test(codex): reproduce finished legacy sub-agent replaying as running (#4538)

Failing on purpose. A thread whose child was spawned with the legacy
spawnAgent/wait/closeAgent items replays the child as running, because
only the spawn snapshot is read on replay.

package-lock.json

@@ -39240,7 +39240,6 @@
         "strip-ansi": "^7.1.2",
         "tree-kill": "^1.2.2",
         "typescript": "^5.9.3",
-        "undici": "^7.30.0",
         "uuid": "^9.0.1",
         "which": "^5.0.0",
         "ws": "^8.14.2",
@@ -39971,15 +39970,6 @@
         "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
-    "packages/server/node_modules/undici": {
-      "version": "7.30.0",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-7.30.0.tgz",
-      "integrity": "sha512-dkrQXeHSaoamnItlYbmzG0wFYrM0ZwDxCIg0A7aKjTyyhh9svRzCNFEzV+Vm05/yehjCzjDZ31KXfGEjYSztDQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=20.18.1"
-      }
-    },
     "packages/server/node_modules/vitest": {
       "version": "4.1.6",
       "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.6.tgz",

packages/app/e2e/browser/chat-outline.spec.ts

@@ -17,14 +17,12 @@ import {
   hoverChatOutlinePrompt,
   chatOutlineRail,
   movePointerOffChatOutline,
-  observePromptIndexRequests,
   pointAtChatOutlineRowEdge,
   pressEnterOnFocusedPrompt,
   splitCurrentPanelRight,
   withStreamingMarkdownOutline,
   expectReadingStreamedMarkdown,
 } from "../support/helpers/chat-outline";
-import { createCreationScenario } from "../support/helpers/creation";
 import {
   expectTimelineAtMaximumScrollWithPromptVisible,
   expectTimelinePromptNotMounted,
@@ -268,21 +266,3 @@ test.describe("desktop chat outline", () => {
     }
   });
 });
-
-test("indexes a new agent's prompts only once the agent exists", async ({ page }) => {
-  const promptIndex = await observePromptIndexRequests(page);
-  const creation = await createCreationScenario(page);
-  try {
-    await page.setViewportSize(WIDE_VIEWPORT);
-    await creation.openAgentDraft();
-    await creation.submitPrompt("Start an agent with an outline.");
-    await creation.expectPromptVisible();
-
-    const agentIds = await creation.agentIds();
-    expect(agentIds).toHaveLength(1);
-    await promptIndex.waitForRequestFor(agentIds[0]!);
-    expect(promptIndex.requestedAgentIds()).toEqual(agentIds);
-  } finally {
-    await creation.cleanup();
-  }
-});

packages/app/e2e/browser/plugin-settings.spec.ts

@@ -14,7 +14,6 @@ import {
   expectConflictPreservesDraft,
   discardTitle,
   returnAndReopenSettings,
-  returnToPluginsPage,
   expectSettingsUnavailable,
 } from "../support/helpers/plugin-settings";
 
@@ -44,11 +43,6 @@ test("another client's save preserves a conflicting draft", async ({ page }) =>
   await discardTitle(page);
 });
 
-test("Back to plugins returns from a plugin settings screen", async ({ page }) => {
-  await openDisplaySettings(page);
-  await returnToPluginsPage(page);
-});
-
 test.describe("compact plugin settings", () => {
   test.use({ viewport: { width: 390, height: 844 } });
 

packages/app/e2e/support/helpers/chat-outline.ts

@@ -3,7 +3,6 @@ import { openSettings } from "./app";
 import { openSettingsSection } from "./settings";
 import { runWorkspaceActionFromCommandCenter } from "./command-center-workspace-actions";
 import { seedMockAgentWorkspace, type MockAgentWorkspace } from "./mock-agent";
-import { loadSessionMessageReaders } from "./new-workspace";
 
 export async function withStreamingMarkdownOutline(
   run: (agent: MockAgentWorkspace) => Promise<void>,
@@ -230,22 +229,3 @@ async function requireBoundingBox(
   }
   return box;
 }
-
-export async function observePromptIndexRequests(page: Page) {
-  const frames = await loadSessionMessageReaders();
-  const agentIds: string[] = [];
-  page.on("websocket", (socket) => {
-    socket.on("framesent", ({ payload }) => {
-      const request = frames.client(payload);
-      if (request?.type === "agent.timeline.list_prompts.request") {
-        agentIds.push(request.agentId);
-      }
-    });
-  });
-  return {
-    async waitForRequestFor(agentId: string) {
-      await expect.poll(() => agentIds).toContain(agentId);
-    },
-    requestedAgentIds: () => [...new Set(agentIds)],
-  };
-}

packages/app/e2e/support/helpers/creation.ts

@@ -206,12 +206,6 @@ export async function createCreationScenario(page: Page) {
         )
         .toBe(count);
     },
-    async agentIds() {
-      await requests.settled();
-      return (await project.client.fetchAgents()).entries
-        .filter(({ agent }) => agent.workspaceId === workspaceId)
-        .map(({ agent }) => agent.id);
-    },
     async expectAgentTitle(title: string) {
       await expect
         .poll(

packages/app/e2e/support/helpers/plugin-settings.ts

@@ -3,8 +3,6 @@ import { expect, test as base, type Page } from "../fixtures";
 import { gotoAppShell, openSettings } from "./app";
 import { goBackInSettings, openCompactSettings, openHostSection } from "./settings";
 import { getServerId } from "./server-id";
-import { expectAppRoute } from "./route-assertions";
-import { buildSettingsHostSectionRoute } from "@/utils/host-routes";
 import { connectNewWorkspaceDaemonClient } from "./new-workspace";
 
 type SettingsClient = Awaited<ReturnType<typeof connectNewWorkspaceDaemonClient>>;
@@ -107,13 +105,6 @@ export async function returnAndReopenSettings(page: Page) {
   await page.getByRole("menuitem", { name: "Display", exact: true }).click();
   await expect(page.getByRole("switch", { name: "Show metadata" })).toBeVisible();
 }
-export async function returnToPluginsPage(page: Page) {
-  await page.getByRole("button", { name: "Back to plugins", exact: true }).click();
-  await expectAppRoute(page, buildSettingsHostSectionRoute(getServerId(), "plugins"));
-  await expect(
-    page.getByRole("button", { name: "Actions for settings-example", exact: true }),
-  ).toBeVisible();
-}
 export async function expectSettingsUnavailable(page: Page) {
   await expect(
     page.getByText("This plugin settings screen is unavailable.", { exact: true }),

packages/app/src/agent-stream/chat-outline/model.test.ts

@@ -12,6 +12,7 @@ describe("chat outline prompt index epoch", () => {
   it("accepts only the authoritative timeline epoch", () => {
     expect(shouldAcceptPromptIndexEpoch("epoch-2", "epoch-2")).toBe(true);
     expect(shouldAcceptPromptIndexEpoch("epoch-2", "epoch-1")).toBe(false);
+    expect(shouldAcceptPromptIndexEpoch(null, "epoch-1")).toBe(true);
   });
 });
 

packages/app/src/agent-stream/chat-outline/model.ts

@@ -2,8 +2,11 @@ import type { AgentTimelinePromptIndexPayload } from "@getpaseo/client/internal/
 
 export type ChatOutlinePrompt = AgentTimelinePromptIndexPayload["prompts"][number];
 
-export function shouldAcceptPromptIndexEpoch(timelineEpoch: string, indexEpoch: string): boolean {
-  return timelineEpoch === indexEpoch;
+export function shouldAcceptPromptIndexEpoch(
+  timelineEpoch: string | null,
+  indexEpoch: string,
+): boolean {
+  return timelineEpoch === null || timelineEpoch === indexEpoch;
 }
 
 /**

packages/app/src/agent-stream/chat-outline/use-chat-outline.test.tsx

@@ -37,31 +37,6 @@ describe("useChatOutline", () => {
     runtime.subscribeAgentTimeline.mockClear();
   });
 
-  it("waits for a served timeline before requesting its prompt index", async () => {
-    runtime.listAgentTimelinePrompts.mockResolvedValue({ epoch: "epoch-1", prompts: [] });
-    const viewportRef = createRef<StreamViewportHandle>();
-    const { rerender } = renderHook(
-      ({ agentId, timelineEpoch }) =>
-        useChatOutline({
-          agentId,
-          serverId: "server-1",
-          timelineEpoch,
-          tail: [],
-          head: [],
-          enabled: true,
-          viewportRef,
-          onJumpError: vi.fn(),
-        }),
-      { initialProps: { agentId: "draft_msg_1", timelineEpoch: null as string | null } },
-    );
-
-    expect(runtime.listAgentTimelinePrompts).not.toHaveBeenCalled();
-
-    rerender({ agentId: "agent-1", timelineEpoch: "epoch-1" });
-    await waitFor(() => expect(runtime.listAgentTimelinePrompts).toHaveBeenCalledTimes(1));
-    expect(runtime.listAgentTimelinePrompts).toHaveBeenCalledWith("agent-1");
-  });
-
   it("drops a late prompt index after the authoritative timeline epoch changes", async () => {
     const first = deferred<{ epoch: string; prompts: [] }>();
     const second = deferred<{

packages/app/src/agent-stream/chat-outline/use-chat-outline.ts

@@ -77,10 +77,8 @@ export function useChatOutline({
 
   useEffect(() => setIndex(null), [agentId, enabled, serverId, timelineEpoch]);
 
-  // Only a timeline the daemon has served can be indexed. A draft's optimistic stream has no
-  // epoch, and its id names no agent the daemon knows.
   useEffect(() => {
-    if (!isWeb || !enabled || timelineEpoch === null) {
+    if (!isWeb || !enabled) {
       setIndex(null);
       return;
     }

packages/app/src/i18n/resources/en.ts

@@ -2071,7 +2071,6 @@ export const en = {
         offline: "Connect to this host to open plugin settings.",
         update: "Update this host to use plugin settings.",
         unavailable: "This plugin settings screen is unavailable.",
-        backToPlugins: "Back to plugins",
       },
       trustedTitle: "Plugins are trusted code",
       trustedDescription:

packages/app/src/i18n/resources/plugin-settings.ts

@@ -18,7 +18,6 @@ export const pluginSettings = {
       offline: "اتصل بهذا المضيف لفتح إعدادات الإضافة.",
       update: "حدّث هذا المضيف لاستخدام إعدادات الإضافة.",
       unavailable: "شاشة إعدادات الإضافة هذه غير متاحة.",
-      backToPlugins: "العودة إلى الإضافات",
     },
     title: "الإضافات",
     trustedTitle: "الإضافات تعليمات برمجية موثوقة",
@@ -73,7 +72,6 @@ export const pluginSettings = {
       offline: "Conéctate a este host para abrir los ajustes del plugin.",
       update: "Actualiza este host para usar los ajustes del plugin.",
       unavailable: "Esta pantalla de ajustes del plugin no está disponible.",
-      backToPlugins: "Volver a plugins",
     },
     title: "Plugins",
     trustedTitle: "Los plugins son código de confianza",
@@ -128,7 +126,6 @@ export const pluginSettings = {
       offline: "Connectez-vous à cet hôte pour ouvrir les paramètres du plugin.",
       update: "Mettez à jour cet hôte pour utiliser les paramètres du plugin.",
       unavailable: "Cet écran de paramètres du plugin est indisponible.",
-      backToPlugins: "Retour aux plugins",
     },
     title: "Plugins",
     trustedTitle: "Les plugins sont du code de confiance",
@@ -183,7 +180,6 @@ export const pluginSettings = {
       offline: "このホストに接続してプラグイン設定を開いてください。",
       update: "プラグイン設定を使用するには、このホストを更新してください。",
       unavailable: "このプラグイン設定画面は利用できません。",
-      backToPlugins: "プラグインに戻る",
     },
     title: "プラグイン",
     trustedTitle: "プラグインは信頼済みコードです",
@@ -238,7 +234,6 @@ export const pluginSettings = {
       offline: "플러그인 설정을 열려면 이 호스트에 연결하세요.",
       update: "플러그인 설정을 사용하려면 이 호스트를 업데이트하세요.",
       unavailable: "이 플러그인 설정 화면을 사용할 수 없습니다.",
-      backToPlugins: "플러그인으로 돌아가기",
     },
     title: "플러그인",
     trustedTitle: "플러그인은 신뢰하는 코드입니다",
@@ -292,7 +287,6 @@ export const pluginSettings = {
       offline: "Conecte-se a este host para abrir as configurações do plugin.",
       update: "Atualize este host para usar as configurações do plugin.",
       unavailable: "Esta tela de configurações do plugin está indisponível.",
-      backToPlugins: "Voltar para plugins",
     },
     title: "Plugins",
     trustedTitle: "Plugins são código confiável",
@@ -347,7 +341,6 @@ export const pluginSettings = {
       offline: "Подключитесь к этому хосту, чтобы открыть настройки плагина.",
       update: "Обновите этот хост, чтобы использовать настройки плагина.",
       unavailable: "Этот экран настроек плагина недоступен.",
-      backToPlugins: "Вернуться к плагинам",
     },
     title: "Плагины",
     trustedTitle: "Плагины — доверенный код",
@@ -402,7 +395,6 @@ export const pluginSettings = {
       offline: "连接到此主机以打开插件设置。",
       update: "更新此主机以使用插件设置。",
       unavailable: "此插件设置页面不可用。",
-      backToPlugins: "返回插件",
     },
     title: "插件",
     trustedTitle: "插件是受信任的代码",

packages/app/src/plugins/settings/index.tsx

@@ -3,7 +3,6 @@ import { useTranslation } from "react-i18next";
 import { Platform, Text, View } from "react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { router } from "expo-router";
-import { ArrowLeft } from "lucide-react-native";
 import type { PluginHostProps } from "@getpaseo/plugin/client";
 import { Button } from "@/components/ui/button";
 import { DropdownMenuItem } from "@/components/ui/dropdown-menu";
@@ -128,30 +127,7 @@ function SettingsContent({
 }
 const ThemedSettingsContent = withUnistyles(SettingsContent);
 const themeMapping = (theme: Theme) => ({ theme: toPluginTheme(theme) });
-export function PluginSettingsContent({
-  onBackToPlugins,
-  showBackToPlugins,
-  ...identity
-}: SettingsIdentity & { onBackToPlugins: () => void; showBackToPlugins: boolean }) {
-  const { t } = useTranslation();
-  return (
-    <View>
-      {showBackToPlugins ? (
-        <Button
-          onPress={onBackToPlugins}
-          variant="ghost"
-          size="sm"
-          leftIcon={ArrowLeft}
-          style={styles.backButton}
-        >
-          {t("settings.plugins.screens.backToPlugins")}
-        </Button>
-      ) : null}
-      <ThemedSettingsContent {...identity} uniProps={themeMapping} />
-    </View>
-  );
+export function PluginSettingsContent(props: SettingsIdentity) {
+  return <ThemedSettingsContent {...props} uniProps={themeMapping} />;
 }
-const styles = StyleSheet.create((theme) => ({
-  message: { color: theme.colors.foregroundMuted },
-  backButton: { alignSelf: "flex-start", paddingHorizontal: 0, marginBottom: theme.spacing[4] },
-}));
+const styles = StyleSheet.create((theme) => ({ message: { color: theme.colors.foregroundMuted } }));

packages/app/src/screens/settings-screen.tsx

@@ -1333,8 +1333,6 @@ export default function SettingsScreen({ view, openAddHostIntent = null }: Setti
           serverId={view.serverId}
           pluginId={view.pluginId}
           screenId={view.screenId}
-          onBackToPlugins={handleBackFromDetail}
-          showBackToPlugins={!isCompactLayout}
         />
       );
     if (view.kind === "host") {

packages/client/examples/agents-and-providers.ts

@@ -58,23 +58,10 @@ export async function runFollowUp(url: string, agentId: string): Promise<string
 
   try {
     await client.connect();
-    const result = await client.agents.ref(agentId).run("Summarize your progress and next step.", {
-      activeTurnBehavior: "interrupt",
-    });
+    const result = await client.agents.ref(agentId).run("Summarize your progress and next step.");
     if (result.status !== "idle") throw new Error(result.error ?? result.status);
     return result.lastMessage;
   } finally {
     await client.close();
   }
 }
-
-export async function steerAgent(url: string, agentId: string, prompt: string): Promise<void> {
-  const client = createClient(url);
-
-  try {
-    await client.connect();
-    await client.agents.ref(agentId).send(prompt, { activeTurnBehavior: "steer" });
-  } finally {
-    await client.close();
-  }
-}

packages/client/src/daemon-client.ts

@@ -425,7 +425,6 @@ export interface DaemonClientTrace {
 
 export interface SendMessageOptions {
   messageId?: string;
-  /** What happens when the agent is mid-turn. The daemon interrupts the turn when omitted. */
   activeTurnBehavior?: ActiveTurnBehavior;
   images?: Array<{ data: string; mimeType: string }>;
   attachments?: SendAgentMessageRequest["attachments"];

packages/client/src/index.test.ts

@@ -744,17 +744,13 @@ test("agent handles delegate create, send, timeline refetch, archive, and local
   expect(updatedAgents).toEqual(["Updated"]);
   expect(agent.current()).toEqual(updatedAgent);
 
-  const sendPromise = agent.send("hello", {
-    messageId: "message-sdk",
-    activeTurnBehavior: "steer",
-  });
+  const sendPromise = agent.send("hello", { messageId: "message-sdk" });
   const sendRequest = parseSentSessionMessage(ws.sent.at(-1));
   expect(sendRequest).toMatchObject({
     type: "send_agent_message_request",
     agentId: "agent_sdk",
     text: "hello",
     messageId: "message-sdk",
-    activeTurnBehavior: "steer",
   });
 
   ws.message(
@@ -772,7 +768,6 @@ test("agent handles delegate create, send, timeline refetch, archive, and local
 
   const runPromise = agent.run("finish the task", {
     messageId: "run-message-sdk",
-    activeTurnBehavior: "interrupt",
     timeoutMs: 30_000,
   });
   const runSendRequest = parseSentSessionMessage(ws.sent.at(-1));
@@ -781,7 +776,6 @@ test("agent handles delegate create, send, timeline refetch, archive, and local
     agentId: "agent_sdk",
     text: "finish the task",
     messageId: "run-message-sdk",
-    activeTurnBehavior: "interrupt",
   });
   ws.message(
     sessionMessage({

packages/client/src/index.ts

@@ -24,6 +24,7 @@ import type {
   ProjectPlacementPayload,
   WorkspaceProjectDescriptorPayload,
   RefreshProvidersSnapshotResponseMessage,
+  SendAgentMessageRequest,
   SessionOutboundMessage,
   WorkspaceDescriptorPayload,
   WorkspaceCreateRequest,
@@ -54,7 +55,6 @@ import type {
   FetchAgentTimelineDirection,
   FetchAgentTimelinePayload,
   FetchAgentTimelineProjection,
-  SendMessageOptions,
   WaitForFinishResult,
 } from "./daemon-client.js";
 
@@ -276,7 +276,11 @@ export interface PaseoAgentTimelineRefetchOptions {
   requestId?: string;
 }
 
-export type PaseoAgentSendOptions = SendMessageOptions;
+export interface PaseoAgentSendOptions {
+  messageId?: string;
+  images?: Array<{ data: string; mimeType: string }>;
+  attachments?: SendAgentMessageRequest["attachments"];
+}
 
 export interface PaseoAgentRunOptions extends PaseoAgentSendOptions {
   timeoutMs?: number;

packages/server/package.json

@@ -141,7 +141,6 @@
     "strip-ansi": "^7.1.2",
     "tree-kill": "^1.2.2",
     "typescript": "^5.9.3",
-    "undici": "^7.30.0",
     "uuid": "^9.0.1",
     "which": "^5.0.0",
     "ws": "^8.14.2",

packages/server/src/server/agent/providers/codex-app-server-agent.test.ts

@@ -4324,6 +4324,69 @@ describe("Codex app-server provider", () => {
     });
   });
 
+  test("replays a legacy sub-agent that later finished as completed", async () => {
+    const session = createSession();
+    session.client = {
+      request: vi.fn(async (method: string, params: unknown) => {
+        if (method !== "thread/read") {
+          return {};
+        }
+        if ((params as { threadId?: string }).threadId !== "test-thread") {
+          return { thread: { turns: [] } };
+        }
+        return {
+          thread: {
+            turns: [
+              {
+                items: [
+                  {
+                    type: "collabAgentToolCall",
+                    id: "exec-spawn-history",
+                    tool: "spawnAgent",
+                    status: "completed",
+                    prompt: "Research child",
+                    receiverThreadIds: ["finished-child-thread"],
+                    agentsStates: { "finished-child-thread": { status: "pendingInit" } },
+                  },
+                  {
+                    type: "collabAgentToolCall",
+                    id: "exec-wait-history",
+                    tool: "wait",
+                    status: "completed",
+                    receiverThreadIds: ["finished-child-thread"],
+                    agentsStates: {
+                      "finished-child-thread": { status: "completed", message: "done" },
+                    },
+                  },
+                  {
+                    type: "collabAgentToolCall",
+                    id: "exec-close-history",
+                    tool: "closeAgent",
+                    status: "completed",
+                    receiverThreadIds: ["finished-child-thread"],
+                    agentsStates: { "finished-child-thread": { status: "completed" } },
+                  },
+                ],
+              },
+            ],
+          },
+        };
+      }),
+    };
+
+    await asInternals(session).loadPersistedHistory(session.client);
+
+    const history: AgentStreamEvent[] = [];
+    for await (const event of session.streamHistory()) {
+      history.push(event);
+    }
+    expect(
+      history.flatMap((event) =>
+        event.type === "provider_subagent" && event.event.type === "upsert" ? [event.event] : [],
+      ),
+    ).toMatchObject([{ type: "upsert", id: "finished-child-thread", status: "completed" }]);
+  });
+
   test("loads mixed legacy and MultiAgentV2 sub-agent history", async () => {
     const session = createSession();
     session.client = {

packages/server/src/server/agent/providers/opencode/tool-call-detail-parser.ts

@@ -221,15 +221,6 @@ function deriveOpencodeTaskDetail(
   };
 }
 
-function toOpencodeEditInput(value: { filePath: string; oldString?: string; newString?: string }) {
-  return {
-    filePath: value.filePath,
-    oldString: nonEmptyString(value.oldString),
-    newString: nonEmptyString(value.newString),
-    unifiedDiff: undefined,
-  };
-}
-
 const OpencodeEditInputSchema = z.union([
   z
     .object({
@@ -238,12 +229,12 @@ const OpencodeEditInputSchema = z.union([
       newString: z.string().optional(),
     })
     .passthrough()
-    .transform(toOpencodeEditInput),
-  // OpenCode v2's edit tool names the file `path`.
-  z
-    .object({ path: z.string(), oldString: z.string(), newString: z.string() })
-    .passthrough()
-    .transform((value) => toOpencodeEditInput({ ...value, filePath: value.path })),
+    .transform((value) => ({
+      filePath: value.filePath,
+      oldString: nonEmptyString(value.oldString),
+      newString: nonEmptyString(value.newString),
+      unifiedDiff: undefined,
+    })),
   ToolEditInputSchema,
 ]);
 

packages/server/src/server/agent/providers/opencode/v2/runtime.test.ts

@@ -1,62 +0,0 @@
-import { mkdtemp, rm, writeFile } from "node:fs/promises";
-import os from "node:os";
-import path from "node:path";
-import { Agent, getGlobalDispatcher, setGlobalDispatcher } from "undici";
-import { afterEach, beforeEach, expect, test, vi } from "vitest";
-
-import { createTestLogger } from "../../../../../test-utils/test-logger.js";
-import { V2Runtime } from "./runtime.js";
-
-// Answers every request at once except session.wait, which it holds for WAIT_MS before answering,
-// the way OpenCode holds the wait response until the session's agent loop is idle.
-const FAKE_HELPER = `
-import http from "node:http";
-const server = http.createServer((request, response) => {
-  if (request.url.endsWith("/wait")) {
-    setTimeout(() => { response.statusCode = 204; response.end(); }, Number(process.env.WAIT_MS));
-    return;
-  }
-  response.setHeader("content-type", "application/json");
-  response.end("{}");
-});
-server.listen(0, "127.0.0.1", () => {
-  console.log("server listening on http://127.0.0.1:" + server.address().port);
-});
-`;
-
-let root: string;
-const defaultDispatcher = getGlobalDispatcher();
-
-beforeEach(async () => {
-  root = await mkdtemp(path.join(os.tmpdir(), "paseo-opencode-v2-runtime-"));
-  vi.stubEnv("PASEO_HOME", path.join(root, "home"));
-});
-
-afterEach(async () => {
-  setGlobalDispatcher(defaultDispatcher);
-  vi.unstubAllEnvs();
-  await rm(root, { recursive: true, force: true });
-});
-
-test("session.wait outlasts the fetch header deadline until the helper reports the session idle", async () => {
-  // Stands in for undici's five-minute default, which ended every longer turn.
-  setGlobalDispatcher(new Agent({ headersTimeout: 200 }));
-  const helper = path.join(root, "fake-opencode.mjs");
-  await writeFile(helper, FAKE_HELPER);
-  const runtime = new V2Runtime({
-    logger: createTestLogger(),
-    settings: {
-      command: { mode: "replace", argv: [process.execPath, helper] },
-      env: { WAIT_MS: "2500" },
-    },
-    decorateEnv: async (env) => env,
-  });
-  try {
-    const connection = await runtime.acquire();
-    await expect(connection.client.session.wait({ sessionID: "ses_long" })).resolves.toBe(
-      undefined,
-    );
-  } finally {
-    await runtime.shutdown();
-  }
-});

packages/server/src/server/agent/providers/opencode/v2/runtime.ts

@@ -5,7 +5,6 @@ import type { V2Api } from "./api.js";
 import { randomBytes } from "node:crypto";
 import { mkdir } from "node:fs/promises";
 import type { Logger } from "pino";
-import { Agent } from "undici";
 import { spawnProcess } from "../../../../../utils/spawn.js";
 import { terminateWithTreeKill } from "../../../../../utils/tree-kill.js";
 import {
@@ -175,9 +174,6 @@ export class V2Runtime {
       }),
     });
     const processAbort = new AbortController();
-    // session.wait answers only once the session is idle, so a header deadline would fail any
-    // turn that outlasts it. Requests end when the helper exits or the caller aborts instead.
-    const dispatcher = new Agent({ headersTimeout: 0 });
     const exited = new Promise<Error>((resolve) =>
       process.once("exit", (code) => {
         const error = new Error(`OpenCode helper server exited (${code})`);
@@ -203,7 +199,6 @@ export class V2Runtime {
     const stop = () => {
       stopped ??= (async () => {
         await terminateWithTreeKill(process, { gracefulTimeoutMs: 5_000, forceTimeoutMs: 1_000 });
-        await dispatcher.destroy();
         const entry = await record;
         if (entry) await managedProcesses?.remove(entry.id);
       })();
@@ -248,9 +243,7 @@ export class V2Runtime {
           const signal = init?.signal
             ? AbortSignal.any([init.signal, processAbort.signal])
             : processAbort.signal;
-          // Node's fetch accepts an undici dispatcher, which the DOM RequestInit type omits.
-          const requestInit: RequestInit & { dispatcher: Agent } = { ...init, signal, dispatcher };
-          const response = await fetch(request, requestInit);
+          const response = await fetch(request, { ...init, signal });
           const html = response.headers.get("content-type")?.includes("text/html") ?? false;
           if (!response.ok || html) {
             const requestUrl = request instanceof Request ? request.url : String(request);

packages/server/src/server/agent/providers/opencode/v2/timeline.test.ts

@@ -1,56 +0,0 @@
-import type { SessionMessageAssistant } from "@opencode/client";
-import { expect, test } from "vitest";
-import { V2Timeline } from "./timeline.js";
-
-function assistant(content: SessionMessageAssistant["content"]): SessionMessageAssistant {
-  return {
-    id: "answer",
-    type: "assistant",
-    agent: "build",
-    model: { providerID: "test", id: "model" },
-    time: { created: 2 },
-    content,
-  };
-}
-
-test("a completed edit carries the replaced and replacement text", () => {
-  // Captured from OpenCode 2.0.18, whose edit tool takes `path` instead of `filePath`.
-  const edit = assistant([
-    {
-      type: "tool",
-      id: "call-edit",
-      name: "edit",
-      executed: false,
-      state: {
-        status: "completed",
-        input: { path: "a.txt", oldString: "beta", newString: "BETA" },
-        content: [{ type: "text", text: "Edited a.txt (1 replacement)" }],
-        metadata: {
-          files: [
-            {
-              file: "a.txt",
-              patch:
-                "Index: a.txt\n===================================================================\n--- a.txt\n+++ a.txt\n@@ -1,3 +1,3 @@\n alpha\n-beta\n+BETA\n gamma\n",
-              status: "modified",
-              additions: 1,
-              deletions: 1,
-            },
-          ],
-          truncated: false,
-        },
-      },
-      time: { created: 2, ran: 2, completed: 2 },
-    },
-  ]);
-
-  expect(new V2Timeline().messages([edit])).toMatchObject([
-    {
-      item: {
-        type: "tool_call",
-        name: "edit",
-        status: "completed",
-        detail: { type: "edit", filePath: "a.txt", oldString: "beta", newString: "BETA" },
-      },
-    },
-  ]);
-});