pi-zentui 0.15.0 → 0.16.0

package/README.md

@@ -21,7 +21,7 @@ Zentui brings two popular aesthetics to Pi:
 - `on  branch` — git branch with icon
 - `[!?↑]` — git status indicators (modified, untracked, ahead/behind, stashed, etc.)
 - `via  v5.5.0` — runtime detection with version and Starship-style Nerd Font runtime/language modules
-- Optional segments (off by default): session name, `user@host`, current time, OS icon, session duration, and the **project package version** (e.g. `package.json` → `0.6.0`) — distinct from the runtime segment, which shows the installed toolchain
+- Optional segments (off by default): selected model/provider, `user@host`, current time, OS icon, session duration, and the **project package version** (e.g. `package.json` → `0.6.0`) — distinct from the runtime segment, which shows the installed toolchain
 - Right side shows context usage, token counts, and cost
 - Built-in footer segments can be shown or hidden individually from `/zentui`
 - Fully custom Starship-style layout via a `footerFormat` template string — see [Footer Format Template](#footer-format-template)
@@ -133,9 +133,9 @@ User config lives at `~/.pi/agent/zentui.json`. The file is optional: missing or
 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`).
+2. **Editor** — editor enabled (`features.editor`); editor border color mode (`editorBorderColorMode`); 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`.
+4. **Segments** — visibility toggles for every non-Git built-in segment under `footerSegments`: `cwd`, `sessionName`, `runtime`, `modelInfo`, `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.
 
@@ -176,6 +176,7 @@ Default config values — copy this and change any value you want:
 	"separator": "pipe",
 	"contextStyle": "text",
 	"editorModelLabel": "id",
+	"editorBorderColorMode": "static",
 	"contextThresholds": {
 		"warning": 70,
 		"error": 90
@@ -260,6 +261,7 @@ Default config values — copy this and change any value you want:
 		"gitStatus": true,
 		"gitCounts": false,
 		"runtime": true,
+		"modelInfo": false,
 		"context": true,
 		"tokens": true,
 		"cost": true,
@@ -295,8 +297,9 @@ Default config values — copy this and change any value you want:
 
 - Style values can be Starship/terminal strings (`bold purple`, `fg:202`, `#89b` / `#89b4fa`, `bg:blue fg:bright-green`) or Pi theme tokens (`accent`, `borderMuted`, `thinkingHigh`). Short `#rgb` hex values expand to `#rrggbb`.
 - `projectRefreshIntervalMs`: project status polling interval; `0` disables polling. Values `1..4999` clamp up to `5000` (minimum 5s); invalid/non-finite values fall back to `30000`.
-- `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.
+- `contextStyle`: `text` (default), `gauge`, or `text+gauge` for the context segment. Finite context percentages use one decimal place. 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, built-in model-info footer segment, and footer `$model` variable. `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.
+- `editorBorderColorMode`: `static` (default) uses `colors.editorBorder`; `adaptive` follows Pi's current shell-mode and thinking-level editor border color. Cycle it from the `/zentui` **Editor** tab.
 - `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` **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.
@@ -305,7 +308,7 @@ Default config values — copy this and change any value you want:
 - `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. `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`.
+- `footerSegments`: show or hide individual built-in footer segments (`cwd`, `sessionName`, `gitBranch`, `gitStatus`, `gitCounts`, `gitCommit`, `gitMetrics`, `runtime`, `modelInfo`, `packageVersion`, `sessionDuration`, `username`, `time`, `os`, `context`, `tokens`, `cost`). `modelInfo` is off by default and shows the selected model plus the provider unless the model label already contains it. 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.
@@ -316,7 +319,7 @@ Default config values — copy this and change any value you want:
 - 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.
-- `editorBorder` styles the active editor and previous user-message top/bottom border color only; the border glyph stays `─`.
+- `editorBorder` styles previous user-message top/bottom borders and the active editor in static border color mode; the border glyph stays `─`.
 - `editorModel`, `editorProvider`, and `editorThinking*` style the editor metadata. `editorThinking` applies to every non-`off` thinking level unless a level-specific key is set.
 
 Tip: when using copy-friendly mode, setting Pi's `editorPaddingX` to `1` in `~/.pi/agent/settings.json` keeps a small left gutter without copying a rail glyph.
@@ -381,16 +384,22 @@ Center the branch between directory and cost:
 | `$git_added`        |              | added line count (`+N`)                                             |
 | `$git_deleted`      |              | deleted line count (`−N`)                                           |
 | `$runtime`          |              | runtime icon + version                                              |
+| `$model`            |              | selected model label (`editorModelLabel`)                           |
+| `$provider`         |              | formatted provider label                                            |
 | `$package`          |              | project package version, `is <glyph> <version>` (manifest-derived)  |
 | `$package_version`  |              | raw project package version (no icon)                               |
 | `$session_duration` | `$duration`  | session running time                                                |
 | `$username`         |              | `user@host`                                                         |
 | `$os`               |              | operating-system icon                                               |
 | `$time`             |              | current time `HH:MM`                                                |
-| `$context`          |              | context usage (text and/or gauge via config)                        |
-| `$tokens`           |              | input/output token counts                                           |
+| `$context`          |              | context usage (text and/or gauge; finite percentages use one decimal) |
+| `$tokens`           |              | input/output counts and existing cache-hit percentage               |
+| `$cache_read`       |              | cache-read total (`R1.2k`); empty at zero or when unavailable       |
+| `$cache_write`      |              | cache-write total (`W300`); empty at zero or when unavailable       |
 | `$cost`             |              | session cost                                                        |
-| `$sep`              | `$separator` | themed `\|` using `colors.separator`            |
+| `$subscription`     |              | `(sub)` in subscription mode; otherwise empty                       |
+| `$auto_compaction`  |              | `(auto)` when automatic compaction is enabled; otherwise empty      |
+| `$sep`              | `$separator` | themed `\|` using `colors.separator`                               |
 | `$fill`             | —            | special: splits zones                                               |
 
 ### `$fill` behavior
@@ -406,6 +415,9 @@ Center the branch between directory and cost:
 - Each variable renders its core value only (no `on`/`via` prefixes); add those words as literal text.
 - Conditional groups: wrap optional pieces in parentheses, e.g. `$cwd( on $git_branch)($git_status)$fill($context)`. If every `$var` inside a group is empty, the whole group (including its literals) is dropped.
 - `$session_name` is available whenever `footerFormat` is set, independently of `footerSegments.sessionName`; use a conditional group such as `($sep$session_name)` so unnamed sessions leave no separator.
+- The built-in wide footer appends cache totals to the token segment, `(sub)` to cost, and `(auto)` to context when available. Custom formats keep `$tokens`, `$cost`, and `$context` backward-compatible and include telemetry only through the atomic variables above.
+- `DEFAULT_COMPACT_FOOTER_FORMAT` omits model/provider and atomic telemetry. Add their variables explicitly to `compactFooterFormat` to opt in at narrow widths.
+- Auto-compaction settings refresh on the next normal footer synchronization event. Unsupported Pi capabilities or settings-read errors safely omit optional markers.
 - Unknown `$variables` render empty.
 - Set or clear at runtime: `/zentui format "<template>"` and `/zentui format clear`.
 

package/extensions/zentui/config.ts

@@ -33,6 +33,7 @@ export type { IconMode } from "./icons";
 export type ContextStyle = "text" | "gauge" | "text+gauge";
 export type SeparatorStyle = "pipe" | "dot" | "chevron" | "none";
 export type ModelLabelSource = "id" | "name";
+export type EditorBorderColorMode = "static" | "adaptive";
 export type CompactFooterMaxLines = 1 | 2 | 3 | "unlimited";
 
 export const DEFAULT_COMPACT_FOOTER_FORMAT =
@@ -79,6 +80,7 @@ export type FooterSegmentsConfig = {
 	gitCommit: boolean;
 	gitMetrics: boolean;
 	runtime: boolean;
+	modelInfo: boolean;
 	context: boolean;
 	tokens: boolean;
 	cost: boolean;
@@ -139,6 +141,7 @@ export type PolishedTuiConfig = {
 	separator: SeparatorStyle;
 	contextStyle: ContextStyle;
 	editorModelLabel: ModelLabelSource;
+	editorBorderColorMode: EditorBorderColorMode;
 	contextThresholds: ContextThresholds;
 	pathDisplay: PathDisplayConfig;
 	gitBranch: GitBranchConfig;
@@ -196,13 +199,19 @@ export const FOOTER_FORMAT_VARIABLES = [
 	"git_status",
 	"git_state",
 	"runtime",
+	"model",
+	"provider",
 	"session_duration",
 	"username",
 	"os",
 	"time",
 	"context",
 	"tokens",
+	"cache_read",
+	"cache_write",
 	"cost",
+	"subscription",
+	"auto_compaction",
 	"package",
 	"package_version",
 	"git_commit",
@@ -240,6 +249,7 @@ export const defaultConfig: PolishedTuiConfig = {
 	separator: "pipe",
 	contextStyle: "text",
 	editorModelLabel: "id",
+	editorBorderColorMode: "static",
 	contextThresholds: { warning: 70, error: 90 },
 	pathDisplay: { mode: "basename", depth: 0 },
 	gitBranch: { maxLength: "full" },
@@ -287,6 +297,7 @@ export const defaultConfig: PolishedTuiConfig = {
 		gitStatus: true,
 		gitCounts: false,
 		runtime: true,
+		modelInfo: false,
 		context: true,
 		tokens: true,
 		cost: true,
@@ -350,6 +361,11 @@ function parseEditorModelLabel(value: unknown): ModelLabelSource {
 	return defaultConfig.editorModelLabel;
 }
 
+function parseEditorBorderColorMode(value: unknown): EditorBorderColorMode {
+	if (value === "static" || value === "adaptive") return value;
+	return defaultConfig.editorBorderColorMode;
+}
+
 export function isSeparatorStyle(value: unknown): value is SeparatorStyle {
 	return value === "pipe" || value === "dot" || value === "chevron" || value === "none";
 }
@@ -521,6 +537,7 @@ function normalizeFooterSegments(record: Record<string, unknown>): FooterSegment
 		gitStatus: footerSegmentValue(record, "gitStatus"),
 		gitCounts: footerSegmentValue(record, "gitCounts"),
 		runtime: footerSegmentValue(record, "runtime"),
+		modelInfo: footerSegmentValue(record, "modelInfo"),
 		context: footerSegmentValue(record, "context"),
 		tokens: footerSegmentValue(record, "tokens"),
 		cost: footerSegmentValue(record, "cost"),
@@ -638,6 +655,7 @@ function isFooterSegmentKey(value: string): value is keyof FooterSegmentsConfig
 		value === "gitStatus" ||
 		value === "gitCounts" ||
 		value === "runtime" ||
+		value === "modelInfo" ||
 		value === "context" ||
 		value === "tokens" ||
 		value === "cost" ||
@@ -815,6 +833,7 @@ export function mergeConfig(parsed: unknown): PolishedTuiConfig {
 		separator: parseSeparatorStyle(config.separator),
 		contextStyle: parseContextStyle(config.contextStyle),
 		editorModelLabel: parseEditorModelLabel(config.editorModelLabel),
+		editorBorderColorMode: parseEditorBorderColorMode(config.editorBorderColorMode),
 		contextThresholds: parseContextThresholds(config.contextThresholds),
 		pathDisplay: parsePathDisplay(config.pathDisplay),
 		gitBranch,
@@ -1007,6 +1026,15 @@ export function saveEditorModelLabel(
 	});
 }
 
+export function saveEditorBorderColorMode(
+	value: EditorBorderColorMode,
+	path = configPath,
+): PolishedTuiConfig {
+	return mutateConfig(path, (record) => {
+		record.editorBorderColorMode = parseEditorBorderColorMode(value);
+	});
+}
+
 export function saveGitCommitPatch(
 	patch: Partial<Pick<GitCommitConfig, "onlyDetached" | "showTag">>,
 	path = configPath,

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/footer.ts

@@ -51,6 +51,18 @@ function joinStatusTexts(statusTexts: string[], separator: string): string {
 	return statusTexts.filter(Boolean).join(separator);
 }
 
+function normalizeModelInfoPart(value: string): string {
+	return value.toLowerCase().replace(/[^a-z0-9]/g, "");
+}
+
+function composeModelInfoLabel(model: string, provider: string): string {
+	const normalizedModel = normalizeModelInfoPart(model);
+	const normalizedProvider = normalizeModelInfoPart(provider);
+	const providerIsDuplicated =
+		normalizedProvider.length > 0 && normalizedModel.includes(normalizedProvider);
+	return [model, providerIsDuplicated ? "" : provider].filter(Boolean).join(" ");
+}
+
 function fitStatusTexts(statusTexts: string[], maxWidth: number, separator: string): string {
 	if (maxWidth <= 0) return "";
 
@@ -260,6 +272,18 @@ export function installFooter(
 						: tier === "warning"
 							? config.colors.contextWarning
 							: config.colors.contextNormal;
+				const cacheReadLabel = state.cacheReadLabel
+					? renderStyleForSource(theme, colorSource, config.colors.tokens, state.cacheReadLabel)
+					: "";
+				const cacheWriteLabel = state.cacheWriteLabel
+					? renderStyleForSource(theme, colorSource, config.colors.tokens, state.cacheWriteLabel)
+					: "";
+				const subscriptionLabel = state.subscription
+					? renderStyleForSource(theme, colorSource, config.colors.cost, "(sub)")
+					: "";
+				const autoCompactionLabel = state.autoCompaction
+					? renderStyleForSource(theme, colorSource, contextColor, "(auto)")
+					: "";
 				const gitColor = (text: string) =>
 					renderStyleForSource(theme, colorSource, config.colors.gitBranch, text);
 				const gitStatusColor = (text: string) =>
@@ -325,6 +349,10 @@ export function installFooter(
 							const label = state.runtime.version ? `${symbol} ${state.runtime.version}` : symbol;
 							return renderStyleForSource(theme, colorSource, state.runtime.style, label);
 						}
+						case "model":
+							return sanitizeExtensionStatusText(state.modelLabel);
+						case "provider":
+							return sanitizeExtensionStatusText(state.providerLabel);
 						case "session_duration":
 							return state.sessionStartEpoch
 								? renderStyleForSource(
@@ -364,8 +392,16 @@ export function installFooter(
 								config.colors.tokens,
 								state.tokenLabel,
 							);
+						case "cache_read":
+							return cacheReadLabel;
+						case "cache_write":
+							return cacheWriteLabel;
 						case "cost":
 							return renderStyleForSource(theme, colorSource, config.colors.cost, state.costLabel);
+						case "subscription":
+							return subscriptionLabel;
+						case "auto_compaction":
+							return autoCompactionLabel;
 						case "package":
 							return formatPackageVersionSegment(
 								theme,
@@ -544,6 +580,12 @@ export function installFooter(
 					.filter(Boolean)
 					.join(" ");
 
+				const modelInfoSegment = config.footerSegments.modelInfo
+					? composeModelInfoLabel(
+							sanitizeExtensionStatusText(state.modelLabel),
+							sanitizeExtensionStatusText(state.providerLabel),
+						)
+					: "";
 				const timeSegment = config.footerSegments.time
 					? renderStyleForSource(
 							theme,
@@ -552,16 +594,30 @@ export function installFooter(
 							formatTimeLabel(config.icons.time),
 						)
 					: "";
+				const builtInContextLabel = [
+					renderStyleForSource(theme, colorSource, contextColor, contextLabel),
+					autoCompactionLabel,
+				]
+					.filter(Boolean)
+					.join(" ");
+				const builtInTokenLabel = [
+					renderStyleForSource(theme, colorSource, config.colors.tokens, state.tokenLabel),
+					cacheReadLabel,
+					cacheWriteLabel,
+				]
+					.filter(Boolean)
+					.join(" ");
+				const builtInCostLabel = [
+					renderStyleForSource(theme, colorSource, config.colors.cost, state.costLabel),
+					subscriptionLabel,
+				]
+					.filter(Boolean)
+					.join(" ");
 				const right = [
-					config.footerSegments.context
-						? renderStyleForSource(theme, colorSource, contextColor, contextLabel)
-						: "",
-					config.footerSegments.tokens
-						? renderStyleForSource(theme, colorSource, config.colors.tokens, state.tokenLabel)
-						: "",
-					config.footerSegments.cost
-						? renderStyleForSource(theme, colorSource, config.colors.cost, state.costLabel)
-						: "",
+					modelInfoSegment,
+					config.footerSegments.context ? builtInContextLabel : "",
+					config.footerSegments.tokens ? builtInTokenLabel : "",
+					config.footerSegments.cost ? builtInCostLabel : "",
 					timeSegment,
 				]
 					.filter(Boolean)

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 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 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): 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;
 
@@ -204,6 +275,14 @@ export function getUsageTotals(ctx: ExtensionContext): UsageTotals {
 	return totals;
 }
 
+export function buildCacheReadLabel(cacheRead: number): string {
+	return cacheRead > 0 ? `R${formatCount(cacheRead)}` : "";
+}
+
+export function buildCacheWriteLabel(cacheWrite: number): string {
+	return cacheWrite > 0 ? `W${formatCount(cacheWrite)}` : "";
+}
+
 export function buildTokenLabel(totals: UsageTotals, cacheHitIcon = "󰆼"): string {
 	const parts: string[] = [];
 	if (totals.input) parts.push(`↑${formatCount(totals.input)}`);
@@ -255,9 +334,9 @@ export function formatContextPercentLabel(
 ): string {
 	if (!contextWindow || contextWindow <= 0) return "--";
 	const percentLabel =
-		percent === null || percent === undefined
+		percent === null || percent === undefined || !Number.isFinite(percent)
 			? "?"
-			: `${Math.max(0, Math.min(999, Math.round(percent)))}%`;
+			: `${Math.max(0, Math.min(999, percent)).toFixed(1)}%`;
 	return `${percentLabel}/${formatCount(contextWindow)}`;
 }