@botbuddy/cli 1.68.0 → 1.68.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.68.1
+
+- The bb-status band now binds a Claude Code session whose repo has no BotBuddy SessionStart hook, such as Supply Guard worktrees, instead of showing "BB identity belongs to another session". When the worktree has no session cache, an unbound one or an expired one, `bb status-band read` bootstraps this session once (ticketless, the same bootstrap `bb bootstrap` runs) and reads again. A cache another live session holds is never taken over.
+
 ## 1.68.0
 
 - The bb-status band for Claude Code now ships in this package. `bb setup` and `bb update` install it once, at user scope, through `bb status-band install`. They point the `botbuddy-labs` marketplace at the plugin inside the installed CLI, so every worktree shows the band with no plugin command, and no repo checkout is needed. The band's reads and live wake run from the installed CLI (`bb status-band read` and `bb status-band relay`).

package/daemon-release/darwin-arm64.json

@@ -1,7 +1,7 @@
 {
-  "release_version": "1.68.0",
-  "source_commit": "dacd86b04baacbb89711e0a72c52ee036fd17721",
-  "source_sha256": "f857817d22c1d475d9b53f86b0ea73f2e6e0af18f306b1d079b21cc844413260",
+  "release_version": "1.68.1",
+  "source_commit": "910247e2ef698463c9c5e1e4949caac7c6bb343c",
+  "source_sha256": "cd971a2647c6424648a30ec47b69c5eff464f408888cd66b5ea9d23a37cf6b83",
   "target": "darwin-arm64",
-  "sha256": "3a9d33c8cfd04bd4844025552464c02b55399fab1c5352fdc86799a62c8bec5e"
+  "sha256": "9cbc2b6f427cc6070f27492bd1693525bcbbc4dad66aacdd2d82c5fb7f64d834"
 }

package/daemon-release/linux-x64.json

@@ -1,7 +1,7 @@
 {
-  "release_version": "1.68.0",
-  "source_commit": "dacd86b04baacbb89711e0a72c52ee036fd17721",
-  "source_sha256": "f857817d22c1d475d9b53f86b0ea73f2e6e0af18f306b1d079b21cc844413260",
+  "release_version": "1.68.1",
+  "source_commit": "910247e2ef698463c9c5e1e4949caac7c6bb343c",
+  "source_sha256": "cd971a2647c6424648a30ec47b69c5eff464f408888cd66b5ea9d23a37cf6b83",
   "target": "linux-x64",
-  "sha256": "15fde9d3dd872809e9cc0aead517e7aef9a5398af55b4543269cdd90a6ffc96b"
+  "sha256": "2ace98b6231c22ae2cf20940ef61c5d08df4ed6af7735f8109bc91fe829eb1fb"
 }

package/daemon-release/manifest.json

@@ -1,21 +1,21 @@
 {
   "schema_version": 1,
-  "release_version": "1.68.0",
-  "source_commit": "dacd86b04baacbb89711e0a72c52ee036fd17721",
-  "source_sha256": "f857817d22c1d475d9b53f86b0ea73f2e6e0af18f306b1d079b21cc844413260",
+  "release_version": "1.68.1",
+  "source_commit": "910247e2ef698463c9c5e1e4949caac7c6bb343c",
+  "source_sha256": "cd971a2647c6424648a30ec47b69c5eff464f408888cd66b5ea9d23a37cf6b83",
   "targets": {
     "darwin-arm64": {
       "goos": "darwin",
       "goarch": "arm64",
       "binary": "daemon/bin/darwin-arm64/botbuddy-daemon",
-      "sha256": "3a9d33c8cfd04bd4844025552464c02b55399fab1c5352fdc86799a62c8bec5e",
+      "sha256": "9cbc2b6f427cc6070f27492bd1693525bcbbc4dad66aacdd2d82c5fb7f64d834",
       "mode": "0755"
     },
     "linux-x64": {
       "goos": "linux",
       "goarch": "amd64",
       "binary": "daemon/bin/linux-x64/botbuddy-daemon",
-      "sha256": "15fde9d3dd872809e9cc0aead517e7aef9a5398af55b4543269cdd90a6ffc96b",
+      "sha256": "2ace98b6231c22ae2cf20940ef61c5d08df4ed6af7735f8109bc91fe829eb1fb",
       "mode": "0755"
     }
   }

package/package.json

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

package/src/status-band-read.mjs

@@ -473,7 +473,48 @@ export async function readStatus({
       : null,
   };
 }
-export async function main(args, { out = process.stdout, cwd = process.cwd(), env = process.env } = {}) {
+// BOT-3152 AC-5: a repo with no SessionStart bootstrap hook (Supply Guard) leaves
+// the worktree cache missing, unbound (no harness id) or expired, so the band
+// binds this session itself, once per read, through the same bootstrap
+// `bb bootstrap` runs. A cache another harness session holds is never
+// bootstrapped over: that session owns the worktree's identity.
+const BINDABLE = new Set(["session_missing", "session_mismatch", "session_expired"]);
+async function bindable(cwd, harnessSessionId, now) {
+  let state;
+  try {
+    state = JSON.parse(await readFile(join(await realpath(cwd), ".botbuddy/agent-state.json"), "utf8"));
+  } catch (error) {
+    return error?.code === "ENOENT";
+  }
+  const holder = typeof state?.harness_session_id === "string" ? state.harness_session_id.toLowerCase() : "";
+  if (!holder || holder === harnessSessionId.toLowerCase()) return true;
+  return !(Date.parse(state.expires_at) > now());
+}
+async function bootstrapBand({ cwd, harnessSessionId, branch }) {
+  const [{ bootstrapHarnessSession }, { getConfig }, { hostname }] = await Promise.all([
+    import("./session-bootstrap.mjs"),
+    import("./config.mjs"),
+    import("node:os"),
+  ]);
+  await bootstrapHarnessSession({
+    name: `${getConfig()?.agent_name || `botbuddy-${hostname()}`}-${harnessSessionId.slice(0, 8)}`,
+    type: "claude",
+    harnessSessionId,
+    cwd,
+    branch,
+    noTicketReason: "bb-status band bound a Claude Code session its repo did not bootstrap",
+    harness: "botbuddy-claude-band",
+  });
+}
+
+export async function main(args, {
+  out = process.stdout,
+  cwd = process.cwd(),
+  env = process.env,
+  read = readStatus,
+  bootstrap = bootstrapBand,
+  now = () => Date.now(),
+} = {}) {
   try {
     args = [...args];
     const skipEpic = args.at(-1) === "--skip-epic";
@@ -484,13 +525,23 @@ export async function main(args, { out = process.stdout, cwd = process.cwd(), en
       (args.length === 4 && args[2] !== "--ticket-id")
     )
       refuse("invalid_arguments");
-    const snapshot = await readStatus({
-      cwd,
-      harnessSessionId: args[1],
-      ticketId: args[3],
-      linearKey: env.LINEAR_BB_API_KEY,
-      skipEpic,
-    });
+    const request = { cwd, harnessSessionId: args[1], ticketId: args[3], linearKey: env.LINEAR_BB_API_KEY, skipEpic };
+    let snapshot;
+    try {
+      snapshot = await read(request);
+    } catch (error) {
+      if (!BINDABLE.has(error?.message) || !UUID.test(args[1]) || !(await bindable(cwd, args[1], now))) throw error;
+      let branch = null;
+      try {
+        branch = (await execFileAsync("git", ["branch", "--show-current"], { cwd })).stdout.trim() || null;
+      } catch { /* detached or not a repo: bootstrap without a branch */ }
+      try {
+        await bootstrap({ cwd, harnessSessionId: args[1].toLowerCase(), branch });
+      } catch {
+        throw error;
+      }
+      snapshot = await read(request);
+    }
     out.write(JSON.stringify(snapshot) + "\n");
     return 0;
   } catch (error) {