@sealant/mend 0.16.0 → 0.17.0

package/dist/dashboard-model.js

@@ -208,6 +208,14 @@ export const foldGroupStatus = (group) => {
  * Null = nothing attachable; opening a new shell is then honest.
  */
 export const liveShellOf = (processes) => processes.findLast((process) => process.kind === "shell" && process.exitedAt === null) ?? null;
+/**
+ * The session's live protocol agent — a phone pickup driving the same
+ * conversation over stream-json. It holds the workspace with no PTY behind it,
+ * so a terminal "get me in" must take it over (hand back to a TUI) rather than
+ * report the attach unavailable or open a bare shell. Null = no pickup to take.
+ */
+export const liveProtocolOf = (processes) => processes.find((process) => process.kind === "agent-protocol" && process.exitedAt === null) ??
+    null;
 /**
  * The optimistic stop: the row settles AND its live process/service fact
  * lines drop in the same paint — the server's refetch only confirms.

package/dist/dashboard.js

@@ -3,7 +3,7 @@ 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 { deriveHarnesses, deriveProjects, advanceFromBase, deriveRows, deriveWorktrees, filterBranches, foldGroupStatus, labelIsIdentity, rowKeyOf, worktreeDisplayName, fetchWorkbench, liveProtocolOf, 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";
@@ -261,8 +261,17 @@ const App = ({ ctx, onQuit }) => {
                 // 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 liveProtocol = liveProtocolOf(detail.processes);
                 const existing = liveShellOf(detail.processes);
-                if (existing !== null) {
+                if (liveProtocol !== null) {
+                    // A phone pickup holds the session in protocol mode — no PTY behind
+                    // it. Take it over: end the protocol agent, resume the same
+                    // conversation as a TUI, then attach to that.
+                    process.stdout.write(`taking over from the protocol session — same conversation…\n\n`);
+                    await ctx.api("POST", `/sessions/${session.id}/handoff`, { to: "pty" });
+                    outcome = await ctx.attachTty(session.id, session.harness);
+                }
+                else if (existing !== null) {
                     process.stdout.write(`no live terminal — rejoining the open shell\n\n`);
                     outcome = await ctx.attachTty(session.id, "shell", existing.id);
                 }
@@ -997,7 +1006,7 @@ const App = ({ ctx, onQuit }) => {
                     ? " ↑↓ 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";
+                        : " ↑↓ move · enter attach/resume · n new worktree · s session here · ⇧K kill · ⇧D remove · v review · e rename · o web · q quit";
     const loadFailure = data === undefined && failureReason !== null
         ? failureReason instanceof Error
             ? failureReason.message

package/dist/main.js

@@ -618,16 +618,41 @@ const exitAfterSessionEnd = (config, sessionId) => {
 /** Reattach a terminal to a running session (full scrollback replay, then live). */
 const attach = async (config, args) => {
     const prefix = args.find((a) => !a.startsWith("--"));
-    if (prefix === undefined)
-        return fail("usage: mend attach <session-id-prefix>");
+    // No id: the picker IS the selection surface (the resolution `mend shell`
+    // already uses), so attaching never demands an id the user must go look up.
+    if (prefix === undefined) {
+        const picked = await resolveLiveSession(config, undefined, "attach");
+        return attachPicked(config, picked);
+    }
     const sessions = await api(config, "GET", "/sessions");
     const match = sessions.find((s) => s.id.startsWith(prefix));
     if (match === undefined)
         return fail(`no active session matches "${prefix}"`);
-    say(`${green("✓")} attaching to ${sessionDisplayName(match)} · ${match.harness} ${dim(match.id.slice(0, 8))}${detachHint()}`);
+    return attachPicked(config, match);
+};
+/** Attach to one resolved session — the tail both `mend attach` paths share. */
+const attachPicked = async (config, session) => {
+    say(`${green("✓")} attaching to ${sessionDisplayName(session)} · ${session.harness} ${dim(session.id.slice(0, 8))}${detachHint()}`);
     say("");
-    await attachOrExit(config, match.id, match.harness);
-    exitAfterSessionEnd(config, match.id);
+    const outcome = await attachTty(config, session.id, session.harness, 0n, undefined, {
+        handleSignals: true,
+    });
+    // A live protocol agent (a phone pickup) has no PTY behind it — the attach
+    // reports "unavailable" with nothing wrong. Take the session over: end the
+    // protocol agent, resume the same conversation as a TUI, then attach to it.
+    if (outcome === "unavailable") {
+        const detail = await api(config, "GET", `/sessions/${session.id}`);
+        if (detail.currentAgent?.kind === "agent-protocol" &&
+            agentIsLive(detail.session, detail.currentAgent)) {
+            say(`${amber("taking over")} from the protocol session`);
+            await withSpinner("reopening as a terminal — same conversation…", api(config, "POST", `/sessions/${session.id}/handoff`, { to: "pty" }));
+            say("");
+            await attachOrExit(config, session.id, session.harness);
+            return exitAfterSessionEnd(config, session.id);
+        }
+    }
+    await finishAttach(config, session.id, outcome);
+    return exitAfterSessionEnd(config, session.id);
 };
 /**
  * Explicit stop — the one intent detaching never carries. Ends the agent; the
@@ -640,8 +665,15 @@ const stopCommand = async (config, args) => {
         ? String(args[projectFlag + 1])
         : null;
     const prefix = args.find((arg, index) => !arg.startsWith("--") && index !== projectFlag + 1);
+    // Neither an id nor --all: pick the session to close, the same resolution
+    // `mend attach` uses. --all and --project keep their bulk meaning.
+    if (!all && prefix === undefined && projectName === null) {
+        const picked = await resolveLiveSession(config, undefined, "stop");
+        await stopSessions(config, [picked], false);
+        return;
+    }
     if (!all && prefix === undefined) {
-        return fail("usage: mend stop <session-id-prefix> | --all [--project <p>]");
+        return fail("usage: mend stop [session-id-prefix] | --all [--project <p>]");
     }
     const [sessions, projects] = await Promise.all([
         api(config, "GET", "/sessions"),
@@ -671,19 +703,24 @@ const stopCommand = async (config, args) => {
         }
         targets = matches;
     }
+    await stopSessions(config, targets, all);
+};
+/** Stop each target and print its record link — the tail every stop path shares. */
+const stopSessions = async (config, targets, summarise) => {
     for (const session of targets) {
         await api(config, "POST", `/sessions/${session.id}/stop`);
         say(`${green("✓")} stopped · ${session.harness} · ${dim(session.id.slice(0, 8))} · ${session.branch}`);
         say(`${cobalt("  review")} · ${config.url}/sessions/${session.id}`);
     }
-    if (all)
+    if (summarise) {
         say(`${green("✓")} stopped ${targets.length} session${targets.length === 1 ? "" : "s"}`);
+    }
 };
 /** Compact picker: numbered live sessions, one keystroke of typing. */
 const pickSessionInteractively = async (rows) => {
     say(dim("more than one live session — pick one:"));
     rows.forEach((row, index) => {
-        say(`  ${index + 1}. ${row.session.harness.padEnd(8)} ${dim(row.session.id.slice(0, 8))}  ${row.projectName}  ${dim(row.session.branch)}`);
+        say(`  ${index + 1}. ${row.session.harness.padEnd(8)} ${dim(row.session.id.slice(0, 8))}  ${row.projectName}  ${dim(row.session.branch)}  ${dim(row.session.status)}`);
     });
     const readline = await import("node:readline/promises");
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
@@ -699,7 +736,7 @@ const pickSessionInteractively = async (rows) => {
  * the cwd's project narrows, one candidate is taken, several go to the
  * picker, and a non-interactive caller never gets a silent guess.
  */
-const resolveLiveSession = async (config, prefix) => {
+const resolveLiveSession = async (config, prefix, command) => {
     const sessions = await api(config, "GET", "/sessions?retained=1");
     if (prefix !== undefined) {
         const matches = sessions.filter((s) => s.id.startsWith(prefix));
@@ -721,7 +758,7 @@ const resolveLiveSession = async (config, prefix) => {
     if (candidates.length === 1)
         return only;
     if (process.stdin.isTTY !== true) {
-        return fail("several live sessions — name one: mend shell <session-id-prefix>");
+        return fail(`several live sessions — name one: mend ${command} <session-id-prefix>`);
     }
     const nameById = new Map(projects.map((p) => [p.id, p.name]));
     return pickSessionInteractively(candidates.map((session) => ({
@@ -737,7 +774,7 @@ const resolveLiveSession = async (config, prefix) => {
  */
 const shellCommand = async (config, args) => {
     const prefix = args.find((a) => !a.startsWith("--"));
-    const session = await resolveLiveSession(config, prefix);
+    const session = await resolveLiveSession(config, prefix, "shell");
     say(`${green("✓")} shell in ${session.harness} session ${dim(session.id.slice(0, 8))} · ${dim(session.branch)}${detachHint()}`);
     const shellProcess = await withSpinner("opening a shell in the session workspace…", api(config, "POST", `/sessions/${session.id}/shell`));
     say("");
@@ -872,7 +909,7 @@ const serviceAdd = async (config, args) => {
         return fail(`"${portRaw}" is not a port`);
     }
     const prefix = positional.find((a) => a !== portRaw);
-    const session = await resolveLiveSession(config, prefix);
+    const session = await resolveLiveSession(config, prefix, "service add");
     const service = await mutateService(config, "POST", `/sessions/${session.id}/services`, {
         port,
         name,
@@ -953,7 +990,7 @@ const serviceRun = async (config, args) => {
         if (name === undefined)
             return fail(usage);
         const prefix = positionals.length > 1 ? positionals[0] : undefined;
-        const session = await resolveLiveSession(config, prefix);
+        const session = await resolveLiveSession(config, prefix, "service run");
         const recipes = await api(config, "GET", `/sessions/${session.id}/recipes`);
         const recipe = recipes.find((entry) => entry.name === name);
         if (recipe === undefined) {
@@ -996,7 +1033,7 @@ const serviceRun = async (config, args) => {
     if (protocol === "udp" && browserScheme !== null)
         return fail(usage);
     const prefix = head.find((a, i) => !a.startsWith("--") && i !== portFlag + 1 && i !== nameFlag + 1);
-    const session = await resolveLiveSession(config, prefix);
+    const session = await resolveLiveSession(config, prefix, "service run");
     const service = await withSpinner(protocol === "udp"
         ? `starting ${name ?? argv[0]} (udp :${port})…`
         : `starting ${name ?? argv[0]} — waiting for :${port} to answer…`, mutateService(config, "POST", `/sessions/${session.id}/services/run`, {
@@ -2556,8 +2593,9 @@ everything else
   mend worktrees [--project <p>] [--json]
                                         every worktree and the sessions inside it (mend sessions
                                         --json stays the v1 flat list; --json=v2 groups like this)
-  mend attach <session-id-prefix>       reattach this terminal to a running session
-  mend stop <session-id-prefix> | --all [--project <p>]
+  mend attach [session-id-prefix]       reattach this terminal to a running session
+                                        (no id: pick one from the live sessions)
+  mend stop [session-id-prefix] | --all [--project <p>]
                                         stop the agent — the workspace harvests and closes; the
                                         record and review remain
   mend shell [session-id-prefix]        open a shell in a live session's workspace

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sealant/mend",
-  "version": "0.16.0",
+  "version": "0.17.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",