pi-tui-footer 1.2.1 → 1.2.3

package/README.md

@@ -17,7 +17,7 @@ pi install git:github.com/onenora/pi-tui-footer
 固定版本：
 
 ```bash
-pi install git:github.com/onenora/pi-tui-footer@v1.2.0
+pi install git:github.com/onenora/pi-tui-footer@v1.2.3
 ```
 
 更新：

package/extensions/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/index.ts

@@ -4,7 +4,7 @@
  * thinking peek preview, rounded tool frames, and turn telemetry.
  *
  * Integrated from:
- *   - pi-open-tui (v0.3.8, MIT, by OldSun, https://github.com/OldSuns/pi-open-tui)
+ *   - pi-open-tui (v0.3.9, MIT, by OldSun, https://github.com/OldSuns/pi-open-tui)
  *   - pi-rounded-tools (v0.1.3, MIT, by OrionPax, https://github.com/orionpax1997/pi-rounded-tools)
  *
  * Security audit notes:

package/extensions/rounded-tools.ts

@@ -4,11 +4,11 @@
  * Merged 2026-08 from the standalone local extension rounded-tools.ts (a
  * localized copy of npm:pi-rounded-tools@0.1.3, MIT, by OrionPax,
  * https://github.com/orionpax1997/pi-rounded-tools), integrated into pi-tui
- * (based on https://github.com/OldSuns/pi-open-tui v0.3.8, MIT, by
+ * (based on https://github.com/OldSuns/pi-open-tui v0.3.9, MIT, by
  * OldSun) and gated behind `roundedTools` in pi-tui config
  * (~/.pi/agent/pi-tui.json, default on).
  *
- * Re-registers the built-in tools (read, write, edit, bash, grep, find, ls)
+ * Re-registers the built-in tools (read, write, edit, grep, find, ls)
  * with `renderShell: "self"` and wraps each tool call / result in a frame
  * drawn with Unicode rounded-corner characters (╭ ╮ ╰ ╯ ─ │).
  *
@@ -26,7 +26,6 @@
 
 import type { ExtensionAPI, ToolDefinition } from "@earendil-works/pi-coding-agent";
 import {
-	createBashToolDefinition,
 	createEditToolDefinition,
 	createFindToolDefinition,
 	createGrepToolDefinition,
@@ -229,7 +228,7 @@ function wrapBuiltin(def: ToolDef) {
 }
 
 /**
- * Register the 7 built-in file/bash tools, either with rounded frames
+ * Register the 6 built-in file tools, either with rounded frames
  * (`enabled`) or with their plain stock definitions (`!enabled`, restores
  * original rendering). Registration refreshes the active tool set in the
  * current session, so toggling the setting takes effect immediately.
@@ -239,7 +238,6 @@ export function registerRoundedTools(pi: ExtensionAPI, enabled: boolean, cwd: st
 		createReadToolDefinition(cwd),
 		createWriteToolDefinition(cwd),
 		createEditToolDefinition(cwd),
-		createBashToolDefinition(cwd),
 		createGrepToolDefinition(cwd),
 		createFindToolDefinition(cwd),
 		createLsToolDefinition(cwd),

package/extensions/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-tui-footer",
-	"version": "1.2.1",
+	"version": "1.2.3",
 	"description": "pi extension: TUI footer/header with git status, telemetry, rounded tools, editor and settings enhancements",
 	"type": "module",
 	"keywords": [