@botbuddy/cli 1.40.10 → 1.40.11

package/package.json

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

package/src/agent-doctor.mjs

@@ -1,7 +1,6 @@
 // BOT-1649 — diagnose and repair a worktree's short-lived agent credential
 // without ever printing the token unless the operator explicitly requests an
 // export snippet for the current shell.
-import { hostname } from "node:os";
 import { readAgentBinding } from "./wait-profile.mjs";
 import { resolveOwnerToken, CLIENT_KEY_SERVICE, OWNER_TOKEN_SERVICE } from "./cli-credentials.mjs";
 import { readKeychainSecret } from "./agent-credential-store.mjs";
@@ -9,6 +8,7 @@ import { getConfig } from "./config.mjs";
 import { isAgentStateFresh, readAgentState } from "./agent-state.mjs";
 import { selfHealAgentSession } from "./agent-session.mjs";
 import { machineUuid } from "./machine-id.mjs";
+import { machineHost } from "./machine-host.mjs";
 
 export function parseDoctorArgs(argv = []) {
   const parsed = { fix: false, printExports: false, json: false, errors: [] };
@@ -97,6 +97,16 @@ function applyStackLeaseCapability(report, capability) {
   if (!capability || typeof capability.status !== "string") return;
   report.stack_lease.capability = capability.status;
   if (capability.reason) report.stack_lease.reason = capability.reason;
+  if (capability.reported_host && capability.enrolled_host) {
+    report.stack_lease.hostname_drift = {
+      reported: capability.reported_host,
+      enrolled: capability.enrolled_host,
+      remedies: [
+        "use the macOS LocalHostName reported by `scutil --get LocalHostName`",
+        "or re-enrol the Helper if this is intentionally a different machine",
+      ],
+    };
+  }
   if (capability.status !== "established" && !report.recovery) {
     report.recovery = `stack leases need a device-consented Helper on this machine: ${capability.reason ?? "worktree not attested"}`;
   }
@@ -126,7 +136,7 @@ export async function doctorAgentAuth({
   // inside selfHeal, which the `--fix` gate skips when it reports the key missing.
   ownerToken = readClientKeyStrict,
   selfHeal = selfHealAgentSession,
-  hostFn = hostname, machineUuidFn = machineUuid,
+  hostFn = machineHost, machineUuidFn = machineUuid,
 } = {}) {
   let owner = null;
   let ownerReadFailed = false;
@@ -140,6 +150,7 @@ export async function doctorAgentAuth({
   // LaunchAgent). Env only, exactly like selfHealAgentSession; never the value.
   const mcpEnv = typeof bound?.mcpEnv === "string" && bound.mcpEnv ? bound.mcpEnv : null;
   const mcpKeyInEnv = Boolean(mcpEnv && typeof env?.[mcpEnv] === "string" && env[mcpEnv]);
+  const resolvedHost = await hostFn();
   const report = {
     schema_version: 1,
     worktree: cwd,
@@ -156,7 +167,7 @@ export async function doctorAgentAuth({
     // is known only after a register call, so a plain `bb doctor` reports `unverified`
     // and `--fix` re-registers to (re)establish it (`established` | `unattested`).
     stack_lease: {
-      host: hostFn(),
+      host: resolvedHost,
       machine_id_readable: Boolean(machineUuidFn()),
       capability: "unverified",
     },

package/src/machine-host.mjs

@@ -0,0 +1,26 @@
+import { execFile } from "node:child_process";
+import { hostname, platform } from "node:os";
+import { promisify } from "node:util";
+import { canonicalizeHostString } from "./pw/host.mjs";
+
+const execFileAsync = promisify(execFile);
+
+/**
+ * Return the host identity used by Helper enrolment. macOS's kernel hostname can
+ * follow DHCP; Bonjour LocalHostName is stable and is what the Helper records.
+ */
+export async function machineHost({
+  platformFn = platform,
+  hostnameFn = hostname,
+  execFileFn = execFileAsync,
+} = {}) {
+  if (platformFn() !== "darwin") return hostnameFn();
+  try {
+    const { stdout } = await execFileFn("scutil", ["--get", "LocalHostName"]);
+    const localName = canonicalizeHostString(stdout);
+    if (localName) return `${localName}.local`;
+  } catch {
+    // Minimal shells can lack scutil; the existing hostname behaviour is safe.
+  }
+  return hostnameFn();
+}

package/src/session-bootstrap.mjs

@@ -8,6 +8,8 @@ import { clearAgentSessionIfMatches, drainPendingCleanup, recordPendingCleanup }
 import { readAgentBinding } from "./wait-profile.mjs";
 import { resolveAgentKey, resolveOwnerToken } from "./cli-credentials.mjs";
 import { getConfig } from "./config.mjs";
+import { machineHost } from "./machine-host.mjs";
+import { machineUuid } from "./machine-id.mjs";
 
 // BOT-1650 → BOT-1649 reconciliation: the harness session lives in the ONE
 // unified client cache (agent-state.mjs), written in main's `agent_session_token`
@@ -29,7 +31,7 @@ export async function loadHarnessSession({ cwd = process.cwd() } = {}) {
 /** Persist a bootstrap-issued session into the unified cache. The bootstrap RPC
  * does not echo the tenant, so derive it from the committed binding exactly as
  * selfHealAgentSession does; host/worktree/minted_at are derived locally. */
-export async function saveHarnessSession(session, { cwd = process.cwd() } = {}) {
+export async function saveHarnessSession(session, { cwd = process.cwd(), machineHostFn = machineHost } = {}) {
   const root = await worktreeRoot(cwd);
   let tenant;
   try { tenant = (await readAgentBinding(root))?.tenant; } catch { tenant = undefined; }
@@ -39,7 +41,7 @@ export async function saveHarnessSession(session, { cwd = process.cwd() } = {})
     agent_session_token: session.session_token,
     session_id: session.session_id ?? null,
     ...(tenant ? { tenant } : {}),
-    host: os.hostname(),
+    host: await machineHostFn(),
     worktree: root,
     minted_at: new Date().toISOString(),
     expires_at: session.expires_at,
@@ -218,6 +220,8 @@ export async function bootstrapHarnessSession({
   model = null,
   effort = null,
   harness = type,
+  machineHostFn = machineHost,
+  machineUuidFn = machineUuid,
   call = callToolJson,
   callOptions = undefined,
   resolveCleanupOptions = durableCleanupOptions,
@@ -249,11 +253,14 @@ export async function bootstrapHarnessSession({
     // bootstrap straight through so the server reuses a still-live incarnation
     // or rotates a truly expired one; never revoke an active wait from a stale
     // local timestamp.
+    const host = await machineHostFn();
+    const hardwareUuid = machineUuidFn();
     const response = await call("bootstrap_agent_session", {
       name,
       type,
       harness_session_id: harnessSessionId,
-      host: os.hostname(),
+      host,
+      ...(hardwareUuid ? { machine_uuid: hardwareUuid } : {}),
       worktree,
       ...(branch ? { branch } : {}),
       ...(ticketId ? { ticket_id: ticketId } : {}),