@botbuddy/cli 1.59.9 → 1.60.0

package/bin/botbuddy.mjs

@@ -1,7 +1,16 @@
 #!/usr/bin/env node
 import { run } from "../src/commands.mjs";
+import { ensureRunDelivery } from "../src/run-delivery.mjs";
 
-run(process.argv.slice(2)).then((code) => {
+const argv = process.argv.slice(2);
+
+// BOT-2600: any `bb` invocation starts the single per-machine delivery process
+// when finished `bb run` commands still have an unsent terminal update. A stat
+// and two small reads when nothing changed; it never fails the command.
+const deliveryProcessArgs = argv[0] === "run" && (argv[1] === "--worker" || argv[1] === "--deliver");
+const delivery = deliveryProcessArgs ? Promise.resolve() : ensureRunDelivery().catch(() => {});
+
+delivery.then(() => run(argv)).then((code) => {
   if (typeof code === "number") process.exitCode = code;
 }).catch((err) => {
   console.error(`\x1b[31m✗\x1b[0m ${err?.message || err}`);

package/daemon-release/darwin-arm64.json

@@ -1,7 +1,7 @@
 {
-  "release_version": "1.59.9",
-  "source_commit": "d9c73efb211e953ac2d57257a0d7d3cd21660d67",
-  "source_sha256": "57b561506694e9a2d326bba24731ab1b0354ef38c509b452686b8a450b59bd4b",
+  "release_version": "1.60.0",
+  "source_commit": "2bde2741ba9158ce03147a2ff28f1c6a44f89e25",
+  "source_sha256": "7091f785b4820eccd5f9596e04def9ef58a02cbb5130ccb84bd55ae77e71ec67",
   "target": "darwin-arm64",
-  "sha256": "ad8d7b6e3255d85f1c1237ae1b6bbd0a6b359b7909fba60b4819566bd7362c31"
+  "sha256": "b6fe4ed183d92a32e398cb9de3f82ac6b4634188409f51eadad457ca6b37c307"
 }

package/daemon-release/linux-x64.json

@@ -1,7 +1,7 @@
 {
-  "release_version": "1.59.9",
-  "source_commit": "d9c73efb211e953ac2d57257a0d7d3cd21660d67",
-  "source_sha256": "57b561506694e9a2d326bba24731ab1b0354ef38c509b452686b8a450b59bd4b",
+  "release_version": "1.60.0",
+  "source_commit": "2bde2741ba9158ce03147a2ff28f1c6a44f89e25",
+  "source_sha256": "7091f785b4820eccd5f9596e04def9ef58a02cbb5130ccb84bd55ae77e71ec67",
   "target": "linux-x64",
-  "sha256": "bf2f3a46ef151ace3e5b21633c03dc1824bee2e42fc6edd8f6898ca35d48f10c"
+  "sha256": "3a1839c5800e38bf9bb7a1465555e0cace01ef82d9c382fde1e036608c536fe8"
 }

package/daemon-release/manifest.json

@@ -1,21 +1,21 @@
 {
   "schema_version": 1,
-  "release_version": "1.59.9",
-  "source_commit": "d9c73efb211e953ac2d57257a0d7d3cd21660d67",
-  "source_sha256": "57b561506694e9a2d326bba24731ab1b0354ef38c509b452686b8a450b59bd4b",
+  "release_version": "1.60.0",
+  "source_commit": "2bde2741ba9158ce03147a2ff28f1c6a44f89e25",
+  "source_sha256": "7091f785b4820eccd5f9596e04def9ef58a02cbb5130ccb84bd55ae77e71ec67",
   "targets": {
     "darwin-arm64": {
       "goos": "darwin",
       "goarch": "arm64",
       "binary": "daemon/bin/darwin-arm64/botbuddy-daemon",
-      "sha256": "ad8d7b6e3255d85f1c1237ae1b6bbd0a6b359b7909fba60b4819566bd7362c31",
+      "sha256": "b6fe4ed183d92a32e398cb9de3f82ac6b4634188409f51eadad457ca6b37c307",
       "mode": "0755"
     },
     "linux-x64": {
       "goos": "linux",
       "goarch": "amd64",
       "binary": "daemon/bin/linux-x64/botbuddy-daemon",
-      "sha256": "bf2f3a46ef151ace3e5b21633c03dc1824bee2e42fc6edd8f6898ca35d48f10c",
+      "sha256": "3a1839c5800e38bf9bb7a1465555e0cace01ef82d9c382fde1e036608c536fe8",
       "mode": "0755"
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botbuddy/cli",
-  "version": "1.59.9",
+  "version": "1.60.0",
   "description": "BotBuddy \u2014 Swarm coordination CLI for multi-agent workflows",
   "type": "module",
   "bin": {

package/src/agent-doctor.mjs

@@ -10,15 +10,35 @@ import { selfHealAgentSession } from "./agent-session.mjs";
 import { machineUuid } from "./machine-id.mjs";
 import { machineHost } from "./machine-host.mjs";
 
+// BOT-2599: checks `--only` can run on their own. Each is local-only (no auth,
+// no network), so it is fast enough for a git hook.
+export const DOCTOR_ONLY_CHECKS = Object.freeze(["git_transport"]);
+
 export function parseDoctorArgs(argv = []) {
   const parsed = { fix: false, printExports: false, json: false, errors: [] };
-  for (const arg of argv) {
+  for (let i = 0; i < argv.length; i += 1) {
+    const arg = argv[i];
     if (arg === "--fix") parsed.fix = true;
     else if (arg === "--print-exports") parsed.printExports = true;
     else if (arg === "--json") parsed.json = true;
     else if (arg === "--help" || arg === "-h") parsed.help = true;
-    else parsed.errors.push(`unknown option: ${arg}`);
+    else if (arg === "--only" || arg.startsWith("--only=")) {
+      const value = arg === "--only" ? argv[++i] : arg.slice("--only=".length);
+      if (!value || value.startsWith("--")) parsed.errors.push("--only needs a check name (git_transport)");
+      else if (!DOCTOR_ONLY_CHECKS.includes(value)) parsed.errors.push(`unknown check: ${value} (--only accepts ${DOCTOR_ONLY_CHECKS.join(", ")})`);
+      else parsed.only = value;
+    } else if (arg === "--remote" || arg.startsWith("--remote=")) {
+      const value = arg === "--remote" ? argv[++i] : arg.slice("--remote=".length);
+      if (!value) parsed.errors.push("--remote needs a remote name or URL");
+      else parsed.remote = value;
+    } else if (arg === "--url" || arg.startsWith("--url=")) {
+      // A pre-push hook's $2: the URL this push actually goes to.
+      const value = arg === "--url" ? argv[++i] : arg.slice("--url=".length);
+      if (!value) parsed.errors.push("--url needs the push URL");
+      else parsed.url = value;
+    } else parsed.errors.push(`unknown option: ${arg}`);
   }
+  if (parsed.only && parsed.printExports) parsed.errors.push("--print-exports cannot be combined with --only");
   return parsed;
 }
 
@@ -251,5 +271,5 @@ export async function doctorAgentAuth({
 }
 
 export function doctorHelp() {
-  return "bb doctor [--fix] [--print-exports] [--json]\n\nChecks the client key, repo binding, cached agent session, and this worktree's stack-lease capability (registered host + attested machine). --fix mints a replacement session and (re)establishes the stack-lease capability; --print-exports prints its canonical shell exports. When the client key is unreachable (a Background LaunchAgent cannot read the login Keychain), --fix mints from the tier-2 MCP key exported under the binding's mcp_env name (env only, never Keychain).";
+  return "bb doctor [--fix] [--print-exports] [--json]\nbb doctor --only git_transport [--remote <name>] [--url <push url>] [--fix] [--json]\n\nChecks the client key, repo binding, cached agent session, this worktree's stack-lease capability (registered host + attested machine), and whether git's SSH push connection carries a keepalive (git_transport). --fix mints a replacement session and (re)establishes the stack-lease capability; --print-exports prints its canonical shell exports. When the client key is unreachable (a Background LaunchAgent cannot read the login Keychain), --fix mints from the tier-2 MCP key exported under the binding's mcp_env name (env only, never Keychain).\n\ngit_transport: git opens the SSH connection BEFORE the pre-push hook runs, so a long hook lets it idle until it is dropped and the push dies (exit 141) after every gate passed. ok = ServerAliveInterval > 0 on the push's ssh; n/a = not an ssh remote; needs_fix / unknown = not provable. --fix sets git config --local core.sshCommand \"ssh -o ServerAliveInterval=20 -o ServerAliveCountMax=60\" only when nothing is configured; an existing GIT_SSH_COMMAND, core.sshCommand or GIT_SSH is never overwritten (the exact edit is printed instead).\n\n--only git_transport runs just that check — no sign-in, no network, well under a second — for a pre-push hook: exit 0 ok/n/a, 3 needs_fix/unknown (remedy on stderr), 4 usage. A hook passes its $1 as --remote and its $2 (the URL this push goes to) as --url; without --url every push URL of the remote (default: the branch's push remote, else origin) is checked.";
 }

package/src/api.mjs

@@ -385,9 +385,9 @@ export const SESSION_TOKEN_DENIED_TOOLS = new Set([
 // call to a specific tenant by appending ?tenant=<slug> to the endpoint (the
 // same mechanism as the documented BOTBUDDY_SERVER_URL override), letting the
 // server resolve/confirm exactly that tenant.
-function toolEndpoint(tenant) {
-  if (!tenant) return SERVER_URL;
-  const url = new URL(SERVER_URL);
+function toolEndpoint(tenant, base = SERVER_URL) {
+  if (!tenant) return base;
+  const url = new URL(base);
   url.searchParams.set("tenant", tenant);
   return url.toString();
 }
@@ -457,6 +457,9 @@ export async function registerContainerHost(body, {
 export async function callToolJson(toolName, args = {}, {
   fetchImpl = fetch, signal, auth: pinnedAuth = null, tenant = null, resolvePin = resolveDefaultTenantPin,
   requireSessionToken = false, resolveAuth = resolveCallAuth,
+  // BOT-2600: a delivery for a sealed run goes to the endpoint the run was
+  // registered with, not this process's ambient one.
+  serverUrl = SERVER_URL,
 } = {}) {
   let auth = pinnedAuth;
   let sessionTokenSelected = false;
@@ -481,7 +484,7 @@ export async function callToolJson(toolName, args = {}, {
   const body = { jsonrpc: "2.0", id: 1, method: "tools/call", params: { name: toolName, arguments: args } };
   let res;
   try {
-    res = await fetchImpl(toolEndpoint(pin), {
+    res = await fetchImpl(toolEndpoint(pin, serverUrl), {
       method: "POST",
       headers: { "Content-Type": "application/json", ...auth },
       body: JSON.stringify(body),

package/src/commands.mjs

@@ -30,6 +30,7 @@ import { createTelemetryOutbox } from "./telemetry-outbox.mjs";
 import { attestTelemetryCredential, loadTelemetryIdentity, loadTelemetryLocation } from "./telemetry-config.mjs";
 import { deliverExecutionEvent } from "./telemetry-delivery.mjs";
 import { doctorAgentAuth, doctorHelp, parseDoctorArgs, readClientKeyStrict, repairFailureRecovery } from "./agent-doctor.mjs";
+import { GIT_TRANSPORT_PASSING, checkGitTransport, formatGitTransportLine } from "./git-transport.mjs";
 import { formatPublishIp, isLoopbackIp, probeEnginePublishIp, publishIpFix } from "./docker-publish-ip.mjs";
 import { cmdHost, fixHelperWorkers, formatHelperWorkersLines, inspectHelperWorkers } from "./helper-host.mjs";
 import { clearAgentState, resolveAgentSessionCredential, selfHealAgentSession } from "./agent-session.mjs";
@@ -48,6 +49,9 @@ export function shouldCheckForUpdates(argv) {
   // BOT-1982: nor `test-ingest`, which runs at the tail of every test harness.
   if (command === "wait" || command === "telemetry" || command === "usage" || command === "test-ingest") return false;
   if (argv.includes("--json")) return false;
+  // BOT-2599: `bb doctor --only <check>` runs inside a git pre-push hook; it must
+  // stay local and sub-second, so it never consults the npm registry.
+  if (command === "doctor" && argv.some((arg) => arg === "--only" || arg.startsWith("--only="))) return false;
   return true;
 }
 
@@ -284,10 +288,13 @@ export async function cmdDoctor(args, {
   // BOT-1982: which credential test-run uploads would use — the ONE place a
   // missing upload credential is reported (the harnesses skip silently).
   testIngestReport = () => doctorTestIngest(),
+  // BOT-2599: will this clone's SSH push connection survive a long pre-push hook?
+  gitTransportReport = async ({ fix, remote, url }) => checkGitTransport({ fix, remote, url }),
 } = {}) {
   const parsed = parseDoctorArgs(args);
   if (parsed.help) { log(doctorHelp()); return 0; }
   if (parsed.errors.length) { errorLog(`bb doctor: ${parsed.errors.join("; ")}`); return 4; }
+  if (parsed.only === "git_transport") return doctorGitTransportOnly(parsed, { log, errorLog, gitTransportReport });
   const result = await doctor({ fix: parsed.fix, printExports: parsed.printExports });
   // BOT-2146: where would this host's engine publish a leased stack's ports?
   // Informational (read-only, never changes the exit code); reported only when
@@ -310,8 +317,13 @@ export async function cmdDoctor(args, {
   }
   // BOT-1982: informational, like usage sync — never changes the exit code.
   const testIngest = await Promise.resolve().then(testIngestReport).catch(() => null);
+  // BOT-2599: informational in the full report (its exit code stays the auth
+  // verdict existing callers key on); `--only git_transport` is the gating form.
+  const gitTransport = await Promise.resolve()
+    .then(() => gitTransportReport({ fix: parsed.fix, remote: parsed.remote ?? null, url: parsed.url ?? null }))
+    .catch(() => ({ check: "git_transport", status: "unknown", reason: "check_failed" }));
   if (parsed.json) {
-    log(JSON.stringify({ ...result.report, ...(usage ? { usage_sync: usage } : {}), ...(bootstrap ? { bootstrap } : {}), ...(helperWorkers ? { helper_workers: helperWorkers } : {}), ...(testIngest ? { test_ingest: testIngest } : {}) }));
+    log(JSON.stringify({ ...result.report, ...(usage ? { usage_sync: usage } : {}), ...(bootstrap ? { bootstrap } : {}), ...(helperWorkers ? { helper_workers: helperWorkers } : {}), ...(testIngest ? { test_ingest: testIngest } : {}), ...(gitTransport ? { git_transport: gitTransport } : {}) }));
   } else {
     log(`binding: ${result.report.binding.status}${result.report.binding.tenant ? ` (${result.report.binding.tenant})` : ""}`);
     log(`client key: ${result.report.client_key.status}`);
@@ -329,11 +341,36 @@ export async function cmdDoctor(args, {
     if (usage) log(formatUsageSyncLine(usage));
     for (const line of formatHelperWorkersLines(helperWorkers, helperFix)) log(line);
     if (testIngest) log(formatTestIngestLine(testIngest));
+    if (gitTransport) {
+      log(formatGitTransportLine(gitTransport));
+      if (gitTransport.recovery) log(`git transport recovery: ${gitTransport.recovery}`);
+    }
   }
   if (result.exports) log(result.exports);
   return result.exitCode;
 }
 
+/**
+ * BOT-2599: `bb doctor --only git_transport` — the one check, nothing else (no
+ * sign-in, no network), for a pre-push hook. Exit 0 = ok / n/a; 3 = needs_fix
+ * or unknown (a check that cannot prove a keepalive never passes); the remedy
+ * goes to stderr so a hook shows it.
+ */
+async function doctorGitTransportOnly(parsed, { log, errorLog, gitTransportReport }) {
+  let report;
+  try {
+    report = await gitTransportReport({ fix: parsed.fix, remote: parsed.remote ?? null, url: parsed.url ?? null });
+  } catch {
+    report = null;
+  }
+  if (!report) report = { check: "git_transport", status: "unknown", reason: "check_failed", recovery: "the git_transport check failed to run; run `bb doctor --only git_transport` by hand" };
+  if (parsed.json) log(JSON.stringify({ git_transport: report }));
+  else log(formatGitTransportLine(report));
+  const passing = GIT_TRANSPORT_PASSING.has(report.status);
+  if (!passing && report.recovery && !parsed.json) errorLog(`recovery: ${report.recovery}`);
+  return passing ? 0 : 3;
+}
+
 /** BOT-1021: is the daily sweep installed, and how did the last sync runs go? */
 export async function doctorUsageSync({ agentStatus = usageAgentStatus, status = usageStatus } = {}) {
   const agent = await agentStatus();
@@ -675,6 +712,8 @@ export async function cmdSetup(args, {
   selfHeal = selfHealAgentSession,
   callerResolver = resolveCaller,
   usageAgent = installUsageAgent,
+  // BOT-2599: setup also gives this clone's SSH push transport a keepalive.
+  gitTransport = async (opts) => checkGitTransport(opts),
   cwd = process.cwd(),
   env = process.env,
   platform = process.platform,
@@ -786,6 +825,7 @@ export async function cmdSetup(args, {
       errorLog(`bb setup: warning: ${warning} — held by ${who}. Confirm the active work before editing shared resources; typed locks remain required.`);
     }
     log(`bb setup: ${tenant} is ready (${session.source} worktree session). Run bb wait '<condition>'.`);
+    await reportGitTransport(gitTransport, { cwd, env, log });
     await reportUsageAgent(usageAgent, { cwd, log });
     return 0;
   } catch (error) {
@@ -805,6 +845,16 @@ async function reportUsageAgent(usageAgent, { cwd, log }) {
   else log(`bb setup: daily usage sync could not be installed (${result?.error ?? "unknown"}); run bb setup again to retry.`);
 }
 
+// BOT-2599: never fails setup — the session is ready either way; the line says
+// whether pushes from this clone keep their SSH connection through a long hook.
+async function reportGitTransport(gitTransport, { cwd, env, log }) {
+  let report;
+  try { report = await gitTransport({ cwd, env, fix: true }); } catch { report = null; }
+  if (!report) report = { check: "git_transport", status: "unknown", reason: "check_failed" };
+  log(`bb setup: ${formatGitTransportLine(report)}`);
+  if (report.recovery) log(`bb setup: git transport recovery: ${report.recovery}`);
+}
+
 export function loginHelp(log = console.log) {
   log(`${bold("botbuddy login")} — authenticate via OAuth (browser + loopback callback)
 

package/src/config.mjs

@@ -9,8 +9,8 @@ const CONFIG_FILE = join(CONFIG_DIR, "config.json");
 // BOT-876: overridable so the CLI can be pointed at a local Supabase stack
 // (`BOTBUDDY_SERVER_URL=http://127.0.0.1:56321/functions/v1/mcp-server`).
 // Production is the default; nothing changes for normal use.
-export const SERVER_URL = process.env.BOTBUDDY_SERVER_URL
-  || "https://api.bot-buddy.ai/functions/v1/mcp-server";
+export const DEFAULT_SERVER_URL = "https://api.bot-buddy.ai/functions/v1/mcp-server";
+export const SERVER_URL = process.env.BOTBUDDY_SERVER_URL || DEFAULT_SERVER_URL;
 
 let config = {};
 

package/src/fixtures/bot-2600-update-command-run-rejections-2026-10-20.json

@@ -0,0 +1,13 @@
+{
+  "source": "production MCP (api.bot-buddy.ai) via cli/src/api.mjs callToolJson, CLI worktree of BOT-2600",
+  "captured_at": "2026-10-20T19:15:53.070Z",
+  "note": "update_command_run for a random run id. Both requests are refused before any write; no credential value is recorded.",
+  "invalid_run_credential": {
+    "request": "x-agent-api-key: the caller's live session token; run_credential: 64 random hex",
+    "result": { "ok": true, "data": { "error": "run_credential_invalid" }, "isError": true }
+  },
+  "unknown_session_token": {
+    "request": "x-agent-api-key: bb_sess_ + 64 zeros",
+    "result": { "ok": false, "auth": true, "status": 401, "error": "unauthorized", "error_code": "session_token_revoked" }
+  }
+}