@xynogen/pix-pretty 1.7.12 → 1.7.14

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.12",
+	"version": "1.7.14",
 	"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": "^0.3.0",
 		"cli-highlight": "^2.1.11",
 		"@ff-labs/fff-node": "^0.5.2",
 		"diff": "^7.0.0"

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;
 

package/src/icon-persist.ts

@@ -14,6 +14,7 @@
 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 {
@@ -63,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);
 }