fix(tui): show 0 not ? for fresh-session context tokens in footer (#94337)

mushuiyu886 · web-flow · commit 78f948f76836 · 2026-06-19T04:10:08.000Z
Summary: - The PR extends TUI session info to carry `totalTokensFresh`, maps fresh missing totals to `0`, and adds a focused regression test for the footer merge path. - PR surface: Source +15, Tests +38. Total +53 across 4 files. - Reproducibility: yes. at source level: `chat.history` returns session info with `totalTokensFresh`, but curr ... `null` before footer formatting. I did not run local tests or a live TUI session in this read-only review. Automerge notes: - PR branch already contained follow-up commit before automerge: Merge branch 'main' into fix/followup-93798 Validation: - ClawSweeper review passed for head 43657b5. - Required merge gates passed before the squash merge. Prepared head SHA: 43657b5 Review: #94337 (comment) Co-authored-by: 杨浩宇0668001029 <yang.haoyu@xydigit.com> Co-authored-by: mushuiyu_xydt <yang.haoyu@xydigit.com>
diff --git a/src/tui/tui-backend.ts b/src/tui/tui-backend.ts
@@ -62,6 +62,7 @@ export type TuiSessionList = {
       | "inputTokens"
       | "outputTokens"
       | "totalTokens"
+      | "totalTokensFresh"
       | "goal"
       | "modelProvider"
       | "displayName"
diff --git a/src/tui/tui-session-actions.test.ts b/src/tui/tui-session-actions.test.ts
@@ -495,6 +495,44 @@ describe("tui session actions", () => {
     expect(listSessions).not.toHaveBeenCalled();
   });
 
+  it("renders a fresh session total as 0 (not '?') when totalTokensFresh is set", async () => {
+    const listSessions = vi.fn().mockResolvedValue({ sessions: [] });
+    const loadHistory = vi.fn().mockResolvedValue({
+      sessionId: "session-fresh",
+      sessionInfo: {
+        key: "agent:main:fresh",
+        sessionId: "session-fresh",
+        model: "session-model",
+        modelProvider: "openai",
+        // The gateway strips the fresh 0 via resolvePositiveNumber but still
+        // flags it fresh, so the footer must show 0 rather than "?". (#93798)
+        totalTokensFresh: true,
+        updatedAt: 60,
+      },
+      messages: [],
+    });
+    const state = createBaseState({
+      historyLoaded: true,
+      sessionInfo: {
+        totalTokens: 3,
+        updatedAt: 500,
+      },
+    });
+
+    const { setSession } = createTestSessionActions({
+      client: {
+        listSessions,
+        loadHistory,
+      } as unknown as TuiBackend,
+      state,
+    });
+
+    await setSession("agent:main:fresh");
+
+    expect(state.sessionInfo.totalTokens).toBe(0);
+    expect(state.sessionInfo.totalTokensFresh).toBe(true);
+  });
+
   it("restores an in-flight run reported by chat.history on switch-back", async () => {
     const loadHistory = vi.fn().mockResolvedValue({
       sessionId: "session-bg",
diff --git a/src/tui/tui-session-actions.ts b/src/tui/tui-session-actions.ts
@@ -253,6 +253,13 @@ export function createSessionActions(context: SessionActionContext) {
     }
     if (entry?.totalTokens !== undefined) {
       next.totalTokens = entry.totalTokens;
+      next.totalTokensFresh = entry.totalTokensFresh === true;
+    } else if (entry?.totalTokensFresh === true) {
+      // Fresh session: the total is known to be 0. The gateway strips the 0 via
+      // resolvePositiveNumber but still flags it fresh, so render 0 (not "?"),
+      // mirroring the /status fix in #93798. See followup to #93771.
+      next.totalTokens = 0;
+      next.totalTokensFresh = true;
     }
     if (params.clearMissingUsage) {
       if (entry?.inputTokens === undefined) {
@@ -261,8 +268,9 @@ export function createSessionActions(context: SessionActionContext) {
       if (entry?.outputTokens === undefined) {
         next.outputTokens = null;
       }
-      if (entry?.totalTokens === undefined) {
+      if (entry?.totalTokens === undefined && entry?.totalTokensFresh !== true) {
         next.totalTokens = null;
+        next.totalTokensFresh = undefined;
       }
     }
     if (hasEntryUpdate) {
diff --git a/src/tui/tui-types.ts b/src/tui/tui-types.ts
@@ -83,6 +83,12 @@ export type SessionInfo = {
   inputTokens?: number | null;
   outputTokens?: number | null;
   totalTokens?: number | null;
+  /**
+   * True when `totalTokens` is a known-fresh value (e.g. 0 on a brand-new
+   * session) rather than an unknown/stale total. Lets the footer render `0`
+   * instead of `?` for fresh sessions, mirroring the `/status` fix in #93798.
+   */
+  totalTokensFresh?: boolean;
   goal?: SessionGoal;
   responseUsage?: ResponseUsageMode;
   updatedAt?: number | null;

Original file line number	Diff line number	Diff line change
`@@ -253,6 +253,13 @@ export function createSessionActions(context: SessionActionContext) {`
`253`	`253`	`}`
`254`	`254`	`if (entry?.totalTokens !== undefined) {`
`255`	`255`	`next.totalTokens = entry.totalTokens;`
	`256`	`+ next.totalTokensFresh = entry.totalTokensFresh === true;`
	`257`	`+ } else if (entry?.totalTokensFresh === true) {`
	`258`	`+ // Fresh session: the total is known to be 0. The gateway strips the 0 via`
	`259`	`+ // resolvePositiveNumber but still flags it fresh, so render 0 (not "?"),`
	`260`	`+ // mirroring the /status fix in #93798. See followup to #93771.`
	`261`	`+ next.totalTokens = 0;`
	`262`	`+ next.totalTokensFresh = true;`
`256`	`263`	`}`
`257`	`264`	`if (params.clearMissingUsage) {`
`258`	`265`	`if (entry?.inputTokens === undefined) {`
`@@ -261,8 +268,9 @@ export function createSessionActions(context: SessionActionContext) {`
`261`	`268`	`if (entry?.outputTokens === undefined) {`
`262`	`269`	`next.outputTokens = null;`
`263`	`270`	`}`
`264`		`- if (entry?.totalTokens === undefined) {`
	`271`	`+ if (entry?.totalTokens === undefined && entry?.totalTokensFresh !== true) {`
`265`	`272`	`next.totalTokens = null;`
	`273`	`+ next.totalTokensFresh = undefined;`
`266`	`274`	`}`
`267`	`275`	`}`
`268`	`276`	`if (hasEntryUpdate) {`