@brimveyn/aimux-config 0.6.9 → 0.6.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brimveyn/aimux-config",
-  "version": "0.6.9",
+  "version": "0.6.11",
   "description": "TypeScript configuration API for aimux — keymaps, themes, and backends with a fluent builder.",
   "keywords": [
     "aimux",

package/src/actions.ts

@@ -195,7 +195,7 @@ export const launchSelectedAssistant: ActionFn = (ctx: ModeContext) => {
     ctx.state.modal.step === 'worktree' &&
     ctx.state.modal.createWorktree
   ) {
-    return r([{ type: 'enter-new-tab-worktree-create' }])
+    return r([{ type: 'enter-new-tab-worktree-create' }], [{ type: 'load-new-tab-base-branches' }])
   }
   return r([], [{ type: 'launch-selected-assistant' }])
 }
@@ -210,19 +210,49 @@ export const deleteSelectedWorktree: ActionFn = (ctx: ModeContext) => {
   const session = ctx.state.sessions.find((entry) => entry.id === sessionId)
   const worktree = session?.worktrees?.[modal.selectedIndex]
   if (!worktree) return null
+  // First attempt is never forced — a recoverable failure opens the confirm
+  // dialog (see set-new-tab-worktree-delete-prompt), where confirmDeleteWorktree
+  // retries with force.
   return r(
-    [
-      { index: modal.selectedIndex, type: 'set-modal-selection-index' },
-      { message: null, type: 'set-new-tab-worktree-delete-state' },
-    ],
+    [{ index: modal.selectedIndex, type: 'set-modal-selection-index' }],
+    [{ force: false, sessionId, type: 'delete-worktree', worktreeId: worktree.id }]
+  )
+}
+
+export const confirmDeleteWorktree: ActionFn = (ctx: ModeContext) => {
+  const modal = ctx.state.modal
+  const sessionId = ctx.state.currentSessionId
+  if (modal.type !== 'new-tab' || modal.worktreeDeletePrompt == null) return null
+  if (!(sessionId != null && sessionId !== '')) return null
+  const { worktreeId } = modal.worktreeDeletePrompt
+  return r(
+    [{ prompt: null, type: 'set-new-tab-worktree-delete-prompt' }],
+    [{ force: true, sessionId, type: 'delete-worktree', worktreeId }],
+    'modal.new-tab.command-edit'
+  )
+}
+
+export const cancelDeleteWorktree: KeyResult = r(
+  [{ prompt: null, type: 'set-new-tab-worktree-delete-prompt' }],
+  [],
+  'modal.new-tab.command-edit'
+)
+
+export const confirmWorktreeDeleteModal: ActionFn = (ctx: ModeContext) => {
+  const modal = ctx.state.modal
+  if (modal.type !== 'worktree-delete-confirm') return null
+  return r(
+    [{ type: 'close-modal' }],
     [
       {
-        force: modal.worktreeDeleteConfirmId === worktree.id,
-        sessionId,
+        closeTabs: modal.closeTabs,
+        force: modal.force,
+        sessionId: modal.sessionId,
         type: 'delete-worktree',
-        worktreeId: worktree.id,
+        worktreeId: modal.worktreeId,
       },
-    ]
+    ],
+    'navigation'
   )
 }
 
@@ -373,7 +403,10 @@ export const openWorktreeMove: ActionFn = (ctx: ModeContext) => {
   }
   // Overlay: no mode transition — deriveModeId routes input to the picker and
   // focusMode stays 'git' so the git view remains mounted underneath.
-  return r([{ sourceWorktreeId: source.id, type: 'open-worktree-move-modal' }])
+  return r(
+    [{ sourceWorktreeId: source.id, type: 'open-worktree-move-modal' }],
+    [{ type: 'load-worktree-move-stats' }]
+  )
 }
 
 export const toggleWorktreeMoveDelete: KeyResult = r([{ type: 'toggle-worktree-move-delete' }])
@@ -406,6 +439,27 @@ export const confirmWorktreeMove: ActionFn = (ctx: ModeContext) => {
   )
 }
 
+// Confirms the dialog opened after a recoverable move failure: re-runs the
+// move with the flag matching the failure (stash the target / keep conflicts).
+export const confirmWorktreeMoveRetry: ActionFn = (ctx: ModeContext) => {
+  const modal = ctx.state.modal
+  if (modal.type !== 'worktree-move-confirm') return null
+  return r(
+    [{ type: 'close-modal' }],
+    [
+      {
+        deleteSource: modal.deleteSource,
+        sessionId: modal.sessionId,
+        sourceWorktreeId: modal.sourceWorktreeId,
+        targetWorktreeId: modal.targetWorktreeId,
+        type: 'move-worktree',
+        ...(modal.variant === 'stash-target' ? { stashTarget: true } : { keepConflicts: true }),
+      },
+    ],
+    'navigation'
+  )
+}
+
 export const closePane: ActionFn = (ctx: ModeContext) => {
   const tabId = ctx.state.activeTabId
   if (!(tabId != null && tabId !== '')) return null

package/src/defaults.ts

@@ -204,6 +204,28 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
         .map('<CR>', actions.confirmWorktreeMove, 'Move')
     )
 
+    // -----------------------------------------------------------------------
+    // Modal: worktree-move recoverable-failure confirmation (stash / conflicts)
+    // -----------------------------------------------------------------------
+    .mode('modal.worktree-move-confirm', (m) =>
+      m
+        .map('<Esc>', actions.closeModal, 'Cancel')
+        .map('n', actions.closeModal, 'Cancel')
+        .map('<CR>', actions.confirmWorktreeMoveRetry, 'Confirm')
+        .map('y', actions.confirmWorktreeMoveRetry, 'Confirm')
+    )
+
+    // -----------------------------------------------------------------------
+    // Modal: standalone worktree delete confirmation (sidebar "Remove worktree")
+    // -----------------------------------------------------------------------
+    .mode('modal.worktree-delete-confirm', (m) =>
+      m
+        .map('<Esc>', actions.closeModal, 'Cancel')
+        .map('n', actions.closeModal, 'Cancel')
+        .map('<CR>', actions.confirmWorktreeDeleteModal, 'Delete worktree')
+        .map('y', actions.confirmWorktreeDeleteModal, 'Delete worktree')
+    )
+
     // -----------------------------------------------------------------------
     // Modal: rename-tab
     // -----------------------------------------------------------------------
@@ -239,6 +261,17 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
         .passthrough()
     )
 
+    // -----------------------------------------------------------------------
+    // Modal: new-tab worktree delete confirmation dialog
+    // -----------------------------------------------------------------------
+    .mode('modal.new-tab.worktree-delete-confirm', (m) =>
+      m
+        .map('<Esc>', actions.cancelDeleteWorktree, 'Cancel')
+        .map('n', actions.cancelDeleteWorktree, 'Cancel')
+        .map('<CR>', actions.confirmDeleteWorktree, 'Delete worktree')
+        .map('y', actions.confirmDeleteWorktree, 'Delete worktree')
+    )
+
     // -----------------------------------------------------------------------
     // Modal: session-picker (always in filter mode via Picker)
     // -----------------------------------------------------------------------

package/src/types.ts

@@ -14,6 +14,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 =
   | 'modal.git-commit.generating'
   | 'modal.update-available'
   | 'modal.worktree-move'
+  | 'modal.worktree-move-confirm'
   | 'modal.ai-usage'
 
 // ─── Primitive app types ──────────────────────────────────────────────────────
@@ -296,16 +299,21 @@ export interface ModalClosed extends ModalBase {
 export interface ModalNewTab extends ModalBase {
   type: 'new-tab'
   editingCommand: AssistantId | null
-  activeField: 'assistant' | 'branch-name' | 'target-worktree' | 'worktree-name'
+  activeField: 'assistant' | 'branch-name' | 'target-worktree' | 'worktree-name' | 'base'
   branchError: string | null
   branchName: string
   createWorktree: boolean
   selectedAssistantId: AssistantId | null
   step: 'assistant' | 'worktree' | 'worktree-create' | 'template'
   targetWorktreeIndex: number
-  worktreeDeleteConfirmId: string | null
-  worktreeDeleteMessage: string | null
+  worktreeDeletePrompt: { worktreeId: string; reason: string } | null
   worktreeName: string
+  /** Filter text typed into the "Base" picker on the worktree-create step. */
+  baseQuery: string
+  /** Resolved base ref the new worktree is forked from (branch of a worktree or a local branch). */
+  baseRef: string
+  /** Local branches available as base refs, loaded when the create step opens. */
+  baseBranches: string[]
 }
 export interface ModalSessionPicker extends ModalBase {
   type: 'session-picker'
@@ -371,6 +379,42 @@ export interface ModalWorktreeMove extends ModalBase {
   /** The worktree being moved (may differ from the active one, e.g. a tab menu). */
   sourceWorktreeId: string
   deleteSource: boolean
+  /** Per-worktree dirty file counts, loaded async when the modal opens. */
+  stats: { kind: 'loading' } | { kind: 'ready'; dirtyFiles: Record<string, number> }
+}
+
+/**
+ * Confirmation for a recoverable move failure: the target's dirty files
+ * overlap the incoming changes (stash-target) or the squash conflicts
+ * (keep-conflicts). Both worktrees are already restored; confirming re-runs
+ * move-worktree with the matching flag.
+ */
+export interface ModalWorktreeMoveConfirm extends ModalBase {
+  type: 'worktree-move-confirm'
+  variant: 'stash-target' | 'keep-conflicts'
+  files: string[]
+  sessionId: string
+  sourceWorktreeId: string
+  targetWorktreeId: string
+  deleteSource: boolean
+  sourceLabel: string
+  targetLabel: string
+}
+
+/**
+ * Standalone confirmation for a recoverable worktree delete failure triggered
+ * outside the new-tab picker (e.g. the sidebar's "Remove worktree"). Carries the
+ * params needed to re-run the delete with force once confirmed.
+ */
+export interface ModalWorktreeDeleteConfirm extends ModalBase {
+  type: 'worktree-delete-confirm'
+  sessionId: string
+  worktreeId: string
+  worktreeLabel: string
+  reason: string
+  closeTabs: boolean
+  /** Whether confirming force-deletes — true only after a recoverable failure. */
+  force: boolean
 }
 
 export type ModalState =
@@ -389,6 +433,8 @@ export type ModalState =
   | ModalUpdateAvailable
   | ModalAIUsage
   | ModalWorktreeMove
+  | ModalWorktreeMoveConfirm
+  | ModalWorktreeDeleteConfirm
 
 export interface LayoutState {
   terminalCols: number
@@ -464,10 +510,10 @@ export type ModalAction =
   | { 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: 'set-new-tab-worktree-delete-prompt'
+      prompt: { worktreeId: string; reason: string } | null
     }
+  | { type: 'set-new-tab-base-branches'; branches: string[] }
   | { type: 'enter-new-tab-worktree-create' }
   | { type: 'enter-new-tab-template-pick' }
   | { type: 'enter-new-tab-template-shortcut' }
@@ -502,6 +548,27 @@ export type ModalAction =
   | { type: 'open-edit-custom-command'; assistantId: AssistantId }
   | { type: 'open-worktree-move-modal'; sourceWorktreeId: string }
   | { type: 'toggle-worktree-move-delete' }
+  | { type: 'set-worktree-move-stats'; dirtyFiles: Record<string, number> }
+  | {
+      type: 'open-worktree-move-confirm'
+      variant: 'stash-target' | 'keep-conflicts'
+      files: string[]
+      sessionId: string
+      sourceWorktreeId: string
+      targetWorktreeId: string
+      deleteSource: boolean
+      sourceLabel: string
+      targetLabel: string
+    }
+  | {
+      type: 'open-worktree-delete-confirm'
+      sessionId: string
+      worktreeId: string
+      worktreeLabel: string
+      reason: string
+      closeTabs: boolean
+      force: boolean
+    }
 
 export type SessionAction =
   | { type: 'load-session'; sessionId: string; workspaceSnapshot?: WorkspaceSnapshotV1 }
@@ -513,7 +580,6 @@ export type SessionAction =
   | { type: 'reorder-active-session'; delta: number }
   | { 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'
@@ -709,6 +775,7 @@ export type AppAction =
 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' }
@@ -748,14 +815,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 }