@brimveyn/aimux 1.12.2 → 1.13.0

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

@@ -29,13 +29,16 @@ interface GitPanelProps {
   pathConfig?: GitPanePathConfig
   diffCountConfig?: GitPaneDiffCountConfig
   headOffset?: number
+  // When set, the single changed-files section is a worktree fork-point review
+  // ("vs <base>") rather than a HEAD~N history walk.
+  baseLabel?: string
   compact?: boolean
 }
 
-function sectionTitle(section: GitFileSection, headOffset: number): string {
+function sectionTitle(section: GitFileSection, headOffset: number, baseLabel?: string): string {
   switch (section) {
     case 'historical':
-      return `HEAD~${headOffset}`
+      return baseLabel != null && baseLabel !== '' ? baseLabel : `HEAD~${headOffset}`
     case 'staged':
       return 'Staged Changes'
     case 'unstaged':
@@ -105,8 +108,8 @@ function renderFileLabel(
   const displayPath = transform ? transform(file.path) : file.path
   const { basename, prefix } = splitPath(displayPath)
   const dir = stripTrailingSlash(prefix)
-  const showDir = fileListMode === 'flat' && pathConfig.enabled && dir
-  if (!file.renamedFrom) {
+  const showDir = fileListMode === 'flat' && pathConfig.enabled && dir !== ''
+  if (!(file.renamedFrom != null && file.renamedFrom !== '')) {
     return (
       <text selectable={false} wrapMode="none">
         <span fg={t.text}>{basename}</span>
@@ -211,7 +214,9 @@ function renderFileRow(
   // Repo disambiguation prefix: only in flat mode, only when the file came
   // from a sub-repo (root repo files get an empty prefix).
   const repoTag =
-    fileListMode === 'flat' && file.repoPath ? (repoPrefixes[file.repoPath] ?? '') : ''
+    fileListMode === 'flat' && file.repoPath != null && file.repoPath !== ''
+      ? (repoPrefixes[file.repoPath] ?? '')
+      : ''
   return (
     <box key={row.key} flexDirection="row" gap={1} backgroundColor={bg} onMouseDown={onSelect}>
       <box width={2} flexShrink={0} justifyContent="center">
@@ -238,7 +243,7 @@ function renderTreeSection(
   section: GitFileSection,
   title: string,
   files: GitFileEntry[],
-  rows: Array<GitTreeFolderRow | GitTreeFileRow>,
+  rows: (GitTreeFolderRow | GitTreeFileRow)[],
   addedW: number,
   removedW: number,
   fileListMode: GitFileListMode,
@@ -337,6 +342,7 @@ const DEFAULT_PATH_CONFIG: GitPanePathConfig = { enabled: true }
 const DEFAULT_DIFF_COUNT_CONFIG: GitPaneDiffCountConfig = { enabled: true }
 
 export const GitPanel = memo(function GitPanel({
+  baseLabel,
   collapsedFolders = {},
   compact = false,
   diffCountConfig = DEFAULT_DIFF_COUNT_CONFIG,
@@ -350,7 +356,8 @@ export const GitPanel = memo(function GitPanel({
   const t = useTheme()
   useTransparent()
   const repoPrefixes = useAppStore((s) => s.multiRepo.prefixes)
-  const sectionOrder = headOffset > 0 ? HISTORICAL_SECTION_ORDER : BASE_SECTION_ORDER
+  const isSingleSection = headOffset > 0 || (baseLabel != null && baseLabel !== '')
+  const sectionOrder = isSingleSection ? HISTORICAL_SECTION_ORDER : BASE_SECTION_ORDER
   const scrollRef = useRef<ScrollBoxRenderable | null>(null)
   const tree = useMemo(
     () => buildGitTreeRows(gitPanel.files, collapsedFolders, fileListMode, compact),
@@ -361,7 +368,7 @@ export const GitPanel = memo(function GitPanel({
     [gitPanel.files]
   )
 
-  const statusNode = renderStatus(gitPanel, !!projectPath)
+  const statusNode = renderStatus(gitPanel, !!(projectPath != null && projectPath !== ''))
 
   const hasRemoteTracking = gitPanel.ahead > 0 || gitPanel.behind > 0
   const toggleSection =
@@ -372,7 +379,7 @@ export const GitPanel = memo(function GitPanel({
 
   useEffect(() => {
     const scrollbox = scrollRef.current
-    if (!scrollbox || !selectedEntryKey) return
+    if (!scrollbox || !(selectedEntryKey != null && selectedEntryKey !== '')) return
     const selectedIndex = tree.visibleRows.findIndex((row) => row.key === selectedEntryKey)
     if (selectedIndex < 0) return
     const viewportHeight = Math.max(1, scrollbox.viewport.height)
@@ -403,7 +410,7 @@ export const GitPanel = memo(function GitPanel({
               .some((k) => (tree.sections.find((e) => e.section === k)?.files.length ?? 0) > 0)
             return renderTreeSection(
               key,
-              sectionTitle(key, headOffset),
+              sectionTitle(key, headOffset, baseLabel),
               section?.files ?? [],
               section?.rows ?? [],
               addedW,

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

@@ -1,16 +1,18 @@
 import { useTerminalDimensions } from '@opentui/react'
-import { memo, useEffect, useRef } from 'react'
+import { memo, useEffect, useRef, useState } from 'react'
 
 import type { DiffData, GitDiffView } from '../../../state/types'
 import type { ThemeId } from '../../themes'
 
 import { diffHash } from '../../../git/diff-hash'
+import { getMergeBase } from '../../../git/divergence'
 import { fetchDiff } from '../../../git/git-diff'
 import { useGitPanelPolling } from '../../../git/git-poller'
 import { useRepoDiscovery } from '../../../git/use-repo-discovery'
 import { useAppStore } from '../../../state/app-store'
 import { dispatchGlobal } from '../../../state/dispatch-ref'
 import { getSelectedGitFile, gitFileKey } from '../../../state/git-tree'
+import { getActiveWorktree, getSessionProjectPath } from '../../../state/session-worktrees'
 import { setGitDiffScroller } from '../../git-view-controls'
 import { useTheme } from '../../theme'
 import { PierreDiff, type PierreDiffHandle } from './diff-renderer'
@@ -64,7 +66,7 @@ const DiffStage = memo(function DiffStage({
       </box>
     )
   }
-  if (diff.errorMessage) {
+  if (diff.errorMessage != null && diff.errorMessage !== '') {
     return (
       <box flexGrow={1} padding={1}>
         <text fg={t.error}>{diff.errorMessage}</text>
@@ -77,7 +79,7 @@ const DiffStage = memo(function DiffStage({
   }
 
   const placeholder = placeholderText(diff)
-  if (placeholder) {
+  if (placeholder != null && placeholder !== '') {
     return (
       <box flexGrow={1} padding={1}>
         <text fg={t.textMuted}>{placeholder}</text>
@@ -87,7 +89,7 @@ const DiffStage = memo(function DiffStage({
 
   return (
     <box flexDirection="column" flexGrow={1} overflow="hidden">
-      {diff.oldPath ? (
+      {diff.oldPath != null && diff.oldPath !== '' ? (
         <box paddingLeft={1} paddingRight={1}>
           <text fg={t.textMuted}>
             renamed: {diff.oldPath} → {diff.path}
@@ -123,13 +125,41 @@ export const GitView = memo(function GitView({ themeId }: GitViewProps) {
   const focusMode = useAppStore((s) => s.focusMode)
   const diffRef = useRef<PierreDiffHandle | null>(null)
 
-  const currentSession = currentSessionId
-    ? sessions.find((s) => s.id === currentSessionId)
-    : undefined
-  const projectPath = currentSession?.projectPath
+  const currentSession =
+    currentSessionId != null && currentSessionId !== ''
+      ? sessions.find((s) => s.id === currentSessionId)
+      : undefined
+  const projectPath = getSessionProjectPath(currentSession)
+
+  // Review-vs-base: when toggled on for a worktree that records a baseRef,
+  // resolve the fork point and diff the working tree against it.
+  const activeWorktree = getActiveWorktree(currentSession)
+  const reviewBaseRef =
+    gitMode.reviewBase && activeWorktree?.baseRef != null && activeWorktree.baseRef !== ''
+      ? activeWorktree.baseRef
+      : null
+  const [compareRef, setCompareRef] = useState<string | undefined>(undefined)
+  useEffect(() => {
+    if (reviewBaseRef == null || projectPath == null || projectPath === '') {
+      setCompareRef(undefined)
+      return
+    }
+    let cancelled = false
+    void getMergeBase(projectPath, reviewBaseRef).then((mergeBase) => {
+      if (!cancelled) setCompareRef(mergeBase)
+    })
+    return () => {
+      cancelled = true
+    }
+  }, [reviewBaseRef, projectPath])
 
   useRepoDiscovery(projectPath)
-  useGitPanelPolling({ enabled: focusMode === 'git', headOffset: gitMode.headOffset, projectPath })
+  useGitPanelPolling({
+    compareRef,
+    enabled: focusMode === 'git',
+    headOffset: gitMode.headOffset,
+    projectPath,
+  })
 
   const fileBarWidth = Math.max(20, Math.floor(dimensions.width * gitPane.diffModeRatio))
 
@@ -140,8 +170,12 @@ export const GitView = memo(function GitView({ themeId }: GitViewProps) {
     selectedEntryKey: gitMode.selectedEntryKey,
   })
   const selectedDiffKey = selectedFile ? gitFileKey(selectedFile) : null
-  const diff = selectedDiffKey ? gitMode.diffs[selectedDiffKey] : undefined
-  const loading = selectedDiffKey ? !!gitMode.loading[selectedDiffKey] : false
+  const diff =
+    selectedDiffKey != null && selectedDiffKey !== '' ? gitMode.diffs[selectedDiffKey] : undefined
+  const loading =
+    selectedDiffKey != null && selectedDiffKey !== ''
+      ? !!(gitMode.loading[selectedDiffKey] === true)
+      : false
 
   useEffect(() => {
     setGitDiffScroller((delta: number) => {
@@ -160,6 +194,7 @@ export const GitView = memo(function GitView({ themeId }: GitViewProps) {
   }, [])
 
   useDiffPrefetch(gitMode.selectedEntryKey, gitPane.prefetchRadius, {
+    compareRef,
     enabled: focusMode === 'git',
     headOffset: gitMode.headOffset,
     projectPath,
@@ -168,11 +203,16 @@ export const GitView = memo(function GitView({ themeId }: GitViewProps) {
 
   useEffect(() => {
     if (focusMode !== 'git') return
-    if (!selectedFile || !projectPath) return
-    if (!selectedDiffKey) return
+    if (!selectedFile || !(projectPath != null && projectPath !== '')) return
+    if (!(selectedDiffKey != null && selectedDiffKey !== '')) return
     if (diff || loading) return
     dispatchGlobal({ key: selectedDiffKey, loading: true, type: 'git-mode-set-loading' })
-    void fetchDiff(selectedFile.repoPath ?? projectPath, selectedFile, gitMode.headOffset)
+    void fetchDiff(
+      selectedFile.repoPath ?? projectPath,
+      selectedFile,
+      gitMode.headOffset,
+      compareRef
+    )
       .then((d) =>
         dispatchGlobal({
           diff: d,
@@ -184,7 +224,16 @@ export const GitView = memo(function GitView({ themeId }: GitViewProps) {
       .catch(() =>
         dispatchGlobal({ key: selectedDiffKey, loading: false, type: 'git-mode-set-loading' })
       )
-  }, [focusMode, projectPath, selectedFile, selectedDiffKey, diff, loading, gitMode.headOffset])
+  }, [
+    focusMode,
+    projectPath,
+    selectedFile,
+    selectedDiffKey,
+    diff,
+    loading,
+    gitMode.headOffset,
+    compareRef,
+  ])
 
   const pendingPath = gitMode.pendingDeletePath
   const pendingIsUntracked =
@@ -199,13 +248,13 @@ export const GitView = memo(function GitView({ themeId }: GitViewProps) {
   }
   const actionMessage = gitMode.actionMessage
   let footerNode: React.ReactNode = null
-  if (pendingHint) {
+  if (pendingHint != null && pendingHint !== '') {
     footerNode = (
       <text fg={t.warning}>
         <strong>{pendingHint}</strong>
       </text>
     )
-  } else if (actionMessage) {
+  } else if (actionMessage != null && actionMessage !== '') {
     footerNode = actionMessage.split('\n').map((line, idx) => (
       <text key={idx} fg={t.primary}>
         {line}
@@ -213,6 +262,8 @@ export const GitView = memo(function GitView({ themeId }: GitViewProps) {
     ))
   }
 
+  const baseLabel = compareRef != null && reviewBaseRef != null ? `vs ${reviewBaseRef}` : undefined
+
   return (
     <box flexDirection="column" flexGrow={1} overflow="hidden">
       <box flexDirection="row" flexGrow={1}>
@@ -228,7 +279,7 @@ export const GitView = memo(function GitView({ themeId }: GitViewProps) {
             <text fg={t.text}>
               <strong>aimux · git</strong>
             </text>
-            {gitPanel.branch ? (
+            {gitPanel.branch != null && gitPanel.branch !== '' ? (
               <box flexDirection="row">
                 <text fg={t.text}>{'\u{e702}'} </text>
                 <text fg={t.text}>{gitPanel.branch}</text>
@@ -242,9 +293,18 @@ export const GitView = memo(function GitView({ themeId }: GitViewProps) {
                 <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>
           <GitPanel
+            baseLabel={baseLabel}
             collapsedFolders={gitMode.collapsedFolders}
             compact={gitPane.treeCompaction}
             fileListMode={gitPane.fileListMode}
@@ -292,7 +352,7 @@ export const GitView = memo(function GitView({ themeId }: GitViewProps) {
           />
         </box>
       </box>
-      {footerNode ? (
+      {footerNode != null ? (
         <box paddingLeft={1} paddingRight={1} backgroundColor={sidebarBg} flexDirection="column">
           {footerNode}
         </box>

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

@@ -76,14 +76,14 @@ export const ImageDiffView = memo(function ImageDiffView({ diff }: ImageDiffView
   const showBoth = before && after
   return (
     <box flexDirection="column" flexGrow={1} overflow="hidden" backgroundColor={t.background}>
-      {diff.oldPath ? (
+      {diff.oldPath != null && diff.oldPath !== '' ? (
         <box paddingLeft={1} paddingRight={1}>
           <text fg={t.textMuted}>
             renamed: {diff.oldPath} → {diff.path}
           </text>
         </box>
       ) : null}
-      {banner ? (
+      {banner != null && banner !== '' ? (
         <box paddingLeft={1} paddingRight={1}>
           <text fg={protocol === 'kitty' ? t.textMuted : t.warning}>{banner}</text>
         </box>

package/src/ui/components/git/image-diff/terminal-image-pane.tsx

@@ -1,4 +1,5 @@
-import { type BoxRenderable } from '@opentui/core'
+import type { BoxRenderable } from '@opentui/core'
+
 import { memo, useEffect, useRef, useState } from 'react'
 
 import { convertToPng, isPng } from '../../../terminal-graphics/format-fallback'
@@ -47,7 +48,7 @@ export const TerminalImagePane = memo(function TerminalImagePane({
     let cancelled = false
     stateRef.current = { imageId: null, lastKey: null, uploaded: false }
     setError(null)
-    ;(async () => {
+    void (async () => {
       let pngBytes: Uint8Array | null = null
       if (mime === 'image/png' || isPng(bytes)) {
         pngBytes = bytes
@@ -60,7 +61,7 @@ export const TerminalImagePane = memo(function TerminalImagePane({
         }
         pngBytes = result.png
       }
-      if (cancelled || !pngBytes) return
+      if (cancelled) return
       const id = nextImageId()
       writeRaw(uploadPngEscape(pngBytes, id))
       stateRef.current.imageId = id
@@ -76,7 +77,7 @@ export const TerminalImagePane = memo(function TerminalImagePane({
     }
   }, [bytes, mime])
 
-  if (error) {
+  if (error != null && error !== '') {
     return (
       <box flexGrow={1} alignItems="center" justifyContent="center" padding={1}>
         <text fg={t.warning}>({error})</text>

package/src/ui/components/git/pane/git-pane-context-menu.ts

@@ -1,11 +1,11 @@
 import type { GitPaneMode, GitPanePosition, GitPaneState } from '../../../../state/types'
 import type { ContextMenuItem } from '../../../context-menu/controller'
 
-const GIT_PANE_MENU_OPTIONS: Array<{
+const GIT_PANE_MENU_OPTIONS: {
   label: string
   mode: GitPaneMode
   position: GitPanePosition
-}> = [
+}[] = [
   { label: 'Move to top', mode: 'embedded', position: 'top' },
   { label: 'Move to bottom', mode: 'embedded', position: 'bottom' },
   { label: 'Move to left', mode: 'pane', position: 'left' },

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

@@ -5,6 +5,7 @@ import type { GitPanelState } from '../../../../state/types'
 import { useGitPanelPolling } from '../../../../git/git-poller'
 import { useRepoDiscovery } from '../../../../git/use-repo-discovery'
 import { useAppStore } from '../../../../state/app-store'
+import { getSessionProjectPath } from '../../../../state/session-worktrees'
 import { GitPanel } from '../git-panel'
 
 interface GitPaneWidgetProps {
@@ -20,10 +21,11 @@ export const GitPaneWidget = memo(function GitPaneWidget({ pollingEnabled }: Git
   const diffCountConfig = useAppStore((s) => s.gitPane.diffCount)
   const currentSessionId = useAppStore((s) => s.currentSessionId)
   const sessions = useAppStore((s) => s.sessions)
-  const currentSession = currentSessionId
-    ? sessions.find((s) => s.id === currentSessionId)
-    : undefined
-  const projectPath = currentSession?.projectPath
+  const currentSession =
+    currentSessionId != null && currentSessionId !== ''
+      ? sessions.find((s) => s.id === currentSessionId)
+      : undefined
+  const projectPath = getSessionProjectPath(currentSession)
 
   useRepoDiscovery(projectPath)
   useGitPanelPolling({ enabled: pollingEnabled, headOffset: 0, projectPath })

package/src/ui/components/layout/session-bar.tsx

@@ -61,7 +61,7 @@ export function SessionBar({ forceVisible = false }: SessionBarProps) {
   }
 
   const handleMouseDrag = (event: OtuiMouseEvent) => {
-    if (!draggingId) return
+    if (!(draggingId != null && draggingId !== '')) return
     const hit = findChipAtX(event.x)
     if (hit === null) {
       lastSwapWithRef.current = null
@@ -83,7 +83,7 @@ export function SessionBar({ forceVisible = false }: SessionBarProps) {
     setDragOrder(null)
     lastSwapWithRef.current = null
 
-    if (!source || !finalOrder) return
+    if (source == null || source === '' || !finalOrder) return
 
     const changed = !arraysEqual(finalOrder, baselineOrder)
     if (changed) {
@@ -184,7 +184,7 @@ interface SessionChipProps {
   onMouseDrag: (event: OtuiMouseEvent) => void
   onMouseUp: (event: OtuiMouseEvent) => void
   onMouseDragEnd: (event: OtuiMouseEvent) => void
-  rightClickMenu: Array<[string, () => void]>
+  rightClickMenu: [string, () => void][]
 }
 
 function SessionChip({