@brimveyn/aimux-config 0.6.10 → 0.6.11

package/package.json

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

package/src/actions.ts

@@ -403,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' }])
@@ -436,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,17 @@ 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")
     // -----------------------------------------------------------------------

package/src/types.ts

@@ -30,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 ──────────────────────────────────────────────────────
@@ -378,6 +379,26 @@ 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
 }
 
 /**
@@ -412,6 +433,7 @@ export type ModalState =
   | ModalUpdateAvailable
   | ModalAIUsage
   | ModalWorktreeMove
+  | ModalWorktreeMoveConfirm
   | ModalWorktreeDeleteConfirm
 
 export interface LayoutState {
@@ -526,6 +548,18 @@ 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
@@ -799,7 +833,11 @@ export type SideEffect =
       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 }