@agentvault/agentvault 0.20.13 → 0.20.15

package/dist/cli.js

@@ -67262,7 +67262,49 @@ ${messageText}`;
                   const kpBytes = new Uint8Array(Buffer.from(kpHex, "hex"));
                   const memberKp = MLSGroupManager.deserializeKeyPackage(kpBytes);
                   console.log(`[SecureChannel] A2A addMembers for ${req.requesting_device_id.slice(0, 8)} group=${chState.mlsGroupId.slice(0, 8)} epoch=${mlsGroup.epoch}`);
-                  const { commit, welcome } = await mlsGroup.addMembers([memberKp]);
+                  let commit;
+                  let welcome;
+                  try {
+                    const result = await mlsGroup.addMembers([memberKp]);
+                    commit = result.commit;
+                    welcome = result.welcome;
+                  } catch (addErr) {
+                    const errMsg = addErr instanceof Error ? addErr.message : String(addErr);
+                    if (errMsg.includes("already in the group")) {
+                      console.log(`[SecureChannel] A2A member already in group \u2014 removing and re-adding ${req.requesting_device_id.slice(0, 8)}`);
+                      try {
+                        const identityBytes = new TextEncoder().encode(req.requesting_device_id);
+                        await mlsGroup.removeMember(identityBytes);
+                        const kpRes2 = await fetch(
+                          `${this.config.apiUrl}/api/v1/mls/key-packages/batch?device_ids=${req.requesting_device_id}`,
+                          { headers: { Authorization: `Bearer ${this._deviceJwt}` } }
+                        );
+                        if (kpRes2.ok) {
+                          const kpData2 = await kpRes2.json();
+                          const kpHex2 = kpData2[req.requesting_device_id];
+                          if (kpHex2) {
+                            const kpBytes2 = new Uint8Array(Buffer.from(kpHex2, "hex"));
+                            const memberKp2 = MLSGroupManager.deserializeKeyPackage(kpBytes2);
+                            const result2 = await mlsGroup.addMembers([memberKp2]);
+                            commit = result2.commit;
+                            welcome = result2.welcome;
+                          } else {
+                            console.log(`[SecureChannel] A2A re-add: no fresh KeyPackage for ${req.requesting_device_id.slice(0, 8)}`);
+                            continue;
+                          }
+                        } else {
+                          console.log(`[SecureChannel] A2A re-add: KeyPackage fetch failed (${kpRes2.status})`);
+                          continue;
+                        }
+                      } catch (readdErr) {
+                        console.log(`[SecureChannel] A2A remove+re-add FAILED: ${readdErr instanceof Error ? readdErr.message : String(readdErr)}`);
+                        continue;
+                      }
+                    } else {
+                      console.log(`[SecureChannel] A2A addMembers FAILED: ${errMsg}`);
+                      continue;
+                    }
+                  }
                   if (!welcome) {
                     console.warn(`[SecureChannel] A2A addMembers produced no Welcome for ${req.requesting_device_id.slice(0, 8)}`);
                     continue;
@@ -67325,7 +67367,7 @@ ${messageText}`;
                   await saveMlsState(this.config.dataDir, chState.mlsGroupId, JSON.stringify(mlsGroup.exportState()));
                   console.log(`[SecureChannel] Fulfilled A2A Welcome for ${req.requesting_device_id.slice(0, 8)} in channel ${chId.slice(0, 8)}`);
                 } catch (fulfillErr) {
-                  console.warn(`[SecureChannel] A2A Welcome fulfill failed:`, fulfillErr);
+                  console.log(`[SecureChannel] A2A Welcome fulfill failed: ${fulfillErr instanceof Error ? fulfillErr.message : String(fulfillErr)}`);
                 }
               }
             } catch {
@@ -88675,7 +88717,7 @@ var init_index = __esm({
     init_skill_invoker();
     await init_skill_telemetry();
     await init_policy_enforcer();
-    VERSION = true ? "0.20.13" : "0.0.0-dev";
+    VERSION = true ? "0.20.15" : "0.0.0-dev";
   }
 });