@xynogen/pix-pretty 1.5.1 → 1.6.0

package/package.json

@@ -1,9 +1,25 @@
 {
 	"name": "@xynogen/pix-pretty",
-	"version": "1.5.1",
+	"version": "1.6.0",
 	"description": "Enhanced tool output rendering with syntax highlighting, file icons, tree views, FFF search, and paste chip formatting",
 	"type": "module",
 	"main": "src/index.ts",
+	"exports": {
+		".": "./src/index.ts",
+		"./ansi": "./src/ansi.ts",
+		"./config": "./src/config.ts",
+		"./diff": "./src/diff.ts",
+		"./diff-render": "./src/diff-render.ts",
+		"./highlight": "./src/highlight.ts",
+		"./lang": "./src/lang.ts",
+		"./icons": "./src/icons.ts",
+		"./renderers": "./src/renderers.ts",
+		"./fff": "./src/fff.ts",
+		"./types": "./src/types.ts",
+		"./utils": "./src/utils.ts",
+		"./resize": "./src/resize.ts",
+		"./context": "./src/tools/context.ts"
+	},
 	"scripts": {
 		"test": "bun test"
 	},

package/src/diff-render.ts

@@ -808,7 +808,7 @@ export async function renderSplit(
 
 	type HalfResult = { gutter: string; contGutter: string; bodyRows: string[] };
 
-	function half_build(
+	function halfBuild(
 		line: DiffLine | null,
 		hl: string,
 		ranges: Array<[number, number]> | null,
@@ -890,14 +890,14 @@ export async function renderSplit(
 		if (paired && wd && wd.similarity >= WORD_DIFF_MIN_SIM && canHL) {
 			const lhl = leftHL[lI++] ?? leftLine.content;
 			const rhl = rightHL[rI++] ?? rightLine.content;
-			lResult = half_build(leftLine, lhl, wd.oldRanges, "left");
-			rResult = half_build(rightLine, rhl, wd.newRanges, "right");
+			lResult = halfBuild(leftLine, lhl, wd.oldRanges, "left");
+			rResult = halfBuild(rightLine, rhl, wd.newRanges, "right");
 		} else if (paired && wd && wd.similarity >= WORD_DIFF_MIN_SIM && !canHL) {
 			const pwd = plainWordDiff(leftLine.content, rightLine.content);
 			lI++;
 			rI++;
-			lResult = half_build(leftLine, pwd.old, null, "left");
-			rResult = half_build(rightLine, pwd.new, null, "right");
+			lResult = halfBuild(leftLine, pwd.old, null, "left");
+			rResult = halfBuild(rightLine, pwd.new, null, "right");
 		} else {
 			const lhl =
 				leftLine && leftLine.type !== "sep"
@@ -907,8 +907,8 @@ export async function renderSplit(
 				rightLine && rightLine.type !== "sep"
 					? (rightHL[rI++] ?? rightLine?.content ?? "")
 					: "";
-			lResult = half_build(leftLine, lhl, null, "left");
-			rResult = half_build(rightLine, rhl, null, "right");
+			lResult = halfBuild(leftLine, lhl, null, "left");
+			rResult = halfBuild(rightLine, rhl, null, "right");
 		}
 
 		const maxRowsN = Math.max(lResult.bodyRows.length, rResult.bodyRows.length);

package/src/index.ts

@@ -1,7 +1,10 @@
 /**
  * pi-pretty — Pretty terminal output for pi built-in tools.
  *
- * Entry point: boots shared state, registers all tool overrides and commands.
+ * Entry point: initialises theme + highlight cache, registers FFF slash
+ * commands (/fff-rescan etc.). Individual tool renderers live in the
+ * standalone pix-{read,bash,ls,find,grep,edit,write} packages — each
+ * self-registers via its own pi extension entry point.
  *
  * Modules:
  *   types.ts          shared interfaces/types
@@ -9,141 +12,32 @@
  *   ansi.ts           ANSI codes, low-contrast fix
  *   utils.ts          helpers + renderToolError
  *   lang.ts           language detection
- *   image.ts          terminal image protocols
  *   icons.ts          Nerd Font file-type icons
  *   highlight.ts      cli-highlight engine + ANSI cache
  *   renderers.ts      renderFileContent/Bash/Tree/Find/Grep
- *   fff.ts            Fast File Finder + cursor store + multi-grep fallback
+ *   fff.ts            Fast File Finder + cursor store + module singleton
  *   diff.ts           unified diff parser
  *   diff-render.ts    split/word-level diff renderer
- *   tools/            per-tool registrars (read/bash/ls/find/grep/edit/write)
+ *   resize.ts         terminal resize invalidation registry
+ *   tools/            per-tool registrar helpers (context type)
  *   commands/         slash command registrars (fff)
  */
 
-import { mkdirSync } from "node:fs";
-import { join } from "node:path";
-import type {
-	BashToolInput,
-	EditToolInput,
-	ExtensionContext,
-	FindToolInput,
-	GrepToolInput,
-	LsToolInput,
-	ReadToolInput,
-	WriteToolInput,
-} from "@earendil-works/pi-coding-agent";
 import { registerFffCommands } from "./commands/fff.js";
 import { getDefaultAgentDir, setPrettyTheme } from "./config.js";
-import {
-	CursorStore,
-	fffDestroy,
-	fffEnsureFinder,
-	fffState,
-	getPiPrettyFffDir,
-} from "./fff.js";
+import { fffState } from "./fff.js";
 import { clearHighlightCache } from "./highlight.js";
-import { registerBashTool } from "./tools/bash.js";
-import type { ToolContext } from "./tools/context.js";
-import { registerEditTool } from "./tools/edit.js";
-import { registerFindTool } from "./tools/find.js";
-import { registerGrepTool } from "./tools/grep.js";
-import { registerLsTool } from "./tools/ls.js";
-import { registerReadTool } from "./tools/read.js";
-import { registerWriteTool } from "./tools/write.js";
-import type {
-	PiPrettyApi,
-	PiPrettyDeps,
-	PiPrettySdk,
-	TextComponentCtor,
-	ToolFactory,
-} from "./types.js";
-import { getErrorMessage, shortPath } from "./utils.js";
+import type { PiPrettyApi } from "./types.js";
 
-// ── Resize invalidation registry ───────────────────────────────────────
-// Diff/write renderResults register their ctx.invalidate keyed by toolCallId
-// so terminal resize triggers re-render at the correct width.
-
-const _resizeInvalidators = new Map<string, () => void>();
-let _resizeListenerAttached = false;
-
-function attachResizeListener(): void {
-	if (_resizeListenerAttached) return;
-	_resizeListenerAttached = true;
-	process.stdout.on("resize", () => {
-		for (const inv of _resizeInvalidators.values()) inv();
-	});
-}
-
-function trackInvalidator(toolCallId: string, inv: () => void): void {
-	_resizeInvalidators.set(toolCallId, inv);
-}
-
-// ── Extension entry point ──────────────────────────────────────────────
-
-export default function piPrettyExtension(
-	pi: PiPrettyApi,
-	deps?: PiPrettyDeps,
-): void {
-	attachResizeListener();
-
-	let createReadTool: ToolFactory<ReadToolInput> | undefined;
-	let createBashTool: ToolFactory<BashToolInput> | undefined;
-	let createLsTool: ToolFactory<LsToolInput> | undefined;
-	let createFindTool: ToolFactory<FindToolInput> | undefined;
-	let createGrepTool: ToolFactory<GrepToolInput> | undefined;
-	let createEditTool: ToolFactory<EditToolInput> | undefined;
-	let createWriteTool: ToolFactory<WriteToolInput> | undefined;
-	let TextComponent: TextComponentCtor;
-	let sdk: PiPrettySdk;
-
-	const cursorStore = new CursorStore();
-
-	if (deps) {
-		sdk = deps.sdk;
-		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;
-		createEditTool = sdk.createEditToolDefinition ?? sdk.createEditTool;
-		createWriteTool = sdk.createWriteToolDefinition ?? sdk.createWriteTool;
-		TextComponent = deps.TextComponent;
-		fffState.module = deps.fffModule ?? null;
-		fffState.finder = null;
-		fffState.partialIndex = false;
-		fffState.dbDir = null;
-	} else {
-		try {
-			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;
-			createEditTool = sdk.createEditToolDefinition ?? sdk.createEditTool;
-			createWriteTool = sdk.createWriteToolDefinition ?? sdk.createWriteTool;
-			TextComponent = require("@earendil-works/pi-tui").Text;
-		} catch {
-			return;
-		}
+export default function piPrettyExtension(pi: PiPrettyApi): void {
+	let sdk: { getAgentDir?: () => string };
+	try {
+		sdk = require("@earendil-works/pi-coding-agent");
+	} catch {
+		return;
 	}
-	if (!createReadTool || !TextComponent!) return;
-
-	const cwd = process.cwd();
-	const home = process.env.HOME ?? "";
-	const sp = (p: string) => shortPath(cwd, home, p);
-	// Respect PRETTY_DISABLE_TOOLS env var
-	const disabledTools = new Set(
-		(process.env.PRETTY_DISABLE_TOOLS ?? "")
-			.split(",")
-			.map((s) => s.trim().toLowerCase())
-			.filter(Boolean),
-	);
-	const isToolEnabled = (name: string) =>
-		!disabledTools.has(name.toLowerCase());
-
-	// ── Theme + FFF init ────────────────────────────────────────────────
 
+	// ── Theme init ──────────────────────────────────────────────────────
 	const getAgentDir = sdk.getAgentDir;
 	setPrettyTheme(
 		(() => {
@@ -156,98 +50,8 @@ export default function piPrettyExtension(
 	);
 	clearHighlightCache();
 
-	if (!deps) {
-		try {
-			fffState.module = require("@ff-labs/fff-node");
-			if (getAgentDir) {
-				fffState.dbDir = getPiPrettyFffDir(getAgentDir());
-				try {
-					mkdirSync(fffState.dbDir, { recursive: true });
-				} catch {}
-			}
-		} catch {
-			/* FFF not installed — SDK tools will be used */
-		}
-	} else if (fffState.module && getAgentDir) {
-		fffState.dbDir = getPiPrettyFffDir(getAgentDir());
-		try {
-			mkdirSync(fffState.dbDir, { recursive: true });
-		} catch {}
-	}
-
-	pi.on("session_start", async (_event, ctx: ExtensionContext) => {
-		if (!fffState.module) {
-			try {
-				const imported = await import("@ff-labs/fff-node");
-				fffState.module = { FileFinder: imported.FileFinder };
-			} catch {}
-		}
-		if (!fffState.module) return;
-
-		if (!fffState.dbDir) {
-			const agentDir = getAgentDir?.() ?? join(home, ".pi/agent");
-			fffState.dbDir = getPiPrettyFffDir(agentDir);
-			try {
-				mkdirSync(fffState.dbDir, { recursive: true });
-			} catch {}
-		}
-
-		try {
-			await fffEnsureFinder(ctx.cwd);
-			if (fffState.partialIndex) {
-				ctx.ui?.notify?.(
-					"FFF: scan timed out — using partial index. Run /fff-rescan when ready.",
-					"warning",
-				);
-			} else {
-				ctx.ui?.notify?.("FFF indexed", "info");
-			}
-		} catch (error: unknown) {
-			ctx.ui?.notify?.(`FFF init failed: ${getErrorMessage(error)}`, "error");
-		}
-	});
-
-	pi.on("session_shutdown", async () => {
-		fffDestroy();
-	});
-
-	// ── Build shared tool context ───────────────────────────────────────
-
-	const toolCtx: ToolContext = {
-		cwd,
-		sp,
-		TextComponent: TextComponent!,
-		fffState,
-		cursorStore,
-	};
-
-	// ── Register tools ──────────────────────────────────────────────────
-
-	if (isToolEnabled("read") && createReadTool) {
-		registerReadTool(pi, createReadTool, toolCtx);
-	}
-	if (isToolEnabled("bash") && createBashTool) {
-		registerBashTool(pi, createBashTool, toolCtx);
-	}
-	if (isToolEnabled("ls") && createLsTool) {
-		registerLsTool(pi, createLsTool, toolCtx);
-	}
-	if (isToolEnabled("find") && createFindTool) {
-		registerFindTool(pi, createFindTool, toolCtx);
-	}
-	if (isToolEnabled("grep") && createGrepTool) {
-		registerGrepTool(pi, createGrepTool, toolCtx);
-	}
-	if (isToolEnabled("edit") && createEditTool) {
-		registerEditTool(pi, createEditTool, toolCtx, trackInvalidator);
-	}
-	if (isToolEnabled("write") && createWriteTool) {
-		registerWriteTool(pi, createWriteTool, toolCtx, trackInvalidator);
-	}
-
-	// ── Register FFF commands ───────────────────────────────────────────
-
-	if (fffState.module) {
-		registerFffCommands(pi, fffState);
-	}
+	// ── FFF slash commands ──────────────────────────────────────────────
+	// fffState is a module-level singleton shared with pix-grep/pix-find.
+	// Commands become available once pix-grep initialises the finder.
+	registerFffCommands(pi, fffState);
 }

package/src/resize.ts

@@ -0,0 +1,18 @@
+// ── Resize invalidation registry ───────────────────────────────────────
+// Diff renderers (edit/write) register their ctx.invalidate keyed by
+// toolCallId so a terminal resize triggers re-render at the new width.
+
+const _invalidators = new Map<string, () => void>();
+let _attached = false;
+
+export function attachResizeListener(): void {
+	if (_attached) return;
+	_attached = true;
+	process.stdout.on("resize", () => {
+		for (const inv of _invalidators.values()) inv();
+	});
+}
+
+export function trackInvalidator(toolCallId: string, inv: () => void): void {
+	_invalidators.set(toolCallId, inv);
+}

package/src/types-diff.d.ts

@@ -1,7 +1,6 @@
-// Minimal ambient shim for the `diff` npm package (v7) — only the surface the
-// vendored pretty extension's diff renderer uses. diff@7 ships no bundled types
-// and @types/diff is not installed into pi's npm root; this keeps the local
-// editor/LSP quiet without vendoring node_modules in-repo.
+// Minimal ambient shim for the `diff` npm package (v7) — only the surface used
+// by diff.ts and diff-render.ts. diff@7 ships no bundled types and @types/diff
+// is not installed into pi's npm root; this keeps tsc quiet without vendoring.
 
 declare module "diff" {
 	export interface StructuredPatchHunk {

package/src/image.ts

@@ -1,163 +0,0 @@
-import * as childProcess from "node:child_process";
-
-import type { ImageProtocol } from "./types.js";
-
-let _tmuxClientTermCache: string | null | undefined;
-let _tmuxAllowPassthroughCache: boolean | null | undefined;
-let _tmuxClientTermOverrideForTests: string | null | undefined;
-let _tmuxAllowPassthroughOverrideForTests: boolean | null | undefined;
-
-function isTmuxSession(): boolean {
-	return !!process.env.TMUX || /^(tmux|screen)/.test(process.env.TERM ?? "");
-}
-
-function normalizeTerminalName(term: string): string {
-	const t = term.toLowerCase();
-	if (t.includes("kitty")) return "kitty";
-	if (t.includes("ghostty")) return "ghostty";
-	if (t.includes("wezterm")) return "WezTerm";
-	if (t.includes("iterm")) return "iTerm.app";
-	if (t.includes("mintty")) return "mintty";
-	return term;
-}
-
-function readTmuxClientTerm(): string | null {
-	if (_tmuxClientTermOverrideForTests !== undefined) {
-		return _tmuxClientTermOverrideForTests
-			? normalizeTerminalName(_tmuxClientTermOverrideForTests)
-			: null;
-	}
-	if (!isTmuxSession()) return null;
-	if (_tmuxClientTermCache !== undefined) return _tmuxClientTermCache;
-	try {
-		const term = childProcess
-			.execFileSync("tmux", ["display-message", "-p", "#{client_termname}"], {
-				encoding: "utf8",
-				stdio: ["ignore", "pipe", "ignore"],
-				timeout: 200,
-			})
-			.trim();
-		_tmuxClientTermCache = term ? normalizeTerminalName(term) : null;
-	} catch {
-		_tmuxClientTermCache = null;
-	}
-	return _tmuxClientTermCache;
-}
-
-/**
- * Detect the outer terminal when running inside tmux.
- * tmux sets TERM_PROGRAM=tmux, but the real terminal is often in
- * the environment of the tmux server or can be inferred.
-
- */
-function getOuterTerminal(): string {
-	// Environment hints that often survive inside tmux
-	if (process.env.LC_TERMINAL === "iTerm2") return "iTerm.app";
-	if (process.env.GHOSTTY_RESOURCES_DIR) return "ghostty";
-	if (process.env.KITTY_WINDOW_ID || process.env.KITTY_PID) return "kitty";
-	if (
-		process.env.WEZTERM_EXECUTABLE ||
-		process.env.WEZTERM_CONFIG_DIR ||
-		process.env.WEZTERM_CONFIG_FILE
-	) {
-		return "WezTerm";
-	}
-
-	const termProgram = process.env.TERM_PROGRAM ?? "";
-	if (termProgram && termProgram !== "tmux" && termProgram !== "screen") {
-		return normalizeTerminalName(termProgram);
-	}
-
-	const tmuxClientTerm = readTmuxClientTerm();
-	if (tmuxClientTerm) return tmuxClientTerm;
-
-	const term = process.env.TERM ?? "";
-	if (term) return normalizeTerminalName(term);
-	if (
-		process.env.COLORTERM === "truecolor" ||
-		process.env.COLORTERM === "24bit"
-	)
-		return "unknown-modern";
-	return termProgram;
-}
-
-function detectImageProtocol(): ImageProtocol {
-	const forced = (process.env.PRETTY_IMAGE_PROTOCOL ?? "").toLowerCase();
-	if (forced === "kitty" || forced === "iterm2" || forced === "none") {
-		return forced;
-	}
-
-	const term = getOuterTerminal();
-	// Ghostty and Kitty use the Kitty graphics protocol
-	if (term === "ghostty" || term === "kitty") return "kitty";
-	// iTerm2, WezTerm, Mintty support the iTerm2 protocol
-	if (["iTerm.app", "WezTerm", "mintty"].includes(term)) return "iterm2";
-	if (process.env.LC_TERMINAL === "iTerm2") return "iterm2";
-	return "none";
-}
-
-function tmuxAllowsPassthrough(): boolean | null {
-	if (_tmuxAllowPassthroughOverrideForTests !== undefined)
-		return _tmuxAllowPassthroughOverrideForTests;
-	if (!isTmuxSession()) return null;
-	if (_tmuxAllowPassthroughCache !== undefined)
-		return _tmuxAllowPassthroughCache;
-	try {
-		const value = childProcess
-			.execFileSync("tmux", ["show-options", "-gv", "allow-passthrough"], {
-				encoding: "utf8",
-				stdio: ["ignore", "pipe", "ignore"],
-				timeout: 200,
-			})
-			.trim()
-			.toLowerCase();
-		_tmuxAllowPassthroughCache = value === "on" || value === "all";
-	} catch {
-		_tmuxAllowPassthroughCache = null;
-	}
-	return _tmuxAllowPassthroughCache;
-}
-
-function getTmuxPassthroughWarning(protocol: ImageProtocol): string | null {
-	if (!isTmuxSession() || protocol === "none") return null;
-	if (tmuxAllowsPassthrough() === false) {
-		return "tmux allow-passthrough is off. Run: tmux set -g allow-passthrough on";
-	}
-	return null;
-}
-
-/**
- * Wrap escape sequence for tmux passthrough.
- * tmux requires: ESC Ptmux; <escaped-sequence> ESC \
- * Inner ESC chars must be doubled.
-
- */
-function tmuxWrap(seq: string): string {
-	if (!isTmuxSession()) return seq;
-	// Double all ESC chars inside the sequence
-	const escaped = seq.split("\x1b").join("\x1b\x1b");
-	return `\x1bPtmux;${escaped}\x1b\\`;
-}
-
-export const __imageInternals = {
-	isTmuxSession,
-	getOuterTerminal,
-	detectImageProtocol,
-	tmuxWrap,
-	tmuxAllowsPassthrough,
-	getTmuxPassthroughWarning,
-	setTmuxClientTermOverrideForTests: (value: string | null | undefined) => {
-		_tmuxClientTermOverrideForTests = value;
-	},
-	setTmuxAllowPassthroughOverrideForTests: (
-		value: boolean | null | undefined,
-	) => {
-		_tmuxAllowPassthroughOverrideForTests = value;
-	},
-	resetCachesForTests: () => {
-		_tmuxClientTermCache = undefined;
-		_tmuxAllowPassthroughCache = undefined;
-		_tmuxClientTermOverrideForTests = undefined;
-		_tmuxAllowPassthroughOverrideForTests = undefined;
-	},
-};

package/src/tools/bash.test.ts

@@ -1,81 +0,0 @@
-import { describe, expect, it } from "bun:test";
-import { visibleWidth } from "@earendil-works/pi-tui";
-import { registerBashTool } from "./bash";
-
-class MockTextComponent {
-	private text: string;
-
-	constructor(text = "") {
-		this.text = text;
-	}
-
-	setText(value: string): void {
-		this.text = value;
-	}
-
-	getText(): string {
-		return this.text;
-	}
-}
-
-describe("registerBashTool", () => {
-	it("clamps renderCall to small terminal widths", () => {
-		const registered: { renderCall?: (...args: any[]) => MockTextComponent } =
-			{};
-		const origColumns = process.env.COLUMNS;
-		process.env.COLUMNS = "24";
-		process.stdout.emit("resize");
-		process.stdin.emit("resize");
-
-		try {
-			registerBashTool(
-				{
-					registerTool(tool: unknown) {
-						Object.assign(registered, tool);
-					},
-				} as any,
-				() => ({
-					execute: async () => ({
-						content: [{ type: "text", text: "ok" }],
-						details: undefined,
-					}),
-				}),
-				{
-					cwd: process.cwd(),
-					sp: (p: string) => p,
-					TextComponent: MockTextComponent as any,
-					fffState: {} as any,
-					cursorStore: {} as any,
-				},
-			);
-
-			const text = registered.renderCall?.(
-				{
-					command: 'printf "very very very long line"\necho second\necho third',
-					timeout: 30,
-				},
-				{
-					fg: (_key: string, value: string) => value,
-					bold: (value: string) => value,
-				} as any,
-				{
-					expanded: false,
-					isError: false,
-					invalidate: () => {},
-					state: {},
-				} as any,
-			);
-
-			expect(text).toBeDefined();
-			const rendered = text?.getText() ?? "";
-			for (const line of rendered.split("\n")) {
-				expect(visibleWidth(line)).toBeLessThanOrEqual(24);
-			}
-		} finally {
-			if (origColumns === undefined) delete process.env.COLUMNS;
-			else process.env.COLUMNS = origColumns;
-			process.stdout.emit("resize");
-			process.stdin.emit("resize");
-		}
-	});
-});