@botbuddy/cli 1.33.5 → 1.33.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botbuddy/cli",
-  "version": "1.33.5",
+  "version": "1.33.6",
   "description": "BotBuddy — Swarm coordination CLI for multi-agent workflows",
   "type": "module",
   "bin": {

package/src/stack.mjs

@@ -76,10 +76,12 @@ ${bold("up OPTIONS")}
   --host <host_key>      Pin to a canonical host. Omit to auto-select a beacon-fresh host.
   --repo <repo>          Repository the batch is for (e.g. botbuddy-web).
   --ticket <BOT-123>     Ticket the batch is for (also used to derive the slot).
-  --stack-path <relative> Stack directory inside the registered worktree (default: .).
-                         REQUIRED with --local-exec: point it at a slot-derived stack whose
-                         supabase/config.toml declares a DISTINCT project_id + remapped ports
-                         (never the worktree root's shared canonical project).
+  --stack-path <relative> ISOLATED stack directory inside the registered worktree. Required:
+                         the control plane refuses the worktree root (stack_path_root_refused,
+                         BOT-1797) because its supabase/config.toml is the repo's SHARED
+                         canonical project. Point it at a slot-derived stack whose
+                         supabase/config.toml declares a DISTINCT project_id + remapped ports,
+                         or use 'stack run', which materializes one for you.
   --purpose <text>       Free-text purpose recorded on the lease.
   --idle-ttl <seconds>   Idle seconds before the reaper STOPS an unused stack (default 1800).
   --timeout <seconds>    Max seconds to park for capacity before giving up (default ${DEFAULT_TIMEOUT_SEC}).
@@ -669,6 +671,39 @@ export function worktreeRegistrationHint(code, auth) {
     + `Run \`bb doctor --fix\` here to register its host + machine id, then retry.`;
 }
 
+// BOT-1797: the control plane refuses a Helper-backed lease whose stack_path is the
+// worktree root — its supabase/config.toml is the repo's SHARED canonical project, so
+// the Helper would start (and on reap destroy) the shared dev stack. This CLI always
+// materializes an isolated stack (BOT-1798), so seeing this code means a stale binary,
+// an explicit root --stack-path, or a wrapper that hand-rolls the lease call.
+export const STACK_PATH_ROOT_REFUSED_CODE = "stack_path_root_refused";
+
+// Only used when an older/leaner server sends the code with no message; the server's
+// own message is always preferred so the two can never drift.
+const STACK_PATH_ROOT_REFUSED_FALLBACK =
+  "the control plane refused a stack lease at the worktree root (the repo's shared stack). " +
+  "Upgrade with `npm i -g @botbuddy/cli@latest`, or pass --stack-path <isolated dir>.";
+
+/** The server's root refusal, verbatim, as one operator-facing line (or null). */
+export function stackPathRootRefusalNotice(code, message) {
+  if (code !== STACK_PATH_ROOT_REFUSED_CODE) return null;
+  return `${yellow("⚠")} stack: ${message || STACK_PATH_ROOT_REFUSED_FALLBACK}`;
+}
+
+/**
+ * Exit code for a lease the server REFUSED (`success: false`). A refused root path is a
+ * bad argument the caller must fix — INVALID (4) — not a backend fault, which automation
+ * reads as "the control plane is unhealthy, retry". Every other refusal keeps BACKEND (5).
+ */
+export function leaseRefusalExit(code) {
+  return code === STACK_PATH_ROOT_REFUSED_CODE ? EXIT.INVALID : EXIT.BACKEND;
+}
+
+/** The refusal text for a receipt: the server's message, else its code. */
+export function leaseRefusalError(data) {
+  return data?.message || data?.code || "lease request refused";
+}
+
 // The MCP lease endpoint accepts a session token in x-agent-api-key, whereas
 // the event-stream relay requires that same token in its bearer form too. Keep
 // the lease RPC shape unchanged and derive the relay-compatible form only at
@@ -1340,9 +1375,9 @@ export async function cmdUp(opts, {
   }
   const d = req.data;
   if (!d.success) {
-    const hint = worktreeRegistrationHint(d.code, auth);
+    const hint = worktreeRegistrationHint(d.code, auth) ?? stackPathRootRefusalNotice(d.code, d.message);
     if (hint) process.stderr.write(`${hint}\n`);
-    return emitResult(buildReceipt({ command: "up", outcome: "error", code: d.code, error: d.message || d.code || "request refused", slot }), opts, EXIT.BACKEND);
+    return emitResult(buildReceipt({ command: "up", outcome: "error", code: d.code, error: leaseRefusalError(d), slot }), opts, leaseRefusalExit(d.code));
   }
   let leaseId = d.lease_id;
   let state = d.state;
@@ -2007,9 +2042,10 @@ export async function runStackLifecycle(opts, childArgv, adapters = {}) {
       return { exitCode: request?.auth ? EXIT.AUTH : EXIT.BACKEND, outcome: "error", error: request?.error || "lease request failed" };
     }
     if (!request.data?.success) {
-      const hint = worktreeRegistrationHint(request.data?.code, rpc.auth);
+      const hint = worktreeRegistrationHint(request.data?.code, rpc.auth)
+        ?? stackPathRootRefusalNotice(request.data?.code, request.data?.message);
       if (hint) process.stderr.write(`${hint}\n`);
-      return { exitCode: EXIT.BACKEND, outcome: "error", error: request.data?.message || request.data?.code || "lease request refused" };
+      return { exitCode: leaseRefusalExit(request.data?.code), outcome: "error", code: request.data?.code, error: leaseRefusalError(request.data) };
     }
     leaseId = request.data.lease_id;
     if (request.data.reused) {
@@ -2154,7 +2190,9 @@ export async function runStackLifecycle(opts, childArgv, adapters = {}) {
 async function cmdRun(opts, childArgv) {
   const result = await runStackLifecycle(opts, childArgv);
   return emit(buildReceipt({
-    command: "run", outcome: result.outcome, lease_id: result.leaseId ?? null,
+    // BOT-1797: carry the server's typed refusal code (e.g. stack_path_root_refused)
+    // so automation can branch on it instead of matching the message text.
+    command: "run", outcome: result.outcome, code: result.code ?? null, lease_id: result.leaseId ?? null,
     child_exit_code: result.childExitCode ?? null, cleanup: result.cleanup?.ok ?? null,
     fenced: result.fenced ?? false, error: result.error ?? result.cleanup?.error ?? null,
   }), opts, result.exitCode);