@heyhuynhgiabuu/pi-pretty 0.4.4 → 0.5.1

package/README.md

@@ -140,6 +140,7 @@ Optional environment variables:
 - `PRETTY_MAX_PREVIEW_LINES` (default: `80`)
 - `PRETTY_CACHE_LIMIT` (default: `128`)
 - `PRETTY_ICONS` (`nerd` by default, set to `none` to disable icons)
+- `PRETTY_DISABLE_TOOLS` — comma-separated list of tool names to skip during registration (e.g. `read,grep`). Useful when another extension already owns one of these tool names. All tools (read, bash, ls, find, grep, multi_grep) are registered by default.
 
 ## Development
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@heyhuynhgiabuu/pi-pretty",
-	"version": "0.4.4",
+	"version": "0.5.1",
 	"description": "Pretty terminal output for pi — syntax-highlighted file reads, colored bash output, tree-view directory listings, and more.",
 	"author": "huynhgiabuu",
 	"license": "MIT",
@@ -26,10 +26,14 @@
 		"@shikijs/cli": "^4.0.2"
 	},
 	"peerDependencies": {
+		"@earendil-works/pi-coding-agent": "*",
+		"@earendil-works/pi-tui": "*",
 		"@mariozechner/pi-coding-agent": "*",
 		"@mariozechner/pi-tui": "*"
 	},
 	"devDependencies": {
+		"@earendil-works/pi-coding-agent": "*",
+		"@earendil-works/pi-tui": "*",
 		"@types/node": "^20.0.0",
 		"typescript": "^5.0.0",
 		"@biomejs/biome": "^2.3.5",

package/src/index.ts

@@ -28,7 +28,7 @@ import { mkdirSync, readFileSync } from "node:fs";
 import { basename, dirname, extname, join, relative } from "node:path";
 
 import type { FileFinder, FileItem, GrepResult, SearchResult } from "@ff-labs/fff-node";
-import type { ImageContent, TextContent } from "@mariozechner/pi-ai";
+import type { ImageContent, TextContent } from "@earendil-works/pi-ai";
 import type {
 	AgentToolResult,
 	AgentToolUpdateCallback,
@@ -40,8 +40,8 @@ import type {
 	LsToolInput,
 	ReadToolInput,
 	ToolRenderResultOptions,
-} from "@mariozechner/pi-coding-agent";
-import { truncateToWidth, visibleWidth } from "@mariozechner/pi-tui";
+} from "@earendil-works/pi-coding-agent";
+import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import { codeToANSI } from "@shikijs/cli";
 import type { BundledLanguage, BundledTheme } from "shiki";
 
@@ -1017,13 +1017,13 @@ export default function piPrettyExtension(pi: PiPrettyApi, deps?: PiPrettyDeps):
 		_fffDbDir = null;
 	} else {
 		try {
-			sdk = require("@mariozechner/pi-coding-agent");
+			sdk = require("@earendil-works/pi-coding-agent");
 			createReadTool = sdk.createReadToolDefinition ?? sdk.createReadTool;
 			createBashTool = sdk.createBashToolDefinition ?? sdk.createBashTool;
 			createLsTool = sdk.createLsToolDefinition ?? sdk.createLsTool;
 			createFindTool = sdk.createFindToolDefinition ?? sdk.createFindTool;
 			createGrepTool = sdk.createGrepToolDefinition ?? sdk.createGrepTool;
-			TextComponent = require("@mariozechner/pi-tui").Text;
+			TextComponent = require("@earendil-works/pi-tui").Text;
 		} catch {
 			return;
 		}
@@ -1035,6 +1035,17 @@ export default function piPrettyExtension(pi: PiPrettyApi, deps?: PiPrettyDeps):
 	const sp = (p: string) => shortPath(cwd, home, p);
 	const multiGrepRipgrepFallback = deps?.multiGrepRipgrepFallback ?? runMultiGrepRipgrepFallback;
 
+	// Parse PRETTY_DISABLE_TOOLS — comma-separated tool names to skip
+	const disabledTools = new Set(
+		(process.env.PRETTY_DISABLE_TOOLS ?? "")
+			.split(",")
+			.map((s) => s.trim().toLowerCase())
+			.filter(Boolean),
+	);
+	function isToolEnabled(name: string): boolean {
+		return !disabledTools.has(name.toLowerCase());
+	}
+
 	// ===================================================================
 	// FFF initialization (optional — graceful fallback to SDK)
 	// ===================================================================
@@ -1111,7 +1122,8 @@ export default function piPrettyExtension(pi: PiPrettyApi, deps?: PiPrettyDeps):
 
 	const origRead = createReadTool(cwd);
 
-	pi.registerTool({
+	if (isToolEnabled("read")) {
+		pi.registerTool({
 		...origRead,
 		name: "read",
 
@@ -1218,12 +1230,13 @@ export default function piPrettyExtension(pi: PiPrettyApi, deps?: PiPrettyDeps):
 			return text;
 		},
 	});
+	}
 
 	// ===================================================================
 	// bash — colored exit status
 	// ===================================================================
 
-	if (createBashTool) {
+	if (createBashTool && isToolEnabled("bash")) {
 		const origBash = createBashTool(cwd);
 
 		pi.registerTool({
@@ -1321,7 +1334,7 @@ export default function piPrettyExtension(pi: PiPrettyApi, deps?: PiPrettyDeps):
 	// ls — tree view with icons
 	// ===================================================================
 
-	if (createLsTool) {
+	if (createLsTool && isToolEnabled("ls")) {
 		const origLs = createLsTool(cwd);
 
 		pi.registerTool({
@@ -1387,7 +1400,7 @@ export default function piPrettyExtension(pi: PiPrettyApi, deps?: PiPrettyDeps):
 	// find — grouped file list with icons
 	// ===================================================================
 
-	if (createFindTool) {
+	if (createFindTool && isToolEnabled("find")) {
 		const origFind = createFindTool(cwd);
 
 		pi.registerTool({
@@ -1490,7 +1503,7 @@ export default function piPrettyExtension(pi: PiPrettyApi, deps?: PiPrettyDeps):
 	// grep — highlighted matches with line numbers
 	// ===================================================================
 
-	if (createGrepTool) {
+	if (createGrepTool && isToolEnabled("grep")) {
 		const origGrep = createGrepTool(cwd);
 
 		pi.registerTool({
@@ -1626,7 +1639,7 @@ export default function piPrettyExtension(pi: PiPrettyApi, deps?: PiPrettyDeps):
 	// SDK grep fallback otherwise)
 	// ===================================================================
 
-	if (_fffModule || createGrepTool) {
+	if ((_fffModule || createGrepTool) && isToolEnabled("multi_grep")) {
 		const multiGrepFallback = createGrepTool ? createGrepTool(cwd) : null;
 
 		pi.registerTool({

package/test/bash-rendering.test.ts

@@ -1,4 +1,4 @@
-import { visibleWidth } from "@mariozechner/pi-tui";
+import { visibleWidth } from "@earendil-works/pi-tui";
 import { describe, expect, it } from "vitest";
 
 import piPrettyExtension from "../src/index.js";

package/test/fff-integration.test.ts

@@ -373,6 +373,44 @@ describe("piPrettyExtension integration", () => {
 			expect(events.has("session_start")).toBe(true);
 			expect(events.has("session_shutdown")).toBe(true);
 		});
+
+		it("skips tools listed in PRETTY_DISABLE_TOOLS", () => {
+			process.env.PRETTY_DISABLE_TOOLS = "read,find";
+			load();
+			expect(tools.has("read"), "read should be disabled").toBe(false);
+			expect(tools.has("find"), "find should be disabled").toBe(false);
+			expect(tools.has("bash"), "bash should be enabled").toBe(true);
+			expect(tools.has("grep"), "grep should be enabled").toBe(true);
+			expect(tools.has("ls"), "ls should be enabled").toBe(true);
+			delete process.env.PRETTY_DISABLE_TOOLS;
+		});
+
+		it("skips multi_grep when listed in PRETTY_DISABLE_TOOLS", () => {
+			process.env.PRETTY_DISABLE_TOOLS = "multi_grep";
+			load(true);
+			expect(tools.has("multi_grep"), "multi_grep should be disabled").toBe(false);
+			expect(tools.has("read"), "read should still be enabled").toBe(true);
+			delete process.env.PRETTY_DISABLE_TOOLS;
+		});
+
+		it("handles whitespace in PRETTY_DISABLE_TOOLS", () => {
+			process.env.PRETTY_DISABLE_TOOLS = " bash , ls ";
+			load();
+			expect(tools.has("bash"), "bash should be disabled").toBe(false);
+			expect(tools.has("ls"), "ls should be disabled").toBe(false);
+			expect(tools.has("read"), "read should be enabled").toBe(true);
+			expect(tools.has("grep"), "grep should be enabled").toBe(true);
+			delete process.env.PRETTY_DISABLE_TOOLS;
+		});
+
+		it("empty PRETTY_DISABLE_TOOLS registers all tools", () => {
+			process.env.PRETTY_DISABLE_TOOLS = "";
+			load();
+			for (const n of ["find", "grep", "read", "bash", "ls"]) {
+				expect(tools.has(n), `missing: ${n}`).toBe(true);
+			}
+			delete process.env.PRETTY_DISABLE_TOOLS;
+		});
 	});
 
 	// ---- find: SDK fallback (no FFF) -----------------------------------