@ai-sdk/harness-claude-code 1.0.126 → 1.0.127

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-sdk/harness-claude-code",
-  "version": "1.0.126",
+  "version": "1.0.127",
   "type": "module",
   "license": "Apache-2.0",
   "sideEffects": false,
@@ -26,8 +26,8 @@
     }
   },
   "dependencies": {
-    "@ai-sdk/harness": "1.0.122",
-    "@ai-sdk/provider-utils": "5.0.46",
+    "@ai-sdk/harness": "1.0.123",
+    "@ai-sdk/provider-utils": "5.0.47",
     "ws": "^8.21.0"
   },
   "peerDependencies": {

package/src/bridge/index.ts

@@ -390,7 +390,7 @@ async function runTurn(start: StartMessage, turn: BridgeTurn): Promise<void> {
 
   const streamEventState = createClaudeStreamEventState();
 
-  const mcpServers: Record<string, unknown> = { ...(start.mcpServers ?? {}) };
+  const mcpServers: Record<string, unknown> = { ...start.mcpServers };
   if (start.tools && start.tools.length > 0) {
     const server = new mcpModule.McpServer({
       name: 'harness-tools',

package/src/bridge/json-schema-to-zod.ts

@@ -37,7 +37,7 @@ function toZodObject(schema: JsonSchemaObject) {
 
 function toZodShape(schema: JsonSchemaObject | undefined): ZodShape {
   if (!schema?.properties) return {};
-  const required = new Set(schema.required ?? []);
+  const required = new Set(schema.required);
   const shape: ZodShape = {};
   for (const [key, propSchema] of Object.entries(schema.properties)) {
     const propType = toZodType(propSchema);

package/src/claude-code-bootstrap.ts

@@ -16,16 +16,14 @@ const readBridgeAsset = createReadBridgeAsset({
 });
 
 /*
- * Bootstrap is derived state stored under the sandbox's default working
- * directory so snapshot-capable providers can preserve the installed CLI,
- * bridge, and recipe marker without requiring root filesystem access.
+ * Bootstrap is derived state stored under `$HOME/.ai-sdk-harness`, outside
+ * the agent's working directory. Snapshot-capable providers preserve the
+ * installed CLI, bridge, and recipe marker there.
  *
- * The session work dir (`startOpts.sessionWorkDir`) and the bridge-state dir
- * derived from `sandboxSession.defaultWorkingDirectory` both live under the sandbox's
- * default working directory — the provider's persistent mount — so the
- * workdir's CLI state (Claude's `~/.claude/projects/<dir>/*.jsonl` thread
- * history is keyed by working directory) and the bridge state files survive
- * both detach -> attach/replay and stop -> snapshot -> resume cycles.
+ * The session work dir (`startOpts.sessionWorkDir`) lives under the sandbox's
+ * default working directory, while the bridge-state dir lives under
+ * `$HOME/.ai-sdk-harness/.agent-runs`. Claude's project history is keyed by
+ * the working directory, so the same work dir is needed across resumes.
  */
 export const CLAUDE_CODE_BOOTSTRAP_DIR = '.harness-bootstrap/claude-code';
 

package/src/claude-code-harness.ts

@@ -21,6 +21,8 @@ import {
   type HarnessV1Session,
   type HarnessV1Skill,
   type HarnessV1StreamPart,
+  harnessStateDirectoryPath,
+  harnessSessionDataDirectoryPath,
 } from '@ai-sdk/harness';
 import {
   applyCredentialForwarding,
@@ -34,7 +36,6 @@ import {
   forwardBridgeProcessStream,
   getRestrictedSandboxSession,
   markBridgeStarting,
-  resolveSandboxDefaultWorkingDirectory,
   resolveSandboxHomeDir,
   SandboxChannel,
   shellQuote,
@@ -842,11 +843,6 @@ export function createClaudeCode(
             'The Claude Code harness cannot use `mintBridgeToken` with a sandbox session that does not expose an id.',
         });
       }
-      const defaultWorkingDirectory =
-        await resolveSandboxDefaultWorkingDirectory({
-          sandboxSession,
-          abortSignal: startOpts.abortSignal,
-        });
       const lifecycleState = startOpts.continueFrom ?? startOpts.resumeFrom;
       const isResume = lifecycleState != null;
       const isContinue = startOpts.continueFrom != null;
@@ -932,21 +928,25 @@ export function createClaudeCode(
             CLAUDE_CODE_CREDENTIAL_ENVIRONMENT_VARIABLES,
         });
       }
-      const bootstrapDir = posix.resolve(
-        defaultWorkingDirectory,
-        BOOTSTRAP_DIR,
-      );
+      // Harness SDK state (bootstrap, per-session runs) always lives under
+      // the sandbox's own HOME, never the working directory, so it stays
+      // out of a user-owned workspace.
+      const sandboxHomeDir = await resolveSandboxHomeDir({
+        sandbox: toolSafeSandboxSession,
+        abortSignal: startOpts.abortSignal,
+      });
+      const stateDir = harnessStateDirectoryPath({ sandboxHomeDir });
+      const bootstrapDir = posix.resolve(stateDir, BOOTSTRAP_DIR);
       // The conversation the host wants back, when it is known. Absent on
       // state written before this field existed; those resumes fall back to
       // the `continue` flag as before.
       const resumeSessionId = resumeData?.claudeSessionId;
 
       const workDir = startOpts.sessionWorkDir;
-      const sandboxHomeDir = await resolveSandboxHomeDir({
-        sandbox: toolSafeSandboxSession,
-        abortSignal: startOpts.abortSignal,
+      const sessionDataDir = harnessSessionDataDirectoryPath({
+        stateDirectory: stateDir,
+        sessionId: startOpts.sessionId,
       });
-      const sessionDataDir = `${defaultWorkingDirectory}/.agent-runs/${startOpts.sessionId}`;
       const bridgeStateDir = `${sessionDataDir}/bridge`;
       const timeoutMs = settings.startupTimeoutMs ?? 120_000;
 
@@ -1016,10 +1016,19 @@ export function createClaudeCode(
             onBridgeError,
             reconnect: settings.reconnect,
           });
-          await attachChannel.open(isContinue ? { resume: true } : undefined);
+          const finishListenerAttachment = isContinue
+            ? attachChannel.beginListenerAttachment()
+            : undefined;
+          try {
+            await attachChannel.open(isContinue ? { resume: true } : undefined);
+          } catch (error) {
+            finishListenerAttachment?.();
+            throw error;
+          }
           return createSession({
             sessionId: startOpts.sessionId,
             channel: attachChannel,
+            finishListenerAttachment,
             ...(resumeSessionId ? { resumeSessionId } : {}),
             // The live bridge was spawned by another process; this one owns no
             // process handle. The session lifecycle method decides whether the
@@ -1168,13 +1177,23 @@ export function createClaudeCode(
           ? { initialLastSeenEventId: coords?.lastSeenEventId ?? 0 }
           : {}),
       });
-      await channel.open(
-        respawnStrategy === 'replay' ? { resume: true } : undefined,
-      );
+      const finishListenerAttachment =
+        respawnStrategy === 'replay'
+          ? channel.beginListenerAttachment()
+          : undefined;
+      try {
+        await channel.open(
+          respawnStrategy === 'replay' ? { resume: true } : undefined,
+        );
+      } catch (error) {
+        finishListenerAttachment?.();
+        throw error;
+      }
 
       return createSession({
         sessionId: startOpts.sessionId,
         channel,
+        finishListenerAttachment,
         proc,
         maxTurns: settings.maxTurns,
         env: sandboxClaudeEnvironment,
@@ -1490,6 +1509,7 @@ function formatUnknownError(error: unknown): string {
 function createSession({
   sessionId,
   channel,
+  finishListenerAttachment,
   proc,
   maxTurns,
   env,
@@ -1513,6 +1533,7 @@ function createSession({
 }: {
   sessionId: string;
   channel: ClaudeCodeChannel;
+  finishListenerAttachment: (() => void) | undefined;
   /** Undefined on `attach` — the live bridge was spawned by another process. */
   proc: Experimental_SandboxProcess | undefined;
   maxTurns: number | undefined;
@@ -1621,6 +1642,7 @@ function createSession({
       'tool-approval-request',
       'tool-result',
       'finish-step',
+      'compaction',
       'raw',
     ] as const;
     for (const type of eventTypes) {
@@ -1650,6 +1672,8 @@ function createSession({
         settleError(msg.error);
       }),
     );
+    finishListenerAttachment?.();
+    finishListenerAttachment = undefined;
 
     /*
      * A `'suspended'` close is a graceful slice-boundary freeze the host