pi-tui-footer 1.2.8 → 1.3.0

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.4
+pi install git:github.com/onenora/pi-tui-footer@v1.3.0
 ```
 
 更新：
@@ -43,24 +43,22 @@ pi update --extensions
 
 也可在 pi 内通过 `/pi-tui` 命令调整。
 
-### 圆角工具框与第三方工具
+### 圆角工具框
 
-`roundedTools` 开启时，除 8 个内置工具（read、write、edit、bash、powershell、grep、find、ls）外，也会自动拦截并为第三方扩展注册的工具（如 pi-fff 的 `ffgrep`、`fffind`、`fff-multi-grep`，或其 override 模式接管的 `grep`/`find`）添加圆角边框。
+需要 pi >= 1.0.4（依赖 `pi.registerToolRenderer()`）。旧版本不会报错，但圆角工具框不生效。
 
-**加载顺序**：需要在 `~/.pi/agent/settings.json` 的 `packages` 中将 `pi-tui-footer` 排在第三方扩展（如 `@ff-labs/pi-fff`）**之前**，以确保 proxy 在工具注册前生效：
+`roundedTools` 通过渲染器解析器包装工具调用/结果的显示，不重新注册工具，不改变工具定义、执行逻辑和激活状态。覆盖范围：
 
-```json
-{
-  "packages": [
-    "npm:pi-tui-footer",
-    "npm:@ff-labs/pi-fff"
-  ]
-}
-```
+- 内置工具：read、write、bash、powershell、grep、find、ls（edit 自带外框，保持原样）
+- pi-fff 工具：ffgrep、fffind、fff-multi-grep
+
+按工具名匹配，与扩展加载顺序无关。其他第三方工具不会自动添加圆角边框；需要时将工具名加入 `extensions/rounded-tools.ts` 的 `ROUNDED_TOOL_NAMES`。
+
+切换 `roundedTools` 后，新的工具调用立即生效，已渲染的历史记录在下次重建（`/reload`、恢复会话、压缩）时更新。
 
 ## 致谢
 
-本项目是以下两个开源项目的深度融合集成：
+本项目can以下两个开源项目的集成：
 
 - [pi-open-tui](https://github.com/OldSuns/pi-open-tui) — 头部、底部、编辑器、遥测和设置界面的整体结构
 - [pi-rounded-tools](https://github.com/orionpax1997/pi-rounded-tools) — 圆角工具调用/结果框

package/extensions/index.ts

@@ -224,21 +224,16 @@ export default function (pi: ExtensionAPI) {
 		requestFooterRender?.();
 	};
 
-	const applyRoundedTools = (ctx: ExtensionContext) => {
-		roundedTools.apply(config.enabled && config.roundedTools, ctx.cwd);
+	const applyRoundedTools = () => {
+		roundedTools.setEnabled(config.enabled && config.roundedTools);
 	};
 
-	// Register rounded tool renderers at load time (before session_start) so a
-	// /reload transcript rebuild — which pi runs BEFORE emitting session_start —
-	// constructs historical tool-call components with the wrapped renderers.
-	// session_start re-registers with the real session cwd afterwards, which
-	// corrects the execute closure for relative-path tools. Toggling the
-	// setting re-registers for new components; already-rendered historical
-	// components keep their current frames until the next transcript rebuild
-	// (compaction / resume / tree navigation / thinking-block toggle).
-	const initialConfig = loadConfig();
-	config = initialConfig;
-	roundedTools.init(initialConfig.enabled && initialConfig.roundedTools);
+	// The renderer resolver is installed when RoundedToolsManager is constructed
+	// (before session_start), so a /reload transcript rebuild already uses it.
+	// Toggling the setting affects components created afterwards; already-rendered
+	// historical components keep their frames until the next transcript rebuild.
+	config = loadConfig();
+	applyRoundedTools();
 
 	const refreshInteractiveState = (ctx: ExtensionContext, project = false) => {
 		if (!sessionLifecycle.isCurrent() || !ctx.hasUI) return;
@@ -280,7 +275,7 @@ export default function (pi: ExtensionAPI) {
 		clearPeekLabel(ctx);
 
 		applyUi(ctx);
-		applyRoundedTools(ctx);
+		applyRoundedTools();
 
 		refreshInteractiveState(ctx, true);
 	});
@@ -437,8 +432,8 @@ export default function (pi: ExtensionAPI) {
 			if (lastCtx) {
 				pendingUiChange = getPendingUiChange(newConfig.enabled, active);
 			}
-			if (lastCtx && (wasRoundedTools !== newConfig.roundedTools || wasEnabled !== newConfig.enabled)) {
-				applyRoundedTools(lastCtx);
+			if (wasRoundedTools !== newConfig.roundedTools || wasEnabled !== newConfig.enabled) {
+				applyRoundedTools();
 			}
 			const gitNeeded = newConfig.footerSegments.gitBranch || newConfig.footerSegments.gitStatus || newConfig.footerSegments.gitCommit;
 			if (lastCtx && gitNeeded) {

package/extensions/rounded-tools.ts

@@ -1,31 +1,20 @@
 /**
  * Rounded tool frames — rounded frames for tool calls and results.
  *
- * Re-registers built-in tools (read, write, bash, powershell, grep, find, ls)
- * with `renderShell: "self"` and wraps each tool call / result in a frame
- * drawn with Unicode rounded-corner characters (╭ ╮ ╰ ╯ ─ │).
+ * Uses `pi.registerToolRenderer()` to wrap the renderers of built-in tools
+ * (read, write, bash, powershell, grep, find, ls, plus pi-fff's ffgrep, fffind,
+ * fff-multi-grep) with `renderShell: "self"`
+ * and a frame drawn with Unicode rounded-corner characters (╭ ╮ ╰ ╯ ─ │).
+ * Tool definitions, execution and active-tool state are left untouched.
  *
- * Tools that already render their own shell (e.g. `edit` in modern Pi versions)
- * are preserved as-is to avoid duplicate nesting and UI glitches.
+ * Tools that already render their own shell (e.g. `edit`) are preserved as-is
+ * to avoid duplicate nesting and UI glitches.
  *
  * Border color follows `theme.fg("border", ...)` so it adapts to your theme,
  * using warning (yellow) during pending/streaming execution and error (red) on failure.
- *
- * Non-default tools (grep, find, ls, powershell) preserve `defaultActive: false`
- * to avoid polluting the model's active toolset.
  */
 
-import type { ExtensionAPI, ToolDefinition } from "@earendil-works/pi-coding-agent";
-import {
-	createBashToolDefinition,
-	createEditToolDefinition,
-	createFindToolDefinition,
-	createGrepToolDefinition,
-	createLsToolDefinition,
-	createPowerShellToolDefinition,
-	createReadToolDefinition,
-	createWriteToolDefinition,
-} from "@earendil-works/pi-coding-agent";
+import type { ExtensionAPI, ToolRenderers } from "@earendil-works/pi-coding-agent";
 import type { Component, TuiMouseEvent, TuiMouseEventResult } from "@earendil-works/pi-tui";
 import { visibleWidth } from "@earendil-works/pi-tui";
 
@@ -38,6 +27,18 @@ import { visibleWidth } from "@earendil-works/pi-tui";
 
 export type FrameMode = "closed" | "open-bottom" | "open-top";
 
+// ─── Border color ────────────────────────────────────────────────────────
+
+type RenderContext = { isPartial?: boolean; isError?: boolean };
+
+function borderColorFor(context: RenderContext | undefined): string {
+	if (context?.isError) return "error";
+	if (context?.isPartial) return "warning";
+	return "border";
+}
+
+// ─── RoundedFrame component ─────────────────────────────────────────────
+
 export class RoundedFrame implements Component {
 	private cachedWidth: number | undefined;
 	private cachedInnerLines: string[] | undefined;
@@ -47,6 +48,7 @@ export class RoundedFrame implements Component {
 		private inner: Component,
 		private border: (text: string) => string,
 		private mode: FrameMode = "closed",
+		private colorKey: string = "border",
 	) {}
 
 	getInner(): Component {
@@ -64,10 +66,16 @@ export class RoundedFrame implements Component {
 		}
 	}
 
-	update(inner: Component, border: (text: string) => string, mode: FrameMode): this {
-		if (this.inner !== inner || this.mode !== mode) {
+	update(
+		inner: Component,
+		border: (text: string) => string,
+		mode: FrameMode,
+		colorKey: string,
+	): this {
+		if (this.inner !== inner || this.mode !== mode || this.colorKey !== colorKey) {
 			this.inner = inner;
 			this.mode = mode;
+			this.colorKey = colorKey;
 			this.invalidate();
 		}
 		this.border = border;
@@ -135,9 +143,8 @@ export class RoundedFrame implements Component {
 			return this.cachedLines;
 		}
 
-		const horizontal = "─".repeat(Math.max(0, width - 2));
+		const horizontal = "─".repeat(width - 2);
 		const side = this.border("│");
-
 		const out: string[] = [];
 
 		if (this.mode !== "open-top") {
@@ -146,8 +153,7 @@ export class RoundedFrame implements Component {
 
 		if (innerLines.length > 0) {
 			for (const line of innerLines) {
-				const vis = visibleWidth(line);
-				const pad = " ".repeat(Math.max(0, innerWidth - vis));
+				const pad = " ".repeat(Math.max(0, innerWidth - visibleWidth(line)));
 				out.push(side + " " + line + pad + " " + side);
 			}
 		} else if (this.mode === "closed") {
@@ -157,6 +163,7 @@ export class RoundedFrame implements Component {
 		if (this.mode !== "open-bottom") {
 			out.push(this.border("╰" + horizontal + "╯"));
 		}
+
 		this.cachedWidth = width;
 		this.cachedInnerLines = innerLines;
 		this.cachedLines = out;
@@ -164,35 +171,38 @@ export class RoundedFrame implements Component {
 	}
 }
 
-const frame = (
+// ─── Frame factories ────────────────────────────────────────────────────
+
+const createFrame = (
 	inner: Component,
 	theme: { fg: (color: string, text: string) => string },
 	mode: FrameMode = "closed",
 	colorKey: string = "border",
-): RoundedFrame => new RoundedFrame(inner, (t) => theme.fg(colorKey, t), mode);
-
-function borderColorFor(
-	context: { isPartial?: boolean; isError?: boolean } | undefined,
-): string {
-	if (context?.isError) return "error";
-	if (context?.isPartial) return "warning";
-	return "border";
-}
-
-// ─── Helpers ─────────────────────────────────────────────────────────────
-
-type ToolDef = ToolDefinition<any, any, any>;
+): RoundedFrame => new RoundedFrame(inner, (t) => theme.fg(colorKey, t), mode, colorKey);
 
 const EMPTY_COMPONENT: Component = { render: () => [], invalidate: () => {} };
 
+// ─── Tool wrapping ──────────────────────────────────────────────────────
+
+const ROUNDED_TOOL_NAMES: ReadonlySet<string> = new Set([
+	"read",
+	"write",
+	"bash",
+	"powershell",
+	"grep",
+	"find",
+	"ls",
+	// pi-fff (@ff-labs/pi-fff) tools; resolvers match by name, so load order is irrelevant.
+	"ffgrep",
+	"fffind",
+	"fff-multi-grep",
+]);
+
 function unwrapInner(component: unknown): Component | undefined {
-	if (component instanceof RoundedFrame) {
-		return component.getInner();
-	}
-	return component as Component | undefined;
+	return component instanceof RoundedFrame ? component.getInner() : (component as Component | undefined);
 }
 
-export function wrapBuiltin(def: ToolDef): ToolDef {
+export function wrapRenderers(def: ToolRenderers): ToolRenderers {
 	// Tools that already manage their own shell (e.g. edit) should remain untouched.
 	if (def.renderShell === "self") {
 		return def;
@@ -211,13 +221,14 @@ export function wrapBuiltin(def: ToolDef): ToolDef {
 			// close the bottom border so it renders as a complete box instead of an open frame.
 			const isPendingWithoutResult = Boolean(context?.isPartial && !context?.state?.__hasResult);
 			const mode: FrameMode = def.renderResult && !isPendingWithoutResult ? "open-bottom" : "closed";
-			const borderFn = (t: string) => theme.fg(borderColorFor(context), t);
+			const colorKey = borderColorFor(context);
+			const borderFn = (t: string) => theme.fg(colorKey, t);
 
 			let callFrame: RoundedFrame;
 			if (context?.lastComponent instanceof RoundedFrame) {
-				callFrame = context.lastComponent.update(inner, borderFn, mode);
+				callFrame = context.lastComponent.update(inner, borderFn, mode, colorKey);
 			} else {
-				callFrame = frame(inner, theme, mode, borderColorFor(context));
+				callFrame = createFrame(inner, theme, mode, colorKey);
 			}
 
 			if (context?.state) {
@@ -239,91 +250,37 @@ export function wrapBuiltin(def: ToolDef): ToolDef {
 			const inner: Component = def.renderResult
 				? def.renderResult(result, options, theme, { ...context, lastComponent: unwrapped })
 				: EMPTY_COMPONENT;
-			const borderFn = (t: string) => theme.fg(borderColorFor(context), t);
+			const colorKey = borderColorFor(context);
+			const borderFn = (t: string) => theme.fg(colorKey, t);
 
 			if (context?.lastComponent instanceof RoundedFrame) {
-				return context.lastComponent.update(inner, borderFn, "open-top");
+				return context.lastComponent.update(inner, borderFn, "open-top", colorKey);
 			}
-			return frame(inner, theme, "open-top", borderColorFor(context));
+			return createFrame(inner, theme, "open-top", colorKey);
 		},
 	};
 }
 
-export function registerRoundedTools(
-	target: ExtensionAPI | ((tool: ToolDef) => void),
-	enabled: boolean,
-	cwd: string,
-	_captured?: Map<string, ToolDef>,
-): void {
-	const register = typeof target === "function" ? target : target.registerTool.bind(target);
-
-	let settings: any;
-	if (typeof target !== "function" && target.getSettings) {
-		try {
-			settings = target.getSettings();
-		} catch {
-			// runtime not initialized yet during early load
-		}
-	}
-	const autoResizeImages = settings?.images?.autoResize ?? true;
-	const shellCommandPrefix = settings?.shellCommandPrefix;
-	const shellPath = settings?.shellPath;
-
-	let activeToolNames: Set<string> | undefined;
-	if (typeof target !== "function" && target.getActiveTools) {
-		try {
-			const active = target.getActiveTools();
-			if (Array.isArray(active) && active.length > 0) {
-				activeToolNames = new Set(active);
-			}
-		} catch {
-			// runtime not initialized yet during early load
-		}
-	}
-	const defaultActiveNames = activeToolNames ?? new Set(["read", "bash", "edit", "write"]);
-
-	const builtins: Record<string, () => ToolDef> = {
-		read: () => createReadToolDefinition(cwd, { autoResizeImages }),
-		write: () => createWriteToolDefinition(cwd),
-		edit: () => createEditToolDefinition(cwd),
-		bash: () => createBashToolDefinition(cwd, { commandPrefix: shellCommandPrefix, shellPath }),
-		powershell: () => createPowerShellToolDefinition(cwd, { shellPath }),
-		ls: () => createLsToolDefinition(cwd),
-		grep: () => createGrepToolDefinition(cwd),
-		find: () => createFindToolDefinition(cwd),
-	};
-
-	for (const [name, factory] of Object.entries(builtins)) {
-		const rawDef = factory();
-		// Skip tools that already manage their own shell framing (e.g. edit)
-		if (rawDef.renderShell === "self") {
-			continue;
-		}
-
-		const shouldBeActive = defaultActiveNames.has(name);
-		const baseDef: ToolDef = {
-			...rawDef,
-			defaultActive: shouldBeActive,
-		};
-
-		register(enabled ? wrapBuiltin(baseDef) : baseDef);
-	}
-}
+// ─── Manager ─────────────────────────────────────────────────────────────
 
 export class RoundedToolsManager {
 	private enabled = false;
 
-	constructor(private readonly pi: ExtensionAPI) {}
-
-	/** Register initial tools before session_start with fallback cwd. */
-	init(enabled: boolean, cwd = process.cwd()): void {
-		this.enabled = enabled;
-		registerRoundedTools(this.pi, enabled, cwd);
+	/**
+	 * Install the renderer resolver once at extension load. Toggling `enabled`
+	 * affects tool components created afterwards (resume / reload / new calls).
+	 */
+	constructor(pi: ExtensionAPI) {
+		pi.registerToolRenderer?.((toolName, next) => {
+			const base = next();
+			if (!base || !this.enabled || !ROUNDED_TOOL_NAMES.has(toolName)) return base;
+			// Nothing to frame: let pi use its own fallback rendering.
+			if (!base.renderCall && !base.renderResult) return base;
+			return wrapRenderers(base);
+		});
 	}
 
-	/** Apply tools with current session cwd. */
-	apply(enabled: boolean, cwd: string): void {
+	setEnabled(enabled: boolean): void {
 		this.enabled = enabled;
-		registerRoundedTools(this.pi, enabled, cwd);
 	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-tui-footer",
-	"version": "1.2.8",
+	"version": "1.3.0",
 	"description": "pi extension: TUI footer/header with git status, telemetry, rounded tools, editor and settings enhancements",
 	"type": "module",
 	"keywords": [