@sealant/mend 0.3.0 → 0.5.0

package/dist/dashboard.js

@@ -5,7 +5,7 @@ import { QueryClient, QueryClientProvider, useQuery, useQueryClient } from "@tan
 import { useEffect, useRef, useState } from "react";
 import { reviewTargetForSession } from "./review-workflow.js";
 import { ReviewScreen } from "./review.js";
-import { HARNESS_COMMANDS, LIVE_STATUSES, matchProjectByCwd } from "./shared.js";
+import { cwdFacts, HARNESS_COMMANDS, LIVE_STATUSES, matchProjectByCwd } from "./shared.js";
 import { openUrl } from "./terminal.js";
 import { AMBER, BG, COBALT, FAINT, GREEN, INK, MUTED, RED, RULE, WASH } from "./tui-theme.js";
 const STATUS_GLYPH = {
@@ -66,7 +66,7 @@ const itemKey = (item) => item.kind === "session"
         : String(item.harness);
 const itemHeight = (view) => (view.kind === "sessions" ? 2 : 1);
 const homeView = (cwd, data) => {
-    const home = matchProjectByCwd(data.projects, cwd);
+    const home = matchProjectByCwd(data.projects, cwdFacts(cwd));
     return home === undefined ? { kind: "projects" } : { kind: "sessions", projectId: home.id };
 };
 const deriveItems = (view, data) => {

package/dist/main.js

@@ -8,7 +8,7 @@ import * as path from "node:path";
 import { readSyncFiles, scanDotfileCandidates } from "./dotfiles.js";
 import { formatLoadReport } from "./env.js";
 import { isComposeFile, proposeFromCompose, proposeFromPackageJson, proposeFromWorkspacePackage, renderMendToml, workspaceGlobs, } from "./service-init.js";
-import { CONTINUE_COMMANDS, gitTopLevel, HARNESS_COMMANDS, LIVE_STATUSES, matchProjectByCwd, normalizeProjectName, } from "./shared.js";
+import { agentIsLive, agentOutcome, cwdFacts, gitTopLevel, HARNESS_COMMANDS, LIVE_STATUSES, matchProjectByCwd, normalizeProjectName, parseLaunchArgs, } from "./shared.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).
 const mendCliHome = () => {
@@ -37,6 +37,14 @@ const fail = (message) => {
     process.stderr.write(`mend: ${message}\n`);
     process.exit(1);
 };
+const parseMendUrl = (value) => {
+    try {
+        return new URL(value);
+    }
+    catch {
+        return fail(`"${value}" is not a valid Mend URL`);
+    }
+};
 const paint = (code) => (text) => process.stdout.isTTY ? `[${code}m${text}` : text;
 const dim = paint("2");
 const green = paint("32");
@@ -110,7 +118,12 @@ const request = async (config, method, route, body) => {
         }
         throw new Error(message);
     }
-    return JSON.parse(text);
+    try {
+        return JSON.parse(text);
+    }
+    catch {
+        throw new Error(`${method} ${route} returned invalid JSON from ${config.url}`);
+    }
 };
 /** The same call for one-shot commands: any failure prints and exits. */
 const api = async (config, method, route, body) => {
@@ -121,7 +134,6 @@ const api = async (config, method, route, body) => {
         return fail(error instanceof Error ? error.message : String(error));
     }
 };
-const worktreePathOf = (storePath, worktree) => path.join(path.dirname(storePath), "worktrees", worktree);
 /** A live elapsed-time spinner around a slow await — provisioning is not a hang. */
 const withSpinner = async (label, work) => {
     if (process.stdout.isTTY !== true)
@@ -187,7 +199,7 @@ const findProject = async (config, explicit, adoptCwd = false) => {
         return named;
     }
     const cwd = process.cwd();
-    const project = matchProjectByCwd(projects, cwd);
+    const project = matchProjectByCwd(projects, cwdFacts(cwd));
     if (project !== undefined)
         return project;
     if (!adoptCwd) {
@@ -207,21 +219,29 @@ const findProject = async (config, explicit, adoptCwd = false) => {
     return adopted;
 };
 const launch = async (config, harness, args) => {
-    const projectFlag = args.indexOf("--project");
-    const explicit = projectFlag !== -1 && args[projectFlag + 1] !== undefined
-        ? String(args[projectFlag + 1])
-        : null;
-    const dashdash = args.indexOf("--");
-    const custom = dashdash !== -1 ? args.slice(dashdash + 1) : [];
-    const argv = harness === "run" ? custom : (HARNESS_COMMANDS[harness] ?? []);
+    const parsed = parseLaunchArgs(args);
+    if (parsed.error !== null)
+        return fail(parsed.error);
+    const structured = parsed.prompt !== null ||
+        parsed.model !== null ||
+        parsed.effort !== null ||
+        parsed.ask ||
+        parsed.fast;
+    if (harness === "run" && structured) {
+        return fail("mend run takes no prompt or harness flags — usage: mend run [--project p] -- <command...>");
+    }
+    const argv = harness === "run" ? parsed.custom : (HARNESS_COMMANDS[harness] ?? []);
     if (argv.length === 0) {
         return fail(harness === "run" ? "usage: mend run -- <command...>" : `unknown harness ${harness}`);
     }
-    const project = await findProject(config, explicit, true);
+    const project = await findProject(config, parsed.project, true);
+    // 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" : ""}`)}`);
     const session = await api(config, "POST", `/projects/${project.id}/sessions`, {
         harness,
         label: null,
-        base: null,
+        base: parsed.base,
     });
     say(`${green("✓")} worktree ${session.worktree} ${dim(`· branch ${session.branch}`)}`);
     say(`${green("✓")} base ${dim(session.baseSha.slice(0, 12))} · session ${dim(session.id.slice(0, 8))}`);
@@ -232,7 +252,18 @@ const launch = async (config, harness, args) => {
     if (harness === "run") {
         return supervisedRun(config, session, argv);
     }
-    await withSpinner("provisioning workspace — a first launch builds the harness image (can take minutes)…", api(config, "POST", `/sessions/${session.id}/launch`, { argv }));
+    // A structured start sends no argv: the server composes the harness flags
+    // (one shared mapping) and names the session from the prompt immediately.
+    const launchBody = structured
+        ? {
+            ...(parsed.prompt === null ? {} : { prompt: parsed.prompt }),
+            ...(parsed.model === null ? {} : { model: parsed.model }),
+            ...(parsed.effort === null ? {} : { effort: parsed.effort }),
+            ...(parsed.ask ? { permissionMode: "ask" } : {}),
+            ...(parsed.fast ? { speed: "fast" } : {}),
+        }
+        : { argv };
+    await withSpinner("provisioning workspace — a first launch builds the harness image (can take minutes)…", api(config, "POST", `/sessions/${session.id}/launch`, launchBody));
     say(`${green("✓ recording")} · workspace mounts the worktree${detachHint()}`);
     say("");
     await attachOrExit(config, session.id, session.harness);
@@ -250,14 +281,14 @@ const launch = async (config, harness, args) => {
  * resumes).
  */
 const attachTty = async (config, sessionId, harness, from, processId, options) => {
-    const url = new URL(`${config.url}/api/tty`);
+    const url = parseMendUrl(`${config.url}/api/tty`);
     url.protocol = url.protocol === "https:" ? "wss:" : "ws:";
     // Process addressing reaches any PTY in the workspace (a shell); the
     // session form remains the agent's PTY.
-    if (processId !== undefined)
-        url.searchParams.set("process", processId);
-    else
+    if (processId === undefined)
         url.searchParams.set("session", sessionId);
+    else
+        url.searchParams.set("process", processId);
     url.searchParams.set("from", from.toString());
     if (config.token !== null)
         url.searchParams.set("token", config.token);
@@ -411,11 +442,11 @@ const pickSessionInteractively = async (rows) => {
  * picker, and a non-interactive caller never gets a silent guess.
  */
 const resolveLiveSession = async (config, prefix) => {
-    const sessions = await api(config, "GET", "/sessions");
+    const sessions = await api(config, "GET", "/sessions?retained=1");
     if (prefix !== undefined) {
         const matches = sessions.filter((s) => s.id.startsWith(prefix));
         if (matches.length === 0)
-            return fail(`no live session matches "${prefix}"`);
+            return fail(`no live or retained session matches "${prefix}"`);
         const exact = matches[0];
         if (matches.length > 1 || exact === undefined) {
             return fail(`session prefix "${prefix}" is ambiguous — use more of the id`);
@@ -423,11 +454,11 @@ const resolveLiveSession = async (config, prefix) => {
         return exact;
     }
     const projects = await api(config, "GET", "/projects");
-    const project = matchProjectByCwd(projects, process.cwd());
+    const project = matchProjectByCwd(projects, cwdFacts(process.cwd()));
     const candidates = project === undefined ? sessions : sessions.filter((s) => s.projectId === project.id);
     const only = candidates[0];
     if (only === undefined) {
-        return fail("no live session — start one with mend codex|claude|opencode");
+        return fail("no live or retained session — start one with mend codex|claude|opencode");
     }
     if (candidates.length === 1)
         return only;
@@ -464,16 +495,68 @@ const shellCommand = async (config, args) => {
     say(`${green("✓")} shell ended`);
     process.exit(0);
 };
-const serviceUrl = (config, service) => {
-    const host = new URL(config.url).hostname || "localhost";
-    // A UDP Service has no page to open — the endpoint is the whole fact.
-    return service.protocol === "udp"
-        ? `${host}:${service.hostPort ?? "?"} (udp)`
-        : `http://${host}:${service.hostPort ?? "?"}`;
+const flattenService = (view) => {
+    const attempt = view.service.currentAttemptId === null
+        ? null
+        : (view.attempts.find((candidate) => candidate.id === view.service.currentAttemptId) ?? null);
+    const observation = view.currentForward !== null && view.latestObservation?.forwardId === view.currentForward.id
+        ? view.latestObservation
+        : null;
+    const endpoint = view.endpoints.find((candidate) => candidate.scope === "private") ?? view.endpoints[0] ?? null;
+    const browserUrl = view.endpoints.find((candidate) => candidate.browserUrl !== null)?.browserUrl ?? null;
+    return {
+        id: view.service.id,
+        processId: attempt?.id ?? null,
+        sessionId: view.service.sessionId,
+        label: view.service.name,
+        status: observation?.state ?? view.currentForward?.state ?? attempt?.status ?? "stopped",
+        workspacePort: view.service.workspacePort,
+        hostPort: endpoint?.hostPort ?? null,
+        authority: endpoint?.authority ?? null,
+        browserUrl,
+        exposureScope: endpoint?.scope ?? null,
+        mendAuthentication: endpoint?.mendAuthentication ?? null,
+        protocol: view.service.transport,
+        sealantSessionId: attempt?.sealantSessionId ?? null,
+        attemptExitedAt: attempt?.exitedAt ?? null,
+        argv: attempt?.argv ?? [],
+        workspaceExpiresAt: view.workspaceExpiresAt,
+        workspaceTtlRenewedAt: view.workspaceTtlRenewedAt,
+        workspaceTtlRenewalFailedAt: view.workspaceTtlRenewalFailedAt,
+        workspaceTtlRenewalError: view.workspaceTtlRenewalError,
+    };
+};
+const fetchServiceViews = (config, all = false) => api(config, "GET", `/services${all ? "?all=1" : ""}`);
+const fetchServices = async (config, all = false) => (await fetchServiceViews(config, all)).map(flattenService);
+const mutateService = async (config, method, endpointPath, body) => flattenService(await api(config, method, endpointPath, body));
+const serviceUrl = (service) => service.browserUrl ??
+    (service.authority === null
+        ? "unbound"
+        : `${service.authority}${service.protocol === "udp" ? " (udp)" : ""}`);
+const serviceExposure = (service) => {
+    if (service.exposureScope === null)
+        return "";
+    if (service.exposureScope === "private") {
+        return "No Mend sign-in protects this port. Anyone who can reach this private address can connect.";
+    }
+    return `Loopback only · Mend auth: ${service.mendAuthentication ?? "unknown"}`;
+};
+const printWorkspaceTtlFailure = (service) => {
+    if (service.workspaceTtlRenewalError === null)
+        return;
+    say(amber(`  workspace TTL renewal failed · ${service.workspaceTtlRenewalError}`));
+    say(dim(`  last renewed ${service.workspaceTtlRenewedAt ?? "unknown"} · known expiry ${service.workspaceExpiresAt ?? "unknown"} · failed ${service.workspaceTtlRenewalFailedAt ?? "unknown"}`));
+};
+const printServiceEndpoint = (service) => {
+    const exposure = serviceExposure(service);
+    say(`  ${cobalt(serviceUrl(service))}${exposure === "" ? "" : `  ${dim(exposure)}`}`);
+    printWorkspaceTtlFailure(service);
 };
-const printService = (config, service) => {
+const printService = (service) => {
     const status = service.status === "reachable" ? green(service.status) : amber(service.status);
-    say(`${(service.label ?? service.id.slice(0, 8)).padEnd(12)}  ${dim(`:${service.workspacePort ?? "?"}${service.protocol === "udp" ? "/udp" : ""} →`)} ${serviceUrl(config, service)}  ${status}  ${dim(service.id.slice(0, 8))}`);
+    const exposure = serviceExposure(service);
+    say(`${(service.label ?? service.id.slice(0, 8)).padEnd(12)}  ${dim(`:${service.workspacePort ?? "?"}${service.protocol === "udp" ? "/udp" : ""} →`)} ${serviceUrl(service)}  ${status}  ${dim(service.id.slice(0, 8))}${exposure === "" ? "" : `  ${dim(exposure)}`}`);
+    printWorkspaceTtlFailure(service);
 };
 /**
  * Adopt an already-listening workspace port as a Service: Mend binds a host
@@ -484,10 +567,18 @@ const serviceAdd = async (config, args) => {
     const nameFlag = args.indexOf("--name");
     const name = nameFlag !== -1 && args[nameFlag + 1] !== undefined ? String(args[nameFlag + 1]) : null;
     const protocol = args.includes("--udp") ? "udp" : "tcp";
+    const http = args.includes("--http");
+    const https = args.includes("--https");
+    if (http && https)
+        return fail("Choose either --http or --https, not both.");
+    const browserScheme = https ? "https" : http ? "http" : null;
+    if (protocol === "udp" && browserScheme !== null) {
+        return fail("UDP Services cannot use --http or --https");
+    }
     const positional = args.filter((a, i) => !a.startsWith("--") && (nameFlag === -1 || i !== nameFlag + 1));
     const portRaw = positional.find((a) => /^\d+$/.test(a));
     if (portRaw === undefined) {
-        return fail("usage: mend service add [session] <port> [--name <n>] [--udp]");
+        return fail("usage: mend service add [session] <port> [--name <n>] [--udp] [--http|--https]");
     }
     const port = Number(portRaw);
     if (!Number.isInteger(port) || port < 1 || port > 65535) {
@@ -495,13 +586,14 @@ const serviceAdd = async (config, args) => {
     }
     const prefix = positional.find((a) => a !== portRaw);
     const session = await resolveLiveSession(config, prefix);
-    const service = await api(config, "POST", `/sessions/${session.id}/services`, {
+    const service = await mutateService(config, "POST", `/sessions/${session.id}/services`, {
         port,
         name,
         protocol,
+        browserScheme,
     });
     say(`${green("✓")} Service ${service.label ?? ""} · ${service.status}`);
-    say(`  ${cobalt(serviceUrl(config, service))}`);
+    printServiceEndpoint(service);
     if (protocol === "udp") {
         say(dim(`  udp — a reply is the only reachability signal; silence just relays`));
     }
@@ -510,19 +602,19 @@ const serviceAdd = async (config, args) => {
     }
 };
 const serviceList = async (config) => {
-    const services = await api(config, "GET", "/services");
+    const services = await fetchServices(config);
     if (services.length === 0) {
         say(dim("no live services — mend service add <port> adopts a listening one"));
         return;
     }
     for (const service of services)
-        printService(config, service);
+        printService(service);
 };
 const serviceStop = async (config, args) => {
     const needle = args.find((a) => !a.startsWith("--"));
     if (needle === undefined)
         return fail("usage: mend service stop <name-or-id-prefix>");
-    const services = await api(config, "GET", "/services");
+    const services = await fetchServices(config);
     const matches = services.filter((service) => service.label === needle || service.id.startsWith(needle));
     if (matches.length === 0)
         return fail(`no live service matches "${needle}"`);
@@ -530,11 +622,11 @@ const serviceStop = async (config, args) => {
     if (matches.length > 1 || match === undefined) {
         return fail(`"${needle}" is ambiguous — use more of the id`);
     }
-    const stoppedService = await api(config, "POST", `/services/${match.id}/stop`);
+    const stoppedService = await mutateService(config, "POST", `/services/${match.id}/stop`);
     say(`${green("✓")} stopped · ${stoppedService.label ?? stoppedService.id.slice(0, 8)}`);
 };
 const findLiveService = async (config, needle) => {
-    const services = await api(config, "GET", "/services");
+    const services = await fetchServices(config);
     const matches = services.filter((service) => service.label === needle || service.id.startsWith(needle));
     if (matches.length === 0)
         return fail(`no live service matches "${needle}"`);
@@ -552,7 +644,7 @@ const findLiveService = async (config, needle) => {
  */
 const serviceRun = async (config, args) => {
     const dashdash = args.indexOf("--");
-    const usage = "usage: mend service run [session] --port <port> [--name <n>] [--udp] -- <command...>\n" +
+    const usage = "usage: mend service run [session] --port <port> [--name <n>] [--udp] [--http|--https] -- <command...>\n" +
         "       mend service run [session] <name>          (a declared recipe)";
     // No explicit command = a DECLARED Service: resolve the name against the
     // session worktree's mend.toml and start (or adopt) its recipe.
@@ -571,27 +663,15 @@ const serviceRun = async (config, args) => {
                 ? `no mend.toml recipes in this worktree — declare [service.${name}] first`
                 : `no recipe named "${name}" — declared: ${known}`);
         }
-        if (recipe.command === null) {
-            // A port-only recipe is an adopt: something else starts the listener.
-            const service = await api(config, "POST", `/sessions/${session.id}/services`, {
-                port: recipe.port,
-                name: recipe.name,
-                protocol: recipe.protocol,
-            });
-            say(`${green("✓")} Service ${service.label ?? ""} · ${service.status}`);
-            say(`  ${cobalt(serviceUrl(config, service))}`);
-            return;
-        }
-        const service = await withSpinner(recipe.protocol === "udp"
-            ? `starting ${recipe.name} (udp :${recipe.port})…`
-            : `starting ${recipe.name} — waiting for :${recipe.port} to answer…`, api(config, "POST", `/sessions/${session.id}/services/run`, {
-            argv: ["sh", "-c", recipe.command],
-            port: recipe.port,
+        const service = await withSpinner(recipe.command === null
+            ? `adopting ${recipe.name} on :${recipe.port}…`
+            : recipe.protocol === "udp"
+                ? `starting ${recipe.name} (udp :${recipe.port})…`
+                : `starting ${recipe.name} — waiting for :${recipe.port} to answer…`, mutateService(config, "POST", `/sessions/${session.id}/services/recipe`, {
             name: recipe.name,
-            protocol: recipe.protocol,
         }));
         say(`${green("✓")} Service ${service.label ?? ""} · ${service.status}`);
-        say(`  ${cobalt(serviceUrl(config, service))}`);
+        printServiceEndpoint(service);
         say(dim(`  logs: mend service logs ${service.label ?? service.id.slice(0, 8)}`));
         return;
     }
@@ -600,74 +680,101 @@ const serviceRun = async (config, args) => {
         return fail(usage);
     const head = args.slice(0, dashdash);
     const portFlag = head.indexOf("--port");
-    const port = portFlag !== -1 ? Number(head[portFlag + 1]) : Number.NaN;
+    const port = portFlag === -1 ? Number.NaN : Number(head[portFlag + 1]);
     if (!Number.isInteger(port) || port < 1 || port > 65535)
         return fail(usage);
     const nameFlag = head.indexOf("--name");
     const name = nameFlag !== -1 && head[nameFlag + 1] !== undefined ? String(head[nameFlag + 1]) : null;
     const protocol = head.includes("--udp") ? "udp" : "tcp";
+    const http = head.includes("--http");
+    const https = head.includes("--https");
+    if (http && https)
+        return fail(usage);
+    const browserScheme = https ? "https" : http ? "http" : null;
+    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 service = await withSpinner(protocol === "udp"
         ? `starting ${name ?? argv[0]} (udp :${port})…`
-        : `starting ${name ?? argv[0]} — waiting for :${port} to answer…`, api(config, "POST", `/sessions/${session.id}/services/run`, {
+        : `starting ${name ?? argv[0]} — waiting for :${port} to answer…`, mutateService(config, "POST", `/sessions/${session.id}/services/run`, {
         argv,
         port,
         name,
         protocol,
+        browserScheme,
     }));
     say(`${green("✓")} Service ${service.label ?? ""} · ${service.status}`);
-    say(`  ${cobalt(serviceUrl(config, service))}`);
+    printServiceEndpoint(service);
     say(dim(`  logs: mend service logs ${service.label ?? service.id.slice(0, 8)}`));
 };
-/**
- * Watch a supervised Service's output: record replay, then live tail. A DEAD
- * Service still answers — its record outlives the process — printed once
- * instead of followed.
- */
+/** Read sequence-addressed PTY output without attaching an input-capable terminal. */
 const serviceLogs = async (config, args) => {
-    const needle = args.find((a) => !a.startsWith("--"));
-    if (needle === undefined)
-        return fail("usage: mend service logs <name-or-id-prefix>");
-    const everything = await api(config, "GET", "/services?all=1");
-    const matches = everything.filter((service) => service.label === needle || service.id.startsWith(needle));
+    const fromFlag = args.indexOf("--from");
+    const from = fromFlag === -1 ? "0" : args[fromFlag + 1];
+    const needle = args.find((argument, index) => !argument.startsWith("--") && index !== fromFlag + 1);
+    if (needle === undefined || from === undefined || !/^(0|[1-9]\d*)$/.test(from)) {
+        return fail("usage: mend service logs <name-or-id-prefix> [--from <decimal-sequence>]");
+    }
+    const everything = await fetchServiceViews(config, true);
+    const matches = everything.filter((view) => view.service.name === needle ||
+        view.service.id.startsWith(needle) ||
+        view.attempts.some((attempt) => attempt.id.startsWith(needle)));
     if (matches.length === 0)
         return fail(`no service matches "${needle}"`);
-    // Prefer the live one; otherwise the newest ended one (list is newest-first).
-    const service = matches.find((m) => m.status !== "exited" && m.status !== "stopped") ?? matches[0];
-    if (service === undefined)
+    const view = matches.find((candidate) => {
+        const current = candidate.service.currentAttemptId === null
+            ? null
+            : candidate.attempts.find((attempt) => attempt.id === candidate.service.currentAttemptId);
+        return current !== null && current !== undefined && current.exitedAt === null;
+    }) ?? matches[0];
+    if (view === undefined)
         return fail(`no service matches "${needle}"`);
-    if (service.sealantSessionId === null) {
+    const currentAttempt = view.service.currentAttemptId === null
+        ? null
+        : (view.attempts.find((candidate) => candidate.id === view.service.currentAttemptId) ?? null);
+    const attempt = view.attempts.find((candidate) => candidate.id.startsWith(needle)) ??
+        currentAttempt ??
+        view.attempts.findLast((candidate) => candidate.sealantSessionId !== null) ??
+        null;
+    if (attempt?.sealantSessionId === null || attempt === null) {
         return fail(`"${needle}" is an adopted port — no process of Mend's, no logs. mend service run supervises.`);
     }
-    if (service.status === "exited" || service.status === "stopped") {
-        // Post-mortem: print the record, don't attach.
-        const output = await api(config, "GET", `/processes/${service.id}/output`);
-        say(dim(`${service.label ?? service.id.slice(0, 8)} · ${service.status} — recorded output:`));
-        say("");
-        process.stdout.write(output.text.endsWith("\n") ? output.text : `${output.text}\n`);
-        process.exit(0);
-    }
-    say(dim(`following ${service.label ?? service.id.slice(0, 8)} — Ctrl+C detaches, the service keeps running`));
+    const label = view.service.name;
+    say(dim(attempt.exitedAt === null
+        ? `following ${label} from sequence ${from} — Ctrl+C detaches, the Service keeps running`
+        : `${label} · ${attempt.status} — recorded output from sequence ${from}`));
     say("");
-    const outcome = await attachTty(config, service.sessionId, "service", 0n, service.id, {
-        readOnly: true,
-    });
-    if (outcome === "unavailable") {
-        return fail(`tty attach unavailable: could not connect to ${config.url}`);
+    let cursor = from;
+    let telemetryReported = false;
+    for (;;) {
+        const page = await api(config, "GET", `/processes/${attempt.id}/logs?from=${encodeURIComponent(cursor)}&limit=256`);
+        if (!telemetryReported) {
+            say(dim(`telemetry loss: ${page.telemetryLoss} · ${page.telemetryNote}`));
+            telemetryReported = true;
+        }
+        for (const chunk of page.chunks) {
+            process.stdout.write(Buffer.from(chunk.dataBase64, "base64"));
+        }
+        const advanced = page.nextFrom !== cursor;
+        cursor = page.nextFrom;
+        const ended = page.status === "exited" || page.status === "failed";
+        if (ended && !advanced)
+            break;
+        if (!advanced)
+            await new Promise((resolve) => setTimeout(resolve, 250));
     }
     say("");
-    say(dim("stream ended"));
-    process.exit(0);
+    say(dim(`stream ended · next sequence ${cursor}`));
 };
 const serviceRestart = async (config, args) => {
     const needle = args.find((a) => !a.startsWith("--"));
     if (needle === undefined)
         return fail("usage: mend service restart <name-or-id-prefix>");
     const service = await findLiveService(config, needle);
-    const restarted = await withSpinner(`restarting ${service.label ?? service.id.slice(0, 8)}…`, api(config, "POST", `/services/${service.id}/restart`));
+    const restarted = await withSpinner(`restarting ${service.label ?? service.id.slice(0, 8)}…`, mutateService(config, "POST", `/services/${service.id}/restart`));
     say(`${green("✓")} restarted · ${restarted.status}`);
-    say(`  ${cobalt(serviceUrl(config, restarted))}`);
+    printServiceEndpoint(restarted);
 };
 /**
  * Scaffold mend.toml from the project's own manifests. Static suggestion,
@@ -910,7 +1017,7 @@ const keysShare = async (config) => {
     if (agentSock === undefined || agentSock === "") {
         return fail("SSH_AUTH_SOCK is not set — start (or plug in) your ssh-agent first");
     }
-    const url = new URL(`${config.url}/api/keys/bridge/ws`);
+    const url = parseMendUrl(`${config.url}/api/keys/bridge/ws`);
     url.protocol = url.protocol === "https:" ? "wss:" : "ws:";
     url.searchParams.set("host", os.hostname());
     if (config.token !== null)
@@ -1040,8 +1147,9 @@ const dotfilesShow = async (config) => {
     }
     else {
         const branch = dotfiles.repository.ref ?? "default branch";
+        const subdir = dotfiles.repository.subdirectory === null ? [] : [`${dotfiles.repository.subdirectory}/`];
         const bootstrap = dotfiles.repository.bootstrap ? "install.sh on" : "install.sh off";
-        say(`repo      ${dotfiles.repository.url} ${dim(`(${branch} · ${bootstrap})`)}`);
+        say(`repo      ${dotfiles.repository.url} ${dim(`(${[branch, ...subdir, bootstrap].join(" · ")})`)}`);
     }
     if (dotfiles.snapshot === null) {
         say(`snapshot  ${dim("none — sync from this machine: mend dotfiles sync --all")}`);
@@ -1101,7 +1209,7 @@ const envLoad = async (config, args) => {
     // `--secret` alone sends everything to Secrets; `--secret A,B` only those names (for the
     // ordinary-looking ones that embed credentials, like DATABASE_URL). Routing is by NAME.
     const secretFlag = args.indexOf("--secret");
-    const secretArg = secretFlag !== -1 ? args[secretFlag + 1] : undefined;
+    const secretArg = secretFlag === -1 ? undefined : args[secretFlag + 1];
     const secretNames = secretArg !== undefined &&
         !secretArg.startsWith("--") &&
         !secretArg.includes("/") &&
@@ -1317,9 +1425,14 @@ const supervisedRun = async (config, session, argv) => {
             }
             if (event.type === "session") {
                 const detail = await api(config, "GET", `/sessions/${session.id}`);
-                if (["completed", "failed", "stopped"].includes(detail.session.status)) {
-                    settled = detail.session.status;
-                }
+                // The agent's own end settles the wait: the session fold may read `idle` while a
+                // shell still holds the workspace.
+                const ended = agentOutcome(detail.currentAgent) ??
+                    (["completed", "failed", "stopped"].includes(detail.session.status)
+                        ? detail.session.status
+                        : null);
+                if (ended !== null)
+                    settled = ended;
             }
         }
     }
@@ -1331,19 +1444,14 @@ const supervisedRun = async (config, session, argv) => {
 };
 /**
  * The second half of the review loop (plan §7.3): find the session with a
- * pending follow-up, deliver it (which reopens the session), and relaunch the
- * harness in the same worktree with the instruction as its prompt.
+ * pending follow-up and retry the one server-owned delivery operation. The
+ * server persists intent, launches, correlates membership, and finalizes.
  */
 const continueSession = async (config, args) => {
     const explicitSession = args.find((a) => !a.startsWith("--")) ?? null;
     let sessionId = explicitSession;
     let followUp = null;
-    if (sessionId !== null) {
-        followUp = await api(config, "GET", `/sessions/${sessionId}/follow-up`);
-        if (followUp === null)
-            return fail(`session ${sessionId} has no pending follow-up`);
-    }
-    else {
+    if (sessionId === null) {
         // Search the cwd's project, newest sessions first.
         const project = await findProject(config, null);
         const detail = await api(config, "GET", `/projects/${project.id}`);
@@ -1359,42 +1467,52 @@ const continueSession = async (config, args) => {
             return fail("no session with a pending follow-up — send one from the review first");
         }
     }
+    else {
+        followUp = await api(config, "GET", `/sessions/${sessionId}/follow-up`);
+        if (followUp === null)
+            return fail(`session ${sessionId} has no pending follow-up`);
+    }
     const detail = await api(config, "GET", `/sessions/${sessionId}`);
     const session = detail.session;
-    const projects = await api(config, "GET", "/projects");
-    const project = projects.find((p) => p.id === session.projectId);
-    if (project === undefined)
-        return fail(`project ${session.projectId} not found`);
-    const worktree = worktreePathOf(project.storePath, session.worktree);
-    const build = CONTINUE_COMMANDS[session.harness];
     say(`${green("✓")} follow-up for session ${dim(session.id.slice(0, 8))} · ${session.branch}`);
     say(dim("  instruction:"));
     for (const line of followUp.instruction.split("\n").slice(0, 6))
         say(dim(`  │ ${line}`));
     if (followUp.instruction.split("\n").length > 6)
         say(dim("  │ …"));
-    if (build === undefined) {
-        say("");
-        say(`${amber("  cannot relaunch")} ${dim(`— harness "${session.harness}" has no known resume command.`)}`);
-        say(dim(`  run it yourself in ${worktree}; the follow-up stays pending.`));
-        process.exit(1);
+    if (followUp.reviewSliceId === null ||
+        followUp.checkpointAId === null ||
+        followUp.checkpointBId === null ||
+        followUp.diffDigest === null ||
+        followUp.idempotencyKey === null) {
+        return fail("legacy follow-up — recreate it from a pinned Review before delivery");
+    }
+    const delivered = await withSpinner("delivering persisted Review bundle — retries reconcile one process…", api(config, "POST", `/sessions/${session.id}/follow-up/deliver`, {
+        reviewSliceId: followUp.reviewSliceId,
+        checkpointAId: followUp.checkpointAId,
+        checkpointBId: followUp.checkpointBId,
+        diffDigest: followUp.diffDigest,
+        commentIds: followUp.commentIds,
+        instruction: followUp.instruction,
+        idempotencyKey: followUp.idempotencyKey,
+    }));
+    if (delivered.status === "pending") {
+        return fail("the session is active — the follow-up remains pending");
+    }
+    if (delivered.status === "delivery_failed") {
+        return fail(delivered.deliveryError ?? "delivery failed before process membership finalized");
     }
-    await api(config, "POST", `/sessions/${session.id}/follow-up/deliver`);
-    say(`${green("✓")} delivered · session reopened`);
+    say(`${green("✓ recording")} · delivered to run ${delivered.deliverySealantRunId ?? "unknown"}${detachHint()}`);
     say(`${cobalt("  watch")} · ${config.url}/sessions/${session.id}`);
-    // Relaunch SUPERVISED, exactly like a fresh `mend <harness>`: a new
-    // workspace mounts the SAME worktree, the platform PTY runs the harness
-    // with the instruction as its opening prompt, and the record continues —
-    // the web session page shows the live terminal throughout.
-    const argv = build(followUp.instruction);
-    await withSpinner("provisioning workspace — the resumed run records like any other…", api(config, "POST", `/sessions/${session.id}/launch`, { argv }));
-    say(`${green("✓ recording")} · workspace mounts the worktree${detachHint()}`);
     say("");
     await attachOrExit(config, session.id, session.harness);
     exitAfterSessionEnd(config, session.id);
 };
 // ─── resume: rejoin a session — same worktree, restored harness state ───────
 const ACTIVE_STATUSES = LIVE_STATUSES;
+/** Whether a listed session's AGENT is live — the annotation carries its current agent process. */
+const agentLiveIn = (detail, session) => agentIsLive(session, detail.annotations.find((annotation) => annotation.sessionId === session.id)?.currentAgent ??
+    null);
 /**
  * Sessions are continuous work, not runs: `mend resume` rejoins one on a
  * fresh workspace — saved harness state restored, a claude resume is native
@@ -1407,15 +1525,15 @@ const resumeCommand = async (config, args) => {
     const prefix = args.find((a, i) => !a.startsWith("--") && i !== withFlag + 1);
     const project = await findProject(config, null);
     const detail = await api(config, "GET", `/projects/${project.id}`);
-    const match = prefix !== undefined
-        ? detail.sessions.find((s) => s.id.startsWith(prefix))
-        : detail.sessions.find((s) => !ACTIVE_STATUSES.has(s.status));
+    const match = prefix === undefined
+        ? detail.sessions.find((s) => !agentLiveIn(detail, s))
+        : detail.sessions.find((s) => s.id.startsWith(prefix));
     if (match === undefined) {
-        return fail(prefix !== undefined
-            ? `no session matches "${prefix}"`
-            : "no settled session to resume — mend status lists sessions");
+        return fail(prefix === undefined
+            ? "no settled session to resume — mend status lists sessions"
+            : `no session matches "${prefix}"`);
     }
-    if (ACTIVE_STATUSES.has(match.status)) {
+    if (agentLiveIn(detail, match)) {
         return fail(`session ${match.id.slice(0, 8)} is live — attach: mend attach ${match.id.slice(0, 8)}`);
     }
     say(`${green("✓")} resuming ${match.harness} · ${dim(match.id.slice(0, 8))}${withHarness === null ? "" : ` ${dim("as")} ${withHarness}`}`);
@@ -1440,7 +1558,7 @@ const resumeForRejoin = async (config, sessionId, label) => {
     }
     catch (error) {
         const refreshed = await api(config, "GET", `/sessions/${sessionId}`);
-        if (ACTIVE_STATUSES.has(refreshed.session.status))
+        if (agentIsLive(refreshed.session, refreshed.currentAgent))
             return false;
         return fail(error instanceof Error ? error.message : String(error));
     }
@@ -1456,7 +1574,7 @@ const rejoinCommand = async (config, args) => {
     const eligible = detail.sessions
         .filter((session) => harness === null || session.harness === harness)
         .toSorted((left, right) => right.createdAt.localeCompare(left.createdAt));
-    const newest = eligible.find((session) => ACTIVE_STATUSES.has(session.status)) ?? eligible[0];
+    const newest = eligible.find((session) => agentLiveIn(detail, session)) ?? eligible[0];
     const matches = prefix === undefined
         ? newest === undefined
             ? []
@@ -1474,10 +1592,11 @@ const rejoinCommand = async (config, args) => {
     const session = matches[0];
     if (session === undefined)
         return fail("session selection failed");
-    say(`${green("✓")} rejoining ${session.harness} · ${dim(session.id.slice(0, 8))} · ${ACTIVE_STATUSES.has(session.status) ? "already live" : "restoring"}`);
+    const alreadyLive = agentLiveIn(detail, session);
+    say(`${green("✓")} rejoining ${session.harness} · ${dim(session.id.slice(0, 8))} · ${alreadyLive ? "already live" : "restoring"}`);
     say(`${cobalt("  watch")} · ${config.url}/sessions/${session.id}`);
     let restored = false;
-    if (!ACTIVE_STATUSES.has(session.status)) {
+    if (!alreadyLive) {
         restored = await resumeForRejoin(config, session.id, "resuming — a fresh workspace restores the saved session state…");
     }
     say(restored
@@ -1487,7 +1606,7 @@ const rejoinCommand = async (config, args) => {
     let outcome = await attachTty(config, session.id, session.harness, 0n);
     if (outcome === "unavailable") {
         const refreshed = await api(config, "GET", `/sessions/${session.id}`);
-        if (!ACTIVE_STATUSES.has(refreshed.session.status)) {
+        if (!agentIsLive(refreshed.session, refreshed.currentAgent)) {
             await resumeForRejoin(config, session.id, "session settled while attaching — restoring it once…");
         }
         outcome = await attachTty(config, session.id, session.harness, 0n);
@@ -1511,11 +1630,16 @@ const projectsCommand = async (config) => {
     }
     const nameWidth = Math.max(...projects.map((p) => p.name.length));
     const branchWidth = Math.max(...projects.map((p) => p.defaultBranch.length));
+    // The cwd's project is marked — the same resolution mend claude|shell use.
+    const here = matchProjectByCwd(projects, cwdFacts(process.cwd()));
     for (const project of projects) {
         const live = liveByProject.get(project.id) ?? 0;
         const liveLabel = live > 0 ? green(`${live} live`) : dim("—");
-        say(`${project.name.padEnd(nameWidth)}  ${dim(project.defaultBranch.padEnd(branchWidth))}  ${liveLabel}  ${dim(project.storePath)}`);
+        const marker = project.id === here?.id ? cobalt("▸ ") : "  ";
+        say(`${marker}${project.name.padEnd(nameWidth)}  ${dim(project.defaultBranch.padEnd(branchWidth))}  ${liveLabel}  ${dim(project.storePath)}`);
     }
+    if (here !== undefined)
+        say(dim(`  ▸ ${here.name} is the cwd's project`));
 };
 const printSessionRow = (row) => {
     const { session, annotation } = row;
@@ -1667,7 +1791,12 @@ const HELP = `mend — the agent workbench
   mend dotfiles sync [--all | paths…]   capture config files from THIS machine into your store
   mend keys share                       relay THIS machine's ssh-agent to the server (bridge mode:
                                         hardware keys sign here; Ctrl-C stops sharing)
-  mend codex|claude|opencode            new session worktree + launch the harness in it
+  mend codex|claude|opencode ["prompt"] [--model <id>] [--effort low|medium|high|xhigh|max]
+                             [--base <ref>] [--ask] [--fast]
+                                        new session worktree + launch the harness in it; a quoted
+                                        prompt becomes its first message (and names the session),
+                                        --ask restores the harness's permission prompts, --fast
+                                        requests priority processing (codex service tier)
   mend run -- <command...>              same, with an arbitrary command
   mend attach <session-id-prefix>       reattach this terminal to a running session
   mend shell [session-id-prefix]        open a shell in a live session's workspace

package/dist/review-workflow.js

@@ -1,15 +1,8 @@
-import { CONTINUE_COMMANDS } from "./shared.js";
 export const reviewTargetForSession = (session, annotation, projectName) => annotation?.changeId === null || annotation?.changeId === undefined
     ? null
     : { session, changeId: annotation.changeId, projectName };
 export const commentRange = (start, current) => start === null
     ? { line: current, endLine: null }
     : { line: Math.min(start, current), endLine: Math.max(start, current) };
-/** Close the review loop without changing session identity or worktree. */
-export const deliverReview = async (api, session, instruction) => {
-    const build = CONTINUE_COMMANDS[session.harness];
-    if (build === undefined)
-        throw new Error(`Harness “${session.harness}” has no known relaunch command`);
-    await api("POST", `/sessions/${session.id}/follow-up/deliver`, {});
-    await api("POST", `/sessions/${session.id}/launch`, { argv: build(instruction) });
-};
+/** One server-owned operation: persist intent, launch, correlate, finalize. */
+export const deliverReview = (api, sessionId, input) => api("POST", `/sessions/${sessionId}/follow-up/deliver`, input);

package/dist/review.js

@@ -1,12 +1,11 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "@opentui/react/jsx-runtime";
-import { createHash } from "node:crypto";
+import { createHash, randomUUID } from "node:crypto";
 import { RGBA, SyntaxStyle, } from "@opentui/core";
 import { useKeyboard, useTerminalDimensions } from "@opentui/react";
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { assembleReviewInstruction, buildReviewFiles, visibleWhitespace, } from "./review-model.js";
 import { commentRange, deliverReview } from "./review-workflow.js";
-import { LIVE_STATUSES } from "./shared.js";
 import { openUrl } from "./terminal.js";
 import { ADD_WASH, AMBER, BG, COBALT, DELETE_WASH, FAINT, GREEN, INK, INK_2, MUTED, PANEL, RED, RULE, SYNTAX_FUNCTION, SYNTAX_KEYWORD, SYNTAX_NUMBER, SYNTAX_STRING, WASH, } from "./tui-theme.js";
 const REVIEW_KEY = (changeId) => ["review", changeId];
@@ -27,7 +26,19 @@ const truncate = (text, width) => {
     return oneLine.length <= width ? oneLine : `${oneLine.slice(0, width - 1)}…`;
 };
 const fetchReview = async (ctx, changeId) => {
-    const wire = await ctx.api("GET", `/changes/${changeId}/diff`);
+    const opened = await ctx.api("POST", `/changes/${changeId}/reviews/open`, {
+        idempotencyKey: `cli-review:${changeId}`,
+    });
+    const pinned = await ctx.api("GET", `/changes/${changeId}/reviews/${opened.slice.id}/diff`);
+    const wire = {
+        change: pinned.change,
+        diff: pinned.patch,
+        files: pinned.files.map((file) => ({
+            path: file.newPath ?? file.oldPath ?? "unknown path",
+            additions: file.additions,
+            deletions: file.deletions,
+        })),
+    };
     const [comments, tour, passes, followUp, sessionDetail] = await Promise.all([
         ctx.api("GET", `/changes/${changeId}/comments`),
         ctx.api("GET", `/changes/${changeId}/tour`),
@@ -37,6 +48,11 @@ const fetchReview = async (ctx, changeId) => {
     ]);
     return {
         wire,
+        sliceId: pinned.slice.id,
+        checkpointAId: pinned.checkpointA.id,
+        checkpointBId: pinned.checkpointB.id,
+        diffDigest: pinned.slice.diffDigest,
+        anchorFiles: pinned.anchorFiles,
         files: buildReviewFiles(wire.diff, wire.files),
         comments,
         tour,
@@ -113,14 +129,13 @@ export function ReviewScreen({ ctx, projectName, session, changeId, onBack, onQu
     const [editor, setEditor] = useState(null);
     const [busy, setBusy] = useState(false);
     const [status, setStatus] = useState("");
-    const [checkpointState, setCheckpointState] = useState("recording");
+    const checkpointState = data === undefined ? (isFetching ? "recording" : "failed") : "recorded";
     const lockRef = useRef(false);
     const editorRef = useRef(null);
     const diffRef = useRef(null);
     const diffScrollRef = useRef(null);
     const fileScrollRef = useRef(null);
     const commentScrollRef = useRef(null);
-    const checkpointedRef = useRef(false);
     const files = useMemo(() => {
         const order = {
             added: 0,
@@ -152,21 +167,6 @@ export function ReviewScreen({ ctx, projectName, session, changeId, onBack, onQu
     const refresh = () => {
         void queryClient.invalidateQueries({ queryKey: REVIEW_KEY(changeId) });
     };
-    const recordReviewCheckpoint = () => {
-        if (checkpointedRef.current)
-            return;
-        checkpointedRef.current = true;
-        setCheckpointState("recording");
-        void ctx
-            .api("POST", `/sessions/${session.id}/checkpoints`, { trigger: "review-open" })
-            .then(() => setCheckpointState("recorded"))
-            .catch((error) => {
-            checkpointedRef.current = false;
-            setCheckpointState("failed");
-            setStatus(`Checkpoint not recorded · ${errorMessage(error)} · K retries`);
-        });
-    };
-    useEffect(recordReviewCheckpoint, [ctx, session.id]);
     useEffect(() => {
         fileScrollRef.current?.scrollTo(Math.max(0, fileIndex * 2 - 2));
     }, [fileIndex]);
@@ -325,6 +325,8 @@ export function ReviewScreen({ ctx, projectName, session, changeId, onBack, onQu
         setEditor({
             kind: "send",
             instruction: assembleReviewInstruction(data.wire.change, sendable),
+            commentIds: sendable.map((comment) => comment.id),
+            idempotencyKey: `cli-follow-up:${data.sliceId}:${randomUUID()}`,
         });
     };
     const submitEditor = async () => {
@@ -338,17 +340,54 @@ export function ReviewScreen({ ctx, projectName, session, changeId, onBack, onQu
         setWorking(true);
         try {
             if (editor.kind === "comment") {
-                await ctx.api("POST", `/changes/${changeId}/comments`, {
-                    file: editor.file,
-                    line: editor.line,
-                    endLine: editor.endLine,
+                if (data === undefined)
+                    throw new Error("The pinned Review is not available.");
+                const anchorFile = data.anchorFiles.find((file) => (file.newPath ?? file.oldPath) === editor.file);
+                const endLine = editor.endLine ?? editor.line;
+                const hunk = editor.line === null || endLine === null
+                    ? null
+                    : (anchorFile?.hunks.find((candidate) => candidate.newLines > 0 &&
+                        editor.line !== null &&
+                        editor.line >= candidate.newStart &&
+                        endLine <= candidate.newStart + candidate.newLines - 1) ?? null);
+                if (editor.file !== null && (anchorFile === undefined || hunk === null)) {
+                    throw new Error("The selected line is outside the pinned Review anchor.");
+                }
+                await ctx.api("POST", `/changes/${changeId}/reviews/${data.sliceId}/comments`, {
+                    target: editor.file === null
+                        ? {
+                            oldPath: null,
+                            newPath: null,
+                            side: null,
+                            startLine: null,
+                            endLine: null,
+                            hunkContextHash: null,
+                        }
+                        : {
+                            oldPath: anchorFile?.oldPath ?? null,
+                            newPath: anchorFile?.newPath ?? null,
+                            side: "new",
+                            startLine: editor.line,
+                            endLine,
+                            hunkContextHash: hunk?.contextHash ?? null,
+                        },
                     body: value,
                 });
                 setStatus(editor.file === null ? "Change comment saved" : "Inline comment saved");
             }
             else {
-                await ctx.api("POST", `/sessions/${session.id}/follow-up`, { instruction: value });
-                setStatus("Follow-up saved · y delivers it and relaunches the same session");
+                if (data === undefined)
+                    throw new Error("The pinned Review is not available.");
+                await deliverReview(ctx.api, session.id, {
+                    reviewSliceId: data.sliceId,
+                    checkpointAId: data.checkpointAId,
+                    checkpointBId: data.checkpointBId,
+                    diffDigest: data.diffDigest,
+                    commentIds: editor.commentIds,
+                    instruction: value,
+                    idempotencyKey: editor.idempotencyKey,
+                });
+                setStatus("Follow-up delivery requested · retry keeps the same run");
             }
             setEditor(null);
             refresh();
@@ -366,16 +405,29 @@ export function ReviewScreen({ ctx, projectName, session, changeId, onBack, onQu
         void runAction(`${state} ${anchorOf(selectedComment)}`, () => ctx.api("POST", `/changes/${changeId}/comments/${selectedComment.id}/state`, { state }));
     };
     const deliverAndRelaunch = () => {
-        if (data?.followUp?.status !== "pending") {
-            setStatus("No pending follow-up — s assembles the open review comments first");
+        const followUp = data?.followUp ?? null;
+        if (followUp === null || followUp.status === "delivered" || followUp.status === "superseded") {
+            setStatus("No retryable follow-up — s assembles the open Review comments first");
             return;
         }
-        if (LIVE_STATUSES.has(data.sessionStatus)) {
-            setStatus("The session is live — deliver the pending follow-up once it settles");
+        if (followUp.reviewSliceId === null ||
+            followUp.checkpointAId === null ||
+            followUp.checkpointBId === null ||
+            followUp.diffDigest === null ||
+            followUp.idempotencyKey === null) {
+            setStatus("Legacy follow-up · recreate it from a pinned Review before delivery");
             return;
         }
-        const instruction = data.followUp.instruction;
-        void runAction("Delivering review and relaunching the same session", () => deliverReview(ctx.api, session, instruction), "Review delivered · the same session is running · diff updates live");
+        const input = {
+            reviewSliceId: followUp.reviewSliceId,
+            checkpointAId: followUp.checkpointAId,
+            checkpointBId: followUp.checkpointBId,
+            diffDigest: followUp.diffDigest,
+            commentIds: followUp.commentIds,
+            instruction: followUp.instruction,
+            idempotencyKey: followUp.idempotencyKey,
+        };
+        void runAction("Delivering the persisted Review bundle", () => deliverReview(ctx.api, session.id, input), "Delivery reconciled · the same idempotency key names one run");
     };
     const focusOrder = wide
         ? ["files", "diff", "comments"]
@@ -410,12 +462,6 @@ export function ReviewScreen({ ctx, projectName, session, changeId, onBack, onQu
             setStatus("Refreshing live change…");
             return refresh();
         }
-        if (key.name === "k" && key.shift) {
-            if (checkpointState !== "failed")
-                return;
-            recordReviewCheckpoint();
-            return;
-        }
         if (key.name === "o") {
             openUrl(`${ctx.config.url}/changes/${changeId}`);
             setStatus("Opened web review");
@@ -518,13 +564,13 @@ export function ReviewScreen({ ctx, projectName, session, changeId, onBack, onQu
     const displayPatch = selectedFile === null || !showWhitespace
         ? (selectedFile?.patch ?? "")
         : visibleWhitespace(selectedFile.patch);
-    const footer = editor !== null
-        ? " ctrl+enter save · esc cancel"
-        : focus === "files"
+    const footer = editor === null
+        ? focus === "files"
             ? " files · ↑↓/jk move · enter review · tab pane · esc back · q quit"
             : focus === "comments"
                 ? " comments · ↑↓/jk move · enter anchor · a accept/address · x dismiss · u reopen · tab pane"
-                : ` diff · ↑↓/jk lines · n/p files · [/ ] hunks · v range${rangeStart === null ? "" : `:${rangeStart}`} · c inline · C change · d layout · w wrap · z whitespace`;
+                : ` diff · ↑↓/jk lines · n/p files · [/ ] hunks · v range${rangeStart === null ? "" : `:${rangeStart}`} · c inline · C change · d layout · w wrap · z whitespace`
+        : " ctrl+enter save · esc cancel";
     const sidebar = wide ? (_jsxs("box", { width: 36, flexShrink: 0, flexDirection: "column", backgroundColor: BG, children: [_jsx("box", { border: true, borderStyle: "rounded", borderColor: focus === "files" ? COBALT : RULE, title: ` files · ${files.length} `, titleAlignment: "left", backgroundColor: PANEL, flexGrow: 1, minHeight: 6, children: _jsx("scrollbox", { ref: fileScrollRef, focused: focus === "files", flexGrow: 1, minHeight: 0, style: {
                         rootOptions: { backgroundColor: PANEL, border: false },
                         wrapperOptions: { backgroundColor: PANEL },
@@ -553,7 +599,7 @@ export function ReviewScreen({ ctx, projectName, session, changeId, onBack, onQu
                                         contentOptions: { backgroundColor: PANEL },
                                     }, children: _jsx("diff", { ref: diffRef, diff: displayPatch, view: view, syncScroll: true, ...(selectedFile.filetype === undefined
                                             ? {}
-                                            : { filetype: selectedFile.filetype }), syntaxStyle: syntaxStyle, wrapMode: wrap ? "word" : "none", showLineNumbers: true, fg: INK, lineNumberFg: FAINT, lineNumberBg: "transparent", contextBg: "transparent", contextContentBg: "transparent", addedBg: ADD_WASH, addedContentBg: ADD_WASH, removedBg: DELETE_WASH, removedContentBg: DELETE_WASH, addedSignColor: GREEN, removedSignColor: RED, addedLineNumberBg: "transparent", removedLineNumberBg: "transparent", selectionBg: WASH, selectionFg: INK, width: "100%", height: displayRows, flexShrink: 0 }, `${selectedFile.path}-${view}-${wrap}-${showWhitespace}`) })) }), focus === "comments" && detailComment !== null ? (_jsx(EvidenceCard, { comment: detailComment, width: wide ? width - 38 : width })) : height < 30 && activeTourStop !== null ? (_jsx(CompactTourEvidence, { stop: activeTourStop, index: activeTourIndex, total: tourStops.length, width: width })) : detailComment !== null ? (_jsx(EvidenceCard, { comment: detailComment, width: wide ? width - 38 : width })) : null] })] }), editor === null ? null : (_jsx(EditorPanel, { editor: editor, refValue: editorRef, busy: busy, onSubmit: () => void submitEditor() })), _jsx("text", { height: 1, fg: status === "" ? FAINT : AMBER, bg: "transparent", children: status === ""
+                                            : { filetype: selectedFile.filetype }), syntaxStyle: syntaxStyle, wrapMode: wrap ? "word" : "none", showLineNumbers: true, fg: INK, lineNumberFg: FAINT, lineNumberBg: "transparent", contextBg: "transparent", contextContentBg: "transparent", addedBg: ADD_WASH, addedContentBg: ADD_WASH, removedBg: DELETE_WASH, removedContentBg: DELETE_WASH, addedSignColor: GREEN, removedSignColor: RED, addedLineNumberBg: "transparent", removedLineNumberBg: "transparent", selectionBg: WASH, selectionFg: INK, width: "100%", height: displayRows, flexShrink: 0 }, `${selectedFile.path}-${view}-${wrap}-${showWhitespace}`) })) }), focus === "comments" && detailComment !== null ? (_jsx(EvidenceCard, { comment: detailComment, width: wide ? width - 38 : width })) : height < 30 && activeTourStop !== null ? (_jsx(CompactTourEvidence, { stop: activeTourStop, index: activeTourIndex, total: tourStops.length, width: width })) : detailComment === null ? null : (_jsx(EvidenceCard, { comment: detailComment, width: wide ? width - 38 : width }))] })] }), editor === null ? null : (_jsx(EditorPanel, { editor: editor, refValue: editorRef, busy: busy, onSubmit: () => void submitEditor() })), _jsx("text", { height: 1, fg: status === "" ? FAINT : AMBER, bg: "transparent", children: status === ""
                     ? ` m read · g suggest · t tour · ,/. tour stops · s draft review${data.followUp?.status === "pending" ? " · y deliver & relaunch" : ""} · o web · r refresh`
                     : ` ${status}` }), _jsx("text", { height: 1, fg: FAINT, bg: "transparent", children: footer })] }));
 }

package/dist/shared.js

@@ -18,17 +18,163 @@ export const CONTINUE_COMMANDS = {
     claude: (instruction) => ["claude", instruction],
     opencode: (instruction) => ["opencode", "run", instruction],
 };
+/** Mirror of @mend/domain/workbench harness-launch.ts — the CLI ships dependency-free. */
+export const EFFORT_LEVELS = ["low", "medium", "high", "xhigh", "max"];
+const LAUNCH_ERROR = {
+    project: null,
+    prompt: null,
+    model: null,
+    effort: null,
+    base: null,
+    ask: false,
+    fast: false,
+    custom: [],
+};
+/**
+ * `mend claude|codex|opencode ["prompt"] [--model <id>] [--effort <level>]
+ * [--base <ref>] [--ask] [--project <p>]`, plus `mend run … -- <command...>`.
+ * The first non-flag positional is the prompt; a second one is an error so a
+ * forgotten quote fails loudly instead of launching with half a sentence.
+ */
+export const parseLaunchArgs = (args) => {
+    const dashdash = args.indexOf("--");
+    const custom = dashdash === -1 ? [] : args.slice(dashdash + 1);
+    const flagArgs = dashdash === -1 ? args : args.slice(0, dashdash);
+    let project = null;
+    let prompt = null;
+    let model = null;
+    let effort = null;
+    let base = null;
+    let ask = false;
+    let fast = false;
+    for (let index = 0; index < flagArgs.length; index += 1) {
+        const arg = flagArgs[index] ?? "";
+        if (arg === "--ask") {
+            ask = true;
+            continue;
+        }
+        if (arg === "--fast") {
+            fast = true;
+            continue;
+        }
+        if (arg === "--project" || arg === "--model" || arg === "--effort" || arg === "--base") {
+            const value = flagArgs[index + 1];
+            if (value === undefined)
+                return { ...LAUNCH_ERROR, error: `${arg} needs a value` };
+            if (arg === "--project")
+                project = value;
+            else if (arg === "--model")
+                model = value;
+            else if (arg === "--effort")
+                effort = value;
+            else
+                base = value;
+            index += 1;
+            continue;
+        }
+        if (arg.startsWith("-")) {
+            // Also catches a prompt starting with "-", which the harness would
+            // otherwise read as a flag of its own.
+            return {
+                ...LAUNCH_ERROR,
+                error: `unknown flag ${arg} — quote the prompt if it starts with "-"`,
+            };
+        }
+        if (prompt !== null) {
+            return {
+                ...LAUNCH_ERROR,
+                error: 'one prompt only — quote it: mend claude "fix the auth test"',
+            };
+        }
+        prompt = arg;
+    }
+    if (effort !== null && !EFFORT_LEVELS.includes(effort)) {
+        return { ...LAUNCH_ERROR, error: `--effort must be one of ${EFFORT_LEVELS.join(", ")}` };
+    }
+    return { project, prompt, model, effort, base, ask, fast, custom, error: null };
+};
 export const LIVE_STATUSES = new Set([
     "starting",
     "running",
     "waiting",
     "idle",
 ]);
-/** The cwd's adopted project: adopted-from-here first, then a basename match. */
-export const matchProjectByCwd = (projects, cwd) => {
-    const byOrigin = projects.find((p) => p.originUrl !== null && cwd.startsWith(p.originUrl));
-    const byName = projects.find((p) => p.name === path.basename(cwd));
-    return byOrigin ?? byName;
+/**
+ * Whether the session's AGENT is live. Session status is a fold over every process — a session
+ * reads `idle` while a shell holds the workspace after its agent ended — so the agent's own row
+ * answers when one exists; `starting` is a launch with no row yet.
+ */
+export const agentIsLive = (session, currentAgent) => currentAgent === null
+    ? LIVE_STATUSES.has(session.status)
+    : session.status === "starting" ||
+        (currentAgent.exitedAt === null &&
+            (currentAgent.status === "starting" || currentAgent.status === "running"));
+/** What an ended agent process's exit says about the work; null while it runs. */
+export const agentOutcome = (currentAgent) => {
+    if (currentAgent === null || currentAgent.exitedAt === null)
+        return null;
+    if (currentAgent.status === "stopped")
+        return "stopped";
+    if (currentAgent.harness === "shell")
+        return "completed";
+    return currentAgent.exitCode === null || currentAgent.exitCode === 0 ? "completed" : "failed";
+};
+/**
+ * A git remote URL reduced to `host/owner/name` so https, ssh, scp-style, and
+ * `.git` spellings of the same repository compare equal. Null for anything
+ * that is not a URL-ish remote (a local path stays a path).
+ */
+export const normalizeRemoteUrl = (raw) => {
+    if (raw === null)
+        return null;
+    const trimmed = raw.trim();
+    if (trimmed === "")
+        return null;
+    const scp = /^(?:[^@\s/]+@)?([^:/\s]+):(?!\/)(.+)$/.exec(trimmed);
+    const url = /^[a-z][a-z0-9+.-]*:\/\/(?:[^@/]+@)?([^/\s:]+)(?::\d+)?\/(.+)$/i.exec(trimmed);
+    const parts = url ?? scp;
+    if (parts === null)
+        return null;
+    const [, host, rest] = parts;
+    if (host === undefined || rest === undefined)
+        return null;
+    const repoPath = rest.replace(/\/+$/, "").replace(/\.git$/i, "");
+    return `${host.toLowerCase()}/${repoPath.toLowerCase()}`;
+};
+/**
+ * The cwd's adopted project, in order: a project adopted from this very
+ * path; a project whose origin is the same remote as the cwd repo's origin
+ * (normalized, so a GitHub-adopted project matches a clone of it anywhere);
+ * a project named like the repository root (through the same normalization
+ * adopt uses, so a checkout called "Mend" matches the project "mend").
+ */
+export const matchProjectByCwd = (projects, facts) => {
+    const root = facts.repoRoot ?? facts.cwd;
+    const byPath = projects.find((p) => p.originUrl !== null &&
+        !p.originUrl.includes("://") &&
+        (root === p.originUrl ||
+            facts.cwd === p.originUrl ||
+            facts.cwd.startsWith(`${p.originUrl}/`)));
+    if (byPath !== undefined)
+        return byPath;
+    const remote = normalizeRemoteUrl(facts.originUrl);
+    const byRemote = remote === null ? undefined : projects.find((p) => normalizeRemoteUrl(p.originUrl) === remote);
+    if (byRemote !== undefined)
+        return byRemote;
+    const name = normalizeProjectName(path.basename(root));
+    return projects.find((p) => p.name === name);
+};
+/** Read the cwd's facts from git once; callers pass them to the matcher. */
+export const cwdFacts = (cwd) => ({
+    cwd,
+    repoRoot: gitTopLevel(cwd),
+    originUrl: gitOriginUrl(cwd),
+});
+/** The cwd repo's origin remote, or null when there is no repo or no origin. */
+export const gitOriginUrl = (cwd) => {
+    const result = spawnSync("git", ["remote", "get-url", "origin"], { cwd, encoding: "utf8" });
+    const out = result.status === 0 ? result.stdout.trim() : "";
+    return out === "" ? null : out;
 };
 /** The repository root of `cwd`, or null when it is not inside a git repo. */
 export const gitTopLevel = (cwd) => {

package/package.json

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