@brimveyn/aimux 1.6.0 → 1.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brimveyn/aimux",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "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.0",
+    "@brimveyn/aimux-config": "0.4.1",
     "@opentui/core": "^0.1.90",
     "@opentui/react": "^0.1.90",
     "@xterm/headless": "^6.0.0",

package/src/git/git-diff.ts

@@ -6,12 +6,14 @@ function resolveStatus(entry: GitFileEntry): { status: DiffFileStatus; oldPath?:
   if (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') return { status: 'new' }
+  if (entry.status === 'A' && (entry.section === 'staged' || entry.section === 'historical')) {
+    return { status: 'new' }
+  }
   return { status: 'modified' }
 }
 
-async function isBinary(cwd: string, path: string): Promise<boolean> {
-  const result = await $`git -C ${cwd} diff HEAD --numstat -- ${path}`.quiet().nothrow()
+async function isBinary(cwd: string, ref: string, path: string): Promise<boolean> {
+  const result = await $`git -C ${cwd} diff ${ref} --numstat -- ${path}`.quiet().nothrow()
   if (result.exitCode !== 0) return false
   const text = result.text().trim()
   if (!text) return false
@@ -19,8 +21,8 @@ async function isBinary(cwd: string, path: string): Promise<boolean> {
   return first.startsWith('-\t-\t')
 }
 
-async function readHeadSize(cwd: string, path: string): Promise<number> {
-  const result = await $`git -C ${cwd} show HEAD:${path}`.quiet().nothrow()
+async function readHeadSize(cwd: string, ref: string, path: string): Promise<number> {
+  const result = await $`git -C ${cwd} show ${ref}:${path}`.quiet().nothrow()
   if (result.exitCode !== 0) return 0
   return result.text().length
 }
@@ -33,9 +35,14 @@ async function readWorkingSize(cwd: string, path: string): Promise<number> {
   return 0
 }
 
-async function rawUnifiedDiff(cwd: string, path: string, status: DiffFileStatus): Promise<string> {
+async function rawUnifiedDiff(
+  cwd: string,
+  ref: string,
+  path: string,
+  status: DiffFileStatus
+): Promise<string> {
   if (status === 'new') {
-    const result = await $`git -C ${cwd} diff HEAD --no-color --no-textconv -- ${path}`
+    const result = await $`git -C ${cwd} diff ${ref} --no-color --no-textconv -- ${path}`
       .quiet()
       .nothrow()
     if (result.exitCode === 0 && result.text().length > 0) return result.text()
@@ -47,19 +54,24 @@ async function rawUnifiedDiff(cwd: string, path: string, status: DiffFileStatus)
   }
 
   const result =
-    await $`git -C ${cwd} diff HEAD --unified=99999 --no-color --no-textconv -- ${path}`
+    await $`git -C ${cwd} diff ${ref} --unified=99999 --no-color --no-textconv -- ${path}`
       .quiet()
       .nothrow()
   if (result.exitCode !== 0) return ''
   return result.text()
 }
 
-export async function fetchDiff(cwd: string, file: GitFileEntry): Promise<DiffData> {
+export async function fetchDiff(
+  cwd: string,
+  file: GitFileEntry,
+  headOffset: number = 0
+): Promise<DiffData> {
   const { oldPath, status } = resolveStatus(file)
+  const ref = headOffset > 0 ? `HEAD~${headOffset}` : 'HEAD'
 
-  if (await isBinary(cwd, file.path)) {
+  if (await isBinary(cwd, ref, file.path)) {
     const [binarySizeBefore, binarySizeAfter] = await Promise.all([
-      readHeadSize(cwd, file.path),
+      readHeadSize(cwd, ref, file.path),
       readWorkingSize(cwd, file.path),
     ])
     return {
@@ -71,7 +83,7 @@ export async function fetchDiff(cwd: string, file: GitFileEntry): Promise<DiffDa
     }
   }
 
-  const rawDiff = await rawUnifiedDiff(cwd, file.path, status)
+  const rawDiff = await rawUnifiedDiff(cwd, ref, file.path, status)
 
   const data: DiffData = {
     path: file.path,

package/src/git/git-poller.ts

@@ -9,9 +9,10 @@ const MAX_INTERVAL_MS = 30_000
 interface Options {
   enabled: boolean
   projectPath: string | undefined
+  headOffset: number
 }
 
-export function useGitPanelPolling({ enabled, projectPath }: Options): void {
+export function useGitPanelPolling({ enabled, headOffset, projectPath }: Options): void {
   useEffect(() => {
     if (!enabled || !projectPath) return undefined
 
@@ -27,11 +28,18 @@ export function useGitPanelPolling({ enabled, projectPath }: Options): void {
     }
 
     const tick = async () => {
-      const result = await collectGitStatus(projectPath)
+      const result = await collectGitStatus(projectPath, { headOffset })
       if (cancelled) return
       if (result.kind === 'ok') {
         dispatchGlobal({ payload: result.payload, type: 'git-refresh-success' })
         delay = BASE_INTERVAL_MS
+      } else if (result.kind === 'out-of-range') {
+        dispatchGlobal({ offset: result.maxOffset, type: 'git-mode-set-head-offset' })
+        dispatchGlobal({
+          message: `no older commit — clamped to HEAD~${result.maxOffset}`,
+          type: 'git-mode-set-message',
+        })
+        delay = BASE_INTERVAL_MS
       } else {
         dispatchGlobal({ kind: result.error, type: 'git-refresh-error' })
         delay = Math.min(delay * 2, MAX_INTERVAL_MS)
@@ -45,5 +53,5 @@ export function useGitPanelPolling({ enabled, projectPath }: Options): void {
       cancelled = true
       if (timer) clearTimeout(timer)
     }
-  }, [enabled, projectPath])
+  }, [enabled, projectPath, headOffset])
 }

package/src/git/git-status.ts

@@ -16,6 +16,7 @@ interface NumstatRow {
 export type GitCollectResult =
   | { kind: 'ok'; payload: GitRefreshPayload }
   | { kind: 'error'; error: GitPanelError }
+  | { kind: 'out-of-range'; maxOffset: number }
 
 const STATUS_CODES = new Set(['M', 'A', 'D', 'R', 'C', 'U', '?'])
 
@@ -189,26 +190,106 @@ async function annotateUntrackedCounts(cwd: string, files: GitFileEntry[]): Prom
   }
 }
 
-export async function collectGitStatus(cwd: string): Promise<GitCollectResult> {
-  try {
-    const [statusResult, unstagedDiff, stagedDiff] = await Promise.all([
-      $`git -C ${cwd} status --porcelain=v2 -b -z --untracked-files=all`.quiet().nothrow(),
-      $`git -C ${cwd} -c core.quotePath=false diff --numstat`.quiet().nothrow(),
-      $`git -C ${cwd} -c core.quotePath=false diff --cached --numstat`.quiet().nothrow(),
-    ])
-
-    if (statusResult.exitCode !== 0) {
-      return { error: 'not-a-repo', kind: 'error' }
+interface CollectOptions {
+  headOffset?: number
+}
+
+function parseNameStatus(
+  output: string
+): { path: string; status: GitFileStatus; renamedFrom?: string }[] {
+  const rows: { path: string; status: GitFileStatus; renamedFrom?: string }[] = []
+  for (const raw of output.split('\n')) {
+    if (!raw) continue
+    const parts = raw.split('\t')
+    const code = parts[0] ?? ''
+    const letter = code[0] ?? ''
+    const status = toStatus(letter)
+    if (!status) continue
+    if (letter === 'R' || letter === 'C') {
+      const from = parts[1]
+      const to = parts[2]
+      if (!from || !to) continue
+      rows.push({ path: to, renamedFrom: from, status })
+    } else {
+      const path = parts.slice(1).join('\t')
+      if (!path) continue
+      rows.push({ path, status })
     }
+  }
+  return rows
+}
+
+async function collectAgainstHead(cwd: string): Promise<GitCollectResult> {
+  const [statusResult, unstagedDiff, stagedDiff] = await Promise.all([
+    $`git -C ${cwd} status --porcelain=v2 -b -z --untracked-files=all`.quiet().nothrow(),
+    $`git -C ${cwd} -c core.quotePath=false diff --numstat`.quiet().nothrow(),
+    $`git -C ${cwd} -c core.quotePath=false diff --cached --numstat`.quiet().nothrow(),
+  ])
 
-    const statusText = statusResult.text()
-    const { ahead, behind, branch } = parseBranchLines(statusText)
-    const unstagedNumstat = parseNumstat(unstagedDiff.text())
-    const stagedNumstat = parseNumstat(stagedDiff.text())
-    const files = parsePorcelainEntries(statusText, stagedNumstat, unstagedNumstat)
-    await annotateUntrackedCounts(cwd, files)
+  if (statusResult.exitCode !== 0) {
+    return { error: 'not-a-repo', kind: 'error' }
+  }
+
+  const statusText = statusResult.text()
+  const { ahead, behind, branch } = parseBranchLines(statusText)
+  const unstagedNumstat = parseNumstat(unstagedDiff.text())
+  const stagedNumstat = parseNumstat(stagedDiff.text())
+  const files = parsePorcelainEntries(statusText, stagedNumstat, unstagedNumstat)
+  await annotateUntrackedCounts(cwd, files)
 
-    return { kind: 'ok', payload: { ahead, behind, branch, files } }
+  return { kind: 'ok', payload: { ahead, behind, branch, files } }
+}
+
+async function collectAgainstHistorical(
+  cwd: string,
+  headOffset: number
+): Promise<GitCollectResult> {
+  const ref = `HEAD~${headOffset}`
+  const revParse = await $`git -C ${cwd} rev-parse ${ref}`.quiet().nothrow()
+  if (revParse.exitCode !== 0) {
+    const countResult = await $`git -C ${cwd} rev-list --count HEAD`.quiet().nothrow()
+    const count = countResult.exitCode === 0 ? Number.parseInt(countResult.text().trim(), 10) : NaN
+    const maxOffset = Number.isFinite(count) && count > 0 ? count - 1 : 0
+    return { kind: 'out-of-range', maxOffset }
+  }
+
+  const [statusResult, nameStatus, numstat, untrackedStatus] = await Promise.all([
+    $`git -C ${cwd} status --porcelain=v2 -b -z --untracked-files=all`.quiet().nothrow(),
+    $`git -C ${cwd} -c core.quotePath=false diff ${ref} --name-status`.quiet().nothrow(),
+    $`git -C ${cwd} -c core.quotePath=false diff ${ref} --numstat`.quiet().nothrow(),
+    $`git -C ${cwd} status --porcelain=v2 -z --untracked-files=all`.quiet().nothrow(),
+  ])
+
+  if (statusResult.exitCode !== 0) {
+    return { error: 'not-a-repo', kind: 'error' }
+  }
+
+  const { ahead, behind, branch } = parseBranchLines(statusResult.text())
+  const stats = parseNumstat(numstat.text())
+  const rows = parseNameStatus(nameStatus.text())
+  const files: GitFileEntry[] = rows.map((row) =>
+    buildEntry('historical', row.status, row.path, stats, row.renamedFrom)
+  )
+
+  // Untracked files live outside any commit — still surface them so `?` files
+  // don't vanish when the user walks history.
+  const porcelain = parsePorcelainEntries(untrackedStatus.text(), new Map(), new Map())
+  const untracked = porcelain.filter((f) => f.section === 'untracked')
+  await annotateUntrackedCounts(cwd, untracked)
+  files.push(...untracked)
+
+  return { kind: 'ok', payload: { ahead, behind, branch, files } }
+}
+
+export async function collectGitStatus(
+  cwd: string,
+  options: CollectOptions = {}
+): Promise<GitCollectResult> {
+  const headOffset = options.headOffset ?? 0
+  try {
+    return headOffset > 0
+      ? await collectAgainstHistorical(cwd, headOffset)
+      : await collectAgainstHead(cwd)
   } catch {
     return { error: 'unknown', kind: 'error' }
   }

package/src/pty/terminal-snapshot.ts

@@ -2,7 +2,7 @@ import type { Terminal } from '@xterm/headless'
 
 import type { TerminalLine, TerminalSnapshot, TerminalSpan } from '../state/types'
 
-import { theme } from '../ui/theme'
+import { getCurrentTheme } from '../ui/theme'
 
 const ANSI_PALETTE = [
   '#000000',
@@ -113,15 +113,15 @@ function buildLine(
     let bg = getColorHex(current.getBgColor(), bgMode)
 
     if (current.isInverse()) {
-      const resolvedFg = fg ?? theme.colors['editor.foreground']
-      const resolvedBg = bg ?? theme.colors['editor.background']
+      const resolvedFg = fg ?? getCurrentTheme().colors['editor.foreground']
+      const resolvedBg = bg ?? getCurrentTheme().colors['editor.background']
       ;[fg, bg] = [resolvedBg, resolvedFg]
     }
 
     const isCursorCell = cursorVisible && cursorColumn === column
     if (isCursorCell) {
-      const resolvedFg = fg ?? theme.colors['editor.foreground']
-      const resolvedBg = bg ?? theme.colors['editor.background']
+      const resolvedFg = fg ?? getCurrentTheme().colors['editor.foreground']
+      const resolvedBg = bg ?? getCurrentTheme().colors['editor.background']
       ;[fg, bg] = [resolvedBg, resolvedFg]
     }
 

package/src/state/git-tree.ts

@@ -1,6 +1,6 @@
 import type { GitFileEntry, GitFileListMode, GitFileSection } from './types'
 
-const SECTION_ORDER: GitFileSection[] = ['staged', 'unstaged', 'untracked']
+const SECTION_ORDER: GitFileSection[] = ['historical', 'staged', 'unstaged', 'untracked']
 
 interface GitTreeNode {
   files: GitFileEntry[]

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

@@ -62,6 +62,7 @@ export function emptyGitMode(): GitModeState {
     diffs: {},
     diffView: 'split',
     folds: {},
+    headOffset: 0,
     loading: {},
     pendingDeletePath: null,
     selectedEntryKey: null,
@@ -90,7 +91,18 @@ export function reduceGitModeState(state: AppState, action: AppAction): AppState
     }
     case 'exit-git-mode': {
       if (state.focusMode !== 'git') return state
-      return { ...state, focusMode: 'navigation' }
+      return {
+        ...state,
+        focusMode: 'navigation',
+        gitMode: {
+          ...state.gitMode,
+          actionMessage: null,
+          diffs: {},
+          folds: {},
+          headOffset: 0,
+          loading: {},
+        },
+      }
     }
     case 'git-mode-move-selection': {
       const next = moveGitSelection(
@@ -266,6 +278,37 @@ export function reduceGitModeState(state: AppState, action: AppAction): AppState
       const next = state.gitMode.diffView === 'split' ? 'stacked' : 'split'
       return { ...state, gitMode: { ...state.gitMode, diffView: next } }
     }
+    case 'git-mode-shift-head-offset': {
+      const next = Math.max(0, state.gitMode.headOffset + action.delta)
+      if (next === state.gitMode.headOffset) return state
+      return {
+        ...state,
+        gitMode: {
+          ...state.gitMode,
+          actionMessage: null,
+          diffs: {},
+          folds: {},
+          headOffset: next,
+          loading: {},
+          pendingDeletePath: null,
+        },
+      }
+    }
+    case 'git-mode-set-head-offset': {
+      const next = Math.max(0, action.offset)
+      if (next === state.gitMode.headOffset) return state
+      return {
+        ...state,
+        gitMode: {
+          ...state.gitMode,
+          diffs: {},
+          folds: {},
+          headOffset: next,
+          loading: {},
+          pendingDeletePath: null,
+        },
+      }
+    }
     case 'git-mode-fold-adjust': {
       const perPath = state.gitMode.folds[action.key] ?? {}
       const prev = perPath[action.foldId] ?? { bottom: 0, top: 0 }

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

@@ -5,7 +5,12 @@ import { reconcileSelectedGitEntryKey } from '../git-tree'
 export const GIT_PANEL_MIN_RATIO = 0.2
 export const GIT_PANEL_MAX_RATIO = 0.8
 
-const SECTION_RANK: Record<GitFileSection, number> = { staged: 0, unstaged: 1, untracked: 2 }
+const SECTION_RANK: Record<GitFileSection, number> = {
+  historical: 0,
+  staged: 1,
+  unstaged: 2,
+  untracked: 3,
+}
 
 export function sortFilesBySection(files: GitFileEntry[]): GitFileEntry[] {
   return [...files].sort((a, b) => {

package/src/state/types.ts

@@ -154,7 +154,7 @@ export interface GitPaneState {
 
 export type GitFileStatus = 'M' | 'A' | 'D' | 'R' | 'C' | 'U' | '?'
 
-export type GitFileSection = 'staged' | 'unstaged' | 'untracked'
+export type GitFileSection = 'staged' | 'unstaged' | 'untracked' | 'historical'
 
 export interface GitFileEntry {
   path: string
@@ -204,6 +204,8 @@ export interface GitModeState {
   actionMessage: string | null
   diffView: GitDiffView
   folds: Record<string, Record<string, FoldState>>
+  /** Working-tree-vs-HEAD~N offset. 0 = working tree vs HEAD (default). */
+  headOffset: number
 }
 
 interface ModalBase {
@@ -477,6 +479,8 @@ export type GitModeAction =
   | { type: 'git-mode-clear-diff-cache'; path: string }
   | { type: 'git-mode-set-message'; message: string | null }
   | { type: 'git-mode-toggle-diff-view' }
+  | { type: 'git-mode-shift-head-offset'; delta: number }
+  | { type: 'git-mode-set-head-offset'; offset: number }
   | {
       type: 'git-mode-fold-adjust'
       key: string

package/src/ui/components/create-session-modal.tsx

@@ -1,7 +1,7 @@
 import type { DirectoryResult } from '../../state/types'
 
 import { abbreviatePath } from '../path-format'
-import { theme } from '../theme'
+import { getCurrentTheme, useTheme } from '../theme'
 import { uiTokens } from '../ui-tokens'
 import { InputField } from './input-field'
 import { ListItem } from './list-item'
@@ -21,14 +21,14 @@ function getDirectoryResultIcon(result: DirectoryResult): string {
 
 function getDirectoryResultColor(result: DirectoryResult): string {
   if (result.type === 'worktree') {
-    return theme.colors['editorWarning.foreground']
+    return getCurrentTheme().colors['editorWarning.foreground']
   }
 
   if (result.type === 'workspace') {
-    return theme.colors['terminal.ansiMagenta']
+    return getCurrentTheme().colors['terminal.ansiMagenta']
   }
 
-  return theme.colors['textLink.foreground']
+  return getCurrentTheme().colors['textLink.foreground']
 }
 
 interface CreateSessionModalProps {
@@ -48,6 +48,7 @@ export function CreateSessionModal({
   selectedIndex,
   sessionName,
 }: CreateSessionModalProps) {
+  const theme = useTheme()
   const dirActive = activeField === 'directory'
   const nameActive = activeField === 'name'
 

package/src/ui/components/diff-renderer/fold-strip.tsx

@@ -1,4 +1,4 @@
-import { theme } from '../../theme'
+import { useTheme } from '../../theme'
 import { FOLD_STEP, type FoldInfo } from './build-rows'
 import { type FoldDispatch } from './pierre-diff'
 
@@ -8,6 +8,7 @@ interface Props {
 }
 
 function Button({ label, onPress }: { label: string; onPress: () => void }) {
+  const theme = useTheme()
   return (
     <box
       paddingLeft={1}
@@ -25,6 +26,7 @@ function Spacer() {
 }
 
 export function FoldStrip({ dispatch, fold }: Props) {
+  const theme = useTheme()
   const { bottomExpanded, foldId, hidden, topExpanded, total } = fold
   const stepUp = Math.min(FOLD_STEP, hidden)
   const stepDown = Math.min(FOLD_STEP, hidden)

package/src/ui/components/diff-renderer/pierre-diff.tsx

@@ -9,7 +9,7 @@ import type { ThemeId } from '../../themes'
 import { parsePatchFiles } from '../../../diff-parser'
 import { useAppStore } from '../../../state/app-store'
 import { dispatchGlobal } from '../../../state/dispatch-ref'
-import { theme } from '../../theme'
+import { useTheme } from '../../theme'
 import { buildSplitRows, buildUnifiedRows, firstChangeRowOffset, gutterWidth } from './build-rows'
 import { filetypeFromPath } from './filetype'
 import { tokenizeSide } from './highlight'
@@ -48,6 +48,7 @@ export const PierreDiff = forwardRef<PierreDiffHandle, Props>(function PierreDif
   { cacheKey, diff, path, themeId, view },
   ref
 ) {
+  const theme = useTheme()
   const file = useMemo(() => {
     const patches = parsePatchFiles(diff)
     return patches[0]?.files[0]

package/src/ui/components/diff-renderer/split-view.tsx

@@ -13,7 +13,7 @@ import type { DiffHighlights, FoldDispatch } from './pierre-diff'
 
 import { getScrollViewportDelta } from '../../../app-runtime/terminal-mouse-adapter'
 import { scrollGitDiff } from '../../git-view-controls'
-import { theme } from '../../theme'
+import { useTheme } from '../../theme'
 import { buildSplitRows, gutterWidth, type SplitCell, type SplitRowOrHeader } from './build-rows'
 import { FoldStrip } from './fold-strip'
 import { tokenToSpan } from './highlight'
@@ -43,6 +43,7 @@ export const SplitView = forwardRef<SplitViewHandle, Props>(function SplitView(
   { contentWidth, file, foldDispatch, folds, highlights },
   ref
 ) {
+  const theme = useTheme()
   const leftRef = useRef<ScrollBoxRenderable | null>(null)
   const rightRef = useRef<ScrollBoxRenderable | null>(null)
 
@@ -132,6 +133,7 @@ function SideRow({
 }
 
 function HunkHeaderRow({ row }: { row: Extract<SplitRowOrHeader, { type: 'hunk-header' }> }) {
+  const theme = useTheme()
   return (
     <box
       flexDirection="row"
@@ -158,6 +160,7 @@ function HalfRow({
   height: number
   tokens: ThemedToken[][]
 }) {
+  const theme = useTheme()
   if (cell.type === 'filler') {
     return <box backgroundColor={theme.colors['sideBarSectionHeader.background']} height={height} />
   }
@@ -185,6 +188,7 @@ function HalfRow({
 }
 
 function LineContent({ content, tokens }: { content: string; tokens: ThemedToken[] | undefined }) {
+  const theme = useTheme()
   if (!tokens || tokens.length === 0) {
     return <text fg={theme.colors['editor.foreground']}>{content}</text>
   }

package/src/ui/components/diff-renderer/stacked-view.tsx

@@ -13,7 +13,7 @@ import type { DiffHighlights, FoldDispatch } from './pierre-diff'
 
 import { getScrollViewportDelta } from '../../../app-runtime/terminal-mouse-adapter'
 import { scrollGitDiff } from '../../git-view-controls'
-import { theme } from '../../theme'
+import { useTheme } from '../../theme'
 import { buildUnifiedRows, gutterWidth, type UnifiedRowOrHeader } from './build-rows'
 import { FoldStrip } from './fold-strip'
 import { tokenToSpan } from './highlight'
@@ -90,6 +90,7 @@ function UnifiedRowRender({
   highlights: DiffHighlights
   row: UnifiedRowOrHeader
 }) {
+  const theme = useTheme()
   if (row.type === 'hunk-header') {
     return (
       <box
@@ -144,6 +145,7 @@ function UnifiedRowRender({
 }
 
 function LineContent({ content, tokens }: { content: string; tokens: ThemedToken[] | undefined }) {
+  const theme = useTheme()
   if (!tokens || tokens.length === 0) {
     return <text fg={theme.colors['editor.foreground']}>{content}</text>
   }

package/src/ui/components/git-commit-modal.tsx

@@ -1,4 +1,4 @@
-import { theme } from '../theme'
+import { useTheme } from '../theme'
 import { uiTokens } from '../ui-tokens'
 import { InputField } from './input-field'
 import { ModalShell } from './modal-shell'
@@ -11,6 +11,7 @@ interface GitCommitModalProps {
 }
 
 export function GitCommitModal({ activeField, body, cursorPos, title }: GitCommitModalProps) {
+  const theme = useTheme()
   const titleActive = activeField === 'title'
   const bodyActive = activeField === 'body'
 

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

@@ -23,7 +23,7 @@ export const GitPaneWidget = memo(function GitPaneWidget({ pollingEnabled }: Git
     : undefined
   const projectPath = currentSession?.projectPath
 
-  useGitPanelPolling({ enabled: pollingEnabled, projectPath })
+  useGitPanelPolling({ enabled: pollingEnabled, headOffset: 0, projectPath })
 
   const lastGoodRef = useRef<GitPanelState | null>(null)
   const prevProjectPathRef = useRef(projectPath)