aimux-cli 0.1.16 → 0.1.19

package/dist/multiplexer/dashboard-interaction.js

@@ -1,17 +1,23 @@
 import { execSync } from "node:child_process";
 import { DASHBOARD_QUICK_JUMP_TIMEOUT_MS, buildDashboardQuickJumpWorktrees, resolveDashboardQuickJumpTarget, } from "../dashboard/quick-jump.js";
+import { selectDashboardTeammates } from "../dashboard/session-registry.js";
 import { clearDashboardOperationFailures } from "../dashboard/operation-failures.js";
 import { parseKeys } from "../key-parser.js";
-import { requestReview } from "../task-dispatcher.js";
+import { isBlockingPendingDashboardActionKind } from "../pending-actions.js";
+import { requestReview } from "../task-workflow.js";
+import { isTeammateSession } from "../team.js";
 function hasBlockingPendingDashboardAction(entry) {
-    return (entry?.pendingAction === "creating" ||
-        entry?.pendingAction === "forking" ||
-        entry?.pendingAction === "migrating" ||
-        entry?.pendingAction === "starting" ||
-        entry?.pendingAction === "stopping" ||
-        entry?.pendingAction === "graveyarding" ||
-        entry?.pendingAction === "renaming" ||
-        entry?.pendingAction === "removing");
+    return isBlockingPendingDashboardActionKind(entry?.pendingAction);
+}
+function pendingDashboardItemMessage(entry, fallbackKind) {
+    const action = entry.pendingAction ?? "pending";
+    const name = entry.label ?? entry.command ?? entry.id ?? fallbackKind;
+    return `${fallbackKind === "agent" ? "Agent" : "Service"} ${name} is ${action}`;
+}
+function flashPendingDashboardItem(host, entry, fallbackKind) {
+    host.footerFlash = pendingDashboardItemMessage(entry, fallbackKind);
+    host.footerFlashTicks = 3;
+    host.renderDashboard();
 }
 function findDashboardWorktreeGroup(host, worktreePath) {
     return host.dashboardWorktreeGroupsCache.find((group) => group.path === worktreePath);
@@ -48,6 +54,73 @@ function refreshSelectedWorktreeEntry(host) {
     }
     return host.dashboardState.worktreeEntries[host.dashboardState.sessionIndex];
 }
+function moveSelectedDashboardWorktreeEntry(host, direction) {
+    if (host.dashboardState.level !== "sessions")
+        return false;
+    const selectedEntry = host.dashboardState.worktreeEntries[host.dashboardState.sessionIndex];
+    if (!selectedEntry)
+        return false;
+    const peerEntries = host.dashboardState.worktreeEntries.filter((entry) => entry.kind === selectedEntry.kind);
+    const moved = host.dashboardUiStateStore.moveEntryWithinWorktree({
+        kind: selectedEntry.kind,
+        worktreePath: host.dashboardState.focusedWorktreePath,
+        selectedId: selectedEntry.id,
+        direction,
+        sessions: peerEntries.filter((entry) => entry.kind === "session").map((entry) => ({ id: entry.id })),
+        services: peerEntries.filter((entry) => entry.kind === "service").map((entry) => ({ id: entry.id })),
+    });
+    if (!moved) {
+        host.footerFlash = "Already at edge";
+        host.footerFlashTicks = 2;
+        host.renderDashboard();
+        return true;
+    }
+    host.dashboardWorktreeGroupsCache = host.dashboardUiStateStore.orderWorktreeGroups(host.dashboardWorktreeGroupsCache);
+    host.updateWorktreeSessions();
+    const nextIndex = host.dashboardState.worktreeEntries.findIndex((entry) => entry.kind === selectedEntry.kind && entry.id === selectedEntry.id);
+    if (nextIndex >= 0)
+        host.dashboardState.sessionIndex = nextIndex;
+    host.preferDashboardEntrySelection(selectedEntry.kind, selectedEntry.id, host.dashboardState.focusedWorktreePath);
+    host.persistDashboardUiState();
+    void host.postToProjectService?.("/statusline/refresh", { force: true }).catch(() => { });
+    host.footerFlash = `Moved ${selectedEntry.kind === "session" ? "agent" : "service"} ${direction}`;
+    host.footerFlashTicks = 2;
+    host.renderDashboard();
+    return true;
+}
+function selectedDashboardSession(host) {
+    const allSessions = host.getDashboardSessions();
+    if (host.dashboardState.level === "sessions" && host.dashboardState.worktreeEntries.length > 0) {
+        const entry = host.dashboardState.worktreeEntries[host.dashboardState.sessionIndex];
+        if (entry?.kind !== "session")
+            return undefined;
+        return allSessions.find((session) => session.id === entry.id);
+    }
+    if (!host.dashboardState.hasWorktrees()) {
+        return allSessions[host.activeIndex];
+    }
+    return undefined;
+}
+function teammateParentSession(host) {
+    const parentId = host.teammatePickerState?.parentSessionId;
+    const selected = selectedDashboardSession(host);
+    if (parentId) {
+        const parent = host.dashboardSessionsCache?.find((session) => session.id === parentId) ??
+            (selected?.id === parentId ? selected : undefined);
+        if (parent && !isTeammateSession(parent))
+            return parent;
+        return undefined;
+    }
+    if (selected && !isTeammateSession(selected))
+        return selected;
+    return undefined;
+}
+function teammatePickerEntries(host) {
+    return selectDashboardTeammates(host.dashboardTeammatesCache ?? [], teammateParentSession(host));
+}
+function teammatePickerVisibleCount(total) {
+    return Math.min(total, Math.max(3, (process.stdout.rows ?? 24) - 10));
+}
 export const dashboardInteractionMethods = {
     clearDashboardQuickJump() {
         if (this.dashboardQuickJumpTimeout) {
@@ -178,6 +251,11 @@ export const dashboardInteractionMethods = {
             this.renderCurrentDashboardView();
             return;
         }
+        if (hasWorktrees && this.isDashboardScreen("dashboard") && event.shift && (key === "up" || key === "down")) {
+            if (moveSelectedDashboardWorktreeEntry(this, key)) {
+                return;
+            }
+        }
         switch (key) {
             case "?":
                 this.showHelp();
@@ -188,9 +266,12 @@ export const dashboardInteractionMethods = {
             case "v":
                 this.showServiceCreatePrompt();
                 return;
+            case "e":
+                this.showTeammatePicker();
+                return;
             case "f": {
                 const selected = this.getSelectedDashboardSessionForActions();
-                if (selected && !selected.remoteInstancePid) {
+                if (selected) {
                     this.showToolPicker(selected.id);
                 }
                 else if (hasWorktrees && this.dashboardState.level === "worktrees") {
@@ -211,14 +292,14 @@ export const dashboardInteractionMethods = {
                 return;
             case "o": {
                 const selected = this.getSelectedDashboardSessionForActions();
-                if (selected && !selected.remoteInstancePid) {
+                if (selected) {
                     this.openRelevantThreadForSession(selected.id);
                 }
                 return;
             }
             case "R": {
                 const selected = this.getSelectedDashboardSessionForActions();
-                if (selected && !selected.remoteInstancePid) {
+                if (selected) {
                     if ((selected.threadWaitingOnMeCount ?? 0) > 0) {
                         this.openRelevantThreadForSession(selected.id);
                     }
@@ -263,7 +344,7 @@ export const dashboardInteractionMethods = {
             case "x": {
                 if (hasWorktrees && this.dashboardState.level === "worktrees" && this.dashboardState.focusedWorktreePath) {
                     const focusedGroup = this.dashboardWorktreeGroupsCache.find((group) => group.path === this.dashboardState.focusedWorktreePath);
-                    if (isRemovingDashboardWorktree(focusedGroup) || this.pendingWorktreeRemovals?.has?.(focusedGroup?.path)) {
+                    if (isRemovingDashboardWorktree(focusedGroup)) {
                         this.footerFlash = blockedRemovingWorktreeMessage(focusedGroup, this.dashboardState.focusedWorktreePath);
                         this.footerFlashTicks = 2;
                         this.renderDashboard();
@@ -297,6 +378,7 @@ export const dashboardInteractionMethods = {
                 const selectedService = this.getSelectedDashboardServiceForActions();
                 if (selectedService) {
                     if (hasBlockingPendingDashboardAction(selectedService)) {
+                        flashPendingDashboardItem(this, selectedService, "service");
                         return;
                     }
                     if (selectedService.status === "offline") {
@@ -321,6 +403,7 @@ export const dashboardInteractionMethods = {
                 if (!selEntry)
                     return;
                 if (hasBlockingPendingDashboardAction(selEntry)) {
+                    flashPendingDashboardItem(this, selEntry, "agent");
                     return;
                 }
                 const runtime = this.sessions.find((s) => s.id === selEntry.id);
@@ -360,7 +443,7 @@ export const dashboardInteractionMethods = {
                     : !hasWorktrees
                         ? allDs2[this.activeIndex]
                         : undefined;
-                if (selEntry2 && !selEntry2.remoteInstancePid) {
+                if (selEntry2) {
                     this.openDashboardOverlay("label-input");
                     this.labelInputBuffer = this.getSessionLabel(selEntry2.id) ?? "";
                     this.labelInputTarget = selEntry2.id;
@@ -513,6 +596,7 @@ export const dashboardInteractionMethods = {
             return;
         }
         if (hasBlockingPendingDashboardAction(service)) {
+            flashPendingDashboardItem(this, service, "service");
             return;
         }
         this.preferDashboardEntrySelection("service", service.id, service.worktreePath);
@@ -523,7 +607,7 @@ export const dashboardInteractionMethods = {
         }
         await this.waitAndOpenLiveTmuxWindowForService(service.id);
     },
-    async activateDashboardEntry(entry) {
+    async activateDashboardEntry(entry, options = {}) {
         if (!entry)
             return;
         const worktreeGroup = findDashboardWorktreeGroup(this, entry.worktreePath);
@@ -534,10 +618,13 @@ export const dashboardInteractionMethods = {
             return;
         }
         if (hasBlockingPendingDashboardAction(entry)) {
+            flashPendingDashboardItem(this, entry, "agent");
             return;
         }
-        this.preferDashboardEntrySelection("session", entry.id, entry.worktreePath);
-        this.persistDashboardUiState();
+        if (!options.preserveDashboardSelection) {
+            this.preferDashboardEntrySelection("session", entry.id, entry.worktreePath);
+            this.persistDashboardUiState();
+        }
         const openResult = await this.waitAndOpenLiveTmuxWindowForEntry(entry);
         if (openResult !== "missing") {
             if (entry.status === "offline") {
@@ -546,15 +633,9 @@ export const dashboardInteractionMethods = {
             }
             return;
         }
-        if (entry.remoteInstanceId) {
-            await this.takeoverFromDashEntryWithFeedback(entry);
-            return;
-        }
         if (entry.status === "offline") {
             const offline = this.offlineSessions.find((session) => session.id === entry.id);
-            if (offline) {
-                await this.resumeOfflineSessionWithFeedback(offline);
-            }
+            await this.resumeOfflineSessionWithFeedback(offline ?? entry);
             return;
         }
         const ptyIdx = this.sessions.findIndex((session) => session.id === entry.id);
@@ -563,6 +644,84 @@ export const dashboardInteractionMethods = {
             this.focusSession(ptyIdx);
         }
     },
+    getTeammatePickerEntries() {
+        return teammatePickerEntries(this);
+    },
+    showTeammatePicker() {
+        const parent = teammateParentSession(this);
+        if (!parent) {
+            this.footerFlash = "Select an agent with teammates";
+            this.footerFlashTicks = 2;
+            this.renderDashboard();
+            return;
+        }
+        const teammates = selectDashboardTeammates(this.dashboardTeammatesCache ?? [], parent);
+        if (teammates.length === 0) {
+            this.footerFlash = `${parent.label ?? parent.command} has no teammates`;
+            this.footerFlashTicks = 2;
+            this.renderDashboard();
+            return;
+        }
+        this.teammatePickerState = { parentSessionId: parent.id, index: 0 };
+        this.openDashboardOverlay("teammate-picker");
+        this.renderTeammatePicker();
+    },
+    renderTeammatePicker() {
+        this.redrawDashboardWithOverlay();
+    },
+    handleTeammatePickerKey(data) {
+        const events = parseKeys(data);
+        if (events.length === 0)
+            return;
+        const event = events[0];
+        const key = event.name || event.char;
+        const teammates = teammatePickerEntries(this);
+        const visibleTeammates = teammates.slice(0, teammatePickerVisibleCount(teammates.length));
+        const selectedIndex = Math.max(0, Math.min(this.teammatePickerState?.index ?? 0, visibleTeammates.length - 1));
+        if (key === "escape") {
+            this.teammatePickerState = null;
+            this.clearDashboardOverlay();
+            this.restoreDashboardAfterOverlayDismiss();
+            return;
+        }
+        if (visibleTeammates.length === 0) {
+            this.teammatePickerState = null;
+            this.clearDashboardOverlay();
+            this.restoreDashboardAfterOverlayDismiss();
+            return;
+        }
+        if (key === "down" || key === "j") {
+            this.teammatePickerState = {
+                parentSessionId: this.teammatePickerState?.parentSessionId ?? teammateParentSession(this)?.id ?? "",
+                index: ((this.teammatePickerState?.index ?? 0) + 1) % visibleTeammates.length,
+            };
+            this.renderTeammatePicker();
+            return;
+        }
+        if (key === "up" || key === "k") {
+            this.teammatePickerState = {
+                parentSessionId: this.teammatePickerState?.parentSessionId ?? teammateParentSession(this)?.id ?? "",
+                index: ((this.teammatePickerState?.index ?? 0) - 1 + visibleTeammates.length) % visibleTeammates.length,
+            };
+            this.renderTeammatePicker();
+            return;
+        }
+        let targetIndex;
+        if (key === "enter" || key === "return") {
+            targetIndex = selectedIndex;
+        }
+        else if (key >= "1" && key <= "9") {
+            targetIndex = parseInt(key, 10) - 1;
+        }
+        if (targetIndex === undefined)
+            return;
+        const teammate = visibleTeammates[targetIndex];
+        if (!teammate)
+            return;
+        this.teammatePickerState = null;
+        this.clearDashboardOverlay();
+        void this.activateDashboardEntry(teammate, { preserveDashboardSelection: true });
+    },
     handleServiceInputKey(data) {
         const events = parseKeys(data);
         if (events.length === 0)
@@ -635,7 +794,7 @@ export const dashboardInteractionMethods = {
             this.renderLabelInput();
         }
     },
-    handleReviewRequest() {
+    async handleReviewRequest() {
         const session = this.activeSession;
         if (!session)
             return;
@@ -645,7 +804,7 @@ export const dashboardInteractionMethods = {
             diff = execSync("git diff HEAD", { encoding: "utf-8", timeout: 5000 }).slice(0, 5000) || undefined;
         }
         catch { }
-        const reviewTask = requestReview(session.id, role, diff, `Review ${session.command} agent's recent work`);
+        const reviewTask = await requestReview(session.id, role, diff, `Review ${session.command} agent's recent work`);
         if (reviewTask) {
             this.footerFlash = `⧫ Review requested → ${reviewTask.assignee ?? "reviewer"}`;
             this.footerFlashTicks = 3;
@@ -681,7 +840,7 @@ export const dashboardInteractionMethods = {
                 this.footerFlash = `Sent message to ${count} recipient${count === 1 ? "" : "s"}`;
             }
             else if (mode === "handoff") {
-                await this.postToProjectService("/tasks/handoff", {
+                await this.postToProjectService("/handoff", {
                     ...requestBody,
                     body,
                 });
@@ -690,7 +849,7 @@ export const dashboardInteractionMethods = {
             else {
                 await this.postToProjectService("/tasks/assign", {
                     ...requestBody,
-                    body,
+                    description: body,
                 });
                 this.footerFlash = `Assigned task to ${target.label}`;
             }
@@ -711,4 +870,3 @@ export const dashboardInteractionMethods = {
         this.renderDashboard();
     },
 };
-//# sourceMappingURL=dashboard-interaction.js.map

package/dist/multiplexer/dashboard-model.d.ts

@@ -1,6 +1,10 @@
 import type { DashboardService, DashboardSession, WorktreeGroup } from "../dashboard/index.js";
 import { type DashboardOperationFailure } from "../dashboard/operation-failures.js";
+import type { PendingServiceActionKind, PendingSessionActionKind, PendingWorktreeActionKind } from "../pending-actions.js";
 type DashboardModelHost = any;
+type MetadataPendingSettle<T> = (result: T) => Promise<boolean> | boolean;
+export declare function withMetadataSessionPending<T>(host: DashboardModelHost, sessionId: string | undefined, kind: PendingSessionActionKind, work: () => Promise<T> | T, sessionSeed?: DashboardSession, settle?: MetadataPendingSettle<T>): Promise<T>;
+export declare function withMetadataServicePending<T>(host: DashboardModelHost, serviceId: string, kind: PendingServiceActionKind, work: () => Promise<T> | T, settle?: MetadataPendingSettle<T>): Promise<T>;
 export declare function buildDashboardWorktreeGroups(_host: DashboardModelHost, dashSessions: DashboardSession[], dashServices: DashboardService[], worktrees: Array<{
     name: string;
     path: string;
@@ -9,17 +13,19 @@ export declare function buildDashboardWorktreeGroups(_host: DashboardModelHost,
     createdAt?: string;
     pending?: boolean;
     removing?: boolean;
-    pendingAction?: "creating";
+    pendingAction?: Extract<PendingWorktreeActionKind, "creating" | "removing" | "graveyarding">;
     operationFailure?: DashboardOperationFailure;
 }>, mainRepoPath?: string): WorktreeGroup[];
 export declare function composeDashboardWorktreeGroups(worktreeGroups: WorktreeGroup[], dashSessions: DashboardSession[], dashServices: DashboardService[]): WorktreeGroup[];
-export declare function applyDashboardModel(host: DashboardModelHost, dashSessions: DashboardSession[], dashServices: DashboardService[], worktreeGroups: WorktreeGroup[], mainCheckoutInfo: {
+export declare function applyDashboardModel(host: DashboardModelHost, dashSessions: DashboardSession[], dashTeammates: DashboardSession[], dashServices: DashboardService[], worktreeGroups: WorktreeGroup[], mainCheckoutInfo: {
     name: string;
     branch: string;
 }, operationFailures?: DashboardOperationFailure[]): boolean;
 export declare function invalidateDesktopStateSnapshot(host: DashboardModelHost): void;
 export declare function refreshDesktopStateSnapshot(host: DashboardModelHost): void;
-export declare function computeDashboardSessions(host: DashboardModelHost): DashboardSession[];
+export declare function computeDashboardSessions(host: DashboardModelHost, options?: {
+    includeTeammates?: boolean;
+}): DashboardSession[];
 export declare function computeDashboardServices(host: DashboardModelHost, worktrees?: any): DashboardService[];
 export declare function readTmuxProcessInfo(host: DashboardModelHost, target: {
     windowId: string;
@@ -30,6 +36,7 @@ export declare function readTmuxProcessInfo(host: DashboardModelHost, target: {
 };
 export declare function buildDesktopStateSnapshot(host: DashboardModelHost): {
     sessions: DashboardSession[];
+    teammates: DashboardSession[];
     services: DashboardService[];
     worktrees: any;
     operationFailures: DashboardOperationFailure[];