@agentunion/fastaun-browser 0.5.8 → 0.5.9

package/dist/bundle.js

@@ -460,7 +460,7 @@ var init_indexeddb_store = __esm({
 });
 
 // src/version.ts
-var VERSION = "0.5.8";
+var VERSION = "0.5.9";
 
 // src/types.ts
 var ConnectionState = /* @__PURE__ */ ((ConnectionState2) => {
@@ -4511,6 +4511,9 @@ var MessageDeliveryEngine = class {
     __publicField(this, "realtimeSyncing", null);
     __publicField(this, "pendingP2pPullUpper", null);
     __publicField(this, "pendingGroupPullUpper", null);
+    __publicField(this, "pendingPullNoProgressAcks", null);
+    __publicField(this, "onlineUnreadHintTargets", null);
+    __publicField(this, "onlineUnreadHintOwners", null);
     __publicField(this, "realtimeAcking", null);
     __publicField(this, "pendingP2PInlineAcks", null);
     __publicField(this, "pendingGroupInlineAcks", null);
@@ -4523,9 +4526,13 @@ var MessageDeliveryEngine = class {
   }
   resetInlineAckState() {
     this.inlineGeneration += 1;
+    void this.runtime.client._rpcPipeline?.invalidatePulls?.();
     this.realtimeSyncing = null;
     this.pendingP2pPullUpper = null;
     this.pendingGroupPullUpper = null;
+    this.pendingPullNoProgressAcks = null;
+    this.onlineUnreadHintTargets = null;
+    this.onlineUnreadHintOwners = null;
     this.realtimeTailResults = null;
     this.realtimeAcking = null;
     this.pendingP2PInlineAcks = null;
@@ -4535,6 +4542,16 @@ var MessageDeliveryEngine = class {
   isInlineGenerationCurrent(generation) {
     return generation === this.inlineGeneration;
   }
+  isPullOperationCurrent() {
+    const client = this.runtime.client;
+    const generation = client._pullOperationGeneration;
+    if (generation === void 0) return true;
+    const pipeline = client._rpcPipeline;
+    return typeof pipeline?.isPullGenerationCurrent === "function" ? pipeline.isPullGenerationCurrent(generation) : true;
+  }
+  ensurePullOperationCurrent() {
+    if (!this.isPullOperationCurrent()) throw new Error("pull invalidated");
+  }
   captureInlineGeneration() {
     return this.inlineGeneration;
   }
@@ -4565,7 +4582,15 @@ var MessageDeliveryEngine = class {
   }
   consumePendingPull(ns, throughSeq) {
     const pending = ns.startsWith("p2p:") ? this.pendingP2pPullUpper : this.pendingGroupPullUpper;
-    if ((pending?.get(ns) ?? 0) <= throughSeq) pending?.delete(ns);
+    if ((pending?.get(ns) ?? 0) <= throughSeq) {
+      pending?.delete(ns);
+      this.pendingPullNoProgressAcks?.delete(ns);
+    }
+  }
+  markPendingPullNoProgress(ns, ack) {
+    const blocked = this.pendingPullNoProgressAcks ?? /* @__PURE__ */ new Map();
+    this.pendingPullNoProgressAcks = blocked;
+    blocked.set(ns, ack);
   }
   schedulePendingPullIfNeeded(ns, reason) {
     const pending = ns.startsWith("p2p:") ? this.pendingP2pPullUpper : this.pendingGroupPullUpper;
@@ -4573,15 +4598,20 @@ var MessageDeliveryEngine = class {
     const upper = pending.get(ns) ?? 0;
     if (upper <= 0) {
       pending.delete(ns);
+      this.pendingPullNoProgressAcks?.delete(ns);
       return false;
     }
     const client = this.runtime.client;
     const contiguous = client._seqTracker.getContiguousSeq(ns);
     if (upper <= contiguous) {
       pending.delete(ns);
+      this.pendingPullNoProgressAcks?.delete(ns);
       client._clientLog?.debug(`pending pull upper already covered: ns=${ns}, upper_seq=${upper}, contiguous=${contiguous}, reason=${reason}`);
       return false;
     }
+    const blockedAck = this.pendingPullNoProgressAcks?.get(ns);
+    if (blockedAck !== void 0 && contiguous <= blockedAck) return false;
+    this.pendingPullNoProgressAcks?.delete(ns);
     if (client.state !== "ready" /* READY */ || client._closing || this.realtimeSyncing?.has(ns) || client._rpcPipeline?.hasPullActivity?.(ns, false)) return false;
     pending.delete(ns);
     client._clientLog?.debug(`pending push follow-up pull scheduled: ns=${ns}, upper_seq=${upper}, reason=${reason}`);
@@ -4947,6 +4977,15 @@ var MessageDeliveryEngine = class {
       value = row.effective_ack_seq;
     } else if (Object.prototype.hasOwnProperty.call(row, "ack_seq")) {
       value = row.ack_seq;
+    } else if (Object.prototype.hasOwnProperty.call(row, "cursor")) {
+      const cursor = row.cursor;
+      const cursorRow = isJsonObject(cursor) ? cursor : null;
+      if (cursorRow) {
+        if (!Object.prototype.hasOwnProperty.call(cursorRow, "current_seq")) return 0;
+        value = cursorRow.current_seq;
+      } else {
+        value = cursor;
+      }
     } else {
       return requestedSeq;
     }
@@ -4961,6 +5000,7 @@ var MessageDeliveryEngine = class {
   }
   async confirmPlainForwardAck(ns, method, ackSeq, groupId = "") {
     const client = this.runtime.client;
+    this.ensurePullOperationCurrent();
     const coordinator = this.forwardCoordinator();
     const generation = this.captureInlineGeneration();
     coordinator.recordForwardAck(ns, ackSeq);
@@ -4977,6 +5017,7 @@ var MessageDeliveryEngine = class {
       _rpc_background: true
     };
     const result = await client._rpcPipeline.rawCall(method, params2, { background: true });
+    this.ensurePullOperationCurrent();
     const actualAckSeq = this.resolveForwardAckSeq(result, ackSeq);
     if (actualAckSeq < ackSeq) {
       throw new Error(`${method} server ACK watermark ${actualAckSeq} is below requested ${ackSeq}`);
@@ -4993,6 +5034,7 @@ var MessageDeliveryEngine = class {
       throw new Error(`${method} response must be an object`);
     }
     const client = this.runtime.client;
+    this.ensurePullOperationCurrent();
     const response = result;
     const messages = deduplicatePlainForwardPageMessages(response.messages, afterSeq);
     const coordinator = this.forwardCoordinator();
@@ -5020,24 +5062,29 @@ var MessageDeliveryEngine = class {
     let committed = false;
     try {
       for (const rawMessage of messages) {
+        this.ensurePullOperationCurrent();
         const seq2 = positiveSafeSequenceHint(rawMessage.seq);
         if (method === "message.pull") {
           const appEvent = p2pAppEventFromPlainPullMessage(rawMessage);
           if (await this.publishPulledMessage(appEvent.event, ns, seq2, appEvent.payload, false)) {
             publishedCount += 1;
           }
+          this.ensurePullOperationCurrent();
           continue;
         }
         const message = normalizeGroupMentionMode(rawMessage);
         if (this.recallEventFromGroupMessage(message)) {
           if (await this.publishGroupRecallTombstone(groupId, seq2, message)) {
+            this.ensurePullOperationCurrent();
             this.markPublishedSeq(ns, seq2);
             publishedCount += 1;
           }
         } else if (await this.publishPulledMessage("group.message_created", ns, seq2, message, false)) {
+          this.ensurePullOperationCurrent();
           publishedCount += 1;
         }
       }
+      this.ensurePullOperationCurrent();
       if (messages.length > 0) client._seqTracker.onPullResult(ns, messages, afterSeq);
       const commitTarget = Math.max(
         client._seqTracker.getContiguousSeq(ns),
@@ -5049,17 +5096,20 @@ var MessageDeliveryEngine = class {
         client._seqTracker.forceContiguousSeq(ns, commitTarget);
       }
       if (client._seqTracker.getContiguousSeq(ns) !== pageContigBefore) {
+        this.ensurePullOperationCurrent();
         await this.drainOrderedMessages(ns, void 0, false, false);
+        this.ensurePullOperationCurrent();
         await client._commitSeqTrackerState(ns);
       }
       committed = true;
     } catch (exc) {
-      if (!committed && typeof client._seqTracker.restoreNamespaceSnapshot === "function") {
+      if (this.isPullOperationCurrent() && !committed && typeof client._seqTracker.restoreNamespaceSnapshot === "function") {
         client._seqTracker.restoreNamespaceSnapshot(ns, pageTrackerSnapshot);
         this.dropSeqTrackerPending(ns);
       }
       throw exc;
     }
+    this.ensurePullOperationCurrent();
     const committedAck = client._seqTracker.getContiguousSeq(ns);
     if (deferredServerCursor > 0 && committedAck >= deferredServerCursor) {
       coordinator.clearForwardCursor(ns, committedAck);
@@ -5092,6 +5142,7 @@ var MessageDeliveryEngine = class {
       if (clampedAckSeq < pendingAckSeq) {
         throw new Error(`${ackMethod} cannot confirm pending Forward watermark ${pendingAckSeq}`);
       }
+      this.ensurePullOperationCurrent();
       await this.confirmPlainForwardAck(ns, ackMethod, pendingAckSeq, groupId);
     }
     return { rawCount: messages.length, publishedCount };
@@ -6234,9 +6285,30 @@ var MessageDeliveryEngine = class {
     const groupId = String(data.group_id ?? "").trim();
     if (!groupId) return;
     const ns = `group:${groupId}`;
-    client._safeAsync(this.runGroupForwardRecovery(groupId, ns, 50, true).catch((exc) => {
-      client._clientLog?.debug(`online unread hint background Forward failed: ns=${ns} err=${formatDeliveryError(exc)}`);
-    }));
+    const targets = this.onlineUnreadHintTargets ?? /* @__PURE__ */ new Map();
+    const owners = this.onlineUnreadHintOwners ?? /* @__PURE__ */ new Set();
+    this.onlineUnreadHintTargets = targets;
+    this.onlineUnreadHintOwners = owners;
+    targets.set(ns, Math.max(targets.get(ns) ?? 0, positiveSafeSequenceHint(data.seq)));
+    if (owners.has(ns)) return;
+    owners.add(ns);
+    client._safeAsync((async () => {
+      try {
+        while (true) {
+          const throughSeq = targets.get(ns) ?? 0;
+          const ackBefore = this.syncState(ns).ack;
+          await this.runGroupForwardRecovery(groupId, ns, 50, true, throughSeq);
+          const ackAfter = this.syncState(ns).ack;
+          const target = targets.get(ns) ?? 0;
+          if (ackAfter >= target || ackAfter <= ackBefore) return;
+        }
+      } catch (exc) {
+        client._clientLog?.debug(`online unread hint background Forward failed: ns=${ns} err=${formatDeliveryError(exc)}`);
+      } finally {
+        if (this.onlineUnreadHintTargets === targets) targets.delete(ns);
+        if (this.onlineUnreadHintOwners === owners) owners.delete(ns);
+      }
+    })());
   }
   enqueueOnlineUnreadEventHint(data) {
     const client = this.runtime.client;
@@ -6266,17 +6338,19 @@ var MessageDeliveryEngine = class {
     const key = pipeline.pullGateKeyForCall("message.pull", request);
     return await pipeline.runPullSerialized(key, invoke, background);
   }
-  async runGroupForwardRecovery(groupId, ns, pageLimit, background = false) {
+  async runGroupForwardRecovery(groupId, ns, pageLimit, background = false, throughSeq = 0) {
     const client = this.runtime.client;
+    const state = this.syncState(ns);
+    const maxPages = this.forwardMaxPages(state.ack, throughSeq, pageLimit);
     const request = {
       group_id: groupId,
-      after_seq: this.syncState(ns).ack,
+      after_seq: state.ack,
       limit: pageLimit,
-      max_pages: 1
+      max_pages: maxPages
     };
     const invoke = async () => {
       const after = this.syncState(ns).ack;
-      const messages = await client._pullGroupV2(groupId, after, pageLimit, { gateLocked: true, maxPages: 1 });
+      const messages = await client._pullGroupV2(groupId, after, pageLimit, { gateLocked: true, maxPages });
       return { messages, raw_count: messages.length };
     };
     const pipeline = client._rpcPipeline;
@@ -6290,6 +6364,10 @@ var MessageDeliveryEngine = class {
     const ack = Number(tracker.getContiguousSeq(ns) || 0);
     return { ack, tail: ack, head: Math.max(ack, Number(tracker.getMaxSeenSeq?.(ns) || 0)) };
   }
+  forwardMaxPages(ack, throughSeq, pageLimit) {
+    const limit = Number.isSafeInteger(pageLimit) && pageLimit > 0 ? pageLimit : 1;
+    return Math.max(1, Math.ceil(Math.max(0, throughSeq - ack) / limit));
+  }
   inlineMessage(data) {
     if (!isJsonObject(data)) return null;
     const inline = data.inline_message;
@@ -6621,17 +6699,28 @@ var MessageDeliveryEngine = class {
     if (forceTail || order[0] === "tail") result = await run(true, false, void 0, false, forceTail);
     const state = this.syncState(ns);
     const tailMissedDuringPull = tailCompleted && Number(client._seqTracker.getMaxSeenSeq(ns) || 0) > state.head;
-    const pendingThroughSeq = tailMissedDuringPull ? Number(client._seqTracker.getMaxSeenSeq(ns) || 0) : 0;
+    const maxSeen = Number(client._seqTracker.getMaxSeenSeq(ns) || 0);
+    const pendingThroughSeq = tailMissedDuringPull ? maxSeen : 0;
     const tailForward = tailCompleted && (state.ack < state.tail - 1 || tailMissedDuringPull);
     const backgroundWindowForward = order[0] === "forward" && !headForward;
     if (headForward || tailForward || client._sessionOptions?.background_sync !== false && backgroundWindowForward) {
+      const forwardTarget = Math.max(
+        headForward ? Math.max(pushSeq, maxSeen) : 0,
+        tailForward || backgroundWindowForward ? state.tail - 1 : 0,
+        tailMissedDuringPull ? maxSeen : 0
+      );
+      const forwardMaxPages = this.forwardMaxPages(state.ack, forwardTarget, pageLimit);
       result = await run(
         false,
         !(headForward || tailForward),
-        headForward ? 2 : order[0] === "tail" ? 1 : void 0,
+        forwardMaxPages,
         headForward || tailMissedDuringPull
       );
-      if (pendingThroughSeq > 0) this.consumePendingPull(ns, pendingThroughSeq);
+      if (pendingThroughSeq > 0) {
+        const committedAck = this.syncState(ns).ack;
+        if (committedAck >= pendingThroughSeq) this.consumePendingPull(ns, pendingThroughSeq);
+        else if (committedAck <= state.ack) this.markPendingPullNoProgress(ns, committedAck);
+      }
     }
     const finalState = this.syncState(ns);
     if (tailCompleted && finalState.ack < finalState.tail - 1) {
@@ -6678,17 +6767,28 @@ var MessageDeliveryEngine = class {
     if (forceTail || order[0] === "tail") result = await run(true, false, void 0, false, forceTail);
     const state = this.syncState(ns);
     const tailMissedDuringPull = tailCompleted && Number(client._seqTracker.getMaxSeenSeq(ns) || 0) > state.head;
-    const pendingThroughSeq = tailMissedDuringPull ? Number(client._seqTracker.getMaxSeenSeq(ns) || 0) : 0;
+    const maxSeen = Number(client._seqTracker.getMaxSeenSeq(ns) || 0);
+    const pendingThroughSeq = tailMissedDuringPull ? maxSeen : 0;
     const tailForward = tailCompleted && (state.ack < state.tail - 1 || tailMissedDuringPull);
     const backgroundWindowForward = order[0] === "forward" && !headForward;
     if (headForward || tailForward || client._sessionOptions?.background_sync !== false && backgroundWindowForward) {
+      const forwardTarget = Math.max(
+        headForward ? Math.max(pushSeq, maxSeen) : 0,
+        tailForward || backgroundWindowForward ? state.tail - 1 : 0,
+        tailMissedDuringPull ? maxSeen : 0
+      );
+      const forwardMaxPages = this.forwardMaxPages(state.ack, forwardTarget, pageLimit);
       result = await run(
         false,
         !(headForward || tailForward),
-        headForward ? 2 : order[0] === "tail" ? 1 : void 0,
+        forwardMaxPages,
         headForward || tailMissedDuringPull
       );
-      if (pendingThroughSeq > 0) this.consumePendingPull(ns, pendingThroughSeq);
+      if (pendingThroughSeq > 0) {
+        const committedAck = this.syncState(ns).ack;
+        if (committedAck >= pendingThroughSeq) this.consumePendingPull(ns, pendingThroughSeq);
+        else if (committedAck <= state.ack) this.markPendingPullNoProgress(ns, committedAck);
+      }
     }
     const finalState = this.syncState(ns);
     if (tailCompleted && finalState.ack < finalState.tail - 1) {
@@ -7245,22 +7345,28 @@ var MessageDeliveryEngine = class {
   }
   async drainOrderedMessages(ns, beforeSeq, pullResponse = false, persist = true) {
     const client = this.runtime.client;
+    this.ensurePullOperationCurrent();
     const queue = client._pendingOrderedMsgs.get(ns);
     if (!queue || queue.size === 0) return;
     const contig = client._seqTracker.getContiguousSeq(ns);
     const ready = [...queue.keys()].filter((seq2) => seq2 <= contig && (beforeSeq === void 0 || seq2 < beforeSeq)).sort((a, b) => a - b);
     let delivered = false;
     for (const seq2 of ready) {
+      this.ensurePullOperationCurrent();
       const item = queue.get(seq2);
       queue.delete(seq2);
       if (!item || client._pushedSeqs.get(ns)?.has(seq2)) continue;
       await this.publishOrderedQueueItem(ns, item.event, seq2, item.payload, pullResponse);
+      this.ensurePullOperationCurrent();
       this.markPublishedSeq(ns, seq2);
       delivered = true;
     }
     if (queue.size === 0) {
       client._pendingOrderedMsgs.delete(ns);
-      if (delivered && persist) await this.saveSeqTrackerState();
+      if (delivered && persist) {
+        this.ensurePullOperationCurrent();
+        await this.saveSeqTrackerState();
+      }
     }
   }
   async publishOrderedMessage(event, ns, seq2, payload) {
@@ -7294,15 +7400,19 @@ var MessageDeliveryEngine = class {
   }
   async publishPulledMessage(event, ns, seq2, payload, persist = true) {
     const client = this.runtime.client;
+    this.ensurePullOperationCurrent();
     const seqNum = Number(seq2);
     if (!Number.isFinite(seqNum) || !Number.isInteger(seqNum) || seqNum <= 0 || !ns) {
       if (event === "message.recalled") {
-        return await client._withPullResponseProcessing(
+        const published = await client._withPullResponseProcessing(
           ns,
           () => this.publishMessageRecallTombstone(seq2, payload)
         );
+        this.ensurePullOperationCurrent();
+        return published;
       }
       await client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload));
+      this.ensurePullOperationCurrent();
       return true;
     }
     const queue = client._pendingOrderedMsgs.get(ns);
@@ -7312,6 +7422,7 @@ var MessageDeliveryEngine = class {
       return false;
     }
     await this.drainOrderedMessages(ns, seqNum, false, persist);
+    this.ensurePullOperationCurrent();
     queue?.delete(seqNum);
     if (queue && queue.size === 0) client._pendingOrderedMsgs.delete(ns);
     if (event === "message.recalled") {
@@ -7319,10 +7430,12 @@ var MessageDeliveryEngine = class {
         ns,
         () => this.publishMessageRecallTombstone(seqNum, payload)
       );
+      this.ensurePullOperationCurrent();
       this.markPublishedSeq(ns, seqNum);
       return published;
     }
     await client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload));
+    this.ensurePullOperationCurrent();
     this.markPublishedSeq(ns, seqNum);
     return true;
   }
@@ -7884,11 +7997,14 @@ var LifecycleController = class {
           return;
         }
         client._delivery.resetInlineAckState();
+        const pullInvalidation = client._rpcPipeline?.invalidatePulls?.();
+        client._rpcPipeline?.stopPullGateWatchdogs?.();
+        await client._transport.close();
+        await pullInvalidation;
         await client._cancelReconnectAndWait();
         await this.cancelConnectionAttemptAndWait();
         await client._saveSeqTrackerState();
         client._stopBackgroundTasks();
-        await client._transport.close();
         if (client._closing) return;
         this.runtime.lifecycle.resetForDisconnect("standby");
         await this.publishLifecycleStopEvent({ state: client._publicState(client._state) });
@@ -7909,22 +8025,30 @@ var LifecycleController = class {
       return;
     }
     return this.withLifecycleStop(async () => {
-      await client._cancelReconnectAndWait();
-      await this.cancelConnectionAttemptAndWait();
-      await client._saveSeqTrackerState();
+      const pullInvalidation = client._rpcPipeline?.invalidatePulls?.();
+      client._rpcPipeline?.stopPullGateWatchdogs?.();
       client._stopBackgroundTasks();
       if (client._state === "idle" || client._state === "closed") {
+        const reconnectCancellation2 = client._cancelReconnectAndWait();
+        const connectionCancellation2 = this.cancelConnectionAttemptAndWait();
+        await Promise.all([reconnectCancellation2, connectionCancellation2]);
+        await pullInvalidation;
+        await client._saveSeqTrackerState();
         this.runtime.lifecycle.setState("closed");
         client._resetSeqTrackingState();
         client._clientLog.debug(`close exit: elapsed=${Date.now() - tStart}ms reason=already_idle`);
         return;
       }
+      const reconnectCancellation = client._cancelReconnectAndWait();
+      const connectionCancellation = this.cancelConnectionAttemptAndWait();
       try {
         await client._transport.call("auth.logout", {});
       } catch (err) {
         client._clientLog.warn(`auth.logout during close failed: ${err instanceof Error ? err.message : String(err)}`);
       }
       await client._transport.close();
+      await Promise.all([pullInvalidation, reconnectCancellation, connectionCancellation]);
+      await client._saveSeqTrackerState();
       this.runtime.lifecycle.setState("closed");
       await this.publishLifecycleStopEvent({ state: client._publicState(client._state) });
       client._resetSeqTrackingState();
@@ -14829,6 +14953,7 @@ var SIGNED_METHODS = /* @__PURE__ */ new Set([
   "group.resume"
 ]);
 var SIGNING_KEY_CACHE_MAX = 32;
+var IDENTITY_ADMISSION_RETRY_DELAYS_MS = [0, 50, 100, 200];
 var signingKeyCache = /* @__PURE__ */ new Map();
 var certFingerprintCache = /* @__PURE__ */ new Map();
 function cacheGet(cache, key) {
@@ -14883,6 +15008,13 @@ async function signingCertFingerprint(certPem) {
 }
 var PULL_GATE_STALE_MS = 3e4;
 var PULL_GATE_OPERATION_TIMEOUT_MS = 3e3;
+function sameIdentityAdmissionRejection(error, original) {
+  const errorCode2 = Number(error?.code);
+  const originalCode = Number(original?.code);
+  const errorMessage3 = String(error instanceof Error ? error.message : error?.message ?? "").trim().toLowerCase();
+  const originalMessage = String(original instanceof Error ? original.message : original?.message ?? "").trim().toLowerCase();
+  return errorCode2 === -32003 && originalCode === -32003 && errorMessage3 === originalMessage;
+}
 var NON_IDEMPOTENT_TIMEOUT = 35;
 var NON_IDEMPOTENT_METHODS = /* @__PURE__ */ new Set([
   "message.send",
@@ -14979,6 +15111,8 @@ var RpcPipeline = class {
     __publicField(this, "runtime");
     __publicField(this, "pullGateStates", /* @__PURE__ */ new Map());
     __publicField(this, "inlineRealtimeScopes", /* @__PURE__ */ new Set());
+    __publicField(this, "pullGeneration", 0);
+    __publicField(this, "pullInvalidationWait", null);
     this.runtime = runtime;
   }
   async call(method, params2) {
@@ -15348,19 +15482,21 @@ var RpcPipeline = class {
     if (method === "message.pull" || method === "message.v2.pull" || method === "message.history") {
       if (!client._aid) return "";
       const mode = method === "message.history" ? "history" : params2.window_mode === "tail" ? "tail" : "forward";
-      const cursor = mode === "history" ? `before=${String(params2.before_seq)}` : `after=${String(params2.after_seq ?? 0)}|force=${String(Boolean(params2.force))}`;
-      return `p2p:${client._aid}|${mode}|${cursor}|limit=${String(params2.limit)}`;
+      const cursor = mode === "history" ? `before=${String(params2.before_seq)}` : `after=${String(params2.after_seq ?? 0)}`;
+      return `p2p:${client._aid}|mode=${mode}|cursor=${cursor}|force=${String(Boolean(params2.force))}|limit=${String(params2.limit)}`;
     }
     if (method === "group.pull" || method === "group.v2.pull" || method === "group.history") {
       const gid = String(params2.group_id ?? params2.group_aid ?? "").trim();
       if (!gid) return "";
       const mode = method === "group.history" ? "history" : params2.window_mode === "tail" ? "tail" : "forward";
-      const cursor = mode === "history" ? `before=${String(params2.before_seq)}` : `after=${String(params2.after_seq ?? params2.after_message_seq ?? 0)}|force=${String(Boolean(params2.force))}`;
-      return `group:${gid}|${mode}|${cursor}|limit=${String(params2.limit)}`;
+      const cursor = mode === "history" ? `before=${String(params2.before_seq)}` : `after=${String(params2.after_seq ?? params2.after_message_seq ?? 0)}`;
+      const explicitCursor = this.explicitGroupCursorParams(params2);
+      const cursorSuffix = Object.keys(explicitCursor).length > 0 ? `|cursor_params=${stableStringify(explicitCursor)}` : "";
+      return `group:${gid}|mode=${mode}|cursor=${cursor}${cursorSuffix}|force=${String(Boolean(params2.force))}|limit=${String(params2.limit)}`;
     }
     if (method === "group.pull_events") {
       const gid = String(params2.group_id ?? params2.group_aid ?? "").trim();
-      return gid ? `group_event:${gid}|forward|after=${String(params2.after_event_seq ?? 0)}|limit=${String(params2.limit)}` : "";
+      return gid ? `group_event:${gid}|mode=forward|cursor=after=${String(params2.after_event_seq ?? 0)}|force=${String(Boolean(params2.force))}|limit=${String(params2.limit)}` : "";
     }
     return "";
   }
@@ -15380,8 +15516,8 @@ var RpcPipeline = class {
     if (!state) {
       state = { active: null, foreground: [], background: [], byKey: /* @__PURE__ */ new Map(), lifecycle: /* @__PURE__ */ new Map(), watchdog: null };
       this.pullGateStates.set(name, state);
-      this.startPullGateWatchdog(state, name);
     }
+    this.startPullGateWatchdog(state, name);
     return state;
   }
   pullGateOperationTimeoutMs() {
@@ -15398,6 +15534,13 @@ var RpcPipeline = class {
     state.watchdog = timer;
     timer.unref?.();
   }
+  stopPullGateWatchdogs() {
+    for (const state of this.pullGateStates.values()) {
+      if (state.watchdog === null) continue;
+      clearInterval(state.watchdog);
+      state.watchdog = null;
+    }
+  }
   checkPullGate(state, name) {
     const active = state.active;
     if (!active) {
@@ -15407,17 +15550,12 @@ var RpcPipeline = class {
     if (!active.pullingStartedAt || Date.now() - active.pullingStartedAt < this.pullGateOperationTimeoutMs()) return;
     if (active.timedOut) return;
     active.timedOut = true;
+    active.invalidated = true;
+    this.pullGeneration += 1;
     active.cancel?.();
     const err = new TimeoutError(`pull gate timeout: ${active.namespace}`, { retryable: true });
     this.runtime.client._clientLog?.warn(`pull gate watchdog timeout: gate=${name} key=${active.key}`);
-    state.lifecycle.set(active.namespace, "idle");
-    if (state.active === active) state.active = null;
-    if (state.byKey.get(active.key) === active) state.byKey.delete(active.key);
-    active.resolve = () => {
-    };
     active.reject(err);
-    this.drainPullGate(state);
-    this.runtime.client._delivery?.onPullGateIdle?.(active.namespace);
   }
   realtimePullNamespace(key) {
     for (const marker of ["|tail|", "|forward|"]) {
@@ -15436,7 +15574,7 @@ var RpcPipeline = class {
     if (typeof cancel !== "function" || !key) return request;
     const state = this.pullGateStates.get(this.pullGateName(key));
     const active = state?.active;
-    if (!active || active.namespace !== this.pullScopeKey(key) || active.timedOut) return request;
+    if (!active || active.key !== key || active.timedOut || active.invalidated) return request;
     const boundCancel = () => cancel.call(request);
     active.cancel = boundCancel;
     return request.finally(() => {
@@ -15522,7 +15660,10 @@ var RpcPipeline = class {
       resumeResolve: null,
       pullingStartedAt: 0,
       timedOut: false,
-      cancel: null
+      invalidated: false,
+      cancel: null,
+      settled: Promise.resolve(),
+      settledResolve: null
     };
     this.inlineRealtimeScopes.add(normalized);
     try {
@@ -15562,14 +15703,59 @@ var RpcPipeline = class {
     gate.inflight = false;
     gate.startedAt = 0;
   }
+  isPullGenerationCurrent(generation) {
+    return generation === this.pullGeneration;
+  }
+  invalidatePulls() {
+    if (this.pullInvalidationWait) return this.pullInvalidationWait;
+    this.pullGeneration += 1;
+    const error = new Error("pull invalidated");
+    const waits = [];
+    for (const state of this.pullGateStates.values()) {
+      const jobs = /* @__PURE__ */ new Set();
+      if (state.active) jobs.add(state.active);
+      for (const job of state.foreground) jobs.add(job);
+      for (const job of state.background) jobs.add(job);
+      for (const job of jobs) {
+        job.invalidated = true;
+        if (!job.timedOut) job.reject(error);
+        job.cancel?.();
+        job.resumeResolve?.();
+        job.resumeResolve = null;
+        if (job.running) {
+          waits.push(job.settled);
+        } else {
+          job.settledResolve?.();
+          job.settledResolve = null;
+        }
+      }
+      state.foreground = state.foreground.filter((job) => !jobs.has(job));
+      state.background = state.background.filter((job) => !jobs.has(job));
+      for (const [key, job] of state.byKey.entries()) {
+        if (jobs.has(job) && !job.running) state.byKey.delete(key);
+      }
+      this.drainPullGate(state);
+    }
+    const wait = Promise.all(waits).then(() => void 0);
+    let tracked;
+    tracked = wait.finally(() => {
+      if (this.pullInvalidationWait === tracked) this.pullInvalidationWait = null;
+    });
+    this.pullInvalidationWait = tracked;
+    return tracked;
+  }
+  pullInvalidationInProgress() {
+    return this.pullInvalidationWait !== null;
+  }
   async runPullSerialized(key, operation, background = false) {
+    if (this.pullInvalidationInProgress()) {
+      throw new Error("pull invalidated");
+    }
     if (!key) return await this.executePullOperation(operation, background);
     const state = this.pullGateState(key);
     const namespace = this.pullScopeKey(key);
-    const active = state.active?.namespace === namespace ? state.active : null;
-    const queuedForeground = state.foreground.find((job2) => job2.namespace === namespace);
-    const queuedBackground = state.background.find((job2) => job2.namespace === namespace);
-    const existing = background ? active ?? queuedForeground ?? queuedBackground : queuedForeground ?? (active && !active.background ? active : null) ?? queuedBackground;
+    const candidate = state.byKey.get(key);
+    const existing = candidate && !candidate.timedOut && !candidate.invalidated ? candidate : null;
     if (existing) {
       if (!background && existing.background && existing !== state.active) {
         const index = state.background.indexOf(existing);
@@ -15581,10 +15767,14 @@ var RpcPipeline = class {
     }
     let resolve;
     let reject;
+    let settledResolve;
     const promise = new Promise((res, rej) => {
       resolve = res;
       reject = rej;
     });
+    const settled = new Promise((resolveSettled) => {
+      settledResolve = resolveSettled;
+    });
     void promise.catch(() => {
     });
     const job = {
@@ -15602,7 +15792,10 @@ var RpcPipeline = class {
       resumeResolve: null,
       pullingStartedAt: 0,
       timedOut: false,
-      cancel: null
+      invalidated: false,
+      cancel: null,
+      settled,
+      settledResolve
     };
     (background ? state.background : state.foreground).push(job);
     state.byKey.set(key, job);
@@ -15611,14 +15804,30 @@ var RpcPipeline = class {
     return await promise;
   }
   async executePullOperation(operation, background) {
-    if (background) return await this.runtime.client._withBackgroundRpc(operation);
-    return await operation();
+    const client = this.runtime.client;
+    const hadPrevious = Object.prototype.hasOwnProperty.call(client, "_pullOperationGeneration");
+    const previous = client._pullOperationGeneration;
+    client._pullOperationGeneration = this.pullGeneration;
+    try {
+      if (background) return await client._withBackgroundRpc(operation);
+      return await operation();
+    } finally {
+      if (hadPrevious) client._pullOperationGeneration = previous;
+      else delete client._pullOperationGeneration;
+    }
+  }
+  pullOperationIsCurrent() {
+    const generation = this.runtime.client._pullOperationGeneration;
+    return generation === void 0 || this.isPullGenerationCurrent(generation);
+  }
+  throwIfPullInvalidated() {
+    if (!this.pullOperationIsCurrent()) throw new Error("pull invalidated");
   }
   async yieldPullGate(key, nextKey, background) {
     if (!key) return;
     const state = this.pullGateState(key);
     const namespace = this.pullScopeKey(key);
-    const job = state.active?.namespace === namespace ? state.active : [...state.foreground, ...state.background].find((candidate) => candidate.namespace === namespace);
+    const job = state.active?.key === key ? state.active : null;
     if (!job || state.active !== job) return;
     const replacementKey = String(nextKey || key);
     if (state.byKey.get(job.key) === job) state.byKey.delete(job.key);
@@ -15634,7 +15843,10 @@ var RpcPipeline = class {
     state.active = null;
     (job.background ? state.background : state.foreground).push(job);
     this.drainPullGate(state);
-    if (job.resume) await job.resume;
+    if (job.resume) {
+      await job.resume;
+      if (job.invalidated) throw new Error("pull invalidated");
+    }
   }
   getPullLifecycle(namespace) {
     const ns = this.pullScopeKey(namespace);
@@ -15670,13 +15882,21 @@ var RpcPipeline = class {
       return;
     }
     job.running = true;
-    void this.executePullOperation(job.operation, job.background).then(job.resolve, job.reject).finally(() => {
-      if (job.timedOut) return;
+    void this.executePullOperation(job.operation, job.background).then(
+      (value) => {
+        if (!job.timedOut && !job.invalidated) job.resolve(value);
+      },
+      (error) => {
+        if (!job.timedOut && !job.invalidated) job.reject(error);
+      }
+    ).finally(() => {
       state.lifecycle.set(job.namespace, "idle");
       if (state.active === job) state.active = null;
       if (state.byKey.get(job.key) === job) state.byKey.delete(job.key);
       this.drainPullGate(state);
-      this.runtime.client._delivery?.onPullGateIdle?.(job.namespace);
+      job.settledResolve?.();
+      job.settledResolve = null;
+      if (!job.invalidated) this.runtime.client._delivery?.onPullGateIdle?.(job.namespace);
     });
   }
   armQueuedPullTimers(_state) {
@@ -15699,7 +15919,9 @@ var RpcPipeline = class {
       else request = client._transport.call(method, payload);
       return this.bindActivePullCancellation(method, payload, request);
     };
-    return await this.transportCallWithIdentityRecovery(invokeTransport, method, payload);
+    const result = await this.transportCallWithIdentityRecovery(invokeTransport, method, payload);
+    this.throwIfPullInvalidated();
+    return result;
   }
   async transportCallWithIdentityRecovery(operation, method, params2) {
     try {
@@ -15707,11 +15929,22 @@ var RpcPipeline = class {
     } catch (err) {
       const recover = this.runtime.client._recoverIdentityAdmission;
       if (typeof recover !== "function" || !await recover.call(this.runtime.client, err, method, params2)) throw err;
-      return await operation();
+      let lastError = err;
+      for (const delay of IDENTITY_ADMISSION_RETRY_DELAYS_MS) {
+        if (delay > 0) await new Promise((resolve) => setTimeout(resolve, delay));
+        try {
+          return await operation();
+        } catch (retryError) {
+          if (!sameIdentityAdmissionRejection(retryError, err)) throw retryError;
+          lastError = retryError;
+        }
+      }
+      throw lastError;
     }
   }
   async postprocessResult(method, params2, result, options = {}) {
     const client = this.runtime.client;
+    this.throwIfPullInvalidated();
     let next = result;
     if ((method === "group.send" || method === "group.v2.send") && isJsonObject(next)) {
       next = normalizeGroupMentionMode(next);
@@ -17412,17 +17645,21 @@ var GroupFacade = class extends RpcFacade {
   }
   create(params2) {
     const split = splitAidStore(params2);
-    if (typeof this.client.createGroup === "function") {
+    if (split.params.group_name === void 0 && split.params.groupName !== void 0) {
+      split.params.group_name = split.params.groupName;
+      delete split.params.groupName;
+    }
+    if (split.aidStore && typeof this.client.createGroup === "function") {
       return this.client.createGroup(split.params, { aidStore: split.aidStore });
     }
     return this.call("group.create", split.params);
   }
   bindAid(params2) {
-    return this.bindGroupAid(params2);
+    return this.call("group.bind_aid", splitAidStore(params2).params);
   }
   bindGroupAid(params2) {
     const split = splitAidStore(params2);
-    if (typeof this.client.bindGroupAid === "function") {
+    if (split.aidStore && typeof this.client.bindGroupAid === "function") {
       return this.client.bindGroupAid(split.params, { aidStore: split.aidStore });
     }
     return this.call("group.bind_group_aid", split.params);
@@ -22795,6 +23032,10 @@ var V2Session = class {
 };
 
 // src/client/v2-e2ee.ts
+function pullGateKeyForClient(client, method, params2, fallback) {
+  const key = client._rpcPipeline?.pullGateKeyForCall?.(method, params2);
+  return typeof key === "string" && key ? key : fallback;
+}
 var V2_BOOTSTRAP_TTL_MS = 60 * 60 * 1e3;
 var V2_RETRYABLE_CODES = /* @__PURE__ */ new Set([-33011, -33012, -33050, -33052, -33054]);
 var V2_GROUP_STALE_BOOTSTRAP_CODE = -33054;
@@ -23854,7 +24095,11 @@ var V2E2EECoordinator = class {
     const ns = client._aid ? `p2p:${client._aid}` : "";
     if (opts?.windowMode === "tail") {
       if (!opts.gateLocked) {
-        const key = `${ns}|tail|after=${afterSeq}|limit=${limit}`;
+        const key = pullGateKeyForClient(client, "message.v2.pull", {
+          window_mode: "tail",
+          after_seq: afterSeq,
+          limit
+        }, `${ns}|tail|after=${afterSeq}|limit=${limit}`);
         return await client._runPullSerialized(key, () => this.pullV2(afterSeq, limit, {
           ...opts ?? {},
           gateLocked: true
@@ -23864,7 +24109,11 @@ var V2E2EECoordinator = class {
       return Array.isArray(result.messages) ? result.messages : [];
     }
     if (ns && !opts?.gateLocked) {
-      const key = `${ns}|forward|after=${afterSeq}|force=${String(Boolean(opts?.force))}|limit=${limit}`;
+      const key = pullGateKeyForClient(client, "message.v2.pull", {
+        after_seq: afterSeq,
+        force: opts?.force === true,
+        limit
+      }, `${ns}|forward|after=${afterSeq}|force=${String(Boolean(opts?.force))}|limit=${limit}`);
       return await client._runPullSerialized(key, () => this.pullV2(afterSeq, limit, {
         ...opts ?? {},
         gateLocked: true
@@ -23872,7 +24121,11 @@ var V2E2EECoordinator = class {
     }
     const decrypted = [];
     let nextAfterSeq = opts?.force ? afterSeq : afterSeq || (ns ? client._seqTracker.getContiguousSeq(ns) : 0);
-    let pullGateKey = ns ? `${ns}|forward|after=${afterSeq}|force=${String(Boolean(opts?.force))}|limit=${limit}` : "";
+    let pullGateKey = ns ? pullGateKeyForClient(client, "message.v2.pull", {
+      after_seq: afterSeq,
+      force: opts?.force === true,
+      limit
+    }, `${ns}|forward|after=${afterSeq}|force=${String(Boolean(opts?.force))}|limit=${limit}`) : "";
     const deferredServerCursor = ns ? this.pendingForwardCursor(ns, client._seqTracker.getContiguousSeq(ns)) : 0;
     const deferredForwardAck = ns ? this.pendingForwardAck(ns, client._seqTracker.getContiguousSeq(ns)) : 0;
     let pageCount = 0;
@@ -23917,6 +24170,7 @@ var V2E2EECoordinator = class {
       const pageTrackerSnapshot = ns && typeof client._seqTracker.snapshotNamespace === "function" ? client._seqTracker.snapshotNamespace(ns) : null;
       const pageMaxSeq = seqs.length > 0 ? Math.max(...seqs) : nextAfterSeq;
       const deferredKeyFetches = /* @__PURE__ */ new Map();
+      let blockedSeq = 0;
       for (const msg of messages) {
         const seq2 = Number(msg.seq ?? 0);
         if (!Number.isFinite(seq2) || seq2 <= 0) continue;
@@ -23956,6 +24210,9 @@ var V2E2EECoordinator = class {
         }
         const deferStatus = {};
         const plaintext = await client._decryptV2Message(msg, true, true, true, true, deferStatus, true);
+        if (deferStatus.deferred) {
+          blockedSeq = blockedSeq > 0 ? Math.min(blockedSeq, seq2) : seq2;
+        }
         if (deferStatus.deferred && deferStatus.fromAid) {
           const key = `${deferStatus.fromAid}\0${deferStatus.senderDeviceId ?? ""}\0${deferStatus.groupId ?? ""}`;
           deferredKeyFetches.set(key, {
@@ -23978,7 +24235,7 @@ var V2E2EECoordinator = class {
       const serverAckSeq = parsedServerAckSeq ?? 0;
       const retentionFloor = Math.max(0, Number(result.retention_floor_seq ?? 0));
       if (ns) {
-        const commitTarget = Math.max(
+        const commitTarget = blockedSeq > 0 ? pageContigBefore : Math.max(
           pageContigBefore,
           Number.isFinite(retentionFloor) ? retentionFloor : 0,
           pageCount === 1 ? deferredServerCursor : 0,
@@ -24020,7 +24277,7 @@ var V2E2EECoordinator = class {
           this.recordForwardCursor(ns, serverAckSeq, ackSeq);
         }
         const knownServerAckSeq = hasServerAckSeq ? serverAckSeq : pageCount === 1 ? deferredServerCursor : 0;
-        const ackNeeded = ackSeq > 0 && ackSeq > lastAutoAckSeq && (hasServerAckSeq && ackSeq > serverAckSeq || contigAdvanced && ackSeq > knownServerAckSeq);
+        const ackNeeded = blockedSeq <= 0 && ackSeq > 0 && ackSeq > lastAutoAckSeq && (hasServerAckSeq && ackSeq > serverAckSeq || contigAdvanced && ackSeq > knownServerAckSeq);
         if (ackNeeded) {
           this.recordForwardAck(ns, ackSeq);
           const nextAfter2 = Math.max(pageMaxSeq, nextAfterSeq);
@@ -24036,6 +24293,7 @@ var V2E2EECoordinator = class {
       }
       const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
       const rawCount = messages.length;
+      if (blockedSeq > 0) break;
       const shouldContinue = shouldContinueForwardPage({
         rawCount,
         nextAfterSeq,
@@ -24048,7 +24306,11 @@ var V2E2EECoordinator = class {
       });
       if (!shouldContinue) break;
       if (pullGateKey && opts?.gateLocked && client._rpcPipeline?.yieldPullGate) {
-        const nextKey = `${ns}|forward|after=${nextAfter}|force=${String(Boolean(opts?.force))}|limit=${limit}`;
+        const nextKey = pullGateKeyForClient(client, "message.v2.pull", {
+          after_seq: nextAfter,
+          force: opts?.force === true,
+          limit
+        }, `${ns}|forward|after=${nextAfter}|force=${String(Boolean(opts?.force))}|limit=${limit}`);
         await client._rpcPipeline.yieldPullGate(pullGateKey, nextKey, true);
         pullGateKey = nextKey;
       }
@@ -24268,7 +24530,13 @@ var V2E2EECoordinator = class {
     const ns = `group:${gid}`;
     if (opts?.windowMode === "tail") {
       if (!opts.gateLocked) {
-        const key = `${ns}|tail|after=${afterSeq}|limit=${limit}`;
+        const key = pullGateKeyForClient(client, "group.v2.pull", {
+          group_id: gid,
+          window_mode: "tail",
+          after_seq: afterSeq,
+          limit,
+          _group_cursor_params: opts?.cursorParams
+        }, `${ns}|tail|after=${afterSeq}|limit=${limit}`);
         return await client._runPullSerialized(key, () => this.pullGroupV2(gid, afterSeq, limit, {
           ...opts ?? {},
           gateLocked: true
@@ -24284,7 +24552,13 @@ var V2E2EECoordinator = class {
       return Array.isArray(result.messages) ? result.messages : [];
     }
     if (!opts?.gateLocked) {
-      const key = `${ns}|forward|after=${afterSeq}|force=${String(Boolean(opts?.force))}|limit=${limit}`;
+      const key = pullGateKeyForClient(client, "group.v2.pull", {
+        group_id: gid,
+        after_seq: afterSeq,
+        force: opts?.force === true,
+        limit,
+        _group_cursor_params: opts?.cursorParams
+      }, `${ns}|forward|after=${afterSeq}|force=${String(Boolean(opts?.force))}|limit=${limit}`);
       return await client._runPullSerialized(key, () => this.pullGroupV2(gid, afterSeq, limit, {
         ...opts ?? {},
         gateLocked: true
@@ -24294,7 +24568,13 @@ var V2E2EECoordinator = class {
     const wireGroupId = String(opts?.wireGroupId ?? groupId ?? "").trim() || gid;
     const cursorParams = opts?.cursorParams ?? {};
     const ownsCursor = opts?.ownsCursor !== false;
-    let pullGateKey = ownsCursor ? `${ns}|forward|after=${afterSeq}|force=${String(Boolean(opts?.force))}|limit=${limit}` : "";
+    let pullGateKey = ownsCursor ? pullGateKeyForClient(client, "group.v2.pull", {
+      group_id: gid,
+      after_seq: afterSeq,
+      force: opts?.force === true,
+      limit,
+      _group_cursor_params: cursorParams
+    }, `${ns}|forward|after=${afterSeq}|force=${String(Boolean(opts?.force))}|limit=${limit}`) : "";
     let nextAfterSeq = opts?.explicitAfterSeq || opts?.force ? afterSeq : afterSeq || client._seqTracker.getContiguousSeq(ns);
     const deferredServerCursor = ownsCursor ? this.pendingForwardCursor(ns, client._seqTracker.getContiguousSeq(ns)) : 0;
     const deferredForwardAck = ownsCursor ? this.pendingForwardAck(ns, client._seqTracker.getContiguousSeq(ns)) : 0;
@@ -24347,6 +24627,7 @@ var V2E2EECoordinator = class {
       const pageTrackerSnapshot = typeof client._seqTracker.snapshotNamespace === "function" ? client._seqTracker.snapshotNamespace(ns) : null;
       const pageMaxSeq = seqs.length > 0 ? Math.max(...seqs) : nextAfterSeq;
       const deferredKeyFetches = /* @__PURE__ */ new Map();
+      let blockedSeq = 0;
       for (const msg of messages) {
         const seq2 = Number(msg.seq ?? 0);
         if (!Number.isFinite(seq2) || seq2 <= 0) continue;
@@ -24411,6 +24692,9 @@ var V2E2EECoordinator = class {
         }
         const deferStatus = {};
         let plaintext = await client._decryptV2Message(msg, true, true, true, true, deferStatus, true);
+        if (deferStatus.deferred) {
+          blockedSeq = blockedSeq > 0 ? Math.min(blockedSeq, seq2) : seq2;
+        }
         if (deferStatus.deferred && deferStatus.fromAid) {
           const key = `${deferStatus.fromAid}\0${deferStatus.senderDeviceId ?? ""}\0${deferStatus.groupId ?? ""}`;
           deferredKeyFetches.set(key, {
@@ -24439,7 +24723,7 @@ var V2E2EECoordinator = class {
         Number(cursor?.join_seq ?? 0)
       );
       const effectiveFloor = Math.max(retentionFloor, visibilityFloor);
-      const commitTarget = Math.max(
+      const commitTarget = blockedSeq > 0 ? pageContigBefore : Math.max(
         pageContigBefore,
         Number.isFinite(effectiveFloor) ? effectiveFloor : 0,
         ownsCursor && pageCount === 1 ? deferredServerCursor : 0,
@@ -24483,7 +24767,7 @@ var V2E2EECoordinator = class {
         this.recordForwardCursor(ns, cursorCurrentSeq, ackSeq);
       }
       const knownServerCursorSeq = hasServerCursor ? cursorCurrentSeq : ownsCursor && pageCount === 1 ? deferredServerCursor : 0;
-      const ackNeeded = ackSeq > 0 && ackSeq > lastAutoAckSeq && ownsCursor && (hasServerCursor && ackSeq > cursorCurrentSeq || contigAdvanced && ackSeq > knownServerCursorSeq);
+      const ackNeeded = blockedSeq <= 0 && ackSeq > 0 && ackSeq > lastAutoAckSeq && ownsCursor && (hasServerCursor && ackSeq > cursorCurrentSeq || contigAdvanced && ackSeq > knownServerCursorSeq);
       if (ackNeeded) {
         this.recordForwardAck(ns, ackSeq);
         const nextAfter2 = Math.max(pageMaxSeq, nextAfterSeq);
@@ -24499,6 +24783,7 @@ var V2E2EECoordinator = class {
       const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
       if (!ownsCursor) break;
       const rawCount = messages.length;
+      if (blockedSeq > 0) break;
       const shouldContinue = shouldContinueForwardPage({
         rawCount,
         nextAfterSeq,
@@ -24511,7 +24796,13 @@ var V2E2EECoordinator = class {
       });
       if (!shouldContinue) break;
       if (pullGateKey && opts?.gateLocked && client._rpcPipeline?.yieldPullGate) {
-        const nextKey = `${ns}|forward|after=${nextAfter}|force=${String(Boolean(opts?.force))}|limit=${limit}`;
+        const nextKey = pullGateKeyForClient(client, "group.v2.pull", {
+          group_id: gid,
+          after_seq: nextAfter,
+          force: opts?.force === true,
+          limit,
+          _group_cursor_params: cursorParams
+        }, `${ns}|forward|after=${nextAfter}|force=${String(Boolean(opts?.force))}|limit=${limit}`);
         await client._rpcPipeline.yieldPullGate(pullGateKey, nextKey, true);
         pullGateKey = nextKey;
       }
@@ -26084,7 +26375,7 @@ var GroupStateCoordinator = class {
       const proposalId = isJsonObject(proposeResult) ? String(proposeResult.proposal_id ?? "").trim() : "";
       if (proposalId) {
         try {
-          await client.call("group.v2.confirm_state", { proposal_id: proposalId });
+          await client.call("group.v2.confirm_state", { proposal_id: proposalId, group_id: groupId });
           client._v2AutoProposeLastSnapshot.set(groupId, membershipSnapshot);
           client._clientLog.debug(`V2 auto confirm_state: group=${groupId} proposal=${proposalId}`);
         } catch (confirmExc) {
@@ -26137,7 +26428,7 @@ var GroupStateCoordinator = class {
       return false;
     }
     if (!await this.verifyPendingProposalAgainstBase(groupId, proposal, stateResp)) return false;
-    await client.call("group.v2.confirm_state", { proposal_id: proposalId });
+    await client.call("group.v2.confirm_state", { proposal_id: proposalId, group_id: groupId });
     client._clientLog.info(`V2 confirmed pending proposal: group=${groupId} proposal=${proposalId}`);
     return true;
   }
@@ -27400,6 +27691,7 @@ var AgentMdManager = class _AgentMdManager {
     if (content !== void 0 && content !== null) {
       const text3 = String(content ?? "");
       if (text3.length === 0) throw new ValidationError("uploadAgentMd requires non-empty content");
+      validateAgentMdDocument(text3, { expectedAid: target });
       await this.saveRecord(target, {
         content: text3,
         local_etag: await _AgentMdManager.contentEtag(text3),
@@ -28877,6 +29169,7 @@ var _AUNClient = class _AUNClient {
     this._peerCache.clear();
     this._certCache.clear();
     this._gatewayUrl = null;
+    this._gatewayCandidates = [];
     this._deviceId = aid.deviceId || getDeviceId();
     this._slotId = aid.slotId || "default";
     this._logger = new AUNLogger({ debug: aid.debug, aunPath: nextConfig.aunPath });
@@ -29056,7 +29349,7 @@ var _AUNClient = class _AUNClient {
     if (!message.toLowerCase().startsWith(agentPrefix)) return false;
     const target = message.slice(agentPrefix.length).trim();
     if (!target || target.toLowerCase() !== String(this._aid ?? "").trim().toLowerCase()) return false;
-    await this._agentMdManager.upload(buildDefaultAgentMd(target));
+    await this._agentMdManager.upload(await this._agentMdManager.readContent(target) ?? buildDefaultAgentMd(target));
     return true;
   }
   async _runGroupIdentityOperation(groupId, operation) {
@@ -29085,6 +29378,10 @@ var _AUNClient = class _AUNClient {
     }
     this._aidStore = store;
     const payload = { ...params2 };
+    if (payload.group_name === void 0 && payload.groupName !== void 0) {
+      payload.group_name = payload.groupName;
+      delete payload.groupName;
+    }
     const isNamed = Boolean(String(payload.group_name ?? "").trim());
     payload._defer_group_ready_postprocess = true;
     if (!isNamed) {
@@ -29112,7 +29409,24 @@ var _AUNClient = class _AUNClient {
       delete postprocessParams2._defer_group_ready_postprocess;
       return await this._groupState.postprocessResult("group.create", postprocessParams2, result2);
     }
-    const keyPair = await new CryptoProvider().generateIdentity();
+    const pendingKey = `create:${String(payload.group_name).trim().toLowerCase()}`;
+    const keystore = store._keystore;
+    let keyPair = null;
+    if (keystore && typeof keystore.loadPendingGroupBind === "function") {
+      keyPair = await keystore.loadPendingGroupBind(pendingKey);
+    }
+    if (!keyPair || !keyPair.public_key_der_b64 || !keyPair.private_key_pem) {
+      const generated = await new CryptoProvider().generateIdentity();
+      keyPair = {
+        private_key_pem: generated.private_key_pem,
+        public_key_der_b64: generated.public_key_der_b64,
+        curve: generated.curve
+      };
+      if (keystore && typeof keystore.savePendingGroupBind === "function") {
+        await keystore.savePendingGroupBind(pendingKey, keyPair);
+      }
+    }
+    if (!keyPair) throw new ValidationError("createGroup: failed to generate or load key pair");
     payload.public_key = keyPair.public_key_der_b64;
     payload.curve = keyPair.curve;
     const result = await this.call("group.create", payload);
@@ -29138,6 +29452,9 @@ var _AUNClient = class _AUNClient {
       throw new ValidationError("createGroup requires current owner AID for group agent.md upload");
     }
     await this._uploadGroupAgentMd(store, groupAid, payload, group, uploaderAid);
+    if (keystore && typeof keystore.clearPendingGroupBind === "function") {
+      await keystore.clearPendingGroupBind(pendingKey);
+    }
     const postprocessParams = { ...payload };
     delete postprocessParams._defer_group_ready_postprocess;
     return await this._groupState.postprocessResult("group.create", postprocessParams, result);
@@ -29195,10 +29512,14 @@ var _AUNClient = class _AUNClient {
     }
     this._aidStore = store;
     const groupId = String(params2.group_id ?? params2.group_aid ?? "").trim();
+    const pendingKey = `bind:${groupId}`;
     const keystore = store._keystore;
     let keyPair = null;
     if (groupId && keystore && typeof keystore.loadPendingGroupBind === "function") {
-      keyPair = await keystore.loadPendingGroupBind(groupId);
+      keyPair = await keystore.loadPendingGroupBind(pendingKey);
+      if (!keyPair || !keyPair.public_key_der_b64 || !keyPair.private_key_pem) {
+        keyPair = await keystore.loadPendingGroupBind(groupId);
+      }
     }
     if (!keyPair || !keyPair.public_key_der_b64 || !keyPair.private_key_pem) {
       const generated = await new CryptoProvider().generateIdentity();
@@ -29208,7 +29529,7 @@ var _AUNClient = class _AUNClient {
         curve: generated.curve
       };
       if (groupId && keystore && typeof keystore.savePendingGroupBind === "function") {
-        await keystore.savePendingGroupBind(groupId, keyPair);
+        await keystore.savePendingGroupBind(pendingKey, keyPair);
       }
     }
     if (!keyPair) {
@@ -29244,6 +29565,7 @@ var _AUNClient = class _AUNClient {
     }
     await this._uploadGroupAgentMd(store, groupAid, payload, group, uploaderAid);
     if (groupId && keystore && typeof keystore.clearPendingGroupBind === "function") {
+      await keystore.clearPendingGroupBind(pendingKey);
       await keystore.clearPendingGroupBind(groupId);
     }
     return result;
@@ -29280,7 +29602,24 @@ var _AUNClient = class _AUNClient {
     if (!oldPublicKey) {
       throw new ValidationError(`renewGroupAid: cannot determine old public key for ${groupAid}`);
     }
-    const newKeyPair = await new CryptoProvider().generateIdentity();
+    const keystore = store._keystore;
+    const pendingKey = `renew:${groupId}`;
+    let newKeyPair = null;
+    if (keystore && typeof keystore.loadPendingGroupBind === "function") {
+      newKeyPair = await keystore.loadPendingGroupBind(pendingKey);
+    }
+    if (!newKeyPair || !newKeyPair.public_key_der_b64 || !newKeyPair.private_key_pem) {
+      const generated = await new CryptoProvider().generateIdentity();
+      newKeyPair = {
+        private_key_pem: generated.private_key_pem,
+        public_key_der_b64: generated.public_key_der_b64,
+        curve: generated.curve
+      };
+      if (keystore && typeof keystore.savePendingGroupBind === "function") {
+        await keystore.savePendingGroupBind(pendingKey, newKeyPair);
+      }
+    }
+    if (!newKeyPair) throw new ValidationError("renewGroupAid: failed to generate or load key pair");
     const newPublicKey = newKeyPair.public_key_der_b64;
     const newPrivateKey = newKeyPair.private_key_pem;
     const curve = newKeyPair.curve || "P-256";
@@ -29336,6 +29675,9 @@ var _AUNClient = class _AUNClient {
       throw new ValidationError("renewGroupAid requires current owner AID for group agent.md upload");
     }
     await this._uploadGroupAgentMd(store, returnedGroupAid, payload, group, uploaderAid);
+    if (keystore && typeof keystore.clearPendingGroupBind === "function") {
+      await keystore.clearPendingGroupBind(pendingKey);
+    }
     return result;
   }
   async startGroupTransfer(params2 = {}, options = {}) {
@@ -29393,12 +29735,12 @@ var _AUNClient = class _AUNClient {
     if (!store) {
       throw new ValidationError("completeGroupTransfer requires aidStore");
     }
-    const keyPair = await new CryptoProvider().generateIdentity();
     const payload = { ...params2 };
     const groupId = String(params2.group_id ?? "").trim();
     if (!groupId) {
       throw new ValidationError("completeGroupTransfer requires group_id");
     }
+    const pendingKey = `complete:${groupId}`;
     let groupAid = String(params2.group_aid ?? "").trim();
     if (!groupAid) {
       const info = await this.call("group.get_info", { group_id: groupId, required: ["member"] });
@@ -29407,6 +29749,23 @@ var _AUNClient = class _AUNClient {
     if (!groupAid) {
       throw new ValidationError("completeGroupTransfer: unable to determine group_aid");
     }
+    const keystore = store._keystore;
+    let keyPair = null;
+    if (keystore && typeof keystore.loadPendingGroupBind === "function") {
+      keyPair = await keystore.loadPendingGroupBind(pendingKey);
+    }
+    if (!keyPair || !keyPair.public_key_der_b64 || !keyPair.private_key_pem) {
+      const generated = await new CryptoProvider().generateIdentity();
+      keyPair = {
+        private_key_pem: generated.private_key_pem,
+        public_key_der_b64: generated.public_key_der_b64,
+        curve: generated.curve
+      };
+      if (keystore && typeof keystore.savePendingGroupBind === "function") {
+        await keystore.savePendingGroupBind(pendingKey, keyPair);
+      }
+    }
+    if (!keyPair) throw new ValidationError("completeGroupTransfer: failed to generate or load key pair");
     const current = this.currentAid;
     const newOwner = String(current?.aid ?? "").trim();
     if (!current || !newOwner || !current.isPrivateKeyValid()) {
@@ -29460,6 +29819,9 @@ var _AUNClient = class _AUNClient {
       throw new ValidationError("completeGroupTransfer requires current owner AID for group agent.md upload");
     }
     await this._uploadGroupAgentMd(store, returnedGroupAid, payload, group, uploaderAid);
+    if (keystore && typeof keystore.clearPendingGroupBind === "function") {
+      await keystore.clearPendingGroupBind(pendingKey);
+    }
     return result;
   }
   static _notifyParamsSizeOk(params2) {
@@ -30040,16 +30402,21 @@ var _AUNClient = class _AUNClient {
   async _resolveGatewayCandidatesForAid(aid) {
     const target = String(aid ?? this._aid ?? "").trim();
     if (!target) throw new StateError("gateway discovery requires a loaded AID");
+    const discovery = this._discovery;
+    const tokenStore = this._tokenStore;
+    const discoveryIsCurrent = () => this._discovery === discovery && this._tokenStore === tokenStore && !this._closing;
     if (this._gatewayCandidates.length > 0) return [...this._gatewayCandidates];
     if (this._gatewayUrl) {
       this._gatewayCandidates = [this._gatewayUrl];
       return [...this._gatewayCandidates];
     }
     try {
-      const getMetadata = this._tokenStore.getMetadata;
-      const rawList = typeof getMetadata === "function" ? String(await getMetadata.call(this._tokenStore, target, "gateway_urls") ?? "").trim() : "";
+      const getMetadata = tokenStore.getMetadata;
+      const rawList = typeof getMetadata === "function" ? String(await getMetadata.call(tokenStore, target, "gateway_urls") ?? "").trim() : "";
+      if (!discoveryIsCurrent()) throw new StateError("gateway discovery superseded by identity change");
       const cachedList = rawList ? JSON.parse(rawList) : [];
-      const raw = typeof getMetadata === "function" ? String(await getMetadata.call(this._tokenStore, target, "gateway_url") ?? "").trim() : "";
+      const raw = typeof getMetadata === "function" ? String(await getMetadata.call(tokenStore, target, "gateway_url") ?? "").trim() : "";
+      if (!discoveryIsCurrent()) throw new StateError("gateway discovery superseded by identity change");
       const candidates2 = Array.isArray(cachedList) ? cachedList.map((item) => String(item ?? "").trim()).filter(Boolean) : [];
       const gateway = candidates2[0] ?? (raw.startsWith('"') && raw.endsWith('"') ? String(JSON.parse(raw)).trim() : raw);
       if (gateway) {
@@ -30058,6 +30425,7 @@ var _AUNClient = class _AUNClient {
         return [...this._gatewayCandidates];
       }
     } catch {
+      if (!discoveryIsCurrent()) throw new StateError("gateway discovery superseded by identity change");
     }
     const dotIdx = target.indexOf(".");
     const issuerDomain = dotIdx >= 0 ? target.slice(dotIdx + 1) : target;
@@ -30069,22 +30437,26 @@ var _AUNClient = class _AUNClient {
     let lastError = null;
     for (const url of candidates) {
       try {
-        const discovered = await this._discovery.discoverAll(url);
+        const discovered = await discovery.discoverAll(url);
+        if (!discoveryIsCurrent()) throw new StateError("gateway discovery superseded by identity change");
         const gatewayUrls = [...new Set(discovered.map((item) => String(item ?? "").trim()).filter(Boolean))];
         if (gatewayUrls.length === 0) throw new ValidationError("gateway discovery returned no candidates");
         const gateway = gatewayUrls[0];
         this._gatewayCandidates = gatewayUrls;
         this._gatewayUrl = gateway;
         try {
-          const setMetadata = this._tokenStore.setMetadata;
+          const setMetadata = tokenStore.setMetadata;
           if (typeof setMetadata === "function") {
-            await setMetadata.call(this._tokenStore, target, "gateway_url", gateway);
-            await setMetadata.call(this._tokenStore, target, "gateway_urls", JSON.stringify(gatewayUrls));
+            await setMetadata.call(tokenStore, target, "gateway_url", gateway);
+            if (!discoveryIsCurrent()) throw new StateError("gateway discovery superseded by identity change");
+            await setMetadata.call(tokenStore, target, "gateway_urls", JSON.stringify(gatewayUrls));
+            if (!discoveryIsCurrent()) throw new StateError("gateway discovery superseded by identity change");
           }
         } catch {
         }
         return [...gatewayUrls];
       } catch (err) {
+        if (!discoveryIsCurrent()) throw new StateError("gateway discovery superseded by identity change");
         lastError = err;
       }
     }
@@ -32600,8 +32972,7 @@ var AIDStore = class {
         });
       }
       await this._persistGatewayUrl(target, gatewayUrl);
-      const uploaded = await this.uploadAgentMd(target, buildDefaultAgentMd(target));
-      if (!uploaded.ok) return uploaded;
+      await this.uploadAgentMd(target, buildDefaultAgentMd(target));
       return resultOk({ registered: true });
     } catch (exc) {
       if (exc instanceof IdentityConflictError) {