@brimveyn/aimux 1.12.2 → 1.13.0

package/src/state/types.ts

@@ -1,7 +1,9 @@
-import type { ModeId } from '@brimveyn/aimux-config'
+import type { ModeId, SnippetVar } from '@brimveyn/aimux-config'
 import type { ThemedToken } from 'shiki'
 
-export type BuiltinAssistantId = 'claude' | 'codex' | 'opencode' | 'terminal'
+import type { LayoutNode, SplitDirection } from './layout-tree'
+
+export type BuiltinAssistantId = 'claude' | 'codex' | 'opencode' | 'terminal' | 'antigravity'
 
 export type AssistantId = BuiltinAssistantId | (string & {})
 
@@ -43,6 +45,7 @@ export type ModalType =
   | 'git-commit'
   | 'update-available'
   | 'ai-usage'
+  | 'worktree-move'
   | null
 
 export interface TerminalSpan {
@@ -97,6 +100,7 @@ export interface PersistedTabSnapshot {
   scrollIntent?: ScrollIntent
   errorMessage?: string
   exitCode?: number
+  worktreeId?: string
 }
 
 export interface WorkspaceSnapshotV1 {
@@ -108,11 +112,28 @@ export interface WorkspaceSnapshotV1 {
     width: number
   }
   tabs: PersistedTabSnapshot[]
-  layoutTree?: import('./layout-tree').LayoutNode
-  layoutTrees?: Record<string, import('./layout-tree').LayoutNode>
+  layoutTree?: LayoutNode
+  layoutTrees?: Record<string, LayoutNode>
   tabGroupMap?: Record<string, string>
 }
 
+export type WorktreeSource = 'primary' | 'aimux-temp' | 'external'
+
+export interface WorktreeRecord {
+  id: string
+  name: string
+  path: string
+  repoRoot: string
+  branch?: string
+  baseRef?: string
+  commitSha?: string
+  source: WorktreeSource
+  createdByAimux: boolean
+  color?: string
+  createdAt: string
+  updatedAt: string
+}
+
 export interface SessionRecord {
   id: string
   name: string
@@ -122,6 +143,8 @@ export interface SessionRecord {
   lastOpenedAt: string
   order?: number
   workspaceSnapshot?: WorkspaceSnapshotV1
+  worktrees?: WorktreeRecord[]
+  activeWorktreeId?: string
 }
 
 export type SessionBarPosition = 'top' | 'bottom'
@@ -144,6 +167,7 @@ export interface TabSession {
   command: string
   errorMessage?: string
   exitCode?: number
+  worktreeId?: string
 }
 
 export interface SidebarState {
@@ -160,7 +184,9 @@ export type GitPanePathConfig =
   | { enabled: false }
   | { enabled: true; pathFn?: (path: string) => string }
 
-export type GitPaneDiffCountConfig = { enabled: boolean }
+export interface GitPaneDiffCountConfig {
+  enabled: boolean
+}
 
 export interface GitPaneState {
   visible: boolean
@@ -271,6 +297,8 @@ export interface GitModeState {
   folds: Record<string, Record<string, FoldState>>
   /** Working-tree-vs-HEAD~N offset. 0 = working tree vs HEAD (default). */
   headOffset: number
+  /** When true, diff the active worktree's working tree against its fork point. */
+  reviewBase: boolean
 }
 
 interface ModalBase {
@@ -289,6 +317,16 @@ export interface ModalClosed extends ModalBase {
 export interface ModalNewTab extends ModalBase {
   type: 'new-tab'
   editingCommand: AssistantId | null
+  activeField: 'assistant' | 'branch-name' | 'target-worktree' | 'worktree-name'
+  branchError: string | null
+  branchName: string
+  createWorktree: boolean
+  selectedAssistantId: AssistantId | null
+  step: 'assistant' | 'worktree' | 'worktree-create'
+  targetWorktreeIndex: number
+  worktreeDeleteConfirmId: string | null
+  worktreeDeleteMessage: string | null
+  worktreeName: string
 }
 
 export interface ModalSessionPicker extends ModalBase {
@@ -306,6 +344,11 @@ export interface ModalRenameTab extends ModalBase {
 
 export interface ModalSnippetPicker extends ModalBase {
   type: 'snippet-picker'
+  /**
+   * Transient status line shown at the bottom of the picker (e.g. error from
+   * an open-in-editor attempt). Cleared automatically when the modal closes.
+   */
+  actionMessage?: string | null
 }
 
 export interface ModalThemePicker extends ModalBase {
@@ -321,7 +364,7 @@ export interface ModalHelp extends ModalBase {
 
 export interface ModalSplitPicker extends ModalBase {
   type: 'split-picker'
-  splitDirection: import('./layout-tree').SplitDirection
+  splitDirection: SplitDirection
 }
 
 export interface ModalGitCommit extends ModalBase {
@@ -342,7 +385,12 @@ export interface ModalCreateSession extends ModalBase {
 
 export interface ModalSnippetEditor extends ModalBase {
   type: 'snippet-editor'
-  activeField: 'name' | 'content'
+  activeField: 'name' | 'trigger' | 'content'
+  /** Persisted value of the name field when it is not the active editor. */
+  nameBuffer: string
+  /** Persisted value of the trigger field when it is not the active editor. */
+  triggerBuffer: string
+  /** Persisted value of the content field when it is not the active editor. */
   contentBuffer: string
 }
 
@@ -356,6 +404,13 @@ export interface ModalAIUsage extends ModalBase {
   type: 'ai-usage'
 }
 
+export interface ModalWorktreeMove extends ModalBase {
+  type: 'worktree-move'
+  /** The worktree being moved (may differ from the active one, e.g. a tab menu). */
+  sourceWorktreeId: string
+  deleteSource: boolean
+}
+
 export type DirectoryResultType = 'git-repo' | 'worktree' | 'workspace'
 
 export interface DirectoryResult {
@@ -378,6 +433,7 @@ export type ModalState =
   | ModalGitCommit
   | ModalUpdateAvailable
   | ModalAIUsage
+  | ModalWorktreeMove
 
 export interface LayoutState {
   terminalCols: number
@@ -388,6 +444,8 @@ export interface SnippetRecord {
   id: string
   name: string
   content: string
+  trigger?: string
+  vars?: Record<string, SnippetVar>
 }
 
 export interface DiscoveredRepo {
@@ -411,7 +469,7 @@ export const EMPTY_MULTI_REPO_STATE: MultiRepoState = { prefixes: {}, repos: []
 export interface AppState {
   tabs: TabSession[]
   activeTabId: string | null
-  layoutTrees: Record<string, import('./layout-tree').LayoutNode>
+  layoutTrees: Record<string, LayoutNode>
   tabGroupMap: Record<string, string>
   sessions: SessionRecord[]
   currentSessionId: string | null
@@ -428,6 +486,11 @@ export interface AppState {
   gitMode: GitModeState
   autoCommit: AutoCommitState
   multiRepo: MultiRepoState
+  /**
+   * Commits each worktree's branch is ahead/behind the ref it forked from,
+   * keyed by worktree id. Ephemeral (polled); not persisted to the catalog.
+   */
+  worktreeDivergence: Record<string, BranchDivergence>
   /** Chord prefix the sequence resolver is currently waiting on, or null when idle. */
   pendingChords: string[] | null
 }
@@ -436,9 +499,18 @@ export interface AppState {
 export type ModalAction =
   | { type: 'move-modal-cursor'; delta?: number; to?: 'home' | 'end' }
   | { type: 'open-new-tab-modal' }
+  | { type: 'set-new-tab-branch-error'; message: string | null }
+  | {
+      type: 'set-new-tab-worktree-delete-state'
+      confirmWorktreeId?: string | null
+      message: string | null
+    }
+  | { type: 'enter-new-tab-worktree-create' }
+  | { type: 'select-new-tab-assistant'; assistantId?: AssistantId }
+  | { type: 'toggle-new-tab-worktree'; assistantId?: AssistantId }
   | { type: 'open-edit-custom-command'; assistantId: AssistantId }
   | { type: 'open-help-modal'; scope?: ModeId }
-  | { type: 'open-split-picker'; direction: import('./layout-tree').SplitDirection }
+  | { type: 'open-split-picker'; direction: SplitDirection }
   | { type: 'open-session-picker' }
   | {
       type: 'open-session-name-modal'
@@ -463,6 +535,8 @@ export type ModalAction =
   | { type: 'open-update-available-modal'; currentVersion: string; latestVersion: string }
   | { type: 'set-modal-selection-index'; index: number }
   | { type: 'open-ai-usage-modal' }
+  | { type: 'open-worktree-move-modal'; sourceWorktreeId: string }
+  | { type: 'toggle-worktree-move-delete' }
 
 // -- Session actions --
 export type SessionAction =
@@ -473,6 +547,15 @@ export type SessionAction =
   | { type: 'delete-session-record'; sessionId: string; openSessionPicker?: boolean }
   | { type: 'reorder-sessions'; orderedIds: string[] }
   | { type: 'set-session-status'; sessionId: string; status: SessionStatus }
+  | { type: 'add-worktree-record'; sessionId: string; worktree: WorktreeRecord; activate?: boolean }
+  | { type: 'remove-worktree-record'; sessionId: string; worktreeId: string }
+  | { type: 'set-active-worktree'; sessionId: string; worktreeId: string }
+  | {
+      type: 'update-worktree-record'
+      sessionId: string
+      worktreeId: string
+      patch: Partial<WorktreeRecord>
+    }
 
 // -- Tab actions --
 export type TabAction =
@@ -481,8 +564,8 @@ export type TabAction =
       type: 'hydrate-workspace'
       tabs: TabSession[]
       activeTabId: string | null
-      layoutTree?: import('./layout-tree').LayoutNode | null
-      layoutTrees?: Record<string, import('./layout-tree').LayoutNode>
+      layoutTree?: LayoutNode | null
+      layoutTrees?: Record<string, LayoutNode>
       tabGroupMap?: Record<string, string>
     }
   | { type: 'close-tab'; tabId: string }
@@ -508,7 +591,7 @@ export type TabAction =
 export type LayoutAction =
   | {
       type: 'split-pane'
-      direction: import('./layout-tree').SplitDirection
+      direction: SplitDirection
       newTab: TabSession
     }
   | { type: 'close-pane'; tabId: string }
@@ -520,13 +603,13 @@ export type LayoutAction =
       type: 'resize-pane'
       tabId: string
       delta: number
-      axis?: import('./layout-tree').SplitDirection
+      axis?: SplitDirection
     }
   | {
       type: 'set-split-ratio'
       tabId: string
       ratio: number
-      axis?: import('./layout-tree').SplitDirection
+      axis?: SplitDirection
     }
 
 // -- UI actions --
@@ -554,10 +637,17 @@ export interface GitRefreshPayload {
   files: GitFileEntry[]
 }
 
+/** Commits a worktree branch is ahead/behind the ref it forked from. */
+export interface BranchDivergence {
+  ahead: number
+  behind: number
+}
+
 export type GitPanelAction =
   | { type: 'git-refresh-success'; payload: GitRefreshPayload }
   | { type: 'git-refresh-error'; kind: GitPanelError }
   | { type: 'git-panel-reset' }
+  | { type: 'set-worktree-divergence'; divergence: Record<string, BranchDivergence> }
 
 // -- Auto-commit state & actions --
 export type AutoCommitSuggestion =
@@ -635,15 +725,17 @@ export type GitModeAction =
       key: string
       hash: string
       themeId: string
-      add: Array<{ start: number; tokens: unknown }>
-      del: Array<{ start: number; tokens: unknown }>
+      add: { start: number; tokens: unknown }[]
+      del: { start: number; tokens: 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 }
   | { type: 'git-mode-set-message'; message: string | null }
+  | { type: 'snippet-picker-set-message'; message: string | null }
   | { type: 'git-mode-toggle-diff-view' }
+  | { type: 'git-mode-toggle-review-base' }
   | { type: 'git-mode-shift-head-offset'; delta: number }
   | { type: 'git-mode-set-head-offset'; offset: number }
   | {

package/src/state/validation.ts

@@ -5,6 +5,7 @@ import type {
   TerminalModeState,
   TerminalSnapshot,
   WorkspaceSnapshotV1,
+  WorktreeRecord,
 } from './types'
 
 function isObjectRecord(value: unknown): value is Record<string, unknown> {
@@ -105,6 +106,24 @@ function isStringRecord(value: unknown): boolean {
   return Object.values(value).every(isString)
 }
 
+function isWorktreeRecord(value: unknown): value is WorktreeRecord {
+  return (
+    isObjectRecord(value) &&
+    isString(value.id) &&
+    isString(value.name) &&
+    isString(value.path) &&
+    isString(value.repoRoot) &&
+    (value.branch === undefined || isString(value.branch)) &&
+    (value.baseRef === undefined || isString(value.baseRef)) &&
+    (value.commitSha === undefined || isString(value.commitSha)) &&
+    (value.source === 'primary' || value.source === 'aimux-temp' || value.source === 'external') &&
+    isBoolean(value.createdByAimux) &&
+    (value.color === undefined || isString(value.color)) &&
+    isString(value.createdAt) &&
+    isString(value.updatedAt)
+  )
+}
+
 export function isWorkspaceSnapshotV1(value: unknown): value is WorkspaceSnapshotV1 {
   return (
     isObjectRecord(value) &&
@@ -132,7 +151,8 @@ export function isWorkspaceSnapshotV1(value: unknown): value is WorkspaceSnapsho
         (tab.viewport === undefined || isTerminalSnapshot(tab.viewport)) &&
         (tab.scrollIntent === undefined || isScrollIntent(tab.scrollIntent)) &&
         (tab.errorMessage === undefined || isString(tab.errorMessage)) &&
-        (tab.exitCode === undefined || isFiniteNumber(tab.exitCode))
+        (tab.exitCode === undefined || isFiniteNumber(tab.exitCode)) &&
+        (tab.worktreeId === undefined || isString(tab.worktreeId))
     ) &&
     (value.layoutTree === undefined || isLayoutNode(value.layoutTree)) &&
     (value.layoutTrees === undefined || isLayoutTreesMap(value.layoutTrees)) &&
@@ -151,12 +171,36 @@ export function isSessionRecord(value: unknown): value is SessionRecord {
     isString(value.lastOpenedAt) &&
     (value.order === undefined ||
       (typeof value.order === 'number' && Number.isFinite(value.order))) &&
-    (value.workspaceSnapshot === undefined || isWorkspaceSnapshotV1(value.workspaceSnapshot))
+    (value.workspaceSnapshot === undefined || isWorkspaceSnapshotV1(value.workspaceSnapshot)) &&
+    (value.worktrees === undefined ||
+      (Array.isArray(value.worktrees) && value.worktrees.every(isWorktreeRecord))) &&
+    (value.activeWorktreeId === undefined || isString(value.activeWorktreeId))
   )
 }
 
+function isSnippetVar(value: unknown): boolean {
+  if (!isObjectRecord(value)) return false
+  if (!isString(value.sh)) return false
+  if (value.timeout !== undefined && !isFiniteNumber(value.timeout)) return false
+  if (value.trim !== undefined && !isBoolean(value.trim)) return false
+  return true
+}
+
+function isSnippetVarRecord(value: unknown): boolean {
+  if (!isObjectRecord(value)) return false
+  for (const entry of Object.values(value)) {
+    if (!isSnippetVar(entry)) return false
+  }
+  return true
+}
+
 export function isSnippetRecord(value: unknown): value is SnippetRecord {
   return (
-    isObjectRecord(value) && isString(value.id) && isString(value.name) && isString(value.content)
+    isObjectRecord(value) &&
+    isString(value.id) &&
+    isString(value.name) &&
+    isString(value.content) &&
+    (value.trigger === undefined || isString(value.trigger)) &&
+    (value.vars === undefined || isSnippetVarRecord(value.vars))
   )
 }

package/src/terminal-manager/manager-client.ts

@@ -1,5 +1,5 @@
 import { EventEmitter } from 'node:events'
-import { connect, Socket } from 'node:net'
+import { connect, type Socket } from 'node:net'
 
 import type {
   ScrollIntent,
@@ -23,7 +23,7 @@ import {
   parseManagerMessage,
 } from '../ipc/manager-protocol'
 
-type ManagerClientEvents = {
+interface ManagerClientEvents {
   render: [
     sessionId: string,
     tabId: string,
@@ -84,7 +84,7 @@ export class TerminalManagerClient extends EventEmitter<ManagerClientEvents> {
     return this.socket
   }
 
-  private send(request: ManagerRequest): Promise<ManagerResponse> {
+  private async send(request: ManagerRequest): Promise<ManagerResponse> {
     const socket = this.getConnectedSocket()
     logDebug('managerClient.send', { id: request.id, type: request.type })
     return new Promise((resolve, reject) => {
@@ -286,7 +286,9 @@ export class TerminalManagerClient extends EventEmitter<ManagerClientEvents> {
     return response.payload
   }
 
-  createTab(options: Extract<ManagerRequest, { type: 'createTab' }>['payload']): Promise<void> {
+  async createTab(
+    options: Extract<ManagerRequest, { type: 'createTab' }>['payload']
+  ): Promise<void> {
     logDebug('managerClient.createTab', {
       command: options.command,
       sessionId: options.sessionId,
@@ -296,7 +298,7 @@ export class TerminalManagerClient extends EventEmitter<ManagerClientEvents> {
     return this.sendExpectOk({ id: crypto.randomUUID(), payload: options, type: 'createTab' })
   }
 
-  write(sessionId: string, tabId: string, data: string): Promise<void> {
+  async write(sessionId: string, tabId: string, data: string): Promise<void> {
     return this.sendExpectOk({
       id: crypto.randomUUID(),
       payload: { data, sessionId, tabId },
@@ -304,7 +306,7 @@ export class TerminalManagerClient extends EventEmitter<ManagerClientEvents> {
     })
   }
 
-  resize(
+  async resize(
     sessionId: string,
     cols: number,
     rows: number,
@@ -317,7 +319,7 @@ export class TerminalManagerClient extends EventEmitter<ManagerClientEvents> {
     })
   }
 
-  resizeTab(
+  async resizeTab(
     sessionId: string,
     tabId: string,
     cols: number,
@@ -331,7 +333,7 @@ export class TerminalManagerClient extends EventEmitter<ManagerClientEvents> {
     })
   }
 
-  scroll(sessionId: string, tabId: string, deltaLines: number): Promise<void> {
+  async scroll(sessionId: string, tabId: string, deltaLines: number): Promise<void> {
     return this.sendExpectOk({
       id: crypto.randomUUID(),
       payload: { deltaLines, sessionId, tabId },
@@ -339,7 +341,7 @@ export class TerminalManagerClient extends EventEmitter<ManagerClientEvents> {
     })
   }
 
-  scrollToBottom(sessionId: string, tabId: string): Promise<void> {
+  async scrollToBottom(sessionId: string, tabId: string): Promise<void> {
     return this.sendExpectOk({
       id: crypto.randomUUID(),
       payload: { sessionId, tabId },
@@ -347,7 +349,7 @@ export class TerminalManagerClient extends EventEmitter<ManagerClientEvents> {
     })
   }
 
-  reapplyScrollIntent(sessionId: string, tabId: string, intent: ScrollIntent): Promise<void> {
+  async reapplyScrollIntent(sessionId: string, tabId: string, intent: ScrollIntent): Promise<void> {
     return this.sendExpectOk({
       id: crypto.randomUUID(),
       payload: { intent, sessionId, tabId },
@@ -355,7 +357,7 @@ export class TerminalManagerClient extends EventEmitter<ManagerClientEvents> {
     })
   }
 
-  setActiveTab(sessionId: string, tabId: string | null): Promise<void> {
+  async setActiveTab(sessionId: string, tabId: string | null): Promise<void> {
     return this.sendExpectOk({
       id: crypto.randomUUID(),
       payload: { sessionId, tabId },
@@ -363,7 +365,7 @@ export class TerminalManagerClient extends EventEmitter<ManagerClientEvents> {
     })
   }
 
-  closeTab(sessionId: string, tabId: string): Promise<void> {
+  async closeTab(sessionId: string, tabId: string): Promise<void> {
     return this.sendExpectOk({
       id: crypto.randomUUID(),
       payload: { sessionId, tabId },
@@ -371,7 +373,7 @@ export class TerminalManagerClient extends EventEmitter<ManagerClientEvents> {
     })
   }
 
-  disposeSession(sessionId: string): Promise<void> {
+  async disposeSession(sessionId: string): Promise<void> {
     return this.sendExpectOk({
       id: crypto.randomUUID(),
       payload: { sessionId },

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

@@ -1,6 +1,7 @@
+import type { FoldDispatch } from './pierre-diff'
+
 import { useTheme } from '../../../theme'
 import { FOLD_STEP, type FoldInfo } from './build-rows'
-import { type FoldDispatch } from './pierre-diff'
 
 interface Props {
   fold: FoldInfo

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

@@ -3,11 +3,11 @@ import type { ThemedToken } from 'shiki'
 
 import { forwardRef, useEffect, useImperativeHandle, useMemo, useRef } from 'react'
 
+import type { FoldState } from '../../../../state/types'
 import type { ThemeId } from '../../../themes'
 
 import { useAppStore } from '../../../../state/app-store'
 import { dispatchGlobal } from '../../../../state/dispatch-ref'
-import { type FoldState } from '../../../../state/types'
 import { useTheme } from '../../../theme'
 import { buildDiffSegments, firstChangeSegmentOffset, gutterWidth } from './build-rows'
 import { SplitView, type SplitViewHandle } from './split-view'

package/src/ui/components/git/diff-renderer/prepare-diff.ts

@@ -22,14 +22,14 @@ interface PrepareOptions {
   signal?: AbortSignal
 }
 
-function yieldToEventLoop(): Promise<void> {
+async function yieldToEventLoop(): Promise<void> {
   return new Promise((resolve) => {
     setImmediate(resolve)
   })
 }
 
 function throwIfAborted(signal?: AbortSignal): void {
-  if (signal?.aborted) throw new DOMException('Aborted', 'AbortError')
+  if (signal?.aborted === true) throw new DOMException('Aborted', 'AbortError')
 }
 
 // Lifts diff parsing off the synchronous render tree and returns a segmented

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

@@ -230,7 +230,9 @@ function HunkHeaderRow({ row }: { row: Extract<SplitRowOrHeader, { type: 'hunk-h
   return (
     <box flexDirection="row" backgroundColor={headerBg} paddingLeft={1} paddingRight={1}>
       <text fg={t.text}>{row.spec}</text>
-      {row.context ? <text fg={t.textMuted}> {row.context}</text> : null}
+      {row.context != null && row.context !== '' ? (
+        <text fg={t.textMuted}> {row.context}</text>
+      ) : null}
     </box>
   )
 }
@@ -285,9 +287,9 @@ function LineContent({ content, tokens }: { content: string; tokens: ThemedToken
       {tokens.map((tok, i) => {
         const s = tokenToSpan(tok)
         let attributes = 0
-        if (s.bold) attributes |= TextAttributes.BOLD
-        if (s.italic) attributes |= TextAttributes.ITALIC
-        if (s.underline) attributes |= TextAttributes.UNDERLINE
+        if (s.bold === true) attributes |= TextAttributes.BOLD
+        if (s.italic === true) attributes |= TextAttributes.ITALIC
+        if (s.underline === true) attributes |= TextAttributes.UNDERLINE
         return (
           <span key={i} fg={s.fg ?? t.text} attributes={attributes}>
             {s.text}

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

@@ -186,7 +186,9 @@ function UnifiedRowRender({
     return (
       <box flexDirection="row" backgroundColor={headerBg} paddingLeft={1} paddingRight={1}>
         <text fg={t.text}>{row.spec}</text>
-        {row.context ? <text fg={t.textMuted}> {row.context}</text> : null}
+        {row.context != null && row.context !== '' ? (
+          <text fg={t.textMuted}> {row.context}</text>
+        ) : null}
       </box>
     )
   }
@@ -230,9 +232,9 @@ function LineContent({ content, tokens }: { content: string; tokens: ThemedToken
       {tokens.map((tok, i) => {
         const s = tokenToSpan(tok)
         let attributes = 0
-        if (s.bold) attributes |= TextAttributes.BOLD
-        if (s.italic) attributes |= TextAttributes.ITALIC
-        if (s.underline) attributes |= TextAttributes.UNDERLINE
+        if (s.bold === true) attributes |= TextAttributes.BOLD
+        if (s.italic === true) attributes |= TextAttributes.ITALIC
+        if (s.underline === true) attributes |= TextAttributes.UNDERLINE
         return (
           <span key={i} fg={s.fg ?? t.text} attributes={attributes}>
             {s.text}

package/src/ui/components/git/diff-renderer/use-diff-prefetch.ts

@@ -13,6 +13,7 @@ interface PrefetchOptions {
   projectPath: string | undefined
   themeId: string
   headOffset: number
+  compareRef?: string
   enabled: boolean
 }
 
@@ -94,15 +95,20 @@ export function useDiffPrefetch(
 
   const queueRef = useRef<PrefetchQueue | null>(null)
 
-  const { enabled, headOffset, projectPath } = opts
+  const { compareRef, enabled, headOffset, projectPath } = opts
   const runTaskRef = useRef<(task: Task) => Promise<void>>(async () => {})
 
   // Keep a ref to the execute function so the queue keeps the latest closure
   // without needing to recreate the queue itself.
   runTaskRef.current = async (task: Task) => {
-    if (!projectPath) return
+    if (!(projectPath != null && projectPath !== '')) return
     try {
-      const diff = await fetchDiff(task.file.repoPath ?? projectPath, task.file, headOffset)
+      const diff = await fetchDiff(
+        task.file.repoPath ?? projectPath,
+        task.file,
+        headOffset,
+        compareRef
+      )
       if (task.controller.signal.aborted) return
       const hash = diffHash(diff.rawDiff)
       dispatchGlobal({ diff, hash, key: task.key, type: 'git-mode-set-diff' })
@@ -122,13 +128,19 @@ export function useDiffPrefetch(
   }
 
   if (!queueRef.current) {
-    queueRef.current = new PrefetchQueue((task) => runTaskRef.current(task), MAX_CONCURRENCY)
+    queueRef.current = new PrefetchQueue(async (task) => runTaskRef.current(task), MAX_CONCURRENCY)
   }
 
   useEffect(() => {
     const queue = queueRef.current
     if (!queue) return
-    if (!enabled || radius <= 0 || !projectPath || !selectedEntryKey) {
+    if (
+      !enabled ||
+      radius <= 0 ||
+      projectPath == null ||
+      projectPath === '' ||
+      !(selectedEntryKey != null && selectedEntryKey !== '')
+    ) {
       queue.cancelAll()
       return
     }
@@ -149,7 +161,7 @@ export function useDiffPrefetch(
       const key = row.key
       if (diffs[key]) continue
       if (parsed[key]) continue
-      if (loading[key]) continue
+      if (loading[key] === true) continue
       tasks.push({
         controller: new AbortController(),
         distance: Math.abs(i - selectedIdx),
@@ -171,6 +183,7 @@ export function useDiffPrefetch(
     parsed,
     loading,
     headOffset,
+    compareRef,
   ])
 
   useEffect(() => {

package/src/ui/components/git/diff-renderer/use-diff-preparation.ts

@@ -163,11 +163,11 @@ export function useDiffPreparation(
     (segments: readonly DiffSegment[]) => {
       const file = parsed.file
       const filetype = parsed.filetype
-      if (!file || !filetype) return
+      if (!file || !(filetype != null && filetype !== '')) return
       const owner = requestOwner
       const version = requestVersionRef.current
       const activeHash = cachedParsed?.hash ?? (localOwnerMatches ? localHash : null)
-      if (!activeHash) return
+      if (!(activeHash != null && activeHash !== '')) return
       const next = segments.filter(
         (segment) =>
           (segment.kind === 'context' || segment.kind === 'change') &&