fix: return preserved totalTokens from resolveFreshSessionTotalTokens (fixes #82900)

njuboy11 · njuboy11 · commit f079119d0e73 · 2026-05-18T02:18:17.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,7 @@ Docs: https://docs.openclaw.ai
 - QA-Lab: add the personal-agent approval-denial scenario so the benchmark pack verifies denied local reads stop cleanly without tool progress or fixture leaks. (#83150) Thanks @iFiras-Max1.
 
 ### Fixes
+- Agents/sessions: return preserved totalTokens from resolveFreshSessionTotalTokens even when stale, so /context and Control UI context meter show correct utilization without affecting compaction or memory flush. Fixes #82900. (#82919) Thanks @njuboy11.
 
 - Feishu: return bound subagent delivery origins from session thread setup so Feishu subagent completions route back to the same DM or topic. (#83190) Thanks @100menotu001.
 - CLI/update: tailor post-update Gateway recovery hints by platform, showing systemd, LaunchAgent, Scheduled Task, or generic service-manager guidance instead of macOS-only recovery text. (#83096) Thanks @rubencu.
diff --git a/src/auto-reply/reply/commands-context-report.test.ts b/src/auto-reply/reply/commands-context-report.test.ts
@@ -154,9 +154,9 @@ describe("buildContextReply", () => {
       }),
     );
     expect(result.text).toContain("Tracked prompt estimate: 1,020 chars (~255 tok)");
-    expect(result.text).toContain("Actual context usage (cached): unavailable");
-    expect(result.text).toContain("Session tokens (cached): unknown / ctx=8,192");
-    expect(result.text).not.toContain("~645 tok");
+    expect(result.text).toContain("Actual context usage (cached): 900 tok");
+    expect(result.text).toContain("Session tokens (cached): 900 total / ctx=8,192");
+    expect(result.text).toContain("Untracked provider/runtime overhead: ~645 tok");
   });
 
   it("prefers the target session entry from sessionStore for cached context stats", async () => {
diff --git a/src/auto-reply/reply/memory-flush.ts b/src/auto-reply/reply/memory-flush.ts
@@ -50,7 +50,7 @@ function resolveMemoryFlushGateState<
   }
 
   const totalTokens =
-    resolvePositiveTokenCount(params.tokenCount) ?? resolveFreshSessionTotalTokens(params.entry);
+    resolvePositiveTokenCount(params.tokenCount) ?? (params.entry?.totalTokensFresh === false ? undefined : resolveFreshSessionTotalTokens(params.entry));
   if (!totalTokens || totalTokens <= 0) {
     return null;
   }
diff --git a/src/auto-reply/reply/session-fork.runtime.ts b/src/auto-reply/reply/session-fork.runtime.ts
@@ -70,7 +70,7 @@ export async function resolveParentForkTokenCountRuntime(params: {
   storePath: string;
 }): Promise<number | undefined> {
   const freshPersistedTokens = resolveFreshSessionTotalTokens(params.parentEntry);
-  if (typeof freshPersistedTokens === "number") {
+  if (typeof freshPersistedTokens === "number" && params.parentEntry.totalTokensFresh !== false) {
     return freshPersistedTokens;
   }
 
diff --git a/src/auto-reply/status.test.ts b/src/auto-reply/status.test.ts
@@ -128,8 +128,8 @@ describe("buildStatusMessage", () => {
     });
     const normalized = normalizeTestText(text);
 
-    expect(normalized).toContain("Context: ?/1.0m");
-    expect(normalized).not.toContain("Context: 3.8m/1.0m");
+    expect(normalized).toContain("Context: 3.8m/1.0m");
+    expect(normalized).not.toContain("Context: ?/1.0m");
   });
 
   it("shows sanitized TTS provider details in the voice status line", async () => {
@@ -1585,8 +1585,8 @@ describe("buildStatusMessage", () => {
         });
         const normalized = normalizeTestText(text);
 
-        expect(normalized).toContain("Context: ?/1.0m");
-        expect(normalized).not.toContain("Context: 3.8m/1.0m");
+        expect(normalized).toContain("Context: 3.8m/1.0m");
+        expect(normalized).not.toContain("Context: ?/1.0m");
         expect(normalized).not.toContain("Context: 3.82m/1.0m");
       },
       { prefix: "openclaw-status-" },
diff --git a/src/config/sessions/types.ts b/src/config/sessions/types.ts
@@ -550,16 +550,16 @@ export function resolveFreshSessionTotalTokens(
   if (total === undefined) {
     return undefined;
   }
-  if (entry?.totalTokensFresh === false) {
-    return undefined;
-  }
+  // PR #82578 ensured totalTokens is preserved across stale usage updates
+  // instead of being corrupted to undefined. totalTokensFresh=false only
+  // means "possibly slightly stale", not "unavailable".
   return total;
 }
 
 export function isSessionTotalTokensFresh(
   entry?: Pick<SessionEntry, "totalTokens" | "totalTokensFresh"> | null,
 ): boolean {
-  return resolveFreshSessionTotalTokens(entry) !== undefined;
+  return resolveSessionTotalTokens(entry) !== undefined && entry?.totalTokensFresh !== false;
 }
 
 export type GroupKeyResolution = {
diff --git a/src/gateway/session-utils.search.test.ts b/src/gateway/session-utils.search.test.ts
@@ -282,7 +282,7 @@ describe("listSessionsFromStore search", () => {
     const missing = result.sessions.find((row) => row.key === "agent:main:missing");
     expect(fresh?.totalTokens).toBe(1200);
     expect(fresh?.totalTokensFresh).toBe(true);
-    expect(stale?.totalTokens).toBeUndefined();
+    expect(stale?.totalTokens).toBe(2200);
     expect(stale?.totalTokensFresh).toBe(false);
     expect(missing?.totalTokens).toBeUndefined();
     expect(missing?.totalTokensFresh).toBe(false);
diff --git a/src/gateway/session-utils.ts b/src/gateway/session-utils.ts
@@ -1801,7 +1801,7 @@ export function buildGatewaySessionRow(params: {
     resolvePositiveNumber(resolveFreshSessionTotalTokens(entry)) ??
     resolvePositiveNumber(transcriptUsage?.totalTokens);
   const totalTokensFresh =
-    typeof totalTokens === "number" && Number.isFinite(totalTokens) && totalTokens > 0
+    typeof totalTokens === "number" && Number.isFinite(totalTokens) && totalTokens > 0 && entry?.totalTokensFresh !== false
       ? true
       : transcriptUsage?.totalTokensFresh === true;
   const childSessions = params.storeChildSessionsByKey

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ function resolveMemoryFlushGateState<`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`const totalTokens =`
`53`		`- resolvePositiveTokenCount(params.tokenCount) ?? resolveFreshSessionTotalTokens(params.entry);`
	`53`	`+ resolvePositiveTokenCount(params.tokenCount) ?? (params.entry?.totalTokensFresh === false ? undefined : resolveFreshSessionTotalTokens(params.entry));`
`54`	`54`	`if (!totalTokens \|\| totalTokens <= 0) {`
`55`	`55`	`return null;`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ export async function resolveParentForkTokenCountRuntime(params: {`
`70`	`70`	`storePath: string;`
`71`	`71`	`}): Promise<number \| undefined> {`
`72`	`72`	`const freshPersistedTokens = resolveFreshSessionTotalTokens(params.parentEntry);`
`73`		`- if (typeof freshPersistedTokens === "number") {`
	`73`	`+ if (typeof freshPersistedTokens === "number" && params.parentEntry.totalTokensFresh !== false) {`
`74`	`74`	`return freshPersistedTokens;`
`75`	`75`	`}`
`76`	`76`
Original file line number	Diff line number	Diff line change
`@@ -550,16 +550,16 @@ export function resolveFreshSessionTotalTokens(`
`550`	`550`	`if (total === undefined) {`
`551`	`551`	`return undefined;`
`552`	`552`	`}`
`553`		`- if (entry?.totalTokensFresh === false) {`
`554`		`- return undefined;`
`555`		`- }`
	`553`	`+ // PR #82578 ensured totalTokens is preserved across stale usage updates`
	`554`	`+ // instead of being corrupted to undefined. totalTokensFresh=false only`
	`555`	`+ // means "possibly slightly stale", not "unavailable".`
`556`	`556`	`return total;`
`557`	`557`	`}`
`558`	`558`
`559`	`559`	`export function isSessionTotalTokensFresh(`
`560`	`560`	`entry?: Pick<SessionEntry, "totalTokens" \| "totalTokensFresh"> \| null,`
`561`	`561`	`): boolean {`
`562`		`- return resolveFreshSessionTotalTokens(entry) !== undefined;`
	`562`	`+ return resolveSessionTotalTokens(entry) !== undefined && entry?.totalTokensFresh !== false;`
`563`	`563`	`}`
`564`	`564`
`565`	`565`	`export type GroupKeyResolution = {`