Skip to content

Commit 1453f19

Browse files
t3dotggclaude
andcommitted
fix(opencode): a step with no seen start leaves the turn's models unknown
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 09b8874 commit 1453f19

2 files changed

Lines changed: 39 additions & 2 deletions

File tree

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

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2902,6 +2902,40 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
29022902
}).pipe(Effect.scoped),
29032903
);
29042904

2905+
it.effect("leaves models unknown when a step ends without a seen start", () =>
2906+
Effect.gen(function* () {
2907+
const tokens = { input: 10, output: 1, reasoning: 0, cache: { read: 0, write: 0 } };
2908+
const step = (id: string) => ({ sessionID: SESSION, assistantMessageID: id });
2909+
const { runtime, thread } = yield* resumed([
2910+
out("session.prompt", { sessionID: SESSION, text: "<any>" }),
2911+
promptAccepted,
2912+
event("session.step.started", {
2913+
...step("msg_seen"),
2914+
agent: "build",
2915+
model: { id: "big-pickle", providerID: "opencode", variant: "default" },
2916+
started: 1,
2917+
}),
2918+
event("session.step.ended", { ...step("msg_seen"), finish: "tool-calls", cost: 0, tokens }),
2919+
event("session.step.ended", { ...step("msg_unseen"), finish: "stop", cost: 0, tokens }),
2920+
event("session.execution.succeeded", { sessionID: SESSION }),
2921+
]);
2922+
const turn = yield* runtime.events.pipe(
2923+
Stream.filter(
2924+
(event) =>
2925+
event.type === "provider_turn.updated" && event.providerTurn.completedAt !== null,
2926+
),
2927+
Stream.runHead,
2928+
Effect.forkScoped,
2929+
);
2930+
yield* runtime.startTurn(turnInput(thread));
2931+
const settled = Option.getOrUndefined(yield* Fiber.join(turn));
2932+
const usage =
2933+
settled?.type === "provider_turn.updated" ? settled.providerTurn.turnTokenUsage : undefined;
2934+
assert.deepInclude(usage, { usageStatus: "complete", inputTokens: 20, outputTokens: 2 });
2935+
assert.notProperty(usage, "models");
2936+
}).pipe(Effect.scoped),
2937+
);
2938+
29052939
it.effect("reports cache writes as cache creation, not only as input", () =>
29062940
Effect.gen(function* () {
29072941
const { runtime, thread } = yield* resumed([

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

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

637637
const turnTokenUsage = (turn: ActiveTurn, status: OrchestrationV2ProviderTurn["status"]) => {
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] };
638+
// A step whose start was missed, in a reconnect gap or as an unreadable event, ran on an unreported model.
639+
const models =
640+
turn.models.size === 0 || turn.missedEvents || turn.steps > turn.startedSteps
641+
? {}
642+
: { models: [...turn.models] };
640643
return turn.steps === 0
641644
? {
642645
usageScope: "main_agent" as const,

0 commit comments

Comments
 (0)