fix(opencode-go): distinguish synthetic stream preambles

zhangguiping-xydt · zhangguiping-xydt · commit 8025cc7cab9d · 2026-06-18T23:34:47.000+08:00
diff --git a/extensions/opencode-go/stream-termination.test.ts b/extensions/opencode-go/stream-termination.test.ts
@@ -288,6 +288,70 @@ describe("createOpencodeGoStalledStreamWrapper", () => {
     expect(received.some((event) => event.type === "done")).toBe(true);
   });
 
+  it("keeps the first-event window after synthetic block-start events until a provider delta", async () => {
+    const { stream: baseStream, controller } = createFakeBaseStream();
+    let abortCalled = false;
+
+    const underlying = vi.fn((_model, _context, options) => {
+      if (options?.signal) {
+        options.signal.addEventListener("abort", () => {
+          abortCalled = true;
+        });
+      }
+      return baseStream;
+    });
+
+    const wrapper = createOpencodeGoStalledStreamWrapper(underlying as any, {
+      provider: "opencode-go",
+      idleTimeoutMs: 5_000,
+      firstEventTimeoutMs: 10_000,
+    });
+
+    const downstream = await Promise.resolve(
+      wrapper({ provider: "opencode-go", id: "deepseek-v4-flash" } as any, {} as any, {} as any),
+    );
+    expect(downstream).toBeDefined();
+    if (!downstream) {
+      return;
+    }
+
+    const received: AnyEvent[] = [];
+    const consumer = (async () => {
+      for await (const event of downstream) {
+        received.push(event);
+      }
+    })();
+
+    const partial = {
+      role: "assistant",
+      content: [{ type: "text", text: "" }],
+      stopReason: undefined,
+    };
+    controller.emit({ type: "start", partial } as any);
+    controller.emit({ type: "text_start", contentIndex: 0, partial } as any);
+
+    await vi.advanceTimersByTimeAsync(6_000);
+    expect(abortCalled).toBe(false);
+
+    const message = {
+      ...partial,
+      content: [{ type: "text", text: "hello" }],
+      stopReason: "stop",
+    };
+    controller.emit({
+      type: "text_delta",
+      contentIndex: 0,
+      delta: "hello",
+      partial: message,
+    } as any);
+    controller.emit({ type: "done", reason: "stop", message } as any);
+    await consumer;
+
+    expect(abortCalled).toBe(false);
+    expect(received.some((event) => event.type === "text_delta")).toBe(true);
+    expect(received.some((event) => event.type === "done")).toBe(true);
+  });
+
   it("honors explicit opencode-go provider request timeout above the wrapper idle default", async () => {
     const { stream: baseStream, controller } = createFakeBaseStream();
     let abortCalled = false;
@@ -340,6 +404,48 @@ describe("createOpencodeGoStalledStreamWrapper", () => {
     await consumer;
   });
 
+  it("honors explicit opencode-go provider request timeout below wrapper defaults", async () => {
+    const { stream: baseStream } = createFakeBaseStream();
+    let abortCalled = false;
+
+    const underlying = vi.fn((_model, _context, options) => {
+      if (options?.signal) {
+        options.signal.addEventListener("abort", () => {
+          abortCalled = true;
+        });
+      }
+      return baseStream;
+    });
+
+    const wrapper = createOpencodeGoStalledStreamWrapper(underlying as any, {
+      provider: "opencode-go",
+      idleTimeoutMs: 5_000,
+      firstEventTimeoutMs: 10_000,
+    });
+
+    const downstream = await Promise.resolve(
+      wrapper(
+        { provider: "opencode-go", id: "deepseek-v4-flash", requestTimeoutMs: 2_000 } as any,
+        {} as any,
+        {} as any,
+      ),
+    );
+    expect(downstream).toBeDefined();
+    if (!downstream) {
+      return;
+    }
+
+    const consumer = (async () => {
+      for await (const event of downstream) {
+        void event;
+      }
+    })();
+
+    await vi.advanceTimersByTimeAsync(2_500);
+    expect(abortCalled).toBe(true);
+    await consumer;
+  });
+
   it("aborts and releases the underlying stream when no first event arrives", async () => {
     const { stream: baseStream, getReturnCalls } = createFakeBaseStream();
     let abortCalled = false;
diff --git a/extensions/opencode-go/stream-termination.ts b/extensions/opencode-go/stream-termination.ts
@@ -48,9 +48,14 @@ function validTimeoutMs(value: unknown): number | undefined {
 }
 
 function resolveTimeoutMs(model: unknown, fallbackMs: number): number {
-  return Math.max(
-    validTimeoutMs((model as { requestTimeoutMs?: unknown })?.requestTimeoutMs) ?? 0,
-    fallbackMs,
+  return validTimeoutMs((model as { requestTimeoutMs?: unknown })?.requestTimeoutMs) ?? fallbackMs;
+}
+
+function isProviderProgressEvent(event: AssistantMessageEvent): boolean {
+  return (
+    event.type === "text_delta" ||
+    event.type === "thinking_delta" ||
+    event.type === "toolcall_delta"
   );
 }
 
@@ -348,7 +353,7 @@ export function createOpencodeGoStalledStreamWrapper(
           }
           trackPartial(event);
           output.push(event);
-          if (event.type !== "start") {
+          if (isProviderProgressEvent(event)) {
             armIdleTimer();
           }
         }

Original file line number	Diff line number	Diff line change
`@@ -48,9 +48,14 @@ function validTimeoutMs(value: unknown): number \| undefined {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`function resolveTimeoutMs(model: unknown, fallbackMs: number): number {`
`51`		`- return Math.max(`
`52`		`- validTimeoutMs((model as { requestTimeoutMs?: unknown })?.requestTimeoutMs) ?? 0,`
`53`		`- fallbackMs,`
	`51`	`+ return validTimeoutMs((model as { requestTimeoutMs?: unknown })?.requestTimeoutMs) ?? fallbackMs;`
	`52`	`+}`
	`53`	`+`
	`54`	`+function isProviderProgressEvent(event: AssistantMessageEvent): boolean {`
	`55`	`+ return (`
	`56`	`+ event.type === "text_delta" \|\|`
	`57`	`+ event.type === "thinking_delta" \|\|`
	`58`	`+ event.type === "toolcall_delta"`
`54`	`59`	`);`
`55`	`60`	`}`
`56`	`61`
`@@ -348,7 +353,7 @@ export function createOpencodeGoStalledStreamWrapper(`
`348`	`353`	`}`
`349`	`354`	`trackPartial(event);`
`350`	`355`	`output.push(event);`
`351`		`- if (event.type !== "start") {`
	`356`	`+ if (isProviderProgressEvent(event)) {`
`352`	`357`	`armIdleTimer();`
`353`	`358`	`}`
`354`	`359`	`}`