@xynogen/pix-pretty 1.7.24 → 1.7.26

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xynogen/pix-pretty",
-	"version": "1.7.24",
+	"version": "1.7.26",
 	"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,9 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"@xynogen/pix-data": "^0.3.4",
+		"@xynogen/pix-data": "^0.4.0",
+		"@xynogen/pix-runtime": "^0.3.0",
+		"chalk": "^4.1.2",
 		"cli-highlight": "^2.1.11",
 		"@ff-labs/fff-node": "^0.5.2",
 		"diff": "^8.0.3"

package/src/config.ts

@@ -1,4 +1,5 @@
-import { pixConfig } from "@xynogen/pix-data/pix-config";
+import { config } from "@xynogen/pix-runtime/config";
+import { prettySection } from "@xynogen/pix-runtime/sections";
 
 export function envInt(name: string, fallback: number): number {
 	const v = Number.parseInt(process.env[name] ?? "", 10);
@@ -15,7 +16,7 @@ function pixOrEnvInt(envName: string, pixValue: number, fallback: number): numbe
 	return pixValue !== fallback ? pixValue : fallback;
 }
 
-const pc = pixConfig().pretty;
+const pc = config(prettySection);
 
 export const MAX_HL_CHARS = pixOrEnvInt("PRETTY_MAX_HL_CHARS", pc.maxHighlightChars, 80_000);
 

package/src/diff-render.ts

@@ -6,7 +6,8 @@
 // Engine note: pi-diff used Shiki's codeToANSI. pretty uses cli-highlight,
 // shared with other pix-pretty renderers, and paints foreground tokens only.
 
-import { pixConfig } from "@xynogen/pix-data/pix-config";
+import { config } from "@xynogen/pix-runtime/config";
+import { prettySection } from "@xynogen/pix-runtime/sections";
 import * as Diff from "diff";
 import { BG_BASE, BOLD, FG_DIM, FG_GREEN, FG_LNUM, FG_RED, FG_RULE, RST } from "./ansi.js";
 import { MAX_HL_CHARS, MAX_RENDER_LINES, WORD_DIFF_MIN_SIM } from "./config.js";
@@ -30,7 +31,7 @@ function envInt(name: string, fallback: number): number {
 // ---------------------------------------------------------------------------
 
 const DIM = "\x1b[2m";
-const dc = pixConfig().pretty.diff;
+const dc = config(prettySection).diff;
 
 // Diff add/remove share the canonical green/red from ansi.ts (single source).
 const FG_ADD = FG_GREEN;

package/src/icon-persist.test.ts

@@ -2,26 +2,30 @@ import { afterAll, afterEach, beforeAll, describe, expect, it } from "bun:test";
 import { mkdtempSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-import { reloadPixConfig } from "@xynogen/pix-data/pix-config";
+import { reloadConfig } from "@xynogen/pix-runtime/config";
 import { getIconMode, setIconMode } from "./icon-catalog.ts";
 import { initIconMode, loadIconMode, saveIconMode } from "./icon-persist.ts";
 
 let tmpAgentDir: string;
 let origHome: string | undefined;
 
-beforeAll(() => {
+beforeAll(async () => {
 	tmpAgentDir = mkdtempSync(join(tmpdir(), "pretty-persist-test-"));
 	origHome = process.env.HOME;
-	// Point HOME at the temp dir so pixConfig() reads from there, not the real ~/.pi/agent/pix.json
+	// Point HOME at the temp dir so the runtime reads from there, not the real ~/.pi/agent/pix.json
 	process.env.HOME = tmpAgentDir;
 	process.env.PI_CODING_AGENT_DIR = tmpAgentDir;
-	// Force pix-config to re-read from the temp HOME (clears cached real config).
-	reloadPixConfig();
+	// Drop any singleton created by earlier test files (it is bound to the old
+	// agent dir); the next accessor call lazily recreates it under the temp HOME.
+	delete (globalThis as Record<symbol, unknown>)[Symbol.for("@xynogen/pix-runtime")];
+	await reloadConfig();
 });
 
 afterAll(() => {
 	process.env.HOME = origHome;
 	delete process.env.PI_CODING_AGENT_DIR;
+	// Drop the temp-HOME-bound singleton so later test files get a fresh one.
+	delete (globalThis as Record<symbol, unknown>)[Symbol.for("@xynogen/pix-runtime")];
 	try {
 		rmSync(tmpAgentDir, { recursive: true });
 	} catch {
@@ -36,18 +40,18 @@ describe("icon-persist", () => {
 		expect(loadIconMode()).toBe("nerd");
 	});
 
-	it("round-trips a mode across save/load (new-session sim)", () => {
-		saveIconMode("unicode");
+	it("round-trips a mode across save/load (new-session sim)", async () => {
+		await saveIconMode("unicode");
 		expect(loadIconMode()).toBe("unicode");
 	});
 
-	it("rejects an invalid persisted mode", () => {
-		saveIconMode("ascii");
+	it("rejects an invalid persisted mode", async () => {
+		await saveIconMode("ascii");
 		expect(loadIconMode()).toBe("ascii");
 	});
 
-	it("initIconMode applies the persisted choice to the catalog", () => {
-		saveIconMode("ascii");
+	it("initIconMode applies the persisted choice to the catalog", async () => {
+		await saveIconMode("ascii");
 		setIconMode("nerd"); // pretend env default
 		initIconMode();
 		expect(getIconMode()).toBe("ascii");

package/src/icon-persist.ts

@@ -9,7 +9,8 @@
  * Precedence: env PRETTY_ICONS → pix.json pretty.icons → default ("nerd")
  */
 
-import { onPixConfigChange, pixConfig, savePixConfig } from "@xynogen/pix-data/pix-config";
+import { config, onConfigChange, updateConfig } from "@xynogen/pix-runtime/config";
+import { prettySection } from "@xynogen/pix-runtime/sections";
 import { ICON_MODES, type IconMode, setIconMode } from "./icon-catalog.js";
 
 function isIconMode(m: string): m is IconMode {
@@ -19,7 +20,7 @@ function isIconMode(m: string): m is IconMode {
 /** Read the persisted icon mode from pix.json, or undefined if unset/invalid. */
 export function loadIconMode(): IconMode | undefined {
 	try {
-		const mode = pixConfig().pretty.icons;
+		const mode = config(prettySection).icons;
 		if (mode == null) return undefined;
 		return isIconMode(mode) ? mode : undefined;
 	} catch {
@@ -28,12 +29,13 @@ export function loadIconMode(): IconMode | undefined {
 }
 
 /** Persist the icon mode to pix.json (`pretty.icons`). */
-export function saveIconMode(mode: IconMode): void {
-	try {
-		savePixConfig({ pretty: { icons: mode } });
-	} catch (err) {
-		console.warn("pix-pretty: persist icon mode failed:", err);
-	}
+export function saveIconMode(mode: IconMode): Promise<void> {
+	return updateConfig(prettySection, { icons: mode }).then(
+		() => undefined,
+		(err) => {
+			console.error("pix-pretty: persist icon mode failed:", err);
+		},
+	);
 }
 
 /**
@@ -43,12 +45,15 @@ export function saveIconMode(mode: IconMode): void {
  * Precedence: env PRETTY_ICONS → pix.json pretty.icons → default ("nerd")
  */
 export function initIconMode(): void {
-	const pixIcons = pixConfig().pretty.icons;
+	const pixIcons = config(prettySection).icons;
 	if (pixIcons && isIconMode(pixIcons)) setIconMode(pixIcons);
 
 	// Keep the in-memory icon mode in sync when /pix changes pretty.icons.
-	onPixConfigChange((cfg) => {
-		const mode = cfg.pretty.icons;
-		if (mode && isIconMode(mode)) setIconMode(mode);
-	});
+	onConfigChange(
+		(change) => {
+			const mode = change.current.get(prettySection).icons;
+			if (mode && isIconMode(mode)) setIconMode(mode);
+		},
+		{ paths: ["pretty.icons"] },
+	);
 }

package/src/renderers.ts

@@ -1,5 +1,6 @@
 import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
-import { getLsStyle } from "@xynogen/pix-data/pix-config";
+import { config } from "@xynogen/pix-runtime/config";
+import { prettySection } from "@xynogen/pix-runtime/sections";
 
 import { FG_DIM, FG_RULE, RST } from "./ansi.js";
 import { MAX_PREVIEW_LINES } from "./config.js";
@@ -75,7 +76,7 @@ export function renderBashOutput(
 
 /** Render ls output using the configured style (grid or tree). */
 export function renderTree(text: string, basePath: string, theme?: FgTheme): string {
-	return getLsStyle() === "tree"
+	return config(prettySection).lsStyle === "tree"
 		? renderLsTree(text, basePath, theme)
 		: renderLsGrid(text, basePath, theme);
 }