pi-open-tui 0.2.8 → 0.2.10

package/README.md

@@ -14,7 +14,7 @@ A polished TUI for [Pi](https://pi.dev) coding agent. Combines the best of pi-ha
 - **Working timer** — live elapsed time while the agent is working, done duration when finished
 - **Turn telemetry** — generation speed, TTFT, stalls, tokens, and list-price rate after each complete agent run
 - **Zero prototype patches** — uses public Pi APIs (setHeader/setFooter/setEditorComponent), safe across Pi updates
-- **Interactive settings UI** — `/open-tui` opens a tabbed settings dialog (Features / Icons / Segments / Telemetry)
+- **Interactive settings UI** — `/open-tui` opens a tabbed settings dialog (General / Icons / Footer / Telemetry)
 
 ## Install
 
@@ -35,6 +35,7 @@ Run `/open-tui` to open the interactive settings UI. Configuration is stored at
 ```json
 {
   "enabled": true,
+  "settingsLanguage": "en",
   "icons": {
     "mode": "auto"
   },
@@ -46,7 +47,8 @@ Run `/open-tui` to open the interactive settings UI. Configuration is stored at
     "runtime": true,
     "context": true,
     "tokens": true,
-    "cost": true
+    "cost": true,
+    "extensionStatuses": true
   },
   "telemetry": {
     "enabled": true,
@@ -60,8 +62,10 @@ Run `/open-tui` to open the interactive settings UI. Configuration is stored at
 }
 ```
 
+- `settingsLanguage`: language for the `/open-tui` settings UI only; `en` or `zh`
 - `icons.mode`: `auto` (detect Nerd Font), `nerd` (force Nerd Font glyphs), or `ascii` (plain fallbacks)
 - `footerSegments.gitCommit`: shows short hash + tag on detached HEAD (off by default)
+- `footerSegments.extensionStatuses`: shows statuses published by extensions through Pi's `setStatus()` API (on by default); turn it off to hide the whole status line, including MCP
 
 ## Turn telemetry
 
@@ -73,7 +77,7 @@ After each complete agent run, open-tui shows one transient notification. Tool-c
 
 The notification uses the footer's icon mode and semantic theme colors. Configure its master switch and individual TPS, TTFT, duration, token, stall, and cost segments from the **Telemetry** tab in `/open-tui`.
 
-TPS is the actual output delivery rate: provider-reported output tokens divided by the time from the first meaningful output delta through `message_end`. It excludes time-to-first-token and tool execution between assistant messages, but includes stalls during streaming. Multi-message and multi-turn runs sum only measurable token-duration pairs before calculating the rate, so an unmeasurable short tool response does not pollute or hide a measurable final response. Messages with fewer than two meaningful deltas or less than 200 ms of observed delivery time are shown as `TPS —` unless another measurable message exists in the run. The `stall` segment shows occurrence count followed by accumulated duration. The optional `$ / M` value uses the model's list-price `usage.cost.total`; it is not the session's cumulative cost shown in the footer.
+TPS is the complete generation throughput for the agent run: all provider-reported assistant output tokens divided by the summed generation time of every LLM turn, measured from `turn_start` through the assistant `message_end`. This includes time-to-first-token, hidden reasoning, buffering, and stalls so the token count and timing cover the same interval. Tool execution between turns is excluded. A run with no output tokens or no measurable generation time is shown as `TPS —`. The `stall` segment shows occurrence count followed by accumulated duration. The optional `$ / M` value uses the model's list-price `usage.cost.total`; it is not the session's cumulative cost shown in the footer.
 
 ## Local development
 

package/extensions/open-tui/config.ts

@@ -3,6 +3,8 @@ import { join } from "node:path";
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
 import type { IconMode } from "./icons.ts";
 
+export type SettingsLanguage = "en" | "zh";
+
 export type { IconMode } from "./icons.ts";
 
 export interface FooterSegments {
@@ -14,6 +16,7 @@ export interface FooterSegments {
 	context: boolean;
 	tokens: boolean;
 	cost: boolean;
+	extensionStatuses: boolean;
 }
 
 export interface TelemetryConfig {
@@ -28,6 +31,7 @@ export interface TelemetryConfig {
 
 export interface OpenTuiConfig {
 	enabled: boolean;
+	settingsLanguage: SettingsLanguage;
 	icons: {
 		mode: IconMode;
 	};
@@ -37,6 +41,7 @@ export interface OpenTuiConfig {
 
 export const DEFAULT_CONFIG: OpenTuiConfig = {
 	enabled: true,
+	settingsLanguage: "en",
 	icons: {
 		mode: "auto",
 	},
@@ -49,6 +54,7 @@ export const DEFAULT_CONFIG: OpenTuiConfig = {
 		context: true,
 		tokens: true,
 		cost: true,
+		extensionStatuses: true,
 	},
 	telemetry: {
 		enabled: true,
@@ -110,7 +116,11 @@ export function loadConfig(notify?: (msg: string, level: "warning" | "info") =>
 	try {
 		const raw = readFileSync(path, "utf8");
 		const parsed: unknown = JSON.parse(raw);
-		return deepMerge(DEFAULT_CONFIG, parsed);
+		const config = deepMerge(DEFAULT_CONFIG, parsed);
+		if (config.settingsLanguage !== "en" && config.settingsLanguage !== "zh") {
+			config.settingsLanguage = DEFAULT_CONFIG.settingsLanguage;
+		}
+		return config;
 	} catch (err) {
 		notify?.(`open-tui config parse error: ${err instanceof Error ? err.message : String(err)}`, "warning");
 		return structuredClone(DEFAULT_CONFIG);

package/extensions/open-tui/footer.ts

@@ -262,15 +262,17 @@ export function installFooter(
 
 				const mainLines = [line1, line2]
 					.map((line) => truncateToWidth(line, width, theme.fg("dim", "...")));
-				return [
-					...mainLines,
-					...renderExtensionStatusLines(
-						theme,
-						footerData.getExtensionStatuses(),
-						glyphs,
-						width,
-					),
-				];
+				return segments.extensionStatuses
+					? [
+						...mainLines,
+						...renderExtensionStatusLines(
+							theme,
+							footerData.getExtensionStatuses(),
+							glyphs,
+							width,
+						),
+					]
+					: mainLines;
 			},
 		};
 	});

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

@@ -8,23 +8,80 @@ import {
 	type TUI,
 	Text,
 } from "@earendil-works/pi-tui";
-import type { IconMode, OpenTuiConfig } from "./config.ts";
+import type { IconMode, OpenTuiConfig, SettingsLanguage } from "./config.ts";
 
 interface SettingItem {
 	id: string;
 	label: string;
 	currentValue: string;
-	values: string[];
 }
 
 type Tab = "features" | "icons" | "segments" | "telemetry";
 
-const TABS: { id: Tab; label: string }[] = [
-	{ id: "features", label: "Features" },
-	{ id: "icons", label: "Icons" },
-	{ id: "segments", label: "Segments" },
-	{ id: "telemetry", label: "Telemetry" },
-];
+const TABS: Tab[] = ["features", "icons", "segments", "telemetry"];
+
+const COPY = {
+	en: {
+		title: "Open TUI Settings",
+		tabs: { features: "General", icons: "Icons", segments: "Footer", telemetry: "Telemetry" },
+		hint: "Tab/Shift+Tab/←/→: tabs · ↑/↓: move · Enter/Space: change · Esc/q: close",
+		labels: {
+			enabled: "Enabled",
+			language: "Language",
+			iconMode: "Icon mode",
+			cwd: "CWD",
+			gitBranch: "Git branch",
+			gitStatus: "Git status",
+			gitCommit: "Git commit (detached)",
+			runtime: "Runtime",
+			context: "Context bar",
+			tokens: "Tokens",
+			cost: "Cost",
+			extensionStatuses: "Extension status line",
+			totalDuration: "Total duration",
+			tokenCounts: "Token counts",
+			stallDetails: "Stall details",
+			costRate: "Cost rate",
+		},
+		values: {
+			on: "On",
+			off: "Off",
+			languages: { en: "English", zh: "简体中文" },
+			icons: { auto: "Auto", nerd: "Nerd", ascii: "ASCII" },
+		},
+	},
+	zh: {
+		title: "Open TUI 设置",
+		tabs: { features: "常规", icons: "图标", segments: "Footer", telemetry: "遥测" },
+		hint: "Tab/Shift+Tab/←/→：切页 · ↑/↓：移动 · Enter/Space：更改 · Esc/q：关闭",
+		labels: {
+			enabled: "启用",
+			language: "语言",
+			iconMode: "图标模式",
+			cwd: "当前目录",
+			gitBranch: "Git 分支",
+			gitStatus: "Git 状态",
+			gitCommit: "Git 提交（分离 HEAD）",
+			runtime: "运行环境",
+			context: "上下文栏",
+			tokens: "Token",
+			cost: "费用",
+			extensionStatuses: "扩展状态行",
+			totalDuration: "总耗时",
+			tokenCounts: "Token 数量",
+			stallDetails: "停顿详情",
+			costRate: "费用速率",
+		},
+		values: {
+			on: "开启",
+			off: "关闭",
+			languages: { en: "English", zh: "简体中文" },
+			icons: { auto: "自动", nerd: "Nerd", ascii: "ASCII" },
+		},
+	},
+} as const;
+
+type SettingsCopy = (typeof COPY)[SettingsLanguage];
 
 function toggleSetting(config: OpenTuiConfig, key: keyof OpenTuiConfig["footerSegments"]): OpenTuiConfig {
 	return {
@@ -47,6 +104,10 @@ function toggleEnabled(config: OpenTuiConfig): OpenTuiConfig {
 	return { ...config, enabled: !config.enabled };
 }
 
+function toggleLanguage(config: OpenTuiConfig): OpenTuiConfig {
+	return { ...config, settingsLanguage: config.settingsLanguage === "en" ? "zh" : "en" };
+}
+
 function toggleTelemetry(config: OpenTuiConfig, key: keyof OpenTuiConfig["telemetry"]): OpenTuiConfig {
 	return {
 		...config,
@@ -54,61 +115,54 @@ function toggleTelemetry(config: OpenTuiConfig, key: keyof OpenTuiConfig["teleme
 	};
 }
 
-function buildFeaturesItems(config: OpenTuiConfig): SettingItem[] {
+function buildFeaturesItems(config: OpenTuiConfig, copy: SettingsCopy): SettingItem[] {
 	return [
-		{
-			id: "enabled",
-			label: "Enabled",
-			currentValue: config.enabled ? "on" : "off",
-			values: ["on", "off"],
-		},
+		{ id: "enabled", label: copy.labels.enabled, currentValue: config.enabled ? copy.values.on : copy.values.off },
+		{ id: "settingsLanguage", label: copy.labels.language, currentValue: copy.values.languages[config.settingsLanguage] },
 	];
 }
 
-function buildIconsItems(config: OpenTuiConfig): SettingItem[] {
-	return [
-		{
-			id: "mode",
-			label: "Icon mode",
-			currentValue: config.icons.mode,
-			values: ["auto", "nerd", "ascii"],
-		},
-	];
+function buildIconsItems(config: OpenTuiConfig, copy: SettingsCopy): SettingItem[] {
+	return [{ id: "mode", label: copy.labels.iconMode, currentValue: copy.values.icons[config.icons.mode] }];
 }
 
-function buildSegmentsItems(config: OpenTuiConfig): SettingItem[] {
+function buildSegmentsItems(config: OpenTuiConfig, copy: SettingsCopy): SettingItem[] {
 	const segs = config.footerSegments;
+	const flag = (value: boolean) => value ? copy.values.on : copy.values.off;
 	return [
-		{ id: "cwd", label: "cwd", currentValue: segs.cwd ? "on" : "off", values: ["on", "off"] },
-		{ id: "gitBranch", label: "git branch", currentValue: segs.gitBranch ? "on" : "off", values: ["on", "off"] },
-		{ id: "gitStatus", label: "git status", currentValue: segs.gitStatus ? "on" : "off", values: ["on", "off"] },
-		{ id: "gitCommit", label: "git commit (detached)", currentValue: segs.gitCommit ? "on" : "off", values: ["on", "off"] },
-		{ id: "runtime", label: "runtime", currentValue: segs.runtime ? "on" : "off", values: ["on", "off"] },
-		{ id: "context", label: "context bar", currentValue: segs.context ? "on" : "off", values: ["on", "off"] },
-		{ id: "tokens", label: "tokens", currentValue: segs.tokens ? "on" : "off", values: ["on", "off"] },
-		{ id: "cost", label: "cost", currentValue: segs.cost ? "on" : "off", values: ["on", "off"] },
+		{ id: "cwd", label: copy.labels.cwd, currentValue: flag(segs.cwd) },
+		{ id: "gitBranch", label: copy.labels.gitBranch, currentValue: flag(segs.gitBranch) },
+		{ id: "gitStatus", label: copy.labels.gitStatus, currentValue: flag(segs.gitStatus) },
+		{ id: "gitCommit", label: copy.labels.gitCommit, currentValue: flag(segs.gitCommit) },
+		{ id: "runtime", label: copy.labels.runtime, currentValue: flag(segs.runtime) },
+		{ id: "context", label: copy.labels.context, currentValue: flag(segs.context) },
+		{ id: "tokens", label: copy.labels.tokens, currentValue: flag(segs.tokens) },
+		{ id: "cost", label: copy.labels.cost, currentValue: flag(segs.cost) },
+		{ id: "extensionStatuses", label: copy.labels.extensionStatuses, currentValue: flag(segs.extensionStatuses) },
 	];
 }
 
-function buildTelemetryItems(config: OpenTuiConfig): SettingItem[] {
+function buildTelemetryItems(config: OpenTuiConfig, copy: SettingsCopy): SettingItem[] {
 	const telemetry = config.telemetry;
+	const flag = (value: boolean) => value ? copy.values.on : copy.values.off;
 	return [
-		{ id: "enabled", label: "Enabled", currentValue: telemetry.enabled ? "on" : "off", values: ["on", "off"] },
-		{ id: "tps", label: "TPS", currentValue: telemetry.tps ? "on" : "off", values: ["on", "off"] },
-		{ id: "ttft", label: "TTFT", currentValue: telemetry.ttft ? "on" : "off", values: ["on", "off"] },
-		{ id: "duration", label: "total duration", currentValue: telemetry.duration ? "on" : "off", values: ["on", "off"] },
-		{ id: "tokens", label: "token counts", currentValue: telemetry.tokens ? "on" : "off", values: ["on", "off"] },
-		{ id: "stalls", label: "stall details", currentValue: telemetry.stalls ? "on" : "off", values: ["on", "off"] },
-		{ id: "cost", label: "cost rate", currentValue: telemetry.cost ? "on" : "off", values: ["on", "off"] },
+		{ id: "enabled", label: copy.labels.enabled, currentValue: flag(telemetry.enabled) },
+		{ id: "tps", label: "TPS", currentValue: flag(telemetry.tps) },
+		{ id: "ttft", label: "TTFT", currentValue: flag(telemetry.ttft) },
+		{ id: "duration", label: copy.labels.totalDuration, currentValue: flag(telemetry.duration) },
+		{ id: "tokens", label: copy.labels.tokenCounts, currentValue: flag(telemetry.tokens) },
+		{ id: "stalls", label: copy.labels.stallDetails, currentValue: flag(telemetry.stalls) },
+		{ id: "cost", label: copy.labels.costRate, currentValue: flag(telemetry.cost) },
 	];
 }
 
 function buildItems(tab: Tab, config: OpenTuiConfig): SettingItem[] {
+	const copy = COPY[config.settingsLanguage];
 	switch (tab) {
-		case "features": return buildFeaturesItems(config);
-		case "icons": return buildIconsItems(config);
-		case "segments": return buildSegmentsItems(config);
-		case "telemetry": return buildTelemetryItems(config);
+		case "features": return buildFeaturesItems(config, copy);
+		case "icons": return buildIconsItems(config, copy);
+		case "segments": return buildSegmentsItems(config, copy);
+		case "telemetry": return buildTelemetryItems(config, copy);
 	}
 }
 
@@ -117,12 +171,11 @@ function handleSettingChange(
 	itemId: string,
 	config: OpenTuiConfig,
 ): OpenTuiConfig {
-	if (tab === "features" && itemId === "enabled") {
-		return toggleEnabled(config);
-	}
-	if (tab === "icons" && itemId === "mode") {
-		return cycleIconMode(config);
+	if (tab === "features") {
+		if (itemId === "enabled") return toggleEnabled(config);
+		if (itemId === "settingsLanguage") return toggleLanguage(config);
 	}
+	if (tab === "icons" && itemId === "mode") return cycleIconMode(config);
 	if (tab === "segments") {
 		return toggleSetting(config, itemId as keyof OpenTuiConfig["footerSegments"]);
 	}
@@ -149,6 +202,7 @@ class SettingsUi implements SettingsUiHandle {
 	private readonly onClose: () => void;
 	private cachedWidth: number | undefined;
 	private cachedLines: string[] | undefined;
+	private compact = false;
 
 	constructor(
 		theme: Theme,
@@ -171,22 +225,36 @@ class SettingsUi implements SettingsUiHandle {
 		this.rebuild();
 	}
 
+	private applySetting(itemId: string): void {
+		this.selectedItemByTab[this.tab] = itemId;
+		this.config = handleSettingChange(this.tab, itemId, this.config);
+		this.onChange(this.config);
+		this.rebuild(itemId);
+	}
+
+	private switchTab(offset: number): void {
+		const idx = TABS.indexOf(this.tab);
+		this.tab = TABS[(idx + offset + TABS.length) % TABS.length]!;
+		this.rebuild();
+	}
+
 	private rebuild(preferredItemId = this.selectedItemByTab[this.tab]): void {
+		const copy = COPY[this.config.settingsLanguage];
 		this.container.clear();
-		this.container.addChild(new Text(this.theme.bold(this.theme.fg("accent", "Open TUI Settings")), 1, 0));
+		this.container.addChild(new Text(this.theme.bold(this.theme.fg("accent", copy.title)), 1, 0));
 
-		const tabBar = TABS.map((t) => {
-			const active = t.id === this.tab;
-			const label = active ? `[${t.label}]` : ` ${t.label} `;
+		const tabBar = TABS.map((tab) => {
+			const active = tab === this.tab;
+			const label = active ? `[${copy.tabs[tab]}]` : ` ${copy.tabs[tab]} `;
 			return active ? this.theme.fg("accent", label) : this.theme.fg("dim", label);
 		}).join(" ");
 		this.container.addChild(new Text(tabBar, 1, 0));
-		this.container.addChild(new Text(this.theme.fg("dim", "Tab/Shift+Tab to switch · Enter to toggle · Esc to close"), 1, 0));
+		this.container.addChild(new Text(this.theme.fg("dim", copy.hint), 1, 0));
 
 		const items = buildItems(this.tab, this.config).map((item) => ({
 			value: item.id,
-			label: item.label,
-			description: item.currentValue,
+			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, 10), {
 			selectedPrefix: (t) => this.theme.fg("accent", t),
@@ -204,11 +272,7 @@ class SettingsUi implements SettingsUiHandle {
 			this.selectedItemByTab[this.tab] = item.value;
 		};
 		this.selectList.onSelect = (item) => {
-			this.selectedItemByTab[this.tab] = item.value;
-			this.config = handleSettingChange(this.tab, item.value, this.config);
-			this.onChange(this.config);
-			this.rebuild(item.value);
-			this.invalidate();
+			this.applySetting(item.value);
 		};
 		this.selectList.onCancel = () => {
 			this.onClose();
@@ -220,30 +284,35 @@ class SettingsUi implements SettingsUiHandle {
 	}
 
 	handleInput(data: string): void {
-		if (matchesKey(data, Key.tab)) {
-			const idx = TABS.findIndex((t) => t.id === this.tab);
-			this.tab = TABS[(idx + 1) % TABS.length]!.id;
-			this.rebuild();
+		if (matchesKey(data, Key.tab) || matchesKey(data, Key.right)) {
+			this.switchTab(1);
 			this.invalidate();
 			return;
 		}
-		if (matchesKey(data, Key.shift("tab"))) {
-			const idx = TABS.findIndex((t) => t.id === this.tab);
-			this.tab = TABS[(idx - 1 + TABS.length) % TABS.length]!.id;
-			this.rebuild();
+		if (matchesKey(data, Key.shift("tab")) || matchesKey(data, Key.left)) {
+			this.switchTab(-1);
 			this.invalidate();
 			return;
 		}
-		if (matchesKey(data, Key.escape)) {
+		if (matchesKey(data, Key.escape) || matchesKey(data, "q")) {
 			this.onClose();
 			return;
 		}
-		this.selectList.handleInput?.(data);
-		this.invalidate();
+		if (matchesKey(data, Key.space) || data === " ") {
+			const selected = this.selectList.getSelectedItem();
+			if (selected) this.applySetting(selected.value);
+		} else {
+			this.selectList.handleInput?.(data);
+		}
 		this.invalidate();
 	}
 
 	render(width: number): string[] {
+		const compact = width <= 60;
+		if (compact !== this.compact) {
+			this.compact = compact;
+			this.rebuild();
+		}
 		if (this.cachedLines && this.cachedWidth === width) return this.cachedLines;
 		this.cachedWidth = width;
 		this.cachedLines = this.container.render(width);

package/extensions/open-tui/telemetry.ts

@@ -14,8 +14,6 @@ import { resolveGlyphs } from "./icons.ts";
 import { fmtTokens, formatDuration } from "./utils.ts";
 
 const STALL_THRESHOLD_MS = 1000;
-const MIN_STREAM_UPDATES = 2;
-const MIN_MEASUREMENT_MS = 200;
 
 type TelemetryEvent =
 	| AgentStartEvent
@@ -30,24 +28,16 @@ type AgentMessage = MessageStartEvent["message"];
 type AssistantMessage = Extract<AgentMessage, { role: "assistant" }>;
 
 interface MessageTiming {
-	startMs: number;
 	lastUpdateMs: number;
 	firstOutputMs: number | null;
-	streamUpdateCount: number;
 	inStall: boolean;
 }
 
-interface MessageMeasurement {
-	outputTokens: number;
-	durationMs: number;
-}
-
 interface TurnTiming {
 	startMs: number;
 	firstTokenMs: number | null;
 	currentMessage: MessageTiming | null;
 	messages: AssistantMessage[];
-	measurements: MessageMeasurement[];
 	generationMs: number;
 	stallMs: number;
 	stallCount: number;
@@ -68,11 +58,6 @@ export interface TurnTelemetry {
 	measurementMs: number | null;
 }
 
-interface MeasuredTurn {
-	telemetry: TurnTelemetry;
-	measuredOutputTokens: number;
-}
-
 function isAssistantMessage(message: AgentMessage): message is AssistantMessage {
 	return message.role === "assistant";
 }
@@ -86,7 +71,7 @@ export class TurnTelemetryTracker {
 	private readonly now: () => number;
 	private turn: TurnTiming | undefined;
 	private agentStartMs: number | null = null;
-	private agentTurns: MeasuredTurn[] = [];
+	private agentTurns: TurnTelemetry[] = [];
 
 	constructor(now: () => number = () => performance.now()) {
 		this.now = now;
@@ -127,7 +112,6 @@ export class TurnTelemetryTracker {
 			firstTokenMs: null,
 			currentMessage: null,
 			messages: [],
-			measurements: [],
 			generationMs: 0,
 			stallMs: 0,
 			stallCount: 0,
@@ -138,10 +122,8 @@ export class TurnTelemetryTracker {
 		if (!this.turn || !isAssistantMessage(message)) return;
 		const now = this.now();
 		this.turn.currentMessage = {
-			startMs: now,
 			lastUpdateMs: now,
 			firstOutputMs: null,
-			streamUpdateCount: 0,
 			inStall: false,
 		};
 	}
@@ -163,13 +145,10 @@ export class TurnTelemetryTracker {
 		if (current.firstOutputMs === null) {
 			current.firstOutputMs = now;
 			turn.firstTokenMs ??= now;
-			current.streamUpdateCount = 1;
 			current.lastUpdateMs = now;
 			return;
 		}
 
-		current.streamUpdateCount++;
-
 		const gap = now - current.lastUpdateMs;
 		if (gap >= STALL_THRESHOLD_MS) {
 			if (!current.inStall) turn.stallCount++;
@@ -188,30 +167,22 @@ export class TurnTelemetryTracker {
 		const current = turn.currentMessage;
 		if (current) {
 			const endMs = this.now();
-			turn.generationMs += endMs - current.startMs;
+			turn.generationMs = endMs - turn.startMs;
 			if (current.firstOutputMs === null && message.usage.output > 0) {
 				turn.firstTokenMs ??= endMs;
 			}
-			const measurementMs = current.firstOutputMs === null ? 0 : endMs - current.firstOutputMs;
-			if (
-				message.usage.output > 0 &&
-				current.streamUpdateCount >= MIN_STREAM_UPDATES &&
-				measurementMs >= MIN_MEASUREMENT_MS
-			) {
-				turn.measurements.push({ outputTokens: message.usage.output, durationMs: measurementMs });
-			}
 			turn.currentMessage = null;
 		}
 		turn.messages.push(message);
 	}
 
 	private endTurnAndCollect(): TurnTelemetry | undefined {
-		const result = this.endTurn();
-		if (result && this.agentStartMs !== null) this.agentTurns.push(result);
-		return result?.telemetry;
+		const telemetry = this.endTurn();
+		if (telemetry && this.agentStartMs !== null) this.agentTurns.push(telemetry);
+		return telemetry;
 	}
 
-	private endTurn(): MeasuredTurn | undefined {
+	private endTurn(): TurnTelemetry | undefined {
 		const turn = this.turn;
 		this.turn = undefined;
 		if (!turn || turn.firstTokenMs === null || turn.messages.length === 0) return;
@@ -231,32 +202,27 @@ export class TurnTelemetryTracker {
 			throw new Error("Invalid assistant usage in turn telemetry");
 		}
 
-		const measuredOutputTokens = turn.measurements.reduce((sum, measurement) => sum + measurement.outputTokens, 0);
-		const measuredMs = turn.measurements.reduce((sum, measurement) => sum + measurement.durationMs, 0);
-		const measurementMs = measuredMs > 0 ? measuredMs : null;
+		const measurementMs = outputTokens > 0 && turn.generationMs > 0 ? turn.generationMs : null;
 		const tps = measurementMs === null
 			? null
-			: round(measuredOutputTokens / (measurementMs / 1000), 1);
+			: round(outputTokens / (measurementMs / 1000), 1);
 		const validCost = Number.isFinite(costUsd) && costUsd > 0;
 		const validTokens = Number.isFinite(totalTokens) && totalTokens > 0;
 		return {
-			telemetry: {
-				tps,
-				ttftMs: turn.firstTokenMs - turn.startMs,
-				totalMs: endMs - turn.startMs,
-				inputTokens,
-				outputTokens,
-				stallMs: turn.stallMs,
-				stallCount: turn.stallCount,
-				rateUsdPerMTokens: validCost && validTokens
-					? round(costUsd / (totalTokens / 1_000_000), 2)
-					: null,
-				generationMs: turn.generationMs,
-				totalTokens,
-				costUsd: validCost ? costUsd : 0,
-				measurementMs,
-			},
-			measuredOutputTokens,
+			tps,
+			ttftMs: turn.firstTokenMs - turn.startMs,
+			totalMs: endMs - turn.startMs,
+			inputTokens,
+			outputTokens,
+			stallMs: turn.stallMs,
+			stallCount: turn.stallCount,
+			rateUsdPerMTokens: validCost && validTokens
+				? round(costUsd / (totalTokens / 1_000_000), 2)
+				: null,
+			generationMs: turn.generationMs,
+			totalTokens,
+			costUsd: validCost ? costUsd : 0,
+			measurementMs,
 		};
 	}
 
@@ -267,29 +233,28 @@ export class TurnTelemetryTracker {
 		this.agentTurns = [];
 		if (startMs === null || turns.length === 0) return;
 
-		const outputTokens = turns.reduce((sum, turn) => sum + turn.telemetry.outputTokens, 0);
-		const inputTokens = turns.reduce((sum, turn) => sum + turn.telemetry.inputTokens, 0);
-		const totalTokens = turns.reduce((sum, turn) => sum + turn.telemetry.totalTokens, 0);
-		const costUsd = turns.reduce((sum, turn) => sum + turn.telemetry.costUsd, 0);
-		const stallMs = turns.reduce((sum, turn) => sum + turn.telemetry.stallMs, 0);
-		const stallCount = turns.reduce((sum, turn) => sum + turn.telemetry.stallCount, 0);
-		const measuredOutputTokens = turns.reduce((sum, turn) => sum + turn.measuredOutputTokens, 0);
-		const measuredMs = turns.reduce((sum, turn) => sum + (turn.telemetry.measurementMs ?? 0), 0);
-		const measurementMs = measuredMs > 0 ? measuredMs : null;
+		const outputTokens = turns.reduce((sum, turn) => sum + turn.outputTokens, 0);
+		const inputTokens = turns.reduce((sum, turn) => sum + turn.inputTokens, 0);
+		const totalTokens = turns.reduce((sum, turn) => sum + turn.totalTokens, 0);
+		const costUsd = turns.reduce((sum, turn) => sum + turn.costUsd, 0);
+		const stallMs = turns.reduce((sum, turn) => sum + turn.stallMs, 0);
+		const stallCount = turns.reduce((sum, turn) => sum + turn.stallCount, 0);
+		const generationMs = turns.reduce((sum, turn) => sum + turn.generationMs, 0);
+		const measurementMs = outputTokens > 0 && generationMs > 0 ? generationMs : null;
 		const tps = measurementMs === null
 			? null
-			: round(measuredOutputTokens / (measurementMs / 1000), 1);
+			: round(outputTokens / (measurementMs / 1000), 1);
 		const validRate = costUsd > 0 && totalTokens > 0;
 		return {
 			tps,
-			ttftMs: turns[0]!.telemetry.ttftMs,
+			ttftMs: turns[0]!.ttftMs,
 			totalMs: this.now() - startMs,
 			inputTokens,
 			outputTokens,
 			stallMs,
 			stallCount,
 			rateUsdPerMTokens: validRate ? round(costUsd / (totalTokens / 1_000_000), 2) : null,
-			generationMs: turns.reduce((sum, turn) => sum + turn.telemetry.generationMs, 0),
+			generationMs,
 			totalTokens,
 			costUsd,
 			measurementMs,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-open-tui",
-  "version": "0.2.8",
+  "version": "0.2.10",
   "description": "A polished TUI for Pi coding agent: animated logo header, Starship-style footer, rounded editor with model metadata, and prompt-box user messages. Combines the best of pi-haiku, pi-claude-code-tui, and pi-zentui.",
   "type": "module",
   "repository": {