@bismawy/pi-arnative 0.2.11 → 0.3.0

package/extensions/timestamps.ts

@@ -101,9 +101,8 @@ export function placeTimeAtRight(
 	const leftPart = sliceByColumn(line, 0, targetCol, true);
 	const leftW = visibleWidth(leftPart);
 	const pad = " ".repeat(Math.max(0, targetCol - leftW));
-	const bg = bgOpen ? bgOpen : "";
 	const reset = bgOpen ? "\x1b[49m" : "";
-	return `${leftPart}${bg}${pad}${timeBadge} ${reset}`;
+	return `${leftPart}${bgOpen}${pad}${timeBadge} ${reset}`;
 }
 
 if (!tsState.patched) {
@@ -211,6 +210,9 @@ export default function (pi: ExtensionAPI) {
 		}
 	});
 
+	// The map is cleared per session (it is refilled from the branch right below),
+	// so it is bounded by the current session instead of growing for the process lifetime.
+	USER_TIMESTAMPS_MAP.clear();
 	// The active theme is re-read per session (ctx.ui.theme); render reads it lazily.
 	// History for old user messages is read HERE, never at render time: the ctx is only
 	// valid inside a handler. A ctx captured in the module throws after session
@@ -285,6 +287,7 @@ if (isMain(import.meta.url)) {
 		},
 	);
 	assert(USER_TIMESTAMPS_MAP.get("after reload") === 4242, "reloaded module prefills the shared map read by the patched render");
+	assert(!USER_TIMESTAMPS_MAP.has("old question"), "session_start clears the map first (bounded growth, current session only)");
 	assert(tsState.theme === theme, "reloaded module shares the theme read by the patched render");
 	console.log("timestamps.ts self-check OK");
 }

package/extensions/tools.ts

@@ -11,7 +11,7 @@
  * Collapsed summary: bash/write `󱞩 first line`; grep/find/read numeric
  * (→ N matches / → N files / N lines); edit `󱞩 +N / -M`. Expanded plain output
  * gets no summary line (no duplicated first line).
- * Colors: tool name accent, paths/links tint, box lines + 󱞩 dim. Execution is a
+ * Colors: tool name accent, paths/links soft, box lines + 󱞩 dim. Execution is a
  * pure delegate (spread of the built-in tools).
  * "has a result" lives in context.state, read at render() -> restore/reload safe,
  * no stale 󰔟 box. Third-party tools with no renderer of their own (memory_write,
@@ -32,14 +32,14 @@ import {
 import { Markdown, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
 import { homedir } from "node:os";
 import { renderBoxLines as box } from "../lib/box.ts";
-import { stripAnsi } from "../lib/ansi.ts";
+import { stripAnsi, accentSoftOf } from "../lib/ansi.ts";
 import { assert, isMain } from "../lib/check.ts";
 import { expandKeyName } from "../lib/format.ts";
 
 type Theme = { fg(color: string, text: string): string; bg?(color: string, text: string): string };
 type TResult = { content: Array<{ type: string; text?: string }>; isError?: boolean; details?: any };
 type TCtx = { isError?: boolean; toolCallId?: string; args?: any; state?: Record<string, unknown> };
-type Res = (r: TResult, th: Theme, tint: (s: string) => string, isErr: boolean, expanded: boolean) => string;
+type Res = (r: TResult, th: Theme, soft: (s: string) => string, isErr: boolean, expanded: boolean) => string;
 
 const cwd = process.cwd();
 const TIMINGS = new Map<string, number>(); // duration ms per tool call (one run)
@@ -97,20 +97,10 @@ const countLines = (s: string): number => (s ? s.split("\n").filter(Boolean).len
 
 // Tint folder paths / URLs; everything else default.
 export const LINK_RE = /(?:https?:\/\/[^\s"'`)}\]]+|(?:~|\.{1,2})?\/[\w.+@~%/-]+|[\w.+@~-]+(?:\/[\w.+@~%/-]+)+)/g;
-export function paintLinks(text: string, tint: (s: string) => string): string {
-	return text.replace(LINK_RE, (m) => tint(m));
+export function paintLinks(text: string, soft: (s: string) => string): string {
+	return text.replace(LINK_RE, (m) => soft(m));
 }
 
-// "tint" only exists in arnative themes; other themes fall back to accent (probed per render)
-const tintOf = (theme: Theme): ((s: string) => string) => {
-	try {
-		theme.fg("tint", "");
-		return (s) => theme.fg("tint", s);
-	} catch {
-		return (s) => theme.fg("accent", s);
-	}
-};
-
 // Word-limited smart title: `maxWords` words + ellipsis; full text when expanded.
 export function smartTitle(cmd: string, maxWords = 6): string {
 	const words = cmd.replace(/\r?\n/g, " ").trim().split(/\s+/).filter(Boolean);
@@ -150,17 +140,17 @@ export function titleRow(
 
 // Default summary: collapsed `󱞩 first output line`, empty when expanded (the
 // full output is right below — no duplicate first line).
-export const resText: Res = (r, th, tint, isErr, expanded) => {
+export const resText: Res = (r, th, soft, isErr, expanded) => {
 	if (expanded && !isErr) return "";
 	const f = firstLine(textOf(r));
-	return f ? `${resHead(th)} ${paintLinks(f, tint)}` : resHead(th);
+	return f ? `${resHead(th)} ${paintLinks(f, soft)}` : resHead(th);
 };
 
 // Numeric summary `󱞩 → N matches`; errors fall back to the first line (most important).
 export const numRes =
 	(fmt: (n: number) => string): Res =>
-	(r, th, tint, isErr, expanded) => {
-		if (isErr) return resText(r, th, tint, isErr, false);
+	(r, th, soft, isErr, expanded) => {
+		if (isErr) return resText(r, th, soft, isErr, false);
 		if (expanded) return "";
 		return `${resHead(th)} ${fmt(countLines(textOf(r)))}`;
 	};
@@ -394,7 +384,7 @@ if (ToolExecutionComponent?.prototype?.render && !(globalThis as Record<symbol,
 					? safeCall(() => own.call(this, { content: result.content, details: result.details }, opts, th, ctx))
 					: null;
 			return new Lines((width) => {
-				const tint = tintOf(th);
+				const soft = accentSoftOf(th);
 				const inner = Math.max(8, width - 4);
 				const icon = isErr ? th.fg("error", "x") : th.fg("success", "✓");
 				const boxed2 = componentLines(theirs, width - 6);
@@ -422,7 +412,7 @@ if (ToolExecutionComponent?.prototype?.render && !(globalThis as Record<symbol,
 				const summary = toolSummary(name, text, ctx.args);
 				const more = countLines(text) > 1;
 				const hint = more && !opts.expanded ? ` ${expandHint(th)}` : "";
-				rows.push(`${resHead(th)}${summary ? ` ${paintLinks(summary, tint)}` : ""}${hint}`);
+				rows.push(`${resHead(th)}${summary ? ` ${paintLinks(summary, soft)}` : ""}${hint}`);
 				if (opts.expanded && more) {
 					// MCP args are gone once the call box is replaced by the result.
 					if (MCP_TOOL(name)) rows.push(th.fg("dim", `args ${JSON.stringify(ctx.args ?? {})}`));
@@ -460,8 +450,8 @@ const formatTodoRows = (lines: string[], th: Theme): string[] => {
 function minimal(
 	pi: ExtensionAPI,
 	tool: { execute: (...a: any[]) => Promise<any> } & Record<string, unknown>,
-	name: (th: Theme, tint: (s: string) => string) => string,
-	call: (a: any, th: Theme, tint: (s: string) => string, expanded: boolean) => string,
+	name: (th: Theme, soft: (s: string) => string) => string,
+	call: (a: any, th: Theme, soft: (s: string) => string, expanded: boolean) => string,
 	res: Res = resText,
 	full: (r: TResult, th: Theme) => string[] = fullText,
 ): void {
@@ -485,13 +475,13 @@ function minimal(
 			return new Lines((width) => {
 				// Read context.state live (never capture): renderResult may create it after renderCall.
 				if (context.state?.hasResult) return [];
-				const tint = tintOf(theme);
+				const soft = accentSoftOf(theme);
 				const inner = Math.max(8, width - 4);
 				const rows = titleRow(
 					theme,
 					theme.fg("warning", spinIcon()),
-					name(theme, tint),
-					call(args, theme, tint, false),
+					name(theme, soft),
+					call(args, theme, soft, false),
 					inner,
 					"",
 					false,
@@ -513,18 +503,18 @@ function minimal(
 			const dur = ms !== undefined ? `${(ms / 1000).toFixed(1)}s` : "";
 			const icon = isErr ? theme.fg("error", "x") : theme.fg("success", "✓");
 			return new Lines((width) => {
-				const tint = tintOf(theme);
+				const soft = accentSoftOf(theme);
 				const inner = Math.max(8, width - 4);
 				const rows = titleRow(
 					theme,
 					icon,
-					name(theme, tint),
-					call(context.args ?? {}, theme, tint, expanded),
+					name(theme, soft),
+					call(context.args ?? {}, theme, soft, expanded),
 					inner,
 					dur,
 					expanded,
 				);
-				const resLine = res(result, theme, tint, isErr, expanded);
+				const resLine = res(result, theme, soft, isErr, expanded);
 				if (resLine) rows.push(resLine);
 				if (expanded) rows.push(...full(result, theme));
 				return box(theme, width, rows);
@@ -559,9 +549,9 @@ function arnativeTools(pi: ExtensionAPI) {
 		pi,
 		createBashTool(cwd),
 		(th) => th.fg("accent", "$"),
-		(a, _th, tint, expanded) => {
+		(a, _th, soft, expanded) => {
 			const cmd = (a.command ?? "").replace(/\r?\n/g, " ").trim();
-			return paintLinks(expanded ? cmd : smartTitle(cmd), tint);
+			return paintLinks(expanded ? cmd : smartTitle(cmd), soft);
 		},
 	);
 
@@ -570,10 +560,10 @@ function arnativeTools(pi: ExtensionAPI) {
 		pi,
 		createReadTool(cwd),
 		(th) => th.fg("accent", "read"),
-		(a, _th, tint) => {
+		(a, _th, soft) => {
 			const range =
 				a.offset || a.limit ? `:${a.offset ?? 1}${a.limit ? `-${(a.offset ?? 1) + a.limit - 1}` : ""}` : "";
-			return `${tint(shortPath(a.path ?? ""))}${range}`;
+			return `${soft(shortPath(a.path ?? ""))}${range}`;
 		},
 		numRes((n) => `${n} lines`),
 	);
@@ -583,8 +573,8 @@ function arnativeTools(pi: ExtensionAPI) {
 		pi,
 		createGrepTool(cwd),
 		(th) => th.fg("accent", "grep"),
-		(a, _th, tint) =>
-			`/${a.pattern ?? ""}/ in ${tint(shortPath(a.path ?? "."))}${a.glob ? ` (${a.glob})` : ""}`,
+		(a, _th, soft) =>
+			`/${a.pattern ?? ""}/ in ${soft(shortPath(a.path ?? "."))}${a.glob ? ` (${a.glob})` : ""}`,
 		numRes((n) => `→ ${n} matches`),
 	);
 
@@ -593,7 +583,7 @@ function arnativeTools(pi: ExtensionAPI) {
 		pi,
 		createFindTool(cwd),
 		(th) => th.fg("accent", "find"),
-		(a, _th, tint) => `${a.pattern ?? ""} in ${tint(shortPath(a.path ?? "."))}`,
+		(a, _th, soft) => `${a.pattern ?? ""} in ${soft(shortPath(a.path ?? "."))}`,
 		numRes((n) => `→ ${n} files`),
 	);
 
@@ -602,7 +592,7 @@ function arnativeTools(pi: ExtensionAPI) {
 		pi,
 		createWriteTool(cwd),
 		(th) => th.fg("accent", "write"),
-		(a, _th, tint) => tint(shortPath(a.path ?? "")),
+		(a, _th, soft) => soft(shortPath(a.path ?? "")),
 	);
 
 	// edit: `edit path`, `󱞩 +N / -M`, expand = diff toolDiff*
@@ -610,8 +600,8 @@ function arnativeTools(pi: ExtensionAPI) {
 		pi,
 		createEditTool(cwd),
 		(th) => th.fg("accent", "edit"),
-		(a, _th, tint) => tint(shortPath(a.path ?? "")),
-		(r, th, _tint, isErr, expanded) => {
+		(a, _th, soft) => soft(shortPath(a.path ?? "")),
+		(r, th, _soft, isErr, expanded) => {
 			if (isErr) return resText(r, th, (s) => s, isErr, false);
 			const diff: string = r.details?.diff ?? "";
 			let add = 0;

package/extensions/ui-render-tweaks.ts

@@ -11,10 +11,13 @@
  *    box; our renderer shows the content as-is.
  * 5. `↓ Jump to latest message` pill (fullscreen): bg selectedBg (grey) -> accent,
  *    text darkened (theme canvas) so contrast stays high (9.6:1).
+ * 6. `ctx.ui.select` rows: pi paints the whole selected row accent -> keep accent on
+ *    the `→` marker and `·` separators, selected text in soft.
  */
 import {
 	CompactionSummaryMessageComponent,
 	CustomMessageComponent,
+	ExtensionSelectorComponent,
 	getMarkdownTheme,
 	initTheme,
 	InteractiveMode,
@@ -37,8 +40,9 @@ import {
 } from "@earendil-works/pi-tui";
 import { readdirSync, readFileSync } from "node:fs";
 import { renderBoxLines } from "../lib/box.ts";
-import { ansiBgOpen, stripAnsi, themeOf } from "../lib/ansi.ts";
+import { ansiBgOpen, stripAnsi, themeOf, accentSoftOf } from "../lib/ansi.ts";
 import { assert, isMain } from "../lib/check.ts";
+import { contrast, parseOklch, toHex } from "../lib/color.ts";
 import { expandKeyName } from "../lib/format.ts";
 
 let activeThemeProxy: { fg(color: string, text: string): string; bg?(color: string, text: string): string } | null = null;
@@ -155,6 +159,43 @@ if (TuiAltScreen?.prototype && !(globalThis as Record<symbol, boolean>)[PILL_KEY
 	}
 }
 
+// 6. Select menus (ctx.ui.select -> ExtensionSelectorComponent.updateList): pi colors the
+// whole selected row accent. Arnative keeps accent on the `→` marker and `·` separators
+// and moves the selected text to soft (accent on themes without the token).
+const SELECT_ROW_KEY = Symbol.for("pi-arnative.selectRowColors");
+
+/** Selected row body: `·` separators accent, the text around them soft. */
+export function selectRowText(row: string, th: { fg(c: string, t: string): string }): string {
+	const soft = accentSoftOf(th);
+	return row
+		.split("·")
+		.map((part) => soft(part))
+		.join(th.fg("accent", "·"));
+}
+
+if (ExtensionSelectorComponent?.prototype && !(globalThis as Record<symbol, boolean>)[SELECT_ROW_KEY]) {
+	(globalThis as Record<symbol, boolean>)[SELECT_ROW_KEY] = true;
+	const proto = ExtensionSelectorComponent.prototype as unknown as {
+		options: string[];
+		selectedIndex: number;
+		listContainer: { clear(): void; addChild(c: unknown): void };
+		updateList(): void;
+	};
+	const origUpdateList = proto.updateList;
+	proto.updateList = function (this: typeof proto) {
+		const th = activeThemeProxy;
+		if (!th) return origUpdateList.call(this); // no theme yet -> pi's default
+		this.listContainer.clear();
+		for (let i = 0; i < this.options.length; i++) {
+			const text =
+				i === this.selectedIndex
+					? th.fg("accent", "→ ") + selectRowText(this.options[i]!, th)
+					: `  ${th.fg("text", this.options[i]!)}`;
+			this.listContainer.addChild(new Text(text, 1, 0));
+		}
+	};
+}
+
 export default function uiRenderTweaks(pi: ExtensionAPI) {
 	// The active theme is re-read per session (ctx.ui.theme); render reads it lazily.
 	pi.on("session_start", async (_event, ctx) => {
@@ -339,10 +380,13 @@ if (isMain(import.meta.url)) {
 		vars: Record<string, string>;
 		colors: Record<string, string>;
 	};
-	const hex = (tok: string) => themeJson.vars[themeJson.colors[tok] ?? tok];
+	// Themes store OKLCH; the Theme class shipped in node_modules (0.87.1) only parses
+	// hex, so resolve every token through lib/color before constructing it.
+	const resolve = (value: string) => toHex(themeJson.vars[value] ?? value);
+	const hex = (tok: string) => resolve(themeJson.colors[tok] ?? tok);
 	// The built-in theme adds fallbacks (scrollbarTrack<-muted, thinkingMax<-thinkingXhigh),
 	// so the fg map must be complete; take the whole palette like pi's loader does.
-	const fgPalette = Object.fromEntries(Object.entries(themeJson.colors).map(([k, v]) => [k, themeJson.vars[v] ?? v]));
+	const fgPalette = Object.fromEntries(Object.entries(themeJson.colors).map(([k, v]) => [k, resolve(v)]));
 	const thPill = new Theme(fgPalette, { toolPendingBg: hex("toolPendingBg"), selectedBg: hex("selectedBg") }, "truecolor");
 	const pillOriginal = thPill.bg("selectedBg", thPill.fg("text", " ↓ Jump to latest message · End "));
 	const rgb = (h: string) => [1, 3, 5].map((i) => parseInt(h.slice(i, i + 2), 16)).join(";");
@@ -361,6 +405,14 @@ if (isMain(import.meta.url)) {
 	assert(accentPill("other text", thPill) === "other text", "pill: non-pill text untouched");
 	assert(accentPill(pillOriginal, null) === pillOriginal, "pill: no theme -> passed through");
 
+	// select rows: `→` + `·` stay accent, selected text moves to accentSoft
+	const tagFg = { fg: (c: string, t: string) => `<${c}>${t}</${c}>` };
+	assert(
+		selectRowText("Routing  ·  off", tagFg) === "<accentSoft>Routing  </accentSoft><accent>·</accent><accentSoft>  off</accentSoft>",
+		"select row: separators accent, text accentSoft",
+	);
+	assert(selectRowText("plain", tagFg) === "<accentSoft>plain</accentSoft>", "select row without separators: all accentSoft");
+
 	// Theme variants: every themes/*.json must be valid — name = file name, all
 	// required colors present, valid hex, and contrast measured against that theme's
 	// own canvas (userMessageBg): content >= 3.0, secondary text >= 2.0, thinking
@@ -380,16 +432,7 @@ if (isMain(import.meta.url)) {
 		thinkingOff: 1.3, thinkingMinimal: 1.3, thinkingLow: 2.0,
 		thinkingMedium: 2.7, thinkingHigh: 3.6, thinkingXhigh: 4.0,
 	};
-	const luminance = (h: string) => {
-		const ch = [1, 3, 5].map((i) => parseInt(h.slice(i, i + 2), 16) / 255).map((c) =>
-			c <= 0.03928 ? c / 12.92 : ((c + 0.055) / 1.055) ** 2.4,
-		);
-		return 0.2126 * ch[0]! + 0.7152 * ch[1]! + 0.0722 * ch[2]!;
-	};
-	const contrast = (a: string, b: string) => {
-		const [x, y] = [luminance(a), luminance(b)].sort((m, n) => n - m);
-		return (x! + 0.05) / (y! + 0.05);
-	};
+	const isColor = (v: string) => /^#[0-9a-f]{6}$/i.test(v) || parseOklch(v) !== null;
 	for (const f of readdirSync(themesDir).filter((n) => n.endsWith(".json")).sort()) {
 		const d = JSON.parse(readFileSync(new URL(f, themesDir), "utf8")) as {
 			name: string;
@@ -399,29 +442,45 @@ if (isMain(import.meta.url)) {
 		assert(d.name === f.replace(/\.json$/, ""), `theme ${f}: name = file name`);
 		const missing = required.filter((k) => !(k in d.colors));
 		assert(missing.length === 0, `theme ${f}: required colors complete (missing ${missing.join(",")})`);
-		// colors values may only be: hex, 256-index, empty, or a REAL variable name —
+		// colors values may only be: hex, oklch, 256-index, empty, or a REAL variable name —
 		// a bare color name (e.g. "muted") makes pi reject the theme with no clear reason.
 		for (const [tok, value] of Object.entries(d.colors)) {
 			if (typeof value !== "string") continue;
-			if (value === "" || /^#[0-9a-f]{6}$/i.test(value) || value in d.vars) continue;
-			assert(false, `theme ${f}: colors.${tok} = "${value}" is not hex/var`);
+			if (value === "" || isColor(value) || value in d.vars) continue;
+			assert(false, `theme ${f}: colors.${tok} = "${value}" is not hex/oklch/var`);
+		}
+		// Every var must itself be a real color, and no two vars may resolve to the
+		// same value — near-identical hand-written hex was the original problem.
+		for (const [name, value] of Object.entries(d.vars)) {
+			assert(isColor(value), `theme ${f}: vars.${name} is a color (${value})`);
 		}
-		const hex = (tok: string) => d.vars[d.colors[tok] ?? tok] ?? d.colors[tok];
+		const seenVar = new Map<string, string>();
+		for (const [name, value] of Object.entries(d.vars)) {
+			const h = toHex(value);
+			assert(!seenVar.has(h), `theme ${f}: vars.${name} duplicates vars.${seenVar.get(h)} (${h})`);
+			seenVar.set(h, name);
+		}
+		const hex = (tok: string) => toHex(d.vars[d.colors[tok] ?? tok] ?? d.colors[tok]!);
 		for (const tok of ["accent", "text", "selectedBg", "toolPendingBg"]) {
-			assert(/^#[0-9a-f]{6}$/i.test(hex(tok)), `theme ${f}: ${tok} is hex (${hex(tok)})`);
+			assert(isColor(d.vars[d.colors[tok] ?? tok] ?? d.colors[tok]!), `theme ${f}: ${tok} is a color (${hex(tok)})`);
 		}
 		// Accent pill: accent bg + toolPendingBg colored text.
 		assert(contrast(hex("accent"), hex("toolPendingBg")) >= 4.5, `theme ${f}: accent vs toolPendingBg contrast >= 4.5`);
-		assert(/^#[0-9a-f]{6}$/i.test(d.vars.softCyan ?? ""), `theme ${f}: vars.softCyan (tint) is hex`);
+		assert(isColor(d.vars.accentSoft ?? ""), `theme ${f}: vars.accentSoft is a color`);
 		const canvas = hex("userMessageBg");
 		for (const tok of Object.keys(d.colors)) {
 			if (nonText.has(tok) || tok === "thinkingMax") continue;
 			const color = hex(tok);
-			if (!/^#[0-9a-f]{6}$/i.test(color)) continue; // 256-color index: let pi judge it
 			const limit = ramp[tok] ?? (secondary.has(tok) ? 2.0 : 3.0);
 			const c = contrast(color, canvas);
 			assert(c >= limit, `theme ${f}: ${tok} vs canvas contrast ${c.toFixed(2)} < ${limit}`);
 		}
+		// Thinking ramp must rise monotonically (Off < Minimal < … < Xhigh).
+		const rampKeys = ["thinkingOff", "thinkingMinimal", "thinkingLow", "thinkingMedium", "thinkingHigh", "thinkingXhigh"];
+		for (let i = 1; i < rampKeys.length; i++) {
+			const [lo, hi] = [hex(rampKeys[i - 1]!), hex(rampKeys[i]!)];
+			assert(contrast(lo, canvas) < contrast(hi, canvas), `theme ${f}: ${rampKeys[i]} is brighter than ${rampKeys[i - 1]}`);
+		}
 		// Tool box text must be readable on the success background AND in errors, and
 		// the error text in the error box — three pairs that used to pass (3.48-4.46)
 		// without being caught.
@@ -433,8 +492,13 @@ if (isMain(import.meta.url)) {
 			assert(c >= 4.5, `theme ${f}: ${fg} on ${bg} contrast ${c.toFixed(2)} < 4.5`);
 		}
 		// The error box must not be heavier than the success box (matching background luminance).
-		const [lErr, lOk] = [luminance(hex("toolErrorBg")), luminance(hex("toolSuccessBg"))];
-		assert(Math.abs(lErr - lOk) / Math.max(lErr, lOk) <= 0.25, `theme ${f}: toolErrorBg vs toolSuccessBg weight (${lErr.toFixed(3)} vs ${lOk.toFixed(3)})`);
+		const [lErr, lOk] = [hex("toolErrorBg"), hex("toolSuccessBg")].map((h) => {
+			const ch = [1, 3, 5].map((i) => parseInt(h.slice(i, i + 2), 16) / 255).map((c) =>
+				c <= 0.03928 ? c / 12.92 : ((c + 0.055) / 1.055) ** 2.4,
+			);
+			return 0.2126 * ch[0]! + 0.7152 * ch[1]! + 0.0722 * ch[2]!;
+		});
+		assert(Math.abs(lErr! - lOk!) / Math.max(lErr!, lOk!) <= 0.25, `theme ${f}: toolErrorBg vs toolSuccessBg weight (${lErr!.toFixed(3)} vs ${lOk!.toFixed(3)})`);
 		// Scrollbar thumb & highlight must be distinguishable from track/selection (they used to be identical).
 		assert(hex("scrollbarThumb") !== hex("scrollbarTrack"), `theme ${f}: scrollbarThumb still equals scrollbarTrack`);
 		assert(hex("searchMatchBg") !== hex("selectedBg"), `theme ${f}: searchMatchBg still equals selectedBg`);
@@ -447,7 +511,7 @@ if (isMain(import.meta.url)) {
 	assert(accentPill(pillOriginal, thEmpty) === pillOriginal, "pill: token absent -> passed through");
 	const hostPil: { scrollToEndIndicator?: () => string } = { scrollToEndIndicator: () => pillOriginal };
 	const inPill = withAccentPill(hostPil, () => hostPil.scrollToEndIndicator?.(), thPill);
-	assert(inPill.includes("\x1b[48;2;0;215;255m"), "pill: instance callback injected with accent bg");
+	assert(inPill.includes(`\x1b[48;2;${rgb(hex("accent"))}m`), "pill: instance callback injected with accent bg");
 	assert(hostPil.scrollToEndIndicator?.() === pillOriginal, "pill: original callback restored after render");
 
 	// compaction: pi's three lines -> one

package/extensions/usage.ts

@@ -4,6 +4,9 @@
  * shared with the Model tab.
  */
 import type { ExtensionAPI, ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
+import { getAgentDir } from "@earendil-works/pi-coding-agent";
+import { existsSync, readFileSync } from "node:fs";
+import { join } from "node:path";
 import { matchesKey, truncateToWidth, visibleWidth, type Component, type TUI } from "@earendil-works/pi-tui";
 import { boxEdge, boxRow } from "../lib/box.ts";
 import { assert, isMain } from "../lib/check.ts";
@@ -12,7 +15,11 @@ import { collectUsageSummary, formatTokens, getModelAllTimeUsage, type UsageSumm
 export function formatCost(n: number): string {
 	if (!n || n <= 0) return "-";
 	if (n < 0.01) return "<$0.01";
-	if (n < 1000) return `$${n.toFixed(2)}`;
+	if (n < 1000) {
+		// Rounding at the boundary used to print "$1000.00" instead of "$1.0k".
+		const s = n.toFixed(2);
+		return s === "1000.00" ? "$1.0k" : `$${s}`;
+	}
 	return `$${(n / 1000).toFixed(1)}k`;
 }
 
@@ -147,9 +154,9 @@ export class UsageModalComponent implements Component {
 		// arnative chat-column box wraps title + table + hint, full width.
 		// Round ends (╭─╮ / ╰─╯); sides + divider from lib/box.ts (single definition).
 		const boxW = width;
-		const tint = (s: string) => th.fg("tint", s);
-		const hline = (l: string, r: string) => boxEdge(l, r, boxW, tint);
-		const row = (text: string) => boxRow(text, boxW, tint);
+		const soft = (s: string) => th.fg("accentSoft", s);
+		const hline = (l: string, r: string) => boxEdge(l, r, boxW, soft);
+		const row = (text: string) => boxRow(text, boxW, soft);
 		const rule = () => hline("├", "┤");
 
 		const rows = this.buildFlatRows();
@@ -208,7 +215,7 @@ export class UsageModalComponent implements Component {
 			const actualIdx = startIdx + i;
 			const isSelected = actualIdx === this.selectedIndex;
 
-			const nameColor = isSelected ? "accent" : item.type === "provider" ? "tint" : "text";
+			const nameColor = isSelected ? "accent" : item.type === "provider" ? "accentSoft" : "text";
 			const valColor = isSelected ? "accent" : "dim";
 
 			const cName = formatCol(th.fg(nameColor, isSelected ? bold(item.label) : item.label), colW.name, false);
@@ -228,14 +235,14 @@ export class UsageModalComponent implements Component {
 
 		// Total row
 		const t = this.summary.totals;
-		const totalName = formatCol(th.fg("tint", bold("Total")), colW.name, false);
-		const totalSess = formatCol(th.fg("tint", bold(formatCount(t.sessions))), colW.sessions);
-		const totalMsgs = formatCol(th.fg("tint", bold(formatCount(t.msgs))), colW.msgs);
-		const totalToks = formatCol(th.fg("tint", bold(formatTokens(t.totalTokens))), colW.tokens);
-		const totalInp = formatCol(th.fg("tint", bold(formatTokens(t.input))), colW.inp);
-		const totalOut = formatCol(th.fg("tint", bold(formatTokens(t.output))), colW.out);
-		const totalCache = formatCol(th.fg("tint", bold(formatTokens(t.cacheRead))), colW.cache);
-		const totalCost = formatCol(th.fg("tint", bold(formatCost(t.cost))), colW.cost);
+		const totalName = formatCol(th.fg("accentSoft", bold("Total")), colW.name, false);
+		const totalSess = formatCol(th.fg("accentSoft", bold(formatCount(t.sessions))), colW.sessions);
+		const totalMsgs = formatCol(th.fg("accentSoft", bold(formatCount(t.msgs))), colW.msgs);
+		const totalToks = formatCol(th.fg("accentSoft", bold(formatTokens(t.totalTokens))), colW.tokens);
+		const totalInp = formatCol(th.fg("accentSoft", bold(formatTokens(t.input))), colW.inp);
+		const totalOut = formatCol(th.fg("accentSoft", bold(formatTokens(t.output))), colW.out);
+		const totalCache = formatCol(th.fg("accentSoft", bold(formatTokens(t.cacheRead))), colW.cache);
+		const totalCost = formatCol(th.fg("accentSoft", bold(formatCost(t.cost))), colW.cost);
 
 		out.push(row("  " + totalName + totalSess + totalMsgs + totalToks + totalInp + totalOut + totalCache + totalCost));
 
@@ -271,6 +278,12 @@ if (isMain(import.meta.url)) {
 	assert(formatCost(0.004) === "<$0.01", "formatCost 0.004 = <$0.01");
 	assert(formatCost(12.345) === "$12.35", "formatCost 12.345 = $12.35");
 	assert(formatCost(1234.5) === "$1.2k", "formatCost 1234.5 = $1.2k");
+	// Boundary regressions: rounding used to print "1000k" / "$1000.00".
+	assert(formatTokens(999_500) === "999.5k", "formatTokens stays k below 1M");
+	assert(formatTokens(999_999) === "1M", "formatTokens promotes a k value that rounds to 1000");
+	assert(formatTokens(999_999_999) === "1B", "formatTokens promotes an M value that rounds to 1000");
+	assert(formatTokens(9_999) === "10k", "formatTokens strips a .0 k tail");
+	assert(formatCost(999.996) === "$1.0k", "formatCost rolls over at $1000");
 
 	const summary = collectUsageSummary();
 	assert(summary.providers.length > 0, "collectUsageSummary detects providers");
@@ -280,6 +293,17 @@ if (isMain(import.meta.url)) {
 
 	const modelUsage = getModelAllTimeUsage("gemini-3.8-flash");
 	assert(modelUsage.input > 0, "getModelAllTimeUsage reads input tokens for gemini-3.8-flash");
+	assert(
+		getModelAllTimeUsage(undefined).input === 0 && getModelAllTimeUsage(undefined).output === 0,
+		"getModelAllTimeUsage without a model id matches nothing (no grand total)",
+	);
+
+	// Disk cache pruning: no cache key may point at a session file that is gone.
+	const cacheFile = join(getAgentDir(), "arnative-usage-cache.json");
+	if (existsSync(cacheFile)) {
+		const raw = JSON.parse(readFileSync(cacheFile, "utf8")) as Record<string, unknown>;
+		assert(Object.keys(raw).every((k) => existsSync(k)), "usage disk cache prunes deleted session files");
+	}
 
 	const fakeTheme = {
 		fg: (_c: string, t: string) => `\x1b[38;2;100;100;100m${t}\x1b[39m`,

package/lib/ansi.ts

@@ -25,6 +25,18 @@ export function themeOf<T>(ctx: unknown): T | null {
 	return (ctx as { ui?: { theme?: T } } | null | undefined)?.ui?.theme ?? null;
 }
 
+/** Painter for the `accentSoft` token, which only arnative themes define; other themes fall back to accent (probed once). */
+export function accentSoftOf(th: { fg?(c: string, t: string): string } | null): (s: string) => string {
+	const fg = th?.fg?.bind(th);
+	if (!fg) return (s) => s;
+	try {
+		fg("accentSoft", "");
+		return (s) => fg("accentSoft", s);
+	} catch {
+		return (s) => fg("accent", s);
+	}
+}
+
 // Self-check: `node lib/ansi.ts`
 if (isMain(import.meta.url)) {
 	assert(ansiBgOpen(null, "selectedBg") === "", "no theme: empty");
@@ -33,5 +45,16 @@ if (isMain(import.meta.url)) {
 	assert(stripAnsi("x\x1b[K") === "x", "stripAnsi removes non-SGR CSI too");
 	assert(themeOf({ ui: { theme: "T" } }) === "T", "themeOf reads ctx.ui.theme");
 	assert(themeOf(null) === null, "themeOf tolerates a missing ctx");
+
+	const tag = { fg: (c: string, t: string) => `<${c}>${t}</${c}>` };
+	assert(accentSoftOf(tag)("x") === "<accentSoft>x</accentSoft>", "accentSoftOf uses accentSoft when the theme defines it");
+	const noSoft = {
+		fg: (c: string, t: string) => {
+			if (c === "accentSoft") throw new Error("Unknown theme color: accentSoft");
+			return `<${c}>${t}</${c}>`;
+		},
+	};
+	assert(accentSoftOf(noSoft)("x") === "<accent>x</accent>", "accentSoftOf falls back to accent without the token");
+	assert(accentSoftOf(null)("x") === "x", "accentSoftOf without a theme is identity");
 	console.log("lib/ansi.ts OK");
 }