@ai-sdk/harness-opencode 1.0.51 → 1.0.53

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @ai-sdk/harness-opencode
 
+## 1.0.53
+
+### Patch Changes
+
+- 2d9c434: fix(harness-opencode): avoid bridge import from provider-utils and rely on more granular types
+  - @ai-sdk/harness@1.0.52
+
+## 1.0.52
+
+### Patch Changes
+
+- Updated dependencies [fa95504]
+- Updated dependencies [226a679]
+  - @ai-sdk/provider-utils@5.0.17
+  - @ai-sdk/harness@1.0.51
+
 ## 1.0.51
 
 ### Patch Changes

package/dist/bridge/index.mjs

@@ -461,7 +461,6 @@ function serialiseError(err) {
 }
 
 // src/bridge/index.ts
-import { isRecord as isRecord5 } from "@ai-sdk/provider-utils";
 import { randomUUID } from "crypto";
 import { mkdirSync } from "fs";
 import path2 from "path";
@@ -471,8 +470,12 @@ import {
   createOpencodeServer
 } from "@opencode-ai/sdk/v2";
 
+// src/bridge/opencode-types.ts
+function asOpenCodeObject(value) {
+  return value != null && typeof value === "object" && !Array.isArray(value) ? value : void 0;
+}
+
 // src/bridge/opencode-events.ts
-import { isRecord } from "@ai-sdk/provider-utils";
 function createTranslationState() {
   return {
     streamStarted: false,
@@ -496,29 +499,32 @@ function emitOpenCodeStreamStart({
   state,
   emit
 }) {
-  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}` : void 0;
   state.streamStarted = true;
   emit({ type: "stream-start", ...modelId ? { modelId } : {} });
 }
 function unwrapOpenCodeEvent(rawEvent) {
-  if (!rawEvent || typeof rawEvent !== "object") return void 0;
-  const raw = rawEvent;
+  const raw = asOpenCodeObject(rawEvent);
+  if (!raw) return void 0;
   if (raw.type === "sync" && raw.syncEvent) {
-    const sync = raw.syncEvent;
+    const sync = asOpenCodeObject(raw.syncEvent);
+    if (!sync) return void 0;
     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 : void 0,
     type: typeof raw.type === "string" ? stripSyncVersion(raw.type) : void 0,
-    properties: asRecord(raw.properties) ?? asRecord(raw.data) ?? {}
+    properties: openCodeEventPropertiesFromValue(raw.properties) ?? openCodeEventPropertiesFromValue(raw.data) ?? {}
   };
 }
 function getOpenCodeEventSessionId(event) {
@@ -530,9 +536,8 @@ function getOpenCodeEventSessionId(event) {
     return props.id;
   }
   const part = props.part;
-  if (part && typeof part === "object" && !Array.isArray(part) && typeof part.sessionID === "string") {
-    return part.sessionID;
-  }
+  const partObject = asOpenCodeObject(part);
+  if (typeof partObject?.sessionID === "string") return partObject.sessionID;
   return void 0;
 }
 function isStepSettlementEvent(event) {
@@ -595,17 +600,17 @@ function emitLegacyTextPartUpdate({
   state,
   emit
 }) {
-  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 : void 0;
+  const text = typeof textPart.text === "string" ? textPart.text : void 0;
   startLegacyPart({
     ids,
     id,
@@ -622,7 +627,7 @@ 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 });
@@ -632,9 +637,6 @@ function emitLegacyTextPartUpdate({
 function stripSyncVersion(type) {
   return type.replace(/\.\d+$/, "");
 }
-function asRecord(value) {
-  return isRecord(value) ? value : void 0;
-}
 function stringValue(value) {
   return typeof value === "string" && value.length > 0 ? value : void 0;
 }
@@ -654,18 +656,27 @@ function startLegacyPart({
   ids.add(id);
   emit({ type: `${type}-start`, id });
 }
-function legacyPartEnded(part) {
-  return isRecord(part.time) && part.time.end != null;
+function openCodeMessageInfoFromValue(value) {
+  return asOpenCodeObject(value);
+}
+function openCodeEventPropertiesFromValue(value) {
+  return asOpenCodeObject(value);
+}
+function legacyTextPartFromValue(value) {
+  const part = asOpenCodeObject(value);
+  if (!part || part.type !== "text" && part.type !== "reasoning") {
+    return void 0;
+  }
+  return {
+    type: part.type,
+    id: part.id,
+    messageID: part.messageID,
+    text: part.text,
+    time: asOpenCodeObject(part.time)
+  };
 }
-
-// src/bridge/create-emit-stream-event.ts
-import { isRecord as isRecord4 } from "@ai-sdk/provider-utils";
-
-// src/bridge/opencode-finish-step.ts
-import { isRecord as isRecord3 } from "@ai-sdk/provider-utils";
 
 // src/bridge/opencode-usage.ts
-import { isRecord as isRecord2 } from "@ai-sdk/provider-utils";
 function mapUsage(tokens) {
   const value = extractOpenCodeTokens(tokens) ?? zeroOpenCodeTokens();
   const cacheRead = value.cache.read;
@@ -687,9 +698,9 @@ function defaultUsage() {
   return mapUsage(zeroOpenCodeTokens());
 }
 function extractSessionTokens(value) {
-  const record = asRecord2(value);
+  const record = asOpenCodeObject(value);
   if (!record) return void 0;
-  const tokens = extractOpenCodeTokens(record.tokens) ?? extractOpenCodeTokens(asRecord2(record.info)?.tokens) ?? extractOpenCodeTokens(asRecord2(record.data)?.tokens) ?? extractOpenCodeTokens(asRecord2(asRecord2(record.data)?.data)?.tokens);
+  const tokens = extractOpenCodeTokens(record.tokens) ?? extractOpenCodeTokens(record.info?.tokens) ?? extractOpenCodeTokens(record.data?.tokens) ?? extractOpenCodeTokens(record.data?.data?.tokens);
   return tokens;
 }
 function subtractSessionTokens({
@@ -739,8 +750,8 @@ function addUsage({
   };
 }
 function extractOpenCodeTokens(value) {
-  const record = asRecord2(value);
-  const cache = asRecord2(record?.cache);
+  const record = asOpenCodeObject(value);
+  const cache = asOpenCodeObject(record?.cache);
   if (!record || !cache) return void 0;
   return {
     input: numberValue(record.input),
@@ -761,10 +772,7 @@ function zeroOpenCodeTokens() {
   };
 }
 function asTokenGroup(value) {
-  return asRecord2(value) ?? {};
-}
-function asRecord2(value) {
-  return isRecord2(value) ? value : void 0;
+  return asOpenCodeObject(value) ?? {};
 }
 function numberValue(value) {
   return typeof value === "number" && Number.isFinite(value) ? value : 0;
@@ -792,10 +800,11 @@ function mapOpenCodeFinishReason(reason) {
   if (normalized === "stop" || normalized === "end") return "stop";
   return "other";
 }
-function legacyStepFinishPartToFinishStep(part) {
-  if (!isRecord3(part) || part.type !== "step-finish") return void 0;
+function translateLegacyStepFinishPart(value) {
+  const part = asOpenCodeObject(value);
+  if (!part || part.type !== "step-finish") return void 0;
   const rawFinish = typeof part.reason === "string" ? part.reason : "stop";
-  return {
+  const event = {
     type: "finish-step",
     finishReason: {
       unified: mapOpenCodeFinishReason(rawFinish),
@@ -804,6 +813,10 @@ function legacyStepFinishPartToFinishStep(part) {
     usage: mapUsage(part.tokens),
     ...typeof part.cost === "number" ? { harnessMetadata: { opencode: { cost: part.cost } } } : {}
   };
+  return {
+    event,
+    ...typeof part.id === "string" ? { partId: part.id } : {}
+  };
 }
 
 // src/bridge/create-emit-stream-event.ts
@@ -823,8 +836,8 @@ function createEmitStreamEvent({
     const type = event.type;
     const props = event.properties ?? {};
     if (type === "message.updated") {
-      const info = props.info;
-      if (isRecord4(info)) {
+      const info = openCodeMessageInfoFromValue(props.info);
+      if (info) {
         const id = stringValue2(info.id);
         const role = stringValue2(info.role);
         if (id && role) state.messageRoles.set(id, role);
@@ -994,7 +1007,7 @@ function createEmitStreamEvent({
     }
     if (type === "session.next.retried") {
       const error = props.error ?? event;
-      if (isRecord4(error) && error.isRetryable === false) {
+      if (openCodeErrorFromValue(error)?.isRetryable === false) {
         emitError({
           error,
           message: "OpenCode session retry failed"
@@ -1068,9 +1081,9 @@ function emitLegacyStepFinishPart({
   state,
   emit
 }) {
-  const event = legacyStepFinishPartToFinishStep(part);
-  if (!event) return false;
-  const id = isRecord4(part) ? stringValue2(part.id) : void 0;
+  const translated = translateLegacyStepFinishPart(part);
+  if (!translated) return false;
+  const { event, partId: id } = translated;
   if (id) {
     if (state.legacyStepFinishPartIds.has(id)) return true;
     state.legacyStepFinishPartIds.add(id);
@@ -1089,16 +1102,12 @@ function emitLegacyToolPart({
   getHostToolName: getHostToolName2,
   authorizeHostToolCall: authorizeHostToolCall2
 }) {
-  if (!part || typeof part !== "object") return;
-  const toolPart = part;
-  if (toolPart.type !== "tool") return;
-  const status = legacyToolPartStatus(toolPart);
+  const toolPart = legacyToolPartFromValue(part);
+  if (!toolPart) return;
+  const status = toolPart.status;
   if (status !== "running" && status !== "completed" && status !== "error") {
     return;
   }
-  if (typeof toolPart.tool !== "string" || typeof toolPart.callID !== "string") {
-    return;
-  }
   const callID = toolPart.callID;
   const rawToolName = toolPart.tool;
   const toolName = toWireToolName2(rawToolName);
@@ -1123,7 +1132,7 @@ function emitLegacyToolPart({
       ...nativeNameField2({ nativeName: rawToolName, toolName }),
       input: JSON.stringify(legacyToolPartInput(toolPart)),
       providerExecuted: true,
-      ...toolPart.provider?.metadata ? { providerMetadata: toolPart.provider.metadata } : {}
+      ...toolPart.providerMetadata ? { providerMetadata: toolPart.providerMetadata } : {}
     });
   }
   if ((status === "completed" || status === "error") && !state.toolResultsEmitted.has(callID)) {
@@ -1137,19 +1146,15 @@ function emitLegacyToolPart({
     });
   }
 }
-function legacyToolPartStatus(part) {
-  return typeof part.state === "string" ? part.state : typeof part.state === "object" && part.state !== null ? String(part.state.status ?? "") : void 0;
-}
 function legacyToolPartInput(part) {
-  const state = typeof part.state === "object" && part.state !== null ? part.state : void 0;
   return {
-    ...isRecord4(part.metadata) ? part.metadata : {},
-    ...isRecord4(state?.metadata) ? state.metadata : {},
-    ...isRecord4(state?.input) ? state.input : {}
+    ...part.metadata ?? {},
+    ...part.state?.metadata ?? {},
+    ...part.state?.input ?? {}
   };
 }
 function legacyToolPartOutput(part) {
-  const state = typeof part.state === "object" && part.state !== null ? part.state : void 0;
+  const state = part.state;
   if (state?.status === "error") {
     return state.error ?? part.error ?? state.result ?? "tool failed";
   }
@@ -1174,9 +1179,10 @@ function nextRetryEventMessage({
     details.push(`attempt ${props.attempt}`);
   }
   const error = props.error;
-  if (isRecord4(error)) {
-    const message = stringValue2(error.message) ?? (isRecord4(error.data) ? stringValue2(error.data.message) : void 0);
-    const statusCode = error.statusCode;
+  const errorDetails = openCodeErrorFromValue(error);
+  if (errorDetails) {
+    const message = stringValue2(errorDetails.message) ?? stringValue2(errorDetails.data?.message);
+    const statusCode = errorDetails.statusCode;
     if (typeof statusCode === "number") {
       details.push(`HTTP ${statusCode}`);
     }
@@ -1189,6 +1195,45 @@ function nextRetryEventMessage({
 function stringValue2(value) {
   return typeof value === "string" && value.length > 0 ? value : void 0;
 }
+function legacyToolPartFromValue(value) {
+  const part = asOpenCodeObject(value);
+  if (!part || part.type !== "tool" || typeof part.tool !== "string" || typeof part.callID !== "string") {
+    return void 0;
+  }
+  const stateObject = asOpenCodeObject(part.state);
+  const provider = asOpenCodeObject(part.provider);
+  const state = stateObject ? {
+    status: stringValue2(stateObject.status),
+    input: asOpenCodeObject(stateObject.input),
+    metadata: asOpenCodeObject(stateObject.metadata),
+    output: stateObject.output,
+    result: stateObject.result,
+    structured: stateObject.structured,
+    content: stateObject.content,
+    error: stateObject.error
+  } : void 0;
+  return {
+    type: "tool",
+    callID: part.callID,
+    tool: part.tool,
+    status: typeof part.state === "string" ? part.state : state?.status ?? void 0,
+    state,
+    metadata: asOpenCodeObject(part.metadata),
+    providerMetadata: provider?.metadata,
+    error: part.error
+  };
+}
+function openCodeErrorFromValue(value) {
+  const error = asOpenCodeObject(value);
+  if (!error) return void 0;
+  const data = asOpenCodeObject(error.data);
+  return {
+    isRetryable: error.isRetryable,
+    message: error.message,
+    statusCode: error.statusCode,
+    data: data ? { message: data.message } : void 0
+  };
+}
 
 // src/bridge/opencode-path.ts
 import path from "path";
@@ -2022,7 +2067,7 @@ async function handlePermissionV2({
     action: String(props.action ?? ""),
     resources: Array.isArray(props.resources) ? props.resources.map(String) : [],
     requestID,
-    toolCallId: typeof props.source === "object" && props.source !== null && "callID" in props.source ? String(props.source.callID) : requestID,
+    toolCallId: String(props.source?.callID ?? requestID),
     permissionMode,
     builtinToolFiltering,
     turn,
@@ -2047,11 +2092,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.callID) : requestID,
+    toolCallId: String(tool?.callID ?? requestID),
     permissionMode,
     builtinToolFiltering,
     turn,
@@ -2317,14 +2363,12 @@ function modelRefFromAssistantSnapshot(assistant) {
   if (model) return model;
   const direct = modelRefFromValue(assistant);
   if (direct) return direct;
-  if (isRecord5(assistant.metadata)) {
-    return modelRefFromValue(assistant.metadata.assistant);
-  }
-  return void 0;
+  return modelRefFromValue(asOpenCodeObject(assistant.metadata)?.assistant);
 }
 function modelRefFromSessionInfo(data) {
-  if (!isRecord5(data)) return void 0;
-  return modelRefFromValue(data.model) ?? modelRefFromValue(data);
+  const session = asOpenCodeObject(data);
+  if (!session) return void 0;
+  return modelRefFromValue(session.model) ?? modelRefFromObject(session);
 }
 function modelRefFromStart(start) {
   const model = splitModel(start.model, start.provider);
@@ -2335,7 +2379,10 @@ function modelRefFromStart(start) {
   };
 }
 function modelRefFromValue(value) {
-  if (!isRecord5(value)) return void 0;
+  const model = asOpenCodeObject(value);
+  return model ? modelRefFromObject(model) : void 0;
+}
+function modelRefFromObject(value) {
   const providerID = stringValue2(value.providerID);
   const modelID = stringValue2(value.modelID ?? value.id);
   if (!providerID || !modelID) return void 0;