@agentvault/agentvault 0.19.13 → 0.19.15

package/dist/index.js

@@ -47946,12 +47946,27 @@ var init_channel = __esm({
           let channelEntry = a2aEntries.find((ch) => ch.hubAddress === target.hubAddress);
           if (!channelEntry) {
             try {
-              console.log(`[deliver] A2A channel not found for ${target.hubAddress}, re-syncing from server...`);
-              await this.listA2AChannels();
-              a2aEntries = this._persisted?.a2aChannels ? Object.values(this._persisted.a2aChannels) : [];
-              channelEntry = a2aEntries.find((ch) => ch.hubAddress === target.hubAddress);
+              console.log(`[deliver] A2A local miss for ${target.hubAddress}, fetching from API...`);
+              const channels = await this.listA2AChannels();
+              const myHub = this._persisted?.hubAddress || "";
+              const match = channels.find(
+                (ch) => (ch.status === "active" || ch.status === "approved") && (ch.initiatorHubAddress === target.hubAddress || ch.responderHubAddress === target.hubAddress)
+              );
+              if (match) {
+                const isInit = match.initiatorHubAddress === myHub;
+                const peerId = isInit ? match.responderHubAddress : match.initiatorHubAddress;
+                if (this._persisted?.a2aChannels) {
+                  const entry = this._persisted.a2aChannels[match.channelId];
+                  if (entry) {
+                    entry.hubAddress = peerId;
+                    entry.conversationId = match.conversationId || entry.conversationId;
+                  }
+                }
+                a2aEntries = this._persisted?.a2aChannels ? Object.values(this._persisted.a2aChannels) : [];
+                channelEntry = a2aEntries.find((ch) => ch.hubAddress === target.hubAddress);
+              }
             } catch (syncErr) {
-              console.warn("[deliver] A2A re-sync failed:", syncErr);
+              console.warn("[deliver] A2A API lookup failed:", syncErr);
             }
           }
           if (!channelEntry) {
@@ -49095,31 +49110,37 @@ var init_channel = __esm({
               }
               if (this._persisted && convId) {
                 if (!this._persisted.a2aChannels) this._persisted.a2aChannels = {};
-                const a2aEphemeral = await generateEphemeralKeypair();
-                const ephPubHex = bytesToHex(a2aEphemeral.publicKey);
-                const ephPrivHex = bytesToHex(a2aEphemeral.privateKey);
-                this._persisted.a2aChannels[channelId] = {
-                  channelId,
-                  hubAddress: peerHub,
-                  conversationId: convId,
-                  role,
-                  pendingEphemeralPrivateKey: ephPrivHex
-                };
-                if (this._ws) {
-                  this._ws.send(
-                    JSON.stringify({
-                      event: "a2a_key_exchange",
-                      data: {
-                        channel_id: channelId,
-                        ephemeral_key: ephPubHex
-                      }
-                    })
-                  );
-                  console.log(
-                    `[SecureChannel] A2A key exchange sent for channel ${channelId.slice(0, 8)}... (role=${role})`
-                  );
+                const existingNow = this._persisted.a2aChannels[channelId];
+                if (existingNow?.pendingEphemeralPrivateKey || existingNow?.session) {
+                  console.log(`[SecureChannel] A2A channel ${channelId.slice(0, 8)}... key exchange already in progress, skipping`);
+                } else {
+                  const a2aEphemeral = await generateEphemeralKeypair();
+                  const ephPubHex = bytesToHex(a2aEphemeral.publicKey);
+                  const ephPrivHex = bytesToHex(a2aEphemeral.privateKey);
+                  this._persisted.a2aChannels[channelId] = {
+                    ...existingNow,
+                    channelId,
+                    hubAddress: existingNow?.hubAddress || peerHub,
+                    conversationId: convId,
+                    role: existingNow?.role || role,
+                    pendingEphemeralPrivateKey: ephPrivHex
+                  };
+                  if (this._ws) {
+                    this._ws.send(
+                      JSON.stringify({
+                        event: "a2a_key_exchange",
+                        data: {
+                          channel_id: channelId,
+                          ephemeral_key: ephPubHex
+                        }
+                      })
+                    );
+                    console.log(
+                      `[SecureChannel] A2A key exchange sent for channel ${channelId.slice(0, 8)}... (role=${role})`
+                    );
+                  }
+                  await this._persistState();
                 }
-                await this._persistState();
               }
               this.emit("a2a_channel_approved", channelData);
               if (this.config.onA2AChannelReady && convId) {