Skip to content

Fix Claude context usage normalization for UI meter, Fixes #2034 #2551

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

Open
amitbet wants to merge 2 commits into
base: main
Choose a base branch
from
+32 −15
Open

Fix Claude context usage normalization for UI meter, Fixes #2034 #2551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4410cbb
Fix Claude context usage normalization for UI meter
amitbezalel-doit May 6, 2026
ee63cc2
fixed Cursor Bugbot comment
amitbezalel-doit May 6, 2026
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
9 changes: 3 additions & 6 deletions apps/server/src/provider/Layers/ClaudeAdapter.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1637,7 +1637,6 @@ describe("ClaudeAdapterLive", () => {
lastUsedTokens: 24542,
inputTokens: 23863,
outputTokens: 679,
maxTokens: 200000,
},
});
}
Expand All @@ -1647,7 +1646,7 @@ describe("ClaudeAdapterLive", () => {
);
});

it.effect("clamps oversized Claude usage to the reported context window", () => {
it.effect("keeps oversized Claude result totals when no context-accurate usage exists", () => {
const harness = makeHarness();
return Effect.gen(function* () {
const adapter = yield* ClaudeAdapter;
Expand Down Expand Up @@ -1697,10 +1696,8 @@ describe("ClaudeAdapterLive", () => {
if (usageEvent?.type === "thread.token-usage.updated") {
assert.deepEqual(usageEvent.payload, {
usage: {
usedTokens: 200000,
lastUsedTokens: 200000,
totalProcessedTokens: 535000,
maxTokens: 200000,
usedTokens: 535000,
lastUsedTokens: 535000,
},
});
}
Expand Down
38 changes: 29 additions & 9 deletions apps/server/src/provider/Layers/ClaudeAdapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,24 +337,47 @@ function normalizeClaudeTokenUsage(
(typeof usage.total_tokens === "number" && Number.isFinite(usage.total_tokens)
? usage.total_tokens
: undefined) ?? (derivedTotalProcessedTokens > 0 ? derivedTotalProcessedTokens : undefined);
if (totalProcessedTokens === undefined || totalProcessedTokens <= 0) {
const directUsedTokens =
(typeof usage.used_tokens === "number" && Number.isFinite(usage.used_tokens)
? usage.used_tokens
: undefined) ??
(typeof usage.usedTokens === "number" && Number.isFinite(usage.usedTokens)
? usage.usedTokens
: undefined) ??
(typeof usage.last_used_tokens === "number" && Number.isFinite(usage.last_used_tokens)
? usage.last_used_tokens
: undefined) ??
(typeof usage.lastUsedTokens === "number" && Number.isFinite(usage.lastUsedTokens)
? usage.lastUsedTokens
: undefined);
if (
(totalProcessedTokens === undefined || totalProcessedTokens <= 0) &&
(directUsedTokens === undefined || directUsedTokens <= 0)
) {
return undefined;
}

const maxTokens =
typeof contextWindow === "number" && Number.isFinite(contextWindow) && contextWindow > 0
? contextWindow
: undefined;
const usedTokens =
maxTokens !== undefined ? Math.min(totalProcessedTokens, maxTokens) : totalProcessedTokens;
const hasDirectContextUsedTokens = directUsedTokens !== undefined && directUsedTokens > 0;
const usedTokens = (() => {
if (hasDirectContextUsedTokens) {
return maxTokens !== undefined ? Math.min(directUsedTokens, maxTokens) : directUsedTokens;
}
return totalProcessedTokens ?? 0;
})();

return {
usedTokens,
lastUsedTokens: usedTokens,
...(totalProcessedTokens > usedTokens ? { totalProcessedTokens } : {}),
...(totalProcessedTokens !== undefined && totalProcessedTokens > usedTokens
? { totalProcessedTokens }
: {}),
...(inputTokens > 0 ? { inputTokens } : {}),
...(outputTokens > 0 ? { outputTokens } : {}),
...(maxTokens !== undefined ? { maxTokens } : {}),
...(maxTokens !== undefined && hasDirectContextUsedTokens ? { maxTokens } : {}),
...(typeof usage.tool_uses === "number" && Number.isFinite(usage.tool_uses)
? { toolUses: usage.tool_uses }
: {}),
Expand Down Expand Up @@ -1417,10 +1440,7 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
// This does NOT represent the current context window size.
// Instead, use the last known context-window-accurate usage from task_progress
// events and treat the accumulated total as totalProcessedTokens.
const accumulatedSnapshot = normalizeClaudeTokenUsage(
result?.usage,
resultContextWindow ?? context.lastKnownContextWindow,
);
const accumulatedSnapshot = normalizeClaudeTokenUsage(result?.usage);
const accumulatedTotalProcessedTokens =
accumulatedSnapshot?.totalProcessedTokens ?? accumulatedSnapshot?.usedTokens;
const lastGoodUsage = context.lastKnownTokenUsage;
Expand Down
Loading