@minhspark/codex-mcp-bridge 1.22.13 → 1.22.15

package/src/index.mjs

@@ -37,10 +37,11 @@ import { captureProjectScope } from "./project-scope.mjs";
 import { DesktopReplyReceipts } from "./desktop-reply-receipts.mjs";
 import { registerDesktopReadTools } from "./desktop-read-tools.mjs";
 import { PROJECT_SETUP_TOOLS, registerProjectOnboardingTools } from "./project-onboarding-tools.mjs";
+import { createRelayWake } from "./relay-wake.mjs";
 
 exitForVersionRequest(import.meta.url);
 
-const VERSION = "1.22.13";
+const VERSION = "1.22.15";
 void import("./telemetry.mjs").then(({ startUsageReporting }) => startUsageReporting({ version: VERSION })).catch(() => {});
 const log = (msg) => process.stderr.write(`[codex-mcp-bridge] ${msg}\n`);
 
@@ -75,7 +76,7 @@ const desktopTasksEnabled = desktopTasksConfigured();
 const runtime = createRuntimeState({ configuration: desktopTasksConfigured });
 const desktopOperation = new AsyncLocalStorage();
 const replyReceipts = new DesktopReplyReceipts();
-const desktopTasks = new DesktopTaskDelivery({ security, beforeRequest: beforeDesktopRequest, accountContext: () => desktopOperation.getStore()?.accounts, senderContext: () => desktopOperation.getStore()?.caller });
+const desktopTasks = new DesktopTaskDelivery({ security, beforeRequest: beforeDesktopRequest, accountContext: () => desktopOperation.getStore()?.accounts, senderContext: () => desktopOperation.getStore()?.caller, wakeRelay: createRelayWake({ senderCwd: () => desktopOperation.getStore()?.caller?.cwd ?? null, log }) });
 
 async function assertDesktopOperation(context, { verifyProcess = false } = {}) {
   if (!context || context.diagnostic) return;
@@ -105,9 +106,24 @@ async function beforeDesktopRequest({ operation, args, phase }) {
   }
 }
 
-function withheldDesktopResult(error, context) {
+const asSentence = (text) => /[.!?]$/.test(text) ? text : `${text}.`;
+
+function deliveryReadGuidance(name, args) {
+  if (name === "wait_codex_reply") return "Keep the deliveryId and retry wait_codex_reply; do not resend the original message.";
+  if (name === "read_codex_thread" && args?.turnId) return "Retry read_codex_thread with the same turnId; do not resend the original message.";
+  return null;
+}
+
+function withheldDesktopResult(error, context, { readOnly = false, completed = false, guidance = null } = {}) {
   if (context.dispatched) reload.defer("A Desktop operation was dispatched without a fully verified outcome");
-  const reason = (error?.message ?? "The calling session or accounts could not be reverified.").replace(/\s*No message was sent\./g, "");
+  const reason = asSentence((error?.message ?? "").replace(/\s*No message was sent\./g, "").trim() || "The calling session or accounts could not be reverified.");
+  if (readOnly && !context.dispatched) {
+    const failed = failure(error);
+    return {
+      ...textResult(`Codex bridge error: ${reason}${completed ? " The read result was withheld." : ""}${guidance ? ` ${guidance}` : ""}`, true),
+      structuredContent: { ...failed.structuredContent, accountContext: context.accounts },
+    };
+  }
   return {
     ...textResult(`${reason} ${context.dispatched ? "A Desktop operation may already have been dispatched. Its original destination and any creation receipt were preserved." : "No Desktop mutation was dispatched."} Reply content was withheld. Inspect the original task and do not resend automatically.`, true),
     structuredContent: { ...failure(error).structuredContent, accountContext: context.accounts, operation: { state: context.dispatched ? "dispatched_outcome_unverified" : "blocked", threadId: context.threadId ?? null } },
@@ -464,17 +480,22 @@ function registerTool(name, definition, handler) {
         const identity = requireBridgeAccounts(accounts);
         const caller = requireClaudeSenderContext(await readClaudeSenderContext({ account: accounts.claude }));
         const context = { accounts: identity, caller, dispatched: false, deadline, projectSetup: PROJECT_SETUP_TOOLS.has(name) };
+        const readOnly = definition.annotations?.readOnlyHint === true;
+        const guidance = deliveryReadGuidance(name, args[0]);
         return await desktopOperation.run(context, async () => {
+          let completed = false;
           try {
             await assertDesktopOperation(context);
             const result = await handler(...args);
+            completed = true;
             await assertDesktopOperation(context);
             if (result.isError && !context.dispatched && result.structuredContent?.responseVersion !== 1) {
-              result.structuredContent = { ...result.structuredContent, accountContext: context.accounts, operation: { state: "blocked", threadId: context.threadId ?? null } };
+              result.structuredContent = { ...result.structuredContent, accountContext: context.accounts, ...(readOnly ? {} : { operation: { state: "blocked", threadId: context.threadId ?? null } }) };
+              if (guidance && result.structuredContent?.nextAction !== "none") result.content.push({ type: "text", text: guidance });
             }
             return result;
           } catch (error) {
-            return withheldDesktopResult(error, context);
+            return withheldDesktopResult(error, context, { readOnly, completed, guidance });
           }
         });
       }
@@ -492,8 +513,8 @@ registerDesktopReadTools(registerTool, {
   assertThreadAccess, normalizeThreadCwd, textResult, replyResult, failure,
 });
 
-registerProjectOnboardingTools(registerTool, { beforePrepare: async () => {
-  if (!desktopTasksEnabled || !desktopOperation.getStore()?.caller) throw new Error("Project onboarding requires a verified Desktop caller");
+registerProjectOnboardingTools(registerTool, { options: { policyRegistration: "claude-code" }, beforePrepare: async () => {
+  if (!desktopTasksEnabled || !desktopOperation.getStore()?.caller) throw new Error("Project onboarding requires a verified Desktop caller.");
   await assertDesktopOperation(desktopOperation.getStore(), { verifyProcess: true });
 } });
 

package/src/mcp-supervisor.mjs

@@ -3,7 +3,7 @@ import { fork } from "node:child_process";
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-import { createReleaseSnapshot, sourceRevision } from "./release-snapshot.mjs";
+import { createReleaseSnapshot, pruneReleaseSnapshots, snapshotRoot, sourceRevision } from "./release-snapshot.mjs";
 import { desktopTasksConfigured } from "./native-relay.mjs";
 import { isMainModule, stableInstallPath } from "./install-paths.mjs";
 import { CLIENT_CLOSE_DRAIN_MS, CLIENT_CLOSE_STOP_MS } from "./reload-control.mjs";
@@ -50,6 +50,8 @@ class Worker {
       stdio: ["pipe", "pipe", "pipe", "ipc"], serialization: "json",
     });
     this.exited = new Promise((resolve) => this.process.once("exit", resolve));
+    this.exited.then(() => release.lease?.release());
+    this.process.once("error", () => { if (this.process.pid === undefined) release.lease?.release(); });
     this.process.stderr.on("data", (data) => process.stderr.write(data));
     this.process.stdin.on("error", (error) => this.fail(error));
     this.process.on("error", (error) => this.fail(error));
@@ -160,6 +162,7 @@ export async function runSupervisor(entry, options = {}) {
   };
   const pollMs = interval(env.CODEX_BRIDGE_RELOAD_POLL_MS, 1000);
   const settleMs = interval(env.CODEX_BRIDGE_RELOAD_SETTLE_MS, 1500);
+  const pruneDelayMs = interval(env.CODEX_BRIDGE_RUNTIME_PRUNE_DELAY_MS, 60000);
   let active;
   let initializeParams;
   let initializeResult;
@@ -225,8 +228,14 @@ export async function runSupervisor(entry, options = {}) {
     },
   };
   const spawn = (release, routing) => {
-    if (stopping) throw new Error("The MCP client disconnected before activation");
-    const worker = new Worker(release, entry, env, handlers);
+    let worker;
+    try {
+      if (stopping) throw new Error("The MCP client disconnected before activation");
+      worker = new Worker(release, entry, env, handlers);
+    } catch (error) {
+      release.lease?.release();
+      throw error;
+    }
     worker.routingConfiguration = routing;
     workers.add(worker);
     return worker;
@@ -249,7 +258,7 @@ export async function runSupervisor(entry, options = {}) {
     try {
       const state = await previous.control("inspect");
       if (!state.reloadable) { reason = state.reason ?? "Pending deliveries prevent a safe reload"; return; }
-      const release = createReleaseSnapshot(source, { expectedRevision: revision });
+      const release = createReleaseSnapshot(source, { expectedRevision: revision, lease: true });
       candidate = spawn(release, routing);
       const initialized = await candidate.rpc("initialize", initializeParams);
       if (initialized.protocolVersion !== initializeResult.protocolVersion || JSON.stringify(initialized.capabilities) !== JSON.stringify(initializeResult.capabilities)) {
@@ -274,6 +283,7 @@ export async function runSupervisor(entry, options = {}) {
       await previous.stop().catch((error) => log(`retired ${entry} worker: ${error.message}`));
       workers.delete(previous);
       log(`activated ${entry} revision ${revision.slice(0, 12)}; client connection retained`);
+      schedulePrune();
     } catch (error) {
       reason = `Update deferred: ${error.message}`;
       retryAt = Date.now() + Math.max(pollMs, 5000);
@@ -323,21 +333,35 @@ export async function runSupervisor(entry, options = {}) {
       active.write({ ...message, id });
     } else active.write(message);
   };
+  let pruneTimer = null;
+  const schedulePrune = () => {
+    if (stopping || pruneTimer) return;
+    pruneTimer = setTimeout(() => {
+      if (stopping) return;
+      void pruneReleaseSnapshots({ cache: snapshotRoot(env), keep: [...workers].map((worker) => worker.release.key) })
+        .then((report) => { if (report.removed.length) log(`removed ${report.removed.length} unused runtime snapshot(s)`); })
+        .catch((error) => log(`runtime snapshot cleanup failed: ${error.message}`))
+        .finally(() => { pruneTimer = null; });
+    }, pruneDelayMs);
+    pruneTimer.unref();
+  };
   const shutdown = async () => {
     if (stopping) return;
     stopping = true;
     clearInterval(timer);
+    clearTimeout(pruneTimer);
     await Promise.allSettled([...workers].map((worker) => worker.stop(CLIENT_CLOSE_GRACE_MS)));
     process.stdin.pause();
   };
   const preparationStarted = performance.now();
   log(`preparing ${entry} runtime`);
-  const initial = createReleaseSnapshot(root);
-  log(`prepared ${entry} runtime in ${Math.round(performance.now() - preparationStarted)} ms`);
+  const initial = createReleaseSnapshot(root, { lease: true });
+  log(`prepared ${entry} runtime in ${Math.round(performance.now() - preparationStarted)} ms (${initial.copy})`);
   observed = initial.revision;
   observedRouting = routingConfiguration();
   active = spawn(initial, observedRouting);
   const timer = setInterval(() => { void check(); }, pollMs);
+  schedulePrune();
   lines(process.stdin, (message) => {
     if (!message || message.jsonrpc !== "2.0" || (!message.method && !hasId(message))) throw new Error("Invalid client JSON-RPC message");
     dispatch(message);

package/src/native-relay-companion.mjs

@@ -39,7 +39,7 @@ import { NativeCreationReceipts, creationIdValid } from "./native-creation-recei
 
 exitForVersionRequest(import.meta.url);
 
-const VERSION = "1.22.13";
+const VERSION = "1.22.15";
 const log = (msg) => process.stderr.write(`[native-relay] ${msg}\n`);
 
 function errorResponse(code, message, sent, details) {
@@ -48,7 +48,7 @@ function errorResponse(code, message, sent, details) {
 }
 
 const RELAY_RELOADING_REFUSAL = Object.freeze({ code: "RELAY_RELOADING", message: "The native relay is reloading; no message was sent" });
-const RELAY_STOPPING_REFUSAL = Object.freeze({ code: "RELAY_STOPPING", message: "The native relay is shutting down because its MCP client closed; no message was sent" });
+const RELAY_STOPPING_REFUSAL = Object.freeze({ code: "RELAY_STOPPING", message: "The native relay is shutting down; no message was sent" });
 
 function boundRequest(payload) {
   return payload?.v === ACCOUNT_RELAY_PROTOCOL_VERSION;
@@ -396,6 +396,7 @@ export class RelaySocketServer {
     restrictSocket = (target) => {
       if (!IS_WINDOWS) fs.chmodSync(target, 0o600);
     },
+    signalExit = true,
     log: logFn = () => {},
   } = {}) {
     this.socketPath = socketPath;
@@ -410,6 +411,7 @@ export class RelaySocketServer {
     this.protectSocket = protectSocket;
     this.restrictSocket = restrictSocket;
     this.log = logFn;
+    this.signalExit = signalExit;
     this.server = null;
     this.started = false;
     this.connections = new Set();
@@ -472,12 +474,16 @@ export class RelaySocketServer {
       this.aclReady = !IS_WINDOWS || !this.strict;
       for (const socket of this.provisionalSockets) socket.destroy();
       this.provisionalSockets.clear();
+      if (!IS_WINDOWS && this.boundIdentity && this.#ownsPublicPath()) {
+        try { fs.rmSync(this.socketPath, { force: true }); } catch {}
+      }
+      this.boundIdentity = null;
       await this.#closeServer();
       throw new Error(`refusing to serve on ${this.socketPath}: its mode could not be restricted (${err.message})`);
     }
     this.started = true;
 
-    for (const signal of ["SIGINT", "SIGTERM"]) {
+    for (const signal of this.signalExit ? ["SIGINT", "SIGTERM"] : []) {
       const handler = () => {
         this.stop();
         process.exit(0);
@@ -799,7 +805,7 @@ export function createNativeRelayLifecycle({ nativeTools, relays, log: logFn = (
     nativeTools.close();
   };
   const activate = async () => {
-    if (stopping) throw new Error("The native relay is shutting down because its MCP client closed");
+    if (stopping) throw new Error("The native relay is shutting down");
     for (const relay of servers) relay.refusal = RELAY_RELOADING_REFUSAL;
     if (startups.length) {
       for (const relay of servers) relay.accepting = true;
@@ -850,6 +856,27 @@ export function createNativeRelayLifecycle({ nativeTools, relays, log: logFn = (
   };
 }
 
+export function createRelayServers({ nativeTools, env = process.env, signalExit = true, log: logFn = () => {} }) {
+  const hardened = hardenedBridgeEnabled(env);
+  if (hardened && !desktopTasksConfigured(env)) throw new Error("CODEX_BRIDGE_HARDENED=1 requires CODEX_BRIDGE_DESKTOP_TASKS=1; legacy relay listeners are disabled");
+  const dispatch = (args, options) => nativeTools.dispatch(args, options);
+  const dispatchDesktop = (args, options) => nativeTools.dispatchDesktop(args, options);
+  const shared = { signalExit, log: logFn };
+  const relay = new RelaySocketServer({ socketPath: relaySocketPath(env), dispatch, dispatchDesktop, ...shared });
+  const desktopRelay = desktopTaskSocketPath(env) === relay.socketPath ? relay : new RelaySocketServer({ socketPath: desktopTaskSocketPath(env), dispatchDesktop, ...shared });
+  const accountRelay = new RelaySocketServer({
+    socketPath: accountRelaySocketPath(env),
+    requireAccountContext: true,
+    strict: hardened,
+    dispatch,
+    dispatchDesktop,
+    authorize: hardened ? createNativeScopeAuthorizer({ dispatchDesktop, env }) : undefined,
+    ...shared,
+  });
+  const strictDesktop = hardened && desktopTasksConfigured(env);
+  return { relay, desktopRelay, accountRelay, strictDesktop, relays: strictDesktop ? [accountRelay] : [relay, desktopRelay, accountRelay] };
+}
+
 /**
  * `import.meta.main` is Node 24 and up, and this project supports Node 22, so
  * the entry point is detected by comparing the resolved argv path instead.
@@ -869,33 +896,9 @@ if (invokedDirectly) {
   );
 
   const nativeTools = new NativeToolsClient();
-  const dispatch = (args, options) => nativeTools.dispatch(args, options);
-
-  const hardened = hardenedBridgeEnabled();
-  if (hardened && !desktopTasksConfigured()) throw new Error("CODEX_BRIDGE_HARDENED=1 requires CODEX_BRIDGE_DESKTOP_TASKS=1; legacy relay listeners are disabled");
-  const relay = new RelaySocketServer({
-    socketPath: relaySocketPath(),
-    dispatch,
-    dispatchDesktop: (args, options) => nativeTools.dispatchDesktop(args, options),
-    log,
-  });
-  const desktopRelay = desktopTaskSocketPath() === relay.socketPath ? relay : new RelaySocketServer({
-    socketPath: desktopTaskSocketPath(),
-    dispatchDesktop: (args, options) => nativeTools.dispatchDesktop(args, options),
-    log,
-  });
-  const accountRelay = new RelaySocketServer({
-    socketPath: accountRelaySocketPath(),
-    requireAccountContext: true,
-    strict: hardened,
-    dispatch,
-    dispatchDesktop: (args, options) => nativeTools.dispatchDesktop(args, options),
-    authorize: hardened ? createNativeScopeAuthorizer({ dispatchDesktop: (args, options) => nativeTools.dispatchDesktop(args, options) }) : undefined,
-    log,
-  });
+  const { relay, desktopRelay, accountRelay, strictDesktop, relays } = createRelayServers({ nativeTools, signalExit: false, log });
   const runtime = createRuntimeState();
-  const strictDesktop = hardened && desktopTasksConfigured();
-  const lifecycle = createNativeRelayLifecycle({ nativeTools, relays: strictDesktop ? [accountRelay] : [relay, desktopRelay, accountRelay], log });
+  const lifecycle = createNativeRelayLifecycle({ nativeTools, relays, log });
   const reload = createReloadControl({ entry: "native-relay-companion.mjs", ...lifecycle });
 
   mcp.registerTool(
@@ -916,7 +919,7 @@ if (invokedDirectly) {
       let executor = "(unconfigured)";
       try {
         const resolved = resolveRelayThreadId();
-        executor = `${resolved.threadId}  (from ${resolved.source})`;
+        executor = `${resolved.threadId}  (from ${resolved.source}; internal executor task, opening it in Codex Desktop reports a missing rollout by design)`;
       } catch (err) {
         executor = err.message;
       }
@@ -943,9 +946,11 @@ if (invokedDirectly) {
   );
 
   if (!reload.staged) void lifecycle.activate().catch((error) => log(`native relay startup failed: ${error.message}`));
-  mcp.server.onclose = () => { void lifecycle.stop(); };
   await mcp.connect(new StdioServerTransport());
-  exitWhenClientCloses({ prepare: () => lifecycle.refuseNewDeliveries(), busy: lifecycle.deliveryReason, stop: lifecycle.stop, log });
+  const shutdown = exitWhenClientCloses({ prepare: () => lifecycle.refuseNewDeliveries(), busy: lifecycle.deliveryReason, stop: lifecycle.stop, log });
+  mcp.server.onclose = () => { void shutdown.close("MCP transport closed"); };
+  let signals = 0;
+  for (const signal of ["SIGINT", "SIGTERM", "SIGHUP"]) process.on(signal, () => { if (++signals > 1) process.exit(1); void shutdown.close(signal); });
   reload.listen();
-  log(`ready on ${PLATFORM_LABEL} (${strictDesktop ? accountRelay.socketPath : relay.started ? relay.socketPath : "socket down"})`);
+  log(`ready on ${PLATFORM_LABEL} (${reload.staged ? "relay listeners staged for reload" : `relay listeners starting on ${(strictDesktop ? accountRelay : relay).socketPath}`})`);
 }

package/src/native-relay.mjs

@@ -774,7 +774,7 @@ export function nativeRelayStatus(env = process.env) {
       enabled: false,
       mode,
       socketPath,
-      reason: `no companion socket at ${socketPath} - is the native relay installed and Codex Desktop running?`,
+      reason: `no companion socket at ${socketPath}. Install the native relay if it is missing. Codex Desktop runs codex-native-relay only while a task has its MCP servers loaded: open any regular project task (not the internal Native Relay executor task) and send it a turn or reconnect its MCP servers, then retry.`,
     };
   }
   return { enabled: true, mode, socketPath, reason: null };
@@ -938,7 +938,7 @@ export class NativeDesktopRelay {
   }
 }
 
-export async function bootstrapRelayThread(client, { cwd = homeDir(), env = process.env, name = "Native Relay" } = {}) {
+export async function bootstrapRelayThread(client, { cwd = homeDir(), env = process.env, name = "Native Relay (internal executor, do not open)" } = {}) {
   const res = await client.call("thread/start", {
     cwd,
     approvalPolicy: "never",

package/src/peer-protocol.mjs

@@ -415,7 +415,7 @@ function isImageToolCompanion(entry, entriesById) {
         && typeof tool.id === "string" && tool.id === part.tool_use_id));
 }
 
-function compactContinuation(entry, root, entriesById, sessionId, cwd) {
+function compactContinuation(entry, root, entriesById, transcriptIds, sessionId, cwd) {
   if (entry.type !== "system" || entry.subtype !== "compact_boundary" || entry.parentUuid !== null
       || typeof entry.logicalParentUuid !== "string") return null;
   const sameIdentity = (record) => record?.entrypoint === "claude-desktop"
@@ -425,13 +425,16 @@ function compactContinuation(entry, root, entriesById, sessionId, cwd) {
   const segment = entry.compactMetadata?.preservedSegment;
   const preserved = entry.compactMetadata?.preservedMessages;
   const ids = preserved?.uuids;
+  const allIds = preserved?.allUuids;
   if (!Array.isArray(ids) || !ids.length || ids.length > 65536
       || ids.some((id) => typeof id !== "string" || !id) || new Set(ids).size !== ids.length
-      || !Array.isArray(preserved.allUuids) || preserved.allUuids.length !== ids.length
-      || ids.some((id, index) => preserved.allUuids[index] !== id)
+      || !Array.isArray(allIds) || !allIds.length || allIds.length > 65536
+      || allIds.some((id) => typeof id !== "string" || !id.trim()) || new Set(allIds).size !== allIds.length
       || !ids.includes(root.uuid) || segment?.headUuid !== ids[0]
       || segment.tailUuid !== ids.at(-1) || segment.tailUuid !== entry.logicalParentUuid
       || typeof segment.anchorUuid !== "string" || preserved.anchorUuid !== segment.anchorUuid) return null;
+  const persistedIds = allIds.filter((id) => transcriptIds.has(id));
+  if (persistedIds.length !== ids.length || ids.some((id, index) => persistedIds[index] !== id)) return null;
   if (ids.some((id, index) => !sameIdentity(entriesById.get(id))
       || index > 0 && entriesById.get(id).parentUuid !== ids[index - 1])
       || ids.includes(entriesById.get(ids[0]).parentUuid)) return null;
@@ -457,12 +460,15 @@ export function readTranscriptOutcome(sessionId, cwd, msgId) {
   const entries = [];
   const roots = [];
   const ids = new Set();
+  const transcriptIds = new Set();
   let ambiguous = false;
   for (const line of lines) {
     if (!line.trim()) continue;
     let entry;
     try { entry = JSON.parse(line); } catch { ambiguous = true; continue; }
-    if (!entry || typeof entry !== "object" || Array.isArray(entry) || entry.isSidechain) continue;
+    if (!entry || typeof entry !== "object" || Array.isArray(entry)) continue;
+    if (typeof entry.uuid === "string") transcriptIds.add(entry.uuid);
+    if (entry.isSidechain) continue;
     if (typeof entry.uuid === "string") {
       if (ids.has(entry.uuid)) ambiguous = true;
       ids.add(entry.uuid);
@@ -490,7 +496,7 @@ export function readTranscriptOutcome(sessionId, cwd, msgId) {
     let parentUuid = entry.parentUuid;
     if (!ambiguous && !interruptions.length && descendants.has(entry.logicalParentUuid)
         && openLeaves.has(entry.logicalParentUuid)) {
-      const summaryId = compactContinuation(entry, root, entriesById, sessionId, cwd);
+      const summaryId = compactContinuation(entry, root, entriesById, transcriptIds, sessionId, cwd);
       if (summaryId) {
         parentUuid = entry.logicalParentUuid;
         compactSummaries.add(summaryId);
@@ -594,7 +600,7 @@ const RELOAD_DRAIN_MS = 1000;
  * answer on and the conversation stays one-way.
  */
 export class PeerEndpoint {
-  constructor({ name = `codex-${process.pid}`, cwd = process.cwd(), log = () => {}, env = process.env, protectSocket } = {}) {
+  constructor({ name = `codex-${process.pid}`, cwd = process.cwd(), log = () => {}, env = process.env, protectSocket, signalExit = true } = {}) {
     this.name = name;
     this.cwd = cwd;
     this.log = log;
@@ -620,6 +626,7 @@ export class PeerEndpoint {
     this.reloadPaused = false;
     this.intakeClosed = false;
     this.processHandlersRegistered = false;
+    this.signalExit = signalExit;
     this.strict = hardenedBridgeEnabled(env);
     this.protectSocket = protectSocket ?? (hardenedBridgeEnabled(env) ? protectCurrentUserPipe : null);
     this.aclReady = !IS_WINDOWS || !this.protectSocket;
@@ -728,7 +735,7 @@ export class PeerEndpoint {
     fs.writeFileSync(this.keyPath, JSON.stringify({ peerToken, ...processIdentity }), { mode: 0o600 });
 
     if (!this.processHandlersRegistered) {
-      for (const signal of ["SIGINT", "SIGTERM"]) {
+      for (const signal of this.signalExit ? ["SIGINT", "SIGTERM"] : []) {
         process.on(signal, () => {
           this.stop();
           process.exit(0);

package/src/platform.mjs

@@ -452,26 +452,59 @@ export function isDesktopAppServerRunning() {
   }
 }
 
+const CODEX_DESKTOP_EXE_WINDOWS = /^[a-z]:\\Program Files\\WindowsApps\\OpenAI\.Codex_[0-9.]+_(?:x64|arm64)__2p2nqsd0c76g0\\app\\ChatGPT\.exe$/i;
+
+export function codexDesktopListed(executablePaths) {
+  return String(executablePaths ?? "").split(/\r?\n/)
+    .some((line) => line.trim() && CODEX_DESKTOP_EXE_WINDOWS.test(path.win32.normalize(line.trim())));
+}
+
+export async function isCodexDesktopRunning({ platform = process.platform, env = process.env, run = execFileAsync, macos = isDesktopAppServerRunning } = {}) {
+  if (platform === "darwin") return macos();
+  if (platform !== "win32") return false;
+  const shell = windowsPowerShell(env);
+  try {
+    const { stdout } = await run(shell, ["-NoLogo", "-NoProfile", "-NonInteractive", "-Command",
+      "Get-Process -Name ChatGPT -ErrorAction SilentlyContinue | ForEach-Object { $_.Path }"], { windowsHide: true, timeout: 5000 });
+    return codexDesktopListed(stdout);
+  } catch {
+    return false;
+  }
+}
+
 /**
  * Bring a thread to the foreground in the Codex desktop app so a human can
  * watch the turn run instead of only reading the transcript afterwards.
  * Windows registers the `codex://` scheme through the packaged Codex app, and
  * macOS registers it through /Applications/ChatGPT.app.
  */
-export async function openThreadInCodexApp(threadId, { activate = true } = {}) {
-  const url = codexThreadUrl(threadId);
-  if (IS_WINDOWS) {
-    await execFileAsync("explorer.exe", [url], { windowsHide: true, timeout: 10000 });
+function windowsPowerShell(env) {
+  return path.win32.join(env.SystemRoot ?? "C:\\Windows", "System32", "WindowsPowerShell", "v1.0", "powershell.exe");
+}
+
+function windowsOpenUrlCommand(url, env) {
+  const shell = windowsPowerShell(env);
+  const encodedUrl = Buffer.from(url, "utf8").toString("base64");
+  const script = `$ErrorActionPreference='Stop'; Start-Process -FilePath ([Text.Encoding]::UTF8.GetString([Convert]::FromBase64String('${encodedUrl}')))`;
+  return [shell, ["-NoLogo", "-NoProfile", "-NonInteractive", "-EncodedCommand", Buffer.from(script, "utf16le").toString("base64")]];
+}
+
+export async function openThreadInCodexApp(threadId, { activate = true, platform = process.platform, env = process.env, run = execFileAsync } = {}) {
+  if (typeof threadId !== "string" || !threadId) throw new Error("A Codex thread id is required");
+  const url = codexThreadUrl(encodeURIComponent(threadId));
+  if (platform === "win32") {
+    const [shell, args] = windowsOpenUrlCommand(url, env);
+    await run(shell, args, { windowsHide: true, timeout: 10000 });
     return url;
   }
-  if (!IS_MACOS) {
+  if (platform !== "darwin") {
     throw new Error(`Opening a Codex thread in the desktop app is supported on Windows and macOS. Open ${url} manually.`);
   }
   if (!hasCodexDesktopApp()) {
     throw new Error(`Codex desktop app not found at ${CODEX_DESKTOP_APP_MACOS}. Install it to use ${url}.`);
   }
   const args = activate ? [url] : ["-g", url];
-  await execFileAsync("open", args, { timeout: 10000 });
+  await run("open", args, { timeout: 10000 });
   return url;
 }
 
@@ -484,7 +517,7 @@ export async function openClaudeCodeComposer(url, { platform = process.platform,
     throw new Error("Invalid Claude Desktop Code creation link");
   }
   if (platform === "win32") {
-    const shell = path.win32.join(env.SystemRoot ?? "C:\\Windows", "System32", "WindowsPowerShell", "v1.0", "powershell.exe");
+    const shell = windowsPowerShell(env);
     const encodedUrl = Buffer.from(url, "utf8").toString("base64");
     const script = String.raw`$ErrorActionPreference='Stop'; $creationUrl=[Text.Encoding]::UTF8.GetString([Convert]::FromBase64String('${encodedUrl}')); try { Start-Process -FilePath $creationUrl -ErrorAction Stop } catch { $desktopPaths=@(Get-Process claude -ErrorAction SilentlyContinue | ForEach-Object { $_.Path } | Where-Object { $_ -match '\\(?:AnthropicClaude\\app-[^\\]+|WindowsApps\\Claude_[^\\]+\\app)\\claude\.exe$' -and (Test-Path -LiteralPath $_) } | Select-Object -Unique); if ($desktopPaths.Count -eq 0 -and $env:LOCALAPPDATA) { $desktopPaths=@(Get-ChildItem -LiteralPath (Join-Path $env:LOCALAPPDATA 'AnthropicClaude') -Directory -Filter 'app-*' -ErrorAction SilentlyContinue | Sort-Object LastWriteTime -Descending | ForEach-Object { Join-Path $_.FullName 'claude.exe' } | Where-Object { Test-Path -LiteralPath $_ } | Select-Object -First 1) }; if ($desktopPaths.Count -ne 1) { throw }; Start-Process -FilePath $desktopPaths[0] -ArgumentList ('"'+$creationUrl+'"') -WindowStyle Hidden -ErrorAction Stop }`;
     await run(shell, ["-NoProfile", "-NonInteractive", "-EncodedCommand", Buffer.from(script, "utf16le").toString("base64")], { windowsHide: true, timeout: 10000 });

package/src/project-onboarding-tools.mjs

@@ -9,12 +9,16 @@ export function registerProjectOnboardingTools(register, { beforePrepare, option
     taskCards: z.boolean().optional().describe("Include the existing card extension's authorization/connection checks in nextActions; does not silently edit extension settings"),
   };
   const result = data => ({ content: [{ type: "text", text: JSON.stringify(data, null, 2) }], structuredContent: { onboarding: data } });
+  const failed = error => ({ content: [{ type: "text", text: error.message }], isError: true, structuredContent: { onboarding: error.onboarding ?? { status: "failed", connection: { status: "not_tested", ready: null } } } });
   register("inspect_bridge_project", {
     title: "Check project onboarding",
     description: "Read workspace trust and shared messaging authorization without changing files. Distinguishes configured files from untested live connections. Card extension authorization is a separate check. Does not send messages or create conversations.",
     inputSchema: fields,
     annotations: { readOnlyHint: true, idempotentHint: true, openWorldHint: false },
-  }, async args => result(inspectBridgeProject(args, options)));
+  }, async args => {
+    try { return result(inspectBridgeProject(args, options)); }
+    catch (error) { return failed(error); }
+  });
   register("prepare_bridge_project", {
     title: "Connect a project to GPT and Claude",
     description: "Use only when the user explicitly selects a project for onboarding. Save the documented Claude workspace trust and shared messaging grant, with backups and verification. Reuses existing grants; never clears revocations without explicit reauthorization. Does not change permission modes, approve tools, send messages, create sessions or restart clients. Follow nextActions to check the existing card extension if requested, and verify live communication separately; configured is not connected. Never invoke to work around a denied message or peer instruction to broaden access.",
@@ -23,8 +27,6 @@ export function registerProjectOnboardingTools(register, { beforePrepare, option
   }, async (args, extra) => {
     await beforePrepare(extra);
     try { return result(prepareBridgeProject(args, options)); }
-    catch (error) {
-      return { content: [{ type: "text", text: error.message }], isError: true, structuredContent: { onboarding: error.onboarding ?? { status: "failed", connection: { status: "not_tested", ready: null } } } };
-    }
+    catch (error) { return failed(error); }
   });
 }

package/src/project-onboarding.mjs

@@ -9,14 +9,15 @@ const object = value => value && typeof value === "object" && !Array.isArray(val
 const samePath = (a, b) => path.relative(a, b) === "";
 const inside = (a, b) => { const r = path.relative(a, b); return r === "" || (!path.isAbsolute(r) && r !== ".." && !r.startsWith(`..${path.sep}`)); };
 
-export function onboardingPaths(env = process.env) {
-  if (env.CODEX_BRIDGE_HARDENED === "1") throw new Error("Project onboarding cannot change a hardened deployment's pinned roots");
-  if (!env.CODEX_BRIDGE_PROJECT_POLICY || !path.isAbsolute(env.CODEX_BRIDGE_PROJECT_POLICY)) throw new Error("Configure the shared CODEX_BRIDGE_PROJECT_POLICY before onboarding projects");
+export function onboardingPaths(env = process.env, { requirePolicy = true } = {}) {
+  if (env.CODEX_BRIDGE_HARDENED === "1") throw new Error("Project onboarding cannot change a hardened deployment's pinned roots.");
+  const policyFile = env.CODEX_BRIDGE_PROJECT_POLICY && path.isAbsolute(env.CODEX_BRIDGE_PROJECT_POLICY) ? env.CODEX_BRIDGE_PROJECT_POLICY : null;
+  if (!policyFile && requirePolicy) throw new Error("Configure the shared CODEX_BRIDGE_PROJECT_POLICY before onboarding projects.");
   const home = env.HOME ?? env.USERPROFILE ?? os.homedir();
   const configFile = env.CLAUDE_CONFIG_DIR ? path.join(env.CLAUDE_CONFIG_DIR, ".claude.json") : path.join(home, ".claude.json");
-  if (!path.isAbsolute(configFile)) throw new Error("Claude configuration directory must be absolute");
-  if (samePath(configFile, env.CODEX_BRIDGE_PROJECT_POLICY)) throw new Error("Trust configuration and project policy must be separate files");
-  return { configFile, policyFile: env.CODEX_BRIDGE_PROJECT_POLICY, home };
+  if (!path.isAbsolute(configFile)) throw new Error("Claude configuration directory must be absolute.");
+  if (policyFile && samePath(configFile, policyFile)) throw new Error("Trust configuration and project policy must be separate files.");
+  return { configFile, policyFile, home };
 }
 
 function read(file, maxBytes = MAX_CONFIG_BYTES) {
@@ -58,17 +59,41 @@ function denied(policy, project) {
     || (d.repository && project.repo && samePath(d.repository.path, project.repo.common.path)));
 }
 
-function load(cwd, options) {
-  const files = onboardingPaths(options.env);
+function loadPolicy(file, project, options, tolerant) {
+  const unavailable = problem => ({ policyRaw: null, policy: { version: 1, grants: [], denies: [] }, denials: [], authorized: false, policyProblem: problem });
+  if (!file) return unavailable({ status: "policy_not_configured", detail: "CODEX_BRIDGE_PROJECT_POLICY is not set to an absolute file in this bridge process." });
+  try {
+    const policyRaw = read(file, 256 * 1024);
+    const policy = policyRaw === null ? { version: 1, grants: [], denies: [] } : parseProjectPolicy(policyRaw).policy;
+    const authorized = policyRaw !== null && createProjectScope(file, options).allows(project.directory.path);
+    return { policyRaw, policy, denials: denied(policy, project), authorized, policyProblem: null };
+  } catch (error) {
+    if (!tolerant) throw error;
+    return unavailable({ status: "policy_invalid", detail: error.message });
+  }
+}
+
+function load(cwd, options, { inspect = false } = {}) {
+  const files = onboardingPaths(options.env, { requirePolicy: !inspect });
   const project = target(cwd, { ...options, home: files.home });
   const configRaw = read(files.configFile);
   const config = parse(configRaw);
   const trust = trustEntry(config, project);
-  const policyRaw = read(files.policyFile, 256 * 1024);
-  const policy = policyRaw === null ? { version: 1, grants: [], denies: [] } : parseProjectPolicy(policyRaw).policy;
-  const denials = denied(policy, project);
-  const authorized = policyRaw !== null && createProjectScope(files.policyFile, options).allows(project.directory.path);
-  return { files, project, configRaw, config, trust, policyRaw, policy, denials, authorized };
+  return { files, project, configRaw, config, trust, policyRegistration: options.policyRegistration, ...loadPolicy(files.policyFile, project, options, inspect) };
+}
+
+const POLICY_REGISTRATION = {
+  "claude-code": file => `register that file with codex-bridge-code-install --policy "${file}" (review the plan, then add --apply --clients-stopped), and reconnect this MCP server`,
+  codex: file => `register that file by running claude-mcp-bridge-install with CODEX_BRIDGE_PROJECT_POLICY="${file}" set, then restart Codex Desktop once so this MCP server loads it`,
+};
+
+function policyActions(state) {
+  if (!state.policyProblem) return [{ tool: "prepare_bridge_project", cwd: state.project.directory.path }];
+  const suggestedFile = path.join(state.files.home, ".config", "GptClaudeBridge", "projects.json");
+  if (state.policyProblem.status === "policy_invalid") return [{ setting: "CODEX_BRIDGE_PROJECT_POLICY", file: state.files.policyFile, then: "Repair or restore this policy file from a backup; prepare_bridge_project does not overwrite an unreadable policy. Run inspect_bridge_project again afterwards." }];
+  const registration = POLICY_REGISTRATION[state.policyRegistration ?? "claude-code"];
+  if (!registration) throw new Error(`Unknown project policy registration: ${state.policyRegistration}`);
+  return [{ setting: "CODEX_BRIDGE_PROJECT_POLICY", suggestedFile, then: `Run bridge-projects prepare "${state.project.directory.path}" --file "${suggestedFile}", ${registration(suggestedFile)}. prepare_bridge_project is available once the setting is loaded.` }];
 }
 
 function report(state, taskCards, extra = {}) {
@@ -77,11 +102,13 @@ function report(state, taskCards, extra = {}) {
     status: configured ? "configured" : "needs_setup",
     project: { cwd: state.project.directory.path, root: state.project.root.path, kind: state.project.repo ? "git" : "directory", repository: state.project.repo?.common.path ?? null },
     workspaceTrust: { status: state.trust.trusted ? "configured" : "missing", file: state.files.configFile, key: state.trust.key },
-    communicationAuthorization: { status: state.authorized ? "authorized" : state.denials.length ? "revoked" : "missing", file: state.files.policyFile },
+    communicationAuthorization: state.policyProblem
+      ? { ...state.policyProblem, file: state.files.policyFile }
+      : { status: state.authorized ? "authorized" : state.denials.length ? "revoked" : "missing", file: state.files.policyFile },
     connection: { status: "not_tested", ready: null, detail: "Saved configuration does not prove a live sender, target, tool permission or successful round trip." },
     taskCards: { status: taskCards ? "requires_extension_check" : "not_requested", detail: "The card extension owns its authorization and connection; this tool does not edit its settings or restart it." },
     nextActions: [
-      ...(!configured ? [{ tool: "prepare_bridge_project", cwd: state.project.directory.path }] : []),
+      ...(!configured ? policyActions(state) : []),
       ...(taskCards ? [{ component: "Local Card Bridge Desktop", tool: "list_projects", cwd: state.project.root.path, then: "If absent, use authorize_project for this exact project under the user's onboarding request; verify desktop_bridge_info after saving. Stop on any denial or disconnected extension." }] : []),
       { tools: ["claude_bridge_status", "codex_bridge_status"], then: "Check in the actual calling sessions, then perform one authorized round trip in each direction. Do not create a new conversation without user authorization." },
     ],
@@ -90,7 +117,7 @@ function report(state, taskCards, extra = {}) {
 }
 
 export function inspectBridgeProject({ cwd, taskCards = false }, options = {}) {
-  return report(load(cwd, options), taskCards);
+  return report(load(cwd, options, { inspect: true }), taskCards);
 }
 
 // Two small configuration files, not a fake 'connected' flag. Preserve full backups,