@brimveyn/aimux-config 0.4.0 → 0.4.1

package/src/themes.ts

@@ -5,14 +5,18 @@ import type {
   ThemeColorMap,
   ThemeDefinition,
   ThemeId,
+  UserThemeInput,
 } from './types'
 
 import { HOUSE_THEME_IDS, HOUSE_THEMES } from './house-themes'
-import { GENERATED_THEME_IDS, GENERATED_THEMES } from './themes.generated'
+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',
@@ -26,28 +30,71 @@ export function migrateThemeId(id: string | undefined): ThemeId {
     const alias = LEGACY_THEME_ALIASES[id]
     if (alias !== undefined) return alias
   }
-  return 'aimux'
+  return DEFAULT_THEME_ID
+}
+
+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
+}
+
+/**
+ * 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 = {
   /**
-   * Palette shortcut. Clones `base`'s Theme and patches a few VSCode color keys
-   * in `colors`. Token settings inherit from the base unchanged.
+   * Palette shortcut. Patches VSCode color keys on top of an existing theme;
+   * token settings inherit from the base unchanged.
    */
   define(name: string, base: ThemeId, overrides: Partial<ThemeColorMap>): NamedThemeDefinition {
     return { base, colors: overrides, name }
   },
-  /**
-   * Lower-level, unnamed variant of `define`. Prefer `define` for config entries.
-   */
+  /** Unnamed variant of `define`. Prefer `define` in config. */
   extend(base: ThemeId, overrides: Partial<ThemeColorMap>): ThemeDefinition {
     return { base, colors: overrides }
   },
   /**
-   * Identity passthrough for a full raw Shiki theme. Use this to drop a VSCode
-   * theme JSON verbatim into aimux config.
+   * 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.
    */
-  full(theme: NamedTheme): NamedTheme {
+  full(theme: UserThemeInput): UserThemeInput {
     return theme
   },
 }

package/src/types.ts

@@ -170,7 +170,7 @@ export interface GitPaneState {
 }
 
 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
@@ -220,6 +220,7 @@ export interface GitModeState {
   actionMessage: string | null
   diffView: GitDiffView
   folds: Record<string, Record<string, FoldState>>
+  headOffset: number
 }
 
 interface ModalBase {
@@ -469,6 +470,8 @@ export type GitModeAction =
   | { 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
@@ -680,6 +683,17 @@ 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) ────────────────────────────────────────────────────
 
 export interface BackendConfig {
@@ -791,7 +805,7 @@ export type GitPaneConfig = GitPaneEmbeddedConfig | GitPanePaneConfig
 
 export interface AimuxUserConfig {
   theme?: ThemeId
-  themes?: Record<string, NamedThemeDefinition>
+  themes?: Record<string, NamedThemeDefinition | UserThemeInput>
   keymaps?: (k: KeymapBuilderApi) => KeymapBuilderApi
   backends?: Record<string, BackendConfig>
   sidebar?: SidebarConfig
@@ -825,7 +839,7 @@ export interface ResolvedKeymapConfig {
 
 export interface ResolvedConfig {
   theme: ThemeId | undefined
-  themes: Record<string, NamedThemeDefinition>
+  themes: Record<string, NamedThemeDefinition | UserThemeInput>
   keymaps: ResolvedKeymapConfig
   backends: Record<string, BackendConfig>
   sidebar: SidebarConfig