@ai-sdk/harness-claude-code 1.0.98 → 1.0.100

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-sdk/harness-claude-code",
-  "version": "1.0.98",
+  "version": "1.0.100",
   "type": "module",
   "license": "Apache-2.0",
   "sideEffects": false,
@@ -26,7 +26,7 @@
     }
   },
   "dependencies": {
-    "@ai-sdk/harness": "1.0.94",
+    "@ai-sdk/harness": "1.0.96",
     "@ai-sdk/provider-utils": "5.0.34",
     "ws": "^8.21.0"
   },

package/src/bridge/create-emit-stream-event.ts

@@ -42,6 +42,7 @@ export type ClaudeMessage = {
   usage?: Record<string, unknown>;
   total_cost_usd?: number;
   structured_output?: unknown;
+  tool_use_result?: unknown;
 };
 
 type MessageBlock = {
@@ -103,6 +104,13 @@ export function createClaudeStreamEventState(): ClaudeStreamEventState {
 }
 
 const UNRECOVERABLE_API_RETRY_STATUSES = new Set([401, 403, 404]);
+const HOST_TOOL_PREFIX = 'mcp__harness-tools__';
+
+export function isExternalMcpTool(nativeName: string): boolean {
+  return (
+    nativeName.startsWith('mcp__') && !nativeName.startsWith(HOST_TOOL_PREFIX)
+  );
+}
 
 export function createEmitStreamEvent({
   state,
@@ -231,15 +239,14 @@ export function createEmitStreamEvent({
             state.structuredOutputToolUseIds.add(block.id);
             continue;
           }
-          const mcpPrefix = 'mcp__harness-tools__';
-          if (block.name.startsWith(mcpPrefix)) {
+          if (block.name.startsWith(HOST_TOOL_PREFIX)) {
             state.pendingStepToolUseIds.add(block.id);
             state.mcpToolUseIds.add(block.id);
             opensStep = true;
             continue;
           }
           state.nativeToolCallNames.set(block.id, block.name);
-          const dynamic = block.name.startsWith('mcp__');
+          const dynamic = isExternalMcpTool(block.name);
           if (dynamic) state.externalMcpToolUseIds.add(block.id);
           if (state.approvalRequestedToolUseIds.has(block.id)) {
             continue;
@@ -265,6 +272,12 @@ export function createEmitStreamEvent({
     }
 
     if (type === 'user' && msg.message?.content) {
+      const toolResultBlocks = msg.message.content.filter(
+        block => block.type === 'tool_result',
+      );
+      const toolUseResult =
+        toolResultBlocks.length === 1 ? msg.tool_use_result : undefined;
+
       for (const block of msg.message.content) {
         if (
           block.type === 'tool_result' &&
@@ -291,17 +304,19 @@ export function createEmitStreamEvent({
            * numeric exit code — the SDK exposes only stdout/stderr text and
            * an is_error flag. Consumers (and the example UI) render bash
            * failures from an `exitCode` field on a structured result, the
-           * shape Codex's shell tool provides natively. To match it, derive
-           * a binary code from is_error: 1 on failure, 0 on success. This is
-           * a stand-in for failed/succeeded, not the process's true exit
-           * status.
+           * shape Codex's shell tool provides natively. When Claude omits
+           * `tool_use_result`, derive a binary code from is_error: 1 on
+           * failure, 0 on success. This fallback is a stand-in for
+           * failed/succeeded, not the process's true exit status.
            */
-          const result =
+          const contentResult =
             toolName === 'bash'
               ? { exitCode: isError ? 1 : 0, stdout: content }
               : dynamic
                 ? parseMcpToolResult(content)
                 : content;
+          const result =
+            toolUseResult !== undefined ? toolUseResult : contentResult;
           emit({
             type: 'tool-result',
             toolCallId: block.tool_use_id,
@@ -388,8 +403,6 @@ function formatApiRetryWarning(msg: ClaudeMessage): string {
     : 'Claude Code API retry';
 }
 
-const HOST_TOOL_PREFIX = 'mcp__harness-tools__';
-
 function handleStreamEvent({
   event,
   state,
@@ -428,8 +441,7 @@ function handleStreamEvent({
       const hostToolName = nativeName.startsWith(HOST_TOOL_PREFIX)
         ? nativeName.slice(HOST_TOOL_PREFIX.length)
         : undefined;
-      const dynamic =
-        hostToolName === undefined && nativeName.startsWith('mcp__');
+      const dynamic = isExternalMcpTool(nativeName);
       partialBlocks.set(index, { id, kind: 'tool-input' });
       send({
         type: 'tool-input-start',

package/src/bridge/index.ts

@@ -43,6 +43,7 @@ import {
   defaultUsage,
   emitFinishStep,
   finishApprovalStep,
+  isExternalMcpTool,
   mapUsage,
   type ClaudeMessage,
 } from './create-emit-stream-event';
@@ -201,6 +202,7 @@ function createPermissionOptions(input: {
         nativeName: toolName,
         input: JSON.stringify(toolInput ?? {}),
         providerExecuted: true,
+        ...(isExternalMcpTool(toolName) ? { dynamic: true } : {}),
       });
       input.emit({
         type: 'tool-approval-request',

package/src/claude-code-bootstrap.ts

@@ -1,6 +1,9 @@
-import { readFile } from 'node:fs/promises';
-import { fileURLToPath } from 'node:url';
 import type { HarnessV1Bootstrap } from '@ai-sdk/harness';
+import { createReadBridgeAsset } from '@ai-sdk/harness/utils';
+
+const readBridgeAsset = createReadBridgeAsset({
+  resolveAssetUrl: name => new URL(`./bridge/${name}`, import.meta.url),
+});
 
 /*
  * Bootstrap is derived state stored under the sandbox's default working
@@ -49,21 +52,3 @@ export async function getClaudeCodeBootstrap(): Promise<HarnessV1Bootstrap> {
   };
   return cachedBootstrap;
 }
-
-async function readBridgeAsset(name: string): Promise<string> {
-  const candidates = [
-    new URL(`./bridge/${name}`, import.meta.url),
-    new URL(`../bridge/${name}`, import.meta.url),
-  ];
-  let lastErr: unknown;
-  for (const url of candidates) {
-    try {
-      return await readFile(fileURLToPath(url), 'utf8');
-    } catch (err) {
-      const code = (err as NodeJS.ErrnoException).code;
-      if (code !== 'ENOENT') throw err;
-      lastErr = err;
-    }
-  }
-  throw lastErr ?? new Error(`bridge asset not found: ${name}`);
-}

package/src/claude-code-harness.ts

@@ -1,4 +1,3 @@
-import { randomBytes } from 'node:crypto';
 import { posix } from 'node:path';
 import {
   commonTool,
@@ -24,6 +23,7 @@ import {
   applyCredentialForwarding,
   classifyDiskLog,
   createSandboxCredentialEnvironment,
+  createBridgeToken,
   experimental_createBridgeUserMessageSubmitter,
   createBridgeErrorHandler,
   createBridgeStartupError,
@@ -37,6 +37,7 @@ import {
   shellQuote,
   warnCredentialBrokeringUnavailable,
   waitForBridgeReady,
+  withBridgeToken,
   writeSkills as writeHarnessSkills,
 } from '@ai-sdk/harness/utils';
 import {
@@ -1069,7 +1070,7 @@ export function createClaudeCode(
       });
       const token =
         settings.mintBridgeToken == null
-          ? randomBytes(32).toString('hex')
+          ? createBridgeToken()
           : settings.mintBridgeToken(sandboxId!);
       const env = {
         BRIDGE_CHANNEL_TOKEN: token,
@@ -1468,18 +1469,6 @@ function webSocketMessageToString(raw: unknown): string {
   return String(raw);
 }
 
-function withBridgeToken({
-  endpoint,
-  token,
-}: {
-  endpoint: HarnessV1PortEndpoint;
-  token: string;
-}): HarnessV1PortEndpoint {
-  const bridgeUrl = new URL(endpoint.url);
-  bridgeUrl.searchParams.set('agent_bridge_token', token);
-  return { ...endpoint, url: bridgeUrl.toString() };
-}
-
 function sleep(ms: number): Promise<void> {
   return new Promise(resolve => {
     const timer = setTimeout(resolve, ms);