@xynogen/pix-pretty 1.7.10 → 1.7.13

package/README.md

@@ -61,7 +61,24 @@ pi install npm:@xynogen/pix-pretty
 
 ## Configuration
 
-### Environment Variables
+Configuration is read from **`~/.pi/agent/pix.json`** (the unified config file hosted by `@xynogen/pix-data/pix-config`). The `pretty` section of that file sets the defaults for theme, icon mode, and preview lines. Environment variables still override `pix.json` values.
+
+> **Note:** `pix-config.ts` and `collapse.ts` previously shipped with `pix-pretty` — they have moved to `pix-data` (`@xynogen/pix-data/pix-config` and `@xynogen/pix-data/collapse`). Update any direct imports.
+
+### `pix.json` — `pretty` section
+
+```jsonc
+{
+  "pretty": {
+    "theme": "monokai",       // syntax-highlight theme
+    "icons": "nerd",          // nerd | unicode | ascii
+    "maxPreviewLines": 50,
+    "diffColors": true
+  }
+}
+```
+
+### Environment Variables (override `pix.json`)
 
 - `PRETTY_THEME` — color theme for syntax highlighting
 - `PRETTY_MAX_HL_CHARS` — max characters to highlight (default: 80000)

package/package.json

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

package/src/ansi.ts

@@ -23,7 +23,7 @@ function parseAnsiRgb(
 	const m = ansi.match(
 		new RegExp(`${ESC_RE}\\[(?:38|48);2;(\\d+);(\\d+);(\\d+)m`),
 	);
-	return m ? { r: +m[1], g: +m[2], b: +m[3] } : null;
+	return m ? { r: +(m[1] ?? 0), g: +(m[2] ?? 0), b: +(m[3] ?? 0) } : null;
 }
 
 function getThemeBgAnsi(theme: BgTheme, key: string): string | null {
@@ -63,7 +63,7 @@ function isLowContrastShikiFg(params: string): boolean {
 	const parts = params.split(";").map(Number);
 	if (parts.length !== 5 || parts.some((n) => !Number.isFinite(n)))
 		return false;
-	const [, , r, g, b] = parts;
+	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

@@ -62,7 +62,7 @@ export function registerPrettyCommand(pi: PiPrettyApi): void {
 			// Headless / no custom-UI host: cycle to the next mode + notify.
 			if (typeof ui.custom !== "function") {
 				const cur = ICON_MODES.indexOf(getIconMode());
-				const next = ICON_MODES[(cur + 1) % ICON_MODES.length] as IconMode;
+				const next = ICON_MODES[(cur + 1) % ICON_MODES.length] ?? "nerd";
 				applyMode(next);
 				ui.notify(`pix-pretty icons: ${next}`, "info");
 				return;
@@ -82,7 +82,7 @@ export function registerPrettyCommand(pi: PiPrettyApi): void {
 
 					const choose = (i: number) => {
 						selected = (i + ICON_MODES.length) % ICON_MODES.length;
-						applyMode(ICON_MODES[selected] as IconMode);
+						applyMode(ICON_MODES[selected] ?? "nerd");
 					};
 
 					return {

package/src/config.ts

@@ -1,6 +1,7 @@
 import { readFileSync } from "node:fs";
 import { join } from "node:path";
 
+import { pixConfig } from "@xynogen/pix-data/pix-config";
 import type { BundledTheme } from "./types.js";
 
 const DEFAULT_THEME: BundledTheme = "github-dark";
@@ -29,8 +30,10 @@ function readThemeFromSettings(agentDir?: string): BundledTheme | undefined {
 }
 
 function resolvePrettyTheme(agentDir?: string): BundledTheme {
+	// Precedence: env → pix.json → settings.json → default
 	return (
 		(process.env.PRETTY_THEME as BundledTheme | undefined) ??
+		(pixConfig().pretty.theme as BundledTheme) ??
 		readThemeFromSettings(agentDir) ??
 		DEFAULT_THEME
 	);
@@ -49,14 +52,46 @@ export function envInt(name: string, fallback: number): number {
 	return Number.isFinite(v) && v > 0 ? v : fallback;
 }
 
-export const MAX_HL_CHARS = envInt("PRETTY_MAX_HL_CHARS", 80_000);
+// Precedence for numeric config: env var → pix.json → hardcoded default
+function pixOrEnvInt(
+	envName: string,
+	pixValue: number,
+	fallback: number,
+): number {
+	const env = process.env[envName];
+	if (env) {
+		const v = Number.parseInt(env, 10);
+		if (Number.isFinite(v) && v > 0) return v;
+	}
+	return pixValue !== fallback ? pixValue : fallback;
+}
+
+const pc = pixConfig().pretty;
+
+export const MAX_HL_CHARS = pixOrEnvInt(
+	"PRETTY_MAX_HL_CHARS",
+	pc.maxHighlightChars,
+	80_000,
+);
 
-export const MAX_PREVIEW_LINES = envInt("PRETTY_MAX_PREVIEW_LINES", 80);
+export const MAX_PREVIEW_LINES = pixOrEnvInt(
+	"PRETTY_MAX_PREVIEW_LINES",
+	pc.maxPreviewLines,
+	80,
+);
 
-export const CACHE_LIMIT = envInt("PRETTY_CACHE_LIMIT", 128);
+export const CACHE_LIMIT = pixOrEnvInt(
+	"PRETTY_CACHE_LIMIT",
+	pc.cacheLimit,
+	128,
+);
 
 // --- Diff rendering limits (edit/write tools) ---
-export const MAX_RENDER_LINES = envInt("PRETTY_MAX_RENDER_LINES", 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/diff-render.ts

@@ -8,6 +8,7 @@
 // technique below works unchanged — diff backgrounds layer underneath and
 // persist through fg switches.
 
+import { pixConfig } from "@xynogen/pix-data/pix-config";
 import * as Diff from "diff";
 import { BG_BASE, BOLD, FG_DIM, FG_LNUM, FG_RULE, RST } from "./ansi.js";
 import { MAX_HL_CHARS, MAX_RENDER_LINES, WORD_DIFF_MIN_SIM } from "./config.js";
@@ -44,21 +45,58 @@ function envBg(name: string, fallback: string): string {
 }
 
 // ---------------------------------------------------------------------------
-// Diff-specific ANSI (override via env, hex "#RRGGBB")
+// Diff-specific ANSI (override via env → pix.json → hardcoded)
 // ---------------------------------------------------------------------------
 
 const DIM = "\x1b[2m";
 
+function hexToBg(hex: string): string {
+	if (!/^#[0-9a-fA-F]{6}$/.test(hex)) return "";
+	const r = Number.parseInt(hex.slice(1, 3), 16);
+	const g = Number.parseInt(hex.slice(3, 5), 16);
+	const b = Number.parseInt(hex.slice(5, 7), 16);
+	return `\x1b[48;2;${r};${g};${b}m`;
+}
+
+function hexToFg(hex: string): string {
+	if (!/^#[0-9a-fA-F]{6}$/.test(hex)) return "";
+	const r = Number.parseInt(hex.slice(1, 3), 16);
+	const g = Number.parseInt(hex.slice(3, 5), 16);
+	const b = Number.parseInt(hex.slice(5, 7), 16);
+	return `\x1b[38;2;${r};${g};${b}m`;
+}
+
+const dc = pixConfig().pretty.diff;
+
 // Subtle diff backgrounds — muted tones to let syntax fg shine through.
-const BG_ADD = envBg("DIFF_BG_ADD", "\x1b[48;2;22;38;32m"); // muted teal-green
-const BG_DEL = envBg("DIFF_BG_DEL", "\x1b[48;2;45;25;25m"); // muted brown-red
-const BG_ADD_W = envBg("DIFF_BG_ADD_HL", "\x1b[48;2;35;75;50m"); // word emphasis
-const BG_DEL_W = envBg("DIFF_BG_DEL_HL", "\x1b[48;2;80;35;35m");
-const BG_GUTTER_ADD = envBg("DIFF_BG_GUTTER_ADD", "\x1b[48;2;18;32;26m");
-const BG_GUTTER_DEL = envBg("DIFF_BG_GUTTER_DEL", "\x1b[48;2;38;22;22m");
-
-const FG_ADD = envFg("DIFF_FG_ADD", "\x1b[38;2;100;180;120m"); // desaturated green
-const FG_DEL = envFg("DIFF_FG_DEL", "\x1b[38;2;200;100;100m"); // desaturated red
+// 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 FG_STRIPE = "\x1b[38;2;40;40;40m"; // diagonal stripes on filler cells
 
 const BORDER_BAR = "▌";
@@ -76,8 +114,11 @@ const MAX_TERM_WIDTH = 210;
 
 const MAX_PREVIEW_LINES = envInt("PRETTY_MAX_PREVIEW_LINES", 80);
 
-const SPLIT_MIN_WIDTH = envInt("DIFF_SPLIT_MIN_WIDTH", 150);
-const SPLIT_MIN_CODE_WIDTH = envInt("DIFF_SPLIT_MIN_CODE_WIDTH", 60);
+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_MAX_WRAP_RATIO = 0.2;
 const SPLIT_MAX_WRAP_LINES = 8;
 
@@ -464,9 +505,12 @@ function injectBg(
 				continue;
 			}
 		}
-		while (ri < ranges.length && vis >= ranges[ri][1]) ri++;
+		while (ri < ranges.length && vis >= (ranges[ri] as [number, number])[1])
+			ri++;
 		const want =
-			ri < ranges.length && vis >= ranges[ri][0] && vis < ranges[ri][1];
+			ri < ranges.length &&
+			vis >= (ranges[ri] as [number, number])[0] &&
+			vis < (ranges[ri] as [number, number])[1];
 		if (want !== inHL) {
 			inHL = want;
 			out += inHL ? hlBg : baseBg;
@@ -497,6 +541,12 @@ function plainWordDiff(
 	return { old: o, new: n };
 }
 
+/** Type-safe index into an array that noUncheckedIndexedAccess marks as T|undefined.
+ *  Only call when the index is provably in-bounds (loop condition, length check, etc.). */
+function at<T>(arr: T[], i: number): T {
+	return arr[i] as T;
+}
+
 // ---------------------------------------------------------------------------
 // Split-vs-unified decision
 // ---------------------------------------------------------------------------
@@ -605,7 +655,7 @@ export async function renderUnified(
 	}
 
 	while (idx < vis.length) {
-		const l = vis[idx];
+		const l = at(vis, idx);
 
 		if (l.type === "sep") {
 			const gap = l.newNum;
@@ -638,29 +688,35 @@ export async function renderUnified(
 		}
 
 		const dels: Array<{ l: DiffLine; hl: string }> = [];
-		while (idx < vis.length && vis[idx].type === "del") {
-			dels.push({ l: vis[idx], hl: oldHL[oI] ?? vis[idx].content });
+		while (idx < vis.length) {
+			const entry = at(vis, idx);
+			if (entry.type !== "del") break;
+			dels.push({ l: entry, hl: oldHL[oI] ?? entry.content });
 			oI++;
 			idx++;
 		}
 		const adds: Array<{ l: DiffLine; hl: string }> = [];
-		while (idx < vis.length && vis[idx].type === "add") {
-			adds.push({ l: vis[idx], hl: newHL[nI] ?? vis[idx].content });
+		while (idx < vis.length) {
+			const entry = at(vis, idx);
+			if (entry.type !== "add") break;
+			adds.push({ l: entry, hl: newHL[nI] ?? entry.content });
 			nI++;
 			idx++;
 		}
 
 		const isPaired = dels.length === 1 && adds.length === 1;
 		const wd = isPaired
-			? wordDiffAnalysis(dels[0].l.content, adds[0].l.content)
+			? 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) {
-			const delBody = injectBg(dels[0].hl, wd.oldRanges, BG_DEL, BG_DEL_W);
-			const addBody = injectBg(adds[0].hl, wd.newRanges, BG_ADD, BG_ADD_W);
+			const del0 = at(dels, 0);
+			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(
-				dels[0].l.oldNum,
+				del0.l.oldNum,
 				"-",
 				BG_GUTTER_DEL,
 				`${dc.fgDel}${BOLD}`,
@@ -668,7 +724,7 @@ export async function renderUnified(
 				BG_DEL,
 			);
 			emitRow(
-				adds[0].l.newNum,
+				add0.l.newNum,
 				"+",
 				BG_GUTTER_ADD,
 				`${dc.fgAdd}${BOLD}`,
@@ -683,9 +739,11 @@ export async function renderUnified(
 			wd.similarity >= WORD_DIFF_MIN_SIM &&
 			!canHL
 		) {
-			const pwd = plainWordDiff(dels[0].l.content, adds[0].l.content);
+			const del0 = at(dels, 0);
+			const add0 = at(adds, 0);
+			const pwd = plainWordDiff(del0.l.content, add0.l.content);
 			emitRow(
-				dels[0].l.oldNum,
+				del0.l.oldNum,
 				"-",
 				BG_GUTTER_DEL,
 				`${dc.fgDel}${BOLD}`,
@@ -693,7 +751,7 @@ export async function renderUnified(
 				BG_DEL,
 			);
 			emitRow(
-				adds[0].l.newNum,
+				add0.l.newNum,
 				"+",
 				BG_GUTTER_ADD,
 				`${dc.fgAdd}${BOLD}`,
@@ -755,7 +813,7 @@ export async function renderSplit(
 	const rows: Row[] = [];
 	let i = 0;
 	while (i < diff.lines.length) {
-		const l = diff.lines[i];
+		const l = at(diff.lines, i);
 		if (l.type === "sep" || l.type === "ctx") {
 			rows.push({ left: l, right: l });
 			i++;
@@ -763,12 +821,16 @@ export async function renderSplit(
 		}
 		const dels: DiffLine[] = [];
 		const adds: DiffLine[] = [];
-		while (i < diff.lines.length && diff.lines[i].type === "del") {
-			dels.push(diff.lines[i]);
+		while (i < diff.lines.length) {
+			const entry = at(diff.lines, i);
+			if (entry.type !== "del") break;
+			dels.push(entry);
 			i++;
 		}
-		while (i < diff.lines.length && diff.lines[i].type === "add") {
-			adds.push(diff.lines[i]);
+		while (i < diff.lines.length) {
+			const entry = at(diff.lines, i);
+			if (entry.type !== "add") break;
+			adds.push(entry);
 			i++;
 		}
 		const n = Math.max(dels.length, adds.length);

package/src/diff.ts

@@ -4,6 +4,12 @@
 
 import * as Diff from "diff";
 
+/** Type-safe index into an array that noUncheckedIndexedAccess marks as T|undefined.
+ *  Only call when the index is provably in-bounds (loop condition, length check, etc.). */
+function at<T>(arr: T[], i: number): T {
+	return arr[i] as T;
+}
+
 export interface DiffLine {
 	type: "add" | "del" | "ctx" | "sep";
 	oldNum: number | null;
@@ -35,8 +41,9 @@ export function parseDiff(
 
 	for (let hi = 0; hi < patch.hunks.length; hi++) {
 		if (hi > 0) {
-			const prev = patch.hunks[hi - 1];
-			const gap = patch.hunks[hi].oldStart - (prev.oldStart + prev.oldLines);
+			const prev = at(patch.hunks, hi - 1);
+			const gap =
+				at(patch.hunks, hi).oldStart - (prev.oldStart + prev.oldLines);
 			lines.push({
 				type: "sep",
 				oldNum: null,
@@ -44,7 +51,7 @@ export function parseDiff(
 				content: "",
 			});
 		}
-		const h = patch.hunks[hi];
+		const h = at(patch.hunks, hi);
 		const shift = baseLine > 0 ? baseLine - 1 : 0;
 		let oL = h.oldStart + shift;
 		let nL = h.newStart + shift;

package/src/icon-catalog.ts

@@ -74,6 +74,9 @@ const CATALOG = {
 	"opt.toon": { nerd: "\u{F05C0}", unicode: `\u2662${VS}`, ascii: "Tn" },
 	"opt.ponytail": { nerd: "\u{F0190}", unicode: `\u2667${VS}`, ascii: "Pt" },
 	"opt.title": { nerd: "\u{F0DAB}", unicode: `\u25C8${VS}`, ascii: "*" },
+
+	// ── subagent widget (pix-subagent) ────────────────────────────────────
+	agent: { nerd: "\u{F0BA0}", unicode: `\u2699${VS}`, ascii: "@" },
 } as const;
 
 /** Every valid semantic icon key. */

package/src/icon-persist.ts

@@ -14,8 +14,13 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
+import { pixConfig } from "@xynogen/pix-data/pix-config";
 import { ICON_MODES, type IconMode, setIconMode } from "./icon-catalog.js";
 
+function isIconMode(m: string): m is IconMode {
+	return (ICON_MODES as readonly string[]).includes(m);
+}
+
 function statePath(): string {
 	return join(getAgentDir(), "pretty.json");
 }
@@ -27,9 +32,8 @@ export function loadIconMode(): IconMode | undefined {
 		if (!existsSync(p)) return undefined;
 		const raw = JSON.parse(readFileSync(p, "utf-8")) as { icons?: string };
 		const mode = raw?.icons;
-		return ICON_MODES.includes(mode as IconMode)
-			? (mode as IconMode)
-			: undefined;
+		if (mode == null) return undefined;
+		return isIconMode(mode) ? mode : undefined;
 	} catch {
 		return undefined;
 	}
@@ -60,8 +64,16 @@ export function saveIconMode(mode: IconMode): void {
 /**
  * Apply the persisted mode (if any) to the catalog. Called once at extension
  * load so the env-seeded default is overridden by the user's saved choice.
+ *
+ * Precedence: env PRETTY_ICONS → pretty.json → pix.json pretty.icons → default ("nerd")
  */
 export function initIconMode(): void {
 	const saved = loadIconMode();
-	if (saved) setIconMode(saved);
+	if (saved) {
+		setIconMode(saved);
+		return;
+	}
+	// No persisted choice — try pix.json
+	const pixIcons = pixConfig().pretty.icons;
+	if (pixIcons && isIconMode(pixIcons)) setIconMode(pixIcons);
 }

package/src/progress.ts

@@ -89,7 +89,7 @@ export function openProgress(
 						width: mw,
 						lines: [
 							theme.fg(accent, theme.bold(title)),
-							`${theme.fg(accent, SPINNER[frame])} ${theme.fg("muted", labelValue)}`,
+							`${theme.fg(accent, SPINNER[frame] ?? "")} ${theme.fg("muted", labelValue)}`,
 						],
 						color: (s) => theme.fg(accent, s),
 						bg: (s) => theme.bg("customMessageBg", s),

package/src/renderers.ts

@@ -92,7 +92,7 @@ export function renderTree(text: string, _basePath: string): string {
 	const show = lines.slice(0, MAX_PREVIEW_LINES);
 
 	for (let i = 0; i < show.length; i++) {
-		const entry = show[i].trim();
+		const entry = (show[i] ?? "").trim();
 		const isLast = i === show.length - 1 && total <= MAX_PREVIEW_LINES;
 		const prefix = isLast ? "└── " : "├── ";
 		const connector = `${FG_RULE}${prefix}${RST}`;