Skip to content

Commit 09b8874

Browse files
t3dotggclaude
andcommitted
fix(opencode): a reconnect gap leaves the turn's models unknown
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 37b7798 commit 09b8874

2 files changed

Lines changed: 14 additions & 6 deletions

File tree

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

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2150,6 +2150,13 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
21502150
const { runtime, thread } = yield* resumed([
21512151
out("session.prompt", { sessionID: SESSION, id: PROMPT_ID, text: "<any>" }),
21522152
promptAccepted,
2153+
event("session.step.started", {
2154+
sessionID: SESSION,
2155+
assistantMessageID: "msg_before_gap",
2156+
agent: "build",
2157+
model: { id: "big-pickle", providerID: "opencode", variant: "default" },
2158+
started: 1,
2159+
}),
21532160
event("session.step.ended", {
21542161
sessionID: SESSION,
21552162
assistantMessageID: "msg_before_gap",
@@ -2171,15 +2178,15 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
21712178
"command_execution:completed",
21722179
]);
21732180
assert.deepInclude(collected.at(-1), { type: "turn.terminal", status: "completed" });
2174-
// Steps that ended during the gap sent no tokens, so the measured step is only part of it.
2181+
// Steps that ended during the gap sent no tokens or models, so both stay incomplete.
21752182
const settled = collected.findLast(
21762183
(event) =>
21772184
event.type === "provider_turn.updated" && event.providerTurn.completedAt !== null,
21782185
);
2179-
assert.deepInclude(
2180-
settled?.type === "provider_turn.updated" ? settled.providerTurn.turnTokenUsage : undefined,
2181-
{ usageStatus: "partial", inputTokens: 100, outputTokens: 10 },
2182-
);
2186+
const usage =
2187+
settled?.type === "provider_turn.updated" ? settled.providerTurn.turnTokenUsage : undefined;
2188+
assert.deepInclude(usage, { usageStatus: "partial", inputTokens: 100, outputTokens: 10 });
2189+
assert.notProperty(usage, "models");
21832190
}).pipe(Effect.scoped),
21842191
);
21852192

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,8 @@ const skillsNamed = (text: string, known: ReadonlySet<string>) => [
635635
];
636636

637637
const turnTokenUsage = (turn: ActiveTurn, status: OrchestrationV2ProviderTurn["status"]) => {
638-
const models = turn.models.size === 0 ? {} : { models: [...turn.models] };
638+
// A step started during a reconnect gap ran on a model no event reported.
639+
const models = turn.models.size === 0 || turn.missedEvents ? {} : { models: [...turn.models] };
639640
return turn.steps === 0
640641
? {
641642
usageScope: "main_agent" as const,

0 commit comments

Comments
 (0)