@brimveyn/aimux 1.14.15 → 1.15.0

package/src/input/modes/types.ts

@@ -9,6 +9,8 @@ export type ModeId =
   | 'git-mode'
   | 'modal.new-tab.command-edit'
   | 'modal.new-tab.editing-command'
+  | 'modal.new-tab.worktree-delete-confirm'
+  | 'modal.worktree-delete-confirm'
   | 'modal.session-picker.filtering'
   | 'modal.session-name'
   | 'modal.create-session'
@@ -23,11 +25,13 @@ export type ModeId =
   | 'modal.git-commit.generating'
   | 'modal.update-available'
   | 'modal.worktree-move'
+  | 'modal.worktree-move-confirm'
   | 'modal.ai-usage'
 
 export type SideEffect =
   | { type: 'quit'; state: AppState }
   | { type: 'launch-selected-assistant' }
+  | { type: 'load-new-tab-base-branches' }
   | { type: 'edit-selected-assistant' }
   | { type: 'confirm-selected-session' }
   | { type: 'delete-selected-session' }
@@ -71,14 +75,29 @@ export type SideEffect =
   | { type: 'cycle-sidebar-item'; direction: 1 | -1 }
   | { type: 'switch-tab-by-index'; index: number }
   | { type: 'delete-session'; sessionId: string }
-  | { type: 'delete-worktree'; sessionId: string; worktreeId: string; force?: boolean }
+  | {
+      type: 'delete-worktree'
+      sessionId: string
+      worktreeId: string
+      // Force the git worktree removal (discards uncommitted changes in the
+      // worktree). Also implies closing the worktree's tabs.
+      force?: boolean
+      // Close the worktree's tabs without forcing the git removal. Lets the
+      // sidebar "Remove worktree" clean up tabs (avoiding orphans) while still
+      // refusing to discard uncommitted work in a temp worktree.
+      closeTabs?: boolean
+    }
   | {
       type: 'move-worktree'
       sessionId: string
       sourceWorktreeId: string
       targetWorktreeId: string
       deleteSource?: boolean
+      // Retry flags set by the worktree-move-confirm dialog.
+      stashTarget?: boolean
+      keepConflicts?: boolean
     }
+  | { type: 'load-worktree-move-stats' }
   | { type: 'toggle-transparent' }
   | { type: 'toggle-mode' }
   | { type: 'open-file-in-editor'; path: string }

package/src/ipc/manager-protocol.ts

@@ -197,7 +197,15 @@ function isTerminalSnapshot(value: unknown): value is TerminalSnapshot {
     ) &&
     isFiniteNumber(value.viewportY) &&
     isFiniteNumber(value.baseY) &&
-    typeof value.cursorVisible === 'boolean'
+    typeof value.cursorVisible === 'boolean' &&
+    (value.cursorStyle === undefined ||
+      value.cursorStyle === 'block' ||
+      value.cursorStyle === 'underline' ||
+      value.cursorStyle === 'bar' ||
+      value.cursorStyle === 'default') &&
+    (value.cursorBlink === undefined || typeof value.cursorBlink === 'boolean') &&
+    (value.cursorRow === undefined || isFiniteNumber(value.cursorRow)) &&
+    (value.cursorCol === undefined || isFiniteNumber(value.cursorCol))
   )
 }
 

package/src/ipc/protocol.ts

@@ -175,7 +175,15 @@ function isTerminalSnapshot(value: unknown): value is TerminalSnapshot {
     ) &&
     isFiniteNumber(value.viewportY) &&
     isFiniteNumber(value.baseY) &&
-    typeof value.cursorVisible === 'boolean'
+    typeof value.cursorVisible === 'boolean' &&
+    (value.cursorStyle === undefined ||
+      value.cursorStyle === 'block' ||
+      value.cursorStyle === 'underline' ||
+      value.cursorStyle === 'bar' ||
+      value.cursorStyle === 'default') &&
+    (value.cursorBlink === undefined || typeof value.cursorBlink === 'boolean') &&
+    (value.cursorRow === undefined || isFiniteNumber(value.cursorRow)) &&
+    (value.cursorCol === undefined || isFiniteNumber(value.cursorCol))
   )
 }
 

package/src/pty/ghostty-shell-integration.ts

@@ -0,0 +1,34 @@
+import { existsSync } from 'node:fs'
+import { basename, join } from 'node:path'
+
+export type PtyEnv = Record<string, string>
+
+/**
+ * Replicate Ghostty's automatic shell-integration injection for the nested
+ * shells aimux spawns. Ghostty only performs it for shells it launches
+ * directly (by pointing ZDOTDIR at its integration dir, whose .zshenv
+ * restores the user's ZDOTDIR and then loads the integration), so aimux
+ * panes would otherwise miss the integration's zle hooks — notably the
+ * DECSCUSR cursor-shape reporting (bar at prompt, block in vicmd) that the
+ * hardware-cursor pass-through relies on for native-parity rendering.
+ */
+export function applyGhosttyShellIntegration(
+  env: PtyEnv,
+  command: string,
+  integrationFileExists: (path: string) => boolean = existsSync
+): PtyEnv {
+  const resourcesDir = env.GHOSTTY_RESOURCES_DIR
+  if (resourcesDir === undefined || resourcesDir === '') return env
+  // bash and fish use different bootstrap mechanisms; only zsh is supported.
+  if (basename(command) !== 'zsh') return env
+
+  const integrationDir = join(resourcesDir, 'shell-integration', 'zsh')
+  if (env.ZDOTDIR === integrationDir) return env
+  if (!integrationFileExists(join(integrationDir, '.zshenv'))) return env
+
+  const next: PtyEnv = { ...env, ZDOTDIR: integrationDir }
+  if (env.ZDOTDIR !== undefined && env.ZDOTDIR !== '') {
+    next.GHOSTTY_ZSH_ZDOTDIR = env.ZDOTDIR
+  }
+  return next
+}

package/src/pty/pty-manager.ts

@@ -2,9 +2,15 @@ import { Terminal as XTerm } from '@xterm/headless'
 import { type IPty, spawn } from 'bun-pty'
 import { EventEmitter } from 'node:events'
 
-import type { ScrollIntent, TerminalModeState, TerminalSnapshot } from '../state/types'
+import type {
+  ScrollIntent,
+  TerminalCursorStyle,
+  TerminalModeState,
+  TerminalSnapshot,
+} from '../state/types'
 
 import { logDebug } from '../debug/input-log'
+import { applyGhosttyShellIntegration } from './ghostty-shell-integration'
 import { areTerminalSnapshotsEqual, snapshotTerminal } from './terminal-snapshot'
 
 interface PtyManagerEvents {
@@ -21,6 +27,10 @@ interface SessionHandle {
   lastTerminalModes?: TerminalModeState
   alternateScrollMode: boolean
   cursorVisible: boolean
+  /** Last DECSCUSR shape; 'default' = the host terminal's configured cursor. */
+  cursorStyle: TerminalCursorStyle
+  /** Last DECSCUSR blink flag; undefined until an explicit DECSCUSR arrives. */
+  cursorBlink: boolean | undefined
   pendingModeSequence: string
   pendingWrites: number
   pendingExitCode: number | null
@@ -75,6 +85,28 @@ function trackPrivateModes(
   }
 }
 
+// DECSCUSR (CSI Ps SP q): 0 resets to the terminal's configured cursor,
+// odd values blink, 1/2 = block, 3/4 = underline, 5/6 = bar.
+const DECSCUSR_STYLES: readonly TerminalCursorStyle[] = [
+  'block',
+  'block',
+  'underline',
+  'underline',
+  'bar',
+  'bar',
+]
+
+function decscusrToCursorState(ps: number): {
+  cursorStyle: TerminalCursorStyle
+  cursorBlink: boolean | undefined
+} {
+  const style = DECSCUSR_STYLES[ps - 1]
+  if (ps === 0 || style === undefined) {
+    return { cursorBlink: undefined, cursorStyle: 'default' }
+  }
+  return { cursorBlink: ps % 2 === 1, cursorStyle: style }
+}
+
 function getTerminalModes(emulator: XTerm, alternateScrollMode: boolean): TerminalModeState {
   return {
     alternateScrollMode,
@@ -192,7 +224,11 @@ export class PtyManager extends EventEmitter<PtyManagerEvents> {
 
   private emitRenderIfChanged(session: SessionHandle): void {
     if (!this.broadcastEnabled) return
-    const nextSnapshot = snapshotTerminal(session.emulator, session.cursorVisible)
+    const nextSnapshot = snapshotTerminal(session.emulator, {
+      cursorBlink: session.cursorBlink,
+      cursorStyle: session.cursorStyle,
+      cursorVisible: session.cursorVisible,
+    })
     const nextTerminalModes = getTerminalModes(session.emulator, session.alternateScrollMode)
     const snapshotChanged = !areTerminalSnapshotsEqual(session.lastSnapshot, nextSnapshot)
     const modesChanged =
@@ -259,21 +295,28 @@ export class PtyManager extends EventEmitter<PtyManagerEvents> {
         scrollback: 1000,
       })
 
-      const pty = spawn(options.command, options.args ?? [], {
-        cols: options.cols,
-        cwd: options.cwd ?? process.cwd(),
-        env: {
+      const env = applyGhosttyShellIntegration(
+        {
           ...process.env,
           COLORTERM: 'truecolor',
           TERM: 'xterm-256color',
           ...options.env,
         },
+        options.command
+      )
+
+      const pty = spawn(options.command, options.args ?? [], {
+        cols: options.cols,
+        cwd: options.cwd ?? process.cwd(),
+        env,
         name: 'xterm-256color',
         rows: options.rows,
       })
 
       const session: SessionHandle = {
         alternateScrollMode: false,
+        cursorBlink: undefined,
+        cursorStyle: 'default',
         cursorVisible: true,
         emulator,
         lastScrollIntent: undefined,
@@ -287,6 +330,17 @@ export class PtyManager extends EventEmitter<PtyManagerEvents> {
         tabId: options.tabId,
       }
 
+      // xterm parses DECSCUSR itself but keeps the result in private state;
+      // mirror it here so snapshots can carry the shape to the renderer.
+      // Returning false lets xterm's own handler still run.
+      emulator.parser.registerCsiHandler({ final: 'q', intermediates: ' ' }, (params) => {
+        const raw = params[0]
+        const tracked = decscusrToCursorState(typeof raw === 'number' ? raw : 0)
+        session.cursorStyle = tracked.cursorStyle
+        session.cursorBlink = tracked.cursorBlink
+        return false
+      })
+
       pty.onData((data) => {
         logDebug('ptyManager.data', {
           byteLength: Buffer.byteLength(data, 'utf8'),

package/src/pty/terminal-snapshot.ts

@@ -1,6 +1,11 @@
 import type { Terminal } from '@xterm/headless'
 
-import type { TerminalLine, TerminalSnapshot, TerminalSpan } from '../state/types'
+import type {
+  TerminalCursorStyle,
+  TerminalLine,
+  TerminalSnapshot,
+  TerminalSpan,
+} from '../state/types'
 
 import { getCurrentTheme } from '../ui/theme'
 
@@ -95,14 +100,10 @@ function buildLine(
       bg = resolvedFg
     }
 
+    // The cursor cell is only flagged here; how it renders (soft inverted
+    // block vs. the host terminal's hardware cursor) is a presentation
+    // decision made in the renderer process (terminal-pane.tsx).
     const isCursorCell = cursorVisible && cursorColumn === column
-    if (isCursorCell) {
-      const tokens = getCurrentTheme()
-      const resolvedFg: CellColor = fg ?? { hex: tokens.text, kind: 'rgb' }
-      const resolvedBg: CellColor = bg ?? { hex: tokens.background, kind: 'rgb' }
-      fg = resolvedBg
-      bg = resolvedFg
-    }
 
     const span: TerminalSpan = {
       bold: current.isBold() ? true : undefined,
@@ -143,11 +144,8 @@ function buildLine(
       if (leading > 0) {
         pushSpan(spans, { text: ' '.repeat(leading) })
       }
-      const tokens = getCurrentTheme()
       pushSpan(spans, {
-        bg: tokens.text,
         cursor: true,
-        fg: tokens.background,
         text: ' ',
       })
       if (trailing > 0) {
@@ -161,7 +159,17 @@ function buildLine(
   return { spans }
 }
 
-export function snapshotTerminal(terminal: Terminal, cursorVisible = true): TerminalSnapshot {
+export interface SnapshotCursorOptions {
+  cursorVisible: boolean
+  cursorStyle?: TerminalCursorStyle
+  cursorBlink?: boolean
+}
+
+export function snapshotTerminal(
+  terminal: Terminal,
+  cursorOptions: SnapshotCursorOptions = { cursorVisible: true }
+): TerminalSnapshot {
+  const { cursorBlink, cursorStyle, cursorVisible } = cursorOptions
   const buffer = terminal.buffer.active
   const startLine = buffer.viewportY
   const tailStartLine = Math.max(0, buffer.baseY + terminal.rows - SNAPSHOT_TAIL_LINE_COUNT)
@@ -201,6 +209,10 @@ export function snapshotTerminal(terminal: Terminal, cursorVisible = true): Term
 
   return {
     baseY: buffer.baseY,
+    cursorBlink,
+    cursorCol: cursorColumn,
+    cursorRow: cursorLine - buffer.viewportY,
+    cursorStyle,
     cursorVisible,
     lines,
     tailLines,
@@ -255,7 +267,11 @@ export function areTerminalSnapshotsEqual(
   if (
     left.viewportY !== right.viewportY ||
     left.baseY !== right.baseY ||
-    left.cursorVisible !== right.cursorVisible
+    left.cursorVisible !== right.cursorVisible ||
+    left.cursorStyle !== right.cursorStyle ||
+    left.cursorBlink !== right.cursorBlink ||
+    left.cursorRow !== right.cursorRow ||
+    left.cursorCol !== right.cursorCol
   ) {
     return false
   }

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

@@ -7,6 +7,8 @@ import { getActiveKeymap } from '../../input/keymap/keymap-ref'
 import { getAllAssistantOptions } from '../../pty/command-registry'
 import { filterThemeIds } from '../../ui/filter-themes'
 import {
+  type BaseRefOption,
+  buildBaseRefOptions,
   filterAssistants,
   filterSessions,
   filterSnippets,
@@ -44,6 +46,17 @@ function getCurrentWorktreeIndex(state: AppState): number {
   )
 }
 
+function getNewTabBaseOptions(state: AppState, queryOverride?: string): BaseRefOption[] {
+  if (state.modal.type !== 'new-tab') return []
+  const worktrees =
+    state.sessions.find((entry) => entry.id === state.currentSessionId)?.worktrees ?? []
+  return buildBaseRefOptions(
+    worktrees,
+    state.modal.baseBranches,
+    queryOverride ?? state.modal.baseQuery
+  )
+}
+
 function getSelectedNewTabAssistant(state: AppState, assistantId?: string) {
   if (assistantId != null && assistantId !== '') {
     return getAllAssistantOptions(state.customCommands).find((entry) => entry.id === assistantId)
@@ -63,6 +76,9 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
         focusMode: 'command-edit',
         modal: {
           activeField: 'assistant',
+          baseBranches: [],
+          baseQuery: '',
+          baseRef: '',
           branchError: null,
           branchName: '',
           createWorktree: false,
@@ -75,19 +91,25 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
           step: 'assistant',
           targetWorktreeIndex,
           type: 'new-tab',
-          worktreeDeleteConfirmId: null,
-          worktreeDeleteMessage: null,
+          worktreeDeletePrompt: null,
           worktreeName: '',
         },
       }
     }
     case 'enter-new-tab-worktree-create': {
       if (state.modal.type !== 'new-tab') return state
+      // Default the base to the branch of the worktree we're forking from (the
+      // current target), preserving the previous always-fork-from-source
+      // behaviour until the user picks another base.
+      const session = state.sessions.find((entry) => entry.id === state.currentSessionId)
+      const sourceWorktree = session?.worktrees?.[state.modal.targetWorktreeIndex]
       return {
         ...state,
         modal: {
           ...state.modal,
           activeField: 'worktree-name',
+          baseQuery: '',
+          baseRef: sourceWorktree?.branch ?? '',
           createWorktree: true,
           cursorPos: state.modal.worktreeName.length,
           selectedIndex: 0,
@@ -95,6 +117,18 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
         },
       }
     }
+    case 'set-new-tab-base-branches': {
+      if (state.modal.type !== 'new-tab') return state
+      const modalWithBranches = { ...state.modal, baseBranches: action.branches }
+      const withBranches: AppState = { ...state, modal: modalWithBranches }
+      // Backfill a default base if none resolved yet (e.g. detached source).
+      if (state.modal.baseRef !== '') return withBranches
+      const firstOption = getNewTabBaseOptions(withBranches)[0]
+      return {
+        ...withBranches,
+        modal: { ...modalWithBranches, baseRef: firstOption?.ref ?? '' },
+      }
+    }
     case 'enter-new-tab-template-pick': {
       if (state.modal.type !== 'new-tab') return state
       return {
@@ -125,14 +159,13 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
         },
       }
     }
-    case 'set-new-tab-worktree-delete-state': {
+    case 'set-new-tab-worktree-delete-prompt': {
       if (state.modal.type !== 'new-tab') return state
       return {
         ...state,
         modal: {
           ...state.modal,
-          worktreeDeleteConfirmId: action.confirmWorktreeId ?? null,
-          worktreeDeleteMessage: action.message,
+          worktreeDeletePrompt: action.prompt,
         },
       }
     }
@@ -192,8 +225,7 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
           selectedIndex: worktreeCount === 0 ? 0 : targetWorktreeIndex,
           step: 'worktree',
           targetWorktreeIndex,
-          worktreeDeleteConfirmId: null,
-          worktreeDeleteMessage: null,
+          worktreeDeletePrompt: null,
           worktreeName: state.modal.worktreeName || `wt-${option.label}`,
         },
       }
@@ -228,8 +260,7 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
             : Math.min(state.modal.selectedIndex, Math.max(0, worktreeCount - 1)),
           step: option && createWorktree ? 'worktree' : state.modal.step,
           targetWorktreeIndex,
-          worktreeDeleteConfirmId: null,
-          worktreeDeleteMessage: null,
+          worktreeDeletePrompt: null,
           worktreeName: defaultName,
         },
       }
@@ -273,6 +304,7 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
           selectedIndex: 0,
           sessionTargetId: null,
           sourceWorktreeId: action.sourceWorktreeId,
+          stats: { kind: 'loading' },
           type: 'worktree-move',
         },
       }
@@ -284,6 +316,51 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
         modal: { ...state.modal, deleteSource: !state.modal.deleteSource },
       }
     }
+    case 'set-worktree-move-stats': {
+      if (state.modal.type !== 'worktree-move') return state
+      return {
+        ...state,
+        modal: { ...state.modal, stats: { dirtyFiles: action.dirtyFiles, kind: 'ready' } },
+      }
+    }
+    case 'open-worktree-move-confirm': {
+      return {
+        ...state,
+        focusMode: 'modal',
+        modal: {
+          deleteSource: action.deleteSource,
+          editBuffer: null,
+          files: action.files,
+          selectedIndex: 0,
+          sessionId: action.sessionId,
+          sessionTargetId: null,
+          sourceLabel: action.sourceLabel,
+          sourceWorktreeId: action.sourceWorktreeId,
+          targetLabel: action.targetLabel,
+          targetWorktreeId: action.targetWorktreeId,
+          type: 'worktree-move-confirm',
+          variant: action.variant,
+        },
+      }
+    }
+    case 'open-worktree-delete-confirm': {
+      return {
+        ...state,
+        focusMode: 'modal',
+        modal: {
+          closeTabs: action.closeTabs,
+          editBuffer: null,
+          force: action.force,
+          reason: action.reason,
+          selectedIndex: 0,
+          sessionId: action.sessionId,
+          sessionTargetId: null,
+          type: 'worktree-delete-confirm',
+          worktreeId: action.worktreeId,
+          worktreeLabel: action.worktreeLabel,
+        },
+      }
+    }
     case 'open-help-modal': {
       const keymap = getActiveKeymap()
       const scope = action.scope ?? null
@@ -616,7 +693,18 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
         return state
       }
       if (state.modal.type === 'new-tab' && state.modal.step === 'worktree-create') {
-        return state
+        if (state.modal.activeField !== 'base') return state
+        const options = getNewTabBaseOptions(state)
+        if (options.length === 0) return state
+        const next = (state.modal.selectedIndex + action.delta + options.length) % options.length
+        return {
+          ...state,
+          modal: {
+            ...state.modal,
+            baseRef: options[next]?.ref ?? state.modal.baseRef,
+            selectedIndex: next,
+          },
+        }
       }
       let optionCount: number
       if (state.modal.type === 'new-tab') {
@@ -661,8 +749,7 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
                 createWorktree:
                   (state.modal.selectedIndex + action.delta + optionCount) % optionCount ===
                   optionCount - 1,
-                worktreeDeleteConfirmId: null,
-                worktreeDeleteMessage: null,
+                worktreeDeletePrompt: null,
               }
             : null),
         },
@@ -683,7 +770,19 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
         return state
       }
       if (state.modal.type === 'new-tab' && state.modal.step === 'worktree-create') {
-        return state
+        if (state.modal.activeField !== 'base') return state
+        const options = getNewTabBaseOptions(state)
+        if (options.length === 0) return state
+        const clamped = Math.max(0, Math.min(options.length - 1, action.index))
+        if (clamped === state.modal.selectedIndex) return state
+        return {
+          ...state,
+          modal: {
+            ...state.modal,
+            baseRef: options[clamped]?.ref ?? state.modal.baseRef,
+            selectedIndex: clamped,
+          },
+        }
       }
       let optionCount: number
       if (state.modal.type === 'help') {
@@ -724,8 +823,7 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
             ...state.modal,
             createWorktree: clamped === optionCount - 1,
             selectedIndex: clamped,
-            worktreeDeleteConfirmId: null,
-            worktreeDeleteMessage: null,
+            worktreeDeletePrompt: null,
           },
         }
       }
@@ -770,6 +868,8 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
           buffer = state.modal.worktreeName
         } else if (state.modal.activeField === 'branch-name') {
           buffer = state.modal.branchName
+        } else if (state.modal.activeField === 'base') {
+          buffer = state.modal.baseQuery
         }
       }
       if (
@@ -821,6 +921,24 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
           },
         }
       }
+      if (
+        state.modal.type === 'new-tab' &&
+        state.modal.editingCommand === null &&
+        state.modal.activeField === 'base'
+      ) {
+        // Re-filter and snap the selection/base to the top match as the query changes.
+        const topOption = getNewTabBaseOptions(state, nextBuffer)[0]
+        return {
+          ...state,
+          modal: {
+            ...state.modal,
+            baseQuery: nextBuffer,
+            baseRef: topOption?.ref ?? state.modal.baseRef,
+            cursorPos: nextCursor,
+            selectedIndex: 0,
+          },
+        }
+      }
       const resetIndex =
         !isNewTabEditing &&
         (state.modal.type === 'session-picker' ||
@@ -901,8 +1019,7 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
               cursorPos: state.modal.editBuffer?.length ?? 0,
               selectedIndex: Math.max(0, assistantIndex),
               step: 'assistant',
-              worktreeDeleteConfirmId: null,
-              worktreeDeleteMessage: null,
+              worktreeDeletePrompt: null,
             },
           }
         }
@@ -991,8 +1108,38 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
       if (state.modal.type === 'new-tab') {
         if (state.modal.step === 'assistant') return state
         if (state.modal.step === 'worktree-create') {
-          const nextField: typeof state.modal.activeField =
-            state.modal.activeField === 'worktree-name' ? 'branch-name' : 'worktree-name'
+          const cycle: Record<
+            'worktree-name' | 'branch-name' | 'base',
+            typeof state.modal.activeField
+          > = {
+            'base': 'worktree-name',
+            'branch-name': 'base',
+            'worktree-name': 'branch-name',
+          }
+          const nextField =
+            state.modal.activeField === 'worktree-name' ||
+            state.modal.activeField === 'branch-name' ||
+            state.modal.activeField === 'base'
+              ? cycle[state.modal.activeField]
+              : 'worktree-name'
+          if (nextField === 'base') {
+            // Highlight the row matching the resolved base ref when entering it.
+            const currentBaseRef = state.modal.baseRef
+            const options = getNewTabBaseOptions(state)
+            const baseIndex = Math.max(
+              0,
+              options.findIndex((option) => option.ref === currentBaseRef)
+            )
+            return {
+              ...state,
+              modal: {
+                ...state.modal,
+                activeField: nextField,
+                cursorPos: state.modal.baseQuery.length,
+                selectedIndex: baseIndex,
+              },
+            }
+          }
           const nextValue =
             nextField === 'branch-name' ? state.modal.branchName : state.modal.worktreeName
           return {