@brimveyn/aimux 1.5.4 → 1.6.1

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

@@ -1,14 +1,71 @@
-import type { AppAction, AppState, GitFileEntry, GitModeState } from '../types'
+import type { AppAction, AppState, FoldState, GitFileEntry, GitModeState } from '../types'
 
+import {
+  getSelectedGitRow,
+  gitFileKey,
+  moveGitFileSelection,
+  moveGitSelection,
+  reconcileSelectedGitEntryKey,
+} from '../git-tree'
 import { sortFilesBySection } from './git-panel-state'
 
+function applyFold(state: AppState, key: string, foldId: string, next: FoldState): AppState {
+  const perPath = state.gitMode.folds[key] ?? {}
+  const prev = perPath[foldId] ?? { bottom: 0, top: 0 }
+  if (prev.top === next.top && prev.bottom === next.bottom) return state
+  const nextPerPath = { ...perPath }
+  if (next.top === 0 && next.bottom === 0) {
+    delete nextPerPath[foldId]
+  } else {
+    nextPerPath[foldId] = next
+  }
+  const nextFolds = { ...state.gitMode.folds }
+  if (Object.keys(nextPerPath).length === 0) {
+    delete nextFolds[key]
+  } else {
+    nextFolds[key] = nextPerPath
+  }
+  return { ...state, gitMode: { ...state.gitMode, folds: nextFolds } }
+}
+
+function clearDiffCacheForPath(state: AppState, path: string): AppState {
+  const nextDiffs = { ...state.gitMode.diffs }
+  const nextFolds = { ...state.gitMode.folds }
+  const nextLoading = { ...state.gitMode.loading }
+  let changed = false
+  for (const key of Object.keys(nextDiffs)) {
+    if (nextDiffs[key]?.path !== path) continue
+    delete nextDiffs[key]
+    changed = true
+  }
+  for (const key of Object.keys(nextFolds)) {
+    if (!key.endsWith(`:${path}`)) continue
+    delete nextFolds[key]
+    changed = true
+  }
+  for (const key of Object.keys(nextLoading)) {
+    if (!key.endsWith(`:${path}`)) continue
+    delete nextLoading[key]
+    changed = true
+  }
+  if (!changed) return state
+  return {
+    ...state,
+    gitMode: { ...state.gitMode, diffs: nextDiffs, folds: nextFolds, loading: nextLoading },
+  }
+}
+
 export function emptyGitMode(): GitModeState {
   return {
     actionMessage: null,
+    collapsedFolders: {},
     diffs: {},
+    diffView: 'split',
+    folds: {},
+    headOffset: 0,
     loading: {},
     pendingDeletePath: null,
-    selectedFileIndex: 0,
+    selectedEntryKey: null,
   }
 }
 
@@ -23,36 +80,176 @@ export function reduceGitModeState(state: AppState, action: AppAction): AppState
           ...state.gitMode,
           actionMessage: null,
           pendingDeletePath: null,
-          selectedFileIndex: 0,
+          selectedEntryKey: reconcileSelectedGitEntryKey(
+            state.gitPanel.files,
+            state.gitMode.collapsedFolders,
+            state.gitPane.fileListMode,
+            null
+          ),
         },
       }
     }
     case 'exit-git-mode': {
       if (state.focusMode !== 'git') return state
-      return { ...state, focusMode: 'navigation' }
+      return {
+        ...state,
+        focusMode: 'navigation',
+        gitMode: {
+          ...state.gitMode,
+          actionMessage: null,
+          diffs: {},
+          folds: {},
+          headOffset: 0,
+          loading: {},
+        },
+      }
+    }
+    case 'git-mode-move-selection': {
+      const next = moveGitSelection(
+        state.gitPanel.files,
+        state.gitMode.collapsedFolders,
+        state.gitPane.fileListMode,
+        state.gitMode.selectedEntryKey,
+        action.delta
+      )
+      if (!next || next === state.gitMode.selectedEntryKey) return state
+      return {
+        ...state,
+        gitMode: {
+          ...state.gitMode,
+          pendingDeletePath: null,
+          selectedEntryKey: next,
+        },
+      }
+    }
+    case 'git-mode-move-file-selection': {
+      const next = moveGitFileSelection(
+        state.gitPanel.files,
+        state.gitMode.collapsedFolders,
+        state.gitPane.fileListMode,
+        state.gitMode.selectedEntryKey,
+        action.delta
+      )
+      if (!next || next === state.gitMode.selectedEntryKey) return state
+      return {
+        ...state,
+        gitMode: {
+          ...state.gitMode,
+          pendingDeletePath: null,
+          selectedEntryKey: next,
+        },
+      }
+    }
+    case 'git-mode-select-entry-by-key': {
+      const next = reconcileSelectedGitEntryKey(
+        state.gitPanel.files,
+        state.gitMode.collapsedFolders,
+        state.gitPane.fileListMode,
+        state.gitMode.selectedEntryKey,
+        [action.key]
+      )
+      if (!next || next !== action.key || next === state.gitMode.selectedEntryKey) return state
+      return {
+        ...state,
+        gitMode: {
+          ...state.gitMode,
+          pendingDeletePath: null,
+          selectedEntryKey: next,
+        },
+      }
     }
-    case 'git-mode-select-file': {
-      const total = state.gitPanel.files.length
-      if (total === 0) return state
-      const next = (state.gitMode.selectedFileIndex + action.delta + total) % total
-      if (next === state.gitMode.selectedFileIndex) return state
+    case 'git-mode-toggle-folder': {
+      const row = getSelectedGitRow(state.gitPanel.files, {
+        collapsedFolders: state.gitMode.collapsedFolders,
+        fileListMode: state.gitPane.fileListMode,
+        selectedEntryKey: action.key,
+      })
+      if (!row || row.kind !== 'folder') return state
+      const nextCollapsed = { ...state.gitMode.collapsedFolders }
+      if (action.key in nextCollapsed) {
+        delete nextCollapsed[action.key]
+      } else {
+        nextCollapsed[action.key] = true
+      }
+      return { ...state, gitMode: { ...state.gitMode, collapsedFolders: nextCollapsed } }
+    }
+    case 'git-mode-toggle-selected-folder': {
+      const row = getSelectedGitRow(state.gitPanel.files, {
+        collapsedFolders: state.gitMode.collapsedFolders,
+        fileListMode: state.gitPane.fileListMode,
+        selectedEntryKey: state.gitMode.selectedEntryKey,
+      })
+      if (!row || row.kind !== 'folder') return state
+      const nextCollapsed = { ...state.gitMode.collapsedFolders }
+      if (row.key in nextCollapsed) {
+        delete nextCollapsed[row.key]
+      } else {
+        nextCollapsed[row.key] = true
+      }
+      return { ...state, gitMode: { ...state.gitMode, collapsedFolders: nextCollapsed } }
+    }
+    case 'git-mode-collapse-selection': {
+      const row = getSelectedGitRow(state.gitPanel.files, {
+        collapsedFolders: state.gitMode.collapsedFolders,
+        fileListMode: state.gitPane.fileListMode,
+        selectedEntryKey: state.gitMode.selectedEntryKey,
+      })
+      if (!row) return state
+      if (row.kind === 'folder' && !row.isCollapsed) {
+        return {
+          ...state,
+          gitMode: {
+            ...state.gitMode,
+            collapsedFolders: { ...state.gitMode.collapsedFolders, [row.key]: true },
+          },
+        }
+      }
+      if (!row.parentKey || row.parentKey === state.gitMode.selectedEntryKey) return state
       return {
         ...state,
         gitMode: {
           ...state.gitMode,
           pendingDeletePath: null,
-          selectedFileIndex: next,
+          selectedEntryKey: row.parentKey,
         },
       }
     }
+    case 'git-mode-expand-selection': {
+      const row = getSelectedGitRow(state.gitPanel.files, {
+        collapsedFolders: state.gitMode.collapsedFolders,
+        fileListMode: state.gitPane.fileListMode,
+        selectedEntryKey: state.gitMode.selectedEntryKey,
+      })
+      if (!row || row.kind !== 'folder' || !row.isCollapsed) return state
+      const nextCollapsed = { ...state.gitMode.collapsedFolders }
+      delete nextCollapsed[row.key]
+      return { ...state, gitMode: { ...state.gitMode, collapsedFolders: nextCollapsed } }
+    }
+    case 'git-mode-toggle-file-list-mode': {
+      const fileListMode = state.gitPane.fileListMode === 'tree' ? 'flat' : 'tree'
+      return {
+        ...state,
+        gitMode: {
+          ...state.gitMode,
+          pendingDeletePath: null,
+          selectedEntryKey: reconcileSelectedGitEntryKey(
+            state.gitPanel.files,
+            state.gitMode.collapsedFolders,
+            fileListMode,
+            state.gitMode.selectedEntryKey
+          ),
+        },
+        gitPane: { ...state.gitPane, fileListMode },
+      }
+    }
     case 'git-mode-set-diff': {
       const nextLoading = { ...state.gitMode.loading }
-      delete nextLoading[action.path]
+      delete nextLoading[action.key]
       return {
         ...state,
         gitMode: {
           ...state.gitMode,
-          diffs: { ...state.gitMode.diffs, [action.path]: action.diff },
+          diffs: { ...state.gitMode.diffs, [action.key]: action.diff },
           loading: nextLoading,
         },
       }
@@ -60,9 +257,9 @@ export function reduceGitModeState(state: AppState, action: AppAction): AppState
     case 'git-mode-set-loading': {
       const nextLoading = { ...state.gitMode.loading }
       if (action.loading) {
-        nextLoading[action.path] = true
+        nextLoading[action.key] = true
       } else {
-        delete nextLoading[action.path]
+        delete nextLoading[action.key]
       }
       return { ...state, gitMode: { ...state.gitMode, loading: nextLoading } }
     }
@@ -71,17 +268,64 @@ export function reduceGitModeState(state: AppState, action: AppAction): AppState
       return { ...state, gitMode: { ...state.gitMode, pendingDeletePath: action.path } }
     }
     case 'git-mode-clear-diff-cache': {
-      if (!(action.path in state.gitMode.diffs)) return state
-      const nextDiffs = { ...state.gitMode.diffs }
-      delete nextDiffs[action.path]
-      return { ...state, gitMode: { ...state.gitMode, diffs: nextDiffs } }
+      return clearDiffCacheForPath(state, action.path)
     }
     case 'git-mode-set-message': {
       if (state.gitMode.actionMessage === action.message) return state
       return { ...state, gitMode: { ...state.gitMode, actionMessage: action.message } }
     }
+    case 'git-mode-toggle-diff-view': {
+      const next = state.gitMode.diffView === 'split' ? 'stacked' : 'split'
+      return { ...state, gitMode: { ...state.gitMode, diffView: next } }
+    }
+    case 'git-mode-shift-head-offset': {
+      const next = Math.max(0, state.gitMode.headOffset + action.delta)
+      if (next === state.gitMode.headOffset) return state
+      return {
+        ...state,
+        gitMode: {
+          ...state.gitMode,
+          actionMessage: null,
+          diffs: {},
+          folds: {},
+          headOffset: next,
+          loading: {},
+          pendingDeletePath: null,
+        },
+      }
+    }
+    case 'git-mode-set-head-offset': {
+      const next = Math.max(0, action.offset)
+      if (next === state.gitMode.headOffset) return state
+      return {
+        ...state,
+        gitMode: {
+          ...state.gitMode,
+          diffs: {},
+          folds: {},
+          headOffset: next,
+          loading: {},
+          pendingDeletePath: null,
+        },
+      }
+    }
+    case 'git-mode-fold-adjust': {
+      const perPath = state.gitMode.folds[action.key] ?? {}
+      const prev = perPath[action.foldId] ?? { bottom: 0, top: 0 }
+      const nextSide = Math.max(0, prev[action.side] + action.delta)
+      const nextFold =
+        action.side === 'top'
+          ? { bottom: prev.bottom, top: nextSide }
+          : { bottom: nextSide, top: prev.top }
+      return applyFold(state, action.key, action.foldId, nextFold)
+    }
+    case 'git-mode-fold-set': {
+      const top = Math.max(0, action.top)
+      const bottom = Math.max(0, action.bottom)
+      return applyFold(state, action.key, action.foldId, { bottom, top })
+    }
     case 'git-mode-optimistic-move': {
-      const currentIdx = state.gitMode.selectedFileIndex
+      const currentKey = state.gitMode.selectedEntryKey
       const files = state.gitPanel.files
       const idx = files.findIndex((f) => f.path === action.path && f.section === action.fromSection)
       if (idx < 0) return state
@@ -103,29 +347,25 @@ export function reduceGitModeState(state: AppState, action: AppAction): AppState
         }
       }
       nextFiles = sortFilesBySection(nextFiles)
-
-      const newLen = nextFiles.length
-      let nextIdx: number
-      if (newLen === 0) {
-        nextIdx = 0
-      } else {
-        const movedIdx =
-          toSection === null
-            ? -1
-            : nextFiles.findIndex((f) => f.path === action.path && f.section === toSection)
-        if (movedIdx === currentIdx) {
-          nextIdx = (currentIdx + 1) % newLen
-        } else {
-          nextIdx = Math.min(currentIdx, newLen - 1)
-        }
-      }
+      const movedCurrentKey = gitFileKey({ path: action.path, section: action.fromSection })
+      const preferredSelection =
+        currentKey === movedCurrentKey && toSection !== null
+          ? [gitFileKey({ path: action.path, section: toSection })]
+          : []
+      const nextSelectedEntryKey = reconcileSelectedGitEntryKey(
+        nextFiles,
+        state.gitMode.collapsedFolders,
+        state.gitPane.fileListMode,
+        currentKey,
+        preferredSelection
+      )
 
       return {
         ...state,
         gitMode: {
           ...state.gitMode,
           pendingDeletePath: null,
-          selectedFileIndex: nextIdx,
+          selectedEntryKey: nextSelectedEntryKey,
         },
         gitPanel: { ...state.gitPanel, files: nextFiles },
       }

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

@@ -1,9 +1,16 @@
 import type { AppAction, AppState, GitFileEntry, GitFileSection, GitPanelState } from '../types'
 
+import { reconcileSelectedGitEntryKey } from '../git-tree'
+
 export const GIT_PANEL_MIN_RATIO = 0.2
 export const GIT_PANEL_MAX_RATIO = 0.8
 
-const SECTION_RANK: Record<GitFileSection, number> = { staged: 0, unstaged: 1, untracked: 2 }
+const SECTION_RANK: Record<GitFileSection, number> = {
+  historical: 0,
+  staged: 1,
+  unstaged: 2,
+  untracked: 3,
+}
 
 export function sortFilesBySection(files: GitFileEntry[]): GitFileEntry[] {
   return [...files].sort((a, b) => {
@@ -63,6 +70,11 @@ export function reduceGitPanelState(state: AppState, action: AppAction): AppStat
       if (nextRatio === state.gitPane.ratio) return state
       return { ...state, gitPane: { ...state.gitPane, ratio: nextRatio } }
     }
+    case 'resize-git-diff-pane': {
+      const nextRatio = clampRatio(state.gitPane.diffModeRatio + action.delta)
+      if (nextRatio === state.gitPane.diffModeRatio) return state
+      return { ...state, gitPane: { ...state.gitPane, diffModeRatio: nextRatio } }
+    }
     case 'set-git-pane-mode': {
       if (state.gitPane.mode === action.mode) return state
       const isEmbedded = action.mode === 'embedded'
@@ -93,17 +105,25 @@ export function reduceGitPanelState(state: AppState, action: AppAction): AppStat
       const prev = state.gitPanel
       const next = action.payload
       const sortedNext = sortFilesBySection(next.files)
+      const nextSelectedEntryKey = reconcileSelectedGitEntryKey(
+        sortedNext,
+        state.gitMode.collapsedFolders,
+        state.gitPane.fileListMode,
+        state.gitMode.selectedEntryKey
+      )
       if (
         prev.branch === next.branch &&
         prev.ahead === next.ahead &&
         prev.behind === next.behind &&
         prev.error === null &&
-        sameFiles(prev.files, sortedNext)
+        sameFiles(prev.files, sortedNext) &&
+        nextSelectedEntryKey === state.gitMode.selectedEntryKey
       ) {
         return state
       }
       return {
         ...state,
+        gitMode: { ...state.gitMode, selectedEntryKey: nextSelectedEntryKey },
         gitPanel: {
           ...prev,
           ahead: next.ahead,
@@ -116,9 +136,16 @@ export function reduceGitPanelState(state: AppState, action: AppAction): AppStat
     }
     case 'git-refresh-error': {
       const prev = state.gitPanel
-      if (prev.error === action.kind && prev.files.length === 0) return state
+      if (
+        prev.error === action.kind &&
+        prev.files.length === 0 &&
+        state.gitMode.selectedEntryKey === null
+      ) {
+        return state
+      }
       return {
         ...state,
+        gitMode: { ...state.gitMode, pendingDeletePath: null, selectedEntryKey: null },
         gitPanel: { ...prev, error: action.kind, files: [] },
       }
     }
@@ -133,7 +160,11 @@ export function reduceGitPanelState(state: AppState, action: AppAction): AppStat
       ) {
         return state
       }
-      return { ...state, gitPanel: emptyGitPanel() }
+      return {
+        ...state,
+        gitMode: { ...state.gitMode, pendingDeletePath: null, selectedEntryKey: null },
+        gitPanel: emptyGitPanel(),
+      }
     }
     default:
       return null

package/src/state/reducers/modal-state.ts

@@ -5,11 +5,9 @@ import type { AppAction, AppState } from '../types'
 import { collectHelpEntries } from '../../input/keymap/help-entries'
 import { getActiveKeymap } from '../../input/keymap/keymap-ref'
 import { getAllAssistantOptions } from '../../pty/command-registry'
-import { THEME_IDS } from '../../ui/themes'
+import { filterThemeIds } from '../../ui/filter-themes'
 import { filterSessions, filterSnippets } from '../selectors'
 
-const THEME_COUNT = THEME_IDS.length
-
 function emptyModal() {
   return {
     cursorPos: 0,
@@ -42,14 +40,16 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
       }
     case 'open-help-modal': {
       const keymap = getActiveKeymap()
-      const entryCount = keymap ? collectHelpEntries(keymap).length : 0
+      const scope = action.scope ?? null
+      const allEntries = keymap ? collectHelpEntries(keymap) : []
+      const scopedEntries = scope ? allEntries.filter((e) => e.mode === scope) : allEntries
       return {
         ...state,
-        focusMode: 'modal',
         modal: {
           cursorPos: 0,
           editBuffer: null,
-          entryCount,
+          entryCount: scopedEntries.length,
+          scope,
           selectedIndex: 0,
           sessionTargetId: null,
           type: 'help',
@@ -162,6 +162,7 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
         modal: {
           cursorPos: 0,
           editBuffer: null,
+          entryCount: 0,
           selectedIndex: 0,
           sessionTargetId: null,
           type: 'theme-picker',
@@ -225,6 +226,27 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
         return state
       }
       const buf = state.modal.editBuffer ?? ''
+      return {
+        ...state,
+        modal: { ...state.modal, cursorPos: buf.length, editBuffer: buf },
+      }
+    }
+    case 'set-theme-entry-count': {
+      if (state.modal.type !== 'theme-picker') return state
+      const clamped = Math.min(state.modal.selectedIndex, Math.max(0, action.count - 1))
+      if (state.modal.entryCount === action.count && clamped === state.modal.selectedIndex) {
+        return state
+      }
+      return {
+        ...state,
+        modal: { ...state.modal, entryCount: action.count, selectedIndex: clamped },
+      }
+    }
+    case 'begin-theme-filter': {
+      if (state.modal.type !== 'theme-picker') {
+        return state
+      }
+      const buf = state.modal.editBuffer ?? ''
       return {
         ...state,
         focusMode: 'command-edit',
@@ -232,8 +254,12 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
       }
     }
     case 'close-modal': {
-      const nextFocus: AppState['focusMode'] =
-        state.modal.type === 'git-commit' ? 'git' : 'navigation'
+      const closingType = state.modal.type
+      // Help is a pure overlay — it never flipped focusMode, so leave it alone.
+      if (closingType === 'help') {
+        return { ...state, modal: emptyModal() }
+      }
+      const nextFocus: AppState['focusMode'] = closingType === 'git-commit' ? 'git' : 'navigation'
       return { ...state, focusMode: nextFocus, modal: emptyModal() }
     }
     case 'move-modal-selection': {
@@ -268,7 +294,7 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
         const filtered = filterSnippets(state.snippets, state.modal.editBuffer)
         optionCount = filtered.length
       } else if (state.modal.type === 'theme-picker') {
-        optionCount = THEME_COUNT
+        optionCount = filterThemeIds(state.modal.editBuffer).length
       } else if (state.modal.type === 'update-available') {
         optionCount = 2
       } else {
@@ -334,6 +360,7 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
       const resetIndex =
         state.modal.type === 'session-picker' ||
         state.modal.type === 'snippet-picker' ||
+        state.modal.type === 'theme-picker' ||
         state.modal.type === 'help'
           ? 0
           : state.modal.selectedIndex
@@ -401,10 +428,16 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
       if (state.modal.type === 'create-session' || state.modal.type === 'snippet-editor') {
         return { ...state, focusMode: 'navigation', modal: emptyModal() }
       }
+      if (state.modal.type === 'help') {
+        return {
+          ...state,
+          modal: { ...state.modal, cursorPos: 0, editBuffer: null, selectedIndex: 0 },
+        }
+      }
       if (
         state.modal.type === 'session-picker' ||
         state.modal.type === 'snippet-picker' ||
-        state.modal.type === 'help'
+        state.modal.type === 'theme-picker'
       ) {
         return {
           ...state,

package/src/state/store.ts

@@ -1,6 +1,7 @@
 import type {
   AppAction,
   AppState,
+  GitModeState,
   GitPaneMode,
   GitPanePosition,
   GitPaneState,
@@ -24,6 +25,7 @@ const DEFAULT_TERMINAL_COLS = 80
 const DEFAULT_TERMINAL_ROWS = 24
 
 export interface InitialStateOverrides {
+  gitMode?: Partial<GitModeState>
   gitPane?: Partial<GitPaneState>
   sessionBarVisible?: boolean
   sessionBarPosition?: SessionBarPosition
@@ -31,6 +33,8 @@ export interface InitialStateOverrides {
 
 const DEFAULT_GIT_PANE: GitPaneState = {
   diffCount: { enabled: true },
+  diffModeRatio: 0.35,
+  fileListMode: 'tree',
   mode: 'embedded',
   path: { enabled: true },
   position: 'bottom',
@@ -62,7 +66,7 @@ export function createInitialState(
     currentSessionId: null,
     customCommands,
     focusMode: showSessionPicker ? 'modal' : 'navigation',
-    gitMode: emptyGitMode(),
+    gitMode: { ...emptyGitMode(), ...overrides.gitMode },
     gitPane: {
       ...DEFAULT_GIT_PANE,
       ...overrides.gitPane,