@ai-sdk/harness-opencode 1.0.40 → 1.0.42

package/dist/bridge/index.mjs

@@ -53,6 +53,7 @@ async function runBridge(options) {
   let currentBoundPort = 0;
   let currentTurnState = "init";
   let activeSocket;
+  let activeSocketReadyForLiveEvents = false;
   let isFirstTurn = true;
   let turnAbort;
   let currentUserMessages;
@@ -152,7 +153,7 @@ async function runBridge(options) {
     diskBuffer += `${line}
 `;
     scheduleEventFlush();
-    if (activeSocket?.readyState === WS_OPEN) {
+    if (activeSocketReadyForLiveEvents && activeSocket?.readyState === WS_OPEN) {
       try {
         activeSocket.send(line);
       } catch {
@@ -255,6 +256,8 @@ async function runBridge(options) {
   const handleInbound = async (msg, ws) => {
     switch (msg.type) {
       case "start": {
+        if (activeSocket !== ws) return;
+        activeSocketReadyForLiveEvents = true;
         const firstTurn = isFirstTurn;
         isFirstTurn = false;
         eventLog = [];
@@ -357,7 +360,9 @@ async function runBridge(options) {
         }
         return;
       case "resume":
+        if (activeSocket !== ws) return;
         replay(ws, msg.lastSeenEventId);
+        activeSocketReadyForLiveEvents = true;
         return;
       case "shutdown":
         currentTurnState = "done";
@@ -422,6 +427,7 @@ async function runBridge(options) {
       return;
     }
     activeSocket = ws;
+    activeSocketReadyForLiveEvents = false;
     sendControl({
       type: "bridge-hello",
       state: currentTurnState,
@@ -444,6 +450,7 @@ async function runBridge(options) {
     ws.on("close", () => {
       if (activeSocket === ws) {
         activeSocket = void 0;
+        activeSocketReadyForLiveEvents = false;
       }
     });
     ws.on("error", () => {
@@ -490,6 +497,7 @@ import {
 // src/bridge/opencode-events.ts
 function createTranslationState() {
   return {
+    streamStarted: false,
     textDeltas: /* @__PURE__ */ new Map(),
     reasoningDeltas: /* @__PURE__ */ new Map(),
     toolInputs: /* @__PURE__ */ new Map(),
@@ -505,6 +513,19 @@ function createTranslationState() {
     legacyStepFinishPartIds: /* @__PURE__ */ new Set()
   };
 }
+function emitOpenCodeStreamStart({
+  info,
+  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);
+  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;
@@ -810,6 +831,393 @@ function isRecord2(value) {
   return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
 
+// src/bridge/create-emit-stream-event.ts
+function createEmitStreamEvent({
+  state,
+  emit,
+  emitWarning,
+  emitError,
+  toWireToolName: toWireToolName2,
+  nativeNameField: nativeNameField2,
+  getHostToolName: getHostToolName2,
+  authorizeHostToolCall: authorizeHostToolCall2,
+  stripWorkDir: stripWorkDir2,
+  formatError: formatError2
+}) {
+  return (event) => {
+    const type = event.type;
+    const props = event.properties ?? {};
+    if (type === "message.updated") {
+      const info = props.info;
+      if (isRecord3(info)) {
+        const id = stringValue2(info.id);
+        const role = stringValue2(info.role);
+        if (id && role) state.messageRoles.set(id, role);
+      }
+      return;
+    }
+    if (type === "message.part.delta") {
+      emitLegacyPartDelta({ props, state, emit });
+      return;
+    }
+    if (type === "message.part.updated") {
+      if (emitLegacyTextPartUpdate({ part: props.part, state, emit })) return;
+      if (emitLegacyStepFinishPart({ part: props.part, state, emit })) return;
+      emitLegacyToolPart({
+        part: props.part,
+        state,
+        emit,
+        toWireToolName: toWireToolName2,
+        nativeNameField: nativeNameField2,
+        getHostToolName: getHostToolName2,
+        authorizeHostToolCall: authorizeHostToolCall2
+      });
+      return;
+    }
+    if (type === "session.next.text.started") {
+      emit({ type: "text-start", id: String(props.textID ?? event.id) });
+      return;
+    }
+    if (type === "session.next.text.delta") {
+      const id = String(props.textID ?? event.id);
+      state.textDeltas.set(
+        id,
+        `${state.textDeltas.get(id) ?? ""}${String(props.delta ?? "")}`
+      );
+      emit({
+        type: "text-delta",
+        id,
+        delta: String(props.delta ?? "")
+      });
+      return;
+    }
+    if (type === "session.next.text.ended") {
+      const id = String(props.textID ?? event.id);
+      emitMissingFinalDelta({
+        id,
+        fullText: typeof props.text === "string" ? props.text : void 0,
+        emittedText: state.textDeltas.get(id) ?? "",
+        emit,
+        type: "text-delta"
+      });
+      emit({ type: "text-end", id });
+      return;
+    }
+    if (type === "session.next.reasoning.started") {
+      emit({
+        type: "reasoning-start",
+        id: String(props.reasoningID ?? event.id)
+      });
+      return;
+    }
+    if (type === "session.next.reasoning.delta") {
+      const id = String(props.reasoningID ?? event.id);
+      state.reasoningDeltas.set(
+        id,
+        `${state.reasoningDeltas.get(id) ?? ""}${String(props.delta ?? "")}`
+      );
+      emit({
+        type: "reasoning-delta",
+        id,
+        delta: String(props.delta ?? "")
+      });
+      return;
+    }
+    if (type === "session.next.reasoning.ended") {
+      const id = String(props.reasoningID ?? event.id);
+      emitMissingFinalDelta({
+        id,
+        fullText: typeof props.text === "string" ? props.text : void 0,
+        emittedText: state.reasoningDeltas.get(id) ?? "",
+        emit,
+        type: "reasoning-delta"
+      });
+      emit({ type: "reasoning-end", id });
+      return;
+    }
+    if (type === "session.next.shell.started") {
+      const callID = String(props.callID ?? event.id);
+      const command = String(props.command ?? "");
+      state.shellCommands.set(callID, command);
+      emit({
+        type: "tool-call",
+        toolCallId: callID,
+        toolName: "bash",
+        nativeName: "bash",
+        input: JSON.stringify({ command }),
+        providerExecuted: true
+      });
+      return;
+    }
+    if (type === "session.next.shell.ended") {
+      const callID = String(props.callID ?? event.id);
+      emit({
+        type: "tool-result",
+        toolCallId: callID,
+        toolName: "bash",
+        result: {
+          command: state.shellCommands.get(callID) ?? "",
+          output: String(props.output ?? "")
+        }
+      });
+      return;
+    }
+    if (type === "session.next.tool.input.delta") {
+      const callID = String(props.callID ?? event.id);
+      state.toolInputs.set(
+        callID,
+        `${state.toolInputs.get(callID) ?? ""}${String(props.delta ?? "")}`
+      );
+      return;
+    }
+    if (type === "session.next.tool.input.ended") {
+      state.toolInputs.set(
+        String(props.callID ?? event.id),
+        String(props.text ?? "")
+      );
+      return;
+    }
+    if (type === "session.next.tool.called") {
+      const callID = String(props.callID ?? event.id);
+      const rawToolName = String(props.tool ?? "unknown");
+      const toolName = toWireToolName2(rawToolName);
+      state.toolNames.set(callID, { rawToolName, toolName });
+      const hostToolName = getHostToolName2(toolName, props.tool);
+      if (hostToolName) {
+        authorizeHostToolCall2({
+          callID,
+          toolName: hostToolName,
+          input: props.input ?? parseToolInput(state, props)
+        });
+        return;
+      }
+      emit({
+        type: "tool-call",
+        toolCallId: callID,
+        toolName,
+        ...nativeNameField2({ nativeName: rawToolName, toolName }),
+        input: JSON.stringify(props.input ?? parseToolInput(state, props)),
+        providerExecuted: true,
+        ...props.provider?.metadata ? { providerMetadata: props.provider.metadata } : {}
+      });
+      return;
+    }
+    if (type === "session.next.tool.success" || type === "session.next.tool.failed") {
+      const callID = String(props.callID ?? event.id);
+      const cachedTool = state.toolNames.get(callID);
+      const rawToolName = cachedTool?.rawToolName ?? String(props.tool ?? "");
+      const toolName = cachedTool?.toolName ?? toWireToolName2(rawToolName || "unknown");
+      if (getHostToolName2(toolName, rawToolName)) return;
+      emit({
+        type: "tool-result",
+        toolCallId: callID,
+        toolName,
+        result: props.result ?? props.structured ?? ("content" in props ? props.content : null) ?? null,
+        ...type === "session.next.tool.failed" ? { isError: true } : {}
+      });
+      return;
+    }
+    if (type === "session.next.retried") {
+      const error = props.error ?? event;
+      if (isRecord3(error) && error.isRetryable === false) {
+        emitError({
+          error,
+          message: "OpenCode session retry failed"
+        });
+      } else {
+        emitWarning({ message: nextRetryEventMessage({ event, formatError: formatError2 }) });
+      }
+      return;
+    }
+    if (type === "session.next.step.ended") {
+      closeLegacyOpenParts({ state, emit });
+      state.turnUsage = mapUsage(props.tokens);
+      emit({
+        type: "finish-step",
+        finishReason: {
+          unified: mapOpenCodeFinishReason(String(props.finish ?? "stop")),
+          raw: String(props.finish ?? "stop")
+        },
+        usage: state.turnUsage,
+        ...typeof props.cost === "number" ? { harnessMetadata: { opencode: { cost: props.cost } } } : {}
+      });
+      return;
+    }
+    if (type === "session.next.compaction.ended") {
+      emit({
+        type: "compaction",
+        trigger: props.reason === "auto" ? "auto" : "manual",
+        summary: String(props.text ?? ""),
+        harnessMetadata: {
+          opencode: {
+            recent: String(props.recent ?? "")
+          }
+        }
+      });
+      return;
+    }
+    if (type === "file.edited") {
+      emit({
+        type: "file-change",
+        event: "modify",
+        path: stripWorkDir2(String(props.file ?? ""))
+      });
+      return;
+    }
+    if (type === "session.error" || type === "session.next.step.failed") {
+      const error = props.error ?? event;
+      emitError({
+        error,
+        message: type === "session.error" ? "OpenCode session error" : "OpenCode step failed"
+      });
+    }
+  };
+}
+function closeLegacyOpenParts({
+  state,
+  emit
+}) {
+  for (const id of state.legacyReasoningPartIds) {
+    emit({ type: "reasoning-end", id });
+    state.reasoningDeltas.delete(id);
+  }
+  state.legacyReasoningPartIds.clear();
+  for (const id of state.legacyTextPartIds) {
+    emit({ type: "text-end", id });
+    state.textDeltas.delete(id);
+  }
+  state.legacyTextPartIds.clear();
+}
+function emitLegacyStepFinishPart({
+  part,
+  state,
+  emit
+}) {
+  const event = legacyStepFinishPartToFinishStep(part);
+  if (!event) return false;
+  const id = isRecord3(part) ? stringValue2(part.id) : void 0;
+  if (id) {
+    if (state.legacyStepFinishPartIds.has(id)) return true;
+    state.legacyStepFinishPartIds.add(id);
+  }
+  closeLegacyOpenParts({ state, emit });
+  state.turnUsage = event.usage;
+  emit(event);
+  return true;
+}
+function emitLegacyToolPart({
+  part,
+  state,
+  emit,
+  toWireToolName: toWireToolName2,
+  nativeNameField: nativeNameField2,
+  getHostToolName: getHostToolName2,
+  authorizeHostToolCall: authorizeHostToolCall2
+}) {
+  if (!part || typeof part !== "object") return;
+  const toolPart = part;
+  if (toolPart.type !== "tool") return;
+  const status = legacyToolPartStatus(toolPart);
+  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);
+  state.toolNames.set(callID, { rawToolName, toolName });
+  const hostToolName = getHostToolName2(toolName, rawToolName);
+  if (hostToolName) {
+    if (status === "running") {
+      authorizeHostToolCall2({
+        callID,
+        toolName: hostToolName,
+        input: legacyToolPartInput(toolPart)
+      });
+    }
+    return;
+  }
+  if (!state.toolCallsEmitted.has(callID)) {
+    state.toolCallsEmitted.add(callID);
+    emit({
+      type: "tool-call",
+      toolCallId: callID,
+      toolName,
+      ...nativeNameField2({ nativeName: rawToolName, toolName }),
+      input: JSON.stringify(legacyToolPartInput(toolPart)),
+      providerExecuted: true,
+      ...toolPart.provider?.metadata ? { providerMetadata: toolPart.provider.metadata } : {}
+    });
+  }
+  if ((status === "completed" || status === "error") && !state.toolResultsEmitted.has(callID)) {
+    state.toolResultsEmitted.add(callID);
+    emit({
+      type: "tool-result",
+      toolCallId: callID,
+      toolName,
+      result: legacyToolPartOutput(toolPart),
+      ...status === "error" ? { isError: true } : {}
+    });
+  }
+}
+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 {
+    ...isRecord3(part.metadata) ? part.metadata : {},
+    ...isRecord3(state?.metadata) ? state.metadata : {},
+    ...isRecord3(state?.input) ? state.input : {}
+  };
+}
+function legacyToolPartOutput(part) {
+  const state = typeof part.state === "object" && part.state !== null ? part.state : void 0;
+  if (state?.status === "error") {
+    return state.error ?? part.error ?? state.result ?? "tool failed";
+  }
+  return state?.output ?? state?.result ?? state?.structured ?? state?.content ?? null;
+}
+function parseToolInput(state, props) {
+  const text = state.toolInputs.get(String(props.callID ?? ""));
+  if (!text) return {};
+  try {
+    return JSON.parse(text);
+  } catch {
+    return { input: text };
+  }
+}
+function nextRetryEventMessage({
+  event,
+  formatError: formatError2
+}) {
+  const props = event.properties ?? {};
+  const details = [];
+  if (typeof props.attempt === "number") {
+    details.push(`attempt ${props.attempt}`);
+  }
+  const error = props.error;
+  if (isRecord3(error)) {
+    const message = stringValue2(error.message) ?? (isRecord3(error.data) ? stringValue2(error.data.message) : void 0);
+    const statusCode = error.statusCode;
+    if (typeof statusCode === "number") {
+      details.push(`HTTP ${statusCode}`);
+    }
+    if (message) details.push(message);
+  } else if (error != null) {
+    details.push(formatError2(error));
+  }
+  return details.length > 0 ? `OpenCode session retry: ${details.join("; ")}` : "OpenCode session retry";
+}
+function isRecord3(value) {
+  return Boolean(value && typeof value === "object" && !Array.isArray(value));
+}
+function stringValue2(value) {
+  return typeof value === "string" && value.length > 0 ? value : void 0;
+}
+
 // src/bridge/opencode-path.ts
 import path from "path";
 var fallbackPath = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin";
@@ -1335,25 +1743,6 @@ function legacyRetryStatusMessage(event) {
   }
   return details.length > 0 ? `OpenCode session retry: ${details.join("; ")}` : "OpenCode session retry";
 }
-function nextRetryEventMessage(event) {
-  const props = event.properties ?? {};
-  const details = [];
-  if (typeof props.attempt === "number") {
-    details.push(`attempt ${props.attempt}`);
-  }
-  const error = props.error;
-  if (isRecord3(error)) {
-    const message = stringValue2(error.message) ?? (isRecord3(error.data) ? stringValue2(error.data.message) : void 0);
-    const statusCode = error.statusCode;
-    if (typeof statusCode === "number") {
-      details.push(`HTTP ${statusCode}`);
-    }
-    if (message) details.push(message);
-  } else if (error != null) {
-    details.push(formatError(error));
-  }
-  return details.length > 0 ? `OpenCode session retry: ${details.join("; ")}` : "OpenCode session retry";
-}
 async function ensureSession({
   client,
   start,
@@ -1396,6 +1785,7 @@ async function runPrompt({
   let sawFinishStep = false;
   let sawBusy = false;
   let terminalError;
+  const state = createTranslationState();
   const initialSessionTokens = await readSessionTokens({
     client,
     sessionId
@@ -1409,6 +1799,7 @@ async function runPrompt({
     permissionMode: start.permissionMode,
     builtinToolFiltering: start.builtinToolFiltering,
     turn,
+    state,
     emit: (msg) => {
       if (msg.type === "text-delta" || msg.type === "reasoning-delta") {
         sawContent = true;
@@ -1425,6 +1816,13 @@ async function runPrompt({
     signal: eventsAbort.signal,
     onSubscribed: () => eventsReady.resolve(void 0),
     onEvent: (event) => {
+      if (event.type === "message.updated") {
+        emitOpenCodeStreamStart({
+          info: event.properties?.info,
+          state,
+          emit
+        });
+      }
       if (event.type === "session.updated") {
         latestSessionTokens = extractSessionTokens(event.properties) ?? latestSessionTokens;
       }
@@ -1452,10 +1850,6 @@ async function runPrompt({
     eventsReady.resolve(void 0);
     turnSettled.resolve();
   });
-  emit({
-    type: "stream-start",
-    ...start.model ? { modelId: start.model } : {}
-  });
   await eventsReady.promise;
   const prompted = await legacySessionPrompt({
     client,
@@ -1475,6 +1869,7 @@ async function runPrompt({
     const emittedFallback = await emitContextFallback({
       client,
       sessionId,
+      state,
       emit,
       emitContent: !sawContent
     }).catch(() => false);
@@ -1526,6 +1921,7 @@ async function runCompaction({
     permissionMode: start.permissionMode,
     builtinToolFiltering: start.builtinToolFiltering,
     turn,
+    state: createTranslationState(),
     emit: (msg) => {
       if (msg.type === "compaction") sawCompaction = true;
       emit(msg);
@@ -1586,6 +1982,7 @@ async function consumeEvents({
   permissionMode,
   builtinToolFiltering,
   turn,
+  state,
   emit,
   signal,
   onSubscribed,
@@ -1594,393 +1991,47 @@ async function consumeEvents({
   const stream = await subscribeLegacyEvents({ client, signal });
   onSubscribed?.();
   if (!stream) return;
-  const state = createTranslationState();
+  const emitStreamEvent = createEmitStreamEvent({
+    state,
+    emit,
+    emitWarning: turn.emitWarning,
+    emitError: turn.emitError,
+    toWireToolName,
+    nativeNameField,
+    getHostToolName,
+    authorizeHostToolCall: (input) => authorizeHostToolCall({ ...input, state }),
+    stripWorkDir,
+    formatError
+  });
   for await (const rawEvent of stream) {
     if (signal.aborted || turn.abortSignal.aborted) break;
     const event = unwrapOpenCodeEvent(rawEvent);
     const eventSessionId = event ? getOpenCodeEventSessionId(event) : void 0;
     if (!event || eventSessionId && eventSessionId !== sessionId) continue;
-    await translateAndEmit({
-      event,
-      state,
-      sessionId,
-      permissionMode,
-      builtinToolFiltering,
-      client,
-      turn,
-      emit
-    });
-    if (onEvent?.(event)) break;
-  }
-}
-async function translateAndEmit({
-  event,
-  state,
-  sessionId,
-  permissionMode,
-  builtinToolFiltering,
-  client,
-  turn,
-  emit
-}) {
-  const type = event.type;
-  const props = event.properties ?? {};
-  if (type === "message.updated") {
-    const info = props.info;
-    if (isRecord3(info)) {
-      const id = stringValue2(info.id);
-      const role = stringValue2(info.role);
-      if (id && role) state.messageRoles.set(id, role);
-    }
-    return;
-  }
-  if (type === "message.part.delta") {
-    emitLegacyPartDelta({ props, state, emit });
-    return;
-  }
-  if (type === "message.part.updated") {
-    if (emitLegacyTextPartUpdate({ part: props.part, state, emit })) return;
-    if (emitLegacyStepFinishPart({ part: props.part, state, emit })) return;
-    emitLegacyToolPart({ part: props.part, state, emit });
-    return;
-  }
-  if (type === "session.next.text.started") {
-    emit({ type: "text-start", id: String(props.textID ?? event.id) });
-    return;
-  }
-  if (type === "session.next.text.delta") {
-    const id = String(props.textID ?? event.id);
-    state.textDeltas.set(
-      id,
-      `${state.textDeltas.get(id) ?? ""}${String(props.delta ?? "")}`
-    );
-    emit({
-      type: "text-delta",
-      id,
-      delta: String(props.delta ?? "")
-    });
-    return;
-  }
-  if (type === "session.next.text.ended") {
-    const id = String(props.textID ?? event.id);
-    emitMissingFinalDelta({
-      id,
-      fullText: typeof props.text === "string" ? props.text : void 0,
-      emittedText: state.textDeltas.get(id) ?? "",
-      emit,
-      type: "text-delta"
-    });
-    emit({ type: "text-end", id });
-    return;
-  }
-  if (type === "session.next.reasoning.started") {
-    emit({
-      type: "reasoning-start",
-      id: String(props.reasoningID ?? event.id)
-    });
-    return;
-  }
-  if (type === "session.next.reasoning.delta") {
-    const id = String(props.reasoningID ?? event.id);
-    state.reasoningDeltas.set(
-      id,
-      `${state.reasoningDeltas.get(id) ?? ""}${String(props.delta ?? "")}`
-    );
-    emit({
-      type: "reasoning-delta",
-      id,
-      delta: String(props.delta ?? "")
-    });
-    return;
-  }
-  if (type === "session.next.reasoning.ended") {
-    const id = String(props.reasoningID ?? event.id);
-    emitMissingFinalDelta({
-      id,
-      fullText: typeof props.text === "string" ? props.text : void 0,
-      emittedText: state.reasoningDeltas.get(id) ?? "",
-      emit,
-      type: "reasoning-delta"
-    });
-    emit({ type: "reasoning-end", id });
-    return;
-  }
-  if (type === "session.next.shell.started") {
-    const callID = String(props.callID ?? event.id);
-    const command = String(props.command ?? "");
-    state.shellCommands.set(callID, command);
-    emit({
-      type: "tool-call",
-      toolCallId: callID,
-      toolName: "bash",
-      nativeName: "bash",
-      input: JSON.stringify({ command }),
-      providerExecuted: true
-    });
-    return;
-  }
-  if (type === "session.next.shell.ended") {
-    const callID = String(props.callID ?? event.id);
-    emit({
-      type: "tool-result",
-      toolCallId: callID,
-      toolName: "bash",
-      result: {
-        command: state.shellCommands.get(callID) ?? "",
-        output: String(props.output ?? "")
-      }
-    });
-    return;
-  }
-  if (type === "session.next.tool.input.delta") {
-    const callID = String(props.callID ?? event.id);
-    state.toolInputs.set(
-      callID,
-      `${state.toolInputs.get(callID) ?? ""}${String(props.delta ?? "")}`
-    );
-    return;
-  }
-  if (type === "session.next.tool.input.ended") {
-    state.toolInputs.set(
-      String(props.callID ?? event.id),
-      String(props.text ?? "")
-    );
-    return;
-  }
-  if (type === "session.next.tool.called") {
-    const callID = String(props.callID ?? event.id);
-    const rawToolName = String(props.tool ?? "unknown");
-    const toolName = toWireToolName(rawToolName);
-    state.toolNames.set(callID, { rawToolName, toolName });
-    const hostToolName = getHostToolName(toolName, props.tool);
-    if (hostToolName) {
-      authorizeHostToolCall({
-        callID,
-        toolName: hostToolName,
-        input: props.input ?? parseToolInput(state, props),
-        state
+    if (event.type === "permission.v2.asked") {
+      await handlePermissionV2({
+        client,
+        sessionId,
+        permissionMode,
+        builtinToolFiltering,
+        turn,
+        emit,
+        event
       });
-      return;
-    }
-    emit({
-      type: "tool-call",
-      toolCallId: callID,
-      toolName,
-      ...nativeNameField({ nativeName: rawToolName, toolName }),
-      input: JSON.stringify(props.input ?? parseToolInput(state, props)),
-      providerExecuted: true,
-      ...props.provider?.metadata ? { providerMetadata: props.provider.metadata } : {}
-    });
-    return;
-  }
-  if (type === "session.next.tool.success" || type === "session.next.tool.failed") {
-    const callID = String(props.callID ?? event.id);
-    const cachedTool = state.toolNames.get(callID);
-    const rawToolName = cachedTool?.rawToolName ?? String(props.tool ?? "");
-    const toolName = cachedTool?.toolName ?? toWireToolName(rawToolName || "unknown");
-    if (getHostToolName(toolName, rawToolName)) return;
-    emit({
-      type: "tool-result",
-      toolCallId: callID,
-      toolName,
-      result: props.result ?? props.structured ?? ("content" in props ? props.content : null) ?? null,
-      ...type === "session.next.tool.failed" ? { isError: true } : {}
-    });
-    return;
-  }
-  if (type === "session.next.retried") {
-    const error = props.error ?? event;
-    if (isRecord3(error) && error.isRetryable === false) {
-      turn.emitError({
-        error,
-        message: "OpenCode session retry failed"
+    } else if (event.type === "permission.asked") {
+      await handlePermission({
+        client,
+        sessionId,
+        permissionMode,
+        builtinToolFiltering,
+        turn,
+        emit,
+        event
       });
     } else {
-      turn.emitWarning({ message: nextRetryEventMessage(event) });
-    }
-    return;
-  }
-  if (type === "session.next.step.ended") {
-    closeLegacyOpenParts({ state, emit });
-    state.turnUsage = mapUsage(props.tokens);
-    emit({
-      type: "finish-step",
-      finishReason: {
-        unified: mapOpenCodeFinishReason(String(props.finish ?? "stop")),
-        raw: String(props.finish ?? "stop")
-      },
-      usage: state.turnUsage,
-      ...typeof props.cost === "number" ? { harnessMetadata: { opencode: { cost: props.cost } } } : {}
-    });
-    return;
-  }
-  if (type === "session.next.compaction.ended") {
-    emit({
-      type: "compaction",
-      trigger: props.reason === "auto" ? "auto" : "manual",
-      summary: String(props.text ?? ""),
-      harnessMetadata: {
-        opencode: {
-          recent: String(props.recent ?? "")
-        }
-      }
-    });
-    return;
-  }
-  if (type === "file.edited") {
-    emit({
-      type: "file-change",
-      event: "modify",
-      path: stripWorkDir(String(props.file ?? ""))
-    });
-    return;
-  }
-  if (type === "session.error" || type === "session.next.step.failed") {
-    const error = props.error ?? event;
-    turn.emitError({
-      error,
-      message: type === "session.error" ? "OpenCode session error" : "OpenCode step failed"
-    });
-    return;
-  }
-  if (type === "permission.v2.asked") {
-    await handlePermissionV2({
-      client,
-      sessionId,
-      permissionMode,
-      builtinToolFiltering,
-      turn,
-      emit,
-      event
-    });
-    return;
-  }
-  if (type === "permission.asked") {
-    await handlePermission({
-      client,
-      sessionId,
-      permissionMode,
-      builtinToolFiltering,
-      turn,
-      emit,
-      event
-    });
-  }
-}
-function closeLegacyOpenParts({
-  state,
-  emit
-}) {
-  for (const id of state.legacyReasoningPartIds) {
-    emit({ type: "reasoning-end", id });
-    state.reasoningDeltas.delete(id);
-  }
-  state.legacyReasoningPartIds.clear();
-  for (const id of state.legacyTextPartIds) {
-    emit({ type: "text-end", id });
-    state.textDeltas.delete(id);
-  }
-  state.legacyTextPartIds.clear();
-}
-function emitLegacyStepFinishPart({
-  part,
-  state,
-  emit
-}) {
-  const event = legacyStepFinishPartToFinishStep(part);
-  if (!event) return false;
-  const id = isRecord3(part) ? stringValue2(part.id) : void 0;
-  if (id) {
-    if (state.legacyStepFinishPartIds.has(id)) return true;
-    state.legacyStepFinishPartIds.add(id);
-  }
-  closeLegacyOpenParts({ state, emit });
-  state.turnUsage = event.usage;
-  emit(event);
-  return true;
-}
-function emitLegacyToolPart({
-  part,
-  state,
-  emit
-}) {
-  if (!part || typeof part !== "object") return;
-  const toolPart = part;
-  if (toolPart.type !== "tool") return;
-  const status = legacyToolPartStatus(toolPart);
-  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 = toWireToolName(rawToolName);
-  state.toolNames.set(callID, { rawToolName, toolName });
-  const hostToolName = getHostToolName(toolName, rawToolName);
-  if (hostToolName) {
-    if (status === "running") {
-      authorizeHostToolCall({
-        callID,
-        toolName: hostToolName,
-        input: legacyToolPartInput(toolPart),
-        state
-      });
+      emitStreamEvent(event);
     }
-    return;
-  }
-  if (!state.toolCallsEmitted.has(callID)) {
-    state.toolCallsEmitted.add(callID);
-    emit({
-      type: "tool-call",
-      toolCallId: callID,
-      toolName,
-      ...nativeNameField({ nativeName: rawToolName, toolName }),
-      input: JSON.stringify(legacyToolPartInput(toolPart)),
-      providerExecuted: true,
-      ...toolPart.provider?.metadata ? { providerMetadata: toolPart.provider.metadata } : {}
-    });
-  }
-  if ((status === "completed" || status === "error") && !state.toolResultsEmitted.has(callID)) {
-    state.toolResultsEmitted.add(callID);
-    emit({
-      type: "tool-result",
-      toolCallId: callID,
-      toolName,
-      result: legacyToolPartOutput(toolPart),
-      ...status === "error" ? { isError: true } : {}
-    });
-  }
-}
-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 {
-    ...isRecord3(part.metadata) ? part.metadata : {},
-    ...isRecord3(state?.metadata) ? state.metadata : {},
-    ...isRecord3(state?.input) ? state.input : {}
-  };
-}
-function legacyToolPartOutput(part) {
-  const state = typeof part.state === "object" && part.state !== null ? part.state : void 0;
-  if (state?.status === "error") {
-    return state.error ?? part.error ?? state.result ?? "tool failed";
-  }
-  return state?.output ?? state?.result ?? state?.structured ?? state?.content ?? null;
-}
-function isRecord3(value) {
-  return Boolean(value && typeof value === "object" && !Array.isArray(value));
-}
-function parseToolInput(state, props) {
-  const text = state.toolInputs.get(String(props.callID ?? ""));
-  if (!text) return {};
-  try {
-    return JSON.parse(text);
-  } catch {
-    return { input: text };
+    if (onEvent?.(event)) break;
   }
 }
 async function handlePermissionV2({
@@ -2153,11 +2204,13 @@ function authorizeHostToolCall({
 async function emitContextFallback({
   client,
   sessionId,
+  state,
   emit,
   emitContent
 }) {
   const assistant = await latestAssistantSnapshot({ client, sessionId });
   if (!assistant) return false;
+  emitOpenCodeStreamStart({ info: assistant, state, emit });
   if (emitContent && Array.isArray(assistant.contentParts)) {
     for (const part of assistant.contentParts) {
       emitAssistantContentPart(part, emit);
@@ -2316,9 +2369,6 @@ function modelRefFromValue(value) {
   if (!providerID || !modelID) return void 0;
   return { providerID, modelID };
 }
-function stringValue2(value) {
-  return typeof value === "string" && value.length > 0 ? value : void 0;
-}
 function stripWorkDir(file) {
   if (!file) return file;
   const normalized = path2.resolve(file);