@brimveyn/aimux 1.14.2 → 1.14.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brimveyn/aimux",
-  "version": "1.14.2",
+  "version": "1.14.3",
   "description": "A terminal multiplexer for AI CLIs. Run Claude, Codex, OpenCode side-by-side with tabbed navigation, split panes, and persistent sessions.",
   "keywords": [
     "ai",

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

@@ -33,6 +33,10 @@ interface GitPanelProps {
   // ("vs <base>") rather than a HEAD~N history walk.
   baseLabel?: string
   compact?: boolean
+  // When false, suppress the inline tree|flat toggle on section headers and the
+  // top ↑n ↓m remote-tracking line so a wrapper can own them at panel level.
+  showFileListToggle?: boolean
+  showRemoteTracking?: boolean
 }
 
 function sectionTitle(section: GitFileSection, headOffset: number, baseLabel?: string): string {
@@ -389,6 +393,8 @@ export const GitPanel = memo(function GitPanel({
   pathConfig = DEFAULT_PATH_CONFIG,
   projectPath,
   selectedEntryKey,
+  showFileListToggle = true,
+  showRemoteTracking = true,
 }: GitPanelProps) {
   const t = useTheme()
   useTransparent()
@@ -407,12 +413,13 @@ export const GitPanel = memo(function GitPanel({
 
   const statusNode = renderStatus(gitPanel, !!(projectPath != null && projectPath !== ''))
 
-  const hasRemoteTracking = gitPanel.ahead > 0 || gitPanel.behind > 0
-  const toggleSection =
-    tree.sections.find((section) => section.section === 'unstaged' && section.files.length > 0)
-      ?.section ??
-    tree.sections.find((section) => section.files.length > 0)?.section ??
-    null
+  const hasRemoteTracking = showRemoteTracking && (gitPanel.ahead > 0 || gitPanel.behind > 0)
+  const toggleSection = showFileListToggle
+    ? (tree.sections.find((section) => section.section === 'unstaged' && section.files.length > 0)
+        ?.section ??
+      tree.sections.find((section) => section.files.length > 0)?.section ??
+      null)
+    : null
 
   useEffect(() => {
     const scrollbox = scrollRef.current

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

@@ -21,6 +21,7 @@ import { PierreDiff, type PierreDiffHandle } from './diff-renderer'
 import { useDiffPrefetch } from './diff-renderer/use-diff-prefetch'
 import { GitPanel } from './git-panel'
 import { ImageDiffView } from './image-diff'
+import { GitPaneHeader } from './pane/git-pane-header'
 
 interface DiffStageProps {
   diff: DiffData | undefined
@@ -287,34 +288,12 @@ export const GitView = memo(function GitView({ themeId }: GitViewProps) {
           gap={0}
           overflow="hidden"
         >
-          <box flexDirection="column" flexShrink={0}>
-            <text fg={t.text}>
-              <strong>aimux · git</strong>
-            </text>
-            {gitPanel.branch != null && gitPanel.branch !== '' ? (
-              <box flexDirection="row">
-                <text fg={t.text}>{'\u{e702}'} </text>
-                <text fg={t.text}>{gitPanel.branch}</text>
-              </box>
-            ) : null}
-            {gitMode.headOffset > 0 ? (
-              <box flexDirection="row" gap={1}>
-                <text fg={t.warning}>
-                  <strong>HEAD~{gitMode.headOffset}</strong>
-                </text>
-                <text fg={t.textMuted}>[ newer · ] older</text>
-              </box>
-            ) : null}
-            {baseLabel != null ? (
-              <box flexDirection="row" gap={1}>
-                <text fg={t.primary}>
-                  <strong>{baseLabel}</strong>
-                </text>
-                <text fg={t.textMuted}>b: back</text>
-              </box>
-            ) : null}
-            <text fg={t.textMuted}>{'·'.repeat(Math.max(0, fileBarWidth - 2))}</text>
-          </box>
+          <GitPaneHeader
+            baseLabel={baseLabel}
+            gitPanel={gitPanel}
+            headOffset={gitMode.headOffset}
+            projectPath={projectPath}
+          />
           <GitPanel
             baseLabel={baseLabel}
             collapsedFolders={gitMode.collapsedFolders}
@@ -324,6 +303,8 @@ export const GitView = memo(function GitView({ themeId }: GitViewProps) {
             headOffset={gitMode.headOffset}
             projectPath={projectPath}
             selectedEntryKey={gitMode.selectedEntryKey}
+            showFileListToggle={false}
+            showRemoteTracking={false}
           />
         </box>
         <box flexDirection="column" flexGrow={1} overflow="hidden">

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

@@ -0,0 +1,127 @@
+import { memo, useCallback } from 'react'
+
+import type { GitPanelState } from '../../../../state/types'
+
+import { useAppStore } from '../../../../state/app-store'
+import { dispatchGlobal, runSideEffectGlobal } from '../../../../state/dispatch-ref'
+import { useTheme } from '../../../theme'
+
+interface GitPaneHeaderProps {
+  gitPanel: GitPanelState
+  projectPath: string | undefined
+  headOffset?: number
+  baseLabel?: string
+}
+
+export const GitPaneHeader = memo(function GitPaneHeader({
+  baseLabel,
+  gitPanel,
+  headOffset = 0,
+  projectPath,
+}: GitPaneHeaderProps) {
+  const t = useTheme()
+  const fileListMode = useAppStore((s) => s.gitPane.fileListMode)
+  const nextFileListMode = fileListMode === 'tree' ? 'flat' : 'tree'
+  const toggleListMode = useCallback(() => {
+    dispatchGlobal({ type: 'git-mode-toggle-file-list-mode' })
+    runSideEffectGlobal({ mode: nextFileListMode, type: 'persist-git-file-list-mode' })
+  }, [nextFileListMode])
+
+  const hasProject = projectPath != null && projectPath !== ''
+  if (!hasProject) return null
+  if (gitPanel.error !== null) return null
+
+  const branch = gitPanel.branch
+  const branchLabel = branch != null && branch !== '' ? branch : 'detached'
+  const branchIsResolved = branch != null && branch !== ''
+
+  const ahead = gitPanel.ahead
+  const behind = gitPanel.behind
+  const showAhead = ahead > 0
+  const showBehind = behind > 0
+  const showTracking = showAhead || showBehind
+
+  const showToggle = gitPanel.files.length > 0
+  const showHistorical = headOffset > 0
+  const showReviewBase = baseLabel != null && baseLabel !== ''
+  const showScope = showHistorical || showReviewBase
+
+  return (
+    <box flexDirection="column" flexShrink={0} paddingBottom={1}>
+      <box flexDirection="row" justifyContent="space-between">
+        <box flexDirection="row" flexShrink={1} overflow="hidden">
+          <text selectable={false} fg={t.textMuted} wrapMode="none">
+            {'\u{e702}'}
+          </text>
+          <text selectable={false} fg={t.textMuted} wrapMode="none">
+            {' '}
+          </text>
+          <text selectable={false} fg={branchIsResolved ? t.text : t.textMuted} wrapMode="none">
+            {branchIsResolved ? <strong>{branchLabel}</strong> : branchLabel}
+          </text>
+        </box>
+        <box flexDirection="row" flexShrink={0} gap={2}>
+          {showTracking ? (
+            <box flexDirection="row" gap={1}>
+              {showAhead ? (
+                <text selectable={false} fg={t.textMuted} wrapMode="none">
+                  {`↑${ahead}`}
+                </text>
+              ) : null}
+              {showBehind ? (
+                <text selectable={false} fg={t.textMuted} wrapMode="none">
+                  {`↓${behind}`}
+                </text>
+              ) : null}
+            </box>
+          ) : null}
+          {showToggle ? (
+            <box flexDirection="row" gap={1} onMouseDown={toggleListMode}>
+              <text
+                selectable={false}
+                fg={fileListMode === 'tree' ? t.primary : t.textMuted}
+                wrapMode="none"
+              >
+                tree
+              </text>
+              <text selectable={false} fg={t.textMuted} wrapMode="none">
+                |
+              </text>
+              <text
+                selectable={false}
+                fg={fileListMode === 'flat' ? t.primary : t.textMuted}
+                wrapMode="none"
+              >
+                flat
+              </text>
+            </box>
+          ) : null}
+        </box>
+      </box>
+      {showScope ? (
+        <box flexDirection="row" gap={2}>
+          {showHistorical ? (
+            <text selectable={false} fg={t.warning} wrapMode="none">
+              <strong>HEAD~{headOffset}</strong>
+            </text>
+          ) : null}
+          {showHistorical ? (
+            <text selectable={false} fg={t.textMuted} wrapMode="none">
+              [ newer · ] older
+            </text>
+          ) : null}
+          {showReviewBase ? (
+            <text selectable={false} fg={t.primary} wrapMode="none">
+              <strong>{baseLabel}</strong>
+            </text>
+          ) : null}
+          {showReviewBase ? (
+            <text selectable={false} fg={t.textMuted} wrapMode="none">
+              b: back
+            </text>
+          ) : null}
+        </box>
+      ) : null}
+    </box>
+  )
+})

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

@@ -7,6 +7,7 @@ import { useRepoDiscovery } from '../../../../git/use-repo-discovery'
 import { useAppStore } from '../../../../state/app-store'
 import { getSessionProjectPath } from '../../../../state/session-worktrees'
 import { GitPanel } from '../git-panel'
+import { GitPaneHeader } from './git-pane-header'
 
 interface GitPaneWidgetProps {
   pollingEnabled: boolean
@@ -43,15 +44,20 @@ export const GitPaneWidget = memo(function GitPaneWidget({ pollingEnabled }: Git
   const display = lastGoodRef.current ?? gitPanel
 
   return (
-    <GitPanel
-      collapsedFolders={gitMode.collapsedFolders}
-      compact={treeCompaction}
-      diffCountConfig={diffCountConfig}
-      fileListMode={gitFileListMode}
-      gitPanel={display}
-      pathConfig={pathConfig}
-      projectPath={projectPath}
-      selectedEntryKey={gitMode.selectedEntryKey}
-    />
+    <box flexDirection="column" flexGrow={1} flexShrink={1} flexBasis={0} overflow="hidden">
+      <GitPaneHeader gitPanel={display} projectPath={projectPath} />
+      <GitPanel
+        collapsedFolders={gitMode.collapsedFolders}
+        compact={treeCompaction}
+        diffCountConfig={diffCountConfig}
+        fileListMode={gitFileListMode}
+        gitPanel={display}
+        pathConfig={pathConfig}
+        projectPath={projectPath}
+        selectedEntryKey={gitMode.selectedEntryKey}
+        showFileListToggle={false}
+        showRemoteTracking={false}
+      />
+    </box>
   )
 })