@brimveyn/aimux 1.9.0 → 1.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brimveyn/aimux",
-  "version": "1.9.0",
+  "version": "1.9.1",
   "description": "A terminal multiplexer for AI CLIs. Run Claude, Codex, OpenCode side-by-side with tabbed navigation, split panes, and persistent sessions.",
   "keywords": [
     "ai",
@@ -60,7 +60,7 @@
     "bump": "bun run scripts/bump.ts"
   },
   "dependencies": {
-    "@brimveyn/aimux-config": "0.5.1",
+    "@brimveyn/aimux-config": "0.5.2",
     "@opentui/core": "^0.1.90",
     "@opentui/react": "^0.1.90",
     "@xterm/headless": "^6.0.0",

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

@@ -605,7 +605,12 @@ function handleSwitchSessionByIndex(ctx: SideEffectContext, index: number): void
     logInputDebug('app.sessionBar.switchOutOfRange', { index, total: ordered.length })
     return
   }
-  if (target.id === state.currentSessionId) return
+  if (target.id === state.currentSessionId) {
+    if (state.focusMode === 'git') {
+      dispatch({ type: 'exit-git-mode' })
+    }
+    return
+  }
   handleSwitchSessionEffect(state, backend, dispatch, target)
 }
 

package/src/app.tsx

@@ -1,14 +1,6 @@
 import { type ResolvedConfig, setAutoCommitEnabled } from '@brimveyn/aimux-config'
 import { useKeyboard, useRenderer, useTerminalDimensions } from '@opentui/react'
-import {
-  useCallback,
-  useEffect,
-  useLayoutEffect,
-  useMemo,
-  useReducer,
-  useRef,
-  useState,
-} from 'react'
+import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'
 
 import type { KeyChord } from './input/keymap/key-chord'
 import type { TrieBinding } from './input/keymap/trie'
@@ -32,11 +24,11 @@ import { type TerminalContentOrigin } from './input/raw-input-handler'
 import { getProfileConfigDir, getProfileName } from './profile-paths'
 import { startAIUsageService } from './services/ai-usage/provider'
 import { aiUsageStore } from './state/ai-usage-store'
-import { appStore } from './state/app-store'
+import { appStore, useAppStore } from './state/app-store'
 import { setActiveDispatch, setActiveSideEffectRunner } from './state/dispatch-ref'
 import { loadSessionCatalog } from './state/session-catalog'
 import { loadSnippetCatalog } from './state/snippet-catalog'
-import { appReducer, createInitialState } from './state/store'
+import { createInitialState } from './state/store'
 import { KeymapContext } from './ui/keymap-context'
 import { RootView } from './ui/root'
 import { applyTheme, setTransparent } from './ui/theme'
@@ -81,7 +73,10 @@ export function App({
     setTransparent(config.themeTransparent ?? false)
     return initial
   })
-  const [state, dispatch] = useReducer(appReducer, undefined, () => {
+  // Initialize zustand store with computed initial state on first render. Using
+  // useState's lazy initializer guarantees this runs exactly once before any
+  // selector reads. We discard the value — the store is the source of truth.
+  useState(() => {
     const json = loadConfig()
     const sessionBarVisible =
       resolvedConfig.sessionBar?.initialVisible ?? json.sessionBarVisible ?? true
@@ -125,7 +120,7 @@ export function App({
       ...(userGitPane?.diffCount !== undefined ? { diffCount: userGitPane.diffCount } : {}),
     }
 
-    return createInitialState(
+    const initial = createInitialState(
       json.customCommands,
       loadSessionCatalog(),
       loadSnippetCatalog(),
@@ -137,11 +132,18 @@ export function App({
         sidebar: sidebarOverrides,
       }
     )
+    // Replace the module-level default with the fully-resolved initial state.
+    // Preserves the dispatch baked into the store by app-store.ts.
+    appStore.setState(initial)
+    return null
   })
 
-  useLayoutEffect(() => {
-    appStore.setState(state)
-  }, [state])
+  // Single source of truth: read state from zustand. The selector returns the
+  // entire store object, so this component re-renders on every dispatch (same
+  // cadence as the previous useReducer setup), but selectors elsewhere only
+  // re-render on the slices they actually subscribe to.
+  const state = useAppStore((s) => s)
+  const dispatch = state.dispatch
 
   useLayoutEffect(() => {
     setActiveDispatch(dispatch)
@@ -191,6 +193,8 @@ export function App({
     return () => {
       cancelled = true
     }
+    // dispatch is stable (same fn reference from the store) — safe to omit
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 
   const resizingRef = useRef(false)

package/src/input/keymap/describe-bindings.ts

@@ -1,4 +1,4 @@
-import type { ModeId, ResolvedKeymapConfig } from '@brimveyn/aimux-config'
+import type { Action, ModeId, ResolvedKeymapConfig } from '@brimveyn/aimux-config'
 
 import { parseKeyNotation } from './key-chord'
 import { formatNotationForDisplay } from './key-format'
@@ -18,6 +18,24 @@ export interface DescribedBindingGroup {
 interface DescribeOptions {
   withDescriptionOnly?: boolean
   dedupeByDescription?: boolean
+  mergeAlternativesByDescription?: boolean
+}
+
+const actionObjectIds = new WeakMap<object, number>()
+let nextActionObjectId = 0
+
+function getActionSignature(action: Action): string {
+  if (typeof action === 'function') {
+    let id = actionObjectIds.get(action)
+    if (id === undefined) {
+      id = nextActionObjectId
+      nextActionObjectId += 1
+      actionObjectIds.set(action, id)
+    }
+    return `fn:${id}`
+  }
+
+  return `json:${JSON.stringify(action)}`
 }
 
 export function describeBindings(
@@ -31,9 +49,52 @@ export function describeBindings(
   const leaderChord = parseKeyNotation(config.leader)[0]
   const seenDescriptions = new Set<string>()
   const result: DescribedBinding[] = []
+  const resultIndexByDescription = new Map<string, number>()
+  const resultIndexByAction = new Map<string, number>()
+  const seenKeysDisplayByIndex = new Map<number, Set<string>>()
 
   for (const binding of mode.bindings) {
+    const keysDisplay = formatNotationForDisplay(binding.keys, leaderChord)
+
+    if (options.mergeAlternativesByDescription) {
+      const actionSignature = getActionSignature(binding.result)
+      const existingIndex = binding.description
+        ? resultIndexByDescription.get(binding.description)
+        : resultIndexByAction.get(actionSignature)
+
+      if (existingIndex === undefined) {
+        if (options.withDescriptionOnly && !binding.description) continue
+        const nextIndex = result.length
+        if (binding.description) resultIndexByDescription.set(binding.description, nextIndex)
+        resultIndexByAction.set(actionSignature, nextIndex)
+        seenKeysDisplayByIndex.set(nextIndex, new Set([keysDisplay]))
+        result.push({
+          description: binding.description,
+          group: binding.group,
+          keys: binding.keys,
+          keysDisplay,
+        })
+        continue
+      }
+
+      const seenKeysDisplay = seenKeysDisplayByIndex.get(existingIndex)
+      if (!seenKeysDisplay || seenKeysDisplay.has(keysDisplay)) continue
+
+      seenKeysDisplay.add(keysDisplay)
+      const existing = result[existingIndex]
+      if (!existing) continue
+      if (!existing.description && binding.description) {
+        existing.description = binding.description
+        existing.group = binding.group
+        resultIndexByDescription.set(binding.description, existingIndex)
+      }
+      existing.keys = `${existing.keys} / ${binding.keys}`
+      existing.keysDisplay = `${existing.keysDisplay} / ${keysDisplay}`
+      continue
+    }
+
     if (options.withDescriptionOnly && !binding.description) continue
+
     if (options.dedupeByDescription && binding.description) {
       if (seenDescriptions.has(binding.description)) continue
       seenDescriptions.add(binding.description)
@@ -42,7 +103,7 @@ export function describeBindings(
       description: binding.description,
       group: binding.group,
       keys: binding.keys,
-      keysDisplay: formatNotationForDisplay(binding.keys, leaderChord),
+      keysDisplay,
     })
   }
 

package/src/pty/terminal-snapshot.ts

@@ -2,7 +2,7 @@ import type { Terminal } from '@xterm/headless'
 
 import type { TerminalLine, TerminalSnapshot, TerminalSpan } from '../state/types'
 
-import { getCurrentTheme } from '../ui/theme'
+import { getCurrentTokens } from '../ui/theme'
 
 const SNAPSHOT_TAIL_LINE_COUNT = 10
 
@@ -115,15 +115,17 @@ function buildLine(
     let bg = getColorHex(current.getBgColor(), bgMode)
 
     if (current.isInverse()) {
-      const resolvedFg = fg ?? getCurrentTheme().palette.ink
-      const resolvedBg = bg ?? getCurrentTheme().palette.neutral
+      const tokens = getCurrentTokens()
+      const resolvedFg = fg ?? tokens.palette.ink
+      const resolvedBg = bg ?? tokens.bg
       ;[fg, bg] = [resolvedBg, resolvedFg]
     }
 
     const isCursorCell = cursorVisible && cursorColumn === column
     if (isCursorCell) {
-      const resolvedFg = fg ?? getCurrentTheme().palette.ink
-      const resolvedBg = bg ?? getCurrentTheme().palette.neutral
+      const tokens = getCurrentTokens()
+      const resolvedFg = fg ?? tokens.palette.ink
+      const resolvedBg = bg ?? tokens.bg
       ;[fg, bg] = [resolvedBg, resolvedFg]
     }
 

package/src/state/reducers/git-mode-state.ts

@@ -274,6 +274,8 @@ export function reduceGitModeState(state: AppState, action: AppAction): AppState
       }
     }
     case 'git-mode-set-parsed': {
+      const prevParsed = state.gitMode.parsedFiles[action.key]
+      if (prevParsed && prevParsed.hash === action.hash) return state
       return {
         ...state,
         gitMode: {
@@ -303,6 +305,62 @@ export function reduceGitModeState(state: AppState, action: AppAction): AppState
         },
       }
     }
+    case 'git-mode-merge-highlights': {
+      const k = `${action.key}|${action.themeId}`
+      const existing = state.gitMode.highlights[k]
+      const sameContent = existing && existing.hash === action.hash
+      if (sameContent) {
+        const existingAdd = existing.add as unknown[]
+        const existingDel = existing.del as unknown[]
+        let changesAnything = false
+        outer: for (const patch of action.add) {
+          const tokens = patch.tokens as unknown[]
+          for (let i = 0; i < tokens.length; i++) {
+            if (existingAdd[patch.start + i] === undefined) {
+              changesAnything = true
+              break outer
+            }
+          }
+        }
+        if (!changesAnything) {
+          outer: for (const patch of action.del) {
+            const tokens = patch.tokens as unknown[]
+            for (let i = 0; i < tokens.length; i++) {
+              if (existingDel[patch.start + i] === undefined) {
+                changesAnything = true
+                break outer
+              }
+            }
+          }
+        }
+        if (!changesAnything) return state
+      }
+      const nextAdd = sameContent ? ([...(existing.add as unknown[])] as unknown[]) : []
+      const nextDel = sameContent ? ([...(existing.del as unknown[])] as unknown[]) : []
+      for (const patch of action.add) {
+        const tokens = patch.tokens as unknown[]
+        for (let i = 0; i < tokens.length; i++) nextAdd[patch.start + i] = tokens[i]
+      }
+      for (const patch of action.del) {
+        const tokens = patch.tokens as unknown[]
+        for (let i = 0; i < tokens.length; i++) nextDel[patch.start + i] = tokens[i]
+      }
+      return {
+        ...state,
+        gitMode: {
+          ...state.gitMode,
+          highlights: {
+            ...state.gitMode.highlights,
+            [k]: {
+              add: nextAdd,
+              del: nextDel,
+              hash: action.hash,
+              themeId: action.themeId,
+            },
+          },
+        },
+      }
+    }
     case 'git-mode-invalidate-diffs': {
       if (action.paths.length === 0) return state
       return clearDiffCacheForPaths(state, new Set(action.paths))

package/src/state/types.ts

@@ -1,8 +1,6 @@
 import type { ModeId } from '@brimveyn/aimux-config'
 import type { ThemedToken } from 'shiki'
 
-import type { FileDiffMetadata } from '../diff-parser'
-
 export type BuiltinAssistantId = 'claude' | 'codex' | 'opencode' | 'terminal'
 
 export type AssistantId = BuiltinAssistantId | (string & {})
@@ -224,8 +222,7 @@ export interface FoldState {
 
 export interface ParsedDiffEntry {
   hash: string
-  // Stored as unknown at the state boundary; concrete type is FileDiffMetadata
-  // | null, narrowed at read sites via getParsedFile().
+  // Stored as unknown at the state boundary and narrowed at read sites.
   file: unknown
 }
 
@@ -237,9 +234,9 @@ export interface HighlightsEntry {
   del: unknown
 }
 
-export function getParsedFile(entry: ParsedDiffEntry | undefined): FileDiffMetadata | null {
+export function getParsedPayload<T>(entry: ParsedDiffEntry | undefined): T | null {
   if (!entry) return null
-  return entry.file as FileDiffMetadata | null
+  return entry.file as T | null
 }
 
 export function getHighlightsTokens(entry: HighlightsEntry | undefined): {
@@ -608,6 +605,14 @@ export type GitModeAction =
       add: unknown
       del: unknown
     }
+  | {
+      type: 'git-mode-merge-highlights'
+      key: string
+      hash: string
+      themeId: string
+      add: Array<{ start: number; tokens: unknown }>
+      del: Array<{ start: number; tokens: unknown }>
+    }
   | { type: 'git-mode-invalidate-diffs'; paths: string[] }
   | { type: 'git-mode-set-loading'; key: string; loading: boolean }
   | { type: 'git-mode-set-pending-delete'; path: string | null }

package/src/ui/breaking-update-screen.tsx

@@ -1,7 +1,7 @@
 import { useKeyboard } from '@opentui/react'
 
-import { ListItem } from './components/list-item'
-import { ModalShell } from './components/modal-shell'
+import { ModalShell } from './components/modals/shared/modal-shell'
+import { ListItem } from './components/primitives/list-item'
 import { uiTokens } from './ui-tokens'
 
 interface BreakingUpdateScreenProps {