@brimveyn/aimux 1.16.0 → 1.16.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brimveyn/aimux",
-  "version": "1.16.0",
+  "version": "1.16.2",
   "description": "A terminal multiplexer for AI CLIs. Run Claude, Codex, OpenCode side-by-side with tabbed navigation, split panes, and persistent sessions.",
   "keywords": [
     "ai",

package/src/app-runtime/side-effects.ts

@@ -1610,7 +1610,6 @@ async function runDeleteWorktree(
   if (tabsInWorktree.length > 0 && !force && !closeTabs) {
     throw new ActiveWorktreeTabsError(tabsInWorktree.length)
   }
-  disposeWorktreeTabs(ctx, worktreeId)
 
   const repoPath = resolveWorktreeGitDir(session, worktree)
   const isAimuxTemp = worktree.source === 'aimux-temp' && worktree.createdByAimux
@@ -1624,15 +1623,14 @@ async function runDeleteWorktree(
     }
   }
 
+  // Run git ops FIRST. If any throws (dirty worktree, etc.) the catch in the
+  // delete-worktree side effect handler re-prompts force or toasts the error —
+  // tabs stay open and the row stays in the sidebar, so the UI matches reality
+  // instead of leaving tabs closed against a worktree that still exists.
   if (isAimuxTemp && isInsideAimuxWorktreeRoot(worktree.path) && !existsSync(worktree.path)) {
     // The dir vanished but git may still pin the branch to a stale worktree entry.
     await pruneGitWorktrees(repoPath)
-    await cleanupAimuxBranch()
-    removeWorktreeRecordFromSession(ctx, sessionId, session, worktreeId)
-    return
-  }
-
-  if (isAimuxTemp && isInsideAimuxWorktreeRoot(worktree.path)) {
+  } else if (isAimuxTemp && isInsideAimuxWorktreeRoot(worktree.path)) {
     await assertSafeAimuxWorktreePath(worktree.path)
     await removeGitWorktree({ force, repoPath, targetPath: worktree.path })
   } else if (worktree.source === 'aimux-temp' || worktree.createdByAimux) {
@@ -1640,7 +1638,15 @@ async function runDeleteWorktree(
   }
 
   await cleanupAimuxBranch()
-  removeWorktreeRecordFromSession(ctx, sessionId, session, worktreeId)
+
+  // Only after git success: close tabs + retire the record. Re-read state so
+  // we don't operate on the snapshot captured before the awaits above.
+  disposeWorktreeTabs({ ...ctx, state: ctx.getState() }, worktreeId)
+  const latest = ctx.getState()
+  const latestSession = latest.sessions.find((entry) => entry.id === sessionId)
+  if (latestSession) {
+    removeWorktreeRecordFromSession({ ...ctx, state: latest }, sessionId, latestSession, worktreeId)
+  }
 }
 
 // A worktree's stored repoRoot can point at a sibling worktree that was since

package/src/input/keymap/help-entries.ts

@@ -19,6 +19,7 @@ export const HELP_MODE_LABELS: { modeId: ModeId; label: string }[] = [
   { label: 'Workspace name', modeId: 'modal.session-name' },
   { label: 'Create workspace', modeId: 'modal.create-session' },
   { label: 'Rename tab', modeId: 'modal.rename-tab' },
+  { label: 'Rename worktree', modeId: 'modal.rename-worktree' },
   { label: 'Snippet picker', modeId: 'modal.snippet-picker.filtering' },
   { label: 'Snippet picker — filter', modeId: 'modal.snippet-picker.filtering' },
   { label: 'Snippet editor', modeId: 'modal.snippet-editor' },

package/src/input/modes/bridge.ts

@@ -15,6 +15,7 @@ const COMMAND_EDIT_MODE_IDS: Partial<Record<SupportedModalType, ModeId>> = {
   'help': 'modal.help.filtering',
   'new-tab': 'modal.new-tab.command-edit',
   'rename-tab': 'modal.rename-tab',
+  'rename-worktree': 'modal.rename-worktree',
   'session-name': 'modal.session-name',
   'session-picker': 'modal.session-picker.filtering',
   'snippet-editor': 'modal.snippet-editor',

package/src/input/modes/transitions.ts

@@ -16,6 +16,7 @@ const TRANSITIONS: Record<ModeId, readonly ModeId[]> = {
   'modal.new-tab.editing-command': ['navigation', 'modal.new-tab.command-edit'],
   'modal.new-tab.worktree-delete-confirm': ['navigation', 'modal.new-tab.command-edit'],
   'modal.rename-tab': ['navigation'],
+  'modal.rename-worktree': ['navigation'],
   'modal.session-name': ['modal.session-picker.filtering', 'navigation'],
   'modal.session-picker.filtering': ['navigation', 'modal.session-name', 'modal.create-session'],
   'modal.snippet-editor': ['navigation', 'modal.snippet-picker.filtering'],
@@ -35,6 +36,7 @@ const TRANSITIONS: Record<ModeId, readonly ModeId[]> = {
     'modal.snippet-picker.filtering',
     'modal.theme-picker.filtering',
     'modal.rename-tab',
+    'modal.rename-worktree',
     'modal.update-available',
     'modal.ai-usage',
     'modal.worktree-delete-confirm',

package/src/input/modes/types.ts

@@ -15,6 +15,7 @@ export type ModeId =
   | 'modal.session-name'
   | 'modal.create-session'
   | 'modal.rename-tab'
+  | 'modal.rename-worktree'
   | 'modal.snippet-picker.filtering'
   | 'modal.snippet-editor'
   | 'modal.theme-picker.filtering'

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

@@ -1217,6 +1217,20 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
         },
       }
     }
+    case 'open-rename-worktree-modal': {
+      return {
+        ...state,
+        focusMode: 'command-edit',
+        modal: {
+          cursorPos: action.initialName.length,
+          editBuffer: action.initialName,
+          selectedIndex: 0,
+          sessionTargetId: action.worktreeId,
+          type: 'rename-worktree',
+          worktreeSessionId: action.sessionId,
+        },
+      }
+    }
     default:
       return null
   }

package/src/state/types.ts

@@ -38,6 +38,7 @@ export type ModalType =
   | 'session-name'
   | 'create-session'
   | 'rename-tab'
+  | 'rename-worktree'
   | 'snippet-picker'
   | 'snippet-editor'
   | 'theme-picker'
@@ -365,6 +366,11 @@ export interface ModalRenameTab extends ModalBase {
   type: 'rename-tab'
 }
 
+export interface ModalRenameWorktree extends ModalBase {
+  type: 'rename-worktree'
+  worktreeSessionId: string
+}
+
 export interface ModalSnippetPicker extends ModalBase {
   type: 'snippet-picker'
   /**
@@ -483,6 +489,7 @@ export type ModalState =
   | ModalSessionPicker
   | ModalSessionName
   | ModalRenameTab
+  | ModalRenameWorktree
   | ModalSnippetPicker
   | ModalThemePicker
   | ModalHelp
@@ -598,6 +605,12 @@ export type ModalAction =
   | { type: 'switch-create-session-field' }
   | { type: 'select-directory' }
   | { type: 'open-rename-tab-modal' }
+  | {
+      type: 'open-rename-worktree-modal'
+      sessionId: string
+      worktreeId: string
+      initialName: string
+    }
   | { type: 'open-snippet-picker' }
   | { type: 'open-snippet-editor'; snippetId?: string }
   | { type: 'set-help-entry-count'; count: number }

package/src/ui/components/layout/sidebar/worktree-row.tsx

@@ -63,9 +63,20 @@ export const WorktreeRow = memo(function WorktreeRow({
   )
 
   const rightClickMenu = useMemo<[string, () => void][] | undefined>(() => {
-    if (worktree.source === 'primary') return
-    return [
+    const entries: [string, () => void][] = [
       [
+        'Rename',
+        () =>
+          dispatchGlobal({
+            initialName: worktree.name,
+            sessionId: session.id,
+            type: 'open-rename-worktree-modal',
+            worktreeId: worktree.id,
+          }),
+      ],
+    ]
+    if (worktree.source !== 'primary') {
+      entries.push([
         'Remove worktree',
         () =>
           // Always confirm first. Confirming routes through the full delete side
@@ -83,8 +94,9 @@ export const WorktreeRow = memo(function WorktreeRow({
             worktreeId: worktree.id,
             worktreeLabel: worktree.branch ?? worktree.name,
           }),
-      ],
-    ]
+      ])
+    }
+    return entries
   }, [session.id, worktree.branch, worktree.id, worktree.name, worktree.source])
 
   let bgColor: string | undefined

package/src/ui/root.tsx

@@ -156,6 +156,8 @@ function renderModal(
       )
     case 'rename-tab':
       return <SessionNameModal title="Rename tab" value={modal.editBuffer ?? ''} />
+    case 'rename-worktree':
+      return <SessionNameModal title="Rename worktree" value={modal.editBuffer ?? ''} />
     case 'create-session':
       return (
         <CreateSessionModal

package/src/ui/status-bar-model.ts

@@ -150,6 +150,8 @@ function deriveCommandEditModeId(modalType: AppState['modal']['type']): ModeId |
       return 'modal.new-tab.command-edit'
     case 'rename-tab':
       return 'modal.rename-tab'
+    case 'rename-worktree':
+      return 'modal.rename-worktree'
     case 'session-name':
       return 'modal.session-name'
     case 'session-picker':