@retasc/cli 1.7.0 → 1.7.2

package/dist/commands/bind.js

@@ -63,6 +63,25 @@ export async function pick(label, items, render, askFn = ask) {
     }
     throw new Error("no valid choice — aborting");
 }
+/**
+ * The message to show when `bind` aborts mid-run, or null when there's nothing
+ * to say. `bind` commits a new org server-side before the project step; if a
+ * later step throws, that org is stranded (no project, no key, no binding) and
+ * unreachable from the CLI. There's no CLI-callable org delete, so we surface
+ * the id and the resume command instead (RTSC-297, Option 2).
+ *
+ * It fires ONLY for an org THIS run created that never got bound. A merely
+ * SELECTED org (or one already bound before the failure) is not ours to
+ * reclaim, and returns null — nothing extra is printed.
+ */
+export function strandRecoveryHint(args) {
+    const { createdOrgThisRun, orgId, bindingWritten } = args;
+    if (!createdOrgThisRun || !orgId || bindingWritten)
+        return null;
+    return (`\n✗ Aborted before this folder was bound. A new org was created (${orgId}) ` +
+        `but has no project or key yet — re-run to finish:\n` +
+        `    retasc bind --org-id ${orgId}`);
+}
 export async function bindAction(opts) {
     const cfg = loadConfig();
     const cwd = process.cwd();
@@ -106,10 +125,20 @@ export async function bindAction(opts) {
         }
     }
     // --- resolve org (pick / flag / create) ------------------------------------
+    // Track whether THIS run created the org (vs. selected a pre-existing one or
+    // took one via --org-id). An org is created and committed server-side BEFORE
+    // the project step runs, so any abort in the project/mint/bind steps below
+    // strands it: no project, no key, no local binding — invisible from the CLI,
+    // and (orgs land on the billing rail) accumulating against the account on
+    // repeated aborts. There's no CLI-callable org delete, so instead we name the
+    // stranded org in the error and print the command to resume (RTSC-297). A
+    // merely-SELECTED org must never trigger this — it isn't ours to reclaim.
     let orgId = opts.orgId;
+    let createdOrgThisRun = false;
     if (!orgId && opts.orgName) {
         const org = (await api.createOrg({ name: opts.orgName }));
         orgId = org.orgId;
+        createdOrgThisRun = true;
         console.log(`✓ Created org "${opts.orgName}".`);
     }
     if (!orgId) {
@@ -125,6 +154,7 @@ export async function bindAction(opts) {
                 if (!name)
                     throw new Error("org name required");
                 orgId = (await api.createOrg({ name })).orgId;
+                createdOrgThisRun = true;
                 console.log(`✓ Created org "${name}".`);
             }
         }
@@ -135,76 +165,89 @@ export async function bindAction(opts) {
             throw new Error("no org selected — pass --org-id <id> or --org-name <name> (or run interactively).");
         }
     }
-    // --- resolve project (pick / flag / create) --------------------------------
-    let projectId = opts.projectId;
-    let prefix;
-    if (!projectId && opts.project && opts.prefix) {
-        const p = (await api.createProject({ orgId: orgId, name: opts.project, prefix: opts.prefix }));
-        projectId = p.projectId;
-        prefix = p.prefix;
-        console.log(`✓ Created project ${p.prefix}.`);
-    }
-    if (!projectId) {
-        const { projects } = (await api.listProjects({ orgId: orgId }));
-        const list = projects ?? [];
-        if (isInteractive()) {
-            const chosen = await pick("Select a project", list, (p) => `${p.prefix} — ${p.name}`);
-            if (chosen) {
-                projectId = chosen.id;
-                prefix = chosen.prefix;
+    // Everything from here to the binding write is the strand window: the org
+    // exists but the workspace isn't bound yet. If we abort in it after creating
+    // the org this run, name it and print the resume command (RTSC-297).
+    let bindingWritten = false;
+    try {
+        // --- resolve project (pick / flag / create) --------------------------------
+        let projectId = opts.projectId;
+        let prefix;
+        if (!projectId && opts.project && opts.prefix) {
+            const p = (await api.createProject({ orgId: orgId, name: opts.project, prefix: opts.prefix }));
+            projectId = p.projectId;
+            prefix = p.prefix;
+            console.log(`✓ Created project ${p.prefix}.`);
+        }
+        if (!projectId) {
+            const { projects } = (await api.listProjects({ orgId: orgId }));
+            const list = projects ?? [];
+            if (isInteractive()) {
+                const chosen = await pick("Select a project", list, (p) => `${p.prefix} — ${p.name}`);
+                if (chosen) {
+                    projectId = chosen.id;
+                    prefix = chosen.prefix;
+                }
+                else {
+                    const name = await ask("New project name: ");
+                    const pfx = (await ask("Project prefix (e.g. ACME): ")).toUpperCase();
+                    if (!name || !pfx)
+                        throw new Error("project name and prefix required");
+                    const p = (await api.createProject({ orgId: orgId, name, prefix: pfx }));
+                    projectId = p.projectId;
+                    prefix = p.prefix;
+                    console.log(`✓ Created project ${p.prefix}.`);
+                }
+            }
+            else if (list.length === 1) {
+                projectId = list[0].id;
+                prefix = list[0].prefix;
             }
             else {
-                const name = await ask("New project name: ");
-                const pfx = (await ask("Project prefix (e.g. ACME): ")).toUpperCase();
-                if (!name || !pfx)
-                    throw new Error("project name and prefix required");
-                const p = (await api.createProject({ orgId: orgId, name, prefix: pfx }));
-                projectId = p.projectId;
-                prefix = p.prefix;
-                console.log(`✓ Created project ${p.prefix}.`);
+                throw new Error("no project selected — pass --project-id <id>, or --project <name> --prefix <PFX>.");
             }
         }
-        else if (list.length === 1) {
-            projectId = list[0].id;
-            prefix = list[0].prefix;
+        // --- mint a key for THIS (org, project) and wire the watchdog into THIS folder
+        const minted = (await api.mintKey({
+            orgId: orgId,
+            projectId: projectId,
+            agentName: opts.agent,
+            runtime: opts.runtime ?? "claude-code",
+            keyName: prefix ? `${prefix} key` : undefined,
+        }));
+        console.log(`✓ Minted key for this workspace (${minted.key.slice(0, 14)}…).\n`);
+        // RTSC-92: the secret stays OUT of the repo. Store it in the home keystore
+        // keyed by a workspace id; reuse this folder's existing id (so a re-bind, or a
+        // teammate's committed marker, keeps the same id) or mint a fresh one.
+        const workspaceId = existing?.workspaceId ?? newWorkspaceId();
+        setBinding(workspaceId, {
+            orgId: orgId,
+            projectId: projectId,
+            key: minted.key,
+            url: cfg.mcpUrl,
+            prefix,
+            orgName: undefined,
+            boundPath: cwd,
+            createdAt: Date.now(),
+        });
+        bindingWritten = true; // strand window closed — the org is now reachable
+        // Per-folder only (local scope), always watchdog. The marker carries only the
+        // workspace id — no secret — so ./.mcp.json is safe to commit.
+        installMarker({ workspaceId, scope: "local" });
+        // Confirm the binding the same way the agent will see it.
+        try {
+            const b = await resolveBinding(cfg.mcpUrl, minted.key);
+            console.log(`\n✓ This folder is bound to org "${b.org.name}" / project ${b.project.prefix}.\n` +
+                `  Agents launched here can only ever read or write ${b.project.prefix}.`);
         }
-        else {
-            throw new Error("no project selected — pass --project-id <id>, or --project <name> --prefix <PFX>.");
+        catch {
+            /* binding written; whoami confirmation is best-effort */
         }
     }
-    // --- mint a key for THIS (org, project) and wire the watchdog into THIS folder
-    const minted = (await api.mintKey({
-        orgId: orgId,
-        projectId: projectId,
-        agentName: opts.agent,
-        runtime: opts.runtime ?? "claude-code",
-        keyName: prefix ? `${prefix} key` : undefined,
-    }));
-    console.log(`✓ Minted key for this workspace (${minted.key.slice(0, 14)}…).\n`);
-    // RTSC-92: the secret stays OUT of the repo. Store it in the home keystore
-    // keyed by a workspace id; reuse this folder's existing id (so a re-bind, or a
-    // teammate's committed marker, keeps the same id) or mint a fresh one.
-    const workspaceId = existing?.workspaceId ?? newWorkspaceId();
-    setBinding(workspaceId, {
-        orgId: orgId,
-        projectId: projectId,
-        key: minted.key,
-        url: cfg.mcpUrl,
-        prefix,
-        orgName: undefined,
-        boundPath: cwd,
-        createdAt: Date.now(),
-    });
-    // Per-folder only (local scope), always watchdog. The marker carries only the
-    // workspace id — no secret — so ./.mcp.json is safe to commit.
-    installMarker({ workspaceId, scope: "local" });
-    // Confirm the binding the same way the agent will see it.
-    try {
-        const b = await resolveBinding(cfg.mcpUrl, minted.key);
-        console.log(`\n✓ This folder is bound to org "${b.org.name}" / project ${b.project.prefix}.\n` +
-            `  Agents launched here can only ever read or write ${b.project.prefix}.`);
-    }
-    catch {
-        /* binding written; whoami confirmation is best-effort */
+    catch (err) {
+        const hint = strandRecoveryHint({ createdOrgThisRun, orgId, bindingWritten });
+        if (hint)
+            console.error(hint);
+        throw err;
     }
 }

package/dist/lib/watchdog.js

@@ -40,6 +40,15 @@ export function applyObservation(leases, o) {
     const id = typeof o.args?.identifier === "string" ? o.args.identifier : undefined;
     if (id && o.toolName === "release_issue")
         leases.delete(id);
+    // RTSC-321: moving to `review` (RTSC-257) hands the lease back server-side (the
+    // author's work is done, pending a reviewer), so stop heartbeating it — like a
+    // release, NOT a terminal close. It must NOT reap: `terminalCloseId` stays
+    // done|canceled only, so the branch/worktree survives for the review + PR. (The
+    // reviewer's send-back review→todo also releases server-side but is undetectable
+    // from args alone — doing→todo does NOT release — so that case self-heals via the
+    // failed-heartbeat path instead.)
+    if (id && o.toolName === "save_issue" && o.args?.status === "review")
+        leases.delete(id);
     const closeId = terminalCloseId(o);
     if (closeId)
         leases.delete(closeId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@retasc/cli",
-  "version": "1.7.0",
+  "version": "1.7.2",
   "description": "Retasc CLI — sign in with GitHub, create projects, mint agent API keys, and wire your agent to the Retasc MCP server in one command.",
   "type": "module",
   "bin": {