@xynogen/pix-pretty 1.5.0 → 1.6.0

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");
-		}
-	});
-});

package/src/tools/bash.ts

@@ -1,173 +0,0 @@
-import type {
-	AgentToolUpdateCallback,
-	BashToolInput,
-	ExtensionContext,
-} from "@earendil-works/pi-coding-agent";
-
-import { truncateToWidth } from "@earendil-works/pi-tui";
-import { FG_DIM, RST } from "../ansi.js";
-import { MAX_PREVIEW_LINES } from "../config.js";
-import { renderBashOutput } from "../renderers.js";
-import type {
-	BashParams,
-	PiPrettyApi,
-	RenderContextLike,
-	ThemeLike,
-	ToolFactory,
-	ToolResultLike,
-} from "../types.js";
-import {
-	fillToolBackground,
-	getTextContent,
-	isTextContent,
-	normalizeLineEndings,
-	renderToolError,
-	rule,
-	setResultDetails,
-	termW,
-} from "../utils.js";
-import type { ToolContext } from "./context.js";
-
-export function registerBashTool(
-	pi: PiPrettyApi,
-	createBashTool: ToolFactory<BashToolInput>,
-	ctx: ToolContext,
-): void {
-	const { cwd, TextComponent } = ctx;
-	const origBash = createBashTool(cwd);
-
-	pi.registerTool({
-		...origBash,
-		name: "bash",
-		// Full-width framing (rules + bg fill) baked at termW(); the default
-		// Box shell pads x by 1 and re-wraps at width-2, splitting every line.
-		renderShell: "self",
-
-		async execute(
-			tid: string,
-			params: BashParams,
-			sig: AbortSignal | undefined,
-			upd: AgentToolUpdateCallback<unknown> | undefined,
-			toolCtx: ExtensionContext,
-		) {
-			const result = (await origBash.execute(
-				tid,
-				params,
-				sig,
-				upd,
-				toolCtx,
-			)) as ToolResultLike;
-			const textContent = getTextContent(result);
-
-			let exitCode: number | null = 0;
-			if (textContent) {
-				const exitMatch = textContent.match(
-					/(?:exit code|exited with|exit status)[:\s]*(\d+)/i,
-				);
-				if (exitMatch) exitCode = Number(exitMatch[1]);
-				if (
-					textContent.includes("command not found") ||
-					textContent.includes("No such file")
-				) {
-					exitCode = 1;
-				}
-			}
-
-			setResultDetails(result, {
-				_type: "bashResult",
-				text: textContent ?? "",
-				exitCode,
-				command: params.command ?? "",
-			});
-
-			return result;
-		},
-
-		renderCall(
-			args: BashParams,
-			theme: ThemeLike,
-			renderCtx: RenderContextLike,
-		) {
-			const cmd = args.command ?? "";
-			const displayCmdRaw = cmd.trim();
-			const text = renderCtx.lastComponent ?? new TextComponent("", 0, 0);
-			const label = theme.fg("toolTitle", theme.bold("bash"));
-			const timeout = args.timeout
-				? ` ${theme.fg("muted", `(${args.timeout}s timeout)`)}`
-				: "";
-			const cmdLines = displayCmdRaw.split("\n");
-			const firstLine = cmdLines[0] ?? "";
-			const compactCmd =
-				cmdLines.length > 1
-					? `${firstLine} ${theme.fg("muted", `… (+${cmdLines.length - 1} lines)`)}`
-					: firstLine;
-			const baseCmd = renderCtx.expanded ? displayCmdRaw : compactCmd;
-			const availableWidth = Math.max(1, termW() - 1);
-			const prefix = `${label} `;
-			const reserve = Math.max(0, availableWidth - timeout.length);
-			const displayCmd = truncateToWidth(
-				theme.fg("accent", baseCmd),
-				Math.max(1, reserve - prefix.length),
-				"…",
-			);
-			text.setText(fillToolBackground(`${prefix}${displayCmd}${timeout}`));
-			return text;
-		},
-
-		renderResult(
-			result: ToolResultLike,
-			_opt: unknown,
-			theme: ThemeLike,
-			renderCtx: RenderContextLike,
-		) {
-			const text = renderCtx.lastComponent ?? new TextComponent("", 0, 0);
-
-			if (renderCtx.isError) {
-				text.setText(renderToolError(getTextContent(result) || "Error", theme));
-				return text;
-			}
-
-			const d = result.details as Record<string, unknown> | undefined;
-			if (d?._type === "bashResult") {
-				const normalizedText = normalizeLineEndings(d.text as string)
-					.replace(/\n{3,}/g, "\n\n")
-					.replace(/^\n+|\n+$/g, "");
-				const { summary } = renderBashOutput(
-					normalizedText,
-					d.exitCode as number | null,
-				);
-				const lines = normalizedText ? normalizedText.split("\n") : [];
-				const lineCount = lines.length;
-				const lineInfo =
-					lineCount > 1 ? `  ${FG_DIM}(${lineCount} lines)${RST}` : "";
-				const header = `  ${summary}${lineInfo}`;
-
-				if (normalizedText) {
-					const maxShow = renderCtx.expanded ? lineCount : MAX_PREVIEW_LINES;
-					const show = lines.slice(0, maxShow);
-					const tw = termW();
-					const out: string[] = [header, rule(tw)];
-					for (const line of show) out.push(`  ${line}`);
-					out.push(rule(tw));
-					if (lineCount > maxShow) {
-						out.push(`${FG_DIM}  … ${lineCount - maxShow} more lines${RST}`);
-					}
-					text.setText(fillToolBackground(out.join("\n")));
-				} else {
-					text.setText(fillToolBackground(header));
-				}
-				return text;
-			}
-
-			const fallback = result.content?.[0];
-			const fallbackText =
-				fallback && isTextContent(fallback) ? fallback.text : "done";
-			text.setText(
-				fillToolBackground(
-					`  ${theme.fg("dim", String(fallbackText).slice(0, 120))}`,
-				),
-			);
-			return text;
-		},
-	});
-}

package/src/tools/edit.ts

@@ -1,291 +0,0 @@
-import { existsSync, readFileSync } from "node:fs";
-import type {
-	AgentToolUpdateCallback,
-	EditToolInput,
-	ExtensionContext,
-	ToolRenderResultOptions,
-} from "@earendil-works/pi-coding-agent";
-
-import { MAX_RENDER_LINES } from "../config.js";
-import { parseDiff } from "../diff.js";
-import {
-	diffThemeCacheKey,
-	renderSplit,
-	resolveDiffColors,
-	summarize,
-} from "../diff-render.js";
-import { lang } from "../lang.js";
-import type {
-	EditOperation,
-	EditParams,
-	EditRenderState,
-	PiPrettyApi,
-	RenderContextLike,
-	ThemeLike,
-	ToolFactory,
-	ToolResultLike,
-} from "../types.js";
-import {
-	fillToolBackground,
-	getTextContent,
-	isTextContent,
-	renderToolError,
-	setResultDetails,
-	termW,
-} from "../utils.js";
-import type { ToolContext } from "./context.js";
-
-// ── Helpers ────────────────────────────────────────────────────────────
-
-export function getEditOperations(input: EditParams): EditOperation[] {
-	if (Array.isArray(input?.edits)) {
-		return input.edits
-			.map((e) => ({
-				oldText:
-					typeof e?.oldText === "string"
-						? e.oldText
-						: typeof e?.old_text === "string"
-							? e.old_text
-							: "",
-				newText:
-					typeof e?.newText === "string"
-						? e.newText
-						: typeof e?.new_text === "string"
-							? e.new_text
-							: "",
-			}))
-			.filter((e) => e.oldText && e.oldText !== e.newText);
-	}
-	const oldText =
-		typeof input?.oldText === "string"
-			? input.oldText
-			: typeof input?.old_text === "string"
-				? input.old_text
-				: "";
-	const newText =
-		typeof input?.newText === "string"
-			? input.newText
-			: typeof input?.new_text === "string"
-				? input.new_text
-				: "";
-	return oldText && oldText !== newText ? [{ oldText, newText }] : [];
-}
-
-export function summarizeEditOperations(operations: EditOperation[]) {
-	const diffs = operations.map((e) => parseDiff(e.oldText, e.newText));
-	const totalAdded = diffs.reduce((sum, d) => sum + d.added, 0);
-	const totalRemoved = diffs.reduce((sum, d) => sum + d.removed, 0);
-	return {
-		diffs,
-		totalAdded,
-		totalRemoved,
-		summary: summarize(totalAdded, totalRemoved),
-	};
-}
-
-// ── Tool ───────────────────────────────────────────────────────────────
-
-export function registerEditTool(
-	pi: PiPrettyApi,
-	createEditTool: ToolFactory<EditToolInput>,
-	ctx: ToolContext,
-	trackInvalidator: (id: string, inv: () => void) => void,
-): void {
-	const { cwd, sp, TextComponent } = ctx;
-	const origEdit = createEditTool(cwd);
-
-	pi.registerTool({
-		...origEdit,
-		name: "edit",
-
-		async execute(
-			tid: string,
-			params: EditParams,
-			sig: AbortSignal | undefined,
-			upd: AgentToolUpdateCallback<unknown> | undefined,
-			toolCtx: ExtensionContext,
-		) {
-			const fp = params.path ?? params.file_path ?? "";
-			const operations = getEditOperations(params);
-			const fileLang = lang(fp);
-
-			const result = (await origEdit.execute(
-				tid,
-				params as unknown as Parameters<typeof origEdit.execute>[1],
-				sig,
-				upd,
-				toolCtx,
-			)) as ToolResultLike;
-
-			if (operations.length === 0) return result;
-
-			const { diffs, summary } = summarizeEditOperations(operations);
-
-			if (operations.length === 1) {
-				let editLine = 0;
-				try {
-					if (fp && existsSync(fp)) {
-						const f = readFileSync(fp, "utf-8");
-						const idx = f.indexOf(operations[0].newText);
-						if (idx >= 0) editLine = f.slice(0, idx).split("\n").length;
-					}
-				} catch {
-					editLine = 0;
-				}
-				setResultDetails(result, {
-					_type: "editInfo",
-					summary,
-					editLine,
-					oldContent: operations[0].oldText,
-					newContent: operations[0].newText,
-					language: fileLang,
-					filePath: fp,
-				});
-				return result;
-			}
-
-			setResultDetails(result, {
-				_type: "multiEditInfo",
-				summary,
-				editCount: operations.length,
-				diffLineCount: diffs.reduce((sum, d) => sum + d.lines.length, 0),
-				ops: operations.map((op) => ({
-					oldContent: op.oldText,
-					newContent: op.newText,
-					language: fileLang,
-					filePath: fp,
-				})),
-			});
-			return result;
-		},
-
-		renderCall(
-			args: EditParams,
-			theme: ThemeLike,
-			renderCtx: RenderContextLike<EditRenderState>,
-		) {
-			const fp = args?.path ?? args?.file_path ?? "";
-			const operations = getEditOperations(args);
-			const text = renderCtx.lastComponent ?? new TextComponent("", 0, 0);
-			const hdr = `${theme.fg("toolTitle", theme.bold("edit"))} ${theme.fg("accent", sp(fp))}`;
-
-			if (operations.length === 0) {
-				text.setText(fillToolBackground(hdr));
-				return text;
-			}
-
-			const { summary } = summarizeEditOperations(operations);
-			const suffix =
-				operations.length === 1
-					? summary
-					: `${operations.length} edits ${summary}`;
-			text.setText(fillToolBackground(`${hdr}  ${theme.fg("muted", suffix)}`));
-			return text;
-		},
-
-		renderResult(
-			result: ToolResultLike,
-			_opt: ToolRenderResultOptions,
-			theme: ThemeLike,
-			renderCtx: RenderContextLike<EditRenderState>,
-		) {
-			const text = renderCtx.lastComponent ?? new TextComponent("", 0, 0);
-			if (renderCtx.isError) {
-				text.setText(renderToolError(getTextContent(result) || "Error", theme));
-				return text;
-			}
-			const d = result.details as Record<string, unknown> | undefined;
-
-			// Single edit — full split diff
-			if (d?._type === "editInfo") {
-				const key = `ed:${diffThemeCacheKey(theme)}:${termW()}:${d.summary}:${(d.oldContent as string).length}:${(d.newContent as string).length}:${d.language ?? ""}`;
-				if (renderCtx.toolCallId)
-					trackInvalidator(renderCtx.toolCallId, renderCtx.invalidate);
-				if (renderCtx.state._edk !== key) {
-					renderCtx.state._edk = key;
-					const loc =
-						(d.editLine as number) > 0
-							? ` ${theme.fg("muted", `at line ${d.editLine}`)}`
-							: "";
-					renderCtx.state._edt = `  ${d.summary}${loc}\n${theme.fg("muted", "  rendering diff…")}`;
-					const dc = resolveDiffColors(theme);
-					const diff = parseDiff(
-						d.oldContent as string,
-						d.newContent as string,
-					);
-					renderSplit(
-						diff,
-						d.language as string | undefined,
-						MAX_RENDER_LINES,
-						dc,
-					)
-						.then((rendered) => {
-							if (renderCtx.state._edk !== key) return;
-							const loc2 =
-								(d.editLine as number) > 0
-									? ` ${theme.fg("muted", `at line ${d.editLine}`)}`
-									: "";
-							renderCtx.state._edt = `  ${d.summary}${loc2}\n${rendered}`;
-							renderCtx.invalidate();
-						})
-						.catch(() => {
-							if (renderCtx.state._edk !== key) return;
-							renderCtx.state._edt = `  ${d.summary}`;
-							renderCtx.invalidate();
-						});
-				}
-				text.setText(renderCtx.state._edt ?? `  ${d.summary}`);
-				return text;
-			}
-
-			// Multi-edit — stacked diffs
-			if (d?._type === "multiEditInfo") {
-				const key = `med:${diffThemeCacheKey(theme)}:${termW()}:${d.summary}:${d.editCount}:${d.diffLineCount}`;
-				if (renderCtx.toolCallId)
-					trackInvalidator(renderCtx.toolCallId, renderCtx.invalidate);
-				if (renderCtx.state._edk !== key) {
-					renderCtx.state._edk = key;
-					renderCtx.state._edt = `  ${d.editCount} edits ${d.summary}\n${theme.fg("muted", "  rendering diff…")}`;
-					const dc = resolveDiffColors(theme);
-					Promise.all(
-						(
-							d.ops as Array<{
-								oldContent: string;
-								newContent: string;
-								language?: string;
-							}>
-						).map((op) => {
-							const diff = parseDiff(op.oldContent, op.newContent);
-							return renderSplit(diff, op.language, MAX_RENDER_LINES, dc);
-						}),
-					)
-						.then((rendered) => {
-							if (renderCtx.state._edk !== key) return;
-							const body = rendered.join(`\n${theme.fg("muted", "  ···")}\n`);
-							renderCtx.state._edt = `  ${d.editCount} edits ${d.summary}\n${body}`;
-							renderCtx.invalidate();
-						})
-						.catch(() => {
-							if (renderCtx.state._edk !== key) return;
-							renderCtx.state._edt = `  ${d.editCount} edits ${d.summary}`;
-							renderCtx.invalidate();
-						});
-				}
-				text.setText(
-					renderCtx.state._edt ?? `  ${d.editCount} edits ${d.summary}`,
-				);
-				return text;
-			}
-
-			const fallback = result.content?.[0];
-			const fallbackText =
-				fallback && isTextContent(fallback) ? fallback.text : "edited";
-			text.setText(
-				fillToolBackground(
-					`  ${theme.fg("dim", String(fallbackText).slice(0, 120))}`,
-				),
-			);
-			return text;
-		},
-	});
-}

package/src/tools/find.ts

@@ -1,143 +0,0 @@
-import type {
-	ExtensionContext,
-	FindToolInput,
-	ToolRenderResultOptions,
-} from "@earendil-works/pi-coding-agent";
-
-import type {
-	FindParams,
-	FindResultDetails,
-	PiPrettyApi,
-	RenderContextLike,
-	ThemeLike,
-	ToolFactory,
-	ToolResultLike,
-} from "../types.js";
-import {
-	appendNotices,
-	fillToolBackground,
-	getTextContent,
-	makeTextResult,
-	renderDimPreview,
-	renderToolError,
-	setResultDetails,
-} from "../utils.js";
-import type { ToolContext } from "./context.js";
-
-export function registerFindTool(
-	pi: PiPrettyApi,
-	createFindTool: ToolFactory<FindToolInput>,
-	ctx: ToolContext,
-): void {
-	const { cwd, sp, TextComponent, fffState } = ctx;
-	const origFind = createFindTool(cwd);
-
-	pi.registerTool({
-		...origFind,
-		name: "find",
-		renderShell: "self",
-
-		async execute(
-			tid: string,
-			params: FindParams,
-			sig: AbortSignal | undefined,
-			upd: unknown,
-			toolCtx: ExtensionContext,
-		) {
-			// Try FFF first (frecency-ranked, SIMD-accelerated)
-			if (fffState.finder && !fffState.finder.isDestroyed) {
-				try {
-					const effectiveLimit = Math.max(1, params.limit ?? 200);
-					let query = params.pattern;
-					if (params.path) query = `${params.path} ${query}`;
-
-					const searchResult = fffState.finder.fileSearch(query, {
-						pageSize: effectiveLimit,
-					});
-					if (searchResult.ok) {
-						const { items, totalMatched } = searchResult.value;
-						const trimmed = items.slice(0, effectiveLimit);
-						const notices: string[] = [];
-						if (fffState.partialIndex)
-							notices.push("Warning: partial file index");
-						if (trimmed.length >= effectiveLimit)
-							notices.push(`${effectiveLimit} limit reached`);
-						if (totalMatched > trimmed.length)
-							notices.push(`${totalMatched} total matches`);
-
-						const textContent = appendNotices(
-							trimmed.map((item) => item.relativePath).join("\n"),
-							notices,
-						);
-						return makeTextResult<FindResultDetails>(textContent, {
-							_type: "findResult",
-							text: textContent,
-							pattern: params.pattern,
-							matchCount: trimmed.length,
-						});
-					}
-				} catch {
-					/* fall through to SDK */
-				}
-			}
-
-			// SDK fallback
-			const result = await origFind.execute(
-				tid,
-				params,
-				sig,
-				upd as never,
-				toolCtx,
-			);
-			const textContent = getTextContent(result);
-			const matchCount = textContent
-				? textContent.trim().split("\n").filter(Boolean).length
-				: 0;
-
-			setResultDetails<FindResultDetails>(result, {
-				_type: "findResult",
-				text: textContent,
-				pattern: params.pattern,
-				matchCount,
-			});
-
-			return result;
-		},
-
-		renderCall(
-			args: FindParams,
-			theme: ThemeLike,
-			renderCtx: RenderContextLike,
-		) {
-			const pattern = args.pattern ?? "";
-			const path = args.path
-				? ` ${theme.fg("muted", `in ${sp(args.path)}`)}`
-				: "";
-			const text = renderCtx.lastComponent ?? new TextComponent("", 0, 0);
-			text.setText(
-				fillToolBackground(
-					`${theme.fg("toolTitle", theme.bold("find"))} ${theme.fg("accent", pattern)}${path}`,
-				),
-			);
-			return text;
-		},
-
-		renderResult(
-			result: ToolResultLike<FindResultDetails>,
-			_opt: ToolRenderResultOptions,
-			theme: ThemeLike,
-			renderCtx: RenderContextLike,
-		) {
-			const text = renderCtx.lastComponent ?? new TextComponent("", 0, 0);
-
-			if (renderCtx.isError) {
-				text.setText(renderToolError(getTextContent(result) || "Error", theme));
-				return text;
-			}
-
-			const output = getTextContent(result) || "found";
-			text.setText(renderDimPreview(output, theme));
-			return text;
-		},
-	});
-}