@botbuddy/cli 1.6.2 → 1.6.3

package/package.json

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

package/src/agent-credential-store.mjs

@@ -27,9 +27,21 @@ function keychainService(profile) {
   return profileCredentialEnvironment(profile);
 }
 
-function writePasswordPrompt(command, args, password) {
+// A keychain/credential-store write failed AFTER OAuth + registration already
+// succeeded. It carries its own code so the CLI never mislabels a storage
+// failure as an auth failure (which would tell the user to re-`login`).
+export class ProfileCredentialStoreError extends Error {
+  constructor(message, { cause } = {}) {
+    super(message);
+    this.name = "ProfileCredentialStoreError";
+    this.code = "profile_credential_store_failed";
+    if (cause !== undefined) this.cause = cause;
+  }
+}
+
+function writePasswordPrompt(command, args, password, spawnProcess) {
   return new Promise((resolve, reject) => {
-    const child = spawn(command, args, { stdio: ["pipe", "ignore", "pipe"] });
+    const child = spawnProcess(command, args, { stdio: ["pipe", "ignore", "pipe"] });
     let stderr = "";
     child.stderr.on("data", (chunk) => { stderr += chunk; });
     child.once("error", reject);
@@ -37,16 +49,37 @@ function writePasswordPrompt(command, args, password) {
       if (code === 0) resolve();
       else reject(new Error(`${command} exited ${code}${stderr ? `: ${stderr.trim()}` : ""}`));
     });
-    // `security -w` prompts from standard input when it is the last option.
-    // Keeping the password off argv prevents process-list disclosure.
-    child.stdin.end(`${password}\n`);
+    // `security -w` prompt mode reads the secret from standard input TWICE (the
+    // value and a retype). A single piped line leaves the retype empty, so
+    // `security` exits with "passwords don't match" the moment there is no TTY.
+    // Feeding the same value twice satisfies both reads without an interactive
+    // terminal, and keeping it off argv prevents process-list disclosure.
+    child.stdin.end(`${password}\n${password}\n`);
   });
 }
 
-async function writeKeychain(profile, token) {
+export async function writeKeychain(profile, token, { spawnProcess = spawn } = {}) {
   const service = keychainService(profile);
-  if (!service) throw new Error("unknown profile keychain service");
-  await writePasswordPrompt("security", ["add-generic-password", "-U", "-s", service, "-a", userInfo().username, "-w"], token);
+  if (!service) throw new ProfileCredentialStoreError(`unknown profile keychain service for "${profile}"`);
+  try {
+    await writePasswordPrompt(
+      "security",
+      ["add-generic-password", "-U", "-s", service, "-a", userInfo().username, "-w"],
+      token,
+      spawnProcess,
+    );
+  } catch (error) {
+    // `security` cancels its authorization when the login keychain is locked in
+    // a headless session; guide the user to unlock it rather than re-login.
+    const detail = String(error?.message ?? error);
+    if (/authorization was cancell?ed/i.test(detail)) {
+      throw new ProfileCredentialStoreError(
+        "macOS Keychain authorization was canceled — unlock your login keychain (`security unlock-keychain`) and retry; a headless session needs it already unlocked",
+        { cause: error },
+      );
+    }
+    throw new ProfileCredentialStoreError(`could not write the profile credential to the macOS Keychain: ${detail}`, { cause: error });
+  }
 }
 
 async function readKeychain(profile) {

package/src/commands.mjs

@@ -10,7 +10,7 @@ import { cmdRun } from "./run.mjs";
 import { runWait } from "./wait.mjs";
 import { green, red, cyan, dim, bold, die } from "./utils.mjs";
 import { VERSION } from "./version.mjs";
-import { bootstrapProfile, ProfileBootstrapError, profileShellRefresh } from "./profile-bootstrap.mjs";
+import { bootstrapProfile, ProfileBootstrapError, profileBootstrapRecovery, profileShellRefresh } from "./profile-bootstrap.mjs";
 import { runPw } from "./pw/run.mjs";
 
 export async function run(argv) {
@@ -325,7 +325,7 @@ async function cmdProfile(args) {
       schema_version: 1,
       outcome: "error",
       error: code,
-      recovery: "botbuddy login && botbuddy profile setup " + args[1],
+      recovery: profileBootstrapRecovery(code, args[1]),
     }));
     process.exitCode = 3;
   }

package/src/profile-bootstrap.mjs

@@ -1,7 +1,7 @@
 import { hostname } from "node:os";
 import { randomUUID } from "node:crypto";
 
-import { ensureProfileCredentialBackend, readProfileIdentity, readProfileRetryIdentity, recordProfileRetryIdentity, installProfileCredential, profileCredentialEnvironment } from "./agent-credential-store.mjs";
+import { ensureProfileCredentialBackend, readProfileIdentity, readProfileRetryIdentity, recordProfileRetryIdentity, installProfileCredential, profileCredentialEnvironment, ProfileCredentialStoreError } from "./agent-credential-store.mjs";
 import { callToolJson } from "./api.mjs";
 import { latestPublicCliCommand } from "./public-invocation.mjs";
 
@@ -79,13 +79,31 @@ export async function bootstrapProfile(profileName, {
   const token = registrationCredential(data);
   if (!token) throw new ProfileBootstrapError("profile_agent_required");
 
-  await store({
-    profile: profileName,
-    tenant: profile.tenant,
-    agentId: data.agent_id,
-    name: agentName,
-    token,
-  });
+  try {
+    await store({
+      profile: profileName,
+      tenant: profile.tenant,
+      agentId: data.agent_id,
+      name: agentName,
+      token,
+    });
+  } catch (error) {
+    // OAuth + registration + tenant attestation all succeeded; only persisting
+    // the credential failed. Give the two persistence failures accurate,
+    // distinct recoveries — never the `botbuddy login` OAuth recovery:
+    //   • a Keychain write failure (ProfileCredentialStoreError) is resolved by
+    //     unlocking the login keychain;
+    //   • a filesystem/lock failure writing ~/.botbuddy/agent-profiles.json
+    //     (EACCES/ENOSPC/busy store lock) is NOT — unlocking the keychain would
+    //     not help, so it gets its own code.
+    if (error instanceof ProfileBootstrapError) throw error;
+    const code = error instanceof ProfileCredentialStoreError
+      ? "profile_credential_store_failed"
+      : "profile_credential_persist_failed";
+    const failure = new ProfileBootstrapError(code);
+    failure.cause = error;
+    throw failure;
+  }
   return {
     schema_version: 1,
     outcome: "installed",
@@ -98,6 +116,19 @@ export async function bootstrapProfile(profileName, {
   };
 }
 
+// Maps a bootstrap error code to the recovery hint shown in the CLI receipt.
+// A credential-store/Keychain failure gets its own actionable recovery; every
+// other failure keeps the historical login-first recovery verbatim.
+export function profileBootstrapRecovery(code, profileName) {
+  if (code === "profile_credential_store_failed") {
+    return `unlock your login keychain (security unlock-keychain), then re-run: botbuddy profile setup ${profileName}`;
+  }
+  if (code === "profile_credential_persist_failed") {
+    return `ensure ~/.botbuddy is writable and no other setup is running, then re-run: botbuddy profile setup ${profileName}`;
+  }
+  return `botbuddy login && botbuddy profile setup ${profileName}`;
+}
+
 export function profileShellRefresh(profileName) {
   const tokenEnv = profileCredentialEnvironment(profileName);
   if (!tokenEnv) throw new ProfileBootstrapError("profile_required");

package/src/botbuddy-release-repair.json

@@ -1 +0,0 @@
-{"schema_version":1,"source_version":"1.6.1","source_identity":"9cc6a78baeb0da589214386daad729a2e8909936a2407da801777f9902e8667f"}