@sealant/mend 0.14.0 → 0.15.2

package/dist/dashboard.js

@@ -3,12 +3,12 @@ import { CliRenderEvents, createCliRenderer } from "@opentui/core";
 import { createRoot, useKeyboard, useRenderer, useTerminalDimensions } from "@opentui/react";
 import { QueryClient, QueryClientProvider, useMutation, useQuery, useQueryClient, } from "@tanstack/react-query";
 import { useEffect, useRef, useState } from "react";
+import { deriveHarnesses, deriveProjects, advanceFromBase, deriveRows, deriveWorktrees, filterBranches, foldGroupStatus, labelIsIdentity, rowKeyOf, worktreeDisplayName, fetchWorkbench, liveShellOf, mapWorkbenchSessions, markSessionStopped, removeWorktreeGroup, prependSession, removeSession, replaceSession, WORKBENCH_KEY, } from "./dashboard-model.js";
 import { reviewTargetForSession } from "./review-workflow.js";
 import { ReviewScreen } from "./review.js";
 import { cwdFacts, HARNESS_COMMANDS, isPendingId, LIVE_STATUSES, matchProjectByCwd, normalizeProjectName, pendingId, } from "./shared.js";
 import { openUrl } from "./terminal.js";
-import { COBALT, FAINT, INK, INK_2, MUTED, RED, RULE, WASH } from "./tui-theme.js";
-import { createSseParser, eventFamilies } from "./workbench-events.js";
+import { COBALT, FAINT, INK, INK_2, MUTED, RED, RULE, SURFACE, WASH } from "./tui-theme.js";
 // Near-mono on purpose: a status is a word, and only an observed failure
 // earns color. Live states read at full ink; settled ones recede.
 const STATUS_COLOR = {
@@ -34,96 +34,7 @@ const timeAgo = (iso) => {
         return `${hours}h ago`;
     return `${Math.floor(hours / 24)}d ago`;
 };
-const WORKBENCH_KEY = ["workbench"];
-const fetchWorkbench = async (ctx) => {
-    const projects = await ctx.api("GET", "/projects");
-    const [fetched, services] = await Promise.all([
-        Promise.all(projects.map((project) => ctx.api("GET", `/projects/${project.id}`))),
-        ctx.api("GET", "/services"),
-    ]);
-    const servicesBySession = new Map();
-    for (const service of services) {
-        const bucket = servicesBySession.get(service.sessionId) ?? [];
-        bucket.push(service);
-        servicesBySession.set(service.sessionId, bucket);
-    }
-    return {
-        projects,
-        details: new Map(fetched.map((detail) => [detail.project.id, detail])),
-        servicesBySession,
-    };
-};
-// ─── optimistic cache surgery: pure Workbench → Workbench ───────────────────
-/** Apply `f` to every session row in every project detail. */
-const mapWorkbenchSessions = (data, f) => ({
-    ...data,
-    details: new Map([...data.details].map(([id, detail]) => [id, { ...detail, sessions: detail.sessions.map(f) }])),
-});
-const mapProjectSessions = (data, projectId, f) => {
-    const detail = data.details.get(projectId);
-    if (detail === undefined)
-        return data;
-    const details = new Map(data.details);
-    details.set(projectId, { ...detail, sessions: f(detail.sessions) });
-    return { ...data, details };
-};
-const prependSession = (data, projectId, session) => mapProjectSessions(data, projectId, (sessions) => [session, ...sessions]);
-const replaceSession = (data, projectId, oldId, session) => mapProjectSessions(data, projectId, (sessions) => sessions.map((candidate) => (candidate.id === oldId ? session : candidate)));
-const removeSession = (data, projectId, sessionId) => mapProjectSessions(data, projectId, (sessions) => sessions.filter((candidate) => candidate.id !== sessionId));
-const deriveProjects = (data) => (data?.projects ?? []).map((project) => {
-    const detail = data?.details.get(project.id);
-    const sessions = detail?.sessions ?? [];
-    const live = sessions.filter((s) => LIVE_STATUSES.has(s.status)).length;
-    const open = (detail?.annotations ?? []).reduce((sum, a) => sum + a.openComments, 0);
-    return { project, total: sessions.length, live, open };
-});
-const deriveSessions = (data, projectId) => {
-    if (data === undefined || projectId === null)
-        return [];
-    const detail = data.details.get(projectId);
-    if (detail === undefined)
-        return [];
-    return detail.sessions
-        .toSorted((a, b) => {
-        const aLive = LIVE_STATUSES.has(a.status) ? 1 : 0;
-        const bLive = LIVE_STATUSES.has(b.status) ? 1 : 0;
-        if (aLive !== bLive)
-            return bLive - aLive;
-        return b.createdAt.localeCompare(a.createdAt);
-    })
-        .map((session) => ({
-        session,
-        annotation: detail.annotations.find((a) => a.sessionId === session.id),
-        services: data.servicesBySession.get(session.id) ?? [],
-    }));
-};
-/** The picker's rows: resume offers the same harness first, then the crossings. */
-const deriveHarnesses = (resuming) => {
-    if (resuming !== null) {
-        const others = Object.keys(HARNESS_COMMANDS).filter((h) => h !== resuming.harness);
-        return [
-            {
-                harness: null,
-                label: resuming.harness,
-                hint: "same harness — native resume, conversation intact",
-            },
-            ...others.map((harness) => ({
-                harness,
-                label: harness,
-                hint: harness === "shell"
-                    ? "a bash in the worktree — resume either agent from inside"
-                    : "the conversation crosses as a distilled prompt",
-            })),
-        ];
-    }
-    return Object.keys(HARNESS_COMMANDS).map((harness) => ({
-        harness,
-        label: harness,
-        hint: harness === "shell"
-            ? "a plain bash session — new worktree, recorded"
-            : `mend ${harness} — new worktree, recorded session`,
-    }));
-};
+import { createSseParser, eventFamilies } from "./workbench-events.js";
 // ─── panes and rows ─────────────────────────────────────────────────────────
 const Gutter = ({ selected }) => (_jsx("span", { fg: selected ? COBALT : FAINT, children: selected ? "▌ " : "  " }));
 /**
@@ -138,23 +49,39 @@ const paneScrollStyle = {
     contentOptions: { backgroundColor: "transparent" },
 };
 const ProjectRow = ({ item, selected, nameWidth, }) => (_jsx("box", { height: 1, flexShrink: 0, backgroundColor: selected ? WASH : "transparent", children: _jsxs("text", { height: 1, bg: "transparent", children: [_jsx(Gutter, { selected: selected }), _jsx("span", { fg: INK, children: item.project.name.padEnd(nameWidth) }), _jsx("span", { fg: item.total === 0 ? FAINT : MUTED, children: `  ${item.total}` }), item.live > 0 ? _jsx("span", { fg: MUTED, children: ` · ${item.live} live` }) : null, item.open > 0 ? _jsx("span", { fg: MUTED, children: ` · ${item.open}` }) : null] }) }));
+const ProcessLines = ({ processes, services, indent, }) => (_jsxs(_Fragment, { children: [processes.map((process) => (_jsx("box", { height: 1, flexShrink: 0, backgroundColor: "transparent", children: _jsxs("text", { height: 1, bg: "transparent", children: [_jsx("span", { fg: FAINT, children: indent }), _jsx("span", { fg: INK_2, children: process.kind === "shell"
+                            ? (process.label ?? "shell")
+                            : (process.harness ?? process.kind) }), _jsxs("span", { fg: FAINT, children: [process.kind === "agent-protocol"
+                                ? " · protocol"
+                                : process.kind === "agent-external"
+                                    ? " · external"
+                                    : "", ` ${process.status}`] })] }) }, process.id))), services.map((service) => (_jsx("box", { height: 1, flexShrink: 0, backgroundColor: "transparent", children: _jsxs("text", { height: 1, bg: "transparent", children: [_jsx("span", { fg: FAINT, children: indent }), _jsx("span", { fg: service.status === "reachable" ? INK_2 : MUTED, children: `${service.label ?? service.id.slice(0, 6)} :${service.workspacePort ?? "?"}${service.protocol === "udp" ? "u" : ""}→${service.hostPort ?? "?"}` }), _jsx("span", { fg: FAINT, children: ` ${service.status}` })] }) }, service.id)))] }));
 /**
- * The worktree IS the session's identity (one worktree per session): its
- * branch, with the noisy default prefix receded. What you are working on
- * leads every row; the harness is a fact about it, not its name.
+ * A lone-session worktree, combined into one row (today's density): the
+ * worktree name leads, everything live inside hangs underneath as facts.
  */
-const worktreeName = (branch) => branch.startsWith("mend/") ? branch.slice("mend/".length) : branch;
-/**
- * One worktree, grouped: the session line leads with the worktree name, and
- * everything live inside it — its Services — hangs underneath. The child
- * rows are facts, not targets: selection stays on the worktree line.
- */
-const SessionRow = ({ item, selected, }) => {
-    const { session, annotation, services } = item;
+const CombinedRow = ({ group, item, selected, }) => {
+    const { session, annotation, services, processes } = item;
+    const color = STATUS_COLOR[session.status] ?? MUTED;
+    const age = timeAgo(session.createdAt).replace(" ago", "");
+    const trailingLabel = labelIsIdentity(session) ? "" : (session.label ?? "");
+    return (_jsxs("box", { flexShrink: 0, flexDirection: "column", backgroundColor: "transparent", children: [_jsx("box", { height: 1, flexShrink: 0, backgroundColor: selected ? WASH : "transparent", children: _jsxs("text", { height: 1, bg: "transparent", children: [_jsx(Gutter, { selected: selected }), _jsx("span", { fg: INK, children: group.name.slice(0, 30).padEnd(31) }), _jsx("span", { fg: color, children: session.status.padEnd(10) }), _jsx("span", { fg: FAINT, children: age.padEnd(9) }), _jsx("span", { fg: MUTED, children: session.harness.padEnd(10) }), annotation !== undefined && annotation.openComments > 0 ? (_jsx("span", { fg: MUTED, children: `${annotation.openComments} open  ` })) : null, _jsx("span", { fg: FAINT, children: trailingLabel.slice(0, 40) })] }) }), _jsx(ProcessLines, { processes: processes, services: services, indent: "     └ " })] }));
+};
+/** A shared worktree's header: the place, its folded status, its member facts. */
+const WorktreeHeaderRow = ({ group, selected, }) => {
+    const folded = foldGroupStatus(group);
+    const color = group.live > 0 ? (STATUS_COLOR[folded] ?? MUTED) : FAINT;
+    const age = timeAgo(group.sessions.at(-1)?.session.createdAt ?? group.createdAt).replace(" ago", "");
+    const open = group.annotation?.openComments ?? 0;
+    return (_jsx("box", { height: 1, flexShrink: 0, backgroundColor: selected ? WASH : "transparent", children: _jsxs("text", { height: 1, bg: "transparent", children: [_jsx(Gutter, { selected: selected }), _jsx("span", { fg: INK, children: group.name.slice(0, 30).padEnd(31) }), _jsx("span", { fg: color, children: (group.live > 0 ? folded : "settled").padEnd(10) }), _jsx("span", { fg: FAINT, children: age.padEnd(9) }), _jsx("span", { fg: MUTED, children: `${group.sessions.length} sessions` }), open > 0 ? _jsx("span", { fg: MUTED, children: ` · ${open} open` }) : null] }) }));
+};
+/** One conversation inside a shared worktree — the label is its identity. */
+const SessionChildRow = ({ item, selected, }) => {
+    const { session, services, processes } = item;
     const color = STATUS_COLOR[session.status] ?? MUTED;
     const age = timeAgo(session.createdAt).replace(" ago", "");
-    const worktree = worktreeName(session.branch);
-    return (_jsxs("box", { flexShrink: 0, flexDirection: "column", backgroundColor: "transparent", children: [_jsx("box", { height: 1, flexShrink: 0, backgroundColor: selected ? WASH : "transparent", children: _jsxs("text", { height: 1, bg: "transparent", children: [_jsx(Gutter, { selected: selected }), _jsx("span", { fg: INK, children: worktree.slice(0, 30).padEnd(31) }), _jsx("span", { fg: color, children: session.status.padEnd(10) }), _jsx("span", { fg: FAINT, children: age.padEnd(9) }), _jsx("span", { fg: MUTED, children: session.harness.padEnd(10) }), annotation !== undefined && annotation.openComments > 0 ? (_jsx("span", { fg: MUTED, children: `${annotation.openComments} open  ` })) : null, _jsx("span", { fg: FAINT, children: (session.label ?? "").slice(0, 40) })] }) }), services.map((service) => (_jsx("box", { height: 1, flexShrink: 0, backgroundColor: "transparent", children: _jsxs("text", { height: 1, bg: "transparent", children: [_jsx("span", { fg: FAINT, children: "     └ " }), _jsx("span", { fg: service.status === "reachable" ? INK_2 : MUTED, children: `${service.label ?? service.id.slice(0, 6)} :${service.workspacePort ?? "?"}${service.protocol === "udp" ? "u" : ""}→${service.hostPort ?? "?"}` }), _jsx("span", { fg: FAINT, children: ` ${service.status}` })] }) }, service.id)))] }));
+    const name = session.label ?? `session ${session.id.slice(0, 8)}`;
+    return (_jsxs("box", { flexShrink: 0, flexDirection: "column", backgroundColor: "transparent", children: [_jsx("box", { height: 1, flexShrink: 0, backgroundColor: selected ? WASH : "transparent", children: _jsxs("text", { height: 1, bg: "transparent", children: [_jsx(Gutter, { selected: selected }), _jsx("span", { fg: FAINT, children: "  └ " }), _jsx("span", { fg: INK, children: name.slice(0, 26).padEnd(27) }), _jsx("span", { fg: color, children: session.status.padEnd(10) }), _jsx("span", { fg: FAINT, children: age.padEnd(9) }), _jsx("span", { fg: MUTED, children: session.harness.padEnd(10) })] }) }), _jsx(ProcessLines, { processes: processes, services: services, indent: "       └ " })] }));
 };
 const HarnessRow = ({ item, selected, }) => (_jsx("box", { height: 1, flexShrink: 0, backgroundColor: selected ? WASH : "transparent", children: _jsxs("text", { height: 1, bg: "transparent", children: [_jsx(Gutter, { selected: selected }), _jsx("span", { fg: INK, children: item.label.padEnd(12) }), _jsx("span", { fg: FAINT, children: item.hint })] }) }));
 /**
@@ -218,6 +145,7 @@ const App = ({ ctx, onQuit }) => {
     });
     const [focusState, setFocus] = useState("sessions");
     const [projectKey, setProjectKey] = useState(null);
+    /** A row key (`wt:<id>` | `s:<id>`), so selection survives regrouping. */
     const [sessionKey, setSessionKey] = useState(null);
     const [picker, setPicker] = useState(null);
     const [pickerIndex, setPickerIndex] = useState(0);
@@ -227,15 +155,24 @@ const App = ({ ctx, onQuit }) => {
     const [editing, setEditing] = useState(null);
     /** Session id a stop is armed against; the second press fires it. */
     const [stopArmed, setStopArmed] = useState(null);
-    /** The new-session flow asks the worktree's name FIRST, then the harness. */
-    const [naming, setNaming] = useState(null);
-    const [pendingName, setPendingName] = useState(null);
+    /**
+     * The whole worktree creation is ONE modal: name, base (fuzzy over the
+     * project's branches), harness — every step visible, the active one
+     * expanded. Enter advances, esc steps back (cancels from the name).
+     */
+    const [creating, setCreating] = useState(null);
+    /**
+     * The cwd is a git repo the store doesn't know: offer to adopt it, once
+     * per dashboard run. Enter adopts, esc declines and stays quiet.
+     */
+    const [adoptOffer, setAdoptOffer] = useState(null);
+    const adoptOfferDecided = useRef(false);
     const [reviewing, setReviewing] = useState(null);
     /** Set synchronously around attach/launch so keystrokes can't double-fire. */
     const lockRef = useRef(false);
     /** Latest modal state for mutation callbacks — closures there go stale. */
     const modalRef = useRef(false);
-    modalRef.current = editing !== null || reviewing !== null || picker !== null;
+    modalRef.current = editing !== null || reviewing !== null || picker !== null || creating !== null;
     const { width: terminalCols, height: terminalRows } = useTerminalDimensions();
     const showProjectsPane = terminalCols >= 72;
     const showDetail = terminalRows >= 18;
@@ -250,13 +187,45 @@ const App = ({ ctx, onQuit }) => {
             ? 0
             : projectItems.findIndex((p) => p.project.id === homeProject.id));
     const selectedProject = projectItems[projectIndex] ?? null;
-    const sessionItems = deriveSessions(data, selectedProject?.project.id ?? null);
-    const sessionIndexRaw = sessionKey === null ? -1 : sessionItems.findIndex((s) => s.session.id === sessionKey);
-    const sessionIndex = sessionIndexRaw === -1 ? 0 : sessionIndexRaw;
-    const selectedSession = sessionItems[sessionIndex] ?? null;
+    const worktreeGroups = deriveWorktrees(data, selectedProject?.project.id ?? null);
+    const rows = deriveRows(worktreeGroups);
+    const rowIndexRaw = sessionKey === null ? -1 : rows.findIndex((row) => rowKeyOf(row) === sessionKey);
+    const rowIndex = rowIndexRaw === -1 ? 0 : rowIndexRaw;
+    const selectedRow = rows[rowIndex] ?? null;
+    const selectedGroup = selectedRow?.group ?? null;
+    // A worktree header still names a concrete conversation for session verbs:
+    // the newest live member, else the newest at all.
+    const selectedSession = selectedRow === null
+        ? null
+        : selectedRow.kind === "session"
+            ? selectedRow.item
+            : (selectedRow.group.sessions.find((item) => LIVE_STATUSES.has(item.session.status)) ??
+                selectedRow.group.sessions[0] ??
+                null);
     const pickerItems = picker === null ? [] : deriveHarnesses(picker.session);
+    const selectSession = (id) => setSessionKey(`s:${id}`);
     const say = (text) => setStatus({ text, at: Date.now() });
     const refetch = () => void queryClient.invalidateQueries({ queryKey: WORKBENCH_KEY });
+    // A repo underfoot that the store has never met: raise the adopt offer the
+    // first time the workbench answers and no project matches the cwd.
+    useEffect(() => {
+        if (data === undefined || adoptOfferDecided.current)
+            return;
+        if (homeProject !== undefined)
+            return;
+        const facts = cwdFacts(ctx.cwd);
+        if (facts.repoRoot === null)
+            return;
+        adoptOfferDecided.current = true;
+        setAdoptOffer({
+            root: facts.repoRoot,
+            source: facts.originUrl ?? facts.repoRoot,
+            name: normalizeProjectName(facts.repoRoot.split("/").at(-1) ?? "project"),
+            modeIndex: 0,
+        });
+        // homeProject/data identity is enough; ctx.cwd never changes in a run.
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [data, homeProject]);
     // Keep each pane's selection on screen — the one imperative escape hatch.
     const projectScrollRef = useRef(null);
     const sessionScrollRef = useRef(null);
@@ -264,17 +233,19 @@ const App = ({ ctx, onQuit }) => {
         keepRowVisible(projectScrollRef.current, projectIndex);
     }, [projectIndex]);
     useEffect(() => {
-        // Rows are worktree groups (a session line plus its service children), so
-        // the scroll target is the group's y offset, not its index.
+        // Rows vary in height (header = 1; a session row carries its process and
+        // service fact lines), so the scroll target is the row's y offset.
+        const rowHeight = (row) => row === undefined || row.kind === "worktree"
+            ? 1
+            : 1 + row.item.processes.length + row.item.services.length;
         let top = 0;
-        for (const [index, item] of sessionItems.entries()) {
-            if (index === sessionIndex)
+        for (const [index, row] of rows.entries()) {
+            if (index === rowIndex)
                 break;
-            top += 1 + item.services.length;
+            top += rowHeight(row);
         }
-        const selectedHeight = 1 + (sessionItems[sessionIndex]?.services.length ?? 0);
-        keepSpanVisible(sessionScrollRef.current, top, selectedHeight);
-    }, [sessionIndex, sessionItems]);
+        keepSpanVisible(sessionScrollRef.current, top, rowHeight(rows[rowIndex]));
+    }, [rowIndex, rows]);
     const attachFlow = async (session) => {
         const short = session.id.slice(0, 8);
         lockRef.current = true;
@@ -285,11 +256,21 @@ const App = ({ ctx, onQuit }) => {
             outcome = await ctx.attachTty(session.id, session.harness);
             if (outcome === "unavailable") {
                 // A live session whose terminal ended (idle: a workspace held open,
-                // no PTY behind it). Enter still means "get me in" — open a fresh
-                // shell in the same workspace and attach to that.
-                const shell = await ctx.api("POST", `/sessions/${session.id}/shell`);
-                process.stdout.write(`no live terminal — opened a shell in the workspace\n\n`);
-                outcome = await ctx.attachTty(session.id, "shell", shell.id);
+                // no PTY behind it). Enter still means "get me in" — REJOIN the shell
+                // already holding the workspace when one is live; only open a fresh
+                // one when nothing is attachable (stacking a new bash per attempt is
+                // how a session ends up held open by orphan shells).
+                const detail = await ctx.api("GET", `/sessions/${session.id}`);
+                const existing = liveShellOf(detail.processes);
+                if (existing !== null) {
+                    process.stdout.write(`no live terminal — rejoining the open shell\n\n`);
+                    outcome = await ctx.attachTty(session.id, "shell", existing.id);
+                }
+                else {
+                    const shell = await ctx.api("POST", `/sessions/${session.id}/shell`);
+                    process.stdout.write(`no live terminal — opened a shell in the workspace\n\n`);
+                    outcome = await ctx.attachTty(session.id, "shell", shell.id);
+                }
             }
         }
         catch (error) {
@@ -341,7 +322,7 @@ const App = ({ ctx, onQuit }) => {
                 harness: vars.harness,
                 label: null,
                 name: vars.name,
-                base: null,
+                base: vars.base,
             });
             await ctx.api("POST", `/sessions/${session.id}/launch`, { argv });
             return session;
@@ -354,12 +335,12 @@ const App = ({ ctx, onQuit }) => {
                 label: null,
                 branch: vars.name === null ? "provisioning…" : `mend/${vars.name}`,
                 baseSha: "",
-                baseRef: null,
+                baseRef: vars.base,
                 status: "starting",
                 summary: null,
                 createdAt: new Date().toISOString(),
             }));
-            setSessionKey(vars.pendingKey);
+            selectSession(vars.pendingKey);
             setBusy(`provisioning ${vars.harness} workspace — a first launch builds the harness image ·`);
             setBusyStarted(Date.now());
         },
@@ -370,7 +351,7 @@ const App = ({ ctx, onQuit }) => {
         },
         onSuccess: async (session, vars) => {
             patchWorkbench((current) => replaceSession(current, vars.projectId, vars.pendingKey, session));
-            setSessionKey(session.id);
+            selectSession(session.id);
             setBusy(null);
             await attachIfIdle(session);
         },
@@ -383,7 +364,7 @@ const App = ({ ctx, onQuit }) => {
         onMutate: async (vars) => {
             await queryClient.cancelQueries({ queryKey: WORKBENCH_KEY });
             patchWorkbench((current) => mapWorkbenchSessions(current, (session) => session.id === vars.session.id ? { ...session, status: "starting" } : session));
-            setSessionKey(vars.session.id);
+            selectSession(vars.session.id);
             setBusy(`resuming ${vars.session.id.slice(0, 8)} — a fresh workspace restores the saved state ·`);
             setBusyStarted(Date.now());
         },
@@ -394,12 +375,52 @@ const App = ({ ctx, onQuit }) => {
         },
         onSuccess: async (resumed, vars) => {
             patchWorkbench((current) => replaceSession(current, vars.projectId, vars.session.id, resumed));
-            setSessionKey(resumed.id);
+            selectSession(resumed.id);
             setBusy(null);
             await attachIfIdle(resumed);
         },
         onSettled: settleRefetch,
     });
+    const ADOPT_AUTH_MODES = [
+        {
+            mode: "ambient",
+            label: "ambient",
+            hint: "the server machine's own git/ssh setup",
+        },
+        {
+            mode: "mend-key",
+            label: "mend-key",
+            hint: "the machine's Mend deploy key — add its public half on the git host",
+        },
+        {
+            mode: "bridge",
+            label: "bridge",
+            hint: "your OWN ssh-agent, relayed while `mend keys share` runs here",
+        },
+    ];
+    const adoptMutation = useMutation({
+        mutationFn: (offer) => ctx.api("POST", "/projects", {
+            name: offer.name,
+            source: offer.source,
+            gitAuthMode: ADOPT_AUTH_MODES[offer.modeIndex]?.mode ?? "ambient",
+        }),
+        onMutate: (offer) => {
+            setAdoptOffer(null);
+            setBusy(`adopting ${offer.name} — cloning into the store ·`);
+            setBusyStarted(Date.now());
+        },
+        onError: (error) => {
+            setBusy(null);
+            say(errorText(error));
+        },
+        onSuccess: (project) => {
+            setBusy(null);
+            say(`adopted · ${project.name} — n starts a worktree`);
+            setProjectKey(project.id);
+            setSessionKey(null);
+        },
+        onSettled: settleRefetch,
+    });
     // The label lands in the row before the server answers; an error puts the
     // truth back on the next refetch.
     const renameMutation = useMutation({
@@ -423,16 +444,125 @@ const App = ({ ctx, onQuit }) => {
         mutationFn: (session) => ctx.api("POST", `/sessions/${session.id}/stop`),
         onMutate: async (session) => {
             await queryClient.cancelQueries({ queryKey: WORKBENCH_KEY });
-            patchWorkbench((current) => mapWorkbenchSessions(current, (row) => row.id === session.id ? { ...row, status: "stopped" } : row));
-            say(`stopped · ${worktreeName(session.branch)} — the record and review remain`);
+            // The row settles and its live process/service facts drop in one paint.
+            patchWorkbench((current) => markSessionStopped(current, session.id));
+            say(`stopped · ${worktreeDisplayName(session)} — the record and review remain`);
+        },
+        onError: (error) => {
+            say(errorText(error));
+            refetch();
+        },
+        onSettled: settleRefetch,
+    });
+    // A new conversation inside an existing worktree — the `s` key's flow.
+    const launchInWorktreeMutation = useMutation({
+        mutationFn: async (vars) => {
+            const argv = HARNESS_COMMANDS[vars.harness];
+            if (argv === undefined)
+                throw new Error(`unknown harness "${vars.harness}"`);
+            const session = await ctx.api("POST", `/worktrees/${vars.worktreeId}/sessions`, {
+                harness: vars.harness,
+                label: null,
+            });
+            await ctx.api("POST", `/sessions/${session.id}/launch`, { argv });
+            return session;
+        },
+        onMutate: async (vars) => {
+            await queryClient.cancelQueries({ queryKey: WORKBENCH_KEY });
+            patchWorkbench((current) => prependSession(current, vars.projectId, {
+                id: vars.pendingKey,
+                worktreeId: vars.worktreeId,
+                harness: vars.harness,
+                label: null,
+                branch: "joining…",
+                baseSha: "",
+                baseRef: null,
+                status: "starting",
+                summary: null,
+                createdAt: new Date().toISOString(),
+            }));
+            selectSession(vars.pendingKey);
+            setBusy(`starting ${vars.harness} in the worktree ·`);
+            setBusyStarted(Date.now());
+        },
+        onError: (error, vars) => {
+            patchWorkbench((current) => removeSession(current, vars.projectId, vars.pendingKey));
+            setBusy(null);
+            say(errorText(error));
+        },
+        onSuccess: async (session, vars) => {
+            patchWorkbench((current) => replaceSession(current, vars.projectId, vars.pendingKey, session));
+            selectSession(session.id);
+            setBusy(null);
+            await attachIfIdle(session);
+        },
+        onSettled: settleRefetch,
+    });
+    // The one explicit destructive act. Against a pre-worktree server the
+    // session delete IS the old combined removal — same key, old semantics.
+    const removeWorktreeMutation = useMutation({
+        mutationFn: (group) => group.id !== null
+            ? ctx.api("DELETE", `/worktrees/${group.id}`)
+            : ctx.api("DELETE", `/sessions/${group.sessions[0]?.session.id ?? ""}`),
+        onMutate: async (group) => {
+            await queryClient.cancelQueries({ queryKey: WORKBENCH_KEY });
+            const projectId = selectedProject?.project.id;
+            // The group leaves the list before the server answers; an error refetches truth.
+            if (projectId !== undefined) {
+                patchWorkbench((current) => removeWorktreeGroup(current, projectId, group));
+            }
+            say(`removing worktree · ${group.name}`);
         },
         onError: (error) => {
             say(errorText(error));
             refetch();
         },
+        onSuccess: (_result, group) => {
+            say(`removed · ${group.name}`);
+            refetch();
+        },
         onSettled: settleRefetch,
     });
+    /** Worktree removal is armed like stops: the first press states the facts. */
+    const [removeArmed, setRemoveArmed] = useState(null);
+    const armRemove = () => {
+        const group = selectedGroup;
+        if (group === null || group.sessions.some((item) => isPendingId(item.session.id)))
+            return;
+        if (group.live > 0) {
+            say(`${group.live} session${group.live === 1 ? "" : "s"} live — stop them first · ${group.name}`);
+            return;
+        }
+        if (removeArmed === group.key) {
+            setRemoveArmed(null);
+            removeWorktreeMutation.mutate(group);
+            return;
+        }
+        setRemoveArmed(group.key);
+        const facts = group.sessions.length === 1
+            ? "its session and change go with it"
+            : `${group.sessions.length} sessions and the change go with it`;
+        say(`press again to remove worktree · ${group.name} — ${facts}`);
+    };
     const armStop = () => {
+        // A worktree header arms a stop of EVERY live conversation in it.
+        if (selectedRow?.kind === "worktree") {
+            const group = selectedRow.group;
+            const live = group.sessions.filter((item) => LIVE_STATUSES.has(item.session.status));
+            if (live.length === 0) {
+                say("nothing to stop — the worktree is settled");
+                return;
+            }
+            if (stopArmed === `wt:${group.key}`) {
+                setStopArmed(null);
+                for (const item of live)
+                    stopMutation.mutate(item.session);
+                return;
+            }
+            setStopArmed(`wt:${group.key}`);
+            say(`press again to stop ${live.length} live session${live.length === 1 ? "" : "s"} · ${group.name}`);
+            return;
+        }
         const item = selectedSession;
         if (item === null || isPendingId(item.session.id))
             return;
@@ -446,19 +576,81 @@ const App = ({ ctx, onQuit }) => {
             return;
         }
         setStopArmed(item.session.id);
-        say(`press again to stop · ${worktreeName(item.session.branch)}`);
+        say(`press again to stop · ${worktreeDisplayName(item.session)}`);
     };
-    const startSession = (projectId, harness) => {
-        setFocus("sessions");
-        launchMutation.mutate({ projectId, harness, name: pendingName, pendingKey: pendingId() });
-        setPendingName(null);
+    /** Open the creation modal; the branch list starts loading immediately. */
+    const openCreateModal = (projectId) => {
+        setCreating({
+            projectId,
+            step: "name",
+            name: "",
+            branches: null,
+            query: "",
+            baseIndex: 0,
+            base: null,
+            joins: false,
+            harnessIndex: 0,
+        });
+        // The checkout mend ran in names its branch; creating in THAT project
+        // prefills the base with it — the list highlights it once loaded.
+        const prefill = projectId === homeProject?.id ? ctx.cwdBranch : null;
+        void ctx.api("GET", `/projects/${projectId}/branches`).then((branches) => setCreating((current) => {
+            if (current === null)
+                return current;
+            const match = prefill === null ? undefined : branches.find((candidate) => candidate.name === prefill);
+            const ordered = filterBranches(branches, "");
+            return {
+                ...current,
+                branches,
+                base: match === undefined || match.isDefault ? null : match.name,
+                baseIndex: match === undefined
+                    ? 0
+                    : Math.max(0, ordered.findIndex((candidate) => candidate.name === match.name)),
+            };
+        }), () => 
+        // An unreadable list falls back to the default base; the base step
+        // then shows only the default and enter moves on.
+        setCreating((current) => (current === null ? current : { ...current, branches: [] })));
     };
-    /** Name first, then the harness: the worktree is the identity being created. */
-    const submitWorktreeName = (value) => {
-        setNaming(null);
-        const slug = normalizeProjectName(value.trim());
-        setPendingName(value.trim() === "" ? null : slug);
-        openPicker(null);
+    /** Commit the name: an existing name JOINS its worktree — base is fixed. */
+    const advanceFromName = (current, raw) => {
+        const slug = normalizeProjectName(raw.trim());
+        const name = raw.trim() === "" ? "" : slug;
+        const joins = name !== "" &&
+            (workbench()?.details.get(current.projectId)?.worktrees ?? []).some((candidate) => candidate.name === name);
+        // A join fixes the base; otherwise whatever is chosen (the checkout
+        // prefill included) rides along untouched.
+        return {
+            ...current,
+            name,
+            joins,
+            ...(joins ? { base: null } : {}),
+            step: joins ? "harness" : "base",
+        };
+    };
+    const submitCreateName = (value) => {
+        setCreating((current) => (current === null ? current : advanceFromName(current, value)));
+    };
+    const submitCreateBase = () => {
+        setCreating((current) => (current === null ? current : advanceFromBase(current)));
+    };
+    /** Enter on the harness: everything is chosen — launch. */
+    const submitCreateHarness = () => {
+        const current = creating;
+        if (current === null)
+            return;
+        const choice = deriveHarnesses(null)[current.harnessIndex];
+        if (choice?.harness == null)
+            return;
+        setCreating(null);
+        setFocus("sessions");
+        launchMutation.mutate({
+            projectId: current.projectId,
+            harness: choice.harness,
+            name: current.name === "" ? null : current.name,
+            base: current.base,
+            pendingKey: pendingId(),
+        });
     };
     const resumeSession = (projectId, session, harness) => {
         setFocus("sessions");
@@ -469,8 +661,8 @@ const App = ({ ctx, onQuit }) => {
         const label = value.trim() === "" ? null : value.trim();
         renameMutation.mutate({ session, label });
     };
-    const openPicker = (session) => {
-        setPicker({ session });
+    const openPicker = (session, worktree) => {
+        setPicker(worktree === undefined ? { session } : { session, worktree });
         setPickerIndex(0);
     };
     const moveSelection = (delta) => {
@@ -489,12 +681,12 @@ const App = ({ ctx, onQuit }) => {
             }
             return;
         }
-        if (sessionItems.length === 0)
+        if (rows.length === 0)
             return;
-        const next = Math.max(0, Math.min(sessionItems.length - 1, sessionIndex + delta));
-        const item = sessionItems[next];
-        if (item !== undefined)
-            setSessionKey(item.session.id);
+        const next = Math.max(0, Math.min(rows.length - 1, rowIndex + delta));
+        const row = rows[next];
+        if (row !== undefined)
+            setSessionKey(rowKeyOf(row));
     };
     const activate = () => {
         if (picker !== null) {
@@ -503,11 +695,18 @@ const App = ({ ctx, onQuit }) => {
             if (choice === undefined || projectId === undefined)
                 return;
             setPicker(null);
-            if (picker.session === null) {
-                if (choice.harness !== null)
-                    startSession(projectId, choice.harness);
+            if (picker.worktree !== undefined && picker.worktree.id !== null) {
+                if (choice.harness !== null) {
+                    setFocus("sessions");
+                    launchInWorktreeMutation.mutate({
+                        projectId,
+                        worktreeId: picker.worktree.id,
+                        harness: choice.harness,
+                        pendingKey: pendingId(),
+                    });
+                }
             }
-            else {
+            else if (picker.session !== null) {
                 resumeSession(projectId, picker.session, choice.harness);
             }
             return;
@@ -516,6 +715,18 @@ const App = ({ ctx, onQuit }) => {
             setFocus("sessions");
             return;
         }
+        if (selectedRow?.kind === "worktree") {
+            // Enter on the place: attach its newest live conversation, or open a
+            // new one when nothing is live.
+            const live = selectedRow.group.sessions.find((item) => LIVE_STATUSES.has(item.session.status));
+            if (live !== undefined) {
+                void attachFlow(live.session);
+            }
+            else if (selectedRow.group.id !== null) {
+                openPicker(null, selectedRow.group);
+            }
+            return;
+        }
         const item = selectedSession;
         if (item === null)
             return;
@@ -536,15 +747,109 @@ const App = ({ ctx, onQuit }) => {
             return;
         if (key.ctrl && key.name === "c")
             return onQuit();
+        if (adoptOffer !== null) {
+            if (key.name === "return" || key.name === "linefeed" || key.name === "y") {
+                adoptMutation.mutate(adoptOffer);
+            }
+            else if (key.name === "escape" || key.name === "q") {
+                setAdoptOffer(null);
+                say("not adopted — mend adopt does it any time");
+            }
+            else if (key.name === "right" ||
+                key.name === "l" ||
+                key.name === "tab" ||
+                key.name === "left" ||
+                key.name === "h") {
+                const delta = key.name === "left" || key.name === "h" ? -1 : 1;
+                setAdoptOffer((current) => current === null
+                    ? current
+                    : {
+                        ...current,
+                        modeIndex: (current.modeIndex + delta + ADOPT_AUTH_MODES.length) % ADOPT_AUTH_MODES.length,
+                    });
+            }
+            return;
+        }
         if (editing !== null) {
             // The input owns the keyboard; only escape leaves without saving.
             if (key.name === "escape")
                 setEditing(null);
             return;
         }
-        if (naming !== null) {
-            if (key.name === "escape")
-                setNaming(null);
+        if (creating !== null) {
+            // Inputs own the characters (name text, base filter); this handler owns
+            // the arrows, esc (a step back; cancel from the name), and the harness
+            // step's enter. The name and base enters land through their input's
+            // submit so typed-but-unflushed text never races.
+            if (key.name === "escape") {
+                setCreating((current) => {
+                    if (current === null)
+                        return current;
+                    if (current.step === "harness") {
+                        return { ...current, step: current.joins ? "name" : "base" };
+                    }
+                    if (current.step === "base")
+                        return { ...current, step: "name" };
+                    say("new worktree cancelled");
+                    return null;
+                });
+                return;
+            }
+            // Tab walks the steps without the enter ceremony: forward commits the
+            // active field (the mirrored name, the highlighted branch), shift+tab
+            // steps back, and from the harness it wraps around to the name.
+            if (key.name === "tab" || key.name === "backtab") {
+                const backward = key.name === "backtab" || key.shift === true;
+                setCreating((current) => {
+                    if (current === null)
+                        return current;
+                    if (backward) {
+                        if (current.step === "harness") {
+                            return { ...current, step: current.joins ? "name" : "base" };
+                        }
+                        if (current.step === "base")
+                            return { ...current, step: "name" };
+                        return current;
+                    }
+                    if (current.step === "name")
+                        return advanceFromName(current, current.name);
+                    if (current.step === "base")
+                        return advanceFromBase(current);
+                    return { ...current, step: "name" };
+                });
+                return;
+            }
+            const delta = key.name === "down" || (key.ctrl === true && key.name === "n")
+                ? 1
+                : key.name === "up" || (key.ctrl === true && key.name === "p")
+                    ? -1
+                    : 0;
+            if (delta !== 0) {
+                setCreating((current) => {
+                    if (current === null)
+                        return current;
+                    if (current.step === "base") {
+                        const matches = filterBranches(current.branches ?? [], current.query).length;
+                        return {
+                            ...current,
+                            baseIndex: Math.max(0, Math.min(matches - 1, current.baseIndex + delta)),
+                        };
+                    }
+                    if (current.step === "harness") {
+                        const count = deriveHarnesses(null).length;
+                        return {
+                            ...current,
+                            harnessIndex: Math.max(0, Math.min(count - 1, current.harnessIndex + delta)),
+                        };
+                    }
+                    return current;
+                });
+                return;
+            }
+            if (creating.step === "harness" &&
+                (key.name === "return" || key.name === "linefeed" || key.name === "l")) {
+                submitCreateHarness();
+            }
             return;
         }
         if (picker !== null) {
@@ -571,6 +876,9 @@ const App = ({ ctx, onQuit }) => {
         // vim-up; the shift is the deliberateness the arm-confirm then doubles.
         if (key.shift === true && key.name === "k")
             return armStop();
+        // Shift+D: remove the selected worktree — the one explicit destructive act.
+        if (key.shift === true && key.name === "d")
+            return armRemove();
         switch (key.name) {
             case "q":
                 return onQuit();
@@ -602,10 +910,22 @@ const App = ({ ctx, onQuit }) => {
                     setFocus(focus === "projects" ? "sessions" : "projects");
                 return;
             case "n":
-                // The worktree's name comes first; the harness picker follows.
+                // The whole creation is one modal: name, base, harness.
                 if (selectedProject !== null)
-                    setNaming({ projectId: selectedProject.project.id });
+                    openCreateModal(selectedProject.project.id);
+                return;
+            case "s": {
+                // A new conversation inside the selected worktree.
+                const group = selectedGroup;
+                if (group === null)
+                    return;
+                if (group.id === null) {
+                    say("this server predates shared worktrees — n starts a new one");
+                    return;
+                }
+                openPicker(null, group);
                 return;
+            }
             case "e": {
                 const item = selectedSession;
                 if (item !== null && !isPendingId(item.session.id))
@@ -628,7 +948,7 @@ const App = ({ ctx, onQuit }) => {
                     say("still provisioning — nothing to review yet");
                     return;
                 }
-                const target = reviewTargetForSession(item.session, item.annotation, selectedProject?.project.name ?? "project");
+                const target = reviewTargetForSession(item.session, selectedGroup?.annotation ?? item.annotation, selectedProject?.project.name ?? "project");
                 if (target === null) {
                     say("this session has no reviewable change yet");
                     return;
@@ -650,23 +970,34 @@ const App = ({ ctx, onQuit }) => {
     const sessionsTitle = selectedProject === null
         ? "sessions"
         : `sessions — ${selectedProject.project.name}${selectedProject.live > 0 ? ` · ${selectedProject.live} live` : ""}`;
-    const detailTitle = selectedSession === null
+    const detailTitle = selectedSession === null || selectedGroup === null
         ? "session"
-        : `worktree — ${worktreeName(selectedSession.session.branch)} · ${selectedSession.session.harness} ${selectedSession.session.id.slice(0, 8)}`;
+        : `worktree — ${selectedGroup.name} · ${selectedSession.session.harness} ${selectedSession.session.id.slice(0, 8)}`;
     const pickerTitle = picker === null
         ? ""
-        : picker.session === null
-            ? "new session — pick a harness"
-            : `resume ${picker.session.id.slice(0, 8)} — pick a harness`;
-    const footerText = editing !== null
-        ? " enter save · esc cancel"
-        : naming !== null
-            ? " enter continue — the harness picker follows · esc cancel"
-            : picker !== null
-                ? " ↑↓ move · enter start · esc cancel"
-                : focus === "projects"
-                    ? " ↑↓ move · enter/l sessions · ⇥ panes · r refresh · q quit"
-                    : " ↑↓ move · enter attach/resume · n new · x stop · v review · e rename · o web · h/⇥ projects · q quit";
+        : picker.worktree !== undefined
+            ? `new session in ${picker.worktree.name} — pick a harness`
+            : picker.session === null
+                ? "new session — pick a harness"
+                : `resume ${picker.session.id.slice(0, 8)} — pick a harness`;
+    // One big fixed-size modal: every step visible at once, nothing shifts as
+    // focus moves through name → base → harness.
+    const creatingHeight = 2 + 1 + 1 + 6 + 1 + deriveHarnesses(null).length;
+    const footerText = adoptOffer !== null
+        ? " enter adopt · ←→ auth mode · esc not now"
+        : editing !== null
+            ? " enter save · esc cancel"
+            : creating !== null
+                ? creating.step === "name"
+                    ? " enter continue · esc cancel"
+                    : creating.step === "base"
+                        ? " type to filter · ↑↓ move · enter choose base · esc back"
+                        : " ↑↓ move · enter launch · esc back"
+                : picker !== null
+                    ? " ↑↓ move · enter start · esc cancel"
+                    : focus === "projects"
+                        ? " ↑↓ move · enter/l sessions · ⇥ panes · r refresh · q quit"
+                        : " ↑↓ move · enter attach/resume · n new worktree · s session here · x stop · ⇧D remove · v review · e rename · o web · q quit";
     const loadFailure = data === undefined && failureReason !== null
         ? failureReason instanceof Error
             ? failureReason.message
@@ -678,13 +1009,39 @@ const App = ({ ctx, onQuit }) => {
                 refetch();
             }, onQuit: onQuit }));
     }
-    return (_jsxs("box", { flexGrow: 1, flexDirection: "column", backgroundColor: "transparent", children: [_jsxs("box", { height: 1, flexDirection: "row", justifyContent: "space-between", children: [_jsxs("text", { height: 1, bg: "transparent", children: [_jsx("span", { fg: INK, children: " mend" }), _jsxs("span", { fg: MUTED, children: ["  ", projectItems.length, " project", projectItems.length === 1 ? "" : "s"] }), _jsx("span", { fg: FAINT, children: " \u00B7 " }), _jsxs("span", { fg: liveTotal > 0 ? MUTED : FAINT, children: [liveTotal, " live"] })] }), _jsx("text", { height: 1, fg: FAINT, bg: "transparent", children: `${ctx.config.url}  ` })] }), _jsxs("box", { flexGrow: 1, flexShrink: 1, minHeight: 0, flexDirection: "row", children: [showProjectsPane ? (_jsx(Pane, { title: "projects", focused: focus === "projects", width: PROJECTS_PANE_WIDTH, children: _jsxs("scrollbox", { ref: projectScrollRef, flexGrow: 1, flexShrink: 1, minHeight: 0, style: paneScrollStyle, children: [projectItems.map((item, index) => (_jsx(ProjectRow, { item: item, selected: index === projectIndex, nameWidth: nameWidth }, item.project.id))), data !== undefined && projectItems.length === 0 ? (_jsx("text", { height: 1, fg: FAINT, bg: "transparent", children: "  none adopted yet" })) : null] }) })) : null, _jsx(Pane, { title: sessionsTitle, focused: focus === "sessions", grow: true, children: _jsxs("scrollbox", { ref: sessionScrollRef, flexGrow: 1, flexShrink: 1, minHeight: 0, style: paneScrollStyle, children: [sessionItems.map((item, index) => (_jsx(SessionRow, { item: item, selected: index === sessionIndex }, item.session.id))), data !== undefined && sessionItems.length === 0 ? (_jsx("text", { height: 1, fg: FAINT, bg: "transparent", children: "  no sessions yet — n starts one" })) : null, loadFailure !== null ? (_jsx("text", { height: 1, fg: INK_2, bg: "transparent", children: `  ${loadFailure} — retrying` })) : null] }) })] }), picker !== null ? (_jsx(Pane, { title: pickerTitle, focused: true, height: 2 + pickerItems.length, children: pickerItems.map((item, index) => (_jsx(HarnessRow, { item: item, selected: index === pickerIndex }, String(item.harness)))) })) : naming !== null ? (_jsx("box", { border: true, borderStyle: "rounded", borderColor: COBALT, title: " new worktree \u2014 name ", titleAlignment: "left", backgroundColor: "transparent", height: 3, flexShrink: 0, children: _jsx("input", { focused: true, value: "", placeholder: "name the worktree, e.g. fix-auth (empty = auto)", backgroundColor: "transparent", focusedBackgroundColor: "transparent", textColor: INK, focusedTextColor: INK, placeholderColor: FAINT, cursorColor: INK, flexGrow: 1, onSubmit: (value) => {
-                        if (typeof value === "string")
-                            submitWorktreeName(value);
-                    } }) })) : editing !== null ? (_jsx("box", { border: true, borderStyle: "rounded", borderColor: COBALT, title: ` label — ${editing.harness} ${editing.id.slice(0, 8)} `, titleAlignment: "left", backgroundColor: "transparent", height: 3, flexShrink: 0, children: _jsx("input", { focused: true, value: editing.label ?? "", placeholder: "a few words for what this session is doing (empty clears)", backgroundColor: "transparent", focusedBackgroundColor: "transparent", textColor: INK, focusedTextColor: INK, placeholderColor: FAINT, cursorColor: INK, flexGrow: 1, onSubmit: (value) => {
+    return (_jsxs("box", { flexGrow: 1, flexDirection: "column", backgroundColor: "transparent", children: [_jsxs("box", { height: 1, flexDirection: "row", justifyContent: "space-between", children: [_jsxs("text", { height: 1, bg: "transparent", children: [_jsx("span", { fg: INK, children: " mend" }), _jsxs("span", { fg: MUTED, children: ["  ", projectItems.length, " project", projectItems.length === 1 ? "" : "s"] }), _jsx("span", { fg: FAINT, children: " \u00B7 " }), _jsxs("span", { fg: liveTotal > 0 ? MUTED : FAINT, children: [liveTotal, " live"] })] }), _jsx("text", { height: 1, fg: FAINT, bg: "transparent", children: `${ctx.config.url}  ` })] }), _jsxs("box", { flexGrow: 1, flexShrink: 1, minHeight: 0, flexDirection: "row", children: [showProjectsPane ? (_jsx(Pane, { title: "projects", focused: focus === "projects", width: PROJECTS_PANE_WIDTH, children: _jsxs("scrollbox", { ref: projectScrollRef, flexGrow: 1, flexShrink: 1, minHeight: 0, style: paneScrollStyle, children: [projectItems.map((item, index) => (_jsx(ProjectRow, { item: item, selected: index === projectIndex, nameWidth: nameWidth }, item.project.id))), data !== undefined && projectItems.length === 0 ? (_jsx("text", { height: 1, fg: FAINT, bg: "transparent", children: "  none adopted yet" })) : null] }) })) : null, _jsx(Pane, { title: sessionsTitle, focused: focus === "sessions", grow: true, children: _jsxs("scrollbox", { ref: sessionScrollRef, flexGrow: 1, flexShrink: 1, minHeight: 0, style: paneScrollStyle, children: [rows.map((row, index) => row.kind === "worktree" ? (_jsx(WorktreeHeaderRow, { group: row.group, selected: index === rowIndex }, rowKeyOf(row))) : row.group.sessions.length === 1 ? (_jsx(CombinedRow, { group: row.group, item: row.item, selected: index === rowIndex }, rowKeyOf(row))) : (_jsx(SessionChildRow, { item: row.item, selected: index === rowIndex }, rowKeyOf(row)))), data !== undefined && rows.length === 0 ? (_jsx("text", { height: 1, fg: FAINT, bg: "transparent", children: "  no sessions yet — n starts one" })) : null, loadFailure !== null ? (_jsx("text", { height: 1, fg: INK_2, bg: "transparent", children: `  ${loadFailure} — retrying` })) : null] }) })] }), picker !== null ? (_jsx(Pane, { title: pickerTitle, focused: true, height: 2 + pickerItems.length, children: pickerItems.map((item, index) => (_jsx(HarnessRow, { item: item, selected: index === pickerIndex }, String(item.harness)))) })) : editing !== null ? (_jsx("box", { border: true, borderStyle: "rounded", borderColor: COBALT, title: ` label — ${editing.harness} ${editing.id.slice(0, 8)} `, titleAlignment: "left", backgroundColor: "transparent", height: 3, flexShrink: 0, children: _jsx("input", { focused: true, value: editing.label ?? "", placeholder: "a few words for what this session is doing (empty clears)", backgroundColor: "transparent", focusedBackgroundColor: "transparent", textColor: INK, focusedTextColor: INK, placeholderColor: FAINT, cursorColor: INK, flexGrow: 1, onSubmit: (value) => {
                         if (typeof value === "string")
                             submitRename(editing, value);
-                    } }) })) : showDetail ? (_jsx(Pane, { title: detailTitle, focused: false, height: 6, children: _jsx(SessionDetail, { item: selectedSession }) })) : null, _jsx(StatusLine, { busy: busy, busyStarted: busyStarted, status: status }), _jsx("text", { height: 1, fg: FAINT, bg: "transparent", children: footerText })] }));
+                    } }) })) : showDetail ? (_jsx(Pane, { title: detailTitle, focused: false, height: 6, children: _jsx(SessionDetail, { item: selectedSession }) })) : null, adoptOffer !== null ? (_jsxs("box", { position: "absolute", zIndex: 11, left: Math.max(1, Math.floor((terminalCols - Math.min(70, terminalCols - 4)) / 2)), top: Math.max(1, Math.floor((terminalRows - 7) / 2)), width: Math.min(70, terminalCols - 4), height: 7, border: true, borderStyle: "rounded", borderColor: COBALT, title: " adopt this repository? ", titleAlignment: "left", backgroundColor: SURFACE, flexDirection: "column", children: [_jsxs("text", { height: 1, bg: SURFACE, children: [_jsx("span", { children: "  " }), _jsx("span", { fg: INK, children: adoptOffer.name }), _jsx("span", { fg: FAINT, children: " · not in the store yet" })] }), _jsx("text", { height: 1, bg: SURFACE, fg: MUTED, children: `  ${adoptOffer.source}` }), _jsxs("text", { height: 1, bg: SURFACE, children: [_jsx("span", { fg: FAINT, children: "  auth  " }), ADOPT_AUTH_MODES.map((candidate, index) => (_jsxs("span", { children: [index > 0 ? _jsx("span", { fg: FAINT, children: " · " }) : null, _jsx("span", { fg: index === adoptOffer.modeIndex ? COBALT : FAINT, children: index === adoptOffer.modeIndex ? `▸ ${candidate.label}` : candidate.label })] }, candidate.mode)))] }), _jsx("text", { height: 1, bg: SURFACE, fg: FAINT, children: `        ${ADOPT_AUTH_MODES[adoptOffer.modeIndex]?.hint ?? ""}` }), _jsx("text", { height: 1, bg: SURFACE, fg: FAINT, children: adoptOffer.source === adoptOffer.root
+                            ? "  enter adopt from this path — needs the server on THIS machine · esc not now"
+                            : "  enter adopt · ←→ auth mode · esc not now" })] })) : null, creating !== null ? (_jsxs("box", { position: "absolute", zIndex: 10, left: Math.max(1, Math.floor((terminalCols - Math.min(74, terminalCols - 4)) / 2)), top: Math.max(1, Math.floor((terminalRows - creatingHeight) / 2)), width: Math.min(74, terminalCols - 4), height: creatingHeight, border: true, borderStyle: "rounded", borderColor: COBALT, title: ` new worktree — ${selectedProject?.project.name ?? "project"} `, titleAlignment: "left", backgroundColor: SURFACE, flexDirection: "column", children: [_jsxs("box", { height: 1, flexShrink: 0, flexDirection: "row", backgroundColor: SURFACE, children: [_jsxs("text", { height: 1, bg: SURFACE, children: [_jsx(Gutter, { selected: creating.step === "name" }), _jsx("span", { fg: FAINT, children: "name     " }), creating.step !== "name" ? (_jsx("span", { fg: INK, children: creating.name === "" ? "auto" : creating.name })) : null, creating.joins ? _jsx("span", { fg: FAINT, children: "  · joins the existing worktree" }) : null] }), creating.step === "name" ? (_jsx("input", { focused: true, value: creating.name, placeholder: "e.g. fix-auth (empty = auto \u00B7 an existing name joins it)", backgroundColor: SURFACE, focusedBackgroundColor: SURFACE, textColor: INK, focusedTextColor: INK, placeholderColor: FAINT, cursorColor: INK, flexGrow: 1, onInput: (value) => {
+                                    const clean = value.replace(/\t/g, "");
+                                    setCreating((current) => current === null ? current : { ...current, name: clean });
+                                }, onSubmit: (value) => {
+                                    if (typeof value === "string")
+                                        submitCreateName(value);
+                                } })) : null] }), _jsxs("box", { height: 1, flexShrink: 0, flexDirection: "row", backgroundColor: SURFACE, children: [_jsxs("text", { height: 1, bg: SURFACE, children: [_jsx(Gutter, { selected: creating.step === "base" }), _jsx("span", { fg: FAINT, children: "base     " }), creating.step !== "base" ? (_jsx("span", { fg: creating.step === "name" && !creating.joins ? FAINT : INK, children: creating.joins
+                                            ? "fixed by the existing worktree"
+                                            : (creating.base ?? "default branch") })) : null] }), creating.step === "base" ? (creating.branches === null ? (_jsx("text", { height: 1, bg: SURFACE, fg: FAINT, children: "reading branches\u2026" })) : (_jsx("input", { focused: true, value: "", placeholder: "type to filter (enter = highlighted; empty = default)", backgroundColor: SURFACE, focusedBackgroundColor: SURFACE, textColor: INK, focusedTextColor: INK, placeholderColor: FAINT, cursorColor: INK, flexGrow: 1, onInput: (value) => {
+                                    const clean = value.replace(/\t/g, "");
+                                    setCreating((current) => current === null ? current : { ...current, query: clean, baseIndex: 0 });
+                                }, onSubmit: () => submitCreateBase() }))) : null] }), Array.from({ length: 6 }, (_, index) => {
+                        const branch = creating.joins || creating.branches === null
+                            ? undefined
+                            : filterBranches(creating.branches, creating.query)[index];
+                        const active = creating.step === "base";
+                        if (branch === undefined) {
+                            return (_jsx("text", { height: 1, bg: SURFACE, fg: FAINT, children: index === 0 && active && creating.branches !== null
+                                    ? "     no branch matches — enter uses the default"
+                                    : " " }, `slot-${index}`));
+                        }
+                        const highlighted = active && index === creating.baseIndex;
+                        return (_jsx("box", { height: 1, flexShrink: 0, backgroundColor: highlighted ? WASH : SURFACE, children: _jsxs("text", { height: 1, bg: highlighted ? WASH : SURFACE, children: [_jsx("span", { fg: FAINT, children: "   " }), _jsx(Gutter, { selected: highlighted }), _jsx("span", { fg: active ? INK : FAINT, children: branch.name.slice(0, 40).padEnd(41) }), _jsx("span", { fg: FAINT, children: branch.sha.slice(0, 8).padEnd(10) }), _jsx("span", { fg: active ? MUTED : FAINT, children: timeAgo(branch.committedAt).replace(" ago", "").padEnd(6) }), branch.isDefault ? _jsx("span", { fg: FAINT, children: "default" }) : null] }) }, branch.name));
+                    }), _jsxs("text", { height: 1, bg: SURFACE, children: [_jsx(Gutter, { selected: creating.step === "harness" }), _jsx("span", { fg: FAINT, children: "harness" })] }), deriveHarnesses(null).map((item, index) => {
+                        const active = creating.step === "harness";
+                        const highlighted = active && index === creating.harnessIndex;
+                        return (_jsx("box", { height: 1, flexShrink: 0, backgroundColor: highlighted ? WASH : SURFACE, children: _jsxs("text", { height: 1, bg: highlighted ? WASH : SURFACE, children: [_jsx("span", { fg: FAINT, children: "   " }), _jsx(Gutter, { selected: highlighted }), _jsx("span", { fg: active ? INK : FAINT, children: item.label.padEnd(12) }), _jsx("span", { fg: FAINT, children: active ? item.hint : "" })] }) }, String(item.harness)));
+                    })] })) : null, _jsx(StatusLine, { busy: busy, busyStarted: busyStarted, status: status }), _jsx("text", { height: 1, fg: FAINT, bg: "transparent", children: footerText })] }));
 };
 // ─── entry ──────────────────────────────────────────────────────────────────
 export const runDashboard = async (ctx) => {