@brimveyn/aimux 1.5.4 → 1.6.0

package/README.md

@@ -19,9 +19,11 @@ snippets, themes, and fully configurable keymaps.
 - profile-isolated config, catalogs, daemon sockets, and runtime state
 - typed keymap customization through `@brimveyn/aimux-config`
 - snippets catalog and snippet picker
-- configurable git pane (embedded in the sidebar or as a standalone pane) and git mode
+- configurable git pane (embedded in the sidebar or as a standalone pane) and a
+  dedicated [git mode](docs/guide/git-mode.md) for review / stage / commit /
+  push with a split or stacked diff view and shiki-powered highlighting
 - built-in help generated from the resolved keymap
-- theme picker with 11 built-in themes
+- theme picker with 67 built-in themes (shiki catalog + aimux house themes) and a `/` filter
 
 ## Install
 
@@ -130,6 +132,7 @@ See [`docs/guide/keymaps.md`](docs/guide/keymaps.md).
 - `Ctrl+S` - open snippet picker
 - `Ctrl+T` - open theme picker
 - `Ctrl+B` - toggle sidebar
+- `Ctrl+D` - enter git mode
 - `Ctrl+W b` - toggle session bar
 - `Ctrl+W 1` through `Ctrl+W 9` - switch sessions by index
 
@@ -172,6 +175,7 @@ See [`docs/developer/architecture.md`](docs/developer/architecture.md).
 - [`docs/reference/cli.md`](docs/reference/cli.md)
 - [`docs/reference/config-reference.md`](docs/reference/config-reference.md)
 - [`docs/reference/runtime-paths.md`](docs/reference/runtime-paths.md)
+- [`docs/guide/git-mode.md`](docs/guide/git-mode.md)
 - [`docs/developer/architecture.md`](docs/developer/architecture.md)
 - [`docs/developer/aimux-config-internals.md`](docs/developer/aimux-config-internals.md)
 
@@ -191,6 +195,14 @@ bun run lint
 The repository dev scripts use `AIMUX_PROFILE=dev`, so local development does
 not collide with a globally installed `aimux` instance.
 
+## References
+
+- [Pierre — diffs.com](https://diffs.com) — inspiration for the git-mode diff
+  review experience: the split / stacked layout, progressive context folding,
+  and focusing on the first change rather than the top of the file.
+- [shiki](https://shiki.style) — syntax highlighting for the git diff view
+  and the source of the bundled theme catalog.
+
 ## License
 
 MIT © BrimVeyn

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brimveyn/aimux",
-  "version": "1.5.4",
+  "version": "1.6.0",
   "description": "A terminal multiplexer for AI CLIs. Run Claude, Codex, OpenCode side-by-side with tabbed navigation, split panes, and persistent sessions.",
   "keywords": [
     "ai",
@@ -57,15 +57,17 @@
     "format": "oxfmt --write .",
     "format:check": "oxfmt --check .",
     "knip": "knip-bun",
-    "bump": "bun run scripts/bump.ts"
+    "bump": "bun run scripts/bump.ts",
+    "generate-themes": "bun run scripts/generate-themes.ts"
   },
   "dependencies": {
-    "@brimveyn/aimux-config": "0.3.5",
+    "@brimveyn/aimux-config": "0.4.0",
     "@opentui/core": "^0.1.90",
     "@opentui/react": "^0.1.90",
     "@xterm/headless": "^6.0.0",
     "bun-pty": "^0.4.8",
     "react": "^19.2.4",
+    "shiki": "^4.0.2",
     "zustand": "^5.0.12"
   },
   "devDependencies": {

package/src/app-runtime/side-effects.ts

@@ -34,9 +34,10 @@ import {
   type TabSession,
 } from '../state/types'
 import { saveCurrentWorkspace } from '../state/workspace-save'
+import { filterThemeIds } from '../ui/filter-themes'
 import { scrollGitDiff } from '../ui/git-view-controls'
 import { applyTheme } from '../ui/theme'
-import { THEME_IDS, type ThemeId } from '../ui/themes'
+import { type ThemeId } from '../ui/themes'
 import {
   handleCreateSessionEffect,
   handleDeleteSessionEffect,
@@ -167,16 +168,18 @@ function applyThemeEffect(
   ctx: SideEffectContext
 ): void {
   const { state } = ctx
+  const filter = state.modal.type === 'theme-picker' ? state.modal.editBuffer : null
+  const ids = filterThemeIds(filter)
 
   switch (effect.action) {
     case 'open':
-      applyTheme(THEME_IDS[0] ?? 'aimux')
+      applyTheme(ctx.themeId)
       return
     case 'restore':
       applyTheme(ctx.themeId)
       return
     case 'confirm': {
-      const selectedId = THEME_IDS[state.modal.selectedIndex]
+      const selectedId = ids[state.modal.selectedIndex]
       if (selectedId) {
         applyTheme(selectedId)
         ctx.setThemeId(selectedId)
@@ -185,9 +188,9 @@ function applyThemeEffect(
       return
     }
     case 'preview': {
-      const count = THEME_IDS.length
-      const nextIndex = (state.modal.selectedIndex + effect.delta + count) % count
-      const previewId = THEME_IDS[nextIndex]
+      if (ids.length === 0) return
+      const nextIndex = (state.modal.selectedIndex + effect.delta + ids.length) % ids.length
+      const previewId = ids[nextIndex]
       if (previewId) {
         applyTheme(previewId)
       }
@@ -457,6 +460,38 @@ export function executeSideEffect(effect: SideEffect, ctx: SideEffectContext): v
       scrollGitDiff(effect.delta)
       return
     }
+    case 'persist-git-diff-mode-ratio': {
+      const config = loadConfig()
+      const persistedGitPane = config.gitPane
+      saveConfig({
+        ...config,
+        gitPane: {
+          diffModeRatio: effect.ratio,
+          fileListMode: persistedGitPane?.fileListMode,
+          mode: persistedGitPane?.mode ?? 'embedded',
+          position: persistedGitPane?.position ?? 'bottom',
+          ratio: persistedGitPane?.ratio ?? 0.5,
+          visible: persistedGitPane?.visible ?? true,
+        },
+      })
+      return
+    }
+    case 'persist-git-file-list-mode': {
+      const config = loadConfig()
+      const persistedGitPane = config.gitPane
+      saveConfig({
+        ...config,
+        gitPane: {
+          diffModeRatio: persistedGitPane?.diffModeRatio,
+          fileListMode: effect.mode,
+          mode: persistedGitPane?.mode ?? 'embedded',
+          position: persistedGitPane?.position ?? 'bottom',
+          ratio: persistedGitPane?.ratio ?? 0.5,
+          visible: persistedGitPane?.visible ?? true,
+        },
+      })
+      return
+    }
     case 'git-stage': {
       void enqueueGitOp(() => runGitAction(ctx, ['add', '--', effect.path], effect.path))
       return

package/src/app.tsx

@@ -15,7 +15,6 @@ import type { KeyChord } from './input/keymap/key-chord'
 import type { TrieBinding } from './input/keymap/trie'
 import type { KeyResult, ModeContext, ModeId } from './input/modes/types'
 import type { SessionBackend } from './session-backend/types'
-import type { ThemeId } from './ui/themes'
 
 import { executeSideEffect, type SideEffectContext } from './app-runtime/side-effects'
 import { useBackendRuntime } from './app-runtime/use-backend-runtime'
@@ -39,6 +38,7 @@ import { appReducer, createInitialState } from './state/store'
 import { KeymapContext } from './ui/keymap-context'
 import { RootView } from './ui/root'
 import { applyTheme } from './ui/theme'
+import { isKnownThemeId, registerUserThemes, type ThemeId } from './ui/themes'
 import {
   fetchLatestNpmVersion,
   getCurrentPackageVersion,
@@ -66,11 +66,16 @@ export function App({
   const renderer = useRenderer()
   const dimensions = useTerminalDimensions()
   const [themeId, setThemeId] = useState<ThemeId>(() => {
+    registerUserThemes(resolvedConfig.themes)
     const config = loadConfig()
-    if (config.themeId) {
-      applyTheme(config.themeId)
-    }
-    return config.themeId ?? 'aimux'
+    const persisted = config.themeId && isKnownThemeId(config.themeId) ? config.themeId : undefined
+    const fromConfig =
+      resolvedConfig.theme && isKnownThemeId(resolvedConfig.theme)
+        ? resolvedConfig.theme
+        : undefined
+    const initial = persisted ?? fromConfig ?? 'aimux'
+    applyTheme(initial)
+    return initial
   })
   const [state, dispatch] = useReducer(appReducer, undefined, () => {
     const json = loadConfig()
@@ -81,12 +86,19 @@ export function App({
     // Merge config-file gitPane (persisted prefs) with user's resolved gitPane
     // (programmatic config). User config wins; file provides persisted prior state.
     const userGitPane = resolvedConfig.gitPane
+    const fileListMode = userGitPane?.fileListMode ?? json.gitPane?.fileListMode ?? 'tree'
+    const diffModeRatio = userGitPane?.diffModeRatio ?? json.gitPane?.diffModeRatio ?? 0.35
     const gitPaneOverrides = {
       ...json.gitPane,
+      diffModeRatio,
+      fileListMode,
       ...(userGitPane?.visible !== undefined ? { visible: userGitPane.visible } : {}),
       ...(userGitPane?.mode !== undefined ? { mode: userGitPane.mode } : {}),
       ...(userGitPane?.position !== undefined ? { position: userGitPane.position } : {}),
       ...(userGitPane?.ratio !== undefined ? { ratio: userGitPane.ratio } : {}),
+      ...(userGitPane?.diffModeRatio !== undefined
+        ? { diffModeRatio: userGitPane.diffModeRatio }
+        : {}),
       ...(userGitPane?.path !== undefined ? { path: userGitPane.path } : {}),
       ...(userGitPane?.diffCount !== undefined ? { diffCount: userGitPane.diffCount } : {}),
     }

package/src/config.ts

@@ -1,15 +1,30 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'
 
-import type { SessionBarPosition, WorkspaceSnapshotV1 } from './state/types'
+import type { GitFileListMode, SessionBarPosition, WorkspaceSnapshotV1 } from './state/types'
 
 import { logDebug } from './debug/input-log'
 import { getProfileConfigDir } from './profile-paths'
 import { isWorkspaceSnapshotV1 } from './state/validation'
 import { THEME_IDS, type ThemeId } from './ui/themes'
 
+const LEGACY_THEME_ALIASES: Record<string, ThemeId> = {
+  'everforest': 'everforest-dark',
+  'gruvbox-dark': 'gruvbox-dark-hard',
+  'kanagawa': 'kanagawa-wave',
+  'one-dark': 'one-dark-pro',
+}
+
+function migrateThemeId(value: unknown): ThemeId | undefined {
+  if (typeof value !== 'string') return undefined
+  if (THEME_IDS.includes(value as ThemeId)) return value as ThemeId
+  return LEGACY_THEME_ALIASES[value]
+}
+
 export const CONFIG_PATH = `${getProfileConfigDir()}/aimux.json`
 
 export interface PersistedGitPane {
+  diffModeRatio?: number
+  fileListMode?: GitFileListMode
   visible: boolean
   mode: 'embedded' | 'pane'
   position: 'top' | 'bottom' | 'left' | 'right'
@@ -38,8 +53,18 @@ function isPersistedGitPane(value: unknown): value is PersistedGitPane {
     v.position === 'right'
   const ratioOk =
     typeof v.ratio === 'number' && Number.isFinite(v.ratio) && v.ratio > 0 && v.ratio < 1
+  const diffModeRatioOk =
+    v.diffModeRatio === undefined ||
+    (typeof v.diffModeRatio === 'number' &&
+      Number.isFinite(v.diffModeRatio) &&
+      v.diffModeRatio > 0 &&
+      v.diffModeRatio < 1)
   const visibleOk = typeof v.visible === 'boolean'
-  if (!modeOk || !positionOk || !ratioOk || !visibleOk) return false
+  const fileListModeOk =
+    v.fileListMode === undefined || v.fileListMode === 'tree' || v.fileListMode === 'flat'
+  if (!modeOk || !positionOk || !ratioOk || !diffModeRatioOk || !visibleOk || !fileListModeOk) {
+    return false
+  }
   // cross-field coherence: embedded => top|bottom; pane => left|right
   if (v.mode === 'embedded' && v.position !== 'top' && v.position !== 'bottom') return false
   if (v.mode === 'pane' && v.position !== 'left' && v.position !== 'right') return false
@@ -58,7 +83,7 @@ export interface ConfigLoadResult {
 }
 
 function isThemeId(value: unknown): value is ThemeId {
-  return typeof value === 'string' && THEME_IDS.includes(value as ThemeId)
+  return migrateThemeId(value) !== undefined
 }
 
 function isCustomCommandsRecord(value: unknown): value is Record<string, string> {
@@ -174,7 +199,7 @@ export function loadConfigResult(): ConfigLoadResult {
         sessionBarPosition: validSessionBarPosition,
         sessionBarVisible: validSessionBarVisible,
         skippedUpdateVersion: validSkippedUpdateVersion,
-        themeId: isThemeId(parsed.themeId) ? parsed.themeId : undefined,
+        themeId: migrateThemeId(parsed.themeId),
         version: 2,
         workspaceSnapshot: isWorkspaceSnapshotV1(parsed.workspaceSnapshot)
           ? parsed.workspaceSnapshot

package/src/diff-parser/clean-last-newline.ts

@@ -0,0 +1,5 @@
+// Vendored from @pierre/diffs v1.1.15 — parser only. See AIMUX-14.
+
+export function cleanLastNewline(contents: string): string {
+  return contents.replace(/\n$|\r\n$/, '')
+}

package/src/diff-parser/constants.ts

@@ -0,0 +1,13 @@
+// Vendored from @pierre/diffs v1.1.15 — parser only. See AIMUX-14.
+
+export const COMMIT_METADATA_SPLIT = /(?=^From [a-f0-9]+ .+$)/m
+export const GIT_DIFF_FILE_BREAK_REGEX = /(?=^diff --git)/gm
+export const UNIFIED_DIFF_FILE_BREAK_REGEX = /(?=^---\s+\S)/gm
+export const FILE_CONTEXT_BLOB = /(?=^@@ )/gm
+export const HUNK_HEADER = /^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@(?: (.*))?/m
+export const SPLIT_WITH_NEWLINES = /(?<=\n)/
+export const FILENAME_HEADER_REGEX = /^(---|\+\+\+)\s+([^\t\r\n]+)/
+export const FILENAME_HEADER_REGEX_GIT = /^(---|\+\+\+)\s+[ab]\/([^\t\r\n]+)/
+export const ALTERNATE_FILE_NAMES_GIT =
+  /^diff --git (?:"a\/(.+?)"|a\/(.+?)) (?:"b\/(.+?)"|b\/(.+?))$/
+export const INDEX_LINE_METADATA = /^index ([0-9a-f]+)\.\.([0-9a-f]+)(?: (\d+))?$/i

package/src/diff-parser/index.ts

@@ -0,0 +1,12 @@
+export { parsePatchFiles, processFile, processPatch } from './parse-patch-files'
+export type {
+  ChangeContent,
+  ChangeTypes,
+  ContextContent,
+  FileContents,
+  FileDiffMetadata,
+  Hunk,
+  HunkContent,
+  HunkLineType,
+  ParsedPatch,
+} from './types'

package/src/diff-parser/parse-line-type.ts

@@ -0,0 +1,29 @@
+// Vendored from @pierre/diffs v1.1.15 — parser only. See AIMUX-14.
+/* eslint-disable no-console, no-nested-ternary */
+
+import type { HunkLineType } from './types'
+
+export interface ParsedLine {
+  line: string
+  type: HunkLineType
+}
+
+export function parseLineType(line: string): ParsedLine | undefined {
+  const firstChar = line[0]
+  if (firstChar !== '+' && firstChar !== '-' && firstChar !== ' ' && firstChar !== '\\') {
+    console.error(`parseLineType: Invalid firstChar: "${firstChar}", full line: "${line}"`)
+    return
+  }
+  const processedLine = line.substring(1)
+  return {
+    line: processedLine === '' ? '\n' : processedLine,
+    type:
+      firstChar === ' '
+        ? 'context'
+        : firstChar === '\\'
+          ? 'metadata'
+          : firstChar === '+'
+            ? 'addition'
+            : 'deletion',
+  }
+}