@agentvault/agentvault 0.20.26 → 0.20.27

package/dist/cli.js

@@ -62735,10 +62735,10 @@ async function hasPendingWelcome(dataDir2, groupId) {
     return false;
   }
 }
-async function savePendingKpBundle(dataDir2, groupId, kp) {
+async function savePendingKpBundle(dataDir2, groupId, kp, serializePublicFn) {
   await mkdir(dataDir2, { recursive: true, mode: DIR_MODE });
   const serialized = {
-    publicPackage: Buffer.from(kp.publicPackage).toString("base64"),
+    publicPackageBytes: Buffer.from(serializePublicFn(kp.publicPackage)).toString("base64"),
     privatePackage: {
       initPrivateKey: Buffer.from(kp.privatePackage.initPrivateKey).toString("base64"),
       hpkePrivateKey: Buffer.from(kp.privatePackage.hpkePrivateKey).toString("base64"),
@@ -62752,7 +62752,7 @@ async function loadPendingKpBundle(dataDir2, groupId) {
     const raw = await readFile(pendingKpPath(dataDir2, groupId), "utf-8");
     const parsed = JSON.parse(raw);
     return {
-      publicPackage: new Uint8Array(Buffer.from(parsed.publicPackage, "base64")),
+      publicPackageBytes: new Uint8Array(Buffer.from(parsed.publicPackageBytes, "base64")),
       privatePackage: {
         initPrivateKey: new Uint8Array(Buffer.from(parsed.privatePackage.initPrivateKey, "base64")),
         hpkePrivateKey: new Uint8Array(Buffer.from(parsed.privatePackage.hpkePrivateKey, "base64")),
@@ -65285,7 +65285,7 @@ var init_channel = __esm({
                 const identity = new TextEncoder().encode(this._persisted.deviceId);
                 const kp = await mgr.generateKeyPackage(identity);
                 this._pendingMlsKpBundle = kp;
-                await savePendingKpBundle(this.config.dataDir, groupId, kp);
+                await savePendingKpBundle(this.config.dataDir, groupId, kp, MLSGroupManager.serializeKeyPackage);
                 const kpBytes = MLSGroupManager.serializeKeyPackage(kp.publicPackage);
                 await fetch(`${this.config.apiUrl}/api/v1/mls/key-packages`, {
                   method: "POST",
@@ -67149,17 +67149,26 @@ ${messageText}`;
       async _handleMlsWelcome(data) {
         const groupId = data.group_id;
         const conversationId = data.conversation_id;
-        const persistedKpAvailable = await hasPendingWelcome(this.config.dataDir, groupId);
-        const kpSource = this._pendingMlsKpBundle ? "pending" : persistedKpAvailable ? "persisted" : this._mlsKeyPackage ? "connect" : "generated";
+        const kpSource = this._pendingMlsKpBundle ? "pending" : this._mlsKeyPackage ? "connect" : await hasPendingWelcome(this.config.dataDir, groupId) ? "persisted" : "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 persistedKp = await loadPendingKpBundle(this.config.dataDir, groupId);
-          const kp = this._pendingMlsKpBundle ?? persistedKp ?? this._mlsKeyPackage ?? await (async () => {
+          let kp = this._pendingMlsKpBundle ?? this._mlsKeyPackage;
+          if (!kp) {
+            const persisted = await loadPendingKpBundle(this.config.dataDir, groupId);
+            if (persisted) {
+              kp = {
+                publicPackage: MLSGroupManager.deserializeKeyPackage(persisted.publicPackageBytes),
+                privatePackage: persisted.privatePackage
+              };
+              console.log(`[SecureChannel] Loaded persisted KP bundle for group ${groupId?.slice(0, 8)}`);
+            }
+          }
+          if (!kp) {
             const identity = new TextEncoder().encode(this._deviceId);
-            return mgr.generateKeyPackage(identity);
-          })();
+            kp = await mgr.generateKeyPackage(identity);
+          }
           console.log(`[SecureChannel] Welcome joinFromWelcome: group=${groupId?.slice(0, 8)} kpSource=${kpSource} welcomeLen=${welcomeBytes.length}`);
           await mgr.joinFromWelcome(welcomeBytes, kp);
           if (conversationId) {
@@ -88963,7 +88972,7 @@ var init_index = __esm({
     init_skill_invoker();
     await init_skill_telemetry();
     await init_policy_enforcer();
-    VERSION = true ? "0.20.26" : "0.0.0-dev";
+    VERSION = true ? "0.20.27" : "0.0.0-dev";
   }
 });