@brimveyn/aimux 1.12.6 → 1.13.0

package/src/app-runtime/snippet-actions.ts

@@ -42,13 +42,13 @@ export function saveSnippetEditorState(state: AppState): SnippetRecord[] | null
 
   const snippetId = state.modal.sessionTargetId
   // Config-pinned snippets are sticky and read-only in the UI.
-  if (snippetId && isConfigSnippetId(snippetId)) {
+  if (snippetId != null && snippetId !== '' && isConfigSnippetId(snippetId)) {
     return null
   }
 
   const trigger = editorValue.trigger.length > 0 ? editorValue.trigger : undefined
 
-  if (snippetId) {
+  if (snippetId != null && snippetId !== '') {
     return state.snippets.map((snippet) =>
       snippet.id === snippetId
         ? { ...snippet, content: editorValue.content, name: editorValue.name, trigger }
@@ -74,7 +74,7 @@ export function pasteSnippetToTab(
   snippet: SnippetRecord | undefined,
   dispatch?: (action: AppAction) => void
 ): void {
-  if (!snippet || !activeTabId || !activeTab) {
+  if (!snippet || activeTabId == null || activeTabId === '' || !activeTab) {
     return
   }
 

package/src/app-runtime/use-auto-commit-driver.ts

@@ -52,7 +52,7 @@ export function useAutoCommitDriver({
   depsRef.current = deps
 
   useEffect(() => {
-    const handler: (args: Parameters<typeof onManualTrigger>[1]) => Promise<void> = (args) =>
+    const handler: (args: Parameters<typeof onManualTrigger>[1]) => Promise<void> = async (args) =>
       onManualTrigger(depsRef.current, args)
     setActiveAutoCommitDriver(handler)
     return () => clearActiveAutoCommitDriverIfMatches(handler)
@@ -74,7 +74,7 @@ export function useAutoCommitDriver({
         (before === 'working' || before === 'waiting-input') && tab.activity === 'idle'
       if (becameIdle) {
         const sessionId = state.currentSessionId
-        if (!sessionId) continue
+        if (!(sessionId != null && sessionId !== '')) continue
         const session = state.sessions.find((s) => s.id === sessionId)
         const git = gitPayloadFromState(state)
         void onActivityTransition(depsRef.current, {
@@ -95,7 +95,7 @@ export function useAutoCommitDriver({
   useEffect(() => {
     if (!configRef.current.enabled) return
     const sessionId = state.currentSessionId
-    if (!sessionId) return
+    if (!(sessionId != null && sessionId !== '')) return
     const payload = gitPayloadFromState(state)
     if (!payload) return
     const cacheKey = JSON.stringify(payload)
@@ -109,7 +109,10 @@ export function useAutoCommitDriver({
     // fast mode) and where the user edits via an external editor.
     if (gitStabilizeTimerRef.current) clearTimeout(gitStabilizeTimerRef.current)
     const activeTabId = state.activeTabId
-    const activeTab = activeTabId ? state.tabs.find((tab) => tab.id === activeTabId) : undefined
+    const activeTab =
+      activeTabId != null && activeTabId !== ''
+        ? state.tabs.find((tab) => tab.id === activeTabId)
+        : undefined
     if (!activeTab) return
     const session = state.sessions.find((s) => s.id === sessionId)
     gitStabilizeTimerRef.current = setTimeout(() => {

package/src/app-runtime/use-backend-runtime.ts

@@ -41,7 +41,7 @@ export function useBackendRuntime({
   const { clearAllTimers, clearIdleTimer, clearStartupGrace, startStartupGrace } = timeouts
 
   useEffect(() => {
-    if (!currentSessionId) {
+    if (!(currentSessionId != null && currentSessionId !== '')) {
       attachRequestIdRef.current += 1
       return
     }
@@ -57,12 +57,12 @@ export function useBackendRuntime({
   }, [backend, currentSessionId, currentSessionWorkspaceSnapshot, dispatch, layoutRef])
 
   useEffect(() => {
-    if (!currentSessionId) {
+    if (!(currentSessionId != null && currentSessionId !== '')) {
       return
     }
 
     backend.setActiveTab(activeTabId)
-    if (activeTabId && activeTabScrollIntentRef.current) {
+    if (activeTabId != null && activeTabId !== '' && activeTabScrollIntentRef.current) {
       backend.reapplyScrollIntent(activeTabId, activeTabScrollIntentRef.current)
     }
   }, [activeTabId, activeTabScrollIntentRef, backend, currentSessionId])

package/src/app-runtime/use-directory-search.ts

@@ -42,11 +42,13 @@ export function useDirectorySearch(
       return
     }
 
-    const timer = setTimeout(async () => {
-      const results = await searchProjectDirectories(directoryQuery)
-      if (isCurrent) {
-        dispatch({ results, type: 'set-directory-results' })
-      }
+    const timer = setTimeout(() => {
+      void (async () => {
+        const results = await searchProjectDirectories(directoryQuery)
+        if (isCurrent) {
+          dispatch({ results, type: 'set-directory-results' })
+        }
+      })()
     }, debounceMs)
 
     return () => {

package/src/app-runtime/use-mouse-handlers.ts

@@ -84,7 +84,7 @@ function getTargetTerminalTabId(
   activeTabId: string | null,
   isEnabled: boolean
 ): string | null {
-  if (focusMode !== 'terminal-input' || !activeTabId || !isEnabled) {
+  if (focusMode !== 'terminal-input' || activeTabId == null || activeTabId === '' || !isEnabled) {
     return null
   }
 
@@ -248,12 +248,12 @@ export function useMouseHandlers({
       state.activeTabId,
       activeMouseForwardingEnabled
     )
-    if (!targetTabId) {
+    if (!(targetTabId != null && targetTabId !== '')) {
       return
     }
 
     const sequence = getForwardedMouseSequence(event, origin)
-    if (!sequence) {
+    if (!(sequence != null && sequence !== '')) {
       return
     }
 
@@ -262,7 +262,12 @@ export function useMouseHandlers({
 
   const handleTerminalScrollEvent = (event: OtuiMouseEvent) => {
     const targetTabId = getTargetTerminalTabId(state.focusMode, state.activeTabId, true)
-    if (!targetTabId || activeMouseForwardingEnabled || !activeLocalScrollbackEnabled) {
+    if (
+      targetTabId == null ||
+      targetTabId === '' ||
+      activeMouseForwardingEnabled ||
+      !activeLocalScrollbackEnabled
+    ) {
       return
     }
 
@@ -389,7 +394,7 @@ export function useMouseHandlers({
     tabId?: string
   ) => {
     const targetTabId = tabId ?? state.activeTabId
-    if (!targetTabId || !event.target) {
+    if (targetTabId == null || targetTabId === '' || !event.target) {
       return
     }
 
@@ -437,7 +442,7 @@ export function useMouseHandlers({
     }
 
     logInputDebug('click.done', {
-      hasSelection: !!renderer.hasSelection,
+      hasSelection: !!(renderer.hasSelection === true),
       mode: selection.mode,
       targetSelectable: isPositionedNode(event.target) ? !!event.target.selectable : false,
     })

package/src/app-runtime/use-pane-size-report.ts

@@ -44,7 +44,7 @@ export function usePaneSizeReport(
 
   const measure = useCallback(() => {
     const box = boxRef.current
-    if (!box || !tabId || !enabled || !onMeasure) {
+    if (!box || tabId == null || tabId === '' || !enabled || !onMeasure) {
       return
     }
     const cols = Math.round(box.width)

package/src/app-runtime/use-renderer-bindings.ts

@@ -1,4 +1,5 @@
-import { useRenderer } from '@opentui/react'
+import type { useRenderer } from '@opentui/react'
+
 import { type MutableRefObject, useEffect, useRef } from 'react'
 
 import type { KeyChord } from '../input/keymap/key-chord'
@@ -202,7 +203,7 @@ export function useRendererBindings({
         defaultPrevented: event.defaultPrevented ?? false,
       })
 
-      if (event.defaultPrevented) {
+      if (event.defaultPrevented === true) {
         return
       }
 
@@ -220,12 +221,12 @@ export function useRendererBindings({
       })
 
       if (currentFocusMode === 'command-edit') {
-        const sanitized = payload.replace(/\r\n?/g, '\n')
+        const sanitized = payload.replaceAll(/\r\n?/g, '\n')
         dispatch({ char: sanitized, type: 'update-command-edit' })
         return
       }
 
-      if (currentFocusMode !== 'terminal-input' || !tabId || !tab) {
+      if (currentFocusMode !== 'terminal-input' || tabId == null || tabId === '' || !tab) {
         return
       }
 
@@ -246,7 +247,7 @@ export function useRendererBindings({
         textLength: selectedText.length,
       })
 
-      if (selection.isDragging || selectedText.length === 0) {
+      if (selection.isDragging === true || selectedText.length === 0) {
         return
       }
 

package/src/app.tsx

@@ -10,6 +10,7 @@ import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } fr
 import type { KeyChord } from './input/keymap/key-chord'
 import type { TrieBinding } from './input/keymap/trie'
 import type { KeyResult, ModeContext, ModeId } from './input/modes/types'
+import type { TerminalContentOrigin } from './input/raw-input-handler'
 import type { SessionBackend } from './session-backend/types'
 
 import { executeSideEffect, type SideEffectContext } from './app-runtime/side-effects'
@@ -25,7 +26,6 @@ import { setActiveKeymap } from './input/keymap/keymap-ref'
 import { deriveModeId } from './input/modes/bridge'
 import { registerAllModes } from './input/modes/handlers'
 import { getHandler, transitionTo } from './input/modes/registry'
-import { type TerminalContentOrigin } from './input/raw-input-handler'
 import { highlightSnapshot, warmClaudeSyntaxOverlay } from './integrations/claude-syntax-overlay'
 import { ensureClaudeSettingsThemePref, syncClaudeTheme } from './integrations/claude-theme-sync'
 import { getProfileConfigDir, getProfileName } from './profile-paths'
@@ -34,6 +34,7 @@ import { aiUsageStore } from './state/ai-usage-store'
 import { appStore, useAppStore } from './state/app-store'
 import { setActiveDispatch, setActiveSideEffectRunner } from './state/dispatch-ref'
 import { findMostRecentSession, loadSessionCatalog } from './state/session-catalog'
+import { getSessionProjectPath } from './state/session-worktrees'
 import { loadSnippetCatalog, mergeConfigSnippets } from './state/snippet-catalog'
 import { createInitialState } from './state/store'
 import { KeymapContext } from './ui/keymap-context'
@@ -81,7 +82,10 @@ export function App({
   const dimensions = useTerminalDimensions()
   const [themeId, setThemeId] = useState<ThemeId>(() => {
     const config = loadConfig()
-    const persisted = config.themeId && isKnownThemeId(config.themeId) ? config.themeId : undefined
+    const persisted =
+      config.themeId != null && config.themeId !== '' && isKnownThemeId(config.themeId)
+        ? config.themeId
+        : undefined
     const initial: ThemeId = persisted ?? resolvedConfig.theme?.initialId ?? 'aimux'
     applyTheme(initial)
     if (resolvedConfig.theme?.initialMode) setMode(resolvedConfig.theme.initialMode)
@@ -180,7 +184,7 @@ export function App({
   }, [dispatch])
 
   useEffect(() => {
-    if (!resolvedConfig.theme?.beta?.harmonizeClaudeTheme) return
+    if (!(resolvedConfig.theme?.beta?.harmonizeClaudeTheme === true)) return
     ensureClaudeSettingsThemePref()
     syncClaudeTheme(getCurrentTheme(), getCurrentMode())
     return subscribeThemeChanges((resolved, mode) => {
@@ -190,7 +194,7 @@ export function App({
 
   useEffect(() => {
     const aiUsage = resolvedConfig.statusBar?.aiUsage
-    if (!aiUsage?.enabled) {
+    if (!(aiUsage?.enabled === true)) {
       aiUsageStore.getState().setEnabled(false)
       return
     }
@@ -215,7 +219,7 @@ export function App({
         getCurrentPackageVersion(),
         fetchLatestNpmVersion('@brimveyn/aimux'),
       ])
-      if (cancelled || !latest) return
+      if (cancelled || !(latest != null && latest !== '')) return
       if (!isNewerVersion(latest, current)) return
       if (loadConfig().skippedUpdateVersion === latest) return
       dispatch({
@@ -395,9 +399,10 @@ export function App({
     clearStartupGrace,
     dispatch,
     getCurrentSessionProjectPath: () => {
-      if (!state.currentSessionId) return undefined
-      return state.sessions.find((s) => s.id === state.currentSessionId)?.projectPath
+      if (!(state.currentSessionId != null && state.currentSessionId !== '')) return
+      return getSessionProjectPath(state.sessions.find((s) => s.id === state.currentSessionId))
     },
+    getState: () => stateRef.current,
     renderer,
     setThemeId,
     startStartupGrace,

package/src/auto-commit/headless-commands.ts

@@ -1,5 +1,3 @@
-import type { AssistantId } from '../state/types'
-
 export interface HeadlessInvocation {
   executable: string
   args: string[]
@@ -9,25 +7,25 @@ export type SupportedProvider = 'claude' | 'codex' | 'opencode'
 
 const SUPPORTED: ReadonlySet<string> = new Set<SupportedProvider>(['claude', 'codex', 'opencode'])
 
-export function isSupportedProvider(id: AssistantId | string): id is SupportedProvider {
+export function isSupportedProvider(id: string): id is SupportedProvider {
   return SUPPORTED.has(id)
 }
 
 export function buildHeadlessInvocation(
-  provider: AssistantId | string,
+  provider: string,
   prompt: string,
   model: string | undefined
 ): HeadlessInvocation | null {
   switch (provider) {
     case 'claude': {
       const args = ['-p', '--output-format', 'text']
-      if (model) args.push('--model', model)
+      if (model != null && model !== '') args.push('--model', model)
       args.push(prompt)
       return { args, executable: 'claude' }
     }
     case 'codex': {
       const args = ['exec']
-      if (model) args.push('--model', model)
+      if (model != null && model !== '') args.push('--model', model)
       args.push(prompt)
       return { args, executable: 'codex' }
     }

package/src/daemon/daemon.ts

@@ -84,7 +84,7 @@ function sendOk(socket: Socket, id: string): void {
 
 function requireSession(socket: Socket, attachedSessions: Map<Socket, string>): string {
   const sessionId = attachedSessions.get(socket)
-  if (!sessionId) {
+  if (!(sessionId != null && sessionId !== '')) {
     throw new Error('No session attached')
   }
   return sessionId
@@ -100,7 +100,7 @@ function requireNegotiatedVersion(socket: Socket, versions: Map<Socket, number>)
 
 async function canConnectToSocket(socketPath: string): Promise<boolean> {
   const securityIssue = getSocketSecurityIssue(socketPath)
-  if (securityIssue) {
+  if (securityIssue != null && securityIssue !== '') {
     logDebug('daemon.socketUnhealthy', { issue: securityIssue, socketPath })
     return false
   }
@@ -527,7 +527,7 @@ export async function runDaemon(): Promise<void> {
                 case 'disposeAll': {
                   const sessionId = attachedSessions.get(socket)
                   requireNegotiatedVersion(socket, negotiatedVersions)
-                  if (sessionId) {
+                  if (sessionId != null && sessionId !== '') {
                     for (const [tabId, entry] of tabRegistry) {
                       if (entry.sessionId === sessionId) tabRegistry.delete(tabId)
                     }

package/src/daemon/runtime-paths.ts

@@ -8,7 +8,7 @@ export function getRuntimeProfile(): string {
 }
 
 function getRuntimeBaseDir(): string {
-  if (process.env.XDG_RUNTIME_DIR) {
+  if (process.env.XDG_RUNTIME_DIR != null && process.env.XDG_RUNTIME_DIR !== '') {
     return join(process.env.XDG_RUNTIME_DIR, `aimux-${getRuntimeProfile()}`)
   }
 

package/src/daemon/session-manager.ts

@@ -11,7 +11,7 @@ import type {
 import { logDebug } from '../debug/input-log'
 import { SessionRegistry } from './session-registry'
 
-type SessionManagerEvents = {
+interface SessionManagerEvents {
   render: [
     sessionId: string,
     tabId: string,

package/src/daemon/session-registry.ts

@@ -17,7 +17,7 @@ import {
   type WorkspaceSnapshotV1,
 } from '../state/types'
 
-type SessionRegistryEvents = {
+interface SessionRegistryEvents {
   render: [tabId: string, viewport: TerminalSnapshot, terminalModes: TerminalModeState]
   exit: [tabId: string, exitCode: number]
   error: [tabId: string, message: string]
@@ -81,7 +81,9 @@ export class SessionRegistry extends EventEmitter<SessionRegistryEvents> {
         this.tabs.set(tab.id, tab)
       }
       this.activeTabId =
-        snapshot.activeTabId && restoredTabs.some((tab) => tab.id === snapshot.activeTabId)
+        snapshot.activeTabId != null &&
+        snapshot.activeTabId !== '' &&
+        restoredTabs.some((tab) => tab.id === snapshot.activeTabId)
           ? snapshot.activeTabId
           : (restoredTabs[0]?.id ?? null)
     } else if (this.tabs.size > 0 && snapshot) {
@@ -90,9 +92,14 @@ export class SessionRegistry extends EventEmitter<SessionRegistryEvents> {
         if (existing) {
           existing.title = persisted.title
           existing.scrollIntent = persisted.scrollIntent ?? DEFAULT_SCROLL_INTENT
+          existing.worktreeId = persisted.worktreeId
         }
       }
-      if (snapshot.activeTabId && this.tabs.has(snapshot.activeTabId)) {
+      if (
+        snapshot.activeTabId != null &&
+        snapshot.activeTabId !== '' &&
+        this.tabs.has(snapshot.activeTabId)
+      ) {
         this.activeTabId = snapshot.activeTabId
       }
     }

package/src/diff-parser/parse-patch-files.ts

@@ -64,7 +64,7 @@ export function processFile(
     const lines = hunk.split(SPLIT_WITH_NEWLINES)
     const firstLine = lines.shift()
     if (firstLine == null) {
-      if (throwOnError) throw Error('parsePatchContent: invalid hunk')
+      if (throwOnError) throw new Error('parsePatchContent: invalid hunk')
       else console.error('parsePatchContent: invalid hunk', hunk)
       continue
     }
@@ -73,7 +73,7 @@ export function processFile(
     let deletionLines = 0
     if (fileHeaderMatch == null || currentFile == null) {
       if (currentFile != null) {
-        if (throwOnError) throw Error('parsePatchContent: Invalid hunk')
+        if (throwOnError) throw new Error('parsePatchContent: Invalid hunk')
         else console.error('parsePatchContent: Invalid hunk', hunk)
         continue
       }
@@ -139,8 +139,9 @@ export function processFile(
             currentFile.mode = line.replace('deleted file mode', '').trim()
           }
           if (line.startsWith('similarity index')) {
-            if (line.startsWith('similarity index 100%')) currentFile.type = 'rename-pure'
-            else currentFile.type = 'rename-changed'
+            currentFile.type = line.startsWith('similarity index 100%')
+              ? 'rename-pure'
+              : 'rename-changed'
           }
           if (line.startsWith('index ')) {
             const [, prevObjectId, newObjectId, mode] = line.trim().match(INDEX_LINE_METADATA) ?? []
@@ -162,24 +163,24 @@ export function processFile(
     let lastLineType: 'addition' | 'deletion' | 'context' | undefined
     while (
       lines.length > 0 &&
-      (lines[lines.length - 1] === '\n' ||
-        lines[lines.length - 1] === '\r' ||
-        lines[lines.length - 1] === '\r\n' ||
-        lines[lines.length - 1] === '')
+      (lines.at(-1) === '\n' ||
+        lines.at(-1) === '\r' ||
+        lines.at(-1) === '\r\n' ||
+        lines.at(-1) === '')
     ) {
       lines.pop()
     }
-    const additionStart = parseInt(fileHeaderMatch[3] ?? '')
-    const deletionStart = parseInt(fileHeaderMatch[1] ?? '')
+    const additionStart = parseInt(fileHeaderMatch[3] ?? '', 10)
+    const deletionStart = parseInt(fileHeaderMatch[1] ?? '', 10)
     deletionLineIndex = isPartial ? deletionLineIndex : deletionStart - 1
     additionLineIndex = isPartial ? additionLineIndex : additionStart - 1
     const hunkData = {
-      additionCount: parseInt(fileHeaderMatch[4] ?? '1'),
+      additionCount: parseInt(fileHeaderMatch[4] ?? '1', 10),
       additionLineIndex,
       additionLines,
       additionStart,
       collapsedBefore: 0,
-      deletionCount: parseInt(fileHeaderMatch[2] ?? '1'),
+      deletionCount: parseInt(fileHeaderMatch[2] ?? '1', 10),
       deletionLineIndex,
       deletionLines,
       deletionStart,
@@ -199,7 +200,7 @@ export function processFile(
       isNaN(hunkData.additionStart) ||
       isNaN(hunkData.deletionStart)
     ) {
-      if (throwOnError) throw Error('parsePatchContent: invalid hunk metadata')
+      if (throwOnError) throw new Error('parsePatchContent: invalid hunk metadata')
       else console.error('parsePatchContent: invalid hunk metadata', hunkData)
       continue
     }
@@ -285,7 +286,7 @@ export function processFile(
     currentFile.unifiedLineCount += hunkData.collapsedBefore + hunkData.unifiedLineCount
   }
   if (currentFile == null) return
-  const lastHunk = currentFile.hunks[currentFile.hunks.length - 1]
+  const lastHunk = currentFile.hunks.at(-1)
   if (
     lastHunk != null &&
     !isPartial &&
@@ -300,8 +301,7 @@ export function processFile(
   }
   if (!isGitDiff) {
     if (currentFile.prevName != null && currentFile.name !== currentFile.prevName) {
-      if (currentFile.hunks.length > 0) currentFile.type = 'rename-changed'
-      else currentFile.type = 'rename-pure'
+      currentFile.type = currentFile.hunks.length > 0 ? 'rename-changed' : 'rename-pure'
     } else if (newFile != null && newFile.contents === '') currentFile.type = 'deleted'
     else if (oldFile != null && oldFile.contents === '') currentFile.type = 'new'
   }
@@ -323,12 +323,12 @@ export function processPatch(
   for (const fileOrPatchMetadata of rawFiles) {
     if (isGitDiff && !GIT_DIFF_FILE_BREAK_REGEX.test(fileOrPatchMetadata)) {
       if (patchMetadata == null) patchMetadata = fileOrPatchMetadata
-      else if (throwOnError) throw Error('parsePatchContent: unknown file blob')
+      else if (throwOnError) throw new Error('parsePatchContent: unknown file blob')
       else console.error('parsePatchContent: unknown file blob:', fileOrPatchMetadata)
       continue
     } else if (!isGitDiff && !UNIFIED_DIFF_FILE_BREAK_REGEX.test(fileOrPatchMetadata)) {
       if (patchMetadata == null) patchMetadata = fileOrPatchMetadata
-      else if (throwOnError) throw Error('parsePatchContent: unknown file blob')
+      else if (throwOnError) throw new Error('parsePatchContent: unknown file blob')
       else console.error('parsePatchContent: unknown file blob:', fileOrPatchMetadata)
       continue
     }

package/src/git/command-queue.ts

@@ -1,6 +1,6 @@
 let tail: Promise<unknown> = Promise.resolve()
 
-export function enqueueGitOp<T>(op: () => Promise<T>): Promise<T> {
+export async function enqueueGitOp<T>(op: () => Promise<T>): Promise<T> {
   const next = tail.then(op, op)
   tail = next.catch(() => {})
   return next

package/src/git/divergence.ts

@@ -0,0 +1,46 @@
+import { $ } from 'bun'
+
+import type { BranchDivergence } from '../state/types'
+
+// Parses `git rev-list --left-right --count <base>...<branch>`, which prints two
+// whitespace-separated counts: "<left> <right>". With the `<base>...<branch>`
+// range the left count is commits in base but not branch (how far the branch is
+// *behind* its base) and the right count is commits in branch but not base (how
+// far it is *ahead*).
+export function parseDivergenceCount(output: string): BranchDivergence | undefined {
+  const match = /(\d+)\s+(\d+)/.exec(output.trim())
+  if (match == null) return undefined
+  return {
+    ahead: Number.parseInt(match[2] ?? '', 10),
+    behind: Number.parseInt(match[1] ?? '', 10),
+  }
+}
+
+// Commits a worktree branch is ahead/behind the ref it forked from. Returns
+// undefined when the refs can't be compared (missing ref, not a repo, …) so
+// callers can simply render nothing.
+export async function getBranchDivergence(
+  repoPath: string,
+  baseRef: string,
+  branch: string
+): Promise<BranchDivergence | undefined> {
+  const range = `${baseRef}...${branch}`
+  const result = await $`git -C ${repoPath} rev-list --left-right --count ${range}`
+    .quiet()
+    .nothrow()
+  if (result.exitCode !== 0) return undefined
+  return parseDivergenceCount(result.text())
+}
+
+// Fork point: the most recent commit shared by baseRef and ref. Diffing the
+// working tree against this shows everything the worktree changed since it
+// branched off (commits + staged + unstaged) — i.e. what a squash-move lands.
+export async function getMergeBase(
+  repoPath: string,
+  baseRef: string,
+  ref = 'HEAD'
+): Promise<string | undefined> {
+  const result = await $`git -C ${repoPath} merge-base ${baseRef} ${ref}`.quiet().nothrow()
+  if (result.exitCode !== 0) return undefined
+  return result.text().trim() || undefined
+}

package/src/git/git-diff.ts

@@ -5,7 +5,8 @@ import type { DiffData, DiffFileStatus, GitFileEntry } from '../state/types'
 import { imageFormatLabel, imageMimeFromPath, isImagePath } from './image-detect'
 
 function resolveStatus(entry: GitFileEntry): { status: DiffFileStatus; oldPath?: string } {
-  if (entry.renamedFrom) return { oldPath: entry.renamedFrom, status: 'renamed' }
+  if (entry.renamedFrom != null && entry.renamedFrom !== '')
+    return { oldPath: entry.renamedFrom, status: 'renamed' }
   if (entry.section === 'untracked' || entry.status === '?') return { status: 'new' }
   if (entry.status === 'D') return { status: 'deleted' }
   if (entry.status === 'A' && (entry.section === 'staged' || entry.section === 'historical')) {
@@ -85,13 +86,19 @@ async function rawUnifiedDiff(
   return result.text()
 }
 
+function resolveCompareRef(headOffset: number, compareRef: string | undefined): string {
+  if (compareRef != null && compareRef !== '') return compareRef
+  return headOffset > 0 ? `HEAD~${headOffset}` : 'HEAD'
+}
+
 export async function fetchDiff(
   cwd: string,
   file: GitFileEntry,
-  headOffset: number = 0
+  headOffset: number = 0,
+  compareRef?: string
 ): Promise<DiffData> {
   const { oldPath, status } = resolveStatus(file)
-  const ref = headOffset > 0 ? `HEAD~${headOffset}` : 'HEAD'
+  const ref = resolveCompareRef(headOffset, compareRef)
 
   if (isImagePath(file.path)) {
     const headPath = oldPath ?? file.path
@@ -112,7 +119,7 @@ export async function fetchDiff(
     }
     if (imageBytesBefore) data.imageBytesBefore = imageBytesBefore
     if (imageBytesAfter) data.imageBytesAfter = imageBytesAfter
-    if (oldPath) data.oldPath = oldPath
+    if (oldPath != null && oldPath !== '') data.oldPath = oldPath
     return data
   }
 
@@ -137,6 +144,6 @@ export async function fetchDiff(
     rawDiff,
     status,
   }
-  if (oldPath) data.oldPath = oldPath
+  if (oldPath != null && oldPath !== '') data.oldPath = oldPath
   return data
 }