@ai-sdk/harness-opencode 1.0.93 → 1.0.95

package/dist/index.js

@@ -94,7 +94,8 @@ async function readBridgeAsset(name) {
 // src/opencode-auth.ts
 import {
   createCredentialRequestTransformation,
-  getAiGatewayAuthFromEnv
+  getAiGatewayAuthFromEnv,
+  isHarnessAuthenticationEnvironment
 } from "@ai-sdk/harness/utils";
 var OPENCODE_CREDENTIAL_ENVIRONMENT_VARIABLES = [
   "AI_GATEWAY_API_KEY",
@@ -211,29 +212,22 @@ function resolveOpenCodeEnv({
   provider,
   processEnv = process.env
 }) {
-  const normalizedAuth = normalizeOpenCodeAuthToLegacyAuth(auth);
+  const suppliedEnvironment = isHarnessAuthenticationEnvironment(auth);
+  const authenticationEnvironment = suppliedEnvironment ? auth : processEnv;
   const selectedProvider = resolveOpenCodeProvider({ model, provider });
-  if (normalizedAuth?.openaiCompatible) {
-    return pickOpenAICompatible(normalizedAuth.openaiCompatible, processEnv);
+  if (selectedProvider === "openai" && auth === "openai") {
+    return pickOpenAI({ processEnv: authenticationEnvironment });
   }
-  if (selectedProvider === "openai") {
-    if (normalizedAuth?.openai) {
-      return pickOpenAI({ explicit: normalizedAuth.openai, processEnv });
-    }
-  } else if (normalizedAuth?.anthropic) {
-    return pickAnthropic({ explicit: normalizedAuth.anthropic, processEnv });
-  }
-  const gatewayAuthFromEnv = getAiGatewayAuthFromEnv({ env: processEnv });
-  if (normalizedAuth?.gateway) {
-    return pickGateway({
-      explicit: normalizedAuth.gateway,
-      gatewayAuthFromEnv
-    });
+  if (selectedProvider === "anthropic" && auth === "anthropic") {
+    return pickAnthropic({ processEnv: authenticationEnvironment });
   }
-  if (gatewayAuthFromEnv.apiKey) {
-    return pickGateway({ explicit: {}, gatewayAuthFromEnv });
+  const gatewayAuthFromEnv = getAiGatewayAuthFromEnv({
+    env: authenticationEnvironment
+  });
+  if (auth === "ai-gateway" || gatewayAuthFromEnv.apiKey) {
+    return pickGateway({ gatewayAuthFromEnv });
   }
-  return selectedProvider === "openai" ? pickOpenAI({ processEnv }) : pickAnthropic({ processEnv });
+  return selectedProvider === "openai" ? pickOpenAI({ processEnv: authenticationEnvironment }) : pickAnthropic({ processEnv: authenticationEnvironment });
 }
 function resolveOpenCodeAuthenticationMode({
   auth,
@@ -241,17 +235,17 @@ function resolveOpenCodeAuthenticationMode({
   provider,
   processEnv = process.env
 }) {
-  if (typeof auth !== "string" && auth?.openaiCompatible) {
-    return "openai";
+  if (isHarnessAuthenticationEnvironment(auth)) {
+    return getAiGatewayAuthFromEnv({ env: auth }).apiKey ? "ai-gateway" : resolveOpenCodeProvider({ model, provider });
   }
   const selectedProvider = resolveOpenCodeProvider({ model, provider });
-  if (selectedProvider === "openai" && (auth === "openai" || typeof auth !== "string" && auth?.openai)) {
+  if (selectedProvider === "openai" && auth === "openai") {
     return "openai";
   }
-  if (selectedProvider === "anthropic" && (auth === "anthropic" || typeof auth !== "string" && auth?.anthropic)) {
+  if (selectedProvider === "anthropic" && auth === "anthropic") {
     return "anthropic";
   }
-  if (auth === "ai-gateway" || typeof auth !== "string" && auth?.gateway) {
+  if (auth === "ai-gateway") {
     return "ai-gateway";
   }
   if (getAiGatewayAuthFromEnv({ env: processEnv }).apiKey) {
@@ -259,80 +253,39 @@ function resolveOpenCodeAuthenticationMode({
   }
   return selectedProvider;
 }
-function normalizeOpenCodeAuthToLegacyAuth(auth) {
-  if (auth == null || auth === "auto") {
-    return void 0;
-  }
-  if (typeof auth === "string") {
-    switch (auth) {
-      case "anthropic":
-        return { anthropic: {} };
-      case "openai":
-        return { openai: {} };
-      case "ai-gateway":
-        return { gateway: {} };
-      default:
-        return void 0;
-    }
-  }
-  console.warn(
-    '[opencode] Passing an object to auth options is deprecated. Use a string mode ("auto" | "anthropic" | "openai" | "ai-gateway") instead, and pass credentials via environment variables.'
-  );
-  return auth;
-}
-function pickOpenAICompatible(explicit, processEnv) {
-  const env = {};
-  const apiKey = explicit.apiKey ?? processEnv.OPENAI_API_KEY;
-  if (apiKey) env.OPENAI_API_KEY = apiKey;
-  const baseUrl = explicit.baseUrl ?? processEnv.OPENAI_BASE_URL;
-  if (baseUrl) env.OPENAI_BASE_URL = baseUrl;
-  const name = explicit.name ?? processEnv.OPENAI_NAME;
-  if (name) env.OPENAI_NAME = name;
-  if (explicit.queryParams && Object.keys(explicit.queryParams).length > 0) {
-    env.OPENAI_QUERY_PARAMS_JSON = JSON.stringify(explicit.queryParams);
-  } else if (processEnv.OPENAI_QUERY_PARAMS_JSON) {
-    env.OPENAI_QUERY_PARAMS_JSON = processEnv.OPENAI_QUERY_PARAMS_JSON;
-  }
-  return env;
-}
 function pickOpenAI({
-  explicit,
   processEnv
 }) {
   const env = {};
-  const apiKey = explicit?.apiKey ?? processEnv.OPENAI_API_KEY;
+  const apiKey = processEnv.OPENAI_API_KEY;
   if (apiKey) env.OPENAI_API_KEY = apiKey;
-  const baseUrl = explicit?.baseUrl ?? processEnv.OPENAI_BASE_URL;
+  const baseUrl = processEnv.OPENAI_BASE_URL;
   if (baseUrl) env.OPENAI_BASE_URL = baseUrl;
-  const organization = explicit?.organization ?? processEnv.OPENAI_ORGANIZATION;
+  const organization = processEnv.OPENAI_ORGANIZATION;
   if (organization) env.OPENAI_ORGANIZATION = organization;
-  const project = explicit?.project ?? processEnv.OPENAI_PROJECT;
+  const project = processEnv.OPENAI_PROJECT;
   if (project) env.OPENAI_PROJECT = project;
   return env;
 }
 function pickAnthropic({
-  explicit,
   processEnv
 }) {
   const env = {};
-  const apiKey = explicit?.apiKey ?? processEnv.ANTHROPIC_API_KEY;
+  const apiKey = processEnv.ANTHROPIC_API_KEY;
   if (apiKey) env.ANTHROPIC_API_KEY = apiKey;
-  const authToken = explicit?.authToken ?? processEnv.ANTHROPIC_AUTH_TOKEN;
+  const authToken = processEnv.ANTHROPIC_AUTH_TOKEN;
   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;
 }
 function pickGateway({
-  explicit,
   gatewayAuthFromEnv
 }) {
   const env = {};
-  const apiKey = explicit.apiKey ?? gatewayAuthFromEnv.apiKey;
+  const apiKey = gatewayAuthFromEnv.apiKey;
   if (apiKey) env.AI_GATEWAY_API_KEY = apiKey;
-  const baseUrl = toOpenCodeGatewayBaseUrl(
-    explicit.baseUrl ?? gatewayAuthFromEnv.baseUrl
-  );
+  const baseUrl = toOpenCodeGatewayBaseUrl(gatewayAuthFromEnv.baseUrl);
   env.AI_GATEWAY_BASE_URL = baseUrl;
   return env;
 }
@@ -355,7 +308,9 @@ var startMessageSchema = harnessV1BridgeStartBaseSchema.extend({
   provider: z.string().optional(),
   variant: z.string().optional(),
   instructions: z.string().optional(),
+  skillsChanged: z.boolean().optional(),
   resumeSessionId: z.string().optional(),
+  openCodeConfig: z.record(z.string(), z.unknown()).optional(),
   mcpServers: z.record(z.string(), z.unknown()).optional()
 });
 var inboundMessageSchema = z.discriminatedUnion("type", [
@@ -364,7 +319,7 @@ var inboundMessageSchema = z.discriminatedUnion("type", [
 ]);
 
 // src/version.ts
-var VERSION = true ? "1.0.93" : "0.0.0-test";
+var VERSION = true ? "1.0.95" : "0.0.0-test";
 
 // src/opencode-harness.ts
 var OPENCODE_CLIENT_APP = `ai-sdk/harness-opencode/${VERSION}`;
@@ -492,6 +447,7 @@ function createOpenCode(settings = {}) {
     lifecycleStateSchema: openCodeResumeStateSchema,
     getBootstrap: getOpenCodeBootstrap,
     doStart: async (startOpts) => {
+      const configuredModel = startOpts.model ?? settings.model;
       const sandboxSession = startOpts.sandboxSession;
       const toolSafeSandboxSession = getRestrictedSandboxSession(sandboxSession);
       const sandboxId = "id" in sandboxSession ? sandboxSession.id : void 0;
@@ -518,12 +474,12 @@ function createOpenCode(settings = {}) {
       const coords = resumeData?.bridge;
       const authenticationMode = resolveOpenCodeAuthenticationMode({
         auth: settings.auth,
-        model: settings.model,
+        model: configuredModel,
         provider: settings.provider
       });
       const resolvedAuthEnvironment = resolveOpenCodeEnv({
         auth: settings.auth,
-        model: settings.model,
+        model: configuredModel,
         provider: settings.provider
       });
       let sandboxAuthEnvironment = resolvedAuthEnvironment;
@@ -558,10 +514,18 @@ function createOpenCode(settings = {}) {
         OPENCODE_BOOTSTRAP_DIR
       );
       const workDir = startOpts.sessionWorkDir;
+      const sandboxHomeDir = await resolveSandboxHomeDir({
+        sandbox: toolSafeSandboxSession,
+        abortSignal: startOpts.abortSignal
+      });
+      const skillsDir = path.posix.join(sandboxHomeDir, ".agents", "skills");
       const sessionDataDir = `${defaultWorkingDirectory}/.agent-runs/${startOpts.sessionId}`;
       const bridgeStateDir = `${sessionDataDir}/bridge`;
       const timeoutMs = settings.startupTimeoutMs ?? 12e4;
-      const model = splitOpenCodeModel(settings.model, settings.provider).model;
+      const model = splitOpenCodeModel(
+        configuredModel,
+        settings.provider
+      ).model;
       const report = startOpts.observability?.report;
       const onDiagnostic = report ? (frame) => report(
         harnessV1DiagnosticFromBridgeFrame(frame, {
@@ -606,6 +570,7 @@ function createOpenCode(settings = {}) {
             model,
             provider: settings.provider,
             reasoningVariant: settings.reasoningVariant,
+            openCodeConfig: settings.openCodeConfig,
             mcpServers: settings.mcpServers,
             openCodeSessionId: resumeSessionId,
             isResume: true,
@@ -618,6 +583,8 @@ function createOpenCode(settings = {}) {
             debug: startOpts.observability?.debug,
             permissionMode: startOpts.permissionMode,
             builtinToolFiltering: startOpts.builtinToolFiltering,
+            sandbox: toolSafeSandboxSession,
+            sandboxHomeDir,
             supportsUserMessageResponses: () => supportsUserMessageResponses2
           });
         } catch {
@@ -640,20 +607,6 @@ function createOpenCode(settings = {}) {
         override: settings.port
       });
       const token = settings.mintBridgeToken == null ? randomBytes(32).toString("hex") : settings.mintBridgeToken(sandboxId);
-      const sandboxHomeDir = await resolveSandboxHomeDir({
-        sandbox: toolSafeSandboxSession,
-        abortSignal: startOpts.abortSignal
-      });
-      const xdgConfigHome = `${sandboxHomeDir}/.config`;
-      const xdgCacheHome = `${sandboxHomeDir}/.cache`;
-      const xdgDataHome = `${sandboxHomeDir}/.local/share`;
-      const xdgStateHome = `${sandboxHomeDir}/.local/state`;
-      const skillSetup = startOpts.skills && startOpts.skills.length > 0 ? await writeOpenCodeSkills({
-        sandbox: toolSafeSandboxSession,
-        skills: startOpts.skills,
-        homeDir: sandboxHomeDir,
-        abortSignal: startOpts.abortSignal
-      }) : void 0;
       const forwardedAuthEnvironment = credentialsBrokered ? sandboxAuthEnvironment : await applyCredentialForwarding({
         environment: sandboxAuthEnvironment,
         credentialEnvironmentVariables: OPENCODE_CREDENTIAL_ENVIRONMENT_VARIABLES,
@@ -664,17 +617,11 @@ function createOpenCode(settings = {}) {
         AI_SDK_HARNESS_CLIENT_APP: OPENCODE_CLIENT_APP,
         BRIDGE_CHANNEL_TOKEN: token,
         BRIDGE_WS_PORT: String(port),
-        HOME: sandboxHomeDir,
-        USERPROFILE: sandboxHomeDir,
-        XDG_CONFIG_HOME: xdgConfigHome,
-        XDG_CACHE_HOME: xdgCacheHome,
-        XDG_DATA_HOME: xdgDataHome,
-        XDG_STATE_HOME: xdgStateHome,
         ...respawnStrategy === "replay" ? { BRIDGE_REPLAY_FROM_DISK: "1" } : {}
       };
       if (respawnStrategy === void 0) {
         await toolSafeSandboxSession.run({
-          command: `mkdir -p ${shellQuote(workDir)} ${shellQuote(bridgeStateDir)} ${shellQuote(xdgConfigHome)} ${shellQuote(xdgCacheHome)} ${shellQuote(xdgDataHome)} ${shellQuote(xdgStateHome)}`,
+          command: `mkdir -p ${shellQuote(workDir)} ${shellQuote(bridgeStateDir)}`,
           abortSignal: startOpts.abortSignal
         });
       }
@@ -685,7 +632,7 @@ function createOpenCode(settings = {}) {
         abortSignal: startOpts.abortSignal
       });
       const proc = await toolSafeSandboxSession.spawn({
-        command: `node ${shellQuote(`${bootstrapDir}/bridge.mjs`)} --workdir ${shellQuote(workDir)} --bridge-state-dir ${shellQuote(bridgeStateDir)} --bootstrap-dir ${shellQuote(bootstrapDir)}${skillSetup ? ` --skills-dir ${shellQuote(skillSetup.skillsDir)}` : ""}`,
+        command: `node ${shellQuote(`${bootstrapDir}/bridge.mjs`)} --workdir ${shellQuote(workDir)} --bridge-state-dir ${shellQuote(bridgeStateDir)} --bootstrap-dir ${shellQuote(bootstrapDir)} --skills-dir ${shellQuote(skillsDir)}`,
         env,
         abortSignal: startOpts.abortSignal
       });
@@ -749,6 +696,7 @@ function createOpenCode(settings = {}) {
         model,
         provider: settings.provider,
         reasoningVariant: settings.reasoningVariant,
+        openCodeConfig: settings.openCodeConfig,
         mcpServers: settings.mcpServers,
         openCodeSessionId: resumeSessionId,
         isResume: respawnStrategy !== void 0,
@@ -761,6 +709,8 @@ function createOpenCode(settings = {}) {
         debug: startOpts.observability?.debug,
         permissionMode: startOpts.permissionMode,
         builtinToolFiltering: startOpts.builtinToolFiltering,
+        sandbox: toolSafeSandboxSession,
+        sandboxHomeDir,
         supportsUserMessageResponses: () => supportsUserMessageResponses
       });
     }
@@ -819,7 +769,7 @@ async function writeOpenCodeSkills({
   abortSignal
 }) {
   const skillsDir = path.posix.join(homeDir, ".agents", "skills");
-  await writeHarnessSkills({
+  return writeHarnessSkills({
     sandbox,
     rootDir: skillsDir,
     skills,
@@ -827,7 +777,6 @@ async function writeOpenCodeSkills({
     invalidSkillNameMessage: ({ name }) => `Invalid OpenCode skill name: ${name}`,
     invalidSkillFilePathMessage: ({ skillName, filePath }) => `Invalid OpenCode skill file path for ${skillName}: ${filePath}`
   });
-  return { skillsDir };
 }
 function openWebSocket({
   endpoint,
@@ -927,6 +876,7 @@ function createSession({
   model,
   provider,
   reasoningVariant,
+  openCodeConfig,
   mcpServers,
   openCodeSessionId,
   isResume,
@@ -939,6 +889,8 @@ function createSession({
   debug,
   permissionMode,
   builtinToolFiltering,
+  sandbox,
+  sandboxHomeDir,
   supportsUserMessageResponses
 }) {
   let stopped = false;
@@ -1084,6 +1036,7 @@ function createSession({
     model,
     provider,
     ...reasoningVariant ? { variant: reasoningVariant } : {},
+    ...openCodeConfig == null ? {} : { openCodeConfig },
     ...mcpServers == null ? {} : { mcpServers },
     ...permissionMode ? { permissionMode } : {},
     ...builtinToolFiltering ? { builtinToolFiltering } : {},
@@ -1101,6 +1054,12 @@ function createSession({
           harnessId: "opencode"
         });
       }
+      const skillWriteResult = await writeOpenCodeSkills({
+        sandbox,
+        skills: promptOpts.skills,
+        homeDir: sandboxHomeDir,
+        abortSignal: promptOpts.abortSignal
+      });
       const control = wireTurn({
         emit: promptOpts.emit,
         abortSignal: promptOpts.abortSignal
@@ -1116,6 +1075,7 @@ function createSession({
         })),
         ...promptOpts.responseFormat == null ? {} : { responseFormat: promptOpts.responseFormat },
         ...promptOpts.instructions ? { instructions: promptOpts.instructions } : {},
+        skillsChanged: skillWriteResult.changed,
         ...startBase()
       });
       pendingResumeSessionId = void 0;
@@ -1128,6 +1088,12 @@ function createSession({
           harnessId: "opencode"
         });
       }
+      const skillWriteResult = await writeOpenCodeSkills({
+        sandbox,
+        skills: continueOpts.skills,
+        homeDir: sandboxHomeDir,
+        abortSignal: continueOpts.abortSignal
+      });
       const control = wireTurn({
         emit: continueOpts.emit,
         abortSignal: continueOpts.abortSignal
@@ -1144,6 +1110,7 @@ function createSession({
           })),
           ...continueOpts.responseFormat == null ? {} : { responseFormat: continueOpts.responseFormat },
           ...continueOpts.instructions ? { instructions: continueOpts.instructions } : {},
+          skillsChanged: skillWriteResult.changed,
           ...startBase()
         });
         pendingResumeSessionId = void 0;
@@ -1169,6 +1136,7 @@ function createSession({
         provider,
         permissionMode,
         debug,
+        openCodeConfig,
         mcpServers,
         resumeSessionId: latestOpenCodeSessionId,
         onCompaction: (part) => pendingCompactionParts.push(part)
@@ -1326,6 +1294,7 @@ async function runCompactOperation({
   provider,
   permissionMode,
   debug,
+  openCodeConfig,
   mcpServers,
   resumeSessionId,
   onCompaction
@@ -1354,6 +1323,7 @@ async function runCompactOperation({
     tools: [],
     model,
     provider,
+    ...openCodeConfig == null ? {} : { openCodeConfig },
     ...mcpServers == null ? {} : { mcpServers },
     ...permissionMode ? { permissionMode } : {},
     ...resumeSessionId ? { resumeSessionId } : {},