borgmcp 5.2.0 → 5.4.0

package/dist/regen.js.map

@@ -1 +1 @@
-{"version":3,"file":"regen.js","sourceRoot":"","sources":["../src/regen.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/E,OAAO,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,0BAA0B,EAC1B,+BAA+B,GAChC,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,iCAAiC,EAAkB,MAAM,oBAAoB,CAAC;AACvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EACL,iCAAiC,EACjC,gBAAgB,EAChB,oBAAoB,GACrB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EACL,sBAAsB,EACtB,iBAAiB,EACjB,6BAA6B,EAC7B,qBAAqB,EACrB,mBAAmB,GACpB,MAAM,uBAAuB,CAAC;AAE/B;;;;;GAKG;AACH,KAAK,UAAU,SAAS;IACtB,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK;QAAE,OAAO,EAAE,CAAC;IACnC,IAAI,CAAC;QACH,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,OAAO,CAAC,KAAK;YAAE,MAAM,CAAC,IAAI,CAAC,KAAe,CAAC,CAAC;QACtE,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACjD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,KAAK,UAAU,IAAI;IACjB,iBAAiB,EAAE,CAAC;IACpB,MAAM,UAAU,GAAG,eAAe,CAAC,MAAM,SAAS,EAAE,CAAC,CAAC;IACtD,mEAAmE;IACnE,qEAAqE;IACrE,mEAAmE;IACnE,+DAA+D;IAC/D,IAAI,CAAC,oBAAoB,CAAC,8BAA8B,CAAC,EAAE,CAAC;QAC1D,0EAA0E;QAC1E,sEAAsE;QACtE,IAAI,aAAa,GAAG,KAAK,CAAC;QAC1B,IAAI,CAAC;YACH,aAAa,GAAG,CAAC,MAAM,aAAa,EAAE,CAAC,KAAK,IAAI,CAAC;QACnD,CAAC;QAAC,MAAM,CAAC;YACP,aAAa,GAAG,KAAK,CAAC;QACxB,CAAC;QACD,IAAI,+BAA+B,CAAC;YAClC,MAAM,EAAE,UAAU;YAClB,SAAS,EAAE,uBAAuB,EAAE;YACpC,aAAa;YACb,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;YAC1C,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC;SACzD,CAAC,EAAE,CAAC;YACH,IAAI,CAAC;gBACH,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,0BAA0B,EAAE,IAAI,CAAC,CAAC;YAC5D,CAAC;YAAC,MAAM,CAAC;gBACP,0EAA0E;YAC5E,CAAC;QACH,CAAC;QACD,OAAO;IACT,CAAC;IACD,0EAA0E;IAC1E,gEAAgE;IAChE,uEAAuE;IACvE,2EAA2E;IAC3E,MAAM,MAAM,GAAG,UAAU,CAAC;IAE1B,MAAM,MAAM,GAAG,MAAM,aAAa,EAAE,CAAC;IACrC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,uBAAuB,EAAE,CAAC;QAChC,OAAO;IACT,CAAC;IACD,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAE5B,MAAM,SAAS,GAAG,iBAAiB,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACnE,MAAM,gBAAgB,GAAG,2BAA2B,CAAC,eAAe,EAAE,CAAC,CAAC;IACxE,MAAM,SAAS,GAAc,uBAAuB,EAAE,CAAC;IAEvD,6DAA6D;IAC7D,sEAAsE;IACtE,wEAAwE;IACxE,2EAA2E;IAC3E,0EAA0E;IAC1E,0EAA0E;IAC1E,yEAAyE;IACzE,4EAA4E;IAC5E,2EAA2E;IAC3E,4EAA4E;IAC5E,IAAI,MAAM,GAA6C,IAAI,CAAC;IAC5D,IAAI,CAAC;QACH,MAAM,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE;YACvD,SAAS,EAAE,iCAAiC,EAAE;YAC9C,WAAW,EAAE,kBAAkB,EAAE;YACjC,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;SAChD,CAAC,CAAC;QACH,sBAAsB,CAAC,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;IAC5D,CAAC;IAAC,MAAM,CAAC;QACP,6BAA6B,CAAC,MAAM,CAAC,CAAC;QACtC,MAAM,GAAG,IAAI,CAAC;IAChB,CAAC;IACD,MAAM,QAAQ,GAAG,qBAAqB,CAAC,MAAM,CAAC,CAAC;IAC/C,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,qBAAqB,CAAC,EAAE,GAAG,QAAQ,EAAE,SAAS,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,GAAG,IAAI,CAC9F,CAAC;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,KAAK,UAAU,uBAAuB;IACpC,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;IACnD,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,KAAK,CAAC,IAAI,CAAC,wFAAwF,CAAC,CAAC;IACrG,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,KAAK,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IACtC,KAAK,CAAC,IAAI,CAAC,2MAA2M,CAAC,CAAC;IACxN,KAAK,CAAC,IAAI,CAAC,4HAA4H,CAAC,CAAC;IACzI,KAAK,CAAC,IAAI,CAAC,oHAAoH,CAAC,CAAC;IACjI,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,gEAAgE;IAChE,gEAAgE;IAChE,+DAA+D;IAC/D,uBAAuB;IACvB,IAAI,CAAC;QACH,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,SAAS,EAAE,CAAC;QACpC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,KAAK,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;YACvC,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;gBACtB,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,WAAW,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;YAC9C,CAAC;QACH,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;YACvC,KAAK,CAAC,IAAI,CAAC,kFAAkF,CAAC,CAAC;QACjG,CAAC;IACH,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,KAAK,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QACvC,KAAK,CAAC,IAAI,CAAC,qBAAqB,GAAG,CAAC,GAAG,EAAE,OAAO,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IAC3E,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,KAAK,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAC;IAC7D,KAAK,CAAC,IAAI,CAAC,uEAAuE,CAAC,CAAC;IACpF,KAAK,CAAC,IAAI,CAAC,2HAA2H,CAAC,CAAC;IACxI,KAAK,CAAC,IAAI,CAAC,kDAAkD,CAAC,CAAC;IAC/D,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;AAChD,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,KAAU,EAAE,EAAE;IAC1B,MAAM,GAAG,GAAG,KAAK,EAAE,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC;IAC5C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC;IAC7C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}
+{"version":3,"file":"regen.js","sourceRoot":"","sources":["../src/regen.ts"],"names":[],"mappings":"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"}

package/docs/SESSION_IDENTITY.md

@@ -0,0 +1,15 @@
+# Agent Session Identity
+
+ARRIVAL is announced once for each known agent session and cube/drone pair, using local lifecycle state. Changing the ARRIVAL wording or reconnecting the MCP transport does not create another announcement for that identity. A different session announces immediately, without a time window. Resuming an already announced session remains suppressed. This state does not affect credentials, authorization, stream ownership, or liveness.
+
+The startup instruction itself remains process-local: reconnecting may display it again. Calling `borg_log` with ARRIVAL applies the persistent identity check. Unknown identity always announces rather than concealing a possible restart. READY suppression is unchanged.
+
+## Harness Coverage
+
+- **Claude Code:** the latest SessionStart hook observed for this launch. Borg puts a random correlation in the launch environment. `borg-regen` stores that correlation, the hook's `session_id`, and its observation time in the worktree's `.borgmcp/claude-session.json`. A reconnect with the same correlation reads the same observation; a successful hook on resume replaces it. Missing, invalid, unreadable, or prior-launch state is unknown. Claude identity can be stale after a resume whose SessionStart hook failed.
+- **Codex:** exactly one non-ephemeral user thread, excluding subagents, in this launch's Borg-owned app-server. Zero or multiple candidates, an unreadable thread, or an unavailable socket is unknown. No recency guess identifies a session.
+- **OpenCode:** the existing launch-correlation binding, rechecked against session metadata. Missing or changed binding, an unseen root session, duplicated launch metadata, or failed inspection is unknown. The identity reader does not follow the wake injector's `/new` selection heuristic.
+
+`borg_stream-status` reports the identity source, the harness-prefixed session id, and the age of the observation in its text response. For Claude this age is measured from the hook, not the MCP child's start. Age is diagnostic only: there is no expiry heuristic. For Codex and OpenCode the observation is a fresh query. Unknown results report their reason.
+
+These identifiers denote harness conversations, not operating-system processes. Restarting a harness into a new conversation produces a new identity; explicitly resuming the same conversation retains its identity when ownership is known. Session identifiers are not secrets or authorization inputs.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "borgmcp",
-  "version": "5.2.0",
+  "version": "5.4.0",
   "description": "Coordinate AI coding agents in shared cubes. Works with Claude Code, Codex, and OpenCode.",
   "type": "module",
   "main": "./dist/index.js",

package/src/agent-runtime.ts

@@ -6,11 +6,13 @@
  */
 
 import { BORG_STATE_ROOT_ENV } from './private-root.js';
+import { randomBytes } from 'node:crypto';
 
 export type AgentKind = 'claude' | 'codex' | 'opencode';
 
 /** Pinned into MCP-child environments by Borg launch paths. */
 export const BORG_AGENT_KIND_ENV = 'BORG_AGENT_KIND';
+export const BORG_CLAUDE_LAUNCH_CORRELATION_ENV = 'BORG_CLAUDE_LAUNCH_CORRELATION';
 /** Transport capability only — never use it as the primary CLI identity. */
 export const BORG_CODEX_REMOTE_WAKE_ENV = 'BORG_CODEX_REMOTE_WAKE';
 /** Legacy OpenCode runtime marker, retained for installed-config compatibility. */
@@ -52,7 +54,11 @@ export function withAgentRuntimeEnv(
   delete next[BORG_AGENT_KIND_ENV];
   delete next[BORG_CODEX_REMOTE_WAKE_ENV];
   delete next[BORG_OPENCODE_ENV];
+  delete next[BORG_CLAUDE_LAUNCH_CORRELATION_ENV];
   next[BORG_AGENT_KIND_ENV] = agentKind;
+  if (agentKind === 'claude') {
+    next[BORG_CLAUDE_LAUNCH_CORRELATION_ENV] = randomBytes(32).toString('base64url');
+  }
   if (agentKind === 'opencode') next[BORG_OPENCODE_ENV] = '1';
   return next;
 }
@@ -66,14 +72,12 @@ export function codexAgentKindConfigArgs(): string[] {
  * Pin the remote-wake transport capability separately from the CLI identity.
  *
  * Codex MCP children read their configured env rather than the wrapper's
- * inherited process env. Explicitly pinning "0" on a no-socket launch is
- * therefore necessary to override legacy static configs that used to persist
- * BORG_CODEX_REMOTE_WAKE="1" as an identity marker.
+ * inherited process env. Every Borg Codex launch owns a remote socket.
  */
-export function codexRemoteWakeConfigArgs(enabled: boolean = true): string[] {
+export function codexRemoteWakeConfigArgs(): string[] {
   return [
     '-c',
-    `mcp_servers.borg.env.${BORG_CODEX_REMOTE_WAKE_ENV}="${enabled ? '1' : '0'}"`,
+    `mcp_servers.borg.env.${BORG_CODEX_REMOTE_WAKE_ENV}="1"`,
   ];
 }
 

package/src/agent-session-identity.ts

@@ -0,0 +1,98 @@
+import { randomBytes } from 'node:crypto';
+import { readFile, rename, unlink, writeFile } from 'node:fs/promises';
+import { join } from 'node:path';
+import { BORG_CLAUDE_LAUNCH_CORRELATION_ENV, resolveReportableSessionAgentKind } from './agent-runtime.js';
+import { findProjectRoot } from './cubes.js';
+import { ensurePrivateBorgConfigRoot } from './private-root.js';
+import { CodexAppServerClient } from './codex-app-server.js';
+import { codexAppServerSocketFromEnv, isCodexSubagentSource } from './codex-wake-resolve.js';
+import { resolveOpenCodeAgentSessionId } from './opencode-drone.js';
+
+export type AgentSessionIdentity =
+  | { kind: 'known'; id: string; source: string; observedAt: string }
+  | { kind: 'unknown'; reason: string };
+
+function validId(value: unknown): value is string {
+  return typeof value === 'string' && value.length > 0 && value.length <= 512 && !/[\s\x00-\x1f\x7f]/.test(value);
+}
+
+function claudeCorrelation(env: NodeJS.ProcessEnv): string | null {
+  const value = env[BORG_CLAUDE_LAUNCH_CORRELATION_ENV];
+  if (!value || !/^[A-Za-z0-9_-]{43}$/.test(value)) return null;
+  return Buffer.from(value, 'base64url').toString('base64url') === value ? value : null;
+}
+
+/** Identity only: no credential, authorization, liveness, or expiry semantics. */
+export async function recordClaudeSessionStart(
+  payload: string,
+  env: NodeJS.ProcessEnv = process.env,
+  worktree = findProjectRoot(),
+): Promise<void> {
+  const correlation = claudeCorrelation(env);
+  if (!correlation) return;
+  let sessionId: unknown;
+  try { sessionId = JSON.parse(payload)?.session_id; } catch { /* Persist unknown rather than retain an old id. */ }
+  const root = join(worktree, '.borgmcp');
+  await ensurePrivateBorgConfigRoot(root);
+  try { await writeFile(join(root, '.gitignore'), '*\n', { flag: 'wx', mode: 0o600 }); }
+  catch (error) { if ((error as NodeJS.ErrnoException).code !== 'EEXIST') throw error; }
+  const path = join(root, 'claude-session.json');
+  const temporary = `${path}.${randomBytes(16).toString('hex')}.tmp`;
+  try {
+    await writeFile(temporary, JSON.stringify({
+      correlation, session_id: validId(sessionId) ? sessionId : null,
+      observedAt: new Date().toISOString(),
+    }) + '\n', { flag: 'wx', mode: 0o600 });
+    await rename(temporary, path);
+  } finally {
+    await unlink(temporary).catch((error: NodeJS.ErrnoException) => { if (error.code !== 'ENOENT') throw error; });
+  }
+}
+
+export async function resolveAgentSessionIdentity(
+  env: NodeJS.ProcessEnv = process.env,
+  worktree = findProjectRoot(),
+): Promise<AgentSessionIdentity> {
+  const kind = resolveReportableSessionAgentKind(env);
+  try {
+    if (kind === 'claude') {
+      const correlation = claudeCorrelation(env);
+      if (!correlation) return { kind: 'unknown', reason: 'claude-launch-correlation-missing' };
+      const record = JSON.parse(await readFile(join(worktree, '.borgmcp', 'claude-session.json'), 'utf8'));
+      if (record?.correlation !== correlation) return { kind: 'unknown', reason: 'claude-launch-correlation-mismatch' };
+      if (!validId(record.session_id) || typeof record.observedAt !== 'string' || !Number.isFinite(Date.parse(record.observedAt))) {
+        return { kind: 'unknown', reason: 'claude-session-start-invalid' };
+      }
+      // Last observed hook, not proof of freshness: a skipped resume hook is
+      // undetectable without a future per-call harness session handoff.
+      return { kind: 'known', id: `claude:${record.session_id}`, source: 'claude-session-start', observedAt: record.observedAt };
+    }
+    if (kind === 'codex') {
+      const socket = codexAppServerSocketFromEnv(env);
+      if (!socket) return { kind: 'unknown', reason: 'codex-launch-socket-missing' };
+      const client = new CodexAppServerClient(socket);
+      try {
+        await client.connect();
+        const candidates: string[] = [];
+        for (const id of await client.loadedThreadIds()) {
+          const thread = await client.readThread(id);
+          // An unreadable candidate could be another user thread; do not guess.
+          if (!thread) return { kind: 'unknown', reason: 'codex-thread-unreadable' };
+          if (thread.ephemeral !== true && !isCodexSubagentSource(thread.source) &&
+              (thread.threadSource === undefined || thread.threadSource === 'user')) candidates.push(thread.id);
+        }
+        if (candidates.length !== 1 || !validId(candidates[0])) return { kind: 'unknown', reason: 'codex-user-thread-not-unique' };
+        return { kind: 'known', id: `codex:${candidates[0]}`, source: 'codex-launch-thread', observedAt: new Date().toISOString() };
+      } finally { client.close(); }
+    }
+    if (kind === 'opencode') {
+      const id = await resolveOpenCodeAgentSessionId();
+      return validId(id)
+        ? { kind: 'known', id: `opencode:${id}`, source: 'opencode-launch-binding', observedAt: new Date().toISOString() }
+        : { kind: 'unknown', reason: 'opencode-launch-binding-unavailable-or-changed' };
+    }
+    return { kind: 'unknown', reason: 'agent-harness-unknown' };
+  } catch {
+    return { kind: 'unknown', reason: `${kind ?? 'agent'}-session-source-unavailable` };
+  }
+}

package/src/assimilate-cmd.ts

@@ -10,20 +10,15 @@ import {
 import { validateName } from './name-validator.js';
 import { renderAssimilationWelcome } from './assimilate-welcome.js';
 import { shellEscape } from './shell-escape.js';
-import { withCodexCwdArg, type CodexRemoteLaunch } from './codex-remote.js';
+import { type CodexRemoteLaunch } from './codex-remote.js';
 import {
   buildAgentKickoffPrompt,
   buildKickoffWakePathClause,
-  recordCodexWakeTarget,
-  socketPathFromRemoteArgs,
+  buildCodexLaunchArgs,
 } from './codex-launch.js';
 import { perWorktreeBranchName, computeWorktreePath, localBranchExists, isMerged } from './worktree-lifecycle.js';
 import { DroneEvictedError } from './drone-lifecycle.js';
-import { codexBorgSessionConfigArgs } from './launch-gate.js';
 import {
-  codexAgentKindConfigArgs,
-  codexRemoteWakeConfigArgs,
-  codexStateRootConfigArgs,
   withAgentRuntimeEnv,
 } from './agent-runtime.js';
 import {
@@ -405,13 +400,6 @@ export interface AssimilateDeps {
   setCliPreferenceForWorktree: (cli: BorgCli, worktree: string) => Promise<void>;
   resolveCli: (explicit?: BorgCli) => Promise<BorgCli>;
   prepareCodexRemoteLaunch: () => Promise<CodexRemoteLaunch>;
-  setCodexWakeTarget: (cubeId: string, droneId: string, target: { threadId: string; socketPath: string }) => Promise<void>;
-  findLoadedCodexThread: (options: {
-    socketPath: string;
-    cwd: string;
-    previewIncludes: string;
-    updatedAfter: number;
-  }) => Promise<string | null>;
 
 }
 
@@ -952,13 +940,11 @@ export async function finalizeAssimilationSeat(
 export type LaunchDeps = Pick<
   AssimilateDeps,
   | 'exec'
-  | 'findLoadedCodexThread'
   | 'getInboxPath'
   | 'isTTY'
   | 'prepareCodexRemoteLaunch'
   | 'probeMcpReady'
   | 'resolveCliApprovals'
-  | 'setCodexWakeTarget'
   | 'setTerminalTitle'
   | 'stderr'
   | 'stdout'
@@ -1019,17 +1005,14 @@ export async function launchAssimilatedAgent(
     );
   }
   const inboxPath = deps.getInboxPath(result.cube_id, result.drone_id);
-  const codexWakeNonce = cli === 'codex' ? `borg-wake-${randomUUID()}` : null;
   const monitorClause = buildKickoffWakePathClause(
     cli,
     cli === 'claude' ? inboxPath : null,
     cli === 'claude' ? monitorStateRoot : null,
   );
-  let codexWakePathClause: string | undefined;
-  let remoteArgs: string[] = [];
   let launchArgs: string[];
-  let codexSocketPath: string | null = null;
   let codexServerCleanup: (() => void) | null = null;
+  let codexRemote: CodexRemoteLaunch | null = null;
   const launchApproval = deps.resolveCliApprovals
     ? await deps.resolveCliApprovals(cli, agentCwd, { skipOverride: flags.noBorgApprovalOverride })
     : { codexArgs: [] };
@@ -1050,39 +1033,36 @@ export async function launchAssimilatedAgent(
   for (const key of modelEnv.unset) delete childEnv[key];
 
   if (cli === 'codex') {
-    const remote = await deps.prepareCodexRemoteLaunch();
-    if (remote.warning) {
-      deps.stderr(`warning: ${remote.warning}\n`);
-      codexWakePathClause =
-        '⚠ Codex wake-path capability check failed: remote-control is unavailable for this session. Run borg_regen manually whenever you return, and expect only fallback wakeups until relaunch.';
-    } else {
-      codexWakePathClause = 'Codex wake-path capability check passed: remote-control socket established for this session.';
+    codexRemote = await deps.prepareCodexRemoteLaunch();
+    if (!codexRemote.ready) {
+      const stderr = codexRemote.stderr ? `\n${codexRemote.stderr}` : '';
+      deps.stderr(`Codex launch refused: ${codexRemote.reason}${stderr}\n`);
+      return 1;
     }
-    remoteArgs = remote.args;
-    if (Object.keys(remote.env).length > 0) Object.assign(childEnv, remote.env);
-    codexSocketPath = socketPathFromRemoteArgs(remote.args);
-    codexServerCleanup = remote.server?.cleanup ?? null;
+    Object.assign(childEnv, codexRemote.env);
+    codexServerCleanup = codexRemote.server.cleanup;
   }
   const kickoff = buildAgentKickoffPrompt({
     cli,
-    codexWakeNonce,
     monitorClause,
-    codexWakePathClause,
   });
   let openCodeKickoff: ReturnType<typeof createOpenCodeLaunchKickoff> | null = null;
   let dronePort: number | undefined;
   launchArgs = [kickoff];
   if (cli === 'codex') {
-    launchArgs = [
-      ...codexLaunchDirectoryArgs(launchAccessPaths),
-      ...launchApproval.codexArgs,
-      ...codexBorgSessionConfigArgs(),
-      ...codexAgentKindConfigArgs(),
-      ...codexRemoteWakeConfigArgs(codexSocketPath !== null),
-      ...codexStateRootConfigArgs(),
-      ...remoteArgs,
-      ...withCodexCwdArg(launchArgs, agentCwd),
-    ];
+    const plan = buildCodexLaunchArgs({
+      remote: codexRemote!,
+      cwd: agentCwd,
+      kickoff,
+      approvalArgs: launchApproval.codexArgs,
+      accessArgs: codexLaunchDirectoryArgs(launchAccessPaths),
+    });
+    if (!plan.ready) {
+      codexServerCleanup?.();
+      deps.stderr(`Codex launch refused: ${plan.reason}\n`);
+      return 1;
+    }
+    launchArgs = plan.args;
   } else if (cli === 'opencode') {
     dronePort = await allocateOpenCodePort();
     childEnv.BORG_OPENCODE_PORT = String(dronePort);
@@ -1094,17 +1074,12 @@ export async function launchAssimilatedAgent(
     launchArgs = buildOpenCodeLaunchArgs(agentCwd, dronePort, openCodeKickoff.prompt);
   }
 
-  const exitPromise = deps.exec(cli, launchArgs, agentCwd, childEnv);
-  if (cli === 'codex' && codexSocketPath && codexWakeNonce) {
-    void recordCodexWakeTarget({
-      deps,
-      cubeId: result.cube_id,
-      droneId: result.drone_id,
-      socketPath: codexSocketPath,
-      cwd: agentCwd,
-      previewNeedle: codexWakeNonce,
-      launchedAtSeconds: Math.floor(Date.now() / 1000),
-    });
+  let exitPromise: Promise<number>;
+  try {
+    exitPromise = deps.exec(cli, launchArgs, agentCwd, childEnv);
+  } catch (error) {
+    codexServerCleanup?.();
+    throw error;
   }
   if (cli === 'opencode' && openCodeKickoff) {
     const launchKickoff = openCodeKickoff;
@@ -1117,12 +1092,14 @@ export async function launchAssimilatedAgent(
       launchIdentity: launchKickoff.correlationIdentity,
     }).then(() => injectInitialKickoff(launchKickoff)).catch(() => {});
   }
-  const exitCode = await exitPromise;
-  if (codexServerCleanup) {
+  let exitCode: number;
+  try {
+    exitCode = await exitPromise;
+  } finally {
     try {
-      codexServerCleanup();
+      codexServerCleanup?.();
     } catch {
-      // Best-effort cleanup after a normal Codex exit.
+      // Best-effort cleanup after Codex exits or fails to spawn.
     }
   }
   if (spawnedWorktreePath && originalCwd !== spawnedWorktreePath) {

package/src/assimilate-deps.ts

@@ -61,7 +61,6 @@ import {
   hasPersistedActiveCube as cubesHasPersistedActive,
   inboxPathForDrone,
   setProjectCliPreference,
-  setCodexWakeTarget,
 } from './cubes.js';
 import {
   addProjectSessionStartHook,
@@ -71,7 +70,6 @@ import { findPendingServerEnrollment, listServerCredentialOrigins } from './conf
 import { setTerminalTitle as setTitle } from './terminal-title.js';
 import { defaultCliChoiceDeps, resolveCliChoice } from './cli-platform.js';
 import { prepareCodexRemoteLaunch, defaultCodexRemoteDeps } from './codex-remote.js';
-import { findLoadedCodexThread } from './codex-app-server.js';
 import { defaultApprovalIo, resolveLaunchBorgApprovals } from './cli-tool-approval.js';
 import { ensurePrivateBorgConfigRoot } from './private-root.js';
 import {
@@ -577,7 +575,5 @@ export function buildDefaultAssimilateDeps(
     ),
     setCliPreferenceForWorktree: (cli, worktree) => setProjectCliPreference(cli, worktree),
     prepareCodexRemoteLaunch: () => prepareCodexRemoteLaunch(defaultCodexRemoteDeps()),
-    setCodexWakeTarget,
-    findLoadedCodexThread,
   };
 }

package/src/claude.ts

@@ -16,7 +16,6 @@
  */
 
 import { spawn } from 'child_process';
-import { randomUUID } from 'node:crypto';
 import { realpathSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { basename } from 'node:path';
@@ -30,8 +29,6 @@ import {
   getActiveCube,
   inboxPathForDrone,
   LaunchSeatIdentityChangedError,
-  setCodexWakeTarget,
-  pruneDeadCodexWakeTargets,
   type ActiveCube,
   type BorgCli,
 } from './cubes.js';
@@ -82,22 +79,15 @@ import { setTerminalTitle } from './terminal-title.js';
 import { initConsolePrefix, consolePrefix } from './console-prefix.js';
 import { initDebugFromArgv } from './debug.js';
 import { configuredCliNames, defaultCliChoiceDeps, detectCliAvailability, detectCliConfiguration, parseCliFlag, resolveCliChoice } from './cli-platform.js';
-import { prepareCodexRemoteLaunch, resolveCodexLaunchCwd, withCodexCwdArg, defaultCodexRemoteDeps, checkCodexBridgeHealthy } from './codex-remote.js';
+import { prepareCodexRemoteLaunch, resolveCodexLaunchCwd, defaultCodexRemoteDeps } from './codex-remote.js';
 import {
-  BORG_CODEX_REMOTE_WAKE_ENV,
-  codexAgentKindConfigArgs,
-  codexRemoteWakeConfigArgs,
-  codexStateRootConfigArgs,
   withAgentRuntimeEnv,
 } from './agent-runtime.js';
-import { findLoadedCodexThread } from './codex-app-server.js';
 import {
   buildAgentKickoffPrompt,
   buildKickoffWakePathClause,
-  recordCodexWakeTarget,
-  socketPathFromRemoteArgs,
+  buildCodexLaunchArgs,
 } from './codex-launch.js';
-import { codexBorgSessionConfigArgs } from './launch-gate.js';
 import {
   addCodexSessionStartHook,
   addCodexUserPromptSubmitHook,
@@ -639,9 +629,6 @@ async function main() {
       : null
   );
 
-  const codexWakeNonce = cli === 'codex' ? `borg-wake-${randomUUID()}` : null;
-  let codexWakePathClause: string | undefined;
-  let remoteArgs: string[] = [];
   // gh#673 P1: mark the agent session as borg-launched. Claude Code's MCP
   // child + hook commands inherit this env, gating the borg activation
   // surface (launch-gate.ts). ACTIVATION-only — never a security gate.
@@ -654,45 +641,33 @@ async function main() {
   if (cli === 'opencode' && launchApproval.openCodePermission) {
     launchEnv.OPENCODE_PERMISSION = launchApproval.openCodePermission;
   }
-  let codexSocketPath: string | null = null;
   let codexServerCleanup: (() => void) | null = null;
-  if (cli === 'codex' && !passthroughArgs.includes('--remote')) {
+  let codexRemote: Awaited<ReturnType<typeof prepareCodexRemoteLaunch>> | null = null;
+  if (cli === 'codex') {
+    if (passthroughArgs.some((arg) => arg === '--remote' || arg.startsWith('--remote='))) {
+      console.error(`${consolePrefix()}${chalk.red('Codex launch refused: Borg owns Codex remote control; remove the passthrough --remote option and retry.')}`);
+      process.exit(1);
+      return;
+    }
     console.error(`${consolePrefix()}${chalk.gray('◼ Starting Codex remote-wake app-server…')}`);
-    const remote = await prepareCodexRemoteLaunch(defaultCodexRemoteDeps());
-    if (remote.warning) {
-      console.error(`${consolePrefix()}${chalk.yellow(`warning: ${remote.warning}`)}`);
-      codexWakePathClause =
-        `⚠ Codex wake-path capability check failed: remote-control is unavailable for this session. Run borg_regen manually whenever you return, and expect only fallback wakeups until relaunch.`;
-    } else {
-      codexWakePathClause =
-        `Codex wake-path capability check passed: remote-control socket established for this session.`;
+    codexRemote = await prepareCodexRemoteLaunch(defaultCodexRemoteDeps());
+    if (!codexRemote.ready) {
+      const stderr = codexRemote.stderr ? `\n${codexRemote.stderr}` : '';
+      console.error(`${consolePrefix()}${chalk.red(`Codex launch refused: ${codexRemote.reason}${stderr}`)}`);
+      process.exit(1);
+      return;
     }
-    remoteArgs = remote.args;
     launchEnv = {
       ...withAgentRuntimeEnv(process.env, cli),
-      ...remote.env,
+      ...codexRemote.env,
       BORG_SESSION: '1',
     };
-    codexSocketPath = socketPathFromRemoteArgs(remote.args);
-    codexServerCleanup = remote.server?.cleanup ?? null;
-  } else if (cli === 'codex' && passthroughArgs.includes('--remote')) {
-    codexWakePathClause =
-      `Codex wake-path capability check: using caller-provided --remote socket; if no wake arrives, run borg_regen manually when returning to the session.`;
-    codexSocketPath = socketPathFromRemoteArgs(passthroughArgs);
-    if (codexSocketPath) {
-      launchEnv = {
-        ...withAgentRuntimeEnv(process.env, cli),
-        [BORG_CODEX_REMOTE_WAKE_ENV]: '1',
-        BORG_SESSION: '1',
-      };
-    }
+    codexServerCleanup = codexRemote.server.cleanup;
   }
 
   const kickoff = buildAgentKickoffPrompt({
     cli,
-    codexWakeNonce,
     monitorClause,
-    codexWakePathClause,
   });
   // This stays separate from the shared kickoff so OpenCode can carry
   // launch-only API and correlation identities outside argv and prompt text.
@@ -700,29 +675,26 @@ async function main() {
   let openCodePort: number | undefined;
   let launchArgs: string[];
   if (cli === 'codex') {
-    // gh#673 P1-codex: codex MCP children only see the pinned
-    // [mcp_servers.borg.env], never inherited env (V2 probe) — deliver
-    // the borg-launch marker and selected CLI identity via per-invocation
-    // -c overrides instead (V2b-proven). Remote wake remains a separate
-    // transport capability, explicitly disabled when this launch has no
-    // socket so legacy static config cannot spuriously arm a bridge.
-    // client#20: the exact approval overrides above are launch-scoped and
-    // consented. They remain separate from activation/identity/wake config.
-    launchArgs = [
-      ...launchApproval.codexArgs,
-      ...codexBorgSessionConfigArgs(),
-      ...codexAgentKindConfigArgs(),
-      ...codexRemoteWakeConfigArgs(codexSocketPath !== null),
-      ...codexStateRootConfigArgs(),
-      ...codexLaunchSeatExpectationConfigArgs(),
-      ...remoteArgs,
-      ...withCodexCwdArg([...passthroughArgs, kickoff], process.cwd()),
-    ];
+    const plan = buildCodexLaunchArgs({
+      remote: codexRemote!,
+      cwd: process.cwd(),
+      kickoff,
+      approvalArgs: launchApproval.codexArgs,
+      seatExpectationArgs: codexLaunchSeatExpectationConfigArgs(),
+      passthroughArgs,
+    });
+    if (!plan.ready) {
+      codexServerCleanup?.();
+      console.error(`${consolePrefix()}${chalk.red(`Codex launch refused: ${plan.reason}`)}`);
+      process.exit(1);
+      return;
+    }
+    launchArgs = plan.args;
   } else if (cli === 'opencode') {
     // OpenCode launch: start TUI with the kickoff passed via --prompt
     // (auto-submits it as the first message). BORG_SESSION is pinned in
-    // opencode.json. The OS-selected loopback port lets the MCP child connect
-    // to OpenCode's local HTTP API without a shared deterministic collision space.
+    // opencode.json. Wake delivery uses HTTP entry injection through OpenCode's local HTTP API;
+    // the OS-selected port avoids a deterministic collision space.
     openCodePort = await allocateOpenCodePort();
     installBorgPlugin();
     openCodeKickoff = createOpenCodeLaunchKickoff(kickoff);
@@ -749,25 +721,6 @@ async function main() {
       })).process
     : spawn(cli, launchArgs, { stdio: 'inherit', shell: false, env: launchEnv });
 
-  // gh#857 WI-2: wake-target recording is codex-only (app-server bridge).
-  // OpenCode uses HTTP entry injection; Claude uses the inbox Monitor.
-  if (cli === 'codex' && active && codexSocketPath) {
-    void recordCodexWakeTarget({
-      deps: { setCodexWakeTarget, findLoadedCodexThread },
-      cubeId: active.cubeId,
-      droneId: active.droneId,
-      socketPath: codexSocketPath,
-      passthroughArgs,
-      previewNeedle: codexWakeNonce ?? kickoff.slice(0, 120),
-      cwd: process.cwd(),
-      launchedAtSeconds: Math.floor(Date.now() / 1000),
-    });
-    // gh#855: self-heal the wake-target file — drop entries whose app-server
-    // socket is positively dead (crashed prior launches), mirroring the
-    // socket-dir pruneStaleSockets. Best-effort; never blocks the launch.
-    void pruneDeadCodexWakeTargets((sock) => checkCodexBridgeHealthy(sock));
-  }
-
   agentProcess.on('error', (err: NodeJS.ErrnoException) => {
     if (codexServerCleanup) {
       try {

package/src/codex-app-server.ts

@@ -7,6 +7,10 @@ export interface CodexThreadSummary {
   preview: string;
   status: { type: string };
   updatedAt: number;
+  source?: unknown;
+  ephemeral?: boolean;
+  threadSource?: string;
+  turns?: unknown[];
 }
 
 interface PendingRequest {
@@ -85,6 +89,10 @@ export class CodexAppServerClient {
       preview: thread.preview,
       status: thread.status,
       updatedAt: thread.updatedAt,
+      source: thread.source,
+      ephemeral: thread.ephemeral,
+      threadSource: thread.threadSource,
+      turns: thread.turns,
     };
   }
 
@@ -159,31 +167,6 @@ export class CodexAppServerClient {
   }
 }
 
-export async function findLoadedCodexThread(options: {
-  socketPath: string;
-  cwd: string;
-  previewIncludes: string;
-  updatedAfter: number;
-}): Promise<string | null> {
-  const client = new CodexAppServerClient(options.socketPath);
-  await client.connect();
-  try {
-    const ids = await client.loadedThreadIds();
-    let best: CodexThreadSummary | null = null;
-    for (const id of ids) {
-      const thread = await client.readThread(id);
-      if (!thread) continue;
-      if (thread.cwd !== options.cwd) continue;
-      if (!thread.preview.includes(options.previewIncludes)) continue;
-      if (thread.updatedAt < options.updatedAfter) continue;
-      if (!best || thread.updatedAt > best.updatedAt) best = thread;
-    }
-    return best?.id ?? null;
-  } finally {
-    client.close();
-  }
-}
-
 function encodeWebSocketTextFrame(text: string): Buffer {
   const payload = Buffer.from(text);
   let header: Buffer;