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

package/dist/index.js

@@ -258,7 +258,15 @@ var startMessageSchema = harnessV1BridgeStartBaseSchema.extend({
   // Resume signal. When true, the bridge passes `{ continue: true }` to the
   // Claude SDK so the in-workdir thread state is rehydrated. The host sets this
   // on the first prompt after a cross-process resume.
-  continue: z.boolean().optional()
+  continue: z.boolean().optional(),
+  // Exact conversation to resume, as the Claude SDK's `resume` option.
+  //
+  // Preferred over `continue` whenever the host knows which conversation it
+  // means: `continue` resolves to the most recent thread in the workdir, which
+  // is the wrong one as soon as anything else has run there since — including
+  // a resume that itself started a new thread. Mutually exclusive with
+  // `continue` in the SDK, so the bridge sends one or the other.
+  resumeSessionId: z.string().optional()
 });
 var inboundMessageSchema = z.discriminatedUnion("type", [
   startMessageSchema,
@@ -266,7 +274,7 @@ var inboundMessageSchema = z.discriminatedUnion("type", [
 ]);
 
 // src/version.ts
-var VERSION = true ? "1.0.96" : "0.0.0-test";
+var VERSION = true ? "1.0.98" : "0.0.0-test";
 
 // src/claude-code-harness.ts
 var CLAUDE_CODE_CLIENT_APP = `ai-sdk/harness-claude-code/${VERSION}`;
@@ -871,7 +879,18 @@ var claudeCodeBridgeCoordsSchema = z2.object({
 });
 var claudeCodeResumeStateSchema = z2.looseObject({
   bridge: claudeCodeBridgeCoordsSchema.optional(),
-  sandboxCredentialEnvironment: z2.record(z2.string(), z2.string()).optional()
+  sandboxCredentialEnvironment: z2.record(z2.string(), z2.string()).optional(),
+  /**
+   * The exact Claude conversation to rehydrate on resume. Written by the
+   * adapter on `doStop()`/`doDetach()`/`doSuspendTurn()` from the session id
+   * the bridge observed, so a resume names the conversation instead of
+   * relying on the SDK's `continue` flag — "most recent thread in this
+   * workdir" — which silently picks the wrong one once a second thread
+   * exists there. Hosts that captured the id themselves (it is surfaced as
+   * `harnessMetadata['claude-code'].sessionId` on `finish` parts) may also
+   * set it explicitly.
+   */
+  claudeSessionId: z2.string().optional()
 });
 function createClaudeCode(settings = {}) {
   if (settings.mcpServers != null && Object.prototype.hasOwnProperty.call(settings.mcpServers, "harness-tools")) {
@@ -964,7 +983,12 @@ function createClaudeCode(settings = {}) {
         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 bridgeStateDir = `${sessionDataDir}/bridge`;
       const timeoutMs = settings.startupTimeoutMs ?? 12e4;
@@ -1011,6 +1035,7 @@ function createClaudeCode(settings = {}) {
           return createSession({
             sessionId: startOpts.sessionId,
             channel: attachChannel,
+            ...resumeSessionId ? { resumeSessionId } : {},
             // The live bridge was spawned by another process; this one owns no
             // process handle. The session lifecycle method decides whether the
             // sandbox is left running, stopped, or destroyed.
@@ -1030,7 +1055,8 @@ function createClaudeCode(settings = {}) {
             debug: startOpts.observability?.debug,
             permissionMode: startOpts.permissionMode,
             builtinToolFiltering: startOpts.builtinToolFiltering,
-            skills: startOpts.skills ?? [],
+            sandbox: toolSafeSandboxSession,
+            sandboxHomeDir,
             mcpServers: settings.mcpServers,
             supportsUserMessageResponses: () => supportsUserMessageResponses
           });
@@ -1049,10 +1075,6 @@ function createClaudeCode(settings = {}) {
           respawnStrategy = "replay";
         }
       }
-      const sandboxHomeDir = startOpts.skills && startOpts.skills.length > 0 ? await resolveSandboxHomeDir({
-        sandbox: toolSafeSandboxSession,
-        abortSignal: startOpts.abortSignal
-      }) : void 0;
       const port = resolveBridgePort({
         sandboxSession,
         override: settings.port
@@ -1061,7 +1083,6 @@ function createClaudeCode(settings = {}) {
       const env = {
         BRIDGE_CHANNEL_TOKEN: token,
         BRIDGE_WS_PORT: String(port),
-        ...sandboxHomeDir ? { HOME: sandboxHomeDir } : {},
         ...respawnStrategy === "replay" ? { BRIDGE_REPLAY_FROM_DISK: "1" } : {}
       };
       if (respawnStrategy === void 0) {
@@ -1069,17 +1090,6 @@ function createClaudeCode(settings = {}) {
           command: `mkdir -p ${shellQuote(workDir)} ${shellQuote(bridgeStateDir)}`,
           abortSignal: startOpts.abortSignal
         });
-        if (startOpts.skills && startOpts.skills.length > 0) {
-          if (!sandboxHomeDir) {
-            throw new Error("Unable to resolve sandbox HOME directory.");
-          }
-          await writeClaudeCodeSkills({
-            sandbox: toolSafeSandboxSession,
-            homeDir: sandboxHomeDir,
-            skills: startOpts.skills,
-            abortSignal: startOpts.abortSignal
-          });
-        }
       }
       await markBridgeStarting({
         sandbox: toolSafeSandboxSession,
@@ -1153,6 +1163,7 @@ function createClaudeCode(settings = {}) {
         effort: settings.effort,
         isResume: respawnStrategy !== void 0,
         continueOnFirstPrompt: respawnStrategy !== void 0,
+        ...resumeSessionId ? { resumeSessionId } : {},
         rerunContinue: respawnStrategy === "rerun",
         bridgePort: boundPort,
         bridgeToken: token,
@@ -1161,7 +1172,8 @@ function createClaudeCode(settings = {}) {
         debug: startOpts.observability?.debug,
         permissionMode: startOpts.permissionMode,
         builtinToolFiltering: startOpts.builtinToolFiltering,
-        skills: startOpts.skills ?? [],
+        sandbox: toolSafeSandboxSession,
+        sandboxHomeDir,
         mcpServers: settings.mcpServers,
         supportsUserMessageResponses: () => supportsUserMessageResponses
       });
@@ -1401,6 +1413,7 @@ function createSession({
   effort,
   isResume,
   continueOnFirstPrompt,
+  resumeSessionId,
   rerunContinue,
   bridgePort,
   bridgeToken,
@@ -1409,13 +1422,15 @@ function createSession({
   debug,
   permissionMode,
   builtinToolFiltering,
-  skills,
+  sandbox,
+  sandboxHomeDir,
   mcpServers,
   supportsUserMessageResponses
 }) {
   let stopped = false;
   let stopPromise;
   let pendingResumeFlag = continueOnFirstPrompt;
+  let lastClaudeSessionId = resumeSessionId;
   const wireTurn = (turnOpts) => {
     let pendingResolve;
     let pendingReject;
@@ -1458,6 +1473,9 @@ function createSession({
       "reasoning-start",
       "reasoning-delta",
       "reasoning-end",
+      "tool-input-start",
+      "tool-input-delta",
+      "tool-input-end",
       "tool-call",
       "tool-approval-request",
       "tool-result",
@@ -1473,6 +1491,10 @@ function createSession({
     }
     unsubs.push(
       channel.on("finish", (msg) => {
+        const metadata = msg.harnessMetadata?.["claude-code"]?.sessionId;
+        if (typeof metadata === "string" && metadata.length > 0) {
+          lastClaudeSessionId = metadata;
+        }
         forward(msg);
         settleSuccess();
       })
@@ -1541,7 +1563,6 @@ function createSession({
   return {
     sessionId,
     isResume,
-    modelId: model,
     doPromptTurn: async (promptOpts) => {
       if (promptOpts.responseFormat?.type === "json" && promptOpts.responseFormat.schema == null) {
         throw new HarnessCapabilityUnsupportedError({
@@ -1549,10 +1570,19 @@ function createSession({
           harnessId: "claude-code"
         });
       }
+      await writeClaudeCodeSkills({
+        sandbox,
+        homeDir: sandboxHomeDir,
+        skills: promptOpts.skills,
+        abortSignal: promptOpts.abortSignal
+      });
       const control = wireTurn({
         emit: promptOpts.emit,
         abortSignal: promptOpts.abortSignal
       });
+      if (promptOpts.abortSignal?.aborted) {
+        return control;
+      }
       const startMessage = {
         type: "start",
         prompt: extractUserText(promptOpts.prompt),
@@ -1563,17 +1593,17 @@ function createSession({
         })),
         ...promptOpts.responseFormat == null ? {} : { responseFormat: promptOpts.responseFormat },
         ...promptOpts.instructions ? { instructions: promptOpts.instructions } : {},
-        model,
+        model: promptOpts.model ?? model,
         maxTurns,
         ...env !== void 0 ? { env } : {},
         thinking,
         ...effort !== void 0 ? { effort } : {},
-        ...skills.length > 0 ? { skills: skills.map((skill) => skill.name) } : {},
+        ...promptOpts.skills.length > 0 ? { skills: promptOpts.skills.map((skill) => skill.name) } : {},
         ...mcpServers == null ? {} : { mcpServers },
         ...permissionMode ? { permissionMode } : {},
         ...builtinToolFiltering ? { builtinToolFiltering } : {},
         ...debug ? { debug } : {},
-        ...pendingResumeFlag ? { continue: true } : {}
+        ...lastClaudeSessionId ? { resumeSessionId: lastClaudeSessionId } : pendingResumeFlag ? { continue: true } : {}
       };
       pendingResumeFlag = false;
       channel.send(startMessage);
@@ -1586,11 +1616,17 @@ function createSession({
           harnessId: "claude-code"
         });
       }
+      await writeClaudeCodeSkills({
+        sandbox,
+        homeDir: sandboxHomeDir,
+        skills: continueOpts.skills,
+        abortSignal: continueOpts.abortSignal
+      });
       const control = wireTurn({
         emit: continueOpts.emit,
         abortSignal: continueOpts.abortSignal
       });
-      if (rerunContinue) {
+      if (rerunContinue && !continueOpts.abortSignal?.aborted) {
         pendingResumeFlag = false;
         channel.send({
           type: "start",
@@ -1609,17 +1645,17 @@ function createSession({
           })),
           ...continueOpts.responseFormat == null ? {} : { responseFormat: continueOpts.responseFormat },
           ...continueOpts.instructions ? { instructions: continueOpts.instructions } : {},
-          model,
+          model: continueOpts.model ?? model,
           maxTurns,
           ...env !== void 0 ? { env } : {},
           thinking,
           ...effort !== void 0 ? { effort } : {},
-          ...skills.length > 0 ? { skills: skills.map((skill) => skill.name) } : {},
+          ...continueOpts.skills.length > 0 ? { skills: continueOpts.skills.map((skill) => skill.name) } : {},
           ...mcpServers == null ? {} : { mcpServers },
           ...permissionMode ? { permissionMode } : {},
           ...builtinToolFiltering ? { builtinToolFiltering } : {},
           ...debug ? { debug } : {},
-          continue: true
+          ...lastClaudeSessionId ? { resumeSessionId: lastClaudeSessionId } : { continue: true }
         });
       }
       return control;
@@ -1647,7 +1683,8 @@ function createSession({
             token: bridgeToken,
             lastSeenEventId,
             ...sandboxId == null ? {} : { sandboxId }
-          }
+          },
+          ...lastClaudeSessionId ? { claudeSessionId: lastClaudeSessionId } : {}
         }
       };
       return payload;
@@ -1740,7 +1777,11 @@ function createSession({
         type: "resume-session",
         harnessId: "claude-code",
         specificationVersion: "harness-v1",
+        // The bridge's stop reply carries the session id it observed; the
+        // adapter's own record backfills it when the reply predates the
+        // field or the channel was already closed.
         data: {
+          ...lastClaudeSessionId ? { claudeSessionId: lastClaudeSessionId } : {},
           ...lifecycleData,
           ...sandboxCredentialEnvironment == null ? {} : { sandboxCredentialEnvironment }
         }
@@ -1766,7 +1807,8 @@ function createSession({
             token: bridgeToken,
             lastSeenEventId,
             ...sandboxId == null ? {} : { sandboxId }
-          }
+          },
+          ...lastClaudeSessionId ? { claudeSessionId: lastClaudeSessionId } : {}
         }
       };
       return payload;