@ai-sdk/harness-claude-code 1.0.95 → 1.0.97

package/dist/index.js

@@ -93,7 +93,8 @@ import { homedir } from "os";
 import { join } from "path";
 import {
   createCredentialRequestTransformation,
-  getAiGatewayAuthFromEnv
+  getAiGatewayAuthFromEnv,
+  isHarnessAuthenticationEnvironment
 } from "@ai-sdk/harness/utils";
 var CLAUDE_CODE_CREDENTIAL_ENVIRONMENT_VARIABLES = [
   "AI_GATEWAY_API_KEY",
@@ -136,70 +137,49 @@ function createClaudeCodeRequestTransformations({
   return transformations;
 }
 function resolveClaudeCodeEnv(auth, processEnv = process.env, options = {}) {
-  const normalizedAuth = normalizeClaudeCodeAuthToLegacyAuth(auth);
-  const readApiKey = options.readApiKeyHelper ?? readApiKeyHelper;
-  if (normalizedAuth?.anthropic) {
+  const suppliedEnvironment = isHarnessAuthenticationEnvironment(auth);
+  const authenticationEnvironment = suppliedEnvironment ? auth : processEnv;
+  const readApiKey = suppliedEnvironment || auth === "direct" ? () => void 0 : options.readApiKeyHelper ?? readApiKeyHelper;
+  if (auth === "direct") {
     return pickAnthropic({
-      explicit: normalizedAuth.anthropic,
-      processEnv,
+      processEnv: authenticationEnvironment,
       readApiKey
     });
   }
-  const gatewayAuthFromEnv = getAiGatewayAuthFromEnv({ env: processEnv });
-  if (normalizedAuth?.gateway) {
-    return pickGateway({
-      explicit: normalizedAuth.gateway,
-      gatewayAuthFromEnv
-    });
-  }
-  if (gatewayAuthFromEnv.apiKey) {
-    return pickGateway({
-      explicit: {},
-      gatewayAuthFromEnv
-    });
+  const gatewayAuthFromEnv = getAiGatewayAuthFromEnv({
+    env: authenticationEnvironment
+  });
+  if (auth === "ai-gateway" || gatewayAuthFromEnv.apiKey) {
+    return pickGateway({ gatewayAuthFromEnv });
   }
-  return pickAnthropic({ processEnv, readApiKey });
+  return pickAnthropic({
+    processEnv: authenticationEnvironment,
+    readApiKey
+  });
 }
 function resolveClaudeCodeAuthenticationMode(auth, processEnv = process.env) {
-  if (auth === "direct" || typeof auth !== "string" && auth?.anthropic) {
+  if (isHarnessAuthenticationEnvironment(auth)) {
+    return getAiGatewayAuthFromEnv({ env: auth }).apiKey ? "ai-gateway" : "direct";
+  }
+  if (auth === "direct") {
     return "direct";
   }
-  if (auth === "ai-gateway" || typeof auth !== "string" && auth?.gateway) {
+  if (auth === "ai-gateway") {
     return "ai-gateway";
   }
   return getAiGatewayAuthFromEnv({ env: processEnv }).apiKey ? "ai-gateway" : "direct";
 }
-function normalizeClaudeCodeAuthToLegacyAuth(auth) {
-  if (auth == null || auth === "auto") {
-    return void 0;
-  }
-  if (typeof auth === "string") {
-    switch (auth) {
-      case "direct":
-        return { anthropic: {} };
-      case "ai-gateway":
-        return { gateway: {} };
-      default:
-        return void 0;
-    }
-  }
-  console.warn(
-    '[claude-code] Passing an object to auth options is deprecated. Use a string mode ("auto" | "direct" | "ai-gateway") instead, and pass credentials via environment variables.'
-  );
-  return auth;
-}
 function pickAnthropic({
-  explicit,
   processEnv,
   readApiKey
 }) {
   const env = {};
-  const helperKey = explicit ? void 0 : readApiKey();
-  const apiKey = explicit?.apiKey ?? processEnv.ANTHROPIC_API_KEY ?? helperKey;
-  const authToken = explicit?.authToken ?? processEnv.ANTHROPIC_AUTH_TOKEN ?? helperKey;
+  const helperKey = readApiKey();
+  const apiKey = processEnv.ANTHROPIC_API_KEY ?? helperKey;
+  const authToken = processEnv.ANTHROPIC_AUTH_TOKEN ?? helperKey;
   if (apiKey) env.ANTHROPIC_API_KEY = apiKey;
   if (authToken) env.ANTHROPIC_AUTH_TOKEN = authToken;
-  const baseUrl = explicit?.baseUrl ?? processEnv.ANTHROPIC_BASE_URL;
+  const baseUrl = processEnv.ANTHROPIC_BASE_URL;
   if (baseUrl) env.ANTHROPIC_BASE_URL = baseUrl;
   return env;
 }
@@ -232,11 +212,10 @@ function readApiKeyHelper() {
   }
 }
 function pickGateway({
-  explicit,
   gatewayAuthFromEnv
 }) {
-  const apiKey = explicit.apiKey ?? gatewayAuthFromEnv.apiKey;
-  const baseUrl = explicit.baseUrl ?? gatewayAuthFromEnv.baseUrl;
+  const apiKey = gatewayAuthFromEnv.apiKey;
+  const baseUrl = gatewayAuthFromEnv.baseUrl;
   const env = {};
   if (apiKey) {
     env.AI_GATEWAY_API_KEY = apiKey;
@@ -287,7 +266,7 @@ var inboundMessageSchema = z.discriminatedUnion("type", [
 ]);
 
 // src/version.ts
-var VERSION = true ? "1.0.95" : "0.0.0-test";
+var VERSION = true ? "1.0.97" : "0.0.0-test";
 
 // src/claude-code-harness.ts
 var CLAUDE_CODE_CLIENT_APP = `ai-sdk/harness-claude-code/${VERSION}`;
@@ -913,6 +892,7 @@ 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;
@@ -986,6 +966,10 @@ function createClaudeCode(settings = {}) {
         CLAUDE_CODE_BOOTSTRAP_DIR
       );
       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;
@@ -1036,7 +1020,7 @@ function createClaudeCode(settings = {}) {
             // process handle. The session lifecycle method decides whether the
             // sandbox is left running, stopped, or destroyed.
             proc: void 0,
-            model: settings.model,
+            model,
             maxTurns: settings.maxTurns,
             env: sandboxClaudeEnvironment,
             thinking,
@@ -1051,7 +1035,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
           });
@@ -1070,10 +1055,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
@@ -1082,7 +1063,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) {
@@ -1090,17 +1070,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,
@@ -1167,7 +1136,7 @@ function createClaudeCode(settings = {}) {
         sessionId: startOpts.sessionId,
         channel,
         proc,
-        model: settings.model,
+        model,
         maxTurns: settings.maxTurns,
         env: sandboxClaudeEnvironment,
         thinking,
@@ -1182,7 +1151,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
       });
@@ -1430,7 +1400,8 @@ function createSession({
   debug,
   permissionMode,
   builtinToolFiltering,
-  skills,
+  sandbox,
+  sandboxHomeDir,
   mcpServers,
   supportsUserMessageResponses
 }) {
@@ -1570,10 +1541,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),
@@ -1589,7 +1569,7 @@ function createSession({
         ...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 } : {},
@@ -1607,11 +1587,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",
@@ -1635,7 +1621,7 @@ function createSession({
           ...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 } : {},