@ai-sdk/harness-opencode 1.0.91 → 1.0.92

package/dist/index.js

@@ -364,7 +364,7 @@ var inboundMessageSchema = z.discriminatedUnion("type", [
 ]);
 
 // src/version.ts
-var VERSION = true ? "1.0.91" : "0.0.0-test";
+var VERSION = true ? "1.0.92" : "0.0.0-test";
 
 // src/opencode-harness.ts
 var OPENCODE_CLIENT_APP = `ai-sdk/harness-opencode/${VERSION}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-sdk/harness-opencode",
-  "version": "1.0.91",
+  "version": "1.0.92",
   "type": "module",
   "license": "Apache-2.0",
   "sideEffects": false,
@@ -26,7 +26,7 @@
     }
   },
   "dependencies": {
-    "@ai-sdk/harness": "1.0.90",
+    "@ai-sdk/harness": "1.0.91",
     "@ai-sdk/provider-utils": "5.0.32",
     "ws": "8.21.0"
   },

package/src/bridge/create-emit-stream-event.ts

@@ -19,6 +19,11 @@ import {
 
 type Emit = (message: Record<string, unknown>) => void;
 
+type SubagentSession = {
+  parentSessionId: string;
+  sessionId: string;
+};
+
 export function createEmitStreamEvent({
   state,
   emit,
@@ -28,6 +33,7 @@ export function createEmitStreamEvent({
   nativeNameField,
   getHostToolName,
   authorizeHostToolCall,
+  onSubagentSession,
   isMcpToolName,
   stripWorkDir,
   formatError,
@@ -49,6 +55,7 @@ export function createEmitStreamEvent({
     toolName: string;
     input: unknown;
   }) => void;
+  onSubagentSession?: (session: SubagentSession) => void;
   isMcpToolName: (toolName: string) => boolean;
   stripWorkDir: (file: string) => string;
   formatError: (error: unknown) => string;
@@ -83,6 +90,7 @@ export function createEmitStreamEvent({
         nativeNameField,
         getHostToolName,
         authorizeHostToolCall,
+        onSubagentSession,
         isMcpToolName,
       });
       return;
@@ -359,6 +367,7 @@ function emitLegacyToolPart({
   nativeNameField,
   getHostToolName,
   authorizeHostToolCall,
+  onSubagentSession,
   isMcpToolName,
 }: {
   part: unknown;
@@ -377,6 +386,7 @@ function emitLegacyToolPart({
     toolName: string;
     input: unknown;
   }) => void;
+  onSubagentSession?: (session: SubagentSession) => void;
   isMcpToolName: (toolName: string) => boolean;
 }): void {
   const toolPart = legacyToolPartFromValue(part);
@@ -389,6 +399,17 @@ function emitLegacyToolPart({
   const rawToolName = toolPart.tool;
   if (rawToolName === 'StructuredOutput') return;
   const toolName = toWireToolName(rawToolName);
+  if (toolName === 'agent') {
+    const metadata = {
+      ...(toolPart.metadata ?? {}),
+      ...(toolPart.state?.metadata ?? {}),
+    };
+    const parentSessionId = stringValue(metadata.parentSessionId);
+    const sessionId = stringValue(metadata.sessionId);
+    if (parentSessionId && sessionId) {
+      onSubagentSession?.({ parentSessionId, sessionId });
+    }
+  }
   state.toolNames.set(callID, { rawToolName, toolName });
   const hostToolName = getHostToolName(toolName, rawToolName);
   if (hostToolName) {

package/src/bridge/index.ts

@@ -878,6 +878,22 @@ async function consumeEvents({
   const stream = await subscribeLegacyEvents({ client, signal });
   onSubscribed?.();
   if (!stream) return;
+  const taskSessionIds = new Set([sessionId]);
+  const registerSubagentSession = (sourceSessionId: string) =>
+    function register({
+      parentSessionId,
+      sessionId: subagentSessionId,
+    }: {
+      parentSessionId: string;
+      sessionId: string;
+    }) {
+      if (
+        parentSessionId === sourceSessionId &&
+        taskSessionIds.has(sourceSessionId)
+      ) {
+        taskSessionIds.add(subagentSessionId);
+      }
+    };
   const emitStreamEvent = createEmitStreamEvent({
     state,
     emit,
@@ -887,20 +903,59 @@ async function consumeEvents({
     nativeNameField,
     getHostToolName,
     authorizeHostToolCall: input => authorizeHostToolCall({ ...input, state }),
+    onSubagentSession: registerSubagentSession(sessionId),
     isMcpToolName: toolName =>
       [...runtime.mcpToolPrefixes].some(prefix => toolName.startsWith(prefix)),
     stripWorkDir,
     formatError,
   });
+  const descendantEventProcessors = new Map<
+    string,
+    (event: OpenCodeEvent) => void
+  >();
+  const processDescendantEvent = (
+    descendantSessionId: string,
+    event: OpenCodeEvent,
+  ) => {
+    let processEvent = descendantEventProcessors.get(descendantSessionId);
+    if (!processEvent) {
+      const descendantState = createTranslationState();
+      processEvent = createEmitStreamEvent({
+        state: descendantState,
+        emit: () => undefined,
+        emitWarning: () => undefined,
+        emitError: () => undefined,
+        toWireToolName,
+        nativeNameField,
+        getHostToolName,
+        authorizeHostToolCall: input =>
+          authorizeHostToolCall({ ...input, state: descendantState }),
+        onSubagentSession: registerSubagentSession(descendantSessionId),
+        isMcpToolName: () => false,
+        stripWorkDir,
+        formatError,
+      });
+      descendantEventProcessors.set(descendantSessionId, processEvent);
+    }
+    processEvent(event);
+  };
   for await (const rawEvent of stream) {
     if (signal.aborted || turn.abortSignal.aborted) break;
     const event = unwrapOpenCodeEvent(rawEvent);
     const eventSessionId = event ? getOpenCodeEventSessionId(event) : undefined;
-    if (!event || (eventSessionId && eventSessionId !== sessionId)) continue;
+    if (!event) continue;
+    const scopedSessionId =
+      !eventSessionId || eventSessionId === sessionId
+        ? sessionId
+        : taskSessionIds.has(eventSessionId)
+          ? eventSessionId
+          : undefined;
+    if (!scopedSessionId) continue;
+    const isDescendant = scopedSessionId !== sessionId;
     if (event.type === 'permission.v2.asked') {
       await handlePermissionV2({
         client,
-        sessionId,
+        sessionId: scopedSessionId,
         permissionMode,
         builtinToolFiltering,
         turn,
@@ -910,16 +965,19 @@ async function consumeEvents({
     } else if (event.type === 'permission.asked') {
       await handlePermission({
         client,
-        sessionId,
+        sessionId: scopedSessionId,
         permissionMode,
         builtinToolFiltering,
         turn,
         emit,
         event,
       });
+    } else if (isDescendant) {
+      processDescendantEvent(scopedSessionId, event);
     } else {
       emitStreamEvent(event);
     }
+    if (isDescendant) continue;
     if (onEvent?.(event)) break;
   }
 }

package/src/bridge/opencode-events.ts

@@ -101,6 +101,16 @@ export function getOpenCodeEventSessionId(
   if (event.type?.startsWith('session.') && typeof props.id === 'string') {
     return props.id;
   }
+  const info = asOpenCodeObject(props.info);
+  if (typeof info?.sessionID === 'string') return info.sessionID;
+  if (
+    (event.type === 'session.created' ||
+      event.type === 'session.updated' ||
+      event.type === 'session.deleted') &&
+    typeof info?.id === 'string'
+  ) {
+    return info.id;
+  }
   const part = props.part;
   const partObject = asOpenCodeObject(part);
   if (typeof partObject?.sessionID === 'string') return partObject.sessionID;

package/src/bridge/opencode-types.ts

@@ -2,6 +2,7 @@ export type OpenCodeObject = Record<string, unknown>;
 
 export type OpenCodeMessageInfo = {
   id?: unknown;
+  sessionID?: unknown;
   role?: unknown;
   type?: unknown;
   providerID?: unknown;