Skip to content

Commit d99861a

Browse files
fix(opencode): keep retry pending until output resumes
1 parent 020b291 commit d99861a

2 files changed

Lines changed: 10 additions & 6 deletions

File tree

‎apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3521,22 +3521,26 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
35213521
);
35223522

35233523
it.effect.each([
3524-
{ name: "restores retry pending at reconnect", pending: true },
3525-
{ name: "settles retry recovered during drop", pending: false },
3526-
])("$name", ({ pending }) =>
3524+
{ name: "restores retry pending at reconnect", pending: true, streamed: false },
3525+
{ name: "settles retry recovered during drop", pending: false, streamed: false },
3526+
{ name: "keeps retry pending when only streamed at reconnect", pending: true, streamed: true },
3527+
])("$name", ({ pending, streamed }) =>
35273528
Effect.gen(function* () {
35283529
const gate = makeProviderReplayGate(["finish"]);
35293530
const { runtime, thread } = yield* resumed(
35303531
[
35313532
out("session.prompt", { sessionID: SESSION, id: PROMPT_ID, text: "<any>" }),
35323533
promptAccepted,
35333534
event("session.execution.started", { sessionID: SESSION }),
3534-
...(pending ? [] : [retryScheduled(2, 2_000)]),
3535+
...(pending && !streamed ? [] : [retryScheduled(2, 2_000)]),
35353536
...reconnected({ [SESSION]: { type: "running" } }, undefined, {
35363537
id: ASSISTANT,
35373538
finish: undefined,
35383539
content: pending ? [] : [{ type: "text", text: "Recovered during the drop." }],
3539-
...(pending ? { retry: { attempt: 2, at: 2_001, error: rateLimited } } : {}),
3540+
...(pending && !streamed
3541+
? { retry: { attempt: 2, at: 2_001, error: rateLimited } }
3542+
: {}),
3543+
...(streamed ? { time: { created: 2, streamed: 3 } } : {}),
35403544
}),
35413545
...openRequests([shellAsk.data]),
35423546
event("session.execution.succeeded", { sessionID: SESSION }, "finish"),

‎packages/provider-opencode/src/server/v2/adapter.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2518,7 +2518,7 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
25182518
turn.retry !== undefined &&
25192519
assistant !== undefined &&
25202520
assistant.error === undefined &&
2521-
(assistant.content.length > 0 || assistant.time.streamed !== undefined)
2521+
assistant.content.length > 0
25222522
) {
25232523
yield* emitRetry(state, turn, "completed");
25242524
turn.retry = undefined;

0 commit comments

Comments
 (0)