@brimveyn/aimux-config 0.3.5 → 0.4.1

package/src/house-themes.ts

@@ -0,0 +1,313 @@
+// Hand-curated aimux house themes, full Shiki theme shape. Colors follow the
+// VSCode workbench color key namespace; `settings` is a TextMate token rule
+// array shared by the in-repo diff highlighter and `shiki.loadTheme`.
+/* eslint-disable perfectionist/sort-objects */
+
+import type { Theme, ThemeColorMap } from './types'
+
+// --- aimux --------------------------------------------------------------
+//
+// Teal accents on a deep blue-black background. Designed to look at home
+// inside the aimux chrome.
+const AIMUX_BG = '#11151b'
+const AIMUX_FG = '#edf4ff'
+
+const AIMUX_COLORS: ThemeColorMap = {
+  'contrastBorder': '#3a4c60',
+  'descriptionForeground': '#6b829a',
+  'diffEditor.insertedLineBackground': '#1e3d2b',
+  'diffEditor.removedLineBackground': '#3b1e27',
+  'editor.background': AIMUX_BG,
+  'editor.foreground': AIMUX_FG,
+  'editor.lineHighlightBackground': '#1a2330',
+  'editor.selectionBackground': '#1f3344',
+  'editorCursor.foreground': '#7cd1b8',
+  'editorError.foreground': '#f38ba8',
+  'editorGroup.border': '#2d3f52',
+  'editorGroupHeader.tabsBackground': '#16202b',
+  'editorLineNumber.foreground': '#3e506a',
+  'editorWarning.foreground': '#f6c177',
+  'editorWidget.background': '#0b1016',
+  'errorForeground': '#f38ba8',
+  'focusBorder': '#7cd1b8',
+  'foreground': AIMUX_FG,
+  'gitDecoration.addedResourceForeground': '#8bd5ca',
+  'gitDecoration.deletedResourceForeground': '#f38ba8',
+  'gitDecoration.modifiedResourceForeground': '#f6c177',
+  'gitDecoration.untrackedResourceForeground': '#8bd5ca',
+  'input.background': '#1c2734',
+  'input.border': '#2d3f52',
+  'input.foreground': AIMUX_FG,
+  'list.activeSelectionBackground': '#1f3344',
+  'list.activeSelectionForeground': AIMUX_FG,
+  'list.hoverBackground': '#1a2330',
+  'panel.background': '#16202b',
+  'panel.border': '#2d3f52',
+  'sideBar.background': '#16202b',
+  'sideBar.foreground': AIMUX_FG,
+  'sideBarSectionHeader.background': '#1c2734',
+  'sideBarSectionHeader.foreground': '#b8c5d6',
+  'terminal.ansiBlue': '#7cb3ff',
+  'terminal.ansiCyan': '#7cd1b8',
+  'terminal.ansiGreen': '#8bd5ca',
+  'terminal.ansiMagenta': '#c4a7e7',
+  'terminal.ansiRed': '#f38ba8',
+  'terminal.ansiYellow': '#f6c177',
+  'textLink.activeForeground': '#7cd1b8',
+  'textLink.foreground': '#7cd1b8',
+}
+
+// --- dracula-at-night --------------------------------------------------
+const DAN_BG = '#0e1419'
+const DAN_FG = '#f8f8f2'
+
+const DAN_COLORS: ThemeColorMap = {
+  'contrastBorder': '#44475a',
+  'descriptionForeground': '#6272a4',
+  'diffEditor.insertedLineBackground': '#162b1d',
+  'diffEditor.removedLineBackground': '#2a1820',
+  'editor.background': DAN_BG,
+  'editor.foreground': DAN_FG,
+  'editor.lineHighlightBackground': '#1a2129',
+  'editor.selectionBackground': '#222a33',
+  'editorCursor.foreground': '#f8f8f0',
+  'editorError.foreground': '#ff5555',
+  'editorGroup.border': '#2a3440',
+  'editorGroupHeader.tabsBackground': '#131920',
+  'editorLineNumber.foreground': '#495466',
+  'editorWarning.foreground': '#f1fa8c',
+  'editorWidget.background': '#090d11',
+  'errorForeground': '#ff5555',
+  'focusBorder': '#bd93f9',
+  'foreground': DAN_FG,
+  'gitDecoration.addedResourceForeground': '#50fa7b',
+  'gitDecoration.deletedResourceForeground': '#ff5555',
+  'gitDecoration.modifiedResourceForeground': '#f1fa8c',
+  'gitDecoration.untrackedResourceForeground': '#50fa7b',
+  'input.background': '#1a2129',
+  'input.border': '#2a3440',
+  'input.foreground': DAN_FG,
+  'list.activeSelectionBackground': '#222a33',
+  'list.activeSelectionForeground': DAN_FG,
+  'list.hoverBackground': '#1a2129',
+  'panel.background': '#131920',
+  'panel.border': '#2a3440',
+  'sideBar.background': '#131920',
+  'sideBar.foreground': DAN_FG,
+  'sideBarSectionHeader.background': '#1a2129',
+  'sideBarSectionHeader.foreground': '#bdc3cf',
+  'terminal.ansiBlue': '#6272a4',
+  'terminal.ansiCyan': '#8be9fd',
+  'terminal.ansiGreen': '#50fa7b',
+  'terminal.ansiMagenta': '#ff79c6',
+  'terminal.ansiRed': '#ff5555',
+  'terminal.ansiYellow': '#f1fa8c',
+  'textLink.activeForeground': '#ff79c6',
+  'textLink.foreground': '#bd93f9',
+}
+
+// --- Shared TextMate rule helpers --------------------------------------
+
+const AIMUX_SETTINGS = [
+  { settings: { background: AIMUX_BG, foreground: AIMUX_FG } },
+  {
+    scope: ['comment', 'punctuation.definition.comment'],
+    settings: { fontStyle: 'italic', foreground: '#6b829a' },
+  },
+  { scope: ['comment.documentation'], settings: { foreground: '#8fa6bf', fontStyle: 'italic' } },
+  { scope: ['string', 'string.quoted'], settings: { foreground: '#f6c177' } },
+  { scope: ['string.template'], settings: { foreground: '#f6c177' } },
+  {
+    scope: ['string.regexp', 'string.escape', 'constant.character.escape'],
+    settings: { foreground: '#c4a7e7' },
+  },
+  {
+    scope: ['constant.numeric', 'constant.language', 'constant.language.boolean'],
+    settings: { foreground: '#f38ba8' },
+  },
+  { scope: ['constant.character', 'constant.other'], settings: { foreground: '#f38ba8' } },
+  {
+    scope: ['keyword', 'keyword.control', 'keyword.operator.new', 'keyword.other'],
+    settings: { fontStyle: 'bold', foreground: '#c4a7e7' },
+  },
+  {
+    scope: ['storage', 'storage.type', 'storage.modifier'],
+    settings: { fontStyle: 'bold', foreground: '#c4a7e7' },
+  },
+  {
+    scope: ['keyword.operator', 'punctuation', 'meta.brace', 'punctuation.separator'],
+    settings: { foreground: '#6b829a' },
+  },
+  {
+    scope: [
+      'entity.name.function',
+      'support.function',
+      'meta.function-call',
+      'entity.name.function.member',
+    ],
+    settings: { foreground: '#8bd5ca' },
+  },
+  {
+    scope: [
+      'entity.name.type',
+      'support.type',
+      'support.class',
+      'entity.name.class',
+      'entity.name.interface',
+      'entity.name.namespace',
+    ],
+    settings: { fontStyle: 'italic', foreground: '#7cd1b8' },
+  },
+  {
+    scope: ['entity.name.type.enum', 'entity.name.type.alias'],
+    settings: { foreground: '#7cd1b8' },
+  },
+  { scope: ['variable', 'meta.variable'], settings: { foreground: AIMUX_FG } },
+  {
+    scope: ['variable.parameter', 'meta.function.parameters'],
+    settings: { fontStyle: 'italic', foreground: AIMUX_FG },
+  },
+  {
+    scope: ['variable.other.property', 'variable.other.member', 'meta.object-literal.key'],
+    settings: { foreground: '#7cd1b8' },
+  },
+  {
+    scope: ['variable.language', 'variable.language.this'],
+    settings: { foreground: '#f38ba8', fontStyle: 'italic' },
+  },
+  { scope: ['entity.name.tag', 'meta.tag'], settings: { foreground: '#f38ba8' } },
+  {
+    scope: ['entity.other.attribute-name'],
+    settings: { fontStyle: 'italic', foreground: '#f6c177' },
+  },
+  { scope: ['support.constant'], settings: { foreground: '#f38ba8' } },
+  { scope: ['support.variable'], settings: { foreground: AIMUX_FG } },
+  // Markdown
+  { scope: ['markup.heading'], settings: { fontStyle: 'bold', foreground: '#7cd1b8' } },
+  { scope: ['markup.bold'], settings: { fontStyle: 'bold', foreground: AIMUX_FG } },
+  { scope: ['markup.italic'], settings: { fontStyle: 'italic', foreground: AIMUX_FG } },
+  { scope: ['markup.underline.link', 'markup.inline.raw'], settings: { foreground: '#8bd5ca' } },
+  { scope: ['markup.list'], settings: { foreground: '#c4a7e7' } },
+  { scope: ['markup.quote'], settings: { foreground: '#6b829a', fontStyle: 'italic' } },
+  { scope: ['markup.raw'], settings: { foreground: '#f6c177' } },
+  // JSX / TSX
+  {
+    scope: ['entity.name.tag.jsx', 'support.class.component'],
+    settings: { foreground: '#7cd1b8' },
+  },
+  { scope: ['meta.jsx.children'], settings: { foreground: AIMUX_FG } },
+  // Diff
+  { scope: ['markup.inserted', 'meta.diff.header.to-file'], settings: { foreground: '#8bd5ca' } },
+  { scope: ['markup.deleted', 'meta.diff.header.from-file'], settings: { foreground: '#f38ba8' } },
+  { scope: ['markup.changed'], settings: { foreground: '#f6c177' } },
+  { scope: ['meta.diff.range'], settings: { foreground: '#c4a7e7' } },
+]
+
+const DAN_SETTINGS = [
+  { settings: { background: DAN_BG, foreground: DAN_FG } },
+  {
+    scope: ['comment', 'punctuation.definition.comment'],
+    settings: { fontStyle: 'italic', foreground: '#6272a4' },
+  },
+  { scope: ['comment.documentation'], settings: { fontStyle: 'italic', foreground: '#8a96b4' } },
+  { scope: ['string', 'string.quoted'], settings: { foreground: '#f1fa8c' } },
+  { scope: ['string.template'], settings: { foreground: '#f1fa8c' } },
+  {
+    scope: ['string.regexp', 'string.escape', 'constant.character.escape'],
+    settings: { foreground: '#ff79c6' },
+  },
+  {
+    scope: ['constant.numeric', 'constant.language', 'constant.language.boolean'],
+    settings: { foreground: '#bd93f9' },
+  },
+  { scope: ['constant.character', 'constant.other'], settings: { foreground: '#bd93f9' } },
+  {
+    scope: ['keyword', 'keyword.control', 'keyword.other'],
+    settings: { fontStyle: 'bold', foreground: '#ff79c6' },
+  },
+  {
+    scope: ['storage', 'storage.type', 'storage.modifier'],
+    settings: { fontStyle: 'bold italic', foreground: '#ff79c6' },
+  },
+  {
+    scope: ['keyword.operator', 'punctuation', 'meta.brace', 'punctuation.separator'],
+    settings: { foreground: '#f8f8f2' },
+  },
+  {
+    scope: ['entity.name.function', 'support.function', 'meta.function-call'],
+    settings: { foreground: '#50fa7b' },
+  },
+  {
+    scope: [
+      'entity.name.type',
+      'support.type',
+      'support.class',
+      'entity.name.class',
+      'entity.name.interface',
+    ],
+    settings: { fontStyle: 'italic', foreground: '#8be9fd' },
+  },
+  {
+    scope: ['entity.name.type.enum', 'entity.name.type.alias'],
+    settings: { foreground: '#8be9fd' },
+  },
+  { scope: ['variable', 'meta.variable'], settings: { foreground: DAN_FG } },
+  {
+    scope: ['variable.parameter', 'meta.function.parameters'],
+    settings: { fontStyle: 'italic', foreground: '#ffb86c' },
+  },
+  {
+    scope: ['variable.other.property', 'variable.other.member', 'meta.object-literal.key'],
+    settings: { foreground: '#8be9fd' },
+  },
+  {
+    scope: ['variable.language', 'variable.language.this'],
+    settings: { foreground: '#bd93f9', fontStyle: 'italic' },
+  },
+  { scope: ['entity.name.tag', 'meta.tag'], settings: { foreground: '#ff79c6' } },
+  {
+    scope: ['entity.other.attribute-name'],
+    settings: { fontStyle: 'italic', foreground: '#50fa7b' },
+  },
+  { scope: ['support.constant'], settings: { foreground: '#bd93f9' } },
+  // Markdown
+  { scope: ['markup.heading'], settings: { fontStyle: 'bold', foreground: '#bd93f9' } },
+  { scope: ['markup.bold'], settings: { fontStyle: 'bold', foreground: '#ffb86c' } },
+  { scope: ['markup.italic'], settings: { fontStyle: 'italic', foreground: '#f1fa8c' } },
+  { scope: ['markup.underline.link', 'markup.inline.raw'], settings: { foreground: '#8be9fd' } },
+  { scope: ['markup.list'], settings: { foreground: '#ff79c6' } },
+  { scope: ['markup.quote'], settings: { foreground: '#6272a4', fontStyle: 'italic' } },
+  { scope: ['markup.raw'], settings: { foreground: '#f1fa8c' } },
+  // JSX / TSX
+  {
+    scope: ['entity.name.tag.jsx', 'support.class.component'],
+    settings: { foreground: '#8be9fd' },
+  },
+  // Diff
+  { scope: ['markup.inserted'], settings: { foreground: '#50fa7b' } },
+  { scope: ['markup.deleted'], settings: { foreground: '#ff5555' } },
+  { scope: ['markup.changed'], settings: { foreground: '#f1fa8c' } },
+]
+
+export const HOUSE_THEMES: Record<string, Theme> = {
+  'aimux': {
+    bg: AIMUX_BG,
+    colors: AIMUX_COLORS,
+    displayName: 'Aimux',
+    fg: AIMUX_FG,
+    name: 'aimux',
+    settings: AIMUX_SETTINGS,
+    type: 'dark',
+  },
+  'dracula-at-night': {
+    bg: DAN_BG,
+    colors: DAN_COLORS,
+    displayName: 'Dracula At Night',
+    fg: DAN_FG,
+    name: 'dracula-at-night',
+    settings: DAN_SETTINGS,
+    type: 'dark',
+  },
+}
+
+export const HOUSE_THEME_IDS: string[] = Object.keys(HOUSE_THEMES)

package/src/index.ts

@@ -2,7 +2,15 @@
 
 export { defineConfig } from './define-config'
 export * as actions from './actions'
-export { THEME_IDS, themes, THEMES } from './themes'
+export {
+  isKnownThemeId,
+  migrateThemeId,
+  registerUserThemes,
+  THEME_IDS,
+  themes,
+  THEMES,
+} from './themes'
+export { normalizeTheme } from './normalize-theme'
 export { GroupBuilder, KeymapBuilder, ModeBindingBuilder } from './keymap-builder'
 export { getDefaultKeymapConfig } from './defaults'
 export { resolveConfig } from './resolver'
@@ -12,6 +20,7 @@ export type {
   // Action types
   Action,
   ActionFn,
+  AimuxColorKey,
   // User-facing config
   AimuxUserConfig,
   AppAction,
@@ -19,6 +28,7 @@ export type {
   BackendConfig,
   BindingDef,
   FocusMode,
+  GitFileListMode,
   GitPaneConfig,
   GitPaneDiffCountConfig,
   GitPaneEmbeddedConfig,
@@ -39,6 +49,8 @@ export type {
   // Mode / state
   ModeId,
   ModeKeymapDef,
+  NamedTheme,
+  NamedThemeDefinition,
   // Resolved config (internal, but exported for tooling)
   ResolvedConfig,
   ResolvedKeymapConfig,
@@ -49,8 +61,11 @@ export type {
   SnippetRecord,
   SplitDirection,
   TabSession,
-  // Themes
-  ThemeColors,
+  Theme,
+  ThemeColorMap,
   ThemeDefinition,
   ThemeId,
+  ThemeSettings,
+  ThemeTokenRule,
 } from './types'
+export { AIMUX_COLOR_KEYS } from './types'

package/src/normalize-theme.ts

@@ -0,0 +1,260 @@
+// Normalize a partial theme input into a full aimux `Theme` where every
+// AIMUX_COLOR_KEY is guaranteed to have a value. Used at build time by the
+// generator script and at runtime by registerUserThemes — same code path, same
+// guarantees.
+
+import {
+  AIMUX_COLOR_KEYS,
+  type AimuxColorKey,
+  type Theme,
+  type ThemeColorMap,
+  type ThemeTokenRule,
+} from './types'
+
+export interface NormalizeInput {
+  name: string
+  displayName?: string
+  type?: 'dark' | 'light'
+  fg?: string
+  bg?: string
+  colors?: Record<string, string | null | undefined>
+  settings?: ThemeTokenRule[]
+  tokenColors?: ThemeTokenRule[]
+  colorReplacements?: Record<string, string>
+  semanticHighlighting?: boolean
+  semanticTokenColors?: Theme['semanticTokenColors']
+}
+
+function stripAlpha(hex: string | null | undefined): string {
+  if (!hex || typeof hex !== 'string') return '#000000'
+  if (hex.length === 9) return hex.slice(0, 7)
+  if (hex.length === 5) return hex.slice(0, 4)
+  return hex
+}
+
+function expand3(hex: string): string {
+  if (hex.length === 4) {
+    return `#${hex[1]}${hex[1]}${hex[2]}${hex[2]}${hex[3]}${hex[3]}`
+  }
+  return hex
+}
+
+function parseHex(hex: string): { r: number; g: number; b: number } {
+  const clean = expand3(stripAlpha(hex))
+  return {
+    b: parseInt(clean.slice(5, 7), 16),
+    g: parseInt(clean.slice(3, 5), 16),
+    r: parseInt(clean.slice(1, 3), 16),
+  }
+}
+
+function toHex({ b, g, r }: { b: number; g: number; r: number }): string {
+  const clamp = (n: number): number => Math.max(0, Math.min(255, Math.round(n)))
+  const h = (n: number): string => clamp(n).toString(16).padStart(2, '0')
+  return `#${h(r)}${h(g)}${h(b)}`
+}
+
+export function shade(hex: string, amount: number): string {
+  const { b, g, r } = parseHex(hex)
+  const d = amount * 255
+  return toHex({ b: b + d, g: g + d, r: r + d })
+}
+
+export function mix(a: string, b: string, t: number): string {
+  const ca = parseHex(a)
+  const cb = parseHex(b)
+  return toHex({
+    b: ca.b + (cb.b - ca.b) * t,
+    g: ca.g + (cb.g - ca.g) * t,
+    r: ca.r + (cb.r - ca.r) * t,
+  })
+}
+
+function first(map: Record<string, string | null | undefined>, keys: string[]): string | undefined {
+  for (const k of keys) {
+    const v = map[k]
+    if (v && typeof v === 'string') return stripAlpha(v)
+  }
+  return undefined
+}
+
+const FALLBACKS: Record<AimuxColorKey, string[]> = {
+  'contrastBorder': ['editorGroup.border'],
+  'descriptionForeground': ['editorLineNumber.foreground', 'foreground'],
+  'diffEditor.insertedLineBackground': [],
+  'diffEditor.removedLineBackground': [],
+  'editor.background': [],
+  'editor.foreground': [],
+  'editor.lineHighlightBackground': [],
+  'editor.selectionBackground': ['selection.background'],
+  'editorCursor.foreground': ['editor.foreground'],
+  'editorError.foreground': ['errorForeground', 'terminal.ansiRed'],
+  'editorGroup.border': ['contrastBorder', 'panel.border'],
+  'editorGroupHeader.tabsBackground': ['sideBar.background'],
+  'editorLineNumber.foreground': ['descriptionForeground'],
+  'editorWarning.foreground': ['terminal.ansiYellow'],
+  'editorWidget.background': ['sideBar.background', 'editor.background'],
+  'errorForeground': ['editorError.foreground', 'terminal.ansiRed'],
+  'focusBorder': ['textLink.foreground'],
+  'foreground': ['editor.foreground'],
+  'gitDecoration.addedResourceForeground': ['terminal.ansiGreen'],
+  'gitDecoration.deletedResourceForeground': ['terminal.ansiRed', 'editorError.foreground'],
+  'gitDecoration.modifiedResourceForeground': ['terminal.ansiYellow'],
+  'gitDecoration.untrackedResourceForeground': ['gitDecoration.addedResourceForeground'],
+  'input.background': ['editorWidget.background'],
+  'input.border': ['focusBorder', 'editorGroup.border'],
+  'input.foreground': ['editor.foreground'],
+  'list.activeSelectionBackground': ['editor.selectionBackground'],
+  'list.activeSelectionForeground': ['editor.foreground'],
+  'list.hoverBackground': ['list.activeSelectionBackground'],
+  'panel.background': ['editor.background'],
+  'panel.border': ['editorGroup.border', 'contrastBorder'],
+  'sideBar.background': ['editorGroupHeader.tabsBackground', 'panel.background'],
+  'sideBar.foreground': ['editor.foreground', 'foreground'],
+  'sideBarSectionHeader.background': ['sideBar.background'],
+  'sideBarSectionHeader.foreground': ['sideBar.foreground'],
+  'terminal.ansiBlue': ['textLink.foreground'],
+  'terminal.ansiCyan': [],
+  'terminal.ansiGreen': ['gitDecoration.addedResourceForeground'],
+  'terminal.ansiMagenta': [],
+  'terminal.ansiRed': ['editorError.foreground'],
+  'terminal.ansiYellow': ['editorWarning.foreground'],
+  'textLink.activeForeground': ['textLink.foreground'],
+  'textLink.foreground': ['editorLink.activeForeground', 'terminal.ansiBlue'],
+}
+
+function computeFallback(
+  key: AimuxColorKey,
+  bg: string,
+  fg: string,
+  resolved: ThemeColorMap
+): string {
+  switch (key) {
+    case 'editor.background':
+      return bg
+    case 'editor.foreground':
+      return fg
+    case 'editor.lineHighlightBackground':
+      return shade(bg, 0.03)
+    case 'editor.selectionBackground':
+      return shade(bg, 0.1)
+    case 'editorCursor.foreground':
+      return fg
+    case 'editorLineNumber.foreground':
+      return mix(fg, bg, 0.55)
+    case 'sideBar.background':
+      return shade(bg, -0.04)
+    case 'sideBar.foreground':
+      return fg
+    case 'sideBarSectionHeader.background':
+      return shade(bg, -0.02)
+    case 'sideBarSectionHeader.foreground':
+      return mix(fg, bg, 0.35)
+    case 'editorGroupHeader.tabsBackground':
+      return shade(bg, -0.04)
+    case 'editorWidget.background':
+      return shade(bg, -0.08)
+    case 'panel.background':
+      return bg
+    case 'panel.border':
+      return shade(bg, 0.15)
+    case 'focusBorder':
+      return resolved['textLink.foreground'] ?? fg
+    case 'editorGroup.border':
+      return shade(bg, 0.15)
+    case 'contrastBorder':
+      return shade(bg, 0.2)
+    case 'list.activeSelectionBackground':
+      return shade(bg, 0.1)
+    case 'list.activeSelectionForeground':
+      return fg
+    case 'list.hoverBackground':
+      return shade(bg, 0.05)
+    case 'foreground':
+      return fg
+    case 'descriptionForeground':
+      return mix(fg, bg, 0.55)
+    case 'textLink.foreground':
+    case 'textLink.activeForeground':
+      return resolved['terminal.ansiBlue'] ?? fg
+    case 'errorForeground':
+    case 'editorError.foreground':
+      return '#f38ba8'
+    case 'editorWarning.foreground':
+      return '#f6c177'
+    case 'terminal.ansiRed':
+      return '#f38ba8'
+    case 'terminal.ansiGreen':
+      return '#8bd5ca'
+    case 'terminal.ansiYellow':
+      return '#f6c177'
+    case 'terminal.ansiBlue':
+      return '#7cd1b8'
+    case 'terminal.ansiMagenta':
+      return resolved['textLink.activeForeground'] ?? '#c4a7e7'
+    case 'terminal.ansiCyan':
+      return resolved['terminal.ansiBlue'] ?? '#89dceb'
+    case 'gitDecoration.addedResourceForeground':
+      return resolved['terminal.ansiGreen'] ?? '#8bd5ca'
+    case 'gitDecoration.modifiedResourceForeground':
+      return resolved['terminal.ansiYellow'] ?? '#f6c177'
+    case 'gitDecoration.deletedResourceForeground':
+      return resolved['terminal.ansiRed'] ?? '#f38ba8'
+    case 'gitDecoration.untrackedResourceForeground':
+      return resolved['gitDecoration.addedResourceForeground'] ?? '#8bd5ca'
+    case 'diffEditor.insertedLineBackground':
+      return mix(bg, resolved['gitDecoration.addedResourceForeground'] ?? '#8bd5ca', 0.18)
+    case 'diffEditor.removedLineBackground':
+      return mix(bg, resolved['gitDecoration.deletedResourceForeground'] ?? '#f38ba8', 0.18)
+    case 'input.background':
+      return shade(bg, -0.04)
+    case 'input.foreground':
+      return fg
+    case 'input.border':
+      return shade(bg, 0.15)
+    default:
+      return fg
+  }
+}
+
+export function normalizeTheme(raw: NormalizeInput): Theme {
+  const srcColors = raw.colors ?? {}
+  const bg = stripAlpha(srcColors['editor.background'] ?? raw.bg ?? '#000000')
+  const fg = stripAlpha(srcColors['editor.foreground'] ?? raw.fg ?? '#ffffff')
+
+  const resolved: ThemeColorMap = {} as ThemeColorMap
+  for (const key of AIMUX_COLOR_KEYS) {
+    const direct = srcColors[key]
+    if (direct && typeof direct === 'string') {
+      resolved[key] = stripAlpha(direct)
+      continue
+    }
+    const alt = first(srcColors, FALLBACKS[key])
+    if (alt) resolved[key] = alt
+  }
+  for (const key of AIMUX_COLOR_KEYS) {
+    if (!resolved[key]) resolved[key] = computeFallback(key, bg, fg, resolved)
+  }
+  for (const [k, v] of Object.entries(srcColors)) {
+    if (!resolved[k] && v && typeof v === 'string') resolved[k] = stripAlpha(v)
+  }
+
+  const out: Theme = {
+    bg,
+    colors: resolved,
+    displayName: raw.displayName ?? raw.name,
+    fg,
+    name: raw.name,
+    settings: raw.settings ?? [],
+    type: raw.type ?? 'dark',
+  }
+  if (raw.colorReplacements && Object.keys(raw.colorReplacements).length > 0) {
+    out.colorReplacements = raw.colorReplacements
+  }
+  if (raw.semanticHighlighting) out.semanticHighlighting = raw.semanticHighlighting
+  if (raw.semanticTokenColors && Object.keys(raw.semanticTokenColors).length > 0) {
+    out.semanticTokenColors = raw.semanticTokenColors
+  }
+  if (raw.tokenColors && raw.tokenColors !== raw.settings) out.tokenColors = raw.tokenColors
+  return out
+}

package/src/resolver.ts

@@ -25,6 +25,7 @@ export function resolveConfig(userConfig: AimuxUserConfig): ResolvedConfig {
     sidebar: userConfig.sidebar ?? {},
     snippets: userConfig.snippets ?? [],
     theme: userConfig.theme,
+    themes: userConfig.themes ?? {},
   }
 }