@autohq/cli 0.1.259 → 0.1.260

package/dist/agent-bridge.js

@@ -21270,11 +21270,11 @@ var SocketWithoutUpgrade = class _SocketWithoutUpgrade extends Emitter {
    */
   _resetPingTimeout() {
     this.clearTimeoutFn(this._pingTimeoutTimer);
-    const delay = this._pingInterval + this._pingTimeout;
-    this._pingTimeoutTime = Date.now() + delay;
+    const delay2 = this._pingInterval + this._pingTimeout;
+    this._pingTimeoutTime = Date.now() + delay2;
     this._pingTimeoutTimer = this.setTimeoutFn(() => {
       this._onClose("ping timeout");
-    }, delay);
+    }, delay2);
     if (this.opts.autoUnref) {
       this._pingTimeoutTimer.unref();
     }
@@ -23255,8 +23255,8 @@ var Manager = class extends Emitter {
       this.emitReserved("reconnect_failed");
       this._reconnecting = false;
     } else {
-      const delay = this.backoff.duration();
-      debug10("will wait %dms before reconnect attempt", delay);
+      const delay2 = this.backoff.duration();
+      debug10("will wait %dms before reconnect attempt", delay2);
       this._reconnecting = true;
       const timer = this.setTimeoutFn(() => {
         if (self2.skipReconnect)
@@ -23276,7 +23276,7 @@ var Manager = class extends Emitter {
             self2.onreconnect();
           }
         });
-      }, delay);
+      }, delay2);
       if (this.opts.autoUnref) {
         timer.unref();
       }
@@ -23340,7 +23340,7 @@ Object.assign(lookup, {
 // package.json
 var package_default = {
   name: "@autohq/cli",
-  version: "0.1.259",
+  version: "0.1.260",
   license: "SEE LICENSE IN README.md",
   publishConfig: {
     access: "public"
@@ -48192,6 +48192,8 @@ function withClaudeStderrDiagnosticsPointer(error51, capturedStderr) {
 // src/commands/agent-bridge/harness/claude-code/session.ts
 var CLAUDE_AGENT_STARTUP_TIMEOUT_MS = 3e4;
 var CLAUDE_INTERRUPT_SETTLE_TIMEOUT_MS = 1e4;
+var CLAUDE_MCP_REGISTRATION_TIMEOUT_MS = 3e3;
+var CLAUDE_MCP_REGISTRATION_POLL_INTERVAL_MS = 100;
 var CLAUDE_STARTUP_PROFILE_HOOK_EVENTS = [
   "Setup",
   "SessionStart",
@@ -48239,6 +48241,12 @@ var ClaudeAgentBridgeSessionImpl = class {
   // message lands only once the interrupted turn has settled its tool_use.
   turnResultCount = 0;
   turnSettlementWaiters = /* @__PURE__ */ new Set();
+  // Memoized MCP-registration gate, keyed by the attached query. A runtime
+  // restart warms a brand-new session + query, so keying off the query object
+  // (rather than a session-lifetime flag) re-arms the gate on every restart:
+  // each fresh warm gates its own first turn, while later turns on the same
+  // query share the resolved promise and never re-poll.
+  mcpRegistrationGate = null;
   constructor(input) {
     const optionsStartedAt = Date.now();
     this.input = input;
@@ -48301,6 +48309,7 @@ var ClaudeAgentBridgeSessionImpl = class {
       return;
     }
     await this.interruptActiveTurnBeforeMessage();
+    await this.awaitMcpRegistration();
     this.enqueueUserMessage(message);
     this.input.runtimeLogger?.info("agent_bridge_claude_send_message_queued", {
       delivery_mode: mode,
@@ -48588,6 +48597,86 @@ var ClaudeAgentBridgeSessionImpl = class {
       }
     }
   }
+  // Why this gate is correct without a provider-backed test (it relies on real
+  // SDK mcpServerStatus() timing that fakes cannot prove):
+  // - Safe-degrade: pollMcpRegistration never rejects — on timeout, a
+  //   status-read failure, or a closed session it resolves, so the worst case
+  //   is today's immediate injection. The gate can never regress below the
+  //   status-quo race; it can only close it.
+  // - Provider-path validation is deferred deliberately: the failure is the
+  //   intermittent live-prod race on the chief-of-staff singleton (a real
+  //   runtime restart dispatching turn-1 while real mcp__* servers reconnect),
+  //   which cannot be reproduced deterministically without live credentials
+  //   and a forced restart racing reconnect.
+  // - Live confirmation comes from the agent_bridge_claude_mcp_gate_started/
+  //   _ready/_timeout diagnostics on the next real restart, not a CI fake.
+  //
+  // Block until the freshly-warmed query's MCP servers have left `pending`, so
+  // the first turn's prompt is built with the mcp__* tools registered. Memoized
+  // per query: the first send pays the wait, concurrent first sends share it,
+  // and a later turn on the same query returns immediately. Sessions without
+  // configured MCP servers, or whose query failed to attach, skip the gate and
+  // fall through to the existing enqueue/error path unchanged.
+  async awaitMcpRegistration() {
+    if (Object.keys(this.options.mcpServers ?? {}).length === 0) {
+      return;
+    }
+    let query;
+    try {
+      query = await this.ensureRunningQuery();
+    } catch {
+      return;
+    }
+    if (this.mcpRegistrationGate?.query !== query) {
+      this.mcpRegistrationGate = {
+        query,
+        promise: this.pollMcpRegistration(query)
+      };
+    }
+    await this.mcpRegistrationGate.promise;
+  }
+  // Poll the live query's MCP server status until no configured server is still
+  // `pending`, bounded by CLAUDE_MCP_REGISTRATION_TIMEOUT_MS. Terminal states
+  // (connected/failed/needs-auth/disabled) all count as settled, so a server
+  // that cannot connect in this runtime (e.g. an interactively-authed server in
+  // a headless sandbox) never holds the gate to the timeout. Never rejects:
+  // status-read failure, timeout, or a closed session all resolve so the caller
+  // degrades to immediate injection.
+  async pollMcpRegistration(query) {
+    const configuredNames = Object.keys(this.options.mcpServers ?? {});
+    const startedAt = Date.now();
+    const deadline = startedAt + CLAUDE_MCP_REGISTRATION_TIMEOUT_MS;
+    this.input.writeOutput?.(
+      `agent_bridge_claude_mcp_gate_started servers=${configuredNames.length}`
+    );
+    while (true) {
+      if (this.state.kind === "closed") {
+        return;
+      }
+      let statuses;
+      try {
+        statuses = await query.mcpServerStatus();
+      } catch (error51) {
+        this.input.writeOutput?.(
+          `agent_bridge_claude_mcp_gate_status_failed duration_ms=${Date.now() - startedAt} error=${error51 instanceof Error ? error51.message : String(error51)}`
+        );
+        return;
+      }
+      if (mcpServersSettled(statuses, configuredNames)) {
+        this.input.writeOutput?.(
+          `agent_bridge_claude_mcp_gate_ready duration_ms=${Date.now() - startedAt} servers=${mcpStatusList(statuses)}`
+        );
+        return;
+      }
+      if (Date.now() >= deadline) {
+        this.input.writeOutput?.(
+          `agent_bridge_claude_mcp_gate_timeout duration_ms=${Date.now() - startedAt} servers=${mcpStatusList(statuses)}`
+        );
+        return;
+      }
+      await delay(CLAUDE_MCP_REGISTRATION_POLL_INTERVAL_MS);
+    }
+  }
   messageProbeContext() {
     return {
       configuredMcpServerNames: Object.keys(this.options.mcpServers ?? {}),
@@ -48717,6 +48806,24 @@ var AsyncMessageQueue = class {
     });
   }
 };
+function mcpServersSettled(statuses, configuredNames) {
+  const statusByName = new Map(
+    statuses.map((server) => [server.name, server.status])
+  );
+  return configuredNames.every((name) => {
+    const status = statusByName.get(name);
+    return status !== void 0 && status !== "pending";
+  });
+}
+function mcpStatusList(statuses) {
+  return statuses.map((server) => `${server.name}:${server.status}`).join(",");
+}
+function delay(ms) {
+  return new Promise((resolve) => {
+    const timer = setTimeout(resolve, ms);
+    timer.unref?.();
+  });
+}
 function claudeAgentUserMessage(message) {
   return {
     type: "user",

package/dist/index.js

@@ -22782,7 +22782,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@autohq/cli",
-      version: "0.1.259",
+      version: "0.1.260",
       license: "SEE LICENSE IN README.md",
       publishConfig: {
         access: "public"
@@ -33655,6 +33655,8 @@ function withClaudeStderrDiagnosticsPointer(error51, capturedStderr) {
 // src/commands/agent-bridge/harness/claude-code/session.ts
 var CLAUDE_AGENT_STARTUP_TIMEOUT_MS = 3e4;
 var CLAUDE_INTERRUPT_SETTLE_TIMEOUT_MS = 1e4;
+var CLAUDE_MCP_REGISTRATION_TIMEOUT_MS = 3e3;
+var CLAUDE_MCP_REGISTRATION_POLL_INTERVAL_MS = 100;
 var CLAUDE_STARTUP_PROFILE_HOOK_EVENTS = [
   "Setup",
   "SessionStart",
@@ -33702,6 +33704,12 @@ var ClaudeAgentBridgeSessionImpl = class {
   // message lands only once the interrupted turn has settled its tool_use.
   turnResultCount = 0;
   turnSettlementWaiters = /* @__PURE__ */ new Set();
+  // Memoized MCP-registration gate, keyed by the attached query. A runtime
+  // restart warms a brand-new session + query, so keying off the query object
+  // (rather than a session-lifetime flag) re-arms the gate on every restart:
+  // each fresh warm gates its own first turn, while later turns on the same
+  // query share the resolved promise and never re-poll.
+  mcpRegistrationGate = null;
   constructor(input) {
     const optionsStartedAt = Date.now();
     this.input = input;
@@ -33764,6 +33772,7 @@ var ClaudeAgentBridgeSessionImpl = class {
       return;
     }
     await this.interruptActiveTurnBeforeMessage();
+    await this.awaitMcpRegistration();
     this.enqueueUserMessage(message);
     this.input.runtimeLogger?.info("agent_bridge_claude_send_message_queued", {
       delivery_mode: mode,
@@ -34051,6 +34060,86 @@ var ClaudeAgentBridgeSessionImpl = class {
       }
     }
   }
+  // Why this gate is correct without a provider-backed test (it relies on real
+  // SDK mcpServerStatus() timing that fakes cannot prove):
+  // - Safe-degrade: pollMcpRegistration never rejects — on timeout, a
+  //   status-read failure, or a closed session it resolves, so the worst case
+  //   is today's immediate injection. The gate can never regress below the
+  //   status-quo race; it can only close it.
+  // - Provider-path validation is deferred deliberately: the failure is the
+  //   intermittent live-prod race on the chief-of-staff singleton (a real
+  //   runtime restart dispatching turn-1 while real mcp__* servers reconnect),
+  //   which cannot be reproduced deterministically without live credentials
+  //   and a forced restart racing reconnect.
+  // - Live confirmation comes from the agent_bridge_claude_mcp_gate_started/
+  //   _ready/_timeout diagnostics on the next real restart, not a CI fake.
+  //
+  // Block until the freshly-warmed query's MCP servers have left `pending`, so
+  // the first turn's prompt is built with the mcp__* tools registered. Memoized
+  // per query: the first send pays the wait, concurrent first sends share it,
+  // and a later turn on the same query returns immediately. Sessions without
+  // configured MCP servers, or whose query failed to attach, skip the gate and
+  // fall through to the existing enqueue/error path unchanged.
+  async awaitMcpRegistration() {
+    if (Object.keys(this.options.mcpServers ?? {}).length === 0) {
+      return;
+    }
+    let query;
+    try {
+      query = await this.ensureRunningQuery();
+    } catch {
+      return;
+    }
+    if (this.mcpRegistrationGate?.query !== query) {
+      this.mcpRegistrationGate = {
+        query,
+        promise: this.pollMcpRegistration(query)
+      };
+    }
+    await this.mcpRegistrationGate.promise;
+  }
+  // Poll the live query's MCP server status until no configured server is still
+  // `pending`, bounded by CLAUDE_MCP_REGISTRATION_TIMEOUT_MS. Terminal states
+  // (connected/failed/needs-auth/disabled) all count as settled, so a server
+  // that cannot connect in this runtime (e.g. an interactively-authed server in
+  // a headless sandbox) never holds the gate to the timeout. Never rejects:
+  // status-read failure, timeout, or a closed session all resolve so the caller
+  // degrades to immediate injection.
+  async pollMcpRegistration(query) {
+    const configuredNames = Object.keys(this.options.mcpServers ?? {});
+    const startedAt = Date.now();
+    const deadline = startedAt + CLAUDE_MCP_REGISTRATION_TIMEOUT_MS;
+    this.input.writeOutput?.(
+      `agent_bridge_claude_mcp_gate_started servers=${configuredNames.length}`
+    );
+    while (true) {
+      if (this.state.kind === "closed") {
+        return;
+      }
+      let statuses;
+      try {
+        statuses = await query.mcpServerStatus();
+      } catch (error51) {
+        this.input.writeOutput?.(
+          `agent_bridge_claude_mcp_gate_status_failed duration_ms=${Date.now() - startedAt} error=${error51 instanceof Error ? error51.message : String(error51)}`
+        );
+        return;
+      }
+      if (mcpServersSettled(statuses, configuredNames)) {
+        this.input.writeOutput?.(
+          `agent_bridge_claude_mcp_gate_ready duration_ms=${Date.now() - startedAt} servers=${mcpStatusList(statuses)}`
+        );
+        return;
+      }
+      if (Date.now() >= deadline) {
+        this.input.writeOutput?.(
+          `agent_bridge_claude_mcp_gate_timeout duration_ms=${Date.now() - startedAt} servers=${mcpStatusList(statuses)}`
+        );
+        return;
+      }
+      await delay(CLAUDE_MCP_REGISTRATION_POLL_INTERVAL_MS);
+    }
+  }
   messageProbeContext() {
     return {
       configuredMcpServerNames: Object.keys(this.options.mcpServers ?? {}),
@@ -34180,6 +34269,24 @@ var AsyncMessageQueue = class {
     });
   }
 };
+function mcpServersSettled(statuses, configuredNames) {
+  const statusByName = new Map(
+    statuses.map((server) => [server.name, server.status])
+  );
+  return configuredNames.every((name) => {
+    const status = statusByName.get(name);
+    return status !== void 0 && status !== "pending";
+  });
+}
+function mcpStatusList(statuses) {
+  return statuses.map((server) => `${server.name}:${server.status}`).join(",");
+}
+function delay(ms) {
+  return new Promise((resolve4) => {
+    const timer = setTimeout(resolve4, ms);
+    timer.unref?.();
+  });
+}
 function claudeAgentUserMessage(message) {
   return {
     type: "user",
@@ -37819,7 +37926,7 @@ function selectLastLines(content, count) {
 async function followRuntimeLog(input) {
   let offset = input.fromByte;
   while (!input.signal?.aborted) {
-    await delay(input.pollIntervalMs, input.signal);
+    await delay2(input.pollIntervalMs, input.signal);
     if (input.signal?.aborted) {
       return;
     }
@@ -37854,7 +37961,7 @@ function readByteRange(path2, offset, length) {
   }
   return buffer.toString("utf8");
 }
-function delay(ms, signal) {
+function delay2(ms, signal) {
   return new Promise((resolve4) => {
     const timer = setTimeout(resolve4, ms);
     signal?.addEventListener(
@@ -38800,10 +38907,10 @@ async function runConsole(input) {
         input.writeOutput(
           `stream interrupted: ${error51 instanceof Error ? error51.message : String(error51)}`
         );
-        await delay2(1e3, abort.signal);
+        await delay3(1e3, abort.signal);
         continue;
       }
-      await delay2(250, abort.signal);
+      await delay3(250, abort.signal);
     }
   })();
   const consoleInput = createInteractiveInputController({
@@ -38883,7 +38990,7 @@ function createInteractiveInputController(input) {
   })();
   return { done, close };
 }
-function delay2(ms, signal) {
+function delay3(ms, signal) {
   if (signal.aborted) {
     return Promise.resolve();
   }
@@ -39204,7 +39311,7 @@ async function pollUntilAwaiting(input) {
     if (firstPoll) {
       firstPoll = false;
     } else {
-      await delay3(
+      await delay4(
         Math.min(input.pollIntervalMs, Math.max(deadline - Date.now(), 0))
       );
     }
@@ -39218,7 +39325,7 @@ async function pollUntilAwaiting(input) {
     status = session.status;
   }
 }
-function delay3(ms) {
+function delay4(ms) {
   if (ms <= 0) {
     return Promise.resolve();
   }
@@ -39278,7 +39385,7 @@ async function streamDiagnosticsBestEffort(input) {
   }
 }
 async function settleDiagnostics(done) {
-  await Promise.race([done, delay3(DIAGNOSTICS_SHUTDOWN_WAIT_MS)]);
+  await Promise.race([done, delay4(DIAGNOSTICS_SHUTDOWN_WAIT_MS)]);
 }
 function writeBenchmarkResult(context, result, json2) {
   if (json2) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autohq/cli",
-  "version": "0.1.259",
+  "version": "0.1.260",
   "license": "SEE LICENSE IN README.md",
   "publishConfig": {
     "access": "public"