@bivy/bivy 0.18.5-staging.1 → 0.18.5-staging.2

package/dist/model-auth-key-recovery.js

@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+// Copyright (c) 2026 Petter André Sjulstad
+/** Validate keys against the vault before caching them or sharing them with peers.
+ * A stale local key must not hide a fresh peer wrap; an unusable wrap must never
+ * be persisted as though key recovery succeeded. No credential data is changed.
+ */
+export function recoverModelAuthKey(options) {
+    if (options.localKey) {
+        try {
+            return { key: options.localKey, value: options.decrypt(options.localKey) };
+        }
+        catch { /* Try the peer's replacement before requesting another wrap. */ }
+    }
+    if (options.unwrap) {
+        try {
+            const key = options.unwrap();
+            return { key, value: options.decrypt(key) };
+        }
+        catch { /* The caller must reject this exact wrap and request a new one. */ }
+    }
+    return undefined;
+}

package/dist/server.js

@@ -149,6 +149,7 @@ import { redactSecrets } from "./redact.js";
 import { getSttConfig, isSttProvider, removeSttKey, setSttKey, setSttProvider, transcribeAudio, MAX_AUDIO_BYTES, } from "./stt.js";
 import { synthesizeOpenAiSpeech } from "./tts.js";
 import { seal, open } from "./e2e.js";
+import { recoverModelAuthKey } from "./model-auth-key-recovery.js";
 import { RunDelegationService, parseDelegationSource } from "./run-tools.js";
 import { ControlPlaneTaskPoller, resolveControlPlaneTaskConfig, } from "./control-plane-tasks.js";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
@@ -3365,20 +3366,31 @@ async function syncModelAuthFromControlPlane() {
         }
         const targetVault = hostedCustody ? hostedData.hostedVault : data.vault;
         let vaultKeyB64 = hostedCustody ? readHostedModelAuthVaultKey() : readLocalModelAuthVaultKey();
-        if (!hostedCustody && !vaultKeyB64 && data.wrappedKey?.wrappedKey) {
-            vaultKeyB64 = pairingStore.unwrapFromNodePublicKey(data.wrappedKey.wrappedByPublicKey, data.wrappedKey.wrappedKey);
-            writeLocalModelAuthVaultKey(vaultKeyB64);
-        }
         // Hosted runners may decrypt ONLY the separately encrypted snapshot of
         // records that the user explicitly granted to unattended execution.
         if (hostedCustody && !vaultKeyB64 && hostedData.hostedKey && hostedData.hostedVault && Buffer.from(hostedData.hostedKey, "base64").length === 32) {
             vaultKeyB64 = hostedData.hostedKey;
             writeHostedModelAuthVaultKey(vaultKeyB64);
         }
-        if (targetVault?.ciphertext && vaultKeyB64) {
+        if (targetVault?.ciphertext && (vaultKeyB64 || (!hostedCustody && data.wrappedKey))) {
             let decrypted;
             try {
-                decrypted = decryptModelAuthEnvelope(targetVault.ciphertext, vaultKeyB64);
+                if (hostedCustody) {
+                    decrypted = decryptModelAuthEnvelope(targetVault.ciphertext, vaultKeyB64);
+                }
+                else {
+                    const wrapped = data.wrappedKey;
+                    const recovered = recoverModelAuthKey({
+                        localKey: vaultKeyB64,
+                        unwrap: wrapped ? () => pairingStore.unwrapFromNodePublicKey(wrapped.wrappedByPublicKey, wrapped.wrappedKey) : undefined,
+                        decrypt: (key) => decryptModelAuthEnvelope(targetVault.ciphertext, key),
+                    });
+                    if (!recovered)
+                        throw new Error("No available key can decrypt the account vault");
+                    vaultKeyB64 = recovered.key;
+                    decrypted = recovered.value;
+                    writeLocalModelAuthVaultKey(vaultKeyB64);
+                }
             }
             catch (error) {
                 // Most commonly this node cached the previous generation while another
@@ -3394,7 +3406,10 @@ async function syncModelAuthFromControlPlane() {
                 else {
                     forgetLocalModelAuthVaultKey();
                     lastPushedModelAuthCiphertext = "";
-                    await modelAuthFetch("/node/model-auth-key/request", { method: "POST", body: JSON.stringify({ publicKey: pairingStore.nodePublicKeyB64() }) });
+                    await modelAuthFetch("/node/model-auth-key/request", {
+                        method: "POST",
+                        body: JSON.stringify({ publicKey: pairingStore.nodePublicKeyB64(), rejectedWrappedKey: data.wrappedKey?.wrappedKey }),
+                    });
                     ensureModelAuthColdStart();
                 }
                 console.warn("[auth-sync] cached vault key is stale; requested the rotated key:", error.message);

package/package.json

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