pi-open-tui 0.3.8 → 0.3.10

package/README.md

@@ -19,9 +19,9 @@ A polished terminal interface for the [Pi](https://pi.dev) coding agent. It brin
 
 ## Requirements
 
-- Pi 0.80 or later
+- Pi 0.85 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; ASCII icons are built in)
+- A [Nerd Font](https://www.nerdfonts.com/font-downloads) for the full icon set (optional; portable Unicode icons are built in)
 
 ## Install
 
@@ -44,10 +44,11 @@ Download any patched font from the official [Nerd Fonts downloads page](https://
 The default `auto` mode checks the terminal environment, not the installed font file. It uses Nerd Font icons in interactive UTF-8 TTYs, including terminals running through a runner or subshell. If icons appear as boxes or incorrect symbols, open `/open-tui` and choose one of these modes under **Appearance**:
 
 - `nerd`: force Nerd Font icons after configuring a Nerd Font in the terminal
+- `unicode`: portable Unicode icons (folder, branch, laptop, bulb, plug, hourglass, ...) that render without a patched font; emoji glyphs use the terminal's emoji fallback
 - `ascii`: use plain-text icons with no patched font required
-- `auto`: use Nerd Font icons in interactive UTF-8 TTYs; use ASCII for non-interactive output, `TERM=dumb`, or an explicitly non-UTF-8 locale
+- `auto`: use Nerd Font icons in interactive UTF-8 TTYs; use portable Unicode icons for SSH sessions (the client terminal controls the font and usually has no Nerd Font); use ASCII for non-interactive output, `TERM=dumb`, or an explicitly non-UTF-8 locale
 
-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 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.
 
 ## Configuration
 
@@ -102,7 +103,7 @@ Key options:
 | `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`, `ascii` | Controls footer and telemetry icons |
+| `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 |
 | `telemetry` | Boolean flags | Enables telemetry and its individual measurements |

package/README.zh-CN.md

@@ -19,9 +19,9 @@
 
 ## 环境要求
 
-- Pi 0.80 或更高版本
+- Pi 0.85 或更高版本
 - 支持 UTF-8 和彩色输出的终端
-- 使用完整图标集时需要 [Nerd Font](https://www.nerdfonts.com/font-downloads)（可选；内置 ASCII 图标）
+- 使用完整图标集时需要 [Nerd Font](https://www.nerdfonts.com/font-downloads)（可选；内置可移植 Unicode 图标）
 
 ## 安装
 
@@ -44,10 +44,11 @@ pi -e npm:pi-open-tui
 默认的 `auto` 模式检查终端环境，而不是已安装的字体文件。在支持 UTF-8 的交互式 TTY 中，它会使用 Nerd Font 图标，即使 Pi 运行在 runner 或子 shell 中。如果图标显示为方框、乱码或错误符号，请打开 `/open-tui`，在**外观**页选择合适的模式：
 
 - `nerd`：终端已配置 Nerd Font 时，强制使用 Nerd Font 图标
+- `unicode`：可移植 Unicode 图标（文件夹、分支、笔记本电脑、灯泡、插头、沙漏等），无需修补字体；emoji 字形通过终端的 emoji 回退渲染
 - `ascii`：使用纯文本图标，无需安装修补字体
-- `auto`：在支持 UTF-8 的交互式 TTY 中使用 Nerd Font 图标；非交互式输出、`TERM=dumb` 或明确配置为非 UTF-8 的 locale 使用 ASCII
+- `auto`：在支持 UTF-8 的交互式 TTY 中使用 Nerd Font 图标；SSH 会话使用可移植 Unicode 图标（字体由客户端终端决定，通常没有 Nerd Font）；非交互式输出、`TERM=dumb` 或明确配置为非 UTF-8 的 locale 使用 ASCII
 
-如果已经安装字体，但 `auto` 仍选择 ASCII，请手动切换为 `nerd`。使用 VS Code、Windows Terminal 等应用时，只在操作系统中安装字体还不够，还需要在对应的终端配置中选中该字体。
+如果已经安装字体，但 `auto` 仍选择 ASCII，请手动切换为 `nerd`。使用 VS Code、Windows Terminal 等应用时，只在操作系统中安装字体还不够，还需要在对应的终端配置中选中该字体。如果 SSH 客户端终端确实安装了 Nerd Font 并希望在 SSH 下使用完整图标，请将模式显式设为 `nerd`。
 
 ## 配置
 
@@ -102,7 +103,7 @@ pi -e npm:pi-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`、`ascii` | 控制底栏和遥测通知使用的图标 |
+| `icons.mode` | `auto`、`nerd`、`unicode`、`ascii` | 控制底栏和遥测通知使用的图标 |
 | `footerSegments` | 布尔开关 | 分别控制底栏中的各项数据 |
 | `footerSegments.capitalizeProviderName` | 布尔开关 | 将底栏中提供商名称的首字母大写；设为 `false` 时保留原始大小写 |
 | `telemetry` | 布尔开关 | 控制遥测总开关和各项指标 |

package/extensions/open-tui/editor.ts

@@ -4,7 +4,7 @@ import {
 	type ExtensionContext,
 	type KeybindingsManager,
 } from "@earendil-works/pi-coding-agent";
-import type { EditorTheme, TUI } from "@earendil-works/pi-tui";
+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 {
@@ -24,6 +24,8 @@ const CURSOR_STYLE_SEQUENCES: Partial<Record<CursorStyle, string>> = {
 	underline: "\x1b[4 q",
 };
 const DEFAULT_CURSOR_STYLE_SEQUENCE = "\x1b[0 q";
+const EDITOR_FRAME_LEFT_INSET = 2;
+const EDITOR_FRAME_HORIZONTAL_CHROME = EDITOR_FRAME_LEFT_INSET * 2;
 
 interface WorkingStatusIndicator {
 	renderInBorder(width: number): string;
@@ -221,6 +223,16 @@ export class OpenTuiEditor extends CustomEditor {
 		super.setPaddingX(0);
 	}
 
+	override handleMouse(event: TuiMouseEvent): TuiMouseEventResult | undefined {
+		if (event.width < EDITOR_FRAME_HORIZONTAL_CHROME) return super.handleMouse(event);
+
+		return super.handleMouse({
+			...event,
+			x: event.x - EDITOR_FRAME_LEFT_INSET,
+			width: event.width - EDITOR_FRAME_HORIZONTAL_CHROME,
+		});
+	}
+
 	setWorkingStatusIndicator(indicator: WorkingStatusIndicator | undefined): void {
 		this.embeddedWorkingStatusIndicator = indicator;
 		this.tui.requestRender();
@@ -262,12 +274,12 @@ export class OpenTuiEditor extends CustomEditor {
 	}
 
 	render(width: number): string[] {
-		if (width < 4) return this.renderBase(width);
+		if (width < EDITOR_FRAME_HORIZONTAL_CHROME) return this.renderBase(width);
 
 		const rail = this.getRail();
 		const borderPaint = this.getBorder;
 		// ponytail: 1-char rail + 1-char gap on each side = 4 chars of chrome.
-		const innerWidth = Math.max(0, width - 4);
+		const innerWidth = Math.max(0, width - EDITOR_FRAME_HORIZONTAL_CHROME);
 		const baseLines = this.renderBase(innerWidth);
 		const bottomIdx = findBottomBorderIndex(baseLines);
 

package/extensions/open-tui/icons.ts

@@ -1,4 +1,4 @@
-export type IconMode = "auto" | "nerd" | "ascii";
+export type IconMode = "auto" | "nerd" | "unicode" | "ascii";
 
 export interface IconGlyphs {
 	cwd: string;
@@ -94,6 +94,47 @@ const ASCII_GLYPHS: IconGlyphs = {
 	deleted: "x",
 };
 
+// Portable Unicode icon set for terminals without a Nerd Font. Keeps the
+// footer icon-like instead of dropping to letters: emoji glyphs (folder,
+// branch, laptop, bulb, floppy, plug, hourglass, bolt) render through the
+// client terminal's emoji fallback at 2 columns, which matches
+// pi-tui's visibleWidth for RGI emoji; the remaining symbols are
+// single-width and covered by DejaVu Sans Mono, JetBrains Mono, Noto Sans
+// Mono and Liberation Mono. Glyph choices are easy to adjust per slot.
+const UNICODE_GLYPHS: IconGlyphs = {
+	cwd: "📁",
+	host: "⌂",
+	session: "🔖",
+	git: "🌿",
+	working: "◷",
+	done: "✓",
+	context: "≡",
+	model: "💻",
+	thinking: "💡",
+	input: "↑",
+	output: "↓",
+	cacheHit: "💾",
+	cost: "$",
+	speed: "⚡",
+	latency: "⌛",
+	stall: "⚠",
+	extensions: "🔌",
+	ahead: "↑",
+	behind: "↓",
+	diverged: "↕",
+	conflicted: "=",
+	stashed: "$",
+	modified: "!",
+	staged: "+",
+	untracked: "?",
+	renamed: "→",
+	deleted: "✗",
+};
+
+function isSshSession(): boolean {
+	return Boolean(process.env.SSH_TTY || process.env.SSH_CONNECTION);
+}
+
 export function detectNerdFont(): boolean {
 	// TTY and locale checks are the only reliable signals available here. The
 	// terminal emulator owns font selection, so auto mode is optimistic once
@@ -103,14 +144,23 @@ export function detectNerdFont(): boolean {
 	return locale === undefined || /utf-?8/i.test(locale);
 }
 
-export function resolveIconMode(mode: IconMode): "nerd" | "ascii" {
+export function resolveIconMode(mode: IconMode): "nerd" | "unicode" | "ascii" {
 	if (mode === "nerd") return "nerd";
 	if (mode === "ascii") return "ascii";
-	return detectNerdFont() ? "nerd" : "ascii";
+	if (mode === "unicode") return "unicode";
+	if (!detectNerdFont()) return "ascii";
+	// Auto cannot know whether the terminal that renders this session ships a
+	// Nerd Font (see #38). Local terminals usually do; SSH clients usually do
+	// not, because the font lives on the client device, so portable Unicode
+	// symbols are the safer default there. Terminals that do have a Nerd Font
+	// can opt back in with an explicit icons.mode of "nerd".
+	if (isSshSession()) return "unicode";
+	return "nerd";
 }
 
 export function resolveGlyphs(mode: IconMode): IconGlyphs {
 	const resolved = resolveIconMode(mode);
+	if (resolved === "unicode") return UNICODE_GLYPHS;
 	return resolved === "nerd" ? NERD_GLYPHS : ASCII_GLYPHS;
 }
 
@@ -185,6 +235,6 @@ const RUNTIME_ASCII_SYMBOLS: Record<string, string> = {
 };
 
 export function runtimeSymbol(name: string, mode: IconMode): string {
-	if (resolveIconMode(mode) === "ascii") return RUNTIME_ASCII_SYMBOLS[name] ?? name;
+	if (resolveIconMode(mode) !== "nerd") return RUNTIME_ASCII_SYMBOLS[name] ?? name;
 	return RUNTIME_SYMBOLS[name] ?? "";
 }

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

@@ -64,7 +64,7 @@ const COPY = {
 			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", ascii: "ASCII" },
+			icons: { auto: "Auto", nerd: "Nerd", unicode: "Unicode", ascii: "ASCII" },
 		},
 	},
 	zh: {
@@ -104,7 +104,7 @@ const COPY = {
 			wheelLines: (count: number) => `每格 ${count} 行`,
 			wheelPrompt: (count: number) => `滚轮每格滚动行数（当前 ${count}，范围 1-10），输入后 Enter 应用 · Esc 取消`,
 			cursorStyles: { block: "块", bar: "竖线", underline: "下划线" },
-			icons: { auto: "自动", nerd: "Nerd", ascii: "ASCII" },
+			icons: { auto: "自动", nerd: "Nerd", unicode: "Unicode", ascii: "ASCII" },
 		},
 	},
 } as const;
@@ -127,7 +127,7 @@ function toggleSetting(config: OpenTuiConfig, key: keyof OpenTuiConfig["footerSe
 }
 
 function cycleIconMode(config: OpenTuiConfig): OpenTuiConfig {
-	const order: IconMode[] = ["auto", "nerd", "ascii"];
+	const order: IconMode[] = ["auto", "nerd", "unicode", "ascii"];
 	const currentIdx = order.indexOf(config.icons.mode);
 	const next = order[(currentIdx + 1) % order.length]!;
 	return { ...config, icons: { mode: next } };

package/extensions/open-tui/utils.ts

@@ -43,23 +43,28 @@ export function truncateBranch(branch: string, maxLen: number): string {
 }
 
 export function truncatePath(path: string, maxLen: number): string {
-	if (path.length <= maxLen) return path;
+	// `maxLen` is a terminal-column budget, so every comparison here must use
+	// display width. Comparing String.length let wide (CJK) paths stay wider than
+	// the budget: for a basename of 4 characters but 8 columns, `truncatePath`
+	// returned it unchanged, so fitSegmentsByPriority's `while (totalW() > maxW)`
+	// loop never made progress and livelocked the renderer at 100% CPU.
+	if (visibleWidth(path) <= maxLen) return path;
 	if (maxLen <= 3) return "...".slice(0, maxLen);
 	const sepChar = path.includes("/") ? "/" : "\\";
 	const parts = path.split(/[\\/]/);
-	if (parts.length <= 2) return path.slice(0, maxLen - 3) + "...";
+	if (parts.length <= 2) return truncateToWidth(path, maxLen, "...");
 	// Keep first segment (e.g. ~) and as many trailing segments as fit.
 	const tail: string[] = [];
 	let tailLen = 0;
 	for (let i = parts.length - 1; i >= 1; i--) {
 		const seg = parts[i]!;
-		if (tailLen + seg.length + 4 > maxLen) break;
+		if (tailLen + visibleWidth(seg) + 4 > maxLen) break;
 		tail.unshift(seg);
-		tailLen += seg.length + 1;
+		tailLen += visibleWidth(seg) + 1;
 	}
 	const head = parts[0]!;
 	const result = `${head}${sepChar}...${sepChar}${tail.join(sepChar)}`;
-	return result.length > maxLen ? result.slice(0, maxLen - 3) + "..." : result;
+	return visibleWidth(result) > maxLen ? truncateToWidth(result, maxLen, "...") : result;
 }
 
 export function finiteOrZero(value: unknown): number {
@@ -158,7 +163,25 @@ export function fitSegmentsByPriority(
 			if (totalW() <= maxW) break;
 		}
 	}
+	// A segment whose `truncate` cannot actually shrink would otherwise spin here
+	// forever and block the render timer. Require each pass to make progress, and
+	// drop the worst segment when it does not, so layout always terminates.
+	let lastTotal = Infinity;
 	while (totalW() > maxW) {
+		const nowTotal = totalW();
+		if (nowTotal >= lastTotal) {
+			let worst = -1;
+			for (let i = 0; i < items.length; i++) {
+				if (items[i].text !== "" && (worst === -1 || items[i].priority < items[worst].priority)) {
+					worst = i;
+				}
+			}
+			if (worst === -1) break;
+			items[worst].text = "";
+			items[worst].w = 0;
+			continue;
+		}
+		lastTotal = nowTotal;
 		let target = -1;
 		for (let i = 0; i < items.length; i++) {
 			if (items[i].text !== "" && (target === -1 || items[i].priority < items[target].priority)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-open-tui",
-  "version": "0.3.8",
+  "version": "0.3.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.",
   "type": "module",
   "repository": {
@@ -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.81",
-    "@earendil-works/pi-ai": ">=0.81",
-    "@earendil-works/pi-tui": ">=0.81"
+    "@earendil-works/pi-coding-agent": ">=0.85",
+    "@earendil-works/pi-ai": ">=0.85",
+    "@earendil-works/pi-tui": ">=0.85"
   },
   "peerDependenciesMeta": {
     "@earendil-works/pi-coding-agent": {