pi-open-tui 0.3.10 → 0.3.12

package/README.md

@@ -15,11 +15,10 @@ A polished terminal interface for the [Pi](https://pi.dev) coding agent. It brin
 - **Turn telemetry** for TPS, time to first token (TTFT), duration, stalls, tokens, and list-price rate
 - **Thinking peek**: an inline ticker replaces Pi's hidden `Thinking...` label with the tail of the model's reasoning while it works
 - **Interactive settings** through `/open-tui`, available in English and Simplified Chinese
-- **Version-guarded Pi compatibility shim**: fullscreen wheel speed falls back to Pi's default if its runtime support changes
 
 ## Requirements
 
-- Pi 0.85 or later
+- Pi 1.0 or later
 - A terminal with UTF-8 and color support
 - A [Nerd Font](https://www.nerdfonts.com/font-downloads) for the full icon set (optional; portable Unicode icons are built in)
 
@@ -50,6 +49,8 @@ The default `auto` mode checks the terminal environment, not the installed font
 
 If the font is installed but `auto` still selects ASCII, choose `nerd` explicitly. In VS Code, Windows Terminal, and similar apps, configure the font in the terminal profile rather than only installing it in the operating system. If your SSH client terminal does ship a Nerd Font and you want the full icon set over SSH, set the mode to `nerd` explicitly.
 
+If wide Nerd Font icons visually consume the gap before their labels (for example in Kitty), enable `footerSegments.nerdIconSpacing` (**Footer → Extra space after Nerd icons** in `/open-tui`). The footer then reserves an extra blank cell after Nerd Font icons, including runtime icons, and includes it in regular and inline footer width calculations. Unicode/ASCII icons and compact Git status flags are unchanged. In Kitty, `narrow_symbols U+E000-U+F8FF 1` in `kitty.conf` is an alternative.
+
 ## Configuration
 
 Run `/open-tui` to open the settings dialog. It provides **General**, **Appearance**, **Footer**, and **Telemetry** tabs. Settings are stored in `~/.pi/agent/open-tui.json`:
@@ -60,9 +61,6 @@ Run `/open-tui` to open the settings dialog. It provides **General**, **Appearan
   "inlineFooter": false,
   "settingsLanguage": "en",
   "cursorStyle": "block",
-  "fullscreen": {
-    "wheelScrollLines": 4
-  },
   "icons": {
     "mode": "auto"
   },
@@ -78,7 +76,8 @@ Run `/open-tui` to open the settings dialog. It provides **General**, **Appearan
     "tokens": true,
     "cost": true,
     "extensionStatuses": true,
-    "capitalizeProviderName": true
+    "capitalizeProviderName": true,
+    "nerdIconSpacing": false
   },
   "telemetry": {
     "enabled": true,
@@ -102,19 +101,17 @@ Key options:
 | `settingsLanguage` | `en`, `zh` | Changes the `/open-tui` interface language |
 | `inlineFooter` | `true`, `false` | Moves the two main Footer rows into the editor's top and bottom borders; defaults to `false`. Extension status rows remain below the editor |
 | `cursorStyle` | `block`, `bar`, `underline` | `bar` and `underline` require terminal cursor-shape support |
-| `fullscreen.wheelScrollLines` | `1`-`10` | Lines scrolled per mouse-wheel notch in fullscreen mode; defaults to `4`. In `/open-tui`, press Enter on this item and type a number (values are clamped to `1`-`10`) |
 | `icons.mode` | `auto`, `nerd`, `unicode`, `ascii` | Controls footer and telemetry icons |
 | `footerSegments` | Boolean flags | Shows or hides individual footer data |
 | `footerSegments.capitalizeProviderName` | Boolean | Capitalizes the first character of the provider name in the footer; set it to `false` to keep the provider's original casing |
+| `footerSegments.nerdIconSpacing` | Boolean | Adds an extra blank cell after Nerd Font icons in the footer; defaults to `false` |
 | `telemetry` | Boolean flags | Enables telemetry and its individual measurements |
 | `thinkingPeek.lines` | `0`, `1`, `2` | Off, one-line, or two-line hidden thinking preview |
 
-`sessionName` appears only when the session has a name. `hostname` shows the short host name (first label of the machine's host name, e.g. `mba` from `mba.example.com`) with a server icon. `gitCommit` shows the short hash and tag in detached HEAD state. Disabling `extensionStatuses` hides the entire extension status line, including MCP status.
+`sessionName` appears only when the session has a name. `hostname` shows the short host name (first label of the machine's host name, e.g. `mba` from `mba.example.com`) with a server icon. In detached HEAD state, `gitBranch` shows `HEAD` with the short commit hash; `gitCommit` appends the tag pointing at that commit and only takes effect while `gitBranch` is on. Disabling `extensionStatuses` hides the entire extension status line, including MCP status. Each status keeps the colours its extension applied with `ctx.ui.theme.fg()`. A status without colours renders in the muted theme colour.
 
 With `inlineFooter` enabled, the two normal Footer rows are rendered inside the editor frame to save vertical space. The top border places the Git branch on the left and CWD first in the right-hand group; the session title appears on the left too when `sessionName` is enabled. The Header and extension status rows remain separate; narrow terminals truncate lower-priority Footer data first, keeping the right-hand statistics and the border corner.
 
-Fullscreen wheel speed uses an isolated compatibility shim for Pi 0.84.2's runtime field because Pi does not yet expose a public setter. On Pi versions without a compatible field, the setting is ignored and Pi's default scrolling remains active.
-
 ## Turn telemetry
 
 After each complete agent run, pi-open-tui shows one transient result. Tool-call turns are combined into that result:

package/README.zh-CN.md

@@ -15,11 +15,10 @@
 - **单轮遥测**：展示 TPS、首 Token 延迟（TTFT）、耗时、停顿、Token 数量和模型标价速率
 - **思考预览**：模型工作时，在 Pi 隐藏思考块的 `Thinking...` 位置显示实时字幕，展示推理内容的末尾片段
 - **交互式设置**：通过 `/open-tui` 配置，并支持英文和简体中文界面
-- **带版本保护的 Pi 兼容层**：全屏滚轮速度所依赖的运行时支持发生变化时，会回退为 Pi 默认行为
 
 ## 环境要求
 
-- Pi 0.85 或更高版本
+- Pi 1.0 或更高版本
 - 支持 UTF-8 和彩色输出的终端
 - 使用完整图标集时需要 [Nerd Font](https://www.nerdfonts.com/font-downloads)（可选；内置可移植 Unicode 图标）
 
@@ -50,6 +49,8 @@ pi -e npm:pi-open-tui
 
 如果已经安装字体，但 `auto` 仍选择 ASCII，请手动切换为 `nerd`。使用 VS Code、Windows Terminal 等应用时，只在操作系统中安装字体还不够，还需要在对应的终端配置中选中该字体。如果 SSH 客户端终端确实安装了 Nerd Font 并希望在 SSH 下使用完整图标，请将模式显式设为 `nerd`。
 
+如果较宽的 Nerd Font 图标占用了图标与文字之间的间隔（例如在 Kitty 中），可开启 `footerSegments.nerdIconSpacing`（`/open-tui` 中的 **底栏 → Nerd 图标后额外留空**）。开启后底栏会在 Nerd Font 图标后额外预留一格空白，包括运行环境图标，常规底栏和内嵌底栏的宽度计算都包含这格留白；Unicode/ASCII 图标与紧凑的 Git 状态标记不受影响。Kitty 用户也可以在 `kitty.conf` 中设置 `narrow_symbols U+E000-U+F8FF 1`。
+
 ## 配置
 
 运行 `/open-tui` 打开设置窗口，其中包含**常规**、**外观**、**底栏**和**遥测**四个页面。设置保存在 `~/.pi/agent/open-tui.json`：
@@ -60,9 +61,6 @@ pi -e npm:pi-open-tui
   "inlineFooter": false,
   "settingsLanguage": "zh",
   "cursorStyle": "block",
-  "fullscreen": {
-    "wheelScrollLines": 4
-  },
   "icons": {
     "mode": "auto"
   },
@@ -78,7 +76,8 @@ pi -e npm:pi-open-tui
     "tokens": true,
     "cost": true,
     "extensionStatuses": true,
-    "capitalizeProviderName": true
+    "capitalizeProviderName": true,
+    "nerdIconSpacing": false
   },
   "telemetry": {
     "enabled": true,
@@ -102,19 +101,17 @@ pi -e npm:pi-open-tui
 | `settingsLanguage` | `en`、`zh` | 切换 `/open-tui` 设置界面的语言 |
 | `inlineFooter` | `true`、`false` | 将两条主要 Footer 信息行移入编辑器上下边框以节省垂直空间，默认关闭；扩展状态行仍显示在编辑器外 |
 | `cursorStyle` | `block`、`bar`、`underline` | `bar` 和 `underline` 需要终端支持光标形状转义序列 |
-| `fullscreen.wheelScrollLines` | `1`-`10` | 全屏模式下滚轮每格滚动的行数，默认值为 `4`；`/open-tui` 中在该项上按 Enter 后直接输入数字（超出范围会自动钳制到 `1`-`10`） |
 | `icons.mode` | `auto`、`nerd`、`unicode`、`ascii` | 控制底栏和遥测通知使用的图标 |
 | `footerSegments` | 布尔开关 | 分别控制底栏中的各项数据 |
 | `footerSegments.capitalizeProviderName` | 布尔开关 | 将底栏中提供商名称的首字母大写；设为 `false` 时保留原始大小写 |
+| `footerSegments.nerdIconSpacing` | 布尔开关 | 在底栏 Nerd Font 图标后额外留一格空白；默认 `false` |
 | `telemetry` | 布尔开关 | 控制遥测总开关和各项指标 |
 | `thinkingPeek.lines` | `0`、`1`、`2` | 关闭、单行或双行思考预览 |
 
-`sessionName` 仅在会话有名称时显示；`hostname` 会显示主机名的短名称（主机名的第一个标签，例如从 `mba.example.com` 显示为 `mba`），并使用服务器图标；`gitCommit` 会在 detached HEAD 状态下显示短哈希和标签；关闭 `extensionStatuses` 会隐藏整行扩展状态，其中也包括 MCP 状态。
+`sessionName` 仅在会话有名称时显示；`hostname` 会显示主机名的短名称（主机名的第一个标签，例如从 `mba.example.com` 显示为 `mba`），并使用服务器图标；处于分离 HEAD（detached HEAD）状态时，`gitBranch` 会显示 `HEAD` 和短提交哈希，`gitCommit` 会在其后追加指向该提交的标签，且仅在开启 `gitBranch` 时生效；关闭 `extensionStatuses` 会隐藏整行扩展状态，其中也包括 MCP 状态。每条状态会保留其扩展通过 `ctx.ui.theme.fg()` 设置的颜色；未设置颜色的状态使用 muted 主题色显示。
 
 开启 `inlineFooter` 后，两条常规 Footer 信息行会移入编辑器边框，从而节省垂直空间。顶部边框左侧显示 Git 分支，右侧信息组以当前目录开头；开启 `sessionName` 时，会话标题也会显示在左侧。Header 和扩展状态行保持独立显示；终端较窄时优先截断低优先级 Footer 数据，保留右侧统计信息和边框角。
 
-全屏滚轮速度通过隔离的兼容层写入 Pi 0.84.2 的运行时字段，因为 Pi 尚未提供公开 setter。若后续 Pi 版本不再包含兼容字段，该设置会被忽略并继续使用 Pi 的默认滚动行为。
-
 ## 单轮遥测
 
 每次 Agent 完整运行结束后，pi-open-tui 会显示一条临时结果，并将其中的多个工具调用轮次合并统计：

package/extensions/open-tui/config.ts

@@ -1,10 +1,6 @@
 import { existsSync, readFileSync, writeFileSync, mkdirSync } from "node:fs";
 import { join } from "node:path";
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
-import {
-	DEFAULT_FULLSCREEN_WHEEL_SCROLL_LINES,
-	normalizeFullscreenWheelScrollLines,
-} from "./fullscreen-scroll.ts";
 import type { IconMode } from "./icons.ts";
 
 export type SettingsLanguage = "en" | "zh";
@@ -26,6 +22,7 @@ export interface FooterSegments {
 	cost: boolean;
 	extensionStatuses: boolean;
 	capitalizeProviderName: boolean;
+	nerdIconSpacing: boolean;
 }
 
 export interface TelemetryConfig {
@@ -42,16 +39,11 @@ export interface ThinkingPeekConfig {
 	lines: ThinkingPeekLines;
 }
 
-export interface FullscreenConfig {
-	wheelScrollLines: number;
-}
-
 export interface OpenTuiConfig {
 	enabled: boolean;
 	inlineFooter: boolean;
 	settingsLanguage: SettingsLanguage;
 	cursorStyle: CursorStyle;
-	fullscreen: FullscreenConfig;
 	icons: {
 		mode: IconMode;
 	};
@@ -65,9 +57,6 @@ export const DEFAULT_CONFIG: OpenTuiConfig = {
 	inlineFooter: false,
 	settingsLanguage: "en",
 	cursorStyle: "block",
-	fullscreen: {
-		wheelScrollLines: DEFAULT_FULLSCREEN_WHEEL_SCROLL_LINES,
-	},
 	icons: {
 		mode: "auto",
 	},
@@ -84,6 +73,7 @@ export const DEFAULT_CONFIG: OpenTuiConfig = {
 		cost: true,
 		extensionStatuses: true,
 		capitalizeProviderName: true,
+		nerdIconSpacing: false,
 	},
 	telemetry: {
 		enabled: true,
@@ -108,6 +98,18 @@ function normalizeThinkingPeekLines(value: unknown): ThinkingPeekLines {
 	return value === 0 || value === 1 || value === 2 ? value : DEFAULT_CONFIG.thinkingPeek.lines;
 }
 
+const ICON_MODES: IconMode[] = ["auto", "nerd", "unicode", "ascii"];
+
+// Non-boolean flags (e.g. "false" strings) fall back to defaults instead of reading as truthy.
+function normalizeFlags<T extends object>(value: unknown, defaults: T): T {
+	const source = typeof value === "object" && value !== null && !Array.isArray(value) ? value : {};
+	const result: Record<string, unknown> = { ...source };
+	for (const [key, fallback] of Object.entries(defaults)) {
+		if (typeof result[key] !== "boolean") result[key] = fallback;
+	}
+	return result as T;
+}
+
 function deepMerge<T>(base: T, override: unknown): T {
 	if (typeof base !== "object" || base === null || Array.isArray(base)) {
 		return (override as T) ?? base;
@@ -153,19 +155,23 @@ export function loadConfig(notify?: (msg: string, level: "warning" | "info") =>
 		const raw = readFileSync(path, "utf8");
 		const parsed: unknown = JSON.parse(raw);
 		const config = deepMerge(DEFAULT_CONFIG, parsed);
+		if (typeof config.enabled !== "boolean") {
+			config.enabled = DEFAULT_CONFIG.enabled;
+		}
 		if (typeof config.inlineFooter !== "boolean") {
 			config.inlineFooter = DEFAULT_CONFIG.inlineFooter;
 		}
+		config.footerSegments = normalizeFlags(config.footerSegments, DEFAULT_CONFIG.footerSegments);
+		config.telemetry = normalizeFlags(config.telemetry, DEFAULT_CONFIG.telemetry);
+		if (typeof config.icons !== "object" || config.icons === null || !ICON_MODES.includes(config.icons.mode)) {
+			config.icons = structuredClone(DEFAULT_CONFIG.icons);
+		}
 		if (config.settingsLanguage !== "en" && config.settingsLanguage !== "zh") {
 			config.settingsLanguage = DEFAULT_CONFIG.settingsLanguage;
 		}
 		if (config.cursorStyle !== "block" && config.cursorStyle !== "bar" && config.cursorStyle !== "underline") {
 			config.cursorStyle = DEFAULT_CONFIG.cursorStyle;
 		}
-		config.fullscreen.wheelScrollLines = normalizeFullscreenWheelScrollLines(
-			config.fullscreen.wheelScrollLines,
-			DEFAULT_CONFIG.fullscreen.wheelScrollLines,
-		);
 		if (typeof config.thinkingPeek !== "object" || config.thinkingPeek === null || Array.isArray(config.thinkingPeek)) {
 			config.thinkingPeek = structuredClone(DEFAULT_CONFIG.thinkingPeek);
 		} else {

package/extensions/open-tui/editor.ts

@@ -7,10 +7,6 @@ import {
 import type { EditorTheme, TuiMouseEvent, TuiMouseEventResult, TUI } from "@earendil-works/pi-tui";
 import { CURSOR_MARKER, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import type { CursorStyle } from "./config.ts";
-import {
-	applyFullscreenWheelScrollLines,
-	DEFAULT_FULLSCREEN_WHEEL_SCROLL_LINES,
-} from "./fullscreen-scroll.ts";
 import { findBottomBorderIndex, isEditorBorderLine, stripAnsi } from "./utils.ts";
 
 function fillLine(content: string, width: number): string {
@@ -316,14 +312,12 @@ export function installEditor(
 	_pi: ExtensionAPI,
 	ctx: ExtensionContext,
 	cursorStyle: CursorStyle = "block",
-	wheelScrollLines = DEFAULT_FULLSCREEN_WHEEL_SCROLL_LINES,
 	inlineFooter?: InlineFooterRenderer,
 ) {
 	let activeTui: TUI | undefined;
 	let activeEditor: OpenTuiEditor | undefined;
 	let previousHardwareCursor: boolean | undefined;
 	let currentCursorStyle = cursorStyle;
-	let currentWheelScrollLines = wheelScrollLines;
 	let hiddenThinkingTarget: HiddenThinkingLabelComponent | undefined;
 	const getActiveTui = (): TUI => {
 		if (!activeTui) throw new Error("Open TUI editor is not mounted");
@@ -333,7 +327,6 @@ export function installEditor(
 	ctx.ui.setEditorComponent((tui, editorTheme, keybindings) => {
 		activeTui = tui;
 		hiddenThinkingTarget = undefined;
-		applyFullscreenWheelScrollLines(tui, currentWheelScrollLines);
 		previousHardwareCursor = tui.getShowHardwareCursor();
 		activeEditor = new OpenTuiEditor(tui, editorTheme, keybindings, currentCursorStyle, inlineFooter);
 		return activeEditor;
@@ -359,10 +352,6 @@ export function installEditor(
 			currentCursorStyle = nextCursorStyle;
 			activeEditor?.setCursorStyle(nextCursorStyle, previousHardwareCursor);
 		},
-		setWheelScrollLines(nextWheelScrollLines: number): void {
-			currentWheelScrollLines = nextWheelScrollLines;
-			if (activeTui) applyFullscreenWheelScrollLines(activeTui, currentWheelScrollLines);
-		},
 		cleanup(): void {
 			hiddenThinkingTarget = undefined;
 			ctx.ui.setEditorComponent(undefined);

package/extensions/open-tui/footer.ts

@@ -16,8 +16,9 @@ import {
 	formatCwd,
 	formatDuration,
 	formatInputBreakdown,
+	hasAnsiStyles,
 	providerColor,
-	sanitizeStatus,
+	sanitizeStatusPreservingStyles,
 	stressColor,
 	truncateBranch,
 	truncatePath,
@@ -30,6 +31,15 @@ export function shortHostname(hostname: string): string {
 	return hostname.split(".")[0] ?? "";
 }
 
+// Kitty can use the blank cell after a wide Nerd icon to render the glyph.
+// With footerSegments.nerdIconSpacing, reserve an extra cell before fitting
+// footer segments. Keep Unicode/ASCII and Git flags compact.
+function spaceFooterIcon(glyph: string): string {
+	return /[\uE000-\uF8FF\u{F0000}-\u{FFFFD}\u{100000}-\u{10FFFD}]/u.test(glyph)
+		? `${glyph} `
+		: glyph;
+}
+
 function renderBar(theme: Theme, pct: number, barWidth: number, ascii: boolean): string {
 	const filled = Math.max(0, Math.min(barWidth, Math.round((pct / 100) * barWidth)));
 	const empty = barWidth - filled;
@@ -111,9 +121,11 @@ function renderRuntimeSegment(
 	theme: Theme,
 	runtime: RuntimeInfo | null,
 	iconMode: OpenTuiConfig["icons"]["mode"],
+	spaceIcon: boolean,
 ): string {
 	if (!runtime) return "";
-	const symbol = theme.fg("success", runtimeSymbol(runtime.name, iconMode));
+	const glyph = runtimeSymbol(runtime.name, iconMode);
+	const symbol = theme.fg("success", spaceIcon ? spaceFooterIcon(glyph) : glyph);
 	const version = runtime.version ? theme.fg("muted", runtime.version) : "";
 	const label = [symbol, version].filter(Boolean).join(" ");
 	return label;
@@ -179,6 +191,18 @@ function renderStatsBlock(
 	return stats.join(` ${theme.fg("dim", "|")} `);
 }
 
+const ANSI_RESET = "\x1b[0m";
+
+/**
+ * Keep the colours an extension applied to its own status text. Plain text stays
+ * muted so unstyled statuses keep the quiet footer look. The trailing reset
+ * stops an unclosed style from tinting the separator and the next status.
+ */
+function renderStatusText(theme: Theme, status: string): string {
+	if (!hasAnsiStyles(status)) return theme.fg("muted", status);
+	return `${status}${ANSI_RESET}`;
+}
+
 function renderExtensionStatusLines(
 	theme: Theme,
 	extensionStatuses: ReadonlyMap<string, string>,
@@ -187,12 +211,12 @@ function renderExtensionStatusLines(
 ): string[] {
 	const statuses = Array.from(extensionStatuses.entries())
 		.sort(([a], [b]) => a.localeCompare(b))
-		.map(([, text]) => sanitizeStatus(text))
+		.map(([, text]) => sanitizeStatusPreservingStyles(text))
 		.filter((text) => text.length > 0);
 	if (statuses.length === 0) return [];
 
 	const separator = ` ${theme.fg("dim", "|")} `;
-	const statusText = statuses.map((status) => theme.fg("muted", status)).join(separator);
+	const statusText = statuses.map((status) => renderStatusText(theme, status)).join(separator);
 	const line = `${theme.fg("mdLink", glyphs.extensions)} ${statusText}`;
 	return wrapTextWithAnsi(line, width);
 }
@@ -273,8 +297,13 @@ function renderFooterContent(
 
 	const state = getState();
 	const config = getConfig();
-	const glyphs = resolveGlyphs(config.icons.mode);
 	const segments = config.footerSegments;
+	const glyphs = { ...resolveGlyphs(config.icons.mode) };
+	if (segments.nerdIconSpacing) {
+		for (const key of Object.keys(glyphs) as (keyof IconGlyphs)[]) {
+			glyphs[key] = spaceFooterIcon(glyphs[key]);
+		}
+	}
 	const meta = getModelMeta();
 	const totals = getUsageTotals(ctx);
 
@@ -327,7 +356,7 @@ function renderFooterContent(
 		inlineTopLeftParts.push(leftParts.at(-1)!);
 	}
 	if (segments.runtime) {
-		const runtimeSeg = renderRuntimeSegment(theme, state.runtime, config.icons.mode);
+		const runtimeSeg = renderRuntimeSegment(theme, state.runtime, config.icons.mode, segments.nerdIconSpacing);
 		if (runtimeSeg) {
 			leftParts.push({ text: runtimeSeg, priority: 4 });
 			inlineTopRightParts.push(leftParts.at(-1)!);

package/extensions/open-tui/index.ts

@@ -150,7 +150,6 @@ export default function (pi: ExtensionAPI) {
 				pi,
 				ctx,
 				config.cursorStyle,
-				config.fullscreen.wheelScrollLines,
 				{
 					enabled: () => config.inlineFooter,
 					render: footer.renderInline,
@@ -179,7 +178,8 @@ export default function (pi: ExtensionAPI) {
 	const scheduleGitRefresh = async (ctx: ExtensionContext) => {
 		if (!sessionLifecycle.isCurrent()) return;
 		const segs = config.footerSegments;
-		if (!segs.gitBranch && !segs.gitStatus && !segs.gitCommit) {
+		// gitCommit only appends a tag to the gitBranch segment, so it never needs git on its own.
+		if (!segs.gitBranch && !segs.gitStatus) {
 			state.git = emptyGitStatus();
 			requestFooterRender?.();
 			return;
@@ -187,8 +187,8 @@ export default function (pi: ExtensionAPI) {
 		const generation = sessionLifecycle.currentGeneration();
 		const cwd = ctx.cwd;
 		const git = await readGitStatus(cwd, {
-			readCommit: true,
-			readTag: segs.gitCommit,
+			readCommit: segs.gitBranch,
+			readTag: segs.gitBranch && segs.gitCommit,
 			readCounts: segs.gitStatus,
 		});
 		if (!sessionLifecycle.isCurrent(generation)) return;
@@ -385,7 +385,6 @@ export default function (pi: ExtensionAPI) {
 		getConfig: () => config,
 		onConfigChanged: (newConfig) => {
 			const cursorStyleChanged = config.cursorStyle !== newConfig.cursorStyle;
-			const wheelScrollLinesChanged = config.fullscreen.wheelScrollLines !== newConfig.fullscreen.wheelScrollLines;
 			const thinkingPeekLinesChanged = config.thinkingPeek.lines !== newConfig.thinkingPeek.lines;
 			saveConfig(newConfig);
 			config = newConfig;
@@ -398,13 +397,10 @@ export default function (pi: ExtensionAPI) {
 			if (cursorStyleChanged && active && editor) {
 				editor.setCursorStyle(newConfig.cursorStyle);
 			}
-			if (wheelScrollLinesChanged && active && editor) {
-				editor.setWheelScrollLines(newConfig.fullscreen.wheelScrollLines);
-			}
 			if (lastCtx) {
 				pendingUiChange = getPendingUiChange(newConfig.enabled, active);
 			}
-			const gitNeeded = newConfig.footerSegments.gitBranch || newConfig.footerSegments.gitStatus || newConfig.footerSegments.gitCommit;
+			const gitNeeded = newConfig.footerSegments.gitBranch || newConfig.footerSegments.gitStatus;
 			if (lastCtx && gitNeeded) {
 				void scheduleGitRefresh(lastCtx);
 			} else {

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

@@ -1,7 +1,6 @@
 import type { ExtensionAPI, ExtensionContext, Theme } from "@earendil-works/pi-coding-agent";
 import {
 	Box,
-	Input,
 	Key,
 	matchesKey,
 	SelectList,
@@ -11,10 +10,6 @@ import {
 	Text,
 } from "@earendil-works/pi-tui";
 import type { CursorStyle, IconMode, OpenTuiConfig, SettingsLanguage, ThinkingPeekLines } from "./config.ts";
-import {
-	DEFAULT_FULLSCREEN_WHEEL_SCROLL_LINES,
-	normalizeFullscreenWheelScrollLines,
-} from "./fullscreen-scroll.ts";
 
 interface SettingItem {
 	id: string;
@@ -30,13 +25,12 @@ const COPY = {
 	en: {
 		title: "Open TUI Settings",
 		tabs: { features: "General", icons: "Appearance", segments: "Footer", telemetry: "Telemetry" },
-		hint: "Tab/Shift+Tab/←/→: tabs · ↑/↓: move · Enter/Space: change · Enter on wheel speed: type 1-10 · Esc/q: close",
+		hint: "Tab/Shift+Tab/←/→: tabs · ↑/↓: move · Enter/Space: change · Esc/q: close",
 		labels: {
 			enabled: "Enabled",
-			inlineFooter: "Inline footer",
+			inlineFooter: "Footer in editor border",
 			thinkingPeek: "Thinking peek",
 			language: "Language",
-			wheelScrollLines: "Mouse wheel speed",
 			cursorStyle: "Cursor style",
 			iconMode: "Icon mode",
 			cwd: "CWD",
@@ -44,39 +38,37 @@ const COPY = {
 			sessionName: "Session name",
 			gitBranch: "Git branch",
 			gitStatus: "Git status",
-			gitCommit: "Git commit (detached)",
-			runtime: "Runtime",
-			context: "Context bar",
-			tokens: "Tokens",
-			cost: "Cost",
+			gitCommit: "Git tag (detached HEAD)",
+			runtime: "Project runtime",
+			context: "Context usage",
+			tokens: "Session tokens",
+			cost: "Session cost",
 			extensionStatuses: "Extension status line",
 			capitalizeProviderName: "Capitalize provider name",
+			nerdIconSpacing: "Extra space after Nerd icons",
 			totalDuration: "Total duration",
-			tokenCounts: "Token counts",
+			tokenCounts: "Run tokens",
 			stallDetails: "Stall details",
-			costRate: "Cost rate",
+			costRate: "Price per 1M tokens",
 		},
 		values: {
 			on: "On",
 			off: "Off",
 			thinkingPeek: { off: "Off", one: "1 line", two: "2 lines" },
 			languages: { en: "English", zh: "简体中文" },
-			wheelLines: (count: number) => `${count} ${count === 1 ? "line" : "lines"} / notch`,
-			wheelPrompt: (count: number) => `Wheel scroll lines per notch, 1-10 (current: ${count}). Enter: apply · Esc: cancel`,
 			cursorStyles: { block: "Block", bar: "Bar", underline: "Underline" },
 			icons: { auto: "Auto", nerd: "Nerd", unicode: "Unicode", ascii: "ASCII" },
 		},
 	},
 	zh: {
 		title: "Open TUI 设置",
-		tabs: { features: "常规", icons: "外观", segments: "Footer", telemetry: "遥测" },
-		hint: "Tab/Shift+Tab/←/→：切页 · ↑/↓：移动 · Enter/Space：更改 · 滚轮速度项 Enter 输入 1-10 · Esc/q：关闭",
+		tabs: { features: "常规", icons: "外观", segments: "底栏", telemetry: "遥测" },
+		hint: "Tab/Shift+Tab/←/→：切页 · ↑/↓：移动 · Enter/Space：更改 · Esc/q：关闭",
 		labels: {
 			enabled: "启用",
-			inlineFooter: "内联底栏",
+			inlineFooter: "底栏嵌入输入框",
 			thinkingPeek: "思考预览",
 			language: "语言",
-			wheelScrollLines: "鼠标滚轮速度",
 			cursorStyle: "光标样式",
 			iconMode: "图标模式",
 			cwd: "当前目录",
@@ -84,25 +76,24 @@ const COPY = {
 			sessionName: "会话名",
 			gitBranch: "Git 分支",
 			gitStatus: "Git 状态",
-			gitCommit: "Git 提交（分离 HEAD）",
-			runtime: "运行环境",
-			context: "上下文栏",
-			tokens: "Token",
-			cost: "费用",
+			gitCommit: "Git 标签（分离 HEAD）",
+			runtime: "项目运行环境",
+			context: "上下文用量",
+			tokens: "会话 Token",
+			cost: "会话费用",
 			extensionStatuses: "扩展状态行",
 			capitalizeProviderName: "提供商名称首字母大写",
+			nerdIconSpacing: "Nerd 图标后额外留空",
 			totalDuration: "总耗时",
-			tokenCounts: "Token 数量",
+			tokenCounts: "单次运行 Token",
 			stallDetails: "停顿详情",
-			costRate: "费用速率",
+			costRate: "每百万 Token 单价",
 		},
 		values: {
 			on: "开启",
 			off: "关闭",
 			thinkingPeek: { off: "关闭", one: "单行", two: "双行" },
 			languages: { en: "English", zh: "简体中文" },
-			wheelLines: (count: number) => `每格 ${count} 行`,
-			wheelPrompt: (count: number) => `滚轮每格滚动行数（当前 ${count}，范围 1-10），输入后 Enter 应用 · Esc 取消`,
 			cursorStyles: { block: "块", bar: "竖线", underline: "下划线" },
 			icons: { auto: "自动", nerd: "Nerd", unicode: "Unicode", ascii: "ASCII" },
 		},
@@ -148,19 +139,6 @@ function cycleCursorStyle(config: OpenTuiConfig): OpenTuiConfig {
 	return { ...config, cursorStyle: next };
 }
 
-function setWheelScrollLines(config: OpenTuiConfig, raw: string): OpenTuiConfig | undefined {
-	if (!/^\d+$/.test(raw)) return undefined;
-	const parsed = Number(raw);
-	const bounded = Number.isFinite(parsed) ? parsed : Number.MAX_SAFE_INTEGER;
-	return {
-		...config,
-		fullscreen: {
-			...config.fullscreen,
-			wheelScrollLines: normalizeFullscreenWheelScrollLines(bounded, DEFAULT_FULLSCREEN_WHEEL_SCROLL_LINES),
-		},
-	};
-}
-
 function toggleTelemetry(config: OpenTuiConfig, key: keyof OpenTuiConfig["telemetry"]): OpenTuiConfig {
 	return {
 		...config,
@@ -181,11 +159,6 @@ function buildFeaturesItems(config: OpenTuiConfig, copy: SettingsCopy): SettingI
 	return [
 		{ id: "enabled", label: copy.labels.enabled, currentValue: flag(config.enabled) },
 		{ id: "settingsLanguage", label: copy.labels.language, currentValue: copy.values.languages[config.settingsLanguage] },
-		{
-			id: "wheelScrollLines",
-			label: copy.labels.wheelScrollLines,
-			currentValue: copy.values.wheelLines(config.fullscreen.wheelScrollLines),
-		},
 		{ id: "thinkingPeek", label: copy.labels.thinkingPeek, currentValue: formatThinkingPeekLines(config.thinkingPeek.lines, copy) },
 		{ id: "inlineFooter", label: copy.labels.inlineFooter, currentValue: flag(config.inlineFooter) },
 	];
@@ -214,6 +187,7 @@ function buildSegmentsItems(config: OpenTuiConfig, copy: SettingsCopy): SettingI
 		{ id: "cost", label: copy.labels.cost, currentValue: flag(segs.cost) },
 		{ 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) },
 	];
 }
 
@@ -271,23 +245,6 @@ interface SettingsUiHandle {
 	handleInput: (data: string) => void;
 }
 
-function insertComponentAfter(list: Component, child: Component, index: () => number): Component {
-	// SelectList renders one line per item; splice the editor into that output.
-	return {
-		render(width: number): string[] {
-			const lines = list.render(width);
-			const insertAt = index();
-			if (insertAt < 0 || insertAt >= lines.length) return lines;
-			const childLines = child.render(width);
-			return [...lines.slice(0, insertAt + 1), ...childLines, ...lines.slice(insertAt + 1)];
-		},
-		invalidate(): void {
-			list.invalidate();
-			child.invalidate();
-		},
-	};
-}
-
 class SettingsUi implements SettingsUiHandle {
 	private tab: Tab = "features";
 	private config: OpenTuiConfig;
@@ -300,7 +257,6 @@ class SettingsUi implements SettingsUiHandle {
 	private cachedWidth: number | undefined;
 	private cachedLines: string[] | undefined;
 	private compact = false;
-	private wheelInput: Input | undefined;
 
 	constructor(
 		theme: Theme,
@@ -325,35 +281,11 @@ class SettingsUi implements SettingsUiHandle {
 
 	private applySetting(itemId: string): void {
 		this.selectedItemByTab[this.tab] = itemId;
-		if (this.tab === "features" && itemId === "wheelScrollLines") {
-			this.openWheelInput();
-			this.invalidate();
-			return;
-		}
 		this.config = handleSettingChange(this.tab, itemId, this.config);
 		this.onChange(this.config);
 		this.rebuild(itemId);
 	}
 
-	private openWheelInput(): void {
-		const input = new Input();
-		input.onSubmit = (value) => {
-			const next = setWheelScrollLines(this.config, value);
-			this.wheelInput = undefined;
-			if (next) {
-				this.config = next;
-				this.onChange(this.config);
-			}
-			this.rebuild("wheelScrollLines");
-		};
-		input.onEscape = () => {
-			this.wheelInput = undefined;
-			this.rebuild("wheelScrollLines");
-		};
-		this.wheelInput = input;
-		this.rebuild("wheelScrollLines");
-	}
-
 	private switchTab(offset: number): void {
 		const idx = TABS.indexOf(this.tab);
 		this.tab = TABS[(idx + offset + TABS.length) % TABS.length]!;
@@ -373,17 +305,11 @@ 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 editingWheel = this.tab === "features" && this.wheelInput !== undefined;
-		const items = buildItems(this.tab, this.config).map((item) => {
-			const editing = editingWheel && item.id === "wheelScrollLines";
-			return {
-				value: item.id,
-				label: editing
-					? (this.compact ? `${item.label}:` : item.label)
-					: (this.compact ? `${item.label}: ${item.currentValue}` : item.label),
-				description: editing || this.compact ? undefined : item.currentValue,
-			} as SelectItem;
-		});
+		const items = buildItems(this.tab, this.config).map((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), {
 			selectedPrefix: (t) => this.theme.fg("accent", t),
 			selectedText: (t) => this.theme.fg("accent", t),
@@ -405,31 +331,13 @@ class SettingsUi implements SettingsUiHandle {
 		this.selectList.onCancel = () => {
 			this.onClose();
 		};
-		if (editingWheel) {
-			this.wheelInput!.focused = true;
-			const wheelInputGroup = new Box(4, 0);
-			wheelInputGroup.addChild(new Text(
-				this.theme.fg("muted", copy.values.wheelPrompt(this.config.fullscreen.wheelScrollLines)),
-				0,
-				0,
-			));
-			wheelInputGroup.addChild(this.wheelInput!);
-			const selectedIndex = () => items.findIndex((item) => item.value === this.selectList.getSelectedItem()?.value);
-			this.container.addChild(insertComponentAfter(this.selectList, wheelInputGroup, selectedIndex));
-		} else {
-			this.container.addChild(this.selectList);
-		}
+		this.container.addChild(this.selectList);
 
 		this.cachedWidth = undefined;
 		this.cachedLines = undefined;
 	}
 
 	handleInput(data: string): void {
-		if (this.wheelInput && this.tab === "features") {
-			this.wheelInput.handleInput(data);
-			this.invalidate();
-			return;
-		}
 		if (matchesKey(data, Key.tab) || matchesKey(data, Key.right)) {
 			this.switchTab(1);
 			this.invalidate();

package/extensions/open-tui/utils.ts

@@ -296,6 +296,28 @@ export function sanitizeStatus(text: string): string {
 		.trim();
 }
 
+// One status token is an SGR sequence, another escape sequence, or one control
+// character. SGR carries colours. Everything else moves the cursor or rewrites
+// the terminal, so it must never reach the footer row.
+const STATUS_TOKEN = /(?:\x1b\[|\x9b)[0-?]*[ -/]*m|(?:\x1b\[|\x9b)[0-?]*[ -/]*[@-~]|(?:\x1bP|\x90|\x1bX|\x98|\x1b\^|\x9e|\x1b_|\x9f)[\s\S]*?(?:\x1b\\|\x9c|$)|(?:\x1b\]|\x9d)[\s\S]*?(?:\x07|\x1b\\|\x9c|$)|\x1b[@-Z\\_]|[\u0000-\u001f\u007f-\u009f]/g;
+const SGR_TOKEN = /^(?:\x1b\[|\x9b)[0-9;:]*m$/;
+const SGR_SEQUENCE = /(?:\x1b\[|\x9b)[0-9;:]*m/;
+
+/**
+ * Sanitize a status text the same way {@link sanitizeStatus} does, but keep the
+ * SGR sequences the extension set. Extensions colour their own status text with
+ * `ctx.ui.theme.fg()`. Stripping those codes renders every status grey.
+ */
+export function sanitizeStatusPreservingStyles(text: string): string {
+	const cleaned = text.replace(STATUS_TOKEN, (token) => (SGR_TOKEN.test(token) ? token : " "));
+	return cleaned.replace(/ {2,}/g, " ").trim();
+}
+
+/** True when the text carries SGR colour or style sequences. */
+export function hasAnsiStyles(text: string): boolean {
+	return SGR_SEQUENCE.test(text);
+}
+
 export function formatThinkingLabel(level: string): string {
 	if (level === "off") return "thinking off";
 	return `${level} effort`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-open-tui",
-  "version": "0.3.10",
+  "version": "0.3.12",
   "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": {
@@ -25,7 +25,7 @@
     "LICENSE"
   ],
   "scripts": {
-    "test": "node --test tests/settings-command.test.ts tests/fullscreen-scroll.test.ts tests/footer.test.ts tests/editor.test.ts tests/telemetry.test.ts tests/peek.test.ts",
+    "test": "node --test tests/settings-command.test.ts tests/footer.test.ts tests/editor.test.ts tests/telemetry.test.ts tests/peek.test.ts",
     "typecheck": "tsc --noEmit"
   },
   "pi": {
@@ -35,9 +35,9 @@
     "image": "https://raw.githubusercontent.com/OldSuns/pi-open-tui/main/assets/preview_dashboard_1.png"
   },
   "peerDependencies": {
-    "@earendil-works/pi-coding-agent": ">=0.85",
-    "@earendil-works/pi-ai": ">=0.85",
-    "@earendil-works/pi-tui": ">=0.85"
+    "@earendil-works/pi-coding-agent": ">=1.0.0",
+    "@earendil-works/pi-ai": ">=1.0.0",
+    "@earendil-works/pi-tui": ">=1.0.0"
   },
   "peerDependenciesMeta": {
     "@earendil-works/pi-coding-agent": {
@@ -51,9 +51,9 @@
     }
   },
   "devDependencies": {
-    "@earendil-works/pi-coding-agent": "*",
-    "@earendil-works/pi-ai": "*",
-    "@earendil-works/pi-tui": "*",
+    "@earendil-works/pi-coding-agent": "^1.0.0",
+    "@earendil-works/pi-ai": "^1.0.0",
+    "@earendil-works/pi-tui": "^1.0.0",
     "@types/node": "^22.0.0",
     "typescript": "^5.5.0"
   },

package/extensions/open-tui/fullscreen-scroll.ts

@@ -1,34 +0,0 @@
-import type { TUI } from "@earendil-works/pi-tui";
-
-export const MIN_FULLSCREEN_WHEEL_SCROLL_LINES = 1;
-export const MAX_FULLSCREEN_WHEEL_SCROLL_LINES = 10;
-export const DEFAULT_FULLSCREEN_WHEEL_SCROLL_LINES = 4;
-
-export function normalizeFullscreenWheelScrollLines(
-	value: unknown,
-	fallback = DEFAULT_FULLSCREEN_WHEEL_SCROLL_LINES,
-): number {
-	if (typeof value !== "number" || !Number.isFinite(value)) return fallback;
-	return Math.min(
-		MAX_FULLSCREEN_WHEEL_SCROLL_LINES,
-		Math.max(MIN_FULLSCREEN_WHEEL_SCROLL_LINES, Math.floor(value)),
-	);
-}
-
-type FullscreenWheelTui = TUI & { wheelScrollLines?: unknown };
-
-/**
- * Pi 0.84.2 keeps this constructor option in a private runtime field. Remove
- * this shim once Pi exposes a public setter; incompatible versions are no-ops.
- */
-export function applyFullscreenWheelScrollLines(tui: TUI, value: number): boolean {
-	try {
-		const fullscreenTui = tui as FullscreenWheelTui;
-		if (fullscreenTui.mode !== "fullscreen" || typeof fullscreenTui.wheelScrollLines !== "number") {
-			return false;
-		}
-		return Reflect.set(fullscreenTui, "wheelScrollLines", normalizeFullscreenWheelScrollLines(value));
-	} catch {
-		return false;
-	}
-}