@bismawy/pi-arnative 0.5.1 → 0.5.3

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 # Changelog
 
+## [0.5.3] - 2026-10-14
+
+### Fixed
+- A new session showed the previous session's token counts. The footer's 2s `getUsage` cache is keyed on branch length, and the module is not re-imported by `/new`, so a fresh session whose branch happened to reach the same length read the cached sums instead of its own. The cache is now cleared in the non-reload `session_start` branch (`extensions/footer.ts`).
+- **The cell was invisible: the footer still matched the value on `jev-eye`.** The value became `Eye: ● ON (Clef Flash)`, which contains no `jev-eye` anywhere, so `value.includes("jev-eye")` went false and the whole cell fell through to the generic path — no icon, no dim backend suffix, just grey text. The router now recognises the cell by the label its value carries (`isJevEyeStatus`, `^\s*Eye\s*:`), and the self-check pins that rule from both sides: every mode's real value is recognised, `Jev: ● ON` and `MCP: 2 servers enabled` are not, and the value is asserted to contain no internal key name. Proved negative: reverting the rule to the substring test makes both `node extensions/footer.ts` and pi-jev-eye's `render-check` fail.
+- **One space after the glyph, not two.** The two spaces existed because the previous glyph's ink overran its cell (`\uedcf`); with `\uf21b` in place they read as a gap in `  Eye: ● ON (Clef Flash)`. Pinned in pi-jev-eye's render check as one space, with an explicit assert that the glyph is not followed by two.
+
+### Changed
+- **The cell glyph is U+F21B (`fa-user_secret`), chosen by the operator.** U+EDCF (`fa-user_shield`) was the previous one; both exist in JetBrainsMono Nerd Font, and the codepoint is pinned by number in pi-jev-eye's render check because a Nerd glyph that renders blank on another platform is the bug the ponytail cell had (`\uf51` -> `\uef04`).
+- **The pi-jev-eye status cell renders `Eye: ● ON (Backend)`, parsed from the value instead of hardcoded.** The format is `Eye: ● ON (Clef Flash)` when a Clef model answers and `Eye: ● ON (Jev)` when TypeSafe or OpenRouter does. `jevEyeStatusLine()` reads the label before the first colon and the backend from the trailing parentheses — so nothing about the cell is a literal in this repo, and an older pi-jev-eye value with no suffix gains no guessed one.
+- **The backend suffix takes `dim`, while `Eye:` and the state keep their tiers.** A backend painted like the label would bury `Eye: ● ON`, which is the case this cell exists for; the spaced `Clef Flash` (not a nested `clef (flash)`) reads as one label on a single line.
+- **The status line moved out of the render closure**, next to `ponytailStatusLine`, so the self-check in `node extensions/footer.ts` drives the exact path the footer uses instead of a copy of it.
+- Dropped two unused imports (`CustomMessageComponent`, `isPointerOrFocusInput`) and corrected three stale statements: the usage estimate comment named `prices.json` where the code reads `models.json`, the footer header listed two of the three footer presets, and the README's local-test snippet ran one extension where `npm run dev` runs all eight (`extensions/ui-render-tweaks.ts`, `lib/usage-store.ts`, `extensions/footer.ts`, `test/footer-minimal.test.ts`, `README.md`).
+
+### Added
+- Self-check for the pi-jev-eye cell: both requested forms (`Eye: ● ON (Clef Flash)`, `Eye: ● ON (Jev)`), the tierless `(Clef)`, an upstream `(Clef Omni)`, `OFF` taking the dim bullet, `REVIEW` keeping its warning bullet, and a suffix-less value drawing no parenthesis.
+
+## [0.5.2] - 2026-10-13
+
+### Fixed
+- Restored the footer's two-tone labels. `0.5.1` moved the label colour onto `softOf(accent)`, which softens the *accent* hue, so cwd/branch/clock/status text inherited the accent (pink) instead of the border-accent (blue) tier and the footer collapsed into a single hue (`extensions/footer.ts`).
+- Added `vars.secondarySoft` to all 11 themes, softened from the same value the `borderAccent` token resolves to (L 0.82, chroma × 0.18, hue kept), and `softSecondaryOf` in `lib/ansi.ts` to derive the identical value at runtime — `vars` names are not addressable via `fg()`, and Pi 1.2 rejects custom `colors` keys, so the declared and derived values must be produced by one recipe.
+- Routed the header's model/thinking/token text, tool bodies, list rows and the usage dashboard onto the label tier. Icons, marks and the logo's second tone stay on the accent tier, so each line keeps its two tones (`extensions/section-headers.ts`, `extensions/tools.ts`, `extensions/usage.ts`, `extensions/arnative.ts`, `extensions/ui-render-tweaks.ts`).
+
+### Added
+- `soften()` is now shared by the generator and the runtime, and `extensions/ui-render-tweaks.ts` asserts every declared `*Soft` var equals its derived value — a drifting or rogue soft colour fails `npm test` instead of shipping (`themes/gen-themes.mjs`, `lib/ansi.ts`).
+- Behavioral test pinning the two-tone rule: labels take the border-accent hue, icons keep the accent hue (`test/footer-minimal.test.ts`).
+
+### Notes
+- Label colour is deliberately softer than the pre-0.5.1 `#05dee7`. `SOFT_CHROMA_SCALE` in `lib/ansi.ts` is the single knob: `0.18` gives `#b2c9ca` on cyberpunk, `0.30` gives `#b2dadc`, `0.50` gives `#9adfe3`. Changing it regenerates all 11 themes and the guard forces them to stay in sync.
+
 ## [0.5.1] - 2026-10-13
 
 ### Fixed

package/README.md

@@ -46,7 +46,7 @@ Apply a theme via `/settings` → **Theme** → `arnative` (or variant). Require
 
 To test locally:
 ```bash
-pi --extension ./extensions/footer.ts
+npm run dev
 ```
 
 ## Shortcuts

package/extensions/arnative.ts

@@ -7,7 +7,7 @@
  */
 import type { ExtensionAPI, ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import { matchesKey, truncateToWidth, visibleWidth, type AutocompleteItem, type Component } from "@earendil-works/pi-tui";
-import { softOf, stripAnsi, thinkingColorOf } from "../lib/ansi.ts";
+import { softSecondaryOf, stripAnsi, thinkingColorOf } from "../lib/ansi.ts";
 import { renderScreen, screenTitle, type ScreenText } from "../lib/box.ts";
 import { assert, isMain } from "../lib/check.ts";
 import { markedLabels } from "../lib/format.ts";
@@ -172,7 +172,7 @@ export class ListPicker implements Component {
 	render(width: number): string[] {
 		const th = this.theme;
 		const bold = th.bold ?? ((t: string) => `\x1b[1m${t}\x1b[22m`);
-		const soft = softOf(th);
+		const soft = softSecondaryOf(th);
 		const edge = (text: string) => this.edge(text);
 		const column = Math.max(0, ...this.rows.map((r) => visibleWidth(r.label)));
 		const body: string[] = [];

package/extensions/footer.ts

@@ -2,7 +2,8 @@
  * Arnative footer (fixed 3-row grid). Row 1: cwd | active time | branch — model + thinking;
  * rows 2-3: extension status | tok/s · cache · token, each side wrapped in its half of the
  * width. The clock counts active time, not wall-clock age — see {@link ActiveClock}.
- * Preset (`/arnative footers`), live: "Arnative (Full)" (default) or "Pi (system)".
+ * Preset (`/arnative footers`), live: "Arnative (Full)" (default), "Arnative (Minimal)"
+ * or "Pi (system)".
  */
 import type { AssistantMessage } from "@earendil-works/pi-ai";
 import { CustomEditor, FooterComponent, type ExtensionAPI, type ExtensionContext } from "@earendil-works/pi-coding-agent";
@@ -11,7 +12,7 @@ import { execFile } from "node:child_process";
 import { mkdirSync, mkdtempSync, readFileSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { dirname, join, resolve } from "node:path";
-import { softOf, stripAnsi } from "../lib/ansi.ts";
+import { softOf, softSecondaryOf, stripAnsi } from "../lib/ansi.ts";
 import { assert, isMain } from "../lib/check.ts";
 import { capitalize, markedLabels, modelDisplayParts } from "../lib/format.ts";
 import { IS_WINDOWS_LIKE, SHORTCUT_RELOAD, SHORTCUT_TOGGLE_FOOTER } from "../lib/shortcuts.ts";
@@ -210,6 +211,55 @@ export function currentToolVerb(active: ReadonlyMap<string, string>): string {
 	return verb;
 }
 
+/**
+ * The pi-jev-eye status cell: `Eye: ● MODE (Backend)`. pi-jev-eye writes the value plain because a status
+ * is a fact, not a layout; this decides the painting.
+ *
+ * The trailing parenthesised backend is a modifier, so it takes `dim` while the `Eye:` label and the state
+ * keep the soft and state tiers — that is what makes `(Clef Flash)` recede and `Eye: ● ON` stay readable
+ * at a glance. The backend name itself is read out of the value, never hardcoded here: the extension
+ * reports the active backend from `/jev-eye models`, so the footer cannot know it in advance.
+ */
+/**
+ * Is this status value pi-jev-eye's own cell? It is matched on the LABEL the value carries (`Eye:`), not on
+ * the internal key name: the value is `Eye: ● ON (Clef Flash)` and contains no `jev-eye` anywhere, so the
+ * old `value.includes("jev-eye")` test went false and the whole cell fell through to the generic path —
+ * which is exactly how it silently lost its icon and its dim backend suffix.
+ *
+ * Recognising the label keeps the rule honest: if pi-jev-eye renames its label, this test fails loudly in
+ * the self-check below instead of degrading to a plain grey cell.
+ */
+export const isJevEyeStatus = (status: string): boolean => /^\s*Eye\s*:/i.test(stripAnsi(status));
+
+export function jevEyeStatusLine(
+	status: string,
+	acc: (text: string) => string,
+	dim: (text: string) => string,
+	soft: (text: string) => string,
+	theme?: { fg?: (color: string, text: string) => string },
+): string {
+	const clean = stripAnsi(status);
+	const isOff = clean.includes("OFF") || clean.includes("\u25CB");
+	const isReview = /REVIEW/i.test(clean);
+	let bullet = isOff ? dim("\u25CB") : acc("\u25CF");
+	if (isReview && typeof theme?.fg === "function") {
+		try {
+			bullet = theme.fg("warning", "\u25CF");
+		} catch {
+			bullet = acc("\u25CF");
+		}
+	}
+	const label = isOff ? "OFF" : isReview ? "REVIEW" : "ON";
+	// `Eye: ● ON (Clef Flash)` -> the base before the first colon, the backend in the trailing parentheses.
+	const base = clean.split(":")[0]!.trim() || "Eye";
+	const at = clean.lastIndexOf("(");
+	const backend = at >= 0 && clean.trimEnd().endsWith(")") ? clean.slice(at, clean.lastIndexOf(")") + 1).trim() : "";
+	// One space, not the two the previous glyph needed: \uf21b's ink fits its own cell, so the label sits
+	// right after it. The space before the backend stays outside the dim run, so the modifier does not
+	// start with a painted blank.
+	return `${acc("\uf21b")} ${soft(`${base}:`)} ${bullet} ${soft(label)}${backend ? ` ${dim(backend)}` : ""}`;
+}
+
 /**
  * The ponytail status cell. The horse lives at U+EF04 (fa-horse). U+EF51
  * (fa-circle_radiation) carries no outline in the Windows Nerd Font build, so it
@@ -848,6 +898,10 @@ export default function (pi: ExtensionAPI) {
 			currentModel = ctx.model;
 			currentThinkingLevel = ctx.thinkingLevel;
 			git = null;
+			// A new session reuses this module (no re-import), so the 2s cache would serve the
+			// previous session's sums whenever the fresh branch happens to be the same length.
+			usageScanAt = 0;
+			usageScanLen = -1;
 		} else {
 			currentModel = (globalThis as Record<symbol, any>)[MODEL_KEY] ?? ctx.model;
 			currentThinkingLevel = (globalThis as Record<symbol, any>)[THINKING_KEY] ?? ctx.thinkingLevel;
@@ -889,9 +943,12 @@ export default function (pi: ExtensionAPI) {
 							const acc = (text: string) => theme.fg("accent", text);
 							const dim = (text: string) => theme.fg("dim", text);
 							const fgAny = theme.fg.bind(theme) as (color: string, text: string) => string;
-							// `accentSoft` is a vars-only token on Pi 1.2+, so the soft tier is resolved
-							// through the shared painter instead of a raw fg() probe.
+							// `accentSoft`/`secondarySoft` are vars-only tokens on Pi 1.2+, so both soft tiers
+							// are resolved through the shared painters instead of a raw fg() probe. Icons keep
+							// `accent`; the cwd/branch/clock/status text takes the border-accent tier, so the
+							// footer stays two-toned instead of the text inheriting the accent hue.
 							const soft = softOf(theme as never);
+							const softLabel = softSecondaryOf(theme as never);
 							// Diff colors: the same theme slots pi uses for a diff body, with the
 							// plain soft color as fallback for a theme that omits them.
 							const colorOr = (name: string, fallback: (t: string) => string) => (t: string) => {
@@ -901,12 +958,10 @@ export default function (pi: ExtensionAPI) {
 									return fallback(t);
 								}
 							};
-							// `primary`/`secondary` are vars, not tokens (Pi 1.2+ rejects custom `colors`
-							// keys). Their arnative carriers are the official tokens they map to.
+							// `primary` is a var, not a token (Pi 1.2+ rejects custom `colors` keys); its
+							// arnative carrier is the official token it maps to.
 							const primary = colorOr("mdHeading", acc);
-							const primarySoft = soft;
-							const secondary = colorOr("borderAccent", soft);
-							const secondarySoft = soft;
+							const secondarySoft = softLabel;
 							const diffAdd = colorOr("toolDiffAdded", soft);
 							const diffDel = colorOr("toolDiffRemoved", soft);
 							const sep = dim(" | ");
@@ -947,22 +1002,7 @@ export default function (pi: ExtensionAPI) {
 									return `${acc("\uf233")} ${secondarySoft(m ? m[0] : rest || "MCP")}`;
 								}
 								if (s.includes("ponytail")) return ponytailStatusLine(s, acc, dim, secondarySoft);
-								if (s.includes("jev-eye")) {
-									const isOff = s.includes("OFF") || s.includes("○");
-									const isReview = /REVIEW/i.test(s);
-									let bullet = isOff ? dim("○") : acc("●");
-									if (isReview) {
-										try {
-											bullet = theme.fg("warning", "●");
-										} catch {
-											bullet = acc("●");
-										}
-									}
-									const label = isOff ? "OFF" : isReview ? "REVIEW" : "ON";
-									// Two spaces: \uedcf's ink is wider than MCP's \uf233 or ponytail's \uef04,
-									// so it needs the extra cell to clear the label.
-									return `${acc("\uedcf")}  ${secondarySoft("Jev:")} ${bullet} ${secondarySoft(label)}`;
-								}
+								if (isJevEyeStatus(s)) return jevEyeStatusLine(s, acc, dim, secondarySoft, theme);
 								let clean = stripAnsi(s);
 								clean = clean.replace(/\uFFFD/g, "").replace(/\?{1,2}\s*/g, "");
 								return secondarySoft(clean.trim());
@@ -1044,7 +1084,7 @@ export default function (pi: ExtensionAPI) {
 						try {
 							const th = this.getActiveTheme();
 							if (!th) return text;
-							return softOf(th as never)(text);
+							return softSecondaryOf(th as never)(text);
 						} catch {
 							return text;
 						}
@@ -1437,6 +1477,58 @@ if (isMain(import.meta.url)) {
 	assert(!ponyLine.includes("\uef51"), "the blank \\uef51 glyph must never come back");
 	assert(ponytailStatusLine("ponytail: LITE", (s) => s, (s) => s, (s) => s).includes("LITE"), "the ponytail mode is read from the status text");
 
+	// Self-check: the status router must recognise the pi-jev-eye cell by the label its VALUE carries.
+	// The old test was `value.includes("jev-eye")`, and the value is `Eye: ● ON (Clef Flash)` — no
+	// `jev-eye` anywhere — so the branch went false and the cell silently lost its icon and dim suffix.
+	// This pins the recognition rule itself, at the same place the router uses it.
+	assert(isJevEyeStatus("Eye: ● ON (Clef Flash)"), "the value pi-jev-eye publishes is recognised as its own cell");
+	assert(isJevEyeStatus("Eye: ○ OFF (Jev)"), "and so is every other mode's value");
+	assert(!isJevEyeStatus("Jev: ● ON"), "the previous format is not claimed as this cell");
+	assert(!isJevEyeStatus("MCP: 2 servers enabled"), "and neither is another extension's status");
+	assert(
+		!stripAnsi("Eye: ● ON (Clef Flash)").includes("jev-eye"),
+		"the value carries no internal key name, which is what broke the old matcher",
+	);
+
+	// Self-check: the pi-jev-eye status cell. The value is `Eye: ● MODE (Backend)`; the backend is read out
+	// of that string rather than hardcoded, and it takes `dim` while the base label and the state stay
+	// readable — a backend painted like the label would bury `Eye: ● ON`, which is the case this cell
+	// exists for. Both footer formats the operator asked for are pinned here.
+	const jevPlain = (s: string) => s;
+	const jevDim = (s: string) => `[dim]${s}[/dim]`;
+	assert(
+		jevEyeStatusLine("Eye: ● ON (Clef Flash)", jevPlain, jevDim, jevPlain, undefined) ===
+			"\uf21b" + " Eye: ● ON [dim](Clef Flash)[/dim]",
+		"Clef Flash is dim while `Eye:` and the state are not",
+	);
+	assert(
+		jevEyeStatusLine("Eye: ● ON (Jev)", jevPlain, jevDim, jevPlain, undefined) === "\uf21b" + " Eye: ● ON [dim](Jev)[/dim]",
+		"TypeSafe and OpenRouter both read as (Jev)",
+	);
+	assert(
+		jevEyeStatusLine("Eye: ● ON (Clef)", jevPlain, jevDim, jevPlain, undefined) === "\uf21b" + " Eye: ● ON [dim](Clef)[/dim]",
+		"the untiered Clef model draws no tier word",
+	);
+	assert(
+		jevEyeStatusLine("Eye: ● ON (Clef Omni)", jevPlain, jevDim, jevPlain, undefined) === "\uf21b" + " Eye: ● ON [dim](Clef Omni)[/dim]",
+		"a model added upstream draws its own tier",
+	);
+	assert(
+		jevEyeStatusLine("Eye: ○ OFF (Jev)", jevPlain, jevDim, jevPlain, undefined) === "\uf21b" + " Eye: [dim]○[/dim] OFF [dim](Jev)[/dim]",
+		"OFF takes the dim bullet",
+	);
+	assert(
+		jevEyeStatusLine("Eye: ● REVIEW (Clef Flash)", jevPlain, jevDim, jevPlain, { fg: (color, text) => `<${color}>${text}</${color}>` }) ===
+			"\uf21b" + " Eye: <warning>●</warning> REVIEW [dim](Clef Flash)[/dim]",
+		"REVIEW keeps the warning bullet",
+	);
+	// A value with no parenthesised backend (an older pi-jev-eye) must not gain a stray `(`: the suffix is
+	// drawn only when the value actually carries one.
+	assert(
+		jevEyeStatusLine("Eye: ● ON", jevPlain, jevDim, jevPlain, undefined) === "\uf21b" + " Eye: ● ON",
+		"no backend suffix means no parenthesis, never a guessed one",
+	);
+
 	// Self-check: session age survives /resume (header timestamp wins over now).
 	const NOW = Date.parse("2026-10-08T12:00:00.000Z");
 	assert(resolveSessionStartMs("resume", "2026-10-08T09:00:00.000Z", NOW) === Date.parse("2026-10-08T09:00:00.000Z"), "resume restores the session age from the header");

package/extensions/section-headers.ts

@@ -33,7 +33,7 @@ import {
 } from "@earendil-works/pi-tui";
 import type { BoxTheme } from "../lib/box.ts";
 import { BRAND, renderBoxLines } from "../lib/box.ts";
-import { getActiveTheme, setActiveTheme, softOf, stripAnsi, themeOf } from "../lib/ansi.ts";
+import { getActiveTheme, setActiveTheme, softOf, softSecondaryOf, stripAnsi, themeOf } from "../lib/ansi.ts";
 import { capitalize, expandKeyName, modelDisplayParts } from "../lib/format.ts";
 import { SHORTCUT_NEW_SESSION, SHORTCUT_NEXT_TAB, SHORTCUT_RELOAD } from "../lib/shortcuts.ts";
 import { HEADER_PRESET_KEY as HEADER_PRESET_CONFIG_KEY, loadChoice, saveChoice } from "../lib/preset-store.ts";
@@ -79,16 +79,31 @@ export function fgFirst(th: Themeish, names: string[], text: string): string {
 }
 
 /**
- * Painter for the header's soft tier. Pi 1.2.0 rejects a custom `accentSoft` key in
- * `colors`, so `fgFirst(["accentSoft", …])` silently degrades to plain text there and
- * the two-tone logo/header look flattens. `softOf` derives the same tint from the
- * resolved accent; a theme that genuinely defines `accentSoft` still wins first.
+ * Painter for the header's soft *accent* tier — the logo mark's second tone, paired with
+ * the accent `P`. Keeps the mark in one hue family instead of blue.
+ *
+ * Pi 1.2.0 rejects a custom `accentSoft` key in `colors`, so `fgFirst(["accentSoft", …])`
+ * silently degrades to plain text there and the two-tone look flattens. `softOf` derives
+ * the same tint from the resolved accent; a theme that genuinely defines `accentSoft`
+ * still wins first.
  */
 export function softFirst(th: Themeish, fallbacks: string[], text: string): string {
-	const soft = softOf(th as never);
-	const out = soft(text);
-	if (out !== text) return out;
-	return fgFirst(th, fallbacks, text);
+	return softOnTier(softOf(th as never), th, fallbacks, text);
+}
+
+/**
+ * Painter for the soft *label* tier of header text (model name, thinking level, token
+ * counts). Same colour language as the footer: marks take `accent`, their text takes the
+ * soft border-accent tier, so a header line and the footer under it agree.
+ */
+export function softLabelFirst(th: Themeish, fallbacks: string[], text: string): string {
+	return softOnTier(softSecondaryOf(th as never), th, fallbacks, text);
+}
+
+/** Shared tail of the two soft painters: use the resolved soft tone, else the fallback tokens. */
+function softOnTier(paint: (s: string) => string, th: Themeish, fallbacks: string[], text: string): string {
+	const out = paint(text);
+	return out !== text ? out : fgFirst(th, fallbacks, text);
 }
 
 /**
@@ -542,7 +557,7 @@ export class ArnativeHeader implements Component {
 			const isActive = t.key === this.activeTab;
 			const iconStyled = isActive ? fgFirst(th, ["accent"], t.icon) : fgFirst(th, ["dim"], t.icon);
 			const labelStyled = isActive
-				? softFirst(th, ["accentSoft", "text"], `\x1b[1m${label}\x1b[22m`)
+				? softLabelFirst(th, ["accentSoft", "text"], `\x1b[1m${label}\x1b[22m`)
 				: fgFirst(th, ["dim"], label);
 			return { key: t.key, plain, formatted: `${iconStyled} ${labelStyled}` };
 		};
@@ -606,19 +621,19 @@ export class ArnativeHeader implements Component {
 			// Model name in soft, its "(Provider)" tail dim.
 			const provSuffix = fullName.match(/(\s*\([^()]*\))$/)?.[1] ?? "";
 			const nameMain = provSuffix ? fullName.slice(0, -provSuffix.length) : fullName;
-			let line = `${softFirst(th, ["accentSoft", "text"], nameMain)}${provSuffix ? fgFirst(th, ["dim"], provSuffix) : ""}${sep}${softFirst(th, ["accentSoft", "text"], `Thinking: ${thinkLevel}`)}`;
+			let line = `${softLabelFirst(th, ["accentSoft", "text"], nameMain)}${provSuffix ? fgFirst(th, ["dim"], provSuffix) : ""}${sep}${softLabelFirst(th, ["accentSoft", "text"], `Thinking: ${thinkLevel}`)}`;
 
 			// All-time usage of that model (same as /usage): ↑... ↓...  ...
 			const usage = getModelAllTimeUsage(modelObj?.id);
 			const tokenParts: string[] = [];
 			if (usage.input > 0) {
-				tokenParts.push(`${fgFirst(th, ["accent"], "↑")}${softFirst(th, ["accentSoft", "text"], formatTokens(usage.input))}`);
+				tokenParts.push(`${fgFirst(th, ["accent"], "↑")}${softLabelFirst(th, ["accentSoft", "text"], formatTokens(usage.input))}`);
 			}
 			if (usage.output > 0) {
-				tokenParts.push(`${fgFirst(th, ["accent"], "↓")}${softFirst(th, ["accentSoft", "text"], formatTokens(usage.output))}`);
+				tokenParts.push(`${fgFirst(th, ["accent"], "↓")}${softLabelFirst(th, ["accentSoft", "text"], formatTokens(usage.output))}`);
 			}
 			if (usage.cacheRead > 0) {
-				tokenParts.push(`${fgFirst(th, ["accent"], "\uf49b ")}${softFirst(th, ["accentSoft", "text"], formatTokens(usage.cacheRead))}`);
+				tokenParts.push(`${fgFirst(th, ["accent"], "\uf49b ")}${softLabelFirst(th, ["accentSoft", "text"], formatTokens(usage.cacheRead))}`);
 			}
 			if (tokenParts.length > 0) {
 				line += `${sep}${tokenParts.join(" ")}`;
@@ -631,11 +646,11 @@ export class ArnativeHeader implements Component {
 
 		if (this.activeTab === "Directory") {
 			for (const line of wrapPath(getCwd(this.ctx), infoW)) {
-				infoLines.push(softFirst(th, ["accentSoft", "text"], line));
+				infoLines.push(softLabelFirst(th, ["accentSoft", "text"], line));
 			}
 		} else if (this.activeTab === "Shortcut") {
 			for (const line of wrapTokens(SHORTCUTS, infoW)) {
-				infoLines.push(softFirst(th, ["accentSoft", "text"], line));
+				infoLines.push(softLabelFirst(th, ["accentSoft", "text"], line));
 			}
 		} else if (activeItems.length === 0) {
 			infoLines.push(
@@ -647,7 +662,7 @@ export class ArnativeHeader implements Component {
 		} else {
 			for (const line of wrapCommaItems(activeItems, infoW)) {
 				// Point 5: selected menu data uses soft only
-				infoLines.push(softFirst(th, ["accentSoft", "text"], line));
+				infoLines.push(softLabelFirst(th, ["accentSoft", "text"], line));
 			}
 		}
 

package/extensions/tools.ts

@@ -39,7 +39,7 @@ 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, softOf } from "../lib/ansi.ts";
+import { stripAnsi, softSecondaryOf } from "../lib/ansi.ts";
 import { assert, isMain } from "../lib/check.ts";
 import { expandKeyName } from "../lib/format.ts";
 
@@ -443,7 +443,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 soft = softOf(th);
+				const soft = softSecondaryOf(th);
 				const inner = Math.max(8, width - 4);
 				const icon = isErr ? th.fg("error", "x") : th.fg("success", "✓");
 				const boxed2 = componentLines(theirs, width - 6);
@@ -606,7 +606,7 @@ function minimal(
 			return new Lines((width) => {
 				// Read context.state live (never capture): renderResult may create it after renderCall.
 				if (context.state?.hasResult) return [];
-				const soft = softOf(theme);
+				const soft = softSecondaryOf(theme);
 				const inner = Math.max(8, width - 4);
 				const rows = titleRow(
 					theme,
@@ -635,7 +635,7 @@ function minimal(
 			const dur = fmtMs(context.toolCallId ? TIMINGS.get(context.toolCallId) : undefined);
 			const icon = isErr ? theme.fg("error", "x") : theme.fg("success", "✓");
 			return new Lines((width) => {
-				const soft = softOf(theme);
+				const soft = softSecondaryOf(theme);
 				const inner = Math.max(8, width - 4);
 				const rows = titleRow(
 					theme,

package/extensions/ui-render-tweaks.ts

@@ -16,7 +16,6 @@
  */
 import {
 	CompactionSummaryMessageComponent,
-	CustomMessageComponent,
 	ExtensionSelectorComponent,
 	getMarkdownTheme,
 	initTheme,
@@ -39,9 +38,9 @@ import {
 } from "@earendil-works/pi-tui";
 import { readdirSync, readFileSync } from "node:fs";
 import { renderBoxLines } from "../lib/box.ts";
-import { ansiBgOpen, getActiveTheme, setActiveTheme, stripAnsi, themeOf, softOf } from "../lib/ansi.ts";
+import { ansiBgOpen, getActiveTheme, setActiveTheme, stripAnsi, themeOf, softSecondaryOf } from "../lib/ansi.ts";
 import { assert, isMain } from "../lib/check.ts";
-import { contrast, parseOklch, toHex } from "../lib/color.ts";
+import { contrast, oklchToRgb, parseOklch, toHex } from "../lib/color.ts";
 import { expandKeyName } from "../lib/format.ts";
 
 type ActiveTheme = { fg(color: string, text: string): string; bg?(color: string, text: string): string } | null;
@@ -174,7 +173,7 @@ 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 = softOf(th);
+	const soft = softSecondaryOf(th);
 	return row
 		.split("·")
 		.map((part) => soft(part))
@@ -396,6 +395,14 @@ if (isMain(import.meta.url)) {
 	// 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);
+	// Mirrors `soften()` (themes/gen-themes.mjs) and `softenColor` (lib/ansi.ts): the soft
+	// tier is the base color at L 0.82 with a fifth of its chroma. Both sides read the
+	// declared OKLCH string (not the 8-bit hex), so the comparison is not rounded twice.
+	const softenToHex = (base: string) => {
+		const o = parseOklch(base);
+		assert(o !== null, `cannot soften a non-oklch color: ${base}`);
+		return toHex(`oklch(82% ${oklchToRgb(0.82, o.C * 0.18, o.H).chroma} ${o.H})`);
+	};
 	// 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(
@@ -508,8 +515,18 @@ if (isMain(import.meta.url)) {
 		// Accent pill: accent bg + toolPendingBg colored text.
 		assert(contrast(hex("accent"), hex("toolPendingBg")) >= 4.5, `theme ${f}: accent vs toolPendingBg contrast >= 4.5`);
 		assert(isColor(d.vars.accentSoft ?? ""), `theme ${f}: vars.accentSoft is a color`);
+		assert(isColor(d.vars.secondarySoft ?? ""), `theme ${f}: vars.secondarySoft is a color`);
 		assert(isColor(d.vars.primary ?? ""), `theme ${f}: vars.primary is a color`);
 		assert(isColor(d.vars.secondary ?? ""), `theme ${f}: vars.secondary is a color`);
+		// The declared soft vars must equal what the extensions derive at runtime, or the
+		// footer label colour drifts from the theme file. `softenToHex` mirrors
+		// `soften()` in gen-themes.mjs and `softenColor` in lib/ansi.ts.
+		for (const [softName, baseName] of [["accentSoft", "accent"], ["secondarySoft", "borderAccent"]] as const) {
+			const base = d.vars[d.colors[baseName] ?? baseName]!;
+			const declared = toHex(d.vars[softName]!);
+			const derived = softenToHex(base);
+			assert(declared === derived, `theme ${f}: vars.${softName} ${declared} != runtime ${derived} (derived from ${baseName})`);
+		}
 		const canvas = hex("userMessageBg");
 		for (const tok of Object.keys(d.colors)) {
 			if (nonText.has(tok) || tok === "thinkingMax") continue;

package/extensions/usage.ts

@@ -11,7 +11,7 @@ import { matchesKey, truncateToWidth, visibleWidth, type Component, type TUI, ty
 import { renderScreen, screenTitle } from "../lib/box.ts";
 import { assert, isMain } from "../lib/check.ts";
 import { capitalize } from "../lib/format.ts";
-import { thinkingColorOf, softOf } from "../lib/ansi.ts";
+import { thinkingColorOf, softSecondaryOf } from "../lib/ansi.ts";
 import { legendUsage, matchesBack } from "../lib/shortcuts.ts";
 import { collectUsageSummary, estimateCost, formatTokens, getModelAllTimeUsage, hasPrice, loadPriceTable, type UsageSummary } from "../lib/usage-store.ts";
 
@@ -196,8 +196,9 @@ export class UsageModalComponent implements Component {
 		// dashboard reads as belonging to the model that produced the usage.
 		const edge = (t: string) => this.edgeOf(t);
 		const boxW = width;
-		// `accentSoft` is a vars-only token on Pi 1.2+; softOf resolves the soft accent either way.
-		const soft = softOf(th);
+		// `secondarySoft` is a vars-only token on Pi 1.2+; softSecondaryOf resolves the soft
+		// label tier (the border-accent hue) and falls back to the accent tier.
+		const soft = softSecondaryOf(th);
 		const acc = (s: string) => th.fg("accent", s);
 		const dim = (s: string) => th.fg("dim", s);
 		const plain = (s: string) => th.fg("text", s);

package/lib/ansi.ts

@@ -38,6 +38,18 @@ export function setActiveTheme<T>(th: T | null): void {
 	else delete (globalThis as Record<symbol, T>)[THEME_PROXY_KEY];
 }
 
+/**
+ * Soft tier of a resolved theme color: clone at L 0.82 with a fifth of its chroma and
+ * the hue kept. The generator's `soften()` (themes/gen-themes.mjs) applies the identical
+ * recipe, so a declared `vars.*Soft` and this derived value agree. `chroma * 0.18` is
+ * the single tuning constant for how far a soft tone leans toward grey.
+ */
+const SOFT_L = 0.82;
+const SOFT_CHROMA_SCALE = 0.18;
+function softenColor(c: { c?: number; h?: number }): { kind: "oklch"; l: number; c: number; h: number } {
+	return { kind: "oklch", l: SOFT_L, c: (c.c ?? 0) * SOFT_CHROMA_SCALE, h: c.h ?? 0 };
+}
+
 /**
  * Painter for arnative's soft accent (`accentSoft`).
  *
@@ -45,9 +57,9 @@ export function setActiveTheme<T>(th: T | null): void {
  * addressable directly. 1.2.0 validates `colors` with `additionalProperties: false`
  * and rejects the whole theme if it carries one, so the token now lives only in
  * `vars` and `fg("accentSoft")` throws. The soft accent stays available through the
- * resolved `accent` color (1.2.0 exposes `theme.colors`): its hue and chroma are
- * softened to the generator's `*Soft` recipe, which keeps the two-tone look instead
- * of collapsing to grey. Falls back to `muted`, then `accent`, on any older theme.
+ * resolved `accent` color (both 1.1.0 and 1.2.0 expose `theme.colors`): its hue and
+ * chroma are softened to the generator's `*Soft` recipe, which keeps the two-tone look
+ * instead of collapsing to grey. Falls back to `muted`, then `accent`, on older themes.
  */
 export function softOf(th: {
 	fg?(c: string, t: string): string;
@@ -65,13 +77,36 @@ export function softOf(th: {
 	const accent = th?.colors?.accent;
 	const style = th?.style?.bind(th);
 	if (accent?.kind === "oklch" && style) {
-		// The generator's `*Soft` recipe: lightness 0.82, a fifth of the accent chroma.
-		const soft = { kind: "oklch" as const, l: 0.82, c: (accent.c ?? 0) * 0.18, h: accent.h ?? 0 };
+		const soft = softenColor(accent);
 		return (s) => style(s, { fg: soft });
 	}
 	return (s) => fg("muted", s);
 }
 
+/**
+ * Painter for the soft *label* tier (`secondarySoft`): the footer's cwd, branch, clock
+ * and status text.
+ *
+ * The two-tone footer puts icons on `accent` and their text on the border-accent tier.
+ * `secondarySoft` is declared only in `vars`, so it cannot be read back with `fg()`;
+ * it is derived instead from `borderAccent`, the official token that tier maps to. The
+ * generator softens that same value, so declared and derived agree. Falls back to
+ * `softOf` (the accent tier) when the theme exposes no resolvable `borderAccent`.
+ */
+export function softSecondaryOf(th: {
+	fg?(c: string, t: string): string;
+	style?(t: string, o: { fg: unknown }): string;
+	colors?: Record<string, { kind?: string; c?: number; h?: number }>;
+} | null): (s: string) => string {
+	const border = th?.colors?.borderAccent;
+	const style = th?.style?.bind(th);
+	if (border?.kind === "oklch" && style) {
+		const soft = softenColor(border);
+		return (s) => style(s, { fg: soft });
+	}
+	return softOf(th);
+}
+
 /** pi defines one theme slot per thinking level (`thinkingOff`…`thinkingMax`), so a box
  *  can follow the model instead of a hardcoded palette — switching theme keeps the
  *  meaning of the color. Shared by `usage.ts` and `arnative.ts`. */
@@ -129,17 +164,26 @@ if (isMain(import.meta.url)) {
 	};
 	assert(softOf(noSoft)("x") === "<muted>x</muted>", "softOf falls back to muted without the token or colors");
 	assert(softOf(null)("x") === "x", "softOf without a theme is identity");
-	// Pi 1.2.0: acentSoft is rejected, so the soft tint is derived from `colors.accent`.
+	// Pi 1.2.0: accentSoft is rejected, so the soft tint is derived from `colors.accent`.
 	const modern = {
 		fg: (c: string, t: string) => {
 			throw new Error(`Unknown theme color: ${c}`);
 		},
 		style: (t: string, o: { fg: unknown }) => `<soft:${JSON.stringify(o.fg)}>${t}</soft>`,
-		colors: { accent: { kind: "oklch", c: 0.2, h: 355 } },
+		colors: { accent: { kind: "oklch", c: 0.2, h: 355 }, borderAccent: { kind: "oklch", c: 0.1, h: 200 } },
 	};
 	const modernOut = softOf(modern)("x");
 	assert(modernOut.includes('"l":0.82') && modernOut.includes('"c":0.036'), "softOf derives the soft tint from accent (l=0.82, c=accent*0.18)");
 	assert(modernOut.includes("x"), "softOf keeps the text");
+	// The label tier softens `borderAccent`, NOT `accent`: that is what keeps footer text
+	// on the blue tier instead of inheriting the pink accent hue.
+	const labelOut = softSecondaryOf(modern)("x");
+	assert(
+		labelOut.includes('"l":0.82') && labelOut.includes('"c":0.018') && labelOut.includes('"h":200'),
+		"softSecondaryOf softens borderAccent (l=0.82, c=borderAccent*0.18, same hue)",
+	);
+	assert(labelOut !== modernOut, "the soft label tier differs from the soft accent tier");
+	assert(softSecondaryOf({ fg: () => "", style: (t) => `<x>${t}</x>`, colors: {} })("x") === softOf({ fg: () => "", style: (t) => `<x>${t}</x>`, colors: {} })("x"), "softSecondaryOf falls back to softOf without a borderAccent");
 
 	assert(thinkingColorSlot("off") === "thinkingOff", "thinking off maps to thinkingOff");
 	assert(thinkingColorSlot(undefined) === "thinkingOff", "missing level falls back to thinkingOff");

package/lib/usage-store.ts

@@ -117,7 +117,7 @@ export interface UsageSummary {
 		cost: number;
 		/** Provider-reported cost only (never includes the estimate). */
 		reportedCost: number;
-		/** Cost reconstructed from `prices.json`. Shown with a `~`, never folded into `cost`. */
+		/** Cost reconstructed from `models.json` rates. Shown with a `~`, never folded into `cost`. */
 		estimatedCost: number;
 	};
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bismawy/pi-arnative",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "Refined aesthetics. Cohesive tools. Built for Pi. Warm themes, rounded tool boxes, tabbed header, compact footer and a /usage dashboard.",
   "keywords": [
     "pi-package",

package/themes/arnative-cyberpunk.json

@@ -9,8 +9,9 @@
 		"fgFaint": "oklch(49% 0.02 275)",
 		"primary": "oklch(88% 0.18 95)",
 		"secondary": "oklch(82% 0.139 200)",
+		"secondarySoft": "oklch(82% 0.02502 200)",
 		"accent": "oklch(78% 0.146 355)",
-		"accentSoft": "oklch(82% 0.026 355)",
+		"accentSoft": "oklch(82% 0.02628 355)",
 		"accentBorder": "oklch(82% 0.114 355)",
 		"success": "oklch(78% 0.15 145)",
 		"error": "oklch(76% 0.143 25)",

package/themes/arnative-dracula.json

@@ -9,8 +9,9 @@
 		"fgFaint": "oklch(49% 0.012 285)",
 		"primary": "oklch(78% 0.125 295)",
 		"secondary": "oklch(82% 0.13 190)",
+		"secondarySoft": "oklch(82% 0.0234 190)",
 		"accent": "oklch(78% 0.14 330)",
-		"accentSoft": "oklch(82% 0.025 330)",
+		"accentSoft": "oklch(82% 0.0252 330)",
 		"accentBorder": "oklch(82% 0.084 330)",
 		"success": "oklch(78% 0.14 145)",
 		"error": "oklch(76% 0.14 25)",

package/themes/arnative-emerald.json

@@ -9,8 +9,9 @@
 		"fgFaint": "oklch(49% 0.012 165)",
 		"primary": "oklch(84% 0.13 165)",
 		"secondary": "oklch(78% 0.1 195)",
+		"secondarySoft": "oklch(82% 0.01296 165)",
 		"accent": "oklch(78% 0.12 165)",
-		"accentSoft": "oklch(82% 0.022 165)",
+		"accentSoft": "oklch(82% 0.0216 165)",
 		"accentBorder": "oklch(82% 0.072 165)",
 		"success": "oklch(78% 0.12 145)",
 		"error": "oklch(76% 0.12 25)",

package/themes/arnative-gruvbox.json

@@ -9,8 +9,9 @@
 		"fgFaint": "oklch(49% 0.015 70)",
 		"primary": "oklch(84% 0.14 83)",
 		"secondary": "oklch(78% 0.1 175)",
+		"secondarySoft": "oklch(82% 0.018 175)",
 		"accent": "oklch(78% 0.137 45)",
-		"accentSoft": "oklch(82% 0.025 45)",
+		"accentSoft": "oklch(82% 0.02466 45)",
 		"accentBorder": "oklch(82% 0.084 45)",
 		"success": "oklch(78% 0.14 145)",
 		"error": "oklch(76% 0.14 25)",

package/themes/arnative-matrix.json

@@ -9,8 +9,9 @@
 		"fgFaint": "oklch(49% 0.02 145)",
 		"primary": "oklch(88% 0.24 145)",
 		"secondary": "oklch(76% 0.16 165)",
+		"secondarySoft": "oklch(82% 0.02376 144)",
 		"accent": "oklch(78% 0.22 144)",
-		"accentSoft": "oklch(82% 0.04 144)",
+		"accentSoft": "oklch(82% 0.0396 144)",
 		"accentBorder": "oklch(82% 0.132 144)",
 		"success": "oklch(78% 0.15 145)",
 		"error": "oklch(76% 0.143 25)",

package/themes/arnative-nord.json

@@ -9,8 +9,9 @@
 		"fgFaint": "oklch(49% 0.01 240)",
 		"primary": "oklch(78% 0.08 217)",
 		"secondary": "oklch(82% 0.09 195)",
+		"secondarySoft": "oklch(82% 0.0162 195)",
 		"accent": "oklch(78% 0.07 310)",
-		"accentSoft": "oklch(82% 0.013 310)",
+		"accentSoft": "oklch(82% 0.0126 310)",
 		"accentBorder": "oklch(82% 0.042 310)",
 		"success": "oklch(78% 0.07 145)",
 		"error": "oklch(76% 0.07 25)",

package/themes/arnative-sun.json

@@ -9,8 +9,9 @@
 		"fgFaint": "oklch(49% 0.012 70)",
 		"primary": "oklch(84% 0.126 70)",
 		"secondary": "oklch(78% 0.12 35)",
+		"secondarySoft": "oklch(82% 0.01512 70)",
 		"accent": "oklch(78% 0.14 70)",
-		"accentSoft": "oklch(82% 0.025 70)",
+		"accentSoft": "oklch(82% 0.0252 70)",
 		"accentBorder": "oklch(82% 0.084 70)",
 		"success": "oklch(78% 0.14 145)",
 		"error": "oklch(76% 0.14 25)",

package/themes/arnative-synthwave.json

@@ -9,8 +9,9 @@
 		"fgFaint": "oklch(49% 0.015 300)",
 		"primary": "oklch(78% 0.178 339)",
 		"secondary": "oklch(82% 0.145 185)",
+		"secondarySoft": "oklch(82% 0.0261 185)",
 		"accent": "oklch(78% 0.142 50)",
-		"accentSoft": "oklch(82% 0.026 50)",
+		"accentSoft": "oklch(82% 0.02556 50)",
 		"accentBorder": "oklch(82% 0.102 50)",
 		"success": "oklch(78% 0.15 145)",
 		"error": "oklch(76% 0.143 25)",

package/themes/arnative-violet.json

@@ -9,8 +9,9 @@
 		"fgFaint": "oklch(49% 0.012 295)",
 		"primary": "oklch(82% 0.1 294)",
 		"secondary": "oklch(78% 0.11 215)",
+		"secondarySoft": "oklch(82% 0.01512 294)",
 		"accent": "oklch(78% 0.124 294)",
-		"accentSoft": "oklch(82% 0.022 294)",
+		"accentSoft": "oklch(82% 0.02232 294)",
 		"accentBorder": "oklch(82% 0.084 294)",
 		"success": "oklch(78% 0.14 145)",
 		"error": "oklch(76% 0.14 25)",

package/themes/arnative-zinc.json

@@ -9,8 +9,9 @@
 		"fgFaint": "oklch(49% 0.005 285)",
 		"primary": "oklch(86% 0.015 285)",
 		"secondary": "oklch(72% 0.025 240)",
+		"secondarySoft": "oklch(82% 0.00216 286)",
 		"accent": "oklch(78% 0.02 286)",
-		"accentSoft": "oklch(82% 0.004 286)",
+		"accentSoft": "oklch(82% 0.0036 286)",
 		"accentBorder": "oklch(82% 0.012 286)",
 		"success": "oklch(78% 0.02 145)",
 		"error": "oklch(76% 0.02 25)",

package/themes/arnative.json

@@ -9,8 +9,9 @@
 		"fgFaint": "oklch(49% 0.012 232)",
 		"primary": "oklch(82% 0.138 218)",
 		"secondary": "oklch(78% 0.11 282)",
+		"secondarySoft": "oklch(82% 0.01404 218)",
 		"accent": "oklch(78% 0.13 218)",
-		"accentSoft": "oklch(82% 0.023 218)",
+		"accentSoft": "oklch(82% 0.0234 218)",
 		"accentBorder": "oklch(82% 0.078 218)",
 		"success": "oklch(78% 0.13 145)",
 		"error": "oklch(76% 0.13 25)",

package/themes/gen-themes.mjs

@@ -32,6 +32,23 @@ function oklch(L, C, H) {
 	return `oklch(${+(L * 100).toFixed(1)}% ${round3(chroma)} ${Math.round(hue(H))})`;
 }
 
+/**
+ * Soft tier of a color: clone at L 0.82 with a fifth of the GAMUT-CLAMPED chroma, hue
+ * kept. `lib/ansi.ts` softens the resolved token with this same recipe at runtime, so a
+ * `*Soft` var declared here and the extension's derived value agree. Grey-collapse is
+ * avoided because the hue is carried, not dropped.
+ *
+ * The chroma keeps five decimals (not the usual three): the soft tier multiplies it by
+ * 0.18, so a coarser round-trip shifts the last hex digit and the `declare == derive`
+ * guard in ui-render-tweaks.ts fails.
+ */
+function soften(value) {
+	const o = parseOklch(value);
+	assert(o !== null, `cannot soften a non-oklch color: ${value}`);
+	const { chroma } = oklchToRgb(0.82, o.C * 0.18, o.H);
+	return `oklch(82% ${+chroma.toFixed(5)} ${Math.round(hue(o.H))})`;
+}
+
 // --- shared ramps ----------------------------------------------------------
 
 const NEUTRAL = { fg: 0.88, fgMuted: 0.72, fgDim: 0.61, fgFaint: 0.49 };
@@ -252,6 +269,15 @@ function derive(spec) {
 	const primaryVal = primarySeed ? oklch(primarySeed.L, primarySeed.C, primarySeed.H) : oklch(0.82, c, h);
 	const secondaryVal = secondarySeed ? oklch(secondarySeed.L, secondarySeed.C, secondarySeed.H) : oklch(0.78, Math.min(c * 0.8, 0.12), roleHue("label"));
 
+	// Soft counterpart of the border-accent tier — the footer's label, clock and status
+	// colour. Softened from the SAME value the `borderAccent` token resolves to, because
+	// that token is what extensions read back at runtime (`softSecondaryOf` in
+	// lib/ansi.ts). One source keeps the declared value and the runtime one identical.
+	const accentBorderVal = oklch(0.82, c * 0.6, h);
+	const accentVal = oklch(0.78, c, h);
+	const borderAccentRole = spec.borderAccent ?? "accentBorder";
+	const borderAccentVal = { accentBorder: accentBorderVal, secondary: secondaryVal }[borderAccentRole] ?? borderAccentRole;
+
 	const vars = {
 		fg: oklch(NEUTRAL.fg, nc, nh),
 		fgMuted: oklch(NEUTRAL.fgMuted, nc, nh),
@@ -259,14 +285,10 @@ function derive(spec) {
 		fgFaint: oklch(NEUTRAL.fgFaint, nc, nh),
 		primary: primaryVal,
 		secondary: secondaryVal,
-		accent: oklch(0.78, c, h),
-		// Derived from the accent's GAMUT-CLAMPED chroma, not the raw spec chroma. Pi's schema
-		// forbids custom keys in `colors`, so extensions resolve the soft tier at runtime by
-		// softening the resolved `accent` (see `softOf` in lib/ansi.ts). Building it from the
-		// same clamped chroma makes the declared value and the runtime one agree; using `c`
-		// drifts wherever the raw chroma is out of gamut at the accent's lightness.
-		accentSoft: oklch(0.82, oklchToRgb(0.78, c, h).chroma * 0.18, h),
-		accentBorder: oklch(0.82, c * 0.6, h),
+		secondarySoft: soften(borderAccentVal),
+		accent: accentVal,
+		accentSoft: soften(accentVal),
+		accentBorder: accentBorderVal,
 		success: oklch(0.78, Math.min(c, 0.15), sem("success")),
 		error: oklch(0.76, Math.min(c, 0.15), sem("error")),
 		warning: oklch(0.86, Math.min(c, 0.14), sem("warning")),