@agentvault/agentvault 0.20.31 → 0.20.32

package/dist/cli.js

@@ -63721,6 +63721,8 @@ var init_channel = __esm({
       _mlsKeyPackage = null;
       /** Pending KeyPackage bundle from request-Welcome flow (used by _handleMlsWelcome). */
       _pendingMlsKpBundle;
+      /** Buffer for MLS commits received before Welcome (keyed by groupId, sorted by epoch). */
+      _pendingMlsCommits = /* @__PURE__ */ new Map();
       /** 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) */
@@ -67030,6 +67032,11 @@ ${messageText}`;
         console.log(`[SecureChannel] MLS decrypt attempt room=${resolvedRoomId.slice(0, 8)} group=${groupId?.slice(0, 8)} loaded=${!!mlsGroup} init=${mlsGroup?.isInitialized} mlsGroupsKeys=[${Array.from(this._mlsGroups.keys()).join(",")}]`);
         if (!mlsGroup?.isInitialized) {
           console.warn(`[SecureChannel] MLS group not loaded for room ${resolvedRoomId.slice(0, 8)}, requesting Welcome`);
+          const roomLockId = `room-kp-${groupId}`;
+          if (!await acquireA2ASyncLock(this.config.dataDir, roomLockId)) {
+            console.log(`[SecureChannel] Room KP publish locked for group ${groupId?.slice(0, 8)}, skipping`);
+            return;
+          }
           try {
             const { MLSGroupManager: MLS } = await init_dist().then(() => dist_exports);
             const mgr = new MLS();
@@ -67042,6 +67049,7 @@ ${messageText}`;
               body: JSON.stringify({ key_package: kpHex, device_id: this._deviceId })
             });
             this._pendingMlsKpBundle = kp;
+            await savePendingKpBundle(this.config.dataDir, groupId, kp);
             await fetch(`${this.config.apiUrl}/api/v1/mls/groups/${groupId}/request-welcome`, {
               method: "POST",
               headers: { Authorization: `Bearer ${this._deviceJwt}`, "Content-Type": "application/json" },
@@ -67050,6 +67058,8 @@ ${messageText}`;
             console.log(`[SecureChannel] Welcome requested for room ${resolvedRoomId.slice(0, 8)} group ${groupId?.slice(0, 8)}`);
           } catch (reqErr) {
             console.warn(`[SecureChannel] Welcome request failed for room ${resolvedRoomId.slice(0, 8)}:`, reqErr);
+            await releaseA2ASyncLock(this.config.dataDir, roomLockId).catch(() => {
+            });
           }
           return;
         }
@@ -67182,6 +67192,7 @@ ${messageText}`;
       }
       async _handleMlsCommit(data) {
         const groupId = data.group_id;
+        const epoch = typeof data.epoch === "number" ? data.epoch : 0;
         for (const [roomId, room] of Object.entries(this._persisted?.rooms ?? {})) {
           if (room.mlsGroupId === groupId) {
             const mlsGroup = this._mlsGroups.get(roomId);
@@ -67200,6 +67211,9 @@ ${messageText}`;
                   throw err;
                 }
               }
+            } else {
+              this._bufferMlsCommit(groupId, epoch, data);
+              console.log(`[SecureChannel] Buffered MLS commit for room ${roomId.slice(0, 8)} (epoch=${epoch}, group not initialized)`);
             }
             return;
           }
@@ -67222,11 +67236,50 @@ ${messageText}`;
                   throw err;
                 }
               }
+            } else {
+              this._bufferMlsCommit(groupId, epoch, data);
+              console.log(`[SecureChannel] Buffered MLS commit for A2A ${chId.slice(0, 8)} (epoch=${epoch}, group not initialized)`);
             }
             return;
           }
         }
       }
+      /** Buffer an MLS commit for replay after Welcome join. Max 50 per group. */
+      _bufferMlsCommit(groupId, epoch, data) {
+        let buf = this._pendingMlsCommits.get(groupId);
+        if (!buf) {
+          buf = [];
+          this._pendingMlsCommits.set(groupId, buf);
+        }
+        if (!buf.some((c2) => c2.epoch === epoch)) {
+          buf.push({ epoch, data });
+          buf.sort((a2, b2) => a2.epoch - b2.epoch);
+          if (buf.length > 50) buf.splice(0, buf.length - 50);
+        }
+      }
+      /** Apply buffered MLS commits after Welcome join. */
+      async _applyBufferedMlsCommits(groupId, mgr) {
+        const buf = this._pendingMlsCommits.get(groupId);
+        if (!buf || buf.length === 0) return;
+        console.log(`[SecureChannel] Applying ${buf.length} buffered MLS commits for group ${groupId.slice(0, 8)}`);
+        let applied = 0;
+        for (const entry of buf) {
+          if (entry.epoch <= mgr.epoch) continue;
+          try {
+            const commitBytes = new Uint8Array(Buffer.from(entry.data.payload, "hex"));
+            await mgr.processCommit(commitBytes);
+            applied++;
+          } catch (err) {
+            console.warn(`[SecureChannel] Buffered commit epoch=${entry.epoch} failed: ${err?.message}`);
+            break;
+          }
+        }
+        this._pendingMlsCommits.delete(groupId);
+        if (applied > 0) {
+          await saveMlsState(this.config.dataDir, groupId, JSON.stringify(mgr.exportState()));
+          console.log(`[SecureChannel] Applied ${applied} buffered commits, now epoch=${mgr.epoch}`);
+        }
+      }
       async _handleMlsWelcome(data) {
         const groupId = data.group_id;
         const conversationId = data.conversation_id;
@@ -67247,8 +67300,8 @@ ${messageText}`;
             }
           }
           if (!kp) {
-            const identity = new TextEncoder().encode(this._deviceId);
-            kp = await mgr.generateKeyPackage(identity);
+            console.error(`[SecureChannel] No matching KeyPackage found for Welcome \u2014 cannot join group ${groupId?.slice(0, 8)}. A fresh KP would fail because the Welcome is encrypted to the published KP's public key. The existing Welcome recovery mechanism will re-request.`);
+            return;
           }
           console.log(`[SecureChannel] Welcome joinFromWelcome: group=${groupId?.slice(0, 8)} kpSource=${kpSource} welcomeLen=${welcomeBytes.length}`);
           await mgr.joinFromWelcome(welcomeBytes, kp);
@@ -67256,6 +67309,7 @@ ${messageText}`;
             const key = `conv:${conversationId}`;
             this._mlsGroups.set(key, mgr);
             await saveMlsState(this.config.dataDir, groupId, JSON.stringify(mgr.exportState()));
+            await this._applyBufferedMlsCommits(groupId, mgr);
             if (this._persisted) {
               if (!this._persisted.mlsConversations) this._persisted.mlsConversations = {};
               this._persisted.mlsConversations[conversationId] = { mlsGroupId: groupId };
@@ -67271,8 +67325,11 @@ ${messageText}`;
               this._mlsGroups.set(roomId, mgr);
               await saveMlsState(this.config.dataDir, groupId, JSON.stringify(mgr.exportState()));
               await this._persistState();
+              await this._applyBufferedMlsCommits(groupId, mgr);
               console.log(`[SecureChannel] Joined MLS group for room ${roomId.slice(0, 8)} via Welcome (epoch=${mgr.epoch})`);
               this._pendingMlsKpBundle = void 0;
+              await releaseA2ASyncLock(this.config.dataDir, `room-kp-${groupId}`).catch(() => {
+              });
               return;
             }
           }
@@ -67283,6 +67340,7 @@ ${messageText}`;
               this._mlsGroups.set(`a2a:${channelId}`, mgr);
               await saveMlsState(this.config.dataDir, groupId, JSON.stringify(mgr.exportState()));
               await this._persistState();
+              await this._applyBufferedMlsCommits(groupId, mgr);
               await clearPendingWelcome(this.config.dataDir, groupId).catch(() => {
               });
               await releaseA2ASyncLock(this.config.dataDir, channelId).catch(() => {
@@ -89065,7 +89123,7 @@ var init_index = __esm({
     init_skill_invoker();
     await init_skill_telemetry();
     await init_policy_enforcer();
-    VERSION = true ? "0.20.31" : "0.0.0-dev";
+    VERSION = true ? "0.20.32" : "0.0.0-dev";
   }
 });