Skip to content

[WRONG BRANCH] fix(usage): recompute totals when capping adapter-estimated inputTokens #286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
luvs01 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[WRONG BRANCH] fix(usage): recompute totals when capping adapter-estimated inputTokens #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/server/request-log.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1017,7 +1017,11 @@ function finalizedUsage(
// ESTIMATE via capEstimateAtContextWindow, and Math.max preserves a real
// provider-reported count, so it needs no further reduction.
? (finalUsage.estimated && contextWindow !== undefined && finalUsage.inputTokens > contextWindow
? { ...finalUsage, inputTokens: contextWindow }
? {
...finalUsage,
inputTokens: contextWindow,
totalTokens: contextWindow + finalUsage.outputTokens,
}
: finalUsage)
: usageFallback;
const totalTokens = usageTotalTokens(loggedUsage);
Expand Down
17 changes: 17 additions & 0 deletions tests/request-log-estimate-cap.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,23 @@ describe("request log token-estimate context-window cap (codex-router PR #140)",
expect(attempt.usage?.inputTokens).toBe(100_000);
});

test("capping adapter-estimated input recomputes an explicit total", () => {
const attempt = beginRequestAttempt(1, "kiro", "deepseek-3.2", "kiro");
finishRequestAttempt(attempt, 200, 10, {
inputTokens: 200_000,
outputTokens: 4,
totalTokens: 200_004,
estimated: true,
});
expect(attempt.usage).toEqual({
inputTokens: DEEPSEEK_WINDOW,
outputTokens: 4,
totalTokens: DEEPSEEK_WINDOW + 4,
estimated: true,
});
expect(attempt.totalTokens).toBe(DEEPSEEK_WINDOW + 4);
});

test("a positive provider-reported input count is never reduced by the cap", () => {
const attempt = beginRequestAttempt(1, "kiro", "deepseek-3.2", "kiro");
noteAttemptSend(attempt, 200_000); // estimate would exceed the window
Expand Down
Loading