@botbuddy/cli 1.21.1 → 1.22.0

package/package.json

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

package/src/stack.mjs

@@ -31,6 +31,7 @@ import { callToolJson } from "./api.mjs";
 import { SERVER_URL, getConfig } from "./config.mjs";
 import { resolveOwnerToken, resolveAgentKey } from "./cli-credentials.mjs";
 import { runDockerCommand, runDockerWorkflow } from "./docker-hygiene.mjs";
+import { machineUuid } from "./machine-id.mjs";
 import { bold, dim, yellow } from "./utils.mjs";
 
 export const STACK_SCHEMA_VERSION = 1;
@@ -667,6 +668,7 @@ export async function cmdUp(opts, {
   localProvisionFn = localProvision,
   waitFn = waitForLease,
   emitResult = emit,
+  machineUuidFn = machineUuid,
 } = {}) {
   let slot;
   try { slot = deriveSlot(opts); } catch (e) {
@@ -696,6 +698,13 @@ export async function cmdUp(opts, {
   const auth = await authProvider();
   if (!auth) return emitResult(buildReceipt({ command: "up", outcome: "error", error: "not authenticated — run `botbuddy login`" }), opts, EXIT.AUTH);
 
+  // BOT-1585: co-location dispatches the lease to the Helper enrolled for THIS
+  // physical machine (hardware id), since a hostname is not machine-unique. The
+  // server requires it; fail fast with an actionable message if it can't be read.
+  const hardwareUuid = machineUuidFn();
+  if (!hardwareUuid) {
+    return emitResult(buildReceipt({ command: "up", outcome: "error", code: "MACHINE_UUID_REQUIRED", error: "could not determine this machine's hardware id (needed to dispatch the stack lease to the right machine)" }), opts, EXIT.BACKEND);
+  }
   const req = await callTool("request_stack_lease", {
     slot, host_key: opts.host || undefined, repo: opts.repo || undefined,
     ticket_id: opts.ticket || undefined, ticket_url: opts.ticketUrl || undefined,
@@ -703,6 +712,7 @@ export async function cmdUp(opts, {
     purpose: opts.purpose || undefined, idle_ttl_secs: opts.idleTtl ?? undefined,
     stack_path: execution.stackPath,
     worktree_root: execution.worktreeRoot,
+    machine_uuid: hardwareUuid,
   });
   if (!req.ok) {
     return req.auth
@@ -1046,6 +1056,7 @@ export async function runStackLifecycle(opts, childArgv, adapters = {}) {
     release: (leaseId, signal) => callToolJson("release_stack_lease", { lease_id: leaseId, disposition: "destroy" }, { signal }),
   };
   const auth = adapters.auth ?? await stackAuthHeader();
+  const machineUuidFn = adapters.machineUuidFn ?? machineUuid;
   const wait = adapters.wait ?? ((leaseId, done, failed, options) => waitForLease(leaseId, done, failed, options));
   // nosemgrep: javascript.lang.security.detect-child-process.detect-child-process -- validated executable + argv only; shell is never used.
   const startChild = adapters.startChild ?? ((argv, env, cwd) => spawn(argv[0], argv.slice(1), { cwd, env, stdio: "inherit", detached: true }));
@@ -1122,6 +1133,13 @@ export async function runStackLifecycle(opts, childArgv, adapters = {}) {
 
   try {
     if (!auth) return { exitCode: EXIT.AUTH, outcome: "error", error: "not authenticated — run botbuddy profile setup botbuddy-dev" };
+    // BOT-1585: request_stack_lease requires this machine's hardware id so the lease
+    // dispatches to the machine the worktree was registered on. `stack run` builds its
+    // own payload (separate from `cmdUp`), so it must send it too.
+    const hardwareUuid = machineUuidFn();
+    if (!hardwareUuid) {
+      return { exitCode: EXIT.BACKEND, outcome: "error", error: "could not determine this machine's hardware id (needed to dispatch the stack lease to the right machine)" };
+    }
     const slot = deriveSlot(opts);
     const execution = resolveStackPath(process.cwd(), opts.stackPath);
     const request = await api.request({
@@ -1129,6 +1147,7 @@ export async function runStackLifecycle(opts, childArgv, adapters = {}) {
       ticket_url: opts.ticketUrl || undefined, pr_id: opts.prId || undefined, pr_url: opts.prUrl || undefined,
       purpose: opts.purpose || "stack run", idle_ttl_secs: opts.idleTtl ?? undefined,
       stack_path: execution.stackPath, worktree_root: execution.worktreeRoot,
+      machine_uuid: hardwareUuid,
     });
     if (!request?.ok) return { exitCode: request?.auth ? EXIT.AUTH : EXIT.BACKEND, outcome: "error", error: request?.error || "lease request failed" };
     if (!request.data?.success) return { exitCode: EXIT.BACKEND, outcome: "error", error: request.data?.message || request.data?.code || "lease request refused" };