@chibitek/chibi 0.1.154 → 0.1.155

package/dist-server/index.js

@@ -27615,7 +27615,8 @@ function gateServer(input) {
       OMB_GATE_UPSTREAM: JSON.stringify({ command: spec.command, args: spec.args ?? [], env: spec.env ?? {} }),
       OMB_GATE_SPILL_DIR: spillDir(input.threadId),
       OMB_GATE_BUDGET: String(budget),
-      OMB_GATE_AUTH_DIR: mcpAuthSignalDir()
+      OMB_GATE_AUTH_DIR: mcpAuthSignalDir(),
+      OMB_GATE_THREAD: input.threadId
     }
   };
 }
@@ -52466,12 +52467,13 @@ var McpHealthStore = class {
    * once. */
   noteFailed(name2, spec, kind, at2 = this.now()) {
     const entry = this.entry(name2, spec);
-    if (entry && at2 < entry.retryAt) return;
+    if (entry && at2 < entry.retryAt) return false;
     const failures = (entry?.failures ?? 0) + 1;
     const wait2 = MCP_FAILURE_BACKOFF_MS[Math.min(failures, MCP_FAILURE_BACKOFF_MS.length) - 1];
     const retryAt = at2 + wait2;
     this.servers.set(name2, { fingerprint: mcpServerFingerprint(spec), kind, failures, lastFailureAt: at2, retryAt });
     this.log(`[mcp] "${name2}" ${kind === "crashed" ? "stopped during a turn" : "would not start"}; turns run without it until ${formatTime(retryAt)}`);
+    return true;
   }
   /** The server answered: whatever was wrong is over. An answer from a start
    * that began before a later failure does not clear that failure. */
@@ -52489,15 +52491,24 @@ var McpHealthStore = class {
     const when = this.now() >= entry.retryAt ? "Atomic tries it again on the next turn." : `Atomic tries it again at ${formatTime(entry.retryAt)}.`;
     return `This server ${what}, so bots are working without it for now. ${when} Check its command and settings if this keeps happening.`;
   }
+  /** Why a server is left out of turns right now, or undefined when it mounts. */
+  unavailableKind(name2, spec) {
+    const entry = this.entry(name2, spec);
+    return entry && this.now() < entry.retryAt ? entry.kind : void 0;
+  }
   /** Apply what gates and the chat runtime reported, in order. `specs` are
-   * the servers as configured now; a signal for a removed server is dropped. */
+   * the servers as configured now; a signal for a removed server is dropped.
+   * Returns the signals that recorded a new failure (a repeat inside the
+   * backoff window is not one), so the harness can raise one incident each. */
   ingest(signals, specs) {
+    const fresh = [];
     for (const signal of signals) {
       const spec = specs[signal.name];
       if (!spec) continue;
       if (signal.kind === "ok") this.noteOk(signal.name, signal.at);
-      else if (signal.kind === "start-failed" || signal.kind === "crashed") this.noteFailed(signal.name, spec, signal.kind, signal.at);
+      else if ((signal.kind === "start-failed" || signal.kind === "crashed") && this.noteFailed(signal.name, spec, signal.kind, signal.at)) fresh.push(signal);
     }
+    return fresh;
   }
 };
 
@@ -52532,7 +52543,12 @@ function drainMcpAuthSignals(dir) {
     try {
       const parsed = JSON.parse(readFileSync27(file2, "utf8"));
       if (typeof parsed.name === "string" && MCP_SIGNAL_KINDS.includes(parsed.kind) && typeof parsed.at === "number" && Number.isFinite(parsed.at)) {
-        signals.push({ name: parsed.name, kind: parsed.kind, at: parsed.at });
+        signals.push({
+          name: parsed.name,
+          kind: parsed.kind,
+          at: parsed.at,
+          ...typeof parsed.threadId === "string" && parsed.threadId ? { threadId: parsed.threadId } : {}
+        });
       }
     } catch {
     }
@@ -52541,6 +52557,34 @@ function drainMcpAuthSignals(dir) {
   return signals.sort((a, b3) => a.at - b3.at);
 }
 
+// server/mcp-turn.ts
+function mcpTurnPolicy(deps) {
+  return {
+    /** Fold in what gates and the chat runtime reported since the last look. */
+    sync() {
+      const signals = drainMcpAuthSignals(deps.signalDir());
+      if (!signals.length) return;
+      const specs = deps.specs();
+      deps.auth.ingest(signals, specs);
+      for (const signal of deps.health.ingest(signals, specs)) {
+        if (signal.threadId) deps.reportUnavailable(signal.threadId, `the "${signal.name}" MCP server ${signal.kind === "crashed" ? "stopped during the turn" : "would not start"}; the turn ran on without its tools`);
+      }
+    },
+    /** The servers one turn starts: `servers` minus any whose sign-in is
+     * backing off or stopped, or that lately would not start or crashed. */
+    mountable(servers) {
+      return Object.fromEntries(Object.entries(servers).filter(([name2, spec]) => deps.auth.mountable(name2, spec) && deps.health.mountable(name2, spec)));
+    },
+    /** The ones left out for being broken, so the model is told in one line. */
+    unavailable(servers) {
+      return Object.entries(servers).flatMap(([name2, spec]) => {
+        const kind = deps.health.unavailableKind(name2, spec);
+        return kind ? [{ name: name2, kind }] : [];
+      });
+    }
+  };
+}
+
 // server/mcp-import-detect.ts
 import { createHash as createHash12 } from "node:crypto";
 import { readFileSync as readFileSync28 } from "node:fs";
@@ -63052,17 +63096,11 @@ function managedCodexArgs(config2) {
 }
 var QUESTION_TIMEOUT_NOTE2 = "No answer was given \u2014 use your best judgment.";
 var DENY_TIMEOUT_NOTE2 = "Atomic: nobody answered this permission request in time. Skip this action and finish what you can without it.";
-var skippedSseServers = /* @__PURE__ */ new Set();
-var renamedMcpServers = /* @__PURE__ */ new Set();
-function noteRenamedMcpServer(name2, mountName) {
-  if (renamedMcpServers.has(name2)) return;
-  renamedMcpServers.add(name2);
-  console.error(`codex: MCP server ${JSON.stringify(name2)} is also declared in Codex's own config.toml \u2014 mounted as ${JSON.stringify(mountName)} for this bot so the two do not merge`);
-}
-function noteSkippedSseServer(name2) {
-  if (skippedSseServers.has(name2)) return;
-  skippedSseServers.add(name2);
-  console.error(`codex: MCP server ${JSON.stringify(name2)} uses the SSE transport, which codex does not speak \u2014 it is available to Claude bots only`);
+var notedMcpServers = /* @__PURE__ */ new Set();
+function noteMcpServerOnce(key4, line2) {
+  if (notedMcpServers.has(key4)) return;
+  notedMcpServers.add(key4);
+  console.error(`codex: MCP server ${line2}`);
 }
 function tomlInlineTable(entries2) {
   return `{ ${Object.entries(entries2).map(([key4, value]) => `${JSON.stringify(key4)} = ${JSON.stringify(value)}`).join(", ")} }`;
@@ -63420,12 +63458,11 @@ var CodexDriver = {
       const stopSignal = new AbortController();
       const { threadId } = turn;
       const approvalMode = turn.approvalMode ?? (config2.fullAuto ? "full" : "ask");
+      const customServers = {};
       for (const [name2, server2] of Object.entries(turn.integrations?.custom ?? {})) {
-        if ("url" in server2) continue;
-        const reserved = Object.entries(server2.env).find(([key4, value]) => isHarnessOwnedMcpEnvName(key4) && !(key4 === "ELECTRON_RUN_AS_NODE" && value === "1"))?.[0];
-        if (reserved) {
-          throw new Error(`Custom MCP server \u201C${name2}\u201D cannot set reserved environment variable \u201C${reserved}\u201D`);
-        }
+        const reserved = "url" in server2 ? void 0 : Object.entries(server2.env).find(([key4, value]) => isHarnessOwnedMcpEnvName(key4) && !(key4 === "ELECTRON_RUN_AS_NODE" && value === "1"))?.[0];
+        if (reserved) noteMcpServerOnce(`reserved:${name2}`, `${JSON.stringify(name2)} sets reserved environment variable ${JSON.stringify(reserved)} \u2014 left out of this bot's turns until its settings change`);
+        else customServers[name2] = server2;
       }
       let autoAcceptPermissions = approvalMode === "full";
       if (active.has(threadId)) throw new Error("a turn is already running on this thread");
@@ -63451,7 +63488,7 @@ var CodexDriver = {
           mountMcpServer(appServerArgs, env, "browser", turn.integrations.browser);
         }
         const childCwd = turn.cwd ?? homedir17();
-        for (const server2 of Object.values(turn.integrations?.custom ?? {})) {
+        for (const server2 of Object.values(customServers)) {
           if (!("url" in server2)) Object.assign(env, server2.env);
         }
         if (turn.integrations?.phone) Object.assign(env, turn.integrations.phone.env);
@@ -63462,13 +63499,13 @@ var CodexDriver = {
           appServerArgs.push(...codexPersonalSetupOffArgs(env, childCwd));
         }
         const customByMountName = /* @__PURE__ */ new Map();
-        for (const [name2, server2] of Object.entries(turn.integrations?.custom ?? {})) {
+        for (const [name2, server2] of Object.entries(customServers)) {
           if ("url" in server2 && server2.type === "sse") {
-            noteSkippedSseServer(name2);
+            noteMcpServerOnce(`sse:${name2}`, `${JSON.stringify(name2)} uses the SSE transport, which codex does not speak \u2014 it is available to Claude bots only`);
             continue;
           }
           const mountName = mountedMcpServerName(name2, declaredInCodexConfig);
-          if (mountName !== name2) noteRenamedMcpServer(name2, mountName);
+          if (mountName !== name2) noteMcpServerOnce(`renamed:${name2}`, `${JSON.stringify(name2)} is also declared in Codex's own config.toml \u2014 mounted as ${JSON.stringify(mountName)} for this bot so the two do not merge`);
           customByMountName.set(mountName, name2);
           mountMcpServer(appServerArgs, env, mountName, server2, false);
         }
@@ -76372,6 +76409,8 @@ function whatHappened(incident) {
       return `${incident.bot.name}'s run ${where} continued on another model because its engine refused the one it was set to${detail}`;
     case "engine-fallback":
       return `${incident.bot.name}'s run ${where} continued on another engine after its selected engine failed${detail}`;
+    case "mcp-unavailable":
+      return `${incident.bot.name}'s run ${where} continued without one of its tool servers${detail}`;
     default:
       return `${incident.bot.name}'s run ${where} failed${detail}`;
   }
@@ -76387,9 +76426,9 @@ function incidentText(incident, count) {
   if (incident.lastRequest) lines.push(`The request there was: "${fold2(incident.lastRequest, 300)}"`);
   if (incident.lastReply) lines.push(`${incident.bot.name} last said: "${fold2(incident.lastReply, 300)}"`);
   if (count.count > 1) lines.push(`This is the ${ordinal(count.count)} incident on that thread within the hour.`);
-  if (incident.kind === "model-fallback" || incident.kind === "engine-fallback") {
+  if (incident.kind === "model-fallback" || incident.kind === "engine-fallback" || incident.kind === "mcp-unavailable") {
     lines.push("The run was not interrupted and needs no retry; do not call retry_thread.");
-    lines.push(incident.kind === "model-fallback" ? "Tell the person in one or two plain sentences that this engine no longer offers that model and that the bot's or the conversation's model setting should be changed, then stop." : "Use the incident detail to correct the failed engine if action is needed, then report what happened in one or two plain sentences and stop.");
+    lines.push(incident.kind === "model-fallback" ? "Tell the person in one or two plain sentences that this engine no longer offers that model and that the bot's or the conversation's model setting should be changed, then stop." : incident.kind === "mcp-unavailable" ? "Tell the person in one or two plain sentences which tool server is not working, that bots carry on without it until it answers again, and that its command and settings in Settings may need a look, then stop." : "Use the incident detail to correct the failed engine if action is needed, then report what happened in one or two plain sentences and stop.");
     return lines.join("\n");
   }
   lines.push(count.mayRetry ? [
@@ -84731,10 +84770,16 @@ function accountsPrompt(emails) {
   const list3 = emails.map((email3) => `"${email3}"`).join(", ");
   return ` You can use the user's ${emails.length === 1 ? "account" : "accounts"} ${list3} through atomic_accounts (mail, calendar and files). Use list_accounts to check granted permissions. Do not use LLM account connectors for Google or Microsoft services. Pass the email as \`account\` when more than one account of that provider is listed. Save messages as drafts and send only when the user asked you to send.`;
 }
-function customMcpPrompt(names3) {
-  if (names3.length === 0) return "";
-  const list3 = names3.map((name2) => `"${name2}"`).join(", ");
-  return ` The user also added ${names3.length === 1 ? "an MCP server" : "MCP servers"} for you: ${list3}. Use their available tools under the engine's normal approval rules.`;
+function customMcpPrompt(names3, unavailable2 = []) {
+  const parts = [];
+  if (names3.length > 0) {
+    const list3 = names3.map((name2) => `"${name2}"`).join(", ");
+    parts.push(` The user also added ${names3.length === 1 ? "an MCP server" : "MCP servers"} for you: ${list3}. Use their available tools under the engine's normal approval rules.`);
+  }
+  for (const server2 of unavailable2) {
+    parts.push(` The "${server2.name}" tool server ${server2.kind === "crashed" ? "stopped working during a recent turn" : "would not start"}, so its tools are left out of this turn; Atomic tries it again later. Carry on without them.`);
+  }
+  return parts.join("");
 }
 var CREDENTIAL_PROMPT = " If a supported API key is missing for the service actually needed, use request_credential to create a secure credential request. Before requesting a computer-provider key, inspect the configured targets with select_computer; an existing self-hosted VPS does not need Box credentials. Do not request a different provider's key merely because a task mentions cloud. A freshly QR-paired mobile app or the desktop app can show the secure entry card. Never claim it opened unless the request succeeded, and never ask the user to paste credentials into chat.";
 var THREADS_PROMPT = " A thread is one conversation with its own history and its own run; a bot can have several running at once, and the person sees them as rows under that bot. Use start_thread to open one on yourself for separate work, or on a teammate to hand them a job that should run on its own. Use list_threads to see how the ones you opened are going. When you mention a thread to the person, write its title as #Title so it links. Do not use a ticket comment, a note, or a room post as a stand-in for a thread.";
@@ -126081,6 +126126,7 @@ bus.subscribe((event) => {
       lastReply.delete(event.threadId);
       const turnError = lastTurnError.get(event.threadId);
       lastTurnError.delete(event.threadId);
+      syncMcpAuthState();
       const lazyClaimAlreadyReported = event.stopReason === "exit_before_result" && turnResourceOwners.get(event.threadId)?.lazyClaimFailureReported === true;
       if (!event.ok && event.stopReason !== "interrupted" && !lazyClaimAlreadyReported && !routines?.runForThread(event.threadId)) {
         const broken = bot ?? (speaker2 ? store.bot(speaker2.botId) : void 0);
@@ -126328,8 +126374,8 @@ function incidentContext(threadId) {
 }
 function reportIncident(input) {
   const { bot, threadId } = input;
-  const quiet = input.kind === "model-fallback" || input.kind === "engine-fallback";
-  if (input.kind !== "routine-failed" && input.kind !== "model-fallback" && input.kind !== "engine-fallback") {
+  const quiet = input.kind === "model-fallback" || input.kind === "engine-fallback" || input.kind === "mcp-unavailable";
+  if (input.kind !== "routine-failed" && input.kind !== "model-fallback" && input.kind !== "engine-fallback" && input.kind !== "mcp-unavailable") {
     primaryBotStore.noteFailure({ botId: bot.id, threadId, kind: input.kind, detail: redactSecretsInText(input.detail).slice(0, 300), at: Date.now() });
   }
   const task2 = store.taskByThread(bot.id, threadId);
@@ -127814,7 +127860,7 @@ async function startTurn(botId, text16, opts) {
         { id: "team-computer", label: "Team computer", text: teamComputerPrompt(teamComputer) },
         { id: "plan", label: "Surface", text: surfacePrompt({ computer: mountedComputer, browser: Boolean(integrations.browser) }, { pinned: plan.pinned, note: plan.note, canSelect: computerSelectionTurns.has(threadId) }) },
         { id: "accounts", label: "Google and Microsoft accounts", text: integrations.accounts ? accountsPrompt(botAccountEmails(bot)) : "" },
-        { id: "mcp", label: "MCP servers", text: customMcpPrompt(Object.keys(integrations.custom ?? {})) },
+        { id: "mcp", label: "MCP servers", text: customMcpPrompt(Object.keys(integrations.custom ?? {}), instance.adapter.capabilities.customMcp === true ? mcpTurn.unavailable(engineMcpServers(bot)) : []) },
         { id: "browser", label: "Browser", text: integrations.browser ? BUILT_IN_BROWSER_SYSTEM_PROMPT : "" },
         { id: "coordination", label: "Team", text: coordinationPrompt ? ` ${coordinationPrompt}` : "" },
         { id: "assignment", label: "Teammate task", text: coordinationNode ? `
@@ -129288,7 +129334,7 @@ ${failover.note}` : ""}`;
       { id: "private-bot", label: "Private Bot", text: isPersonalBot(bot) ? privateBotPrompt(false) : "" },
       { id: "files", label: "File locations", text: workspace ? workspaceLocationsPrompt(bot.id, cwd, readyBot.cwd) : "" },
       { id: "repos", label: "Linked repos", text: repoPlan ? repoPromptSection(repoPlan, repoPlace(void 0, roomTeamComputer || roomComputerKind === "box" ? "box" : roomVmMounted ? "vm" : roomComputerKind), cwd) : "" },
-      { id: "mcp", label: "MCP servers", text: customMcpPrompt(Object.keys(integrations.custom ?? {})) },
+      { id: "mcp", label: "MCP servers", text: customMcpPrompt(Object.keys(integrations.custom ?? {}), instance.adapter.capabilities.customMcp === true ? mcpTurn.unavailable(engineMcpServers(bot)) : []) },
       { id: "computer", label: "Computer", text: computerPrompt(roomTeamComputer || roomComputerKind === "box" ? instance.driverKind === "boxAgent" ? "box-agent" : instance.adapter.capabilities.cloudComputerMcp ? "box-chat" : "box" : roomVmMounted ? localVmMode(cfg) === "per-bot" ? "vm-private" : "vm-shared" : roomComputerKind) },
       { id: "team-computer", label: "Team computer", text: teamComputerPrompt(roomTeamComputer) },
       { id: "plan", label: "Surface", text: surfacePrompt({ computer: roomTeamComputer ? "cloud" : roomVmMounted ? "vm" : surfaceOfComputerKind(roomComputerKind), browser: Boolean(integrations.browser) }, { note: roomPlan.note }) },
@@ -131127,16 +131173,25 @@ function warmMcpToolHints(custom2) {
 }
 var mcpAuthState = new McpAuthStateStore(join124(DATA_DIR, "mcp-auth-state.json"));
 var mcpHealth = new McpHealthStore();
+var mcpTurn = mcpTurnPolicy({
+  auth: mcpAuthState,
+  health: mcpHealth,
+  signalDir: mcpAuthSignalDir,
+  specs: () => customMcpServers(cfg),
+  reportUnavailable: (threadId, detail) => {
+    const bot = store.botByThread(threadId);
+    if (bot) reportIncident({ kind: "mcp-unavailable", bot, threadId, detail });
+  }
+});
 function syncMcpAuthState() {
-  const signals = drainMcpAuthSignals(mcpAuthSignalDir());
-  if (signals.length) for (const state2 of [mcpAuthState, mcpHealth]) state2.ingest(signals, customMcpServers(cfg));
+  mcpTurn.sync();
 }
 function bridgedMcpServer(spec, allowBrowser) {
   return bridgeMcpRemote(spec, { bridge: resolveMcpRemoteBridge(), execPath: process.execPath, allowBrowser });
 }
 function turnMcpServers2(bot) {
   syncMcpAuthState();
-  return Object.fromEntries(Object.entries(engineMcpServers(bot)).filter(([name2, spec]) => mcpAuthState.mountable(name2, spec) && mcpHealth.mountable(name2, spec)));
+  return mcpTurn.mountable(engineMcpServers(bot));
 }
 function engineMcpServers(bot) {
   const requested = bot.mcpServers ?? Object.keys(cfg.mcpServers ?? {});

package/dist-server/mcp-gate.js

@@ -812,9 +812,12 @@ var GATE_ENV_KEYS = [
   "OMB_GATE_UPSTREAM",
   "OMB_GATE_SPILL_HINT",
   "OMB_GATE_AUTH_DIR",
-  "OMB_GATE_START_TIMEOUT_MS"
+  "OMB_GATE_START_TIMEOUT_MS",
+  "OMB_GATE_THREAD"
 ];
 var AUTH_DIR = process.env.OMB_GATE_AUTH_DIR || "";
+var THREAD = process.env.OMB_GATE_THREAD || "";
+var signalHarness = (kind) => writeMcpAuthSignal(AUTH_DIR, { name: NAME, kind, at: Date.now(), ...THREAD ? { threadId: THREAD } : {} });
 function fail(message) {
   process.stderr.write(`mcp-gate(${NAME}): ${message}
 `);
@@ -928,7 +931,7 @@ function goDown(reason, why, signal = true) {
   if (startTimer) clearTimeout(startTimer);
   process.stderr.write(`mcp-gate(${NAME}): ${why}; answering as an empty server so the turn carries on without it
 `);
-  if (signal) writeMcpAuthSignal(AUTH_DIR, { name: NAME, kind: reason, at: Date.now() });
+  if (signal) signalHarness(reason);
   for (const message of inFlight.values()) answer(strandedResponse(NAME, message));
   inFlight.clear();
   pending.clear();
@@ -1002,7 +1005,7 @@ createInterface({ input: child.stdout }).on("line", (line) => {
   if (!reportedOk && id !== void 0 && id === initializeId && message.result !== void 0) {
     reportedOk = true;
     if (startTimer) clearTimeout(startTimer);
-    writeMcpAuthSignal(AUTH_DIR, { name: NAME, kind: "ok", at: Date.now() });
+    signalHarness("ok");
   }
   const tool = id === void 0 ? void 0 : pending.get(id);
   if (id !== void 0) pending.delete(id);
@@ -1029,7 +1032,7 @@ child.on("exit", (code, signal) => {
   if (!reportedOk && exitMeansSignInRequired(code, stderrTail)) {
     process.stderr.write(`mcp-gate(${NAME}): sign-in required; not opening a browser from a background start
 `);
-    writeMcpAuthSignal(AUTH_DIR, { name: NAME, kind: "sign-in-required", at: Date.now() });
+    signalHarness("sign-in-required");
     if (!clientGone) return goDown("start-failed", "needs a sign-in", false);
   }
   if (clientGone) process.exit(code ?? (signal ? 1 : 0));

package/dist-server/openmausbot.js

@@ -26066,7 +26066,8 @@ function gateServer(input) {
       OMB_GATE_UPSTREAM: JSON.stringify({ command: spec.command, args: spec.args ?? [], env: spec.env ?? {} }),
       OMB_GATE_SPILL_DIR: spillDir(input.threadId),
       OMB_GATE_BUDGET: String(budget),
-      OMB_GATE_AUTH_DIR: mcpAuthSignalDir()
+      OMB_GATE_AUTH_DIR: mcpAuthSignalDir(),
+      OMB_GATE_THREAD: input.threadId
     }
   };
 }
@@ -32291,15 +32292,10 @@ function managedCodexArgs(config2) {
     "shell_environment_policy.ignore_default_excludes=false"
   ];
 }
-function noteRenamedMcpServer(name, mountName) {
-  if (renamedMcpServers.has(name)) return;
-  renamedMcpServers.add(name);
-  console.error(`codex: MCP server ${JSON.stringify(name)} is also declared in Codex's own config.toml \u2014 mounted as ${JSON.stringify(mountName)} for this bot so the two do not merge`);
-}
-function noteSkippedSseServer(name) {
-  if (skippedSseServers.has(name)) return;
-  skippedSseServers.add(name);
-  console.error(`codex: MCP server ${JSON.stringify(name)} uses the SSE transport, which codex does not speak \u2014 it is available to Claude bots only`);
+function noteMcpServerOnce(key, line) {
+  if (notedMcpServers.has(key)) return;
+  notedMcpServers.add(key);
+  console.error(`codex: MCP server ${line}`);
 }
 function tomlInlineTable(entries2) {
   return `{ ${Object.entries(entries2).map(([key, value]) => `${JSON.stringify(key)} = ${JSON.stringify(value)}`).join(", ")} }`;
@@ -32558,7 +32554,7 @@ function mountMcpServer(appServerArgs, env, name, server, preApproved = true) {
     appServerArgs.push("-c", `${prefix}.default_tools_approval_mode="auto"`);
   }
 }
-var DRIVER_KIND3, ASTRA_MODEL_ID, ASTRA_MIN_CODEX_VERSION, CodexRpcError, QUESTION_TIMEOUT_NOTE2, DENY_TIMEOUT_NOTE2, skippedSseServers, renamedMcpServers, plainRecord, containsControlCharacter, CodexDriver;
+var DRIVER_KIND3, ASTRA_MODEL_ID, ASTRA_MIN_CODEX_VERSION, CodexRpcError, QUESTION_TIMEOUT_NOTE2, DENY_TIMEOUT_NOTE2, notedMcpServers, plainRecord, containsControlCharacter, CodexDriver;
 var init_codex = __esm({
   "server/drivers/codex.ts"() {
     "use strict";
@@ -32597,8 +32593,7 @@ var init_codex = __esm({
     };
     QUESTION_TIMEOUT_NOTE2 = "No answer was given \u2014 use your best judgment.";
     DENY_TIMEOUT_NOTE2 = "Atomic: nobody answered this permission request in time. Skip this action and finish what you can without it.";
-    skippedSseServers = /* @__PURE__ */ new Set();
-    renamedMcpServers = /* @__PURE__ */ new Set();
+    notedMcpServers = /* @__PURE__ */ new Set();
     plainRecord = (value) => value && typeof value === "object" && !Array.isArray(value) ? value : null;
     containsControlCharacter = (value) => {
       for (const character of value) {
@@ -32698,12 +32693,11 @@ var init_codex = __esm({
           const stopSignal = new AbortController();
           const { threadId } = turn;
           const approvalMode = turn.approvalMode ?? (config2.fullAuto ? "full" : "ask");
+          const customServers = {};
           for (const [name, server] of Object.entries(turn.integrations?.custom ?? {})) {
-            if ("url" in server) continue;
-            const reserved = Object.entries(server.env).find(([key, value]) => isHarnessOwnedMcpEnvName(key) && !(key === "ELECTRON_RUN_AS_NODE" && value === "1"))?.[0];
-            if (reserved) {
-              throw new Error(`Custom MCP server \u201C${name}\u201D cannot set reserved environment variable \u201C${reserved}\u201D`);
-            }
+            const reserved = "url" in server ? void 0 : Object.entries(server.env).find(([key, value]) => isHarnessOwnedMcpEnvName(key) && !(key === "ELECTRON_RUN_AS_NODE" && value === "1"))?.[0];
+            if (reserved) noteMcpServerOnce(`reserved:${name}`, `${JSON.stringify(name)} sets reserved environment variable ${JSON.stringify(reserved)} \u2014 left out of this bot's turns until its settings change`);
+            else customServers[name] = server;
           }
           let autoAcceptPermissions = approvalMode === "full";
           if (active.has(threadId)) throw new Error("a turn is already running on this thread");
@@ -32729,7 +32723,7 @@ var init_codex = __esm({
               mountMcpServer(appServerArgs, env, "browser", turn.integrations.browser);
             }
             const childCwd = turn.cwd ?? homedir15();
-            for (const server of Object.values(turn.integrations?.custom ?? {})) {
+            for (const server of Object.values(customServers)) {
               if (!("url" in server)) Object.assign(env, server.env);
             }
             if (turn.integrations?.phone) Object.assign(env, turn.integrations.phone.env);
@@ -32740,13 +32734,13 @@ var init_codex = __esm({
               appServerArgs.push(...codexPersonalSetupOffArgs(env, childCwd));
             }
             const customByMountName = /* @__PURE__ */ new Map();
-            for (const [name, server] of Object.entries(turn.integrations?.custom ?? {})) {
+            for (const [name, server] of Object.entries(customServers)) {
               if ("url" in server && server.type === "sse") {
-                noteSkippedSseServer(name);
+                noteMcpServerOnce(`sse:${name}`, `${JSON.stringify(name)} uses the SSE transport, which codex does not speak \u2014 it is available to Claude bots only`);
                 continue;
               }
               const mountName = mountedMcpServerName(name, declaredInCodexConfig);
-              if (mountName !== name) noteRenamedMcpServer(name, mountName);
+              if (mountName !== name) noteMcpServerOnce(`renamed:${name}`, `${JSON.stringify(name)} is also declared in Codex's own config.toml \u2014 mounted as ${JSON.stringify(mountName)} for this bot so the two do not merge`);
               customByMountName.set(mountName, name);
               mountMcpServer(appServerArgs, env, mountName, server, false);
             }

package/dist-server/pair-cli.js

@@ -26066,7 +26066,8 @@ function gateServer(input) {
       OMB_GATE_UPSTREAM: JSON.stringify({ command: spec.command, args: spec.args ?? [], env: spec.env ?? {} }),
       OMB_GATE_SPILL_DIR: spillDir(input.threadId),
       OMB_GATE_BUDGET: String(budget),
-      OMB_GATE_AUTH_DIR: mcpAuthSignalDir()
+      OMB_GATE_AUTH_DIR: mcpAuthSignalDir(),
+      OMB_GATE_THREAD: input.threadId
     }
   };
 }
@@ -32291,15 +32292,10 @@ function managedCodexArgs(config2) {
     "shell_environment_policy.ignore_default_excludes=false"
   ];
 }
-function noteRenamedMcpServer(name, mountName) {
-  if (renamedMcpServers.has(name)) return;
-  renamedMcpServers.add(name);
-  console.error(`codex: MCP server ${JSON.stringify(name)} is also declared in Codex's own config.toml \u2014 mounted as ${JSON.stringify(mountName)} for this bot so the two do not merge`);
-}
-function noteSkippedSseServer(name) {
-  if (skippedSseServers.has(name)) return;
-  skippedSseServers.add(name);
-  console.error(`codex: MCP server ${JSON.stringify(name)} uses the SSE transport, which codex does not speak \u2014 it is available to Claude bots only`);
+function noteMcpServerOnce(key, line) {
+  if (notedMcpServers.has(key)) return;
+  notedMcpServers.add(key);
+  console.error(`codex: MCP server ${line}`);
 }
 function tomlInlineTable(entries2) {
   return `{ ${Object.entries(entries2).map(([key, value]) => `${JSON.stringify(key)} = ${JSON.stringify(value)}`).join(", ")} }`;
@@ -32558,7 +32554,7 @@ function mountMcpServer(appServerArgs, env, name, server, preApproved = true) {
     appServerArgs.push("-c", `${prefix}.default_tools_approval_mode="auto"`);
   }
 }
-var DRIVER_KIND3, ASTRA_MODEL_ID, ASTRA_MIN_CODEX_VERSION, CodexRpcError, QUESTION_TIMEOUT_NOTE2, DENY_TIMEOUT_NOTE2, skippedSseServers, renamedMcpServers, plainRecord, containsControlCharacter, CodexDriver;
+var DRIVER_KIND3, ASTRA_MODEL_ID, ASTRA_MIN_CODEX_VERSION, CodexRpcError, QUESTION_TIMEOUT_NOTE2, DENY_TIMEOUT_NOTE2, notedMcpServers, plainRecord, containsControlCharacter, CodexDriver;
 var init_codex = __esm({
   "server/drivers/codex.ts"() {
     "use strict";
@@ -32597,8 +32593,7 @@ var init_codex = __esm({
     };
     QUESTION_TIMEOUT_NOTE2 = "No answer was given \u2014 use your best judgment.";
     DENY_TIMEOUT_NOTE2 = "Atomic: nobody answered this permission request in time. Skip this action and finish what you can without it.";
-    skippedSseServers = /* @__PURE__ */ new Set();
-    renamedMcpServers = /* @__PURE__ */ new Set();
+    notedMcpServers = /* @__PURE__ */ new Set();
     plainRecord = (value) => value && typeof value === "object" && !Array.isArray(value) ? value : null;
     containsControlCharacter = (value) => {
       for (const character of value) {
@@ -32698,12 +32693,11 @@ var init_codex = __esm({
           const stopSignal = new AbortController();
           const { threadId } = turn;
           const approvalMode = turn.approvalMode ?? (config2.fullAuto ? "full" : "ask");
+          const customServers = {};
           for (const [name, server] of Object.entries(turn.integrations?.custom ?? {})) {
-            if ("url" in server) continue;
-            const reserved = Object.entries(server.env).find(([key, value]) => isHarnessOwnedMcpEnvName(key) && !(key === "ELECTRON_RUN_AS_NODE" && value === "1"))?.[0];
-            if (reserved) {
-              throw new Error(`Custom MCP server \u201C${name}\u201D cannot set reserved environment variable \u201C${reserved}\u201D`);
-            }
+            const reserved = "url" in server ? void 0 : Object.entries(server.env).find(([key, value]) => isHarnessOwnedMcpEnvName(key) && !(key === "ELECTRON_RUN_AS_NODE" && value === "1"))?.[0];
+            if (reserved) noteMcpServerOnce(`reserved:${name}`, `${JSON.stringify(name)} sets reserved environment variable ${JSON.stringify(reserved)} \u2014 left out of this bot's turns until its settings change`);
+            else customServers[name] = server;
           }
           let autoAcceptPermissions = approvalMode === "full";
           if (active.has(threadId)) throw new Error("a turn is already running on this thread");
@@ -32729,7 +32723,7 @@ var init_codex = __esm({
               mountMcpServer(appServerArgs, env, "browser", turn.integrations.browser);
             }
             const childCwd = turn.cwd ?? homedir15();
-            for (const server of Object.values(turn.integrations?.custom ?? {})) {
+            for (const server of Object.values(customServers)) {
               if (!("url" in server)) Object.assign(env, server.env);
             }
             if (turn.integrations?.phone) Object.assign(env, turn.integrations.phone.env);
@@ -32740,13 +32734,13 @@ var init_codex = __esm({
               appServerArgs.push(...codexPersonalSetupOffArgs(env, childCwd));
             }
             const customByMountName = /* @__PURE__ */ new Map();
-            for (const [name, server] of Object.entries(turn.integrations?.custom ?? {})) {
+            for (const [name, server] of Object.entries(customServers)) {
               if ("url" in server && server.type === "sse") {
-                noteSkippedSseServer(name);
+                noteMcpServerOnce(`sse:${name}`, `${JSON.stringify(name)} uses the SSE transport, which codex does not speak \u2014 it is available to Claude bots only`);
                 continue;
               }
               const mountName = mountedMcpServerName(name, declaredInCodexConfig);
-              if (mountName !== name) noteRenamedMcpServer(name, mountName);
+              if (mountName !== name) noteMcpServerOnce(`renamed:${name}`, `${JSON.stringify(name)} is also declared in Codex's own config.toml \u2014 mounted as ${JSON.stringify(mountName)} for this bot so the two do not merge`);
               customByMountName.set(mountName, name);
               mountMcpServer(appServerArgs, env, mountName, server, false);
             }