@oh-my-pi/pi-tui 18.4.3 → 18.4.4

package/src/status-line/separators.ts

@@ -1,10 +1,6 @@
 import type { Theme } from "../theme";
 import type { SeparatorDef, StatusLineSeparatorStyle } from "./types";
 
-function trimSep(value: string): string {
-	return value.trim();
-}
-
 export function getSeparator(style: StatusLineSeparatorStyle, theme: Theme): SeparatorDef {
 	switch (style) {
 		case "powerline":
@@ -17,22 +13,12 @@ export function getSeparator(style: StatusLineSeparatorStyle, theme: Theme): Sep
 					useBgAsFg: true,
 				},
 			};
-		case "powerline-thin":
-			return {
-				left: theme.sep.powerlineThinLeft,
-				right: theme.sep.powerlineThinRight,
-				endCaps: {
-					left: theme.sep.powerlineRight,
-					right: theme.sep.powerlineLeft,
-					useBgAsFg: true,
-				},
-			};
 		case "slash": {
-			const slash = trimSep(theme.sep.slash);
+			const slash = theme.sep.slash.trim();
 			return { left: slash, right: slash };
 		}
 		case "pipe": {
-			const pipe = trimSep(theme.sep.pipe);
+			const pipe = theme.sep.pipe.trim();
 			return { left: pipe, right: pipe };
 		}
 		case "block":
@@ -41,6 +27,7 @@ export function getSeparator(style: StatusLineSeparatorStyle, theme: Theme): Sep
 			return { left: theme.sep.space, right: theme.sep.space };
 		case "ascii":
 			return { left: theme.sep.asciiLeft, right: theme.sep.asciiRight };
+		// "powerline-thin" is also the fallback for unknown styles.
 		default:
 			return {
 				left: theme.sep.powerlineThinLeft,

package/src/status-line/types.ts

@@ -1,5 +1,6 @@
 import type { Model } from "@oh-my-pi/pi-ai";
-import type { SessionState } from "@oh-my-pi/pi-wire";
+import type { SessionState, TspSpan, TspTone } from "@oh-my-pi/pi-wire";
+import type { NativeNode, NativeUiEvent } from "../native/node";
 import type { ContextLineMode, StatusLinePreset, StatusLineSegmentId, StatusLineSeparatorStyle } from "./schema";
 import type { ActiveRepoContext, StatusLineSession } from "./host";
 import type { LoopConditionConfig, LoopLimitRuntime } from "./loop";
@@ -203,9 +204,50 @@ export interface RenderedSegment {
 	visible: boolean; // Whether to render (e.g., git hidden when not in repo)
 }
 
+/**
+ * A segment described for a TSP terminal: styled spans (theme/semantic
+ * tokens, no ANSI), a named icon, a tone, and terminal-clocked nodes
+ * (`spinner`, `elapsed`, `rate`) laid out after the spans.
+ */
+export interface SegmentView {
+	readonly spans: readonly TspSpan[];
+	readonly icon?: string;
+	readonly tone?: TspTone;
+	readonly motion?: readonly NativeNode[];
+	/** Tooltip on the segment. */
+	readonly title?: string;
+}
+
+/**
+ * The status line's facts for the native composer. A TSP terminal shows no
+ * status strip: the tab title carries the session, the pane header the path
+ * and branch, and the composer the rest.
+ */
+export interface ComposerFacts {
+	/** `meter` (role `omp.composer.context`): context usage along the composer's top edge. */
+	readonly context: NativeNode;
+	/** The model chip's label: name plus the advisor, fast-mode and slow-mode marks. */
+	readonly model: SegmentView;
+	/**
+	 * `status` (role `omp.composer.extras`, `grow: 1`) of the other configured
+	 * segments as `seg`s; the bar's flexible space, so present even when empty.
+	 */
+	readonly extras: NativeNode;
+	/** `text` (role `omp.composer.usage`): the context share of the window and the session cost. */
+	readonly usage: NativeNode;
+}
+
+/** Supplies {@link ComposerFacts} and takes the clicks on them (`status.*` actions). */
+export interface ComposerFactsSource {
+	describeComposerFacts(): ComposerFacts;
+	handleNativeEvent(event: NativeUiEvent): void;
+}
+
 export interface StatusLineSegment {
 	id: StatusLineSegmentId;
 	render(ctx: SegmentContext): RenderedSegment;
+	/** Native description; null when the segment is hidden. */
+	describe(ctx: SegmentContext): SegmentView | null;
 }
 
 // ═══════════════════════════════════════════════════════════════════════════

package/src/terminal-capabilities.ts

@@ -39,6 +39,7 @@ export type TerminalId =
 	| "orca"
 	| "otty"
 	| "rio"
+	| "tern"
 	| "base"
 	| "trueColor";
 
@@ -698,6 +699,11 @@ const KNOWN_TERMINALS = Object.freeze({
 	// OSC 99, and OSC 66 text sizing are outside rio's supported set and keep
 	// the conservative defaults.
 	rio: new TerminalInfo("rio", ImageProtocol.Kitty, true, true),
+	// Tern (Stencil's terminal, `stencil-term`) sets TERM_PROGRAM=tern and
+	// implements Kitty graphics, OSC 8 and OSC 9/99 notifications. Whether omp
+	// renders natively (Tern Surface Protocol) is decided by the `hello`
+	// handshake alone, never by this identity.
+	tern: new TerminalInfo("tern", ImageProtocol.Kitty, true, true, NotifyProtocol.Osc99),
 });
 
 /** Resolve terminal identity from environment markers used by common emulators. */
@@ -718,6 +724,7 @@ export function detectTerminalId(env: NodeJS.ProcessEnv = Bun.env): TerminalId {
 		if (caseEq(program, "orca")) return "orca";
 		if (caseEq(program, "otty")) return "otty";
 		if (caseEq(program, "rio")) return "rio";
+		if (caseEq(program, "tern")) return "tern";
 		return null;
 	}
 

package/src/terminal.ts

@@ -5,6 +5,7 @@ import { $env, isBunTestRuntime, isTerminalHeadless, isWsl } from "@oh-my-pi/pi-
 import * as logger from "@oh-my-pi/pi-utils/logger";
 import * as postmortem from "@oh-my-pi/pi-utils/postmortem";
 import { restoreTerminalStderr, suppressTerminalStderr } from "@oh-my-pi/pi-utils/stderr-guard";
+import { TSP_VERSION } from "@oh-my-pi/pi-wire";
 import {
 	encodeBundledGlyphRegistrations,
 	encodeGlyphCoverageQuery,
@@ -14,6 +15,7 @@ import {
 	parseGlyphProtocolReply,
 } from "./glyph-protocol";
 import { setKittyProtocolActive } from "./keys";
+import { encodeTspHelloQuery, parseTspMessage, TSP_PREFIX, type TspHello } from "./native/encode";
 import { StdinBuffer } from "./stdin-buffer";
 import {
 	isInsideTerminalMultiplexer,
@@ -486,6 +488,12 @@ export type PrivateModeReportHandler = (mode: number, supported: boolean, confir
  * glossary, so a host can safely repaint — or switch to the nerd preset.
  */
 export type GlyphProtocolReportHandler = (supported: boolean) => void;
+/**
+ * Outcome of the Tern Surface Protocol `hello` probe: the terminal's reply,
+ * or null when it answered the DA1 sentinel first (no TSP) or the probe was
+ * skipped (`PI_TUI_NATIVE=0`, multiplexers).
+ */
+export type TspHelloHandler = (hello: TspHello | null) => void;
 
 /**
  * Cursor shapes addressable via DECSCUSR (`CSI <n> SP q`). `"default"` (0) hands the shape back to
@@ -654,6 +662,23 @@ export interface Terminal {
 	 * pi-tui versions keep working.
 	 */
 	onGlyphProtocolReport?(callback: GlyphProtocolReportHandler): void;
+	/**
+	 * Register a callback fired once the Tern Surface Protocol `hello` probe
+	 * resolves (see {@link TspHelloHandler}); a resolved outcome is replayed to
+	 * late subscribers. TSP events arriving afterwards are delivered through
+	 * `onInput` as complete `ESC _ tsp;e;… ESC \` strings. Optional so custom
+	 * Terminals built against older pi-tui versions keep working.
+	 */
+	onTspHello?(callback: TspHelloHandler): void;
+	/** True while the `hello` probe awaits its reply or DA1 sentinel. */
+	readonly tspProbePending?: boolean;
+	/**
+	 * The environment names a Tern Surface Protocol terminal
+	 * (`TERM_PROGRAM=tern`) and the `hello` probe will run: the TUI takes input
+	 * at start and opens its surface before the reply, which then confirms or
+	 * revokes it.
+	 */
+	readonly tspExpected?: boolean;
 }
 
 /**
@@ -676,7 +701,8 @@ type Da1SentinelOwner =
 	| { kind: "osc11" }
 	| { kind: "privateMode"; mode: number }
 	| { kind: "osc99Probe"; id: string }
-	| { kind: "glyphProtocol"; phase: "support" | "confirm" };
+	| { kind: "glyphProtocol"; phase: "support" | "confirm" }
+	| { kind: "tsp" };
 
 let nextOsc99ProbeId = 1;
 
@@ -813,6 +839,10 @@ export class ProcessTerminal implements Terminal {
 	#glyphProtocolReplyBuffer = "";
 	#glyphProtocolResult: boolean | undefined;
 	#glyphProtocolCallbacks: GlyphProtocolReportHandler[] = [];
+	#tspPending = false;
+	#tspResult: TspHello | null | undefined;
+	#tspCallbacks: TspHelloHandler[] = [];
+	#tspReplyBuffer = "";
 	#privateCsiResponseBuffer = "";
 	#da1SentinelOwners: Da1SentinelOwner[] = [];
 	/** Resolved DECRQM support per private mode (mode → supported). */
@@ -924,6 +954,26 @@ export class ProcessTerminal implements Terminal {
 		if (this.#glyphProtocolResult !== undefined) callback(this.#glyphProtocolResult);
 	}
 
+	onTspHello(callback: TspHelloHandler): void {
+		this.#tspCallbacks.push(callback);
+		if (this.#tspResult !== undefined) callback(this.#tspResult);
+	}
+
+	get tspProbePending(): boolean {
+		return this.#tspPending;
+	}
+
+	get tspExpected(): boolean {
+		// A multiplexer started from Tern can leave `TERM_PROGRAM=tern` behind
+		// while swallowing APC, even when `PI_TUI_NATIVE=1` forces the probe.
+		return (
+			$env.TERM_PROGRAM?.toLowerCase() === "tern" &&
+			!isInsideTerminalMultiplexer($env) &&
+			!isTerminalHeadless() &&
+			this.#shouldQueryTspSupport()
+		);
+	}
+
 	start(
 		onInput: (data: string) => void,
 		onResize: () => void,
@@ -1066,6 +1116,10 @@ export class ProcessTerminal implements Terminal {
 		// without a patched font installed.
 		this.#queryGlyphProtocolSupport();
 
+		// Tern Surface Protocol `hello`, same DA1 sentinel FIFO. A reply switches
+		// the TUI to describing its UI instead of painting rows.
+		this.#queryTspSupport();
+
 		// Subscribe to Mode 2031 appearance change notifications.
 		// When the terminal reports a change, we re-query OSC 11 to get the
 		// actual background color (following Neovim convention) with 100ms debounce.
@@ -1210,7 +1264,8 @@ export class ProcessTerminal implements Terminal {
 				this.#inBandResizeBuffer.length === 0 &&
 				this.#osc11ResponseBuffer.length === 0 &&
 				this.#osc99ResponseBuffer.length === 0 &&
-				this.#glyphProtocolReplyBuffer.length === 0
+				this.#glyphProtocolReplyBuffer.length === 0 &&
+				this.#tspReplyBuffer.length === 0
 			) {
 				if (this.#inputHandler) {
 					this.#inputHandler(sequence);
@@ -1376,6 +1431,11 @@ export class ProcessTerminal implements Terminal {
 						if (owner.phase === this.#glyphProtocolPhase) this.#resolveGlyphProtocolSupport(false);
 						break;
 					}
+					case "tsp": {
+						// DA1 before any `tsp;r` reply: the terminal doesn't speak TSP.
+						this.#resolveTspSupport(null);
+						break;
+					}
 				}
 				return;
 			}
@@ -1460,6 +1520,22 @@ export class ProcessTerminal implements Terminal {
 				}
 			}
 
+			// Tern Surface Protocol APC (`ESC _ tsp ; … ESC \`): the hello reply
+			// resolves the probe; events go to the input handler whole, where the
+			// TUI routes them to the native backend before key matching.
+			if (this.#tspReplyBuffer || sequence.startsWith(TSP_PREFIX)) {
+				if (this.#tspReplyBuffer && sequence.startsWith("\x1b") && sequence !== "\x1b\\") {
+					this.#tspReplyBuffer = "";
+				} else {
+					this.#tspReplyBuffer += sequence;
+					if (!this.#tspReplyBuffer.endsWith("\x1b\\")) return;
+					const message = this.#tspReplyBuffer;
+					this.#tspReplyBuffer = "";
+					this.#handleTspMessage(message);
+					return;
+				}
+			}
+
 			// Glyph Protocol APC replies (`ESC _ 25a1 ; … ESC \`). Swallowed for
 			// the whole session, not just while the probe is outstanding: an APC is
 			// exclusively terminal->host data, and registrations use `reply=0`, so
@@ -1669,6 +1745,54 @@ export class ProcessTerminal implements Terminal {
 		}
 	}
 
+	#shouldQueryTspSupport(): boolean {
+		const override = $env.PI_TUI_NATIVE;
+		if (override === "0") return false;
+		if (override === "1") return true;
+		// Multiplexers swallow APC, so the reply could never arrive.
+		if (isInsideTerminalMultiplexer($env)) return false;
+		return !isBunTestRuntime();
+	}
+
+	#queryTspSupport(): void {
+		this.#tspPending = false;
+		this.#tspResult = undefined;
+		this.#tspReplyBuffer = "";
+		if (this.#dead) return;
+		if (!this.#shouldQueryTspSupport()) {
+			this.#tspResult = null;
+			for (const cb of this.#tspCallbacks) cb(null);
+			return;
+		}
+		this.#tspPending = true;
+		this.#da1SentinelOwners.push({ kind: "tsp" });
+		this.#safeWrite(`${encodeTspHelloQuery()}\x1b[c`);
+	}
+
+	#handleTspMessage(sequence: string): void {
+		const message = parseTspMessage(sequence);
+		if (message?.verb === "r") {
+			if (message.reply.r === "hello") this.#resolveTspSupport(message.reply);
+			return;
+		}
+		this.#inputHandler?.(sequence);
+	}
+
+	#resolveTspSupport(hello: TspHello | null): void {
+		if (!this.#tspPending) return;
+		this.#tspPending = false;
+		const result = hello !== null && hello.v === TSP_VERSION ? hello : null;
+		if (hello !== null && result === null) logger.warn("TSP: unsupported protocol version", { v: hello.v });
+		this.#tspResult = result;
+		for (const cb of this.#tspCallbacks) {
+			try {
+				cb(result);
+			} catch (error) {
+				logger.warn("TSP: hello subscriber failed", { error: String(error) });
+			}
+		}
+	}
+
 	/** Finish the handshake in either phase and notify subscribers once. */
 	#resolveGlyphProtocolSupport(supported: boolean): void {
 		if (this.#glyphProtocolPhase === "idle") return;
@@ -2017,6 +2141,10 @@ export class ProcessTerminal implements Terminal {
 		this.#glyphProtocolReplyBuffer = "";
 		this.#glyphProtocolCallbacks = [];
 		setTerminalGlyphProtocol(false);
+		this.#tspPending = false;
+		this.#tspResult = undefined;
+		this.#tspReplyBuffer = "";
+		this.#tspCallbacks = [];
 		this.#privateCsiResponseBuffer = "";
 		this.#inBandResizeBuffer = "";
 		this.#da1SentinelOwners.length = 0;

package/src/theme/defaults/dark-neon-noir.json

@@ -0,0 +1,100 @@
+{
+	"$schema": "https://raw.githubusercontent.com/can1357/oh-my-pi/main/packages/coding-agent/theme-schema.json",
+	"name": "dark-neon-noir",
+	"vars": {
+		"magenta": "#ff2bd6",
+		"hotMagenta": "#ff4f9a",
+		"deepMagenta": "#8f1a78",
+		"cyan": "#00e5ff",
+		"paleCyan": "#8ff4ff",
+		"deepCyan": "#0a6f80",
+		"violet": "#a35cff",
+		"amber": "#ffc857",
+		"ash": "#d8d8e0",
+		"smoke": "#8a8a96",
+		"soot": "#4a4a55",
+		"black": "#050507",
+		"panelBg": "#0d0d12",
+		"selectedBg": "#1c0b1c",
+		"userMsgBg": "#0b1418",
+		"toolPendingBg": "#0d0d12",
+		"toolSuccessBg": "#06141a",
+		"toolErrorBg": "#1f0612",
+		"customMsgBg": "#140a18"
+	},
+	"colors": {
+		"accent": "magenta",
+		"border": "deepMagenta",
+		"borderAccent": "cyan",
+		"borderMuted": "soot",
+		"success": "cyan",
+		"error": "hotMagenta",
+		"warning": "amber",
+		"muted": "smoke",
+		"dim": "soot",
+		"text": "",
+		"thinkingText": "smoke",
+		"selectedBg": "selectedBg",
+		"userMessageBg": "userMsgBg",
+		"userMessageText": "",
+		"customMessageBg": "customMsgBg",
+		"customMessageText": "",
+		"customMessageLabel": "magenta",
+		"toolPendingBg": "toolPendingBg",
+		"toolSuccessBg": "toolSuccessBg",
+		"toolErrorBg": "toolErrorBg",
+		"toolText": "",
+		"toolTitle": "",
+		"toolOutput": "smoke",
+		"mdHeading": "magenta",
+		"mdLink": "cyan",
+		"mdLinkUrl": "deepCyan",
+		"mdCode": "paleCyan",
+		"mdCodeBlock": "ash",
+		"mdCodeBlockBorder": "deepMagenta",
+		"mdQuote": "smoke",
+		"mdQuoteBorder": "deepMagenta",
+		"mdHr": "soot",
+		"mdListBullet": "magenta",
+		"toolDiffAdded": "cyan",
+		"toolDiffRemoved": "hotMagenta",
+		"toolDiffContext": "smoke",
+		"link": "cyan",
+		"syntaxComment": "soot",
+		"syntaxKeyword": "magenta",
+		"syntaxFunction": "cyan",
+		"syntaxVariable": "ash",
+		"syntaxString": "paleCyan",
+		"syntaxNumber": "amber",
+		"syntaxType": "violet",
+		"syntaxOperator": "hotMagenta",
+		"syntaxPunctuation": "smoke",
+		"thinkingOff": "soot",
+		"thinkingMinimal": "smoke",
+		"thinkingLow": "deepCyan",
+		"thinkingMedium": "cyan",
+		"thinkingHigh": "magenta",
+		"thinkingXhigh": "hotMagenta",
+		"bashMode": "cyan",
+		"statusLineBg": "black",
+		"statusLineSep": 238,
+		"statusLineModel": "magenta",
+		"statusLinePath": "cyan",
+		"statusLineGitClean": "cyan",
+		"statusLineGitDirty": "amber",
+		"statusLineContext": "violet",
+		"statusLineSpend": "ash",
+		"statusLineStaged": "cyan",
+		"statusLineDirty": "amber",
+		"statusLineUntracked": "hotMagenta",
+		"statusLineOutput": "magenta",
+		"statusLineCost": "paleCyan",
+		"statusLineSubagents": "magenta",
+		"pythonMode": "amber"
+	},
+	"export": {
+		"pageBg": "#050507",
+		"cardBg": "#0d0d12",
+		"infoBg": "#1c0b1c"
+	}
+}

package/src/theme/defaults/index.ts

@@ -25,6 +25,7 @@ import dark_midnight from "./dark-midnight.json" with { type: "json" };
 import dark_monochrome from "./dark-monochrome.json" with { type: "json" };
 import dark_monokai from "./dark-monokai.json" with { type: "json" };
 import dark_nebula from "./dark-nebula.json" with { type: "json" };
+import dark_neon_noir from "./dark-neon-noir.json" with { type: "json" };
 import dark_nord from "./dark-nord.json" with { type: "json" };
 import dark_ocean from "./dark-ocean.json" with { type: "json" };
 import dark_one from "./dark-one.json" with { type: "json" };
@@ -126,6 +127,7 @@ export const defaultThemes = {
 	"dark-monochrome": dark_monochrome,
 	"dark-monokai": dark_monokai,
 	"dark-nebula": dark_nebula,
+	"dark-neon-noir": dark_neon_noir,
 	"dark-nord": dark_nord,
 	"dark-ocean": dark_ocean,
 	"dark-one": dark_one,

package/src/theme/defaults/light-prism.json

@@ -25,7 +25,7 @@
 		"muted": "slate",
 		"dim": "dim",
 		"text": "",
-		"thinkingText": "muted",
+		"thinkingText": "slate",
 		"selectedBg": "#f2f5fb",
 		"userMessageBg": "#ffffff",
 		"userMessageText": "",
@@ -36,20 +36,20 @@
 		"toolSuccessBg": "#effaf2",
 		"toolErrorBg": "#fceeee",
 		"toolTitle": "",
-		"toolOutput": "muted",
+		"toolOutput": "slate",
 		"mdHeading": "indigo",
 		"mdLink": "blue",
 		"mdLinkUrl": "dim",
 		"mdCode": "violet",
 		"mdCodeBlock": "slate",
 		"mdCodeBlockBorder": "#e1e4ea",
-		"mdQuote": "muted",
+		"mdQuote": "slate",
 		"mdQuoteBorder": "#e1e4ea",
 		"mdHr": "#e1e4ea",
 		"mdListBullet": "cyan",
 		"toolDiffAdded": "green",
 		"toolDiffRemoved": "red",
-		"toolDiffContext": "muted",
+		"toolDiffContext": "slate",
 		"syntaxComment": "dim",
 		"syntaxKeyword": "indigo",
 		"syntaxFunction": "blue",
@@ -72,7 +72,7 @@
 		"statusLinePath": "blue",
 		"statusLineGitClean": "green",
 		"statusLineGitDirty": "orange",
-		"statusLineContext": "muted",
+		"statusLineContext": "slate",
 		"statusLineSpend": "cyan",
 		"statusLineStaged": "green",
 		"statusLineDirty": "orange",

package/src/theme/defaults/onyx.json

@@ -16,76 +16,76 @@
 		"emerald": "#6fb37f"
 	},
 	"colors": {
-		"accent": "$vein",
-		"border": "$band2",
-		"borderAccent": "$vein",
-		"borderMuted": "$band1",
-		"success": "$emerald",
-		"error": "$ruby",
-		"warning": "$bronze",
-		"muted": "$warmGray",
+		"accent": "vein",
+		"border": "band2",
+		"borderAccent": "vein",
+		"borderMuted": "band1",
+		"success": "emerald",
+		"error": "ruby",
+		"warning": "bronze",
+		"muted": "warmGray",
 		"dim": "#6a6760",
 		"text": "",
-		"thinkingText": "$warmGray",
-		"selectedBg": "$band2",
-		"userMessageBg": "$band1",
+		"thinkingText": "warmGray",
+		"selectedBg": "band2",
+		"userMessageBg": "band1",
 		"userMessageText": "",
-		"customMessageBg": "$band2",
+		"customMessageBg": "band2",
 		"customMessageText": "",
-		"customMessageLabel": "$vein",
-		"toolPendingBg": "$band1",
-		"toolSuccessBg": "$band1",
-		"toolErrorBg": "$band1",
+		"customMessageLabel": "vein",
+		"toolPendingBg": "band1",
+		"toolSuccessBg": "band1",
+		"toolErrorBg": "band1",
 		"toolTitle": "",
-		"toolOutput": "$warmGray",
-		"mdHeading": "$vein",
-		"mdLink": "$bronze",
-		"mdLinkUrl": "$copper",
-		"mdCode": "$vein",
-		"mdCodeBlock": "$cream",
-		"mdCodeBlockBorder": "$band3",
-		"mdQuote": "$warmGray",
-		"mdQuoteBorder": "$veinDim",
-		"mdHr": "$band2",
-		"mdListBullet": "$vein",
-		"toolDiffAdded": "$emerald",
-		"toolDiffRemoved": "$ruby",
-		"toolDiffContext": "$warmGray",
+		"toolOutput": "warmGray",
+		"mdHeading": "vein",
+		"mdLink": "bronze",
+		"mdLinkUrl": "copper",
+		"mdCode": "vein",
+		"mdCodeBlock": "cream",
+		"mdCodeBlockBorder": "band3",
+		"mdQuote": "warmGray",
+		"mdQuoteBorder": "veinDim",
+		"mdHr": "band2",
+		"mdListBullet": "vein",
+		"toolDiffAdded": "emerald",
+		"toolDiffRemoved": "ruby",
+		"toolDiffContext": "warmGray",
 		"syntaxComment": "#6a6760",
-		"syntaxKeyword": "$vein",
-		"syntaxFunction": "$bronze",
-		"syntaxVariable": "$cream",
-		"syntaxString": "$copper",
-		"syntaxNumber": "$veinDim",
-		"syntaxType": "$vein",
-		"syntaxOperator": "$warmGray",
-		"syntaxPunctuation": "$warmGray",
-		"thinkingOff": "$warmGray",
-		"thinkingMinimal": "$warmGray",
-		"thinkingLow": "$warmGray",
-		"thinkingMedium": "$veinDim",
-		"thinkingHigh": "$vein",
-		"thinkingXhigh": "$bronze",
-		"bashMode": "$vein",
-		"statusLineBg": "$band1",
-		"statusLineSep": "$band3",
-		"statusLineModel": "$vein",
-		"statusLinePath": "$cream",
-		"statusLineGitClean": "$emerald",
-		"statusLineGitDirty": "$bronze",
-		"statusLineContext": "$warmGray",
-		"statusLineSpend": "$copper",
-		"statusLineStaged": "$emerald",
-		"statusLineDirty": "$bronze",
-		"statusLineUntracked": "$warmGray",
-		"statusLineOutput": "$cream",
-		"statusLineCost": "$copper",
-		"statusLineSubagents": "$vein",
+		"syntaxKeyword": "vein",
+		"syntaxFunction": "bronze",
+		"syntaxVariable": "cream",
+		"syntaxString": "copper",
+		"syntaxNumber": "veinDim",
+		"syntaxType": "vein",
+		"syntaxOperator": "warmGray",
+		"syntaxPunctuation": "warmGray",
+		"thinkingOff": "warmGray",
+		"thinkingMinimal": "warmGray",
+		"thinkingLow": "warmGray",
+		"thinkingMedium": "veinDim",
+		"thinkingHigh": "vein",
+		"thinkingXhigh": "bronze",
+		"bashMode": "vein",
+		"statusLineBg": "band1",
+		"statusLineSep": "band3",
+		"statusLineModel": "vein",
+		"statusLinePath": "cream",
+		"statusLineGitClean": "emerald",
+		"statusLineGitDirty": "bronze",
+		"statusLineContext": "warmGray",
+		"statusLineSpend": "copper",
+		"statusLineStaged": "emerald",
+		"statusLineDirty": "bronze",
+		"statusLineUntracked": "warmGray",
+		"statusLineOutput": "cream",
+		"statusLineCost": "copper",
+		"statusLineSubagents": "vein",
 		"pythonMode": "#f0c040"
 	},
 	"export": {
-		"pageBg": "$stone",
-		"cardBg": "$band1",
-		"infoBg": "$band2"
+		"pageBg": "stone",
+		"cardBg": "band1",
+		"infoBg": "band2"
 	}
 }

package/src/theme/schema.ts

@@ -165,4 +165,19 @@ export type ThemeBg =
 	| "toolErrorBg"
 	| "statusLineBg";
 
+const VALID_THEME_BGS: ReadonlySet<string> = new Set([
+	"selectedBg",
+	"userMessageBg",
+	"customMessageBg",
+	"toolPendingBg",
+	"toolSuccessBg",
+	"toolErrorBg",
+	"statusLineBg",
+] satisfies ThemeBg[]);
+
+/** Check if a string is a valid ThemeBg value */
+export function isValidThemeBg(color: string): color is ThemeBg {
+	return VALID_THEME_BGS.has(color);
+}
+
 export type ColorMode = "truecolor" | "256color";