@ai-sdk/harness-claude-code 1.0.97 → 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.97" : "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")) {
@@ -892,7 +911,6 @@ function createClaudeCode(settings = {}) {
     lifecycleStateSchema: claudeCodeResumeStateSchema,
     getBootstrap: getClaudeCodeBootstrap,
     doStart: async (startOpts) => {
-      const model = startOpts.model ?? settings.model;
       const sandboxSession = startOpts.sandboxSession;
       const toolSafeSandboxSession = getRestrictedSandboxSession(sandboxSession);
       const sandboxId = "id" in sandboxSession ? sandboxSession.id : void 0;
@@ -965,6 +983,7 @@ function createClaudeCode(settings = {}) {
         defaultWorkingDirectory,
         CLAUDE_CODE_BOOTSTRAP_DIR
       );
+      const resumeSessionId = resumeData?.claudeSessionId;
       const workDir = startOpts.sessionWorkDir;
       const sandboxHomeDir = await resolveSandboxHomeDir({
         sandbox: toolSafeSandboxSession,
@@ -1016,11 +1035,12 @@ 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.
             proc: void 0,
-            model,
+            model: settings.model,
             maxTurns: settings.maxTurns,
             env: sandboxClaudeEnvironment,
             thinking,
@@ -1136,13 +1156,14 @@ function createClaudeCode(settings = {}) {
         sessionId: startOpts.sessionId,
         channel,
         proc,
-        model,
+        model: settings.model,
         maxTurns: settings.maxTurns,
         env: sandboxClaudeEnvironment,
         thinking,
         effort: settings.effort,
         isResume: respawnStrategy !== void 0,
         continueOnFirstPrompt: respawnStrategy !== void 0,
+        ...resumeSessionId ? { resumeSessionId } : {},
         rerunContinue: respawnStrategy === "rerun",
         bridgePort: boundPort,
         bridgeToken: token,
@@ -1392,6 +1413,7 @@ function createSession({
   effort,
   isResume,
   continueOnFirstPrompt,
+  resumeSessionId,
   rerunContinue,
   bridgePort,
   bridgeToken,
@@ -1408,6 +1430,7 @@ function createSession({
   let stopped = false;
   let stopPromise;
   let pendingResumeFlag = continueOnFirstPrompt;
+  let lastClaudeSessionId = resumeSessionId;
   const wireTurn = (turnOpts) => {
     let pendingResolve;
     let pendingReject;
@@ -1450,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",
@@ -1465,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();
       })
@@ -1533,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({
@@ -1564,7 +1593,7 @@ function createSession({
         })),
         ...promptOpts.responseFormat == null ? {} : { responseFormat: promptOpts.responseFormat },
         ...promptOpts.instructions ? { instructions: promptOpts.instructions } : {},
-        model,
+        model: promptOpts.model ?? model,
         maxTurns,
         ...env !== void 0 ? { env } : {},
         thinking,
@@ -1574,7 +1603,7 @@ function createSession({
         ...permissionMode ? { permissionMode } : {},
         ...builtinToolFiltering ? { builtinToolFiltering } : {},
         ...debug ? { debug } : {},
-        ...pendingResumeFlag ? { continue: true } : {}
+        ...lastClaudeSessionId ? { resumeSessionId: lastClaudeSessionId } : pendingResumeFlag ? { continue: true } : {}
       };
       pendingResumeFlag = false;
       channel.send(startMessage);
@@ -1616,7 +1645,7 @@ function createSession({
           })),
           ...continueOpts.responseFormat == null ? {} : { responseFormat: continueOpts.responseFormat },
           ...continueOpts.instructions ? { instructions: continueOpts.instructions } : {},
-          model,
+          model: continueOpts.model ?? model,
           maxTurns,
           ...env !== void 0 ? { env } : {},
           thinking,
@@ -1626,7 +1655,7 @@ function createSession({
           ...permissionMode ? { permissionMode } : {},
           ...builtinToolFiltering ? { builtinToolFiltering } : {},
           ...debug ? { debug } : {},
-          continue: true
+          ...lastClaudeSessionId ? { resumeSessionId: lastClaudeSessionId } : { continue: true }
         });
       }
       return control;
@@ -1654,7 +1683,8 @@ function createSession({
             token: bridgeToken,
             lastSeenEventId,
             ...sandboxId == null ? {} : { sandboxId }
-          }
+          },
+          ...lastClaudeSessionId ? { claudeSessionId: lastClaudeSessionId } : {}
         }
       };
       return payload;
@@ -1747,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 }
         }
@@ -1773,7 +1807,8 @@ function createSession({
             token: bridgeToken,
             lastSeenEventId,
             ...sandboxId == null ? {} : { sandboxId }
-          }
+          },
+          ...lastClaudeSessionId ? { claudeSessionId: lastClaudeSessionId } : {}
         }
       };
       return payload;