pi-open-tui 0.3.14 → 0.4.1

package/extensions/open-tui/index.ts

@@ -1,5 +1,6 @@
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { type OpenTuiConfig, DEFAULT_CONFIG, ensureConfigExists, loadConfig, saveConfig } from "./config.ts";
+import { installCopyButtons, markCopyScope } from "./copy-buttons.ts";
 import { installEditor } from "./editor.ts";
 import { installFooter } from "./footer.ts";
 import { installHeader } from "./header.ts";
@@ -8,6 +9,7 @@ import { readRuntimeInfo } from "./runtime.ts";
 import { SessionLifecycle } from "./session-lifecycle.ts";
 import { registerSettingsCommand } from "./settings-command.ts";
 import { formatTurnTelemetry, TurnTelemetryTracker } from "./telemetry.ts";
+import { registerToolView } from "./tool-view.ts";
 import {
 	createInitialState,
 	getModelMeta,
@@ -31,12 +33,7 @@ export function getPendingUiChange(enabled: boolean, active: boolean): PendingUi
 }
 
 function isTuiContext(ctx: ExtensionContext): boolean {
-	try {
-		const mode = (ctx as ExtensionContext & { mode?: string }).mode;
-		return ctx.hasUI && (mode === undefined || mode === "tui");
-	} catch {
-		return false;
-	}
+	return ctx.hasUI && ctx.mode === "tui";
 }
 
 export default function (pi: ExtensionAPI) {
@@ -45,6 +42,7 @@ export default function (pi: ExtensionAPI) {
 	const turnTelemetry = new TurnTelemetryTracker();
 
 	let config: OpenTuiConfig = structuredClone(DEFAULT_CONFIG);
+	let configLoaded = false;
 	let active = false;
 	let lastCtx: ExtensionContext | undefined;
 	let requestFooterRender: (() => void) | undefined;
@@ -52,6 +50,7 @@ export default function (pi: ExtensionAPI) {
 	let cleanupHeader: (() => void) | undefined;
 	let cleanupFooter: (() => void) | undefined;
 	let editor: ReturnType<typeof installEditor> | undefined;
+	let copyButtons: ReturnType<typeof installCopyButtons> | undefined;
 	let pendingUiChange: PendingUiChange | undefined;
 
 	// thinking-peek state (rendered by Pi inside its hidden-thinking block)
@@ -63,15 +62,6 @@ export default function (pi: ExtensionAPI) {
 
 	const getThinkingLevel = () => (sessionLifecycle.isCurrent() ? pi.getThinkingLevel() : "off");
 
-	/** True while the agent is running (false during session-restore replay). */
-	const isAgentIdle = (ctx: ExtensionContext): boolean => {
-		try {
-			return (ctx as ExtensionContext & { isIdle?: () => boolean }).isIdle?.() === true;
-		} catch {
-			return false;
-		}
-	};
-
 	/** Pi decides whether this label is visible; our toggle only controls updates. */
 	const isPeekEnabled = () => sessionLifecycle.isCurrent() && config.enabled && config.thinkingPeek.lines > 0 && active;
 
@@ -114,7 +104,8 @@ export default function (pi: ExtensionAPI) {
 			return;
 		}
 		if (!active) {
-			cleanupHeader = installHeader(pi, ctx);
+			// Leave the header slot alone when disabled so another extension's header survives.
+			if (config.header) cleanupHeader = installHeader(pi, ctx);
 			const footer = installFooter(
 				ctx,
 				() => state,
@@ -128,6 +119,7 @@ export default function (pi: ExtensionAPI) {
 						void scheduleGitRefresh(ctx);
 					},
 					getLiveTps: () => turnTelemetry.getLiveTps(),
+					canEmbedInEditor: () => editor?.isFramed() ?? false,
 				},
 			);
 			cleanupFooter = footer.cleanup;
@@ -140,6 +132,11 @@ export default function (pi: ExtensionAPI) {
 					render: footer.renderInline,
 				},
 			);
+			copyButtons = installCopyButtons({
+				getTui: editor.getTui,
+				getTheme: () => ctx.ui.theme,
+				isEnabled: () => config.copyButtons,
+			});
 			active = true;
 		}
 	};
@@ -149,9 +146,11 @@ export default function (pi: ExtensionAPI) {
 		if (active) {
 			cleanupHeader?.();
 			cleanupFooter?.();
+			copyButtons?.cleanup();
 			editor?.cleanup();
 			cleanupHeader = undefined;
 			cleanupFooter = undefined;
+			copyButtons = undefined;
 			editor = undefined;
 			requestFooterRender = undefined;
 			resetPeek();
@@ -221,13 +220,13 @@ export default function (pi: ExtensionAPI) {
 	pi.on("session_start", async (_event, ctx) => {
 		sessionLifecycle.start();
 		lastCtx = ctx;
-		state.sessionStartEpoch = Date.now();
 		state.workingSince = undefined;
 		state.lastDoneIn = undefined;
 		invalidateUsageCache();
 
 		ensureConfigExists();
 		config = loadConfig((msg, level) => ctx.ui.notify(msg, level));
+		configLoaded = true;
 		clearPeekLabel(ctx);
 
 		applyUi(ctx);
@@ -271,7 +270,7 @@ export default function (pi: ExtensionAPI) {
 
 	pi.on("message_start", (event, ctx) => {
 		turnTelemetry.handle(event);
-		if (!sessionLifecycle.isCurrent() || isAgentIdle(ctx)) return;
+		if (!sessionLifecycle.isCurrent() || ctx.isIdle()) return;
 		const role = event.message?.role;
 		if (role === "user") {
 			// Restore Pi's native label until real thinking arrives. The task epoch is
@@ -286,7 +285,7 @@ export default function (pi: ExtensionAPI) {
 
 	pi.on("message_update", (event, ctx) => {
 		turnTelemetry.handle(event);
-		if (!sessionLifecycle.isCurrent() || isAgentIdle(ctx)) return;
+		if (!sessionLifecycle.isCurrent() || ctx.isIdle()) return;
 		if (!isPeekEnabled()) return;
 		const message = event.message;
 		if (!message || message.role !== "assistant") return;
@@ -366,12 +365,33 @@ export default function (pi: ExtensionAPI) {
 		refreshInteractiveState(ctx);
 	});
 
+	registerToolView(
+		pi,
+		() => {
+			// Resumed sessions rebuild their rows before session_start fires, so read the file once here.
+			if (!configLoaded) {
+				config = loadConfig();
+				configLoaded = true;
+			}
+			return config.enabled ? config.toolView.mode : "native";
+		},
+		() => resolveGlyphs(config.icons.mode),
+	);
+
+	pi.registerMarkdownTransformer(markCopyScope);
+
 	registerSettingsCommand(pi, {
 		getConfig: () => config,
 		onConfigChanged: (newConfig) => {
 			const cursorStyleChanged = config.cursorStyle !== newConfig.cursorStyle;
+			const headerChanged = config.header !== newConfig.header;
+			const copyButtonsChanged = config.copyButtons !== newConfig.copyButtons;
 			const thinkingPeekLinesChanged = config.thinkingPeek.lines !== newConfig.thinkingPeek.lines;
-			saveConfig(newConfig);
+			if (!saveConfig(newConfig)) {
+				lastCtx?.ui.notify(newConfig.settingsLanguage === "zh"
+					? "open-tui 设置本次生效，但未保存到磁盘。请检查配置目录权限和可用空间。"
+					: "open-tui settings apply for this session but could not be saved. Check configuration directory permissions and free space.", "warning");
+			}
 			config = newConfig;
 			if (newConfig.thinkingPeek.lines === 0 || !newConfig.enabled) {
 				resetPeek();
@@ -382,6 +402,11 @@ export default function (pi: ExtensionAPI) {
 			if (cursorStyleChanged && active && editor) {
 				editor.setCursorStyle(newConfig.cursorStyle);
 			}
+			if (headerChanged && active && lastCtx) {
+				cleanupHeader?.();
+				cleanupHeader = newConfig.header ? installHeader(pi, lastCtx) : undefined;
+			}
+			if (copyButtonsChanged) copyButtons?.refresh();
 			if (lastCtx) {
 				pendingUiChange = getPendingUiChange(newConfig.enabled, active);
 			}

package/extensions/open-tui/runtime.ts

@@ -31,10 +31,9 @@ const RUNTIMES: readonly RuntimeDef[] = [
 	{ name: "swift", files: ["Package.swift"], versionCommand: { cmd: "swift", args: ["--version"], pattern: /Swift\s+(\d+\.\d+)/ } },
 	{ name: "kotlin", files: ["build.gradle.kts", "settings.gradle.kts"] },
 	{ name: "cpp", files: ["CMakeLists.txt", "Makefile"] },
-	{ name: "c", files: ["Makefile", "CMakeLists.txt"] },
 	{ name: "deno", files: ["deno.json", "deno.jsonc", "deno.lock"], versionCommand: { cmd: "deno", args: ["--version"], pattern: /deno\s+(\d+\.\d+\.\d+)/ } },
 	{ name: "php", files: ["composer.json"], versionCommand: { cmd: "php", args: ["--version"], pattern: /PHP\s+(\d+\.\d+\.\d+)/ } },
-	{ name: "haskell", files: ["stack.yaml", "cabal.project", ".cabal"], versionCommand: { cmd: "ghc", args: ["--version"], pattern: /(\d+\.\d+\.\d+)/ } },
+	{ name: "haskell", files: ["stack.yaml", "cabal.project"], extensions: [".cabal"], versionCommand: { cmd: "ghc", args: ["--version"], pattern: /(\d+\.\d+\.\d+)/ } },
 	{ name: "julia", files: ["Project.toml", "Manifest.toml"], versionCommand: { cmd: "julia", args: ["--version"], pattern: /julia\s+(\d+\.\d+\.\d+)/ } },
 	{ name: "lua", files: ["stylua.toml", ".luarc.json"], versionCommand: { cmd: "lua", args: ["-v"], pattern: /Lua\s+(\d+\.\d+)/ } },
 	{ name: "elixir", files: ["mix.exs"], versionCommand: { cmd: "elixir", args: ["--version"], pattern: /Elixir\s+(\d+\.\d+\.\d+)/ } },
@@ -42,13 +41,13 @@ const RUNTIMES: readonly RuntimeDef[] = [
 	{ name: "gleam", files: ["gleam.toml"], versionCommand: { cmd: "gleam", args: ["--version"], pattern: /gleam\s+(\d+\.\d+\.\d+)/ } },
 	{ name: "crystal", files: ["shard.yml"], versionCommand: { cmd: "crystal", args: ["--version"], pattern: /Crystal\s+(\d+\.\d+\.\d+)/ } },
 	{ name: "dart", files: ["pubspec.yaml"], versionCommand: { cmd: "dart", args: ["--version"], pattern: /Dart\s+SDK\s+version:\s+(\d+\.\d+\.\d+)/ } },
-	{ name: "nim", files: ["nim.cfg", ".nimble"] },
+	{ name: "nim", files: ["nim.cfg"], extensions: [".nimble"] },
 	{ name: "zig", files: ["build.zig"], versionCommand: { cmd: "zig", args: ["version"], pattern: /(\d+\.\d+\.\d+)/ } },
-	{ name: "ocaml", files: [".opam", "dune", "dune-project"] },
+	{ name: "ocaml", files: ["dune", "dune-project"], extensions: [".opam"] },
 	{ name: "clojure", files: ["project.clj", "deps.edn"] },
-	{ name: "scala", files: ["build.sbt", ".scala", ".metals"] },
+	{ name: "scala", files: ["build.sbt", ".metals"], extensions: [".scala"] },
 	{ name: "perl", files: ["Makefile.PL", "cpanfile"] },
-	{ name: "r", files: [".Rproj", "DESCRIPTION"] },
+	{ name: "r", files: ["DESCRIPTION"], extensions: [".Rproj"] },
 	{ name: "elm", files: ["elm.json"] },
 	{ name: "haxe", files: ["haxelib.json", ".haxerc"] },
 	{ name: "vagrant", files: ["Vagrantfile"] },
@@ -65,7 +64,6 @@ const RUNTIMES: readonly RuntimeDef[] = [
 	{ name: "v", files: ["v.mod", "vpkg.json"], extensions: [".v"] },
 	{ name: "xmake", files: ["xmake.lua"] },
 	{ name: "gradle", files: ["build.gradle", "build.gradle.kts"], folders: ["gradle"] },
-	{ name: "maven", files: ["pom.xml"] },
 	{ name: "cmake", files: ["CMakeLists.txt", "CMakeCache.txt"] },
 	{ name: "meson", files: ["meson.build"], env: "MESON_DEVENV" },
 	{ name: "nix", files: ["flake.nix", "shell.nix"], env: "IN_NIX_SHELL" },
@@ -76,7 +74,7 @@ const RUNTIMES: readonly RuntimeDef[] = [
 	{ name: "pulumi", files: ["Pulumi.yaml", "Pulumi.yml"] },
 	{ name: "typst", files: ["template.typ"], extensions: [".typ"] },
 	{ name: "buf", files: ["buf.yaml", "buf.gen.yaml", "buf.work.yaml"] },
-	{ name: "dotnet", files: [".csproj", ".fsproj", "global.json", "Directory.Build.props"] },
+	{ name: "dotnet", files: ["global.json", "Directory.Build.props"], extensions: [".csproj", ".fsproj"] },
 	{ name: "cobol", files: [], extensions: [".cbl", ".cob"] },
 ];
 
@@ -124,16 +122,17 @@ function matchesDef(cwd: string, def: RuntimeDef): boolean {
 async function fetchVersion(def: RuntimeDef, cwd: string): Promise<string | undefined> {
 	if (!def.versionCommand) return undefined;
 	try {
-		const { stdout } = await execFileAsync(def.versionCommand.cmd, def.versionCommand.args ?? [], {
+		const { stdout, stderr } = await execFileAsync(def.versionCommand.cmd, def.versionCommand.args ?? [], {
 			cwd,
 			timeout: VERSION_TIMEOUT_MS,
 			maxBuffer: 64 * 1024,
 		});
+		const output = `${stdout}\n${stderr}`;
 		if (def.versionCommand.pattern) {
-			const match = stdout.match(def.versionCommand.pattern);
+			const match = output.match(def.versionCommand.pattern);
 			return match?.[1];
 		}
-		return stdout.trim() || undefined;
+		return output.trim() || undefined;
 	} catch {
 		return undefined;
 	}

package/extensions/open-tui/session-lifecycle.ts

@@ -1,43 +1,23 @@
-export class SessionLifecycle {
-	private current = 0;
-	private deferred: Array<() => void> = [];
-	private shutDown = false;
-
-	start(): void {
-		this.current++;
-		this.shutDown = false;
-		this.flushDeferred();
-	}
-
-	shutdown(): void {
-		this.shutDown = true;
-		this.deferred = [];
-	}
-
-	isCurrent(generation?: number): boolean {
-		if (this.shutDown) return false;
-		if (generation === undefined) return true;
-		return generation === this.current;
-	}
-
-	currentGeneration(): number {
-		return this.current;
-	}
-
-	defer(fn: () => void): void {
-		if (this.shutDown) return;
-		this.deferred.push(fn);
-	}
-
-	private flushDeferred(): void {
-		const pending = this.deferred;
-		this.deferred = [];
-		for (const fn of pending) {
-			try {
-				fn();
-			} catch {
-				// ponytail: silent fallback — deferred tasks are best-effort
-			}
-		}
-	}
-}
+export class SessionLifecycle {
+	private current = 0;
+	private shutDown = false;
+
+	start(): void {
+		this.current++;
+		this.shutDown = false;
+	}
+
+	shutdown(): void {
+		this.shutDown = true;
+	}
+
+	isCurrent(generation?: number): boolean {
+		if (this.shutDown) return false;
+		if (generation === undefined) return true;
+		return generation === this.current;
+	}
+
+	currentGeneration(): number {
+		return this.current;
+	}
+}

package/extensions/open-tui/settings-command.ts

@@ -4,10 +4,11 @@ import {
 	Key,
 	matchesKey,
 	SelectList,
-	type Component,
 	type SelectItem,
 	type TUI,
 	Text,
+	truncateToWidth,
+	visibleWidth,
 } from "@earendil-works/pi-tui";
 import type { CursorStyle, IconMode, OpenTuiConfig, SettingsLanguage, ThinkingPeekLines } from "./config.ts";
 
@@ -28,8 +29,11 @@ const COPY = {
 		hint: "Tab/Shift+Tab/←/→: tabs · ↑/↓: move · Enter/Space: change · Esc/q: close",
 		labels: {
 			enabled: "Enabled",
+			header: "Override header",
 			inlineFooter: "Footer in editor border",
+			copyButtons: "Copy buttons",
 			thinkingPeek: "Thinking peek",
+			toolView: "Tool view",
 			language: "Language",
 			cursorStyle: "Cursor style",
 			iconMode: "Icon mode",
@@ -56,6 +60,7 @@ const COPY = {
 			on: "On",
 			off: "Off",
 			thinkingPeek: { off: "Off", one: "1 line", two: "2 lines" },
+			toolView: { native: "Native", compact: "Compact" },
 			languages: { en: "English", zh: "简体中文" },
 			cursorStyles: { block: "Block", bar: "Bar", underline: "Underline" },
 			icons: { auto: "Auto", nerd: "Nerd", unicode: "Unicode", ascii: "ASCII" },
@@ -67,8 +72,11 @@ const COPY = {
 		hint: "Tab/Shift+Tab/←/→：切页 · ↑/↓：移动 · Enter/Space：更改 · Esc/q：关闭",
 		labels: {
 			enabled: "启用",
+			header: "覆盖顶部信息栏",
 			inlineFooter: "底栏嵌入输入框",
+			copyButtons: "复制按钮",
 			thinkingPeek: "思考预览",
+			toolView: "工具视图",
 			language: "语言",
 			cursorStyle: "光标样式",
 			iconMode: "图标模式",
@@ -95,6 +103,7 @@ const COPY = {
 			on: "开启",
 			off: "关闭",
 			thinkingPeek: { off: "关闭", one: "单行", two: "双行" },
+			toolView: { native: "原生", compact: "紧凑" },
 			languages: { en: "English", zh: "简体中文" },
 			cursorStyles: { block: "块", bar: "竖线", underline: "下划线" },
 			icons: { auto: "自动", nerd: "Nerd", unicode: "Unicode", ascii: "ASCII" },
@@ -160,9 +169,12 @@ function buildFeaturesItems(config: OpenTuiConfig, copy: SettingsCopy): SettingI
 	const flag = (value: boolean) => value ? copy.values.on : copy.values.off;
 	return [
 		{ id: "enabled", label: copy.labels.enabled, currentValue: flag(config.enabled) },
+		{ id: "header", label: copy.labels.header, currentValue: flag(config.header) },
 		{ id: "settingsLanguage", label: copy.labels.language, currentValue: copy.values.languages[config.settingsLanguage] },
 		{ id: "thinkingPeek", label: copy.labels.thinkingPeek, currentValue: formatThinkingPeekLines(config.thinkingPeek.lines, copy) },
 		{ id: "inlineFooter", label: copy.labels.inlineFooter, currentValue: flag(config.inlineFooter) },
+		{ id: "copyButtons", label: copy.labels.copyButtons, currentValue: flag(config.copyButtons) },
+		{ id: "toolView", label: copy.labels.toolView, currentValue: copy.values.toolView[config.toolView.mode] },
 	];
 }
 
@@ -225,9 +237,14 @@ function handleSettingChange(
 ): OpenTuiConfig {
 	if (tab === "features") {
 		if (itemId === "enabled") return toggleEnabled(config);
+		if (itemId === "header") return { ...config, header: !config.header };
 		if (itemId === "inlineFooter") return { ...config, inlineFooter: !config.inlineFooter };
+		if (itemId === "copyButtons") return { ...config, copyButtons: !config.copyButtons };
 		if (itemId === "settingsLanguage") return toggleLanguage(config);
 		if (itemId === "thinkingPeek") return cycleThinkingPeek(config);
+		if (itemId === "toolView") {
+			return { ...config, toolView: { mode: config.toolView.mode === "native" ? "compact" : "native" } };
+		}
 	}
 	if (tab === "icons") {
 		if (itemId === "mode") return cycleIconMode(config);
@@ -251,34 +268,30 @@ interface SettingsUiHandle {
 class SettingsUi implements SettingsUiHandle {
 	private tab: Tab = "features";
 	private config: OpenTuiConfig;
-	private selectList: SelectList;
+	private selectList!: SelectList;
 	private readonly selectedItemByTab: Partial<Record<Tab, string>> = {};
 	private readonly container: Box;
+	private readonly tui: TUI;
 	private readonly theme: Theme;
 	private readonly onChange: (config: OpenTuiConfig) => void;
 	private readonly onClose: () => void;
-	private cachedWidth: number | undefined;
+	private layoutWidth: number | undefined;
+	private layoutRows: number | undefined;
 	private cachedLines: string[] | undefined;
-	private compact = false;
 
 	constructor(
+		tui: TUI,
 		theme: Theme,
 		config: OpenTuiConfig,
 		onChange: (config: OpenTuiConfig) => void,
 		onClose: () => void,
 	) {
+		this.tui = tui;
 		this.theme = theme;
 		this.config = config;
 		this.onChange = onChange;
 		this.onClose = onClose;
 		this.container = new Box(1, 1, (s: string) => theme.bg("customMessageBg", s));
-		this.selectList = new SelectList([], 12, {
-			selectedPrefix: (t) => theme.fg("accent", t),
-			selectedText: (t) => theme.fg("accent", t),
-			description: (t) => theme.fg("muted", t),
-			scrollInfo: (t) => theme.fg("dim", t),
-			noMatch: (t) => theme.fg("warning", t),
-		});
 		this.rebuild();
 	}
 
@@ -295,7 +308,13 @@ class SettingsUi implements SettingsUiHandle {
 		this.rebuild();
 	}
 
-	private rebuild(preferredItemId = this.selectedItemByTab[this.tab]): void {
+	private rebuild(
+		preferredItemId = this.selectedItemByTab[this.tab],
+		width = this.layoutWidth ?? Math.min(80, this.tui.terminal.columns),
+	): void {
+		this.layoutWidth = width;
+		this.layoutRows = this.tui.terminal.rows;
+		const compact = width <= 60;
 		const copy = COPY[this.config.settingsLanguage];
 		this.container.clear();
 		this.container.addChild(new Text(this.theme.bold(this.theme.fg("accent", copy.title)), 1, 0));
@@ -308,12 +327,18 @@ class SettingsUi implements SettingsUiHandle {
 		this.container.addChild(new Text(tabBar, 1, 0));
 		this.container.addChild(new Text(this.theme.fg("dim", copy.hint), 1, 0));
 
-		const items = buildItems(this.tab, this.config).map((item) => ({
+		const items = buildItems(this.tab, this.config).map<SelectItem>((item) => ({
 			value: item.id,
-			label: this.compact ? `${item.label}: ${item.currentValue}` : item.label,
-			description: this.compact ? undefined : item.currentValue,
-		} as SelectItem));
-		this.selectList = new SelectList(items, Math.min(items.length, 12), {
+			// Reserve Box padding (2), SelectList prefix/safety (4), and ": " (2).
+			label: compact
+				? `${truncateToWidth(item.label, Math.max(0, width - 8 - visibleWidth(item.currentValue)))}: ${item.currentValue}`
+				: item.label,
+			description: compact ? undefined : item.currentValue,
+		}));
+		const availableRows = this.layoutRows - this.container.render(width).length;
+		// A scrolling SelectList adds one status row below the items.
+		const visibleItems = items.length <= availableRows ? items.length : Math.max(1, availableRows - 1);
+		this.selectList = new SelectList(items, visibleItems, {
 			selectedPrefix: (t) => this.theme.fg("accent", t),
 			selectedText: (t) => this.theme.fg("accent", t),
 			description: (t) => this.theme.fg("muted", t),
@@ -336,7 +361,6 @@ class SettingsUi implements SettingsUiHandle {
 		};
 		this.container.addChild(this.selectList);
 
-		this.cachedWidth = undefined;
 		this.cachedLines = undefined;
 	}
 
@@ -365,19 +389,15 @@ class SettingsUi implements SettingsUiHandle {
 	}
 
 	render(width: number): string[] {
-		const compact = width <= 60;
-		if (compact !== this.compact) {
-			this.compact = compact;
-			this.rebuild();
+		if (width !== this.layoutWidth || this.tui.terminal.rows !== this.layoutRows) {
+			this.rebuild(undefined, width);
 		}
-		if (this.cachedLines && this.cachedWidth === width) return this.cachedLines;
-		this.cachedWidth = width;
+		if (this.cachedLines) return this.cachedLines;
 		this.cachedLines = this.container.render(width);
 		return this.cachedLines;
 	}
 
 	invalidate(): void {
-		this.cachedWidth = undefined;
 		this.cachedLines = undefined;
 		this.container.invalidate();
 	}
@@ -395,26 +415,27 @@ export function registerSettingsCommand(
 		description: "Open the open-tui settings UI",
 		handler: async (_args, ctx: ExtensionContext) => {
 			if (!ctx.hasUI) return;
-		await ctx.ui.custom<void>((tui: TUI, theme, _kb, done) => {
-			const ui = new SettingsUi(
-				theme,
-				hooks.getConfig(),
-				(config) => hooks.onConfigChanged(config),
-				() => done(undefined),
-			);
-			return {
-				render: (w: number) => ui.render(w),
-				invalidate: () => ui.invalidate(),
-				handleInput: (data: string) => {
-					ui.handleInput(data);
-					tui.requestRender();
-				},
-			};
-		}, { overlay: true });
-		// Overlay is closed and focus is back on the editor. Deferred UI changes
-		// (e.g. toggling the extension) run here, so pi core's focus restore
-		// cannot strand the overlay without keyboard input.
-		hooks.onOverlayClosed?.();
+			await ctx.ui.custom<void>((tui: TUI, theme, _kb, done) => {
+				const ui = new SettingsUi(
+					tui,
+					theme,
+					hooks.getConfig(),
+					(config) => hooks.onConfigChanged(config),
+					() => done(undefined),
+				);
+				return {
+					render: (w: number) => ui.render(w),
+					invalidate: () => ui.invalidate(),
+					handleInput: (data: string) => {
+						ui.handleInput(data);
+						tui.requestRender();
+					},
+				};
+			}, { overlay: true });
+			// Overlay is closed and focus is back on the editor. Deferred UI changes
+			// (e.g. toggling the extension) run here, so pi core's focus restore
+			// cannot strand the overlay without keyboard input.
+			hooks.onOverlayClosed?.();
 		},
 	});
 }

package/extensions/open-tui/state.ts

@@ -8,7 +8,6 @@ import { finiteOrZero, formatProviderLabel } from "./utils.ts";
 export interface FooterState {
 	git: GitStatus;
 	runtime: RuntimeInfo | null;
-	sessionStartEpoch: number;
 	workingSince: number | undefined;
 	lastDoneIn: number | undefined;
 }
@@ -22,23 +21,22 @@ export interface UsageTotals {
 	latestCacheHitRate: number | undefined;
 }
 
-let usageCache: { key: string; totals: UsageTotals } | undefined;
-
-function entriesKey(ctx: ExtensionContext): string {
-	const entries = ctx.sessionManager.getEntries();
-	const last = entries.at(-1);
-	return `${entries.length}:${last?.id ?? ""}:${last?.timestamp ?? ""}`;
-}
+let usageCache: {
+	sessionManager: ExtensionContext["sessionManager"];
+	leafId: string | null;
+	totals: UsageTotals;
+} | undefined;
 
 export function getUsageTotals(ctx: ExtensionContext): UsageTotals {
-	const key = entriesKey(ctx);
-	if (usageCache && usageCache.key === key) return usageCache.totals;
+	const { sessionManager } = ctx;
+	const leafId = sessionManager.getLeafId();
+	if (usageCache?.sessionManager === sessionManager && usageCache.leafId === leafId) return usageCache.totals;
 
 	const totals: UsageTotals = {
 		input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0,
 		latestCacheHitRate: undefined,
 	};
-	for (const entry of ctx.sessionManager.getEntries()) {
+	for (const entry of sessionManager.getEntries()) {
 		let u: Usage | undefined;
 		let updateCacheHitRate = false;
 		if (entry.type === "message" && entry.message.role === "assistant") {
@@ -46,7 +44,7 @@ export function getUsageTotals(ctx: ExtensionContext): UsageTotals {
 			updateCacheHitRate = true;
 		} else if (entry.type === "message" && entry.message.role === "toolResult") {
 			u = entry.message.usage;
-		} else if (entry.type === "branch_summary" || entry.type === "compaction") {
+		} else if (entry.type === "usage" || entry.type === "branch_summary" || entry.type === "compaction") {
 			u = entry.usage;
 		}
 		if (!u) continue;
@@ -67,7 +65,7 @@ export function getUsageTotals(ctx: ExtensionContext): UsageTotals {
 				: undefined;
 		}
 	}
-	usageCache = { key, totals };
+	usageCache = { sessionManager, leafId, totals };
 	return totals;
 }
 
@@ -79,7 +77,6 @@ export function createInitialState(): FooterState {
 	return {
 		git: emptyGitStatus(),
 		runtime: null,
-		sessionStartEpoch: Date.now(),
 		workingSince: undefined,
 		lastDoneIn: undefined,
 	};