@bismawy/pi-arnative 0.3.10 → 0.5.1

package/lib/usage-store.ts

@@ -87,6 +87,8 @@ interface UsageModelStats {
 	cacheRead: number;
 	totalTokens: number;
 	cost: number;
+	/** Cost reconstructed from the price table, only when `cost` is 0. Never folded into `cost`. */
+	estimatedCost: number;
 }
 
 interface UsageProviderStats {
@@ -98,6 +100,8 @@ interface UsageProviderStats {
 	cacheRead: number;
 	totalTokens: number;
 	cost: number;
+	/** Sum of the models' `estimatedCost`, for the same rows this provider could not price. */
+	estimatedCost: number;
 	models: UsageModelStats[];
 }
 
@@ -111,9 +115,82 @@ export interface UsageSummary {
 		cacheRead: number;
 		totalTokens: number;
 		cost: number;
+		/** Provider-reported cost only (never includes the estimate). */
+		reportedCost: number;
+		/** Cost reconstructed from `prices.json`. Shown with a `~`, never folded into `cost`. */
+		estimatedCost: number;
 	};
 }
 
+export type ModelPrices = Record<string, { input?: number; output?: number; cacheRead?: number }>;
+export type PriceTable = Record<string, ModelPrices>;
+
+const modelsFilePath = (): string => join(getAgentDir(), "models.json");
+
+type ModelsJsonCost = { input?: number; output?: number; cacheRead?: number };
+
+/**
+ * Rates declared automatically in pi's `models.json` (`providers.<name>.models[].cost`).
+ * Keyed by provider to reconstruct estimates for historical or 0-cost rows.
+ */
+export function loadPriceTable(): PriceTable {
+	const table: PriceTable = {};
+	try {
+		const raw = JSON.parse(readFileSync(modelsFilePath(), "utf8")) as {
+			providers?: Record<string, { models?: { id?: string; cost?: ModelsJsonCost }[] }>;
+		};
+		for (const [provider, cfg] of Object.entries(raw.providers ?? {})) {
+			const models: ModelPrices = {};
+			for (const m of cfg?.models ?? []) {
+				const c = m?.cost;
+				if (!m?.id || !c || typeof c.input !== "number" || typeof c.output !== "number") continue;
+				models[m.id] = { input: c.input, output: c.output, cacheRead: typeof c.cacheRead === "number" ? c.cacheRead : 0 };
+			}
+			if (Object.keys(models).length > 0) table[provider] = models;
+		}
+	} catch {
+		// Malformed or absent models.json means no declared rates.
+	}
+	return table;
+}
+
+/** True when this provider+model has a usable input+output price (cacheRead is optional). */
+export function hasPrice(provider: string, modelId: string, table: PriceTable = loadPriceTable()): boolean {
+	return findPrice(provider, modelId, table) !== null;
+}
+
+/** Rates for one provider+model. The provider's own entry wins over the `*` fallback. */
+function findPrice(provider: string, modelId: string, table: PriceTable): { input: number; output: number; cacheRead: number } | null {
+	return rateFor(table[provider], modelId) ?? rateFor(table["*"], modelId);
+}
+
+function rateFor(entries: ModelPrices | undefined, modelId: string): { input: number; output: number; cacheRead: number } | null {
+	if (!entries || typeof entries !== "object") return null;
+	const lower = modelId.toLowerCase();
+	const keys = Object.keys(entries).filter((k) => !k.startsWith("_"));
+	const key =
+		keys.find((k) => k.toLowerCase() === lower) ??
+		keys.find((k) => lower.endsWith("/" + k.toLowerCase()) || k.toLowerCase().endsWith("/" + lower));
+	if (!key) return null;
+	const p = entries[key]!;
+	if (typeof p.input !== "number" || typeof p.output !== "number") return null;
+	return { input: p.input, output: p.output, cacheRead: typeof p.cacheRead === "number" ? p.cacheRead : 0 };
+}
+
+/** Cost of one provider+model's token counts from the price table, or null when unpriced. */
+export function estimateCost(
+	input: number,
+	output: number,
+	cacheRead: number,
+	modelId: string,
+	provider: string,
+	table: PriceTable = loadPriceTable(),
+): number | null {
+	const p = findPrice(provider, modelId, table);
+	if (!p) return null;
+	return (input / 1e6) * p.input + (output / 1e6) * p.output + (cacheRead / 1e6) * p.cacheRead;
+}
+
 /** 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$/, "");
@@ -208,10 +285,9 @@ function entryOfLine(line: string): UsageEntry | null {
 }
 
 /**
- * Parse newline-terminated lines from a buffer. Byte granularity, so the returned offset can be
- * fed back to `readSync`. A trailing segment with no newline is parsed (the last record of a file
- * not ending in `\n`) but only consumed when it is valid JSON — a write caught mid-flight is left
- * for the next scan instead of being dropped or truncated into a bad entry.
+ * Parse newline-terminated lines from a buffer. The returned offset is byte-granular, so it can
+ * be fed back to `readSync`; a trailing segment without a newline counts only when it parses, so
+ * a write caught mid-flight is left for the next scan rather than dropped.
  */
 function parseBuffer(buf: Buffer): { entries: UsageEntry[]; consumed: number } {
 	const entries: UsageEntry[] = [];
@@ -428,6 +504,20 @@ export function collectUsageSummary(forceScan = false): UsageSummary {
 
 	providers.sort((a, b) => b.totalTokens - a.totalTokens);
 
+	// Estimate unpriced pairs from price table. Kept separate in estimatedCost.
+	const priceTable = loadPriceTable();
+	let estimatedCost = 0;
+	for (const p of providers) {
+		let providerEstimate = 0;
+		for (const m of p.models) {
+			const est = m.cost > 0 ? null : estimateCost(m.input, m.output, m.cacheRead, m.name, p.name, priceTable);
+			m.estimatedCost = est ?? 0;
+			providerEstimate += m.estimatedCost;
+		}
+		p.estimatedCost = providerEstimate;
+		estimatedCost += providerEstimate;
+	}
+
 	cachedSummary = {
 		providers,
 		totals: {
@@ -438,6 +528,8 @@ export function collectUsageSummary(forceScan = false): UsageSummary {
 			cacheRead: totalCache,
 			totalTokens: totalInp + totalOut,
 			cost: totalCost,
+			reportedCost: totalCost,
+			estimatedCost,
 		},
 	};
 	lastScanMs = now;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bismawy/pi-arnative",
-  "version": "0.3.10",
+  "version": "0.5.1",
   "description": "Refined aesthetics. Cohesive tools. Built for Pi. Warm themes, rounded tool boxes, tabbed header, compact footer and a /usage dashboard.",
   "keywords": [
     "pi-package",
@@ -40,8 +40,9 @@
     "@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 --extension ./extensions/arnative.ts",
-    "test": "node lib/box.ts && node lib/ansi.ts && node lib/color.ts && node lib/shortcuts.ts && node lib/preset-store.ts && node themes/gen-themes.mjs --check && node extensions/tools.ts && node extensions/footer.ts && node extensions/timestamps.ts && node extensions/ui-render-tweaks.ts && node extensions/usage.ts && node extensions/arnative.ts && node --test",
+    "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/animations.ts --extension ./extensions/arnative.ts",
+    "test": "node lib/box.ts && node lib/ansi.ts && node lib/color.ts && node lib/shortcuts.ts && node lib/preset-store.ts && node lib/spinner.ts && node themes/gen-themes.mjs --check && node extensions/tools.ts && node extensions/footer.ts && node extensions/timestamps.ts && node extensions/ui-render-tweaks.ts && node extensions/usage.ts && node extensions/animations.ts && node extensions/arnative.ts && node --test",
+    "preview": "node scripts/preview.mjs",
     "themes": "node themes/gen-themes.mjs",
     "release:check": "node scripts/release-check.mjs pre-tag",
     "prepublishOnly": "npm test && node scripts/release-check.mjs pre-publish"

package/themes/arnative-cyberpunk.json

@@ -1,5 +1,5 @@
 {
-	"$schema": "https://raw.githubusercontent.com/earendil-works/pi/main/packages/coding-agent/src/modes/interactive/theme/theme-schema.json",
+	"$schema": "https://pi.dev/schemas/theme.schema.json",
 	"name": "arnative-cyberpunk",
 	"appearance": "dark",
 	"vars": {
@@ -7,19 +7,20 @@
 		"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)",
+		"primary": "oklch(88% 0.18 95)",
+		"secondary": "oklch(82% 0.139 200)",
+		"accent": "oklch(78% 0.146 355)",
+		"accentSoft": "oklch(82% 0.026 355)",
+		"accentBorder": "oklch(82% 0.114 355)",
 		"success": "oklch(78% 0.15 145)",
 		"error": "oklch(76% 0.143 25)",
 		"warning": "oklch(86% 0.14 85)",
-		"surfaceMsg": "oklch(16% 0.01 275)"
+		"surfaceMsg": "oklch(24% 0.035 200)"
 	},
 	"colors": {
 		"accent": "accent",
-		"accentSoft": "accentSoft",
-		"border": "oklch(55% 0.07 357)",
-		"borderAccent": "accentBorder",
+		"border": "oklch(55% 0.07 200)",
+		"borderAccent": "secondary",
 		"borderMuted": "fgFaint",
 		"success": "success",
 		"error": "error",
@@ -29,58 +30,58 @@
 		"text": "fg",
 
 		"thinkingText": "fgMuted",
-		"selectedBg": "oklch(23% 0.05 357)",
+		"selectedBg": "oklch(31% 0.05 200)",
 		"scrollbarTrack": "fgFaint",
 		"scrollbarThumb": "accentSoft",
-		"searchMatchBg": "oklch(30% 0.09 357)",
+		"searchMatchBg": "oklch(38% 0.078 95)",
 		"searchMatchText": "fg",
 		"userMessageBg": "surfaceMsg",
 		"userMessageText": "fg",
-		"customMessageBg": "oklch(17% 0.03 190)",
+		"customMessageBg": "oklch(25% 0.043 200)",
 		"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)",
+		"customMessageLabel": "oklch(78% 0.133 200)",
+		"toolPendingBg": "oklch(22% 0.05 355)",
+		"toolSuccessBg": "oklch(21% 0.06 145)",
+		"toolErrorBg": "oklch(21% 0.06 25)",
 		"toolTitle": "fg",
 
 		"toolOutput": "fgMuted",
-		"mdHeading": "oklch(88% 0.079 60)",
-		"mdLink": "oklch(80% 0.138 190)",
+		"mdHeading": "primary",
+		"mdLink": "oklch(80% 0.136 200)",
 		"mdLinkUrl": "fgDim",
-		"mdCode": "oklch(80% 0.128 357)",
+		"mdCode": "secondary",
 		"mdCodeBlock": "success",
 		"mdCodeBlockBorder": "fgMuted",
 		"mdQuote": "fgMuted",
 		"mdQuoteBorder": "fgMuted",
 		"mdHr": "fgFaint",
 
-		"mdListBullet": "oklch(80% 0.128 357)",
+		"mdListBullet": "primary",
 		"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)",
+		"syntaxKeyword": "secondary",
+		"syntaxFunction": "oklch(86% 0.16 95)",
+		"syntaxVariable": "oklch(84% 0.1 355)",
+		"syntaxString": "oklch(82% 0.14 140)",
+		"syntaxNumber": "oklch(80% 0.122 45)",
+		"syntaxType": "oklch(80% 0.136 200)",
 		"syntaxOperator": "fg",
 
 		"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)",
+		"thinkingMinimal": "oklch(47% 0.05 355)",
+		"thinkingLow": "oklch(55% 0.08 355)",
+		"thinkingMedium": "oklch(63% 0.12 355)",
+		"thinkingHigh": "oklch(71% 0.16 355)",
+		"thinkingXhigh": "oklch(79% 0.138 355)",
 		"thinkingMax": "accent",
 		"bashMode": "success"
 	},
 	"export": {
-		"pageBg": "oklch(10% 0.02 275)",
-		"cardBg": "oklch(13% 0.02 275)",
-		"infoBg": "oklch(21% 0.05 357)"
+		"pageBg": "oklch(18% 0.02 275)",
+		"cardBg": "oklch(21% 0.02 275)",
+		"infoBg": "oklch(29% 0.05 355)"
 	}
 }

package/themes/arnative-dracula.json

@@ -1,5 +1,5 @@
 {
-	"$schema": "https://raw.githubusercontent.com/earendil-works/pi/main/packages/coding-agent/src/modes/interactive/theme/theme-schema.json",
+	"$schema": "https://pi.dev/schemas/theme.schema.json",
 	"name": "arnative-dracula",
 	"appearance": "dark",
 	"vars": {
@@ -7,9 +7,11 @@
 		"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)",
+		"primary": "oklch(78% 0.125 295)",
+		"secondary": "oklch(82% 0.13 190)",
+		"accent": "oklch(78% 0.14 330)",
+		"accentSoft": "oklch(82% 0.025 330)",
+		"accentBorder": "oklch(82% 0.084 330)",
 		"success": "oklch(78% 0.14 145)",
 		"error": "oklch(76% 0.14 25)",
 		"warning": "oklch(86% 0.14 85)",
@@ -17,9 +19,8 @@
 	},
 	"colors": {
 		"accent": "accent",
-		"accentSoft": "accentSoft",
-		"border": "oklch(55% 0.049 302)",
-		"borderAccent": "accentBorder",
+		"border": "oklch(55% 0.049 295)",
+		"borderAccent": "secondary",
 		"borderMuted": "fgFaint",
 		"success": "success",
 		"error": "error",
@@ -29,58 +30,58 @@
 		"text": "fg",
 
 		"thinkingText": "fgMuted",
-		"selectedBg": "oklch(36% 0.035 302)",
+		"selectedBg": "oklch(36% 0.035 295)",
 		"scrollbarTrack": "fgFaint",
 		"scrollbarThumb": "accentSoft",
-		"searchMatchBg": "oklch(43% 0.063 302)",
+		"searchMatchBg": "oklch(43% 0.063 85)",
 		"searchMatchText": "fg",
 		"userMessageBg": "surfaceMsg",
 		"userMessageText": "fg",
-		"customMessageBg": "oklch(30% 0.056 330)",
+		"customMessageBg": "oklch(30% 0.05 190)",
 		"customMessageText": "fg",
-		"customMessageLabel": "oklch(78% 0.098 330)",
-		"toolPendingBg": "oklch(27% 0.042 302)",
+		"customMessageLabel": "oklch(78% 0.098 190)",
+		"toolPendingBg": "oklch(27% 0.042 330)",
 		"toolSuccessBg": "oklch(26% 0.056 145)",
 		"toolErrorBg": "oklch(26% 0.056 25)",
 		"toolTitle": "fg",
 
 		"toolOutput": "fgMuted",
-		"mdHeading": "oklch(88% 0.079 60)",
+		"mdHeading": "oklch(88% 0.084 85)",
 		"mdLink": "oklch(80% 0.098 190)",
 		"mdLinkUrl": "fgDim",
-		"mdCode": "oklch(80% 0.098 302)",
+		"mdCode": "secondary",
 		"mdCodeBlock": "success",
 		"mdCodeBlockBorder": "fgMuted",
 		"mdQuote": "fgMuted",
 		"mdQuoteBorder": "fgMuted",
 		"mdHr": "fgFaint",
 
-		"mdListBullet": "oklch(80% 0.098 302)",
+		"mdListBullet": "accent",
 		"toolDiffAdded": "success",
 		"toolDiffRemoved": "error",
 		"toolDiffContext": "fgMuted",
 		"syntaxComment": "fgDim",
-		"syntaxKeyword": "oklch(80% 0.098 302)",
-		"syntaxFunction": "oklch(86% 0.112 135)",
+		"syntaxKeyword": "oklch(80% 0.098 330)",
+		"syntaxFunction": "oklch(86% 0.112 140)",
 		"syntaxVariable": "oklch(84% 0.077 190)",
-		"syntaxString": "oklch(82% 0.098 60)",
-		"syntaxNumber": "oklch(80% 0.098 265)",
+		"syntaxString": "oklch(82% 0.098 85)",
+		"syntaxNumber": "oklch(80% 0.098 295)",
 		"syntaxType": "oklch(80% 0.112 190)",
 		"syntaxOperator": "fg",
 
 		"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)",
+		"thinkingMinimal": "oklch(47% 0.035 330)",
+		"thinkingLow": "oklch(55% 0.056 330)",
+		"thinkingMedium": "oklch(63% 0.084 330)",
+		"thinkingHigh": "oklch(71% 0.112 330)",
+		"thinkingXhigh": "oklch(79% 0.14 330)",
 		"thinkingMax": "accent",
 		"bashMode": "success"
 	},
 	"export": {
 		"pageBg": "oklch(23% 0.012 285)",
 		"cardBg": "oklch(26% 0.012 285)",
-		"infoBg": "oklch(34% 0.035 302)"
+		"infoBg": "oklch(34% 0.035 330)"
 	}
 }

package/themes/arnative-emerald.json

@@ -1,5 +1,5 @@
 {
-	"$schema": "https://raw.githubusercontent.com/earendil-works/pi/main/packages/coding-agent/src/modes/interactive/theme/theme-schema.json",
+	"$schema": "https://pi.dev/schemas/theme.schema.json",
 	"name": "arnative-emerald",
 	"appearance": "dark",
 	"vars": {
@@ -7,6 +7,8 @@
 		"fgMuted": "oklch(72% 0.012 165)",
 		"fgDim": "oklch(61% 0.012 165)",
 		"fgFaint": "oklch(49% 0.012 165)",
+		"primary": "oklch(84% 0.13 165)",
+		"secondary": "oklch(78% 0.1 195)",
 		"accent": "oklch(78% 0.12 165)",
 		"accentSoft": "oklch(82% 0.022 165)",
 		"accentBorder": "oklch(82% 0.072 165)",
@@ -17,8 +19,7 @@
 	},
 	"colors": {
 		"accent": "accent",
-		"accentSoft": "accentSoft",
-		"border": "oklch(55% 0.042 165)",
+		"border": "oklch(55% 0.042 0)",
 		"borderAccent": "accentBorder",
 		"borderMuted": "fgFaint",
 		"success": "success",
@@ -29,10 +30,10 @@
 		"text": "fg",
 
 		"thinkingText": "fgMuted",
-		"selectedBg": "oklch(34% 0.03 165)",
+		"selectedBg": "oklch(34% 0.03 0)",
 		"scrollbarTrack": "fgFaint",
 		"scrollbarThumb": "accentSoft",
-		"searchMatchBg": "oklch(41% 0.054 165)",
+		"searchMatchBg": "oklch(41% 0.054 0)",
 		"searchMatchText": "fg",
 		"userMessageBg": "surfaceMsg",
 		"userMessageText": "fg",

package/themes/arnative-gruvbox.json

@@ -1,5 +1,5 @@
 {
-	"$schema": "https://raw.githubusercontent.com/earendil-works/pi/main/packages/coding-agent/src/modes/interactive/theme/theme-schema.json",
+	"$schema": "https://pi.dev/schemas/theme.schema.json",
 	"name": "arnative-gruvbox",
 	"appearance": "dark",
 	"vars": {
@@ -7,9 +7,11 @@
 		"fgMuted": "oklch(72% 0.015 70)",
 		"fgDim": "oklch(61% 0.015 70)",
 		"fgFaint": "oklch(49% 0.015 70)",
-		"accent": "oklch(78% 0.14 83)",
-		"accentSoft": "oklch(82% 0.025 83)",
-		"accentBorder": "oklch(82% 0.084 83)",
+		"primary": "oklch(84% 0.14 83)",
+		"secondary": "oklch(78% 0.1 175)",
+		"accent": "oklch(78% 0.137 45)",
+		"accentSoft": "oklch(82% 0.025 45)",
+		"accentBorder": "oklch(82% 0.084 45)",
 		"success": "oklch(78% 0.14 145)",
 		"error": "oklch(76% 0.14 25)",
 		"warning": "oklch(86% 0.14 85)",
@@ -17,9 +19,8 @@
 	},
 	"colors": {
 		"accent": "accent",
-		"accentSoft": "accentSoft",
 		"border": "oklch(55% 0.049 83)",
-		"borderAccent": "accentBorder",
+		"borderAccent": "secondary",
 		"borderMuted": "fgFaint",
 		"success": "success",
 		"error": "error",
@@ -36,51 +37,51 @@
 		"searchMatchText": "fg",
 		"userMessageBg": "surfaceMsg",
 		"userMessageText": "fg",
-		"customMessageBg": "oklch(25% 0.056 330)",
+		"customMessageBg": "oklch(25% 0.047 175)",
 		"customMessageText": "fg",
-		"customMessageLabel": "oklch(78% 0.098 330)",
-		"toolPendingBg": "oklch(22% 0.042 83)",
+		"customMessageLabel": "oklch(78% 0.098 175)",
+		"toolPendingBg": "oklch(22% 0.042 45)",
 		"toolSuccessBg": "oklch(21% 0.056 145)",
 		"toolErrorBg": "oklch(21% 0.056 25)",
 		"toolTitle": "fg",
 
 		"toolOutput": "fgMuted",
-		"mdHeading": "oklch(88% 0.068 45)",
-		"mdLink": "oklch(80% 0.098 200)",
+		"mdHeading": "primary",
+		"mdLink": "oklch(80% 0.098 175)",
 		"mdLinkUrl": "fgDim",
-		"mdCode": "oklch(80% 0.098 83)",
+		"mdCode": "secondary",
 		"mdCodeBlock": "success",
 		"mdCodeBlockBorder": "fgMuted",
 		"mdQuote": "fgMuted",
 		"mdQuoteBorder": "fgMuted",
 		"mdHr": "fgFaint",
 
-		"mdListBullet": "oklch(80% 0.098 83)",
+		"mdListBullet": "accent",
 		"toolDiffAdded": "success",
 		"toolDiffRemoved": "error",
 		"toolDiffContext": "fgMuted",
 		"syntaxComment": "fgDim",
-		"syntaxKeyword": "oklch(80% 0.098 83)",
-		"syntaxFunction": "oklch(86% 0.109 70)",
-		"syntaxVariable": "oklch(84% 0.077 200)",
-		"syntaxString": "oklch(82% 0.098 70)",
-		"syntaxNumber": "oklch(80% 0.098 330)",
-		"syntaxType": "oklch(80% 0.112 45)",
+		"syntaxKeyword": "oklch(80% 0.098 45)",
+		"syntaxFunction": "oklch(86% 0.112 83)",
+		"syntaxVariable": "oklch(84% 0.077 175)",
+		"syntaxString": "oklch(82% 0.098 145)",
+		"syntaxNumber": "oklch(80% 0.098 45)",
+		"syntaxType": "oklch(80% 0.112 83)",
 		"syntaxOperator": "fg",
 
 		"syntaxPunctuation": "fgMuted",
 		"thinkingOff": "oklch(40% 0.015 70)",
-		"thinkingMinimal": "oklch(47% 0.035 83)",
-		"thinkingLow": "oklch(55% 0.056 83)",
-		"thinkingMedium": "oklch(63% 0.084 83)",
-		"thinkingHigh": "oklch(71% 0.112 83)",
-		"thinkingXhigh": "oklch(79% 0.14 83)",
+		"thinkingMinimal": "oklch(47% 0.035 45)",
+		"thinkingLow": "oklch(55% 0.056 45)",
+		"thinkingMedium": "oklch(63% 0.084 45)",
+		"thinkingHigh": "oklch(71% 0.112 45)",
+		"thinkingXhigh": "oklch(79% 0.13 45)",
 		"thinkingMax": "accent",
 		"bashMode": "success"
 	},
 	"export": {
 		"pageBg": "oklch(18% 0.015 70)",
 		"cardBg": "oklch(21% 0.015 70)",
-		"infoBg": "oklch(29% 0.035 83)"
+		"infoBg": "oklch(29% 0.035 45)"
 	}
 }

package/themes/arnative-matrix.json

@@ -1,5 +1,5 @@
 {
-	"$schema": "https://raw.githubusercontent.com/earendil-works/pi/main/packages/coding-agent/src/modes/interactive/theme/theme-schema.json",
+	"$schema": "https://pi.dev/schemas/theme.schema.json",
 	"name": "arnative-matrix",
 	"appearance": "dark",
 	"vars": {
@@ -7,18 +7,19 @@
 		"fgMuted": "oklch(72% 0.02 145)",
 		"fgDim": "oklch(61% 0.02 145)",
 		"fgFaint": "oklch(49% 0.02 145)",
+		"primary": "oklch(88% 0.24 145)",
+		"secondary": "oklch(76% 0.16 165)",
 		"accent": "oklch(78% 0.22 144)",
 		"accentSoft": "oklch(82% 0.04 144)",
 		"accentBorder": "oklch(82% 0.132 144)",
 		"success": "oklch(78% 0.15 145)",
 		"error": "oklch(76% 0.143 25)",
 		"warning": "oklch(86% 0.14 85)",
-		"surfaceMsg": "oklch(15% 0.01 145)"
+		"surfaceMsg": "oklch(24% 0.035 145)"
 	},
 	"colors": {
 		"accent": "accent",
-		"accentSoft": "accentSoft",
-		"border": "oklch(55% 0.077 144)",
+		"border": "oklch(55% 0.077 0)",
 		"borderAccent": "accentBorder",
 		"borderMuted": "fgFaint",
 		"success": "success",
@@ -29,43 +30,43 @@
 		"text": "fg",
 
 		"thinkingText": "fgMuted",
-		"selectedBg": "oklch(22% 0.055 144)",
+		"selectedBg": "oklch(31% 0.055 0)",
 		"scrollbarTrack": "fgFaint",
 		"scrollbarThumb": "accentSoft",
-		"searchMatchBg": "oklch(29% 0.093 144)",
+		"searchMatchBg": "oklch(38% 0.099 0)",
 		"searchMatchText": "fg",
 		"userMessageBg": "surfaceMsg",
 		"userMessageText": "fg",
-		"customMessageBg": "oklch(16% 0.052 145)",
+		"customMessageBg": "oklch(25% 0.05 145)",
 		"customMessageText": "fg",
-		"customMessageLabel": "oklch(78% 0.154 145)",
-		"toolPendingBg": "oklch(13% 0.044 144)",
-		"toolSuccessBg": "oklch(12% 0.04 145)",
-		"toolErrorBg": "oklch(12% 0.051 25)",
+		"customMessageLabel": "oklch(78% 0.14 145)",
+		"toolPendingBg": "oklch(22% 0.05 144)",
+		"toolSuccessBg": "oklch(21% 0.06 145)",
+		"toolErrorBg": "oklch(21% 0.06 25)",
 		"toolTitle": "fg",
 
 		"toolOutput": "fgMuted",
 		"mdHeading": "oklch(88% 0.132 145)",
-		"mdLink": "oklch(80% 0.154 145)",
+		"mdLink": "oklch(80% 0.14 145)",
 		"mdLinkUrl": "fgDim",
-		"mdCode": "oklch(80% 0.154 144)",
+		"mdCode": "oklch(80% 0.14 144)",
 		"mdCodeBlock": "success",
 		"mdCodeBlockBorder": "fgMuted",
 		"mdQuote": "fgMuted",
 		"mdQuoteBorder": "fgMuted",
 		"mdHr": "fgFaint",
 
-		"mdListBullet": "oklch(80% 0.154 144)",
+		"mdListBullet": "oklch(80% 0.14 144)",
 		"toolDiffAdded": "success",
 		"toolDiffRemoved": "error",
 		"toolDiffContext": "fgMuted",
 		"syntaxComment": "fgDim",
-		"syntaxKeyword": "oklch(80% 0.154 144)",
-		"syntaxFunction": "oklch(86% 0.176 145)",
+		"syntaxKeyword": "oklch(80% 0.14 144)",
+		"syntaxFunction": "oklch(86% 0.16 145)",
 		"syntaxVariable": "oklch(84% 0.121 145)",
 		"syntaxString": "oklch(82% 0.154 145)",
-		"syntaxNumber": "oklch(80% 0.154 145)",
-		"syntaxType": "oklch(80% 0.176 145)",
+		"syntaxNumber": "oklch(80% 0.15 145)",
+		"syntaxType": "oklch(80% 0.16 145)",
 		"syntaxOperator": "fg",
 
 		"syntaxPunctuation": "fgMuted",
@@ -79,8 +80,8 @@
 		"bashMode": "success"
 	},
 	"export": {
-		"pageBg": "oklch(9% 0.02 145)",
-		"cardBg": "oklch(12% 0.02 145)",
-		"infoBg": "oklch(20% 0.055 144)"
+		"pageBg": "oklch(18% 0.02 145)",
+		"cardBg": "oklch(21% 0.02 145)",
+		"infoBg": "oklch(29% 0.055 144)"
 	}
 }