@agentvault/agentvault 0.19.39 → 0.19.41

package/dist/index.js

@@ -62887,30 +62887,6 @@ var init_channel = __esm({
           if (roomConvIds.has(convId)) continue;
           if (targetConvId && convId !== targetConvId) continue;
           try {
-            const mlsMgr = this._mlsGroups.get(`conv:${convId}`);
-            if (mlsMgr && this._state === "ready" && this._ws) {
-              const plainBytes = new TextEncoder().encode(plaintext);
-              const ciphertext = await mlsMgr.encrypt(plainBytes);
-              const mlsGroupId = this._persisted?.mlsConversations?.[convId]?.mlsGroupId;
-              if (mlsGroupId) {
-                const payloadHex = Buffer.from(ciphertext).toString("hex");
-                pendingWsSends.push(
-                  JSON.stringify({
-                    event: "message_mls",
-                    data: {
-                      group_id: mlsGroupId,
-                      conversation_id: convId,
-                      epoch: Number(mlsMgr.epoch),
-                      payload: payloadHex,
-                      topic_id: topicId
-                    }
-                  })
-                );
-                await saveMlsState(this.config.dataDir, mlsGroupId, JSON.stringify(mlsMgr.exportState()));
-                sentCount++;
-                continue;
-              }
-            }
             const encrypted = session.ratchet.encrypt(plaintext);
             const transport = encryptedMessageToTransport(encrypted);
             const msg = {
@@ -63195,13 +63171,7 @@ var init_channel = __esm({
             if (initRes.ok) {
               const groupData = await initRes.json();
               mlsRoom.mlsGroupId = groupData.group_id;
-              const mgr = new MLSGroupManager();
-              const identity2 = new TextEncoder().encode(this._deviceId);
-              const kp = await mgr.generateKeyPackage(identity2);
-              await mgr.createGroup(new TextEncoder().encode(groupData.group_id), kp);
-              this._mlsGroups.set(roomData.roomId, mgr);
-              await saveMlsState(this.config.dataDir, groupData.group_id, JSON.stringify(mgr.exportState()));
-              console.log(`[SecureChannel] MLS group created for room ${roomData.roomId.slice(0, 8)} (groupId=${groupData.group_id.slice(0, 8)})`);
+              console.log(`[SecureChannel] MLS room ${roomData.roomId.slice(0, 8)} registered (groupId=${groupData.group_id.slice(0, 8)}, awaiting Welcome from owner)`);
             }
           } catch (mlsInitErr) {
             console.error(`[SecureChannel] MLS room init failed:`, mlsInitErr);
@@ -64733,22 +64703,9 @@ var init_channel = __esm({
                     const entry = this._persisted.a2aChannels?.[channelId];
                     if (entry) {
                       entry.mlsGroupId = mlsData.group_id;
-                      const mgr = new MLSGroupManager();
-                      const identity = new TextEncoder().encode(this._deviceId);
-                      const kp = await mgr.generateKeyPackage(identity);
-                      await mgr.createGroup(
-                        new TextEncoder().encode(mlsData.group_id),
-                        kp
-                      );
-                      this._mlsGroups.set(`a2a:${channelId}`, mgr);
-                      await saveMlsState(
-                        this.config.dataDir,
-                        mlsData.group_id,
-                        JSON.stringify(mgr.exportState())
-                      );
                       await this._persistState();
                       console.log(
-                        `[SecureChannel] MLS group created for A2A ${channelId.slice(0, 8)} (groupId=${mlsData.group_id.slice(0, 8)})`
+                        `[SecureChannel] A2A ${channelId.slice(0, 8)} MLS registered (groupId=${mlsData.group_id.slice(0, 8)}, awaiting Welcome)`
                       );
                     }
                   }
@@ -65945,14 +65902,36 @@ ${messageText}`;
               return;
             }
           }
+          const a2aChannelId = data.a2a_channel_id;
           for (const [channelId, entry] of Object.entries(this._persisted?.a2aChannels ?? {})) {
-            if (entry.mlsGroupId === groupId) {
+            if (entry.mlsGroupId === groupId || channelId === a2aChannelId) {
+              entry.mlsGroupId = groupId;
               this._mlsGroups.set(`a2a:${channelId}`, mgr);
               await saveMlsState(this.config.dataDir, groupId, JSON.stringify(mgr.exportState()));
+              await this._persistState();
               console.log(`[SecureChannel] Joined MLS group for A2A ${channelId.slice(0, 8)} via Welcome (epoch=${mgr.epoch})`);
               return;
             }
           }
+          if (a2aChannelId && this._persisted) {
+            if (!this._persisted.a2aChannels) this._persisted.a2aChannels = {};
+            if (!this._persisted.a2aChannels[a2aChannelId]) {
+              this._persisted.a2aChannels[a2aChannelId] = {
+                channelId: a2aChannelId,
+                hubAddress: "",
+                conversationId: "",
+                mlsGroupId: groupId
+              };
+            } else {
+              this._persisted.a2aChannels[a2aChannelId].mlsGroupId = groupId;
+            }
+            this._mlsGroups.set(`a2a:${a2aChannelId}`, mgr);
+            await saveMlsState(this.config.dataDir, groupId, JSON.stringify(mgr.exportState()));
+            await this._persistState();
+            console.log(`[SecureChannel] Joined MLS group for A2A ${a2aChannelId.slice(0, 8)} via Welcome (new channel, epoch=${mgr.epoch})`);
+            return;
+          }
+          console.warn(`[SecureChannel] MLS welcome for unmatched group ${groupId?.slice(0, 8)} (no room/A2A/conv match)`);
         } catch (err) {
           console.error(`[SecureChannel] MLS welcome processing failed:`, err);
         }