@ai-sdk/harness-opencode 1.0.65 → 1.0.67

package/src/bridge/opencode-events.ts

@@ -22,6 +22,7 @@ export type TranslationState = {
   legacyTextPartIds: Set<string>;
   legacyReasoningPartIds: Set<string>;
   legacyStepFinishPartIds: Set<string>;
+  dynamicToolCallIds: Set<string>;
 };
 
 export function createTranslationState(): TranslationState {
@@ -40,6 +41,7 @@ export function createTranslationState(): TranslationState {
     legacyTextPartIds: new Set(),
     legacyReasoningPartIds: new Set(),
     legacyStepFinishPartIds: new Set(),
+    dynamicToolCallIds: new Set(),
   };
 }
 

package/src/opencode-bridge-protocol.ts

@@ -15,6 +15,7 @@ export const startMessageSchema = harnessV1BridgeStartBaseSchema.extend({
   variant: z.string().optional(),
   instructions: z.string().optional(),
   resumeSessionId: z.string().optional(),
+  mcpServers: z.record(z.string(), z.unknown()).optional(),
 });
 
 export type StartMessage = z.infer<typeof startMessageSchema>;

package/src/opencode-harness.ts

@@ -67,6 +67,11 @@ const OPENCODE_CLIENT_APP = `ai-sdk/harness-opencode/${VERSION}`;
 
 export type OpenCodeHarnessSettings = {
   readonly auth?: OpenCodeAuthOptions;
+  /**
+   * MCP server definitions keyed by server name. Each definition uses the
+   * underlying runtime's native MCP server configuration format.
+   */
+  readonly mcpServers?: Record<string, unknown>;
   readonly model?: string;
   readonly provider?: string;
   /**
@@ -77,6 +82,11 @@ export type OpenCodeHarnessSettings = {
   readonly reasoningVariant?: string;
   readonly port?: number;
   readonly startupTimeoutMs?: number;
+  /**
+   * Creates the authentication token used by the sandbox bridge. Defaults to
+   * a random 32-byte hexadecimal token.
+   */
+  readonly mintBridgeToken?: (sandboxId: string) => string;
 };
 
 const optionalStringRecord = z.record(z.string(), z.unknown()).optional();
@@ -201,6 +211,14 @@ type OpenCodeBridgeCoords = z.infer<typeof openCodeBridgeCoordsSchema>;
 export function createOpenCode(
   settings: OpenCodeHarnessSettings = {},
 ): HarnessV1<typeof OPENCODE_BUILTIN_TOOLS> {
+  if (
+    settings.mcpServers != null &&
+    Object.prototype.hasOwnProperty.call(settings.mcpServers, 'harness-tools')
+  ) {
+    throw new Error(
+      'OpenCode MCP server name "harness-tools" is reserved for HarnessAgent tools.',
+    );
+  }
   let cachedBootstrap: HarnessV1Bootstrap | undefined;
 
   return {
@@ -309,6 +327,7 @@ export function createOpenCode(
             model,
             provider: settings.provider,
             reasoningVariant: settings.reasoningVariant,
+            mcpServers: settings.mcpServers,
             openCodeSessionId: resumeSessionId,
             isResume: true,
             seedResumeSessionOnFirstPrompt: false,
@@ -339,7 +358,10 @@ export function createOpenCode(
       }
 
       const port = resolveBridgePort(sandboxSession, settings.port);
-      const token = randomBytes(32).toString('hex');
+      const token =
+        settings.mintBridgeToken == null
+          ? randomBytes(32).toString('hex')
+          : settings.mintBridgeToken(sandboxId);
       const sandboxHomeDir = await resolveSandboxHomeDir({
         sandbox: session,
         abortSignal: startOpts.abortSignal,
@@ -456,6 +478,7 @@ export function createOpenCode(
         model,
         provider: settings.provider,
         reasoningVariant: settings.reasoningVariant,
+        mcpServers: settings.mcpServers,
         openCodeSessionId: resumeSessionId,
         isResume: respawnStrategy !== undefined,
         seedResumeSessionOnFirstPrompt: respawnStrategy !== undefined,
@@ -552,6 +575,7 @@ function createSession({
   model,
   provider,
   reasoningVariant,
+  mcpServers,
   openCodeSessionId,
   isResume,
   seedResumeSessionOnFirstPrompt,
@@ -569,6 +593,7 @@ function createSession({
   model: string | undefined;
   provider: string | undefined;
   reasoningVariant: string | undefined;
+  mcpServers: Record<string, unknown> | undefined;
   openCodeSessionId: string | undefined;
   isResume: boolean;
   seedResumeSessionOnFirstPrompt: boolean;
@@ -586,7 +611,6 @@ function createSession({
   let pendingResumeSessionId = seedResumeSessionOnFirstPrompt
     ? openCodeSessionId
     : undefined;
-  let instructionsApplied = isResume;
   let activeTurn = false;
   const pendingCompactionParts: HarnessV1StreamPart[] = [];
 
@@ -729,6 +753,7 @@ function createSession({
     model,
     provider,
     ...(reasoningVariant ? { variant: reasoningVariant } : {}),
+    ...(mcpServers == null ? {} : { mcpServers }),
     ...(permissionMode ? { permissionMode } : {}),
     ...(builtinToolFiltering ? { builtinToolFiltering } : {}),
     ...(pendingResumeSessionId
@@ -748,9 +773,6 @@ function createSession({
         emit: promptOpts.emit,
         abortSignal: promptOpts.abortSignal,
       });
-      const applyInstructions =
-        !instructionsApplied && !!promptOpts.instructions;
-      instructionsApplied = true;
       channel.send({
         type: 'start',
         operation: 'prompt',
@@ -760,7 +782,9 @@ function createSession({
           description: t.description,
           inputSchema: t.inputSchema,
         })),
-        ...(applyInstructions ? { instructions: promptOpts.instructions } : {}),
+        ...(promptOpts.instructions
+          ? { instructions: promptOpts.instructions }
+          : {}),
         ...startBase(),
       });
       pendingResumeSessionId = undefined;
@@ -781,6 +805,9 @@ function createSession({
             description: t.description,
             inputSchema: t.inputSchema,
           })),
+          ...(continueOpts.instructions
+            ? { instructions: continueOpts.instructions }
+            : {}),
           ...startBase(),
         });
         pendingResumeSessionId = undefined;
@@ -808,6 +835,7 @@ function createSession({
         provider,
         permissionMode,
         debug,
+        mcpServers,
         resumeSessionId: latestOpenCodeSessionId,
         onCompaction: part => pendingCompactionParts.push(part),
       });
@@ -964,6 +992,7 @@ async function runCompactOperation({
   provider,
   permissionMode,
   debug,
+  mcpServers,
   resumeSessionId,
   onCompaction,
 }: {
@@ -972,6 +1001,7 @@ async function runCompactOperation({
   provider: string | undefined;
   permissionMode: HarnessV1PermissionMode | undefined;
   debug: HarnessV1DebugConfig | undefined;
+  mcpServers: Record<string, unknown> | undefined;
   resumeSessionId: string | undefined;
   onCompaction: (part: HarnessV1StreamPart) => void;
 }): Promise<void> {
@@ -999,6 +1029,7 @@ async function runCompactOperation({
     tools: [],
     model,
     provider,
+    ...(mcpServers == null ? {} : { mcpServers }),
     ...(permissionMode ? { permissionMode } : {}),
     ...(resumeSessionId ? { resumeSessionId } : {}),
     ...(debug ? { debug } : {}),