@xynogen/pix-pretty 1.7.13 → 1.7.16

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xynogen/pix-pretty",
-	"version": "1.7.13",
+	"version": "1.7.16",
 	"description": "Enhanced tool output rendering with syntax highlighting, file icons, tree views, diff rendering, and FFF search",
 	"type": "module",
 	"main": "src/index.ts",
@@ -58,7 +58,7 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"@xynogen/pix-data": "workspace:*",
+		"@xynogen/pix-data": "^0.3.0",
 		"cli-highlight": "^2.1.11",
 		"@ff-labs/fff-node": "^0.5.2",
 		"diff": "^7.0.0"

package/src/ansi.ts

@@ -17,12 +17,8 @@ export let BG_BASE = BG_DEFAULT; // tool box success/base bg — updated from th
 export let BG_ERROR = BG_DEFAULT; // tool box error bg — updated from theme's toolErrorBg
 
 /** Parse an ANSI 24-bit color escape into { r, g, b }. Handles both fg (38;2) and bg (48;2). */
-function parseAnsiRgb(
-	ansi: string,
-): { r: number; g: number; b: number } | null {
-	const m = ansi.match(
-		new RegExp(`${ESC_RE}\\[(?:38|48);2;(\\d+);(\\d+);(\\d+)m`),
-	);
+function parseAnsiRgb(ansi: string): { r: number; g: number; b: number } | null {
+	const m = ansi.match(new RegExp(`${ESC_RE}\\[(?:38|48);2;(\\d+);(\\d+);(\\d+)m`));
 	return m ? { r: +(m[1] ?? 0), g: +(m[2] ?? 0), b: +(m[3] ?? 0) } : null;
 }
 
@@ -40,10 +36,7 @@ function getThemeBgAnsi(theme: BgTheme, key: string): string | null {
 export function resolveBaseBackground(theme: BgTheme | null | undefined): void {
 	if (!theme?.getBgAnsi) return;
 
-	BG_BASE =
-		getThemeBgAnsi(theme, "toolBg") ??
-		getThemeBgAnsi(theme, "background") ??
-		BG_DEFAULT;
+	BG_BASE = getThemeBgAnsi(theme, "toolBg") ?? getThemeBgAnsi(theme, "background") ?? BG_DEFAULT;
 	BG_ERROR = getThemeBgAnsi(theme, "toolErrorBg") ?? BG_BASE;
 	RST = `\x1b[0m${BG_BASE}`;
 }
@@ -61,8 +54,7 @@ function isLowContrastShikiFg(params: string): boolean {
 	if (params === "38;5;0" || params === "38;5;8") return true;
 	if (!params.startsWith("38;2;")) return false;
 	const parts = params.split(";").map(Number);
-	if (parts.length !== 5 || parts.some((n) => !Number.isFinite(n)))
-		return false;
+	if (parts.length !== 5 || parts.some((n) => !Number.isFinite(n))) return false;
 	const [, , r = 0, g = 0, b = 0] = parts;
 	const luminance = 0.2126 * r + 0.7152 * g + 0.0722 * b;
 	return luminance < 72;

package/src/commands/pretty.ts

@@ -93,9 +93,7 @@ export function registerPrettyCommand(pi: PiPrettyApi): void {
 								const name = theme.fg(sel ? "accent" : "text", mode.padEnd(8));
 								// Live preview: render the sample glyphs in THIS mode.
 								const prev = ICON_MODES[i] === getIconMode();
-								const samples = prev
-									? PREVIEW.map((p) => icon(p.key)).join(" ")
-									: "";
+								const samples = prev ? PREVIEW.map((p) => icon(p.key)).join(" ") : "";
 								return `${cursor} ${name} ${theme.fg("dim", samples)}`;
 							});
 							const lines = [
@@ -115,8 +113,7 @@ export function registerPrettyCommand(pi: PiPrettyApi): void {
 						invalidate: () => {},
 						handleInput: (data: string) => {
 							if (data === "k" || data === "\u001b[A") choose(selected - 1);
-							else if (data === "j" || data === "\u001b[B")
-								choose(selected + 1);
+							else if (data === "j" || data === "\u001b[B") choose(selected + 1);
 							else if (data === "\u001b" || data === "q" || data === "\r") {
 								done(null);
 								return;

package/src/config.ts

@@ -16,14 +16,10 @@ function readThemeFromSettings(agentDir?: string): BundledTheme | undefined {
 	if (!resolvedAgentDir) return undefined;
 
 	try {
-		const settings = JSON.parse(
-			readFileSync(join(resolvedAgentDir, "settings.json"), "utf8"),
-		) as {
+		const settings = JSON.parse(readFileSync(join(resolvedAgentDir, "settings.json"), "utf8")) as {
 			theme?: unknown;
 		};
-		return typeof settings.theme === "string"
-			? (settings.theme as BundledTheme)
-			: undefined;
+		return typeof settings.theme === "string" ? (settings.theme as BundledTheme) : undefined;
 	} catch {
 		return undefined;
 	}
@@ -53,11 +49,7 @@ export function envInt(name: string, fallback: number): number {
 }
 
 // Precedence for numeric config: env var → pix.json → hardcoded default
-function pixOrEnvInt(
-	envName: string,
-	pixValue: number,
-	fallback: number,
-): number {
+function pixOrEnvInt(envName: string, pixValue: number, fallback: number): number {
 	const env = process.env[envName];
 	if (env) {
 		const v = Number.parseInt(env, 10);
@@ -68,30 +60,14 @@ function pixOrEnvInt(
 
 const pc = pixConfig().pretty;
 
-export const MAX_HL_CHARS = pixOrEnvInt(
-	"PRETTY_MAX_HL_CHARS",
-	pc.maxHighlightChars,
-	80_000,
-);
+export const MAX_HL_CHARS = pixOrEnvInt("PRETTY_MAX_HL_CHARS", pc.maxHighlightChars, 80_000);
 
-export const MAX_PREVIEW_LINES = pixOrEnvInt(
-	"PRETTY_MAX_PREVIEW_LINES",
-	pc.maxPreviewLines,
-	80,
-);
+export const MAX_PREVIEW_LINES = pixOrEnvInt("PRETTY_MAX_PREVIEW_LINES", pc.maxPreviewLines, 80);
 
-export const CACHE_LIMIT = pixOrEnvInt(
-	"PRETTY_CACHE_LIMIT",
-	pc.cacheLimit,
-	128,
-);
+export const CACHE_LIMIT = pixOrEnvInt("PRETTY_CACHE_LIMIT", pc.cacheLimit, 128);
 
 // --- Diff rendering limits (edit/write tools) ---
-export const MAX_RENDER_LINES = pixOrEnvInt(
-	"PRETTY_MAX_RENDER_LINES",
-	pc.maxRenderLines,
-	150,
-);
+export const MAX_RENDER_LINES = pixOrEnvInt("PRETTY_MAX_RENDER_LINES", pc.maxRenderLines, 150);
 
 // Word-level emphasis only when paired del/add lines are at least this similar.
 export const WORD_DIFF_MIN_SIM = 0.15;

package/src/confirm.ts

@@ -55,19 +55,13 @@ const COUNTDOWN_WARN_S = 5;
 /**
  * Show a Yes/No overlay. Resolves true on confirm, false otherwise.
  */
-export function confirmOverlay(
-	ui: ConfirmUI,
-	opts: ConfirmOptions,
-): Promise<boolean> {
+export function confirmOverlay(ui: ConfirmUI, opts: ConfirmOptions): Promise<boolean> {
 	const accent = opts.accent ?? "accent";
 	const timeoutMs = opts.timeoutMs ?? 0;
 
 	return new Promise((resolve) => {
 		const controller = new AbortController();
-		const timer =
-			timeoutMs > 0
-				? setTimeout(() => controller.abort(), timeoutMs)
-				: undefined;
+		const timer = timeoutMs > 0 ? setTimeout(() => controller.abort(), timeoutMs) : undefined;
 
 		ui.custom<boolean>(
 			(tui, theme, _kb, done) => {
@@ -87,25 +81,15 @@ export function confirmOverlay(
 					},
 				];
 
-				const selectList = new SelectList(
-					choices,
-					choices.length,
-					selectListTheme(theme, accent),
-				);
+				const selectList = new SelectList(choices, choices.length, selectListTheme(theme, accent));
 
 				if (timeoutMs > 0) {
 					const deadlineMs = Date.now() + timeoutMs;
 					const updateCountdown = () => {
-						const remaining = Math.max(
-							0,
-							Math.ceil((deadlineMs - Date.now()) / SECOND_MS),
-						);
+						const remaining = Math.max(0, Math.ceil((deadlineMs - Date.now()) / SECOND_MS));
 						countdownLine =
 							theme.fg("dim", "Auto-cancel in ") +
-							theme.fg(
-								remaining <= COUNTDOWN_WARN_S ? accent : "muted",
-								`${remaining}s`,
-							);
+							theme.fg(remaining <= COUNTDOWN_WARN_S ? accent : "muted", `${remaining}s`);
 					};
 					updateCountdown();
 					ticker = setInterval(() => {
@@ -148,9 +132,7 @@ export function confirmOverlay(
 						for (const l of selectList.render(inner)) lines.push(l);
 
 						lines.push("");
-						lines.push(
-							theme.fg("dim", "↑↓ navigate • enter select • esc cancel"),
-						);
+						lines.push(theme.fg("dim", "↑↓ navigate • enter select • esc cancel"));
 
 						return frameLines({
 							width: mw,

package/src/diff-render.ts

@@ -72,31 +72,13 @@ const dc = pixConfig().pretty.diff;
 // Precedence: env → pix.json → hardcoded default
 const BG_ADD = envBg("DIFF_BG_ADD", hexToBg(dc.bgAdd) || "\x1b[48;2;22;38;32m");
 const BG_DEL = envBg("DIFF_BG_DEL", hexToBg(dc.bgDel) || "\x1b[48;2;45;25;25m");
-const BG_ADD_W = envBg(
-	"DIFF_BG_ADD_HL",
-	hexToBg(dc.bgAddHighlight) || "\x1b[48;2;35;75;50m",
-);
-const BG_DEL_W = envBg(
-	"DIFF_BG_DEL_HL",
-	hexToBg(dc.bgDelHighlight) || "\x1b[48;2;80;35;35m",
-);
-const BG_GUTTER_ADD = envBg(
-	"DIFF_BG_GUTTER_ADD",
-	hexToBg(dc.bgGutterAdd) || "\x1b[48;2;18;32;26m",
-);
-const BG_GUTTER_DEL = envBg(
-	"DIFF_BG_GUTTER_DEL",
-	hexToBg(dc.bgGutterDel) || "\x1b[48;2;38;22;22m",
-);
-
-const FG_ADD = envFg(
-	"DIFF_FG_ADD",
-	hexToFg(dc.fgAdd) || "\x1b[38;2;100;180;120m",
-);
-const FG_DEL = envFg(
-	"DIFF_FG_DEL",
-	hexToFg(dc.fgDel) || "\x1b[38;2;200;100;100m",
-);
+const BG_ADD_W = envBg("DIFF_BG_ADD_HL", hexToBg(dc.bgAddHighlight) || "\x1b[48;2;35;75;50m");
+const BG_DEL_W = envBg("DIFF_BG_DEL_HL", hexToBg(dc.bgDelHighlight) || "\x1b[48;2;80;35;35m");
+const BG_GUTTER_ADD = envBg("DIFF_BG_GUTTER_ADD", hexToBg(dc.bgGutterAdd) || "\x1b[48;2;18;32;26m");
+const BG_GUTTER_DEL = envBg("DIFF_BG_GUTTER_DEL", hexToBg(dc.bgGutterDel) || "\x1b[48;2;38;22;22m");
+
+const FG_ADD = envFg("DIFF_FG_ADD", hexToFg(dc.fgAdd) || "\x1b[38;2;100;180;120m");
+const FG_DEL = envFg("DIFF_FG_DEL", hexToFg(dc.fgDel) || "\x1b[38;2;200;100;100m");
 const FG_STRIPE = "\x1b[38;2;40;40;40m"; // diagonal stripes on filler cells
 
 const BORDER_BAR = "▌";
@@ -115,10 +97,7 @@ const MAX_TERM_WIDTH = 210;
 const MAX_PREVIEW_LINES = envInt("PRETTY_MAX_PREVIEW_LINES", 80);
 
 const SPLIT_MIN_WIDTH = envInt("DIFF_SPLIT_MIN_WIDTH", dc.splitMinWidth || 150);
-const SPLIT_MIN_CODE_WIDTH = envInt(
-	"DIFF_SPLIT_MIN_CODE_WIDTH",
-	dc.splitMinCodeWidth || 60,
-);
+const SPLIT_MIN_CODE_WIDTH = envInt("DIFF_SPLIT_MIN_CODE_WIDTH", dc.splitMinCodeWidth || 60);
 const SPLIT_MAX_WRAP_RATIO = 0.2;
 const SPLIT_MAX_WRAP_LINES = 8;
 
@@ -192,20 +171,12 @@ function ensureContrast(fg: string, bgSeq: string, min = 3): string {
  *
  *  Theme hue is preserved, but each add/del fg is contrast-checked against the
  *  gutter bg it is painted on and lifted if it would render too dark to read. */
-export function resolveDiffColors(theme?: {
-	getFgAnsi?: (key: string) => string;
-}): DiffColors {
+export function resolveDiffColors(theme?: { getFgAnsi?: (key: string) => string }): DiffColors {
 	if (!theme?.getFgAnsi) return DEFAULT_DIFF_COLORS;
 	try {
 		return {
-			fgAdd: ensureContrast(
-				theme.getFgAnsi("toolDiffAdded") || FG_ADD,
-				BG_GUTTER_ADD,
-			),
-			fgDel: ensureContrast(
-				theme.getFgAnsi("toolDiffRemoved") || FG_DEL,
-				BG_GUTTER_DEL,
-			),
+			fgAdd: ensureContrast(theme.getFgAnsi("toolDiffAdded") || FG_ADD, BG_GUTTER_ADD),
+			fgDel: ensureContrast(theme.getFgAnsi("toolDiffRemoved") || FG_DEL, BG_GUTTER_DEL),
 			fgCtx: theme.getFgAnsi("toolDiffContext") || FG_DIM,
 		};
 	} catch {
@@ -214,9 +185,7 @@ export function resolveDiffColors(theme?: {
 }
 
 /** Stable cache key for the resolved diff theme colors. */
-export function diffThemeCacheKey(theme?: {
-	getFgAnsi?: (key: string) => string;
-}): string {
+export function diffThemeCacheKey(theme?: { getFgAnsi?: (key: string) => string }): string {
 	const c = resolveDiffColors(theme);
 	return `${c.fgAdd}|${c.fgDel}|${c.fgCtx}|${BG_BASE}`;
 }
@@ -266,9 +235,7 @@ function fit(s: string, w: number): string {
 		vis++;
 		i++;
 	}
-	return w > 2
-		? `${s.slice(0, i)}${RST}${FG_DIM}›${RST}`
-		: `${s.slice(0, i)}${RST}`;
+	return w > 2 ? `${s.slice(0, i)}${RST}${FG_DIM}›${RST}` : `${s.slice(0, i)}${RST}`;
 }
 
 /** Extract last active fg + bg ANSI codes from a string (for wrap continuations). */
@@ -293,12 +260,7 @@ function ansiState(s: string): string {
 }
 
 /** Wrap ANSI-encoded string into rows of `w` visible chars. */
-function wrapAnsi(
-	s: string,
-	w: number,
-	maxRows = adaptiveWrapRows(),
-	fillBg = "",
-): string[] {
+function wrapAnsi(s: string, w: number, maxRows = adaptiveWrapRows(), fillBg = ""): string[] {
 	if (w <= 0) return [""];
 	const plain = strip(s);
 	if (plain.length <= w) {
@@ -375,12 +337,7 @@ function stripes(w: number, _rowOffset: number): string {
 
 /** Right-aligned line number. `noReset` keeps the active bg alive (no
  *  trailing RST) so the caller can build one bg-continuous gutter segment. */
-function lnum(
-	n: number | null,
-	w: number,
-	fg = FG_LNUM,
-	noReset = false,
-): string {
+function lnum(n: number | null, w: number, fg = FG_LNUM, noReset = false): string {
 	if (n === null) return " ".repeat(w);
 	const v = String(n);
 	const pad = " ".repeat(Math.max(0, w - v.length));
@@ -402,20 +359,8 @@ function buildGutter(opts: {
 	nw: number;
 	continuation: boolean;
 }): string {
-	const {
-		borderFg,
-		gutterBg,
-		bodyBg,
-		num,
-		numFg,
-		signFg,
-		sign,
-		nw,
-		continuation,
-	} = opts;
-	const border = borderFg
-		? `${gutterBg}${borderFg}${BORDER_BAR}`
-		: `${BG_BASE} `;
+	const { borderFg, gutterBg, bodyBg, num, numFg, signFg, sign, nw, continuation } = opts;
+	const border = borderFg ? `${gutterBg}${borderFg}${BORDER_BAR}` : `${BG_BASE} `;
 	const numCell = continuation
 		? " ".repeat(nw + 2)
 		: `${lnum(num, nw, numFg, true)}${signFg}${sign} `;
@@ -505,8 +450,7 @@ function injectBg(
 				continue;
 			}
 		}
-		while (ri < ranges.length && vis >= (ranges[ri] as [number, number])[1])
-			ri++;
+		while (ri < ranges.length && vis >= (ranges[ri] as [number, number])[1]) ri++;
 		const want =
 			ri < ranges.length &&
 			vis >= (ranges[ri] as [number, number])[0] &&
@@ -523,10 +467,7 @@ function injectBg(
 }
 
 /** Simple word diff (no syntax hl) — fallback when highlighting is unavailable. */
-function plainWordDiff(
-	oldText: string,
-	newText: string,
-): { old: string; new: string } {
+function plainWordDiff(oldText: string, newText: string): { old: string; new: string } {
 	const parts = Diff.diffWords(oldText, newText);
 	let o = "";
 	let n = "";
@@ -551,18 +492,13 @@ function at<T>(arr: T[], i: number): T {
 // Split-vs-unified decision
 // ---------------------------------------------------------------------------
 
-function shouldUseSplit(
-	diff: ParsedDiff,
-	tw: number,
-	maxRows = MAX_PREVIEW_LINES,
-): boolean {
+function shouldUseSplit(diff: ParsedDiff, tw: number, maxRows = MAX_PREVIEW_LINES): boolean {
 	if (!diff.lines.length) return false;
 	if (tw < SPLIT_MIN_WIDTH) return false;
 
 	const nw = Math.max(
 		2,
-		String(Math.max(...diff.lines.map((l) => l.oldNum ?? l.newNum ?? 0), 0))
-			.length,
+		String(Math.max(...diff.lines.map((l) => l.oldNum ?? l.newNum ?? 0), 0)).length,
 	);
 	const half = Math.floor((tw - 1) / 2);
 	const gw = nw + 5;
@@ -599,10 +535,7 @@ export async function renderUnified(
 
 	const vis = diff.lines.slice(0, max);
 	const tw = termW();
-	const nw = Math.max(
-		2,
-		String(Math.max(...vis.map((l) => l.oldNum ?? l.newNum ?? 0), 0)).length,
-	);
+	const nw = Math.max(2, String(Math.max(...vis.map((l) => l.oldNum ?? l.newNum ?? 0), 0)).length);
 	const gw = nw + 5;
 	const cw = Math.max(20, tw - gw);
 	const canHL = diff.chars <= MAX_HL_CHARS && vis.length <= MAX_RENDER_LINES;
@@ -650,8 +583,7 @@ export async function renderUnified(
 		const contGutter = buildGutter({ ...gutterArgs, continuation: true });
 		const rows = wrapAnsi(tabs(body), cw, adaptiveWrapRows(), bodyBg);
 		out.push(`${gutter}${rows[0]}${RST}`);
-		for (let r = 1; r < rows.length; r++)
-			out.push(`${contGutter}${rows[r]}${RST}`);
+		for (let r = 1; r < rows.length; r++) out.push(`${contGutter}${rows[r]}${RST}`);
 	}
 
 	while (idx < vis.length) {
@@ -664,23 +596,14 @@ export async function renderUnified(
 			const pad = Math.max(0, totalW - label.length - 2);
 			const half1 = Math.floor(pad / 2);
 			const half2 = pad - half1;
-			out.push(
-				`${BG_BASE}${FG_DIM}${"─".repeat(half1)}${label}${"─".repeat(half2)}${RST}`,
-			);
+			out.push(`${BG_BASE}${FG_DIM}${"─".repeat(half1)}${label}${"─".repeat(half2)}${RST}`);
 			idx++;
 			continue;
 		}
 
 		if (l.type === "ctx") {
 			const hl = oldHL[oI] ?? l.content;
-			emitRow(
-				l.newNum,
-				" ",
-				BG_BASE,
-				dc.fgCtx,
-				`${BG_BASE}${DIM}${hl}`,
-				BG_BASE,
-			);
+			emitRow(l.newNum, " ", BG_BASE, dc.fgCtx, `${BG_BASE}${DIM}${hl}`, BG_BASE);
 			oI++;
 			nI++;
 			idx++;
@@ -705,9 +628,7 @@ export async function renderUnified(
 		}
 
 		const isPaired = dels.length === 1 && adds.length === 1;
-		const wd = isPaired
-			? wordDiffAnalysis(at(dels, 0).l.content, at(adds, 0).l.content)
-			: null;
+		const wd = isPaired ? wordDiffAnalysis(at(dels, 0).l.content, at(adds, 0).l.content) : null;
 		const wdBalanced = wd && wd.oldRanges.length > 0 && wd.newRanges.length > 0;
 
 		if (isPaired && wdBalanced && wd.similarity >= WORD_DIFF_MIN_SIM && canHL) {
@@ -715,30 +636,11 @@ export async function renderUnified(
 			const add0 = at(adds, 0);
 			const delBody = injectBg(del0.hl, wd.oldRanges, BG_DEL, BG_DEL_W);
 			const addBody = injectBg(add0.hl, wd.newRanges, BG_ADD, BG_ADD_W);
-			emitRow(
-				del0.l.oldNum,
-				"-",
-				BG_GUTTER_DEL,
-				`${dc.fgDel}${BOLD}`,
-				delBody,
-				BG_DEL,
-			);
-			emitRow(
-				add0.l.newNum,
-				"+",
-				BG_GUTTER_ADD,
-				`${dc.fgAdd}${BOLD}`,
-				addBody,
-				BG_ADD,
-			);
+			emitRow(del0.l.oldNum, "-", BG_GUTTER_DEL, `${dc.fgDel}${BOLD}`, delBody, BG_DEL);
+			emitRow(add0.l.newNum, "+", BG_GUTTER_ADD, `${dc.fgAdd}${BOLD}`, addBody, BG_ADD);
 			continue;
 		}
-		if (
-			isPaired &&
-			wdBalanced &&
-			wd.similarity >= WORD_DIFF_MIN_SIM &&
-			!canHL
-		) {
+		if (isPaired && wdBalanced && wd.similarity >= WORD_DIFF_MIN_SIM && !canHL) {
 			const del0 = at(dels, 0);
 			const add0 = at(adds, 0);
 			const pwd = plainWordDiff(del0.l.content, add0.l.content);
@@ -763,33 +665,17 @@ export async function renderUnified(
 
 		for (const d of dels) {
 			const body = canHL ? `${BG_DEL}${d.hl}` : `${BG_DEL}${d.l.content}`;
-			emitRow(
-				d.l.oldNum,
-				"-",
-				BG_GUTTER_DEL,
-				`${dc.fgDel}${BOLD}`,
-				body,
-				BG_DEL,
-			);
+			emitRow(d.l.oldNum, "-", BG_GUTTER_DEL, `${dc.fgDel}${BOLD}`, body, BG_DEL);
 		}
 		for (const a of adds) {
 			const body = canHL ? `${BG_ADD}${a.hl}` : `${BG_ADD}${a.l.content}`;
-			emitRow(
-				a.l.newNum,
-				"+",
-				BG_GUTTER_ADD,
-				`${dc.fgAdd}${BOLD}`,
-				body,
-				BG_ADD,
-			);
+			emitRow(a.l.newNum, "+", BG_GUTTER_ADD, `${dc.fgAdd}${BOLD}`, body, BG_ADD);
 		}
 	}
 
 	out.push(rule(tw));
 	if (diff.lines.length > vis.length) {
-		out.push(
-			`${BG_BASE}${FG_DIM}  … ${diff.lines.length - vis.length} more lines${RST}`,
-		);
+		out.push(`${BG_BASE}${FG_DIM}  … ${diff.lines.length - vis.length} more lines${RST}`);
 	}
 	return out.join("\n");
 }
@@ -805,8 +691,7 @@ export async function renderSplit(
 	dc: DiffColors = DEFAULT_DIFF_COLORS,
 ): Promise<string> {
 	const tw = termW();
-	if (!shouldUseSplit(diff, tw, max))
-		return renderUnified(diff, language, max, dc);
+	if (!shouldUseSplit(diff, tw, max)) return renderUnified(diff, language, max, dc);
 	if (!diff.lines.length) return "";
 
 	type Row = { left: DiffLine | null; right: DiffLine | null };
@@ -834,21 +719,18 @@ export async function renderSplit(
 			i++;
 		}
 		const n = Math.max(dels.length, adds.length);
-		for (let j = 0; j < n; j++)
-			rows.push({ left: dels[j] ?? null, right: adds[j] ?? null });
+		for (let j = 0; j < n; j++) rows.push({ left: dels[j] ?? null, right: adds[j] ?? null });
 	}
 
 	const vis = rows.slice(0, max);
 	const half = Math.floor((tw - 1) / 2);
 	const nw = Math.max(
 		2,
-		String(Math.max(...diff.lines.map((l) => l.oldNum ?? l.newNum ?? 0), 0))
-			.length,
+		String(Math.max(...diff.lines.map((l) => l.oldNum ?? l.newNum ?? 0), 0)).length,
 	);
 	const gw = nw + 5;
 	const cw = Math.max(12, half - gw);
-	const canHL =
-		diff.chars <= MAX_HL_CHARS && vis.length * 2 <= MAX_RENDER_LINES * 2;
+	const canHL = diff.chars <= MAX_HL_CHARS && vis.length * 2 <= MAX_RENDER_LINES * 2;
 
 	const leftSrc: string[] = [];
 	const rightSrc: string[] = [];
@@ -920,9 +802,7 @@ export async function renderSplit(
 
 		// Split view's non-bordered context rows lead with a space before bg;
 		// buildGutter handles bordered rows, so feed the same border convention.
-		const splitBorder = borderFg
-			? `${gBg}${borderFg}${BORDER_BAR}`
-			: ` ${BG_BASE}`;
+		const splitBorder = borderFg ? `${gBg}${borderFg}${BORDER_BAR}` : ` ${BG_BASE}`;
 		const numCell = `${lnum(num, nw, numFg, true)}${sFg}${BOLD}${sign} `;
 		const gutter = `${splitBorder}${gBg}${numCell}${FG_RULE}│${cBg} ${RST}`;
 		const contGutter = `${splitBorder}${gBg}${" ".repeat(nw + 2)}${FG_RULE}│${cBg} ${RST}`;
@@ -936,14 +816,8 @@ export async function renderSplit(
 	for (const r of vis) {
 		const leftLine = r.left;
 		const rightLine = r.right;
-		const paired =
-			leftLine &&
-			rightLine &&
-			leftLine.type === "del" &&
-			rightLine.type === "add";
-		const wd = paired
-			? wordDiffAnalysis(leftLine.content, rightLine.content)
-			: null;
+		const paired = leftLine && rightLine && leftLine.type === "del" && rightLine.type === "add";
+		const wd = paired ? wordDiffAnalysis(leftLine.content, rightLine.content) : null;
 
 		let lResult: HalfResult;
 		let rResult: HalfResult;
@@ -961,13 +835,9 @@ export async function renderSplit(
 			rResult = halfBuild(rightLine, pwd.new, null, "right");
 		} else {
 			const lhl =
-				leftLine && leftLine.type !== "sep"
-					? (leftHL[lI++] ?? leftLine?.content ?? "")
-					: "";
+				leftLine && leftLine.type !== "sep" ? (leftHL[lI++] ?? leftLine?.content ?? "") : "";
 			const rhl =
-				rightLine && rightLine.type !== "sep"
-					? (rightHL[rI++] ?? rightLine?.content ?? "")
-					: "";
+				rightLine && rightLine.type !== "sep" ? (rightHL[rI++] ?? rightLine?.content ?? "") : "";
 			lResult = halfBuild(leftLine, lhl, null, "left");
 			rResult = halfBuild(rightLine, rhl, null, "right");
 		}
@@ -987,9 +857,7 @@ export async function renderSplit(
 
 	out.push(`${rule(half)}${FG_RULE}┊${RST}${rule(half)}`);
 	if (rows.length > vis.length) {
-		out.push(
-			`${BG_BASE}${FG_DIM}  … ${rows.length - vis.length} more lines${RST}`,
-		);
+		out.push(`${BG_BASE}${FG_DIM}  … ${rows.length - vis.length} more lines${RST}`);
 	}
 	return out.join("\n");
 }

package/src/diff.ts

@@ -42,8 +42,7 @@ export function parseDiff(
 	for (let hi = 0; hi < patch.hunks.length; hi++) {
 		if (hi > 0) {
 			const prev = at(patch.hunks, hi - 1);
-			const gap =
-				at(patch.hunks, hi).oldStart - (prev.oldStart + prev.oldLines);
+			const gap = at(patch.hunks, hi).oldStart - (prev.oldStart + prev.oldLines);
 			lines.push({
 				type: "sep",
 				oldNum: null,

package/src/fff.ts

@@ -31,9 +31,7 @@ export function getPiPrettyFffDir(_agentDir: string): string {
 	return join(cacheHome, "pi", "fff");
 }
 
-export async function fffEnsureFinder(
-	cwd: string,
-): Promise<FffBackedFinder | null> {
+export async function fffEnsureFinder(cwd: string): Promise<FffBackedFinder | null> {
 	if (fffState.finder && !fffState.finder.isDestroyed) return fffState.finder;
 	if (!fffState.module || !fffState.dbDir) return null;
 
@@ -68,13 +66,9 @@ export function fffDestroy(): void {
 function sanitizeGrepRecordContent(text: string): string {
 	let content = text;
 	if (content.endsWith("\r\n")) content = content.slice(0, -2);
-	else if (content.endsWith("\r") || content.endsWith("\n"))
-		content = content.slice(0, -1);
+	else if (content.endsWith("\r") || content.endsWith("\n")) content = content.slice(0, -1);
 
-	return content
-		.replace(/\r\n/g, "\\n")
-		.replace(/\r/g, "\\r")
-		.replace(/\n/g, "\\n");
+	return content.replace(/\r\n/g, "\\n").replace(/\r/g, "\\r").replace(/\n/g, "\\n");
 }
 
 function truncateGrepRecordContent(text: string): string {

package/src/gate-overlay.test.ts

@@ -27,9 +27,7 @@ interface Wired {
  * the SelectList keys; simpler: we expose the live component so the test can
  * call its handlers. We do the latter via the captured component ref.
  */
-function makeUI(
-	onReady: (comp: Wired, finish: (v: unknown) => void) => void,
-): OverlayUI {
+function makeUI(onReady: (comp: Wired, finish: (v: unknown) => void) => void): OverlayUI {
 	return {
 		custom: async <T>(
 			cb: (
@@ -195,9 +193,7 @@ function makeTimerUI(onReady?: (comp: Wired) => void): OverlayUI {
 			) => Wired,
 		): Promise<T | undefined> =>
 			new Promise((resolve) => {
-				const comp = cb({ requestRender: () => {} }, theme, undefined, (v) =>
-					resolve(v),
-				);
+				const comp = cb({ requestRender: () => {} }, theme, undefined, (v) => resolve(v));
 				comp.render(80);
 				onReady?.(comp);
 			}),

package/src/gate-overlay.ts

@@ -14,12 +14,7 @@
  *   - Single source of truth for the overlay look across pix-gate and pix-sudo.
  */
 
-import {
-	Input,
-	type SelectItem,
-	SelectList,
-	wrapTextWithAnsi,
-} from "@earendil-works/pi-tui";
+import { Input, type SelectItem, SelectList, wrapTextWithAnsi } from "@earendil-works/pi-tui";
 import { frameLines, modalWidth, selectListTheme } from "./modal-frame.js";
 
 // ── Types ─────────────────────────────────────────────────────────────────────
@@ -135,16 +130,7 @@ function buildLines(opts: {
 	countdownLine: string | undefined;
 	width: number;
 }): string[] {
-	const {
-		theme,
-		accent,
-		config,
-		stage,
-		selectList,
-		maskedInput,
-		countdownLine,
-		width,
-	} = opts;
+	const { theme, accent, config, stage, selectList, maskedInput, countdownLine, width } = opts;
 	const inner = width - 4; // CHROME = 2 border + 2 padding
 	const lines: string[] = [];
 
@@ -172,10 +158,7 @@ function buildLines(opts: {
 		lines.push("");
 		lines.push(theme.fg("dim", "↑↓ navigate • enter select • esc deny"));
 	} else {
-		const label =
-			config.mode === "sudo"
-				? (config.passwordLabel ?? "Sudo password:")
-				: "Password:";
+		const label = config.mode === "sudo" ? (config.passwordLabel ?? "Sudo password:") : "Password:";
 		lines.push(theme.fg("muted", label));
 		const inputLines = maskedInput.render(inner);
 		for (const l of inputLines) lines.push(l);
@@ -217,10 +200,7 @@ function buildLines(opts: {
  * if (result.action === "approved") runWithSudo(cmd, result.password!);
  * ```
  */
-export function showOverlay(
-	ui: OverlayUI,
-	config: OverlayConfig,
-): Promise<OverlayResult> {
+export function showOverlay(ui: OverlayUI, config: OverlayConfig): Promise<OverlayResult> {
 	const accent = config.accent ?? "accent";
 	const choices = config.choices ?? DEFAULT_CHOICES;
 	const approveVal = config.approveValue ?? "yes";
@@ -291,8 +271,7 @@ export function showOverlay(
 				};
 				selectList.onCancel = () => finish({ action: "denied" });
 
-				maskedInput.onSubmit = (pw) =>
-					finish({ action: "approved", password: pw });
+				maskedInput.onSubmit = (pw) => finish({ action: "approved", password: pw });
 				maskedInput.onEscape = () => finish({ action: "denied" });
 
 				// ── component interface ──────────────────────────────────────────

package/src/highlight.ts

@@ -10,10 +10,7 @@ import type { BundledLanguage } from "./types.js";
 // is not the process stdout chalk inspects) we default FORCE_COLOR before chalk
 // initializes, and lazy-load cli-highlight so this runs first. Respect an
 // explicit FORCE_COLOR/NO_COLOR if the user set one.
-if (
-	process.env.FORCE_COLOR === undefined &&
-	process.env.NO_COLOR === undefined
-) {
+if (process.env.FORCE_COLOR === undefined && process.env.NO_COLOR === undefined) {
 	process.env.FORCE_COLOR = "3";
 }
 

package/src/icon-catalog.ts

@@ -77,6 +77,9 @@ const CATALOG = {
 
 	// ── subagent widget (pix-subagent) ────────────────────────────────────
 	agent: { nerd: "\u{F0BA0}", unicode: `\u2699${VS}`, ascii: "@" },
+	turns: { nerd: "\u{F006A}", unicode: `\u21BB${VS}`, ascii: "~" },
+	tools: { nerd: "\u{F1064}", unicode: `\u2692${VS}`, ascii: "T" },
+	tokens: { nerd: "\u{F027F}", unicode: `\u25A4${VS}`, ascii: "tk" },
 } as const;
 
 /** Every valid semantic icon key. */

package/src/icon-persist.ts

@@ -47,10 +47,7 @@ export function saveIconMode(mode: IconMode): void {
 		let existing: Record<string, unknown> = {};
 		if (existsSync(p)) {
 			try {
-				existing = JSON.parse(readFileSync(p, "utf-8")) as Record<
-					string,
-					unknown
-				>;
+				existing = JSON.parse(readFileSync(p, "utf-8")) as Record<string, unknown>;
 			} catch {
 				existing = {};
 			}

package/src/modal-frame.ts

@@ -71,8 +71,7 @@ export function frameLines(opts: FrameOptions): string[] {
 
 	const row = (content: string): string => {
 		const pad = inner - visibleWidth(content);
-		const padded =
-			pad > 0 ? content + " ".repeat(pad) : truncateToWidth(content, inner);
+		const padded = pad > 0 ? content + " ".repeat(pad) : truncateToWidth(content, inner);
 		return bg(`${color("│")} ${reassert(padded)} ${color("│")}`);
 	};
 
@@ -101,10 +100,7 @@ interface FgTheme {
  * Canonical SelectList theme for interactive overlays.
  * accent = active/selected, muted = descriptions, dim = scroll/hints, warning = no-match.
  */
-export function selectListTheme(
-	theme: FgTheme,
-	accent = "accent",
-): SelectListThemeConfig {
+export function selectListTheme(theme: FgTheme, accent = "accent"): SelectListThemeConfig {
 	return {
 		selectedPrefix: (t) => theme.fg(accent, t),
 		selectedText: (t) => theme.fg(accent, t),

package/src/progress.ts

@@ -55,11 +55,7 @@ const SPINNER_INTERVAL_MS = 120;
  * Open a modal progress overlay. Returns a handle to update the label and
  * close it. The overlay swallows all keystrokes until closed.
  */
-export function openProgress(
-	ui: ProgressUI,
-	title: string,
-	accent = "accent",
-): ProgressHandle {
+export function openProgress(ui: ProgressUI, title: string, accent = "accent"): ProgressHandle {
 	let setLabelImpl: (label: string) => void = () => {};
 	let closeImpl: () => void = () => {};
 

package/src/renderers.ts

@@ -1,15 +1,6 @@
 import { truncateToWidth } from "@earendil-works/pi-tui";
 
-import {
-	BOLD,
-	FG_BLUE,
-	FG_DIM,
-	FG_GREEN,
-	FG_RED,
-	FG_RULE,
-	FG_YELLOW,
-	RST,
-} from "./ansi.js";
+import { BOLD, FG_BLUE, FG_DIM, FG_GREEN, FG_RED, FG_RULE, FG_YELLOW, RST } from "./ansi.js";
 import { MAX_PREVIEW_LINES } from "./config.js";
 import { hlBlock } from "./highlight.js";
 import { dirIcon, fileIcon } from "./icons.js";
@@ -49,9 +40,7 @@ export async function renderFileContent(
 
 	out.push(rule(tw));
 	if (total > maxLines) {
-		out.push(
-			`${FG_DIM}  … ${pluralize(total - maxLines, "more line")} (${total} total)${RST}`,
-		);
+		out.push(`${FG_DIM}  … ${pluralize(total - maxLines, "more line")} (${total} total)${RST}`);
 	}
 	return out.join("\n");
 }

package/src/types-diff.d.ts

@@ -32,9 +32,5 @@ declare module "diff" {
 		count?: number;
 	}
 
-	export function diffWords(
-		oldStr: string,
-		newStr: string,
-		options?: unknown,
-	): Change[];
+	export function diffWords(oldStr: string, newStr: string, options?: unknown): Change[];
 }

package/src/types.ts

@@ -41,28 +41,19 @@ export type ToolImageContent = ImageContent;
 
 export type ToolContent = TextContent | ImageContent;
 
-export type ToolResultLike<TDetails = unknown> = AgentToolResult<
-	TDetails | undefined
->;
+export type ToolResultLike<TDetails = unknown> = AgentToolResult<TDetails | undefined>;
 
 type TextComponentLike = {
 	setText(value: string): void;
 	getText?: () => string;
 };
 
-export type TextComponentCtor = new (
-	text?: string,
-	x?: number,
-	y?: number,
-) => TextComponentLike;
+export type TextComponentCtor = new (text?: string, x?: number, y?: number) => TextComponentLike;
 
 export type ThemeLike = BgTheme & FgTheme & { bold: (text: string) => string };
 
 export type RenderContextLike<
-	TState extends Record<string, string | undefined> = Record<
-		string,
-		string | undefined
-	>,
+	TState extends Record<string, string | undefined> = Record<string, string | undefined>,
 > = {
 	lastComponent?: TextComponentLike;
 	state: TState;

package/src/utils.test.ts

@@ -49,20 +49,14 @@ describe("renderDimPreview", () => {
 	});
 
 	it("adds singular overflow marker for 1 extra line", () => {
-		const body = Array.from(
-			{ length: MAX_PREVIEW_LINES + 1 },
-			(_, i) => `L${i}`,
-		);
+		const body = Array.from({ length: MAX_PREVIEW_LINES + 1 }, (_, i) => `L${i}`);
 		const out = plain(renderDimPreview(body.join("\n"), theme));
 		expect(out).toContain("… 1 more line");
 		expect(out).not.toContain("more lines");
 	});
 
 	it("adds plural overflow marker for many extra lines", () => {
-		const body = Array.from(
-			{ length: MAX_PREVIEW_LINES + 3 },
-			(_, i) => `L${i}`,
-		);
+		const body = Array.from({ length: MAX_PREVIEW_LINES + 3 }, (_, i) => `L${i}`);
 		const out = plain(renderDimPreview(body.join("\n"), theme));
 		expect(out).toContain("… 3 more lines");
 	});
@@ -86,8 +80,6 @@ describe("renderDimPreview", () => {
 	});
 
 	it("does not throw on an invalid highlight regex", () => {
-		expect(() =>
-			renderDimPreview("text", theme, { highlight: "(" }),
-		).not.toThrow();
+		expect(() => renderDimPreview("text", theme, { highlight: "(" })).not.toThrow();
 	});
 });

package/src/utils.ts

@@ -41,21 +41,14 @@ export function fillToolBackground(text: string, bg = BG_BASE): string {
 		.split("\n")
 		.map((line) => {
 			const normalized = preserveToolBackground(line, bg);
-			const fitted = preserveToolBackground(
-				truncateToWidth(normalized, width, ""),
-				bg,
-			);
+			const fitted = preserveToolBackground(truncateToWidth(normalized, width, ""), bg);
 			const padding = Math.max(0, width - visibleWidth(fitted));
 			return `${bg}${fitted}${" ".repeat(padding)}${RST}`;
 		})
 		.join("\n");
 }
 
-export function pluralize(
-	count: number,
-	noun: string,
-	plural?: string,
-): string {
+export function pluralize(count: number, noun: string, plural?: string): string {
 	return `${count} ${count === 1 ? noun : (plural ?? `${noun}s`)}`;
 }
 
@@ -74,18 +67,12 @@ function safeHighlightRegex(pattern: string): RegExp | null {
 	}
 }
 
-function dimLineWithHighlight(
-	line: string,
-	theme: FgTheme,
-	re: RegExp | null,
-): string {
+function dimLineWithHighlight(line: string, theme: FgTheme, re: RegExp | null): string {
 	if (!re) return theme.fg("dim", line);
 	// split with capture group: odd indexes are matches
 	return line
 		.split(re)
-		.map((part, i) =>
-			i % 2 ? `${FG_GREEN}${BOLD}${part}${RST}` : theme.fg("dim", part),
-		)
+		.map((part, i) => (i % 2 ? `${FG_GREEN}${BOLD}${part}${RST}` : theme.fg("dim", part)))
 		.join("");
 }
 
@@ -204,15 +191,11 @@ export function humanSize(bytes: number): string {
 // Fallback: set PRETTY_ICONS=none to disable icons.
 // ---------------------------------------------------------------------------
 
-export function isTextContent(
-	content: ToolContent,
-): content is ToolTextContent {
+export function isTextContent(content: ToolContent): content is ToolTextContent {
 	return content.type === "text";
 }
 
-export function isImageContent(
-	content: ToolContent,
-): content is ToolImageContent {
+export function isImageContent(content: ToolContent): content is ToolImageContent {
 	return content.type === "image";
 }