@brimveyn/aimux 1.6.1 → 1.6.2

package/package.json

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

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

@@ -471,6 +471,7 @@ export function executeSideEffect(effect: SideEffect, ctx: SideEffectContext): v
           mode: persistedGitPane?.mode ?? 'embedded',
           position: persistedGitPane?.position ?? 'bottom',
           ratio: persistedGitPane?.ratio ?? 0.5,
+          treeCompaction: persistedGitPane?.treeCompaction,
           visible: persistedGitPane?.visible ?? true,
         },
       })
@@ -487,6 +488,24 @@ export function executeSideEffect(effect: SideEffect, ctx: SideEffectContext): v
           mode: persistedGitPane?.mode ?? 'embedded',
           position: persistedGitPane?.position ?? 'bottom',
           ratio: persistedGitPane?.ratio ?? 0.5,
+          treeCompaction: persistedGitPane?.treeCompaction,
+          visible: persistedGitPane?.visible ?? true,
+        },
+      })
+      return
+    }
+    case 'persist-git-tree-compaction': {
+      const config = loadConfig()
+      const persistedGitPane = config.gitPane
+      saveConfig({
+        ...config,
+        gitPane: {
+          diffModeRatio: persistedGitPane?.diffModeRatio,
+          fileListMode: persistedGitPane?.fileListMode,
+          mode: persistedGitPane?.mode ?? 'embedded',
+          position: persistedGitPane?.position ?? 'bottom',
+          ratio: persistedGitPane?.ratio ?? 0.5,
+          treeCompaction: effect.enabled,
           visible: persistedGitPane?.visible ?? true,
         },
       })

package/src/app.tsx

@@ -88,10 +88,14 @@ export function App({
     const userGitPane = resolvedConfig.gitPane
     const fileListMode = userGitPane?.fileListMode ?? json.gitPane?.fileListMode ?? 'tree'
     const diffModeRatio = userGitPane?.diffModeRatio ?? json.gitPane?.diffModeRatio ?? 0.35
+    const treeCompaction = userGitPane?.treeCompaction ?? json.gitPane?.treeCompaction ?? true
+    const prefetchRadius = userGitPane?.prefetchRadius ?? json.gitPane?.prefetchRadius ?? 5
     const gitPaneOverrides = {
       ...json.gitPane,
       diffModeRatio,
       fileListMode,
+      prefetchRadius,
+      treeCompaction,
       ...(userGitPane?.visible !== undefined ? { visible: userGitPane.visible } : {}),
       ...(userGitPane?.mode !== undefined ? { mode: userGitPane.mode } : {}),
       ...(userGitPane?.position !== undefined ? { position: userGitPane.position } : {}),

package/src/config.ts

@@ -25,6 +25,8 @@ export const CONFIG_PATH = `${getProfileConfigDir()}/aimux.json`
 export interface PersistedGitPane {
   diffModeRatio?: number
   fileListMode?: GitFileListMode
+  treeCompaction?: boolean
+  prefetchRadius?: number
   visible: boolean
   mode: 'embedded' | 'pane'
   position: 'top' | 'bottom' | 'left' | 'right'
@@ -62,7 +64,23 @@ function isPersistedGitPane(value: unknown): value is PersistedGitPane {
   const visibleOk = typeof v.visible === 'boolean'
   const fileListModeOk =
     v.fileListMode === undefined || v.fileListMode === 'tree' || v.fileListMode === 'flat'
-  if (!modeOk || !positionOk || !ratioOk || !diffModeRatioOk || !visibleOk || !fileListModeOk) {
+  const treeCompactionOk = v.treeCompaction === undefined || typeof v.treeCompaction === 'boolean'
+  const prefetchRadiusOk =
+    v.prefetchRadius === undefined ||
+    (typeof v.prefetchRadius === 'number' &&
+      Number.isFinite(v.prefetchRadius) &&
+      v.prefetchRadius >= 0 &&
+      v.prefetchRadius <= 50)
+  if (
+    !modeOk ||
+    !positionOk ||
+    !ratioOk ||
+    !diffModeRatioOk ||
+    !visibleOk ||
+    !fileListModeOk ||
+    !treeCompactionOk ||
+    !prefetchRadiusOk
+  ) {
     return false
   }
   // cross-field coherence: embedded => top|bottom; pane => left|right

package/src/git/diff-hash.ts

@@ -0,0 +1,10 @@
+// FNV-1a 32-bit hash. Fast, non-crypto, used to detect stale cached diff
+// artefacts (parsed file, syntax highlights) when the raw diff text changes.
+export function diffHash(input: string): string {
+  let h = 0x811c9dc5
+  for (let i = 0; i < input.length; i++) {
+    h ^= input.charCodeAt(i)
+    h = (h + ((h << 1) + (h << 4) + (h << 7) + (h << 8) + (h << 24))) >>> 0
+  }
+  return h.toString(16)
+}

package/src/input/modes/types.ts

@@ -49,6 +49,7 @@ export type SideEffect =
   | { type: 'scroll-git-diff'; delta: number }
   | { type: 'persist-git-diff-mode-ratio'; ratio: number }
   | { type: 'persist-git-file-list-mode'; mode: GitFileListMode }
+  | { type: 'persist-git-tree-compaction'; enabled: boolean }
   | { type: 'git-stage'; path: string }
   | { type: 'git-unstage'; path: string }
   | { type: 'git-restore'; path: string }

package/src/state/git-tree.ts

@@ -53,7 +53,8 @@ export function gitFolderKey(section: GitFileSection, folderPath: string): strin
 export function buildGitTreeRows(
   files: GitFileEntry[],
   collapsedFolders: Record<string, true>,
-  fileListMode: GitFileListMode = 'tree'
+  fileListMode: GitFileListMode = 'tree',
+  compact: boolean = false
 ): GitTreeRows {
   const sections = SECTION_ORDER.map((section) => {
     const sectionFiles = files.filter((file) => file.section === section)
@@ -68,7 +69,7 @@ export function buildGitTreeRows(
               kind: 'file' as const,
               section,
             }))
-          : flattenSectionRows(sectionFiles, collapsedFolders),
+          : flattenSectionRows(sectionFiles, collapsedFolders, compact),
       section,
     }
   })
@@ -81,10 +82,16 @@ export function getSelectedGitRow(
     collapsedFolders: Record<string, true>
     fileListMode: GitFileListMode
     selectedEntryKey: string | null
+    compact?: boolean
   }
 ): GitTreeRow | null {
   if (!options.selectedEntryKey) return null
-  const { visibleRows } = buildGitTreeRows(files, options.collapsedFolders, options.fileListMode)
+  const { visibleRows } = buildGitTreeRows(
+    files,
+    options.collapsedFolders,
+    options.fileListMode,
+    options.compact ?? false
+  )
   return visibleRows.find((row) => row.key === options.selectedEntryKey) ?? null
 }
 
@@ -94,6 +101,7 @@ export function getSelectedGitFile(
     collapsedFolders: Record<string, true>
     fileListMode: GitFileListMode
     selectedEntryKey: string | null
+    compact?: boolean
   }
 ): GitFileEntry | null {
   const row = getSelectedGitRow(files, options)
@@ -105,9 +113,10 @@ export function reconcileSelectedGitEntryKey(
   collapsedFolders: Record<string, true>,
   fileListMode: GitFileListMode,
   selectedEntryKey: string | null | undefined,
-  preferredKeys: string[] = []
+  preferredKeys: string[] = [],
+  compact: boolean = false
 ): string | null {
-  const { visibleRows } = buildGitTreeRows(files, collapsedFolders, fileListMode)
+  const { visibleRows } = buildGitTreeRows(files, collapsedFolders, fileListMode, compact)
   if (visibleRows.length === 0) return null
   const candidates = [...preferredKeys, selectedEntryKey ?? '']
   for (const key of candidates) {
@@ -122,9 +131,10 @@ export function moveGitSelection(
   collapsedFolders: Record<string, true>,
   fileListMode: GitFileListMode,
   selectedEntryKey: string | null,
-  delta: -1 | 1
+  delta: -1 | 1,
+  compact: boolean = false
 ): string | null {
-  const { visibleRows } = buildGitTreeRows(files, collapsedFolders, fileListMode)
+  const { visibleRows } = buildGitTreeRows(files, collapsedFolders, fileListMode, compact)
   const total = visibleRows.length
   if (total === 0) return null
   const current = visibleRows.findIndex((row) => row.key === selectedEntryKey)
@@ -137,9 +147,10 @@ export function moveGitFileSelection(
   collapsedFolders: Record<string, true>,
   fileListMode: GitFileListMode,
   selectedEntryKey: string | null,
-  delta: -1 | 1
+  delta: -1 | 1,
+  compact: boolean = false
 ): string | null {
-  const { visibleRows } = buildGitTreeRows(files, collapsedFolders, fileListMode)
+  const { visibleRows } = buildGitTreeRows(files, collapsedFolders, fileListMode, compact)
   const fileRows = visibleRows.filter((row) => row.kind === 'file')
   const total = fileRows.length
   if (total === 0) return null
@@ -153,13 +164,14 @@ export function moveGitFileSelection(
 
 function flattenSectionRows(
   files: GitFileEntry[],
-  collapsedFolders: Record<string, true>
+  collapsedFolders: Record<string, true>,
+  compact: boolean
 ): GitTreeRow[] {
   if (files.length === 0) return []
   const section = files[0]?.section
   if (!section) return []
   const root = buildSectionTree(files, section)
-  return flattenTreeNode(root, collapsedFolders, 0)
+  return flattenTreeNode(root, collapsedFolders, 0, undefined, compact)
 }
 
 function buildSectionTree(files: GitFileEntry[], section: GitFileSection): GitTreeNode {
@@ -187,16 +199,28 @@ function flattenTreeNode(
   node: GitTreeNode,
   collapsedFolders: Record<string, true>,
   depth: number,
-  parentKey?: string
+  parentKey: string | undefined,
+  compact: boolean
 ): GitTreeRow[] {
   const rows: GitTreeRow[] = []
   for (const child of node.folders.values()) {
-    const name = child.path.split('/').pop() ?? child.path
-    const key = gitFolderKey(node.section, child.path)
+    // Compaction: while a folder has exactly one child folder and no direct
+    // files, fold the chain into a single row ("src/keymap/keymap.ts" instead
+    // of three nested rows).
+    let current = child
+    const segments: string[] = [current.path.split('/').pop() ?? current.path]
+    while (compact && current.files.length === 0 && current.folders.size === 1) {
+      const next = current.folders.values().next().value
+      if (!next) break
+      segments.push(next.path.split('/').pop() ?? next.path)
+      current = next
+    }
+    const name = segments.join('/')
+    const key = gitFolderKey(node.section, current.path)
     const isCollapsed = key in collapsedFolders
     rows.push({
       depth,
-      folderPath: child.path,
+      folderPath: current.path,
       isCollapsed,
       key,
       kind: 'folder',
@@ -204,7 +228,9 @@ function flattenTreeNode(
       parentKey,
       section: node.section,
     })
-    if (!isCollapsed) rows.push(...flattenTreeNode(child, collapsedFolders, depth + 1, key))
+    if (!isCollapsed) {
+      rows.push(...flattenTreeNode(current, collapsedFolders, depth + 1, key, compact))
+    }
   }
   for (const file of node.files) {
     rows.push({

package/src/state/reducers/diff-cache.ts

@@ -0,0 +1,64 @@
+import type { AppState } from '../types'
+
+export function clearDiffCacheForPath(state: AppState, path: string): AppState {
+  return clearDiffCacheForPaths(state, new Set([path]))
+}
+
+// Drops every cache slice derived from the given file paths: diffs, folds,
+// loading flags, parsed patches, and per-theme highlight tokens. Called when
+// a file's on-disk content shifts or a file disappears from git status.
+export function clearDiffCacheForPaths(state: AppState, paths: Set<string>): AppState {
+  if (paths.size === 0) return state
+  const nextDiffs = { ...state.gitMode.diffs }
+  const nextFolds = { ...state.gitMode.folds }
+  const nextLoading = { ...state.gitMode.loading }
+  const nextParsed = { ...state.gitMode.parsedFiles }
+  const nextHighlights = { ...state.gitMode.highlights }
+  let changed = false
+  const keyMatches = (key: string): boolean => {
+    for (const path of paths) {
+      if (key.endsWith(`:${path}`) || key.startsWith(`${path}|`) || key.includes(`:${path}|`)) {
+        return true
+      }
+    }
+    return false
+  }
+  for (const key of Object.keys(nextDiffs)) {
+    const entry = nextDiffs[key]
+    if (!entry || !paths.has(entry.path)) continue
+    delete nextDiffs[key]
+    changed = true
+  }
+  for (const key of Object.keys(nextFolds)) {
+    if (!keyMatches(key)) continue
+    delete nextFolds[key]
+    changed = true
+  }
+  for (const key of Object.keys(nextLoading)) {
+    if (!keyMatches(key)) continue
+    delete nextLoading[key]
+    changed = true
+  }
+  for (const key of Object.keys(nextParsed)) {
+    if (!keyMatches(key)) continue
+    delete nextParsed[key]
+    changed = true
+  }
+  for (const key of Object.keys(nextHighlights)) {
+    if (!keyMatches(key)) continue
+    delete nextHighlights[key]
+    changed = true
+  }
+  if (!changed) return state
+  return {
+    ...state,
+    gitMode: {
+      ...state.gitMode,
+      diffs: nextDiffs,
+      folds: nextFolds,
+      highlights: nextHighlights,
+      loading: nextLoading,
+      parsedFiles: nextParsed,
+    },
+  }
+}

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

@@ -7,6 +7,7 @@ import {
   moveGitSelection,
   reconcileSelectedGitEntryKey,
 } from '../git-tree'
+import { clearDiffCacheForPath, clearDiffCacheForPaths } from './diff-cache'
 import { sortFilesBySection } from './git-panel-state'
 
 function applyFold(state: AppState, key: string, foldId: string, next: FoldState): AppState {
@@ -28,33 +29,6 @@ function applyFold(state: AppState, key: string, foldId: string, next: FoldState
   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,
@@ -63,7 +37,9 @@ export function emptyGitMode(): GitModeState {
     diffView: 'split',
     folds: {},
     headOffset: 0,
+    highlights: {},
     loading: {},
+    parsedFiles: {},
     pendingDeletePath: null,
     selectedEntryKey: null,
   }
@@ -84,7 +60,9 @@ export function reduceGitModeState(state: AppState, action: AppAction): AppState
             state.gitPanel.files,
             state.gitMode.collapsedFolders,
             state.gitPane.fileListMode,
-            null
+            null,
+            [],
+            state.gitPane.treeCompaction
           ),
         },
       }
@@ -100,7 +78,9 @@ export function reduceGitModeState(state: AppState, action: AppAction): AppState
           diffs: {},
           folds: {},
           headOffset: 0,
+          highlights: {},
           loading: {},
+          parsedFiles: {},
         },
       }
     }
@@ -110,7 +90,8 @@ export function reduceGitModeState(state: AppState, action: AppAction): AppState
         state.gitMode.collapsedFolders,
         state.gitPane.fileListMode,
         state.gitMode.selectedEntryKey,
-        action.delta
+        action.delta,
+        state.gitPane.treeCompaction
       )
       if (!next || next === state.gitMode.selectedEntryKey) return state
       return {
@@ -128,7 +109,8 @@ export function reduceGitModeState(state: AppState, action: AppAction): AppState
         state.gitMode.collapsedFolders,
         state.gitPane.fileListMode,
         state.gitMode.selectedEntryKey,
-        action.delta
+        action.delta,
+        state.gitPane.treeCompaction
       )
       if (!next || next === state.gitMode.selectedEntryKey) return state
       return {
@@ -146,7 +128,8 @@ export function reduceGitModeState(state: AppState, action: AppAction): AppState
         state.gitMode.collapsedFolders,
         state.gitPane.fileListMode,
         state.gitMode.selectedEntryKey,
-        [action.key]
+        [action.key],
+        state.gitPane.treeCompaction
       )
       if (!next || next !== action.key || next === state.gitMode.selectedEntryKey) return state
       return {
@@ -161,6 +144,7 @@ export function reduceGitModeState(state: AppState, action: AppAction): AppState
     case 'git-mode-toggle-folder': {
       const row = getSelectedGitRow(state.gitPanel.files, {
         collapsedFolders: state.gitMode.collapsedFolders,
+        compact: state.gitPane.treeCompaction,
         fileListMode: state.gitPane.fileListMode,
         selectedEntryKey: action.key,
       })
@@ -176,6 +160,7 @@ export function reduceGitModeState(state: AppState, action: AppAction): AppState
     case 'git-mode-toggle-selected-folder': {
       const row = getSelectedGitRow(state.gitPanel.files, {
         collapsedFolders: state.gitMode.collapsedFolders,
+        compact: state.gitPane.treeCompaction,
         fileListMode: state.gitPane.fileListMode,
         selectedEntryKey: state.gitMode.selectedEntryKey,
       })
@@ -191,6 +176,7 @@ export function reduceGitModeState(state: AppState, action: AppAction): AppState
     case 'git-mode-collapse-selection': {
       const row = getSelectedGitRow(state.gitPanel.files, {
         collapsedFolders: state.gitMode.collapsedFolders,
+        compact: state.gitPane.treeCompaction,
         fileListMode: state.gitPane.fileListMode,
         selectedEntryKey: state.gitMode.selectedEntryKey,
       })
@@ -217,6 +203,7 @@ export function reduceGitModeState(state: AppState, action: AppAction): AppState
     case 'git-mode-expand-selection': {
       const row = getSelectedGitRow(state.gitPanel.files, {
         collapsedFolders: state.gitMode.collapsedFolders,
+        compact: state.gitPane.treeCompaction,
         fileListMode: state.gitPane.fileListMode,
         selectedEntryKey: state.gitMode.selectedEntryKey,
       })
@@ -236,24 +223,90 @@ export function reduceGitModeState(state: AppState, action: AppAction): AppState
             state.gitPanel.files,
             state.gitMode.collapsedFolders,
             fileListMode,
-            state.gitMode.selectedEntryKey
+            state.gitMode.selectedEntryKey,
+            [],
+            state.gitPane.treeCompaction
           ),
         },
         gitPane: { ...state.gitPane, fileListMode },
       }
     }
+    case 'git-mode-toggle-tree-compaction': {
+      const treeCompaction = !state.gitPane.treeCompaction
+      return {
+        ...state,
+        gitMode: {
+          ...state.gitMode,
+          pendingDeletePath: null,
+          selectedEntryKey: reconcileSelectedGitEntryKey(
+            state.gitPanel.files,
+            state.gitMode.collapsedFolders,
+            state.gitPane.fileListMode,
+            state.gitMode.selectedEntryKey,
+            [],
+            treeCompaction
+          ),
+        },
+        gitPane: { ...state.gitPane, treeCompaction },
+      }
+    }
     case 'git-mode-set-diff': {
       const nextLoading = { ...state.gitMode.loading }
       delete nextLoading[action.key]
+      // Drop stale derived entries (parsed + highlights) whose hash no longer matches.
+      const nextParsed = { ...state.gitMode.parsedFiles }
+      const prevParsed = nextParsed[action.key]
+      if (prevParsed && prevParsed.hash !== action.hash) delete nextParsed[action.key]
+      const nextHighlights = { ...state.gitMode.highlights }
+      for (const key of Object.keys(nextHighlights)) {
+        if (!key.startsWith(`${action.key}|`)) continue
+        if (nextHighlights[key]?.hash !== action.hash) delete nextHighlights[key]
+      }
       return {
         ...state,
         gitMode: {
           ...state.gitMode,
           diffs: { ...state.gitMode.diffs, [action.key]: action.diff },
+          highlights: nextHighlights,
           loading: nextLoading,
+          parsedFiles: nextParsed,
+        },
+      }
+    }
+    case 'git-mode-set-parsed': {
+      return {
+        ...state,
+        gitMode: {
+          ...state.gitMode,
+          parsedFiles: {
+            ...state.gitMode.parsedFiles,
+            [action.key]: { file: action.file, hash: action.hash },
+          },
+        },
+      }
+    }
+    case 'git-mode-set-highlights': {
+      const k = `${action.key}|${action.themeId}`
+      return {
+        ...state,
+        gitMode: {
+          ...state.gitMode,
+          highlights: {
+            ...state.gitMode.highlights,
+            [k]: {
+              add: action.add,
+              del: action.del,
+              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))
+    }
     case 'git-mode-set-loading': {
       const nextLoading = { ...state.gitMode.loading }
       if (action.loading) {
@@ -289,7 +342,9 @@ export function reduceGitModeState(state: AppState, action: AppAction): AppState
           diffs: {},
           folds: {},
           headOffset: next,
+          highlights: {},
           loading: {},
+          parsedFiles: {},
           pendingDeletePath: null,
         },
       }
@@ -304,7 +359,9 @@ export function reduceGitModeState(state: AppState, action: AppAction): AppState
           diffs: {},
           folds: {},
           headOffset: next,
+          highlights: {},
           loading: {},
+          parsedFiles: {},
           pendingDeletePath: null,
         },
       }
@@ -357,7 +414,8 @@ export function reduceGitModeState(state: AppState, action: AppAction): AppState
         state.gitMode.collapsedFolders,
         state.gitPane.fileListMode,
         currentKey,
-        preferredSelection
+        preferredSelection,
+        state.gitPane.treeCompaction
       )
 
       return {

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

@@ -1,6 +1,7 @@
 import type { AppAction, AppState, GitFileEntry, GitFileSection, GitPanelState } from '../types'
 
 import { reconcileSelectedGitEntryKey } from '../git-tree'
+import { clearDiffCacheForPaths } from './diff-cache'
 
 export const GIT_PANEL_MIN_RATIO = 0.2
 export const GIT_PANEL_MAX_RATIO = 0.8
@@ -35,6 +36,32 @@ export function emptyGitPanel(): GitPanelState {
   }
 }
 
+function fileSignature(f: GitFileEntry): string {
+  return `${f.status}|${f.added ?? '-'}|${f.removed ?? '-'}|${f.renamedFrom ?? ''}`
+}
+
+// Paths whose content/status shifted between two snapshots — used to drop
+// stale cached diffs so we re-fetch instead of serving pre-edit data.
+function diffChangedPaths(prev: GitFileEntry[], next: GitFileEntry[]): Set<string> {
+  const prevByKey = new Map<string, string>()
+  for (const f of prev) prevByKey.set(`${f.section}:${f.path}`, fileSignature(f))
+  const changed = new Set<string>()
+  const nextKeys = new Set<string>()
+  for (const f of next) {
+    const key = `${f.section}:${f.path}`
+    nextKeys.add(key)
+    const prevSig = prevByKey.get(key)
+    if (prevSig !== fileSignature(f)) changed.add(f.path)
+  }
+  for (const [key, _sig] of prevByKey) {
+    if (nextKeys.has(key)) continue
+    const [, ...rest] = key.split(':')
+    const path = rest.join(':')
+    if (path) changed.add(path)
+  }
+  return changed
+}
+
 function sameFiles(a: GitFileEntry[], b: GitFileEntry[]): boolean {
   if (a.length !== b.length) return false
   for (let i = 0; i < a.length; i++) {
@@ -109,7 +136,9 @@ export function reduceGitPanelState(state: AppState, action: AppAction): AppStat
         sortedNext,
         state.gitMode.collapsedFolders,
         state.gitPane.fileListMode,
-        state.gitMode.selectedEntryKey
+        state.gitMode.selectedEntryKey,
+        [],
+        state.gitPane.treeCompaction
       )
       if (
         prev.branch === next.branch &&
@@ -121,7 +150,8 @@ export function reduceGitPanelState(state: AppState, action: AppAction): AppStat
       ) {
         return state
       }
-      return {
+      const changedPaths = diffChangedPaths(prev.files, sortedNext)
+      const base: AppState = {
         ...state,
         gitMode: { ...state.gitMode, selectedEntryKey: nextSelectedEntryKey },
         gitPanel: {
@@ -133,6 +163,7 @@ export function reduceGitPanelState(state: AppState, action: AppAction): AppStat
           files: sortedNext,
         },
       }
+      return changedPaths.size === 0 ? base : clearDiffCacheForPaths(base, changedPaths)
     }
     case 'git-refresh-error': {
       const prev = state.gitPanel

package/src/state/store.ts

@@ -38,7 +38,9 @@ const DEFAULT_GIT_PANE: GitPaneState = {
   mode: 'embedded',
   path: { enabled: true },
   position: 'bottom',
+  prefetchRadius: 5,
   ratio: 0.5,
+  treeCompaction: true,
   visible: true,
 }