github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-08 12:11:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: use last API call's cache tokens for context-size display (#13698) (#13805)

Browse Source 
The UsageAccumulator sums cacheRead/cacheWrite across all API calls
within a single turn. With Anthropic prompt caching, each call reports
cacheRead ≈ current_context_size, so after N tool-call round-trips the
accumulated total becomes N × actual_context, which gets clamped to
contextWindow (200k) by deriveSessionTotalTokens().

Fix: track the most recent API call's cache fields separately and use
them in toNormalizedUsage() for context-size reporting. This makes
/status Context display accurate while preserving accumulated output
token counts.

Fixes #13698
Fixes #13782

Co-authored-by: akari-musubi <259925157+akari-musubi@users.noreply.github.com>
This commit is contained in:
Akari
2026-02-12 23:01:36 +09:00
committed by GitHub
parent 4c350bc4c8
commit 455bc1ebba
1 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/agents/pi-embedded-runner/run.ts
View File

@@ -80,6 +80,10 @@ type UsageAccumulator = {
cacheRead: number; cacheRead: number;
cacheWrite: number; cacheWrite: number;
total: number; total: number;
/** Cache fields from the most recent API call (not accumulated). */
lastCacheRead: number;
lastCacheWrite: number;
lastInput: number;
}; };
const createUsageAccumulator = (): UsageAccumulator => ({ const createUsageAccumulator = (): UsageAccumulator => ({
@@ -88,6 +92,9 @@ const createUsageAccumulator = (): UsageAccumulator => ({
cacheRead: 0, cacheRead: 0,
cacheWrite: 0, cacheWrite: 0,
total: 0, total: 0,
lastCacheRead: 0,
lastCacheWrite: 0,
lastInput: 0,
}); });
const hasUsageValues = ( const hasUsageValues = (
@@ -112,6 +119,12 @@ const mergeUsageIntoAccumulator = (
target.total += target.total +=
usage.total ?? usage.total ??
(usage.input ?? 0) + (usage.output ?? 0) + (usage.cacheRead ?? 0) + (usage.cacheWrite ?? 0); (usage.input ?? 0) + (usage.output ?? 0) + (usage.cacheRead ?? 0) + (usage.cacheWrite ?? 0);
// Track the most recent API call's cache fields for accurate context-size reporting.
// Accumulated cache totals inflate context size when there are multiple tool-call round-trips,
// since each call reports cacheRead ≈ current_context_size.
target.lastCacheRead = usage.cacheRead ?? 0;
target.lastCacheWrite = usage.cacheWrite ?? 0;
target.lastInput = usage.input ?? 0;
}; };
const toNormalizedUsage = (usage: UsageAccumulator) => { const toNormalizedUsage = (usage: UsageAccumulator) => {
@@ -124,13 +137,21 @@ const toNormalizedUsage = (usage: UsageAccumulator) => {
if (!hasUsage) { if (!hasUsage) {
return undefined; return undefined;
} }
const derivedTotal = usage.input + usage.output + usage.cacheRead + usage.cacheWrite; // Use the LAST API call's cache fields for context-size calculation.
// The accumulated cacheRead/cacheWrite inflate context size because each tool-call
// round-trip reports cacheRead ≈ current_context_size, and summing N calls gives
// N × context_size which gets clamped to contextWindow (e.g. 200k).
// See: https://github.com/openclaw/openclaw/issues/13698
//
// We use lastInput/lastCacheRead/lastCacheWrite (from the most recent API call) for
// cache-related fields, but keep accumulated output (total generated text this turn).
const lastPromptTokens = usage.lastInput + usage.lastCacheRead + usage.lastCacheWrite;
return { return {
input: usage.input || undefined, input: usage.lastInput || undefined,
output: usage.output || undefined, output: usage.output || undefined,
cacheRead: usage.cacheRead || undefined, cacheRead: usage.lastCacheRead || undefined,
cacheWrite: usage.cacheWrite || undefined, cacheWrite: usage.lastCacheWrite || undefined,
total: usage.total || derivedTotal || undefined, total: lastPromptTokens + usage.output || undefined,
}; };
}; };