@autohq/cli 0.1.308 → 0.1.310

package/dist/agent-bridge.js

@@ -19692,7 +19692,12 @@ var RuntimeBridgeOutputEntryEnvelopeWireSchema = external_exports.object({
   turnStatus: RuntimeTurnStatusSchema.optional(),
   // Present only on a turn's terminal result entry; carries the captured
   // token/cost usage the persisting side turns into ledger rows.
-  usage: RuntimeBridgeTurnUsageSchema.optional()
+  usage: RuntimeBridgeTurnUsageSchema.optional(),
+  // Present only on a turn's terminal result entry: the commands whose
+  // messages that harness turn consumed, from the runtime's injection-order
+  // ground truth. The persisting side settles exactly these turns; absent
+  // (older runtimes, non-command turns) it falls back to cursor attribution.
+  consumedCommandIds: external_exports.array(SessionCommandIdSchema).optional()
 }).strict();
 var LegacyRuntimeBridgeOutputEntryEnvelopeSchema = RuntimeBridgeOutputEntryEnvelopeWireSchema.omit({ turnStatus: true }).extend({
   sessionStatusAfter: external_exports.enum(["awaiting", "failed"])
@@ -19752,6 +19757,9 @@ var RuntimeBridgeOutputUiMessageCompletedEnvelopeSchema = external_exports.objec
   message: JsonValueSchema,
   turnStatus: external_exports.enum(["waiting_for_input", "completed", "failed"]).optional(),
   usage: RuntimeBridgeTurnUsageSchema.optional(),
+  // See the conversation.entry envelope: terminal-result-only declaration of
+  // the commands this turn consumed, for exact turn-ledger settlement.
+  consumedCommandIds: external_exports.array(SessionCommandIdSchema).optional(),
   createdAt: external_exports.string().datetime(),
   completedAt: external_exports.string().datetime().nullable()
 }).strict();
@@ -23399,7 +23407,7 @@ Object.assign(lookup, {
 // package.json
 var package_default = {
   name: "@autohq/cli",
-  version: "0.1.308",
+  version: "0.1.310",
   license: "SEE LICENSE IN README.md",
   publishConfig: {
     access: "public"
@@ -24616,6 +24624,8 @@ var ConversationRealtimeEventSchema = external_exports.discriminatedUnion("type"
 
 // ../../packages/schemas/src/claude-code.ts
 var ASK_USER_QUESTION_TOOL_NAME = "AskUserQuestion";
+var CLAUDE_CODE_INTERRUPT_MARKER_PREFIX = "[Request interrupted by user";
+var CLAUDE_CODE_EDE_DIAGNOSTIC_PREFIX = "[ede_diagnostic]";
 var ClaudeCodeTextBlockSchema = external_exports.object({
   type: external_exports.literal("text"),
   text: external_exports.string()
@@ -24684,6 +24694,15 @@ var ClaudeCodeUserRecordSchema = external_exports.object({
   type: external_exports.literal("user"),
   message: ClaudeCodeUserMessageSchema
 }).passthrough();
+var ClaudeCodeInterruptMarkerRecordSchema = external_exports.object({
+  type: external_exports.literal("user"),
+  message: external_exports.object({
+    content: external_exports.union([
+      external_exports.string(),
+      external_exports.array(OptionalClaudeCodeAssistantContentBlockSchema)
+    ])
+  }).passthrough()
+}).passthrough();
 var ClaudeCodeAggregateUsageSchema = external_exports.object({
   input_tokens: external_exports.number().optional(),
   output_tokens: external_exports.number().optional(),
@@ -24746,6 +24765,26 @@ function parseClaudeCodeStreamRecord(parsed) {
     }
   };
 }
+function isClaudeCodeInterruptMarker(record2) {
+  const parsed = ClaudeCodeInterruptMarkerRecordSchema.safeParse(record2);
+  if (!parsed.success) {
+    return false;
+  }
+  const content = parsed.data.message.content;
+  if (typeof content === "string") {
+    return content.startsWith(CLAUDE_CODE_INTERRUPT_MARKER_PREFIX);
+  }
+  return content.some(
+    (block) => block !== null && block.type === "text" && block.text.startsWith(CLAUDE_CODE_INTERRUPT_MARKER_PREFIX)
+  );
+}
+function isClaudeCodeEdeDiagnosticOnlyError(errorMessage4) {
+  if (!errorMessage4) {
+    return false;
+  }
+  const lines = errorMessage4.split("\n").map((line) => line.trim()).filter((line) => line.length > 0);
+  return lines.length > 0 && lines.every((line) => line.startsWith(CLAUDE_CODE_EDE_DIAGNOSTIC_PREFIX));
+}
 function textContent(text2) {
   return {
     parts: [
@@ -39504,6 +39543,7 @@ var AgentBridgeOutputBuffer = class {
       status: terminalEntryStatus(projection),
       turnStatus: turnFailed ? void 0 : projection.turnStatus,
       usage: turnFailed ? void 0 : projection.usage,
+      consumedCommandIds: turnFailed ? void 0 : projection.consumedCommandIds,
       createdAt: completedAt,
       completedAt
     });
@@ -39526,6 +39566,7 @@ var AgentBridgeOutputBuffer = class {
         status: terminalEntryStatus(projection),
         ...projection.turnStatus ? { turnStatus: projection.turnStatus } : {},
         ...projection.usage ? { usage: projection.usage } : {},
+        ...projection.consumedCommandIds ? { consumedCommandIds: projection.consumedCommandIds } : {},
         content: {
           parts: [{ type: "text", text: statusText }]
         }
@@ -39922,7 +39963,8 @@ function buildOutputEnvelope(context, outputSeq, projection) {
     createdAt,
     completedAt: entry.status === "in_progress" ? null : createdAt,
     ...entry.turnStatus ? { turnStatus: entry.turnStatus } : {},
-    ...entry.usage ? { usage: entry.usage } : {}
+    ...entry.usage ? { usage: entry.usage } : {},
+    ...entry.consumedCommandIds ? { consumedCommandIds: entry.consumedCommandIds } : {}
   });
 }
 function buildDeltaOutputEnvelope(input) {
@@ -39984,6 +40026,7 @@ function buildUiMessageCompletedOutputEnvelope(input) {
     message: toJsonValue(input.message),
     ...input.turnStatus ? { turnStatus: input.turnStatus } : {},
     ...input.usage ? { usage: input.usage } : {},
+    ...input.consumedCommandIds ? { consumedCommandIds: input.consumedCommandIds } : {},
     createdAt: input.createdAt,
     completedAt: input.completedAt
   });
@@ -40016,13 +40059,25 @@ var ClaudeCodeProjector = class {
   activeParts = /* @__PURE__ */ new Map();
   activeToolInputs = /* @__PURE__ */ new Map();
   streamedMessageIds = /* @__PURE__ */ new Set();
+  // The SDK's "[Request interrupted by user]" transcript marker was seen since
+  // the last terminal result: the very next diagnostic-only
+  // `error_during_execution` result is that interrupt's cancellation, not a
+  // real turn failure (FRA-3548). Cleared on every result and on the next
+  // message_start so a stale marker can never reclassify a later failure.
+  interruptMarkerSeen = false;
   project(message) {
+    if (isClaudeCodeInterruptMarker(message)) {
+      this.interruptMarkerSeen = true;
+    }
     if (message.type === "stream_event") {
       return this.projectStreamEvent(message);
     }
     const parsed = parseClaudeCodeStreamRecord(message);
     const snapshotMessageId = assistantSnapshotMessageId(message);
     const suppressStreamed = snapshotMessageId !== null && this.streamedMessageIds.has(snapshotMessageId);
+    if (message.type === "assistant" && !suppressStreamed) {
+      this.interruptMarkerSeen = false;
+    }
     const outputs = !suppressStreamed && message.type === "assistant" ? projectAssistantSnapshot(parsed.projections) : parsed.projections.flatMap((entry) => {
       if (suppressStreamed && (entry.kind === "message" || entry.kind === "tool_call")) {
         return [];
@@ -40033,10 +40088,24 @@ var ClaudeCodeProjector = class {
       outputs.push(...this.endActiveParts(), ...this.finishActiveToolInputs());
       this.currentMessageId = null;
       this.activeResponseMessageId = null;
-      outputs.push(projectClaudeCodeResult(parsed.result));
+      outputs.push(
+        projectClaudeCodeResult(parsed.result, {
+          interrupted: this.isInterruptCancellation(parsed.result)
+        })
+      );
+      this.interruptMarkerSeen = false;
     }
     return outputs;
   }
+  // An interrupt cancels the running turn cleanly at the transcript level, but
+  // Claude Code has no cancelled result subtype: the turn's terminal result
+  // surfaces as a diagnostic-only `error_during_execution`. Treating that as a
+  // turn failure fed the FRA-3548 redelivery loop (the bridge redelivered a
+  // message the SDK was actively answering), so a failed result bracketed by
+  // the SDK's own interrupt marker is classified as a cancellation instead.
+  isInterruptCancellation(result) {
+    return result.isError && this.interruptMarkerSeen && isClaudeCodeEdeDiagnosticOnlyError(result.errorMessage);
+  }
   flushPendingAssistantMessages() {
     const outputs = [
       ...this.endActiveParts(),
@@ -40044,6 +40113,7 @@ var ClaudeCodeProjector = class {
     ];
     this.currentMessageId = null;
     this.activeResponseMessageId = null;
+    this.interruptMarkerSeen = false;
     return outputs;
   }
   projectStreamEvent(message) {
@@ -40052,6 +40122,7 @@ var ClaudeCodeProjector = class {
       this.streamedMessageIds.add(this.currentMessageId);
       this.activeParts.clear();
       this.activeToolInputs.clear();
+      this.interruptMarkerSeen = false;
       return this.ensureResponseStarted(this.currentMessageId);
     }
     if (message.event.type === "message_stop") {
@@ -40142,7 +40213,17 @@ var ClaudeCodeProjector = class {
     );
   }
 };
-function projectClaudeCodeResult(result) {
+function projectClaudeCodeResult(result, options = {}) {
+  if (options.interrupted) {
+    return {
+      type: "ui_message_chunk",
+      chunk: { type: "finish", finishReason: "stop" },
+      // Neutral wording: the projector sees that an interrupt cancelled the
+      // turn, not why the interrupt was sent.
+      statusText: "claude-code turn interrupted",
+      turnStatus: "completed"
+    };
+  }
   return {
     type: "ui_message_chunk",
     chunk: {
@@ -60277,6 +60358,13 @@ var ClaudeAgentBridgeSessionImpl = class {
   // settlement after the ack). Flushed once the turn ends and the session is
   // idle.
   deferredMessages = [];
+  // Consumed-command ids per enqueued turn, in injection order. Results arrive
+  // in turn order, so each terminal `result` settles the OLDEST open entry —
+  // which is also why an interrupted turn's result (arriving after the
+  // interrupter enqueued) still resolves to the interrupted command. A
+  // deferred flush enqueues one concatenated turn, so its entry carries every
+  // flushed command id.
+  openTurnCommandIds = [];
   // 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
@@ -60338,6 +60426,7 @@ var ClaudeAgentBridgeSessionImpl = class {
   }
   async sendMessage(message, options) {
     const mode = options?.mode ?? "interrupt";
+    const commandIds = options?.commandId ? [options.commandId] : [];
     const startedAt = Date.now();
     this.input.runtimeLogger?.info("agent_bridge_claude_send_message_started", {
       delivery_mode: mode,
@@ -60347,7 +60436,7 @@ var ClaudeAgentBridgeSessionImpl = class {
       deferred_count: this.deferredMessages.length
     });
     if (mode === "deferred" && this.hasInterruptibleTurn()) {
-      this.deferredMessages.push(message);
+      this.deferredMessages.push({ text: message, commandIds });
       this.input.runtimeLogger?.info("agent_bridge_claude_message_deferred", {
         active_turn_count: this.activeTurnCount,
         pending_tool_use_count: this.pendingToolUseIds.size,
@@ -60357,7 +60446,7 @@ var ClaudeAgentBridgeSessionImpl = class {
     }
     const interruption = await this.interruptActiveTurnBeforeMessage();
     if (interruption === "defer" && this.hasInterruptibleTurn()) {
-      this.deferredMessages.push(message);
+      this.deferredMessages.push({ text: message, commandIds });
       this.input.runtimeLogger?.info(
         "agent_bridge_claude_message_deferred_after_interrupt_timeout",
         {
@@ -60369,7 +60458,7 @@ var ClaudeAgentBridgeSessionImpl = class {
       return;
     }
     await this.awaitMcpRegistration();
-    this.enqueueUserMessage(message);
+    this.enqueueUserMessage(message, commandIds);
     this.input.runtimeLogger?.info("agent_bridge_claude_send_message_queued", {
       delivery_mode: mode,
       duration_ms: Date.now() - startedAt,
@@ -60379,6 +60468,20 @@ var ClaudeAgentBridgeSessionImpl = class {
       deferred_count: this.deferredMessages.length
     });
   }
+  noteActiveTurnCommand(commandId) {
+    const activeTurn = this.openTurnCommandIds[0];
+    if (activeTurn) {
+      activeTurn.push(commandId);
+    }
+    this.input.runtimeLogger?.info(
+      "agent_bridge_claude_active_turn_command_noted",
+      {
+        attributed: Boolean(activeTurn),
+        active_turn_count: this.activeTurnCount,
+        open_turn_entries: this.openTurnCommandIds.length
+      }
+    );
+  }
   close() {
     const previousState = this.state;
     if (previousState.kind === "closed") {
@@ -60394,6 +60497,7 @@ var ClaudeAgentBridgeSessionImpl = class {
       );
       this.deferredMessages.length = 0;
     }
+    this.openTurnCommandIds.length = 0;
     this.stderr.flush();
     this.inputQueue.close();
     if (previousState.kind === "started") {
@@ -60477,8 +60581,12 @@ var ClaudeAgentBridgeSessionImpl = class {
       try {
         for await (const message of query) {
           this.trackToolUseLifecycle(message);
+          let meta3;
           if (isClaudeAgentTurnResult(message)) {
             this.activeTurnCount = Math.max(0, this.activeTurnCount - 1);
+            meta3 = {
+              consumedCommandIds: this.openTurnCommandIds.shift() ?? []
+            };
             this.pendingToolUseIds.clear();
             this.turnResultCount += 1;
             this.resolveTurnSettlement(true);
@@ -60486,7 +60594,8 @@ var ClaudeAgentBridgeSessionImpl = class {
               active_turn_count: this.activeTurnCount,
               pending_tool_use_count: this.pendingToolUseIds.size,
               turn_result_count: this.turnResultCount,
-              deferred_count: this.deferredMessages.length
+              deferred_count: this.deferredMessages.length,
+              consumed_command_ids: meta3.consumedCommandIds
             });
             if (this.activeTurnCount === 0) {
               this.flushDeferredMessages();
@@ -60506,7 +60615,7 @@ var ClaudeAgentBridgeSessionImpl = class {
             this.close();
             return;
           }
-          await this.input.onMessage(message);
+          await this.input.onMessage(message, meta3);
         }
       } catch (error51) {
         if (this.state.kind !== "closed") {
@@ -60514,6 +60623,7 @@ var ClaudeAgentBridgeSessionImpl = class {
         }
       } finally {
         this.activeTurnCount = 0;
+        this.openTurnCommandIds.length = 0;
         this.pendingToolUseIds.clear();
         this.resolveTurnSettlement(false);
         this.state = { kind: "closed" };
@@ -60525,9 +60635,10 @@ var ClaudeAgentBridgeSessionImpl = class {
   // lets injection work while the SDK session is still starting; the queue
   // drains once the query attaches. Startup failures surface through onError
   // instead of failing injection.
-  enqueueUserMessage(message) {
+  enqueueUserMessage(message, commandIds) {
     this.inputQueue.push(claudeAgentUserMessage(message));
     this.activeTurnCount += 1;
+    this.openTurnCommandIds.push(commandIds);
     this.input.runtimeLogger?.info("agent_bridge_claude_message_enqueued", {
       state: this.state.kind,
       active_turn_count: this.activeTurnCount,
@@ -60611,7 +60722,10 @@ var ClaudeAgentBridgeSessionImpl = class {
     this.input.writeOutput?.(
       `agent_bridge_claude_deferred_flush count=${pending.length}`
     );
-    this.enqueueUserMessage(pending.join("\n\n"));
+    this.enqueueUserMessage(
+      pending.map((entry) => entry.text).join("\n\n"),
+      pending.flatMap((entry) => entry.commandIds)
+    );
   }
   async interruptActiveTurnBeforeMessage() {
     if (!this.hasInterruptibleTurn()) {
@@ -61278,7 +61392,8 @@ var ClaudeCodeCommandHandler = class {
         })
       );
       await this.ensureAgentSession().sendMessage(message, {
-        mode
+        mode,
+        commandId: delivery.commandId
       });
       this.input.runtimeLogger?.info(
         "agent_bridge_claude_command_send_message_ready",
@@ -61333,6 +61448,7 @@ var ClaudeCodeCommandHandler = class {
     const pending = this.pendingQuestions.get(answer.toolCallId);
     if (pending) {
       this.pendingQuestions.delete(answer.toolCallId);
+      this.agentSession?.noteActiveTurnCommand(delivery.commandId);
       pending.resolve({
         behavior: "allow",
         updatedInput: {
@@ -61359,7 +61475,9 @@ var ClaudeCodeCommandHandler = class {
         }
       }
     });
-    await this.ensureAgentSession().sendMessage(message);
+    await this.ensureAgentSession().sendMessage(message, {
+      commandId: delivery.commandId
+    });
     this.input.writeOutput?.(
       `agent_bridge_question_answer_fallback tool_use_id=${answer.toolCallId}`
     );
@@ -61415,7 +61533,7 @@ var ClaudeCodeCommandHandler = class {
       );
     }
   }
-  async handleAgentMessage(message) {
+  async handleAgentMessage(message, meta3) {
     const activeContext = this.context;
     if (!activeContext) {
       return;
@@ -61431,7 +61549,10 @@ var ClaudeCodeCommandHandler = class {
       return;
     }
     for (const projection of projections) {
-      await this.emitBridgeOutput(activeContext, projection);
+      await this.emitBridgeOutput(
+        activeContext,
+        withConsumedCommandIds(projection, meta3)
+      );
     }
   }
   async handleAgentError(error51) {
@@ -61499,7 +61620,7 @@ var ClaudeCodeCommandHandler = class {
       claude: this.input.claude,
       resumeAgentId: this.storedResumeAgentId(),
       canUseTool: this.canUseTool,
-      onMessage: (message) => this.handleAgentMessage(message),
+      onMessage: (message, meta3) => this.handleAgentMessage(message, meta3),
       onError: (error51) => this.handleAgentError(error51),
       onExit: () => {
         if (this.agentSession === session) {
@@ -61514,6 +61635,13 @@ var ClaudeCodeCommandHandler = class {
     return session;
   }
 };
+function withConsumedCommandIds(projection, meta3) {
+  const consumedCommandIds = meta3?.consumedCommandIds;
+  if (!consumedCommandIds || consumedCommandIds.length === 0 || projection.type !== "ui_message_chunk" || !projection.turnStatus) {
+    return projection;
+  }
+  return { ...projection, consumedCommandIds };
+}
 function answerFallbackMessage(answer) {
   const lines = Object.entries(answer.answers).map(
     ([question, value2]) => `- ${question}: ${value2}`

package/dist/index.js

@@ -16004,6 +16004,26 @@ function parseClaudeCodeStreamRecord(parsed) {
     }
   };
 }
+function isClaudeCodeInterruptMarker(record2) {
+  const parsed = ClaudeCodeInterruptMarkerRecordSchema.safeParse(record2);
+  if (!parsed.success) {
+    return false;
+  }
+  const content = parsed.data.message.content;
+  if (typeof content === "string") {
+    return content.startsWith(CLAUDE_CODE_INTERRUPT_MARKER_PREFIX);
+  }
+  return content.some(
+    (block) => block !== null && block.type === "text" && block.text.startsWith(CLAUDE_CODE_INTERRUPT_MARKER_PREFIX)
+  );
+}
+function isClaudeCodeEdeDiagnosticOnlyError(errorMessage6) {
+  if (!errorMessage6) {
+    return false;
+  }
+  const lines = errorMessage6.split("\n").map((line) => line.trim()).filter((line) => line.length > 0);
+  return lines.length > 0 && lines.every((line) => line.startsWith(CLAUDE_CODE_EDE_DIAGNOSTIC_PREFIX));
+}
 function textContent(text) {
   return {
     parts: [
@@ -16185,7 +16205,7 @@ function usdAmount(value) {
   }
   return value;
 }
-var ASK_USER_QUESTION_TOOL_NAME, ClaudeCodeTextBlockSchema, ClaudeCodeToolUseBlockSchema, ClaudeCodeThinkingBlockSchema, ClaudeCodeToolResultBlockSchema, ClaudeCodeAssistantContentBlockSchema, OptionalClaudeCodeAssistantContentBlockSchema, ClaudeCodeAssistantContentSchema, OptionalClaudeCodeToolResultBlockSchema, ClaudeCodeToolResultContentSchema, ClaudeCodeUserContentSchema, ClaudeCodeAssistantMessageSchema, ClaudeCodeUserMessageSchema, ClaudeCodeSystemRecordSchema, ClaudeCodeAssistantRecordSchema, ClaudeCodeUserRecordSchema, ClaudeCodeAggregateUsageSchema, ClaudeCodeModelUsageSchema, ClaudeCodeResultRecordSchema, ClaudeCodeSessionRecordSchema, ClaudeCodeStreamRecordSchema, AskUserQuestionInputSchema;
+var ASK_USER_QUESTION_TOOL_NAME, CLAUDE_CODE_INTERRUPT_MARKER_PREFIX, CLAUDE_CODE_EDE_DIAGNOSTIC_PREFIX, ClaudeCodeTextBlockSchema, ClaudeCodeToolUseBlockSchema, ClaudeCodeThinkingBlockSchema, ClaudeCodeToolResultBlockSchema, ClaudeCodeAssistantContentBlockSchema, OptionalClaudeCodeAssistantContentBlockSchema, ClaudeCodeAssistantContentSchema, OptionalClaudeCodeToolResultBlockSchema, ClaudeCodeToolResultContentSchema, ClaudeCodeUserContentSchema, ClaudeCodeAssistantMessageSchema, ClaudeCodeUserMessageSchema, ClaudeCodeSystemRecordSchema, ClaudeCodeAssistantRecordSchema, ClaudeCodeUserRecordSchema, ClaudeCodeInterruptMarkerRecordSchema, ClaudeCodeAggregateUsageSchema, ClaudeCodeModelUsageSchema, ClaudeCodeResultRecordSchema, ClaudeCodeSessionRecordSchema, ClaudeCodeStreamRecordSchema, AskUserQuestionInputSchema;
 var init_claude_code = __esm({
   "../../packages/schemas/src/claude-code.ts"() {
     "use strict";
@@ -16193,6 +16213,8 @@ var init_claude_code = __esm({
     init_conversation();
     init_primitives();
     ASK_USER_QUESTION_TOOL_NAME = "AskUserQuestion";
+    CLAUDE_CODE_INTERRUPT_MARKER_PREFIX = "[Request interrupted by user";
+    CLAUDE_CODE_EDE_DIAGNOSTIC_PREFIX = "[ede_diagnostic]";
     ClaudeCodeTextBlockSchema = external_exports.object({
       type: external_exports.literal("text"),
       text: external_exports.string()
@@ -16261,6 +16283,15 @@ var init_claude_code = __esm({
       type: external_exports.literal("user"),
       message: ClaudeCodeUserMessageSchema
     }).passthrough();
+    ClaudeCodeInterruptMarkerRecordSchema = external_exports.object({
+      type: external_exports.literal("user"),
+      message: external_exports.object({
+        content: external_exports.union([
+          external_exports.string(),
+          external_exports.array(OptionalClaudeCodeAssistantContentBlockSchema)
+        ])
+      }).passthrough()
+    }).passthrough();
     ClaudeCodeAggregateUsageSchema = external_exports.object({
       input_tokens: external_exports.number().optional(),
       output_tokens: external_exports.number().optional(),
@@ -25579,7 +25610,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@autohq/cli",
-      version: "0.1.308",
+      version: "0.1.310",
       license: "SEE LICENSE IN README.md",
       publishConfig: {
         access: "public"
@@ -35611,7 +35642,12 @@ var RuntimeBridgeOutputEntryEnvelopeWireSchema = external_exports.object({
   turnStatus: RuntimeTurnStatusSchema.optional(),
   // Present only on a turn's terminal result entry; carries the captured
   // token/cost usage the persisting side turns into ledger rows.
-  usage: RuntimeBridgeTurnUsageSchema.optional()
+  usage: RuntimeBridgeTurnUsageSchema.optional(),
+  // Present only on a turn's terminal result entry: the commands whose
+  // messages that harness turn consumed, from the runtime's injection-order
+  // ground truth. The persisting side settles exactly these turns; absent
+  // (older runtimes, non-command turns) it falls back to cursor attribution.
+  consumedCommandIds: external_exports.array(SessionCommandIdSchema2).optional()
 }).strict();
 var LegacyRuntimeBridgeOutputEntryEnvelopeSchema = RuntimeBridgeOutputEntryEnvelopeWireSchema.omit({ turnStatus: true }).extend({
   sessionStatusAfter: external_exports.enum(["awaiting", "failed"])
@@ -35671,6 +35707,9 @@ var RuntimeBridgeOutputUiMessageCompletedEnvelopeSchema = external_exports.objec
   message: JsonValueSchema2,
   turnStatus: external_exports.enum(["waiting_for_input", "completed", "failed"]).optional(),
   usage: RuntimeBridgeTurnUsageSchema.optional(),
+  // See the conversation.entry envelope: terminal-result-only declaration of
+  // the commands this turn consumed, for exact turn-ledger settlement.
+  consumedCommandIds: external_exports.array(SessionCommandIdSchema2).optional(),
   createdAt: external_exports.string().datetime(),
   completedAt: external_exports.string().datetime().nullable()
 }).strict();
@@ -36601,6 +36640,7 @@ var AgentBridgeOutputBuffer = class {
       status: terminalEntryStatus(projection),
       turnStatus: turnFailed ? void 0 : projection.turnStatus,
       usage: turnFailed ? void 0 : projection.usage,
+      consumedCommandIds: turnFailed ? void 0 : projection.consumedCommandIds,
       createdAt: completedAt,
       completedAt
     });
@@ -36623,6 +36663,7 @@ var AgentBridgeOutputBuffer = class {
         status: terminalEntryStatus(projection),
         ...projection.turnStatus ? { turnStatus: projection.turnStatus } : {},
         ...projection.usage ? { usage: projection.usage } : {},
+        ...projection.consumedCommandIds ? { consumedCommandIds: projection.consumedCommandIds } : {},
         content: {
           parts: [{ type: "text", text: statusText }]
         }
@@ -37019,7 +37060,8 @@ function buildOutputEnvelope(context, outputSeq, projection) {
     createdAt,
     completedAt: entry.status === "in_progress" ? null : createdAt,
     ...entry.turnStatus ? { turnStatus: entry.turnStatus } : {},
-    ...entry.usage ? { usage: entry.usage } : {}
+    ...entry.usage ? { usage: entry.usage } : {},
+    ...entry.consumedCommandIds ? { consumedCommandIds: entry.consumedCommandIds } : {}
   });
 }
 function buildDeltaOutputEnvelope(input) {
@@ -37081,6 +37123,7 @@ function buildUiMessageCompletedOutputEnvelope(input) {
     message: toJsonValue(input.message),
     ...input.turnStatus ? { turnStatus: input.turnStatus } : {},
     ...input.usage ? { usage: input.usage } : {},
+    ...input.consumedCommandIds ? { consumedCommandIds: input.consumedCommandIds } : {},
     createdAt: input.createdAt,
     completedAt: input.completedAt
   });
@@ -37114,13 +37157,25 @@ var ClaudeCodeProjector = class {
   activeParts = /* @__PURE__ */ new Map();
   activeToolInputs = /* @__PURE__ */ new Map();
   streamedMessageIds = /* @__PURE__ */ new Set();
+  // The SDK's "[Request interrupted by user]" transcript marker was seen since
+  // the last terminal result: the very next diagnostic-only
+  // `error_during_execution` result is that interrupt's cancellation, not a
+  // real turn failure (FRA-3548). Cleared on every result and on the next
+  // message_start so a stale marker can never reclassify a later failure.
+  interruptMarkerSeen = false;
   project(message) {
+    if (isClaudeCodeInterruptMarker(message)) {
+      this.interruptMarkerSeen = true;
+    }
     if (message.type === "stream_event") {
       return this.projectStreamEvent(message);
     }
     const parsed = parseClaudeCodeStreamRecord(message);
     const snapshotMessageId = assistantSnapshotMessageId(message);
     const suppressStreamed = snapshotMessageId !== null && this.streamedMessageIds.has(snapshotMessageId);
+    if (message.type === "assistant" && !suppressStreamed) {
+      this.interruptMarkerSeen = false;
+    }
     const outputs = !suppressStreamed && message.type === "assistant" ? projectAssistantSnapshot(parsed.projections) : parsed.projections.flatMap((entry) => {
       if (suppressStreamed && (entry.kind === "message" || entry.kind === "tool_call")) {
         return [];
@@ -37131,10 +37186,24 @@ var ClaudeCodeProjector = class {
       outputs.push(...this.endActiveParts(), ...this.finishActiveToolInputs());
       this.currentMessageId = null;
       this.activeResponseMessageId = null;
-      outputs.push(projectClaudeCodeResult(parsed.result));
+      outputs.push(
+        projectClaudeCodeResult(parsed.result, {
+          interrupted: this.isInterruptCancellation(parsed.result)
+        })
+      );
+      this.interruptMarkerSeen = false;
     }
     return outputs;
   }
+  // An interrupt cancels the running turn cleanly at the transcript level, but
+  // Claude Code has no cancelled result subtype: the turn's terminal result
+  // surfaces as a diagnostic-only `error_during_execution`. Treating that as a
+  // turn failure fed the FRA-3548 redelivery loop (the bridge redelivered a
+  // message the SDK was actively answering), so a failed result bracketed by
+  // the SDK's own interrupt marker is classified as a cancellation instead.
+  isInterruptCancellation(result) {
+    return result.isError && this.interruptMarkerSeen && isClaudeCodeEdeDiagnosticOnlyError(result.errorMessage);
+  }
   flushPendingAssistantMessages() {
     const outputs = [
       ...this.endActiveParts(),
@@ -37142,6 +37211,7 @@ var ClaudeCodeProjector = class {
     ];
     this.currentMessageId = null;
     this.activeResponseMessageId = null;
+    this.interruptMarkerSeen = false;
     return outputs;
   }
   projectStreamEvent(message) {
@@ -37150,6 +37220,7 @@ var ClaudeCodeProjector = class {
       this.streamedMessageIds.add(this.currentMessageId);
       this.activeParts.clear();
       this.activeToolInputs.clear();
+      this.interruptMarkerSeen = false;
       return this.ensureResponseStarted(this.currentMessageId);
     }
     if (message.event.type === "message_stop") {
@@ -37240,7 +37311,17 @@ var ClaudeCodeProjector = class {
     );
   }
 };
-function projectClaudeCodeResult(result) {
+function projectClaudeCodeResult(result, options = {}) {
+  if (options.interrupted) {
+    return {
+      type: "ui_message_chunk",
+      chunk: { type: "finish", finishReason: "stop" },
+      // Neutral wording: the projector sees that an interrupt cancelled the
+      // turn, not why the interrupt was sent.
+      statusText: "claude-code turn interrupted",
+      turnStatus: "completed"
+    };
+  }
   return {
     type: "ui_message_chunk",
     chunk: {
@@ -37803,6 +37884,13 @@ var ClaudeAgentBridgeSessionImpl = class {
   // settlement after the ack). Flushed once the turn ends and the session is
   // idle.
   deferredMessages = [];
+  // Consumed-command ids per enqueued turn, in injection order. Results arrive
+  // in turn order, so each terminal `result` settles the OLDEST open entry —
+  // which is also why an interrupted turn's result (arriving after the
+  // interrupter enqueued) still resolves to the interrupted command. A
+  // deferred flush enqueues one concatenated turn, so its entry carries every
+  // flushed command id.
+  openTurnCommandIds = [];
   // 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
@@ -37864,6 +37952,7 @@ var ClaudeAgentBridgeSessionImpl = class {
   }
   async sendMessage(message, options) {
     const mode = options?.mode ?? "interrupt";
+    const commandIds = options?.commandId ? [options.commandId] : [];
     const startedAt = Date.now();
     this.input.runtimeLogger?.info("agent_bridge_claude_send_message_started", {
       delivery_mode: mode,
@@ -37873,7 +37962,7 @@ var ClaudeAgentBridgeSessionImpl = class {
       deferred_count: this.deferredMessages.length
     });
     if (mode === "deferred" && this.hasInterruptibleTurn()) {
-      this.deferredMessages.push(message);
+      this.deferredMessages.push({ text: message, commandIds });
       this.input.runtimeLogger?.info("agent_bridge_claude_message_deferred", {
         active_turn_count: this.activeTurnCount,
         pending_tool_use_count: this.pendingToolUseIds.size,
@@ -37883,7 +37972,7 @@ var ClaudeAgentBridgeSessionImpl = class {
     }
     const interruption = await this.interruptActiveTurnBeforeMessage();
     if (interruption === "defer" && this.hasInterruptibleTurn()) {
-      this.deferredMessages.push(message);
+      this.deferredMessages.push({ text: message, commandIds });
       this.input.runtimeLogger?.info(
         "agent_bridge_claude_message_deferred_after_interrupt_timeout",
         {
@@ -37895,7 +37984,7 @@ var ClaudeAgentBridgeSessionImpl = class {
       return;
     }
     await this.awaitMcpRegistration();
-    this.enqueueUserMessage(message);
+    this.enqueueUserMessage(message, commandIds);
     this.input.runtimeLogger?.info("agent_bridge_claude_send_message_queued", {
       delivery_mode: mode,
       duration_ms: Date.now() - startedAt,
@@ -37905,6 +37994,20 @@ var ClaudeAgentBridgeSessionImpl = class {
       deferred_count: this.deferredMessages.length
     });
   }
+  noteActiveTurnCommand(commandId) {
+    const activeTurn = this.openTurnCommandIds[0];
+    if (activeTurn) {
+      activeTurn.push(commandId);
+    }
+    this.input.runtimeLogger?.info(
+      "agent_bridge_claude_active_turn_command_noted",
+      {
+        attributed: Boolean(activeTurn),
+        active_turn_count: this.activeTurnCount,
+        open_turn_entries: this.openTurnCommandIds.length
+      }
+    );
+  }
   close() {
     const previousState = this.state;
     if (previousState.kind === "closed") {
@@ -37920,6 +38023,7 @@ var ClaudeAgentBridgeSessionImpl = class {
       );
       this.deferredMessages.length = 0;
     }
+    this.openTurnCommandIds.length = 0;
     this.stderr.flush();
     this.inputQueue.close();
     if (previousState.kind === "started") {
@@ -38003,8 +38107,12 @@ var ClaudeAgentBridgeSessionImpl = class {
       try {
         for await (const message of query) {
           this.trackToolUseLifecycle(message);
+          let meta3;
           if (isClaudeAgentTurnResult(message)) {
             this.activeTurnCount = Math.max(0, this.activeTurnCount - 1);
+            meta3 = {
+              consumedCommandIds: this.openTurnCommandIds.shift() ?? []
+            };
             this.pendingToolUseIds.clear();
             this.turnResultCount += 1;
             this.resolveTurnSettlement(true);
@@ -38012,7 +38120,8 @@ var ClaudeAgentBridgeSessionImpl = class {
               active_turn_count: this.activeTurnCount,
               pending_tool_use_count: this.pendingToolUseIds.size,
               turn_result_count: this.turnResultCount,
-              deferred_count: this.deferredMessages.length
+              deferred_count: this.deferredMessages.length,
+              consumed_command_ids: meta3.consumedCommandIds
             });
             if (this.activeTurnCount === 0) {
               this.flushDeferredMessages();
@@ -38032,7 +38141,7 @@ var ClaudeAgentBridgeSessionImpl = class {
             this.close();
             return;
           }
-          await this.input.onMessage(message);
+          await this.input.onMessage(message, meta3);
         }
       } catch (error51) {
         if (this.state.kind !== "closed") {
@@ -38040,6 +38149,7 @@ var ClaudeAgentBridgeSessionImpl = class {
         }
       } finally {
         this.activeTurnCount = 0;
+        this.openTurnCommandIds.length = 0;
         this.pendingToolUseIds.clear();
         this.resolveTurnSettlement(false);
         this.state = { kind: "closed" };
@@ -38051,9 +38161,10 @@ var ClaudeAgentBridgeSessionImpl = class {
   // lets injection work while the SDK session is still starting; the queue
   // drains once the query attaches. Startup failures surface through onError
   // instead of failing injection.
-  enqueueUserMessage(message) {
+  enqueueUserMessage(message, commandIds) {
     this.inputQueue.push(claudeAgentUserMessage(message));
     this.activeTurnCount += 1;
+    this.openTurnCommandIds.push(commandIds);
     this.input.runtimeLogger?.info("agent_bridge_claude_message_enqueued", {
       state: this.state.kind,
       active_turn_count: this.activeTurnCount,
@@ -38137,7 +38248,10 @@ var ClaudeAgentBridgeSessionImpl = class {
     this.input.writeOutput?.(
       `agent_bridge_claude_deferred_flush count=${pending.length}`
     );
-    this.enqueueUserMessage(pending.join("\n\n"));
+    this.enqueueUserMessage(
+      pending.map((entry) => entry.text).join("\n\n"),
+      pending.flatMap((entry) => entry.commandIds)
+    );
   }
   async interruptActiveTurnBeforeMessage() {
     if (!this.hasInterruptibleTurn()) {
@@ -38804,7 +38918,8 @@ var ClaudeCodeCommandHandler = class {
         })
       );
       await this.ensureAgentSession().sendMessage(message, {
-        mode
+        mode,
+        commandId: delivery.commandId
       });
       this.input.runtimeLogger?.info(
         "agent_bridge_claude_command_send_message_ready",
@@ -38859,6 +38974,7 @@ var ClaudeCodeCommandHandler = class {
     const pending = this.pendingQuestions.get(answer.toolCallId);
     if (pending) {
       this.pendingQuestions.delete(answer.toolCallId);
+      this.agentSession?.noteActiveTurnCommand(delivery.commandId);
       pending.resolve({
         behavior: "allow",
         updatedInput: {
@@ -38885,7 +39001,9 @@ var ClaudeCodeCommandHandler = class {
         }
       }
     });
-    await this.ensureAgentSession().sendMessage(message);
+    await this.ensureAgentSession().sendMessage(message, {
+      commandId: delivery.commandId
+    });
     this.input.writeOutput?.(
       `agent_bridge_question_answer_fallback tool_use_id=${answer.toolCallId}`
     );
@@ -38941,7 +39059,7 @@ var ClaudeCodeCommandHandler = class {
       );
     }
   }
-  async handleAgentMessage(message) {
+  async handleAgentMessage(message, meta3) {
     const activeContext = this.context;
     if (!activeContext) {
       return;
@@ -38957,7 +39075,10 @@ var ClaudeCodeCommandHandler = class {
       return;
     }
     for (const projection of projections) {
-      await this.emitBridgeOutput(activeContext, projection);
+      await this.emitBridgeOutput(
+        activeContext,
+        withConsumedCommandIds(projection, meta3)
+      );
     }
   }
   async handleAgentError(error51) {
@@ -39025,7 +39146,7 @@ var ClaudeCodeCommandHandler = class {
       claude: this.input.claude,
       resumeAgentId: this.storedResumeAgentId(),
       canUseTool: this.canUseTool,
-      onMessage: (message) => this.handleAgentMessage(message),
+      onMessage: (message, meta3) => this.handleAgentMessage(message, meta3),
       onError: (error51) => this.handleAgentError(error51),
       onExit: () => {
         if (this.agentSession === session) {
@@ -39040,6 +39161,13 @@ var ClaudeCodeCommandHandler = class {
     return session;
   }
 };
+function withConsumedCommandIds(projection, meta3) {
+  const consumedCommandIds = meta3?.consumedCommandIds;
+  if (!consumedCommandIds || consumedCommandIds.length === 0 || projection.type !== "ui_message_chunk" || !projection.turnStatus) {
+    return projection;
+  }
+  return { ...projection, consumedCommandIds };
+}
 function answerFallbackMessage(answer) {
   const lines = Object.entries(answer.answers).map(
     ([question, value]) => `- ${question}: ${value}`

package/package.json

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