aimux-cli 0.1.15 → 0.1.18

package/dist/multiplexer/worktrees.js

@@ -4,18 +4,25 @@ import { parseKeys } from "../key-parser.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";
 import { dashboardCreatedSortKey } from "../dashboard/sort.js";
 function assertDashboardWorktreeMutationSettled(settled, action) {
     if (!settled) {
         throw new Error(`worktree ${action} did not settle before timing out`);
     }
 }
+function findRenderedWorktreeForSettlement(host, path) {
+    const raw = Array.isArray(host.dashboardRawWorktreeGroupsCache)
+        ? host.dashboardRawWorktreeGroupsCache.find((entry) => entry.path === path)
+        : undefined;
+    if (raw)
+        return raw;
+    return host.dashboardWorktreeGroupsCache.find((entry) => entry.path === path);
+}
 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);
+        const group = findRenderedWorktreeForSettlement(host, path);
         if (predicate(group))
             return true;
         await new Promise((resolve) => setTimeout(resolve, 100));
@@ -23,16 +30,19 @@ async function waitForRenderedDashboardWorktreeState(host, path, predicate, time
     return false;
 }
 async function runDashboardWorktreeMutation(host, opts) {
-    host.dashboardPendingActions.set(opts.pendingKey, opts.pendingAction);
+    host.dashboardPendingActions.setWorktreeAction(opts.pendingPath, opts.pendingAction);
+    host.reapplyDashboardPendingActions?.();
     host.renderDashboard();
     try {
         await opts.request();
         assertDashboardWorktreeMutationSettled(await opts.settle(), opts.pendingAction);
-        host.dashboardPendingActions.set(opts.pendingKey, null);
+        host.dashboardPendingActions.clearWorktreeAction(opts.pendingPath);
+        host.reapplyDashboardPendingActions?.();
         opts.onSuccess?.();
     }
     catch (error) {
-        host.dashboardPendingActions.set(opts.pendingKey, null);
+        host.dashboardPendingActions.clearWorktreeAction(opts.pendingPath);
+        host.reapplyDashboardPendingActions?.();
         opts.onError?.(error);
     }
 }
@@ -45,32 +55,34 @@ function sortDashboardWorktrees(worktrees) {
         return dashboardCreatedSortKey(b) - dashboardCreatedSortKey(a);
     });
 }
+function getOptimisticWorktreeCreatedAt(host, path) {
+    const existing = host.dashboardWorktreeGroupsCache.find((group) => group.path === path);
+    if (typeof existing?.createdAt === "string")
+        return existing.createdAt;
+    host.dashboardOptimisticWorktreeCreatedAt ??= new Map();
+    const cached = host.dashboardOptimisticWorktreeCreatedAt.get(path);
+    if (cached)
+        return cached;
+    const createdAt = new Date().toISOString();
+    host.dashboardOptimisticWorktreeCreatedAt.set(path, createdAt);
+    return createdAt;
+}
 function showOptimisticDashboardWorktreeCreate(host, name) {
     const targetPath = getWorktreeCreatePath(name);
-    const existing = host.dashboardWorktreeGroupsCache.find((group) => group.path === targetPath);
-    if (!existing) {
-        host.dashboardWorktreeGroupsCache = [
-            ...host.dashboardWorktreeGroupsCache,
-            {
-                name,
-                branch: name,
-                path: targetPath,
-                createdAt: new Date().toISOString(),
-                status: "offline",
-                pending: true,
-                pendingAction: "creating",
-                optimistic: true,
-                sessions: [],
-                services: [],
-            },
-        ];
-        sortDashboardWorktrees(host.dashboardWorktreeGroupsCache);
-    }
-    else {
-        existing.pending = true;
-        existing.pendingAction = "creating";
-        existing.optimistic = true;
-    }
+    host.dashboardPendingActions.setWorktreeAction(targetPath, "creating", {
+        worktreeSeed: {
+            name,
+            branch: name,
+            path: targetPath,
+            createdAt: getOptimisticWorktreeCreatedAt(host, targetPath),
+            status: "offline",
+            isBare: false,
+            sessions: [],
+            services: [],
+        },
+    });
+    host.reapplyDashboardPendingActions?.();
+    sortDashboardWorktrees(host.dashboardWorktreeGroupsCache);
     host.dashboardState.focusedWorktreePath = targetPath;
     host.dashboardUiStateStore.markSelectionDirty();
     host.dashboardState.worktreeNavOrder = host.dashboardWorktreeGroupsCache.map((wt) => wt.path);
@@ -94,6 +106,8 @@ function showDashboardWorktreeCreateFailure(host, name, path, error) {
         worktreePath: path,
         worktreeName: name,
     });
+    host.dashboardPendingActions.clearWorktreeAction(path);
+    host.dashboardOptimisticWorktreeCreatedAt?.delete?.(path);
     removeOptimisticDashboardWorktree(host, path);
     host.dashboardWorktreeGroupsCache = [
         ...host.dashboardWorktreeGroupsCache,
@@ -119,6 +133,40 @@ function showDashboardWorktreeCreateFailure(host, name, path, error) {
     host.dashboardUiStateStore.markSelectionDirty();
     host.showDashboardError(`Failed to create "${name}"`, [`Path: ${path}`, `Error: ${message}`]);
 }
+function findDashboardWorktreeCreateFailure(host, path) {
+    const groupFailure = host.dashboardWorktreeGroupsCache?.find((group) => group.path === path)?.operationFailure;
+    if (groupFailure)
+        return groupFailure;
+    return (host.dashboardOperationFailuresCache ?? []).find((failure) => failure.targetKind === "worktree" && failure.operation === "create" && failure.worktreePath === path);
+}
+function isDashboardWorktreeCreateSettled(group) {
+    if (!group)
+        return false;
+    if (group.operationFailure)
+        return false;
+    return group.pending !== true && group.pendingAction !== "creating";
+}
+async function waitForRenderedDashboardWorktreeCreate(host, name, path, timeoutMs = 180_000) {
+    const deadline = Date.now() + timeoutMs;
+    while (Date.now() < deadline) {
+        if (typeof host.refreshDashboardModelFromService === "function") {
+            await host.refreshDashboardModelFromService(true);
+        }
+        const failure = findDashboardWorktreeCreateFailure(host, path);
+        if (failure) {
+            const message = typeof failure.message === "string" ? failure.message : "worktree create failed";
+            return { ok: false, error: new Error(message) };
+        }
+        const group = findRenderedWorktreeForSettlement(host, path);
+        if (isDashboardWorktreeCreateSettled(group)) {
+            return { ok: true };
+        }
+        showOptimisticDashboardWorktreeCreate(host, name);
+        host.renderDashboard?.();
+        await new Promise((resolve) => setTimeout(resolve, 250));
+    }
+    return { ok: false, error: new Error("worktree creating did not settle before timing out") };
+}
 export function showWorktreeCreatePrompt(host) {
     host.openDashboardOverlay("worktree-input");
     host.worktreeInputBuffer = "";
@@ -170,17 +218,27 @@ export function handleWorktreeInputKey(host, data) {
         if (name) {
             if (host.mode === "dashboard") {
                 const targetPath = showOptimisticDashboardWorktreeCreate(host, name);
-                const pendingKey = DashboardPendingActions.worktreeKey(targetPath);
                 host.renderDashboard();
                 void (async () => {
                     try {
                         await postToProjectService(host, "/worktrees/create", { name }, { timeoutMs: 180_000 });
-                        await host.refreshDashboardModelFromService?.(true);
+                        const result = await waitForRenderedDashboardWorktreeCreate(host, name, targetPath);
+                        if (!result.ok) {
+                            throw result.error;
+                        }
                         debug(`worktree created from UI: ${name}`, "worktree");
-                        host.settleDashboardCreatePending?.(pendingKey);
+                        host.dashboardPendingActions.clearWorktreeAction(targetPath);
+                        host.reapplyDashboardPendingActions?.();
+                        host.dashboardOptimisticWorktreeCreatedAt?.delete?.(targetPath);
+                        await host.refreshDashboardModelFromService?.(true);
+                        host.dashboardState.focusedWorktreePath = targetPath;
+                        host.dashboardUiStateStore.markSelectionDirty();
+                        host.renderDashboard();
                     }
                     catch (err) {
-                        host.dashboardPendingActions.set(pendingKey, null);
+                        host.dashboardPendingActions.clearWorktreeAction(targetPath);
+                        host.reapplyDashboardPendingActions?.();
+                        host.dashboardOptimisticWorktreeCreatedAt?.delete?.(targetPath);
                         debug(`worktree create failed: ${err instanceof Error ? err.message : String(err)}`, "worktree");
                         showDashboardWorktreeCreateFailure(host, name, targetPath, err);
                     }
@@ -241,8 +299,6 @@ export function beginWorktreeRemoval(host, path, name, oldIdx) {
         host.renderDashboard();
         return;
     }
-    if (host.pendingWorktreeRemovals?.has?.(path))
-        return;
     debug(`begin worktree graveyard: name=${name} path=${path}`, "worktree");
     host.worktreeRemovalJob = {
         path,
@@ -251,15 +307,12 @@ export function beginWorktreeRemoval(host, path, name, oldIdx) {
         oldIdx,
         stderr: "",
     };
-    host.refreshLocalDashboardModel();
-    host.renderDashboard();
     if (host.mode === "dashboard") {
-        const pendingKey = DashboardPendingActions.worktreeKey(path);
         void runDashboardWorktreeMutation(host, {
-            pendingKey,
+            pendingPath: path,
             pendingAction: "graveyarding",
             request: async () => {
-                await postToProjectService(host, "/worktrees/graveyard", { path }, { timeoutMs: 10_000 });
+                await postToProjectService(host, "/worktrees/graveyard", { path }, { timeoutMs: 180_000 });
             },
             settle: () => waitForRenderedDashboardWorktreeState(host, path, (group) => !group),
             onSuccess: () => {
@@ -276,6 +329,8 @@ export function beginWorktreeRemoval(host, path, name, oldIdx) {
         });
         return;
     }
+    host.refreshLocalDashboardModel();
+    host.renderDashboard();
     void (async () => {
         try {
             await host.graveyardDesktopWorktree(path);
@@ -326,6 +381,7 @@ export function finishWorktreeRemoval(host, code) {
             `Error: ${message}`,
             ...details,
         ]);
+        host.renderDashboard();
         return;
     }
     host.renderDashboard();

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

@@ -35,12 +35,16 @@ function isDirectSessionFocus(entry, sessionId) {
 }
 export function updateNotificationContext(source, patch) {
     const state = loadState();
+    const previous = state.contexts[source];
+    const has = (key) => Object.prototype.hasOwnProperty.call(patch, key);
+    const nextSessionId = has("sessionId") ? patch.sessionId : previous?.sessionId;
+    const nextScreen = has("screen") ? patch.screen : has("sessionId") && nextSessionId ? "session" : previous?.screen;
     const next = {
         source,
-        focused: patch.focused ?? state.contexts[source]?.focused ?? false,
-        screen: patch.screen ?? state.contexts[source]?.screen,
-        sessionId: patch.sessionId ?? state.contexts[source]?.sessionId,
-        panelOpen: patch.panelOpen ?? state.contexts[source]?.panelOpen ?? false,
+        focused: has("focused") ? (patch.focused ?? false) : (previous?.focused ?? false),
+        screen: nextScreen,
+        sessionId: nextSessionId,
+        panelOpen: has("panelOpen") ? (patch.panelOpen ?? false) : (previous?.panelOpen ?? false),
         updatedAt: new Date().toISOString(),
     };
     state.contexts[source] = next;

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.js

@@ -1,48 +1,8 @@
 import { randomUUID } from "node:crypto";
-import { existsSync, readFileSync } from "node:fs";
-import { writeJsonAtomic } from "./atomic-write.js";
-import { getNotificationsPath } from "./paths.js";
-function loadState() {
-    const path = getNotificationsPath();
-    if (!existsSync(path))
-        return { version: 1, notifications: [] };
-    try {
-        const raw = readFileSync(path, "utf8");
-        const parsed = JSON.parse(raw);
-        if (parsed.version !== 1 || !Array.isArray(parsed.notifications)) {
-            return { version: 1, notifications: [] };
-        }
-        return parsed;
-    }
-    catch {
-        return { version: 1, notifications: [] };
-    }
-}
-function saveState(state) {
-    writeJsonAtomic(getNotificationsPath(), state);
-}
-export function addNotification(input) {
-    const now = input.createdAt ?? new Date().toISOString();
-    const state = loadState();
-    const record = {
-        id: randomUUID(),
-        title: input.title.trim() || "aimux",
-        subtitle: input.subtitle?.trim() || undefined,
-        body: input.body.trim() || input.title.trim() || "aimux",
-        sessionId: input.sessionId?.trim() || undefined,
-        targetKey: normalizeTargetKey(input),
-        targetKind: normalizeTargetKind(input),
-        kind: input.kind?.trim() || undefined,
-        unread: input.unread ?? true,
-        cleared: false,
-        createdAt: now,
-        updatedAt: now,
-        dedupeKey: input.dedupeKey?.trim() || undefined,
-    };
-    state.notifications.unshift(record);
-    saveState(state);
-    return record;
-}
+import { deriveRuntimeExchangeIndexes } from "./runtime-core/exchange-derived.js";
+import { createRuntimeExchangeStore, } from "./runtime-core/exchange-store.js";
+const PROJECT_NOTIFICATION_PARTICIPANT = "project";
+const NOTIFICATION_TAG = "notification";
 function normalizeTargetKey(input) {
     const targetKey = input.targetKey?.trim();
     if (targetKey)
@@ -53,39 +13,127 @@ function normalizeTargetKey(input) {
 function normalizeTargetKind(input) {
     if (input.targetKind)
         return input.targetKind;
-    return input.sessionId?.trim() ? "session" : undefined;
+    return input.sessionId?.trim() ? "session" : "generic";
 }
-function recordTargetKey(record) {
-    return record.targetKey ?? (record.sessionId ? `session:${record.sessionId}` : undefined);
+function metadataString(message, key) {
+    const value = message?.metadata?.[key];
+    return typeof value === "string" && value.trim() ? value : undefined;
 }
-export function upsertNotification(input) {
-    const targetKey = normalizeTargetKey(input);
+function metadataBoolean(message, key) {
+    return message?.metadata?.[key] === true;
+}
+function notificationThreadId(targetKey) {
     if (!targetKey)
-        return addNotification(input);
+        return `notification-${randomUUID()}`;
+    return `notification-${Buffer.from(targetKey).toString("base64url")}`;
+}
+function threadLatestMessage(exchange, threadId) {
+    return exchange.messages
+        .filter((message) => message.threadId === threadId)
+        .sort((a, b) => b.ts.localeCompare(a.ts))[0];
+}
+function entryForThread(exchange, thread) {
+    return exchange.inbox.find((entry) => entry.subjectKind === "thread" && entry.subjectId === thread.id);
+}
+function notificationRecord(exchange, thread, message) {
+    const entry = entryForThread(exchange, thread);
+    const sessionId = metadataString(message, "notificationSessionId");
+    const targetKey = metadataString(message, "notificationTargetKey");
+    const targetKind = metadataString(message, "notificationTargetKind");
+    return {
+        id: metadataString(message, "notificationRecordId") ?? thread.id,
+        title: thread.title,
+        subtitle: metadataString(message, "notificationSubtitle"),
+        body: message.body,
+        sessionId,
+        targetKey,
+        targetKind,
+        kind: metadataString(message, "notificationKind"),
+        unread: Boolean(entry && entry.state !== "done"),
+        cleared: metadataBoolean(message, "notificationCleared"),
+        createdAt: thread.createdAt,
+        updatedAt: thread.updatedAt,
+        dedupeKey: metadataString(message, "notificationDedupeKey"),
+    };
+}
+function notificationRecords(exchange = createRuntimeExchangeStore().read()) {
+    return exchange.threads
+        .filter((thread) => thread.tags?.includes(NOTIFICATION_TAG))
+        .map((thread) => {
+        const message = threadLatestMessage(exchange, thread.id);
+        return message ? notificationRecord(exchange, thread, message) : undefined;
+    })
+        .filter((record) => Boolean(record))
+        .sort((a, b) => b.createdAt.localeCompare(a.createdAt));
+}
+function writeNotification(input) {
     const now = input.createdAt ?? new Date().toISOString();
-    const state = loadState();
-    const record = {
-        id: randomUUID(),
+    const sessionId = input.sessionId?.trim() || undefined;
+    const targetKey = normalizeTargetKey(input);
+    const targetKind = normalizeTargetKind(input);
+    const threadId = input.replaceTarget ? notificationThreadId(targetKey) : notificationThreadId();
+    const participantId = sessionId ?? PROJECT_NOTIFICATION_PARTICIPANT;
+    const thread = {
+        id: threadId,
         title: input.title.trim() || "aimux",
-        subtitle: input.subtitle?.trim() || undefined,
-        body: input.body.trim() || input.title.trim() || "aimux",
-        sessionId: input.sessionId?.trim() || undefined,
-        targetKey,
-        targetKind: normalizeTargetKind(input),
-        kind: input.kind?.trim() || undefined,
-        unread: input.unread ?? true,
-        cleared: false,
+        kind: "conversation",
+        status: "open",
         createdAt: now,
         updatedAt: now,
-        dedupeKey: input.dedupeKey?.trim() || undefined,
+        createdBy: "aimux",
+        participants: ["aimux", participantId],
+        lastMessageId: `message-${threadId}`,
+        unreadBy: input.unread === false ? [] : [participantId],
+        tags: [NOTIFICATION_TAG],
     };
-    state.notifications = [record, ...state.notifications.filter((existing) => recordTargetKey(existing) !== targetKey)];
-    saveState(state);
+    const message = {
+        id: `message-${threadId}`,
+        threadId,
+        ts: now,
+        from: "aimux",
+        to: [participantId],
+        kind: "note",
+        body: input.body.trim() || input.title.trim() || "aimux",
+        metadata: {
+            notificationRecordId: randomUUID(),
+            notificationSubtitle: input.subtitle?.trim() || null,
+            notificationSessionId: sessionId ?? null,
+            notificationTargetKey: targetKey ?? null,
+            notificationTargetKind: targetKind ?? null,
+            notificationKind: input.kind?.trim() || null,
+            notificationDedupeKey: input.dedupeKey?.trim() || null,
+            notificationCleared: false,
+        },
+    };
+    let record;
+    createRuntimeExchangeStore().update((exchange) => {
+        const next = deriveRuntimeExchangeIndexes({
+            ...exchange,
+            generatedAt: now,
+            threads: [...exchange.threads.filter((existing) => existing.id !== threadId), thread],
+            messages: [...exchange.messages.filter((existing) => existing.threadId !== threadId), message],
+        });
+        const inbox = input.unread === false
+            ? next.inbox.map((entry) => entry.subjectKind === "thread" && entry.subjectId === threadId
+                ? { ...entry, state: "done" }
+                : entry)
+            : next.inbox;
+        const updated = { ...next, inbox };
+        record = notificationRecord(updated, thread, message);
+        return updated;
+    });
+    if (!record)
+        throw new Error("failed to write notification");
     return record;
 }
+export function addNotification(input) {
+    return writeNotification(input);
+}
+export function upsertNotification(input) {
+    return writeNotification({ ...input, replaceTarget: Boolean(normalizeTargetKey(input)) });
+}
 export function listNotifications(opts) {
-    const state = loadState();
-    return state.notifications.filter((record) => {
+    return notificationRecords().filter((record) => {
         if (!opts?.includeCleared && record.cleared)
             return false;
         if (opts?.unreadOnly && !record.unread)
@@ -96,49 +144,63 @@ export function listNotifications(opts) {
     });
 }
 export function markNotificationsRead(opts) {
-    const state = loadState();
-    let changed = 0;
-    const now = new Date().toISOString();
-    state.notifications = state.notifications.map((record) => {
+    const store = createRuntimeExchangeStore();
+    const records = notificationRecords(store.read()).filter((record) => {
         if (record.cleared || !record.unread)
-            return record;
-        const matchesId = opts?.id ? record.id === opts.id : true;
-        const matchesSession = opts?.sessionId ? record.sessionId === opts.sessionId : true;
-        if (!matchesId || !matchesSession)
-            return record;
-        changed += 1;
-        return {
-            ...record,
-            unread: false,
-            updatedAt: now,
-        };
+            return false;
+        if (opts?.id && record.id !== opts.id)
+            return false;
+        if (opts?.sessionId && record.sessionId !== opts.sessionId)
+            return false;
+        return true;
     });
-    if (changed > 0)
-        saveState(state);
-    return changed;
+    if (records.length === 0)
+        return 0;
+    const threadIds = new Set(records
+        .map((record) => {
+        const exchange = store.read();
+        return exchange.threads.find((thread) => {
+            const message = threadLatestMessage(exchange, thread.id);
+            return message && notificationRecord(exchange, thread, message).id === record.id;
+        })?.id;
+    })
+        .filter((id) => Boolean(id)));
+    store.update((exchange) => ({
+        ...exchange,
+        inbox: exchange.inbox.map((entry) => entry.subjectKind === "thread" && threadIds.has(entry.subjectId) ? { ...entry, state: "done" } : entry),
+    }));
+    return records.length;
 }
 export function clearNotifications(opts) {
-    const state = loadState();
-    let changed = 0;
-    const now = new Date().toISOString();
-    state.notifications = state.notifications.map((record) => {
+    const store = createRuntimeExchangeStore();
+    const records = notificationRecords(store.read()).filter((record) => {
         if (record.cleared)
-            return record;
-        const matchesId = opts?.id ? record.id === opts.id : true;
-        const matchesSession = opts?.sessionId ? record.sessionId === opts.sessionId : true;
-        if (!matchesId || !matchesSession)
-            return record;
-        changed += 1;
+            return false;
+        if (opts?.id && record.id !== opts.id)
+            return false;
+        if (opts?.sessionId && record.sessionId !== opts.sessionId)
+            return false;
+        return true;
+    });
+    if (records.length === 0)
+        return 0;
+    const recordIds = new Set(records.map((record) => record.id));
+    store.update((exchange) => {
+        const threadIds = new Set(exchange.threads
+            .map((thread) => {
+            const message = threadLatestMessage(exchange, thread.id);
+            return message && recordIds.has(notificationRecord(exchange, thread, message).id) ? thread.id : undefined;
+        })
+            .filter((id) => Boolean(id)));
         return {
-            ...record,
-            unread: false,
-            cleared: true,
-            updatedAt: now,
+            ...exchange,
+            messages: exchange.messages.map((message) => message.threadId && threadIds.has(message.threadId)
+                ? { ...message, metadata: { ...(message.metadata ?? {}), notificationCleared: true } }
+                : message),
+            inbox: exchange.inbox.map((entry) => entry.subjectKind === "thread" && threadIds.has(entry.subjectId) ? { ...entry, state: "done" } : entry),
         };
     });
-    if (changed > 0)
-        saveState(state);
-    return changed;
+    return records.length;
 }
 export function unreadNotificationCount(opts) {
     return listNotifications({ unreadOnly: true, sessionId: opts?.sessionId }).length;