pi-tui-footer 1.2.8 → 1.2.9

package/README.md

@@ -45,9 +45,9 @@ pi update --extensions
 
 ### 圆角工具框与第三方工具
 
-`roundedTools` 开启时，除 8 个内置工具（read、write、edit、bash、powershell、grep、find、ls）外，也会自动拦截并为第三方扩展注册的工具（如 pi-fff 的 `ffgrep`、`fffind`、`fff-multi-grep`，或其 override 模式接管的 `grep`/`find`）添加圆角边框。
+`roundedTools` 会为 Pi 内置工具（read、write、edit、bash、powershell、grep、find、ls）添加圆角边框。第三方扩展注册的自定义工具不会自动添加圆角边框。
 
-**加载顺序**：需要在 `~/.pi/agent/settings.json` 的 `packages` 中将 `pi-tui-footer` 排在第三方扩展（如 `@ff-labs/pi-fff`）**之前**，以确保 proxy 在工具注册前生效：
+若第三方扩展会覆盖同名内置工具，请在 `~/.pi/agent/settings.json` 的 `packages` 中将 `pi-tui-footer` 放在该扩展之后。Pi 按扩展加载顺序处理同名工具，先注册的定义生效；此顺序可保留第三方工具的执行实现：
 
 ```json
 {

package/extensions/rounded-tools.ts

@@ -47,6 +47,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 +65,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;
@@ -169,7 +176,7 @@ const frame = (
 	theme: { fg: (color: string, text: string) => string },
 	mode: FrameMode = "closed",
 	colorKey: string = "border",
-): RoundedFrame => new RoundedFrame(inner, (t) => theme.fg(colorKey, t), mode);
+): RoundedFrame => new RoundedFrame(inner, (t) => theme.fg(colorKey, t), mode, colorKey);
 
 function borderColorFor(
 	context: { isPartial?: boolean; isError?: boolean } | undefined,
@@ -215,7 +222,7 @@ export function wrapBuiltin(def: ToolDef): ToolDef {
 
 			let callFrame: RoundedFrame;
 			if (context?.lastComponent instanceof RoundedFrame) {
-				callFrame = context.lastComponent.update(inner, borderFn, mode);
+				callFrame = context.lastComponent.update(inner, borderFn, mode, borderColorFor(context));
 			} else {
 				callFrame = frame(inner, theme, mode, borderColorFor(context));
 			}
@@ -242,7 +249,7 @@ export function wrapBuiltin(def: ToolDef): ToolDef {
 			const borderFn = (t: string) => theme.fg(borderColorFor(context), t);
 
 			if (context?.lastComponent instanceof RoundedFrame) {
-				return context.lastComponent.update(inner, borderFn, "open-top");
+				return context.lastComponent.update(inner, borderFn, "open-top", borderColorFor(context));
 			}
 			return frame(inner, theme, "open-top", borderColorFor(context));
 		},
@@ -273,7 +280,7 @@ export function registerRoundedTools(
 	if (typeof target !== "function" && target.getActiveTools) {
 		try {
 			const active = target.getActiveTools();
-			if (Array.isArray(active) && active.length > 0) {
+			if (Array.isArray(active)) {
 				activeToolNames = new Set(active);
 			}
 		} catch {
@@ -287,7 +294,7 @@ export function registerRoundedTools(
 		write: () => createWriteToolDefinition(cwd),
 		edit: () => createEditToolDefinition(cwd),
 		bash: () => createBashToolDefinition(cwd, { commandPrefix: shellCommandPrefix, shellPath }),
-		powershell: () => createPowerShellToolDefinition(cwd, { shellPath }),
+		powershell: () => createPowerShellToolDefinition(cwd),
 		ls: () => createLsToolDefinition(cwd),
 		grep: () => createGrepToolDefinition(cwd),
 		find: () => createFindToolDefinition(cwd),

package/package.json

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