@ai-sdk/harness-opencode 1.0.94 → 1.0.96

package/src/bridge/pnpm-lock.yaml

@@ -12,11 +12,11 @@ importers:
         specifier: 1.29.0
         version: 1.29.0(zod@3.25.76)
       '@opencode-ai/sdk':
-        specifier: 1.18.3
-        version: 1.18.3
+        specifier: 1.18.23
+        version: 1.18.23
       opencode-ai:
-        specifier: 1.18.3
-        version: 1.18.3
+        specifier: 1.18.23
+        version: 1.18.23
       ws:
         specifier: 8.21.0
         version: 8.21.0
@@ -42,8 +42,8 @@ packages:
       '@cfworker/json-schema':
         optional: true
 
-  '@opencode-ai/sdk@1.18.3':
-    resolution: {integrity: sha512-Mevo4e6kQwbvto9E+42KSIVMhp+JBu+SwQhC5AomAvrV6Xkio3U249T+xDILDCXhl5Z/Hi/DlAuVLzpGnuh0gg==}
+  '@opencode-ai/sdk@1.18.23':
+    resolution: {integrity: sha512-VouYbL8O2ynLq0atr5fjzCv8YLtFi/zKLQ/uYkCvTJ4CmUdA01XwPn8om+u3TvxnGEfQsBfmThGU141vt3sg5w==}
 
   accepts@2.0.0:
     resolution: {integrity: sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==}
@@ -286,72 +286,72 @@ packages:
   once@1.4.0:
     resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
 
-  opencode-ai@1.18.3:
-    resolution: {integrity: sha512-HnItl/+uhSpj7JV9x6ITiE0XFq4b/PKF5OM03TIyiFoFiLw3MQoJOAXZFTEzC7IOgAIYcysRQBBmCmlXILkxww==}
+  opencode-ai@1.18.23:
+    resolution: {integrity: sha512-3NkT0XINL7d0HYkTyGV1SPChHXhvRgKqNaTgKRTGb0TXUWszXA7MW/y3zMZw29y1AQuUDAzRvVYmQ9KGRQhroA==}
     cpu: [arm64, x64]
     os: [darwin, linux, win32]
     hasBin: true
 
-  opencode-darwin-arm64@1.18.3:
-    resolution: {integrity: sha512-BkfJf4E502OVwpDXgaVz8eqTDOy2B9xXPefYebT+xv8TXYvEo1wtby4eu4MoN51o4o1qpzcvCCXDqUDXu1pBGQ==}
+  opencode-darwin-arm64@1.18.23:
+    resolution: {integrity: sha512-QP9PjwpHtZoLVXw2WvUmPZecz7mWbQkT4t3K36B//fCaDG+zWa+SsztIeaW5azujNwwtUemLA5icE/zINng48Q==}
     cpu: [arm64]
     os: [darwin]
 
-  opencode-darwin-x64-baseline@1.18.3:
-    resolution: {integrity: sha512-8qQ9Ig7Zp7LEKaKGRL+OIlDb/uTLYkeAq6SGsN0fLHR2rHZRHyb61KrpkS5TgUlGwSWPtb5uCeVtTA9rGbEAKw==}
+  opencode-darwin-x64-baseline@1.18.23:
+    resolution: {integrity: sha512-QGx6I/nFYur7qJ/Nx2L3fC4XYQt44cyDsm7p8twNA+cdjGX3ndnPbMdAl5ikdZyAfSMUGYK8VWY2JMxv0rmfjw==}
     cpu: [x64]
     os: [darwin]
 
-  opencode-darwin-x64@1.18.3:
-    resolution: {integrity: sha512-ujy61O3WUEHjPqk+qXMBl97zR9q3crOzHbm2VLmXLHUWbqB5ZtN1HToODbuI1SBMKVR8GyZwPygRQVMfON4DHg==}
+  opencode-darwin-x64@1.18.23:
+    resolution: {integrity: sha512-R9nWP3edz/0FnEfwmuxtiWBB7bS4NtZCyCffJyiMlrbwdDC+bIXYrWxWXVrzaP1mJujs6g2MAwTCUSx/qpBhDw==}
     cpu: [x64]
     os: [darwin]
 
-  opencode-linux-arm64-musl@1.18.3:
-    resolution: {integrity: sha512-s1vNP8dpIH3vFs8aoMzgHViBNVz6xtR7n24gGg0WOw4uSZVM+sRUmZKc3Hj56XjHQSsVBg5AkwR2Xm0nFSfIUQ==}
+  opencode-linux-arm64-musl@1.18.23:
+    resolution: {integrity: sha512-VyDkzUJfJgkx9h9RhazTW9xeTgSXBmVFPblsbPGBW9tR612f6gjQxfOfu4cpHnQHK1qjuW9ClzLKHWqv3EcJTA==}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  opencode-linux-arm64@1.18.3:
-    resolution: {integrity: sha512-K+1SPkfrYFUufPUYpbSurlB2ogpjv5in2usA1FwOM7HCOpNxR3ap7K+X4uQXnOV8AtsON+Vr9W5uYXQJA1yKlA==}
+  opencode-linux-arm64@1.18.23:
+    resolution: {integrity: sha512-g1zDFhuE9FOYwjSGderlu69wfd4GQzS0xsDiIY11QUciuBmM6DrHqLvmhlLFsUVHYVnCPY1YeN1pq5ewE3x72Q==}
     cpu: [arm64]
     os: [linux]
 
-  opencode-linux-x64-baseline-musl@1.18.3:
-    resolution: {integrity: sha512-F2nNPqYPdTCydLvNH1rvSXdlX3pfmOmOOfsFl+pqi3W0iE3Alyxmv28AjrIGUw4/6EfWhMKYcyxKjNIKLFyaZQ==}
+  opencode-linux-x64-baseline-musl@1.18.23:
+    resolution: {integrity: sha512-c1DPxauhzAurlIBhJBr/rokDpc65l084T4qTl36gDDT9Xzc/Nk5Q5yMDaPm1DDI3WeHKDt11MDlxT5AjQW5gtw==}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  opencode-linux-x64-baseline@1.18.3:
-    resolution: {integrity: sha512-DDfspGSQ123yhsFhAlbpF+tsvje5kHOS2/PYUpWJroTlvgtqRLGmET51Anrxd5BrAFrqB6PXYA2kGh5QStPU/g==}
+  opencode-linux-x64-baseline@1.18.23:
+    resolution: {integrity: sha512-yUhBOXfTQour2JCdAkwD3DDqSnyxB0grefwdPqEhYmJHIkYxfJIIzyy6V//pyouvkE0XMouFtiuZXw8S6Wo0iQ==}
     cpu: [x64]
     os: [linux]
 
-  opencode-linux-x64-musl@1.18.3:
-    resolution: {integrity: sha512-SSp2zSpAM4dntcPZw8ISl3CmXYrWPftLc8u0HuAIeNWJOo6G4xAHPoXhNnXI3tQYqqGcppArf/3EMPnF9WnyFw==}
+  opencode-linux-x64-musl@1.18.23:
+    resolution: {integrity: sha512-t/5mlnTBZKdZpqKHwdwxlWqGakntauvMSmXtyJc17M7XJRmZaaGHtNSaSefbbYFIL4agoQCXTvIkhhyxOvr7zQ==}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  opencode-linux-x64@1.18.3:
-    resolution: {integrity: sha512-p+19dSTf3pWL3+Rh/Ym94DvS9mNxNG94HJnR5oMCDhQvgimdT5tSdoK4ETtk4XOoCKz3OcTQDPHTdYKcJg32KQ==}
+  opencode-linux-x64@1.18.23:
+    resolution: {integrity: sha512-5x9d1Cm/YtqzR6lAlNbgVprTQ3R3hx7qGTWCzm5l5u6lBNkhYTrhy2s8k25dxKKuxqZ9Kngqz9JYWvSVHy2Lmw==}
     cpu: [x64]
     os: [linux]
 
-  opencode-windows-arm64@1.18.3:
-    resolution: {integrity: sha512-qkz9/r6kUhhgLycQv71MoSQ2m5UI2QnZZx8SeZgyYD7oB8pDH6DIGbDWcs6BJ02ND1Y5hmgYWlP+rOrMkGlMJw==}
+  opencode-windows-arm64@1.18.23:
+    resolution: {integrity: sha512-QtJQcLU0yPz6on3jjks3f/EHgZuIDFw7FvAKu3wsHhL09NYDh7GczfRXDPRHa3NgqnU8dkB8p9mhqgaPRPogoQ==}
     cpu: [arm64]
     os: [win32]
 
-  opencode-windows-x64-baseline@1.18.3:
-    resolution: {integrity: sha512-+tyoxwSfY7msfZNY1IoA0ZWRL9XfdqY+ash6U3ldfE+GfF2WNAdhewmmYiUsC4lHjkdSmLt2brdWgoebQK9HAg==}
+  opencode-windows-x64-baseline@1.18.23:
+    resolution: {integrity: sha512-AqXsTKaPcDx3rrid5bLUwJbQ/3vr9rJ6fvOStIznTzwrbOgP8wy5G4jCoIzu6KB/WxGx/d1MrV4cGaJ73qnjBA==}
     cpu: [x64]
     os: [win32]
 
-  opencode-windows-x64@1.18.3:
-    resolution: {integrity: sha512-V/Q4VkyZ7TkotLbpTCX/s5wP8MoFj5UnRqBHFJ8WGptb/+oYw36kamUUt1P1wN8iRjmw+8vwYhuYdAe+3xbgpQ==}
+  opencode-windows-x64@1.18.23:
+    resolution: {integrity: sha512-mMaIITuXzkNfjdcYL8uZaZuMDjulFyH/UCq9bxblam2mUZf9uWisoi5J6CXFsS/mkN7CZfTAt6PttSp4n3PH4g==}
     cpu: [x64]
     os: [win32]
 
@@ -508,7 +508,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@opencode-ai/sdk@1.18.3':
+  '@opencode-ai/sdk@1.18.23':
     dependencies:
       cross-spawn: 7.0.6
 
@@ -752,55 +752,55 @@ snapshots:
     dependencies:
       wrappy: 1.0.2
 
-  opencode-ai@1.18.3:
+  opencode-ai@1.18.23:
     optionalDependencies:
-      opencode-darwin-arm64: 1.18.3
-      opencode-darwin-x64: 1.18.3
-      opencode-darwin-x64-baseline: 1.18.3
-      opencode-linux-arm64: 1.18.3
-      opencode-linux-arm64-musl: 1.18.3
-      opencode-linux-x64: 1.18.3
-      opencode-linux-x64-baseline: 1.18.3
-      opencode-linux-x64-baseline-musl: 1.18.3
-      opencode-linux-x64-musl: 1.18.3
-      opencode-windows-arm64: 1.18.3
-      opencode-windows-x64: 1.18.3
-      opencode-windows-x64-baseline: 1.18.3
-
-  opencode-darwin-arm64@1.18.3:
+      opencode-darwin-arm64: 1.18.23
+      opencode-darwin-x64: 1.18.23
+      opencode-darwin-x64-baseline: 1.18.23
+      opencode-linux-arm64: 1.18.23
+      opencode-linux-arm64-musl: 1.18.23
+      opencode-linux-x64: 1.18.23
+      opencode-linux-x64-baseline: 1.18.23
+      opencode-linux-x64-baseline-musl: 1.18.23
+      opencode-linux-x64-musl: 1.18.23
+      opencode-windows-arm64: 1.18.23
+      opencode-windows-x64: 1.18.23
+      opencode-windows-x64-baseline: 1.18.23
+
+  opencode-darwin-arm64@1.18.23:
     optional: true
 
-  opencode-darwin-x64-baseline@1.18.3:
+  opencode-darwin-x64-baseline@1.18.23:
     optional: true
 
-  opencode-darwin-x64@1.18.3:
+  opencode-darwin-x64@1.18.23:
     optional: true
 
-  opencode-linux-arm64-musl@1.18.3:
+  opencode-linux-arm64-musl@1.18.23:
     optional: true
 
-  opencode-linux-arm64@1.18.3:
+  opencode-linux-arm64@1.18.23:
     optional: true
 
-  opencode-linux-x64-baseline-musl@1.18.3:
+  opencode-linux-x64-baseline-musl@1.18.23:
     optional: true
 
-  opencode-linux-x64-baseline@1.18.3:
+  opencode-linux-x64-baseline@1.18.23:
     optional: true
 
-  opencode-linux-x64-musl@1.18.3:
+  opencode-linux-x64-musl@1.18.23:
     optional: true
 
-  opencode-linux-x64@1.18.3:
+  opencode-linux-x64@1.18.23:
     optional: true
 
-  opencode-windows-arm64@1.18.3:
+  opencode-windows-arm64@1.18.23:
     optional: true
 
-  opencode-windows-x64-baseline@1.18.3:
+  opencode-windows-x64-baseline@1.18.23:
     optional: true
 
-  opencode-windows-x64@1.18.3:
+  opencode-windows-x64@1.18.23:
     optional: true
 
   parseurl@1.3.3: {}

package/src/bridge/pnpm-workspace.yaml

@@ -1,2 +1,2 @@
 allowBuilds:
-  'opencode-ai@1.18.3': true
+  'opencode-ai@1.18.23': true

package/src/opencode-bridge-protocol.ts

@@ -14,7 +14,9 @@ export const 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(),
 });
 

package/src/opencode-harness.ts

@@ -38,6 +38,7 @@ import {
   warnCredentialBrokeringUnavailable,
   waitForBridgeReady,
   writeSkills as writeHarnessSkills,
+  type WriteSkillsResult,
 } from '@ai-sdk/harness/utils';
 import {
   safeParseJSON,
@@ -69,10 +70,6 @@ import { VERSION } from './version';
 type OpenCodeChannel = SandboxChannel<OutboundMessage, InboundMessage>;
 type OpenCodeRespawnStrategy = 'replay' | 'rerun';
 
-type WriteSkillsResult = {
-  readonly skillsDir: string;
-};
-
 /**
  * Value to use in User-Agent and `x-client-app` headers.
  */
@@ -86,11 +83,20 @@ export type OpenCodeHarnessSettings = {
    * discover, read, or otherwise access in the host process.
    */
   readonly credentialForwarding?: HarnessV1CredentialForwarding;
+  /**
+   * Additional configuration passed through to OpenCode as-is. OpenCode
+   * config keys must use their native names. Values managed by this adapter
+   * take precedence over conflicting entries.
+   */
+  readonly openCodeConfig?: Record<string, unknown>;
   /**
    * MCP server definitions keyed by server name. Each definition uses the
    * underlying runtime's native MCP server configuration format.
    */
   readonly mcpServers?: Record<string, unknown>;
+  /**
+   * @deprecated Use `model` on `HarnessAgent` instead.
+   */
   readonly model?: string;
   readonly provider?: string;
   /**
@@ -250,6 +256,7 @@ export function createOpenCode(
     lifecycleStateSchema: openCodeResumeStateSchema,
     getBootstrap: getOpenCodeBootstrap,
     doStart: async startOpts => {
+      const configuredModel = settings.model;
       const sandboxSession = startOpts.sandboxSession;
       const toolSafeSandboxSession =
         getRestrictedSandboxSession(sandboxSession);
@@ -290,12 +297,12 @@ export function createOpenCode(
       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;
@@ -336,10 +343,18 @@ export function createOpenCode(
         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 ?? 120_000;
-      const model = splitOpenCodeModel(settings.model, settings.provider).model;
+      const model = splitOpenCodeModel(
+        configuredModel,
+        settings.provider,
+      ).model;
 
       const report = startOpts.observability?.report;
       const onDiagnostic = report
@@ -390,6 +405,7 @@ export function createOpenCode(
             model,
             provider: settings.provider,
             reasoningVariant: settings.reasoningVariant,
+            openCodeConfig: settings.openCodeConfig,
             mcpServers: settings.mcpServers,
             openCodeSessionId: resumeSessionId,
             isResume: true,
@@ -402,6 +418,8 @@ export function createOpenCode(
             debug: startOpts.observability?.debug,
             permissionMode: startOpts.permissionMode,
             builtinToolFiltering: startOpts.builtinToolFiltering,
+            sandbox: toolSafeSandboxSession,
+            sandboxHomeDir,
             supportsUserMessageResponses: () => supportsUserMessageResponses,
           });
         } catch {}
@@ -430,23 +448,6 @@ export function createOpenCode(
         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,
-            })
-          : undefined;
       const forwardedAuthEnvironment = credentialsBrokered
         ? sandboxAuthEnvironment
         : await applyCredentialForwarding({
@@ -460,12 +461,6 @@ export function createOpenCode(
         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' }
           : {}),
@@ -473,7 +468,7 @@ export function createOpenCode(
 
       if (respawnStrategy === undefined) {
         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,
         });
       }
@@ -486,7 +481,7 @@ export function createOpenCode(
       });
 
       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,
       });
@@ -559,6 +554,7 @@ export function createOpenCode(
         model,
         provider: settings.provider,
         reasoningVariant: settings.reasoningVariant,
+        openCodeConfig: settings.openCodeConfig,
         mcpServers: settings.mcpServers,
         openCodeSessionId: resumeSessionId,
         isResume: respawnStrategy !== undefined,
@@ -571,6 +567,8 @@ export function createOpenCode(
         debug: startOpts.observability?.debug,
         permissionMode: startOpts.permissionMode,
         builtinToolFiltering: startOpts.builtinToolFiltering,
+        sandbox: toolSafeSandboxSession,
+        sandboxHomeDir,
         supportsUserMessageResponses: () => supportsUserMessageResponses,
       });
     },
@@ -654,7 +652,7 @@ async function writeOpenCodeSkills({
   abortSignal?: AbortSignal;
 }): Promise<WriteSkillsResult> {
   const skillsDir = path.posix.join(homeDir, '.agents', 'skills');
-  await writeHarnessSkills({
+  return writeHarnessSkills({
     sandbox,
     rootDir: skillsDir,
     skills,
@@ -664,8 +662,6 @@ async function writeOpenCodeSkills({
     invalidSkillFilePathMessage: ({ skillName, filePath }) =>
       `Invalid OpenCode skill file path for ${skillName}: ${filePath}`,
   });
-
-  return { skillsDir };
 }
 
 function openWebSocket({
@@ -787,6 +783,7 @@ function createSession({
   model,
   provider,
   reasoningVariant,
+  openCodeConfig,
   mcpServers,
   openCodeSessionId,
   isResume,
@@ -799,6 +796,8 @@ function createSession({
   debug,
   permissionMode,
   builtinToolFiltering,
+  sandbox,
+  sandboxHomeDir,
   supportsUserMessageResponses,
 }: {
   sessionId: string;
@@ -807,6 +806,7 @@ function createSession({
   model: string | undefined;
   provider: string | undefined;
   reasoningVariant: string | undefined;
+  openCodeConfig: Record<string, unknown> | undefined;
   mcpServers: Record<string, unknown> | undefined;
   openCodeSessionId: string | undefined;
   isResume: boolean;
@@ -819,6 +819,8 @@ function createSession({
   debug: HarnessV1DebugConfig | undefined;
   permissionMode: HarnessV1PermissionMode | undefined;
   builtinToolFiltering: HarnessV1BuiltinToolFiltering | undefined;
+  sandbox: SandboxSession;
+  sandboxHomeDir: string;
   supportsUserMessageResponses: () => boolean;
 }): HarnessV1Session {
   let stopped = false;
@@ -827,6 +829,7 @@ function createSession({
   let pendingResumeSessionId = seedResumeSessionOnFirstPrompt
     ? openCodeSessionId
     : undefined;
+  let selectedModel = model;
   let activeTurn = false;
   const pendingCompactionParts: HarnessV1StreamPart[] = [];
 
@@ -977,10 +980,11 @@ function createSession({
     };
   };
 
-  const startBase = () => ({
-    model,
+  const startBase = (turnModel: string | undefined) => ({
+    model: turnModel,
     provider,
     ...(reasoningVariant ? { variant: reasoningVariant } : {}),
+    ...(openCodeConfig == null ? {} : { openCodeConfig }),
     ...(mcpServers == null ? {} : { mcpServers }),
     ...(permissionMode ? { permissionMode } : {}),
     ...(builtinToolFiltering ? { builtinToolFiltering } : {}),
@@ -995,7 +999,6 @@ function createSession({
   return {
     sessionId,
     isResume,
-    modelId: model,
     doPromptTurn: async promptOpts => {
       if (
         promptOpts.responseFormat?.type === 'json' &&
@@ -1007,10 +1010,18 @@ 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,
       });
+      const turnModel = promptOpts.model ?? selectedModel;
+      if (turnModel) selectedModel = turnModel;
       channel.send({
         type: 'start',
         operation: 'prompt',
@@ -1026,7 +1037,8 @@ function createSession({
         ...(promptOpts.instructions
           ? { instructions: promptOpts.instructions }
           : {}),
-        ...startBase(),
+        skillsChanged: skillWriteResult.changed,
+        ...startBase(turnModel),
       });
       pendingResumeSessionId = undefined;
       return control;
@@ -1042,11 +1054,19 @@ 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,
       });
       if (rerunContinue) {
+        const turnModel = continueOpts.model ?? selectedModel;
+        if (turnModel) selectedModel = turnModel;
         channel.send({
           type: 'start',
           operation: 'prompt',
@@ -1062,7 +1082,8 @@ function createSession({
           ...(continueOpts.instructions
             ? { instructions: continueOpts.instructions }
             : {}),
-          ...startBase(),
+          skillsChanged: skillWriteResult.changed,
+          ...startBase(turnModel),
         });
         pendingResumeSessionId = undefined;
       }
@@ -1085,10 +1106,11 @@ function createSession({
       }
       await runCompactOperation({
         channel,
-        model,
+        model: selectedModel,
         provider,
         permissionMode,
         debug,
+        openCodeConfig,
         mcpServers,
         resumeSessionId: latestOpenCodeSessionId,
         onCompaction: part => pendingCompactionParts.push(part),
@@ -1261,6 +1283,7 @@ async function runCompactOperation({
   provider,
   permissionMode,
   debug,
+  openCodeConfig,
   mcpServers,
   resumeSessionId,
   onCompaction,
@@ -1270,6 +1293,7 @@ async function runCompactOperation({
   provider: string | undefined;
   permissionMode: HarnessV1PermissionMode | undefined;
   debug: HarnessV1DebugConfig | undefined;
+  openCodeConfig: Record<string, unknown> | undefined;
   mcpServers: Record<string, unknown> | undefined;
   resumeSessionId: string | undefined;
   onCompaction: (part: HarnessV1StreamPart) => void;
@@ -1298,6 +1322,7 @@ async function runCompactOperation({
     tools: [],
     model,
     provider,
+    ...(openCodeConfig == null ? {} : { openCodeConfig }),
     ...(mcpServers == null ? {} : { mcpServers }),
     ...(permissionMode ? { permissionMode } : {}),
     ...(resumeSessionId ? { resumeSessionId } : {}),