@autohq/cli 0.1.309 → 0.1.311

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.309",
+  version: "0.1.311",
   license: "SEE LICENSE IN README.md",
   publishConfig: {
     access: "public"
@@ -39535,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
     });
@@ -39557,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 }]
         }
@@ -39953,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) {
@@ -40015,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
   });
@@ -60346,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
@@ -60407,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,
@@ -60416,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,
@@ -60426,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",
         {
@@ -60438,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,
@@ -60448,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") {
@@ -60463,6 +60497,7 @@ var ClaudeAgentBridgeSessionImpl = class {
       );
       this.deferredMessages.length = 0;
     }
+    this.openTurnCommandIds.length = 0;
     this.stderr.flush();
     this.inputQueue.close();
     if (previousState.kind === "started") {
@@ -60546,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);
@@ -60555,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();
@@ -60575,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") {
@@ -60583,6 +60623,7 @@ var ClaudeAgentBridgeSessionImpl = class {
         }
       } finally {
         this.activeTurnCount = 0;
+        this.openTurnCommandIds.length = 0;
         this.pendingToolUseIds.clear();
         this.resolveTurnSettlement(false);
         this.state = { kind: "closed" };
@@ -60594,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,
@@ -60680,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()) {
@@ -61347,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",
@@ -61402,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: {
@@ -61428,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}`
     );
@@ -61484,7 +61533,7 @@ var ClaudeCodeCommandHandler = class {
       );
     }
   }
-  async handleAgentMessage(message) {
+  async handleAgentMessage(message, meta3) {
     const activeContext = this.context;
     if (!activeContext) {
       return;
@@ -61500,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) {
@@ -61568,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) {
@@ -61583,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

@@ -25610,7 +25610,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@autohq/cli",
-      version: "0.1.309",
+      version: "0.1.311",
       license: "SEE LICENSE IN README.md",
       publishConfig: {
         access: "public"
@@ -27723,15 +27723,15 @@ var init_template_staleness = __esm({
 function readProjectApplyDirectorySource(input) {
   const resourceRoot = normalizeSourcePath(input.resourceRoot ?? "");
   const displayResourceRoot2 = input.displayResourceRoot ?? (resourceRoot || ".auto");
-  const fileIndex = sourceFileIndex(input.files);
-  assertNoLegacySessionSourceFiles(
-    input.files,
-    resourceRoot,
-    displayResourceRoot2
-  );
-  assertNoStandaloneSourceFiles(input.files, resourceRoot, displayResourceRoot2);
-  assertValidFragmentSourceFiles(input.files, resourceRoot, fileIndex);
-  const agentFiles = input.files.filter(
+  const files = injectManagedTemplateFiles({
+    files: input.files,
+    registry: defaultTemplateRegistry
+  });
+  const fileIndex = sourceFileIndex(files);
+  assertNoLegacySessionSourceFiles(files, resourceRoot, displayResourceRoot2);
+  assertNoStandaloneSourceFiles(files, resourceRoot, displayResourceRoot2);
+  assertValidFragmentSourceFiles(files, resourceRoot, fileIndex);
+  const agentFiles = files.filter(
     (file2) => isResourceFileUnderDirectory(
       file2.path,
       sourcePathJoin(resourceRoot, primaryApplyDirectory())
@@ -27747,7 +27747,7 @@ function readProjectApplyDirectorySource(input) {
       }))
     );
   }
-  const configResource = readProjectConfigResource(input.files, resourceRoot);
+  const configResource = readProjectConfigResource(files, resourceRoot);
   const resources = [
     ...dedupeGeneratedResources(resourceRecords),
     ...configResource ? [configResource] : []
@@ -27765,7 +27765,12 @@ function readProjectApplyDirectorySource(input) {
 }
 function readProjectApplyFileSource(input) {
   const request = readProjectApplyDocumentSourceFile(input.file, {
-    fileIndex: sourceFileIndex(input.files ?? [input.file])
+    fileIndex: sourceFileIndex(
+      injectManagedTemplateFiles({
+        files: input.files ?? [input.file],
+        registry: defaultTemplateRegistry
+      })
+    )
   });
   return ProjectApplyRequestSchema.parse({
     ...request,
@@ -35642,7 +35647,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"])
@@ -35702,6 +35712,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();
@@ -36632,6 +36645,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
     });
@@ -36654,6 +36668,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 }]
         }
@@ -37050,7 +37065,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) {
@@ -37112,6 +37128,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
   });
@@ -37872,6 +37889,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
@@ -37933,6 +37957,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,
@@ -37942,7 +37967,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,
@@ -37952,7 +37977,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",
         {
@@ -37964,7 +37989,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,
@@ -37974,6 +37999,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") {
@@ -37989,6 +38028,7 @@ var ClaudeAgentBridgeSessionImpl = class {
       );
       this.deferredMessages.length = 0;
     }
+    this.openTurnCommandIds.length = 0;
     this.stderr.flush();
     this.inputQueue.close();
     if (previousState.kind === "started") {
@@ -38072,8 +38112,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);
@@ -38081,7 +38125,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();
@@ -38101,7 +38146,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") {
@@ -38109,6 +38154,7 @@ var ClaudeAgentBridgeSessionImpl = class {
         }
       } finally {
         this.activeTurnCount = 0;
+        this.openTurnCommandIds.length = 0;
         this.pendingToolUseIds.clear();
         this.resolveTurnSettlement(false);
         this.state = { kind: "closed" };
@@ -38120,9 +38166,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,
@@ -38206,7 +38253,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()) {
@@ -38873,7 +38923,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",
@@ -38928,6 +38979,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: {
@@ -38954,7 +39006,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}`
     );
@@ -39010,7 +39064,7 @@ var ClaudeCodeCommandHandler = class {
       );
     }
   }
-  async handleAgentMessage(message) {
+  async handleAgentMessage(message, meta3) {
     const activeContext = this.context;
     if (!activeContext) {
       return;
@@ -39026,7 +39080,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) {
@@ -39094,7 +39151,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) {
@@ -39109,6 +39166,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.309",
+  "version": "0.1.311",
   "license": "SEE LICENSE IN README.md",
   "publishConfig": {
     "access": "public"