@brimveyn/aimux-config 0.3.5 → 0.4.1

package/README.md

@@ -149,41 +149,58 @@ You can also bind a custom `ActionFn` for dynamic behavior.
 
 ## Themes
 
-Built-in theme IDs:
-
-- `aimux`
-- `dracula`
-- `dracula-at-night`
-- `everforest`
-- `tokyo-night`
-- `gruvbox-dark`
-- `catppuccin-mocha`
-- `nord`
-- `solarized-dark`
-- `one-dark`
-- `kanagawa`
-
-Helpers:
+aimux themes are [Shiki](https://shiki.style/themes) themes. Two house themes
+(`aimux`, `dracula-at-night`) ship alongside the full Shiki catalog — 67
+themes total. The same `Theme` object powers UI colors and code highlighting.
+
+Declare your own themes in config:
 
 ```ts
-themes.extend(baseThemeId, overrides)
-themes.create(colors)
+import { defineConfig, themes } from '@brimveyn/aimux-config'
+
+export default defineConfig({
+  theme: 'my-neon',
+  themes: {
+    // Palette shortcut — patch VSCode color keys on top of a base theme.
+    'my-neon': themes.define('My Neon', 'aimux', {
+      'textLink.foreground': '#ff00aa',
+      'terminal.ansiMagenta': '#00ffcc',
+    }),
+    // Or drop a full VSCode theme JSON verbatim:
+    'custom': themes.full({
+      name: 'custom',
+      displayName: 'Custom',
+      type: 'dark',
+      fg: '#eee',
+      bg: '#1a1a1a',
+      colors: {
+        /* VSCode workbench keys */
+      },
+      settings: [
+        /* TextMate token rules */
+      ],
+    }),
+  },
+})
 ```
 
-Typed theme config is currently only `Partially supported` by the runtime.
+See [`../../docs/guide/themes.md`](../../docs/guide/themes.md) for picker
+shortcuts, the VSCode color key reference, and migration notes if you're
+coming from the old palette alias API.
 
 ## Support Status
 
-| Surface      | Status              | Notes                                                                 |
-| ------------ | ------------------- | --------------------------------------------------------------------- |
-| `keymaps`    | Supported           | Fully registered by the runtime                                       |
-| `sessionBar` | Supported           | Used during app initialization                                        |
-| `gitPane`    | Supported           | Placement and rendering of the git file list (see docs reference)     |
-| `theme`      | Partially supported | Package surface exists, but runtime startup uses `aimux.json.themeId` |
-| `backends`   | Typed surface only  | Runtime wiring deferred                                               |
-| `sidebar`    | Typed surface only  | Type exists, runtime not currently driven by this field               |
-| `hooks`      | Typed surface only  | Type exists, runtime use not currently wired                          |
-| `snippets`   | Typed surface only  | Runtime currently uses `aimux-snippets.json`                          |
+| Surface      | Status             | Notes                                                                |
+| ------------ | ------------------ | -------------------------------------------------------------------- |
+| `keymaps`    | Supported          | Fully registered by the runtime                                      |
+| `sessionBar` | Supported          | Used during app initialization                                       |
+| `gitPane`    | Supported          | Placement and rendering of the git file list (see docs reference)    |
+| `theme`      | Supported          | Initial theme id; `aimux.json.themeId` wins if still known           |
+| `themes`     | Supported          | User themes; appear in the picker and power synthesized highlighting |
+| `backends`   | Typed surface only | Runtime wiring deferred                                              |
+| `sidebar`    | Typed surface only | Type exists, runtime not currently driven by this field              |
+| `hooks`      | Typed surface only | Type exists, runtime use not currently wired                         |
+| `snippets`   | Typed surface only | Runtime currently uses `aimux-snippets.json`                         |
 
 ## Backends Subpath
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brimveyn/aimux-config",
-  "version": "0.3.5",
+  "version": "0.4.1",
   "description": "TypeScript configuration API for aimux — keymaps, themes, and backends with a fluent builder.",
   "keywords": [
     "aimux",
@@ -36,5 +36,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "dependencies": {
+    "shiki": "^4.0.2"
   }
 }

package/src/actions.ts

@@ -1,4 +1,4 @@
-import type { ActionFn, AppAction, KeyResult, ModeContext } from './types'
+import type { ActionFn, AppAction, KeyResult, ModeContext, ModeId } from './types'
 
 function r(
   actions: KeyResult['actions'] = [],
@@ -32,7 +32,9 @@ export const themePicker: KeyResult = r(
   [{ action: 'open', type: 'apply-theme' }],
   'modal.theme-picker'
 )
-export const helpModal: KeyResult = r([{ type: 'open-help-modal' }], [], 'modal.help')
+export function helpModal(scope?: ModeId): KeyResult {
+  return r([{ scope, type: 'open-help-modal' }])
+}
 
 export const toggleSidebar: KeyResult = r([{ type: 'toggle-sidebar' }])
 export const toggleGitPane: KeyResult = r([{ type: 'toggle-git-pane' }])
@@ -69,6 +71,8 @@ export const enterInsert: ActionFn = (ctx: ModeContext) => {
 
 export const closeModal: KeyResult = r([{ type: 'close-modal' }], [], 'navigation')
 
+export const closeOverlayModal: KeyResult = r([{ type: 'close-modal' }])
+
 // ---------------------------------------------------------------------------
 // Dynamic actions (need ctx at runtime — ActionFn)
 // ---------------------------------------------------------------------------
@@ -109,6 +113,17 @@ export function resizeGitPane(delta: number): KeyResult {
   return r([{ delta, type: 'resize-git-pane' }])
 }
 
+export function resizeGitDiffPane(delta: number): ActionFn {
+  return (ctx: ModeContext) => {
+    const nextRatio = Math.max(0.2, Math.min(0.8, ctx.state.gitPane.diffModeRatio + delta))
+    if (nextRatio === ctx.state.gitPane.diffModeRatio) return r([])
+    return r(
+      [{ delta, type: 'resize-git-diff-pane' }],
+      [{ ratio: nextRatio, type: 'persist-git-diff-mode-ratio' }]
+    )
+  }
+}
+
 export function focusPane(direction: 'left' | 'right' | 'up' | 'down'): KeyResult {
   return r(
     [
@@ -214,6 +229,12 @@ export const beginHelpFilter: KeyResult = r(
   'modal.help.filtering'
 )
 
+export const beginThemeFilter: KeyResult = r(
+  [{ type: 'begin-theme-filter' }],
+  [],
+  'modal.theme-picker.filtering'
+)
+
 export const confirmSplit: KeyResult = r([], [{ type: 'confirm-split' }])
 
 export const restoreTheme: KeyResult = r(
@@ -385,25 +406,80 @@ function clearPendingDelete(ctx: ModeContext): AppAction[] {
   return [{ path: null, type: 'git-mode-set-pending-delete' }]
 }
 
+function gitFileKey(section: string, path: string): string {
+  return `${section}:${path}`
+}
+
+function selectedGitFile(ctx: ModeContext) {
+  const key = ctx.state.gitMode.selectedEntryKey
+  if (!key) return null
+  return (
+    ctx.state.gitPanel.files.find((file) => gitFileKey(file.section, file.path) === key) ?? null
+  )
+}
+
 export const exitGitMode: KeyResult = r([{ type: 'exit-git-mode' }], [], 'navigation')
 
 export function selectGitFile(delta: -1 | 1): ActionFn {
   return (ctx: ModeContext) => {
-    const total = ctx.state.gitPanel.files.length
-    if (total === 0) return r([])
-    const current = ctx.state.gitMode.selectedFileIndex
-    const next = (current + delta + total) % total
-    if (next === current) return r([])
-    return r([{ delta, type: 'git-mode-select-file' }])
+    if (ctx.state.gitPanel.files.length === 0) return r([])
+    return r([{ delta, type: 'git-mode-move-selection' }])
   }
 }
 
+export function selectGitFileOnly(delta: -1 | 1): ActionFn {
+  return (ctx: ModeContext) => {
+    if (ctx.state.gitPanel.files.length === 0) return r([])
+    return r([{ delta, type: 'git-mode-move-file-selection' }])
+  }
+}
+
+export const toggleSelectedGitFolder: ActionFn = (ctx: ModeContext) => {
+  if (!ctx.state.gitMode.selectedEntryKey) return r([])
+  return r([{ type: 'git-mode-toggle-selected-folder' }])
+}
+
+export const collapseGitSelection: ActionFn = (ctx: ModeContext) => {
+  if (!ctx.state.gitMode.selectedEntryKey) return r([])
+  return r([{ type: 'git-mode-collapse-selection' }])
+}
+
+export const expandGitSelection: ActionFn = (ctx: ModeContext) => {
+  if (!ctx.state.gitMode.selectedEntryKey) return r([])
+  return r([{ type: 'git-mode-expand-selection' }])
+}
+
+export const toggleGitFileListMode: ActionFn = (ctx: ModeContext) => {
+  const mode = ctx.state.gitPane.fileListMode === 'tree' ? 'flat' : 'tree'
+  return r(
+    [{ type: 'git-mode-toggle-file-list-mode' }],
+    [{ mode, type: 'persist-git-file-list-mode' }]
+  )
+}
+
 export function scrollGitDiff(delta: number): KeyResult {
   return r([], [{ delta, type: 'scroll-git-diff' }])
 }
 
+export const toggleGitDiffView: KeyResult = r([{ type: 'git-mode-toggle-diff-view' }])
+
+export function shiftGitHeadOffset(delta: number): KeyResult {
+  return r([
+    { delta, type: 'git-mode-shift-head-offset' },
+    { message: null, type: 'git-mode-set-message' },
+  ])
+}
+
 export const gitStageSelected: ActionFn = (ctx: ModeContext) => {
-  const file = ctx.state.gitPanel.files[ctx.state.gitMode.selectedFileIndex]
+  if (ctx.state.gitMode.headOffset > 0) {
+    return r([
+      {
+        message: 'disabled while viewing HEAD~N (press 0 or [ to return)',
+        type: 'git-mode-set-message',
+      },
+    ])
+  }
+  const file = selectedGitFile(ctx)
   if (!file) return r(clearPendingDelete(ctx))
   const actions = clearPendingDelete(ctx)
   if (file.section === 'staged') return r(actions)
@@ -417,7 +493,15 @@ export const gitStageSelected: ActionFn = (ctx: ModeContext) => {
 }
 
 export const gitDestructiveSelected: ActionFn = (ctx: ModeContext) => {
-  const file = ctx.state.gitPanel.files[ctx.state.gitMode.selectedFileIndex]
+  if (ctx.state.gitMode.headOffset > 0) {
+    return r([
+      {
+        message: 'disabled while viewing HEAD~N (press 0 or [ to return)',
+        type: 'git-mode-set-message',
+      },
+    ])
+  }
+  const file = selectedGitFile(ctx)
   if (!file) return r(clearPendingDelete(ctx))
 
   if (file.section === 'staged') {
@@ -453,10 +537,26 @@ export const gitDestructiveSelected: ActionFn = (ctx: ModeContext) => {
 }
 
 export const gitCommitOpen: ActionFn = (ctx: ModeContext) => {
+  if (ctx.state.gitMode.headOffset > 0) {
+    return r([
+      {
+        message: 'disabled while viewing HEAD~N (press 0 or [ to return)',
+        type: 'git-mode-set-message',
+      },
+    ])
+  }
   return r([...clearPendingDelete(ctx), { type: 'open-git-commit-modal' }], [], 'modal.git-commit')
 }
 
 export const gitPush: ActionFn = (ctx: ModeContext) => {
+  if (ctx.state.gitMode.headOffset > 0) {
+    return r([
+      {
+        message: 'disabled while viewing HEAD~N (press 0 or [ to return)',
+        type: 'git-mode-set-message',
+      },
+    ])
+  }
   return r(clearPendingDelete(ctx), [{ type: 'git-push' }])
 }
 

package/src/defaults.ts

@@ -37,7 +37,7 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
         .map('k', actions.prevTab, 'Prev tab')
         .map('r', actions.renameTab, 'Rename tab')
         .map('i', actions.enterInsert, 'Focus terminal')
-        .map('?', actions.helpModal, 'Help')
+        .map('?', actions.helpModal(), 'Help')
     )
 
     // -----------------------------------------------------------------------
@@ -82,17 +82,31 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
     // -----------------------------------------------------------------------
     .mode('git-mode', (m) =>
       m
+        .map('a', actions.gitStageSelected, 'Stage')
+        .map('d', actions.gitDestructiveSelected, 'Unstage/delete')
+        .map('c', actions.gitCommitOpen, 'Commit')
+        .map('p', actions.gitPush, 'Push')
+        .map('v', actions.toggleGitDiffView, 'Toggle split/stacked')
+        .map('t', actions.toggleGitFileListMode, 'Toggle flat/tree')
+        .map(']', actions.shiftGitHeadOffset(1), 'Older commit')
+        .map('[', actions.shiftGitHeadOffset(-1), 'Newer commit')
+        .map('?', actions.helpModal('git-mode'), 'Help')
         .map('<Esc>', actions.exitGitMode, 'Exit git')
-        .map('j', actions.selectGitFile(1), 'Next file')
-        .map('k', actions.selectGitFile(-1), 'Prev file')
+        .map('j', actions.selectGitFile(1), 'Next entry')
+        .map('k', actions.selectGitFile(-1), 'Prev entry')
+        .map('<C-n>', actions.selectGitFileOnly(1), 'Next file')
+        .map('<C-p>', actions.selectGitFileOnly(-1), 'Prev file')
+        .map('h', actions.toggleSelectedGitFolder, 'Toggle folder')
+        .map('l', actions.toggleSelectedGitFolder, 'Toggle folder')
         .map('<C-d>', actions.scrollGitDiff(20), 'Page down')
+        .map('<BS>', actions.resizeGitDiffPane(-0.05), 'File bar narrower')
+        .map('<C-h>', actions.resizeGitDiffPane(-0.05), 'File bar narrower')
+        .map('<C-l>', actions.resizeGitDiffPane(0.05), 'File bar wider')
         .map('<C-u>', actions.scrollGitDiff(-20), 'Page up')
+        .map('<Left>', actions.collapseGitSelection, 'Collapse folder')
+        .map('<Right>', actions.expandGitSelection, 'Expand folder')
         .map('<Down>', actions.scrollGitDiff(1), 'Scroll down')
         .map('<Up>', actions.scrollGitDiff(-1), 'Scroll up')
-        .map('a', actions.gitStageSelected, 'Stage')
-        .map('d', actions.gitDestructiveSelected, 'Unstage/delete')
-        .map('c', actions.gitCommitOpen, 'Commit')
-        .map('p', actions.gitPush, 'Push')
     )
 
     // -----------------------------------------------------------------------
@@ -100,7 +114,7 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
     // -----------------------------------------------------------------------
     .mode('modal.help', (m) =>
       m
-        .map('<Esc>', actions.closeModal, 'Close')
+        .map('<Esc>', actions.closeOverlayModal, 'Close')
         .map('j', actions.moveModalSelection(1), 'Next')
         .map('k', actions.moveModalSelection(-1), 'Prev')
         .map('<Down>', actions.moveModalSelection(1))
@@ -136,6 +150,21 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
         .map('<C-n>', actions.previewTheme(1))
         .map('<C-p>', actions.previewTheme(-1))
         .map('<CR>', actions.confirmTheme, 'Confirm')
+        .map('/', actions.beginThemeFilter, 'Filter')
+    )
+
+    // -----------------------------------------------------------------------
+    // Modal: theme-picker filtering
+    // -----------------------------------------------------------------------
+    .mode('modal.theme-picker.filtering', (m) =>
+      m
+        .map('<Esc>', actions.cancelCommandEdit('modal.theme-picker'), 'Cancel')
+        .map('<C-n>', actions.previewTheme(1), 'Next')
+        .map('<C-p>', actions.previewTheme(-1), 'Prev')
+        .map('<Down>', actions.previewTheme(1))
+        .map('<Up>', actions.previewTheme(-1))
+        .map('<CR>', actions.confirmTheme, 'Confirm')
+        .passthrough()
     )
 
     // -----------------------------------------------------------------------