@bismawy/pi-arnative 0.2.11 → 0.3.0

package/lib/color.ts

@@ -0,0 +1,118 @@
+/**
+ * OKLCH color math — the single source of truth for theme generation
+ * (`themes/gen-themes.mjs`) and the theme self-check
+ * (`extensions/ui-render-tweaks.ts`). No dependencies.
+ */
+import { assert, isMain } from "./check.ts";
+
+interface Rgb {
+	r: number;
+	g: number;
+	b: number;
+}
+interface Oklch {
+	L: number;
+	C: number;
+	H: number;
+}
+
+const clamp01 = (x: number): number => (x < 0 ? 0 : x > 1 ? 1 : x);
+
+/** `"oklch(62% 0.1 200)"` or `"oklch(0.62 0.1 200)"` -> Oklch, or null when not OKLCH. */
+export function parseOklch(value: string): Oklch | null {
+	const m = /^oklch\(\s*([0-9]*\.?[0-9]+)(%?)\s+([0-9]*\.?[0-9]+)\s+([0-9]*\.?[0-9]+)(?:deg)?\s*\)$/i.exec(value.trim());
+	if (!m) return null;
+	const raw = Number(m[1]);
+	return { L: m[2] === "%" ? raw / 100 : raw, C: Number(m[3]), H: Number(m[4]) };
+}
+
+function linearFromOklab(L: number, C: number, H: number): [number, number, number] {
+	const h = (H * Math.PI) / 180;
+	const a = C * Math.cos(h);
+	const b = C * Math.sin(h);
+	const l = (L + 0.3963377774 * a + 0.2158037573 * b) ** 3;
+	const m = (L - 0.1055613458 * a - 0.0638541728 * b) ** 3;
+	const s = (L - 0.0894841775 * a - 1.291485548 * b) ** 3;
+	return [
+		4.0767416621 * l - 3.3077115913 * m + 0.2309699292 * s,
+		-1.2684380046 * l + 2.6097574011 * m - 0.3413193965 * s,
+		-0.0041960863 * l - 0.7034186147 * m + 1.707614701 * s,
+	];
+}
+
+const encode = (c: number): number => (c <= 0.0031308 ? 12.92 * c : 1.055 * c ** (1 / 2.4) - 0.055);
+const inGamut = (rgb: readonly number[]): boolean => rgb.every((c) => c >= -1e-4 && c <= 1 + 1e-4);
+
+/** OKLCH -> sRGB, reducing chroma until the result fits sRGB. Returns the chroma actually used. */
+export function oklchToRgb(L: number, C: number, H: number): Rgb & { chroma: number } {
+	let used = C;
+	if (!inGamut(linearFromOklab(L, C, H))) {
+		let lo = 0;
+		let hi = C;
+		for (let i = 0; i < 24; i++) {
+			const mid = (lo + hi) / 2;
+			if (inGamut(linearFromOklab(L, mid, H))) lo = mid;
+			else hi = mid;
+		}
+		used = lo;
+	}
+	const [r, g, b] = linearFromOklab(L, used, H).map((c) => clamp01(encode(c)));
+	return { r: Math.round(r * 255), g: Math.round(g * 255), b: Math.round(b * 255), chroma: used };
+}
+
+const oklchToHex = (L: number, C: number, H: number): string => {
+	const { r, g, b } = oklchToRgb(L, C, H);
+	return `#${[r, g, b].map((c) => c.toString(16).padStart(2, "0")).join("")}`;
+};
+
+/** Any theme color value (hex or oklch) -> lowercase `#rrggbb`. Throws otherwise. */
+export function toHex(value: string): string {
+	const v = value.trim();
+	if (/^#[0-9a-f]{6}$/i.test(v)) return v.toLowerCase();
+	if (/^#[0-9a-f]{3}$/i.test(v)) return `#${v.slice(1).split("").map((c) => c + c).join("")}`.toLowerCase();
+	const o = parseOklch(v);
+	if (o) return oklchToHex(o.L, o.C, o.H);
+	throw new Error(`Not a hex/oklch color: ${value}`);
+}
+
+function relativeLuminance(hex: string): number {
+	const [r, g, b] = [1, 3, 5]
+		.map((i) => parseInt(hex.slice(i, i + 2), 16) / 255)
+		.map((c) => (c <= 0.03928 ? c / 12.92 : ((c + 0.055) / 1.055) ** 2.4));
+	return 0.2126 * r! + 0.7152 * g! + 0.0722 * b!;
+}
+
+export function contrast(a: string, b: string): number {
+	const [hi, lo] = [relativeLuminance(a), relativeLuminance(b)].sort((x, y) => y - x);
+	return (hi! + 0.05) / (lo! + 0.05);
+}
+
+/** sRGB hex -> OKLCH (seeds a theme's hue from a reference color). */
+export function hexToOklch(hex: string): Oklch {
+	const [r, g, b] = [1, 3, 5].map((i) => parseInt(hex.slice(i, i + 2), 16) / 255);
+	const lin = [r!, g!, b!].map((c) => (c <= 0.04045 ? c / 12.92 : ((c + 0.055) / 1.055) ** 2.4));
+	const l = Math.cbrt(0.4122214708 * lin[0]! + 0.5363325363 * lin[1]! + 0.0514459929 * lin[2]!);
+	const m = Math.cbrt(0.2119034982 * lin[0]! + 0.6806995451 * lin[1]! + 0.1073969566 * lin[2]!);
+	const s = Math.cbrt(0.0883024619 * lin[0]! + 0.2817188376 * lin[1]! + 0.6299787005 * lin[2]!);
+	const L = 0.2104542553 * l + 0.793617785 * m - 0.0040720468 * s;
+	const A = 1.9779984951 * l - 2.428592205 * m + 0.4505937099 * s;
+	const B = 0.0259040371 * l + 0.7827717662 * m - 0.808675766 * s;
+	return { L, C: Math.hypot(A, B), H: ((Math.atan2(B, A) * 180) / Math.PI + 360) % 360 };
+}
+
+if (isMain(import.meta.url)) {
+	const o = parseOklch("oklch(62% 0.1 200)");
+	assert(o !== null && Math.abs(o.L - 0.62) < 1e-9 && o.C === 0.1 && o.H === 200, "parseOklch reads percent L");
+	assert(parseOklch("oklch(0.62 0.1 200)")?.L === 0.62, "parseOklch reads fractional L");
+	assert(parseOklch("#fff") === null, "parseOklch rejects hex");
+	assert(toHex("#0AF") === "#00aaff", "toHex expands #rgb");
+	assert(toHex("oklch(100% 0 0)") === "#ffffff", "toHex converts oklch to hex");
+	assert(oklchToHex(1, 0, 0) === "#ffffff", "oklch L=1 is white");
+	assert(oklchToHex(0, 0, 0) === "#000000", "oklch L=0 is black");
+	assert(contrast("#ffffff", "#000000") === 21, "white on black = 21:1");
+	assert(Math.abs(contrast("#000000", "#ffffff") - 21) < 1e-9, "contrast is order-independent");
+	const back = hexToOklch("#00d7ff");
+	assert(Math.abs(back.H - 218) < 6, `hexToOklch hue of #00d7ff ~218 (got ${back.H.toFixed(1)})`);
+	assert(oklchToRgb(0.7, 0.4, 145).chroma < 0.4, "out-of-gamut chroma is reduced");
+	console.log("lib/color.ts OK");
+}

package/lib/format.ts

@@ -23,6 +23,12 @@ export function modelDisplayParts(model?: { id?: string; name?: string; provider
 	return { name, provider };
 }
 
+// Picker rows for every /arnative list (themes, header & footer presets):
+// `● name` marks the active entry, everything else gets a two-space indent.
+export function markedLabels(names: readonly string[], current: string | undefined): string[] {
+	return names.map((n) => `${n === current ? "● " : "  "}${n}`);
+}
+
 // Expand-hint key follows the active keybinding; outside a pi session keyText() is empty.
 export function expandKeyName(): string {
 	try {

package/lib/usage-store.ts

@@ -10,7 +10,7 @@ import { existsSync, mkdirSync, readFileSync, readdirSync, statSync, writeFileSy
 import { dirname, join } from "node:path";
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
 
-export interface UsageEntry {
+interface UsageEntry {
 	provider: string;
 	model: string;
 	input: number;
@@ -19,14 +19,14 @@ export interface UsageEntry {
 	cost: number;
 }
 
-export interface FileCacheItem {
+interface FileCacheItem {
 	mtimeMs: number;
 	size: number;
 	v?: number;
 	entries: UsageEntry[];
 }
 
-export interface UsageModelStats {
+interface UsageModelStats {
 	name: string;
 	sessions: number;
 	msgs: number;
@@ -37,7 +37,7 @@ export interface UsageModelStats {
 	cost: number;
 }
 
-export interface UsageProviderStats {
+interface UsageProviderStats {
 	name: string;
 	sessions: number;
 	msgs: number;
@@ -62,20 +62,19 @@ export interface UsageSummary {
 	};
 }
 
+/** Scaled value with 1 decimal ("2.5k"); a value that rounds up to the next unit is promoted (999,999 -> "1M", not "1000k"). */
+const fmtUnit = (v: number, unit: string, next: string): string => {
+	const s = v.toFixed(1).replace(/\.0$/, "");
+	return s === "1000" ? `1${next}` : `${s}${unit}`;
+};
+
 /** Token count with k/M/B units; 0 or negative = "-". */
 export function formatTokens(n: number): string {
 	if (!n || n <= 0) return "-";
 	if (n < 1000) return String(n);
-	if (n < 1_000_000) {
-		const k = n / 1000;
-		return `${k < 10 ? k.toFixed(1) : Math.round(k)}k`;
-	}
-	if (n < 1_000_000_000) {
-		const m = n / 1_000_000;
-		return `${m.toFixed(1).replace(/\.0$/, "")}M`;
-	}
-	const b = n / 1_000_000_000;
-	return `${b.toFixed(1).replace(/\.0$/, "")}B`;
+	if (n < 1_000_000) return fmtUnit(n / 1000, "k", "M");
+	if (n < 1_000_000_000) return fmtUnit(n / 1_000_000, "M", "B");
+	return fmtUnit(n / 1_000_000_000, "B", "T");
 }
 
 const CACHE_FILE_PATH = join(getAgentDir(), "arnative-usage-cache.json");
@@ -258,6 +257,15 @@ export function collectUsageSummary(forceScan = false): UsageSummary {
 		}
 	}
 
+	// Session files deleted on disk must leave the cache, or the file grows forever.
+	const known = new Set(files);
+	for (const k of diskCache.keys()) {
+		if (!known.has(k)) {
+			diskCache.delete(k);
+			cacheDirty = true;
+		}
+	}
+
 	if (cacheDirty) {
 		saveDiskCache(diskCache);
 	}
@@ -328,7 +336,6 @@ export function collectUsageSummary(forceScan = false): UsageSummary {
 
 // Match model names across id shapes ("gemini-3.8-flash", "vendor/gemini-…").
 const modelMatches = (mNameLower: string, targetLower: string): boolean =>
-	!targetLower ||
 	mNameLower === targetLower ||
 	mNameLower.endsWith("/" + targetLower) ||
 	mNameLower.split(":")[0] === targetLower ||
@@ -336,12 +343,14 @@ const modelMatches = (mNameLower: string, targetLower: string): boolean =>
 
 /** All-time usage for one model (same numbers as /usage; the active session is already in its own file). */
 export function getModelAllTimeUsage(modelId?: string): { input: number; output: number; cacheRead: number } {
+	// An empty target used to match EVERY model -> the Model tab showed the grand total under "No Model".
+	if (!modelId) return { input: 0, output: 0, cacheRead: 0 };
 	const summary = collectUsageSummary();
 	let inp = 0;
 	let out = 0;
 	let read = 0;
 
-	const target = (modelId || "").toLowerCase();
+	const target = modelId.toLowerCase();
 	for (const p of summary.providers) {
 		for (const m of p.models) {
 			if (modelMatches(m.name.toLowerCase(), target)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bismawy/pi-arnative",
-  "version": "0.2.11",
+  "version": "0.3.0",
   "description": "Arnative look for Pi: warm-neutral themes, rounded tool boxes, tabbed header, compact footer, transcript clock, and a /usage dashboard.",
   "keywords": [
     "pi-package",
@@ -22,6 +22,7 @@
     "lib",
     "themes",
     "CHANGELOG.md",
+    "LICENSE",
     "README.md"
   ],
   "pi": {
@@ -39,8 +40,8 @@
     "@earendil-works/pi-tui": "*"
   },
   "scripts": {
-    "dev": "pi --extension ./extensions/tools.ts --extension ./extensions/section-headers.ts --extension ./extensions/footer.ts --extension ./extensions/timestamps.ts --extension ./extensions/ui-render-tweaks.ts --extension ./extensions/usage.ts",
-    "test": "node lib/box.ts && node lib/ansi.ts && node lib/shortcuts.ts && node themes/gen-themes.mjs --check && node extensions/tools.ts && node extensions/footer.ts && node extensions/timestamps.ts && node extensions/section-headers.ts && node extensions/ui-render-tweaks.ts && node extensions/usage.ts",
+    "dev": "pi --extension ./extensions/tools.ts --extension ./extensions/section-headers.ts --extension ./extensions/footer.ts --extension ./extensions/timestamps.ts --extension ./extensions/ui-render-tweaks.ts --extension ./extensions/usage.ts --extension ./extensions/arnative.ts",
+    "test": "node lib/box.ts && node lib/ansi.ts && node lib/shortcuts.ts && node themes/gen-themes.mjs --check && node extensions/tools.ts && node extensions/footer.ts && node extensions/timestamps.ts && node extensions/section-headers.ts && node extensions/ui-render-tweaks.ts && node extensions/usage.ts && node extensions/arnative.ts",
     "themes": "node themes/gen-themes.mjs"
   }
 }

package/themes/arnative-cyberpunk.json

@@ -1,94 +1,86 @@
 {
 	"$schema": "https://raw.githubusercontent.com/earendil-works/pi/main/packages/coding-agent/src/modes/interactive/theme/theme-schema.json",
 	"name": "arnative-cyberpunk",
+	"appearance": "dark",
 	"vars": {
-		"cyan": "#00f0ff",
-		"blue": "#2a7fd4",
-		"green": "#00ff9f",
-		"red": "#ff4d6d",
-		"yellow": "#ffe600",
-		"text": "#eaeaf5",
-		"gray": "#8b88a8",
-		"dimGray": "#6f6a9a",
-		"darkGray": "#4a4763",
-		"accent": "#ff2e97",
-		"softCyan": "#7fd8f0",
-		"searchBg": "#5f3349",
-		"selectedBg": "#2b2350",
-		"userMsgBg": "#16131f",
-		"toolPendingBg": "#0d0b16",
-		"toolSuccessBg": "#0d2430",
-		"toolErrorBg": "#3a1524",
-		"customMsgBg": "#1a1329"
+		"fg": "oklch(88% 0.02 275)",
+		"fgMuted": "oklch(72% 0.02 275)",
+		"fgDim": "oklch(61% 0.02 275)",
+		"fgFaint": "oklch(49% 0.02 275)",
+		"accent": "oklch(78% 0.144 357)",
+		"accentSoft": "oklch(82% 0.036 357)",
+		"accentBorder": "oklch(82% 0.113 357)",
+		"success": "oklch(78% 0.15 145)",
+		"error": "oklch(76% 0.143 25)",
+		"warning": "oklch(86% 0.14 85)",
+		"surfaceMsg": "oklch(16% 0.01 275)"
 	},
 	"colors": {
 		"accent": "accent",
-		"tint": "softCyan",
-		"border": "blue",
-		"borderAccent": "cyan",
-		"borderMuted": "darkGray",
-		"success": "green",
-		"error": "red",
-		"warning": "yellow",
-		"muted": "gray",
-		"dim": "dimGray",
-		"text": "text",
-		"thinkingText": "gray",
+		"accentSoft": "accentSoft",
+		"border": "oklch(55% 0.07 357)",
+		"borderAccent": "accentBorder",
+		"borderMuted": "fgFaint",
+		"success": "success",
+		"error": "error",
+		"warning": "warning",
+		"muted": "fgMuted",
+		"dim": "fgDim",
+		"text": "fg",
 
-		"selectedBg": "selectedBg",
-		"scrollbarTrack": "darkGray",
-		"scrollbarThumb": "softCyan",
-		"searchMatchBg": "searchBg",
-		"searchMatchText": "text",
-		"userMessageBg": "userMsgBg",
-		"userMessageText": "text",
-		"customMessageBg": "customMsgBg",
-		"customMessageText": "text",
-		"customMessageLabel": "#00f0ff",
-		"toolPendingBg": "toolPendingBg",
-		"toolSuccessBg": "toolSuccessBg",
-		"toolErrorBg": "toolErrorBg",
-		"toolTitle": "text",
-		"toolOutput": "gray",
+		"thinkingText": "fgMuted",
+		"selectedBg": "oklch(23% 0.05 357)",
+		"scrollbarTrack": "fgFaint",
+		"scrollbarThumb": "accentSoft",
+		"searchMatchBg": "oklch(30% 0.09 357)",
+		"searchMatchText": "fg",
+		"userMessageBg": "surfaceMsg",
+		"userMessageText": "fg",
+		"customMessageBg": "oklch(17% 0.03 190)",
+		"customMessageText": "fg",
+		"customMessageLabel": "oklch(78% 0.135 190)",
+		"toolPendingBg": "oklch(14% 0.059 357)",
+		"toolSuccessBg": "oklch(13% 0.043 145)",
+		"toolErrorBg": "oklch(13% 0.055 25)",
+		"toolTitle": "fg",
 
-		"mdHeading": "#ffe600",
-		"mdLink": "#00f0ff",
-		"mdLinkUrl": "dimGray",
-		"mdCode": "accent",
-		"mdCodeBlock": "green",
-		"mdCodeBlockBorder": "gray",
-		"mdQuote": "gray",
-		"mdQuoteBorder": "gray",
-		"mdHr": "gray",
-		"mdListBullet": "accent",
+		"toolOutput": "fgMuted",
+		"mdHeading": "oklch(88% 0.079 60)",
+		"mdLink": "oklch(80% 0.138 190)",
+		"mdLinkUrl": "fgDim",
+		"mdCode": "oklch(80% 0.128 357)",
+		"mdCodeBlock": "success",
+		"mdCodeBlockBorder": "fgMuted",
+		"mdQuote": "fgMuted",
+		"mdQuoteBorder": "fgMuted",
+		"mdHr": "fgFaint",
 
-		"toolDiffAdded": "green",
-		"toolDiffRemoved": "red",
-		"toolDiffContext": "gray",
+		"mdListBullet": "oklch(80% 0.128 357)",
+		"toolDiffAdded": "success",
+		"toolDiffRemoved": "error",
+		"toolDiffContext": "fgMuted",
+		"syntaxComment": "fgDim",
+		"syntaxKeyword": "oklch(80% 0.128 357)",
+		"syntaxFunction": "oklch(86% 0.094 60)",
+		"syntaxVariable": "oklch(84% 0.11 320)",
+		"syntaxString": "oklch(82% 0.14 320)",
+		"syntaxNumber": "oklch(80% 0.115 30)",
+		"syntaxType": "oklch(80% 0.16 150)",
+		"syntaxOperator": "fg",
 
-		"syntaxComment": "#6f6a9a",
-		"syntaxKeyword": "#00f0ff",
-		"syntaxFunction": "#ffe600",
-		"syntaxVariable": "#ffd9f2",
-		"syntaxString": "#ff2e97",
-		"syntaxNumber": "#ff9a3c",
-		"syntaxType": "#00ff9f",
-		"syntaxOperator": "#c8c8e8",
-		"syntaxPunctuation": "#9a96c0",
-
-		"thinkingOff": "darkGray",
-		"thinkingMinimal": "#33285c",
-		"thinkingLow": "#4d3a94",
-		"thinkingMedium": "#7a4fd6",
-		"thinkingHigh": "#b84fe8",
-		"thinkingXhigh": "#ff4fc3",
+		"syntaxPunctuation": "fgMuted",
+		"thinkingOff": "oklch(40% 0.02 275)",
+		"thinkingMinimal": "oklch(47% 0.05 357)",
+		"thinkingLow": "oklch(55% 0.08 357)",
+		"thinkingMedium": "oklch(63% 0.12 357)",
+		"thinkingHigh": "oklch(71% 0.16 357)",
+		"thinkingXhigh": "oklch(79% 0.136 357)",
 		"thinkingMax": "accent",
-
-		"bashMode": "green"
+		"bashMode": "success"
 	},
 	"export": {
-		"pageBg": "#0d0b16",
-		"cardBg": "#16131f",
-		"infoBg": "#3a2a10"
+		"pageBg": "oklch(10% 0.02 275)",
+		"cardBg": "oklch(13% 0.02 275)",
+		"infoBg": "oklch(21% 0.05 357)"
 	}
 }

package/themes/arnative-dracula.json

@@ -1,94 +1,86 @@
 {
 	"$schema": "https://raw.githubusercontent.com/earendil-works/pi/main/packages/coding-agent/src/modes/interactive/theme/theme-schema.json",
 	"name": "arnative-dracula",
+	"appearance": "dark",
 	"vars": {
-		"cyan": "#8be9fd",
-		"blue": "#6272a4",
-		"green": "#50fa7b",
-		"red": "#ff6363",
-		"yellow": "#f1fa8c",
-		"text": "#f8f8f2",
-		"gray": "#8e96ba",
-		"dimGray": "#6272a4",
-		"darkGray": "#4a4e63",
-		"accent": "#bd93f9",
-		"softCyan": "#c9b8f2",
-		"searchBg": "#59427b",
-		"selectedBg": "#44475a",
-		"userMsgBg": "#343746",
-		"toolPendingBg": "#21222c",
-		"toolSuccessBg": "#26332e",
-		"toolErrorBg": "#412936",
-		"customMsgBg": "#383a52"
+		"fg": "oklch(88% 0.012 285)",
+		"fgMuted": "oklch(72% 0.012 285)",
+		"fgDim": "oklch(61% 0.012 285)",
+		"fgFaint": "oklch(49% 0.012 285)",
+		"accent": "oklch(78% 0.135 302)",
+		"accentSoft": "oklch(82% 0.025 302)",
+		"accentBorder": "oklch(82% 0.084 302)",
+		"success": "oklch(78% 0.14 145)",
+		"error": "oklch(76% 0.14 25)",
+		"warning": "oklch(86% 0.14 85)",
+		"surfaceMsg": "oklch(29% 0.006 285)"
 	},
 	"colors": {
 		"accent": "accent",
-		"tint": "softCyan",
-		"border": "blue",
-		"borderAccent": "cyan",
-		"borderMuted": "darkGray",
-		"success": "green",
-		"error": "red",
-		"warning": "yellow",
-		"muted": "gray",
-		"dim": "dimGray",
-		"text": "text",
-		"thinkingText": "gray",
+		"accentSoft": "accentSoft",
+		"border": "oklch(55% 0.049 302)",
+		"borderAccent": "accentBorder",
+		"borderMuted": "fgFaint",
+		"success": "success",
+		"error": "error",
+		"warning": "warning",
+		"muted": "fgMuted",
+		"dim": "fgDim",
+		"text": "fg",
 
-		"selectedBg": "selectedBg",
-		"scrollbarTrack": "darkGray",
-		"scrollbarThumb": "softCyan",
-		"searchMatchBg": "searchBg",
-		"searchMatchText": "text",
-		"userMessageBg": "userMsgBg",
-		"userMessageText": "text",
-		"customMessageBg": "customMsgBg",
-		"customMessageText": "text",
-		"customMessageLabel": "#ff79c6",
-		"toolPendingBg": "toolPendingBg",
-		"toolSuccessBg": "toolSuccessBg",
-		"toolErrorBg": "toolErrorBg",
-		"toolTitle": "text",
-		"toolOutput": "gray",
+		"thinkingText": "fgMuted",
+		"selectedBg": "oklch(36% 0.035 302)",
+		"scrollbarTrack": "fgFaint",
+		"scrollbarThumb": "accentSoft",
+		"searchMatchBg": "oklch(43% 0.063 302)",
+		"searchMatchText": "fg",
+		"userMessageBg": "surfaceMsg",
+		"userMessageText": "fg",
+		"customMessageBg": "oklch(30% 0.056 330)",
+		"customMessageText": "fg",
+		"customMessageLabel": "oklch(78% 0.098 330)",
+		"toolPendingBg": "oklch(27% 0.042 302)",
+		"toolSuccessBg": "oklch(26% 0.056 145)",
+		"toolErrorBg": "oklch(26% 0.056 25)",
+		"toolTitle": "fg",
 
-		"mdHeading": "#f1fa8c",
-		"mdLink": "#8be9fd",
-		"mdLinkUrl": "dimGray",
-		"mdCode": "accent",
-		"mdCodeBlock": "green",
-		"mdCodeBlockBorder": "gray",
-		"mdQuote": "gray",
-		"mdQuoteBorder": "gray",
-		"mdHr": "gray",
-		"mdListBullet": "accent",
+		"toolOutput": "fgMuted",
+		"mdHeading": "oklch(88% 0.079 60)",
+		"mdLink": "oklch(80% 0.098 190)",
+		"mdLinkUrl": "fgDim",
+		"mdCode": "oklch(80% 0.098 302)",
+		"mdCodeBlock": "success",
+		"mdCodeBlockBorder": "fgMuted",
+		"mdQuote": "fgMuted",
+		"mdQuoteBorder": "fgMuted",
+		"mdHr": "fgFaint",
 
-		"toolDiffAdded": "green",
-		"toolDiffRemoved": "red",
-		"toolDiffContext": "gray",
+		"mdListBullet": "oklch(80% 0.098 302)",
+		"toolDiffAdded": "success",
+		"toolDiffRemoved": "error",
+		"toolDiffContext": "fgMuted",
+		"syntaxComment": "fgDim",
+		"syntaxKeyword": "oklch(80% 0.098 302)",
+		"syntaxFunction": "oklch(86% 0.112 135)",
+		"syntaxVariable": "oklch(84% 0.077 190)",
+		"syntaxString": "oklch(82% 0.098 60)",
+		"syntaxNumber": "oklch(80% 0.098 265)",
+		"syntaxType": "oklch(80% 0.112 190)",
+		"syntaxOperator": "fg",
 
-		"syntaxComment": "#6272a4",
-		"syntaxKeyword": "#ff79c6",
-		"syntaxFunction": "#50fa7b",
-		"syntaxVariable": "#8be9fd",
-		"syntaxString": "#f1fa8c",
-		"syntaxNumber": "#bd93f9",
-		"syntaxType": "#8be9fd",
-		"syntaxOperator": "#ff79c6",
-		"syntaxPunctuation": "#f8f8f2",
-
-		"thinkingOff": "darkGray",
-		"thinkingMinimal": "#464a5d",
-		"thinkingLow": "#6272a4",
-		"thinkingMedium": "#7a6fd0",
-		"thinkingHigh": "#bd93f9",
-		"thinkingXhigh": "#ff79c6",
+		"syntaxPunctuation": "fgMuted",
+		"thinkingOff": "oklch(40% 0.012 285)",
+		"thinkingMinimal": "oklch(47% 0.035 302)",
+		"thinkingLow": "oklch(55% 0.056 302)",
+		"thinkingMedium": "oklch(63% 0.084 302)",
+		"thinkingHigh": "oklch(71% 0.112 302)",
+		"thinkingXhigh": "oklch(79% 0.128 302)",
 		"thinkingMax": "accent",
-
-		"bashMode": "green"
+		"bashMode": "success"
 	},
 	"export": {
-		"pageBg": "#21222c",
-		"cardBg": "#282a36",
-		"infoBg": "#44475a"
+		"pageBg": "oklch(23% 0.012 285)",
+		"cardBg": "oklch(26% 0.012 285)",
+		"infoBg": "oklch(34% 0.035 302)"
 	}
 }