@oh-my-pi/pi-tui 18.2.4 → 18.2.6

package/src/theme/defaults/porcelain.json

@@ -0,0 +1,91 @@
+{
+	"$schema": "https://raw.githubusercontent.com/can1357/oh-my-pi/main/packages/coding-agent/theme-schema.json",
+	"name": "porcelain",
+	"vars": {
+		"porcelainWhite": "#f8f9fc",
+		"wedgwoodBlue": "#5070a0",
+		"goldTrim": "#b09040",
+		"delicateGray": "#d0d4e0",
+		"cobaltBlack": "#1a2030",
+		"paleBlue": "#e8eef8",
+		"deepWedgwood": "#405080",
+		"warmGold": "#c0a050",
+		"softBlue": "#708cb0",
+		"crimsonRed": "#c04040",
+		"darkGold": "#907030",
+		"mutedBlue": "#909cb0"
+	},
+	"colors": {
+		"accent": "wedgwoodBlue",
+		"border": "delicateGray",
+		"borderAccent": "wedgwoodBlue",
+		"borderMuted": "#e8eaf0",
+		"success": "#507050",
+		"error": "crimsonRed",
+		"warning": "darkGold",
+		"muted": "mutedBlue",
+		"dim": "#a0a8b8",
+		"text": "",
+		"thinkingText": "softBlue",
+		"selectedBg": "paleBlue",
+		"userMessageBg": "wedgwoodBlue",
+		"userMessageText": "",
+		"customMessageBg": "goldTrim",
+		"customMessageText": "",
+		"customMessageLabel": "warmGold",
+		"toolPendingBg": "paleBlue",
+		"toolSuccessBg": "#e8f0e8",
+		"toolErrorBg": "#f8e8e8",
+		"toolTitle": "",
+		"toolOutput": "cobaltBlack",
+		"mdHeading": "deepWedgwood",
+		"mdLink": "wedgwoodBlue",
+		"mdLinkUrl": "goldTrim",
+		"mdCode": "darkGold",
+		"mdCodeBlock": "cobaltBlack",
+		"mdCodeBlockBorder": "delicateGray",
+		"mdQuote": "softBlue",
+		"mdQuoteBorder": "wedgwoodBlue",
+		"mdHr": "delicateGray",
+		"mdListBullet": "wedgwoodBlue",
+		"toolDiffAdded": "#507050",
+		"toolDiffRemoved": "crimsonRed",
+		"toolDiffContext": "mutedBlue",
+		"syntaxComment": "mutedBlue",
+		"syntaxKeyword": "deepWedgwood",
+		"syntaxFunction": "wedgwoodBlue",
+		"syntaxVariable": "cobaltBlack",
+		"syntaxString": "darkGold",
+		"syntaxNumber": "goldTrim",
+		"syntaxType": "deepWedgwood",
+		"syntaxOperator": "softBlue",
+		"syntaxPunctuation": "#606870",
+		"thinkingOff": "#c0c4d0",
+		"thinkingMinimal": "mutedBlue",
+		"thinkingLow": "softBlue",
+		"thinkingMedium": "wedgwoodBlue",
+		"thinkingHigh": "deepWedgwood",
+		"thinkingXhigh": "cobaltBlack",
+		"bashMode": "goldTrim",
+		"statusLineBg": "porcelainWhite",
+		"statusLineSep": "delicateGray",
+		"statusLineModel": "wedgwoodBlue",
+		"statusLinePath": "cobaltBlack",
+		"statusLineGitClean": "#507050",
+		"statusLineGitDirty": "darkGold",
+		"statusLineContext": "softBlue",
+		"statusLineSpend": "goldTrim",
+		"statusLineStaged": "#507050",
+		"statusLineDirty": "darkGold",
+		"statusLineUntracked": "mutedBlue",
+		"statusLineOutput": "wedgwoodBlue",
+		"statusLineCost": "goldTrim",
+		"statusLineSubagents": "deepWedgwood",
+		"pythonMode": "#f0c040"
+	},
+	"export": {
+		"pageBg": "porcelainWhite",
+		"cardBg": "#ffffff",
+		"infoBg": "paleBlue"
+	}
+}

package/src/theme/defaults/quartz.json

@@ -0,0 +1,96 @@
+{
+	"$schema": "https://raw.githubusercontent.com/can1357/oh-my-pi/main/packages/coding-agent/theme-schema.json",
+	"name": "quartz",
+	"vars": {
+		"rosePink": "#c07088",
+		"quartzPurple": "#8070a0",
+		"softRose": "#e8dce0",
+		"deepRoseGray": "#3a2830",
+		"palePink": "#f5e8ed",
+		"dustyRose": "#9e6b7b",
+		"lavenderGray": "#a898b0",
+		"crystalMint": "#7fa090",
+		"warmGold": "#c09870",
+		"roseRed": "#b85860",
+		"roseGreen": "#88a088",
+		"selectedBg": "#f0e0e8",
+		"userMsgBg": "#faf5f7",
+		"toolPendingBg": "#f5eef8",
+		"toolSuccessBg": "#f0f5f0",
+		"toolErrorBg": "#f8f0f0",
+		"customMsgBg": "#f5f0f8"
+	},
+	"colors": {
+		"accent": "rosePink",
+		"border": "quartzPurple",
+		"borderAccent": "rosePink",
+		"borderMuted": "softRose",
+		"success": "roseGreen",
+		"error": "roseRed",
+		"warning": "warmGold",
+		"muted": "dustyRose",
+		"dim": "lavenderGray",
+		"text": "",
+		"thinkingText": "dustyRose",
+		"selectedBg": "selectedBg",
+		"userMessageBg": "userMsgBg",
+		"userMessageText": "",
+		"customMessageBg": "customMsgBg",
+		"customMessageText": "",
+		"customMessageLabel": "#8070a0",
+		"toolPendingBg": "toolPendingBg",
+		"toolSuccessBg": "toolSuccessBg",
+		"toolErrorBg": "toolErrorBg",
+		"toolTitle": "",
+		"toolOutput": "dustyRose",
+		"mdHeading": "warmGold",
+		"mdLink": "quartzPurple",
+		"mdLinkUrl": "lavenderGray",
+		"mdCode": "rosePink",
+		"mdCodeBlock": "crystalMint",
+		"mdCodeBlockBorder": "dustyRose",
+		"mdQuote": "dustyRose",
+		"mdQuoteBorder": "softRose",
+		"mdHr": "softRose",
+		"mdListBullet": "roseGreen",
+		"toolDiffAdded": "roseGreen",
+		"toolDiffRemoved": "roseRed",
+		"toolDiffContext": "dustyRose",
+		"syntaxComment": "#7fa090",
+		"syntaxKeyword": "#8070a0",
+		"syntaxFunction": "#c07088",
+		"syntaxVariable": "#3a2830",
+		"syntaxString": "#b85860",
+		"syntaxNumber": "#88a088",
+		"syntaxType": "#9e6b7b",
+		"syntaxOperator": "#3a2830",
+		"syntaxPunctuation": "#3a2830",
+		"thinkingOff": "softRose",
+		"thinkingMinimal": "#a898b0",
+		"thinkingLow": "#8070a0",
+		"thinkingMedium": "#c07088",
+		"thinkingHigh": "#9e6b7b",
+		"thinkingXhigh": "#8b4560",
+		"bashMode": "roseGreen",
+		"statusLineBg": "#f5e8ed",
+		"statusLineSep": "#9e6b7b",
+		"statusLineModel": "#8070a0",
+		"statusLinePath": "#7fa090",
+		"statusLineGitClean": "#5f875f",
+		"statusLineGitDirty": "#c09870",
+		"statusLineContext": "#8070a0",
+		"statusLineSpend": "#7fa090",
+		"statusLineStaged": 108,
+		"statusLineDirty": 180,
+		"statusLineUntracked": 139,
+		"statusLineOutput": 132,
+		"statusLineCost": 132,
+		"statusLineSubagents": "rosePink",
+		"pythonMode": "#f0c040"
+	},
+	"export": {
+		"pageBg": "#fbf7f9",
+		"cardBg": "#ffffff",
+		"infoBg": "#faf5f7"
+	}
+}

package/src/theme/defaults/sandstone.json

@@ -0,0 +1,95 @@
+{
+	"$schema": "https://raw.githubusercontent.com/can1357/oh-my-pi/main/packages/coding-agent/theme-schema.json",
+	"name": "sandstone",
+	"vars": {
+		"rust": "#b86040",
+		"sage": "#688058",
+		"terracotta": "#c87850",
+		"olive": "#7a8a68",
+		"amber": "#d89850",
+		"shadow": "#302820",
+		"darkGray": "#544840",
+		"mediumGray": "#786858",
+		"erosion": "#d8cbb8",
+		"sand": "#f5ede3",
+		"selectedBg": "#e8dcc8",
+		"userMsgBg": "#f0e6d8",
+		"toolPendingBg": "#e8e0d0",
+		"toolSuccessBg": "#e0e8d8",
+		"toolErrorBg": "#e8d0c8",
+		"customMsgBg": "#e8dcd0"
+	},
+	"colors": {
+		"accent": "rust",
+		"border": "terracotta",
+		"borderAccent": "rust",
+		"borderMuted": "erosion",
+		"success": "sage",
+		"error": "rust",
+		"warning": "amber",
+		"muted": "mediumGray",
+		"dim": "darkGray",
+		"text": "",
+		"thinkingText": "mediumGray",
+		"selectedBg": "selectedBg",
+		"userMessageBg": "userMsgBg",
+		"userMessageText": "",
+		"customMessageBg": "customMsgBg",
+		"customMessageText": "",
+		"customMessageLabel": "#a05030",
+		"toolPendingBg": "toolPendingBg",
+		"toolSuccessBg": "toolSuccessBg",
+		"toolErrorBg": "toolErrorBg",
+		"toolTitle": "",
+		"toolOutput": "mediumGray",
+		"mdHeading": "amber",
+		"mdLink": "terracotta",
+		"mdLinkUrl": "mediumGray",
+		"mdCode": "rust",
+		"mdCodeBlock": "sage",
+		"mdCodeBlockBorder": "mediumGray",
+		"mdQuote": "mediumGray",
+		"mdQuoteBorder": "erosion",
+		"mdHr": "erosion",
+		"mdListBullet": "sage",
+		"toolDiffAdded": "sage",
+		"toolDiffRemoved": "rust",
+		"toolDiffContext": "mediumGray",
+		"syntaxComment": "#688058",
+		"syntaxKeyword": "#b86040",
+		"syntaxFunction": "#c87850",
+		"syntaxVariable": "#544840",
+		"syntaxString": "#a05030",
+		"syntaxNumber": "#7a8a68",
+		"syntaxType": "#8a6848",
+		"syntaxOperator": "#302820",
+		"syntaxPunctuation": "#302820",
+		"thinkingOff": "erosion",
+		"thinkingMinimal": "#a89888",
+		"thinkingLow": "#c87850",
+		"thinkingMedium": "#b86040",
+		"thinkingHigh": "#a05030",
+		"thinkingXhigh": "#903020",
+		"bashMode": "sage",
+		"statusLineBg": "#ebe0d0",
+		"statusLineSep": "#9a8878",
+		"statusLineModel": "#a05030",
+		"statusLinePath": "#8a6848",
+		"statusLineGitClean": "#588048",
+		"statusLineGitDirty": "#c87850",
+		"statusLineContext": "#786858",
+		"statusLineSpend": "#688058",
+		"statusLineStaged": 100,
+		"statusLineDirty": 173,
+		"statusLineUntracked": 95,
+		"statusLineOutput": 131,
+		"statusLineCost": 131,
+		"statusLineSubagents": "rust",
+		"pythonMode": "amber"
+	},
+	"export": {
+		"pageBg": "#f5ede3",
+		"cardBg": "#faf6f0",
+		"infoBg": "#f0e6d8"
+	}
+}

package/src/theme/defaults/titanium.json

@@ -0,0 +1,90 @@
+{
+	"$schema": "https://raw.githubusercontent.com/can1357/oh-my-pi/main/packages/coding-agent/theme-schema.json",
+	"name": "titanium",
+	"vars": {
+		"brushedTitanium": "#151820",
+		"darkTitanium": "#0f1216",
+		"electricBlue": "#00b4ff",
+		"deepBlue": "#0082b3",
+		"titaniumGold": "#d4c090",
+		"brightAluminum": "#e8ecf4",
+		"dimAluminum": "#9ca3b0",
+		"warningAmber": "#ffb347",
+		"readoutGreen": "#00ff88",
+		"alertRed": "#ff4757",
+		"subtleGray": "#2a3038"
+	},
+	"colors": {
+		"accent": "electricBlue",
+		"border": "subtleGray",
+		"borderAccent": "electricBlue",
+		"borderMuted": "#1f252d",
+		"success": "readoutGreen",
+		"error": "alertRed",
+		"warning": "warningAmber",
+		"muted": "dimAluminum",
+		"dim": "#6b7280",
+		"text": "",
+		"thinkingText": "dimAluminum",
+		"selectedBg": "deepBlue",
+		"userMessageBg": "darkTitanium",
+		"userMessageText": "",
+		"customMessageBg": "subtleGray",
+		"customMessageText": "",
+		"customMessageLabel": "titaniumGold",
+		"toolPendingBg": "darkTitanium",
+		"toolSuccessBg": "darkTitanium",
+		"toolErrorBg": "#1a0f10",
+		"toolTitle": "",
+		"toolOutput": "dimAluminum",
+		"mdHeading": "electricBlue",
+		"mdLink": "electricBlue",
+		"mdLinkUrl": "deepBlue",
+		"mdCode": "readoutGreen",
+		"mdCodeBlock": "dimAluminum",
+		"mdCodeBlockBorder": "subtleGray",
+		"mdQuote": "dimAluminum",
+		"mdQuoteBorder": "subtleGray",
+		"mdHr": "subtleGray",
+		"mdListBullet": "electricBlue",
+		"toolDiffAdded": "readoutGreen",
+		"toolDiffRemoved": "alertRed",
+		"toolDiffContext": "dimAluminum",
+		"syntaxComment": "#6b7280",
+		"syntaxKeyword": "electricBlue",
+		"syntaxFunction": "readoutGreen",
+		"syntaxVariable": "brightAluminum",
+		"syntaxString": "titaniumGold",
+		"syntaxNumber": "warningAmber",
+		"syntaxType": "electricBlue",
+		"syntaxOperator": "electricBlue",
+		"syntaxPunctuation": "dimAluminum",
+		"thinkingOff": "#4a5058",
+		"thinkingMinimal": "#5a6068",
+		"thinkingLow": "#6a7078",
+		"thinkingMedium": "dimAluminum",
+		"thinkingHigh": "electricBlue",
+		"thinkingXhigh": "titaniumGold",
+		"bashMode": "readoutGreen",
+		"statusLineBg": "darkTitanium",
+		"statusLineSep": "subtleGray",
+		"statusLineModel": "electricBlue",
+		"statusLinePath": "brightAluminum",
+		"statusLineGitClean": "readoutGreen",
+		"statusLineGitDirty": "warningAmber",
+		"statusLineContext": "dimAluminum",
+		"statusLineSpend": "titaniumGold",
+		"statusLineStaged": "readoutGreen",
+		"statusLineDirty": "warningAmber",
+		"statusLineUntracked": "dimAluminum",
+		"statusLineOutput": "deepBlue",
+		"statusLineCost": "titaniumGold",
+		"statusLineSubagents": "electricBlue",
+		"pythonMode": "#f0c040"
+	},
+	"export": {
+		"pageBg": "brushedTitanium",
+		"cardBg": "darkTitanium",
+		"infoBg": "subtleGray"
+	}
+}

package/src/theme/index.ts

@@ -0,0 +1,5 @@
+// Theme runtime: active-theme singleton, loading, appearance detection, and pi-tui adapters.
+export * from "../lang-from-path";
+export * from "./session-color";
+export * from "./shimmer";
+export * from "./theme";

package/src/theme/light.json

@@ -0,0 +1,93 @@
+{
+	"$schema": "https://raw.githubusercontent.com/can1357/oh-my-pi/main/packages/coding-agent/theme-schema.json",
+	"name": "light",
+	"vars": {
+		"teal": "#5a8080",
+		"blue": "#547da7",
+		"green": "#588458",
+		"red": "#aa5555",
+		"yellow": "#9a7326",
+		"mediumGray": "#6c6c6c",
+		"dimGray": "#767676",
+		"lightGray": "#b0b0b0",
+		"selectedBg": "#d0d0e0",
+		"userMsgBg": "#e8e8e8",
+		"toolPendingBg": "#e8e8f0",
+		"toolSuccessBg": "#e8f0e8",
+		"toolErrorBg": "#f0e8e8",
+		"customMsgBg": "#ede7f6"
+	},
+	"colors": {
+		"accent": "teal",
+		"border": "blue",
+		"borderAccent": "teal",
+		"borderMuted": "lightGray",
+		"success": "green",
+		"error": "red",
+		"warning": "yellow",
+		"muted": "mediumGray",
+		"dim": "dimGray",
+		"text": "",
+		"thinkingText": "mediumGray",
+		"selectedBg": "selectedBg",
+		"userMessageBg": "userMsgBg",
+		"userMessageText": "",
+		"customMessageBg": "customMsgBg",
+		"customMessageText": "",
+		"customMessageLabel": "#7e57c2",
+		"toolPendingBg": "toolPendingBg",
+		"toolSuccessBg": "toolSuccessBg",
+		"toolErrorBg": "toolErrorBg",
+		"toolTitle": "",
+		"toolOutput": "mediumGray",
+		"mdHeading": "yellow",
+		"mdLink": "blue",
+		"mdLinkUrl": "dimGray",
+		"mdCode": "teal",
+		"mdCodeBlock": "green",
+		"mdCodeBlockBorder": "mediumGray",
+		"mdQuote": "mediumGray",
+		"mdQuoteBorder": "mediumGray",
+		"mdHr": "mediumGray",
+		"mdListBullet": "green",
+		"toolDiffAdded": "green",
+		"toolDiffRemoved": "red",
+		"toolDiffContext": "mediumGray",
+		"syntaxComment": "#008000",
+		"syntaxKeyword": "#0000FF",
+		"syntaxFunction": "#795E26",
+		"syntaxVariable": "#001080",
+		"syntaxString": "#A31515",
+		"syntaxNumber": "#098658",
+		"syntaxType": "#267F99",
+		"syntaxOperator": "#000000",
+		"syntaxPunctuation": "#000000",
+		"thinkingOff": "lightGray",
+		"thinkingMinimal": "#767676",
+		"thinkingLow": "blue",
+		"thinkingMedium": "teal",
+		"thinkingHigh": "#875f87",
+		"thinkingXhigh": "#8b008b",
+		"bashMode": "green",
+		"statusLineBg": "#e0e0e0",
+		"statusLineSep": "#808080",
+		"statusLineModel": "#875f87",
+		"statusLinePath": "#005f87",
+		"statusLineGitClean": "#005f00",
+		"statusLineGitDirty": "#af5f00",
+		"statusLineContext": "#5f5f87",
+		"statusLineSpend": "#005f5f",
+		"statusLineStaged": 28,
+		"statusLineDirty": 136,
+		"statusLineUntracked": 31,
+		"statusLineOutput": 133,
+		"statusLineCost": 133,
+		"statusLineSubagents": "teal",
+		"pythonMode": "yellow"
+	},
+	"export": {
+		"pageBg": "#f8f8f8",
+		"cardBg": "#ffffff",
+		"infoBg": "#fffae6"
+	}
+}

package/src/theme/loader.ts

@@ -0,0 +1,200 @@
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { adjustHsv } from "@oh-my-pi/pi-utils/color";
+import { getCustomThemesDir } from "@oh-my-pi/pi-utils/dirs";
+import { isEnoent } from "@oh-my-pi/pi-utils/fs-error";
+import { detectColorMode, resolveThemeColors } from "./color";
+import darkThemeJson from "./dark.json" with { type: "json" };
+import { defaultThemes } from "./defaults";
+import lightThemeJson from "./light.json" with { type: "json" };
+import type { ColorMode, ThemeBg, ThemeColor, ThemeJson } from "./schema";
+import { normalizeSpinnerFramesOverride, type SymbolPreset } from "./symbols";
+import { Theme } from "./theme-class";
+
+// ============================================================================
+// Theme Loading
+// ============================================================================
+
+const BUILTIN_THEMES: Record<string, ThemeJson> = {
+	dark: darkThemeJson as ThemeJson,
+	light: lightThemeJson as ThemeJson,
+	...(defaultThemes as Record<string, ThemeJson>),
+};
+
+export function getBuiltinThemes(): Record<string, ThemeJson> {
+	return BUILTIN_THEMES;
+}
+
+export async function getAvailableThemes(): Promise<string[]> {
+	const themes = new Set<string>(Object.keys(getBuiltinThemes()));
+	const customThemesDir = getCustomThemesDir();
+	try {
+		const files = await fs.promises.readdir(customThemesDir);
+		for (const file of files) {
+			if (file.endsWith(".json")) {
+				themes.add(file.slice(0, -5));
+			}
+		}
+	} catch {
+		// Directory doesn't exist or isn't readable
+	}
+	return Array.from(themes).sort();
+}
+
+export interface ThemeInfo {
+	name: string;
+	path: string | undefined;
+}
+
+export async function getAvailableThemesWithPaths(): Promise<ThemeInfo[]> {
+	const result: ThemeInfo[] = [];
+
+	// Built-in themes (embedded, no file path)
+	for (const name of Object.keys(getBuiltinThemes())) {
+		result.push({ name, path: undefined });
+	}
+
+	// Custom themes
+	const customThemesDir = getCustomThemesDir();
+	try {
+		const files = await fs.promises.readdir(customThemesDir);
+		for (const file of files) {
+			if (file.endsWith(".json")) {
+				const name = file.slice(0, -5);
+				if (!result.some(themeInfo => themeInfo.name === name)) {
+					result.push({ name, path: path.join(customThemesDir, file) });
+				}
+			}
+		}
+	} catch {
+		// Directory doesn't exist or isn't readable
+	}
+
+	return result.sort((a, b) => a.name.localeCompare(b.name));
+}
+
+function parseThemeJson(name: string, content: string): ThemeJson {
+	let json: unknown;
+	try {
+		json = JSON.parse(content);
+	} catch (error) {
+		throw new Error(`Failed to parse theme ${name}: ${error}`);
+	}
+	let parsed: ThemeJson;
+	try {
+		// Custom-theme-only boundary: built-in first-frame themes do not need to
+		// load or construct the omptype validation graph.
+		const { validateThemeJson } = require("./schema-validation");
+		parsed = validateThemeJson(json);
+	} catch (error) {
+		const errorMessage = error instanceof Error ? error.message : String(error);
+		// Extract color key information if available
+		const missingColorMatch = errorMessage.match(/missing keys: (.+)/i);
+		const missingColors: string[] = missingColorMatch ? missingColorMatch[1].split(",").map(s => s.trim()) : [];
+
+		let fullErrorMessage = `Invalid theme "${name}":\n`;
+		if (missingColors.length > 0) {
+			fullErrorMessage += `\nMissing required color tokens:\n`;
+			fullErrorMessage += missingColors.map(c => `  - ${c}`).join("\n");
+			fullErrorMessage += `\n\nPlease add these colors to your theme's "colors" object.`;
+			fullErrorMessage += `\nSee the built-in themes (dark.json, light.json) for reference values.`;
+		}
+		fullErrorMessage += `\n\nValidation error:\n  - ${errorMessage}`;
+
+		throw new Error(fullErrorMessage);
+	}
+	return parsed;
+}
+
+export async function loadThemeJson(name: string): Promise<ThemeJson> {
+	const builtinThemes = getBuiltinThemes();
+	if (name in builtinThemes) {
+		return builtinThemes[name];
+	}
+	const customThemesDir = getCustomThemesDir();
+	const themePath = path.join(customThemesDir, `${name}.json`);
+	try {
+		return parseThemeJson(name, await Bun.file(themePath).text());
+	} catch (error) {
+		if (isEnoent(error)) throw new Error(`Theme not found: ${name}`);
+		throw error;
+	}
+}
+
+/** Load a theme definition synchronously for the first terminal frame. */
+export function loadThemeJsonSync(name: string): ThemeJson {
+	const builtinThemes = getBuiltinThemes();
+	if (name in builtinThemes) {
+		return builtinThemes[name];
+	}
+	const themePath = path.join(getCustomThemesDir(), `${name}.json`);
+	try {
+		return parseThemeJson(name, fs.readFileSync(themePath, "utf8"));
+	} catch (error) {
+		if (isEnoent(error)) throw new Error(`Theme not found: ${name}`);
+		throw error;
+	}
+}
+
+export interface CreateThemeOptions {
+	mode?: ColorMode;
+	symbolPresetOverride?: SymbolPreset;
+	colorBlindMode?: boolean;
+}
+
+/** HSV adjustment to shift green toward blue for colorblind mode (red-green colorblindness) */
+const COLORBLIND_ADJUSTMENT = { h: 60, s: 0.71 };
+
+export function createTheme(themeJson: ThemeJson, options: CreateThemeOptions = {}): Theme {
+	const { mode, symbolPresetOverride, colorBlindMode } = options;
+	const colorMode = mode ?? detectColorMode();
+	const resolvedColors = resolveThemeColors(themeJson.colors, themeJson.vars);
+
+	if (colorBlindMode) {
+		const added = resolvedColors.toolDiffAdded;
+		if (typeof added === "string" && added.startsWith("#")) {
+			resolvedColors.toolDiffAdded = adjustHsv(added, COLORBLIND_ADJUSTMENT);
+		}
+	}
+
+	const fgColors: Record<ThemeColor, string | number> = {} as Record<ThemeColor, string | number>;
+	const bgColors: Record<ThemeBg, string | number> = {} as Record<ThemeBg, string | number>;
+	const bgColorKeys: Set<string> = new Set([
+		"selectedBg",
+		"userMessageBg",
+		"customMessageBg",
+		"toolPendingBg",
+		"toolSuccessBg",
+		"toolErrorBg",
+		"statusLineBg",
+	]);
+	for (const [key, value] of Object.entries(resolvedColors)) {
+		if (bgColorKeys.has(key)) {
+			bgColors[key as ThemeBg] = value;
+		} else {
+			fgColors[key as ThemeColor] = value;
+		}
+	}
+	// Extract symbol configuration - settings override takes precedence over theme
+	const symbolPreset: SymbolPreset = symbolPresetOverride ?? themeJson.symbols?.preset ?? "unicode";
+	const symbolOverrides = themeJson.symbols?.overrides ?? {};
+	const spinnerFramesOverrides = normalizeSpinnerFramesOverride(themeJson.symbols?.spinnerFrames);
+	return new Theme(fgColors, bgColors, colorMode, symbolPreset, symbolOverrides, spinnerFramesOverrides);
+}
+
+export async function loadTheme(name: string, options: CreateThemeOptions = {}): Promise<Theme> {
+	const themeJson = await loadThemeJson(name);
+	return createTheme(themeJson, options);
+}
+
+/** Load and construct a theme synchronously for latency-sensitive first paint. */
+export function loadThemeSync(name: string, options: CreateThemeOptions = {}): Theme {
+	return createTheme(loadThemeJsonSync(name), options);
+}
+export async function getThemeByName(name: string): Promise<Theme | undefined> {
+	try {
+		return await loadTheme(name);
+	} catch {
+		return undefined;
+	}
+}