@botbuddy/cli 1.45.2 → 1.45.3

package/package.json

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

package/src/agent-doctor.mjs

@@ -77,6 +77,12 @@ export function repairFailureRecovery(code, error = null) {
   if (code === "client_key_unavailable") {
     return "the client key could not be read (locked or failing credential store); unlock it, then run `bb doctor --fix`";
   }
+  // BOT-1787: this is a server-side identity conflict, not an authentication
+  // failure. Preserve the real remedy so a healthy credential is never needlessly
+  // rotated; `bb setup` clears this worktree's cache and re-registers it.
+  if (code === "agent_tenant_immutable") {
+    return "this worktree's agent identity belongs to another tenant; run `bb setup` to register this tenant, then `bb doctor --fix`";
+  }
   // BOT-1750 (Codex R9 P2): `session_mint_unauthorized` means a locally-unexpired
   // client key was revoked/rejected server-side — only a fresh login replaces it, so
   // point at `bb login`, not a binding repair (the binding is valid).

package/src/api.mjs

@@ -445,7 +445,13 @@ export async function callToolJson(toolName, args = {}, { fetchImpl = fetch, sig
   }
   let payload;
   try { payload = await res.json(); } catch { return { ok: false, status: res.status, error: "invalid_json" }; }
-  if (payload.error?.message) return { ok: false, status: res.status, error: payload.error.message };
+  if (payload.error?.message) {
+    // Typed domain errors retain their verdict inside the HTTP-200 JSON-RPC
+    // envelope. Do not infer credential failure from an identity conflict.
+    const code = payload.error.data?.code;
+    return { ok: false, status: res.status, error: payload.error.message,
+      ...(typeof code === "string" && code ? { code } : {}) };
+  }
   const text = payload.result?.content?.map((c) => c.text).filter(Boolean).join("\n") ?? "";
   let data;
   try { data = text ? JSON.parse(text) : {}; } catch { data = { raw: text }; }

package/src/botbuddy-release-repair.json

@@ -1 +0,0 @@
-{"schema_version":1,"source_version":"1.45.1","source_identity":"2fa051c4d0ee5cb09fda8d9e15c4952af94d701a6a43e98c8831912040cb41f2"}