@sealant/mend 0.13.0 → 0.14.0

package/dist/dashboard.js

@@ -5,7 +5,7 @@ import { QueryClient, QueryClientProvider, useMutation, useQuery, useQueryClient
 import { useEffect, useRef, useState } from "react";
 import { reviewTargetForSession } from "./review-workflow.js";
 import { ReviewScreen } from "./review.js";
-import { cwdFacts, HARNESS_COMMANDS, isPendingId, LIVE_STATUSES, matchProjectByCwd, pendingId, } from "./shared.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";
@@ -138,11 +138,23 @@ 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] }) }));
+/**
+ * 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.
+ */
+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 } = item;
+    const { session, annotation, services } = item;
     const color = STATUS_COLOR[session.status] ?? MUTED;
     const age = timeAgo(session.createdAt).replace(" ago", "");
-    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: session.harness.padEnd(9) }), _jsx("span", { fg: FAINT, children: session.id.slice(0, 8) }), _jsx("span", { fg: color, children: `  ${session.status.padEnd(10)}` }), _jsx("span", { fg: FAINT, children: age.padEnd(9) }), annotation !== undefined && annotation.openComments > 0 ? (_jsx("span", { fg: MUTED, children: `${annotation.openComments} open  ` })) : null, _jsx("span", { fg: MUTED, children: (session.label ?? "").slice(0, 40) })] }) }));
+    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 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 })] }) }));
 /**
@@ -183,15 +195,16 @@ const StatusLine = ({ busy, busyStarted, status, }) => {
 };
 const errorText = (error) => error instanceof Error ? error.message : String(error);
 /** Keep a 1-line-per-row selection inside its scrollbox's real viewport. */
-const keepRowVisible = (scroll, index) => {
+const keepSpanVisible = (scroll, top, height) => {
     if (scroll === null)
         return;
     const viewH = Math.max(1, scroll.viewport.height);
-    if (index < scroll.scrollTop)
-        scroll.scrollTo(index);
-    else if (index + 1 > scroll.scrollTop + viewH)
-        scroll.scrollTo(index + 1 - viewH);
+    if (top < scroll.scrollTop)
+        scroll.scrollTo(top);
+    else if (top + height > scroll.scrollTop + viewH)
+        scroll.scrollTo(top + height - viewH);
 };
+const keepRowVisible = (scroll, index) => keepSpanVisible(scroll, index, 1);
 const PROJECTS_PANE_WIDTH = 30;
 const App = ({ ctx, onQuit }) => {
     const renderer = useRenderer();
@@ -212,6 +225,11 @@ const App = ({ ctx, onQuit }) => {
     const [busyStarted, setBusyStarted] = useState(0);
     const [status, setStatus] = useState(null);
     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);
     const [reviewing, setReviewing] = useState(null);
     /** Set synchronously around attach/launch so keystrokes can't double-fire. */
     const lockRef = useRef(false);
@@ -246,8 +264,17 @@ const App = ({ ctx, onQuit }) => {
         keepRowVisible(projectScrollRef.current, projectIndex);
     }, [projectIndex]);
     useEffect(() => {
-        keepRowVisible(sessionScrollRef.current, sessionIndex);
-    }, [sessionIndex]);
+        // Rows are worktree groups (a session line plus its service children), so
+        // the scroll target is the group's y offset, not its index.
+        let top = 0;
+        for (const [index, item] of sessionItems.entries()) {
+            if (index === sessionIndex)
+                break;
+            top += 1 + item.services.length;
+        }
+        const selectedHeight = 1 + (sessionItems[sessionIndex]?.services.length ?? 0);
+        keepSpanVisible(sessionScrollRef.current, top, selectedHeight);
+    }, [sessionIndex, sessionItems]);
     const attachFlow = async (session) => {
         const short = session.id.slice(0, 8);
         lockRef.current = true;
@@ -313,6 +340,7 @@ const App = ({ ctx, onQuit }) => {
             const session = await ctx.api("POST", `/projects/${vars.projectId}/sessions`, {
                 harness: vars.harness,
                 label: null,
+                name: vars.name,
                 base: null,
             });
             await ctx.api("POST", `/sessions/${session.id}/launch`, { argv });
@@ -324,7 +352,7 @@ const App = ({ ctx, onQuit }) => {
                 id: vars.pendingKey,
                 harness: vars.harness,
                 label: null,
-                branch: "provisioning…",
+                branch: vars.name === null ? "provisioning…" : `mend/${vars.name}`,
                 baseSha: "",
                 baseRef: null,
                 status: "starting",
@@ -389,9 +417,48 @@ const App = ({ ctx, onQuit }) => {
         },
         onSettled: settleRefetch,
     });
+    // Stops are explicit — and armed: the first press names what a second press
+    // will stop; moving the selection re-arms against the newly selected row.
+    const stopMutation = useMutation({
+        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`);
+        },
+        onError: (error) => {
+            say(errorText(error));
+            refetch();
+        },
+        onSettled: settleRefetch,
+    });
+    const armStop = () => {
+        const item = selectedSession;
+        if (item === null || isPendingId(item.session.id))
+            return;
+        if (!LIVE_STATUSES.has(item.session.status)) {
+            say("nothing to stop — the session is settled");
+            return;
+        }
+        if (stopArmed === item.session.id) {
+            setStopArmed(null);
+            stopMutation.mutate(item.session);
+            return;
+        }
+        setStopArmed(item.session.id);
+        say(`press again to stop · ${worktreeName(item.session.branch)}`);
+    };
     const startSession = (projectId, harness) => {
         setFocus("sessions");
-        launchMutation.mutate({ projectId, harness, pendingKey: pendingId() });
+        launchMutation.mutate({ projectId, harness, name: pendingName, pendingKey: pendingId() });
+        setPendingName(null);
+    };
+    /** 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);
     };
     const resumeSession = (projectId, session, harness) => {
         setFocus("sessions");
@@ -475,6 +542,11 @@ const App = ({ ctx, onQuit }) => {
                 setEditing(null);
             return;
         }
+        if (naming !== null) {
+            if (key.name === "escape")
+                setNaming(null);
+            return;
+        }
         if (picker !== null) {
             switch (key.name) {
                 case "down":
@@ -495,6 +567,10 @@ const App = ({ ctx, onQuit }) => {
                     return;
             }
         }
+        // Shift+K (and x below): stop the selected session. Lowercase k stays
+        // vim-up; the shift is the deliberateness the arm-confirm then doubles.
+        if (key.shift === true && key.name === "k")
+            return armStop();
         switch (key.name) {
             case "q":
                 return onQuit();
@@ -504,6 +580,8 @@ const App = ({ ctx, onQuit }) => {
             case "up":
             case "k":
                 return moveSelection(-1);
+            case "x":
+                return armStop();
             case "return":
             case "linefeed":
                 return activate();
@@ -524,8 +602,9 @@ const App = ({ ctx, onQuit }) => {
                     setFocus(focus === "projects" ? "sessions" : "projects");
                 return;
             case "n":
+                // The worktree's name comes first; the harness picker follows.
                 if (selectedProject !== null)
-                    openPicker(null);
+                    setNaming({ projectId: selectedProject.project.id });
                 return;
             case "e": {
                 const item = selectedSession;
@@ -573,7 +652,7 @@ const App = ({ ctx, onQuit }) => {
         : `sessions — ${selectedProject.project.name}${selectedProject.live > 0 ? ` · ${selectedProject.live} live` : ""}`;
     const detailTitle = selectedSession === null
         ? "session"
-        : `session — ${selectedSession.session.harness} ${selectedSession.session.id.slice(0, 8)}`;
+        : `worktree — ${worktreeName(selectedSession.session.branch)} · ${selectedSession.session.harness} ${selectedSession.session.id.slice(0, 8)}`;
     const pickerTitle = picker === null
         ? ""
         : picker.session === null
@@ -581,11 +660,13 @@ const App = ({ ctx, onQuit }) => {
             : `resume ${picker.session.id.slice(0, 8)} — pick a harness`;
     const footerText = editing !== null
         ? " enter save · 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 · v review · e rename · o web · h/⇥ projects · q quit";
+        : 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";
     const loadFailure = data === undefined && failureReason !== null
         ? failureReason instanceof Error
             ? failureReason.message
@@ -597,7 +678,10 @@ 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)))) })) : 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: [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) => {
                         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 })] }));

package/dist/main.js

@@ -11,7 +11,7 @@ import { formatLoadReport } from "./env.js";
 import { loginCommand } from "./login.js";
 import { pairCommand, qrCommand } from "./pair.js";
 import { isComposeFile, proposeFromCompose, proposeFromPackageJson, proposeFromWorkspacePackage, renderMendToml, workspaceGlobs, } from "./service-init.js";
-import { agentIsLive, agentOutcome, cwdFacts, gitTopLevel, HARNESS_COMMANDS, LIVE_STATUSES, matchProjectByCwd, normalizeProjectName, parseLaunchArgs, } from "./shared.js";
+import { agentIsLive, agentOutcome, cwdFacts, gitTopLevel, HARNESS_COMMANDS, isDetachChunk, LIVE_STATUSES, matchProjectByCwd, normalizeProjectName, parseLaunchArgs, } from "./shared.js";
 import { sshCommand } from "./ssh-setup.js";
 // `$XDG_CONFIG_HOME/mend`, default `~/.config/mend`; a pre-XDG `~/.mend` stays authoritative
 // when it is the only one present (mirrors @mend/store's resolver — the CLI stays dependency-light).
@@ -245,6 +245,20 @@ const resolvedBackgroundSessions = async (config, project) => {
         return true;
     }
 };
+/** One-line TTY ask: the worktree's name comes first — it is the identity being created. */
+const askWorktreeName = async () => {
+    if (process.stdin.isTTY !== true || process.stdout.isTTY !== true)
+        return null;
+    const readline = await import("node:readline/promises");
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    try {
+        const answer = (await rl.question(`  worktree name ${dim("(enter for auto)")}: `)).trim();
+        return answer === "" ? null : normalizeProjectName(answer);
+    }
+    finally {
+        rl.close();
+    }
+};
 const launch = async (config, harness, args) => {
     const parsed = parseLaunchArgs(args);
     if (parsed.error !== null)
@@ -268,6 +282,9 @@ const launch = async (config, harness, args) => {
     // Say which project the cwd resolved to before anything is created — a
     // wrong guess should be visible here, not discovered in the tree later.
     say(`${green("✓")} project ${project.name} ${dim(`· ${project.defaultBranch}${parsed.project === null ? " · from cwd" : ""}`)}`);
+    // The worktree's name comes first, then the session details — it is the
+    // identity every list leads with. `mend run` stays scriptable: flag only.
+    const worktreeName = harness === "run" ? parsed.name : (parsed.name ?? (await askWorktreeName()));
     const lifecycle = harness === "run"
         ? "background"
         : parsed.detach
@@ -297,6 +314,7 @@ const launch = async (config, harness, args) => {
     const session = await api(config, "POST", `/projects/${project.id}/sessions`, {
         harness,
         label: null,
+        name: worktreeName,
         base: parsed.base,
     });
     createdSessionId = session.id;
@@ -423,8 +441,10 @@ const attachTty = async (config, sessionId, harness, from, processId, options) =
         }
     };
     const onKeys = (data) => {
-        if (detachKeyEnabled && data.includes(0x1d)) {
-            // Ctrl+] — detach, leave the session running.
+        if (detachKeyEnabled && isDetachChunk(data)) {
+            // Ctrl+] — detach, leave the session running. Matched in both its
+            // encodings: the inner TUI may have switched the user's terminal onto
+            // the kitty keyboard protocol, where the key arrives as CSI-u.
             detached = true;
             ws.close();
             return;
@@ -463,6 +483,19 @@ const attachTty = async (config, sessionId, harness, from, processId, options) =
         ws.removeEventListener("close", onClose);
         if (rawModeEnabled)
             process.stdin.setRawMode(false);
+        if (options?.readOnly !== true && process.stdout.isTTY === true) {
+            // The inner TUI's terminal modes leaked onto OUR terminal through the
+            // byte bridge — kitty keyboard protocol, bracketed paste, mouse
+            // reporting, alternate screen, hidden cursor. The TUI keeps running
+            // remotely; the local terminal must come back to shell sanity, or every
+            // keystroke after a detach arrives as CSI-u junk. A reattach replays
+            // the session from 0, which re-establishes whatever the TUI had set.
+            process.stdout.write("\x1b[<u\x1b[=0;1u" + // pop the kitty keyboard stack, then force flags 0
+                "\x1b[?2004l" + // bracketed paste off
+                "\x1b[?1000l\x1b[?1002l\x1b[?1003l\x1b[?1006l" + // mouse reporting off
+                "\x1b[?1049l" + // leave the alternate screen (no-op when already left)
+                "\x1b[?25h");
+        }
         process.stdin.pause();
         if (ws.readyState === WebSocket.OPEN || ws.readyState === WebSocket.CONNECTING)
             ws.close();
@@ -560,7 +593,7 @@ const attach = async (config, args) => {
     const match = sessions.find((s) => s.id.startsWith(prefix));
     if (match === undefined)
         return fail(`no active session matches "${prefix}"`);
-    say(`${green("✓")} attaching to ${match.harness} · ${dim(match.id.slice(0, 8))}${detachHint()}`);
+    say(`${green("✓")} attaching to ${match.branch} · ${match.harness} ${dim(match.id.slice(0, 8))}${detachHint()}`);
     say("");
     await attachOrExit(config, match.id, match.harness);
     exitAfterSessionEnd(config, match.id);
@@ -2034,7 +2067,7 @@ const rejoinCommand = async (config, args) => {
     if (session === undefined)
         return fail("session selection failed");
     const alreadyLive = agentLiveIn(detail, session);
-    say(`${green("✓")} rejoining ${session.harness} · ${dim(session.id.slice(0, 8))} · ${alreadyLive ? "already live" : "restoring"}`);
+    say(`${green("✓")} rejoining ${session.branch} · ${session.harness} ${dim(session.id.slice(0, 8))} · ${alreadyLive ? "already live" : "restoring"}`);
     say(`${cobalt("  watch")} · ${config.url}/sessions/${session.id}`);
     let restored = false;
     const currentAgent = detail.annotations.find((annotation) => annotation.sessionId === session.id)?.currentAgent ??
@@ -2262,10 +2295,12 @@ start
   mend adopt [source] [--name <name>] [--auth ambient|mend-key|bridge]
                                         adopt a repository into the store (default: cwd; any git
                                         URL — GitHub, GitLab, self-hosted, ssh://, a local path)
-  mend codex|claude|opencode ["prompt"] [--model <id>] [--effort low|medium|high|xhigh|max]
+  mend codex|claude|opencode ["prompt"] [--name <worktree>] [--model <id>]
+                             [--effort low|medium|high|xhigh|max]
                              [--base <ref>] [--ask] [--fast] [--detach|-d] [--foreground]
-                                        new session worktree + launch the harness in it; a quoted
-                                        prompt becomes its first message (and names the session),
+                                        new session worktree + launch the harness in it; the
+                                        worktree's name is asked first (--name skips the ask), a
+                                        quoted prompt becomes its first message,
                                         --ask restores the harness's permission prompts, --fast
                                         requests priority processing (codex service tier),
                                         --detach launches without attaching (reattach anywhere),

package/dist/shared.js

@@ -34,6 +34,7 @@ const LAUNCH_ERROR = {
     model: null,
     effort: null,
     base: null,
+    name: null,
     ask: false,
     fast: false,
     detach: false,
@@ -56,6 +57,7 @@ export const parseLaunchArgs = (args) => {
     let model = null;
     let effort = null;
     let base = null;
+    let workName = null;
     let ask = false;
     let fast = false;
     let detach = false;
@@ -78,7 +80,11 @@ export const parseLaunchArgs = (args) => {
             foreground = true;
             continue;
         }
-        if (arg === "--project" || arg === "--model" || arg === "--effort" || arg === "--base") {
+        if (arg === "--project" ||
+            arg === "--model" ||
+            arg === "--effort" ||
+            arg === "--base" ||
+            arg === "--name") {
             const value = flagArgs[index + 1];
             if (value === undefined)
                 return { ...LAUNCH_ERROR, error: `${arg} needs a value` };
@@ -88,6 +94,8 @@ export const parseLaunchArgs = (args) => {
                 model = value;
             else if (arg === "--effort")
                 effort = value;
+            else if (arg === "--name")
+                workName = normalizeProjectName(value);
             else
                 base = value;
             index += 1;
@@ -121,6 +129,7 @@ export const parseLaunchArgs = (args) => {
         model,
         effort,
         base,
+        name: workName,
         ask,
         fast,
         detach,
@@ -129,6 +138,29 @@ export const parseLaunchArgs = (args) => {
         error: null,
     };
 };
+/**
+ * Whether a raw stdin chunk carries the detach key (Ctrl+]). Two encodings
+ * reach us: the legacy control byte 0x1d — and, once an inner TUI (claude)
+ * pushes the kitty keyboard protocol through the PTY and the user's own
+ * terminal honors it, the CSI-u escape `ESC [ 93 ; 5 u` (`]` is code 93,
+ * ctrl is modifier 5), optionally with a kitty event-type suffix. Only press
+ * (`:1`) and repeat (`:2`) are intent; a release (`:3`) is not.
+ */
+export const isDetachChunk = (data) => {
+    if (data.includes(0x1d))
+        return true;
+    // latin1 maps bytes 1:1, so the scan sees exactly the wire bytes. A string
+    // scan rather than a regex: an escape byte inside a pattern trips lint, and
+    // anchoring on the real ESC[ prefix keeps pasted text from ever matching.
+    const text = data.toString("latin1");
+    const prefix = "\u001b[93;5";
+    for (let start = text.indexOf(prefix); start !== -1; start = text.indexOf(prefix, start + 1)) {
+        const rest = text.slice(start + prefix.length);
+        if (rest.startsWith("u") || rest.startsWith(":1u") || rest.startsWith(":2u"))
+            return true;
+    }
+    return false;
+};
 export const LIVE_STATUSES = new Set([
     "starting",
     "running",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sealant/mend",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "description": "The mend CLI: adopt a repository into Mend's store, launch your coding agent in a recorded session worktree, detach and reattach from any terminal",
   "keywords": [
     "claude-code",