@brimveyn/aimux-config 0.3.5 → 0.4.1

package/src/themes.ts

@@ -1,252 +1,100 @@
-import type { ThemeColors, ThemeDefinition, ThemeId } from './types'
+import type {
+  NamedTheme,
+  NamedThemeDefinition,
+  Theme,
+  ThemeColorMap,
+  ThemeDefinition,
+  ThemeId,
+  UserThemeInput,
+} from './types'
 
-export const THEMES: Record<ThemeId, { name: string; colors: ThemeColors }> = {
-  'aimux': {
-    colors: {
-      accent: '#7cd1b8',
-      accentAlt: '#c4a7e7',
-      background: '#11151b',
-      border: '#2d3f52',
-      borderActive: '#7cd1b8',
-      danger: '#f38ba8',
-      dim: '#243242',
-      overlay: '#0b1016',
-      panel: '#16202b',
-      panelHighlight: '#1f3344',
-      panelMuted: '#1c2734',
-      success: '#8bd5ca',
-      text: '#edf4ff',
-      textMuted: '#6b829a',
-      warning: '#f6c177',
-    },
-    name: 'Aimux',
-  },
-  'catppuccin-mocha': {
-    colors: {
-      accent: '#cba6f7',
-      accentAlt: '#f5c2e7',
-      background: '#1e1e2e',
-      border: '#45475a',
-      borderActive: '#cba6f7',
-      danger: '#f38ba8',
-      dim: '#313244',
-      overlay: '#181825',
-      panel: '#232334',
-      panelHighlight: '#313244',
-      panelMuted: '#2a2a3c',
-      success: '#a6e3a1',
-      text: '#cdd6f4',
-      textMuted: '#6c7086',
-      warning: '#f9e2af',
-    },
-    name: 'Catppuccin Mocha',
-  },
-  'dracula': {
-    colors: {
-      accent: '#bd93f9',
-      accentAlt: '#ff79c6',
-      background: '#282a36',
-      border: '#44475a',
-      borderActive: '#bd93f9',
-      danger: '#ff5555',
-      dim: '#383a4a',
-      overlay: '#1f2029',
-      panel: '#2d2f3d',
-      panelHighlight: '#3d4056',
-      panelMuted: '#343746',
-      success: '#50fa7b',
-      text: '#f8f8f2',
-      textMuted: '#6272a4',
-      warning: '#f1fa8c',
-    },
-    name: 'Dracula',
-  },
-  'dracula-at-night': {
-    colors: {
-      accent: '#bd93f9',
-      accentAlt: '#ff79c6',
-      background: '#0e1419',
-      border: '#2a3440',
-      borderActive: '#bd93f9',
-      danger: '#ff5555',
-      dim: '#1e2630',
-      overlay: '#090d11',
-      panel: '#131920',
-      panelHighlight: '#222a33',
-      panelMuted: '#1a2129',
-      success: '#50fa7b',
-      text: '#f8f8f2',
-      textMuted: '#6272a4',
-      warning: '#f1fa8c',
-    },
-    name: 'Dracula At Night',
-  },
-  'everforest': {
-    colors: {
-      accent: '#a7c080',
-      accentAlt: '#d699b6',
-      background: '#2d353b',
-      border: '#4f585e',
-      borderActive: '#a7c080',
-      danger: '#e67e80',
-      dim: '#3d484d',
-      overlay: '#232a2e',
-      panel: '#343f44',
-      panelHighlight: '#475258',
-      panelMuted: '#3d484d',
-      success: '#a7c080',
-      text: '#d3c6aa',
-      textMuted: '#859289',
-      warning: '#dbbc7f',
-    },
-    name: 'Everforest',
-  },
-  'gruvbox-dark': {
-    colors: {
-      accent: '#b8bb26',
-      accentAlt: '#d3869b',
-      background: '#282828',
-      border: '#504945',
-      borderActive: '#b8bb26',
-      danger: '#fb4934',
-      dim: '#3c3836',
-      overlay: '#1f1d1b',
-      panel: '#2e2e2e',
-      panelHighlight: '#504945',
-      panelMuted: '#3c3836',
-      success: '#b8bb26',
-      text: '#ebdbb2',
-      textMuted: '#928374',
-      warning: '#fabd2f',
-    },
-    name: 'Gruvbox Dark',
-  },
-  'kanagawa': {
-    colors: {
-      accent: '#7e9cd8',
-      accentAlt: '#957fb8',
-      background: '#1f1f28',
-      border: '#363646',
-      borderActive: '#7e9cd8',
-      danger: '#e82424',
-      dim: '#2a2a37',
-      overlay: '#171720',
-      panel: '#24242e',
-      panelHighlight: '#363646',
-      panelMuted: '#2a2a37',
-      success: '#76946a',
-      text: '#dcd7ba',
-      textMuted: '#727169',
-      warning: '#e6c384',
-    },
-    name: 'Kanagawa',
-  },
-  'nord': {
-    colors: {
-      accent: '#88c0d0',
-      accentAlt: '#b48ead',
-      background: '#2e3440',
-      border: '#434c5e',
-      borderActive: '#88c0d0',
-      danger: '#bf616a',
-      dim: '#3b4252',
-      overlay: '#252a33',
-      panel: '#333a47',
-      panelHighlight: '#434c5e',
-      panelMuted: '#3b4252',
-      success: '#a3be8c',
-      text: '#eceff4',
-      textMuted: '#7b88a1',
-      warning: '#ebcb8b',
-    },
-    name: 'Nord',
-  },
-  'one-dark': {
-    colors: {
-      accent: '#61afef',
-      accentAlt: '#c678dd',
-      background: '#282c34',
-      border: '#3e4452',
-      borderActive: '#61afef',
-      danger: '#e06c75',
-      dim: '#3b4048',
-      overlay: '#1f2329',
-      panel: '#2c313a',
-      panelHighlight: '#3b4048',
-      panelMuted: '#333842',
-      success: '#98c379',
-      text: '#abb2bf',
-      textMuted: '#636d83',
-      warning: '#e5c07b',
-    },
-    name: 'One Dark',
-  },
-  'solarized-dark': {
-    colors: {
-      accent: '#268bd2',
-      accentAlt: '#d33682',
-      background: '#002b36',
-      border: '#2e5560',
-      borderActive: '#268bd2',
-      danger: '#dc322f',
-      dim: '#073642',
-      overlay: '#00242c',
-      panel: '#003340',
-      panelHighlight: '#0a4050',
-      panelMuted: '#073642',
-      success: '#859900',
-      text: '#fdf6e3',
-      textMuted: '#657b83',
-      warning: '#b58900',
-    },
-    name: 'Solarized Dark',
-  },
-  'tokyo-night': {
-    colors: {
-      accent: '#7aa2f7',
-      accentAlt: '#bb9af7',
-      background: '#1a1b26',
-      border: '#3b4261',
-      borderActive: '#7aa2f7',
-      danger: '#f7768e',
-      dim: '#292e42',
-      overlay: '#141722',
-      panel: '#1f2335',
-      panelHighlight: '#292e42',
-      panelMuted: '#24283b',
-      success: '#9ece6a',
-      text: '#c0caf5',
-      textMuted: '#565f89',
-      warning: '#e0af68',
-    },
-    name: 'Tokyo Night',
-  },
+import { HOUSE_THEME_IDS, HOUSE_THEMES } from './house-themes'
+import { normalizeTheme } from './normalize-theme'
+import { GENERATED_THEME_IDS, GENERATED_THEMES } from './themes/generated'
+
+export const THEMES: Record<string, Theme> = { ...GENERATED_THEMES, ...HOUSE_THEMES }
+export const THEME_IDS: ThemeId[] = [...GENERATED_THEME_IDS, ...HOUSE_THEME_IDS]
+
+const DEFAULT_THEME_ID: ThemeId = 'aimux'
+
+const LEGACY_THEME_ALIASES: Record<string, ThemeId> = {
+  'everforest': 'everforest-dark',
+  'gruvbox-dark': 'gruvbox-dark-hard',
+  'kanagawa': 'kanagawa-wave',
+  'one-dark': 'one-dark-pro',
+}
+
+export function migrateThemeId(id: string | undefined): ThemeId {
+  if (id !== undefined && id in THEMES) return id as ThemeId
+  if (id !== undefined) {
+    const alias = LEGACY_THEME_ALIASES[id]
+    if (alias !== undefined) return alias
+  }
+  return DEFAULT_THEME_ID
 }
 
-export const THEME_IDS = Object.keys(THEMES) as ThemeId[]
+export function isKnownThemeId(id: string): boolean {
+  return id in THEMES
+}
+
+function isFullTheme(
+  def: NamedTheme | NamedThemeDefinition | UserThemeInput
+): def is NamedTheme | UserThemeInput {
+  return 'settings' in def || 'fg' in def || 'bg' in def
+}
 
 /**
- * Theme helpers for user configs.
+ * Merge user-declared themes into the registry. Both the full and palette
+ * shortcut paths run through `normalizeTheme` so every registered theme has
+ * all AIMUX_COLOR_KEYS populated — same guarantees as shipped themes.
  */
+export function registerUserThemes(
+  defs: Record<string, NamedTheme | NamedThemeDefinition | UserThemeInput> | undefined
+): void {
+  if (!defs) return
+  const fallback = THEMES[DEFAULT_THEME_ID]
+  if (!fallback) return
+  for (const [id, def] of Object.entries(defs)) {
+    if (isFullTheme(def)) {
+      THEMES[id] = normalizeTheme({ ...def, name: def.name ?? id })
+    } else {
+      const base = def.base ? (THEMES[def.base] ?? fallback) : fallback
+      const colors: Record<string, string> = { ...base.colors }
+      for (const [k, v] of Object.entries(def.colors ?? {})) {
+        if (typeof v === 'string') colors[k] = v
+      }
+      THEMES[id] = normalizeTheme({
+        bg: base.bg,
+        colors,
+        displayName: def.name,
+        fg: base.fg,
+        name: id,
+        settings: base.settings,
+        type: base.type,
+      })
+    }
+    if (!THEME_IDS.includes(id)) THEME_IDS.push(id)
+  }
+}
+
 export const themes = {
   /**
-   * Create a fully custom theme from scratch.
+   * Palette shortcut. Patches VSCode color keys on top of an existing theme;
+   * token settings inherit from the base unchanged.
    */
-  create(colors: ThemeColors): ThemeDefinition {
-    return { colors }
+  define(name: string, base: ThemeId, overrides: Partial<ThemeColorMap>): NamedThemeDefinition {
+    return { base, colors: overrides, name }
+  },
+  /** Unnamed variant of `define`. Prefer `define` in config. */
+  extend(base: ThemeId, overrides: Partial<ThemeColorMap>): ThemeDefinition {
+    return { base, colors: overrides }
   },
-
   /**
-   * Create a new theme by extending an existing built-in theme with overrides.
+   * Passthrough for a raw Shiki / VSCode-shape theme. Missing
+   * `AIMUX_COLOR_KEYS` are filled at registration via the same fallback chain
+   * the shipped themes go through.
    */
-  extend(base: ThemeId, overrides: Partial<ThemeColors>): ThemeDefinition {
-    const baseTheme = THEMES[base]
-    if (!baseTheme) {
-      throw new Error(`themes.extend: unknown base theme "${base}"`)
-    }
-    return {
-      base,
-      colors: { ...baseTheme.colors, ...overrides },
-    }
+  full(theme: UserThemeInput): UserThemeInput {
+    return theme
   },
 }

package/src/types.ts

@@ -23,6 +23,7 @@ export type ModeId =
   | 'modal.snippet-picker.filtering'
   | 'modal.snippet-editor'
   | 'modal.theme-picker'
+  | 'modal.theme-picker.filtering'
   | 'modal.help'
   | 'modal.help.filtering'
   | 'modal.split-picker'
@@ -162,12 +163,14 @@ export interface GitPaneState {
   mode: 'embedded' | 'pane'
   position: 'top' | 'bottom' | 'left' | 'right'
   ratio: number
+  diffModeRatio: number
+  fileListMode: GitFileListMode
   path: GitPanePathConfig
   diffCount: GitPaneDiffCountConfig
 }
 
 export type GitFileStatus = 'M' | 'A' | 'D' | 'R' | 'C' | 'U' | '?'
-export type GitFileSection = 'staged' | 'unstaged' | 'untracked'
+export type GitFileSection = 'staged' | 'unstaged' | 'untracked' | 'historical'
 
 export interface GitFileEntry {
   path: string
@@ -200,12 +203,24 @@ export interface DiffData {
   errorMessage?: string
 }
 
+export type GitDiffView = 'split' | 'stacked'
+export type GitFileListMode = 'tree' | 'flat'
+
+export interface FoldState {
+  top: number
+  bottom: number
+}
+
 export interface GitModeState {
-  selectedFileIndex: number
+  selectedEntryKey: string | null
+  collapsedFolders: Record<string, true>
   diffs: Record<string, DiffData>
   loading: Record<string, boolean>
   pendingDeletePath: string | null
   actionMessage: string | null
+  diffView: GitDiffView
+  folds: Record<string, Record<string, FoldState>>
+  headOffset: number
 }
 
 interface ModalBase {
@@ -238,10 +253,12 @@ export interface ModalSnippetPicker extends ModalBase {
 }
 export interface ModalThemePicker extends ModalBase {
   type: 'theme-picker'
+  entryCount: number
 }
 export interface ModalHelp extends ModalBase {
   type: 'help'
   entryCount: number
+  scope: ModeId | null
 }
 export interface ModalSplitPicker extends ModalBase {
   type: 'split-picker'
@@ -323,7 +340,7 @@ export interface AppState {
 
 export type ModalAction =
   | { type: 'open-new-tab-modal' }
-  | { type: 'open-help-modal' }
+  | { type: 'open-help-modal'; scope?: ModeId }
   | { type: 'open-split-picker'; direction: SplitDirection }
   | { type: 'open-session-picker' }
   | { type: 'open-session-name-modal'; sessionTargetId?: string; initialName?: string }
@@ -343,7 +360,9 @@ export type ModalAction =
   | { type: 'open-snippet-editor'; snippetId?: string }
   | { type: 'begin-snippet-filter' }
   | { type: 'begin-help-filter' }
+  | { type: 'begin-theme-filter' }
   | { type: 'set-help-entry-count'; count: number }
+  | { type: 'set-theme-entry-count'; count: number }
   | { type: 'open-theme-picker' }
   | { type: 'open-update-available-modal'; currentVersion: string; latestVersion: string }
 
@@ -415,6 +434,7 @@ export type UIAction =
   | { type: 'set-terminal-size'; cols: number; rows: number }
   | { type: 'toggle-git-pane' }
   | { type: 'resize-git-pane'; delta: number }
+  | { type: 'resize-git-diff-pane'; delta: number }
   | { type: 'set-git-pane-mode'; mode: 'embedded' | 'pane' }
   | { type: 'set-git-pane-position'; position: 'top' | 'bottom' | 'left' | 'right' }
   | { type: 'set-pending-chords'; chords: string[] | null }
@@ -436,12 +456,30 @@ export type GitPanelAction =
 export type GitModeAction =
   | { type: 'enter-git-mode' }
   | { type: 'exit-git-mode' }
-  | { type: 'git-mode-select-file'; delta: -1 | 1 }
-  | { type: 'git-mode-set-diff'; path: string; diff: DiffData }
-  | { type: 'git-mode-set-loading'; path: string; loading: boolean }
+  | { type: 'git-mode-move-selection'; delta: -1 | 1 }
+  | { type: 'git-mode-move-file-selection'; delta: -1 | 1 }
+  | { type: 'git-mode-select-entry-by-key'; key: string }
+  | { type: 'git-mode-toggle-folder'; key: string }
+  | { type: 'git-mode-toggle-selected-folder' }
+  | { type: 'git-mode-collapse-selection' }
+  | { type: 'git-mode-expand-selection' }
+  | { type: 'git-mode-toggle-file-list-mode' }
+  | { type: 'git-mode-set-diff'; key: string; diff: DiffData }
+  | { type: 'git-mode-set-loading'; key: string; loading: boolean }
   | { type: 'git-mode-set-pending-delete'; path: string | null }
   | { type: 'git-mode-clear-diff-cache'; path: string }
   | { type: 'git-mode-set-message'; message: string | null }
+  | { type: 'git-mode-toggle-diff-view' }
+  | { type: 'git-mode-shift-head-offset'; delta: number }
+  | { type: 'git-mode-set-head-offset'; offset: number }
+  | {
+      type: 'git-mode-fold-adjust'
+      key: string
+      foldId: string
+      side: 'top' | 'bottom'
+      delta: number
+    }
+  | { type: 'git-mode-fold-set'; key: string; foldId: string; top: number; bottom: number }
   | {
       type: 'git-mode-optimistic-move'
       path: string
@@ -489,6 +527,8 @@ export type SideEffect =
   | { type: 'split-pane'; direction: SplitDirection }
   | { type: 'confirm-split' }
   | { type: 'scroll-git-diff'; delta: number }
+  | { type: 'persist-git-diff-mode-ratio'; ratio: number }
+  | { type: 'persist-git-file-list-mode'; mode: GitFileListMode }
   | { type: 'git-stage'; path: string }
   | { type: 'git-unstage'; path: string }
   | { type: 'git-restore'; path: string }
@@ -521,40 +561,137 @@ export interface ModeContext {
 
 // ─── Themes ───────────────────────────────────────────────────────────────────
 
-export interface ThemeColors {
-  background: string
-  panel: string
-  panelMuted: string
-  panelHighlight: string
-  overlay: string
-  border: string
-  borderActive: string
-  text: string
-  textMuted: string
-  accent: string
-  accentAlt: string
-  warning: string
-  danger: string
-  success: string
-  dim: string
-}
-
-export type ThemeId =
-  | 'aimux'
-  | 'dracula'
-  | 'dracula-at-night'
-  | 'everforest'
-  | 'tokyo-night'
-  | 'gruvbox-dark'
-  | 'catppuccin-mocha'
-  | 'nord'
-  | 'solarized-dark'
-  | 'one-dark'
-  | 'kanagawa'
-
+import type { BundledTheme } from 'shiki'
+
+export type ThemeId = BundledTheme | (string & {})
+
+/**
+ * VSCode workbench color keys aimux's UI depends on. The build-time normalizer
+ * guarantees every `Theme` has all of these populated.
+ */
+export const AIMUX_COLOR_KEYS = [
+  // editor
+  'editor.background',
+  'editor.foreground',
+  'editor.lineHighlightBackground',
+  'editor.selectionBackground',
+  'editorLineNumber.foreground',
+  'editorCursor.foreground',
+  // sidebar / panels
+  'sideBar.background',
+  'sideBar.foreground',
+  'sideBarSectionHeader.background',
+  'sideBarSectionHeader.foreground',
+  'editorGroupHeader.tabsBackground',
+  'editorWidget.background',
+  'panel.background',
+  'panel.border',
+  // borders & focus
+  'focusBorder',
+  'editorGroup.border',
+  'contrastBorder',
+  // lists
+  'list.activeSelectionBackground',
+  'list.activeSelectionForeground',
+  'list.hoverBackground',
+  // text & links
+  'foreground',
+  'descriptionForeground',
+  'textLink.foreground',
+  'textLink.activeForeground',
+  // status
+  'errorForeground',
+  'editorError.foreground',
+  'editorWarning.foreground',
+  // terminal ANSI
+  'terminal.ansiRed',
+  'terminal.ansiGreen',
+  'terminal.ansiYellow',
+  'terminal.ansiBlue',
+  'terminal.ansiMagenta',
+  'terminal.ansiCyan',
+  // git decorations
+  'gitDecoration.addedResourceForeground',
+  'gitDecoration.modifiedResourceForeground',
+  'gitDecoration.deletedResourceForeground',
+  'gitDecoration.untrackedResourceForeground',
+  // diff editor
+  'diffEditor.insertedLineBackground',
+  'diffEditor.removedLineBackground',
+  // input
+  'input.background',
+  'input.foreground',
+  'input.border',
+] as const
+
+export type AimuxColorKey = (typeof AIMUX_COLOR_KEYS)[number]
+
+export type ThemeColorMap = Record<AimuxColorKey, string> & Record<string, string>
+
+export interface ThemeSettings {
+  fontStyle?: string
+  foreground?: string
+  background?: string
+  // Some bundled shiki themes include non-standard keys (e.g. `content`); allow passthrough.
+  [key: string]: string | undefined
+}
+
+export interface ThemeTokenRule {
+  name?: string
+  scope?: string | string[]
+  // `foreground` at the top level is used by a handful of shiki themes as a
+  // shorthand for `settings.foreground` — accept both forms.
+  foreground?: string
+  settings?: ThemeSettings
+}
+
+export interface Theme {
+  name: string
+  displayName: string
+  type: 'dark' | 'light'
+  fg: string
+  bg: string
+  colors: ThemeColorMap
+  settings: ThemeTokenRule[]
+  tokenColors?: ThemeTokenRule[]
+  colorReplacements?: Record<string, string>
+  semanticHighlighting?: boolean
+  semanticTokenColors?: Record<
+    string,
+    | string
+    | {
+        foreground?: string
+        fontStyle?: string
+        bold?: boolean
+        italic?: boolean
+        underline?: boolean
+      }
+  >
+}
+
+/** Partial-override shape for `themes.define(name, base, overrides)`. */
 export interface ThemeDefinition {
   base?: ThemeId
-  colors: ThemeColors
+  colors: Partial<ThemeColorMap>
+}
+
+export interface NamedThemeDefinition extends ThemeDefinition {
+  name: string
+}
+
+export interface NamedTheme extends Theme {
+  displayName: string
+}
+
+/**
+ * Input shape accepted by `themes.full(...)` — lets users paste a shiki /
+ * VSCode theme JSON without typing every AIMUX_COLOR_KEY. `registerUserThemes`
+ * runs it through `normalizeTheme` to produce a complete `Theme`.
+ */
+export interface UserThemeInput extends Partial<Omit<Theme, 'colors' | 'name' | 'displayName'>> {
+  name: string
+  displayName: string
+  colors?: Partial<ThemeColorMap> & Record<string, string | undefined>
 }
 
 // ─── Backend config (stub) ────────────────────────────────────────────────────
@@ -648,6 +785,8 @@ export type GitPaneDiffCountConfig = { enabled: boolean }
 interface GitPaneBaseConfig {
   visible?: boolean
   ratio?: number
+  diffModeRatio?: number
+  fileListMode?: GitFileListMode
   path?: GitPanePathConfig
   diffCount?: GitPaneDiffCountConfig
 }
@@ -665,7 +804,8 @@ export interface GitPanePaneConfig extends GitPaneBaseConfig {
 export type GitPaneConfig = GitPaneEmbeddedConfig | GitPanePaneConfig
 
 export interface AimuxUserConfig {
-  theme?: ThemeId | ThemeDefinition
+  theme?: ThemeId
+  themes?: Record<string, NamedThemeDefinition | UserThemeInput>
   keymaps?: (k: KeymapBuilderApi) => KeymapBuilderApi
   backends?: Record<string, BackendConfig>
   sidebar?: SidebarConfig
@@ -698,7 +838,8 @@ export interface ResolvedKeymapConfig {
 }
 
 export interface ResolvedConfig {
-  theme: ThemeId | ThemeDefinition | undefined
+  theme: ThemeId | undefined
+  themes: Record<string, NamedThemeDefinition | UserThemeInput>
   keymaps: ResolvedKeymapConfig
   backends: Record<string, BackendConfig>
   sidebar: SidebarConfig