aimux-cli 0.1.13 → 0.1.14

package/dist/multiplexer/worktrees.js

@@ -1,20 +1,49 @@
-import { getWorktreeCreatePath, listWorktrees as listAllWorktrees } from "../worktree.js";
+import { getWorktreeCreatePath, isToolInternalWorktree, listWorktrees as listAllWorktrees } from "../worktree.js";
 import { debug } from "../debug.js";
 import { parseKeys } from "../key-parser.js";
-import { renderWorktreeListOverlay, renderWorktreeRemoveConfirmOverlay } from "../tui/screens/overlay-renderers.js";
+import { addDashboardOperationFailure } from "../dashboard/operation-failures.js";
+import { buildWorktreeListOverlayOutput, buildWorktreeRemoveConfirmOverlayOutput, } from "../tui/screens/overlay-renderers.js";
 import { postToProjectService } from "./dashboard-control.js";
 import { DashboardPendingActions } from "../dashboard/pending-actions.js";
-function forceDashboardServiceRefresh(host) {
-    if (typeof host.refreshDashboardModelFromService !== "function")
-        return;
-    void host.refreshDashboardModelFromService(true).then((refreshed) => {
-        if (!refreshed || host.mode !== "dashboard")
-            return;
-        host.renderDashboard();
-    });
+import { dashboardCreatedSortKey } from "../dashboard/sort.js";
+function assertDashboardWorktreeMutationSettled(settled, action) {
+    if (!settled) {
+        throw new Error(`worktree ${action} did not settle before timing out`);
+    }
+}
+async function waitForRenderedDashboardWorktreeState(host, path, predicate, timeoutMs = 10_000) {
+    const deadline = Date.now() + timeoutMs;
+    while (Date.now() < deadline) {
+        await host.refreshDashboardModelFromService(true);
+        const group = host.dashboardWorktreeGroupsCache.find((entry) => entry.path === path);
+        if (predicate(group))
+            return true;
+        await new Promise((resolve) => setTimeout(resolve, 100));
+    }
+    return false;
+}
+async function runDashboardWorktreeMutation(host, opts) {
+    host.dashboardPendingActions.set(opts.pendingKey, opts.pendingAction);
+    host.renderDashboard();
+    try {
+        await opts.request();
+        assertDashboardWorktreeMutationSettled(await opts.settle(), opts.pendingAction);
+        host.dashboardPendingActions.set(opts.pendingKey, null);
+        opts.onSuccess?.();
+    }
+    catch (error) {
+        host.dashboardPendingActions.set(opts.pendingKey, null);
+        opts.onError?.(error);
+    }
 }
 function sortDashboardWorktrees(worktrees) {
-    worktrees.sort((a, b) => a.name.localeCompare(b.name));
+    worktrees.sort((a, b) => {
+        if (a.path === undefined)
+            return -1;
+        if (b.path === undefined)
+            return 1;
+        return dashboardCreatedSortKey(b) - dashboardCreatedSortKey(a);
+    });
 }
 function showOptimisticDashboardWorktreeCreate(host, name) {
     const targetPath = getWorktreeCreatePath(name);
@@ -26,6 +55,7 @@ function showOptimisticDashboardWorktreeCreate(host, name) {
                 name,
                 branch: name,
                 path: targetPath,
+                createdAt: new Date().toISOString(),
                 status: "offline",
                 pending: true,
                 pendingAction: "creating",
@@ -43,23 +73,58 @@ function showOptimisticDashboardWorktreeCreate(host, name) {
     }
     host.dashboardState.focusedWorktreePath = targetPath;
     host.dashboardUiStateStore.markSelectionDirty();
-    host.dashboardState.worktreeNavOrder = [undefined, ...host.dashboardWorktreeGroupsCache.map((wt) => wt.path)];
+    host.dashboardState.worktreeNavOrder = host.dashboardWorktreeGroupsCache.map((wt) => wt.path);
     return targetPath;
 }
 function removeOptimisticDashboardWorktree(host, path) {
     host.dashboardWorktreeGroupsCache = host.dashboardWorktreeGroupsCache.filter((group) => group.path !== path);
-    host.dashboardState.worktreeNavOrder = [undefined, ...host.dashboardWorktreeGroupsCache.map((wt) => wt.path)];
+    host.dashboardState.worktreeNavOrder = host.dashboardWorktreeGroupsCache.map((wt) => wt.path);
     if (host.dashboardState.focusedWorktreePath === path) {
         host.dashboardState.focusedWorktreePath = undefined;
     }
     host.dashboardUiStateStore.markSelectionDirty();
 }
+function showDashboardWorktreeCreateFailure(host, name, path, error) {
+    const message = error instanceof Error ? error.message : String(error);
+    const failure = addDashboardOperationFailure({
+        targetKind: "worktree",
+        operation: "create",
+        title: `Failed to create worktree "${name}"`,
+        message,
+        worktreePath: path,
+        worktreeName: name,
+    });
+    removeOptimisticDashboardWorktree(host, path);
+    host.dashboardWorktreeGroupsCache = [
+        ...host.dashboardWorktreeGroupsCache,
+        {
+            name,
+            branch: "(failed)",
+            path,
+            status: "offline",
+            sessions: [],
+            services: [],
+            operationFailure: failure,
+        },
+    ];
+    sortDashboardWorktrees(host.dashboardWorktreeGroupsCache);
+    host.dashboardState.focusedWorktreePath = path;
+    host.dashboardState.worktreeNavOrder = host.dashboardWorktreeGroupsCache.map((wt) => wt.path);
+    host.dashboardOperationFailuresCache = [
+        failure,
+        ...(host.dashboardOperationFailuresCache ?? []).filter((existing) => !(existing.targetKind === failure.targetKind &&
+            existing.operation === failure.operation &&
+            existing.worktreePath === failure.worktreePath)),
+    ];
+    host.dashboardUiStateStore.markSelectionDirty();
+    host.showDashboardError(`Failed to create "${name}"`, [`Path: ${path}`, `Error: ${message}`]);
+}
 export function showWorktreeCreatePrompt(host) {
-    host.worktreeInputActive = true;
+    host.openDashboardOverlay("worktree-input");
     host.worktreeInputBuffer = "";
     renderWorktreeInput(host);
 }
-export function renderWorktreeInput(host) {
+export function buildWorktreeInputOverlayOutput(host) {
     const cols = process.stdout.columns ?? 80;
     const rows = process.stdout.rows ?? 24;
     const lines = ["Create worktree:", "", `  Name: ${host.worktreeInputBuffer}_`, "", "  [Enter] create  [Esc] cancel"];
@@ -79,7 +144,14 @@ export function renderWorktreeInput(host) {
         }
     }
     output += "\x1b8";
-    process.stdout.write(output);
+    return output;
+}
+export function renderWorktreeInput(host) {
+    if (host.mode === "dashboard" && typeof host.redrawDashboardWithOverlay === "function") {
+        host.redrawDashboardWithOverlay();
+        return;
+    }
+    process.stdout.write(buildWorktreeInputOverlayOutput(host));
 }
 export function handleWorktreeInputKey(host, data) {
     const events = parseKeys(data);
@@ -88,35 +160,29 @@ export function handleWorktreeInputKey(host, data) {
     const event = events[0];
     const key = event.name || event.char;
     if (key === "escape") {
-        host.worktreeInputActive = false;
-        if (host.mode === "dashboard") {
-            host.renderDashboard();
-        }
-        else {
-            host.focusSession(host.activeIndex);
-        }
+        host.clearDashboardOverlay();
+        host.restoreDashboardAfterOverlayDismiss();
         return;
     }
     if (key === "enter" || key === "return") {
-        host.worktreeInputActive = false;
+        host.clearDashboardOverlay();
         const name = host.worktreeInputBuffer.trim();
         if (name) {
             if (host.mode === "dashboard") {
                 const targetPath = showOptimisticDashboardWorktreeCreate(host, name);
-                host.dashboardPendingActions.set(DashboardPendingActions.worktreeKey(targetPath), "creating");
+                const pendingKey = DashboardPendingActions.worktreeKey(targetPath);
                 host.renderDashboard();
                 void (async () => {
                     try {
-                        await postToProjectService(host, "/worktrees/create", { name });
+                        await postToProjectService(host, "/worktrees/create", { name }, { timeoutMs: 180_000 });
+                        await host.refreshDashboardModelFromService?.(true);
                         debug(`worktree created from UI: ${name}`, "worktree");
-                        host.settleDashboardCreatePending?.(DashboardPendingActions.worktreeKey(targetPath));
-                        forceDashboardServiceRefresh(host);
+                        host.settleDashboardCreatePending?.(pendingKey);
                     }
                     catch (err) {
-                        host.dashboardPendingActions.set(DashboardPendingActions.worktreeKey(targetPath), null);
-                        removeOptimisticDashboardWorktree(host, targetPath);
+                        host.dashboardPendingActions.set(pendingKey, null);
                         debug(`worktree create failed: ${err instanceof Error ? err.message : String(err)}`, "worktree");
-                        host.showDashboardError(`Failed to create "${name}"`, [err instanceof Error ? err.message : String(err)]);
+                        showDashboardWorktreeCreateFailure(host, name, targetPath, err);
                     }
                 })();
                 return;
@@ -129,12 +195,7 @@ export function handleWorktreeInputKey(host, data) {
                 debug(`worktree create failed: ${err instanceof Error ? err.message : String(err)}`, "worktree");
             }
         }
-        if (host.mode === "dashboard") {
-            host.renderDashboard();
-        }
-        else {
-            host.focusSession(host.activeIndex);
-        }
+        host.restoreDashboardAfterOverlayDismiss();
         return;
     }
     if (key === "backspace" || key === "delete") {
@@ -148,31 +209,41 @@ export function handleWorktreeInputKey(host, data) {
     }
 }
 export function showWorktreeList(host) {
-    host.worktreeListActive = true;
+    host.openDashboardOverlay("worktree-list");
     renderWorktreeList(host);
 }
 export function renderWorktreeList(host) {
-    renderWorktreeListOverlay(host);
+    if (host.mode === "dashboard" && typeof host.redrawDashboardWithOverlay === "function") {
+        host.redrawDashboardWithOverlay();
+        return;
+    }
+    process.stdout.write(buildWorktreeListOverlayOutput(host));
 }
 export function renderWorktreeRemoveConfirm(host) {
-    renderWorktreeRemoveConfirmOverlay(host);
+    if (host.mode === "dashboard" && typeof host.redrawDashboardWithOverlay === "function") {
+        host.redrawDashboardWithOverlay();
+        return;
+    }
+    const output = buildWorktreeRemoveConfirmOverlayOutput(host);
+    if (output)
+        process.stdout.write(output);
 }
 export function beginWorktreeRemoval(host, path, name, oldIdx) {
     if (host.worktreeRemovalJob?.path === path)
         return;
     if (host.worktreeRemovalJob && host.worktreeRemovalJob.path !== path) {
         const inFlightName = host.worktreeRemovalJob.name;
-        host.footerFlash = `Already removing ${inFlightName}`;
+        host.footerFlash = `Already graveyarding ${inFlightName}`;
         host.footerFlashTicks = 4;
-        host.showDashboardError("Worktree removal already in progress", [
-            `Finish removing "${inFlightName}" before removing "${name}".`,
+        host.showDashboardError("Worktree graveyard already in progress", [
+            `Finish graveyarding "${inFlightName}" before graveyarding "${name}".`,
         ]);
         host.renderDashboard();
         return;
     }
     if (host.pendingWorktreeRemovals?.has?.(path))
         return;
-    debug(`begin worktree removal: name=${name} path=${path}`, "worktree");
+    debug(`begin worktree graveyard: name=${name} path=${path}`, "worktree");
     host.worktreeRemovalJob = {
         path,
         name,
@@ -182,35 +253,40 @@ export function beginWorktreeRemoval(host, path, name, oldIdx) {
     };
     host.refreshLocalDashboardModel();
     host.renderDashboard();
-    forceDashboardServiceRefresh(host);
     if (host.mode === "dashboard") {
-        void (async () => {
-            try {
-                await postToProjectService(host, "/worktrees/remove", { path });
-                debug(`removeDesktopWorktree succeeded: name=${name} path=${path}`, "worktree");
+        const pendingKey = DashboardPendingActions.worktreeKey(path);
+        void runDashboardWorktreeMutation(host, {
+            pendingKey,
+            pendingAction: "graveyarding",
+            request: async () => {
+                await postToProjectService(host, "/worktrees/graveyard", { path }, { timeoutMs: 10_000 });
+            },
+            settle: () => waitForRenderedDashboardWorktreeState(host, path, (group) => !group),
+            onSuccess: () => {
+                debug(`graveyardDesktopWorktree succeeded: name=${name} path=${path}`, "worktree");
                 finishWorktreeRemoval(host, 0);
-            }
-            catch (err) {
+            },
+            onError: (err) => {
                 if (host.worktreeRemovalJob) {
                     host.worktreeRemovalJob.stderr += `\n${err instanceof Error ? err.message : String(err)}`;
                 }
-                debug(`removeDesktopWorktree failed: name=${name} path=${path} error=${err instanceof Error ? err.message : String(err)}`, "worktree");
+                debug(`graveyardDesktopWorktree failed: name=${name} path=${path} error=${err instanceof Error ? err.message : String(err)}`, "worktree");
                 finishWorktreeRemoval(host, 1);
-            }
-        })();
+            },
+        });
         return;
     }
     void (async () => {
         try {
-            await host.removeDesktopWorktree(path);
-            debug(`removeDesktopWorktree succeeded: name=${name} path=${path}`, "worktree");
+            await host.graveyardDesktopWorktree(path);
+            debug(`graveyardDesktopWorktree succeeded: name=${name} path=${path}`, "worktree");
             finishWorktreeRemoval(host, 0);
         }
         catch (err) {
             if (host.worktreeRemovalJob) {
                 host.worktreeRemovalJob.stderr += `\n${err instanceof Error ? err.message : String(err)}`;
             }
-            debug(`removeDesktopWorktree failed: name=${name} path=${path} error=${err instanceof Error ? err.message : String(err)}`, "worktree");
+            debug(`graveyardDesktopWorktree failed: name=${name} path=${path} error=${err instanceof Error ? err.message : String(err)}`, "worktree");
             finishWorktreeRemoval(host, 1);
         }
     })();
@@ -225,11 +301,11 @@ export function finishWorktreeRemoval(host, code) {
         .map((line) => line.trim())
         .filter(Boolean);
     if (code === 0) {
-        host.footerFlash = `Removed: ${job.name}`;
+        host.footerFlash = `Graveyarded: ${job.name}`;
         host.footerFlashTicks = 3;
-        debug(`removed worktree: ${job.name}`, "worktree");
-        const newWorktrees = listAllWorktrees().filter((wt) => !wt.isBare);
-        host.dashboardState.worktreeNavOrder = [undefined, ...newWorktrees.map((wt) => wt.path)];
+        debug(`graveyarded worktree: ${job.name}`, "worktree");
+        const newWorktrees = listAllWorktrees().filter((wt) => !wt.isBare && !isToolInternalWorktree(wt));
+        host.dashboardState.worktreeNavOrder = newWorktrees.map((wt) => wt.path);
         if (job.oldIdx >= 0 && job.oldIdx < host.dashboardState.worktreeNavOrder.length) {
             host.dashboardState.focusedWorktreePath = host.dashboardState.worktreeNavOrder[job.oldIdx];
         }
@@ -242,32 +318,38 @@ export function finishWorktreeRemoval(host, code) {
         }
     }
     else {
-        const message = details[0] ?? `git worktree remove exited with code ${code}`;
+        const message = details[0] ?? `worktree graveyard failed with code ${code}`;
         host.footerFlash = `Failed: ${message}`;
         host.footerFlashTicks = 5;
-        host.showDashboardError(`Failed to remove "${job.name}"`, [`Path: ${job.path}`, `Error: ${message}`, ...details]);
-        forceDashboardServiceRefresh(host);
+        host.showDashboardError(`Failed to graveyard "${job.name}"`, [
+            `Path: ${job.path}`,
+            `Error: ${message}`,
+            ...details,
+        ]);
         return;
     }
     host.renderDashboard();
-    forceDashboardServiceRefresh(host);
 }
 export function handleWorktreeRemoveConfirmKey(host, data) {
     const events = parseKeys(data);
     if (events.length === 0)
         return;
     const key = events[0].name || events[0].char;
-    if (key === "y") {
+    if (key === "y" || key === "enter" || key === "return") {
         const confirm = host.worktreeRemoveConfirm;
         if (confirm) {
             host.worktreeRemoveConfirm = null;
+            host.clearDashboardOverlay();
             const oldIdx = host.dashboardState.worktreeNavOrder.indexOf(confirm.path);
             beginWorktreeRemoval(host, confirm.path, confirm.name, oldIdx);
             return;
         }
     }
-    host.worktreeRemoveConfirm = null;
-    host.restoreDashboardAfterOverlayDismiss();
+    if (key === "n" || key === "escape") {
+        host.worktreeRemoveConfirm = null;
+        host.clearDashboardOverlay();
+        host.restoreDashboardAfterOverlayDismiss();
+    }
 }
 export function handleWorktreeListKey(host, data) {
     const events = parseKeys(data);
@@ -276,7 +358,7 @@ export function handleWorktreeListKey(host, data) {
     const event = events[0];
     const key = event.name || event.char;
     if (key === "escape") {
-        host.worktreeListActive = false;
+        host.clearDashboardOverlay();
         host.restoreDashboardAfterOverlayDismiss();
     }
 }

package/dist/multiplexer/worktrees.js.map

@@ -1 +1 @@
-{"version":3,"file":"worktrees.js","sourceRoot":"","sources":["../../src/multiplexer/worktrees.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"worktrees.js","sourceRoot":"","sources":["../../src/multiplexer/worktrees.ts"],"names":[],"mappings":"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"}

package/dist/notification-context.js

@@ -1,13 +1,10 @@
-import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
-import { dirname } from "node:path";
+import { existsSync, readFileSync } from "node:fs";
+import { writeJsonAtomic } from "./atomic-write.js";
 import { getNotificationContextPath } from "./paths.js";
 // Active direct-chat panes can stay in focus for minutes without any explicit
 // context refresh, so a 30s expiry causes long Codex/Claude back-and-forth
 // sessions to start accumulating "unread" as if they were backgrounded.
 const CONTEXT_FRESH_MS = 15 * 60_000;
-function ensureParent(path) {
-    mkdirSync(dirname(path), { recursive: true });
-}
 function loadState() {
     const path = getNotificationContextPath();
     if (!existsSync(path))
@@ -25,11 +22,7 @@ function loadState() {
     }
 }
 function saveState(state) {
-    const path = getNotificationContextPath();
-    ensureParent(path);
-    const tmp = `${path}.tmp`;
-    writeFileSync(tmp, JSON.stringify(state, null, 2) + "\n");
-    renameSync(tmp, path);
+    writeJsonAtomic(getNotificationContextPath(), state);
 }
 function isFresh(entry) {
     if (!entry?.updatedAt)
@@ -37,6 +30,9 @@ function isFresh(entry) {
     const updated = Date.parse(entry.updatedAt);
     return Number.isFinite(updated) && Date.now() - updated <= CONTEXT_FRESH_MS;
 }
+function isDirectSessionFocus(entry, sessionId) {
+    return entry.sessionId === sessionId && entry.screen !== "dashboard" && !entry.panelOpen;
+}
 export function updateNotificationContext(source, patch) {
     const state = loadState();
     const next = {
@@ -61,7 +57,7 @@ export function isSessionNotificationFocused(sessionId) {
     for (const entry of Object.values(contexts)) {
         if (!entry || !isFresh(entry) || !entry.focused)
             continue;
-        if (entry.sessionId === sessionId)
+        if (isDirectSessionFocus(entry, sessionId))
             return true;
     }
     return false;
@@ -73,11 +69,9 @@ export function shouldSuppressNotification(event) {
     for (const entry of Object.values(contexts)) {
         if (!entry || !isFresh(entry) || !entry.focused)
             continue;
-        if (entry.panelOpen)
-            return true;
-        if (event.sessionId && entry.sessionId && entry.sessionId === event.sessionId)
+        if (event.sessionId && isDirectSessionFocus(entry, event.sessionId))
             return true;
-        if (!event.sessionId && entry.screen)
+        if (!event.sessionId && entry.screen && entry.screen !== "dashboard" && !entry.panelOpen)
             return true;
     }
     return false;

package/dist/notification-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"notification-context.js","sourceRoot":"","sources":["../src/notification-context.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"notification-context.js","sourceRoot":"","sources":["../src/notification-context.ts"],"names":[],"mappings":"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"}

package/dist/notifications.d.ts

@@ -4,6 +4,8 @@ export interface NotificationRecord {
     subtitle?: string;
     body: string;
     sessionId?: string;
+    targetKey?: string;
+    targetKind?: "session" | "generic";
     kind?: string;
     unread: boolean;
     cleared: boolean;
@@ -16,9 +18,24 @@ export declare function addNotification(input: {
     subtitle?: string;
     body: string;
     sessionId?: string;
+    targetKey?: string;
+    targetKind?: "session" | "generic";
     kind?: string;
     dedupeKey?: string;
     createdAt?: string;
+    unread?: boolean;
+}): NotificationRecord;
+export declare function upsertNotification(input: {
+    title: string;
+    subtitle?: string;
+    body: string;
+    sessionId?: string;
+    targetKey?: string;
+    targetKind?: "session" | "generic";
+    kind?: string;
+    dedupeKey?: string;
+    createdAt?: string;
+    unread?: boolean;
 }): NotificationRecord;
 export declare function listNotifications(opts?: {
     unreadOnly?: boolean;
@@ -36,3 +53,8 @@ export declare function clearNotifications(opts?: {
 export declare function unreadNotificationCount(opts?: {
     sessionId?: string;
 }): number;
+export interface SessionNotificationSummary {
+    unreadCount: number;
+    latestUnread?: NotificationRecord;
+}
+export declare function summarizeUnreadNotificationsBySession(): Map<string, SessionNotificationSummary>;