@botbuddy/cli 1.50.0 → 1.50.1

package/package.json

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

package/src/commands.mjs

@@ -32,6 +32,7 @@ import { doctorAgentAuth, doctorHelp, parseDoctorArgs, readClientKeyStrict, repa
 import { formatPublishIp, isLoopbackIp, probeEnginePublishIp, publishIpFix } from "./docker-publish-ip.mjs";
 import { cmdHost, fixHelperWorkers, formatHelperWorkersLines, inspectHelperWorkers } from "./helper-host.mjs";
 import { clearAgentState, selfHealAgentSession } from "./agent-session.mjs";
+import { readAgentState } from "./agent-state.mjs";
 import { runUsage, usageStatus } from "./usage/sync.mjs";
 import { cmdTestIngest, doctorTestIngest, formatTestIngestLine } from "./test-ingest.mjs";
 import { installUsageAgent, usageAgentStatus } from "./usage/launchd.mjs";
@@ -580,6 +581,7 @@ export async function cmdSetup(args, {
   now = () => Date.now(),
   binding = readAgentBinding,
   clearState = clearAgentState,
+  readState = readAgentState,
   selfHeal = selfHealAgentSession,
   callerResolver = resolveCaller,
   usageAgent = installUsageAgent,
@@ -654,12 +656,22 @@ export async function cmdSetup(args, {
         signedIn = true;
       }
     }
-    // Setup is an explicit session bootstrap/repair command. Rotate before
-    // resolving so it cannot merely report an old cache as ready.
-    await clearState(cwd);
+    // Setup is an explicit session bootstrap/repair command: it always mints a
+    // fresh session so it cannot merely report an old cache as ready.
+    // BOT-2171: but it keeps the worktree's AGENT. Deleting the cache first made
+    // the mint carry no agent_id, so the server fell back to a hostname-bearing
+    // name lookup and, after a hostname drift, inserted a new agent — every stack
+    // lease this worktree held then answered NOT_LEASE_OWNER. A cache bound to this
+    // tenant is re-minted in place (`force` re-registers with its agent_id); one
+    // bound elsewhere, or a legacy cache with no tenant to verify, is still
+    // discarded, since its agent may not serve this tenant (Codex #1180 R1).
+    const cached = await readState(cwd).catch(() => null);
+    const keepAgent = Boolean(cached?.agent_id) && cached.tenant === tenant;
+    if (!keepAgent) await clearState(cwd);
+    const mint = () => selfHeal({ cwd, env, ...(keepAgent ? { force: true } : {}) });
     let session;
     try {
-      session = await selfHeal({ cwd, env });
+      session = await mint();
     } catch (error) {
       // A locally-valid key the server rejects (revoked, rotated) needs exactly
       // one fresh sign-in and one retried mint. Never loop, and never re-sign a
@@ -667,7 +679,7 @@ export async function cmdSetup(args, {
       if (signedIn || !SIGN_IN_REJECTED.has(error?.code) || error?.mintedWith === "mcp_key") throw error;
       errorLog(`bb setup: this machine's saved sign-in was rejected (${error.code}); signing in again.`);
       await signIn();
-      session = await selfHeal({ cwd, env });
+      session = await mint();
     }
     // BOT-2058: register_agent reports any OTHER live session already holding
     // this ticket (heartbeat < 15m) in `ticket_signals`. This is advisory: a