@linxiraos/pi-tui 1.2.1 → 1.3.1

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

@@ -7,7 +7,8 @@
  * scrollbar, right sidebar (file management + commit form while dirty, HEAD
  * commit details with author avatar when clean). Submitting an empty commit
  * form generates an llm-git-compatible message; submitting populated fields
- * commits them. A footer shows key hints.
+ * commits them. A footer shows key hints; the staging and discarding ones are
+ * omitted while the tree is clean, where they cannot fire.
  *
  * `tab` moves focus between the diff and the sidebar; both panes take
  * arrows/PgUp/PgDn, vim motions (`j`/`k`/`h`/`l`/`g`/`G`), and mouse
@@ -22,7 +23,8 @@
  * refreshes. In the sidebar tree `←`/`→` collapse/expand directories,
  * `enter` opens the selected file in the diff pane, `space` stages or
  * unstages the selected row, and `delete` discards it — on a directory,
- * every file underneath it.
+ * every file underneath it. All of the staging and discarding keys are inert
+ * on a clean tree, which shows the HEAD commit instead of a change list.
  */
 
 import type { TspSpan } from "@linxiraos/pi-wire";
@@ -32,7 +34,7 @@ import { Stack } from "../../components/layout/stack";
 import { matchesKey } from "../../keys";
 import { ProcessTerminal } from "../../terminal";
 import { routeSgrMouseInput } from "../../mouse";
-import { col, compact, keyed, node, row, span, text } from "../../native/describe";
+import { col, compact, keyed, node, row, span, stableKey, text } from "../../native/describe";
 import { Memo } from "../../native/memo";
 import type { DescribeContext, NativeNode, NativeUiEvent } from "../../native/node";
 import { actionButton } from "../../native/overlay";
@@ -42,6 +44,7 @@ import { theme, warmHighlighter } from "../../theme/theme";
 import type { AvatarSource } from "./avatar";
 import { pill, softPill, tintChip } from "./colors";
 import {
+	assetTitle,
 	buildDiffDocument,
 	type DiffDocument,
 	buildLineSelectionPatch,
@@ -53,7 +56,7 @@ import {
 } from "./diff-pane";
 import { GitHelpSheet } from "./help";
 import { Sidebar, type SidebarAction, type GitCommitMessage } from "./sidebar";
-import type { AssetFileContents, ChangedFile, FileContents, GitTuiModel } from "./state";
+import type { AssetFileContents, ChangedFile, FileAssetSide, FileContents, GitTuiModel, MediaRef } from "./state";
 
 /** AI staging counts displayed after filtering the working tree. */
 export interface AiStageOutcome {
@@ -88,6 +91,28 @@ const STATUS_TTL_MS = 6_000;
 
 type Focus = "diff" | "sidebar";
 
+/**
+ * Footer key hints. A clean tree renders the HEAD commit view, where stage
+ * and discard cannot fire: `#patchTargetFor` returns null and
+ * `#discardCurrentFile` returns early for `area: "commit"` rows, and the
+ * sidebar only builds stage/discard actions for the unstaged/staged
+ * sections. `commit` needs the commit form (absent on a clean tree) and
+ * `select` feeds the line-level stage/discard actions (no-ops on commit
+ * rows), so the commit view drops those too and says what it is showing.
+ */
+export function gitFooterHints(clean: boolean, focus: Focus): string {
+	const edit = clean
+		? ""
+		: focus === "diff"
+			? ` · ${formatKeyHints(["s", "u"])} stage · ${formatKeyHints(["x", "delete"])} discard`
+			: ` · ${formatKeyHint("space")} stage · ${formatKeyHint("delete")} discard`;
+	const commit = clean ? "" : ` · ${formatKeyHint("c")} commit`;
+	const select = clean || focus !== "diff" ? "" : ` · ${formatKeyHints(["shift+up", "shift+down"])} select`;
+	return focus === "diff"
+		? `${formatKeyHints(["alt+down", "alt+up"])} hunk · ${formatKeyHints(["]", "["])} file${select}${edit} · ${formatKeyHint("v")} view${commit} · ${formatKeyHint("?")} keys · ${formatKeyHint("q")} quit`
+		: `${formatKeyHints(["up", "down"])} move · ${formatKeyHints(["left", "right"])} fold${edit} · ${formatKeyHint("enter")} open · ${formatKeyHints(["alt+down", "alt+up"])} hunk${commit} · ${formatKeyHint("t")} tree · ${formatKeyHint("?")} keys · ${formatKeyHint("q")} quit`;
+}
+
 /** Tone of a status message: its colour in the header and its span token natively. */
 type StatusTone = "success" | "warning" | "error" | "accent" | "dim";
 
@@ -792,14 +817,7 @@ class GitTuiComponent implements Component {
 
 		// The empty middle carries the key hints (or a fresh status message).
 		const status = this.#visibleStatus() ? theme.fg(this.#statusTone, this.#status) : "";
-		const middle =
-			status ||
-			theme.fg(
-				"dim",
-				this.#focus === "diff"
-					? `${formatKeyHints(["alt+down", "alt+up"])} hunk · ${formatKeyHints(["]", "["])} file · ${formatKeyHints(["shift+up", "shift+down"])} select · ${formatKeyHints(["s", "u"])} stage · ${formatKeyHints(["x", "delete"])} discard · ${formatKeyHint("v")} view · ${formatKeyHint("c")} commit · ${formatKeyHint("?")} keys · ${formatKeyHint("q")} quit`
-					: `${formatKeyHints(["up", "down"])} move · ${formatKeyHints(["left", "right"])} fold · ${formatKeyHint("space")} stage · ${formatKeyHint("delete")} discard · ${formatKeyHint("enter")} open · ${formatKeyHints(["alt+down", "alt+up"])} hunk · ${formatKeyHint("c")} commit · ${formatKeyHint("t")} tree · ${formatKeyHint("?")} keys · ${formatKeyHint("q")} quit`,
-			);
+		const middle = status || theme.fg("dim", gitFooterHints(this.#model.clean, this.#focus));
 		const free = width - row.width - right.width - 1;
 		const middleText = free > visibleWidth(middle) + 4 ? middle : truncateToWidth(middle, Math.max(0, free - 4));
 		const leftPad = Math.max(1, Math.floor((free - visibleWidth(middleText)) / 2));
@@ -929,8 +947,9 @@ class GitTuiComponent implements Component {
 				this.#contents,
 				this.#currentFile,
 				this.#pane.emptyMessage,
+				cx.supports("media"),
 			],
-			() => this.#describeBody(),
+			() => this.#describeBody(cx),
 		);
 		const side = this.#sidebar.describe(cx);
 		return this.#nativeRoot.get([bar, body, side, narrow, status, this.#status, this.#statusTone], () => {
@@ -1086,7 +1105,7 @@ class GitTuiComponent implements Component {
 	}
 
 	/** The diff for the view mode, or the loading, empty and media states. */
-	#describeBody(): NativeNode {
+	#describeBody(cx: DescribeContext): NativeNode {
 		const doc = this.#pane.doc;
 		const file = this.#currentFile;
 		if (doc && this.#pane.state === "ready") {
@@ -1104,6 +1123,18 @@ class GitTuiComponent implements Component {
 		}
 		const contents = this.#contents;
 		if (this.#pane.state === "asset" && file && contents?.kind === "asset") {
+			if (cx.supports("media")) {
+				return keyed(
+					row(
+						[
+							mediaColumn("before", contents.old, contents.oldRef),
+							mediaColumn("after", contents.new, contents.newRef),
+						],
+						{ gap: "sm", align: "stretch", grow: 1, role: "zeta.app.git.compare" },
+					),
+					"compare",
+				);
+			}
 			return keyed(
 				col(
 					[
@@ -1190,6 +1221,41 @@ function unifiedDiff(doc: DiffDocument, whole: boolean): string {
 	return out.join("\n");
 }
 
+/** `media` nodes of the before/after compare share this link, so they pan and zoom together. */
+const MEDIA_COMPARE_LINK = "git-compare";
+
+/**
+ * One column of the native media compare: its heading (`Before · PNG`) over a
+ * `media` node Tern loads from `ref`, keyed by path so another file remounts,
+ * or a muted line when the side has no file.
+ */
+function mediaColumn(side: "before" | "after", asset: FileAssetSide, ref: MediaRef | undefined): NativeNode {
+	const head = keyed(
+		text([span(assetTitle(side === "before" ? "Before" : "After", asset), "strong")], {
+			truncate: "end",
+			role: "zeta.app.git.media-head",
+		}),
+		"head",
+	);
+	const body = ref
+		? node(
+				"media",
+				{ ...ref, link: MEDIA_COMPARE_LINK, grow: 1, role: "zeta.app.git.media" },
+				undefined,
+				`media-${stableKey(ref.path)}`,
+			)
+		: keyed(
+				text(
+					asset.kind === "empty"
+						? [span(side === "before" ? "Did not exist" : "Deleted", "muted")]
+						: assetText(asset).map(fact => span(fact.t, "muted")),
+					{ role: "zeta.app.git.media-none" },
+				),
+				"none",
+			);
+	return keyed(col([head, body], { gap: "xs", grow: 1, basis: 0, role: "zeta.app.git.media-side" }), side);
+}
+
 /** One side of a media/binary change as a short fact line. */
 function assetText(asset: AssetFileContents["old"]): TspSpan[] {
 	const size = (bytes: number | undefined): string =>

package/src/apps/git/sidebar.ts

@@ -1681,6 +1681,9 @@ export class Sidebar {
 				text: ` ${theme.fg("dim", tuiText("gitParentLabel", "parent:"))} ${theme.fg("accent", head.parents.map(sha => sha.slice(0, 8)).join(" "))}`,
 			});
 		}
+		// This view only appears when there is nothing to stage or discard, so say so
+		// rather than letting the file list read as pending work.
+		rows.push({ text: theme.fg("success", ` Working tree clean — showing committed ${head.shortSha}`) });
 		rows.push({ text: theme.fg("borderMuted", "─".repeat(Math.max(0, width))) });
 		if (!head.filesLoaded) {
 			rows.push({ text: theme.fg("dim", tuiText("gitLoadingChangedFiles", " Loading changed files…")) });
@@ -1689,8 +1692,14 @@ export class Sidebar {
 
 		const additions = head.files.reduce((sum, file) => sum + (file.additions ?? 0), 0);
 		const deletions = head.files.reduce((sum, file) => sum + (file.deletions ?? 0), 0);
+		// Upstream's redesigned row ("N files in <sha>"); the count and the sha
+		// fragment both come from the catalogue so a zh session localizes them.
+		const count =
+			head.files.length === 1
+				? tuiTextFmt("gitModifiedCountOneFmt", "%s file", head.files.length)
+				: tuiTextFmt("gitModifiedCountManyFmt", "%s files", head.files.length);
 		rows.push({
-			text: ` ${theme.bold(tuiTextFmt("gitModifiedCountFmt", "%s modified", head.files.length))}  ${theme.fg("success", `+${additions}`)} ${theme.fg("error", `−${deletions}`)} ${theme.fg("dim", `· ${head.shortSha}`)}`,
+			text: ` ${theme.bold(count)} ${theme.fg("dim", tuiTextFmt("gitInShaFmt", `in ${head.shortSha}`, head.shortSha))}  ${theme.fg("success", `+${additions}`)} ${theme.fg("error", `−${deletions}`)}`,
 		});
 		rows.push(this.#viewToggleRow(width));
 		rows.push(...this.#entryRows(head.files, "commit"));

package/src/apps/git/state.ts

@@ -66,11 +66,23 @@ export interface TextFileContents {
 	readonly streamResult: DiffStreamResult;
 }
 
+/** Where one side of a change lives, so a host viewer (Tern's TSP `media` node) can load it by path. */
+export interface MediaRef {
+	/** Absolute path of the file (repository root joined with its repository path). */
+	readonly path: string;
+	/** Git revision holding this side (`HEAD`, a sha, `:0` for the index); absent for the worktree file. */
+	readonly rev?: string;
+}
+
 /** Non-text sides rendered as previews or explicit placeholders. */
 export interface AssetFileContents {
 	readonly kind: "asset";
 	readonly old: FileAssetSide;
 	readonly new: FileAssetSide;
+	/** Source of {@link old}; absent when that side is empty. */
+	readonly oldRef?: MediaRef;
+	/** Source of {@link new}; absent when that side is empty. */
+	readonly newRef?: MediaRef;
 }
 
 /** Loaded file content selected for text diffing or asset preview. */

package/src/autocomplete.d.ts

@@ -6,6 +6,8 @@
  */
 export declare function findLeadingSlashCommandStart(text: string): number | null;
 export declare function findTrailingSlashCommandStart(text: string): number | null;
+/** Extract the live whitespace-delimited or double-quoted `@` file token ending at the cursor. */
+export declare function extractAtFilePrefix(text: string): string | null;
 /**
  * Whether an autocomplete value represents a directory: trailing slash or
  * backslash, optionally followed by a closing quote for quoted paths.

package/src/autocomplete.ts

@@ -14,6 +14,11 @@ const PATH_DELIMITERS = new Set([" ", "\t", '"', "'", "="]);
  */
 const AT_PARTIAL_DELAY_MS = 150;
 
+/**
+ * Without a deadline the native walk follows symlinks at unbounded depth and never returns.
+ */
+const AT_FUZZY_TIMEOUT_MS = 1_500;
+
 function buildAutocompleteFuzzyDiscoveryProfile(
 	query: string,
 	basePath: string,
@@ -25,6 +30,7 @@ function buildAutocompleteFuzzyDiscoveryProfile(
 	hidden: boolean;
 	gitignore: boolean;
 	cache: boolean;
+	timeoutMs: number;
 	signal?: AbortSignal;
 } {
 	return {
@@ -34,6 +40,7 @@ function buildAutocompleteFuzzyDiscoveryProfile(
 		hidden: true,
 		gitignore: true,
 		cache: true,
+		timeoutMs: AT_FUZZY_TIMEOUT_MS,
 		...(signal ? { signal } : {}),
 	};
 }
@@ -106,6 +113,18 @@ function extractQuotedPrefix(text: string): string | null {
 	return text.slice(quoteStart);
 }
 
+/** Extract the live whitespace-delimited or double-quoted `@` file token ending at the cursor. */
+export function extractAtFilePrefix(text: string): string | null {
+	const quotedPrefix = extractQuotedPrefix(text);
+	if (quotedPrefix?.startsWith('@"')) {
+		return quotedPrefix;
+	}
+
+	const lastDelimiterIndex = findLastDelimiter(text);
+	const tokenStart = lastDelimiterIndex === -1 ? 0 : lastDelimiterIndex + 1;
+	return text[tokenStart] === "@" ? text.slice(tokenStart) : null;
+}
+
 function parsePathPrefix(prefix: string): { rawPrefix: string; isAtPrefix: boolean; isQuotedPrefix: boolean } {
 	if (prefix.startsWith('@"')) {
 		return { rawPrefix: prefix.slice(2), isAtPrefix: true, isQuotedPrefix: true };
@@ -719,7 +738,7 @@ export class CombinedAutocompleteProvider implements AutocompleteProvider {
 		}
 
 		// Check for @ file reference (fuzzy search) - must be after a delimiter or at start
-		const atPrefix = this.#extractAtPrefix(textBeforeCursor);
+		const atPrefix = extractAtFilePrefix(textBeforeCursor);
 		if (atPrefix) {
 			const { rawPrefix, isQuotedPrefix } = parsePathPrefix(atPrefix);
 			// Recursive fuzzy walks rooted outside the project (e.g. `@../`,
@@ -862,7 +881,7 @@ export class CombinedAutocompleteProvider implements AutocompleteProvider {
 
 		// Check if we're completing a file attachment (prefix starts with "@")
 		if (prefix.startsWith("@")) {
-			const liveAtPrefix = this.#extractAtPrefix(textBeforeCursor);
+			const liveAtPrefix = extractAtFilePrefix(textBeforeCursor);
 			if (liveAtPrefix) {
 				beforePrefix = currentLine.slice(0, cursorCol - liveAtPrefix.length);
 			}
@@ -896,23 +915,6 @@ export class CombinedAutocompleteProvider implements AutocompleteProvider {
 		};
 	}
 
-	// Extract @ prefix for fuzzy file suggestions
-	#extractAtPrefix(text: string): string | null {
-		const quotedPrefix = extractQuotedPrefix(text);
-		if (quotedPrefix?.startsWith('@"')) {
-			return quotedPrefix;
-		}
-
-		const lastDelimiterIndex = findLastDelimiter(text);
-		const tokenStart = lastDelimiterIndex === -1 ? 0 : lastDelimiterIndex + 1;
-
-		if (text[tokenStart] === "@") {
-			return text.slice(tokenStart);
-		}
-
-		return null;
-	}
-
 	// Extract a path-like prefix from the text before cursor
 	#extractPathPrefix(text: string, forceExtract: boolean = false): string | null {
 		const quotedPrefix = extractQuotedPrefix(text);

package/src/bracketed-paste.ts

@@ -68,6 +68,7 @@ const DEFAULT_BYTE_LIMIT = 64 * 1024 * 1024;
  */
 export class BracketedPasteHandler {
 	#buffer = "";
+	#bufferBytes = 0;
 	#active = false;
 	readonly #byteLimit: number;
 
@@ -88,7 +89,10 @@ export class BracketedPasteHandler {
 		const start = data.indexOf(PASTE_START);
 		const end = data.indexOf(PASTE_END);
 		if (start !== -1 && (end === -1 || start < end)) {
-			if (!this.#active) this.#buffer = "";
+			if (!this.#active) {
+				this.#buffer = "";
+				this.#bufferBytes = 0;
+			}
 			this.#active = true;
 			// Only strip nested starts before this paste's first end. Later starts
 			// belong to the next paste in `remaining`.
@@ -100,6 +104,7 @@ export class BracketedPasteHandler {
 
 		if (!this.#active) return { handled: false };
 
+		this.#bufferBytes += Buffer.byteLength(data, "utf8");
 		this.#buffer += data;
 
 		const endIndex = this.#buffer.indexOf(PASTE_END);
@@ -108,6 +113,7 @@ export class BracketedPasteHandler {
 			const remaining = this.#buffer.substring(endIndex + PASTE_END.length);
 
 			this.#buffer = "";
+			this.#bufferBytes = 0;
 			this.#active = false;
 
 			return { handled: true, pasteContent, remaining };
@@ -118,9 +124,10 @@ export class BracketedPasteHandler {
 		// neither lost nor held forever, and reset paste mode so subsequent
 		// input recovers. See `StdinBuffer#abortPaste` for the sibling recovery
 		// semantics inside `StdinBuffer`.
-		if (this.#buffer.length > this.#byteLimit) {
+		if (this.#bufferBytes > this.#byteLimit) {
 			const pasteContent = this.#buffer;
 			this.#buffer = "";
+			this.#bufferBytes = 0;
 			this.#active = false;
 			return { handled: true, pasteContent, remaining: "" };
 		}

package/src/charts/chart-svg.d.ts

@@ -2,9 +2,11 @@
  * Draws a {@link ChartSpec} as a standalone SVG document colored only with
  * figure tokens — `var(--fg)`, `var(--muted)`, `var(--border)`,
  * `var(--accent)`, `var(--surface)`, `var(--c1)`…`var(--c6)` — on a
- * transparent background — the token vocabulary of assistant ```svg figures —
- * so the host resolves them against the live theme (`prepareSvg`) for both
- * the rasterized terminal image and the native TSP blob.
+ * transparent background — the token vocabulary of assistant ```svg figures:
+ * the host resolves them against the live theme (`prepareSvg`) for the
+ * rasterized terminal image, and a TSP terminal draws the chart as an ```svg
+ * figure in the palette it shows. The root carries {@link chartAlt} as its
+ * `aria-label`.
  *
  * Styled after Apple's charts and Tern's UI: a UI sans (Geist where Tern
  * provides it), muted labels, hairline gridlines that recede behind the
@@ -39,16 +41,8 @@
  */
 import { type ChartSpec } from "./chart-plan";
 import { type Dimension } from "./table-data";
-/** A drawn chart: the SVG document and its size in user units. */
-export interface ChartSvg {
-    readonly svg: string;
-    readonly width: number;
-    readonly height: number;
-}
-/** The SVG document for `spec`. */
-export declare function renderChartSvg(spec: ChartSpec): ChartSvg;
-/** One-line description of the chart, for screen readers and terminals that show the alt text. */
-export declare function chartAlt(spec: ChartSpec): string;
+/** The SVG document for `spec`, labeled for screen readers with {@link chartAlt}. */
+export declare function renderChartSvg(spec: ChartSpec): string;
 /**
  * A value in base units as an axis label: durations and sizes in the unit,
  * counts compacted under the suffix (`12k`, `3.4M`), that `magnitude` reads

package/src/charts/chart-svg.ts

@@ -2,9 +2,11 @@
  * Draws a {@link ChartSpec} as a standalone SVG document colored only with
  * figure tokens — `var(--fg)`, `var(--muted)`, `var(--border)`,
  * `var(--accent)`, `var(--surface)`, `var(--c1)`…`var(--c6)` — on a
- * transparent background — the token vocabulary of assistant ```svg figures —
- * so the host resolves them against the live theme (`prepareSvg`) for both
- * the rasterized terminal image and the native TSP blob.
+ * transparent background — the token vocabulary of assistant ```svg figures:
+ * the host resolves them against the live theme (`prepareSvg`) for the
+ * rasterized terminal image, and a TSP terminal draws the chart as an ```svg
+ * figure in the palette it shows. The root carries {@link chartAlt} as its
+ * `aria-label`.
  *
  * Styled after Apple's charts and Tern's UI: a UI sans (Geist where Tern
  * provides it), muted labels, hairline gridlines that recede behind the
@@ -236,15 +238,8 @@ interface Tier {
 	readonly high: number;
 }
 
-/** A drawn chart: the SVG document and its size in user units. */
-export interface ChartSvg {
-	readonly svg: string;
-	readonly width: number;
-	readonly height: number;
-}
-
-/** The SVG document for `spec`. */
-export function renderChartSvg(spec: ChartSpec): ChartSvg {
+/** The SVG document for `spec`, labeled for screen readers with {@link chartAlt}. */
+export function renderChartSvg(spec: ChartSpec): string {
 	const layer = drawChart(spec);
 	const header = drawHeader(spec, layer);
 	const head = matrixHead(spec);
@@ -268,8 +263,8 @@ export function renderChartSvg(spec: ChartSpec): ChartSvg {
 		height += 20;
 	}
 	height = Math.ceil(height + PAD);
-	const svg = [
-		`<svg xmlns="http://www.w3.org/2000/svg" width="${WIDTH}" height="${height}" viewBox="0 0 ${WIDTH} ${height}" font-family="${FONT}" font-size="${LABEL_SIZE}">`,
+	return [
+		`<svg xmlns="http://www.w3.org/2000/svg" width="${WIDTH}" height="${height}" viewBox="0 0 ${WIDTH} ${height}" role="img" aria-label="${escapeXml(chartAlt(spec))}" font-family="${FONT}" font-size="${LABEL_SIZE}">`,
 		layer.body.includes(`url(#${INK_MASK})`) ? INK_DEFS : "",
 		`<g transform="translate(0 ${PAD})">${header.body}</g>`,
 		head.body && `<g transform="translate(0 ${num(PAD + header.height)})">${head.body}</g>`,
@@ -278,11 +273,10 @@ export function renderChartSvg(spec: ChartSpec): ChartSvg {
 		caption,
 		"</svg>",
 	].join("");
-	return { svg, width: WIDTH, height };
 }
 
-/** One-line description of the chart, for screen readers and terminals that show the alt text. */
-export function chartAlt(spec: ChartSpec): string {
+/** One-line description of the chart, for screen readers. */
+function chartAlt(spec: ChartSpec): string {
 	const joint =
 		spec.kind === "stacked" ? " + " : spec.kind === "slope" ? " → " : spec.kind === "butterfly" ? " vs " : ", ";
 	const names = spec.series.map(entry => entry.name).join(joint);
@@ -4432,6 +4426,13 @@ function token(name: string): string {
 	return `var(--${name})`;
 }
 
+/** `raw` safe as XML text or a double-quoted attribute value. */
+function escapeXml(raw: string): string {
+	return raw.replace(/[&<>"]/g, char =>
+		char === "&" ? "&amp;" : char === "<" ? "&lt;" : char === ">" ? "&gt;" : "&quot;",
+	);
+}
+
 function num(value: number): string {
 	return Number(value.toFixed(1)).toString();
 }
@@ -4469,10 +4470,6 @@ function text(x: number, y: number, content: string | readonly TextRun[], style:
 		style.weight ? `font-weight="${style.weight}"` : "",
 		style.italic ? `font-style="italic"` : "",
 	].filter(Boolean);
-	const escape = (raw: string) =>
-		raw.replace(/[&<>"]/g, char =>
-			char === "&" ? "&amp;" : char === "<" ? "&lt;" : char === ">" ? "&gt;" : "&quot;",
-		);
 	const body = runs
 		.filter(run => run.content)
 		.map(run => {
@@ -4480,7 +4477,7 @@ function text(x: number, y: number, content: string | readonly TextRun[], style:
 				run.fill ? ` fill="${token(run.fill)}"` : "",
 				run.weight ? ` font-weight="${run.weight}"` : "",
 			].join("");
-			return own ? `<tspan${own}>${escape(run.content)}</tspan>` : escape(run.content);
+			return own ? `<tspan${own}>${escapeXml(run.content)}</tspan>` : escapeXml(run.content);
 		})
 		.join("");
 	return `<text ${attrs.join(" ")}>${body}</text>`;

package/src/charts/table-data.ts

@@ -148,7 +148,17 @@ export interface TableAnalysis {
 	readonly composition?: Composition;
 }
 
-const NUMBER = String.raw`(?:\d{1,3}(?:,\d{3})+|\d+)(?:\.\d+)?(?:[eE][+-]?\d+)?|\.\d+`;
+/**
+ * A whole number as written: bare, or grouped in thousands by commas (`1,988`)
+ * or by spaces as many locales write it (`1 988`, also U+00A0 and U+202F).
+ * Space groups take exactly three digits, so `12 5` and `128 2560` stay apart.
+ */
+const INTEGER = String.raw`\d{1,3}(?:,\d{3})+|\d{1,3}(?:[ \u00A0\u202F]\d{3})+(?!\d)|\d+`;
+const NUMBER = String.raw`(?:${INTEGER})(?:\.\d+)?(?:[eE][+-]?\d+)?|\.\d+`;
+/** A cell holding one whole number and nothing else (`38`, `1,980`). */
+const WHOLE = new RegExp(String.raw`^(?:${INTEGER})$`);
+/** The first number of a figure, its whole part and its decimals apart. */
+const WRITTEN = new RegExp(String.raw`(${INTEGER})(?:\.(\d+))?`);
 const CELL = new RegExp(
 	String.raw`^(?<approx>~|≈|<=|>=|<|>|≤|≥)?\s*(?<sign>[+\-−±])?\s*(?<cur>[$€£¥])?\s*(?<num>${NUMBER})(?<plus>\+(?=\s*[A-Za-zµμ%]))?\s*(?<unit>%|[A-Za-zµμ×]+(?:\/[A-Za-z]+)?|\/s)?(?<rest>.*)$`,
 );
@@ -517,8 +527,9 @@ export function parseCell(markdown: string): Cell {
 	return { ...cell, fit: "prose" };
 }
 
+/** The value of a number {@link NUMBER} matched, its comma or space group separators removed. */
 function toNumber(written: string): number {
-	return Number(written.replaceAll(",", ""));
+	return Number(written.replace(/[,\s]/g, ""));
 }
 
 /** A number of a list or sum: its value as written, its unit (known or a noun) and how it was marked. */
@@ -632,7 +643,7 @@ function listCell(text: string, base: CellBase): NumberCell | undefined {
 	// A spaced pair of bare numbers that is no score (`25.0 / 27.8`, `12.6 / 9.4`: the second is no whole, or
 	// the first exceeds it) lists two values of the column's quantity; `27 / 30` stays a score.
 	const [first, second] = items;
-	const whole = /^\d[\d,]*$/.test(text.slice(text.indexOf("/") + 1, end).trim());
+	const whole = WHOLE.test(text.slice(text.indexOf("/") + 1, end).trim());
 	const score = whole && first!.value >= 0 && first!.value <= second!.value;
 	const pair = items.length === 2 && !marked.some(Boolean) && separators[0] !== "/" && !score;
 	if (!pair && (!marked.at(-1) || !(marked.every(Boolean) || carried))) return undefined;
@@ -876,9 +887,9 @@ const WHOLE_HEADER = /\b(?:total|all|sum|overall)\b/i;
  */
 export function writtenSlack(cell: NumberCell): number {
 	if (cell.denominator !== undefined && cell.dim === "percent") return 0;
-	const match = /(\d[\d,]*)(?:\.(\d+))?/.exec(cell.figure);
+	const match = WRITTEN.exec(cell.figure);
 	if (!match) return 0;
-	const written = Number(`${match[1]!.replaceAll(",", "")}${match[2] ? `.${match[2]}` : ""}`);
+	const written = toNumber(`${match[1]!}${match[2] ? `.${match[2]}` : ""}`);
 	const factor = written ? Math.abs(cell.value) / written : 1;
 	const decimals = match[2]?.length ?? 0;
 	if (cell.dim === "count" && decimals === 0 && factor === 1 && !cell.approx) return 0;
@@ -1097,7 +1108,7 @@ const MIN_LISTS = 2;
 /** A spaced slash between list items. */
 const LIST_SLASH = /\s+\/\s+/;
 /** A list item that is one number, as written (`12`, `~1,400`, `3.5 ms`, `40%`). */
-const LISTED_NUMBER = /^[~≈]?[$€£¥]?\d[\d,]*(?:\.\d+)?\s*(?:%|[A-Za-zµμ]+)?$/;
+const LISTED_NUMBER = new RegExp(String.raw`^[~≈]?[$€£¥]?(?:${INTEGER})(?:\.\d+)?\s*(?:%|[A-Za-zµμ]+)?$`);
 
 /**
  * Rows folding several rows into one (`response anthropic / chat / responses /

package/src/chat/advisor-message.d.ts

@@ -1,6 +1,6 @@
 import { type Component } from "../tui";
 import type { AdvisorMessageDetails } from "./messages";
-import { type Theme } from "../theme";
+import type { Theme } from "../theme";
 import { type NativeUiEvent } from "../native/node";
 /** The advisor card: shared by the controlled expansion getter and native toggles. */
 export interface AdvisorMessageCard extends Component {
@@ -14,6 +14,9 @@ export interface AdvisorMessageCard extends Component {
  * output (whose `thinkingText` color equals `toolOutput` in most themes):
  * a bold `customMessageLabel` header tag (skill-card convention), a heavy
  * rail tinted per-note severity, and the note body on the default text color.
+ * Natively it is a callout tinted by its worst note: that severity's icon and
+ * the tally head it, the advisor's name ends the head, and with several notes
+ * each leads with its own severity icon.
  *
  * `getExpanded` owns expansion; a native toggle overrides it for this card
  * until the next transcript-wide change.