Skip to content

Commit f7c9e27

Browse files
authored
Merge pull request #1831 from luvs01/agent/recompute-capped-usage-totals
fix(usage): recompute normalized estimated totals
2 parents f5bce1b + 6df4cc6 commit f7c9e27

2 files changed

Lines changed: 62 additions & 3 deletions

File tree

‎src/server/request-log.ts‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,10 +1004,14 @@ function finalizedUsage(
10041004
const usageFallback = !finalUsage && estimate !== undefined
10051005
? { inputTokens: estimate, outputTokens: 0, estimated: true }
10061006
: undefined;
1007-
const loggedUsage = finalUsage && estimate !== undefined
1007+
const combinedInputTokens = finalUsage && estimate !== undefined
1008+
? Math.max(finalUsage.inputTokens, estimate)
1009+
: undefined;
1010+
const loggedUsage = finalUsage && combinedInputTokens !== undefined
10081011
? {
10091012
...finalUsage,
1010-
inputTokens: Math.max(finalUsage.inputTokens, estimate),
1013+
inputTokens: combinedInputTokens,
1014+
totalTokens: combinedInputTokens + finalUsage.outputTokens,
10111015
estimated: true,
10121016
}
10131017
: finalUsage
@@ -1017,7 +1021,11 @@ function finalizedUsage(
10171021
// ESTIMATE via capEstimateAtContextWindow, and Math.max preserves a real
10181022
// provider-reported count, so it needs no further reduction.
10191023
? (finalUsage.estimated && contextWindow !== undefined && finalUsage.inputTokens > contextWindow
1020-
? { ...finalUsage, inputTokens: contextWindow }
1024+
? {
1025+
...finalUsage,
1026+
inputTokens: contextWindow,
1027+
totalTokens: contextWindow + finalUsage.outputTokens,
1028+
}
10211029
: finalUsage)
10221030
: usageFallback;
10231031
const totalTokens = usageTotalTokens(loggedUsage);

‎tests/request-log-estimate-cap.test.ts‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,57 @@ describe("request log token-estimate context-window cap (codex-router PR #140)",
3131
expect(attempt.usage?.inputTokens).toBe(100_000);
3232
});
3333

34+
test("capping adapter-estimated input recomputes an explicit total", () => {
35+
const attempt = beginRequestAttempt(1, "kiro", "deepseek-3.2", "kiro");
36+
finishRequestAttempt(attempt, 200, 10, {
37+
inputTokens: 200_000,
38+
outputTokens: 4,
39+
totalTokens: 200_004,
40+
estimated: true,
41+
});
42+
expect(attempt.usage).toEqual({
43+
inputTokens: DEEPSEEK_WINDOW,
44+
outputTokens: 4,
45+
totalTokens: DEEPSEEK_WINDOW + 4,
46+
estimated: true,
47+
});
48+
expect(attempt.totalTokens).toBe(DEEPSEEK_WINDOW + 4);
49+
});
50+
51+
test("combining a local estimate recomputes the nested and outer totals", () => {
52+
const attempt = beginRequestAttempt(1, "kiro", "deepseek-3.2", "kiro");
53+
noteAttemptSend(attempt, 200_000);
54+
finishRequestAttempt(attempt, 200, 10, {
55+
inputTokens: 50,
56+
outputTokens: 4,
57+
totalTokens: 54,
58+
});
59+
expect(attempt.usage).toEqual({
60+
inputTokens: DEEPSEEK_WINDOW,
61+
outputTokens: 4,
62+
totalTokens: DEEPSEEK_WINDOW + 4,
63+
estimated: true,
64+
});
65+
expect(attempt.totalTokens).toBe(DEEPSEEK_WINDOW + 4);
66+
});
67+
68+
test("caps an estimated Cursor checkpoint without double-adding output", () => {
69+
const attempt = beginRequestAttempt(1, "cursor", "claude-4.6-opus-high", "cursor");
70+
finishRequestAttempt(attempt, 200, 10, {
71+
inputTokens: 499_994,
72+
outputTokens: 6,
73+
totalTokens: 500_000,
74+
estimated: true,
75+
});
76+
expect(attempt.usage).toEqual({
77+
inputTokens: CURSOR_CLAUDE_WINDOW,
78+
outputTokens: 6,
79+
totalTokens: CURSOR_CLAUDE_WINDOW + 6,
80+
estimated: true,
81+
});
82+
expect(attempt.totalTokens).toBe(CURSOR_CLAUDE_WINDOW + 6);
83+
});
84+
3485
test("a positive provider-reported input count is never reduced by the cap", () => {
3586
const attempt = beginRequestAttempt(1, "kiro", "deepseek-3.2", "kiro");
3687
noteAttemptSend(attempt, 200_000); // estimate would exceed the window

0 commit comments

Comments
 (0)