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

package/dist/index.js

@@ -4,7 +4,9 @@ import {
   commonTool,
   HARNESS_V1_BUILTIN_TOOLS,
   harnessV1DiagnosticFromBridgeFrame,
-  HarnessCapabilityUnsupportedError
+  HarnessCapabilityUnsupportedError,
+  harnessStateDirectoryPath,
+  harnessSessionDataDirectoryPath
 } from "@ai-sdk/harness";
 import {
   applyCredentialForwarding,
@@ -18,7 +20,6 @@ import {
   forwardBridgeProcessStream,
   getRestrictedSandboxSession,
   markBridgeStarting,
-  resolveSandboxDefaultWorkingDirectory,
   resolveSandboxHomeDir,
   SandboxChannel,
   shellQuote,
@@ -449,7 +450,7 @@ var inboundMessageSchema = z.discriminatedUnion("type", [
 ]);
 
 // src/version.ts
-var VERSION = true ? "1.0.125" : "0.0.0-test";
+var VERSION = true ? "1.0.127" : "0.0.0-test";
 
 // src/claude-code-harness.ts
 var CLAUDE_CODE_CLIENT_APP = `ai-sdk/harness-claude-code/${VERSION}`;
@@ -1077,10 +1078,6 @@ function createClaudeCode(settings = {}) {
           message: "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;
@@ -1146,17 +1143,18 @@ function createClaudeCode(settings = {}) {
           credentialEnvironmentVariables: CLAUDE_CODE_CREDENTIAL_ENVIRONMENT_VARIABLES
         });
       }
-      const bootstrapDir = posix.resolve(
-        defaultWorkingDirectory,
-        CLAUDE_CODE_BOOTSTRAP_DIR
-      );
-      const resumeSessionId = resumeData?.claudeSessionId;
-      const workDir = startOpts.sessionWorkDir;
       const sandboxHomeDir = await resolveSandboxHomeDir({
         sandbox: toolSafeSandboxSession,
         abortSignal: startOpts.abortSignal
       });
-      const sessionDataDir = `${defaultWorkingDirectory}/.agent-runs/${startOpts.sessionId}`;
+      const stateDir = harnessStateDirectoryPath({ sandboxHomeDir });
+      const bootstrapDir = posix.resolve(stateDir, CLAUDE_CODE_BOOTSTRAP_DIR);
+      const resumeSessionId = resumeData?.claudeSessionId;
+      const workDir = startOpts.sessionWorkDir;
+      const sessionDataDir = harnessSessionDataDirectoryPath({
+        stateDirectory: stateDir,
+        sessionId: startOpts.sessionId
+      });
       const bridgeStateDir = `${sessionDataDir}/bridge`;
       const timeoutMs = settings.startupTimeoutMs ?? 12e4;
       const report = startOpts.observability?.report;
@@ -1202,10 +1200,17 @@ function createClaudeCode(settings = {}) {
             onBridgeError,
             reconnect: settings.reconnect
           });
-          await attachChannel.open(isContinue ? { resume: true } : void 0);
+          const finishListenerAttachment2 = isContinue ? attachChannel.beginListenerAttachment() : void 0;
+          try {
+            await attachChannel.open(isContinue ? { resume: true } : void 0);
+          } catch (error) {
+            finishListenerAttachment2?.();
+            throw error;
+          }
           return createSession({
             sessionId: startOpts.sessionId,
             channel: attachChannel,
+            finishListenerAttachment: finishListenerAttachment2,
             ...resumeSessionId ? { resumeSessionId } : {},
             // The live bridge was spawned by another process; this one owns no
             // process handle. The session lifecycle method decides whether the
@@ -1320,12 +1325,19 @@ function createClaudeCode(settings = {}) {
         // `finish`) rather than starting empty.
         ...respawnStrategy === "replay" ? { initialLastSeenEventId: coords?.lastSeenEventId ?? 0 } : {}
       });
-      await channel.open(
-        respawnStrategy === "replay" ? { resume: true } : void 0
-      );
+      const finishListenerAttachment = respawnStrategy === "replay" ? channel.beginListenerAttachment() : void 0;
+      try {
+        await channel.open(
+          respawnStrategy === "replay" ? { resume: true } : void 0
+        );
+      } catch (error) {
+        finishListenerAttachment?.();
+        throw error;
+      }
       return createSession({
         sessionId: startOpts.sessionId,
         channel,
+        finishListenerAttachment,
         proc,
         maxTurns: settings.maxTurns,
         env: sandboxClaudeEnvironment,
@@ -1568,6 +1580,7 @@ function formatUnknownError(error) {
 function createSession({
   sessionId,
   channel,
+  finishListenerAttachment,
   proc,
   maxTurns,
   env,
@@ -1642,6 +1655,7 @@ function createSession({
       "tool-approval-request",
       "tool-result",
       "finish-step",
+      "compaction",
       "raw"
     ];
     for (const type of eventTypes) {
@@ -1667,6 +1681,8 @@ function createSession({
         settleError(msg.error);
       })
     );
+    finishListenerAttachment?.();
+    finishListenerAttachment = void 0;
     const onClose = (_code, reason) => {
       if (isSettled) return;
       if (reason === "suspended") {