Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/web-search/progress-stream.ts
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,10 @@ export async function* parseStreamWithProgress(
}
if (event.type === "done" || event.type === "incomplete") {
heldTerminal = event;
// Response-byte inactivity ends once the adapter has produced a terminal event.
// From here the separate post-terminal drain guard owns the bounded wait for
// iterator cleanup, so leaving the inactivity timer armed creates a false timeout.
clearInactivity();
continue;
}
await handoff.deliver(event);
Expand Down
7 changes: 5 additions & 2 deletions tests/web-search/web-search-progress-stream.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -215,10 +215,13 @@ describe("web-search streamed-body progress collector", () => {
let returned = false;
const parser: ParseStream = async function* () {
yield { type: "done", usage: { inputTokens: 1, outputTokens: 2 } };
await sleep(20);
await sleep(30);
returned = true;
};
const iterator = parseStreamWithProgress(new Response(chunkStream([])), parser, { inactivityTimeoutMs: 100 });
const iterator = parseStreamWithProgress(new Response(chunkStream([])), parser, {
inactivityTimeoutMs: 10,
postTerminalDrainTimeoutMs: 100,
});
const next = await iterator.next();
expect(returned).toBe(true);
expect(next.value).toEqual({ type: "done", usage: { inputTokens: 1, outputTokens: 2 } });
Expand Down
Loading