@ai-sdk/harness-opencode 1.0.52 → 1.0.54

package/src/bridge/index.ts

@@ -3,7 +3,6 @@ import {
   type BridgeEvent,
   type BridgeTurn,
 } from '@ai-sdk/harness/bridge';
-import { isRecord } from '@ai-sdk/provider-utils';
 import { randomUUID } from 'node:crypto';
 import { mkdirSync } from 'node:fs';
 import path from 'node:path';
@@ -19,7 +18,6 @@ import {
   emitOpenCodeStreamStart,
   getOpenCodeEventSessionId,
   isStepSettlementEvent,
-  type OpenCodeEvent,
   type TranslationState,
   unwrapOpenCodeEvent,
 } from './opencode-events';
@@ -35,6 +33,11 @@ import {
   type HarnessUsage,
   type OpenCodeTokenUsage,
 } from './opencode-usage';
+import {
+  asOpenCodeObject,
+  type OpenCodeEvent,
+  type OpenCodeObject,
+} from './opencode-types';
 import { startAuthorizedToolRelay, type ToolRelay } from './tool-relay';
 
 type Emit = (msg: Record<string, unknown>) => void;
@@ -834,12 +837,7 @@ async function handlePermissionV2({
       ? props.resources.map(String)
       : [],
     requestID,
-    toolCallId:
-      typeof props.source === 'object' &&
-      props.source !== null &&
-      'callID' in props.source
-        ? String((props.source as { callID?: unknown }).callID)
-        : requestID,
+    toolCallId: String(props.source?.callID ?? requestID),
     permissionMode,
     builtinToolFiltering,
     turn,
@@ -873,16 +871,12 @@ async function handlePermission({
   const props = event.properties ?? {};
   const requestID = String(props.id ?? '');
   if (!requestID) return;
+  const tool = asOpenCodeObject(props.tool);
   const reply = await selectPermissionReply({
     action: String(props.permission ?? ''),
     resources: Array.isArray(props.patterns) ? props.patterns.map(String) : [],
     requestID,
-    toolCallId:
-      typeof props.tool === 'object' &&
-      props.tool !== null &&
-      'callID' in props.tool
-        ? String((props.tool as { callID?: unknown }).callID)
-        : requestID,
+    toolCallId: String(tool?.callID ?? requestID),
     permissionMode,
     builtinToolFiltering,
     turn,
@@ -1302,15 +1296,13 @@ function modelRefFromAssistantSnapshot(
   const direct = modelRefFromValue(assistant);
   if (direct) return direct;
 
-  if (isRecord(assistant.metadata)) {
-    return modelRefFromValue(assistant.metadata.assistant);
-  }
-  return undefined;
+  return modelRefFromValue(asOpenCodeObject(assistant.metadata)?.assistant);
 }
 
 function modelRefFromSessionInfo(data: unknown): OpenCodeModelRef | undefined {
-  if (!isRecord(data)) return undefined;
-  return modelRefFromValue(data.model) ?? modelRefFromValue(data);
+  const session = asOpenCodeObject(data);
+  if (!session) return undefined;
+  return modelRefFromValue(session.model) ?? modelRefFromObject(session);
 }
 
 function modelRefFromStart(start: StartMessage): OpenCodeModelRef | undefined {
@@ -1324,7 +1316,13 @@ function modelRefFromStart(start: StartMessage): OpenCodeModelRef | undefined {
 }
 
 function modelRefFromValue(value: unknown): OpenCodeModelRef | undefined {
-  if (!isRecord(value)) return undefined;
+  const model = asOpenCodeObject(value);
+  return model ? modelRefFromObject(model) : undefined;
+}
+
+function modelRefFromObject(
+  value: OpenCodeObject,
+): OpenCodeModelRef | undefined {
   const providerID = stringValue(value.providerID);
   const modelID = stringValue(value.modelID ?? value.id);
   if (!providerID || !modelID) return undefined;

package/src/bridge/opencode-events.ts

@@ -1,10 +1,9 @@
-import { isRecord } from '@ai-sdk/provider-utils';
-
-export type OpenCodeEvent = {
-  id?: string;
-  type?: string;
-  properties?: Record<string, any>;
-};
+import {
+  asOpenCodeObject,
+  type OpenCodeEvent,
+  type OpenCodeEventProperties,
+  type OpenCodeMessageInfo,
+} from './opencode-types';
 
 type Emit = (msg: Record<string, unknown>) => void;
 
@@ -53,10 +52,12 @@ export function emitOpenCodeStreamStart({
   state: TranslationState;
   emit: Emit;
 }): void {
-  if (state.streamStarted || !isRecord(info)) return;
-  if (info.role !== 'assistant' && info.type !== 'assistant') return;
-  const providerID = stringValue(info.providerID);
-  const modelID = stringValue(info.modelID);
+  if (state.streamStarted) return;
+  const message = openCodeMessageInfoFromValue(info);
+  if (!message) return;
+  if (message.role !== 'assistant' && message.type !== 'assistant') return;
+  const providerID = stringValue(message.providerID);
+  const modelID = stringValue(message.modelID);
   const modelId =
     providerID && modelID ? `${providerID}/${modelID}` : undefined;
 
@@ -67,20 +68,24 @@ export function emitOpenCodeStreamStart({
 export function unwrapOpenCodeEvent(
   rawEvent: unknown,
 ): OpenCodeEvent | undefined {
-  if (!rawEvent || typeof rawEvent !== 'object') return undefined;
-  const raw = rawEvent as Record<string, any>;
+  const raw = asOpenCodeObject(rawEvent);
+  if (!raw) return undefined;
   if (raw.type === 'sync' && raw.syncEvent) {
-    const sync = raw.syncEvent as Record<string, any>;
+    const sync = asOpenCodeObject(raw.syncEvent);
+    if (!sync) return undefined;
     return {
       id: String(sync.id ?? raw.id ?? ''),
       type: stripSyncVersion(String(sync.type ?? '')),
-      properties: asRecord(sync.data) ?? {},
+      properties: openCodeEventPropertiesFromValue(sync.data) ?? {},
     };
   }
   return {
     id: typeof raw.id === 'string' ? raw.id : undefined,
     type: typeof raw.type === 'string' ? stripSyncVersion(raw.type) : undefined,
-    properties: asRecord(raw.properties) ?? asRecord(raw.data) ?? {},
+    properties:
+      openCodeEventPropertiesFromValue(raw.properties) ??
+      openCodeEventPropertiesFromValue(raw.data) ??
+      {},
   };
 }
 
@@ -95,14 +100,8 @@ export function getOpenCodeEventSessionId(
     return props.id;
   }
   const part = props.part;
-  if (
-    part &&
-    typeof part === 'object' &&
-    !Array.isArray(part) &&
-    typeof (part as { sessionID?: unknown }).sessionID === 'string'
-  ) {
-    return (part as { sessionID: string }).sessionID;
-  }
+  const partObject = asOpenCodeObject(part);
+  if (typeof partObject?.sessionID === 'string') return partObject.sessionID;
   return undefined;
 }
 
@@ -202,21 +201,21 @@ export function emitLegacyTextPartUpdate({
   state: TranslationState;
   emit: Emit;
 }): boolean {
-  if (!isRecord(part)) return false;
-  if (part.type !== 'text' && part.type !== 'reasoning') return false;
-  const id = stringValue(part.id);
+  const textPart = legacyTextPartFromValue(part);
+  if (!textPart) return false;
+  const id = stringValue(textPart.id);
   if (!id) return true;
 
-  const messageID = stringValue(part.messageID);
+  const messageID = stringValue(textPart.messageID);
   if (messageID && state.messageRoles.get(messageID) === 'user') return true;
 
-  const isReasoning = part.type === 'reasoning';
+  const isReasoning = textPart.type === 'reasoning';
   const ids = isReasoning
     ? state.legacyReasoningPartIds
     : state.legacyTextPartIds;
   const deltaMap = isReasoning ? state.reasoningDeltas : state.textDeltas;
   const deltaType = isReasoning ? 'reasoning-delta' : 'text-delta';
-  const text = typeof part.text === 'string' ? part.text : undefined;
+  const text = typeof textPart.text === 'string' ? textPart.text : undefined;
 
   startLegacyPart({
     ids,
@@ -236,7 +235,7 @@ export function emitLegacyTextPartUpdate({
     deltaMap.set(id, text);
   }
 
-  if (legacyPartEnded(part)) {
+  if (textPart.time?.end != null) {
     ids.delete(id);
     deltaMap.delete(id);
     emit({ type: isReasoning ? 'reasoning-end' : 'text-end', id });
@@ -249,10 +248,6 @@ function stripSyncVersion(type: string): string {
   return type.replace(/\.\d+$/, '');
 }
 
-function asRecord(value: unknown): Record<string, any> | undefined {
-  return isRecord(value) ? value : undefined;
-}
-
 function stringValue(value: unknown): string | undefined {
   return typeof value === 'string' && value.length > 0 ? value : undefined;
 }
@@ -283,6 +278,36 @@ function startLegacyPart({
   emit({ type: `${type}-start`, id });
 }
 
-function legacyPartEnded(part: Record<string, unknown>): boolean {
-  return isRecord(part.time) && part.time.end != null;
+export function openCodeMessageInfoFromValue(
+  value: unknown,
+): OpenCodeMessageInfo | undefined {
+  return asOpenCodeObject(value) as OpenCodeMessageInfo | undefined;
+}
+
+function openCodeEventPropertiesFromValue(
+  value: unknown,
+): OpenCodeEventProperties | undefined {
+  return asOpenCodeObject(value) as OpenCodeEventProperties | undefined;
+}
+
+type LegacyTextPart = {
+  type: 'text' | 'reasoning';
+  id?: unknown;
+  messageID?: unknown;
+  text?: unknown;
+  time?: { end?: unknown };
+};
+
+function legacyTextPartFromValue(value: unknown): LegacyTextPart | undefined {
+  const part = asOpenCodeObject(value);
+  if (!part || (part.type !== 'text' && part.type !== 'reasoning')) {
+    return undefined;
+  }
+  return {
+    type: part.type,
+    id: part.id,
+    messageID: part.messageID,
+    text: part.text,
+    time: asOpenCodeObject(part.time),
+  };
 }

package/src/bridge/opencode-finish-step.ts

@@ -1,6 +1,6 @@
 import type { HarnessV1StreamPart } from '@ai-sdk/harness';
-import { isRecord } from '@ai-sdk/provider-utils';
 import { mapUsage } from './opencode-usage';
+import { asOpenCodeObject } from './opencode-types';
 
 type FinishStepEvent = Extract<HarnessV1StreamPart, { type: 'finish-step' }>;
 
@@ -20,9 +20,16 @@ export function mapOpenCodeFinishReason(
 export function legacyStepFinishPartToFinishStep(
   part: unknown,
 ): FinishStepEvent | undefined {
-  if (!isRecord(part) || part.type !== 'step-finish') return undefined;
+  return translateLegacyStepFinishPart(part)?.event;
+}
+
+export function translateLegacyStepFinishPart(
+  value: unknown,
+): { event: FinishStepEvent; partId?: string } | undefined {
+  const part = asOpenCodeObject(value);
+  if (!part || part.type !== 'step-finish') return undefined;
   const rawFinish = typeof part.reason === 'string' ? part.reason : 'stop';
-  return {
+  const event: FinishStepEvent = {
     type: 'finish-step',
     finishReason: {
       unified: mapOpenCodeFinishReason(rawFinish),
@@ -33,4 +40,8 @@ export function legacyStepFinishPartToFinishStep(
       ? { harnessMetadata: { opencode: { cost: part.cost } } }
       : {}),
   };
+  return {
+    event,
+    ...(typeof part.id === 'string' ? { partId: part.id } : {}),
+  };
 }

package/src/bridge/opencode-types.ts

@@ -0,0 +1,33 @@
+export type OpenCodeObject = Record<string, unknown>;
+
+export type OpenCodeMessageInfo = {
+  id?: unknown;
+  role?: unknown;
+  type?: unknown;
+  providerID?: unknown;
+  modelID?: unknown;
+  tokens?: unknown;
+};
+
+export type OpenCodeEventProperties = OpenCodeObject & {
+  info?: OpenCodeMessageInfo;
+  provider?: { metadata?: unknown };
+  source?: { callID?: unknown };
+  status?: {
+    type?: unknown;
+    attempt?: unknown;
+    message?: unknown;
+  };
+};
+
+export type OpenCodeEvent = {
+  id?: string;
+  type?: string;
+  properties?: OpenCodeEventProperties;
+};
+
+export function asOpenCodeObject(value: unknown): OpenCodeObject | undefined {
+  return value != null && typeof value === 'object' && !Array.isArray(value)
+    ? (value as OpenCodeObject)
+    : undefined;
+}

package/src/bridge/opencode-usage.ts

@@ -1,5 +1,5 @@
 import type { HarnessV1StreamPart } from '@ai-sdk/harness';
-import { isRecord } from '@ai-sdk/provider-utils';
+import { asOpenCodeObject } from './opencode-types';
 
 type FinishStepEvent = Extract<HarnessV1StreamPart, { type: 'finish-step' }>;
 
@@ -40,13 +40,13 @@ export function defaultUsage(): HarnessUsage {
 export function extractSessionTokens(
   value: unknown,
 ): OpenCodeTokenUsage | undefined {
-  const record = asRecord(value);
+  const record = asOpenCodeObject(value) as SessionTokenEnvelope | undefined;
   if (!record) return undefined;
   const tokens =
     extractOpenCodeTokens(record.tokens) ??
-    extractOpenCodeTokens(asRecord(record.info)?.tokens) ??
-    extractOpenCodeTokens(asRecord(record.data)?.tokens) ??
-    extractOpenCodeTokens(asRecord(asRecord(record.data)?.data)?.tokens);
+    extractOpenCodeTokens(record.info?.tokens) ??
+    extractOpenCodeTokens(record.data?.tokens) ??
+    extractOpenCodeTokens(record.data?.data?.tokens);
   return tokens;
 }
 
@@ -105,8 +105,8 @@ export function addUsage({
 }
 
 function extractOpenCodeTokens(value: unknown): OpenCodeTokenUsage | undefined {
-  const record = asRecord(value);
-  const cache = asRecord(record?.cache);
+  const record = asOpenCodeObject(value);
+  const cache = asOpenCodeObject(record?.cache);
   if (!record || !cache) return undefined;
   return {
     input: numberValue(record.input),
@@ -129,11 +129,11 @@ function zeroOpenCodeTokens(): OpenCodeTokenUsage {
 }
 
 function asTokenGroup(value: unknown): Record<string, number | undefined> {
-  return asRecord(value) ?? {};
-}
-
-function asRecord(value: unknown): Record<string, any> | undefined {
-  return isRecord(value) ? value : undefined;
+  return (
+    (asOpenCodeObject(value) as
+      | Record<string, number | undefined>
+      | undefined) ?? {}
+  );
 }
 
 function numberValue(value: unknown): number {
@@ -157,3 +157,12 @@ function add({
     ? undefined
     : (leftNumber ?? 0) + (rightNumber ?? 0);
 }
+
+type SessionTokenEnvelope = {
+  tokens?: unknown;
+  info?: { tokens?: unknown };
+  data?: {
+    tokens?: unknown;
+    data?: { tokens?: unknown };
+  };
+};

package/src/opencode-harness.ts

@@ -182,7 +182,7 @@ const OPENCODE_BUILTIN_TOOLS = {
   }),
 } as const satisfies Record<string, HarnessV1BuiltinTool<any, any>>;
 
-const BOOTSTRAP_DIR = '/tmp/harness/opencode';
+const BOOTSTRAP_DIR = '.harness-bootstrap/opencode';
 
 const openCodeBridgeCoordsSchema = z.object({
   port: z.number(),
@@ -230,12 +230,12 @@ export function createOpenCode(
           },
         ],
         commands: [
-          { command: `mkdir -p ${BOOTSTRAP_DIR}` },
           {
-            command: `pnpm --dir ${BOOTSTRAP_DIR} install --frozen-lockfile --store-dir ${BOOTSTRAP_DIR}/.pnpm-store`,
+            command: 'pnpm install --frozen-lockfile --store-dir .pnpm-store',
           },
           {
-            command: `cd ${BOOTSTRAP_DIR} && node node_modules/opencode-ai/postinstall.mjs && ./node_modules/.bin/opencode --version`,
+            command:
+              'node node_modules/opencode-ai/postinstall.mjs && ./node_modules/.bin/opencode --version',
           },
         ],
       };
@@ -245,6 +245,10 @@ export function createOpenCode(
       const sandboxSession = startOpts.sandboxSession;
       const session = sandboxSession.restricted();
       const sandboxId = sandboxSession.id;
+      const bootstrapDir = path.posix.resolve(
+        sandboxSession.defaultWorkingDirectory,
+        BOOTSTRAP_DIR,
+      );
       const lifecycleState = startOpts.continueFrom ?? startOpts.resumeFrom;
       const isResume = lifecycleState != null;
       const isContinue = startOpts.continueFrom != null;
@@ -388,7 +392,7 @@ export function createOpenCode(
       });
 
       const proc = await session.spawn({
-        command: `node ${BOOTSTRAP_DIR}/bridge.mjs --workdir ${shellQuote(workDir)} --bridge-state-dir ${shellQuote(bridgeStateDir)} --bootstrap-dir ${shellQuote(BOOTSTRAP_DIR)}${skillSetup ? ` --skills-dir ${shellQuote(skillSetup.skillsDir)}` : ''}`,
+        command: `node ${shellQuote(`${bootstrapDir}/bridge.mjs`)} --workdir ${shellQuote(workDir)} --bridge-state-dir ${shellQuote(bridgeStateDir)} --bootstrap-dir ${shellQuote(bootstrapDir)}${skillSetup ? ` --skills-dir ${shellQuote(skillSetup.skillsDir)}` : ''}`,
         env,
         abortSignal: startOpts.abortSignal,
       });