pi-zentui 0.1.9 → 0.1.10

package/README.md

@@ -121,13 +121,15 @@ pi install git:github.com/lmilojevicc/pi-zentui
 
 ## Config
 
-On first run, Zentui creates a config file at:
+Zentui uses built-in defaults when no config file exists. User settings live at:
 
 ```
 ~/.pi/agent/zentui.json
 ```
 
-### Default config
+Zentui treats this file as user-owned and compatibility-sensitive: invalid known values fall back to runtime defaults, unknown keys are ignored at runtime, and `/zentui` patches only the settings it changes instead of rewriting the whole file.
+
+### Runtime defaults
 
 ```json
 {

package/extensions/zentui/config.ts

@@ -1,6 +1,7 @@
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
+import { isSupportedColorSpec } from "./style";
 
 export type ColorSpec = string;
 export type ColorSource = "theme" | "terminal";
@@ -84,6 +85,22 @@ export const defaultConfig: PolishedTuiConfig = {
 	},
 };
 
+const iconKeys = [
+	"cwd",
+	"git",
+	"ahead",
+	"behind",
+	"diverged",
+	"conflicted",
+	"untracked",
+	"stashed",
+	"modified",
+	"staged",
+	"renamed",
+	"deleted",
+	"typechanged",
+] as const satisfies readonly (keyof PolishedTuiConfig["icons"])[];
+
 type ConfigRecord = Record<string, unknown>;
 
 function isRecord(value: unknown): value is ConfigRecord {
@@ -107,6 +124,11 @@ function stringValue(record: Record<string, unknown>, key: string): string | und
 	return typeof value === "string" ? value : undefined;
 }
 
+function colorValue(record: Record<string, unknown>, key: string): string | undefined {
+	const value = stringValue(record, key);
+	return value !== undefined && isSupportedColorSpec(value) ? value : undefined;
+}
+
 function colorSourceValue(
 	record: Record<string, unknown>,
 	key: keyof ColorSourcesConfig,
@@ -125,18 +147,27 @@ function definedColors(
 	) as Partial<PolishedTuiConfig["colors"]>;
 }
 
+function normalizeIcons(record: Record<string, unknown>): Partial<PolishedTuiConfig["icons"]> {
+	return Object.fromEntries(
+		iconKeys.flatMap((key) => {
+			const value = stringValue(record, key);
+			return value === undefined ? [] : [[key, value]];
+		}),
+	) as Partial<PolishedTuiConfig["icons"]>;
+}
+
 function normalizeColors(record: Record<string, unknown>): Partial<PolishedTuiConfig["colors"]> {
 	return definedColors({
-		cwd: stringValue(record, "cwd") ?? stringValue(record, "cwdText"),
-		gitBranch: stringValue(record, "gitBranch") ?? stringValue(record, "git"),
-		gitStatus: stringValue(record, "gitStatus"),
-		contextNormal: stringValue(record, "contextNormal"),
-		contextWarning: stringValue(record, "contextWarning"),
-		contextError: stringValue(record, "contextError"),
-		tokens: stringValue(record, "tokens"),
-		cost: stringValue(record, "cost"),
-		separator: stringValue(record, "separator"),
-		runtimePrefix: stringValue(record, "runtimePrefix"),
+		cwd: colorValue(record, "cwd") ?? colorValue(record, "cwdText"),
+		gitBranch: colorValue(record, "gitBranch") ?? colorValue(record, "git"),
+		gitStatus: colorValue(record, "gitStatus"),
+		contextNormal: colorValue(record, "contextNormal"),
+		contextWarning: colorValue(record, "contextWarning"),
+		contextError: colorValue(record, "contextError"),
+		tokens: colorValue(record, "tokens"),
+		cost: colorValue(record, "cost"),
+		separator: colorValue(record, "separator"),
+		runtimePrefix: colorValue(record, "runtimePrefix"),
 	});
 }
 
@@ -172,18 +203,17 @@ function readConfigRecord(path = configPath): ConfigRecord {
 }
 
 export function ensureConfigExists(): void {
-	try {
-		if (!existsSync(configPath)) {
-			writeFileSync(configPath, `${JSON.stringify(defaultConfig, null, 2)}\n`, "utf8");
-		}
-	} catch {
-		// Ignore config bootstrap failures; extension will fall back to defaults.
-	}
+	// Intentionally left as a no-op. Zentui config is user-owned and
+	// compatibility-sensitive: runtime defaults come from `mergeConfig({})`, and
+	// the extension should not persist opinionated defaults unless the user
+	// explicitly changes a setting.
 }
 
 export function mergeConfig(parsed: unknown): PolishedTuiConfig {
 	const config = isRecord(parsed) ? parsed : {};
-	const icons = isRecord(config.icons) ? (config.icons as Partial<PolishedTuiConfig["icons"]>) : {};
+	const icons = isRecord(config.icons)
+		? normalizeIcons(config.icons as Record<string, unknown>)
+		: {};
 	const colors = isRecord(config.colors)
 		? normalizeColors(config.colors as Record<string, unknown>)
 		: {};
@@ -200,16 +230,16 @@ export function mergeConfig(parsed: unknown): PolishedTuiConfig {
 			...defaultConfig.colors,
 			...colors,
 		},
-		colorSources,
+		colorSources: { ...colorSources },
 	};
 }
 
 export function loadConfig(): PolishedTuiConfig {
 	try {
-		if (!existsSync(configPath)) return defaultConfig;
+		if (!existsSync(configPath)) return mergeConfig({});
 		return mergeConfig(JSON.parse(readFileSync(configPath, "utf8")));
 	} catch {
-		return defaultConfig;
+		return mergeConfig({});
 	}
 }
 
@@ -219,10 +249,9 @@ export function saveColorSourcesPatch(
 ): PolishedTuiConfig {
 	const record = readConfigRecord(path);
 	const existing = isRecord(record.colorSources)
-		? validColorSourceEntries(record.colorSources as Record<string, unknown>)
+		? { ...(record.colorSources as Record<string, unknown>) }
 		: {};
 	record.colorSources = {
-		...defaultConfig.colorSources,
 		...existing,
 		...validColorSourceEntries(patch),
 	};

package/extensions/zentui/footer.ts

@@ -53,7 +53,7 @@ export function installFooter(
 					renderStyleForSource(theme, colorSource, config.colors.gitBranch, text);
 				const gitStatusColor = (text: string) =>
 					renderStyleForSource(theme, colorSource, config.colors.gitStatus, text);
-				const gitIcon = gitColor(config.icons.git);
+				const gitIcon = config.icons.git ? gitColor(config.icons.git) : "";
 				const allStatus = [
 					state.conflicted > 0 ? config.icons.conflicted : "",
 					state.stashed ? config.icons.stashed : "",
@@ -75,7 +75,9 @@ export function installFooter(
 				const statusBlock =
 					allStatus || aheadBehind ? gitStatusColor(`[${allStatus}${aheadBehind}]`) : "";
 				const branchLabel = branch
-					? `on ${gitIcon} ${gitColor(branch)}${statusBlock ? ` ${statusBlock}` : ""}`
+					? [...["on", gitIcon, gitColor(branch)].filter(Boolean), statusBlock]
+							.filter(Boolean)
+							.join(" ")
 					: "";
 				const runtimeLabel = formatRuntimeSegment(
 					theme,

package/extensions/zentui/index.ts

@@ -19,7 +19,7 @@ import { readRuntimeInfo } from "./runtime";
 import { installSelectorBorderStyle } from "./selector-border";
 import { registerZentuiSettingsCommand } from "./settings-command";
 import { type FooterState, createInitialState, syncState } from "./state";
-import { renderAccentLine } from "./style";
+import { renderAccentLine, safeThemeFg } from "./style";
 import { PolishedEditor } from "./ui";
 import { installUserMessageStyle } from "./user-message";
 
@@ -88,8 +88,8 @@ export default function (pi: ExtensionAPI) {
 								getCurrentConfig().colorSources.editor,
 								state.modelLabel,
 							),
-							ctx.ui.theme.fg("text", state.providerLabel),
-						].join(ctx.ui.theme.fg("borderMuted", "  ")),
+							safeThemeFg(ctx.ui.theme, "text", state.providerLabel),
+						].join(safeThemeFg(ctx.ui.theme, "borderMuted", "  ")),
 					getThinkingLevel,
 				),
 		);

package/extensions/zentui/settings-command.ts

@@ -7,7 +7,7 @@ import {
 	truncateToWidth,
 } from "@earendil-works/pi-tui";
 import type { ColorSource, ColorSourcesConfig, PolishedTuiConfig } from "./config";
-import { EDITOR_BORDER_STYLE, renderChromeBorder } from "./style";
+import { EDITOR_BORDER_STYLE, renderChromeBorder, safeThemeFg } from "./style";
 
 const colorSourceValues: ColorSource[] = ["theme", "terminal"];
 
@@ -97,8 +97,8 @@ export function registerZentuiSettingsCommand(pi: ExtensionAPI, deps: SettingsCo
 							EDITOR_BORDER_STYLE,
 							"─".repeat(Math.max(0, width)),
 						);
-						const header = theme.fg("accent", theme.bold("Zentui settings"));
-						const hint = theme.fg("dim", "Enter/Space cycles values · Esc closes");
+						const header = safeThemeFg(theme, "accent", theme.bold("Zentui settings"));
+						const hint = safeThemeFg(theme, "muted", "Enter/Space cycles values · Esc closes");
 						return [
 							truncateToWidth(border, width, ""),
 							truncateToWidth(header, width, ""),

package/extensions/zentui/style.ts

@@ -1,3 +1,4 @@
+import type { ThemeColor } from "@earendil-works/pi-coding-agent";
 import type { ColorSource, ColorSpec } from "./config";
 
 type ThemeLike = {
@@ -72,6 +73,54 @@ const themeColorNameMap = new Map([
 
 const themeStyleModifiers = new Set(["bold", "italic", "underline"]);
 
+const themeColorTokens = new Set<ThemeColor>([
+	"accent",
+	"border",
+	"borderAccent",
+	"borderMuted",
+	"success",
+	"error",
+	"warning",
+	"muted",
+	"dim",
+	"text",
+	"thinkingText",
+	"userMessageText",
+	"customMessageText",
+	"customMessageLabel",
+	"toolTitle",
+	"toolOutput",
+	"mdHeading",
+	"mdLink",
+	"mdLinkUrl",
+	"mdCode",
+	"mdCodeBlock",
+	"mdCodeBlockBorder",
+	"mdQuote",
+	"mdQuoteBorder",
+	"mdHr",
+	"mdListBullet",
+	"toolDiffAdded",
+	"toolDiffRemoved",
+	"toolDiffContext",
+	"syntaxComment",
+	"syntaxKeyword",
+	"syntaxFunction",
+	"syntaxVariable",
+	"syntaxString",
+	"syntaxNumber",
+	"syntaxType",
+	"syntaxOperator",
+	"syntaxPunctuation",
+	"thinkingOff",
+	"thinkingMinimal",
+	"thinkingLow",
+	"thinkingMedium",
+	"thinkingHigh",
+	"thinkingXhigh",
+	"bashMode",
+]);
+
 function terminalColorToAnsi(color: string, isBackground = false): string | undefined {
 	const normalized = color.toLowerCase();
 	const colorCode = terminalColorCodes.get(normalized);
@@ -92,6 +141,26 @@ function isExplicitTerminalColorToken(token: string): boolean {
 	return /^(?:[0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$/.test(normalized);
 }
 
+function isSupportedStyleToken(token: string): boolean {
+	const normalized = token.toLowerCase();
+	if (terminalStyleModifiers.has(normalized)) return true;
+	if (terminalColorToAnsi(normalized) !== undefined) return true;
+
+	const isForeground = normalized.startsWith("fg:");
+	const isBackground = normalized.startsWith("bg:");
+	if (isForeground || isBackground) {
+		return terminalColorToAnsi(normalized.slice(3), isBackground) !== undefined;
+	}
+
+	return themeColorTokens.has(token as ThemeColor);
+}
+
+export function isSupportedColorSpec(style: ColorSpec): boolean {
+	const trimmed = style.trim();
+	if (trimmed === "") return true;
+	return trimmed.split(/\s+/).every(isSupportedStyleToken);
+}
+
 function applyThemeModifiers(theme: ThemeLike, styleTokens: string[], text: string): string {
 	let rendered = text;
 	for (const token of styleTokens) {
@@ -103,7 +172,7 @@ function applyThemeModifiers(theme: ThemeLike, styleTokens: string[], text: stri
 	return rendered;
 }
 
-function themeFg(theme: ThemeLike, color: string, text: string): string {
+export function safeThemeFg(theme: ThemeLike, color: string, text: string): string {
 	try {
 		return theme.fg(color, text);
 	} catch {
@@ -137,7 +206,7 @@ export function colorize(theme: ThemeLike, color: ColorSpec, text: string): stri
 	if (isHexColor(color)) {
 		return `${hexToAnsi(color)}${text}\x1b[39m`;
 	}
-	return themeFg(theme, color, text);
+	return safeThemeFg(theme, color, text);
 }
 
 /**
@@ -184,7 +253,7 @@ export function renderThemeStyle(theme: ThemeLike, style: ColorSpec, text: strin
 	if (tokens.some(isExplicitTerminalColorToken)) return renderTerminalStyle(style, text);
 
 	const color = mapThemeColor(tokens) ?? "text";
-	return themeFg(theme, color, applyThemeModifiers(theme, tokens, text));
+	return safeThemeFg(theme, color, applyThemeModifiers(theme, tokens, text));
 }
 
 export function renderStyleForSource(
@@ -207,7 +276,7 @@ export function renderEditorBorder(text: string): string {
 }
 
 export function renderAccentLine(theme: ThemeLike, source: ColorSource, text: string): string {
-	return source === "terminal" ? renderEditorAccent(text) : themeFg(theme, "accent", text);
+	return source === "terminal" ? renderEditorAccent(text) : safeThemeFg(theme, "accent", text);
 }
 
 export function renderChromeBorder(
@@ -217,5 +286,5 @@ export function renderChromeBorder(
 	text: string,
 ): string {
 	if (source === "terminal") return renderTerminalStyle(terminalFallbackStyle, text);
-	return themeFg(theme, "borderMuted", text);
+	return safeThemeFg(theme, "borderMuted", text);
 }

package/extensions/zentui/ui.ts

@@ -7,7 +7,7 @@ import {
 	visibleWidth,
 } from "@earendil-works/pi-tui";
 import type { PolishedTuiConfig } from "./config";
-import { EDITOR_BORDER_STYLE, renderAccentLine, renderChromeBorder } from "./style";
+import { EDITOR_BORDER_STYLE, renderAccentLine, renderChromeBorder, safeThemeFg } from "./style";
 
 type AutocompleteEditorInternals = {
 	autocompleteList?: Pick<Component, "render">;
@@ -36,7 +36,7 @@ export class PolishedEditor extends CustomEditor {
 		getThinkingLevel: () => string | undefined,
 	) {
 		super(tui, theme, keybindings, { paddingX: 0 });
-		this.borderColor = (text: string) => uiTheme.fg("border", text);
+		this.borderColor = (text: string) => safeThemeFg(uiTheme, "border", text);
 		this.uiTheme = uiTheme;
 		this.getConfig = getConfig;
 		this.getModelMeta = getModelMeta;
@@ -88,9 +88,9 @@ export class PolishedEditor extends CustomEditor {
 		const metaParts = [this.getModelMeta()];
 		const thinkingLevel = this.getThinkingLevel();
 		if (thinkingLevel && thinkingLevel !== "off") {
-			metaParts.push(this.uiTheme.fg("muted", thinkingLevel));
+			metaParts.push(safeThemeFg(this.uiTheme, "muted", thinkingLevel));
 		}
-		const meta = metaParts.filter(Boolean).join(this.uiTheme.fg("border", "  "));
+		const meta = metaParts.filter(Boolean).join(safeThemeFg(this.uiTheme, "border", "  "));
 
 		const colorSource = this.getConfig().colorSources.editor;
 		const rail = `${renderAccentLine(this.uiTheme, colorSource, "│")}${this.reset} `;

package/extensions/zentui/user-message.ts

@@ -52,7 +52,12 @@ function findMarkdownText(value: unknown): string | undefined {
 }
 
 function themeFg(theme: Theme | undefined, color: ThemeColor, text: string): string {
-	return theme ? theme.fg(color, text) : text;
+	if (!theme) return text;
+	try {
+		return theme.fg(color, text);
+	} catch {
+		return text;
+	}
 }
 
 function makeMarkdownTheme(theme: Theme | undefined): MarkdownTheme {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-zentui",
-	"version": "0.1.9",
+	"version": "0.1.10",
 	"description": "A Starship-inspired statusline and Opencode-style TUI for Pi.",
 	"type": "module",
 	"license": "MIT",