@bivy/bivy 0.18.11-staging.11 → 0.18.11-staging.13

package/dist/control-plane-tasks.js

@@ -121,8 +121,13 @@ export async function fetchPendingWork(cfg) {
 /** Consume the authoritative claim snapshot, not the earlier queue listing. */
 export async function claimWork(cfg, id) {
     const res = await cp(cfg, "POST", `/node/work/${encodeURIComponent(id)}/claim`, randomUUID());
-    if (!res.ok)
+    if (!res.ok) {
+        // 409 is the normal "another node won" race; anything else would otherwise
+        // leave an item silently pending forever.
+        if (res.status !== 409)
+            console.warn(`[control-plane-tasks] claim ${id} failed: HTTP ${res.status}`);
         return undefined;
+    }
     const data = await res.json();
     return data.item ?? { id }; // compatibility with older control planes
 }

package/dist/server.js

@@ -545,7 +545,10 @@ const runDelegation = new RunDelegationService({
             method: "POST",
             body: JSON.stringify({
                 title: "Delegated Run",
-                body: `bivy-room-v1:${targetId}:${seal(pairingStore.roomKey(), input.instructions)}`,
+                // Only the target machine can open its Run body, so seal with ITS room
+                // key: this machine's own for local work, the sibling's (learned over
+                // the sealed pairing handshake) for another machine.
+                body: `bivy-room-v1:${targetId}:${seal(targetId === identity.nodeId ? pairingStore.roomKey() : await siblingRoomKey(targetId), input.instructions)}`,
                 repo: input.repo,
                 node: machine,
                 runtimeId: input.agent,
@@ -568,7 +571,8 @@ const runDelegation = new RunDelegationService({
         if (!sessionId)
             return undefined;
         const routing = raw.routing && typeof raw.routing === "object" ? raw.routing : {};
-        const machine = typeof routing.nodeLabel === "string" && routing.nodeLabel ? routing.nodeLabel : identity.name;
+        // The queue routes by label `bivy/<machine>`.
+        const machine = typeof routing.nodeLabel === "string" && routing.nodeLabel ? routing.nodeLabel.replace(/^bivy\//, "") : identity.name;
         if (machine === identity.name)
             return delegationAnswer(sessionId);
         const target = (await accountMachines()).find((m) => m.name === machine);
@@ -604,6 +608,19 @@ async function siblingRequest(nodeId, command, timeoutMs = 20_000) {
         client.close();
     }
 }
+/** Another machine's room key, from a sealed pairing with it. */
+async function siblingRoomKey(nodeId) {
+    if (!sessionAdvertiseTarget)
+        throw new Error("This machine is not signed in to an account.");
+    const client = new SiblingClient({ controlPlaneUrl: sessionAdvertiseTarget.controlPlaneUrl, enrollmentToken: sessionAdvertiseTarget.enrollmentToken, siblingNodeId: nodeId, label: "Bivy delegation" });
+    try {
+        await client.connect();
+        return client.roomKey();
+    }
+    finally {
+        client.close();
+    }
+}
 /** Agents this machine can run a delegated task with (installed ones). */
 function localAgents() {
     return runtimeList().filter((rt) => rt.status === "available").map((rt) => ({ id: rt.id, name: String(rt.displayName || rt.id) }));
@@ -4849,8 +4866,16 @@ async function runSessionTurn(record, prompt, signal) {
     if (signal?.aborted)
         throw signal.reason ?? new Error("Run cancelled");
     let unsubscribe = () => { };
+    // A turn the agent failed (usage limit, auth, crash) still ends with
+    // agent_end; remember why so the Run fails instead of reporting success.
+    let turnError = "";
     const finished = new Promise((resolve) => {
         unsubscribe = record.session.subscribe((event) => {
+            const e = event;
+            if (e.type === "session.error" && typeof e.error === "string")
+                turnError ||= e.error;
+            if (e.type === "message_end" && e.message?.stopReason === "error" && typeof e.message.errorMessage === "string")
+                turnError ||= e.message.errorMessage;
             if (event.type === "agent_end")
                 resolve();
         });
@@ -4865,6 +4890,8 @@ async function runSessionTurn(record, prompt, signal) {
     try {
         await turnWatchdog.promptWithWatchdog(record, prompt);
         await (signal ? Promise.race([finished, cancelled]) : finished);
+        if (turnError)
+            throw new Error(turnError);
     }
     finally {
         signal?.removeEventListener("abort", onAbort);
@@ -5324,6 +5351,10 @@ async function delegationAnswer(sessionId) {
         const message = messages[i];
         if (message?.role !== "assistant")
             continue;
+        // A turn the agent failed (usage limit, auth) ends on an error marker, not
+        // prose: hand the parent the reason instead of an empty answer.
+        if (message.stopReason === "error" && typeof message.errorMessage === "string" && message.errorMessage.trim())
+            return `The delegated agent failed: ${message.errorMessage.trim()}`;
         const text = runtimeContentText(message.content).trim();
         if (text)
             return text;

package/dist/session/sibling-client.js

@@ -30,6 +30,7 @@ export class SiblingClient {
     opts;
     ws;
     cipher;
+    siblingRoomKey;
     keypair = newDeviceKeypair();
     reassembler = new FrameReassembler({ onReject: () => this.ws?.close() });
     transfers = new EventTransferReceiver({
@@ -147,6 +148,7 @@ export class SiblingClient {
         if (k === "pair.welcome") {
             try {
                 const roomKey = acceptWelcome(this.keypair, { nodePublicKeyB64: String(p.nodePublicKeyB64 ?? ""), wrapped: String(p.wrapped ?? "") });
+                this.siblingRoomKey = roomKey;
                 this.cipher = new RoomCipher(roomKey);
                 this.resolvePaired?.();
             }
@@ -169,6 +171,13 @@ export class SiblingClient {
         }
         this.opts.onEvent?.(event);
     }
+    /** The sibling's room key, once paired: what seals content only it can read
+     *  (e.g. a delegated Run's instructions queued for that machine). */
+    roomKey() {
+        if (!this.siblingRoomKey)
+            throw new Error("sibling client not paired");
+        return this.siblingRoomKey;
+    }
     /** Send a command and await its correlated reply event (by requestId). */
     request(command, timeoutMs = 30_000) {
         const requestId = `repl-${++this.reqSeq}-${Date.now()}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bivy/bivy",
-  "version": "0.18.11-staging.11",
+  "version": "0.18.11-staging.13",
   "type": "module",
   "license": "AGPL-3.0-only",
   "description": "Run coding agents on machines you own. Open-source, self-hostable agent workspace.",