@autohq/cli 0.1.307 → 0.1.309

package/dist/agent-bridge.js

@@ -23399,7 +23399,7 @@ Object.assign(lookup, {
 // package.json
 var package_default = {
   name: "@autohq/cli",
-  version: "0.1.307",
+  version: "0.1.309",
   license: "SEE LICENSE IN README.md",
   publishConfig: {
     access: "public"
@@ -24616,6 +24616,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 +24686,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 +24757,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: [
@@ -39832,7 +39863,7 @@ function legacyToolEntry(chunk) {
             {
               type: "tool_result",
               toolUseId: legacyToolCallId(chunk.toolCallId),
-              output: chunk.errorText,
+              output: errorOutput(chunk.errorText),
               isError: true
             }
           ]
@@ -39860,6 +39891,13 @@ function legacyToolEntry(chunk) {
 function legacyToolCallId(toolCallId) {
   return toolCallId === UNKNOWN_MESSAGE_ID ? null : toolCallId;
 }
+function errorOutput(errorText) {
+  try {
+    return JSON.parse(errorText);
+  } catch {
+    return errorText;
+  }
+}
 function terminalStatusText(projection) {
   if (projection.statusText) {
     return projection.statusText;
@@ -40009,13 +40047,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 [];
@@ -40026,10 +40076,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(),
@@ -40037,6 +40101,7 @@ var ClaudeCodeProjector = class {
     ];
     this.currentMessageId = null;
     this.activeResponseMessageId = null;
+    this.interruptMarkerSeen = false;
     return outputs;
   }
   projectStreamEvent(message) {
@@ -40045,6 +40110,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") {
@@ -40135,7 +40201,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: {

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.307",
+      version: "0.1.309",
       license: "SEE LICENSE IN README.md",
       publishConfig: {
         access: "public"
@@ -36929,7 +36960,7 @@ function legacyToolEntry(chunk) {
             {
               type: "tool_result",
               toolUseId: legacyToolCallId(chunk.toolCallId),
-              output: chunk.errorText,
+              output: errorOutput(chunk.errorText),
               isError: true
             }
           ]
@@ -36957,6 +36988,13 @@ function legacyToolEntry(chunk) {
 function legacyToolCallId(toolCallId) {
   return toolCallId === UNKNOWN_MESSAGE_ID ? null : toolCallId;
 }
+function errorOutput(errorText) {
+  try {
+    return JSON.parse(errorText);
+  } catch {
+    return errorText;
+  }
+}
 function terminalStatusText(projection) {
   if (projection.statusText) {
     return projection.statusText;
@@ -37107,13 +37145,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 [];
@@ -37124,10 +37174,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(),
@@ -37135,6 +37199,7 @@ var ClaudeCodeProjector = class {
     ];
     this.currentMessageId = null;
     this.activeResponseMessageId = null;
+    this.interruptMarkerSeen = false;
     return outputs;
   }
   projectStreamEvent(message) {
@@ -37143,6 +37208,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") {
@@ -37233,7 +37299,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: {

package/package.json

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