@botbuddy/cli 1.8.1 → 1.8.2

package/package.json

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

package/src/pw/coordinator.mjs

@@ -8,5 +8,5 @@ export function createProfileCoordinator({ profile, identity, fetchImpl = fetch
     const json = await response.json(); if (json.error) throw new Error(json.error.message || "BotBuddy lock verification failed");
     const text = json.result?.content?.find((item) => item.type === "text")?.text; try { return text ? JSON.parse(text) : {}; } catch { throw new Error("BotBuddy lock verification returned invalid JSON"); }
   }
-  return { kind: "profile", async status({ host, slot }) { const result = await call("list_resources", { host, subtype: "playwright_lane" }); const list = Array.isArray(result) ? result : result.resources ?? []; const resource = list.find((item) => item.name === `playwright_lane:${host}:${slot}` || String(item.slot) === String(slot)); return resource ? { held: resource.status !== "free", heldBy: resource.owner_agent_id ?? null, heldByName: resource.agents?.name ?? null, host: resource.host ?? null, name: resource.name ?? null, slot: resource.slot ?? null } : { held: false, heldBy: null, heldByName: null, host: null, name: null, slot: null }; }, async emit(event) { await call("record_lane_event", event); }, agentId: identity.agentId };
+  return { kind: "profile", async status({ host, slot }) { const result = await call("list_resources", { host, subtype: "playwright_lane" }); const list = Array.isArray(result) ? result : result.resources ?? []; const resource = list.find((item) => item.name === `playwright_lane:${host}:${slot}` || String(item.slot) === String(slot)); /* BOT-1490: canonical_host is a TOP-LEVEL field the server echoes even on an empty page (not-held lane); owner_is_caller is per-row. Older servers send neither → null. */ const canonicalHost = (result && !Array.isArray(result) ? result.canonical_host : null) ?? null; return resource ? { held: resource.status !== "free", heldBy: resource.owner_agent_id ?? null, heldByName: resource.agents?.name ?? null, host: resource.host ?? null, name: resource.name ?? null, slot: resource.slot ?? null, canonicalHost, ownerIsCaller: resource.owner_is_caller ?? null } : { held: false, heldBy: null, heldByName: null, host: null, name: null, slot: null, canonicalHost, ownerIsCaller: null }; }, async emit(event) { await call("record_lane_event", event); }, agentId: identity.agentId };
 }

package/src/pw/run.mjs

@@ -43,16 +43,24 @@ async function gate({ env, host, lane, deps }) {
   try {
     const status = await coordinator.status({ host, slot: lane });
     // The server's alias map can collapse the locally-normalized host further
-    // (jonos-macbook-pro -> jonos-mbp). When the lock service returned the resource,
-    // prefer its canonical host + name so messages/telemetry match what it stored,
-    // rather than the string bb-pw built — the ticket's "match by the canonical host
-    // field the server returns" path, without replicating the alias map here.
-    const canonicalHost = status.host ?? host;
-    const foundLaneName = status.name ?? laneName;
-    if (status.held && selfAgentIds.has(status.heldBy)) return { allowed: true, coordinator, canonicalHost };
+    // (jonos-macbook-pro -> jonos-mbp). BOT-1490: the lock service now echoes that
+    // canonical host as a top-level field EVEN on a not-held lane (empty page), so
+    // prefer it for every lane name/message; fall back to the resource host
+    // (BOT-1488, only present when a resource was returned) then the local string —
+    // without replicating the alias map here.
+    const canonicalHost = status.canonicalHost ?? status.host ?? host;
+    const foundLaneName = status.name ?? `playwright_lane:${canonicalHost}:${lane}`;
+    // Allow when a local id matches the holder (BOT-1488: profile / --session-id /
+    // $BOTBUDDY_SESSION_ID / ~/.botbuddy/config.json) OR the lock service attributes
+    // the holder to the caller's owner (BOT-1490 owner_is_caller — server-authoritative,
+    // closing the shared-hostname gap without trusting a local file). The local paths
+    // stay as fallbacks for older servers that do not send owner_is_caller.
+    if (status.held && (selfAgentIds.has(status.heldBy) || status.ownerIsCaller === true)) return { allowed: true, coordinator, canonicalHost };
     // Distinguish an expired/free lane from one another operator holds so the
-    // operator knows whether to re-acquire vs. wait for a handover (BOT-660).
-    if (!status.held) return { allowed: false, message: `bb-pw: lane lock ${laneName} is not held (caller ${identity.agentId}). Acquire it via BotBuddy first, or set BB_PW_NO_LOCK=1 for local-only work.` };
+    // operator knows whether to re-acquire vs. wait for a handover (BOT-660). Name it
+    // by the server's canonical host so a not-held message matches the dashboard even
+    // when local normalization cannot reach the alias-collapsed key (BOT-1490 AC-5).
+    if (!status.held) return { allowed: false, message: `bb-pw: lane lock ${foundLaneName} is not held (caller ${identity.agentId}). Acquire it via BotBuddy first, or set BB_PW_NO_LOCK=1 for local-only work.` };
     const holder = status.heldBy ?? "unknown";
     const holderName = status.heldByName ? ` (${status.heldByName})` : "";
     return { allowed: false, message: `bb-pw: lane lock ${foundLaneName} is held by ${holder}${holderName}, not you (caller ${identity.agentId}). Acquire it first or set BB_PW_NO_LOCK=1 for local-only work.` };