@botbuddy/cli 1.40.6 → 1.40.9

package/package.json

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

package/src/commands.mjs

@@ -57,14 +57,24 @@ export async function run(argv, {
   loadConfig: load = loadConfig,
   warnStale = maybeWarnStale,
   errorLog = (line) => console.error(line),
+  bootstrap = cmdBootstrap,
 } = {}) {
-  await load();
   const [command, ...args] = argv;
+  // BOT-2069: `bootstrap close` can retire a live server session. Parse its
+  // own arguments before loading config, checking npm, reading the runtime
+  // cache, or resolving any credential. Help and malformed invocations return
+  // immediately; a valid plain close retains its established config/update
+  // setup before the generation-confirmed cleanup transaction.
+  if (command === "bootstrap" && args[0] === "close" && parseBootstrapCloseArgs(args).action !== "close") {
+    return bootstrap(args);
+  }
+
+  await load();
   if (shouldCheckForUpdates(argv)) await warnStale({ version: VERSION });
 
   switch (command) {
     case "start": return cmdStart(args);
-    case "bootstrap": return cmdBootstrap(args);
+    case "bootstrap": return bootstrap(args);
     case "login": return cmdLogin(args, { errorLog });
     case "setup": return cmdSetup(args, { errorLog });
     case "logout": return cmdLogout();
@@ -812,28 +822,55 @@ export async function closeStoredHarnessSession({
   return result;
 }
 
-async function cmdBootstrap(args) {
+const BOOTSTRAP_CLOSE_USAGE = "Usage: bb bootstrap close [--help]";
+
+function parseBootstrapCloseArgs(args) {
+  const rest = args.slice(1);
+  if (rest.length === 0) return { action: "close" };
+  if (rest.length === 1 && (rest[0] === "--help" || rest[0] === "-h")) return { action: "help" };
+  return { action: "invalid" };
+}
+
+export async function cmdBootstrap(args, {
+  withHarnessBootstrapLock: withLock = withHarnessBootstrapLock,
+  loadHarnessSession: loadSession = loadHarnessSession,
+  resolveOwnerToken: resolveOwner = resolveOwnerToken,
+  resolveAgentKey: resolveAgent = resolveAgentKey,
+  closeStoredHarnessSession: closeSession = closeStoredHarnessSession,
+  clearHarnessSession: clearSession = clearHarnessSession,
+  bootstrapHarnessSession: bootstrapSession = bootstrapHarnessSession,
+  getConfig: getCfg = getConfig,
+  log = (line) => console.log(line),
+  die: fail = die,
+} = {}) {
   if (args[0] === "close") {
-    return withHarnessBootstrapLock({}, async () => {
-      const session = await loadHarnessSession();
+    const closeArguments = parseBootstrapCloseArgs(args);
+    if (closeArguments.action === "help") {
+      log(`${BOOTSTRAP_CLOSE_USAGE}\n\nClose this worktree's cached harness session after generation-confirmed server cleanup.`);
+      return;
+    }
+    if (closeArguments.action === "invalid") return fail(BOOTSTRAP_CLOSE_USAGE);
+
+    return withLock({}, async () => {
+      const session = await loadSession();
       if (!session) {
-        console.log(JSON.stringify({ outcome: "no_session" }));
+        log(JSON.stringify({ outcome: "no_session" }));
         return;
       }
-      const owner = await resolveOwnerToken({ getConfig });
+      const owner = await resolveOwner({ getConfig: getCfg });
     // Match resolveCallAuth: a stored but expired owner token must never mask
     // a usable MCP key or the exact session credential that needs cleanup.
       const activeOwner = owner && !(owner.expiresAt && Date.now() >= owner.expiresAt) ? owner : null;
-      const agentKey = activeOwner ? null : await resolveAgentKey();
+      const agentKey = activeOwner ? null : await resolveAgent();
       const durableAuth = activeOwner
         ? { Authorization: `Bearer ${activeOwner.token}` }
         : agentKey
           ? { "x-agent-api-key": agentKey }
           : { "x-agent-api-key": session.session_token };
-      const result = await closeStoredHarnessSession({ session, durableAuth });
-      if (!result?.ok || result.isError) die(result?.error || "bb bootstrap close failed");
-      await clearHarnessSession(session.session_id, { sessionToken: session.session_token, lock: false }); // already inside withHarnessBootstrapLock (non-reentrant)
-      console.log(JSON.stringify({ outcome: "closed", session_id: session.session_id }));
+      const result = await closeSession({ session, durableAuth });
+      if (!result?.ok || result.isError) fail(result?.error || "bb bootstrap close failed");
+      await clearSession(session.session_id, { sessionToken: session.session_token, lock: false }); // already inside withHarnessBootstrapLock (non-reentrant)
+      log(JSON.stringify({ outcome: "closed", session_id: session.session_id }));
     });
   }
   let harnessSessionId = null;
@@ -848,7 +885,7 @@ async function cmdBootstrap(args) {
   let prUrl = null;
   let model = null;
   let effort = null;
-  let name = getConfig()?.agent_name || `botbuddy-${os.hostname()}`;
+  let name = getCfg()?.agent_name || `botbuddy-${os.hostname()}`;
   let nameExplicit = false;
   for (let i = 0; i < args.length; i += 1) {
     if (args[i] === "--session-id") harnessSessionId = args[++i] || null;
@@ -864,15 +901,15 @@ async function cmdBootstrap(args) {
     else if (args[i] === "--pr-url") prUrl = args[++i] || null;
     else if (args[i] === "--model") model = args[++i] || null;
     else if (args[i] === "--effort") effort = args[++i] || null;
-    else die("Usage: bb bootstrap --session-id <harness UUID> (--ticket-id <ticket> | --no-ticket-reason <reason>) [--type codex|claude|gpt|custom] [--codex-thread-id <UUID>] [--name <technical-name>] [--branch <branch>] [--ticket-url <url>] [--model <model>] [--effort <effort>]");
+    else fail("Usage: bb bootstrap --session-id <harness UUID> (--ticket-id <ticket> | --no-ticket-reason <reason>) [--type codex|claude|gpt|custom] [--codex-thread-id <UUID>] [--name <technical-name>] [--branch <branch>] [--ticket-url <url>] [--model <model>] [--effort <effort>]");
   }
-  if (!harnessSessionId) die("bb bootstrap requires --session-id <harness UUID>");
+  if (!harnessSessionId) fail("bb bootstrap requires --session-id <harness UUID>");
   const linkageError = validateBootstrapLinkage(ticketId, noTicketReason);
-  if (linkageError) die(linkageError);
+  if (linkageError) fail(linkageError);
   ticketId = ticketId?.trim() || null;
   noTicketReason = noTicketReason?.trim() || null;
   if (!nameExplicit) name = `${name}-${harnessSessionId.slice(0, 8)}`;
-  const state = await bootstrapHarnessSession({
+  const state = await bootstrapSession({
     name,
     type,
     harnessSessionId,
@@ -888,13 +925,13 @@ async function cmdBootstrap(args) {
     effort,
     harness: `botbuddy-${type}-launcher`,
   });
-  if (state.linkage?.status === "gap") die(state.linkage.warning || "bb bootstrap requires ticket attribution or --no-ticket-reason.");
+  if (state.linkage?.status === "gap") fail(state.linkage.warning || "bb bootstrap requires ticket attribution or --no-ticket-reason.");
   // BOT-1945: name (never the bearer of) an unowned cached session this bootstrap
   // replaced, so a leftover live holder is visible instead of silent.
   // BOT-2058: the launcher must see a known-holder warning before it starts a
   // new harness. Keep it out of the credential cache, but preserve the
   // non-secret concurrency payload in this command receipt.
-  console.log(JSON.stringify({ agent_id: state.agent_id, display_name: state.display_name, session_id: state.session_id, expires_at: state.expires_at, ...(state.ticket_signals?.concurrency ? { ticket_session_warning: state.ticket_signals.concurrency } : {}), ...(state.replaced_cached_session ? { replaced_cached_session: state.replaced_cached_session } : {}) }));
+  log(JSON.stringify({ agent_id: state.agent_id, display_name: state.display_name, session_id: state.session_id, expires_at: state.expires_at, ...(state.ticket_signals?.concurrency ? { ticket_session_warning: state.ticket_signals.concurrency } : {}), ...(state.replaced_cached_session ? { replaced_cached_session: state.replaced_cached_session } : {}) }));
 }
 
 // BOT-1566 A4: after the local-metadata lines, ask the SERVER whether the stored

package/src/stack.mjs

@@ -2186,7 +2186,8 @@ function waitForChild(child) {
 function isDenoIntegrationLane(argv) {
   // `test:all` is the supported package wrapper that transitively invokes
   // `test:integration`; both must receive the leased runner configuration.
-  return argv.includes("test:integration") || argv.includes("test:integration:coverage") || argv.includes("test:all") || argv.includes("scripts/run-deno-integration.sh");
+  return argv.includes("test:integration") || argv.includes("test:integration:coverage") || argv.includes("test:all") || argv.includes("scripts/run-deno-integration.sh") ||
+    (argv.includes("scripts/run-deno-hermetic.mjs") && argv.includes("database-checks"));
 }
 
 function requireConnectionText(connection, key) {