@brimveyn/aimux 1.6.1 → 1.7.0

package/src/state/reducers/session-state.ts

@@ -64,8 +64,8 @@ export function reduceSessionState(state: AppState, action: AppAction): AppState
       const filteredNew = filterSessions(newSessions, state.modal.editBuffer)
       const maxIndex = filteredNew.length
       const clampedIndex = Math.min(state.modal.selectedIndex, maxIndex)
-      const nextBusy = { ...state.sessionsBusy }
-      delete nextBusy[action.sessionId]
+      const nextStatuses = { ...state.sessionStatuses }
+      delete nextStatuses[action.sessionId]
       return {
         ...state,
         activeTabId: action.sessionId === state.currentSessionId ? null : state.activeTabId,
@@ -79,7 +79,7 @@ export function reduceSessionState(state: AppState, action: AppAction): AppState
           type: 'session-picker',
         },
         sessions: newSessions,
-        sessionsBusy: nextBusy,
+        sessionStatuses: nextStatuses,
         tabs: action.sessionId === state.currentSessionId ? [] : state.tabs,
       }
     }
@@ -101,11 +101,18 @@ export function reduceSessionState(state: AppState, action: AppAction): AppState
       }
       return { ...state, sessions: ordered }
     }
-    case 'set-session-busy': {
-      if ((state.sessionsBusy[action.sessionId] ?? false) === action.busy) return state
+    case 'set-session-status': {
+      const prev = state.sessionStatuses[action.sessionId]
+      if (
+        prev !== undefined &&
+        prev.working === action.status.working &&
+        prev.waiting === action.status.waiting
+      ) {
+        return state
+      }
       return {
         ...state,
-        sessionsBusy: { ...state.sessionsBusy, [action.sessionId]: action.busy },
+        sessionStatuses: { ...state.sessionStatuses, [action.sessionId]: action.status },
       }
     }
     default:

package/src/state/reducers/tab-state.ts

@@ -432,16 +432,6 @@ export function reduceTabState(state: AppState, action: AppAction): AppState | n
         ...state,
         tabs: updateTab(state.tabs, action.tabId, (tab) => ({ ...tab, activity: action.activity })),
       }
-    case 'set-tab-status':
-      return {
-        ...state,
-        tabs: updateTab(state.tabs, action.tabId, (tab) => ({
-          ...tab,
-          activity: action.status === 'running' ? tab.activity : undefined,
-          exitCode: action.exitCode,
-          status: action.status,
-        })),
-      }
     case 'set-tab-error':
       return {
         ...state,

package/src/state/selectors.ts

@@ -1,5 +1,17 @@
+import type { AssistantOption } from '../pty/command-registry'
 import type { SessionRecord, SnippetRecord } from './types'
 
+export function filterAssistants(
+  options: AssistantOption[],
+  filter: string | null
+): AssistantOption[] {
+  if (!filter) return options
+  const lower = filter.toLowerCase()
+  return options.filter(
+    (o) => o.label.toLowerCase().includes(lower) || o.description.toLowerCase().includes(lower)
+  )
+}
+
 export function filterSessions(sessions: SessionRecord[], filter: string | null): SessionRecord[] {
   if (!filter) {
     return sessions

package/src/state/session-persistence.ts

@@ -20,7 +20,7 @@ export function createEmptyWorkspaceSnapshot(): WorkspaceSnapshotV1 {
   }
 }
 
-function getDisconnectedStatus(status: WorkspaceSnapshotV1['tabs'][number]['status']): TabStatus {
+function getDisconnectedStatus(status: TabStatus): TabStatus {
   if (status === 'running' || status === 'starting') {
     return 'disconnected'
   }
@@ -61,20 +61,25 @@ export function restoreTabsFromWorkspace(snapshot: WorkspaceSnapshotV1 | undefin
     return []
   }
 
-  return snapshot.tabs.map((tab) => ({
-    activity: 'idle',
-    assistant: tab.assistant,
-    buffer: tab.buffer,
-    command: tab.command,
-    errorMessage: tab.errorMessage,
-    exitCode: tab.exitCode,
-    id: tab.id,
-    scrollIntent: tab.scrollIntent ?? DEFAULT_SCROLL_INTENT,
-    status: getDisconnectedStatus(tab.status),
-    terminalModes: tab.terminalModes,
-    title: tab.title,
-    viewport: tab.viewport,
-  }))
+  return snapshot.tabs
+    .filter(
+      (tab): tab is typeof tab & { status: Exclude<typeof tab.status, 'exited'> } =>
+        tab.status !== 'exited'
+    )
+    .map((tab) => ({
+      activity: 'idle',
+      assistant: tab.assistant,
+      buffer: tab.buffer,
+      command: tab.command,
+      errorMessage: tab.errorMessage,
+      exitCode: tab.exitCode,
+      id: tab.id,
+      scrollIntent: tab.scrollIntent ?? DEFAULT_SCROLL_INTENT,
+      status: getDisconnectedStatus(tab.status),
+      terminalModes: tab.terminalModes,
+      title: tab.title,
+      viewport: tab.viewport,
+    }))
 }
 
 export function restoreLayoutTrees(

package/src/state/store.ts

@@ -38,7 +38,9 @@ const DEFAULT_GIT_PANE: GitPaneState = {
   mode: 'embedded',
   path: { enabled: true },
   position: 'bottom',
+  prefetchRadius: 5,
   ratio: 0.5,
+  treeCompaction: true,
   visible: true,
 }
 
@@ -65,7 +67,7 @@ export function createInitialState(
     activeTabId: null,
     currentSessionId: null,
     customCommands,
-    focusMode: showSessionPicker ? 'modal' : 'navigation',
+    focusMode: showSessionPicker ? 'command-edit' : 'navigation',
     gitMode: { ...emptyGitMode(), ...overrides.gitMode },
     gitPane: {
       ...DEFAULT_GIT_PANE,
@@ -80,7 +82,13 @@ export function createInitialState(
     },
     layoutTrees: {},
     modal: showSessionPicker
-      ? { editBuffer: null, selectedIndex: 0, sessionTargetId: null, type: 'session-picker' }
+      ? {
+          cursorPos: 0,
+          editBuffer: '',
+          selectedIndex: 0,
+          sessionTargetId: null,
+          type: 'session-picker',
+        }
       : emptyModal(),
     pendingChords: null,
     sessionBar: {
@@ -88,7 +96,7 @@ export function createInitialState(
       visible: overrides.sessionBarVisible ?? true,
     },
     sessions,
-    sessionsBusy: {},
+    sessionStatuses: {},
     sidebar: {
       maxWidth: DEFAULT_SIDEBAR_MAX_WIDTH,
       minWidth: DEFAULT_SIDEBAR_MIN_WIDTH,
@@ -123,6 +131,8 @@ export function appReducer(state: AppState, action: AppAction): AppState {
   switch (action.type) {
     case 'set-snippets':
       return { ...state, snippets: action.snippets }
+    case 'set-custom-commands':
+      return { ...state, customCommands: action.customCommands }
     case 'delete-snippet': {
       const newSnippets = state.snippets.filter((s) => s.id !== action.snippetId)
       const filteredNew = filterSnippets(newSnippets, state.modal.editBuffer)

package/src/state/types.ts

@@ -1,12 +1,33 @@
 import type { ModeId } from '@brimveyn/aimux-config'
+import type { ThemedToken } from 'shiki'
+
+import type { FileDiffMetadata } from '../diff-parser'
 
 export type BuiltinAssistantId = 'claude' | 'codex' | 'opencode' | 'terminal'
 
 export type AssistantId = BuiltinAssistantId | (string & {})
 
-export type TabStatus = 'starting' | 'running' | 'disconnected' | 'exited' | 'error'
+export type TabStatus = 'starting' | 'running' | 'disconnected' | 'error'
+
+/**
+ * Status values that may appear in legacy on-disk workspace snapshots but are
+ * not produced by the running app anymore. Filtered at restore time.
+ */
+export type LegacyPersistedTabStatus = TabStatus | 'exited'
+
+export type TabActivity = 'working' | 'waiting-input' | 'idle'
+
+/**
+ * Per-session status flags. Both can be true at once (e.g. one tab working,
+ * another waiting for user input) so we keep them as independent booleans
+ * rather than a single priority enum.
+ */
+export interface SessionStatus {
+  working: boolean
+  waiting: boolean
+}
 
-export type TabActivity = 'busy' | 'idle'
+export const IDLE_SESSION_STATUS: SessionStatus = { waiting: false, working: false }
 
 export type FocusMode = 'navigation' | 'terminal-input' | 'modal' | 'command-edit' | 'git'
 
@@ -69,7 +90,7 @@ export interface PersistedTabSnapshot {
   assistant: AssistantId
   title: string
   command: string
-  status: Exclude<TabStatus, 'disconnected'>
+  status: Exclude<LegacyPersistedTabStatus, 'disconnected'>
   buffer: string
   viewport?: TerminalSnapshot
   terminalModes: TerminalModeState
@@ -148,8 +169,11 @@ export interface GitPaneState {
   ratio: number
   diffModeRatio: number
   fileListMode: GitFileListMode
+  treeCompaction: boolean
   path: GitPanePathConfig
   diffCount: GitPaneDiffCountConfig
+  /** Prefetch this many neighbours around the selection. 0 disables prefetch. */
+  prefetchRadius: number
 }
 
 export type GitFileStatus = 'M' | 'A' | 'D' | 'R' | 'C' | 'U' | '?'
@@ -195,10 +219,45 @@ export interface FoldState {
   bottom: number
 }
 
+export interface ParsedDiffEntry {
+  hash: string
+  // Stored as unknown at the state boundary; concrete type is FileDiffMetadata
+  // | null, narrowed at read sites via getParsedFile().
+  file: unknown
+}
+
+export interface HighlightsEntry {
+  hash: string
+  themeId: string
+  // See ParsedDiffEntry note — narrowed via getHighlights().
+  add: unknown
+  del: unknown
+}
+
+export function getParsedFile(entry: ParsedDiffEntry | undefined): FileDiffMetadata | null {
+  if (!entry) return null
+  return entry.file as FileDiffMetadata | null
+}
+
+export function getHighlightsTokens(entry: HighlightsEntry | undefined): {
+  add: ThemedToken[][]
+  del: ThemedToken[][]
+} | null {
+  if (!entry) return null
+  return {
+    add: entry.add as ThemedToken[][],
+    del: entry.del as ThemedToken[][],
+  }
+}
+
 export interface GitModeState {
   selectedEntryKey: string | null
   collapsedFolders: Record<string, true>
   diffs: Record<string, DiffData>
+  /** Parsed diff keyed by fileKey. Invalidated on file change or head offset shift. */
+  parsedFiles: Record<string, ParsedDiffEntry>
+  /** Tokenised highlights keyed by `${fileKey}|${themeId}`. */
+  highlights: Record<string, HighlightsEntry>
   loading: Record<string, boolean>
   pendingDeletePath: string | null
   actionMessage: string | null
@@ -223,6 +282,7 @@ export interface ModalClosed extends ModalBase {
 
 export interface ModalNewTab extends ModalBase {
   type: 'new-tab'
+  editingCommand: AssistantId | null
 }
 
 export interface ModalSessionPicker extends ModalBase {
@@ -269,6 +329,7 @@ export interface ModalCreateSession extends ModalBase {
   pendingProjectPath: string | null
   activeField: 'directory' | 'name'
   nameBuffer: string
+  returnToSessionPicker: boolean
 }
 
 export interface ModalSnippetEditor extends ModalBase {
@@ -323,7 +384,7 @@ export interface AppState {
   tabGroupMap: Record<string, string>
   sessions: SessionRecord[]
   currentSessionId: string | null
-  sessionsBusy: Record<string, boolean>
+  sessionStatuses: Record<string, SessionStatus>
   sessionBar: SessionBarState
   snippets: SnippetRecord[]
   focusMode: FocusMode
@@ -342,31 +403,27 @@ export interface AppState {
 export type ModalAction =
   | { type: 'move-modal-cursor'; delta?: number; to?: 'home' | 'end' }
   | { type: 'open-new-tab-modal' }
+  | { type: 'open-edit-custom-command'; assistantId: AssistantId }
   | { type: 'open-help-modal'; scope?: ModeId }
   | { type: 'open-split-picker'; direction: import('./layout-tree').SplitDirection }
   | { type: 'open-session-picker' }
   | { type: 'open-session-name-modal'; sessionTargetId?: string; initialName?: string }
   | { type: 'close-modal' }
   | { type: 'move-modal-selection'; delta: number }
-  | { type: 'begin-command-edit' }
   | { type: 'update-command-edit'; char: string }
-  | { type: 'commit-command-edit' }
   | { type: 'cancel-command-edit' }
-  | { type: 'open-create-session-modal' }
+  | { type: 'open-create-session-modal'; returnToSessionPicker: boolean }
   | { type: 'set-directory-results'; results: DirectoryResult[] }
   | { type: 'switch-create-session-field' }
   | { type: 'select-directory' }
-  | { type: 'begin-session-filter' }
   | { type: 'open-rename-tab-modal' }
   | { type: 'open-snippet-picker' }
   | { type: 'open-snippet-editor'; snippetId?: string }
-  | { type: 'begin-snippet-filter' }
-  | { type: 'begin-help-filter' }
-  | { type: 'begin-theme-filter' }
   | { type: 'set-help-entry-count'; count: number }
   | { type: 'set-theme-entry-count'; count: number }
   | { type: 'open-theme-picker' }
   | { type: 'open-update-available-modal'; currentVersion: string; latestVersion: string }
+  | { type: 'set-modal-selection-index'; index: number }
 
 // -- Session actions --
 export type SessionAction =
@@ -376,7 +433,7 @@ export type SessionAction =
   | { type: 'rename-session-record'; sessionId: string; name: string }
   | { type: 'delete-session-record'; sessionId: string }
   | { type: 'reorder-sessions'; orderedIds: string[] }
-  | { type: 'set-session-busy'; sessionId: string; busy: boolean }
+  | { type: 'set-session-status'; sessionId: string; status: SessionStatus }
 
 // -- Tab actions --
 export type TabAction =
@@ -406,7 +463,6 @@ export type TabAction =
     }
   | { type: 'set-scroll-intent'; tabId: string; intent: ScrollIntent }
   | { type: 'set-tab-activity'; tabId: string; activity?: TabActivity }
-  | { type: 'set-tab-status'; tabId: string; status: TabStatus; exitCode?: number }
   | { type: 'set-tab-error'; tabId: string; message: string }
 
 // -- Layout actions --
@@ -473,7 +529,23 @@ export type GitModeAction =
   | { type: 'git-mode-collapse-selection' }
   | { type: 'git-mode-expand-selection' }
   | { type: 'git-mode-toggle-file-list-mode' }
-  | { type: 'git-mode-set-diff'; key: string; diff: DiffData }
+  | { type: 'git-mode-toggle-tree-compaction' }
+  | { type: 'git-mode-set-diff'; key: string; diff: DiffData; hash: string }
+  | {
+      type: 'git-mode-set-parsed'
+      key: string
+      hash: string
+      file: unknown
+    }
+  | {
+      type: 'git-mode-set-highlights'
+      key: string
+      hash: string
+      themeId: string
+      add: unknown
+      del: unknown
+    }
+  | { type: 'git-mode-invalidate-diffs'; paths: string[] }
   | { type: 'git-mode-set-loading'; key: string; loading: boolean }
   | { type: 'git-mode-set-pending-delete'; path: string | null }
   | { type: 'git-mode-clear-diff-cache'; path: string }
@@ -501,6 +573,7 @@ export type GitModeAction =
 export type DataAction =
   | { type: 'set-snippets'; snippets: SnippetRecord[] }
   | { type: 'delete-snippet'; snippetId: string }
+  | { type: 'set-custom-commands'; customCommands: Record<AssistantId, string> }
 
 export type AppAction =
   | ModalAction

package/src/ui/breaking-update-screen.tsx

@@ -0,0 +1,31 @@
+import { useKeyboard } from '@opentui/react'
+
+import { ListItem } from './components/list-item'
+import { ModalShell } from './components/modal-shell'
+import { uiTokens } from './ui-tokens'
+
+interface BreakingUpdateScreenProps {
+  onConfirm: () => void
+}
+
+export function BreakingUpdateScreen({ onConfirm }: BreakingUpdateScreenProps) {
+  useKeyboard((key) => {
+    if (key.name === 'return') {
+      key.preventDefault()
+      onConfirm()
+    }
+  })
+
+  return (
+    <ModalShell title="Breaking update detected" width={uiTokens.modalWidth.md}>
+      <box flexDirection="column" gap={1}>
+        <box flexDirection="column" gap={0}>
+          <text>{"We're sorry, but this update contains breaking protocol changes."}</text>
+          <text>The terminal manager must be restarted.</text>
+          <text>You will lose your current terminal states.</text>
+        </box>
+        <ListItem active direction="row" title={<text>OK — Restart terminal manager</text>} />
+      </box>
+    </ModalShell>
+  )
+}

package/src/ui/components/bare-input.tsx

@@ -0,0 +1,44 @@
+import { useTheme } from '../theme'
+
+interface BareInputProps {
+  value: string
+  cursorPos?: number
+  placeholder?: string
+}
+
+export function BareInput({ cursorPos, placeholder = '', value }: BareInputProps) {
+  const theme = useTheme()
+  const fg = theme.colors['editor.foreground']
+  const bg = theme.colors['editor.background']
+  const placeholderFg = theme.colors['editorLineNumber.foreground']
+
+  if (!value) {
+    const firstChar = placeholder.charAt(0) || ' '
+    const rest = placeholder.slice(1)
+    return (
+      <text>
+        <span bg={fg} fg={bg}>
+          {firstChar}
+        </span>
+        <span fg={placeholderFg}>{rest}</span>
+      </text>
+    )
+  }
+
+  const safePos =
+    cursorPos === undefined ? value.length : Math.max(0, Math.min(value.length, cursorPos))
+  const before = value.slice(0, safePos)
+  const cursorOnEnd = safePos >= value.length
+  const cursorChar = cursorOnEnd ? ' ' : value.charAt(safePos)
+  const after = cursorOnEnd ? '' : value.slice(safePos + 1)
+
+  return (
+    <text fg={fg}>
+      {before}
+      <span bg={fg} fg={bg}>
+        {cursorChar}
+      </span>
+      {after}
+    </text>
+  )
+}

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

@@ -7,6 +7,8 @@ import { InputField } from './input-field'
 import { ListItem } from './list-item'
 import { ModalShell } from './modal-shell'
 
+const VISIBLE_ROWS = 8
+
 function getDirectoryResultIcon(result: DirectoryResult): string {
   if (result.type === 'worktree') {
     return '\u{e728}'
@@ -52,6 +54,9 @@ export function CreateSessionModal({
   const dirActive = activeField === 'directory'
   const nameActive = activeField === 'name'
 
+  const scrollOffset = Math.max(0, selectedIndex - VISIBLE_ROWS + 1)
+  const visibleResults = results.slice(scrollOffset, scrollOffset + VISIBLE_ROWS)
+
   return (
     <ModalShell
       title="Create session"
@@ -66,19 +71,21 @@ export function CreateSessionModal({
         </text>
         <InputField
           active={dirActive}
+          placeholder="Type a project name..."
           value={
             pendingProjectPath && !dirActive ? abbreviatePath(pendingProjectPath) : directoryQuery
           }
         />
       </box>
 
-      {dirActive && results.length === 0 && directoryQuery.length > 0 ? (
-        <text fg={theme.colors['descriptionForeground']}>No matches</text>
-      ) : null}
-
-      {dirActive
-        ? results.map((result, index) => {
-            const active = index === selectedIndex
+      <box flexDirection="column" height={VISIBLE_ROWS}>
+        {results.length === 0 ? (
+          <text fg={theme.colors['descriptionForeground']}>
+            {directoryQuery.length > 0 ? 'No matches' : 'Type a project name to search...'}
+          </text>
+        ) : (
+          visibleResults.map((result, index) => {
+            const active = dirActive && scrollOffset + index === selectedIndex
             return (
               <ListItem
                 key={result.path}
@@ -100,7 +107,8 @@ export function CreateSessionModal({
               />
             )
           })
-        : null}
+        )}
+      </box>
 
       <box flexDirection="column">
         <text

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

@@ -1,4 +1,4 @@
-import { useTheme } from '../../theme'
+import { useBg, useTheme } from '../../theme'
 import { FOLD_STEP, type FoldInfo } from './build-rows'
 import { type FoldDispatch } from './pierre-diff'
 
@@ -9,13 +9,9 @@ interface Props {
 
 function Button({ label, onPress }: { label: string; onPress: () => void }) {
   const theme = useTheme()
+  const bg = useBg('sideBar.background')
   return (
-    <box
-      paddingLeft={1}
-      paddingRight={1}
-      backgroundColor={theme.colors['sideBar.background']}
-      onMouseDown={onPress}
-    >
+    <box paddingLeft={1} paddingRight={1} backgroundColor={bg} onMouseDown={onPress}>
       <text fg={theme.colors['textLink.foreground']}>{label}</text>
     </box>
   )
@@ -27,6 +23,7 @@ function Spacer() {
 
 export function FoldStrip({ dispatch, fold }: Props) {
   const theme = useTheme()
+  const headerBg = useBg('sideBarSectionHeader.background')
   const { bottomExpanded, foldId, hidden, topExpanded, total } = fold
   const stepUp = Math.min(FOLD_STEP, hidden)
   const stepDown = Math.min(FOLD_STEP, hidden)
@@ -73,12 +70,7 @@ export function FoldStrip({ dispatch, fold }: Props) {
   }
 
   return (
-    <box
-      flexDirection="row"
-      backgroundColor={theme.colors['sideBarSectionHeader.background']}
-      paddingLeft={1}
-      paddingRight={1}
-    >
+    <box flexDirection="row" backgroundColor={headerBg} paddingLeft={1} paddingRight={1}>
       <text fg={theme.colors['descriptionForeground']}>{`⋯ ${hidden} hidden `}</text>
       {controls}
     </box>

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

@@ -1,20 +1,18 @@
 import type { ScrollBoxRenderable } from '@opentui/core'
 import type { ThemedToken } from 'shiki'
 
-import { forwardRef, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react'
+import { forwardRef, useEffect, useImperativeHandle, useMemo, useRef } from 'react'
 
-import type { FoldState } from '../../../state/types'
 import type { ThemeId } from '../../themes'
 
-import { parsePatchFiles } from '../../../diff-parser'
 import { useAppStore } from '../../../state/app-store'
 import { dispatchGlobal } from '../../../state/dispatch-ref'
+import { type FoldState } from '../../../state/types'
 import { useTheme } from '../../theme'
 import { buildSplitRows, buildUnifiedRows, firstChangeRowOffset, gutterWidth } from './build-rows'
-import { filetypeFromPath } from './filetype'
-import { tokenizeSide } from './highlight'
 import { SplitView, type SplitViewHandle } from './split-view'
 import { StackedView, type StackedViewHandle } from './stacked-view'
+import { useDiffPreparation } from './use-diff-preparation'
 
 export type DiffView = 'split' | 'stacked'
 
@@ -41,7 +39,6 @@ interface Props {
   view: DiffView
 }
 
-const EMPTY_HIGHLIGHTS: DiffHighlights = { add: [], del: [] }
 const EMPTY_FOLDS: Record<string, FoldState> = {}
 
 export const PierreDiff = forwardRef<PierreDiffHandle, Props>(function PierreDiff(
@@ -49,12 +46,9 @@ export const PierreDiff = forwardRef<PierreDiffHandle, Props>(function PierreDif
   ref
 ) {
   const theme = useTheme()
-  const file = useMemo(() => {
-    const patches = parsePatchFiles(diff)
-    return patches[0]?.files[0]
-  }, [diff])
-
-  const filetype = useMemo(() => filetypeFromPath(path), [path])
+  const preparation = useDiffPreparation(cacheKey, diff, path, themeId)
+  const file = preparation.file ?? undefined
+  const highlights: DiffHighlights = preparation.highlights
 
   const terminalCols = useAppStore((s) => s.layout.terminalCols)
   const sidebarWidth = useAppStore((s) => s.sidebar.width)
@@ -78,24 +72,6 @@ export const PierreDiff = forwardRef<PierreDiffHandle, Props>(function PierreDif
     [cacheKey]
   )
 
-  const [highlights, setHighlights] = useState<DiffHighlights>(EMPTY_HIGHLIGHTS)
-
-  useEffect(() => {
-    setHighlights(EMPTY_HIGHLIGHTS)
-    if (!file || !filetype) return
-    let cancelled = false
-    void Promise.all([
-      tokenizeSide(file.additionLines, filetype, themeId),
-      tokenizeSide(file.deletionLines, filetype, themeId),
-    ]).then(([add, del]) => {
-      if (cancelled) return
-      setHighlights({ add, del })
-    })
-    return () => {
-      cancelled = true
-    }
-  }, [file, filetype, themeId])
-
   const splitRef = useRef<SplitViewHandle | null>(null)
   const stackedRef = useRef<StackedViewHandle | null>(null)
 
@@ -141,7 +117,9 @@ export const PierreDiff = forwardRef<PierreDiffHandle, Props>(function PierreDif
   if (!file) {
     return (
       <box flexGrow={1} padding={1}>
-        <text fg={theme.colors['descriptionForeground']}>(could not parse diff)</text>
+        <text fg={theme.colors['descriptionForeground']}>
+          {preparation.preparing ? 'Preparing diff…' : '(could not parse diff)'}
+        </text>
       </box>
     )
   }