pi-open-tui 0.3.11 → 0.3.12

package/README.md

@@ -49,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`:
@@ -74,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,
@@ -101,10 +104,11 @@ Key options:
 | `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. Each status keeps the colours its extension applied with `ctx.ui.theme.fg()`. A status without colours renders in the muted theme colour.
+`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.
 

package/README.zh-CN.md

@@ -49,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`：
@@ -74,7 +76,8 @@ pi -e npm:pi-open-tui
     "tokens": true,
     "cost": true,
     "extensionStatuses": true,
-    "capitalizeProviderName": true
+    "capitalizeProviderName": true,
+    "nerdIconSpacing": false
   },
   "telemetry": {
     "enabled": true,
@@ -101,10 +104,11 @@ pi -e npm:pi-open-tui
 | `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 状态。每条状态会保留其扩展通过 `ctx.ui.theme.fg()` 设置的颜色；未设置颜色的状态使用 muted 主题色显示。
+`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 数据，保留右侧统计信息和边框角。
 

package/extensions/open-tui/config.ts

@@ -22,6 +22,7 @@ export interface FooterSegments {
 	cost: boolean;
 	extensionStatuses: boolean;
 	capitalizeProviderName: boolean;
+	nerdIconSpacing: boolean;
 }
 
 export interface TelemetryConfig {
@@ -72,6 +73,7 @@ export const DEFAULT_CONFIG: OpenTuiConfig = {
 		cost: true,
 		extensionStatuses: true,
 		capitalizeProviderName: true,
+		nerdIconSpacing: false,
 	},
 	telemetry: {
 		enabled: true,
@@ -96,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;
@@ -141,9 +155,17 @@ 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;
 		}

package/extensions/open-tui/footer.ts

@@ -31,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;
@@ -112,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;
@@ -286,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);
 
@@ -340,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

@@ -178,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;
@@ -186,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;
@@ -399,7 +400,7 @@ export default function (pi: ExtensionAPI) {
 			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

@@ -28,7 +28,7 @@ const COPY = {
 		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",
 			cursorStyle: "Cursor style",
@@ -38,17 +38,18 @@ 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",
@@ -61,11 +62,11 @@ const COPY = {
 	},
 	zh: {
 		title: "Open TUI 设置",
-		tabs: { features: "常规", icons: "外观", segments: "Footer", telemetry: "遥测" },
+		tabs: { features: "常规", icons: "外观", segments: "底栏", telemetry: "遥测" },
 		hint: "Tab/Shift+Tab/←/→：切页 · ↑/↓：移动 · Enter/Space：更改 · Esc/q：关闭",
 		labels: {
 			enabled: "启用",
-			inlineFooter: "内联底栏",
+			inlineFooter: "底栏嵌入输入框",
 			thinkingPeek: "思考预览",
 			language: "语言",
 			cursorStyle: "光标样式",
@@ -75,17 +76,18 @@ 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: "开启",
@@ -185,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) },
 	];
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-open-tui",
-  "version": "0.3.11",
+  "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": {