@linxiraos/pi-tui 1.1.26 → 1.2.0

package/src/apps/git/diff-pane.ts

@@ -19,7 +19,7 @@ import { centerLine, sliceWithWidth, truncateToWidth, visibleWidth } from "../..
 import { formatBytes } from "@linxiraos/pi-utils";
 import { sanitizeDisplayText } from "../../overlays/extensions/display-text";
 import { getLanguageFromPath } from "../../lang-from-path";
-import { createHighlightStream, theme } from "../../theme/theme";
+import { createHighlightStream, getThemeEpoch, theme } from "../../theme/theme";
 import { bgAnsiHex, canvasHex, fgAnsiHex, mixHex, pill, selectionBgAnsi, textHex, withBg } from "./colors";
 import { DIFF_CONTEXT_LINES, type FileAssetSide, type FileStreamUpdate } from "./state";
 import { tuiText } from "../../i18n";
@@ -184,6 +184,10 @@ export interface DiffBuildOptions {
 	streamResult?: DiffStreamResult;
 }
 
+function filePatchHeader(filePath: string): string {
+	return `diff --git a/${filePath} b/${filePath}\n--- a/${filePath}\n+++ b/${filePath}\n`;
+}
+
 /** Build the aligned document for one file from its raw old/new texts. */
 export function buildDiffDocument(
 	oldRaw: string,
@@ -376,10 +380,11 @@ export function buildDiffDocument(
 	// cannot use the raw streamed result because its equality basis differs.
 	const canPatch = !ignoreWs;
 	const tightHunks = streamed?.hunks ?? structuredPatchHunks(oldBasis, newBasis, DIFF_CONTEXT_LINES);
+	const patchHeader = canPatch && tightHunks.length > 0 ? filePatchHeader(filePath) : "";
 	const allHunks: HunkBlock[] = tightHunks.map(hunk => ({
 		header: `@@ -${hunk.oldStart},${hunk.oldLines} +${hunk.newStart},${hunk.newLines} @@`,
 		patch: canPatch
-			? `--- a/${filePath}\n+++ b/${filePath}\n@@ -${hunk.oldStart},${hunk.oldLines} +${hunk.newStart},${hunk.newLines} @@\n${hunk.lines.join("\n")}\n`
+			? `${patchHeader}@@ -${hunk.oldStart},${hunk.oldLines} +${hunk.newStart},${hunk.newLines} @@\n${hunk.lines.join("\n")}\n`
 			: "",
 		rows: walkHunk(hunk, false),
 	}));
@@ -476,7 +481,7 @@ export function buildLineSelectionPatch(
 				`@@ -${hunk.oldStart},${hunk.oldLines} +${hunk.newStart},${hunk.newLines} @@\n${hunk.lines.join("\n")}`,
 		)
 		.join("\n");
-	return `--- a/${doc.filePath}\n+++ b/${doc.filePath}\n${body}\n`;
+	return `${filePatchHeader(doc.filePath)}${body}\n`;
 }
 
 // ── palette ──────────────────────────────────────────────────────────────────
@@ -497,9 +502,12 @@ interface DiffPalette {
 	gutterDel: string;
 }
 
-let paletteCache: { key: string; palette: DiffPalette } | undefined;
+let paletteCache: { epoch: number; theme: object; palette: DiffPalette } | undefined;
 
+/** Diff colors for the active theme, rebuilt only when the theme instance or epoch changes. */
 function palette(): DiffPalette {
+	const epoch = getThemeEpoch();
+	if (paletteCache?.epoch === epoch && paletteCache.theme === theme) return paletteCache.palette;
 	const added = theme.getColorHex("toolDiffAdded");
 	const removed = theme.getColorHex("toolDiffRemoved");
 	const accent = theme.getColorHex("accent");
@@ -507,8 +515,6 @@ function palette(): DiffPalette {
 	const dark = luminance === undefined || luminance <= 0.5;
 	const canvas = canvasHex();
 	const text = textHex();
-	const key = `${added}\u0000${removed}\u0000${accent}\u0000${dark}\u0000${canvas}\u0000${text}`;
-	if (paletteCache?.key === key) return paletteCache.palette;
 	const built: DiffPalette = {
 		addSoft: bgAnsiHex(mixHex(canvas, added, dark ? 0.18 : 0.24)),
 		addStrong: bgAnsiHex(mixHex(canvas, added, dark ? 0.42 : 0.48)),
@@ -524,7 +530,7 @@ function palette(): DiffPalette {
 		gutterAdd: added,
 		gutterDel: removed,
 	};
-	paletteCache = { key, palette: built };
+	paletteCache = { epoch, theme, palette: built };
 	return built;
 }
 
@@ -594,8 +600,18 @@ export class DiffPane {
 	#lastHeight = 1;
 	#lastWidth = 0;
 	#layoutCache: { key: string; visuals: Visual[] } | undefined;
+	/** Minimap column for (layout, height, scroll offset, palette). */
+	#minimapCache:
+		| { visuals: Visual[]; height: number; scrollTop: number; colors: DiffPalette; lines: string[] }
+		| undefined;
 	/** Per visible row: clickable hunk-button ranges recorded during render. */
 	#hits: ({ hunk: number; primary?: [number, number]; discard?: [number, number] } | undefined)[] = [];
+	/**
+	 * Asset images from the last render, by placement and size. Reusing them
+	 * lets a SIXEL image show the sequence its off-thread encode delivers on a
+	 * later render; a fresh `Image` per render would restart the encode forever.
+	 */
+	#assetImages = new Map<string, Image>();
 	constructor(imageBudget?: ImageBudget) {
 		this.#imageBudget = imageBudget;
 	}
@@ -721,6 +737,7 @@ export class DiffPane {
 		this.scrollLeft = 0;
 		this.cursor = 0;
 		this.anchor = null;
+		if (mode === "hunk") this.selectedHunk = 0;
 	}
 
 	cycleMode(): void {
@@ -771,6 +788,7 @@ export class DiffPane {
 			this.anchor = null;
 		}
 		this.cursor = Math.max(0, Math.min(total - 1, this.cursor + delta));
+		this.#syncHunkToCursor();
 		this.scrollTop = scrollOffsetForRow(this.scrollTop, this.cursor, total, this.#lastHeight);
 		this.#clampScroll();
 	}
@@ -854,6 +872,7 @@ export class DiffPane {
 		if (total === 0) return;
 		this.anchor = null;
 		this.cursor = edge === "start" ? 0 : total - 1;
+		this.#syncHunkToCursor();
 		this.scrollTop = scrollOffsetForRow(this.scrollTop, this.cursor, total, this.#lastHeight);
 		this.#clampScroll();
 	}
@@ -870,6 +889,19 @@ export class DiffPane {
 		}
 	}
 
+	/** Keep the hunk action and highlighted header on the cursor's hunk, including blank separators. */
+	#syncHunkToCursor(): void {
+		if (this.mode !== "hunk") return;
+		const visuals = this.#layout(this.#lastWidth || 80);
+		for (let row = this.cursor; row >= 0; row--) {
+			const visual = visuals[row];
+			if (visual?.t === "header") {
+				this.selectedHunk = visual.hunk;
+				return;
+			}
+		}
+	}
+
 	/** First visual row of every change block, in document order. */
 	#changeStarts(visuals: Visual[]): number[] {
 		const starts: number[] = [];
@@ -917,6 +949,10 @@ export class DiffPane {
 		const hit = this.#hits[row];
 		if (hit && this.#doc) {
 			this.selectedHunk = hit.hunk;
+			if (this.mode === "hunk") {
+				this.cursor = this.scrollTop + row;
+				this.anchor = null;
+			}
 			if (hit.primary && col >= hit.primary[0] && col < hit.primary[1] && this.patchTarget) {
 				return { type: "hunk-action", hunk: this.#doc.hunks[hit.hunk], action: this.patchTarget };
 			}
@@ -933,6 +969,7 @@ export class DiffPane {
 				this.anchor = null;
 			}
 			this.cursor = visual;
+			this.#syncHunkToCursor();
 			return { type: "handled" };
 		}
 		return null;
@@ -1077,8 +1114,16 @@ export class DiffPane {
 		const leftWidth = Math.max(1, Math.floor((width - 1) / 2));
 		const rightWidth = Math.max(1, width - leftWidth - 1);
 		const bodyHeight = Math.max(0, height - 1);
-		const oldLines = this.#renderAssetSide(asset.old, leftWidth, bodyHeight, `old:${asset.filePath}`);
-		const newLines = this.#renderAssetSide(asset.new, rightWidth, bodyHeight, `new:${asset.filePath}`);
+		const previousImages = this.#assetImages;
+		this.#assetImages = new Map();
+		const oldLines = this.#renderAssetSide(asset.old, leftWidth, bodyHeight, `old:${asset.filePath}`, previousImages);
+		const newLines = this.#renderAssetSide(
+			asset.new,
+			rightWidth,
+			bodyHeight,
+			`new:${asset.filePath}`,
+			previousImages,
+		);
 		const border = theme.fg("borderMuted", "│");
 		const lines: string[] = [];
 		for (let index = 0; index < height; index++) {
@@ -1105,24 +1150,36 @@ export class DiffPane {
 		return lines;
 	}
 
-	#renderAssetSide(side: FileAssetSide, width: number, height: number, placementKey: string): readonly string[] {
+	#renderAssetSide(
+		side: FileAssetSide,
+		width: number,
+		height: number,
+		placementKey: string,
+		previousImages: ReadonlyMap<string, Image>,
+	): readonly string[] {
 		if (height <= 0) return [];
 		let content: readonly string[];
 		if (side.kind === "image") {
 			const image = side.image;
-			content = new Image(
-				image.data,
-				image.mimeType,
-				{ fallbackColor: text => theme.fg("dim", text) },
-				{
-					maxWidthCells: Math.max(1, width - 2),
-					maxHeightCells: height,
-					filename: this.#asset?.filePath,
-					budget: this.#imageBudget,
-					imageKey: `git-review:${placementKey}:${image.key}`,
-				},
-				{ widthPx: image.widthPx, heightPx: image.heightPx },
-			).render(width);
+			const imageKey = `git-review:${placementKey}:${image.key}`;
+			const cacheKey = `${imageKey}:${width}x${height}`;
+			const component =
+				previousImages.get(cacheKey) ??
+				new Image(
+					image.data,
+					image.mimeType,
+					{ fallbackColor: text => theme.fg("dim", text) },
+					{
+						maxWidthCells: Math.max(1, width - 2),
+						maxHeightCells: height,
+						filename: this.#asset?.filePath,
+						budget: this.#imageBudget,
+						imageKey,
+					},
+					{ widthPx: image.widthPx, heightPx: image.heightPx },
+				);
+			this.#assetImages.set(cacheKey, component);
+			content = component.render(width);
 		} else {
 			let details: string[];
 			switch (side.kind) {
@@ -1448,6 +1505,22 @@ export class DiffPane {
 	}
 
 	#renderMinimap(visuals: Visual[], height: number, colors: DiffPalette): string[] {
+		const cached = this.#minimapCache;
+		if (
+			cached &&
+			cached.visuals === visuals &&
+			cached.height === height &&
+			cached.scrollTop === this.scrollTop &&
+			cached.colors === colors
+		) {
+			return cached.lines;
+		}
+		const lines = this.#buildMinimap(visuals, height, colors);
+		this.#minimapCache = { visuals, height, scrollTop: this.scrollTop, colors, lines };
+		return lines;
+	}
+
+	#buildMinimap(visuals: Visual[], height: number, colors: DiffPalette): string[] {
 		const total = visuals.length;
 		const lines: string[] = [];
 		const bandKind = (band: number): RowKind | "hunk" | null => {

package/src/apps/git/git-tui.ts

@@ -1,5 +1,5 @@
 /**
- * `omp git` — fullscreen repository TUI.
+ * `zetacode git` — fullscreen repository TUI.
  *
  * Layout: header (file path, encoding, stage-file button, close), toolbar
  * (scope chip, file/diff toggle, hunk navigation, hunk/inline/split view
@@ -13,8 +13,9 @@
  * arrows/PgUp/PgDn, vim motions (`j`/`k`/`h`/`l`/`g`/`G`), and mouse
  * clicks/wheel. All toolbar buttons are clickable and mirrored by keys:
  * `v` cycles the view (`1`–`4` pick one), `alt+↓`/`alt+↑` jump hunks and roll
- * into the adjacent file at the edges, `]`/`[` switch files, `s`/`u`
- * stage/unstage (hunk-aware), `x` discards a hunk, `delete` discards the
+ * into the adjacent file at the edges, `space` stages/unstages the focused
+ * diff row (the focused hunk in hunk view), `s`/`u` stage/unstage
+ * (hunk-aware), `x` discards a hunk, `delete` discards the
  * whole file (press twice to confirm), `w` wraps, `b` cycles
  * whitespace handling (exact → ignore whitespace → ignore
  * formatting/import-only changes), `c` jumps to the commit form, `r`
@@ -25,7 +26,7 @@
  */
 
 import type { TspSpan } from "@linxiraos/pi-wire";
-import { formatKeyHint, formatKeyHints } from "../../app-keybindings";
+import { formatKeyHint, formatKeyHints, formatTooltipKey } from "../../app-keybindings";
 import { SplitPane } from "../../components/layout/split-pane";
 import { Stack } from "../../components/layout/stack";
 import { matchesKey } from "../../keys";
@@ -669,14 +670,20 @@ class GitTuiComponent implements Component {
 			else if (matchesKey(data, "up") || data === "k") this.#pane.moveCursor(-1, false);
 			else if (matchesKey(data, "down") || data === "j") this.#pane.moveCursor(1, false);
 			else if (matchesKey(data, "pageUp")) this.#pane.moveCursor(-Math.max(1, this.#contentHeight - 2), false);
-			else if (matchesKey(data, "pageDown") || data === " ")
-				this.#pane.moveCursor(Math.max(1, this.#contentHeight - 2), false);
+			else if (matchesKey(data, "pageDown")) this.#pane.moveCursor(Math.max(1, this.#contentHeight - 2), false);
 			else if (matchesKey(data, "left") || data === "h") this.#pane.scrollLeftBy(-8);
 			else if (matchesKey(data, "right") || data === "l") this.#pane.scrollLeftBy(8);
 			else if (matchesKey(data, "home") || data === "g") this.#pane.cursorToEdge("start");
 			else if (matchesKey(data, "end") || data === "G") this.#pane.cursorToEdge("end");
 			else if (matchesKey(data, "enter")) return this.#jumpHunkOrFile(1);
-			else if (data === "s" || data === "u") {
+			else if (matchesKey(data, "space")) {
+				// Hunk-view rows do not map back to document rows, so Space acts on the focused hunk there.
+				const target = this.#pane.patchTarget;
+				const hunk = this.#pane.mode === "hunk" ? this.#pane.currentHunk : null;
+				if (target && hunk) void this.#hunkAction(hunk, target);
+				else if (target && this.#pane.selection) void this.#lineAction(target);
+				return;
+			} else if (data === "s" || data === "u") {
 				if (this.#pane.selection?.explicit && this.#pane.patchTarget) {
 					void this.#lineAction(this.#pane.patchTarget);
 					return;
@@ -1023,8 +1030,8 @@ class GitTuiComponent implements Component {
 		const right: NativeNode[] = [
 			row(
 				[
-					iconButton("chev-up", "prev-hunk", `Previous change (${formatKeyHint("alt+up")})`),
-					iconButton("chev", "next-hunk", `Next change (${formatKeyHint("alt+down")})`),
+					iconButton("chev-up", "prev-hunk", `Previous change (${formatTooltipKey("alt+up")})`),
+					iconButton("chev", "next-hunk", `Next change (${formatTooltipKey("alt+down")})`),
 				],
 				{ gap: "none", align: "center" },
 			),
@@ -1045,13 +1052,13 @@ class GitTuiComponent implements Component {
 					"type",
 					"whitespace",
 					this.#whitespace === "off"
-						? `Ignore whitespace (${formatKeyHint("b")})`
+						? `Ignore whitespace (${formatTooltipKey("b")})`
 						: this.#whitespace === "whitespace"
-							? `Ignoring whitespace; also ignore formatting (${formatKeyHint("b")})`
-							: `Ignoring formatting and imports; show all (${formatKeyHint("b")})`,
+							? `Ignoring whitespace; also ignore formatting (${formatTooltipKey("b")})`
+							: `Ignoring formatting and imports; show all (${formatTooltipKey("b")})`,
 					this.#whitespace !== "off",
 				),
-				iconButton("corner-down-right", "wrap", `Wrap lines (${formatKeyHint("w")})`, this.#pane.wrap),
+				iconButton("corner-down-right", "wrap", `Wrap lines (${formatTooltipKey("w")})`, this.#pane.wrap),
 			);
 		}
 		if (file?.area === "unstaged" || file?.area === "staged") {
@@ -1063,8 +1070,8 @@ class GitTuiComponent implements Component {
 			);
 		}
 		right.push(
-			iconButton("keyboard", "help", `Keyboard shortcuts (${formatKeyHint("?")})`),
-			iconButton("x", "close", `Close (${formatKeyHint("q")})`),
+			iconButton("keyboard", "help", `Keyboard shortcuts (${formatTooltipKey("?")})`),
+			iconButton("x", "close", `Close (${formatTooltipKey("q")})`),
 		);
 		return keyed(
 			row(
@@ -1228,7 +1235,7 @@ export async function showGitOverlay(ui: TUI, host: GitTuiHost): Promise<void> {
 	}
 }
 
-/** Run the fullscreen git TUI standalone (`omp git`) until the user quits. */
+/** Run the fullscreen git TUI standalone (`zetacode git`) until the user quits. */
 export async function runGitTui(host: GitTuiHost): Promise<void> {
 	const ui = new TUI(new ProcessTerminal());
 	ui.start();

package/src/apps/git/help.ts

@@ -11,7 +11,8 @@ import { formatKeyHint } from "../../app-keybindings";
 import type { KeyName } from "../../key-hint-format";
 import { matchesKey } from "../../keys";
 import { col, node, span } from "../../native/describe";
-import type { NativeNode } from "../../native/node";
+import type { NativeNode, NativeUiEvent } from "../../native/node";
+import { actionBar, actionButton } from "../../native/overlay";
 import { theme } from "../../theme/theme";
 import type { Component } from "../../tui";
 import { truncateToWidth, visibleWidth } from "../../utils";
@@ -79,28 +80,36 @@ export class GitHelpSheet implements Component {
 		if (data === "?" || data === "q" || matchesKey(data, "escape") || matchesKey(data, "ctrl+c")) this.#close();
 	}
 
+	/** Close runs what Esc runs. */
+	handleNativeEvent(event: NativeUiEvent): void {
+		if (event.type === "action" && event.act === "close") this.#close();
+	}
+
 	describe(): NativeNode {
 		this.#native ??= col(
-			GROUPS.map(group =>
-				node(
-					"section",
-					{ head: group.title, role: "zeta.hotkeys.group" },
-					[
-						node("table", {
-							role: "zeta.hotkeys.table",
-							cols: [
-								{ id: "keys", head: "Keys" },
-								{ id: "does", head: "Action", grow: 1 },
-							],
-							rows: group.rows.map((row, index) => ({
-								id: String(index),
-								cells: { keys: row.keys.map(key => span(formatKeyHint(key), "key")), does: row.label },
-							})),
-						}),
-					],
-					group.title,
+			[
+				...GROUPS.map(group =>
+					node(
+						"section",
+						{ head: group.title, role: "zeta.hotkeys.group" },
+						[
+							node("table", {
+								role: "zeta.hotkeys.table",
+								cols: [
+									{ id: "keys", head: "Keys" },
+									{ id: "does", head: "Action", grow: 1 },
+								],
+								rows: group.rows.map((row, index) => ({
+									id: String(index),
+									cells: { keys: row.keys.map(key => span(formatKeyHint(key), "key")), does: row.label },
+								})),
+							}),
+						],
+						group.title,
+					),
 				),
-			),
+				actionBar([null, actionButton("Close", "close", { keys: "escape" })]),
+			],
 			{ gap: "lg", role: "zeta.app.git.help" },
 		);
 		return this.#native;

package/src/apps/git/sidebar.ts

@@ -1008,7 +1008,7 @@ export class Sidebar {
 	 * text field being edited. False when not the sidebar's event.
 	 */
 	handleNativeEvent(event: NativeUiEvent): boolean {
-		if (event.type === "edit") {
+		if (event.type === "edit" || event.type === "undo") {
 			const editing = this.editing ? this.selected?.kind : undefined;
 			const field =
 				editing === "summary"
@@ -1018,7 +1018,7 @@ export class Sidebar {
 						: editing === "description"
 							? this.description
 							: undefined;
-			field?.applyHostEdit(event);
+			field?.handleNativeEvent(event);
 			return field !== undefined;
 		}
 		if (event.type === "select" || event.type === "activate") {
@@ -1713,7 +1713,12 @@ export class Sidebar {
 					png,
 					"image/png",
 					{ fallbackColor: text => theme.fg("dim", text) },
-					{ maxHeightCells: 3, budget: this.#imageBudget, imageKey: `git-avatar:${email}` },
+					{
+						maxHeightCells: 3,
+						budget: this.#imageBudget,
+						imageKey: `git-avatar:${email}`,
+						requestRender: this.#requestRender,
+					},
 				),
 			};
 		}

package/src/apps/if-bench-board.ts

@@ -1,5 +1,5 @@
 /**
- * Live board and scoreboard for `omp if-bench`.
+ * Live board and scoreboard for `zetacode if-bench`.
  *
  * Interactive terminals get one repainted row per model — a turn ladder that
  * fills as turns pass, the in-flight turn as a spinner cell, and the live
@@ -71,7 +71,7 @@ const FAILURE_TEXT: Record<IfBenchFailure, string> = {
 	provider: "provider error",
 };
 
-/** Rendering surface for one `omp if-bench` run. */
+/** Rendering surface for one `zetacode if-bench` run. */
 export interface IfBenchBoard extends IfBenchObserver {
 	readonly interactive: boolean;
 	/** Print a permanent line above the live rows (plain write when non-TTY). */

package/src/apps/ps-top.ts

@@ -1,5 +1,5 @@
 /**
- * Interactive alt-screen monitor for `omp ps` (btop idiom): a live process
+ * Interactive alt-screen monitor for `zetacode ps` (btop idiom): a live process
  * table over every selected broker scope with in-place actions.
  *
  * Keys — table: `↑/↓`/`j/k` select, `enter`/`i` info, `l` logs, `s` stop,
@@ -631,7 +631,7 @@ export class PsTopComponent implements Component {
 
 	#header(width: number, title: string): string {
 		const age = this.#lastRefresh ? `updated ${formatDuration(Date.now() - this.#lastRefresh)} ago` : "updating…";
-		const left = ` ${chalk.bold("omp ps")} ${chalk.dim("·")} ${title}`;
+		const left = ` ${chalk.bold("zetacode ps")} ${chalk.dim("·")} ${title}`;
 		const right = chalk.dim(age);
 		const pad = Math.max(1, width - Bun.stringWidth(left) - Bun.stringWidth(right) - 1);
 		return truncateToWidth(`${left}${" ".repeat(pad)}${right}`, width);

package/src/apps/setup-model-picker.ts

@@ -1,5 +1,5 @@
 /**
- * Standalone TUI model picker used by `omp setup speech`.
+ * Standalone TUI model picker used by `zetacode setup speech`.
  *
  * One-shot {@link selectStandaloneItem} prompt: resolve on select/cancel and
  * let the adapter tear the UI down. The standalone TUI auto-renders on input,

package/src/autocomplete.d.ts

@@ -77,8 +77,11 @@ export interface AutocompleteProvider {
     };
     /** Get inline hint text to show as dim ghost text after the cursor */
     getInlineHint?(lines: string[], cursorLine: number, cursorCol: number): string | null;
-    /** Synchronously try to complete a slash command at the start of a line (no async I/O). */
-    /** Returns matched items and the full prefix, or null if not applicable. */
+    /**
+     * Synchronously list slash command-name completions for a leading slash token (no async I/O).
+     * Mirrors the command-name branch of {@link getSuggestions}, including the bare `/` listing and
+     * the collapsed `/skill:` namespace row. Returns null outside a command-name token or with no match.
+     */
     trySyncSlashCompletion?(textBeforeCursor: string): {
         items: AutocompleteItem[];
         prefix: string;