@viraatdas/rudder 1.0.6 → 1.0.7

package/dist/tui.js

@@ -4,10 +4,12 @@ import { spawn } from "node:child_process";
 import { fileURLToPath } from "node:url";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { Box, Text, render, useApp, useInput, useWindowSize } from "ink";
-import { currentBranch, findRepoRoot, hasChanges } from "./git.js";
+import { permissionAttentionFromOutput } from "./agent-attention.js";
+import { currentBranch, findRepoRoot } from "./git.js";
 import { discoverModelOptions, fallbackModelOptions } from "./models.js";
-import { eventsPath, listRuns, loadConfig, outputPath, } from "./state.js";
+import { eventsPath, listRuns, loadConfig, outputPath, rememberBackendSelection, } from "./state.js";
 import { continueRun, deleteRun, mergeRun, startRun, stopRun } from "./run-manager.js";
+import { taskDisplayLabel } from "./task-summary.js";
 import { pathExists, shortenHome } from "./util.js";
 const INTERACTIVE_BACKENDS = ["claude", "codex"];
 const COMPLETION_SOUND = fileURLToPath(new URL("../assets/sounds/ping.mp3", import.meta.url));
@@ -19,7 +21,7 @@ const COMMANDS = [
     { name: "new", detail: "return to new-agent mode", insert: "/new" },
     { name: "worktree", detail: "toggle worktree policy", insert: "/worktree " },
     { name: "stop", detail: "stop the selected run", insert: "/stop" },
-    { name: "delete", detail: "delete selected run, offering merge first when relevant", insert: "/delete" },
+    { name: "delete", detail: "delete selected run and its worktree", insert: "/delete" },
     { name: "copy", detail: "copy selected worker transcript", insert: "/copy" },
     { name: "merge", detail: "merge the selected completed worktree", insert: "/merge" },
     { name: "merge-all", detail: "merge all completed worktrees", insert: "/merge-all" },
@@ -58,9 +60,11 @@ function RudderTui({ defaults }) {
     const [commandMenuIndex, setCommandMenuIndex] = useState(0);
     const [discoveredModels, setDiscoveredModels] = useState([]);
     const [deletePrompt, setDeletePrompt] = useState(null);
+    const [mergePrompt, setMergePrompt] = useState(null);
+    const [conflictPrompt, setConflictPrompt] = useState(null);
     const [submitting, setSubmitting] = useState(false);
     const [preferencesLoaded, setPreferencesLoaded] = useState(false);
-    const notifiedFinishedRuns = useRef(null);
+    const notifiedAlerts = useRef(null);
     const refresh = useCallback(async () => {
         const root = findRepoRoot();
         const [nextConfig, nextBranch, nextRuns] = await Promise.all([
@@ -71,7 +75,7 @@ function RudderTui({ defaults }) {
         setRepoRoot(root);
         setConfig(nextConfig);
         setBranch(nextBranch);
-        notifyFinishedRuns(nextRuns, notifiedFinishedRuns);
+        notifyRunAlerts(nextRuns, notifiedAlerts);
         setRuns(nextRuns);
         if (!preferencesLoaded) {
             setBackend(toInteractiveBackend(defaults.backend ?? nextConfig.lastUsedBackend ?? nextConfig.defaultBackend));
@@ -168,30 +172,26 @@ function RudderTui({ defaults }) {
             setSubmitting(false);
         }
     }, [backend, model, refresh, submitting, targetRun, worktreeMode]);
-    const requestDeleteSelectedRun = useCallback(async (runOverride) => {
+    const requestDeleteSelectedRun = useCallback((runOverride) => {
         const run = runOverride ?? selectedRun;
         if (!run) {
             setNotice("No agent selected");
             return;
         }
-        const changed = run.worktree.enabled && await hasChanges(run.worktree.path).catch(() => false);
-        const mergeable = changed && run.status === "completed";
-        setDeletePrompt({ runId: run.id, canMerge: mergeable });
-        setNotice(mergeable
-            ? `Delete ${shortId(run.id)}? press m to merge first, d to discard, Esc to cancel`
-            : `Delete ${shortId(run.id)}? press d to confirm, Esc to cancel`);
+        setDeletePrompt({ runId: run.id });
+        setNotice(`Delete ${shortId(run.id)}? press d to confirm, Esc to cancel`);
     }, [selectedRun]);
-    const confirmDelete = useCallback(async (mergeFirst) => {
+    const confirmDelete = useCallback(async () => {
         if (!deletePrompt) {
             return;
         }
         const runId = deletePrompt.runId;
         try {
-            await deleteRun(runId, { mergeFirst, force: true, silent: true });
+            await deleteRun(runId, { force: true, silent: true });
             setDeletePrompt(null);
             setSelectedRunId(undefined);
             setTargetRunId(undefined);
-            setNotice(`${mergeFirst ? "Merged and deleted" : "Deleted"} ${shortId(runId)}`);
+            setNotice(`Deleted ${shortId(runId)}`);
             await refresh();
         }
         catch (error) {
@@ -199,6 +199,107 @@ function RudderTui({ defaults }) {
             setNotice(error instanceof Error ? error.message : String(error));
         }
     }, [deletePrompt, refresh]);
+    const requestMergeRun = useCallback((runOverride, allowDirty = false) => {
+        const run = runOverride ?? selectedRun;
+        if (!run) {
+            setNotice("No agent selected");
+            return;
+        }
+        if (!canMerge(run)) {
+            setNotice(`${shortId(run.id)} is not ready to merge`);
+            return;
+        }
+        setDeletePrompt(null);
+        setConflictPrompt(null);
+        setMergePrompt({
+            kind: "selected",
+            runId: run.id,
+            label: truncate(taskDisplayLabel(run, 48), 48),
+            allowDirty,
+        });
+        setNotice(`Merge ${shortId(run.id)}? press y to confirm or n to cancel`);
+    }, [selectedRun]);
+    const requestMergeAll = useCallback((allowDirty = false) => {
+        const ready = runs.filter(canMerge);
+        if (ready.length === 0) {
+            setNotice("No completed worktree runs ready to merge");
+            return;
+        }
+        setDeletePrompt(null);
+        setConflictPrompt(null);
+        setMergePrompt({ kind: "all", runIds: ready.map((run) => run.id), allowDirty });
+        setNotice(`Merge ${ready.length} run${ready.length === 1 ? "" : "s"}? press y to confirm or n to cancel`);
+    }, [runs]);
+    const confirmMerge = useCallback(async () => {
+        if (!mergePrompt) {
+            return;
+        }
+        const prompt = mergePrompt;
+        setMergePrompt(null);
+        try {
+            if (prompt.kind === "selected") {
+                const merged = await mergeRun(prompt.runId, prompt.allowDirty, { silent: true });
+                if (merged.merge?.status === "conflict") {
+                    const files = merged.merge.conflictedFiles ?? [];
+                    setConflictPrompt({ runId: prompt.runId, files });
+                    setNotice(`Merge conflict in ${files.length || "unknown"} file${files.length === 1 ? "" : "s"}; press y for AI help or n for manual`);
+                }
+                else {
+                    setNotice(`Merged ${shortId(prompt.runId)}`);
+                }
+                await refresh();
+                return;
+            }
+            let mergedCount = 0;
+            for (const runId of prompt.runIds) {
+                const merged = await mergeRun(runId, prompt.allowDirty, { silent: true });
+                if (merged.merge?.status === "conflict") {
+                    const files = merged.merge.conflictedFiles ?? [];
+                    setConflictPrompt({ runId, files });
+                    setNotice(`Merge all stopped after ${mergedCount}: conflict in ${shortId(runId)}; press y for AI help or n for manual`);
+                    await refresh();
+                    return;
+                }
+                mergedCount += 1;
+            }
+            setNotice(`Merged ${mergedCount} run${mergedCount === 1 ? "" : "s"}`);
+            await refresh();
+        }
+        catch (error) {
+            setNotice(error instanceof Error ? error.message : String(error));
+            await refresh();
+        }
+    }, [mergePrompt, refresh]);
+    const startConflictResolver = useCallback(async () => {
+        if (!conflictPrompt) {
+            return;
+        }
+        const files = conflictPrompt.files.length ? conflictPrompt.files.join("\n") : "(git did not report conflicted files)";
+        const task = [
+            "Read RUDDER.md first. A git merge stopped with conflicts in this checkout.",
+            `Conflicted files:\n${files}`,
+            "Resolve the merge conflicts, keep the intended changes from both sides where appropriate, run relevant checks if possible, and report what changed. Do not abort the merge unless resolving is impossible.",
+        ].join("\n\n");
+        try {
+            const run = await startRun({
+                task,
+                backend,
+                model,
+                detach: true,
+                worktree: false,
+                silent: true,
+                view: "shell",
+            });
+            setConflictPrompt(null);
+            setSelectedRunId(run.id);
+            setExpandedRunIds((current) => new Set(current).add(run.id));
+            setNotice(`Started AI merge-conflict resolver ${shortId(run.id)}`);
+            await refresh();
+        }
+        catch (error) {
+            setNotice(error instanceof Error ? error.message : String(error));
+        }
+    }, [backend, conflictPrompt, model, refresh]);
     const copySelectedTranscript = useCallback(async (runOverride) => {
         const run = runOverride ?? selectedRun;
         if (!run) {
@@ -229,7 +330,9 @@ function RudderTui({ defaults }) {
                 return;
             case "backend":
                 if (isInteractiveBackend(args[0])) {
-                    chooseBackend(args[0], setBackend, setModel, setNotice);
+                    const nextBackend = args[0];
+                    chooseBackend(nextBackend, setBackend, setModel, setNotice);
+                    setConfig(await rememberBackendSelection({ backend: nextBackend }));
                 }
                 else {
                     setNotice("Usage: /backend claude|codex");
@@ -267,6 +370,11 @@ function RudderTui({ defaults }) {
                 else {
                     const nextModel = args.join(" ");
                     setModel(nextModel);
+                    setConfig(await rememberBackendSelection({
+                        backend,
+                        model: nextModel,
+                        updateModel: true,
+                    }));
                     setNotice(`Model ${nextModel}`);
                 }
                 setInput("");
@@ -289,11 +397,11 @@ function RudderTui({ defaults }) {
                 setInput("");
                 return;
             case "merge":
-                await runAction(args[0] ?? selectedRun?.id, async (id) => mergeRun(id, args.includes("--allow-dirty"), { silent: true }), "Merged", setNotice, refresh);
+                requestMergeRun(resolveUiRun(runs, args[0] ?? selectedRun?.id), args.includes("--allow-dirty"));
                 setInput("");
                 return;
             case "merge-all":
-                await mergeReadyRuns(runs, args.includes("--allow-dirty"), setNotice, refresh);
+                requestMergeAll(args.includes("--allow-dirty"));
                 setInput("");
                 return;
             case "clear":
@@ -305,7 +413,7 @@ function RudderTui({ defaults }) {
                 setNotice(`Unknown command: /${command}`);
                 setInput("");
         }
-    }, [app, backend, copySelectedTranscript, refresh, requestDeleteSelectedRun, runs, selectedRun?.id]);
+    }, [app, backend, copySelectedTranscript, refresh, requestDeleteSelectedRun, requestMergeAll, requestMergeRun, runs, selectedRun?.id]);
     const selectModelOption = useCallback((index) => {
         const option = modelOptions[index];
         if (!option) {
@@ -315,7 +423,14 @@ function RudderTui({ defaults }) {
         setModelMenuOpen(false);
         setModelMenuIndex(index);
         setNotice(option.value ? `Model ${option.value}` : "Using backend default model");
-    }, [modelOptions]);
+        void rememberBackendSelection({
+            backend,
+            model: option.value,
+            updateModel: true,
+        }).then(setConfig).catch((error) => {
+            setNotice(error instanceof Error ? error.message : String(error));
+        });
+    }, [backend, modelOptions]);
     const selectCommandOption = useCallback((index) => {
         const option = commandOptions[index];
         if (!option) {
@@ -355,18 +470,38 @@ function RudderTui({ defaults }) {
             }
             return;
         }
+        if (mergePrompt) {
+            if (key.escape || value === "n" || value === "N") {
+                setMergePrompt(null);
+                setNotice("Merge cancelled");
+                return;
+            }
+            if (value === "y" || value === "Y") {
+                void confirmMerge();
+                return;
+            }
+            return;
+        }
+        if (conflictPrompt) {
+            if (key.escape || value === "n" || value === "N") {
+                setConflictPrompt(null);
+                setNotice("Resolve the merge conflicts manually, then commit");
+                return;
+            }
+            if (value === "y" || value === "Y") {
+                void startConflictResolver();
+                return;
+            }
+            return;
+        }
         if (deletePrompt) {
             if (key.escape) {
                 setDeletePrompt(null);
                 setNotice("Delete cancelled");
                 return;
             }
-            if (value === "m" && deletePrompt.canMerge) {
-                void confirmDelete(true);
-                return;
-            }
-            if (value === "d" || key.delete || key.backspace) {
-                void confirmDelete(false);
+            if (value === "d") {
+                void confirmDelete();
                 return;
             }
             return;
@@ -532,11 +667,11 @@ function RudderTui({ defaults }) {
             return;
         }
         if (input.length === 0 && value === "m" && selectedRun) {
-            void runAction(selectedRun.id, async (id) => mergeRun(id, false, { silent: true }), "Merged", setNotice, refresh);
+            requestMergeRun(selectedRun);
             return;
         }
         if (input.length === 0 && value === "M") {
-            void mergeReadyRuns(runs, false, setNotice, refresh);
+            requestMergeAll();
             return;
         }
         if (input.length === 0 && value === "d") {
@@ -565,7 +700,7 @@ function RudderTui({ defaults }) {
     const railWidth = Math.min(42, Math.max(30, Math.floor(width * 0.34)));
     const detailWidth = Math.max(30, width - railWidth - 1);
     const detailHeight = Math.max(8, height - 8);
-    return (_jsxs(Box, { flexDirection: "column", width: width, height: height, children: [_jsx(Header, { width: width, repoRoot: repoRoot, branch: branch, backend: backend, model: model ?? modelForBackend(backend, config), activeCount: activeCount, worktreeMode: worktreeMode }), _jsxs(Box, { flexGrow: 1, minHeight: 0, children: [_jsx(RunRail, { runs: runs, selectedRunId: selectedRun?.id, targetRunId: targetRun?.id, width: railWidth, expandedRunIds: expandedRunIds, focused: focusPane === "agents" }), _jsx(Box, { flexDirection: "column", flexGrow: 1, marginLeft: 1, children: _jsx(DetailPane, { run: selectedRun, width: detailWidth, height: detailHeight, expanded: selectedExpanded, transcriptExpanded: transcriptExpanded, focused: focusPane === "worker", input: focusPane === "worker" ? input : "", submitting: submitting }) })] }), helpOpen ? _jsx(Help, {}) : null, modelMenuOpen ? _jsx(ModelMenu, { backend: backend, options: modelOptions, selectedIndex: modelMenuIndex, currentModel: model, width: width }) : null, commandMenuOpen ? _jsx(CommandMenu, { options: commandOptions, selectedIndex: commandMenuIndex, width: width }) : null, deletePrompt ? _jsx(DeletePromptBox, { prompt: deletePrompt, width: width }) : null, focusPane === "worker"
+    return (_jsxs(Box, { flexDirection: "column", width: width, height: height, children: [_jsx(Header, { width: width, repoRoot: repoRoot, branch: branch, backend: backend, model: model ?? modelForBackend(backend, config), activeCount: activeCount, worktreeMode: worktreeMode }), _jsxs(Box, { flexGrow: 1, minHeight: 0, children: [_jsx(RunRail, { runs: runs, selectedRunId: selectedRun?.id, targetRunId: targetRun?.id, width: railWidth, expandedRunIds: expandedRunIds, focused: focusPane === "agents" }), _jsx(Box, { flexDirection: "column", flexGrow: 1, marginLeft: 1, children: _jsx(DetailPane, { run: selectedRun, width: detailWidth, height: detailHeight, expanded: selectedExpanded, transcriptExpanded: transcriptExpanded, focused: focusPane === "worker", input: focusPane === "worker" ? input : "", submitting: submitting }) })] }), helpOpen ? _jsx(Help, {}) : null, modelMenuOpen ? _jsx(ModelMenu, { backend: backend, options: modelOptions, selectedIndex: modelMenuIndex, currentModel: model, width: width }) : null, commandMenuOpen ? _jsx(CommandMenu, { options: commandOptions, selectedIndex: commandMenuIndex, width: width }) : null, mergePrompt ? _jsx(MergePromptBox, { prompt: mergePrompt, width: width }) : null, conflictPrompt ? _jsx(MergeConflictPromptBox, { prompt: conflictPrompt, width: width }) : null, deletePrompt ? _jsx(DeletePromptBox, { prompt: deletePrompt, width: width }) : null, focusPane === "worker"
                 ? _jsx(StatusDock, { notice: notice })
                 : _jsx(PromptDock, { input: input, backend: backend, model: model ?? modelForBackend(backend, config), notice: notice, submitting: submitting, targetRun: targetRun, focused: focusPane === "task" }), _jsx(Footer, { focusPane: focusPane })] }));
 }
@@ -579,13 +714,13 @@ function RunRail(props) {
     return (_jsxs(Box, { flexDirection: "column", width: props.width, borderStyle: props.focused ? "double" : "single", borderColor: props.focused ? "cyan" : "gray", paddingX: 1, children: [_jsxs(Box, { justifyContent: "space-between", children: [_jsxs(Box, { children: [props.focused ? _jsx(FocusPill, { label: "focus" }) : null, _jsx(Text, { bold: true, color: props.focused ? "cyan" : undefined, children: " agents" })] }), _jsxs(Text, { color: "gray", children: [props.runs.length, " runs"] })] }), visible.length === 0 ? (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "gray", children: "No runs yet. Type a task below." }) })) : null, visible.map((run) => (_jsx(RunCard, { run: run, selected: run.id === props.selectedRunId, targeted: run.id === props.targetRunId, expanded: props.expandedRunIds.has(run.id), width: props.width - 4 }, run.id)))] }));
 }
 function RunCard(props) {
-    const tone = statusColor(props.run.status);
+    const tone = runStatusColor(props.run);
     const label = props.selected ? (props.targeted ? ">>" : "> ") : "  ";
-    const task = truncate(props.run.task, Math.max(12, props.width - 14));
+    const task = truncate(taskDisplayLabel(props.run, 80), Math.max(12, props.width - 14));
     const progress = completionPercent(props.run);
     const summary = truncate(agentRailSummary(props.run), Math.max(12, props.width - 7));
     const meta = `${progressBar(progress)} ${progress}%`;
-    return (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsxs(Text, { wrap: "truncate", color: props.selected ? "white" : "gray", bold: props.selected, children: [label, " ", meta, " ", statusGlyph(props.run.status), " ", props.run.backend, " ", task] }), _jsxs(Text, { wrap: "truncate", color: tone, children: ["  ", statusWord(props.run.status), " ", props.targeted ? "editing " : "", summary] })] }));
+    return (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsxs(Text, { wrap: "truncate", color: props.selected ? "white" : "gray", bold: props.selected, children: [label, " ", meta, " ", statusGlyph(props.run.status), " ", props.run.backend, " ", task] }), _jsxs(Text, { wrap: "truncate", color: tone, children: ["  ", statusWord(props.run), " ", props.targeted ? "editing " : "", summary] })] }));
 }
 function DetailPane(props) {
     if (!props.run) {
@@ -594,7 +729,7 @@ function DetailPane(props) {
     const composerHeight = props.focused ? 3 : 0;
     const outputHeight = Math.max(5, props.height - 6 - composerHeight);
     const contentWidth = Math.max(10, props.width - 4);
-    return (_jsxs(Box, { width: props.width, height: props.height, borderStyle: props.focused ? "double" : "single", borderColor: props.focused ? "cyan" : statusColor(props.run.status), paddingX: 1, flexDirection: "column", children: [_jsxs(Box, { justifyContent: "space-between", children: [_jsxs(Box, { children: [props.focused ? _jsx(FocusPill, { label: "focus" }) : null, _jsx(Text, { bold: true, color: props.focused ? "cyan" : undefined, children: " worker" })] }), _jsx(Text, { color: statusColor(props.run.status), children: workerStateLabel(props.run) })] }), _jsx(Text, { wrap: "truncate", color: "gray", children: fitLine(props.run.task, contentWidth) }), _jsx(Box, { flexDirection: "column", marginTop: 1, minHeight: 0, children: _jsx(Box, { height: outputHeight, overflow: "hidden", flexDirection: "column", children: tailLines(props.run.output, outputHeight).map((line, index) => (_jsx(Text, { wrap: "truncate", children: line || " " }, index))) }) }), props.focused ? _jsx(WorkerComposer, { run: props.run, input: props.input, submitting: props.submitting, width: contentWidth }) : null] }));
+    return (_jsxs(Box, { width: props.width, height: props.height, borderStyle: props.focused ? "double" : "single", borderColor: props.focused ? "cyan" : runStatusColor(props.run), paddingX: 1, flexDirection: "column", children: [_jsxs(Box, { justifyContent: "space-between", children: [_jsxs(Box, { children: [props.focused ? _jsx(FocusPill, { label: "focus" }) : null, _jsx(Text, { bold: true, color: props.focused ? "cyan" : undefined, children: " worker" })] }), _jsx(Text, { color: runStatusColor(props.run), children: workerStateLabel(props.run) })] }), _jsx(Text, { wrap: "truncate", color: "gray", children: fitLine(props.run.task, contentWidth) }), _jsx(Box, { flexDirection: "column", marginTop: 1, minHeight: 0, children: _jsx(Box, { height: outputHeight, overflow: "hidden", flexDirection: "column", children: tailLines(props.run.output, outputHeight).map((line, index) => (_jsx(Text, { wrap: "truncate", children: line || " " }, index))) }) }), props.focused ? _jsx(WorkerComposer, { run: props.run, input: props.input, submitting: props.submitting, width: contentWidth }) : null] }));
 }
 function WorkerComposer(props) {
     const active = isActive(props.run.status);
@@ -604,7 +739,7 @@ function WorkerComposer(props) {
     return (_jsxs(Box, { flexDirection: "column", marginTop: 1, borderStyle: "single", borderColor: "cyan", paddingX: 1, children: [_jsxs(Box, { justifyContent: "space-between", children: [_jsxs(Text, { children: [_jsx(FocusPill, { label: label }), _jsxs(Text, { color: props.submitting ? "yellow" : "cyan", children: [" ", props.submitting ? "sending" : shortId(props.run.id)] }), _jsxs(Text, { children: ["  ", truncate(value, Math.max(8, props.width - 28))] }), _jsx(Text, { color: "cyan", children: "_" })] }), _jsx(Text, { color: "gray", children: active ? "running" : "resumable" })] }), _jsx(Text, { color: "gray", children: fitLine(`${helper}. Tab changes pane, Esc returns to task.`, props.width) })] }));
 }
 function Help() {
-    return (_jsxs(Box, { borderStyle: "single", borderColor: "yellow", paddingX: 1, flexDirection: "column", children: [_jsx(Text, { bold: true, color: "yellow", children: "keys" }), _jsxs(Text, { children: [_jsx(Text, { color: "cyan", children: "Tab" }), " focus agents/worker/task   ", _jsx(Text, { color: "cyan", children: "Enter" }), " submit focused input   ", _jsx(Text, { color: "cyan", children: "j/k" }), " select run"] }), _jsxs(Text, { children: [_jsx(Text, { color: "cyan", children: "worker focus" }), " type to selected agent; running agents are interrupted on Enter   ", _jsx(Text, { color: "cyan", children: "n" }), " new task   ", _jsx(Text, { color: "cyan", children: "x" }), " expand   ", _jsx(Text, { color: "cyan", children: "l" }), " transcript"] }), _jsxs(Text, { children: [_jsx(Text, { color: "cyan", children: "o" }), " model picker   ", _jsx(Text, { color: "cyan", children: "/" }), " command search   ", _jsx(Text, { color: "cyan", children: "d" }), " delete   ", _jsx(Text, { color: "cyan", children: "y" }), " copy transcript   ", _jsx(Text, { color: "cyan", children: "s" }), " stop   ", _jsx(Text, { color: "cyan", children: "m/M" }), " merge"] }), _jsx(Text, { color: "gray", children: "Slash: /backend claude|codex, /model, /model <name>, /agent, /interrupt, /new, /worktree, /stop, /delete, /copy, /merge, /merge-all, /exit" })] }));
+    return (_jsxs(Box, { borderStyle: "single", borderColor: "yellow", paddingX: 1, flexDirection: "column", children: [_jsx(Text, { bold: true, color: "yellow", children: "keys" }), _jsxs(Text, { children: [_jsx(Text, { color: "cyan", children: "Tab" }), " focus agents/worker/task   ", _jsx(Text, { color: "cyan", children: "Enter" }), " submit focused input   ", _jsx(Text, { color: "cyan", children: "j/k" }), " select run"] }), _jsxs(Text, { children: [_jsx(Text, { color: "cyan", children: "worker focus" }), " type to selected agent; running agents are interrupted on Enter   ", _jsx(Text, { color: "cyan", children: "n" }), " new task   ", _jsx(Text, { color: "cyan", children: "x" }), " expand   ", _jsx(Text, { color: "cyan", children: "l" }), " transcript"] }), _jsxs(Text, { children: [_jsx(Text, { color: "cyan", children: "o" }), " model picker   ", _jsx(Text, { color: "cyan", children: "/" }), " command search   ", _jsx(Text, { color: "cyan", children: "dd" }), " delete   ", _jsx(Text, { color: "cyan", children: "y" }), " copy transcript   ", _jsx(Text, { color: "cyan", children: "s" }), " stop   ", _jsx(Text, { color: "cyan", children: "m/M" }), " merge"] }), _jsx(Text, { color: "gray", children: "Slash: /backend claude|codex, /model, /model <name>, /agent, /interrupt, /new, /worktree, /stop, /delete, /copy, /merge, /merge-all, /exit" })] }));
 }
 function FocusPill(props) {
     return (_jsxs(Text, { backgroundColor: "cyan", color: "black", bold: true, children: [" ", props.label.toUpperCase(), " "] }));
@@ -637,11 +772,25 @@ function CommandMenu(props) {
 }
 function DeletePromptBox(props) {
     const contentWidth = Math.max(24, props.width - 4);
-    const action = props.prompt.canMerge
-        ? "m merge first, d discard run, Esc cancel"
-        : "d delete run, Esc cancel";
+    const action = "d delete run + worktree, Esc cancel";
     return (_jsx(Box, { width: props.width, borderStyle: "double", borderColor: "yellow", paddingX: 1, children: _jsx(Text, { color: "yellow", bold: true, children: fitLine(`delete ${shortId(props.prompt.runId)}?  ${action}`, contentWidth) }) }));
 }
+function MergePromptBox(props) {
+    const contentWidth = Math.max(24, props.width - 4);
+    const subject = props.prompt.kind === "selected"
+        ? `merge ${shortId(props.prompt.runId)}  ${props.prompt.label}`
+        : `merge ${props.prompt.runIds.length} completed run${props.prompt.runIds.length === 1 ? "" : "s"}`;
+    const prefix = "press ";
+    const action = "y to merge";
+    const suffix = ", n to cancel";
+    const hint = fitLine(`${prefix}${action}${suffix}`, contentWidth);
+    return (_jsxs(Box, { width: props.width, borderStyle: "double", borderColor: "yellow", paddingX: 1, flexDirection: "column", children: [_jsx(Text, { color: "yellow", bold: true, children: fitLine(subject, contentWidth) }), _jsxs(Text, { children: [_jsx(Text, { color: "gray", children: hint.slice(0, prefix.length) }), _jsx(Text, { color: "red", bold: true, children: hint.slice(prefix.length, prefix.length + action.length) }), _jsx(Text, { color: "gray", children: hint.slice(prefix.length + action.length) })] })] }));
+}
+function MergeConflictPromptBox(props) {
+    const contentWidth = Math.max(24, props.width - 4);
+    const files = props.prompt.files.length ? props.prompt.files.join(", ") : "unknown files";
+    return (_jsxs(Box, { width: props.width, borderStyle: "double", borderColor: "red", paddingX: 1, flexDirection: "column", children: [_jsx(Text, { color: "red", bold: true, children: fitLine(`merge conflict ${shortId(props.prompt.runId)}`, contentWidth) }), _jsx(Text, { color: "gray", children: fitLine(files, contentWidth) }), _jsx(Text, { color: "gray", children: fitLine("press y for AI help, n to handle manually", contentWidth) })] }));
+}
 function PromptDock(props) {
     const label = props.targetRun ? `${isActive(props.targetRun.status) ? "interrupt" : "agent"} ${shortId(props.targetRun.id)}` : "task";
     const showTextLabel = !props.focused || Boolean(props.targetRun);
@@ -651,7 +800,7 @@ function StatusDock(props) {
     return (_jsxs(Box, { borderStyle: "single", borderColor: "gray", paddingX: 1, justifyContent: "space-between", children: [_jsx(Text, { color: "gray", children: "worker input is active inside the selected agent pane" }), _jsx(Text, { color: "gray", children: props.notice })] }));
 }
 function Footer(props) {
-    return (_jsx(Box, { children: _jsxs(Text, { color: "gray", children: ["focus:", props.focusPane, "  Tab focus  / commands  o model  n new  c worker  d delete  y copy  m/M merge  ? help"] }) }));
+    return (_jsx(Box, { children: _jsxs(Text, { color: "gray", children: ["focus:", props.focusPane, "  Tab focus  / commands  o model  n new  c worker  dd delete  y copy  m/M merge  ? help"] }) }));
 }
 async function loadUiRuns(repoRoot) {
     const runs = await listRuns(repoRoot);
@@ -665,6 +814,7 @@ async function loadUiRuns(repoRoot) {
             output,
             events,
             work: buildWork(events, run),
+            attention: permissionAttentionFromOutput(output),
         };
     }));
 }
@@ -853,25 +1003,32 @@ function modelForBackend(backend, config) {
         return undefined;
     }
     if (backend === "claude") {
-        return config.backends.claude?.model === "opus" ? "sonnet" : config.backends.claude?.model;
+        return config.backends.claude?.model;
     }
     if (backend === "codex") {
         return config.backends.codex?.model;
     }
     return config.backends.acpx?.model;
 }
-function notifyFinishedRuns(runs, ref) {
-    const finished = new Set(runs.filter((run) => isTerminal(run.status)).map((run) => run.id));
+function notifyRunAlerts(runs, ref) {
+    const terminal = new Set(runs.filter((run) => isTerminal(run.status)).map((run) => run.id));
+    const permission = new Set(runs.filter((run) => runNeedsPermission(run)).map((run) => run.id));
     if (!ref.current) {
-        ref.current = finished;
+        ref.current = { terminal, permission };
         return;
     }
     for (const run of runs) {
-        if (isTerminal(run.status) && !ref.current.has(run.id)) {
+        if (isTerminal(run.status) && !ref.current.terminal.has(run.id)) {
+            playCompletionSound();
+            ref.current.terminal.add(run.id);
+        }
+        if (runNeedsPermission(run) && !ref.current.permission.has(run.id)) {
             playCompletionSound();
-            ref.current.add(run.id);
+            ref.current.permission.add(run.id);
         }
     }
+    ref.current.terminal = terminal;
+    ref.current.permission = permission;
 }
 function playCompletionSound() {
     try {
@@ -953,6 +1110,12 @@ function statusColor(status) {
     }
     return "cyan";
 }
+function runStatusColor(run) {
+    return runNeedsPermission(run) ? "yellow" : statusColor(run.status);
+}
+function runNeedsPermission(run) {
+    return isActive(run.status) && run.attention.needsPermission;
+}
 function toneColor(tone) {
     if (tone === "success") {
         return "green";
@@ -984,6 +1147,9 @@ function workGlyph(tone) {
     return "--";
 }
 function completionPercent(run) {
+    if (runNeedsPermission(run)) {
+        return 90;
+    }
     if (run.status === "merged") {
         return 100;
     }
@@ -1027,6 +1193,9 @@ function canMerge(run) {
     return run.status === "completed" && run.worktree.enabled;
 }
 function runSummary(run) {
+    if (runNeedsPermission(run)) {
+        return run.attention.summary ? `needs permission: ${run.attention.summary}` : "needs permission";
+    }
     const latestWork = run.work.at(-1);
     if (run.status === "steering") {
         return "auto-steering after completion";
@@ -1041,6 +1210,9 @@ function runSummary(run) {
     return run.status;
 }
 function workerStateLabel(run) {
+    if (runNeedsPermission(run)) {
+        return "needs permission";
+    }
     if (run.status === "completed") {
         return canMerge(run) ? "done  m merge" : "done";
     }
@@ -1059,6 +1231,9 @@ function workerStateLabel(run) {
     return "running";
 }
 function agentRailSummary(run) {
+    if (runNeedsPermission(run)) {
+        return run.attention.summary ?? "waiting for permission";
+    }
     const output = summarizeOutput(run.output);
     if (output) {
         return output;
@@ -1077,8 +1252,15 @@ function summarizeOutput(output) {
     const sentence = normalized.match(/^.{24,180}?[.!?](?:\s|$)/)?.[0]?.trim();
     return sentence || normalized.slice(0, 180);
 }
-function statusWord(status) {
-    if (status === "completed" || status === "merged") {
+function statusWord(run) {
+    if (runNeedsPermission(run)) {
+        return "permission:";
+    }
+    const status = run.status;
+    if (status === "merged") {
+        return "merged:";
+    }
+    if (status === "completed") {
         return "done:";
     }
     if (status === "failed" || status === "merge-conflict") {