@botbuddy/cli 1.53.0 → 1.53.1

package/package.json

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

package/src/agent-doctor.mjs

@@ -83,6 +83,11 @@ export function repairFailureRecovery(code, error = null) {
   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-2415: the cached session names a different agent than the one holding this
+  // worktree's technical name. Deterministic: a retry repeats the same conflict.
+  if (code === "agent_name_conflict") {
+    return "this worktree's cached session (.botbuddy/agent-state.json) names a different agent than the one holding the worktree's technical name; move that file aside, then run `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/agent-session.mjs

@@ -345,6 +345,9 @@ export async function selfHealAgentSession({
       branch: currentBranch || undefined,
       ticket_id: ticketFromBranch(currentBranch),
       agent_id: presentedAgentId ?? undefined,
+      // A rejected-token renewal may still own locks or leases under this agent.
+      // Ask the server to keep it; ordinary setup/doctor repair may adopt a holder.
+      ...(renewal ? { preserve_agent_identity: true } : {}),
       harness_session_id: presentedHarness ?? undefined,
       harness: env.CLAUDE_CODE || env.CLAUDECODE ? "claude-code" : Object.keys(env).some((key) => key.startsWith("CODEX_")) ? "codex" : "cli",
       model: env.BOTBUDDY_MODEL || undefined,
@@ -372,8 +375,14 @@ export async function selfHealAgentSession({
       const typedCode = typeof response?.code === "string"
         ? response.code
         : typeof data.code === "string" ? data.code : null;
-      const code = typedCode === "agent_tenant_immutable"
+      // BOT-2415: a technical-name conflict is deterministic (the cached agent_id
+      // names a different agent than the one holding this worktree's name), so no
+      // retry fixes it. Recognise the typed refusal and an older server's raw 23505.
+      const nameConflict = typedCode === "agent_name_taken"
+        || /agents_name_key/.test(String(response?.error ?? data.error ?? ""));
+      const code = ["agent_tenant_immutable", "session_identity_mismatch"].includes(typedCode)
         ? typedCode
+        : nameConflict ? "agent_name_conflict"
         : response?.auth ? "session_mint_unauthorized" : "session_mint_failed";
       // BOT-1891: name the credential (never its value) so `bb doctor` can point a
       // rejected tier-2 key at rotation instead of `bb login`.

package/src/commands.mjs

@@ -568,7 +568,7 @@ function setupFailureRecovery(error) {
   if (code === "tenant_binding_required" || code === "invalid_binding") {
     return "fix the committed .botbuddy-agent.json binding, then retry `bb setup`";
   }
-  if (code === "client_key_unavailable" || code === "session_mint_unauthorized") return repairFailureRecovery(code, error);
+  if (code === "client_key_unavailable" || code === "session_mint_unauthorized" || code === "agent_name_conflict") return repairFailureRecovery(code, error);
   return "retry `bb setup`";
 }
 

package/src/stack.mjs

@@ -985,7 +985,7 @@ export function retryingStackCall({
 // taxonomy so automation sees AUTH/BACKEND, not a CLI-defect INTERNAL. Credential
 // problems are AUTH (3); a transport/server mint failure is BACKEND (5); anything
 // unrecognized stays INTERNAL (7).
-const AUTH_ERROR_CODES = new Set(["client_key_required", "client_key_unavailable", "tenant_binding_required", "session_token_malformed", "session_mint_unauthorized", "session_identity_mismatch"]);
+const AUTH_ERROR_CODES = new Set(["client_key_required", "client_key_unavailable", "tenant_binding_required", "session_token_malformed", "session_mint_unauthorized", "session_identity_mismatch", "agent_name_conflict"]);
 // BOT-1750 (Codex R11 P2): `session_mint_invalid` is an incompatible/malformed SERVER
 // response, not a credential problem — classify it with the transport/server failures.
 const BACKEND_ERROR_CODES = new Set(["session_mint_failed", "session_mint_invalid"]);
@@ -1423,6 +1423,7 @@ export const PARK_AUTH_BUDGET_MS = 5 * 60_000;
 // the regular auth budget; it is not evidence that the lease changed owner.
 const DEFINITIVE_REAUTH_CODES = new Set([
   "session_identity_mismatch", "client_key_required", "tenant_binding_required", "session_token_malformed", "agent_tenant_immutable",
+  "agent_name_conflict",
 ]);
 
 function abortableSleep(ms, signal) {

package/src/wait.mjs

@@ -20,6 +20,7 @@ import { fileURLToPath } from "node:url";
 import { latestPublicCliCommand } from "./public-invocation.mjs";
 import { AGENT_KEY_RE, readAgentSessionTokenEnv, legacyAgentAliasHint } from "./agent-key.mjs";
 import { clearAgentState, hasAgentSessionRuntime, isRejectedCachedSession, resolveAgentSessionCredential, selfHealAgentSession } from "./agent-session.mjs";
+import { repairFailureRecovery } from "./agent-doctor.mjs";
 import { touchAgentStateExpiry } from "./agent-state.mjs";
 import { SETUP_BLOCK } from "./setup-block.mjs";
 import { createWaitCheckpointStore, WaitCheckpointError } from "./wait-checkpoint.mjs";
@@ -1679,7 +1680,10 @@ export async function runWait(argv, { recoveryLocalWaitId = null } = {}) {
       opts.credentialSource = credential.source;
     } catch (error) {
       const code = error?.code ?? "session_mint_failed";
-      const recovery = code === "client_key_required"
+      // BOT-2415: a stale cache naming another agent is not fixed by `bb setup` + retry.
+      const recovery = code === "agent_name_conflict"
+        ? repairFailureRecovery(code)
+        : code === "client_key_required"
         ? "run `bb setup` from this project worktree, then retry"
         : code === "tenant_binding_required"
         ? "run from a configured project worktree, then run `bb setup` and retry"