gsd-pi 2.34.0-dev.ed0bfbf → 2.35.0-dev.55dcc60

package/packages/pi-tui/src/keys.ts

@@ -325,131 +325,74 @@ const FUNCTIONAL_CODEPOINTS = {
 	end: -15,
 } as const;
 
-const LEGACY_KEY_SEQUENCES = {
-	up: ["\x1b[A", "\x1bOA"],
-	down: ["\x1b[B", "\x1bOB"],
-	right: ["\x1b[C", "\x1bOC"],
-	left: ["\x1b[D", "\x1bOD"],
-	home: ["\x1b[H", "\x1bOH", "\x1b[1~", "\x1b[7~"],
-	end: ["\x1b[F", "\x1bOF", "\x1b[4~", "\x1b[8~"],
-	insert: ["\x1b[2~"],
-	delete: ["\x1b[3~"],
-	pageUp: ["\x1b[5~", "\x1b[[5~"],
-	pageDown: ["\x1b[6~", "\x1b[[6~"],
-	clear: ["\x1b[E", "\x1bOE"],
-	f1: ["\x1bOP", "\x1b[11~", "\x1b[[A"],
-	f2: ["\x1bOQ", "\x1b[12~", "\x1b[[B"],
-	f3: ["\x1bOR", "\x1b[13~", "\x1b[[C"],
-	f4: ["\x1bOS", "\x1b[14~", "\x1b[[D"],
-	f5: ["\x1b[15~", "\x1b[[E"],
-	f6: ["\x1b[17~"],
-	f7: ["\x1b[18~"],
-	f8: ["\x1b[19~"],
-	f9: ["\x1b[20~"],
-	f10: ["\x1b[21~"],
-	f11: ["\x1b[23~"],
-	f12: ["\x1b[24~"],
-} as const;
-
-const LEGACY_SHIFT_SEQUENCES = {
-	up: ["\x1b[a"],
-	down: ["\x1b[b"],
-	right: ["\x1b[c"],
-	left: ["\x1b[d"],
-	clear: ["\x1b[e"],
-	insert: ["\x1b[2$"],
-	delete: ["\x1b[3$"],
-	pageUp: ["\x1b[5$"],
-	pageDown: ["\x1b[6$"],
-	home: ["\x1b[7$"],
-	end: ["\x1b[8$"],
-} as const;
-
-const LEGACY_CTRL_SEQUENCES = {
-	up: ["\x1bOa"],
-	down: ["\x1bOb"],
-	right: ["\x1bOc"],
-	left: ["\x1bOd"],
-	clear: ["\x1bOe"],
-	insert: ["\x1b[2^"],
-	delete: ["\x1b[3^"],
-	pageUp: ["\x1b[5^"],
-	pageDown: ["\x1b[6^"],
-	home: ["\x1b[7^"],
-	end: ["\x1b[8^"],
-} as const;
-
-const LEGACY_SEQUENCE_KEY_IDS: Record<string, KeyId> = {
-	"\x1bOA": "up",
-	"\x1bOB": "down",
-	"\x1bOC": "right",
-	"\x1bOD": "left",
-	"\x1bOH": "home",
-	"\x1bOF": "end",
-	"\x1b[E": "clear",
-	"\x1bOE": "clear",
-	"\x1bOe": "ctrl+clear",
-	"\x1b[e": "shift+clear",
-	"\x1b[2~": "insert",
-	"\x1b[2$": "shift+insert",
-	"\x1b[2^": "ctrl+insert",
-	"\x1b[3$": "shift+delete",
-	"\x1b[3^": "ctrl+delete",
-	"\x1b[[5~": "pageUp",
-	"\x1b[[6~": "pageDown",
-	"\x1b[a": "shift+up",
-	"\x1b[b": "shift+down",
-	"\x1b[c": "shift+right",
-	"\x1b[d": "shift+left",
-	"\x1bOa": "ctrl+up",
-	"\x1bOb": "ctrl+down",
-	"\x1bOc": "ctrl+right",
-	"\x1bOd": "ctrl+left",
-	"\x1b[5$": "shift+pageUp",
-	"\x1b[6$": "shift+pageDown",
-	"\x1b[7$": "shift+home",
-	"\x1b[8$": "shift+end",
-	"\x1b[5^": "ctrl+pageUp",
-	"\x1b[6^": "ctrl+pageDown",
-	"\x1b[7^": "ctrl+home",
-	"\x1b[8^": "ctrl+end",
-	"\x1bOP": "f1",
-	"\x1bOQ": "f2",
-	"\x1bOR": "f3",
-	"\x1bOS": "f4",
-	"\x1b[11~": "f1",
-	"\x1b[12~": "f2",
-	"\x1b[13~": "f3",
-	"\x1b[14~": "f4",
-	"\x1b[[A": "f1",
-	"\x1b[[B": "f2",
-	"\x1b[[C": "f3",
-	"\x1b[[D": "f4",
-	"\x1b[[E": "f5",
-	"\x1b[15~": "f5",
-	"\x1b[17~": "f6",
-	"\x1b[18~": "f7",
-	"\x1b[19~": "f8",
-	"\x1b[20~": "f9",
-	"\x1b[21~": "f10",
-	"\x1b[23~": "f11",
-	"\x1b[24~": "f12",
-	"\x1bb": "alt+left",
-	"\x1bf": "alt+right",
-	"\x1bp": "alt+up",
-	"\x1bn": "alt+down",
+/**
+ * Consolidated legacy terminal key sequences.
+ * Each key maps to its sequences for unmodified, shift-modified, and ctrl-modified variants.
+ * This single structure replaces three separate maps (LEGACY_KEY_SEQUENCES,
+ * LEGACY_SHIFT_SEQUENCES, LEGACY_CTRL_SEQUENCES) that shared the same key sets.
+ */
+const LEGACY_SEQUENCES: Record<string, { plain?: readonly string[]; shift?: readonly string[]; ctrl?: readonly string[] }> = {
+	up:       { plain: ["\x1b[A", "\x1bOA"],                            shift: ["\x1b[a"],  ctrl: ["\x1bOa"]  },
+	down:     { plain: ["\x1b[B", "\x1bOB"],                            shift: ["\x1b[b"],  ctrl: ["\x1bOb"]  },
+	right:    { plain: ["\x1b[C", "\x1bOC"],                            shift: ["\x1b[c"],  ctrl: ["\x1bOc"]  },
+	left:     { plain: ["\x1b[D", "\x1bOD"],                            shift: ["\x1b[d"],  ctrl: ["\x1bOd"]  },
+	home:     { plain: ["\x1b[H", "\x1bOH", "\x1b[1~", "\x1b[7~"],   shift: ["\x1b[7$"], ctrl: ["\x1b[7^"] },
+	end:      { plain: ["\x1b[F", "\x1bOF", "\x1b[4~", "\x1b[8~"],   shift: ["\x1b[8$"], ctrl: ["\x1b[8^"] },
+	insert:   { plain: ["\x1b[2~"],                                      shift: ["\x1b[2$"], ctrl: ["\x1b[2^"] },
+	delete:   { plain: ["\x1b[3~"],                                      shift: ["\x1b[3$"], ctrl: ["\x1b[3^"] },
+	pageUp:   { plain: ["\x1b[5~", "\x1b[[5~"],                        shift: ["\x1b[5$"], ctrl: ["\x1b[5^"] },
+	pageDown: { plain: ["\x1b[6~", "\x1b[[6~"],                        shift: ["\x1b[6$"], ctrl: ["\x1b[6^"] },
+	clear:    { plain: ["\x1b[E", "\x1bOE"],                            shift: ["\x1b[e"],  ctrl: ["\x1bOe"]  },
+	f1:       { plain: ["\x1bOP", "\x1b[11~", "\x1b[[A"] },
+	f2:       { plain: ["\x1bOQ", "\x1b[12~", "\x1b[[B"] },
+	f3:       { plain: ["\x1bOR", "\x1b[13~", "\x1b[[C"] },
+	f4:       { plain: ["\x1bOS", "\x1b[14~", "\x1b[[D"] },
+	f5:       { plain: ["\x1b[15~", "\x1b[[E"] },
+	f6:       { plain: ["\x1b[17~"] },
+	f7:       { plain: ["\x1b[18~"] },
+	f8:       { plain: ["\x1b[19~"] },
+	f9:       { plain: ["\x1b[20~"] },
+	f10:      { plain: ["\x1b[21~"] },
+	f11:      { plain: ["\x1b[23~"] },
+	f12:      { plain: ["\x1b[24~"] },
 } as const;
 
-type LegacyModifierKey = keyof typeof LEGACY_SHIFT_SEQUENCES;
+/**
+ * Reverse lookup from escape sequence to key identifier, auto-generated from LEGACY_SEQUENCES.
+ * Additional non-standard sequences (alt+arrow aliases) are appended after generation.
+ */
+const LEGACY_SEQUENCE_KEY_IDS: Record<string, KeyId> = (() => {
+	const map: Record<string, KeyId> = {};
+	for (const [key, entry] of Object.entries(LEGACY_SEQUENCES)) {
+		const keyId = key as KeyId;
+		if (entry.plain) {
+			for (const seq of entry.plain) map[seq] = keyId;
+		}
+		if (entry.shift) {
+			for (const seq of entry.shift) map[seq] = `shift+${keyId}` as KeyId;
+		}
+		if (entry.ctrl) {
+			for (const seq of entry.ctrl) map[seq] = `ctrl+${keyId}` as KeyId;
+		}
+	}
+	// Non-standard alt+arrow aliases not derivable from the table
+	map["\x1bb"] = "alt+left";
+	map["\x1bf"] = "alt+right";
+	map["\x1bp"] = "alt+up";
+	map["\x1bn"] = "alt+down";
+	return map;
+})();
 
 const matchesLegacySequence = (data: string, sequences: readonly string[]): boolean => sequences.includes(data);
 
-const matchesLegacyModifierSequence = (data: string, key: LegacyModifierKey, modifier: number): boolean => {
-	if (modifier === MODIFIERS.shift) {
-		return matchesLegacySequence(data, LEGACY_SHIFT_SEQUENCES[key]);
+const matchesLegacyModifierSequence = (data: string, key: string, modifier: number): boolean => {
+	const entry = LEGACY_SEQUENCES[key];
+	if (!entry) return false;
+	if (modifier === MODIFIERS.shift && entry.shift) {
+		return matchesLegacySequence(data, entry.shift);
 	}
-	if (modifier === MODIFIERS.ctrl) {
-		return matchesLegacySequence(data, LEGACY_CTRL_SEQUENCES[key]);
+	if (modifier === MODIFIERS.ctrl && entry.ctrl) {
+		return matchesLegacySequence(data, entry.ctrl);
 	}
 	return false;
 };
@@ -481,33 +424,29 @@ interface ParsedModifyOtherKeysSequence {
 let _lastEventType: KeyEventType = "press";
 
 /**
- * Check if the last parsed key event was a key release.
- * Only meaningful when Kitty keyboard protocol with flag 2 is active.
+ * Check if input data contains a Kitty event type marker.
+ * Event type markers appear as ":<eventType>" followed by a sequence terminator (u, ~, A-D, H, F).
+ * Ignores bracketed paste content which may contain similar patterns.
  */
-export function isKeyRelease(data: string): boolean {
-	// Don't treat bracketed paste content as key release, even if it contains
-	// patterns like ":3F" (e.g., bluetooth MAC addresses like "90:62:3F:A5").
-	// Terminal.ts re-wraps paste content with bracketed paste markers before
-	// passing to TUI, so pasted data will always contain \x1b[200~.
+function hasKittyEventType(data: string, eventType: number): boolean {
 	if (data.includes("\x1b[200~")) {
 		return false;
 	}
+	const marker = `:${eventType}`;
+	return (
+		data.includes(`${marker}u`) ||
+		data.includes(`${marker}~`) ||
+		data.includes(`${marker}A`) ||
+		data.includes(`${marker}B`) ||
+		data.includes(`${marker}C`) ||
+		data.includes(`${marker}D`) ||
+		data.includes(`${marker}H`) ||
+		data.includes(`${marker}F`)
+	);
+}
 
-	// Quick check: release events with flag 2 contain ":3"
-	// Format: \x1b[<codepoint>;<modifier>:3u
-	if (
-		data.includes(":3u") ||
-		data.includes(":3~") ||
-		data.includes(":3A") ||
-		data.includes(":3B") ||
-		data.includes(":3C") ||
-		data.includes(":3D") ||
-		data.includes(":3H") ||
-		data.includes(":3F")
-	) {
-		return true;
-	}
-	return false;
+export function isKeyRelease(data: string): boolean {
+	return hasKittyEventType(data, 3);
 }
 
 /**
@@ -515,25 +454,7 @@ export function isKeyRelease(data: string): boolean {
  * Only meaningful when Kitty keyboard protocol with flag 2 is active.
  */
 export function isKeyRepeat(data: string): boolean {
-	// Don't treat bracketed paste content as key repeat, even if it contains
-	// patterns like ":2F". See isKeyRelease() for details.
-	if (data.includes("\x1b[200~")) {
-		return false;
-	}
-
-	if (
-		data.includes(":2u") ||
-		data.includes(":2~") ||
-		data.includes(":2A") ||
-		data.includes(":2B") ||
-		data.includes(":2C") ||
-		data.includes(":2D") ||
-		data.includes(":2H") ||
-		data.includes(":2F")
-	) {
-		return true;
-	}
-	return false;
+	return hasKittyEventType(data, 2);
 }
 
 function parseEventType(eventTypeStr: string | undefined): KeyEventType {
@@ -847,7 +768,7 @@ export function matchesKey(data: string, keyId: KeyId): boolean {
 		case "insert":
 			if (modifier === 0) {
 				return (
-					matchesLegacySequence(data, LEGACY_KEY_SEQUENCES.insert) ||
+					matchesLegacySequence(data, LEGACY_SEQUENCES.insert.plain!) ||
 					matchesKittySequence(data, FUNCTIONAL_CODEPOINTS.insert, 0)
 				);
 			}
@@ -859,7 +780,7 @@ export function matchesKey(data: string, keyId: KeyId): boolean {
 		case "delete":
 			if (modifier === 0) {
 				return (
-					matchesLegacySequence(data, LEGACY_KEY_SEQUENCES.delete) ||
+					matchesLegacySequence(data, LEGACY_SEQUENCES.delete.plain!) ||
 					matchesKittySequence(data, FUNCTIONAL_CODEPOINTS.delete, 0)
 				);
 			}
@@ -870,14 +791,14 @@ export function matchesKey(data: string, keyId: KeyId): boolean {
 
 		case "clear":
 			if (modifier === 0) {
-				return matchesLegacySequence(data, LEGACY_KEY_SEQUENCES.clear);
+				return matchesLegacySequence(data, LEGACY_SEQUENCES.clear.plain!);
 			}
 			return matchesLegacyModifierSequence(data, "clear", modifier);
 
 		case "home":
 			if (modifier === 0) {
 				return (
-					matchesLegacySequence(data, LEGACY_KEY_SEQUENCES.home) ||
+					matchesLegacySequence(data, LEGACY_SEQUENCES.home.plain!) ||
 					matchesKittySequence(data, FUNCTIONAL_CODEPOINTS.home, 0)
 				);
 			}
@@ -889,7 +810,7 @@ export function matchesKey(data: string, keyId: KeyId): boolean {
 		case "end":
 			if (modifier === 0) {
 				return (
-					matchesLegacySequence(data, LEGACY_KEY_SEQUENCES.end) ||
+					matchesLegacySequence(data, LEGACY_SEQUENCES.end.plain!) ||
 					matchesKittySequence(data, FUNCTIONAL_CODEPOINTS.end, 0)
 				);
 			}
@@ -901,7 +822,7 @@ export function matchesKey(data: string, keyId: KeyId): boolean {
 		case "pageup":
 			if (modifier === 0) {
 				return (
-					matchesLegacySequence(data, LEGACY_KEY_SEQUENCES.pageUp) ||
+					matchesLegacySequence(data, LEGACY_SEQUENCES.pageUp.plain!) ||
 					matchesKittySequence(data, FUNCTIONAL_CODEPOINTS.pageUp, 0)
 				);
 			}
@@ -913,7 +834,7 @@ export function matchesKey(data: string, keyId: KeyId): boolean {
 		case "pagedown":
 			if (modifier === 0) {
 				return (
-					matchesLegacySequence(data, LEGACY_KEY_SEQUENCES.pageDown) ||
+					matchesLegacySequence(data, LEGACY_SEQUENCES.pageDown.plain!) ||
 					matchesKittySequence(data, FUNCTIONAL_CODEPOINTS.pageDown, 0)
 				);
 			}
@@ -928,7 +849,7 @@ export function matchesKey(data: string, keyId: KeyId): boolean {
 			}
 			if (modifier === 0) {
 				return (
-					matchesLegacySequence(data, LEGACY_KEY_SEQUENCES.up) ||
+					matchesLegacySequence(data, LEGACY_SEQUENCES.up.plain!) ||
 					matchesKittySequence(data, ARROW_CODEPOINTS.up, 0)
 				);
 			}
@@ -943,7 +864,7 @@ export function matchesKey(data: string, keyId: KeyId): boolean {
 			}
 			if (modifier === 0) {
 				return (
-					matchesLegacySequence(data, LEGACY_KEY_SEQUENCES.down) ||
+					matchesLegacySequence(data, LEGACY_SEQUENCES.down.plain!) ||
 					matchesKittySequence(data, ARROW_CODEPOINTS.down, 0)
 				);
 			}
@@ -970,7 +891,7 @@ export function matchesKey(data: string, keyId: KeyId): boolean {
 			}
 			if (modifier === 0) {
 				return (
-					matchesLegacySequence(data, LEGACY_KEY_SEQUENCES.left) ||
+					matchesLegacySequence(data, LEGACY_SEQUENCES.left.plain!) ||
 					matchesKittySequence(data, ARROW_CODEPOINTS.left, 0)
 				);
 			}
@@ -997,7 +918,7 @@ export function matchesKey(data: string, keyId: KeyId): boolean {
 			}
 			if (modifier === 0) {
 				return (
-					matchesLegacySequence(data, LEGACY_KEY_SEQUENCES.right) ||
+					matchesLegacySequence(data, LEGACY_SEQUENCES.right.plain!) ||
 					matchesKittySequence(data, ARROW_CODEPOINTS.right, 0)
 				);
 			}
@@ -1021,8 +942,8 @@ export function matchesKey(data: string, keyId: KeyId): boolean {
 			if (modifier !== 0) {
 				return false;
 			}
-			const functionKey = key as keyof typeof LEGACY_KEY_SEQUENCES;
-			return matchesLegacySequence(data, LEGACY_KEY_SEQUENCES[functionKey]);
+			const functionKey = key as keyof typeof LEGACY_SEQUENCES;
+			return matchesLegacySequence(data, LEGACY_SEQUENCES[functionKey]!.plain!);
 		}
 	}
 

package/pkg/dist/modes/interactive/theme/theme.d.ts

@@ -1,4 +1,69 @@
 import type { EditorTheme, MarkdownTheme, SelectListTheme } from "@gsd/pi-tui";
+import { type Static } from "@sinclair/typebox";
+declare const ThemeJsonSchema: import("@sinclair/typebox").TObject<{
+    $schema: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+    name: import("@sinclair/typebox").TString;
+    vars: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TRecord<import("@sinclair/typebox").TString, import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>>>;
+    colors: import("@sinclair/typebox").TObject<{
+        accent: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        border: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        borderAccent: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        borderMuted: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        success: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        error: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        warning: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        muted: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        dim: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        text: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        thinkingText: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        selectedBg: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        userMessageBg: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        userMessageText: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        customMessageBg: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        customMessageText: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        customMessageLabel: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        toolPendingBg: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        toolSuccessBg: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        toolErrorBg: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        toolTitle: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        toolOutput: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        mdHeading: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        mdLink: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        mdLinkUrl: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        mdCode: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        mdCodeBlock: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        mdCodeBlockBorder: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        mdQuote: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        mdQuoteBorder: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        mdHr: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        mdListBullet: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        toolDiffAdded: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        toolDiffRemoved: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        toolDiffContext: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        syntaxComment: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        syntaxKeyword: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        syntaxFunction: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        syntaxVariable: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        syntaxString: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        syntaxNumber: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        syntaxType: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        syntaxOperator: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        syntaxPunctuation: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        thinkingOff: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        thinkingMinimal: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        thinkingLow: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        thinkingMedium: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        thinkingHigh: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        thinkingXhigh: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+        bashMode: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>;
+    }>;
+    export: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
+        pageBg: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>>;
+        cardBg: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>>;
+        infoBg: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TInteger]>>;
+    }>>;
+}>;
+export type ThemeJson = Static<typeof ThemeJsonSchema>;
 export type ThemeColor = "accent" | "border" | "borderAccent" | "borderMuted" | "success" | "error" | "warning" | "muted" | "dim" | "text" | "thinkingText" | "userMessageText" | "customMessageText" | "customMessageLabel" | "toolTitle" | "toolOutput" | "mdHeading" | "mdLink" | "mdLinkUrl" | "mdCode" | "mdCodeBlock" | "mdCodeBlockBorder" | "mdQuote" | "mdQuoteBorder" | "mdHr" | "mdListBullet" | "toolDiffAdded" | "toolDiffRemoved" | "toolDiffContext" | "syntaxComment" | "syntaxKeyword" | "syntaxFunction" | "syntaxVariable" | "syntaxString" | "syntaxNumber" | "syntaxType" | "syntaxOperator" | "syntaxPunctuation" | "thinkingOff" | "thinkingMinimal" | "thinkingLow" | "thinkingMedium" | "thinkingHigh" | "thinkingXhigh" | "bashMode";
 export type ThemeBg = "selectedBg" | "userMessageBg" | "customMessageBg" | "toolPendingBg" | "toolSuccessBg" | "toolErrorBg";
 type ColorMode = "truecolor" | "256color";

package/pkg/dist/modes/interactive/theme/theme.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"theme.d.ts","sourceRoot":"","sources":["../../../../src/modes/interactive/theme/theme.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"theme.d.ts","sourceRoot":"","sources":["../../../../src/modes/interactive/theme/theme.ts"],"names":[],"mappings":"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"}

package/pkg/dist/modes/interactive/theme/theme.js

@@ -4,7 +4,8 @@ import { Type } from "@sinclair/typebox";
 import { TypeCompiler } from "@sinclair/typebox/compiler";
 import chalk from "chalk";
 import { highlightCode as nativeHighlightCode, supportsLanguage, } from "@gsd/native";
-import { getCustomThemesDir, getThemesDir } from "../../../config.js";
+import { getCustomThemesDir } from "../../../config.js";
+import { builtinThemes } from "./themes.js";
 // Issue #453: native preview highlighting can wedge the entire interactive
 // session after a successful file tool. Keep the safer plain-text path as the
 // default and allow native highlighting only as an explicit opt-in.
@@ -335,18 +336,8 @@ export class Theme {
 // ============================================================================
 // Theme Loading
 // ============================================================================
-let BUILTIN_THEMES;
 function getBuiltinThemes() {
-    if (!BUILTIN_THEMES) {
-        const themesDir = getThemesDir();
-        const darkPath = path.join(themesDir, "dark.json");
-        const lightPath = path.join(themesDir, "light.json");
-        BUILTIN_THEMES = {
-            dark: JSON.parse(fs.readFileSync(darkPath, "utf-8")),
-            light: JSON.parse(fs.readFileSync(lightPath, "utf-8")),
-        };
-    }
-    return BUILTIN_THEMES;
+    return builtinThemes;
 }
 export function getAvailableThemes() {
     const themes = new Set(Object.keys(getBuiltinThemes()));
@@ -365,12 +356,11 @@ export function getAvailableThemes() {
     return Array.from(themes).sort();
 }
 export function getAvailableThemesWithPaths() {
-    const themesDir = getThemesDir();
     const customThemesDir = getCustomThemesDir();
     const result = [];
-    // Built-in themes
+    // Built-in themes (embedded in code, no file path)
     for (const name of Object.keys(getBuiltinThemes())) {
-        result.push({ name, path: path.join(themesDir, `${name}.json`) });
+        result.push({ name, path: undefined });
     }
     // Custom themes
     if (fs.existsSync(customThemesDir)) {
@@ -410,7 +400,7 @@ function parseThemeJson(label, json) {
             errorMessage += "\nMissing required color tokens:\n";
             errorMessage += missingColors.map((c) => `  - ${c}`).join("\n");
             errorMessage += '\n\nPlease add these colors to your theme\'s "colors" object.';
-            errorMessage += "\nSee the built-in themes (dark.json, light.json) for reference values.";
+            errorMessage += "\nSee the built-in dark/light themes for reference values.";
         }
         if (otherErrors.length > 0) {
             errorMessage += `\n\nOther errors:\n${otherErrors.join("\n")}`;