@botbuddy/cli 1.6.4 → 1.7.0

package/package.json

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

package/src/wait-profile.mjs

@@ -79,6 +79,10 @@ export function withPrincipalReceipt(receipt, profile, registration = {}) {
       profile: profile.name,
       tenant_id: registration.sessionTenant ?? profile.tenant,
       agent_id: registration.agentId ?? null,
+      // BOT-1467: the arming session's agent, when the relay attributed the wait
+      // to it instead of the profile agent (null for an ordinary profile wait).
+      session_id: registration.sessionId ?? null,
+      session_agent_id: registration.sessionAgentId ?? null,
     },
   };
 }

package/src/wait.mjs

@@ -93,6 +93,7 @@ OPTIONS
   --heartbeat           keep this agent session alive while waiting (so it is not reaped)
   --url <base>          relay base URL (default $BOTBUDDY_RELAY_URL or https://api.bot-buddy.ai/functions/v1)
   --profile <name>      tenant-bound machine profile (normally read from .botbuddy-agent.json)
+  --session-id <uuid>   attribute this wait to the arming session (the work-graph session id from register_agent); default $BOTBUDDY_SESSION_ID
   --token <key>         explicit agent key override; otherwise the profile-specific env is used
   --help                show this help
 
@@ -133,6 +134,9 @@ function parseArgv(argv) {
     url: process.env.BOTBUDDY_RELAY_URL || "https://api.bot-buddy.ai/functions/v1",
     token: null,
     profile: null,
+    // BOT-1467: attribute this wait to the arming session's agent (the id from
+    // register_agent) instead of the tenant-bound profile agent. Env fallback.
+    sessionId: process.env.BOTBUDDY_SESSION_ID || null,
     help: false,
   };
   for (let i = 0; i < argv.length; i++) {
@@ -155,6 +159,7 @@ function parseArgv(argv) {
     else if (a === "--url") opts.url = optionValue();
     else if (a === "--token") opts.token = optionValue();
     else if (a === "--profile") opts.profile = optionValue();
+    else if (a === "--session-id") opts.sessionId = optionValue();
     else if (a.startsWith("--")) opts.unknown = a;
     else opts.conditions.push(a);
   }
@@ -176,6 +181,9 @@ async function registerWait(opts, conditions, deadlineIso) {
       action: "register",
       profile: opts.agentProfile.name,
       expected_tenant: opts.agentProfile.tenant,
+      // BOT-1467: name the arming work-graph session so the relay resolves and attributes
+      // the wait to its agent (validated same-owner) instead of the profile agent.
+      ...(opts.sessionId ? { session_id: opts.sessionId } : {}),
       client_version: VERSION,
       wait_protocol_version: WAIT_PROTOCOL_VERSION,
       conditions,
@@ -224,6 +232,11 @@ async function registerWait(opts, conditions, deadlineIso) {
       // can't bind to one workspace (ci / pr-review / bare tenant-primary event). A hard
       // stop — arming it untracked would only ever park to timeout.
       "tenant_ambiguous",
+      // BOT-1467: a caller-actionable session-attribution rejection — a malformed
+      // --session-id, or one passed without a profile. Arming it untracked would
+      // only ever park to timeout, so it's a hard stop, not the live-only fallback.
+      "invalid_session_agent",
+      "session_agent_requires_profile",
     ]);
     if (INVALID_CONDITION_CODES.has(body.error)) {
       const err = new Error(body.detail || body.error);
@@ -293,6 +306,10 @@ async function registerWait(opts, conditions, deadlineIso) {
     // new relay (the deploy-skew case, acceptable because waits are short-lived).
     sessionTenant: body.session_tenant ?? null,
     agentId: body.agent_id ?? null,
+    // BOT-1467: the session agent the relay attributed the wait to, if any (it
+    // echoes session_agent_id only when it overrode the profile agent).
+    sessionId: body.session_id ?? null,
+    sessionAgentId: body.session_agent_id ?? null,
   };
 }
 
@@ -565,6 +582,9 @@ export async function runWait(argv) {
   // pre-BOT-1259 behaviour for a wait the server never scoped.
   let sessionTenant;
   let registeredAgentId = null;
+  // BOT-1467: the session agent the relay attributed the wait to (when overridden).
+  let registeredSessionAgentId = null;
+  let registeredSessionId = null;
   if (needsRelay) {
     try {
       const reg = await registerWait(opts, conditions, new Date(deadlineMs).toISOString());
@@ -572,6 +592,8 @@ export async function runWait(argv) {
       opts.waitSessionId = waitSessionId;
       sessionTenant = reg.sessionTenant;
       registeredAgentId = reg.agentId;
+      registeredSessionAgentId = reg.sessionAgentId;
+      registeredSessionId = reg.sessionId;
       // BOT-1184: adopt the server's canonical host for each lock condition so the
       // local matcher builds the same subject_key the availability/claim-grant
       // signals carry (armed under an alias like 'jono-mac', the signal uses the
@@ -709,6 +731,8 @@ export async function runWait(argv) {
       withClientIdentity(withPrincipalReceipt(receipt, opts.agentProfile, {
         sessionTenant,
         agentId: registeredAgentId,
+        sessionAgentId: registeredSessionAgentId,
+        sessionId: registeredSessionId,
       })),
       opts.receiptMaxBytes,
     );

package/src/botbuddy-release-repair.json

@@ -1 +0,0 @@
-{"schema_version":1,"source_version":"1.6.3","source_identity":"2deb439f7afdbb1918d76fe15665ed6ca14c30bcfd5d65524083695cc939814c"}