pi-zentui 0.14.0 → 0.15.1

package/README.md

@@ -130,7 +130,16 @@ pi install git:github.com/lmilojevicc/pi-zentui
 
 User config lives at `~/.pi/agent/zentui.json`. The file is optional: missing or invalid known values fall back to Zentui defaults, unknown keys are ignored at runtime, and `/zentui` can patch color-source settings, UI feature toggles, built-in footer segment visibility, and active third-party status placements.
 
-The interactive `/zentui` menu is split into five sections. Use `Tab` and `Shift+Tab` to switch between `Coloring`, `Features`, `Layout`, `Built-in segments`, and `Extension segments`.
+The interactive `/zentui` menu is split into exactly six sections, in this order. Use `Tab` and `Shift+Tab` to switch sections. Every listed control patches the shown JSON equivalent:
+
+1. **Appearance** — Starship/footer colors (`colorSources.starship`); editor + previous-message colors (`colorSources.editor` and `colorSources.userMessages`); separator (`separator`); icon mode (`icons.mode`).
+2. **Editor** — editor enabled (`features.editor`); editor model label (`editorModelLabel`); copy-friendly mode (`features.copyFriendly`); viewport indicators (`features.viewportIndicators`); fixed editor (`fixedEditor.enabled`); and, while fixed editor is enabled, mouse scroll (`fixedEditor.mouseScroll`) and copy notice (`fixedEditor.copyNotice`).
+3. **Footer** — status line enabled (`features.statusLine`); responsive footer (`responsiveFooter`); compact footer rows (`compactFooterMaxLines`); context style (`contextStyle`); path display (`pathDisplay.mode`); path depth (`pathDisplay.depth`).
+4. **Segments** — visibility toggles for every non-Git built-in segment under `footerSegments`: `cwd`, `sessionName`, `runtime`, `context`, `tokens`, `cost`, `sessionDuration`, `username`, `time`, `os`, and `packageVersion`.
+5. **Git** — Git branch visibility (`footerSegments.gitBranch`); branch length (`gitBranch.maxLength`); Git status visibility (`footerSegments.gitStatus`); Git counts visibility (`footerSegments.gitCounts`); Git commit visibility (`footerSegments.gitCommit`); commit-only-detached (`gitCommit.onlyDetached`); exact-match tag (`gitCommit.showTag`); Git metrics visibility (`footerSegments.gitMetrics`); hide zero metrics (`gitMetrics.onlyNonzero`); ignore submodules (`gitMetrics.ignoreSubmodules`).
+6. **Extensions** — default placement (`extensionStatuses.defaultPlacement`) first, followed by placement (`extensionStatuses.placements[key]`) and color (`extensionStatuses.colorModes[key]`) controls for currently active status keys.
+
+Free-form values such as custom formats, raw colors/styles, numeric values outside the shown presets, and inactive extension keys remain JSON-only.
 
 Useful slash-command shortcuts:
 
@@ -144,6 +153,9 @@ Useful slash-command shortcuts:
 /zentui copy-friendly enable
 /zentui copy-friendly disable
 /zentui copy-friendly toggle
+/zentui viewport-indicators enable
+/zentui viewport-indicators disable
+/zentui viewport-indicators toggle
 /zentui fixed-editor enable
 /zentui fixed-editor disable
 /zentui fixed-editor toggle
@@ -238,7 +250,8 @@ Default config values — copy this and change any value you want:
 	"features": {
 		"editor": true,
 		"statusLine": true,
-		"copyFriendly": false
+		"copyFriendly": false,
+		"viewportIndicators": true
 	},
 	"footerSegments": {
 		"cwd": true,
@@ -285,21 +298,21 @@ Default config values — copy this and change any value you want:
 - `contextStyle`: `text` (default), `gauge`, or `text+gauge` for the context segment. Context usage refreshes during assistant streaming; token and cost totals remain canonical and finalize at turn boundaries.
 - `editorModelLabel`: controls the model shown in the editor frame. `id` (default) shows the model id; `name` shows the model's display name (including custom `name` values set in `models.json`), falling back to the id when no name is set.
 - `editorMetadataFormat`: JSON-only template for the left side of the editor metadata row. Missing, non-string, or empty values restore the default `$model  $provider(  $thinking)` layout; non-empty strings, including whitespace-only strings, are preserved. See [Editor Metadata Format](#editor-metadata-format) below.
-- `separator`: controls the default footer layout and extension-status connectors: `pipe` (default, ` | `), `dot` (` · `), `chevron` (` › `), or `none` (one space). Cycle it from the `/zentui` **Layout** tab. This selects the separator glyph; `colors.separator` controls its color. Custom `footerFormat` literals and `$sep` keep their existing behavior.
+- `separator`: controls the default footer layout and extension-status connectors: `pipe` (default, ` | `), `dot` (` · `), `chevron` (` › `), or `none` (one space). Cycle it from the `/zentui` **Appearance** tab. This selects the separator glyph; `colors.separator` controls its color. Custom `footerFormat` literals and `$sep` keep their existing behavior.
 - `contextThresholds`: `{ warning, error }` percentages (default `70` / `90`) that select contextNormal / contextWarning / contextError colors.
-- `pathDisplay`: controls how the cwd/`$cwd` path is shown. `mode` is `basename` (default, last segment only) or `full` (path with home contracted to `~`). In `full` mode, `depth` keeps only the last N trailing directories (`0` = entire path after `~`, max `5`); when parents are dropped the path is prefixed with `…/` (Starship-style). The `/zentui` **Layout** tab cycles path mode and path depth (`0`–`5`; depth is ignored for basename). Example: `~/Projects/foo/bar` with `depth: 2` → `…/foo/bar`.
-- `gitBranch.maxLength`: visible width of the built-in branch name and `$git_branch` / `$branch`. The default `full` preserves the complete name; any positive integer uses that width including the trailing `…`. `/zentui` **Layout** cycles `full`, `10`, `20`, `30`, `40`, and `50`; custom positive integers can be set in JSON.
+- `pathDisplay`: controls how the cwd/`$cwd` path is shown. `mode` is `basename` (default, last segment only) or `full` (path with home contracted to `~`). In `full` mode, `depth` keeps only the last N trailing directories (`0` = entire path after `~`, max `5`); when parents are dropped the path is prefixed with `…/` (Starship-style). The `/zentui` **Footer** tab cycles path mode and path depth (`0`–`5`; depth is ignored for basename). Example: `~/Projects/foo/bar` with `depth: 2` → `…/foo/bar`.
+- `gitBranch.maxLength`: visible width of the built-in branch name and `$git_branch` / `$branch`. The default `full` preserves the complete name; any positive integer uses that width including the trailing `…`. `/zentui` **Git** cycles `full`, `10`, `20`, `30`, `40`, and `50`; custom positive integers can be set in JSON.
 - `icons`: every shown icon key is configurable; omit any key to use the Zentui default. `icons.mode` is `auto` | `nerd` | `ascii` (default `auto`, same glyphs as nerd). ASCII mode swaps in plain fallbacks for statusline icons and runtime symbols — useful without a Nerd Font. Custom per-icon strings always win over mode defaults. Custom `icons.os` always wins; when left at the mode default, Zentui maps the OS icon by platform. `rail` sets the vertical glyph drawn as the left rail of the active editor frame and previous user messages when `copyFriendly` is disabled (default `│`; any single Unicode vertical or block glyph). `editorPrompt` controls an optional copy-friendly editor prompt glyph; the default is `""` so copy-friendly mode stays rail-free.
 - `colorSources`: `theme` maps styles through Pi theme tokens; `terminal` emits terminal colors. `/zentui` switches these sources; manual JSON controls specific style values.
-- `features`: `editor` enables Zentui's custom editor, selector borders, and previous-message chrome. `statusLine` enables Zentui's custom footer/status line. `copyFriendly` hides editor and previous-message rail glyphs so native terminal selection copies less chrome. All three can be changed from `/zentui` or direct slash-command arguments.
-- `footerSegments`: show or hide individual built-in footer segments (`cwd`, `sessionName`, `gitBranch`, `gitStatus`, `gitCounts`, `gitCommit`, `gitMetrics`, `runtime`, `packageVersion`, `sessionDuration`, `username`, `time`, `os`, `context`, `tokens`, `cost`). Toggle them from the `Built-in segments` tab in `/zentui`.
-- `footerFormat`: optional Starship-style template string that fully controls the footer layout. When set, it overrides `footerSegments`. See [Footer Format Template](#footer-format-template) below. The `/zentui` **Layout** tab configures responsive behavior, compact rows, context style, separator, path display mode/depth, branch length, and icon mode; set or clear custom formats with `/zentui format`.
+- `features`: `editor` enables Zentui's custom editor, selector borders, and previous-message chrome. `statusLine` enables Zentui's custom footer/status line. `copyFriendly` hides editor and previous-message rail glyphs so native terminal selection copies less chrome. `viewportIndicators` preserves Pi's native `↑ N more` / `↓ N more` wrapped-row counts in Zentui's editor borders (default `true`). All four can be changed from `/zentui` or direct slash-command arguments.
+- `footerSegments`: show or hide individual built-in footer segments (`cwd`, `sessionName`, `gitBranch`, `gitStatus`, `gitCounts`, `gitCommit`, `gitMetrics`, `runtime`, `packageVersion`, `sessionDuration`, `username`, `time`, `os`, `context`, `tokens`, `cost`). Toggle non-Git segments from **Segments** and Git segments from **Git** in `/zentui`.
+- `footerFormat`: optional Starship-style template string that fully controls the footer layout. When set, it overrides `footerSegments`. See [Footer Format Template](#footer-format-template) below. The `/zentui` **Footer** tab configures responsive behavior, compact rows, context style, and path display mode/depth; **Appearance** configures separator and icon mode; **Git** configures branch length; set or clear custom formats with `/zentui format`.
 - `responsiveFooter`: enabled by default. Zentui keeps the current aligned one-row footer while every settings-resolved left/middle/right zone fits without layout truncation. Otherwise it tries two complete left-aligned rows, preferring `left` / `middle right` and then `left middle` / `right`. Only when neither split fits does it use `compactFooterFormat`. Set `false` to restore the legacy one-row fitting behavior. Selection uses measured terminal-cell width, not fixed device breakpoints.
 - `compactFooterFormat`: JSON-only template used by the compact stage. The default keeps cwd, session name, git branch/status, context, and abbreviated token/cache metrics. A top-level `$wrap` is an automatic wrap opportunity: one space on the same row or no space at a row break. `$wrap_sep` is the same kind of boundary but renders the styled ` | ` divider only when its adjacent chunks share a row. Nested uses of either boundary remain empty variables. `$fill` is ignored. A standalone `$extensions` chunk inserts active non-`off` extension statuses in left/middle/right placement order; embedded uses render empty. Custom `footerFormat` values use this built-in compact fallback unless this key is also customized.
 - `compactFooterMaxLines`: `1`, `2`, `3`, or `"unlimited"` (default `2`). Finite limits crop remaining chunks with exactly one trailing `…`. Compact cwd always uses basename mode; cwd/session/branch chunks target half the available row width before final ANSI-aware clamping. `/zentui` exposes the responsive toggle and row limit, while compact format editing remains JSON-only. Pi supplies footer width but no supported viewport-height budget, so `"unlimited"` is explicit.
 - `gitCommit`: Starship [`git_commit`](https://starship.rs/config/#git-commit)-style options for the `gitCommit` footer segment. `hashLength` (default `7`, clamped to `4`–`40`) controls the short-hash display length. `onlyDetached` (default `true`) shows the hash mainly on detached HEAD. `showTag` (default `true`) appends an exact-match tag (`git describe --tags --exact-match HEAD`). The tag probe piggybacks on the existing git refresh — it only runs when both the segment and `showTag` are on, and misses/failures degrade silently.
 - `gitMetrics`: Starship [`git_metrics`](https://starship.rs/config/#git-metrics)-style options for the `gitMetrics` footer segment. Uses `git diff HEAD --numstat` (staged + unstaged combined — the Starship “total dirty” view) to show aggregate `+added −deleted` line counts. `onlyNonzero` (default `true`) omits each zero component independently and hides the segment entirely at `0/0`. `ignoreSubmodules` (default `false`) adds `--ignore-submodules=all`. The numstat diff piggybacks on the existing git refresh and uses a hard 2s timeout; a metrics-only failure degrades silently without discarding fresh branch/status data. On very large monorepos the diff may lag or be omitted on timeout.
-- `extensionStatuses`: controls third-party statuses published by other Pi extensions through `ctx.ui.setStatus()`. `defaultPlacement` and each `placements` value can be `off`, `left`, `middle`, or `right`. The `Extension segments` tab in `/zentui` lists only statuses that are currently active.
+- `extensionStatuses`: controls third-party statuses published by other Pi extensions through `ctx.ui.setStatus()`. `defaultPlacement` and each `placements` value can be `off`, `left`, `middle`, or `right`. The **Extensions** tab in `/zentui` lists only statuses that are currently active. `defaultPlacement` applies only when a status key has no entry in `placements`; keyed overrides always win.
 - The shown `editor*` values match the default `theme` source. Omit those keys to keep Zentui's source-aware defaults when switching between `theme` and `terminal`.
 - `editorAccent` styles the active editor rail and previous user-message rail when `features.copyFriendly` is disabled.
 - `editorPrompt` styles the copy-friendly editor prompt glyph. Omit it to use `editorAccent`, then the default accent fallback.

package/extensions/zentui/config.ts

@@ -67,6 +67,7 @@ export type UiFeaturesConfig = {
 	editor: boolean;
 	statusLine: boolean;
 	copyFriendly: boolean;
+	viewportIndicators: boolean;
 };
 
 export type FooterSegmentsConfig = {
@@ -277,6 +278,7 @@ export const defaultConfig: PolishedTuiConfig = {
 		editor: true,
 		statusLine: true,
 		copyFriendly: false,
+		viewportIndicators: true,
 	},
 	footerSegments: {
 		cwd: true,
@@ -507,6 +509,7 @@ function normalizeUiFeatures(record: Record<string, unknown>): UiFeaturesConfig
 		editor: booleanValue(record, "editor"),
 		statusLine: booleanValue(record, "statusLine"),
 		copyFriendly: booleanValue(record, "copyFriendly"),
+		viewportIndicators: booleanValue(record, "viewportIndicators"),
 	};
 }
 
@@ -619,7 +622,12 @@ function isColorSourceKey(value: string): value is keyof ColorSourcesConfig {
 }
 
 function isUiFeatureKey(value: string): value is keyof UiFeaturesConfig {
-	return value === "editor" || value === "statusLine" || value === "copyFriendly";
+	return (
+		value === "editor" ||
+		value === "statusLine" ||
+		value === "copyFriendly" ||
+		value === "viewportIndicators"
+	);
 }
 
 function isFooterSegmentKey(value: string): value is keyof FooterSegmentsConfig {
@@ -990,6 +998,62 @@ export function saveGitBranchPatch(
 	});
 }
 
+export function saveEditorModelLabel(
+	value: ModelLabelSource,
+	path = configPath,
+): PolishedTuiConfig {
+	return mutateConfig(path, (record) => {
+		record.editorModelLabel = parseEditorModelLabel(value);
+	});
+}
+
+export function saveGitCommitPatch(
+	patch: Partial<Pick<GitCommitConfig, "onlyDetached" | "showTag">>,
+	path = configPath,
+): PolishedTuiConfig {
+	return mutateConfig(path, (record) => {
+		const existing = isRecord(record.gitCommit)
+			? { ...(record.gitCommit as Record<string, unknown>) }
+			: {};
+		if (typeof patch.onlyDetached === "boolean") existing.onlyDetached = patch.onlyDetached;
+		if (typeof patch.showTag === "boolean") existing.showTag = patch.showTag;
+		record.gitCommit = existing;
+	});
+}
+
+export function saveGitMetricsPatch(
+	patch: Partial<GitMetricsConfig>,
+	path = configPath,
+): PolishedTuiConfig {
+	return mutateConfig(path, (record) => {
+		const existing = isRecord(record.gitMetrics)
+			? { ...(record.gitMetrics as Record<string, unknown>) }
+			: {};
+		if (typeof patch.onlyNonzero === "boolean") existing.onlyNonzero = patch.onlyNonzero;
+		if (typeof patch.ignoreSubmodules === "boolean") {
+			existing.ignoreSubmodules = patch.ignoreSubmodules;
+		}
+		record.gitMetrics = existing;
+	});
+}
+
+export function saveExtensionStatusDefaultPlacement(
+	placement: ExtensionStatusPlacement,
+	path = configPath,
+): PolishedTuiConfig {
+	return mutateConfig(path, (record) => {
+		const existing = isRecord(record.extensionStatuses)
+			? { ...(record.extensionStatuses as Record<string, unknown>) }
+			: {};
+		record.extensionStatuses = {
+			...existing,
+			defaultPlacement: isExtensionStatusPlacement(placement)
+				? placement
+				: defaultConfig.extensionStatuses.defaultPlacement,
+		};
+	});
+}
+
 export function saveExtensionStatusPlacement(
 	key: string,
 	placement: ExtensionStatusPlacement,

package/extensions/zentui/editor-transfer.ts

@@ -0,0 +1,73 @@
+export type EditorComponentFactory = (...args: never[]) => unknown;
+
+export type EditorTransferUi<Factory = EditorComponentFactory> = {
+	getEditorText?: () => unknown;
+	setEditorText?: (text: string) => void;
+	setEditorComponent?: (factory: Factory | undefined) => void;
+	getEditorComponent?: () => Factory | undefined;
+};
+
+export type EditorTransferFailureReason =
+	| "unsupported-transfer-api"
+	| "editor-factory-snapshot-failed"
+	| "editor-text-snapshot-failed"
+	| "editor-text-preparation-failed"
+	| "editor-replacement-failed-with-rollback"
+	| "editor-replacement-rollback-failed";
+
+export type EditorTransferResult =
+	| { ok: true }
+	| { ok: false; reason: EditorTransferFailureReason };
+
+/**
+ * Prepare the active editor's public expanded text before Pi replaces its factory.
+ * This intentionally transfers prompt contents only; editor-private state is never inspected.
+ */
+export function replaceEditorComponentWithExpandedText<Factory>(
+	ui: EditorTransferUi<Factory>,
+	factory: Factory | undefined,
+): EditorTransferResult {
+	if (
+		typeof ui.getEditorText !== "function" ||
+		typeof ui.setEditorText !== "function" ||
+		typeof ui.setEditorComponent !== "function" ||
+		typeof ui.getEditorComponent !== "function"
+	) {
+		return { ok: false, reason: "unsupported-transfer-api" };
+	}
+
+	let previousFactory: Factory | undefined;
+	try {
+		previousFactory = ui.getEditorComponent();
+	} catch {
+		return { ok: false, reason: "editor-factory-snapshot-failed" };
+	}
+
+	let expandedText: unknown;
+	try {
+		expandedText = ui.getEditorText();
+	} catch {
+		return { ok: false, reason: "editor-text-snapshot-failed" };
+	}
+	if (typeof expandedText !== "string") {
+		return { ok: false, reason: "editor-text-snapshot-failed" };
+	}
+
+	try {
+		ui.setEditorText(expandedText);
+	} catch {
+		return { ok: false, reason: "editor-text-preparation-failed" };
+	}
+
+	try {
+		ui.setEditorComponent(factory);
+	} catch {
+		try {
+			ui.setEditorComponent(previousFactory);
+			return { ok: false, reason: "editor-replacement-failed-with-rollback" };
+		} catch {
+			return { ok: false, reason: "editor-replacement-rollback-failed" };
+		}
+	}
+	return { ok: true };
+}

package/extensions/zentui/format.ts

@@ -1,5 +1,4 @@
 import { homedir, hostname, userInfo } from "node:os";
-import type { AssistantMessage } from "@earendil-works/pi-ai";
 import type { ExtensionContext, Theme } from "@earendil-works/pi-coding-agent";
 import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import type {
@@ -81,23 +80,40 @@ export type UsageTotals = {
 
 export type ContextColorTier = "normal" | "warning" | "error";
 
+type SessionUsage = {
+	input?: unknown;
+	output?: unknown;
+	cacheRead?: unknown;
+	cacheWrite?: unknown;
+	cost?: unknown;
+};
+
 type SessionEntry = {
 	type?: string;
 	id?: string | number;
 	timestamp?: string | number;
+	usage?: SessionUsage;
 	message?: {
 		role?: string;
-		usage?: AssistantMessage["usage"];
+		usage?: SessionUsage;
 	};
 };
 
+type SelectedUsage = {
+	usage: SessionUsage | undefined;
+	location: "message" | "entry";
+	isAssistant: boolean;
+};
+
 type UsageCacheEntry = {
 	key: string;
 	totals: UsageTotals;
 };
 
+const MAX_USAGE_TOTAL = Number.MAX_VALUE;
+
 let usageTotalsCache: UsageCacheEntry | undefined;
-let usageTotalsComputeCount = 0;
+let usageTotalsAggregationPassCount = 0;
 
 export function formatCount(value: number): string {
 	if (value < 1000) return value.toString();
@@ -130,26 +146,78 @@ function calculateCacheHitRate(
 	cacheWrite: number,
 ): number | undefined {
 	const promptTokens = input + cacheRead + cacheWrite;
-	return promptTokens > 0 ? (cacheRead / promptTokens) * 100 : undefined;
+	if (promptTokens === 0) return undefined;
+	if (Number.isFinite(promptTokens)) return (cacheRead / promptTokens) * 100;
+
+	const scale = Math.max(input, cacheRead, cacheWrite);
+	const scaledPromptTokens = input / scale + cacheRead / scale + cacheWrite / scale;
+	return (cacheRead / scale / scaledPromptTokens) * 100;
+}
+
+function normalizeUsageNumber(value: unknown): number {
+	return typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : 0;
+}
+
+function usageCostTotal(usage: SessionUsage | undefined): number {
+	if (typeof usage?.cost !== "object" || usage.cost === null) return 0;
+	return normalizeUsageNumber((usage.cost as { total?: unknown }).total);
+}
+
+function addUsageTotal(total: number, value: number): number {
+	const sum = total + value;
+	return Number.isFinite(sum) ? sum : MAX_USAGE_TOTAL;
+}
+
+function usageForEntry(entry: SessionEntry): SelectedUsage | undefined {
+	if (entry.type === "message") {
+		const role = entry.message?.role;
+		if (role !== "assistant" && role !== "toolResult") return undefined;
+		return {
+			usage: entry.message?.usage,
+			location: "message",
+			isAssistant: role === "assistant",
+		};
+	}
+	if (entry.type === "compaction" || entry.type === "branch_summary") {
+		return { usage: entry.usage, location: "entry", isAssistant: false };
+	}
+	return undefined;
+}
+
+function normalizedUsage(usage: SessionUsage | undefined) {
+	return {
+		input: normalizeUsageNumber(usage?.input),
+		output: normalizeUsageNumber(usage?.output),
+		cacheRead: normalizeUsageNumber(usage?.cacheRead),
+		cacheWrite: normalizeUsageNumber(usage?.cacheWrite),
+		cost: usageCostTotal(usage),
+	};
 }
 
-function entryIdentity(entry: SessionEntry | undefined): string {
-	if (!entry) return "";
-	const usage = entry.message?.usage;
-	const usageKey = usage
-		? `${usage.input ?? 0}:${usage.output ?? 0}:${usage.cacheRead ?? 0}:${usage.cacheWrite ?? 0}:${usage.cost?.total ?? 0}`
-		: "";
-	return `${entry.id ?? ""}|${entry.timestamp ?? ""}|${entry.type ?? ""}|${entry.message?.role ?? ""}|${usageKey}`;
+function entryIdentity(entry: SessionEntry): string {
+	const selected = usageForEntry(entry);
+	if (!selected) return "unsupported";
+	const usage = normalizedUsage(selected.usage);
+	return JSON.stringify([
+		entry.id ?? null,
+		entry.timestamp ?? null,
+		entry.type ?? null,
+		entry.message?.role ?? null,
+		selected.location,
+		usage.input,
+		usage.output,
+		usage.cacheRead,
+		usage.cacheWrite,
+		usage.cost,
+	]);
 }
 
 function buildUsageFingerprint(entries: readonly SessionEntry[]): string {
-	const first = entries[0];
-	const last = entries[entries.length - 1];
-	return `${entries.length}\0${entryIdentity(first)}\0${entryIdentity(last)}`;
+	return entries.map(entryIdentity).join("\0");
 }
 
 function computeUsageTotals(entries: readonly SessionEntry[]): UsageTotals {
-	usageTotalsComputeCount += 1;
+	usageTotalsAggregationPassCount += 1;
 	let input = 0;
 	let output = 0;
 	let cacheRead = 0;
@@ -158,18 +226,18 @@ function computeUsageTotals(entries: readonly SessionEntry[]): UsageTotals {
 	let cost = 0;
 
 	for (const entry of entries) {
-		if (entry.type !== "message" || entry.message?.role !== "assistant") continue;
-		const usage = entry.message.usage;
-		const entryInput = usage?.input ?? 0;
-		const entryCacheRead = usage?.cacheRead ?? 0;
-		const entryCacheWrite = usage?.cacheWrite ?? 0;
-
-		input += entryInput;
-		output += usage?.output ?? 0;
-		cacheRead += entryCacheRead;
-		cacheWrite += entryCacheWrite;
-		cost += usage?.cost?.total ?? 0;
-		latestCacheHitRate = calculateCacheHitRate(entryInput, entryCacheRead, entryCacheWrite);
+		const selected = usageForEntry(entry);
+		if (!selected) continue;
+		const usage = normalizedUsage(selected.usage);
+
+		input = addUsageTotal(input, usage.input);
+		output = addUsageTotal(output, usage.output);
+		cacheRead = addUsageTotal(cacheRead, usage.cacheRead);
+		cacheWrite = addUsageTotal(cacheWrite, usage.cacheWrite);
+		cost = addUsageTotal(cost, usage.cost);
+		if (selected.isAssistant) {
+			latestCacheHitRate = calculateCacheHitRate(usage.input, usage.cacheRead, usage.cacheWrite);
+		}
 	}
 
 	return Object.freeze({ input, output, cacheRead, cacheWrite, latestCacheHitRate, cost });
@@ -179,23 +247,26 @@ export function invalidateUsageTotalsCache(): void {
 	usageTotalsCache = undefined;
 }
 
-/** Test helper: number of full usage scans performed since process start / last reset. */
-export function __usageTotalsComputeCount(): number {
-	return usageTotalsComputeCount;
+/** Test helper: counts aggregation passes only; every cache lookup still fingerprints all entries. */
+export function __usageTotalsAggregationPassCount(): number {
+	return usageTotalsAggregationPassCount;
 }
 
-/** Test helper: reset memoization counters/cache. */
+/** Test helper: reset the aggregation-pass counter and cached totals. */
 export function __resetUsageTotalsCacheForTests(): void {
 	usageTotalsCache = undefined;
-	usageTotalsComputeCount = 0;
+	usageTotalsAggregationPassCount = 0;
 }
 
 export function getUsageTotals(ctx: ExtensionContext): UsageTotals {
 	const sessionManager = ctx.sessionManager as {
-		getEntries?: () => SessionEntry[];
-		getBranch: () => SessionEntry[];
+		getEntries?: () => readonly SessionEntry[];
+		getBranch: () => readonly SessionEntry[];
 	};
-	const entries = sessionManager.getEntries?.() ?? sessionManager.getBranch();
+	const entries =
+		typeof sessionManager.getEntries === "function"
+			? sessionManager.getEntries()
+			: sessionManager.getBranch();
 	const key = buildUsageFingerprint(entries);
 	if (usageTotalsCache?.key === key) return usageTotalsCache.totals;