@ai-sdk/harness-claude-code 1.0.41 → 1.0.42

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @ai-sdk/harness-claude-code
 
+## 1.0.42
+
+### Patch Changes
+
+- 07c977a: chore(harness): refactor bridge code to break out stream event emission from launcher to make it testable
+- Updated dependencies [a94425b]
+- Updated dependencies [2de0611]
+  - @ai-sdk/harness@1.0.41
+
 ## 1.0.41
 
 ### Patch Changes

package/dist/bridge/index.mjs

@@ -513,7 +513,7 @@ function createCompactionLatch(emit) {
 }
 
 // src/bridge/index.ts
-import { randomUUID } from "crypto";
+import { randomUUID as randomUUID2 } from "crypto";
 import { argv, stdout as stdout2 } from "process";
 import * as claudeAgentSdk from "@anthropic-ai/claude-agent-sdk";
 import * as mcpServerModule from "@modelcontextprotocol/sdk/server/mcp.js";
@@ -523,6 +523,263 @@ function toClaudeSkillsOption(skills) {
   return skills && skills.length > 0 ? "all" : void 0;
 }
 
+// src/bridge/create-emit-stream-event.ts
+import { randomUUID } from "crypto";
+function createClaudeStreamEventState() {
+  return {
+    nativeToolCallNames: /* @__PURE__ */ new Map(),
+    approvalRequestedToolUseIds: /* @__PURE__ */ new Set(),
+    partialBlocks: /* @__PURE__ */ new Map(),
+    stepUsage: void 0,
+    pendingStepToolUseIds: /* @__PURE__ */ new Set(),
+    pendingStepUsage: void 0,
+    stepOpen: false,
+    mcpToolUseIds: /* @__PURE__ */ new Set(),
+    observedTerminalError: void 0
+  };
+}
+var UNRECOVERABLE_API_RETRY_STATUSES = /* @__PURE__ */ new Set([401, 403, 404]);
+function createEmitStreamEvent({
+  state,
+  emit,
+  emitWarning,
+  emitTerminalError,
+  onCompactionBoundary,
+  toCommonName: toCommonName2
+}) {
+  let streamStarted = false;
+  return (msg) => {
+    const type = msg.type;
+    if (!streamStarted) {
+      const initModel = type === "system" && msg.subtype === "init" && typeof msg.model === "string" ? msg.model : void 0;
+      emit({
+        type: "stream-start",
+        ...initModel ? { modelId: initModel } : {}
+      });
+      streamStarted = true;
+    }
+    if (type === "system" && msg.subtype === "api_retry") {
+      if (typeof msg.error_status === "number" && UNRECOVERABLE_API_RETRY_STATUSES.has(msg.error_status)) {
+        emitTerminalError(
+          `HTTP ${msg.error_status}: ${msg.error ?? "provider request failed"}`
+        );
+        return;
+      }
+      emitWarning({ message: formatApiRetryWarning(msg) });
+      return;
+    }
+    if (typeof msg.error === "string" && msg.error.trim()) {
+      state.observedTerminalError = msg.error.trim();
+    }
+    if (type === "auth_status" && typeof msg.error === "string" && msg.error.trim()) {
+      emitTerminalError(msg.error);
+      return;
+    }
+    if (type === "system" && msg.subtype === "task_updated" && msg.patch?.status === "failed" && typeof msg.patch.error === "string") {
+      emitTerminalError(msg.patch.error);
+      return;
+    }
+    if (type === "system" && msg.subtype === "compact_boundary") {
+      const meta = msg.compact_metadata;
+      if (meta) {
+        onCompactionBoundary({
+          trigger: meta.trigger,
+          ...typeof meta.pre_tokens === "number" ? { tokensBefore: meta.pre_tokens } : {},
+          ...typeof meta.post_tokens === "number" ? { tokensAfter: meta.post_tokens } : {}
+        });
+      }
+      return;
+    }
+    if (type === "stream_event") {
+      handleStreamEvent(msg.event, state.partialBlocks, emit);
+      return;
+    }
+    if (type === "assistant" && msg.message?.content) {
+      const usage = mapUsage(msg.message.usage);
+      const toolUseIds = [];
+      let opensStep = false;
+      for (const block of msg.message.content) {
+        if (block.type === "tool_use" && typeof block.id === "string" && typeof block.name === "string") {
+          toolUseIds.push(block.id);
+          const mcpPrefix = "mcp__harness-tools__";
+          if (block.name.startsWith(mcpPrefix)) {
+            state.pendingStepToolUseIds.add(block.id);
+            state.mcpToolUseIds.add(block.id);
+            opensStep = true;
+            continue;
+          }
+          state.nativeToolCallNames.set(block.id, block.name);
+          if (state.approvalRequestedToolUseIds.has(block.id)) {
+            continue;
+          }
+          state.pendingStepToolUseIds.add(block.id);
+          opensStep = true;
+          emit({
+            type: "tool-call",
+            toolCallId: block.id,
+            toolName: toCommonName2(block.name),
+            nativeName: block.name,
+            input: JSON.stringify(block.input ?? {}),
+            providerExecuted: true
+          });
+        }
+      }
+      if (opensStep || toolUseIds.length === 0) {
+        state.stepOpen = true;
+        if (usage) state.pendingStepUsage = usage;
+      }
+      return;
+    }
+    if (type === "user" && msg.message?.content) {
+      for (const block of msg.message.content) {
+        if (block.type === "tool_result" && typeof block.tool_use_id === "string") {
+          if (state.mcpToolUseIds.has(block.tool_use_id)) {
+            state.mcpToolUseIds.delete(block.tool_use_id);
+            state.pendingStepToolUseIds.delete(block.tool_use_id);
+            continue;
+          }
+          state.approvalRequestedToolUseIds.delete(block.tool_use_id);
+          const nativeName = state.nativeToolCallNames.get(block.tool_use_id) ?? "unknown";
+          state.nativeToolCallNames.delete(block.tool_use_id);
+          const toolName = toCommonName2(nativeName);
+          const isError = !!block.is_error;
+          const content = stringifyContent(block.content);
+          const result = toolName === "bash" ? { exitCode: isError ? 1 : 0, stdout: content } : content;
+          emit({
+            type: "tool-result",
+            toolCallId: block.tool_use_id,
+            toolName,
+            result,
+            isError
+          });
+          state.pendingStepToolUseIds.delete(block.tool_use_id);
+        }
+      }
+      closeStepIfReady({ state, emit });
+    }
+  };
+}
+function finishApprovalStep({
+  state,
+  emit,
+  approvalId
+}) {
+  state.stepOpen = true;
+  state.pendingStepToolUseIds.delete(approvalId);
+  closeStepIfReady({ state, emit });
+}
+function emitFinishStep({
+  state,
+  emit,
+  usage
+}) {
+  emit({
+    type: "finish-step",
+    finishReason: { unified: "stop", raw: "stop" },
+    usage: usage ?? defaultUsage()
+  });
+  state.stepUsage = usage ?? state.stepUsage;
+  state.pendingStepUsage = void 0;
+  state.pendingStepToolUseIds = /* @__PURE__ */ new Set();
+  state.stepOpen = false;
+}
+function closeStepIfReady({
+  state,
+  emit
+}) {
+  if (!state.stepOpen || state.pendingStepToolUseIds.size > 0 || state.partialBlocks.size > 0) {
+    return;
+  }
+  emitFinishStep({ state, emit, usage: state.pendingStepUsage });
+}
+function formatApiRetryWarning(msg) {
+  const details = [];
+  if (typeof msg.attempt === "number") {
+    const maxRetries = typeof msg.max_retries === "number" ? `/${msg.max_retries}` : "";
+    details.push(`attempt ${msg.attempt}${maxRetries}`);
+  }
+  if (typeof msg.error_status === "number") {
+    details.push(`HTTP ${msg.error_status}`);
+  }
+  if (typeof msg.retry_delay_ms === "number") {
+    details.push(`retrying in ${msg.retry_delay_ms}ms`);
+  }
+  if (msg.error) details.push(msg.error);
+  return details.length > 0 ? `Claude Code API retry: ${details.join("; ")}` : "Claude Code API retry";
+}
+function handleStreamEvent(event, partialBlocks, send) {
+  if (!event || typeof event.index !== "number") return;
+  const index = event.index;
+  if (event.type === "content_block_start") {
+    const blockType = event.content_block?.type;
+    if (blockType === "text") {
+      const id = randomUUID();
+      partialBlocks.set(index, { id, kind: "text" });
+      send({ type: "text-start", id });
+    } else if (blockType === "thinking") {
+      const id = randomUUID();
+      partialBlocks.set(index, { id, kind: "thinking" });
+      send({ type: "reasoning-start", id });
+    }
+    return;
+  }
+  if (event.type === "content_block_delta") {
+    const block = partialBlocks.get(index);
+    if (!block) return;
+    if (block.kind === "text" && event.delta?.type === "text_delta" && typeof event.delta.text === "string") {
+      send({ type: "text-delta", id: block.id, delta: event.delta.text });
+    } else if (block.kind === "thinking" && event.delta?.type === "thinking_delta" && typeof event.delta.thinking === "string") {
+      send({
+        type: "reasoning-delta",
+        id: block.id,
+        delta: event.delta.thinking
+      });
+    }
+    return;
+  }
+  if (event.type === "content_block_stop") {
+    const block = partialBlocks.get(index);
+    if (!block) return;
+    partialBlocks.delete(index);
+    if (block.kind === "text") {
+      send({ type: "text-end", id: block.id });
+    } else {
+      send({ type: "reasoning-end", id: block.id });
+    }
+  }
+}
+function stringifyContent(content) {
+  if (typeof content === "string") return content;
+  if (Array.isArray(content)) {
+    return content.map(
+      (entry) => entry && typeof entry === "object" && "text" in entry ? String(entry.text ?? "") : JSON.stringify(entry)
+    ).join("");
+  }
+  return JSON.stringify(content);
+}
+function mapUsage(usage) {
+  if (!usage || typeof usage !== "object") return void 0;
+  const u = usage;
+  return {
+    inputTokens: {
+      total: (u.input_tokens ?? 0) + (u.cache_creation_input_tokens ?? 0) + (u.cache_read_input_tokens ?? 0),
+      noCache: u.input_tokens ?? 0,
+      cacheRead: u.cache_read_input_tokens ?? 0,
+      cacheWrite: u.cache_creation_input_tokens ?? 0
+    },
+    outputTokens: {
+      total: u.output_tokens ?? 0,
+      text: u.output_tokens ?? 0
+    }
+  };
+}
+function defaultUsage() {
+  return {
+    inputTokens: { total: 0, noCache: 0, cacheRead: 0, cacheWrite: 0 },
+    outputTokens: { total: 0, text: 0 }
+  };
+}
+
 // src/bridge/json-schema-to-zod.ts
 import { z } from "zod/v4";
 function jsonSchemaToZodShape(input) {
@@ -653,7 +910,6 @@ var PUBLIC_TO_NATIVE = {
   ToolSearch: "ToolSearch"
 };
 var PUBLIC_TOOL_NAMES = Object.keys(PUBLIC_TO_NATIVE);
-var UNRECOVERABLE_API_RETRY_STATUSES = /* @__PURE__ */ new Set([401, 403, 404]);
 var NATIVE_TOOL_KINDS = {
   Read: "readonly",
   Glob: "readonly",
@@ -804,31 +1060,7 @@ async function runTurn(start, turn) {
       once: true
     });
   }
-  const nativeToolCallNames = /* @__PURE__ */ new Map();
-  const approvalRequestedToolUseIds = /* @__PURE__ */ new Set();
-  const partialBlocks = /* @__PURE__ */ new Map();
-  let stepUsage;
-  let pendingStepToolUseIds = /* @__PURE__ */ new Set();
-  let pendingStepUsage;
-  let stepOpen = false;
-  const emitFinishStep = (usage) => {
-    emit({
-      type: "finish-step",
-      finishReason: { unified: "stop", raw: "stop" },
-      usage: usage ?? defaultUsage()
-    });
-    stepUsage = usage ?? stepUsage;
-    pendingStepUsage = void 0;
-    pendingStepToolUseIds = /* @__PURE__ */ new Set();
-    stepOpen = false;
-  };
-  const closeStepIfReady = () => {
-    if (!stepOpen || pendingStepToolUseIds.size > 0 || partialBlocks.size > 0) {
-      return;
-    }
-    emitFinishStep(pendingStepUsage);
-  };
-  const mcpToolUseIds = /* @__PURE__ */ new Set();
+  const streamEventState = createClaudeStreamEventState();
   const mcpServers = {};
   if (start.tools && start.tools.length > 0) {
     const server = new mcpModule.McpServer({
@@ -842,7 +1074,7 @@ async function runTurn(start, turn) {
         tool.description ?? "",
         shape,
         async (input) => {
-          const toolCallId = randomUUID();
+          const toolCallId = randomUUID2();
           emit({
             type: "tool-call",
             toolCallId,
@@ -886,12 +1118,10 @@ async function runTurn(start, turn) {
     turn,
     emit,
     finishApprovalStep: (approvalId) => {
-      stepOpen = true;
-      pendingStepToolUseIds.delete(approvalId);
-      closeStepIfReady();
+      finishApprovalStep({ state: streamEventState, emit, approvalId });
     },
-    nativeToolCallNames,
-    approvalRequestedToolUseIds
+    nativeToolCallNames: streamEventState.nativeToolCallNames,
+    approvalRequestedToolUseIds: streamEventState.approvalRequestedToolUseIds
   });
   const q = claudeSdk.query({
     prompt: queryInput.input,
@@ -934,14 +1164,12 @@ async function runTurn(start, turn) {
   turn.onInterrupt(() => q.interrupt());
   let turnUsage;
   let totalCostUsd;
-  let observedTerminalError;
   let emittedTerminalError = false;
   let emittedTerminalFinish = false;
-  let streamStarted = false;
   const emitTerminalError = (message) => {
     const normalized = message?.trim();
     if (!normalized || emittedTerminalError || emittedTerminalFinish) return;
-    observedTerminalError = normalized;
+    streamEventState.observedTerminalError = normalized;
     emittedTerminalError = true;
     turn.emitError({
       error: normalized,
@@ -950,123 +1178,24 @@ async function runTurn(start, turn) {
     queryInput.close();
     abortCtl.abort();
   };
+  const emitStreamEvent = createEmitStreamEvent({
+    state: streamEventState,
+    emit,
+    emitWarning: turn.emitWarning,
+    emitTerminalError,
+    onCompactionBoundary: (boundary) => compaction.onBoundary(boundary),
+    toCommonName
+  });
   try {
     for await (const msg of q) {
       if (abortCtl.signal.aborted) break;
       const type = msg.type;
-      if (!streamStarted) {
-        const initModel = type === "system" && msg.subtype === "init" && typeof msg.model === "string" ? msg.model : void 0;
-        emit({
-          type: "stream-start",
-          ...initModel ? { modelId: initModel } : {}
-        });
-        streamStarted = true;
-      }
-      if (type === "system" && msg.subtype === "api_retry") {
-        if (typeof msg.error_status === "number" && UNRECOVERABLE_API_RETRY_STATUSES.has(msg.error_status)) {
-          emitTerminalError(
-            `HTTP ${msg.error_status}: ${msg.error ?? "provider request failed"}`
-          );
-          continue;
-        }
-        turn.emitWarning({ message: formatApiRetryWarning(msg) });
-        continue;
-      }
-      if (typeof msg.error === "string" && msg.error.trim()) {
-        observedTerminalError = msg.error.trim();
-      }
-      if (type === "auth_status" && typeof msg.error === "string" && msg.error.trim()) {
-        emitTerminalError(msg.error);
-        continue;
-      }
-      if (type === "system" && msg.subtype === "task_updated" && msg.patch?.status === "failed" && typeof msg.patch.error === "string") {
-        emitTerminalError(msg.patch.error);
-        continue;
-      }
-      if (type === "system" && msg.subtype === "compact_boundary") {
-        const meta = msg.compact_metadata;
-        if (meta) {
-          compaction.onBoundary({
-            trigger: meta.trigger,
-            ...typeof meta.pre_tokens === "number" ? { tokensBefore: meta.pre_tokens } : {},
-            ...typeof meta.post_tokens === "number" ? { tokensAfter: meta.post_tokens } : {}
-          });
-        }
-        continue;
-      }
-      if (type === "stream_event") {
-        handleStreamEvent(msg.event, partialBlocks, emit);
-        continue;
-      }
-      if (type === "assistant" && msg.message?.content) {
-        const usage = mapUsage(msg.message.usage);
-        const toolUseIds = [];
-        let opensStep = false;
-        for (const block of msg.message.content) {
-          if (block.type === "tool_use" && typeof block.id === "string" && typeof block.name === "string") {
-            toolUseIds.push(block.id);
-            const mcpPrefix = "mcp__harness-tools__";
-            if (block.name.startsWith(mcpPrefix)) {
-              pendingStepToolUseIds.add(block.id);
-              mcpToolUseIds.add(block.id);
-              opensStep = true;
-              continue;
-            }
-            nativeToolCallNames.set(block.id, block.name);
-            if (approvalRequestedToolUseIds.has(block.id)) {
-              continue;
-            }
-            pendingStepToolUseIds.add(block.id);
-            opensStep = true;
-            emit({
-              type: "tool-call",
-              toolCallId: block.id,
-              toolName: toCommonName(block.name),
-              nativeName: block.name,
-              input: JSON.stringify(block.input ?? {}),
-              providerExecuted: true
-            });
-          }
-        }
-        if (opensStep || toolUseIds.length === 0) {
-          stepOpen = true;
-          if (usage) pendingStepUsage = usage;
-        }
-        continue;
-      }
-      if (type === "user" && msg.message?.content) {
-        for (const block of msg.message.content) {
-          if (block.type === "tool_result" && typeof block.tool_use_id === "string") {
-            if (mcpToolUseIds.has(block.tool_use_id)) {
-              mcpToolUseIds.delete(block.tool_use_id);
-              pendingStepToolUseIds.delete(block.tool_use_id);
-              continue;
-            }
-            approvalRequestedToolUseIds.delete(block.tool_use_id);
-            const nativeName = nativeToolCallNames.get(block.tool_use_id) ?? "unknown";
-            nativeToolCallNames.delete(block.tool_use_id);
-            const toolName = toCommonName(nativeName);
-            const isError = !!block.is_error;
-            const content = stringifyContent(block.content);
-            const result = toolName === "bash" ? { exitCode: isError ? 1 : 0, stdout: content } : content;
-            emit({
-              type: "tool-result",
-              toolCallId: block.tool_use_id,
-              toolName,
-              result,
-              isError
-            });
-            pendingStepToolUseIds.delete(block.tool_use_id);
-          }
-        }
-        closeStepIfReady();
-        continue;
-      }
+      emitStreamEvent(msg);
       if (type === "result") {
         if (msg.subtype === "success") {
           const emptyResult = !msg.result?.trim?.();
-          if (emptyResult && observedTerminalError) {
-            emitTerminalError(observedTerminalError);
+          if (emptyResult && streamEventState.observedTerminalError) {
+            emitTerminalError(streamEventState.observedTerminalError);
             continue;
           }
           const usage = msg.usage ?? msg.message?.usage;
@@ -1075,12 +1204,18 @@ async function runTurn(start, turn) {
           if (typeof msg.total_cost_usd === "number") {
             totalCostUsd = (totalCostUsd ?? 0) + msg.total_cost_usd;
           }
-          if (stepOpen) emitFinishStep(harnessUsage ?? pendingStepUsage);
+          if (streamEventState.stepOpen) {
+            emitFinishStep({
+              state: streamEventState,
+              emit,
+              usage: harnessUsage ?? streamEventState.pendingStepUsage
+            });
+          }
           queryInput.close();
           break;
         } else {
           emitTerminalError(
-            (Array.isArray(msg.errors) ? msg.errors.join("\n") : void 0) || observedTerminalError || msg.result || "Unknown error"
+            (Array.isArray(msg.errors) ? msg.errors.join("\n") : void 0) || streamEventState.observedTerminalError || msg.result || "Unknown error"
           );
         }
         continue;
@@ -1100,66 +1235,10 @@ async function runTurn(start, turn) {
   emit({
     type: "finish",
     finishReason: { unified: "stop", raw: "stop" },
-    totalUsage: turnUsage ?? stepUsage ?? defaultUsage(),
+    totalUsage: turnUsage ?? streamEventState.stepUsage ?? defaultUsage(),
     ...totalCostUsd !== void 0 ? { harnessMetadata: { "claude-code": { costUsd: totalCostUsd } } } : {}
   });
 }
-function formatApiRetryWarning(msg) {
-  const details = [];
-  if (typeof msg.attempt === "number") {
-    const maxRetries = typeof msg.max_retries === "number" ? `/${msg.max_retries}` : "";
-    details.push(`attempt ${msg.attempt}${maxRetries}`);
-  }
-  if (typeof msg.error_status === "number") {
-    details.push(`HTTP ${msg.error_status}`);
-  }
-  if (typeof msg.retry_delay_ms === "number") {
-    details.push(`retrying in ${msg.retry_delay_ms}ms`);
-  }
-  if (msg.error) details.push(msg.error);
-  return details.length > 0 ? `Claude Code API retry: ${details.join("; ")}` : "Claude Code API retry";
-}
-function handleStreamEvent(event, partialBlocks, send) {
-  if (!event || typeof event.index !== "number") return;
-  const index = event.index;
-  if (event.type === "content_block_start") {
-    const blockType = event.content_block?.type;
-    if (blockType === "text") {
-      const id = randomUUID();
-      partialBlocks.set(index, { id, kind: "text" });
-      send({ type: "text-start", id });
-    } else if (blockType === "thinking") {
-      const id = randomUUID();
-      partialBlocks.set(index, { id, kind: "thinking" });
-      send({ type: "reasoning-start", id });
-    }
-    return;
-  }
-  if (event.type === "content_block_delta") {
-    const block = partialBlocks.get(index);
-    if (!block) return;
-    if (block.kind === "text" && event.delta?.type === "text_delta" && typeof event.delta.text === "string") {
-      send({ type: "text-delta", id: block.id, delta: event.delta.text });
-    } else if (block.kind === "thinking" && event.delta?.type === "thinking_delta" && typeof event.delta.thinking === "string") {
-      send({
-        type: "reasoning-delta",
-        id: block.id,
-        delta: event.delta.thinking
-      });
-    }
-    return;
-  }
-  if (event.type === "content_block_stop") {
-    const block = partialBlocks.get(index);
-    if (!block) return;
-    partialBlocks.delete(index);
-    if (block.kind === "text") {
-      send({ type: "text-end", id: block.id });
-    } else {
-      send({ type: "reasoning-end", id: block.id });
-    }
-  }
-}
 function createQueryInput({
   initialUserMessage,
   pendingUserMessages,
@@ -1211,37 +1290,6 @@ function createQueryInput({
     }
   };
 }
-function stringifyContent(content) {
-  if (typeof content === "string") return content;
-  if (Array.isArray(content)) {
-    return content.map(
-      (entry) => entry && typeof entry === "object" && "text" in entry ? String(entry.text ?? "") : JSON.stringify(entry)
-    ).join("");
-  }
-  return JSON.stringify(content);
-}
-function mapUsage(usage) {
-  if (!usage || typeof usage !== "object") return void 0;
-  const u = usage;
-  return {
-    inputTokens: {
-      total: (u.input_tokens ?? 0) + (u.cache_creation_input_tokens ?? 0) + (u.cache_read_input_tokens ?? 0),
-      noCache: u.input_tokens ?? 0,
-      cacheRead: u.cache_read_input_tokens ?? 0,
-      cacheWrite: u.cache_creation_input_tokens ?? 0
-    },
-    outputTokens: {
-      total: u.output_tokens ?? 0,
-      text: u.output_tokens ?? 0
-    }
-  };
-}
-function defaultUsage() {
-  return {
-    inputTokens: { total: 0, noCache: 0, cacheRead: 0, cacheWrite: 0 },
-    outputTokens: { total: 0, text: 0 }
-  };
-}
 function parseArgs(args2) {
   const out = {};
   for (let i = 0; i < args2.length; i++) {