@brimveyn/aimux 1.6.1 → 1.6.2

package/src/ui/components/git-pane-widget.tsx

@@ -14,6 +14,7 @@ export const GitPaneWidget = memo(function GitPaneWidget({ pollingEnabled }: Git
   const gitPanel = useAppStore((s) => s.gitPanel)
   const gitMode = useAppStore((s) => s.gitMode)
   const gitFileListMode = useAppStore((s) => s.gitPane.fileListMode)
+  const treeCompaction = useAppStore((s) => s.gitPane.treeCompaction)
   const pathConfig = useAppStore((s) => s.gitPane.path)
   const diffCountConfig = useAppStore((s) => s.gitPane.diffCount)
   const currentSessionId = useAppStore((s) => s.currentSessionId)
@@ -40,6 +41,7 @@ export const GitPaneWidget = memo(function GitPaneWidget({ pollingEnabled }: Git
   return (
     <GitPanel
       collapsedFolders={gitMode.collapsedFolders}
+      compact={treeCompaction}
       diffCountConfig={diffCountConfig}
       fileListMode={gitFileListMode}
       gitPanel={display}

package/src/ui/components/git-panel.tsx

@@ -24,6 +24,7 @@ interface GitPanelProps {
   pathConfig?: GitPanePathConfig
   diffCountConfig?: GitPaneDiffCountConfig
   headOffset?: number
+  compact?: boolean
 }
 
 function sectionTitle(section: GitFileSection, headOffset: number): string {
@@ -172,7 +173,10 @@ function renderFolderRow(row: GitTreeFolderRow, isSelected: boolean): ReactNode
           <text fg={getCurrentTheme().colors['descriptionForeground']} bg={bg}>
             {row.isCollapsed ? '▸' : '▾'}
           </text>
-          <text fg={getCurrentTheme().colors['terminal.ansiMagenta']} bg={bg} wrapMode="none">
+          <text fg={getCurrentTheme().colors['textLink.foreground']} bg={bg}>
+            {row.isCollapsed ? '\uf07b' : '\uf07c'}
+          </text>
+          <text fg={getCurrentTheme().colors['textLink.foreground']} bg={bg} wrapMode="none">
             {row.name}
           </text>
         </box>
@@ -222,7 +226,8 @@ function renderTreeSection(
   selectedEntryKey: string | null | undefined,
   showListModeToggle: boolean,
   pathConfig: GitPanePathConfig,
-  diffCountConfig: GitPaneDiffCountConfig
+  diffCountConfig: GitPaneDiffCountConfig,
+  marginTop: number
 ): ReactNode {
   if (files.length === 0) return null
   const nextFileListMode = fileListMode === 'tree' ? 'flat' : 'tree'
@@ -231,7 +236,7 @@ function renderTreeSection(
     runSideEffectGlobal({ mode: nextFileListMode, type: 'persist-git-file-list-mode' })
   }
   return (
-    <box key={section} flexDirection="column">
+    <box key={section} flexDirection="column" marginTop={marginTop}>
       <box flexDirection="row" justifyContent="space-between">
         <text fg={getCurrentTheme().colors['terminal.ansiMagenta']}>
           <strong>
@@ -327,6 +332,7 @@ const DEFAULT_DIFF_COUNT_CONFIG: GitPaneDiffCountConfig = { enabled: true }
 
 export const GitPanel = memo(function GitPanel({
   collapsedFolders = {},
+  compact = false,
   diffCountConfig = DEFAULT_DIFF_COUNT_CONFIG,
   fileListMode = 'tree',
   gitPanel,
@@ -339,8 +345,8 @@ export const GitPanel = memo(function GitPanel({
   const sectionOrder = headOffset > 0 ? HISTORICAL_SECTION_ORDER : BASE_SECTION_ORDER
   const scrollRef = useRef<ScrollBoxRenderable | null>(null)
   const tree = useMemo(
-    () => buildGitTreeRows(gitPanel.files, collapsedFolders, fileListMode),
-    [collapsedFolders, fileListMode, gitPanel.files]
+    () => buildGitTreeRows(gitPanel.files, collapsedFolders, fileListMode, compact),
+    [collapsedFolders, compact, fileListMode, gitPanel.files]
   )
   const { added: addedW, removed: removedW } = useMemo(
     () => maxDigitWidth(gitPanel.files),
@@ -382,8 +388,11 @@ export const GitPanel = memo(function GitPanel({
           viewportCulling
           contentOptions={{ flexDirection: 'column', gap: 0 }}
         >
-          {sectionOrder.map((key) => {
+          {sectionOrder.map((key, idx) => {
             const section = tree.sections.find((entry) => entry.section === key)
+            const priorHasFiles = sectionOrder
+              .slice(0, idx)
+              .some((k) => (tree.sections.find((e) => e.section === k)?.files.length ?? 0) > 0)
             return renderTreeSection(
               key,
               sectionTitle(key, headOffset),
@@ -395,7 +404,8 @@ export const GitPanel = memo(function GitPanel({
               selectedEntryKey,
               key === toggleSection,
               pathConfig,
-              diffCountConfig
+              diffCountConfig,
+              priorHasFiles ? 1 : 0
             )
           })}
         </scrollbox>

package/src/ui/components/git-view.tsx

@@ -4,6 +4,7 @@ import { memo, useEffect, useRef } from 'react'
 import type { DiffData, GitDiffView } from '../../state/types'
 import type { ThemeId } from '../themes'
 
+import { diffHash } from '../../git/diff-hash'
 import { fetchDiff } from '../../git/git-diff'
 import { useGitPanelPolling } from '../../git/git-poller'
 import { useAppStore } from '../../state/app-store'
@@ -12,6 +13,7 @@ import { getSelectedGitFile, gitFileKey } from '../../state/git-tree'
 import { setGitDiffScroller } from '../git-view-controls'
 import { useTheme } from '../theme'
 import { PierreDiff, type PierreDiffHandle } from './diff-renderer'
+import { useDiffPrefetch } from './diff-renderer/use-diff-prefetch'
 import { GitPanel } from './git-panel'
 
 interface DiffStageProps {
@@ -124,6 +126,7 @@ export const GitView = memo(function GitView({ themeId }: GitViewProps) {
 
   const selectedFile = getSelectedGitFile(gitPanel.files, {
     collapsedFolders: gitMode.collapsedFolders,
+    compact: gitPane.treeCompaction,
     fileListMode: gitPane.fileListMode,
     selectedEntryKey: gitMode.selectedEntryKey,
   })
@@ -147,6 +150,13 @@ export const GitView = memo(function GitView({ themeId }: GitViewProps) {
     return () => setGitDiffScroller(null)
   }, [])
 
+  useDiffPrefetch(gitMode.selectedEntryKey, gitPane.prefetchRadius, {
+    enabled: focusMode === 'git',
+    headOffset: gitMode.headOffset,
+    projectPath,
+    themeId,
+  })
+
   useEffect(() => {
     if (focusMode !== 'git') return
     if (!selectedFile || !projectPath) return
@@ -154,7 +164,14 @@ export const GitView = memo(function GitView({ themeId }: GitViewProps) {
     if (diff || loading) return
     dispatchGlobal({ key: selectedDiffKey, loading: true, type: 'git-mode-set-loading' })
     void fetchDiff(projectPath, selectedFile, gitMode.headOffset)
-      .then((d) => dispatchGlobal({ diff: d, key: selectedDiffKey, type: 'git-mode-set-diff' }))
+      .then((d) =>
+        dispatchGlobal({
+          diff: d,
+          hash: diffHash(d.rawDiff),
+          key: selectedDiffKey,
+          type: 'git-mode-set-diff',
+        })
+      )
       .catch(() =>
         dispatchGlobal({ key: selectedDiffKey, loading: false, type: 'git-mode-set-loading' })
       )
@@ -219,6 +236,7 @@ export const GitView = memo(function GitView({ themeId }: GitViewProps) {
           </text>
           <GitPanel
             collapsedFolders={gitMode.collapsedFolders}
+            compact={gitPane.treeCompaction}
             fileListMode={gitPane.fileListMode}
             gitPanel={gitPanel}
             headOffset={gitMode.headOffset}