Skip to content

Replace generic Error with DaemonConflictError in split-brain guard #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
clduab11 merged 2 commits into from
Feb 13, 2026
Merged

Replace generic Error with DaemonConflictError in split-brain guard #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd3abb3
Initial plan
Copilot Feb 13, 2026
0fc8b59
Add DaemonConflictError class for split-brain guard
Copilot Feb 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/cli/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import type {
CodexPromptEnvelope,
ContextLogEntry
} from '../types/codex-context.js';
import { RetryManager } from '../core/errors.js';
import { RetryManager, DaemonConflictError } from '../core/errors.js';
import { HiveMindYamlFormatter } from '../utils/yaml-output.js';
import { parseFileContent, parseJsonInput, loadFileThroughFeedforward } from './feedforward.js';
import { InstructionParser } from '../instructions/index.js';
Expand Down Expand Up @@ -599,10 +599,15 @@ async function useSystem(description: string, fn: (system: CodexSynapticSystem)
if (!alreadyRunning && process.env.CODEX_ALLOW_LOCAL_WITH_DAEMON !== '1') {
const background = getBackgroundStatus();
if (background.running) {
throw new Error(
throw new DaemonConflictError(
`Background daemon already running (pid ${background.pid}). ` +
'To avoid split-brain state, use `codex-synaptic background attach` for daemon-backed monitoring, ' +
'`codex-synaptic background stop` before local commands, or set CODEX_ALLOW_LOCAL_WITH_DAEMON=1 to override.'
'`codex-synaptic background stop` before local commands, or set CODEX_ALLOW_LOCAL_WITH_DAEMON=1 to override.',
{
daemonPid: background.pid,
alreadyRunning,
allowLocalWithDaemon: process.env.CODEX_ALLOW_LOCAL_WITH_DAEMON
}
);
}
}
Expand Down
15 changes: 14 additions & 1 deletion src/core/errors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ export enum ErrorCode {
// Bridge errors
BRIDGE_ERROR = 'BRIDGE_ERROR',
MCP_ERROR = 'MCP_ERROR',
A2A_ERROR = 'A2A_ERROR'
A2A_ERROR = 'A2A_ERROR',

// CLI/Daemon errors
DAEMON_CONFLICT = 'DAEMON_CONFLICT'
}

export class CodexSynapticError extends Error {
Expand Down Expand Up @@ -111,6 +114,16 @@ export class BridgeError extends CodexSynapticError {
}
}

/**
* Error thrown when a daemon conflict is detected (split-brain prevention)
*/
export class DaemonConflictError extends CodexSynapticError {
constructor(message: string, context?: Record<string, any>) {
super(ErrorCode.DAEMON_CONFLICT, message, context, false);
this.name = 'DaemonConflictError';
}
}

/**
* Circuit breaker for handling failures gracefully
*/
Expand Down