@autohq/cli 0.1.195 → 0.1.197

package/dist/agent-bridge.js

@@ -26640,7 +26640,7 @@ Object.assign(lookup, {
 // package.json
 var package_default = {
   name: "@autohq/cli",
-  version: "0.1.195",
+  version: "0.1.197",
   license: "SEE LICENSE IN README.md",
   publishConfig: {
     access: "public"
@@ -27109,13 +27109,14 @@ var ClaudeCodeProjector = class {
   }
 };
 function projectClaudeCodeResult(result) {
+  const failedButRecoverable = isRecoverableToolUseDiagnostic(result);
   return {
     type: "entry",
     entry: {
       role: "system",
       kind: "status",
       status: result.isError ? "failed" : "completed",
-      sessionStatusAfter: result.isError ? "failed" : "awaiting",
+      sessionStatusAfter: result.isError && !failedButRecoverable ? "failed" : "awaiting",
       content: {
         parts: [
           {
@@ -27127,6 +27128,13 @@ function projectClaudeCodeResult(result) {
     }
   };
 }
+function isRecoverableToolUseDiagnostic(result) {
+  if (!result.isError) {
+    return false;
+  }
+  const message = result.errorMessage ?? "";
+  return message.startsWith("[ede_diagnostic]") && message.includes("stop_reason=tool_use");
+}
 function anthropicMessageIdFromStreamStart(message) {
   const event = message.event;
   if (event.type !== "message_start") {
@@ -46955,6 +46963,7 @@ 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_STARTUP_PROFILE_HOOK_EVENTS = [
   "Setup",
   "SessionStart",
@@ -46991,6 +47000,17 @@ var ClaudeAgentBridgeSessionImpl = class {
   // held here instead of injected mid-turn (which would reject a pending
   // tool_use) and flushed once the turn ends and the session is idle.
   deferredMessages = [];
+  // tool_use ids the assistant has emitted whose tool_result has not yet been
+  // observed. A non-empty set means a tool call is in flight, so an immediate
+  // interrupt would append the new user message after an unresolved
+  // stop_reason=tool_use — the invalid transcript that trips Claude Code's
+  // ede_diagnostic and auto-restarts the session (FRA-3049).
+  pendingToolUseIds = /* @__PURE__ */ new Set();
+  // Incremented on every turn-terminal `result`. An interrupt that aborts an
+  // in-flight tool call waits for this to advance before injecting, so the
+  // message lands only once the interrupted turn has settled its tool_use.
+  turnResultCount = 0;
+  turnSettlementWaiters = /* @__PURE__ */ new Set();
   constructor(input) {
     const optionsStartedAt = Date.now();
     this.input = input;
@@ -47052,6 +47072,8 @@ var ClaudeAgentBridgeSessionImpl = class {
     }
     this.state = { kind: "closed" };
     this.activeTurnCount = 0;
+    this.pendingToolUseIds.clear();
+    this.resolveTurnSettlement(false);
     if (this.deferredMessages.length > 0) {
       this.input.writeOutput?.(
         `agent_bridge_claude_deferred_dropped count=${this.deferredMessages.length} reason=session_closed`
@@ -47140,8 +47162,12 @@ var ClaudeAgentBridgeSessionImpl = class {
     void (async () => {
       try {
         for await (const message of query) {
+          this.trackToolUseLifecycle(message);
           if (isClaudeAgentTurnResult(message)) {
             this.activeTurnCount = Math.max(0, this.activeTurnCount - 1);
+            this.pendingToolUseIds.clear();
+            this.turnResultCount += 1;
+            this.resolveTurnSettlement(true);
             if (this.activeTurnCount === 0) {
               this.flushDeferredMessages();
             }
@@ -47168,6 +47194,8 @@ var ClaudeAgentBridgeSessionImpl = class {
         }
       } finally {
         this.activeTurnCount = 0;
+        this.pendingToolUseIds.clear();
+        this.resolveTurnSettlement(false);
         this.state = { kind: "closed" };
         this.reportExit();
       }
@@ -47189,6 +47217,65 @@ var ClaudeAgentBridgeSessionImpl = class {
   hasInterruptibleTurn() {
     return this.activeTurnCount > 0 && this.state.kind === "running";
   }
+  // True while the assistant has an emitted tool_use with no matching
+  // tool_result yet — the window where an immediate interrupt would strand an
+  // unresolved stop_reason=tool_use ahead of the injected user message.
+  hasInFlightToolUse() {
+    return this.pendingToolUseIds.size > 0;
+  }
+  // Track tool_use/tool_result pairs as they stream so hasInFlightToolUse()
+  // reflects the live transcript. A tool_use may appear first as a streaming
+  // content block before the full assistant message is available; the matching
+  // tool_result closes it; the turn's terminal result clears any remainder.
+  trackToolUseLifecycle(message) {
+    for (const id of toolUseIds(message)) {
+      this.pendingToolUseIds.add(id);
+    }
+    for (const id of toolResultIds(message)) {
+      this.pendingToolUseIds.delete(id);
+    }
+  }
+  // Resolve once the interrupted turn emits its terminal `result` (turnResultCount
+  // advances past the pre-interrupt baseline), bounded so a tool that never
+  // returns after interrupt cannot wedge delivery. On timeout the caller falls
+  // back to immediate injection rather than hanging or dropping the message.
+  awaitTurnSettlement(baseline, startedAt) {
+    if (this.turnResultCount > baseline) {
+      return Promise.resolve();
+    }
+    return new Promise((resolve) => {
+      let done = false;
+      const finish = (outcome) => {
+        if (done) {
+          return;
+        }
+        done = true;
+        clearTimeout(timer);
+        this.turnSettlementWaiters.delete(waiter);
+        this.input.writeOutput?.(
+          `agent_bridge_claude_interrupt_settle_${outcome} duration_ms=${Date.now() - startedAt}`
+        );
+        resolve();
+      };
+      const waiter = (settled) => finish(settled ? "ready" : "aborted");
+      const timer = setTimeout(
+        () => finish("timeout"),
+        CLAUDE_INTERRUPT_SETTLE_TIMEOUT_MS
+      );
+      timer.unref?.();
+      this.turnSettlementWaiters.add(waiter);
+    });
+  }
+  resolveTurnSettlement(settled) {
+    if (this.turnSettlementWaiters.size === 0) {
+      return;
+    }
+    const waiters = [...this.turnSettlementWaiters];
+    this.turnSettlementWaiters.clear();
+    for (const waiter of waiters) {
+      waiter(settled);
+    }
+  }
   flushDeferredMessages() {
     if (this.deferredMessages.length === 0) {
       return;
@@ -47213,9 +47300,11 @@ var ClaudeAgentBridgeSessionImpl = class {
       return;
     }
     const query = this.state.query;
+    const hadInFlightToolUse = this.hasInFlightToolUse();
+    const settlementBaseline = this.turnResultCount;
     const startedAt = Date.now();
     this.input.writeOutput?.(
-      `agent_bridge_claude_mid_turn_interrupt_started at=${new Date(startedAt).toISOString()}`
+      `agent_bridge_claude_mid_turn_interrupt_started at=${new Date(startedAt).toISOString()} in_flight_tool_use=${hadInFlightToolUse}`
     );
     const interruptPromise = (async () => {
       try {
@@ -47228,6 +47317,9 @@ var ClaudeAgentBridgeSessionImpl = class {
           `agent_bridge_claude_mid_turn_interrupt_failed duration_ms=${Date.now() - startedAt} error=${error51 instanceof Error ? error51.message : String(error51)}`
         );
       }
+      if (hadInFlightToolUse) {
+        await this.awaitTurnSettlement(settlementBaseline, startedAt);
+      }
     })();
     this.interruptInFlight = interruptPromise;
     try {
@@ -47385,6 +47477,38 @@ function claudeAgentUserMessage(message) {
 function isClaudeAgentTurnResult(message) {
   return message.type === "result";
 }
+function toolUseIds(message) {
+  if (message.type === "assistant") {
+    return contentBlocks(message.message.content).flatMap(
+      (block2) => block2.type === "tool_use" && typeof block2.id === "string" ? [block2.id] : []
+    );
+  }
+  if (message.type !== "stream_event") {
+    return [];
+  }
+  const event = message.event;
+  if (event.type !== "content_block_start") {
+    return [];
+  }
+  const block = event.content_block;
+  return block.type === "tool_use" && typeof block.id === "string" ? [block.id] : [];
+}
+function toolResultIds(message) {
+  if (message.type !== "user") {
+    return [];
+  }
+  return contentBlocks(message.message.content).flatMap(
+    (block) => block.type === "tool_result" && typeof block.tool_use_id === "string" ? [block.tool_use_id] : []
+  );
+}
+function contentBlocks(content) {
+  if (!Array.isArray(content)) {
+    return [];
+  }
+  return content.filter(
+    (block) => typeof block === "object" && block !== null
+  );
+}
 
 // src/commands/agent-bridge/harness/claude-code/index.ts
 async function runAgentBridgeClaudeCode(options) {

package/dist/index.js

@@ -21623,7 +21623,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@autohq/cli",
-      version: "0.1.195",
+      version: "0.1.197",
       license: "SEE LICENSE IN README.md",
       publishConfig: {
         access: "public"
@@ -31701,13 +31701,14 @@ var ClaudeCodeProjector = class {
   }
 };
 function projectClaudeCodeResult(result) {
+  const failedButRecoverable = isRecoverableToolUseDiagnostic(result);
   return {
     type: "entry",
     entry: {
       role: "system",
       kind: "status",
       status: result.isError ? "failed" : "completed",
-      sessionStatusAfter: result.isError ? "failed" : "awaiting",
+      sessionStatusAfter: result.isError && !failedButRecoverable ? "failed" : "awaiting",
       content: {
         parts: [
           {
@@ -31719,6 +31720,13 @@ function projectClaudeCodeResult(result) {
     }
   };
 }
+function isRecoverableToolUseDiagnostic(result) {
+  if (!result.isError) {
+    return false;
+  }
+  const message = result.errorMessage ?? "";
+  return message.startsWith("[ede_diagnostic]") && message.includes("stop_reason=tool_use");
+}
 function anthropicMessageIdFromStreamStart(message) {
   const event = message.event;
   if (event.type !== "message_start") {
@@ -31975,6 +31983,7 @@ 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_STARTUP_PROFILE_HOOK_EVENTS = [
   "Setup",
   "SessionStart",
@@ -32011,6 +32020,17 @@ var ClaudeAgentBridgeSessionImpl = class {
   // held here instead of injected mid-turn (which would reject a pending
   // tool_use) and flushed once the turn ends and the session is idle.
   deferredMessages = [];
+  // tool_use ids the assistant has emitted whose tool_result has not yet been
+  // observed. A non-empty set means a tool call is in flight, so an immediate
+  // interrupt would append the new user message after an unresolved
+  // stop_reason=tool_use — the invalid transcript that trips Claude Code's
+  // ede_diagnostic and auto-restarts the session (FRA-3049).
+  pendingToolUseIds = /* @__PURE__ */ new Set();
+  // Incremented on every turn-terminal `result`. An interrupt that aborts an
+  // in-flight tool call waits for this to advance before injecting, so the
+  // message lands only once the interrupted turn has settled its tool_use.
+  turnResultCount = 0;
+  turnSettlementWaiters = /* @__PURE__ */ new Set();
   constructor(input) {
     const optionsStartedAt = Date.now();
     this.input = input;
@@ -32072,6 +32092,8 @@ var ClaudeAgentBridgeSessionImpl = class {
     }
     this.state = { kind: "closed" };
     this.activeTurnCount = 0;
+    this.pendingToolUseIds.clear();
+    this.resolveTurnSettlement(false);
     if (this.deferredMessages.length > 0) {
       this.input.writeOutput?.(
         `agent_bridge_claude_deferred_dropped count=${this.deferredMessages.length} reason=session_closed`
@@ -32160,8 +32182,12 @@ var ClaudeAgentBridgeSessionImpl = class {
     void (async () => {
       try {
         for await (const message of query) {
+          this.trackToolUseLifecycle(message);
           if (isClaudeAgentTurnResult(message)) {
             this.activeTurnCount = Math.max(0, this.activeTurnCount - 1);
+            this.pendingToolUseIds.clear();
+            this.turnResultCount += 1;
+            this.resolveTurnSettlement(true);
             if (this.activeTurnCount === 0) {
               this.flushDeferredMessages();
             }
@@ -32188,6 +32214,8 @@ var ClaudeAgentBridgeSessionImpl = class {
         }
       } finally {
         this.activeTurnCount = 0;
+        this.pendingToolUseIds.clear();
+        this.resolveTurnSettlement(false);
         this.state = { kind: "closed" };
         this.reportExit();
       }
@@ -32209,6 +32237,65 @@ var ClaudeAgentBridgeSessionImpl = class {
   hasInterruptibleTurn() {
     return this.activeTurnCount > 0 && this.state.kind === "running";
   }
+  // True while the assistant has an emitted tool_use with no matching
+  // tool_result yet — the window where an immediate interrupt would strand an
+  // unresolved stop_reason=tool_use ahead of the injected user message.
+  hasInFlightToolUse() {
+    return this.pendingToolUseIds.size > 0;
+  }
+  // Track tool_use/tool_result pairs as they stream so hasInFlightToolUse()
+  // reflects the live transcript. A tool_use may appear first as a streaming
+  // content block before the full assistant message is available; the matching
+  // tool_result closes it; the turn's terminal result clears any remainder.
+  trackToolUseLifecycle(message) {
+    for (const id of toolUseIds(message)) {
+      this.pendingToolUseIds.add(id);
+    }
+    for (const id of toolResultIds(message)) {
+      this.pendingToolUseIds.delete(id);
+    }
+  }
+  // Resolve once the interrupted turn emits its terminal `result` (turnResultCount
+  // advances past the pre-interrupt baseline), bounded so a tool that never
+  // returns after interrupt cannot wedge delivery. On timeout the caller falls
+  // back to immediate injection rather than hanging or dropping the message.
+  awaitTurnSettlement(baseline, startedAt) {
+    if (this.turnResultCount > baseline) {
+      return Promise.resolve();
+    }
+    return new Promise((resolve4) => {
+      let done = false;
+      const finish = (outcome) => {
+        if (done) {
+          return;
+        }
+        done = true;
+        clearTimeout(timer);
+        this.turnSettlementWaiters.delete(waiter);
+        this.input.writeOutput?.(
+          `agent_bridge_claude_interrupt_settle_${outcome} duration_ms=${Date.now() - startedAt}`
+        );
+        resolve4();
+      };
+      const waiter = (settled) => finish(settled ? "ready" : "aborted");
+      const timer = setTimeout(
+        () => finish("timeout"),
+        CLAUDE_INTERRUPT_SETTLE_TIMEOUT_MS
+      );
+      timer.unref?.();
+      this.turnSettlementWaiters.add(waiter);
+    });
+  }
+  resolveTurnSettlement(settled) {
+    if (this.turnSettlementWaiters.size === 0) {
+      return;
+    }
+    const waiters = [...this.turnSettlementWaiters];
+    this.turnSettlementWaiters.clear();
+    for (const waiter of waiters) {
+      waiter(settled);
+    }
+  }
   flushDeferredMessages() {
     if (this.deferredMessages.length === 0) {
       return;
@@ -32233,9 +32320,11 @@ var ClaudeAgentBridgeSessionImpl = class {
       return;
     }
     const query = this.state.query;
+    const hadInFlightToolUse = this.hasInFlightToolUse();
+    const settlementBaseline = this.turnResultCount;
     const startedAt = Date.now();
     this.input.writeOutput?.(
-      `agent_bridge_claude_mid_turn_interrupt_started at=${new Date(startedAt).toISOString()}`
+      `agent_bridge_claude_mid_turn_interrupt_started at=${new Date(startedAt).toISOString()} in_flight_tool_use=${hadInFlightToolUse}`
     );
     const interruptPromise = (async () => {
       try {
@@ -32248,6 +32337,9 @@ var ClaudeAgentBridgeSessionImpl = class {
           `agent_bridge_claude_mid_turn_interrupt_failed duration_ms=${Date.now() - startedAt} error=${error51 instanceof Error ? error51.message : String(error51)}`
         );
       }
+      if (hadInFlightToolUse) {
+        await this.awaitTurnSettlement(settlementBaseline, startedAt);
+      }
     })();
     this.interruptInFlight = interruptPromise;
     try {
@@ -32405,6 +32497,38 @@ function claudeAgentUserMessage(message) {
 function isClaudeAgentTurnResult(message) {
   return message.type === "result";
 }
+function toolUseIds(message) {
+  if (message.type === "assistant") {
+    return contentBlocks(message.message.content).flatMap(
+      (block2) => block2.type === "tool_use" && typeof block2.id === "string" ? [block2.id] : []
+    );
+  }
+  if (message.type !== "stream_event") {
+    return [];
+  }
+  const event = message.event;
+  if (event.type !== "content_block_start") {
+    return [];
+  }
+  const block = event.content_block;
+  return block.type === "tool_use" && typeof block.id === "string" ? [block.id] : [];
+}
+function toolResultIds(message) {
+  if (message.type !== "user") {
+    return [];
+  }
+  return contentBlocks(message.message.content).flatMap(
+    (block) => block.type === "tool_result" && typeof block.tool_use_id === "string" ? [block.tool_use_id] : []
+  );
+}
+function contentBlocks(content) {
+  if (!Array.isArray(content)) {
+    return [];
+  }
+  return content.filter(
+    (block) => typeof block === "object" && block !== null
+  );
+}
 
 // src/commands/agent-bridge/harness/claude-code/index.ts
 async function runAgentBridgeClaudeCode(options) {

package/package.json

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