pi-zentui 0.10.0 → 0.11.0

package/README.md

@@ -275,7 +275,7 @@ Default config values — copy this and change any value you want:
 
 - Style values can be Starship/terminal strings (`bold purple`, `fg:202`, `#89b` / `#89b4fa`, `bg:blue fg:bright-green`) or Pi theme tokens (`accent`, `borderMuted`, `thinkingHigh`). Short `#rgb` hex values expand to `#rrggbb`.
 - `projectRefreshIntervalMs`: project status polling interval; `0` disables polling. Values `1..4999` clamp up to `5000` (minimum 5s); invalid/non-finite values fall back to `30000`.
-- `contextStyle`: `text` (default), `gauge`, or `text+gauge` for the context segment.
+- `contextStyle`: `text` (default), `gauge`, or `text+gauge` for the context segment. Context usage refreshes during assistant streaming; token and cost totals remain canonical and finalize at turn boundaries.
 - `separator`: controls the default footer layout and extension-status connectors: `pipe` (default, ` | `), `dot` (` · `), `chevron` (` › `), or `none` (one space). Cycle it from the `/zentui` **Layout** tab. This selects the separator glyph; `colors.separator` controls its color. Custom `footerFormat` literals and `$sep` keep their existing behavior.
 - `contextThresholds`: `{ warning, error }` percentages (default `70` / `90`) that select contextNormal / contextWarning / contextError colors.
 - `pathDisplay`: controls how the cwd/`$cwd` path is shown. `mode` is `basename` (default, last segment only) or `full` (path with home contracted to `~`). In `full` mode, `depth` keeps only the last N trailing directories (`0` = entire path after `~`, max `5`); when parents are dropped the path is prefixed with `…/` (Starship-style). The `/zentui` **Layout** tab cycles path mode and path depth (`0`–`5`; depth is ignored for basename). Example: `~/Projects/foo/bar` with `depth: 2` → `…/foo/bar`.

package/extensions/zentui/config.ts

@@ -1,5 +1,19 @@
-import { existsSync, readFileSync, writeFileSync } from "node:fs";
-import { join } from "node:path";
+import { randomUUID } from "node:crypto";
+import {
+	closeSync,
+	existsSync,
+	fchmodSync,
+	fsyncSync,
+	lstatSync,
+	openSync,
+	readFileSync,
+	realpathSync,
+	renameSync,
+	statSync,
+	unlinkSync,
+	writeFileSync,
+} from "node:fs";
+import { basename, dirname, join } from "node:path";
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
 import {
 	ICON_GLYPH_KEYS,
@@ -623,14 +637,83 @@ function validFooterSegmentEntries(record: Record<string, unknown>): Partial<Foo
 	) as Partial<FooterSegmentsConfig>;
 }
 
-function readConfigRecord(path = configPath): ConfigRecord {
+type ConfigFileState =
+	| { kind: "missing"; record: ConfigRecord; writePath: string }
+	| { kind: "valid"; record: ConfigRecord; writePath: string; mode: number }
+	| { kind: "corrupt"; error: unknown };
+
+function errorCode(error: unknown): string | undefined {
+	return typeof error === "object" && error !== null && "code" in error
+		? String(error.code)
+		: undefined;
+}
+
+function readConfigFileState(path: string): ConfigFileState {
+	let writePath = path;
 	try {
-		if (!existsSync(path)) return {};
-		const parsed = JSON.parse(readFileSync(path, "utf8"));
-		return isRecord(parsed) ? parsed : {};
-	} catch {
-		return {};
+		const pathStat = lstatSync(path);
+		if (pathStat.isSymbolicLink()) writePath = realpathSync(path);
+		const targetStat = statSync(writePath);
+		const parsed = JSON.parse(readFileSync(writePath, "utf8"));
+		return isRecord(parsed)
+			? { kind: "valid", record: parsed, writePath, mode: targetStat.mode & 0o7777 }
+			: { kind: "corrupt", error: new Error("top-level value must be a JSON object") };
+	} catch (error) {
+		if (errorCode(error) === "ENOENT") {
+			try {
+				lstatSync(path);
+			} catch (pathError) {
+				if (errorCode(pathError) === "ENOENT")
+					return { kind: "missing", record: {}, writePath: path };
+			}
+		}
+		return { kind: "corrupt", error };
+	}
+}
+
+function writeConfigAtomically(path: string, record: ConfigRecord, mode?: number): void {
+	const tempPath = join(dirname(path), `.${basename(path)}.${process.pid}.${randomUUID()}.tmp`);
+	let file: number | undefined;
+	try {
+		file = openSync(tempPath, "wx", mode ?? 0o666);
+		if (mode !== undefined) fchmodSync(file, mode);
+		writeFileSync(file, `${JSON.stringify(record, null, 2)}\n`, "utf8");
+		fsyncSync(file);
+		closeSync(file);
+		file = undefined;
+		renameSync(tempPath, path);
+	} catch (error) {
+		if (file !== undefined) {
+			try {
+				closeSync(file);
+			} catch {}
+		}
+		try {
+			unlinkSync(tempPath);
+		} catch (cleanupError) {
+			if (errorCode(cleanupError) !== "ENOENT") {
+				// Preserve the persistence failure; the best-effort cleanup error is secondary.
+			}
+		}
+		throw error;
+	}
+}
+
+function mutateConfig(path: string, mutate: (record: ConfigRecord) => void): PolishedTuiConfig {
+	const state = readConfigFileState(path);
+	if (state.kind === "corrupt") {
+		const detail = state.error instanceof Error ? ` (${state.error.message})` : "";
+		throw new Error(
+			`Refusing to save Zentui config because ${path} is corrupt or unreadable; fix or remove it first.${detail}`,
+		);
 	}
+	mutate(state.record);
+	writeConfigAtomically(
+		state.writePath,
+		state.record,
+		state.kind === "valid" ? state.mode : undefined,
+	);
+	return mergeConfig(state.record);
 }
 
 export function ensureConfigExists(): void {
@@ -724,129 +807,119 @@ export function saveColorSourcesPatch(
 	patch: Partial<ColorSourcesConfig>,
 	path = configPath,
 ): PolishedTuiConfig {
-	const record = readConfigRecord(path);
-	const existing = isRecord(record.colorSources)
-		? { ...(record.colorSources as Record<string, unknown>) }
-		: {};
-	record.colorSources = {
-		...existing,
-		...validColorSourceEntries(patch),
-	};
-	writeFileSync(path, `${JSON.stringify(record, null, 2)}\n`, "utf8");
-	return mergeConfig(record);
+	return mutateConfig(path, (record) => {
+		const existing = isRecord(record.colorSources)
+			? { ...(record.colorSources as Record<string, unknown>) }
+			: {};
+		record.colorSources = {
+			...existing,
+			...validColorSourceEntries(patch),
+		};
+	});
 }
 
 export function saveUiFeaturesPatch(
 	patch: Partial<UiFeaturesConfig>,
 	path = configPath,
 ): PolishedTuiConfig {
-	const record = readConfigRecord(path);
-	const existing = isRecord(record.features)
-		? { ...(record.features as Record<string, unknown>) }
-		: {};
-	record.features = {
-		...existing,
-		...validUiFeatureEntries(patch),
-	};
-	writeFileSync(path, `${JSON.stringify(record, null, 2)}\n`, "utf8");
-	return mergeConfig(record);
+	return mutateConfig(path, (record) => {
+		const existing = isRecord(record.features)
+			? { ...(record.features as Record<string, unknown>) }
+			: {};
+		record.features = {
+			...existing,
+			...validUiFeatureEntries(patch),
+		};
+	});
 }
 
 export function saveFooterSegmentsPatch(
 	patch: Partial<FooterSegmentsConfig>,
 	path = configPath,
 ): PolishedTuiConfig {
-	const record = readConfigRecord(path);
-	const existing = isRecord(record.footerSegments)
-		? { ...(record.footerSegments as Record<string, unknown>) }
-		: {};
-	record.footerSegments = {
-		...existing,
-		...validFooterSegmentEntries(patch),
-	};
-	writeFileSync(path, `${JSON.stringify(record, null, 2)}\n`, "utf8");
-	return mergeConfig(record);
+	return mutateConfig(path, (record) => {
+		const existing = isRecord(record.footerSegments)
+			? { ...(record.footerSegments as Record<string, unknown>) }
+			: {};
+		record.footerSegments = {
+			...existing,
+			...validFooterSegmentEntries(patch),
+		};
+	});
 }
 
 export function saveFooterFormatPatch(value: string, path = configPath): PolishedTuiConfig {
-	const record = readConfigRecord(path);
-	record.footerFormat = typeof value === "string" ? value : "";
-	writeFileSync(path, `${JSON.stringify(record, null, 2)}\n`, "utf8");
-	return mergeConfig(record);
+	return mutateConfig(path, (record) => {
+		record.footerFormat = typeof value === "string" ? value : "";
+	});
 }
 
 export function saveIconsModePatch(mode: IconMode, path = configPath): PolishedTuiConfig {
-	const record = readConfigRecord(path);
-	const existing = isRecord(record.icons) ? { ...(record.icons as Record<string, unknown>) } : {};
-	record.icons = {
-		...existing,
-		mode: normalizeIconMode(mode),
-	};
-	writeFileSync(path, `${JSON.stringify(record, null, 2)}\n`, "utf8");
-	return mergeConfig(record);
+	return mutateConfig(path, (record) => {
+		const existing = isRecord(record.icons) ? { ...(record.icons as Record<string, unknown>) } : {};
+		record.icons = {
+			...existing,
+			mode: normalizeIconMode(mode),
+		};
+	});
 }
 
 export function saveContextStylePatch(style: ContextStyle, path = configPath): PolishedTuiConfig {
-	const record = readConfigRecord(path);
-	record.contextStyle = parseContextStyle(style);
-	writeFileSync(path, `${JSON.stringify(record, null, 2)}\n`, "utf8");
-	return mergeConfig(record);
+	return mutateConfig(path, (record) => {
+		record.contextStyle = parseContextStyle(style);
+	});
 }
 
 export function saveSeparatorPatch(
 	separator: SeparatorStyle,
 	path = configPath,
 ): PolishedTuiConfig {
-	const record = readConfigRecord(path);
-	record.separator = parseSeparatorStyle(separator);
-	writeFileSync(path, `${JSON.stringify(record, null, 2)}\n`, "utf8");
-	return mergeConfig(record);
+	return mutateConfig(path, (record) => {
+		record.separator = parseSeparatorStyle(separator);
+	});
 }
 
 export function saveContextThresholdsPatch(
 	thresholds: Partial<ContextThresholds>,
 	path = configPath,
 ): PolishedTuiConfig {
-	const record = readConfigRecord(path);
-	const existing = isRecord(record.contextThresholds)
-		? { ...(record.contextThresholds as Record<string, unknown>) }
-		: {};
-	record.contextThresholds = {
-		...existing,
-		...thresholds,
-	};
-	writeFileSync(path, `${JSON.stringify(record, null, 2)}\n`, "utf8");
-	return mergeConfig(record);
+	return mutateConfig(path, (record) => {
+		const existing = isRecord(record.contextThresholds)
+			? { ...(record.contextThresholds as Record<string, unknown>) }
+			: {};
+		record.contextThresholds = {
+			...existing,
+			...thresholds,
+		};
+	});
 }
 
 export function savePathDisplayPatch(
 	patch: Partial<PathDisplayConfig>,
 	path = configPath,
 ): PolishedTuiConfig {
-	const record = readConfigRecord(path);
-	const existing = isRecord(record.pathDisplay)
-		? { ...(record.pathDisplay as Record<string, unknown>) }
-		: {};
-	if (patch.mode !== undefined) existing.mode = patch.mode;
-	if (patch.depth !== undefined) existing.depth = patch.depth;
-	record.pathDisplay = existing;
-	writeFileSync(path, `${JSON.stringify(record, null, 2)}\n`, "utf8");
-	return mergeConfig(record);
+	return mutateConfig(path, (record) => {
+		const existing = isRecord(record.pathDisplay)
+			? { ...(record.pathDisplay as Record<string, unknown>) }
+			: {};
+		if (patch.mode !== undefined) existing.mode = patch.mode;
+		if (patch.depth !== undefined) existing.depth = patch.depth;
+		record.pathDisplay = existing;
+	});
 }
 
 export function saveGitBranchPatch(
 	patch: Partial<GitBranchConfig>,
 	path = configPath,
 ): PolishedTuiConfig {
-	const record = readConfigRecord(path);
-	const existing = isRecord(record.gitBranch)
-		? { ...(record.gitBranch as Record<string, unknown>) }
-		: {};
-	if (patch.maxLength !== undefined)
-		existing.maxLength = normalizeGitBranchMaxLength(patch.maxLength);
-	record.gitBranch = existing;
-	writeFileSync(path, `${JSON.stringify(record, null, 2)}\n`, "utf8");
-	return mergeConfig(record);
+	return mutateConfig(path, (record) => {
+		const existing = isRecord(record.gitBranch)
+			? { ...(record.gitBranch as Record<string, unknown>) }
+			: {};
+		if (patch.maxLength !== undefined)
+			existing.maxLength = normalizeGitBranchMaxLength(patch.maxLength);
+		record.gitBranch = existing;
+	});
 }
 
 export function saveExtensionStatusPlacement(
@@ -854,27 +927,26 @@ export function saveExtensionStatusPlacement(
 	placement: ExtensionStatusPlacement,
 	path = configPath,
 ): PolishedTuiConfig {
-	const record = readConfigRecord(path);
-	const existingExtensionStatuses = isRecord(record.extensionStatuses)
-		? { ...(record.extensionStatuses as Record<string, unknown>) }
-		: {};
-	const existingPlacements = isRecord(existingExtensionStatuses.placements)
-		? { ...(existingExtensionStatuses.placements as Record<string, unknown>) }
-		: {};
-
-	Object.defineProperty(existingPlacements, key, {
-		value: placement,
-		enumerable: true,
-		configurable: true,
-		writable: true,
+	return mutateConfig(path, (record) => {
+		const existingExtensionStatuses = isRecord(record.extensionStatuses)
+			? { ...(record.extensionStatuses as Record<string, unknown>) }
+			: {};
+		const existingPlacements = isRecord(existingExtensionStatuses.placements)
+			? { ...(existingExtensionStatuses.placements as Record<string, unknown>) }
+			: {};
+
+		Object.defineProperty(existingPlacements, key, {
+			value: placement,
+			enumerable: true,
+			configurable: true,
+			writable: true,
+		});
+
+		record.extensionStatuses = {
+			...existingExtensionStatuses,
+			placements: existingPlacements,
+		};
 	});
-
-	record.extensionStatuses = {
-		...existingExtensionStatuses,
-		placements: existingPlacements,
-	};
-	writeFileSync(path, `${JSON.stringify(record, null, 2)}\n`, "utf8");
-	return mergeConfig(record);
 }
 
 export function saveExtensionStatusColorMode(
@@ -882,43 +954,41 @@ export function saveExtensionStatusColorMode(
 	colorMode: ExtensionStatusColorMode,
 	path = configPath,
 ): PolishedTuiConfig {
-	const record = readConfigRecord(path);
-	const existingExtensionStatuses = isRecord(record.extensionStatuses)
-		? { ...(record.extensionStatuses as Record<string, unknown>) }
-		: {};
-	const existingColorModes = isRecord(existingExtensionStatuses.colorModes)
-		? { ...(existingExtensionStatuses.colorModes as Record<string, unknown>) }
-		: {};
-
-	Object.defineProperty(existingColorModes, key, {
-		value: colorMode,
-		enumerable: true,
-		configurable: true,
-		writable: true,
+	return mutateConfig(path, (record) => {
+		const existingExtensionStatuses = isRecord(record.extensionStatuses)
+			? { ...(record.extensionStatuses as Record<string, unknown>) }
+			: {};
+		const existingColorModes = isRecord(existingExtensionStatuses.colorModes)
+			? { ...(existingExtensionStatuses.colorModes as Record<string, unknown>) }
+			: {};
+
+		Object.defineProperty(existingColorModes, key, {
+			value: colorMode,
+			enumerable: true,
+			configurable: true,
+			writable: true,
+		});
+
+		record.extensionStatuses = {
+			...existingExtensionStatuses,
+			colorModes: existingColorModes,
+		};
 	});
-
-	record.extensionStatuses = {
-		...existingExtensionStatuses,
-		colorModes: existingColorModes,
-	};
-	writeFileSync(path, `${JSON.stringify(record, null, 2)}\n`, "utf8");
-	return mergeConfig(record);
 }
 
 export function saveFixedEditorPatch(
 	patch: Partial<FixedEditorConfig>,
 	path = configPath,
 ): PolishedTuiConfig {
-	const record = readConfigRecord(path);
-	const existing = isRecord(record.fixedEditor)
-		? { ...(record.fixedEditor as Record<string, unknown>) }
-		: {};
-	record.fixedEditor = {
-		...existing,
-		...(patch.enabled !== undefined ? { enabled: patch.enabled } : {}),
-		...(patch.mouseScroll !== undefined ? { mouseScroll: patch.mouseScroll } : {}),
-		...(patch.copyNotice !== undefined ? { copyNotice: patch.copyNotice } : {}),
-	};
-	writeFileSync(path, `${JSON.stringify(record, null, 2)}\n`, "utf8");
-	return mergeConfig(record);
+	return mutateConfig(path, (record) => {
+		const existing = isRecord(record.fixedEditor)
+			? { ...(record.fixedEditor as Record<string, unknown>) }
+			: {};
+		record.fixedEditor = {
+			...existing,
+			...(patch.enabled !== undefined ? { enabled: patch.enabled } : {}),
+			...(patch.mouseScroll !== undefined ? { mouseScroll: patch.mouseScroll } : {}),
+			...(patch.copyNotice !== undefined ? { copyNotice: patch.copyNotice } : {}),
+		};
+	});
 }

package/extensions/zentui/fixed-editor/cluster.ts

@@ -1,118 +1,22 @@
 /**
- * Cluster discovery and rendering for the fixed editor.
+ * Cluster rendering for the fixed editor.
  *
- * The "cluster" is the set of Pi TUI children around the editor that should be
- * pinned at the bottom: status container, above-editor widget, editor,
- * below-editor widget, and footer.
+ * Pi-specific cluster discovery and validation live in pi-compat.ts. This module
+ * only renders the already-verified pinned components.
  *
  * @internal
  */
 
 import { CURSOR_MARKER, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 
+import type { PiFixedCluster, PiRenderableCapability } from "./pi-compat";
 import type { ClusterRender } from "./types";
 
-/** Minimal Component shape needed for rendering. */
-type Renderable = {
-	render(width: number): string[];
-	/** Saved original render when the compositor has patched render → [] */
-	__zentuiOriginalRender?: (width: number) => string[];
-};
-
-/** Minimal Container shape for child scanning. */
-type ContainerLike = Renderable & {
-	children: unknown[];
-};
-
-/** Check if a value is a container-like object (has children + render). */
-function isContainerLike(value: unknown): value is ContainerLike {
-	return (
-		typeof value === "object" &&
-		value !== null &&
-		Array.isArray(Reflect.get(value, "children")) &&
-		typeof Reflect.get(value, "render") === "function"
-	);
-}
-
-/** Check if a value looks like an editor component (duck-typed). */
-function isEditorLike(value: unknown): boolean {
-	return (
-		typeof value === "object" &&
-		value !== null &&
-		typeof Reflect.get(value, "getText") === "function" &&
-		typeof Reflect.get(value, "setText") === "function" &&
-		typeof Reflect.get(value, "handleInput") === "function"
-	);
-}
-
-/**
- * Find the index in `children` of the container holding the editor.
- * Prefers the focused component's parent; falls back to scanning for
- * an editor-like grandchild.
- */
-export function findEditorContainerIndex(
-	children: unknown[],
-	focusedComponent?: unknown,
-): number | undefined {
-	// Try focused component first.
-	if (focusedComponent && typeof focusedComponent === "object") {
-		const idx = children.findIndex(
-			(c) => isContainerLike(c) && c.children.includes(focusedComponent),
-		);
-		if (idx !== -1) return idx;
-	}
-
-	// Scan for a container with an editor-like child.
-	const idx = children.findIndex(
-		(c) => isContainerLike(c) && c.children.some((gc) => isEditorLike(gc)),
-	);
-	return idx === -1 ? undefined : idx;
-}
-
-/** The 5-component cluster pinned at the bottom. */
-export type FixedCluster = {
-	status: Renderable | null;
-	aboveWidget: Renderable | null;
-	editor: Renderable;
-	belowWidget: Renderable | null;
-	footer: Renderable | null;
-};
-
-/**
- * Patch a cluster component's render to return [] (hide from transcript).
- * Saves the original render for cluster painting.
- */
-export function hideRenderable(component: Renderable | null): void {
-	if (!component || component.__zentuiOriginalRender) return;
-	component.__zentuiOriginalRender = component.render.bind(component);
-	component.render = () => [];
-}
-
-/** Restore a cluster component's original render. */
-export function restoreRenderable(component: Renderable | null): void {
-	if (!component?.__zentuiOriginalRender) return;
-	component.render = component.__zentuiOriginalRender;
-	delete component.__zentuiOriginalRender;
-}
-
-/** Build the cluster from children around the editor index. */
-export function buildCluster(children: unknown[], editorIdx: number): FixedCluster | null {
-	const editor = children[editorIdx];
-	if (!editor || typeof (editor as Renderable).render !== "function") return null;
-	return {
-		status: (children[editorIdx - 2] as Renderable | undefined) ?? null,
-		aboveWidget: (children[editorIdx - 1] as Renderable | undefined) ?? null,
-		editor: editor as Renderable,
-		belowWidget: (children[editorIdx + 1] as Renderable | undefined) ?? null,
-		footer: (children[editorIdx + 2] as Renderable | undefined) ?? null,
-	};
-}
+export type FixedCluster = PiFixedCluster;
 
-/** Render a component at `width`, using the saved original render if hidden. */
-function renderComponent(component: Renderable | null, width: number): string[] {
+function renderComponent(component: PiRenderableCapability | null, width: number): string[] {
 	if (!component) return [];
-	const renderFn = component.__zentuiOriginalRender ?? component.render;
-	const lines = renderFn.call(component, width);
+	const lines = component.render.call(component.target, width);
 	// Strip only trailing blank lines — internal blank lines (e.g. editor
 	// padding in copy-friendly mode) must be preserved.
 	let end = lines.length;