@brimveyn/aimux 1.24.0 → 1.24.1

package/package.json

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

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

@@ -13,6 +13,7 @@ import { allLeafIds, getGroupIdForTab } from '../state/layout-tree'
 import { saveCurrentProject } from '../state/project-save'
 import { getActiveWorkspace, getActiveWorkspacePath } from '../state/project-workspaces'
 import { toast } from '../state/toast-store'
+import { beginWorkspaceDelete, endWorkspaceDelete } from '../state/workspace-delete-store'
 import { filterThemeIds } from '../ui/filter-themes'
 import { scrollGitDiff } from '../ui/git-view-controls'
 import { applyTheme, getCurrentMode, getTransparent, setMode, setTransparent } from '../ui/theme'
@@ -306,6 +307,16 @@ export function executeSideEffect(effect: SideEffect, ctx: SideEffectContext): v
       return
     }
     case 'delete-workspace': {
+      const deleting = state.projects
+        .find((entry) => entry.id === effect.projectId)
+        ?.workspaces?.find((entry) => entry.id === effect.workspaceId)
+      // Marked before the enqueue, not inside the git op: the queue is why a
+      // delete can sit there doing nothing visible, which is the whole thing
+      // this indicator exists to answer.
+      beginWorkspaceDelete(
+        effect.workspaceId,
+        deleting?.branch ?? deleting?.name ?? 'this workspace'
+      )
       void (async () => {
         try {
           await enqueueGitOp(async () =>
@@ -333,11 +344,18 @@ export function executeSideEffect(effect: SideEffect, ctx: SideEffectContext): v
             closeTabs: effect.closeTabs === true,
             force: true,
             projectId: effect.projectId,
-            reason: message,
+            // Git's refusal, condensed to the one line that changes the answer.
+            // The raw message is a paragraph of plumbing nobody reads before
+            // pressing y, and the dialog is not where it gets debugged.
+            reason: /active assistant tabs/i.test(message)
+              ? 'Its assistant tabs will be closed.'
+              : 'Deleting anyway discards uncommitted work.',
             type: 'open-workspace-delete-confirm',
             workspaceId: effect.workspaceId,
             workspaceLabel: workspace?.branch ?? workspace?.name ?? 'this workspace',
           })
+        } finally {
+          endWorkspaceDelete(effect.workspaceId)
         }
       })()
       return

package/src/state/actions.ts

@@ -95,7 +95,7 @@ export type ModalAction =
       projectId: string
       workspaceId: string
       workspaceLabel: string
-      reason: string
+      reason?: string
       closeTabs: boolean
       force: boolean
     }

package/src/state/types.ts

@@ -648,7 +648,7 @@ export interface ModalWorkspaceDeleteConfirm extends ModalBase {
   projectId: string
   workspaceId: string
   workspaceLabel: string
-  reason: string
+  reason?: string
   closeTabs: boolean
   /** Whether confirming force-deletes — true only after a recoverable failure. */
   force: boolean

package/src/state/workspace-delete-store.ts

@@ -0,0 +1,32 @@
+import { useStore } from 'zustand'
+import { createStore } from 'zustand/vanilla'
+
+/**
+ * Workspace deletes in flight, keyed by workspace id, valued by the label to
+ * show for them. Its own store rather than a slice of `AppState`: nothing here
+ * survives the operation, no reducer decides anything about it, and the side
+ * effect that owns the git work can set it without a dispatch round-trip.
+ */
+interface WorkspaceDeleteState {
+  deleting: Record<string, string>
+}
+
+const workspaceDeleteStore = createStore<WorkspaceDeleteState>(() => ({ deleting: {} }))
+
+export function beginWorkspaceDelete(workspaceId: string, label: string): void {
+  workspaceDeleteStore.setState((state) => ({
+    deleting: { ...state.deleting, [workspaceId]: label },
+  }))
+}
+
+export function endWorkspaceDelete(workspaceId: string): void {
+  workspaceDeleteStore.setState((state) => {
+    const deleting = { ...state.deleting }
+    delete deleting[workspaceId]
+    return { deleting }
+  })
+}
+
+export function useWorkspaceDeleteStore<T>(selector: (state: WorkspaceDeleteState) => T): T {
+  return useStore(workspaceDeleteStore, selector)
+}

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

@@ -9,6 +9,7 @@ import { dispatchGlobal, runSideEffectGlobal } from '../../../../state/dispatch-
 import { formatDiffStat } from '../../../../state/project-workspaces'
 // eslint-disable-next-line no-duplicate-imports
 import { IDLE_WORKSPACE_ACTIVITY } from '../../../../state/types'
+import { useWorkspaceDeleteStore } from '../../../../state/workspace-delete-store'
 import { useActivitySprite } from '../../../hooks/use-activity-sprite'
 import { useBusySpinner } from '../../../hooks/use-busy-spinner'
 // eslint-disable-next-line no-duplicate-imports
@@ -56,9 +57,13 @@ export const WorkspaceRow = memo(function WorkspaceRow({
   // own: one shape is what keeps a cell from resolving to the wrong image.
   const hasBranch = workspace.branch != null && workspace.branch !== ''
   const sprite = useActivitySprite(hasBranch ? spriteStateFor(activity) : null)
+  // A delete takes seconds of git work with the row still on screen. The branch
+  // line is where it says so — the name above it is what you are looking for,
+  // and the branch under it is the one fact the delete is about to take away.
+  const isDeleting = useWorkspaceDeleteStore((s) => s.deleting[workspace.id] !== undefined)
   // Only the working case animates, so the timer is off for every other row —
   // and off entirely when a sprite is drawing this row instead.
-  const spinner = useBusySpinner(activity.working && sprite === null)
+  const spinner = useBusySpinner(isDeleting || (activity.working && sprite === null))
   // A primitive, so the selector stays referentially stable across renders.
   const hasSleepingTabs = useAppStore((s) =>
     s.tabs.some((tab) => tab.workspaceId === workspace.id && tab.hibernated === true)
@@ -121,7 +126,6 @@ export const WorkspaceRow = memo(function WorkspaceRow({
             closeTabs: true,
             force: false,
             projectId: project.id,
-            reason: 'Its assistant tabs will be closed and the worktree removed.',
             type: 'open-workspace-delete-confirm',
             workspaceId: workspace.id,
             workspaceLabel: workspace.branch ?? workspace.name,
@@ -243,7 +247,7 @@ export const WorkspaceRow = memo(function WorkspaceRow({
           </text>
         ) : null}
       </box>
-      {branchLabel == null ? null : (
+      {branchLabel == null && !isDeleting ? null : (
         <box flexDirection="row" alignItems="center">
           <text fg={t.primary} selectable={false} wrapMode="none">
             {cursorGlyph}
@@ -254,9 +258,15 @@ export const WorkspaceRow = memo(function WorkspaceRow({
           <text fg={statusColor} selectable={false} wrapMode="none">
             {sprite?.glyphs[1] ?? '  '}
           </text>
-          <text fg={t.textMuted} selectable={false} wrapMode="none">
-            {'\u{e702}'} {branchLabel}
-          </text>
+          {isDeleting ? (
+            <text fg={t.error} selectable={false} wrapMode="none">
+              {spinner} Deleting…
+            </text>
+          ) : (
+            <text fg={t.textMuted} selectable={false} wrapMode="none">
+              {'\u{e702}'} {branchLabel}
+            </text>
+          )}
         </box>
       )}
     </ContextMenuBox>

package/src/ui/components/modals/shared/workspace-delete-confirm.tsx

@@ -6,7 +6,11 @@ import { Form } from './form'
 
 interface WorkspaceDeleteConfirmProps {
   keybindsModeId: ModeId
-  reason: string
+  /**
+   * One short line naming what confirming costs beyond the delete itself.
+   * Omitted for the ordinary case, where the title already said everything.
+   */
+  reason?: string
   workspaceLabel: string
 }
 
@@ -24,16 +28,13 @@ export function WorkspaceDeleteConfirm({
   return (
     <Form
       title="Delete workspace?"
+      subtitle={workspaceLabel}
       keybindsModeId={keybindsModeId}
       width={uiTokens.modalWidth.md}
+      // Destructive confirmation — the one place §7 keeps an inline key hint.
       footer={<text fg={t.textMuted}>Enter / y to delete · Esc / n to cancel</text>}
     >
-      <box flexDirection="column" gap={1}>
-        <text fg={t.text}>
-          Delete <strong>{workspaceLabel}</strong>?
-        </text>
-        <text fg={t.warning}>{reason}</text>
-      </box>
+      {reason == null || reason === '' ? null : <text fg={t.textMuted}>{reason}</text>}
     </Form>
   )
 }

package/src/ui/components/overlays/workspace-deleting-overlay.tsx

@@ -0,0 +1,29 @@
+import { useWorkspaceDeleteStore } from '../../../state/workspace-delete-store'
+import { useBusySpinner } from '../../hooks/use-busy-spinner'
+import { useTheme } from '../../theme'
+import { uiTokens } from '../../ui-tokens'
+import { ModalShell } from '../modals/shared/modal-shell'
+
+/**
+ * The card that stands in for the confirmation while the git work runs. Same
+ * shell, same width, same place on screen as the dialog that was just there, so
+ * confirming reads as the dialog changing what it says rather than the screen
+ * going quiet for a few seconds.
+ */
+function DeletingCard({ label }: { label: string }) {
+  const t = useTheme()
+  const spinner = useBusySpinner()
+  return (
+    <ModalShell title={`${spinner} Deleting workspace`} width={uiTokens.modalWidth.md}>
+      <text fg={t.textMuted}>{label}</text>
+    </ModalShell>
+  )
+}
+
+export function WorkspaceDeletingOverlay() {
+  // Joined in the selector so the subscription compares a string: a fresh object
+  // every render would re-render the whole root on every unrelated store write.
+  const label = useWorkspaceDeleteStore((state) => Object.values(state.deleting).join(' · '))
+  if (label === '') return null
+  return <DeletingCard label={label} />
+}

package/src/ui/root.tsx

@@ -44,6 +44,7 @@ import { WorkspaceMoveModal } from './components/modals/workspace/workspace-move
 import { ContextMenuOverlay } from './components/overlays/context-menu/context-menu-overlay'
 import { PendingChordOverlay } from './components/overlays/pending-chord-overlay'
 import { ToastViewport } from './components/overlays/toast/toast-viewport'
+import { WorkspaceDeletingOverlay } from './components/overlays/workspace-deleting-overlay'
 import { SettingsView } from './components/settings/settings-view'
 import { StatsView } from './components/stats/stats-view'
 import { useTheme } from './theme'
@@ -541,6 +542,7 @@ export function RootView({
         themeId,
         workspaceDivergence,
       })}
+      <WorkspaceDeletingOverlay />
       <ToastViewport />
     </box>
   )