pi-bar 0.3.43 → 0.3.45

package/extensions/status-footer.ts

@@ -2,7 +2,7 @@
  * pi-bar — footer / statusline extension.
  *
  * Replaces pi's built-in footer with left-aligned segments:
- *   <model> ❯ think:<level> ❯ <context% / window> ❯ [cwd] ❯ <progress> ❯ <extensions>
+ *   <model> ❯ think:<level> ❯ <context% / window> ❯ [metrics] ❯ [cwd] ❯ <progress> ❯ <extensions>
  *
  * Example:
  *   claude-opus-4.7  ❯  think:med  ❯  2.6% / 1.0M  ❯  Reviewing package structure
@@ -21,7 +21,7 @@
 import { mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, join, posix, win32 } from "node:path";
-import { complete, type UserMessage } from "@earendil-works/pi-ai";
+import { complete, type Usage, type UserMessage } from "@earendil-works/pi-ai";
 import {
 	getSettingsListTheme,
 	SettingsManager,
@@ -31,13 +31,15 @@ import {
 } from "@earendil-works/pi-coding-agent";
 import {
 	Container,
+	type AutocompleteItem,
 	type SettingItem,
 	SettingsList,
 	truncateToWidth,
 	visibleWidth,
 } from "@earendil-works/pi-tui";
+import { FooterUsageTracker, hasUsage, PROGRESS_USAGE_ENTRY_TYPE, totalsFromUsage } from "./usage.js";
 
-type SegmentName = "model" | "thinking" | "context" | "cwd" | "progress" | "extensions";
+type SegmentName = "model" | "thinking" | "context" | "cache_hit_ratio" | "cost" | "tokens" | "cwd" | "progress" | "extensions";
 type StatusFilter =
 	| { mode: "all"; hidden: Set<string> }
 	| { mode: "only"; shown: Set<string> };
@@ -47,6 +49,8 @@ type SerializedStatusFilter =
 type GlobalBarConfig = {
 	statusFilter?: SerializedStatusFilter;
 	segments?: SegmentName[];
+	showProvider?: boolean;
+	progressModel?: string;
 };
 type ProgressActivityType =
 	| "user_message"
@@ -120,6 +124,9 @@ const ALL_SEGMENTS: readonly SegmentName[] = [
 	"model",
 	"thinking",
 	"context",
+	"cache_hit_ratio",
+	"cost",
+	"tokens",
 	"cwd",
 	"progress",
 	"extensions",
@@ -128,10 +135,43 @@ const SEGMENT_LABELS: Record<SegmentName, string> = {
 	model: "Model",
 	thinking: "Thinking level",
 	context: "Context usage",
+	cache_hit_ratio: "Cache hit ratio",
+	cost: "Estimated session cost",
+	tokens: "Session token totals",
 	cwd: "Current directory",
 	progress: "Progress update",
-	extensions: "Extension statuses",
+	extensions: "Extension badges",
 };
+const SEGMENT_DESCRIPTIONS: Record<SegmentName, string> = {
+	model: "Show the current chat model's name. This does not change your model.",
+	thinking: "Show the current thinking level, with its usual color.",
+	context: "Show context usage and the model's context window.",
+	cache_hit_ratio: "Show the latest response's prompt cache-hit rate. Hidden until prompt usage is available.",
+	cost: "Show estimated recorded session cost, not an invoice. Hidden until usage is available.",
+	tokens: "Show recorded input and output token totals, including cache usage.",
+	cwd: "Show this session's directory, not the directory of a tool's shell.",
+	progress: "Show live activity updates. Uses extra model calls; choose the progress model below.",
+	extensions: "Show badges published by other extensions. Choose individual badges below.",
+};
+// Advertise tasks, not the legacy command groups. Old spellings still work.
+const BAR_COMMAND_DESCRIPTIONS = new Map([
+	["settings", "Open all footer settings"],
+	["show", "Show footer items"],
+	["hide", "Hide footer items"],
+	["badges", "Choose extension badges"],
+	["provider", "Show or hide provider prefix"],
+	["progress-model", "Choose progress model"],
+	["help", "Commands and examples"],
+]);
+const BAR_ACTION_DESCRIPTIONS = new Map([
+	["show", "Show selected items"],
+	["hide", "Hide selected items"],
+	["only", "Show only selected items"],
+	["all", "Show all items"],
+	["none", "Hide all items"],
+	["list", "Inspect visibility without changing it"],
+	["settings", "Open visibility settings"],
+]);
 const DEFAULT_WARNING_THRESHOLD = 70;
 const DEFAULT_ERROR_THRESHOLD = 90;
 
@@ -149,10 +189,17 @@ function formatTokens(n: number): string {
 	return `${n}`;
 }
 
-function formatModelName(id: string | undefined): string {
+export function formatModelName(
+	model: { id: string; provider?: string } | undefined,
+	showProvider = false,
+): string {
+	const id = stripTerminalControls(model?.id ?? "");
 	if (!id) return "no-model";
-	const base = id.includes("/") ? (id.split("/").pop() ?? id) : id;
-	return base.replace(/-\d{8}$/, "").replace(/-\d{4}-\d{2}-\d{2}$/, "");
+	const base = id.split("/").filter(Boolean).at(-1) ?? id;
+	const name = base.replace(/-\d{8}$/, "").replace(/-\d{4}-\d{2}-\d{2}$/, "");
+	// The namespace in a model ID is not necessarily its routing provider.
+	const provider = stripTerminalControls(model?.provider ?? "");
+	return showProvider && provider ? `${provider}/${name}` : name;
 }
 
 const DEFAULT_CWD_MAX_WIDTH = 36;
@@ -254,7 +301,7 @@ export function layoutFooter(
 		separator = ` ${divider} `;
 		updateBadges();
 	}
-	for (const name of ["cwd", "context", "thinking"] as const) {
+	for (const name of ["cwd", "context", "thinking", "model"] as const) {
 		const item = items.find((item) => item.name === name);
 		if (!item) continue;
 		for (const alternative of item.alternatives ?? []) {
@@ -262,6 +309,12 @@ export function layoutFooter(
 			if (visibleWidth(alternative) < visibleWidth(item.text)) item.text = alternative;
 		}
 	}
+	// Optional metrics yield whole, never leaving a misleading partial number.
+	for (const name of ["tokens", "cost", "cache_hit_ratio"] as const) {
+		if (overflow() <= 0) break;
+		const item = items.find((item) => item.name === name);
+		if (item) item.text = "";
+	}
 	while (extensions && shownBadges > 0 && overflow() > 0) {
 		shownBadges--;
 		updateBadges();
@@ -282,7 +335,7 @@ export function layoutFooter(
 	}
 	// Whole-badge overflow can free more space than needed. Use that space rather
 	// than leaving unnecessarily compact context, paths, or progress on screen.
-	for (const name of ["context", "thinking", "cwd", "progress"] as const) {
+	for (const name of ["model", "context", "thinking", "cwd", "progress"] as const) {
 		const item = items.find((item) => item.name === name);
 		const original = segments.find((segment) => segment.name === name);
 		if (!item?.text || !original) continue;
@@ -334,6 +387,19 @@ function contextColor(
 	return "success";
 }
 
+// Cache hit ratio is "higher is better", the inverse of context usage. A healthy
+// multi-turn conversation typically reads 90%+ of its prompt from cache; below
+// 50% means most of the prompt was billed as fresh input (a mostly-miss turn).
+const CACHE_HIT_GOOD_THRESHOLD = 90;
+const CACHE_HIT_POOR_THRESHOLD = 50;
+
+function cacheHitColor(percent: number | null | undefined): ThemeColor {
+	if (percent === null || percent === undefined) return "muted";
+	if (percent >= CACHE_HIT_GOOD_THRESHOLD) return "success";
+	if (percent >= CACHE_HIT_POOR_THRESHOLD) return "warning";
+	return "error";
+}
+
 function isSegmentName(value: string): value is SegmentName {
 	return (ALL_SEGMENTS as readonly string[]).includes(value);
 }
@@ -380,7 +446,7 @@ function parseThresholds(): { warningThreshold: number; errorThreshold: number }
 
 function parseProgressModelSpec(value: string): ProgressModelPreference | undefined {
 	const trimmed = value.trim();
-	if (!trimmed || trimmed === "auto") return undefined;
+	if (!trimmed || trimmed === "auto" || /[\s\x00-\x1f\x7f-\x9f]/u.test(trimmed)) return undefined;
 	const separator = trimmed.indexOf("/");
 	if (separator <= 0 || separator === trimmed.length - 1) return undefined;
 	return { provider: trimmed.slice(0, separator), id: trimmed.slice(separator + 1) };
@@ -402,10 +468,14 @@ function settingsModelValue(settings: Record<string, unknown>): string | undefin
 	return undefined;
 }
 
-function resolveProgressModelPreference(cwd: string): ProgressModelPreference | undefined {
+export function resolveProgressModelPreference(cwd: string): ProgressModelPreference | undefined {
 	const envModel = process.env.PI_BAR_PROGRESS_MODEL;
 	if (envModel) return parseProgressModelSpec(envModel);
 
+	// An explicit /bar choice wins over legacy Pi settings, including "auto".
+	const savedModel = readGlobalConfig().progressModel;
+	if (savedModel !== undefined) return parseProgressModelSpec(savedModel);
+
 	const settings = SettingsManager.create(cwd);
 	const projectModel = settingsModelValue(
 		settings.getProjectSettings() as Record<string, unknown>,
@@ -428,8 +498,64 @@ const FAST_PROGRESS_MODELS: readonly ProgressModelPreference[] = [
 	{ provider: "anthropic", id: "claude-haiku-4-5-20251001" },
 ];
 
-function formatProgressModelKey(model: ProgressModelPreference): string {
-	return `${model.provider}/${model.id}`;
+function formatProgressModelKey(model: ProgressModelPreference | undefined): string {
+	return model ? `${model.provider}/${model.id}` : "auto";
+}
+
+function parseSerializedProgressModel(value: unknown): string | undefined {
+	if (typeof value !== "string") return undefined;
+	if (value.trim() === "auto") return "auto";
+	const model = parseProgressModelSpec(value);
+	return model ? formatProgressModelKey(model) : undefined;
+}
+
+function createProgressModelPicker(
+	ctx: ExtensionContext,
+	currentValue: string,
+	done: (value?: string) => void,
+): SettingsList {
+	// Availability is a local snapshot of configured credentials, not a key
+	// validation request. Never resolve or display credentials in this UI.
+	const choices = new Map<string, SettingItem>();
+	for (const model of ctx.modelRegistry.getAvailable()) {
+		const key = formatProgressModelKey(model);
+		if (parseSerializedProgressModel(key) !== key) continue;
+		choices.set(key, {
+			id: key,
+			label: key,
+			currentValue: key === currentValue ? "selected" : "",
+			description: `${key} — ${stripTerminalControls(model.name)}. Uses this provider's Pi credentials.`,
+			values: ["selected"],
+		});
+	}
+	const items: SettingItem[] = [{
+		id: "auto",
+		label: "Auto",
+		currentValue: currentValue === "auto" ? "selected" : "",
+		description: choices.size > 0
+			? "Try fast Codex models, then Anthropic Haiku. Choose an openai/ model explicitly to use an OpenAI API key."
+			: "No models with configured credentials. Use /login, then reopen this picker.",
+		values: ["selected"],
+	}];
+	if (currentValue !== "auto" && !choices.has(currentValue)) {
+		items.push({
+			id: currentValue,
+			label: stripTerminalControls(currentValue),
+			currentValue: "unavailable",
+			description: "Current preference is not in Pi's available models. Use /login or choose another model.",
+		});
+	}
+	items.push(...[...choices.values()].sort((a, b) => a.id.localeCompare(b.id)));
+	const picker = new SettingsList(
+		items,
+		Math.min(items.length + 2, 14),
+		getSettingsListTheme(),
+		(id) => done(id),
+		() => done(),
+		{ enableSearch: true },
+	);
+	picker.selectItem(currentValue);
+	return picker;
 }
 
 async function getModelAuth(
@@ -807,12 +933,19 @@ class FooterProgressEngine {
 	private normalCheckpointTimer?: ReturnType<typeof setTimeout>;
 	private normalCheckpointBurstStartedAt?: number;
 
-	constructor(private readonly requestRender: () => void) {}
+	constructor(
+		private readonly requestRender: () => void,
+		private readonly createUsageRecorder: (ctx: ExtensionContext) => (usage: Usage) => void,
+	) {}
 
 	text(): string | null {
 		return this.currentText;
 	}
 
+	modelKey(): string {
+		return formatProgressModelKey(this.configuredModel);
+	}
+
 	startSession(cwd: string): void {
 		this.configuredModel = resolveProgressModelPreference(cwd);
 		this.facts.resetConversation();
@@ -1058,6 +1191,7 @@ class FooterProgressEngine {
 
 			abortController = new AbortController();
 			this.abortController = abortController;
+			const recordUsage = this.createUsageRecorder(ctx);
 			const response = await complete(
 				auth.model,
 				{ systemPrompt: checkpointSystemPrompt(job), messages: [prompt] },
@@ -1071,6 +1205,9 @@ class FooterProgressEngine {
 					signal: abortController.signal,
 				},
 			);
+			// A superseded/aborted request can still report billed usage. Account for
+			// it even when its text must no longer be displayed.
+			recordUsage(response.usage);
 			if (!this.isCurrentJob(job) || response.stopReason !== "stop") return;
 
 			const rawText = extractTextContent(response.content) ?? "";
@@ -1740,11 +1877,11 @@ function describeSegments(segments: readonly SegmentName[]): string {
 function describeStatusFilter(filter: StatusFilter): string {
 	if (filter.mode === "only") {
 		const shown = Array.from(filter.shown).sort();
-		return shown.length > 0 ? `showing only: ${shown.join(", ")}` : "showing none";
+		return shown.length > 0 ? `showing only: ${shown.map(stripTerminalControls).join(", ")}` : "showing none";
 	}
 
 	const hidden = Array.from(filter.hidden).sort();
-	return hidden.length > 0 ? `showing all except: ${hidden.join(", ")}` : "showing all";
+	return hidden.length > 0 ? `showing all except: ${hidden.map(stripTerminalControls).join(", ")}` : "showing all";
 }
 
 function readGlobalConfig(): GlobalBarConfig {
@@ -1754,6 +1891,8 @@ function readGlobalConfig(): GlobalBarConfig {
 		return {
 			statusFilter: statusFilter ? serializeStatusFilter(statusFilter) : undefined,
 			segments: parseSerializedSegments(data.segments) ?? undefined,
+			showProvider: typeof data.showProvider === "boolean" ? data.showProvider : undefined,
+			progressModel: parseSerializedProgressModel(data.progressModel),
 		};
 	} catch {
 		return {};
@@ -1786,6 +1925,76 @@ function writeGlobalSegments(segments: readonly SegmentName[]): void {
 	writeGlobalConfig({ ...existing, segments: serializeSegments(segments) });
 }
 
+/** Pi replaces the entire argument prefix, not just its last word. */
+export function completeBarArguments(
+	prefix: string,
+	knownStatusKeys: readonly string[] = [],
+	progressModelKeys: readonly string[] = [],
+): AutocompleteItem[] | null {
+	const words = prefix.trimStart().split(/\s+/);
+	let fragment = words.at(-1) ?? "";
+	let stem = prefix.slice(0, prefix.length - fragment.length);
+	let candidates: readonly string[];
+	let selected: string[] = [];
+	let segmentValues = false;
+	let badgeValues = false;
+	let modelValues = false;
+	const section = words[0];
+	const directVisibility = section === "show" || section === "hide";
+	const segmentSection = section === "segments" || section === "segment" || section === "footer";
+	const statusSection = section === "badges" || section === "status" || section === "statuses";
+
+	if (words.length === 1) {
+		candidates = [...BAR_COMMAND_DESCRIPTIONS.keys()];
+	} else if (words.length === 2 && (segmentSection || statusSection)) {
+		candidates = [...BAR_ACTION_DESCRIPTIONS.keys()];
+	} else if (words.length === 2 && section === "provider") {
+		candidates = ["show", "hide"];
+	} else if (words.length === 2 && section === "progress-model") {
+		modelValues = true;
+		candidates = ["auto", ...[...new Set(progressModelKeys.filter(
+			(key) => typeof key === "string" && key !== "auto" && parseSerializedProgressModel(key) === key,
+		))].sort()];
+	} else if (directVisibility || ((segmentSection || statusSection) && ["only", "show", "hide"].includes(words[1]))) {
+		const comma = fragment.lastIndexOf(",");
+		const priorValues = fragment.slice(0, comma + 1);
+		stem += priorValues;
+		fragment = fragment.slice(comma + 1);
+		selected = [...words.slice(directVisibility ? 1 : 2, -1), priorValues].join(" ").split(/[\s,]+/).filter(Boolean);
+		segmentValues = directVisibility || segmentSection;
+		badgeValues = !segmentValues;
+		// Keys containing delimiters/controls are still configurable in the UI,
+		// but cannot be represented safely by the existing command grammar.
+		if (directVisibility && selected.some((value) => value.toLowerCase() === "all")) return null;
+		candidates = segmentValues
+			? [...(directVisibility && selected.length === 0 ? ["all"] : []), ...ALL_SEGMENTS]
+			: [...new Set(knownStatusKeys)].filter(
+				(key) => typeof key === "string" && key.length > 0 && !/[\s,\x00-\x1f\x7f-\x9f]/u.test(key),
+			).sort();
+	} else {
+		return null;
+	}
+
+	const description = (value: string): string | undefined => {
+		if (words.length === 1) return BAR_COMMAND_DESCRIPTIONS.get(value);
+		if (segmentValues) return value === "all" ? "All footer items" : isSegmentName(value) ? SEGMENT_LABELS[value] : undefined;
+		if (badgeValues) return "Extension badge";
+		if (modelValues) return value === "auto" ? "Automatic fast-model selection" : "Progress model";
+		if (section === "provider") return `${value === "show" ? "Show" : "Hide"} provider prefix`;
+		return BAR_ACTION_DESCRIPTIONS.get(value);
+	};
+	const normalize = (value: string) => segmentValues || modelValues ? value.toLowerCase() : value;
+	const used = new Set(selected.map(normalize));
+	const query = normalize(fragment);
+	const matches = candidates
+		.filter((value) => {
+			const normalized = normalize(value);
+			return (modelValues ? normalized.includes(query) : normalized.startsWith(query)) && !used.has(normalized);
+		})
+		.map((value) => ({ value: `${stem}${value}`, label: value, description: description(value) }));
+	return matches.length > 0 ? matches : null;
+}
+
 function getKnownStatusKeys(filter: StatusFilter, seenStatusKeys: Set<string>): string[] {
 	const keys = new Set(seenStatusKeys);
 	if (filter.mode === "only") {
@@ -1800,12 +2009,36 @@ export default function (pi: ExtensionAPI) {
 	let requestRender: (() => void) | undefined;
 	let statusFilter: StatusFilter = { mode: "all", hidden: new Set() };
 	let visibleSegments: SegmentName[] = readGlobalSegments() ?? DEFAULT_SEGMENTS;
+	let showProvider = readGlobalConfig().showProvider ?? false;
 	const seenStatusKeys = new Set<string>();
 	let currentStatuses: ReadonlyMap<string, string> = new Map();
+	let completionModelRegistry: ExtensionContext["modelRegistry"] | undefined;
 	const statusDescription = (key: string) =>
 		stripTerminalControls(currentStatuses.get(key) ?? "") || "No current status text";
 	const refresh = () => requestRender?.();
-	const progress = new FooterProgressEngine(refresh);
+	const usageTracker = new FooterUsageTracker();
+	const syncUsage = (ctx: ExtensionContext, restoreBranch = false) => {
+		usageTracker.syncEntries(ctx.sessionManager.getEntries());
+		if (restoreBranch) usageTracker.restoreBranch(ctx.sessionManager.getBranch());
+	};
+	let sessionEpoch = 0;
+	let sessionOpen = false;
+	const progress = new FooterProgressEngine(refresh, (ctx) => {
+		const epoch = sessionEpoch;
+		return (usage) => {
+			// Never append a late response into a replacement/reloaded session.
+			if (!sessionOpen || epoch !== sessionEpoch) return;
+			const totals = totalsFromUsage(usage);
+			if (!hasUsage(totals)) return;
+			try {
+				pi.appendEntry(PROGRESS_USAGE_ENTRY_TYPE, totals);
+				syncUsage(ctx);
+				refresh();
+			} catch {
+				// Usage persistence is best effort; do not discard a valid progress update.
+			}
+		};
+	});
 	const restoreStatusFilter = (ctx: ExtensionContext) => {
 		let restoredFilter = readGlobalStatusFilter();
 		if (!restoredFilter) {
@@ -1821,6 +2054,29 @@ export default function (pi: ExtensionAPI) {
 		writeGlobalStatusFilter(statusFilter);
 		refresh();
 	};
+	const setShowProvider = (value: boolean) => {
+		showProvider = value;
+		writeGlobalConfig({ ...readGlobalConfig(), showProvider });
+		refresh();
+	};
+	const setProgressModel = (value: string, ctx: ExtensionContext): boolean => {
+		if (process.env.PI_BAR_PROGRESS_MODEL) {
+			ctx.ui.notify("Progress model is controlled by PI_BAR_PROGRESS_MODEL. Unset it and restart Pi to choose here.", "warning");
+			return false;
+		}
+		const model = parseSerializedProgressModel(value);
+		if (!model) return false;
+		try {
+			writeGlobalConfig({ ...readGlobalConfig(), progressModel: model });
+		} catch {
+			ctx.ui.notify("Could not save the progress model. Check pi-bar config file permissions; selection unchanged.", "error");
+			return false;
+		}
+		// Reset/cancel old-provider jobs, but do not enable a hidden segment.
+		if (visibleSegments.includes("progress") && model !== progress.modelKey()) progress.startSession(ctx.cwd);
+		refresh();
+		return true;
+	};
 	const setVisibleSegments = (segments: readonly SegmentName[], ctx?: ExtensionContext) => {
 		const previousProgressVisible = visibleSegments.includes("progress");
 		visibleSegments = serializeSegments(segments);
@@ -1830,228 +2086,167 @@ export default function (pi: ExtensionAPI) {
 		if (!previousProgressVisible && nextProgressVisible && ctx) progress.startSession(ctx.cwd);
 		refresh();
 	};
-	const openSegmentConfigurator = async (ctx: ExtensionContext) => {
-		await ctx.ui.custom((tui, theme, _kb, done) => {
-			const knownStatusKeys = getKnownStatusKeys(statusFilter, seenStatusKeys);
-			const segmentVisibility = new Map(
-				ALL_SEGMENTS.map(
-					(segment): [SegmentName, boolean] => [segment, visibleSegments.includes(segment)],
-				),
-			);
-			let futureShown = statusFilter.mode === "all";
-			const statusVisibility = new Map(
-				knownStatusKeys.map((key): [string, boolean] => [
-					key,
-					shouldShowStatus(key, statusFilter),
-				]),
-			);
-			const persistSegmentsFromVisibility = () => {
-				setVisibleSegments(
-					ALL_SEGMENTS.filter((segment) => segmentVisibility.get(segment)),
-					ctx,
-				);
-			};
-			const persistStatusesFromVisibility = () => {
-				if (futureShown) {
-					statusFilter = {
-						mode: "all",
-						hidden: new Set(
-							knownStatusKeys.filter((key) => !statusVisibility.get(key)),
-						),
-					};
-				} else {
-					statusFilter = {
-						mode: "only",
-						shown: new Set(
-							knownStatusKeys.filter((key) => statusVisibility.get(key)),
-						),
-					};
-				}
-				persistStatusFilter();
-			};
-
-			const segmentItems: SettingItem[] = ALL_SEGMENTS.map((segment): SettingItem => ({
-				id: `segment:${segment}`,
-				label: SEGMENT_LABELS[segment],
-				description: "Footer segment visibility",
-				currentValue: segmentVisibility.get(segment) ? "shown" : "hidden",
+	const setBadgeVisibility = (key: string, shown: boolean) => {
+		if (statusFilter.mode === "all") {
+			if (shown) statusFilter.hidden.delete(key);
+			else statusFilter.hidden.add(key);
+		} else {
+			if (shown) statusFilter.shown.add(key);
+			else statusFilter.shown.delete(key);
+		}
+	};
+	const badgeSummary = () => {
+		const keys = getKnownStatusKeys(statusFilter, seenStatusKeys);
+		const enabled = keys.filter((key) => shouldShowStatus(key, statusFilter)).length;
+		return keys.length > 0 ? `${enabled}/${keys.length} enabled` : "No badges yet";
+	};
+	const savedSettingsTheme = (exit: "close" | "go back") => {
+		const theme = getSettingsListTheme();
+		return {
+			...theme,
+			// These toggles save immediately; Esc is not an undo operation.
+			hint: (text: string) => theme.hint(text.replace("Esc to cancel", `Esc to ${exit}`)),
+		};
+	};
+	const createBadgeSettings = (onClose: () => void, exit: "close" | "go back") => {
+		const knownKeys = getKnownStatusKeys(statusFilter, seenStatusKeys);
+		const theme = savedSettingsTheme(exit);
+		const items: SettingItem[] = [
+			{
+				id: "default:future",
+				label: "New badges",
+				description: "Default for badges discovered later. Existing badge choices stay unchanged.",
+				currentValue: statusFilter.mode === "all" ? "shown" : "hidden",
 				values: ["shown", "hidden"],
-			}));
-			const statusItems: SettingItem[] = knownStatusKeys.length > 0
-				? [
-					{
-						id: "status:__future",
-						label: "New extension statuses",
-						description: "Default visibility for status keys discovered later",
-						currentValue: futureShown ? "shown" : "hidden",
-						values: ["shown", "hidden"],
-					},
-					...knownStatusKeys.map((key): SettingItem => ({
-						id: `status:${key}`,
-						label: `Status: ${stripTerminalControls(key)}`,
-						description: statusDescription(key),
-						currentValue: statusVisibility.get(key) ? "shown" : "hidden",
-						values: ["shown", "hidden"],
-					})),
-				]
-				: [];
-			const items: SettingItem[] = [...segmentItems, ...statusItems];
-
+			},
+			...knownKeys.map((key): SettingItem => ({
+				id: `badge:${key}`,
+				label: `Badge: ${stripTerminalControls(key)}`,
+				description: statusDescription(key),
+				currentValue: shouldShowStatus(key, statusFilter) ? "shown" : "hidden",
+				values: ["shown", "hidden"],
+			})),
+		];
+		const settings = new SettingsList(items, Math.min(items.length + 2, 15), theme, (id, value) => {
+			if (id === "default:future") {
+				const keys = getKnownStatusKeys(statusFilter, seenStatusKeys);
+				statusFilter = value === "shown"
+					? { mode: "all", hidden: new Set(keys.filter((key) => !shouldShowStatus(key, statusFilter))) }
+					: { mode: "only", shown: new Set(keys.filter((key) => shouldShowStatus(key, statusFilter))) };
+			} else {
+				setBadgeVisibility(id.slice("badge:".length), value === "shown");
+			}
+			persistStatusFilter();
+		}, onClose, { enableSearch: true });
+		return {
+			render(width: number) {
+				return [
+					theme.label("Extension badges", true),
+					theme.hint(knownKeys.length > 0
+						? "Choose badges by key; select a row to preview its text."
+						: "No badges yet. Extensions publish them while you work."),
+					theme.hint("Changes save immediately."),
+					...(!visibleSegments.includes("extensions")
+						? [theme.hint("All badges are hidden. Use /bar show extensions to display them.")]
+						: []),
+					"",
+					...settings.render(Math.max(8, width)),
+				].map((line) => truncateToWidth(line, Math.max(0, width)));
+			},
+			invalidate() { settings.invalidate(); },
+			handleInput(data: string) { settings.handleInput(data); },
+		};
+	};
+	const openSettings = async (ctx: ExtensionContext) => {
+		if (ctx.mode !== "tui") {
+			ctx.ui.notify("/bar settings requires TUI mode", "warning");
+			return;
+		}
+		await ctx.ui.custom((tui, theme, _kb, done) => {
+			const items = ALL_SEGMENTS.flatMap((segment): SettingItem[] => {
+				const group: SettingItem[] = [{
+					id: `segment:${segment}`,
+					label: SEGMENT_LABELS[segment],
+					description: SEGMENT_DESCRIPTIONS[segment],
+					currentValue: visibleSegments.includes(segment) ? "shown" : "hidden",
+					values: ["shown", "hidden"],
+				}];
+				if (segment === "model") group.push({
+					id: "show-provider",
+					label: "Show provider",
+					description: "Prefix the model name with its provider. Only visible when Model is shown.",
+					currentValue: showProvider ? "shown" : "hidden",
+					values: ["shown", "hidden"],
+				});
+				if (segment === "progress") group.push({
+					id: "progress-model",
+					label: "Progress model",
+					description: process.env.PI_BAR_PROGRESS_MODEL
+						? "Controlled by PI_BAR_PROGRESS_MODEL (read-only). Unset it and restart Pi to choose here."
+						: "Choose Auto or search models with configured Pi credentials. Changes only progress updates, not the chat model.",
+					currentValue: formatProgressModelKey(resolveProgressModelPreference(ctx.cwd)),
+					submenu: process.env.PI_BAR_PROGRESS_MODEL
+						? undefined
+						: (currentValue, close) => createProgressModelPicker(ctx, currentValue, close),
+				});
+				if (segment === "extensions") group.push({
+					id: "badge-settings",
+					label: "Choose badges",
+					description: "Choose individual badges from other extensions. They display only when Extension badges is shown.",
+					currentValue: badgeSummary(),
+					submenu: (_currentValue, close) => createBadgeSettings(() => close(badgeSummary()), "go back"),
+				});
+				return group;
+			});
 			const container = new Container();
-			container.addChild(
-				new (class {
-					render(_width: number) {
-						return [
-							theme.fg("accent", theme.bold("pi-bar visibility")),
-							theme.fg(
-								"dim",
-								knownStatusKeys.length > 0
-									? "Footer segments + extension statuses · Enter/Space toggles · Esc closes"
-									: "Footer segments · no extension statuses seen yet · Esc closes",
-							),
-							"",
-						];
-					}
-					invalidate() {}
-				})(),
-			);
-
-			const settingsList = new SettingsList(
-				items,
-				Math.min(items.length + 2, 18),
-				getSettingsListTheme(),
-				(id, newValue) => {
-					if (id.startsWith("segment:")) {
-						const segment = id.slice("segment:".length);
-						if (!isSegmentName(segment)) return;
-						segmentVisibility.set(segment, newValue === "shown");
-						persistSegmentsFromVisibility();
-						return;
-					}
-
-					if (id === "status:__future") {
-						futureShown = newValue === "shown";
-						persistStatusesFromVisibility();
-						return;
-					}
-
-					if (id.startsWith("status:")) {
-						statusVisibility.set(id.slice("status:".length), newValue === "shown");
-						persistStatusesFromVisibility();
-					}
-				},
-				() => done(undefined),
-				{ enableSearch: true },
-			);
-
-			container.addChild(settingsList);
-
+			container.addChild(new (class {
+				render(_width: number) {
+					return [
+						theme.fg("accent", theme.bold("pi-bar settings")),
+						theme.fg("dim", "Choose what appears in your footer. Changes save immediately."),
+						"",
+					];
+				}
+				invalidate() {}
+			})());
+			const settings = new SettingsList(items, Math.min(items.length + 2, 18), savedSettingsTheme("close"), (id, value) => {
+				if (id === "progress-model") {
+					setProgressModel(value, ctx);
+					settings.updateValue(id, formatProgressModelKey(resolveProgressModelPreference(ctx.cwd)));
+				} else if (id === "show-provider") {
+					setShowProvider(value === "shown");
+				} else if (id.startsWith("segment:")) {
+					const segment = id.slice("segment:".length);
+					if (!isSegmentName(segment)) return;
+					setVisibleSegments(value === "shown"
+						? [...visibleSegments, segment]
+						: visibleSegments.filter((item) => item !== segment), ctx);
+				}
+			}, () => done(undefined), { enableSearch: true });
+			container.addChild(settings);
 			return {
 				render(width: number) {
-					return container.render(width);
-				},
-				invalidate() {
-					container.invalidate();
+					return container.render(Math.max(8, width)).map((line) => truncateToWidth(line, Math.max(0, width)));
 				},
+				invalidate() { container.invalidate(); },
 				handleInput(data: string) {
-					settingsList.handleInput?.(data);
+					settings.handleInput(data);
 					tui.requestRender();
 				},
 			};
 		});
 	};
-	const openStatusConfigurator = async (ctx: ExtensionContext) => {
-		const knownStatusKeys = getKnownStatusKeys(statusFilter, seenStatusKeys);
-		if (knownStatusKeys.length === 0) {
-			ctx.ui.notify(
-				"No extension statuses seen yet. Open /bar after another extension calls ctx.ui.setStatus().",
-				"info",
-			);
+	const openBadges = async (ctx: ExtensionContext) => {
+		if (ctx.mode !== "tui") {
+			ctx.ui.notify("/bar badges requires TUI mode", "warning");
 			return;
 		}
-
-		await ctx.ui.custom((tui, theme, _kb, done) => {
-			let futureShown = statusFilter.mode === "all";
-			const statusVisibility = new Map(
-				knownStatusKeys.map((key) => [key, shouldShowStatus(key, statusFilter)]),
-			);
-			const persistFromVisibility = () => {
-				if (futureShown) {
-					statusFilter = {
-						mode: "all",
-						hidden: new Set(
-							knownStatusKeys.filter((key) => !statusVisibility.get(key)),
-						),
-					};
-				} else {
-					statusFilter = {
-						mode: "only",
-						shown: new Set(
-							knownStatusKeys.filter((key) => statusVisibility.get(key)),
-						),
-					};
-				}
-				persistStatusFilter();
-			};
-
-			const items: SettingItem[] = [
-				{
-					id: "__future",
-					label: "New statuses",
-					description: "Default visibility for status keys discovered later",
-					currentValue: futureShown ? "shown" : "hidden",
-					values: ["shown", "hidden"],
-				},
-				...knownStatusKeys.map((key): SettingItem => ({
-					id: key,
-					label: stripTerminalControls(key),
-					description: statusDescription(key),
-					currentValue: statusVisibility.get(key) ? "shown" : "hidden",
-					values: ["shown", "hidden"],
-				})),
-			];
-
-			const container = new Container();
-			container.addChild(
-				new (class {
-					render(_width: number) {
-						return [
-							theme.fg("accent", theme.bold("pi-bar status visibility")),
-							theme.fg("dim", "Enter/Space toggles · Esc closes"),
-							"",
-						];
-					}
-					invalidate() {}
-				})(),
-			);
-
-			const settingsList = new SettingsList(
-				items,
-				Math.min(items.length + 2, 15),
-				getSettingsListTheme(),
-				(id, newValue) => {
-					if (id === "__future") {
-						futureShown = newValue === "shown";
-					} else {
-						statusVisibility.set(id, newValue === "shown");
-					}
-					persistFromVisibility();
-				},
-				() => done(undefined),
-				{ enableSearch: true },
-			);
-
-			container.addChild(settingsList);
-
+		await ctx.ui.custom((tui, _theme, _kb, done) => {
+			const settings = createBadgeSettings(() => done(undefined), "close");
 			return {
-				render(width: number) {
-					return container.render(width);
-				},
-				invalidate() {
-					container.invalidate();
-				},
+				...settings,
 				handleInput(data: string) {
-					settingsList.handleInput?.(data);
+					settings.handleInput(data);
 					tui.requestRender();
 				},
 			};
@@ -2059,23 +2254,105 @@ export default function (pi: ExtensionAPI) {
 	};
 
 	pi.registerCommand("bar", {
-		description: "Configure pi-bar footer visibility",
+		description: "Open footer settings; choose what appears in the bar",
+		getArgumentCompletions: (prefix) => {
+			let modelKeys: string[] = [];
+			if (/^\s*progress-model\s+\S*$/.test(prefix)) {
+				if (!sessionOpen || process.env.PI_BAR_PROGRESS_MODEL) return null;
+				// Read current local availability only for model arguments, never
+				// refresh catalogs or resolve credentials while the user types.
+				modelKeys = completionModelRegistry?.getAvailable().map(formatProgressModelKey) ?? [];
+			}
+			return completeBarArguments(prefix, getKnownStatusKeys(statusFilter, seenStatusKeys), modelKeys);
+		},
 		handler: async (args, ctx) => {
-			const [section, action, ...rest] = args.trim().split(/\s+/).filter(Boolean);
-			if (!section || section === "config" || section === "configure" || section === "edit") {
-				await openSegmentConfigurator(ctx);
+			const words = args.trim().split(/\s+/).filter(Boolean);
+			if (words[0] === "show" || words[0] === "hide") {
+				const names = splitStatusKeys(words.slice(1).join(" ")).map((name) => name.toLowerCase());
+				if (names.includes("all")) {
+					if (names.length !== 1) {
+						ctx.ui.notify("Use all by itself: /bar show all or /bar hide all.", "warning");
+						return;
+					}
+					words.splice(0, words.length, "segments", words[0] === "show" ? "all" : "none");
+				} else {
+					const unknown = names.filter((name) => !isSegmentName(name));
+					if (unknown.length > 0) {
+						ctx.ui.notify(`Unknown footer items: ${unknown.map(stripTerminalControls).join(", ")}. Use Tab to choose items.`, "warning");
+						return;
+					}
+					words.unshift("segments");
+				}
+			}
+			if (words[0] === "badges") {
+				if (["show", "hide", "only"].includes(words[1]) && splitStatusKeys(words.slice(2).join(" ")).length === 0) {
+					ctx.ui.notify("Choose badge keys with Tab, or open /bar badges to choose them interactively.", "warning");
+					return;
+				}
+				words[0] = "status";
+			}
+			const [section, action, ...rest] = words;
+			if (!section || section === "settings" || section === "config" || section === "configure" || section === "edit") {
+				await openSettings(ctx);
 				return;
 			}
 			if (section === "list" || section === "ls") {
 				ctx.ui.notify(`pi-bar footer: ${describeSegments(visibleSegments)}`, "info");
 				return;
 			}
+			if (section === "help") {
+				ctx.ui.notify([
+					"Open /bar for all footer settings. Changes save immediately.",
+					"",
+					...Array.from(BAR_COMMAND_DESCRIPTIONS, ([name, description]) => `/bar ${name} — ${description}`),
+					"",
+					"Examples: /bar show cost tokens · /bar hide progress · /bar badges hide mcp",
+					"Use /bar show all or /bar hide all to change every footer item.",
+					`Footer items: ${ALL_SEGMENTS.join(", ")}`,
+					`Current configuration: ${describeSegments(visibleSegments)}`,
+					"Enabled items may wait for data or yield under width pressure.",
+					"Old commands still work: /bar config, /bar segments, /bar status, /bar list.",
+				].join("\n"), "info");
+				return;
+			}
+
+			if (section === "progress-model") {
+				if (!action) {
+					const value = formatProgressModelKey(resolveProgressModelPreference(ctx.cwd));
+					const override = process.env.PI_BAR_PROGRESS_MODEL ? " (PI_BAR_PROGRESS_MODEL, read-only)" : "";
+					ctx.ui.notify(`pi-bar progress model: ${value}${override}`, "info");
+					return;
+				}
+				const model = parseSerializedProgressModel(action);
+				if (rest.length > 0 || !model) {
+					ctx.ui.notify("Usage: /bar progress-model [auto|provider/model]", "warning");
+					return;
+				}
+				if (!process.env.PI_BAR_PROGRESS_MODEL && model !== "auto" && !ctx.modelRegistry.getAvailable().some(
+					(available) => formatProgressModelKey(available) === model,
+				)) {
+					ctx.ui.notify("Progress model unavailable. Use /login or choose a configured model with Tab.", "warning");
+					return;
+				}
+				if (setProgressModel(model, ctx)) ctx.ui.notify(`pi-bar progress model: ${model}`, "info");
+				return;
+			}
+
+			if (section === "provider") {
+				if (rest.length > 0 || (action !== undefined && action !== "show" && action !== "hide")) {
+					ctx.ui.notify("Usage: /bar provider [show|hide]", "warning");
+					return;
+				}
+				if (action) setShowProvider(action === "show");
+				ctx.ui.notify(`pi-bar provider prefix: ${showProvider ? "shown" : "hidden"}`, "info");
+				return;
+			}
 
 			if (section === "segment" || section === "segments" || section === "footer") {
 				const segments = splitSegmentNames(rest.join(" "));
 				if ((action === "only" || action === "show" || action === "hide") && segments.length === 0) {
 					ctx.ui.notify(
-						`Segments: ${ALL_SEGMENTS.join(", ")}`,
+						`Footer items: ${ALL_SEGMENTS.join(", ")}. Use Tab to choose.`,
 						"warning",
 					);
 					return;
@@ -2083,10 +2360,11 @@ export default function (pi: ExtensionAPI) {
 
 				switch (action) {
 					case undefined:
+					case "settings":
 					case "config":
 					case "configure":
 					case "edit":
-						await openSegmentConfigurator(ctx);
+						await openSettings(ctx);
 						return;
 					case "list":
 					case "ls":
@@ -2112,7 +2390,7 @@ export default function (pi: ExtensionAPI) {
 						break;
 					default:
 						ctx.ui.notify(
-							"Usage: /bar [config] or /bar segments [list|all|none|only <segments>|show <segments>|hide <segments>]",
+							"Use /bar show <items> or /bar hide <items>. Open /bar for all settings.",
 							"warning",
 						);
 						return;
@@ -2123,7 +2401,7 @@ export default function (pi: ExtensionAPI) {
 			}
 
 			if ((section === "status" || section === "statuses") && !action) {
-				await openStatusConfigurator(ctx);
+				await openBadges(ctx);
 				return;
 			}
 
@@ -2131,16 +2409,17 @@ export default function (pi: ExtensionAPI) {
 				const keys = splitStatusKeys(rest.join(" "));
 
 				switch (action) {
+					case "settings":
 					case "config":
 					case "configure":
 					case "edit":
-						await openStatusConfigurator(ctx);
+						await openBadges(ctx);
 						return;
 					case "list":
 					case "ls": {
 						const known = getKnownStatusKeys(statusFilter, seenStatusKeys);
 						ctx.ui.notify(
-							`pi-bar statuses: ${describeStatusFilter(statusFilter)}${known.length > 0 ? `; known: ${known.join(", ")}` : "; known: none yet"}`,
+							`pi-bar badges: ${describeStatusFilter(statusFilter)}${known.length > 0 ? `; known: ${known.map(stripTerminalControls).join(", ")}` : "; known: none yet"}`,
 							"info",
 						);
 						return;
@@ -2155,34 +2434,24 @@ export default function (pi: ExtensionAPI) {
 						statusFilter = { mode: "only", shown: new Set(keys) };
 						break;
 					case "hide":
-						if (statusFilter.mode === "only") {
-							for (const key of keys) statusFilter.shown.delete(key);
-						} else {
-							for (const key of keys) statusFilter.hidden.add(key);
-						}
-						break;
 					case "show":
-						if (statusFilter.mode === "only") {
-							for (const key of keys) statusFilter.shown.add(key);
-						} else {
-							for (const key of keys) statusFilter.hidden.delete(key);
-						}
+						for (const key of keys) setBadgeVisibility(key, action === "show");
 						break;
 					default:
 						ctx.ui.notify(
-							"Usage: /bar status [list|all|none|only <keys>|show <keys>|hide <keys>]",
+							"Open /bar badges to choose badges, or use /bar badges show|hide <keys>.",
 							"warning",
 						);
 						return;
 				}
 
 				persistStatusFilter();
-				ctx.ui.notify(`pi-bar statuses: ${describeStatusFilter(statusFilter)}`, "info");
+				ctx.ui.notify(`pi-bar badges: ${describeStatusFilter(statusFilter)}`, "info");
 				return;
 			}
 
 			ctx.ui.notify(
-				"Usage: /bar [config] or /bar segments [list|all|none|only <segments>|show <segments>|hide <segments>] or /bar status [list|all|none|only <keys>|show <keys>|hide <keys>]",
+				"Unknown /bar command. Open /bar for settings or /bar help for examples.",
 				"warning",
 			);
 		},
@@ -2190,7 +2459,11 @@ export default function (pi: ExtensionAPI) {
 
 	pi.on("model_select", async () => refresh());
 	pi.on("thinking_level_select", async () => refresh());
-	pi.on("turn_end", async () => refresh());
+	// message_end runs before persistence and allows later handlers to replace
+	// usage. Read finalized entries at the synchronized lifecycle boundaries.
+	pi.on("turn_end", async (_event, ctx) => { syncUsage(ctx); refresh(); });
+	pi.on("agent_end", async (_event, ctx) => { syncUsage(ctx); refresh(); });
+	pi.on("session_compact", async (_event, ctx) => { syncUsage(ctx); refresh(); });
 	pi.on("before_agent_start", async (event, ctx) => {
 		if (visibleSegments.includes("progress")) progress.recordUserMessage(ctx, event.prompt);
 	});
@@ -2198,7 +2471,9 @@ export default function (pi: ExtensionAPI) {
 		if (visibleSegments.includes("progress")) progress.recordAssistantUpdate(ctx, event.message);
 	});
 	pi.on("tool_call", async (event, ctx) => {
+		syncUsage(ctx);
 		if (visibleSegments.includes("progress")) progress.recordToolCall(ctx, event);
+		refresh();
 	});
 	pi.on("tool_result", async (event, ctx) => {
 		if (visibleSegments.includes("progress")) progress.recordToolResult(ctx, event);
@@ -2214,11 +2489,21 @@ export default function (pi: ExtensionAPI) {
 		if (visibleSegments.includes("progress")) progress.startSession(ctx.cwd);
 		else progress.shutdown();
 		restoreStatusFilter(ctx);
+		showProvider = readGlobalConfig().showProvider ?? false;
+		syncUsage(ctx, true);
 		refresh();
 	});
 
 	pi.on("session_start", async (_event, ctx) => {
+		sessionEpoch++;
+		sessionOpen = true;
+		completionModelRegistry = ctx.modelRegistry;
+		usageTracker.reset();
+		syncUsage(ctx, true);
+		currentStatuses = new Map();
+		seenStatusKeys.clear();
 		visibleSegments = readGlobalSegments() ?? DEFAULT_SEGMENTS;
+		showProvider = readGlobalConfig().showProvider ?? false;
 		if (visibleSegments.includes("progress")) progress.startSession(ctx.cwd);
 		else progress.shutdown();
 		restoreStatusFilter(ctx);
@@ -2237,7 +2522,9 @@ export default function (pi: ExtensionAPI) {
 				},
 				invalidate() {},
 				render(width: number): string[] {
-					const modelName = formatModelName(ctx.model?.id);
+					const modelName = formatModelName(ctx.model, showProvider);
+					const metrics = usageTracker.snapshot();
+					const reportedUsage = hasUsage(metrics);
 					const thinkingLevel = String(pi.getThinkingLevel());
 					currentStatuses = footerData?.getExtensionStatuses?.() ?? new Map();
 					const extensionStatusParts = formatExtensionStatuses(
@@ -2265,7 +2552,10 @@ export default function (pi: ExtensionAPI) {
 						: "—";
 					const shortThinking = thinkingLevel === "medium" ? "med" : thinkingLevel === "minimal" ? "min" : thinkingLevel;
 					const renderers: Record<SegmentName, Omit<FooterSegment, "name">> = {
-						model: { text: theme.fg("accent", stripTerminalControls(modelName)) },
+						model: {
+							text: theme.fg("accent", modelName),
+							alternatives: showProvider ? [theme.fg("accent", formatModelName(ctx.model))] : [],
+						},
 						thinking: {
 							text: theme.fg(thinkingColor(thinkingLevel), `think:${thinkingLevel}`),
 							alternatives: [theme.fg(thinkingColor(thinkingLevel), `think:${shortThinking}`)],
@@ -2274,6 +2564,11 @@ export default function (pi: ExtensionAPI) {
 							text: theme.fg(contextSegmentColor, contextText),
 							alternatives: [theme.fg(contextSegmentColor, contextCompact)],
 						},
+						cache_hit_ratio: {
+							text: metrics.cacheHitRate === null ? "" : theme.fg(cacheHitColor(metrics.cacheHitRate), `CH:${metrics.cacheHitRate.toFixed(1).replace(/\.0$/, "")}%`),
+						},
+						cost: { text: reportedUsage ? theme.fg("muted", `≈$${metrics.cost.toFixed(3)}`) : "" },
+						tokens: { text: reportedUsage ? theme.fg("muted", `↑${formatTokens(metrics.input)} ↓${formatTokens(metrics.output)}`) : "" },
 						cwd: { text: directories[0] ?? "", alternatives: directories.slice(1) },
 						progress: { text: progressText ? theme.fg("text", progressText) : "" },
 						extensions: { text: "" },
@@ -2290,6 +2585,9 @@ export default function (pi: ExtensionAPI) {
 	});
 
 	pi.on("session_shutdown", async (_event, ctx) => {
+		sessionOpen = false;
+		completionModelRegistry = undefined;
+		sessionEpoch++;
 		progress.shutdown();
 		if (ctx.hasUI) ctx.ui.setFooter(undefined);
 	});