@brimveyn/aimux 1.14.15 → 1.14.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brimveyn/aimux",
-  "version": "1.14.15",
+  "version": "1.14.16",
   "description": "A terminal multiplexer for AI CLIs. Run Claude, Codex, OpenCode side-by-side with tabbed navigation, split panes, and persistent sessions.",
   "keywords": [
     "ai",
@@ -60,7 +60,7 @@
     "bump": "bun run scripts/bump.ts"
   },
   "dependencies": {
-    "@brimveyn/aimux-config": "0.6.9",
+    "@brimveyn/aimux-config": "0.6.10",
     "@opentui/core": "^0.1.90",
     "@opentui/react": "^0.1.90",
     "@resvg/resvg-wasm": "^2.6.2",

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

@@ -22,10 +22,13 @@ import { enqueueGitOp } from '../git/command-queue'
 import { moveWorktree } from '../git/move-worktree'
 import {
   createGitWorktree,
+  deleteGitBranch,
   getCurrentBranch,
   getHeadSha,
   getMainWorktreeRoot,
   listGitWorktrees,
+  listLocalBranches,
+  pruneGitWorktrees,
   removeGitWorktree,
 } from '../git/worktree'
 import { createPrefixedId } from '../platform/id'
@@ -419,6 +422,7 @@ async function launchAssistantInNewWorktree(
   worktreeName: string,
   branchName?: string,
   sourceWorktreeId?: string,
+  baseRef?: string,
   templateId?: string
 ): Promise<void> {
   const sessionId = ctx.state.currentSessionId
@@ -428,7 +432,7 @@ async function launchAssistantInNewWorktree(
     sessionId,
     worktreeName,
     branchName,
-    undefined,
+    baseRef,
     sourceWorktreeId
   )
   if (!worktree) return
@@ -665,6 +669,7 @@ export function executeSideEffect(effect: SideEffect, ctx: SideEffectContext): v
       if (state.modal.type === 'new-tab' && state.modal.createWorktree) {
         const worktreeName = state.modal.worktreeName
         const branchName = state.modal.branchName
+        const baseRef = state.modal.baseRef
         const sourceWorktreeId = getNewTabTargetWorktreeId(state)
         let templateId: string | undefined
         if (state.modal.step === 'template') {
@@ -683,6 +688,7 @@ export function executeSideEffect(effect: SideEffect, ctx: SideEffectContext): v
                 worktreeName,
                 branchName,
                 sourceWorktreeId,
+                baseRef !== '' ? baseRef : undefined,
                 templateId
               )
             )
@@ -700,6 +706,17 @@ export function executeSideEffect(effect: SideEffect, ctx: SideEffectContext): v
       dispatch({ assistantId: option.id, type: 'open-edit-custom-command' })
       return
     }
+    case 'load-new-tab-base-branches': {
+      void (async () => {
+        const session = state.sessions.find((entry) => entry.id === state.currentSessionId)
+        const sourcePath = getActiveWorktree(session)?.path ?? getSessionProjectPath(session)
+        if (!(sourcePath != null && sourcePath !== '')) return
+        const branches = await listLocalBranches(sourcePath)
+        if (ctx.getState().modal.type !== 'new-tab') return
+        ctx.dispatch({ branches, type: 'set-new-tab-base-branches' })
+      })()
+      return
+    }
     case 'confirm-selected-session': {
       handleSessionSelection(ctx)
       return
@@ -720,27 +737,40 @@ export function executeSideEffect(effect: SideEffect, ctx: SideEffectContext): v
               { ...ctx, state: ctx.getState() },
               effect.sessionId,
               effect.worktreeId,
-              !!(effect.force === true)
+              !!(effect.force === true),
+              !!(effect.closeTabs === true)
             )
           )
         } catch (error) {
           const message = error instanceof Error ? error.message : String(error)
-          const forceable = isForceableWorktreeDeleteError(message)
+          // Real errors surface as a toast. Recoverable failures (dirty tree,
+          // active tabs, …) open a confirmation so the user can opt into a
+          // force-delete: in-place inside the new-tab worktree picker (preserving
+          // it), or as a standalone modal elsewhere (e.g. the sidebar's "Remove
+          // worktree").
+          if (!isForceableWorktreeDeleteError(message)) {
+            toast.error(`Could not delete worktree: ${message}`)
+            return
+          }
           const latest = ctx.getState()
           if (latest.modal.type === 'new-tab' && latest.modal.step === 'worktree') {
-            const session = latest.sessions.find((entry) => entry.id === effect.sessionId)
-            const selected = session?.worktrees?.[latest.modal.selectedIndex]
-            if (selected && selected.id !== effect.worktreeId) {
-              ctx.dispatch({ message, type: 'git-mode-set-message' })
-              return
-            }
+            ctx.dispatch({
+              prompt: { reason: message, worktreeId: effect.worktreeId },
+              type: 'set-new-tab-worktree-delete-prompt',
+            })
+            return
           }
+          const session = latest.sessions.find((entry) => entry.id === effect.sessionId)
+          const worktree = session?.worktrees?.find((entry) => entry.id === effect.worktreeId)
           ctx.dispatch({
-            confirmWorktreeId: forceable ? effect.worktreeId : null,
-            message: forceable ? message : `Could not delete worktree: ${message}`,
-            type: 'set-new-tab-worktree-delete-state',
+            closeTabs: effect.closeTabs === true,
+            force: true,
+            reason: message,
+            sessionId: effect.sessionId,
+            type: 'open-worktree-delete-confirm',
+            worktreeId: effect.worktreeId,
+            worktreeLabel: worktree?.branch ?? worktree?.name ?? 'this worktree',
           })
-          ctx.dispatch({ message, type: 'git-mode-set-message' })
         }
       })()
       return
@@ -1544,7 +1574,8 @@ async function runDeleteWorktree(
   ctx: SideEffectContext,
   sessionId: string,
   worktreeId: string,
-  force: boolean
+  force: boolean,
+  closeTabs = false
 ): Promise<void> {
   const session = ctx.state.sessions.find((entry) => entry.id === sessionId)
   const worktree = session?.worktrees?.find((entry) => entry.id === worktreeId)
@@ -1554,36 +1585,43 @@ async function runDeleteWorktree(
   if (worktree.source === 'primary') throw new Error('root worktree cannot be deleted')
 
   const tabsInWorktree = ctx.state.tabs.filter((tab) => tab.worktreeId === worktreeId)
-  if (tabsInWorktree.length > 0 && !force) {
+  // The active-tabs guard asks the modal user to confirm before closing tabs.
+  // `closeTabs` (the sidebar's "Remove worktree") opts into closing them
+  // directly without forcing the git removal, so dirty temp worktrees are still
+  // protected by the non-force `git worktree remove`.
+  if (tabsInWorktree.length > 0 && !force && !closeTabs) {
     throw new ActiveWorktreeTabsError(tabsInWorktree.length)
   }
   disposeWorktreeTabs(ctx, worktreeId)
 
-  if (
-    worktree.source === 'aimux-temp' &&
-    worktree.createdByAimux &&
-    isInsideAimuxWorktreeRoot(worktree.path) &&
-    !existsSync(worktree.path)
-  ) {
+  const repoPath = resolveWorktreeGitDir(session, worktree)
+  const isAimuxTemp = worktree.source === 'aimux-temp' && worktree.createdByAimux
+  // Drop the throwaway aimux branch alongside the worktree so deleted temp
+  // worktrees don't accumulate in the repo or haunt the base picker. Scoped to
+  // the `aimux/` namespace (matches the picker filter); best-effort.
+  const cleanupAimuxBranch = async (): Promise<void> => {
+    const branch = worktree.branch
+    if (isAimuxTemp && branch != null && branch !== '' && branch.startsWith('aimux/')) {
+      await deleteGitBranch(repoPath, branch)
+    }
+  }
+
+  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 (
-    worktree.source === 'aimux-temp' &&
-    worktree.createdByAimux &&
-    isInsideAimuxWorktreeRoot(worktree.path)
-  ) {
+  if (isAimuxTemp && isInsideAimuxWorktreeRoot(worktree.path)) {
     await assertSafeAimuxWorktreePath(worktree.path)
-    await removeGitWorktree({
-      force,
-      repoPath: resolveWorktreeGitDir(session, worktree),
-      targetPath: worktree.path,
-    })
+    await removeGitWorktree({ force, repoPath, targetPath: worktree.path })
   } else if (worktree.source === 'aimux-temp' || worktree.createdByAimux) {
     throw new Error(`refusing unsafe worktree delete: ${worktree.path}`)
   }
 
+  await cleanupAimuxBranch()
   removeWorktreeRecordFromSession(ctx, sessionId, session, worktreeId)
 }
 
@@ -1694,7 +1732,7 @@ function removeWorktreeRecordFromSession(
       type: 'set-modal-selection-index',
     })
   }
-  ctx.dispatch({ message: null, type: 'set-new-tab-worktree-delete-state' })
+  ctx.dispatch({ prompt: null, type: 'set-new-tab-worktree-delete-prompt' })
 }
 
 function isForceableWorktreeDeleteError(message: string): boolean {
@@ -1706,7 +1744,7 @@ function isForceableWorktreeDeleteError(message: string): boolean {
 class ActiveWorktreeTabsError extends Error {
   constructor(tabCount: number) {
     super(
-      `active assistant tabs are using this worktree (${tabCount}). Click [del] again to close them and delete the worktree.`
+      `active assistant tabs are using this worktree (${tabCount}) — they will be closed if you confirm.`
     )
   }
 }

package/src/app.tsx

@@ -22,7 +22,9 @@ import { useMouseHandlers } from './app-runtime/use-mouse-handlers'
 import { useRendererBindings } from './app-runtime/use-renderer-bindings'
 import { useTerminalResize } from './app-runtime/use-terminal-resize'
 import { useWorkspaceAutosave } from './app-runtime/use-workspace-autosave'
-import { loadConfig } from './config'
+import { loadConfig, saveConfig } from './config'
+import { enqueueGitOp } from './git/command-queue'
+import { pruneOrphanAimuxBranches } from './git/worktree'
 import { setActiveKeymap } from './input/keymap/keymap-ref'
 import { deriveModeId } from './input/modes/bridge'
 import { registerAllModes } from './input/modes/handlers'
@@ -39,6 +41,7 @@ import { findMostRecentSession, loadSessionCatalog } from './state/session-catal
 import { getSessionProjectPath } from './state/session-worktrees'
 import { loadSnippetCatalog, mergeConfigSnippets } from './state/snippet-catalog'
 import { createInitialState } from './state/store'
+import { toast } from './state/toast-store'
 import { KeymapContext } from './ui/keymap-context'
 import { RootView } from './ui/root'
 import {
@@ -250,6 +253,28 @@ export function App({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 
+  useEffect(() => {
+    // One-shot cleanup: prune `aimux/` branches orphaned by temp worktrees that
+    // were deleted before delete-time branch cleanup existed. Gated by a config
+    // flag so it runs once per machine. All git calls are best-effort (nothrow)
+    // and git protects branches still checked out in a live worktree.
+    if (loadConfig().prunedOrphanAimuxBranches === true) return
+    void (async () => {
+      const repoRoots = new Set<string>()
+      for (const session of loadSessionCatalog()) {
+        for (const worktree of session.worktrees ?? []) {
+          if (worktree.repoRoot !== '') repoRoots.add(worktree.repoRoot)
+        }
+      }
+      let removed = 0
+      for (const repoRoot of repoRoots) {
+        removed += await enqueueGitOp(() => pruneOrphanAimuxBranches(repoRoot))
+      }
+      saveConfig({ ...loadConfig(), prunedOrphanAimuxBranches: true })
+      if (removed > 0) toast.success(`Cleaned ${removed} orphaned aimux branch(es)`)
+    })()
+  }, [])
+
   const resizingRef = useRef(false)
   // Seeded with state.layout's DEFAULT 80x24; reassigned below once
   // useTerminalResize has produced the open-loop estimate from real dimensions.

package/src/config.ts

@@ -64,6 +64,8 @@ export interface AimuxConfig {
   sessionBarVisible?: boolean
   workspaceSnapshot?: WorkspaceSnapshotV1
   skippedUpdateVersion?: string
+  /** One-shot guard: orphan `aimux/` branches were pruned from existing repos. */
+  prunedOrphanAimuxBranches?: boolean
   worktreeTemplates?: WorktreeTemplate[]
 }
 
@@ -255,6 +257,7 @@ export function loadConfigResult(): ConfigLoadResult {
       sessionBarVisible?: unknown
       workspaceSnapshot?: unknown
       skippedUpdateVersion?: unknown
+      prunedOrphanAimuxBranches?: unknown
       worktreeTemplates?: unknown
     }
 
@@ -350,6 +353,7 @@ export function loadConfigResult(): ConfigLoadResult {
       config: {
         customCommands: isCustomCommandsRecord(parsed.customCommands) ? parsed.customCommands : {},
         gitPane: validGitPane,
+        prunedOrphanAimuxBranches: parsed.prunedOrphanAimuxBranches === true ? true : undefined,
         sessionBarVisible: validSessionBarVisible,
         sidebar: validSidebar,
         skippedUpdateVersion: validSkippedUpdateVersion,

package/src/git/worktree.ts

@@ -33,6 +33,24 @@ export async function getHeadSha(cwd: string): Promise<string | undefined> {
   return result.text().trim() || undefined
 }
 
+// Local branch names, ordered most-recently-committed first so the likely base
+// surfaces near the top of the picker.
+export async function listLocalBranches(cwd: string): Promise<string[]> {
+  // The format must be interpolated, not inlined: Bun's shell parses a bare
+  // `%(refname:short)` and chokes on the parentheses.
+  const format = '%(refname:short)'
+  const result =
+    await $`git -C ${cwd} for-each-ref --sort=-committerdate refs/heads --format=${format}`
+      .quiet()
+      .nothrow()
+  if (result.exitCode !== 0) return []
+  return result
+    .text()
+    .split('\n')
+    .map((line) => line.trim())
+    .filter((line) => line !== '')
+}
+
 export async function createGitWorktree({
   baseRef,
   branchName,
@@ -52,6 +70,33 @@ export async function createGitWorktree({
   }
 }
 
+// Force-delete a local branch. Returns false (without throwing) when git
+// refuses — notably when the branch is still checked out in a live worktree,
+// which is exactly how orphan-pruning stays safe.
+export async function deleteGitBranch(repoPath: string, branch: string): Promise<boolean> {
+  const result = await $`git -C ${repoPath} branch -D ${branch}`.quiet().nothrow()
+  return result.exitCode === 0
+}
+
+export async function pruneGitWorktrees(repoPath: string): Promise<void> {
+  await $`git -C ${repoPath} worktree prune`.quiet().nothrow()
+}
+
+// Drop every `aimux/` branch left behind by deleted temp worktrees. git refuses
+// to delete branches still checked out in a live worktree, so this only removes
+// true orphans. Returns the number of branches removed.
+export async function pruneOrphanAimuxBranches(repoPath: string): Promise<number> {
+  await pruneGitWorktrees(repoPath)
+  const branches = (await listLocalBranches(repoPath)).filter((branch) =>
+    branch.startsWith('aimux/')
+  )
+  let removed = 0
+  for (const branch of branches) {
+    if (await deleteGitBranch(repoPath, branch)) removed++
+  }
+  return removed
+}
+
 export async function removeGitWorktree({
   force,
   repoPath,

package/src/input/modes/bridge.ts

@@ -26,6 +26,7 @@ const COMMAND_EDIT_MODE_IDS: Partial<Record<SupportedModalType, ModeId>> = {
 const MODAL_MODE_IDS: Partial<Record<SupportedModalType, ModeId>> = {
   'ai-usage': 'modal.ai-usage',
   'update-available': 'modal.update-available',
+  'worktree-delete-confirm': 'modal.worktree-delete-confirm',
   'worktree-move': 'modal.worktree-move',
 }
 
@@ -51,6 +52,9 @@ export function deriveModeId(state: AppState): ModeId {
     if (state.modal.type === 'new-tab' && state.modal.editingCommand !== null) {
       return 'modal.new-tab.editing-command'
     }
+    if (state.modal.type === 'new-tab' && state.modal.worktreeDeletePrompt !== null) {
+      return 'modal.new-tab.worktree-delete-confirm'
+    }
     if (state.modal.type === 'git-commit' && state.modal.stage === 'confirm') {
       return 'modal.git-commit.confirm'
     }

package/src/input/modes/transitions.ts

@@ -8,8 +8,13 @@ const TRANSITIONS: Record<ModeId, readonly ModeId[]> = {
   'modal.git-commit.confirm': ['modal.git-commit', 'git-mode'],
   'modal.git-commit.generating': ['modal.git-commit', 'modal.git-commit.confirm', 'git-mode'],
   'modal.help.filtering': ['navigation'],
-  'modal.new-tab.command-edit': ['navigation', 'modal.new-tab.editing-command'],
+  'modal.new-tab.command-edit': [
+    'navigation',
+    'modal.new-tab.editing-command',
+    'modal.new-tab.worktree-delete-confirm',
+  ],
   '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.session-name': ['modal.session-picker.filtering', 'navigation'],
   'modal.session-picker.filtering': ['navigation', 'modal.session-name', 'modal.create-session'],
@@ -18,6 +23,7 @@ const TRANSITIONS: Record<ModeId, readonly ModeId[]> = {
   'modal.split-picker': ['navigation', 'terminal-input'],
   'modal.theme-picker.filtering': ['navigation'],
   'modal.update-available': ['navigation'],
+  'modal.worktree-delete-confirm': ['navigation'],
   'modal.worktree-move': ['git-mode', 'navigation'],
   'navigation': [
     'terminal-input',
@@ -30,6 +36,7 @@ const TRANSITIONS: Record<ModeId, readonly ModeId[]> = {
     'modal.rename-tab',
     'modal.update-available',
     'modal.ai-usage',
+    'modal.worktree-delete-confirm',
     'git-mode',
   ],
   'terminal-input': ['navigation', 'modal.split-picker', 'modal.ai-usage'],

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'
@@ -28,6 +30,7 @@ export type ModeId =
 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,7 +74,18 @@ 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