pi-open-tui 0.3.12 → 0.3.14

package/README.md

@@ -75,6 +75,7 @@ Run `/open-tui` to open the settings dialog. It provides **General**, **Appearan
     "context": true,
     "tokens": true,
     "cost": true,
+    "liveTps": true,
     "extensionStatuses": true,
     "capitalizeProviderName": true,
     "nerdIconSpacing": false
@@ -122,6 +123,8 @@ After each complete agent run, pi-open-tui shows one transient result. Tool-call
 
 TPS is calculated from all provider-reported assistant output tokens divided by the total generation time across the run. Timing starts at `turn_start` and ends at the assistant `message_end`, so it includes TTFT, hidden reasoning, buffering, and stalls; tool execution between turns is excluded. Runs without output tokens or measurable generation time show `TPS —`.
 
+While a response streams, the working timer also shows the current estimated speed, for example `working 12.3s · ~54 tok/s`. The `~` marks it as an estimate: it is the rate over the last 2 seconds of streamed text, thinking, and tool-call arguments, estimated at about 4 characters per token for Latin text and code and 1 token per CJK character. It drops toward zero during stalls and stays dimmed at its last value during tool execution and between messages. It is controlled by **Footer → Live TPS** (`footerSegments.liveTps`), independently of the telemetry notification. It disappears when the run ends; the exact TPS above is the authoritative value.
+
 The `$ / M` value is the model's list-price rate from `usage.cost.total`, not the cumulative session cost shown in the footer. Every telemetry field can be toggled from the **Telemetry** tab.
 
 ## Thinking peek

package/README.zh-CN.md

@@ -75,6 +75,7 @@ pi -e npm:pi-open-tui
     "context": true,
     "tokens": true,
     "cost": true,
+    "liveTps": true,
     "extensionStatuses": true,
     "capitalizeProviderName": true,
     "nerdIconSpacing": false
@@ -122,6 +123,8 @@ pi -e npm:pi-open-tui
 
 TPS 的计算方式是：将本次运行中服务商报告的全部 Assistant 输出 Token，除以各个生成轮次的总耗时。计时范围从 `turn_start` 到 Assistant 的 `message_end`，包含 TTFT、隐藏推理、缓冲和停顿，但不包含轮次之间的工具执行时间。没有输出 Token 或无法测得生成时间时，会显示 `TPS —`。
 
+回复流式输出时，工作计时器还会显示当前的估算速度，例如 `working 12.3s · ~54 tok/s`。`~` 表示估算值：它是最近 2 秒内流式输出的正文、思考内容和工具调用参数的速率，按拉丁文本和代码约 4 个字符 1 个 Token、中日韩字符每字 1 个 Token 估算。停顿时数值会逐渐降向零；工具执行期间和消息之间以暗色保留上一个值。由**底栏 → 实时 TPS**（`footerSegments.liveTps`）控制，与遥测通知的开关互不影响。运行结束后不再显示，以上面的精确 TPS 为准。
+
 `$ / M` 表示根据 `usage.cost.total` 得到的模型标价速率，不是底栏中的会话累计费用。所有遥测字段都可以在**遥测**页单独开关。
 
 ## 思考预览

package/extensions/open-tui/config.ts

@@ -20,6 +20,7 @@ export interface FooterSegments {
 	context: boolean;
 	tokens: boolean;
 	cost: boolean;
+	liveTps: boolean;
 	extensionStatuses: boolean;
 	capitalizeProviderName: boolean;
 	nerdIconSpacing: boolean;
@@ -71,6 +72,7 @@ export const DEFAULT_CONFIG: OpenTuiConfig = {
 		context: true,
 		tokens: true,
 		cost: true,
+		liveTps: true,
 		extensionStatuses: true,
 		capitalizeProviderName: true,
 		nerdIconSpacing: false,

package/extensions/open-tui/editor.ts

@@ -40,6 +40,8 @@ export interface InlineFooterRenderer {
 
 interface HiddenThinkingLabelComponent {
 	children: unknown[];
+	outputPad?: unknown;
+	render(width: number): string[];
 	setHiddenThinkingLabel(label: string): void;
 	setHideThinkingBlock(hide: boolean): void;
 	updateContent(message: unknown, isStreaming?: boolean): void;
@@ -48,6 +50,7 @@ interface HiddenThinkingLabelComponent {
 function isHiddenThinkingLabelComponent(value: object): value is HiddenThinkingLabelComponent {
 	const component = value as unknown as Record<string, unknown>;
 	return Array.isArray(component.children)
+		&& typeof component.render === "function"
 		&& typeof component.setHiddenThinkingLabel === "function"
 		&& typeof component.setHideThinkingBlock === "function"
 		&& typeof component.updateContent === "function";
@@ -71,6 +74,13 @@ function findLatestHiddenThinkingLabel(tui: TUI): HiddenThinkingLabelComponent {
 	return latest;
 }
 
+/** Width Pi's hidden-thinking `Text(label, outputPad, 0)` wraps at when its message renders at `width`. */
+function hiddenThinkingTextWidth(width: number, outputPad: unknown): number {
+	const pad = typeof outputPad === "number" && Number.isFinite(outputPad) ? Math.max(0, Math.floor(outputPad)) : 1;
+	const paddingX = Math.min(pad, Math.max(0, Math.floor((width - 1) / 2)));
+	return Math.max(1, width - paddingX * 2);
+}
+
 function removeSoftwareCursor(line: string, cursorMarker = ""): string {
 	return line.replace(/\x1b\[7m([\s\S]*?)\x1b\[0m/g, (_match, cursor: string) => {
 		const replacement = `${cursorMarker}${cursor}`;
@@ -308,6 +318,42 @@ export class OpenTuiEditor extends CustomEditor {
 	}
 }
 
+type StreamWrite = (...args: unknown[]) => boolean;
+
+/**
+ * Calls `requestRepaint` after each raw write to a TTY stream. Pi's fullscreen renderer only
+ * rewrites changed rows, so text other extensions print straight to the terminal would
+ * otherwise stay over the editor and footer until a resize.
+ */
+export function repaintAfterStreamWrites(
+	requestRepaint: () => void,
+	stream: NodeJS.WriteStream = process.stderr,
+): () => void {
+	if (!stream.isTTY) return () => {};
+	const original = stream.write as unknown as StreamWrite;
+	let enabled = true;
+	const patched = ((...args: unknown[]) => {
+		const callback = typeof args[args.length - 1] === "function"
+			? (args.pop() as (error?: Error | null) => void)
+			: undefined;
+		// Repaint from the write callback so the redraw lands after the stray text.
+		return original.call(stream, ...args, (error?: Error | null) => {
+			try {
+				if (enabled) requestRepaint();
+			} catch {
+				// A failed repaint must not break the caller's write; logging it here would recurse.
+			}
+			callback?.(error);
+		});
+	}) as typeof stream.write;
+	stream.write = patched;
+	return () => {
+		enabled = false;
+		// A later wrapper may still delegate to ours; leave it as a passthrough then.
+		if (stream.write === patched) stream.write = original as unknown as typeof stream.write;
+	};
+}
+
 export function installEditor(
 	_pi: ExtensionAPI,
 	ctx: ExtensionContext,
@@ -319,41 +365,69 @@ export function installEditor(
 	let previousHardwareCursor: boolean | undefined;
 	let currentCursorStyle = cursorStyle;
 	let hiddenThinkingTarget: HiddenThinkingLabelComponent | undefined;
+	let restoreHiddenThinkingRender: (() => void) | undefined;
+	let buildHiddenThinkingLabel: ((width: number) => string) | undefined;
 	const getActiveTui = (): TUI => {
 		if (!activeTui) throw new Error("Open TUI editor is not mounted");
 		return activeTui;
 	};
+	const resetHiddenThinkingTarget = (): void => {
+		restoreHiddenThinkingRender?.();
+		restoreHiddenThinkingRender = undefined;
+		hiddenThinkingTarget = undefined;
+		buildHiddenThinkingLabel = undefined;
+	};
+	// Build the label at the width Pi actually renders the message with; layout
+	// extensions (e.g. pi-sidebar) can make it much narrower than the terminal.
+	const patchHiddenThinkingRender = (target: HiddenThinkingLabelComponent): void => {
+		const originalRender = target.render;
+		let lastWidth: number | undefined;
+		let lastBuild: ((width: number) => string) | undefined;
+		target.render = function (this: HiddenThinkingLabelComponent, width: number): string[] {
+			const build = buildHiddenThinkingLabel;
+			const textWidth = hiddenThinkingTextWidth(width, this.outputPad);
+			if (build && (build !== lastBuild || textWidth !== lastWidth)) {
+				lastBuild = build;
+				lastWidth = textWidth;
+				this.setHiddenThinkingLabel(build(textWidth));
+			}
+			return originalRender.call(this, width);
+		};
+		restoreHiddenThinkingRender = () => {
+			target.render = originalRender;
+		};
+	};
+	// Only the fullscreen renderer clears and rewrites the whole screen on a forced render.
+	const restoreStderr = repaintAfterStreamWrites(() => {
+		if (activeTui?.mode === "fullscreen") activeTui.requestRender(true);
+	});
 
 	ctx.ui.setEditorComponent((tui, editorTheme, keybindings) => {
 		activeTui = tui;
-		hiddenThinkingTarget = undefined;
+		resetHiddenThinkingTarget();
 		previousHardwareCursor = tui.getShowHardwareCursor();
 		activeEditor = new OpenTuiEditor(tui, editorTheme, keybindings, currentCursorStyle, inlineFooter);
 		return activeEditor;
 	});
 	return {
-		getViewportWidth(): number {
-			const columns = getActiveTui().terminal.columns;
-			if (typeof columns !== "number" || !Number.isFinite(columns)) {
-				throw new Error("Open TUI editor terminal has an invalid width");
-			}
-			return Math.max(1, Math.floor(columns));
-		},
-		setLatestHiddenThinkingLabel(label: string): void {
+		/** `build` receives the hidden-thinking text width and runs again whenever that width changes. */
+		setLatestHiddenThinkingLabel(build: (width: number) => string): void {
 			const tui = getActiveTui();
-			hiddenThinkingTarget ??= findLatestHiddenThinkingLabel(tui);
-			hiddenThinkingTarget.setHiddenThinkingLabel(label);
+			if (!hiddenThinkingTarget) {
+				hiddenThinkingTarget = findLatestHiddenThinkingLabel(tui);
+				patchHiddenThinkingRender(hiddenThinkingTarget);
+			}
+			buildHiddenThinkingLabel = build;
 			tui.requestRender();
 		},
-		resetHiddenThinkingLabelTarget(): void {
-			hiddenThinkingTarget = undefined;
-		},
+		resetHiddenThinkingLabelTarget: resetHiddenThinkingTarget,
 		setCursorStyle(nextCursorStyle: CursorStyle): void {
 			currentCursorStyle = nextCursorStyle;
 			activeEditor?.setCursorStyle(nextCursorStyle, previousHardwareCursor);
 		},
 		cleanup(): void {
-			hiddenThinkingTarget = undefined;
+			restoreStderr();
+			resetHiddenThinkingTarget();
 			ctx.ui.setEditorComponent(undefined);
 			if (activeTui) {
 				if (currentCursorStyle !== "block") activeTui.terminal.write(DEFAULT_CURSOR_STYLE_SEQUENCE);

package/extensions/open-tui/footer.ts

@@ -6,6 +6,7 @@ import type { IconGlyphs } from "./icons.ts";
 import { resolveGlyphs, resolveIconMode, runtimeSymbol } from "./icons.ts";
 import type { GitStatus } from "./git.ts";
 import type { RuntimeInfo } from "./runtime.ts";
+import type { LiveTps } from "./telemetry.ts";
 import {
 	alignRight,
 	basenamePath,
@@ -224,6 +225,7 @@ function renderExtensionStatusLines(
 export interface FooterHooks {
 	setRequestRender: (fn: (() => void) | undefined) => void;
 	scheduleGitRefresh: () => void;
+	getLiveTps?: () => LiveTps | null;
 }
 
 interface FooterDataLike {
@@ -283,6 +285,7 @@ function renderFooterContent(
 	theme: Theme,
 	footerData: FooterDataLike,
 	width: number,
+	getLiveTps: () => LiveTps | null,
 ): { mainLines: [string, string]; inlineLines: InlineFooterLines; extensionLines: string[] } {
 	if (width <= 0) {
 		return {
@@ -364,7 +367,14 @@ function renderFooterContent(
 	}
 	const timerSeg = renderTimerSegment(theme, state, glyphs);
 	if (timerSeg) {
-		leftParts.push({ text: timerSeg, priority: 1 });
+		const liveTps = state.workingSince !== undefined && segments.liveTps
+			? getLiveTps()
+			: null;
+		const text = liveTps === null
+			? timerSeg
+			: `${timerSeg} ${theme.fg("dim", "·")} ${theme.fg(liveTps.stale ? "dim" : "accent", `${glyphs.speed} ~${Math.round(liveTps.tps)} tok/s`)}`;
+		// Narrow widths shed the live TPS before the timer itself.
+		leftParts.push({ text, compactText: liveTps === null ? undefined : timerSeg, priority: 1 });
 		inlineTopRightParts.push(leftParts.at(-1)!);
 	}
 
@@ -443,6 +453,7 @@ export function installFooter(
 			theme,
 			footerData,
 			width,
+			hooks.getLiveTps ?? (() => null),
 		);
 
 		renderInline = (width) => getContent(width).inlineLines;

package/extensions/open-tui/git.ts

@@ -77,11 +77,13 @@ export async function readGitStatus(
 				status.branch = undefined;
 				status.commit = { oid: null, detached: true, tag: null };
 			} else {
-				const branchMatch = branchPart.match(/^(\S+?)(?:\.\.\.(\S+))?(?:\s+\[(ahead|behind) (\d+)\])?$/);
+				const branchMatch = branchPart.match(/^(\S+?)(?:\.\.\.(\S+))?(?:\s+\[(.*)\])?$/);
 				if (branchMatch) {
 					status.branch = branchMatch[1];
-					if (branchMatch[3] === "ahead") status.ahead = parseInt(branchMatch[4]!, 10);
-					if (branchMatch[3] === "behind") status.behind = parseInt(branchMatch[4]!, 10);
+					const ahead = branchMatch[3]?.match(/\bahead (\d+)\b/);
+					const behind = branchMatch[3]?.match(/\bbehind (\d+)\b/);
+					if (ahead) status.ahead = parseInt(ahead[1]!, 10);
+					if (behind) status.behind = parseInt(behind[1]!, 10);
 				}
 			}
 			continue;
@@ -103,7 +105,7 @@ export async function readGitStatus(
 		const x = line[0]!;
 		const y = line[1]!;
 
-		if (x === "U" || y === "U" || (x === "C" && y === "C")) status.conflicted++;
+		if (x === "U" || y === "U" || (x === "A" && y === "A") || (x === "D" && y === "D")) status.conflicted++;
 		else if (x === "?" && y === "?") status.untracked++;
 		else if (x === "R") status.renamed++;
 		else if (x === "D" || y === "D") status.deleted++;

package/extensions/open-tui/index.ts

@@ -24,9 +24,6 @@ import {
 } from "./peek.ts";
 
 type PendingUiChange = "install" | "uninstall";
-const HIDDEN_THINKING_HORIZONTAL_PADDING = 2;
-// Pi's fullscreen transcript can reserve one more column for its scrollbar.
-const HIDDEN_THINKING_SCROLLBAR_RESERVE = 1;
 
 export function getPendingUiChange(enabled: boolean, active: boolean): PendingUiChange | undefined {
 	if (enabled === active) return undefined;
@@ -78,29 +75,16 @@ export default function (pi: ExtensionAPI) {
 	/** Pi decides whether this label is visible; our toggle only controls updates. */
 	const isPeekEnabled = () => sessionLifecycle.isCurrent() && config.enabled && config.thinkingPeek.lines > 0 && active;
 
-	/** Keep each native hidden-thinking label row within Pi's narrowest transcript width. */
-	const hiddenThinkingLabelWidth = (): number => {
-		if (!editor) throw new Error("Open TUI editor is not installed");
-		return Math.max(
-			1,
-			editor.getViewportWidth() - HIDDEN_THINKING_HORIZONTAL_PADDING - HIDDEN_THINKING_SCROLLBAR_RESERVE,
-		);
-	};
-
 	const setPeekLabel = (ctx?: ExtensionContext): void => {
 		if (!isPeekEnabled() || peek.phase === "idle") return;
 		const target = ctx ?? lastCtx;
 		if (!target || !isTuiContext(target)) return;
 		if (!editor) throw new Error("Open TUI editor is not installed");
-		editor.setLatestHiddenThinkingLabel(
-			buildPeekLabel(
-				peek,
-				peekFrame,
-				resolveGlyphs(config.icons.mode),
-				hiddenThinkingLabelWidth(),
-				config.thinkingPeek.lines,
-			),
-		);
+		const snapshot = { ...peek };
+		const frame = peekFrame;
+		const glyphs = resolveGlyphs(config.icons.mode);
+		const lines = config.thinkingPeek.lines;
+		editor.setLatestHiddenThinkingLabel((width) => buildPeekLabel(snapshot, frame, glyphs, width, lines));
 		peekLabelActive = true;
 	};
 
@@ -143,6 +127,7 @@ export default function (pi: ExtensionAPI) {
 					scheduleGitRefresh: () => {
 						void scheduleGitRefresh(ctx);
 					},
+					getLiveTps: () => turnTelemetry.getLiveTps(),
 				},
 			);
 			cleanupFooter = footer.cleanup;

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

@@ -46,6 +46,7 @@ const COPY = {
 			extensionStatuses: "Extension status line",
 			capitalizeProviderName: "Capitalize provider name",
 			nerdIconSpacing: "Extra space after Nerd icons",
+			liveTps: "Live TPS",
 			totalDuration: "Total duration",
 			tokenCounts: "Run tokens",
 			stallDetails: "Stall details",
@@ -84,6 +85,7 @@ const COPY = {
 			extensionStatuses: "扩展状态行",
 			capitalizeProviderName: "提供商名称首字母大写",
 			nerdIconSpacing: "Nerd 图标后额外留空",
+			liveTps: "实时 TPS",
 			totalDuration: "总耗时",
 			tokenCounts: "单次运行 Token",
 			stallDetails: "停顿详情",
@@ -185,6 +187,7 @@ function buildSegmentsItems(config: OpenTuiConfig, copy: SettingsCopy): SettingI
 		{ 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: "liveTps", label: copy.labels.liveTps, currentValue: flag(segs.liveTps) },
 		{ id: "extensionStatuses", label: copy.labels.extensionStatuses, currentValue: flag(segs.extensionStatuses) },
 		{ id: "capitalizeProviderName", label: copy.labels.capitalizeProviderName, currentValue: flag(segs.capitalizeProviderName) },
 		{ id: "nerdIconSpacing", label: copy.labels.nerdIconSpacing, currentValue: flag(segs.nerdIconSpacing) },

package/extensions/open-tui/telemetry.ts

@@ -14,6 +14,10 @@ import { resolveGlyphs } from "./icons.ts";
 import { finiteOrZero, fmtTokens, formatDuration, formatInputBreakdown } from "./utils.ts";
 
 const STALL_THRESHOLD_MS = 1000;
+// Live TPS is the rate over this trailing window, so it tracks current speed.
+const LIVE_TPS_WINDOW_MS = 2000;
+// CJK/kana/hangul/fullwidth: roughly one token per character in common tokenizers.
+const CJK_CHARS = /[\u3040-\u30ff\u3400-\u9fff\uac00-\ud7af\uf900-\ufaff\uff00-\uffef]/g;
 
 type TelemetryEvent =
 	| AgentStartEvent
@@ -31,6 +35,9 @@ interface MessageTiming {
 	lastUpdateMs: number;
 	firstOutputMs: number | null;
 	inStall: boolean;
+	estimatedTokens: number;
+	/** Cumulative estimate per delta; keeps one sample before the window as baseline. */
+	samples: { ms: number; tokens: number }[];
 }
 
 interface TurnTiming {
@@ -59,10 +66,22 @@ export interface TurnTelemetry {
 	measurementMs: number | null;
 }
 
+export interface LiveTps {
+	tps: number;
+	/** True between messages, when the value is the previous message's last rate. */
+	stale: boolean;
+}
+
 function isAssistantMessage(message: AgentMessage): message is AssistantMessage {
 	return message.role === "assistant";
 }
 
+/** ~4 chars/token for Latin text and code, ~1 token per CJK character. */
+export function estimateDeltaTokens(delta: string): number {
+	const cjk = delta.match(CJK_CHARS)?.length ?? 0;
+	return cjk + (delta.length - cjk) / 4;
+}
+
 function round(value: number, decimals: number): number {
 	const factor = 10 ** decimals;
 	return Math.round(value * factor) / factor;
@@ -73,17 +92,41 @@ export class TurnTelemetryTracker {
 	private turn: TurnTiming | undefined;
 	private agentStartMs: number | null = null;
 	private agentTurns: TurnTelemetry[] = [];
+	private lastLiveTps: number | null = null;
 
 	constructor(now: () => number = () => performance.now()) {
 		this.now = now;
 	}
 
+	/**
+	 * Estimated output rate of the streaming message over the trailing window.
+	 * Between messages of a run (tools, TTFT) the last rate is kept as `stale`.
+	 */
+	getLiveTps(): LiveTps | null {
+		const tps = this.windowTps();
+		if (tps !== null) return { tps, stale: false };
+		return this.lastLiveTps === null ? null : { tps: this.lastLiveTps, stale: true };
+	}
+
+	private windowTps(): number | null {
+		const samples = this.turn?.currentMessage?.samples;
+		if (!samples || samples.length < 2) return null;
+		const first = samples[0]!;
+		const now = this.now();
+		// Samples are only pruned on new deltas, so a stall longer than the window means no recent output.
+		if (now - samples.at(-1)!.ms >= LIVE_TPS_WINDOW_MS) return 0;
+		const elapsedMs = now - first.ms;
+		if (elapsedMs <= 0) return null;
+		return round((samples.at(-1)!.tokens - first.tokens) / (elapsedMs / 1000), 1);
+	}
+
 	handle(event: TelemetryEvent): TurnTelemetry | undefined {
 		switch (event.type) {
 			case "agent_start":
 				if (this.agentStartMs === null) {
 					this.agentStartMs = this.now();
 					this.agentTurns = [];
+					this.lastLiveTps = null;
 				}
 				return;
 			case "agent_settled":
@@ -126,6 +169,8 @@ export class TurnTelemetryTracker {
 			lastUpdateMs: now,
 			firstOutputMs: null,
 			inStall: false,
+			estimatedTokens: 0,
+			samples: [],
 		};
 	}
 
@@ -143,6 +188,11 @@ export class TurnTelemetryTracker {
 		if (!turn || !current || !isAssistantMessage(message)) return;
 
 		const now = this.now();
+		current.estimatedTokens += estimateDeltaTokens(streamEvent.delta);
+		const samples = current.samples;
+		samples.push({ ms: now, tokens: current.estimatedTokens });
+		while (samples.length > 2 && samples[1]!.ms <= now - LIVE_TPS_WINDOW_MS) samples.shift();
+
 		if (current.firstOutputMs === null) {
 			current.firstOutputMs = now;
 			turn.firstTokenMs ??= now;
@@ -172,6 +222,7 @@ export class TurnTelemetryTracker {
 			if (current.firstOutputMs === null && finiteOrZero(message.usage?.output) > 0) {
 				turn.firstTokenMs ??= endMs;
 			}
+			this.lastLiveTps = this.windowTps() ?? this.lastLiveTps;
 			turn.currentMessage = null;
 		}
 		turn.messages.push(message);
@@ -234,6 +285,7 @@ export class TurnTelemetryTracker {
 		const turns = this.agentTurns;
 		this.agentStartMs = null;
 		this.agentTurns = [];
+		this.lastLiveTps = null;
 		if (startMs === null || turns.length === 0) return;
 
 		const outputTokens = turns.reduce((sum, turn) => sum + turn.outputTokens, 0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-open-tui",
-  "version": "0.3.12",
+  "version": "0.3.14",
   "description": "A polished TUI for Pi coding agent: animated logo header, Starship-style footer, rounded editor with model metadata, and prompt-box user messages.",
   "type": "module",
   "repository": {