Skip to content

Commit ba63cde

Browse files
committed
fix(opencode): use last-step input for oversized-session check
turn.usage.input accumulates across steps, so several fitting steps could sum past the window and misclassify a later unrelated InvalidRequest. Use the last completed step's input (the live context size, same basis as the reported turn token usage) instead.
1 parent 073cb01 commit ba63cde

3 files changed

Lines changed: 32 additions & 23 deletions

File tree

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3715,8 +3715,12 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
37153715
// evidence keeps the original error.
37163716
const oversized = oversizedSessionMessage({
37173717
causeTag: cause._tag,
3718-
steps: turn.steps,
3719-
inputTokens: turn.usage.input,
3718+
lastStepInputTokens:
3719+
turn.lastStep === undefined
3720+
? undefined
3721+
: turn.lastStep.input +
3722+
turn.lastStep.cache.read +
3723+
turn.lastStep.cache.write,
37203724
windowTokens: windowOf(
37213725
directoryOf(turnInput.runtimePolicy.cwd),
37223726
turnInput.modelSelection.model,

‎packages/provider-opencode/src/server/v2/oversizedSession.test.ts‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ describe("oversizedSessionMessage", () => {
77
expect(
88
oversizedSessionMessage({
99
causeTag: "InvalidRequestError",
10-
steps: 12,
11-
inputTokens: 8_700_000,
10+
lastStepInputTokens: 8_700_000,
1211
windowTokens: 1_000_000,
1312
}),
1413
).toBe(
@@ -23,19 +22,27 @@ describe("oversizedSessionMessage", () => {
2322
expect(
2423
oversizedSessionMessage({
2524
causeTag: "InvalidRequestError",
26-
steps: 1,
27-
inputTokens: 200_000,
25+
lastStepInputTokens: 200_000,
2826
windowTokens: 200_000,
2927
}),
3028
).not.toBeNull();
3129
});
3230

31+
it("ignores cumulative totals when the last step fits the window", () => {
32+
expect(
33+
oversizedSessionMessage({
34+
causeTag: "InvalidRequestError",
35+
lastStepInputTokens: 80_000,
36+
windowTokens: 200_000,
37+
}),
38+
).toBeNull();
39+
});
40+
3341
it("leaves other rejections alone", () => {
3442
expect(
3543
oversizedSessionMessage({
3644
causeTag: "ConflictError",
37-
steps: 12,
38-
inputTokens: 8_700_000,
45+
lastStepInputTokens: 8_700_000,
3946
windowTokens: 1_000_000,
4047
}),
4148
).toBeNull();
@@ -45,8 +52,7 @@ describe("oversizedSessionMessage", () => {
4552
expect(
4653
oversizedSessionMessage({
4754
causeTag: "InvalidRequestError",
48-
steps: 12,
49-
inputTokens: 50_000,
55+
lastStepInputTokens: 50_000,
5056
windowTokens: 1_000_000,
5157
}),
5258
).toBeNull();
@@ -56,16 +62,14 @@ describe("oversizedSessionMessage", () => {
5662
expect(
5763
oversizedSessionMessage({
5864
causeTag: "InvalidRequestError",
59-
steps: 12,
60-
inputTokens: 8_700_000,
65+
lastStepInputTokens: 8_700_000,
6166
windowTokens: undefined,
6267
}),
6368
).toBeNull();
6469
expect(
6570
oversizedSessionMessage({
6671
causeTag: "InvalidRequestError",
67-
steps: 0,
68-
inputTokens: 0,
72+
lastStepInputTokens: undefined,
6973
windowTokens: 1_000_000,
7074
}),
7175
).toBeNull();

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,22 @@
88
* This maps that case to an actionable message: fork from an earlier
99
* completed run or start a fresh thread.
1010
*
11-
* Only fires with positive size evidence — a known window and a turn whose
12-
* observed input already meets it — so genuine malformed requests keep
13-
* their original error. A refused first prompt (no steps yet) carries no
14-
* size signal and is left alone for the same reason.
11+
* Only fires with per-request size evidence: the last completed step's
12+
* input is the live context size, and it must already meet the known
13+
* window. Cumulative turn totals are deliberately not used — several steps
14+
* that each fit the window can sum past it, and a later unrelated
15+
* rejection must keep its original error. Unknown windows and prompt-less
16+
* failures are left alone for the same reason.
1517
*/
1618
export const oversizedSessionMessage = (input: {
1719
readonly causeTag: string | undefined;
18-
readonly steps: number;
19-
readonly inputTokens: number;
20+
readonly lastStepInputTokens: number | undefined;
2021
readonly windowTokens: number | undefined;
2122
}): string | null => {
2223
if (input.causeTag !== "InvalidRequestError") return null;
23-
if (input.windowTokens === undefined || input.steps === 0) return null;
24-
if (input.inputTokens < input.windowTokens) return null;
25-
const used = input.inputTokens.toLocaleString("en-US");
24+
if (input.windowTokens === undefined || input.lastStepInputTokens === undefined) return null;
25+
if (input.lastStepInputTokens < input.windowTokens) return null;
26+
const used = input.lastStepInputTokens.toLocaleString("en-US");
2627
const window = input.windowTokens.toLocaleString("en-US");
2728
return (
2829
`This session has grown past the model's context window ` +

0 commit comments

Comments
 (0)