@agentvault/agentvault 0.20.23 → 0.20.25

package/dist/cli.js

@@ -62727,6 +62727,48 @@ function mlsFileName(groupId) {
   const safe = groupId.replace(/[^a-zA-Z0-9_-]/g, "_");
   return `mls-${safe}.json`;
 }
+async function hasPendingWelcome(dataDir2, groupId) {
+  try {
+    await readFile(pendingKpPath(dataDir2, groupId));
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function savePendingKpBundle(dataDir2, groupId, kp) {
+  await mkdir(dataDir2, { recursive: true, mode: DIR_MODE });
+  const serialized = {
+    publicPackage: Buffer.from(kp.publicPackage).toString("base64"),
+    privatePackage: {
+      initPrivateKey: Buffer.from(kp.privatePackage.initPrivateKey).toString("base64"),
+      hpkePrivateKey: Buffer.from(kp.privatePackage.hpkePrivateKey).toString("base64"),
+      signaturePrivateKey: Buffer.from(kp.privatePackage.signaturePrivateKey).toString("base64")
+    }
+  };
+  await writeFile(pendingKpPath(dataDir2, groupId), JSON.stringify(serialized), { encoding: "utf-8", mode: FILE_MODE });
+}
+async function loadPendingKpBundle(dataDir2, groupId) {
+  try {
+    const raw = await readFile(pendingKpPath(dataDir2, groupId), "utf-8");
+    const parsed = JSON.parse(raw);
+    return {
+      publicPackage: new Uint8Array(Buffer.from(parsed.publicPackage, "base64")),
+      privatePackage: {
+        initPrivateKey: new Uint8Array(Buffer.from(parsed.privatePackage.initPrivateKey, "base64")),
+        hpkePrivateKey: new Uint8Array(Buffer.from(parsed.privatePackage.hpkePrivateKey, "base64")),
+        signaturePrivateKey: new Uint8Array(Buffer.from(parsed.privatePackage.signaturePrivateKey, "base64"))
+      }
+    };
+  } catch {
+    return null;
+  }
+}
+async function clearPendingWelcome(dataDir2, groupId) {
+  try {
+    await rm(pendingKpPath(dataDir2, groupId));
+  } catch {
+  }
+}
 async function saveMlsState(dataDir2, groupId, state) {
   await mkdir(dataDir2, { recursive: true, mode: DIR_MODE });
   const filePath = join(dataDir2, mlsFileName(groupId));
@@ -62747,12 +62789,13 @@ async function deleteMlsState(dataDir2, groupId) {
   } catch {
   }
 }
-var FILE_MODE, DIR_MODE;
+var FILE_MODE, DIR_MODE, pendingKpPath;
 var init_mls_state = __esm({
   "src/mls-state.ts"() {
     "use strict";
     FILE_MODE = 384;
     DIR_MODE = 448;
+    pendingKpPath = (dataDir2, groupId) => join(dataDir2, `mls-kp-pending-${groupId.replace(/[^a-zA-Z0-9_-]/g, "_")}.json`);
   }
 });
 
@@ -63640,9 +63683,6 @@ var init_channel = __esm({
       _mlsKeyPackage = null;
       /** Pending KeyPackage bundle from request-Welcome flow (used by _handleMlsWelcome). */
       _pendingMlsKpBundle;
-      /** Channels that have already had their sync fallback KeyPackage published this connect cycle.
-       *  Prevents multiple agents from overwriting each other's KP for the same channel. */
-      _pendingWelcomeChannels = /* @__PURE__ */ new Set();
       /** In-memory credential store for renter-provided credentials (never persisted). */
       _credentialStore = new CredentialStore();
       /** Dedup buffer for A2A message IDs (prevents double-delivery via direct + Redis) */
@@ -65203,8 +65243,7 @@ var init_channel = __esm({
               }
             }
             const memberMlsGroup = chState.mlsGroupId ? this._mlsGroups.get(`a2a:${chId}`) : void 0;
-            if (chState.role === "member" && !memberMlsGroup?.isInitialized && !this._pendingWelcomeChannels.has(chId)) {
-              this._pendingWelcomeChannels.add(chId);
+            if (chState.role === "member" && !memberMlsGroup?.isInitialized) {
               try {
                 let groupId = chState.mlsGroupId;
                 let memberIds = [];
@@ -65238,10 +65277,16 @@ var init_channel = __esm({
                 if (memberIds.includes(this._persisted.deviceId)) {
                   console.log(`[SecureChannel] A2A ${chId.slice(0, 8)} member in server membership but no local MLS state \u2014 requesting Welcome`);
                 }
+                if (await hasPendingWelcome(this.config.dataDir, groupId)) {
+                  console.log(`[SecureChannel] A2A ${chId.slice(0, 8)} sync fallback: skipping \u2014 Welcome already pending for group=${groupId.slice(0, 8)}`);
+                  continue;
+                }
+                await setPendingWelcome(this.config.dataDir, groupId);
                 const mgr = new MLSGroupManager();
                 const identity = new TextEncoder().encode(this._persisted.deviceId);
                 const kp = await mgr.generateKeyPackage(identity);
                 this._pendingMlsKpBundle = kp;
+                await savePendingKpBundle(this.config.dataDir, groupId, kp);
                 const kpBytes = MLSGroupManager.serializeKeyPackage(kp.publicPackage);
                 await fetch(`${this.config.apiUrl}/api/v1/mls/key-packages`, {
                   method: "POST",
@@ -66116,7 +66161,6 @@ var init_channel = __esm({
             clearInterval(this._deliveryHeartbeat);
             this._deliveryHeartbeat = null;
           }
-          this._pendingWelcomeChannels.clear();
           if (this._stopped) return;
           this._setState("disconnected");
           this._scheduleReconnect();
@@ -67106,12 +67150,14 @@ ${messageText}`;
       async _handleMlsWelcome(data) {
         const groupId = data.group_id;
         const conversationId = data.conversation_id;
-        const kpSource = this._pendingMlsKpBundle ? "pending" : this._mlsKeyPackage ? "connect" : "generated";
+        const persistedKpAvailable = await hasPendingWelcome(this.config.dataDir, groupId);
+        const kpSource = this._pendingMlsKpBundle ? "pending" : persistedKpAvailable ? "persisted" : this._mlsKeyPackage ? "connect" : "generated";
         console.log(`[SecureChannel] Received MLS welcome for group ${groupId?.slice(0, 8)}${conversationId ? ` conv=${conversationId.slice(0, 8)}` : ""} kpSource=${kpSource}`);
         try {
           const welcomeBytes = new Uint8Array(Buffer.from(data.payload, "hex"));
           const mgr = new MLSGroupManager();
-          const kp = this._pendingMlsKpBundle ?? this._mlsKeyPackage ?? await (async () => {
+          const persistedKp = await loadPendingKpBundle(this.config.dataDir, groupId);
+          const kp = this._pendingMlsKpBundle ?? persistedKp ?? this._mlsKeyPackage ?? await (async () => {
             const identity = new TextEncoder().encode(this._deviceId);
             return mgr.generateKeyPackage(identity);
           })();
@@ -67148,7 +67194,8 @@ ${messageText}`;
               this._mlsGroups.set(`a2a:${channelId}`, mgr);
               await saveMlsState(this.config.dataDir, groupId, JSON.stringify(mgr.exportState()));
               await this._persistState();
-              this._pendingWelcomeChannels.delete(channelId);
+              await clearPendingWelcome(this.config.dataDir, groupId).catch(() => {
+              });
               this._pendingMlsKpBundle = void 0;
               console.log(`[SecureChannel] Joined MLS group for A2A ${channelId.slice(0, 8)} via Welcome (epoch=${mgr.epoch})`);
               if (this.config.onA2AChannelReady && entry.conversationId) {
@@ -88917,7 +88964,7 @@ var init_index = __esm({
     init_skill_invoker();
     await init_skill_telemetry();
     await init_policy_enforcer();
-    VERSION = true ? "0.20.23" : "0.0.0-dev";
+    VERSION = true ? "0.20.25" : "0.0.0-dev";
   }
 });