@agentunion/fastaun 0.5.19 → 0.5.20

package/dist/client/v2-e2ee.js

@@ -113,13 +113,13 @@ function deduplicateForwardPageMessages(value, afterSeq) {
 function contiguousPullSeq(afterSeq, seqs, proof) {
     const pulledMax = seqs.length > 0 ? Math.max(...seqs) : 0;
     const serverProof = safeNonNegativeSeq(proof);
-    return Math.max(afterSeq, pulledMax, serverProof ?? 0);
+    return Math.max(afterSeq, pulledMax, pulledMax > 0 ? 0 : serverProof ?? 0);
 }
 function shouldContinueForwardPage({ rawCount, nextAfterSeq, nextAfter, limit, hasMoreField, hasMore, serverHead, observedUpper, pendingAckSeq, }) {
     // 无新 seq 或游标未前进时必须停止，避免错误元数据造成循环。
     if (rawCount <= 0 || nextAfter <= nextAfterSeq)
         return false;
-    if (hasMore || serverHead > nextAfter || observedUpper > nextAfter || pendingAckSeq > 0)
+    if (hasMore || serverHead > nextAfter || observedUpper > nextAfter)
         return true;
     // 仅旧服务缺失 has_more 时，以满页保留兼容续拉。
     return !hasMoreField && limit > 0 && rawCount >= limit;
@@ -917,10 +917,14 @@ export class V2E2EECoordinator {
                 });
             }
         }
+        const targetDeviceId = String(opts.deviceId ?? '').trim();
+        if (useCache && targetDeviceId && !peerDevices.some((dev) => String(dev.device_id ?? '').trim() === targetDeviceId)) {
+            this.deleteBootstrapCacheEntry(to);
+            return this.buildV2P2PEnvelope({ ...opts, useCache: false });
+        }
         if (peerDevices.length === 0) {
             throw new E2EEError(`V2 bootstrap: no devices found for ${to}`);
         }
-        const targetDeviceId = String(opts.deviceId ?? '').trim();
         if (targetDeviceId && !peerDevices.some((dev) => String(dev.device_id ?? '').trim() === targetDeviceId)) {
             throw new E2EEError(`V2 bootstrap: target device ${targetDeviceId} not found for ${to}`);
         }
@@ -1007,6 +1011,10 @@ export class V2E2EECoordinator {
             targetSet = this.cloneP2PTargetSet(targetSet);
         }
         if (targetSet.targets.length === 0) {
+            if (useCache && targetDeviceId) {
+                this.deleteBootstrapCacheEntry(to);
+                return this.buildV2P2PEnvelope({ ...opts, useCache: false });
+            }
             throw new E2EEError(`V2 bootstrap: no usable devices found for ${to}`);
         }
         if (targetDeviceId) {
@@ -1020,6 +1028,10 @@ export class V2E2EECoordinator {
                 return isPeerTarget || target.role === 'self_sync';
             });
             if (!peerTargetFound) {
+                if (useCache) {
+                    this.deleteBootstrapCacheEntry(to);
+                    return this.buildV2P2PEnvelope({ ...opts, useCache: false });
+                }
                 throw new E2EEError(`V2 bootstrap: target device ${targetDeviceId} not found for ${to}`);
             }
         }
@@ -1361,10 +1373,9 @@ export class V2E2EECoordinator {
         const maxPages = Math.max(1, Math.min(100, Math.trunc(Number(opts?.maxPages ?? 100) || 100)));
         let pipelineRunning = false;
         let pipelineError = null;
-        const pipelineQueue = new V2PullPageQueue(V2_PULL_PIPELINE_QUEUE_CAPACITY);
+        let pipelineQueue = new V2PullPageQueue(V2_PULL_PIPELINE_QUEUE_CAPACITY);
         let pipelineProducer = null;
         let pipelineStopped = false;
-        const pipelineResume = { current: null };
         const startPipeline = (startAfterSeq, startVolatileCursor) => {
             if (pipelineRunning || pageCount >= maxPages || limit < V2_PULL_MAX_PAGE_LIMIT)
                 return;
@@ -1375,30 +1386,31 @@ export class V2E2EECoordinator {
                 for (let produced = pageCount; produced < maxPages; produced += 1) {
                     if (pipelineStopped)
                         break;
+                    this.ensureDeliveryCurrent(ns, generation);
                     const requestedVolatileCursor = producerVolatileCursor;
+                    const ackUpToSeq = pendingAckSeq;
+                    const inlineAckGeneration = ackUpToSeq > 0 ? client._delivery.captureP2PInlineAckGeneration() : null;
                     const result = await client._callRawV2Rpc('message.v2.pull', {
                         after_seq: producerAfterSeq,
                         limit,
+                        ...(ackUpToSeq > 0 ? { ack_up_to_seq: ackUpToSeq } : {}),
                         ...(producerVolatileCursor ? { after_volatile_cursor: producerVolatileCursor } : {}),
                         ...(opts?.force ? { force: true } : {}),
                     }, pullGateKey);
                     if (pipelineStopped)
                         break;
+                    this.ensureDeliveryCurrent(ns, generation);
                     const rawPageMessages = (Array.isArray(result?.messages) ? result.messages : []);
-                    const completed = new Promise((resolve) => { pipelineResume.current = resolve; });
                     const enqueued = await pipelineQueue.put({
                         result,
                         afterSeq: producerAfterSeq,
-                        ackUpToSeq: 0,
-                        inlineAckGeneration: null,
+                        ackUpToSeq,
+                        inlineAckGeneration,
                         requestedVolatileCursor,
                         weight: rawPageMessages.length,
                     }, rawPageMessages.length);
                     if (!enqueued || pipelineStopped)
                         break;
-                    await completed;
-                    if (pipelineStopped)
-                        break;
                     const volatileMessages = client._delivery.volatileMessages?.(rawPageMessages) ?? [];
                     if (volatileMessages.length > 0)
                         break;
@@ -1406,7 +1418,7 @@ export class V2E2EECoordinator {
                     const seqs = messages
                         .map((msg) => Number(msg.seq ?? 0))
                         .filter((seq) => Number.isFinite(seq) && seq > 0);
-                    const nextAfter = Math.max(contiguousPullSeq(producerAfterSeq, seqs, result.contiguous_seq), producerAfterSeq);
+                    const nextAfter = Math.max(producerAfterSeq, ...seqs);
                     const cursor = isJsonObject(result.cursor)
                         ? result.cursor : null;
                     const shouldContinue = shouldContinueForwardPage({
@@ -1433,8 +1445,6 @@ export class V2E2EECoordinator {
         };
         const stopPipeline = async () => {
             pipelineStopped = true;
-            pipelineResume.current?.();
-            pipelineResume.current = null;
             pipelineQueue.close();
             if (pipelineProducer) {
                 const producer = pipelineProducer;
@@ -1458,7 +1468,7 @@ export class V2E2EECoordinator {
                 pageCount += 1;
                 const requestedVolatileCursor = pipelinePage?.requestedVolatileCursor ?? volatileCursor;
                 const ackUpToSeq = pipelinePage?.ackUpToSeq ?? pendingAckSeq;
-                const inlineAckGeneration = pipelinePage?.inlineAckGeneration ?? (ackUpToSeq > 0
+                const inlineAckGeneration = pipelinePage ? pipelinePage.inlineAckGeneration : (ackUpToSeq > 0
                     ? client._delivery.captureP2PInlineAckGeneration()
                     : null);
                 client._clientLog.debug(`message.v2.pull page request: page=${pageCount}, after_seq=${nextAfterSeq}, limit=${limit}, ack_up_to_seq=${ackUpToSeq}, ns=${ns || '<none>'}`);
@@ -1487,25 +1497,31 @@ export class V2E2EECoordinator {
                         continue;
                     }
                 }
+                this.ensureDeliveryCurrent(ns, generation);
                 if (ackUpToSeq > 0) {
                     const actualAckSeq = client._delivery.resolveP2PPullAckSeq(result, ackUpToSeq);
                     if (actualAckSeq >= ackUpToSeq) {
                         if (inlineAckGeneration !== null) {
                             client._delivery.onP2PV2PullAckResult(result, ackUpToSeq, inlineAckGeneration);
                         }
-                        pendingAckSeq = 0;
+                        if (pendingAckSeq <= ackUpToSeq)
+                            pendingAckSeq = 0;
                         lastAutoAckSeq = Math.max(lastAutoAckSeq, ackUpToSeq);
                         this.clearForwardAck(ns, ackUpToSeq);
                     }
                     else {
                         client._clientLog.warn(`message.v2.pull piggyback ACK below target: requested=${ackUpToSeq}, actual=${actualAckSeq}; fallback terminal ACK`);
-                        await this.confirmForwardP2PAck(ackUpToSeq);
-                        pendingAckSeq = 0;
-                        lastAutoAckSeq = Math.max(lastAutoAckSeq, ackUpToSeq);
                     }
                 }
                 const pageMessages = (Array.isArray(result?.messages) ? result.messages : []);
                 const volatileMessages = client._delivery.volatileMessages?.(pageMessages) ?? [];
+                if (pipelinePage && volatileMessages.length > 0) {
+                    if (pipelineProducer)
+                        await pipelineProducer;
+                    pipelineProducer = null;
+                    pipelineRunning = false;
+                    pipelineQueue = new V2PullPageQueue(V2_PULL_PIPELINE_QUEUE_CAPACITY);
+                }
                 if (volatileMessages.length > 0) {
                     decrypted.push(...await this.publishV2VolatileMessages(volatileMessages, 'pull', true));
                     volatileCursor = String(client._delivery.volatilePullCursor?.() ?? '').trim();
@@ -1531,6 +1547,13 @@ export class V2E2EECoordinator {
                     pageMaxSeq = Math.max(...seqs);
                 }
                 const pageContiguousSeq = contiguousPullSeq(pageContigBefore, seqs, result.contiguous_seq);
+                if (!pipelineRunning && volatileMessages.length === 0 && shouldContinueForwardPage({
+                    rawCount: messages.length, nextAfterSeq, nextAfter: pageMaxSeq, limit,
+                    hasMoreField, hasMore, serverHead,
+                    observedUpper: Math.max(client._seqTracker.getMaxSeenSeq(ns), Number(client._pendingP2pPullUpper?.get?.(ns) ?? 0)),
+                    pendingAckSeq: 0,
+                }))
+                    startPipeline(pageMaxSeq, volatileCursor);
                 const deferredKeyFetches = new Map();
                 let blockedSeq = 0;
                 const pageDecryptedBefore = decrypted.length;
@@ -1701,18 +1724,8 @@ export class V2E2EECoordinator {
                             || (contigAdvanced && ackSeq > knownServerAckSeq));
                     if (ackNeeded) {
                         this.recordForwardAck(ns, ackSeq);
-                        const nextAfter = Math.max(pageContiguousSeq, nextAfterSeq);
-                        const canContinuePage = blockedSeq <= 0 && messages.length > 0 && nextAfter > nextAfterSeq;
-                        if (canContinuePage && !pipelineRunning) {
-                            pendingAckSeq = Math.max(pendingAckSeq, ackSeq);
-                            lastAutoAckSeq = Math.max(lastAutoAckSeq, ackSeq);
-                            client._clientLog.debug(`message.v2.pull queued piggyback auto-ack: ns=${ns}, ack_seq=${pendingAckSeq}, raw_count=${messages.length}`);
-                        }
-                        else {
-                            client._clientLog.debug(`message.v2.pull sending terminal auto-ack: ns=${ns}, ack_seq=${ackSeq}, raw_count=${messages.length}`);
-                            await this.confirmForwardP2PAck(ackSeq);
-                            lastAutoAckSeq = Math.max(lastAutoAckSeq, ackSeq);
-                        }
+                        pendingAckSeq = Math.max(pendingAckSeq, ackSeq);
+                        client._clientLog.debug(`message.v2.pull queued piggyback auto-ack: ns=${ns}, ack_seq=${pendingAckSeq}, raw_count=${messages.length}`);
                     }
                 }
                 if (!ns) {
@@ -1729,7 +1742,7 @@ export class V2E2EECoordinator {
                         currentSeq: client._seqTracker.getContiguousSeq(ns),
                         targetSeq: serverHead,
                     });
-                const nextAfter = Math.max(pageContiguousSeq, nextAfterSeq);
+                const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
                 const rawCount = messages.length;
                 if (blockedSeq > 0)
                     break;
@@ -1761,11 +1774,7 @@ export class V2E2EECoordinator {
                     && volatileCursor !== requestedVolatileCursor;
                 if (!shouldContinuePersistent && !shouldContinueVolatile)
                     break;
-                if (shouldContinueForPipeline && !pipelineRunning && limit >= V2_PULL_MAX_PAGE_LIMIT) {
-                    if (pendingAckSeq > 0) {
-                        await this.confirmForwardP2PAck(pendingAckSeq);
-                        pendingAckSeq = 0;
-                    }
+                if (shouldContinueForPipeline && volatileMessages.length === 0 && !pipelineRunning && limit >= V2_PULL_MAX_PAGE_LIMIT) {
                     startPipeline(nextAfter, volatileCursor);
                 }
                 if (!pipelineRunning && pullGateKey && opts?.gateLocked && client._rpcPipeline?.yieldPullGate) {
@@ -1775,14 +1784,10 @@ export class V2E2EECoordinator {
                     await client._rpcPipeline.yieldPullGate(pullGateKey, nextKey, true);
                     pullGateKey = nextKey;
                 }
-                const tailDelayMs = v2PullTailDelayMs(rawCount, limit);
+                const tailDelayMs = pipelineRunning ? 0 : v2PullTailDelayMs(rawCount, limit);
                 if (tailDelayMs > 0)
                     await v2Sleep(tailDelayMs);
                 nextAfterSeq = nextAfter;
-                if (pipelinePage) {
-                    pipelineResume.current?.();
-                    pipelineResume.current = null;
-                }
             }
         }
         finally {
@@ -1790,11 +1795,14 @@ export class V2E2EECoordinator {
         }
         if (pageCount >= maxPages) {
             client._clientLog.warn(`message.v2.pull reached max_pages=${maxPages} after_seq=${nextAfterSeq}`);
-            if (pendingAckSeq > 0) {
-                client._clientLog.debug(`message.v2.pull flushing pending auto-ack after max_pages: ns=${ns}, ack_seq=${pendingAckSeq}`);
-                await this.confirmForwardP2PAck(pendingAckSeq);
+        }
+        if (pendingAckSeq > 0) {
+            this.ensureDeliveryCurrent(ns, generation);
+            client._clientLog.debug(`message.v2.pull flushing pending auto-ack: ns=${ns}, ack_seq=${pendingAckSeq}`);
+            const ackToFlush = pendingAckSeq;
+            await this.confirmForwardP2PAck(ackToFlush);
+            if (pendingAckSeq <= ackToFlush)
                 pendingAckSeq = 0;
-            }
         }
         client._clientLog.debug(`message.v2.pull done: requested_after_seq=${afterSeq}, pages=${pageCount}, decrypted=${decrypted.length}, ns=${ns || '<none>'}`);
         return decrypted;
@@ -1881,8 +1889,10 @@ export class V2E2EECoordinator {
     }
     async confirmForwardP2PAck(upToSeq) {
         const ns = this.client._aid ? `p2p:${this.client._aid}` : '';
+        const generation = Number(this.client._v2RuntimeGeneration ?? 0);
         try {
             const result = await this.ackV2ForForward(upToSeq);
+            this.ensureDeliveryCurrent(ns, generation);
             const actualAckSeq = this.client._delivery.resolveForwardAckSeq(result, upToSeq);
             if (actualAckSeq < upToSeq) {
                 throw new E2EEError(`message.v2.ack server ACK watermark ${actualAckSeq} is below requested ${upToSeq}`);
@@ -1890,7 +1900,9 @@ export class V2E2EECoordinator {
             this.clearForwardAck(ns, upToSeq);
         }
         catch (exc) {
-            this.recordForwardAck(ns, upToSeq);
+            if (Number(this.client._v2RuntimeGeneration ?? 0) === generation
+                && this.client._rpcPipeline?.isPullNamespaceCurrent?.(ns) !== false)
+                this.recordForwardAck(ns, upToSeq);
             throw exc;
         }
     }
@@ -2334,7 +2346,6 @@ export class V2E2EECoordinator {
         const pipelineQueue = new V2PullPageQueue(V2_PULL_PIPELINE_QUEUE_CAPACITY);
         let pipelineProducer = null;
         let pipelineStopped = false;
-        const pipelineResume = { current: null };
         const startPipeline = (startAfterSeq) => {
             if (pipelineRunning || pageCount >= maxPages || limit < V2_PULL_MAX_PAGE_LIMIT || !ownsCursor)
                 return;
@@ -2344,35 +2355,36 @@ export class V2E2EECoordinator {
                 for (let produced = pageCount; produced < maxPages; produced += 1) {
                     if (pipelineStopped)
                         break;
+                    this.ensureDeliveryCurrent(ns, generation);
+                    const ackUpToSeq = pendingAckSeq;
+                    const inlineAckGeneration = ackUpToSeq > 0 ? client._delivery.captureGroupInlineAckGeneration() : null;
                     const result = await client._callRawV2Rpc('group.v2.pull', withExplicitGroupAid({
                         group_id: wireGroupId,
                         after_seq: producerAfterSeq,
                         limit,
                         ...cursorParams,
                         ...(opts?.force ? { force: true } : {}),
+                        ...(ackUpToSeq > 0 ? { ack_up_to_seq: ackUpToSeq } : {}),
                     }, groupAid), pullGateKey);
                     if (pipelineStopped)
                         break;
+                    this.ensureDeliveryCurrent(ns, generation);
                     const pageMessages = (Array.isArray(result.messages) ? result.messages : []);
-                    const completed = new Promise((resolve) => { pipelineResume.current = resolve; });
                     const enqueued = await pipelineQueue.put({
                         result,
                         afterSeq: producerAfterSeq,
-                        ackUpToSeq: 0,
-                        inlineAckGeneration: null,
+                        ackUpToSeq,
+                        inlineAckGeneration,
                         requestedVolatileCursor: '',
                         weight: pageMessages.length,
                     }, pageMessages.length);
                     if (!enqueued || pipelineStopped)
                         break;
-                    await completed;
-                    if (pipelineStopped)
-                        break;
                     const messages = deduplicateForwardPageMessages(pageMessages, producerAfterSeq);
                     const seqs = messages
                         .map((msg) => Number(msg.seq ?? 0))
                         .filter((seq) => Number.isFinite(seq) && seq > 0);
-                    const nextAfter = Math.max(contiguousPullSeq(producerAfterSeq, seqs, result.contiguous_seq), producerAfterSeq);
+                    const nextAfter = Math.max(producerAfterSeq, ...seqs);
                     const cursor = isJsonObject(result.cursor)
                         ? result.cursor : null;
                     const shouldContinue = shouldContinueForwardPage({
@@ -2398,8 +2410,6 @@ export class V2E2EECoordinator {
         };
         const stopPipeline = async () => {
             pipelineStopped = true;
-            pipelineResume.current?.();
-            pipelineResume.current = null;
             pipelineQueue.close();
             if (pipelineProducer) {
                 const producer = pipelineProducer;
@@ -2422,7 +2432,7 @@ export class V2E2EECoordinator {
                 }
                 pageCount += 1;
                 const ackUpToSeq = ownsCursor ? (pipelinePage?.ackUpToSeq ?? pendingAckSeq) : 0;
-                const inlineAckGeneration = pipelinePage?.inlineAckGeneration ?? (ackUpToSeq > 0
+                const inlineAckGeneration = pipelinePage ? pipelinePage.inlineAckGeneration : (ackUpToSeq > 0
                     ? client._delivery.captureGroupInlineAckGeneration()
                     : null);
                 client._clientLog.debug(`group.v2.pull page request: group=${gid}, page=${pageCount}, after_seq=${nextAfterSeq}, limit=${limit}, ack_up_to_seq=${ackUpToSeq}, ns=${ns}`);
@@ -2441,21 +2451,21 @@ export class V2E2EECoordinator {
                         ...(ackUpToSeq > 0 ? { ack_up_to_seq: ackUpToSeq } : {}),
                     }, groupAid), pullGateKey);
                 }
+                if (ownsCursor)
+                    this.ensureDeliveryCurrent(ns, generation);
                 if (ackUpToSeq > 0) {
                     const actualAckSeq = client._delivery.resolveGroupPullAckSeq(result, ackUpToSeq);
                     if (actualAckSeq >= ackUpToSeq) {
                         if (inlineAckGeneration !== null) {
                             client._delivery.onGroupV2PullAckResult(gid, result, ackUpToSeq, inlineAckGeneration);
                         }
-                        pendingAckSeq = 0;
+                        if (pendingAckSeq <= ackUpToSeq)
+                            pendingAckSeq = 0;
                         lastAutoAckSeq = Math.max(lastAutoAckSeq, ackUpToSeq);
                         this.clearForwardAck(ns, ackUpToSeq);
                     }
                     else {
                         client._clientLog.warn(`group.v2.pull piggyback ACK below target: group=${gid}, requested=${ackUpToSeq}, actual=${actualAckSeq}; fallback terminal ACK`);
-                        await this.confirmForwardGroupAck(gid, ackUpToSeq, groupAid);
-                        pendingAckSeq = 0;
-                        lastAutoAckSeq = Math.max(lastAutoAckSeq, ackUpToSeq);
                     }
                 }
                 const resultGroupAid = String(result.group_aid ?? result.groupAid ?? '').trim();
@@ -2483,6 +2493,13 @@ export class V2E2EECoordinator {
                     pageMaxSeq = Math.max(...seqs);
                 }
                 const pageContiguousSeq = contiguousPullSeq(pageContigBefore, seqs, result.contiguous_seq);
+                if (!pipelineRunning && ownsCursor && shouldContinueForwardPage({
+                    rawCount: messages.length, nextAfterSeq, nextAfter: pageMaxSeq, limit,
+                    hasMoreField, hasMore, serverHead,
+                    observedUpper: Math.max(client._seqTracker.getMaxSeenSeq(ns), Number(client._delivery.pendingPullUpper?.(ns) ?? 0)),
+                    pendingAckSeq: 0,
+                }))
+                    startPipeline(pageMaxSeq);
                 const deferredKeyFetches = new Map();
                 let blockedSeq = 0;
                 const pageDecryptedBefore = decrypted.length;
@@ -2688,18 +2705,8 @@ export class V2E2EECoordinator {
                         || (contigAdvanced && ackSeq > knownServerCursorSeq));
                 if (ackNeeded) {
                     this.recordForwardAck(ns, ackSeq);
-                    const nextAfter = Math.max(pageContiguousSeq, nextAfterSeq);
-                    const canContinuePage = blockedSeq <= 0 && messages.length > 0 && nextAfter > nextAfterSeq && ownsCursor;
-                    if (canContinuePage && !pipelineRunning) {
-                        pendingAckSeq = Math.max(pendingAckSeq, ackSeq);
-                        lastAutoAckSeq = Math.max(lastAutoAckSeq, ackSeq);
-                        client._clientLog.debug(`group.v2.pull queued piggyback auto-ack: group=${gid}, ns=${ns}, ack_seq=${pendingAckSeq}, raw_count=${messages.length}`);
-                    }
-                    else {
-                        client._clientLog.debug(`group.v2.pull sending terminal auto-ack: group=${gid}, ns=${ns}, ack_seq=${ackSeq}, raw_count=${messages.length}`);
-                        await this.confirmForwardGroupAck(gid, ackSeq, groupAid);
-                        lastAutoAckSeq = Math.max(lastAutoAckSeq, ackSeq);
-                    }
+                    pendingAckSeq = Math.max(pendingAckSeq, ackSeq);
+                    client._clientLog.debug(`group.v2.pull queued piggyback auto-ack: group=${gid}, ns=${ns}, ack_seq=${pendingAckSeq}, raw_count=${messages.length}`);
                 }
                 client._delivery.syncProgress(ns, {
                     rawCount: messages.length,
@@ -2709,7 +2716,7 @@ export class V2E2EECoordinator {
                     currentSeq: client._seqTracker.getContiguousSeq(ns),
                     targetSeq: serverHead,
                 });
-                const nextAfter = Math.max(pageContiguousSeq, nextAfterSeq);
+                const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
                 if (!ownsCursor)
                     break;
                 const rawCount = messages.length;
@@ -2740,10 +2747,6 @@ export class V2E2EECoordinator {
                 if (!shouldContinue)
                     break;
                 if (shouldContinueForPipeline && !pipelineRunning && limit >= V2_PULL_MAX_PAGE_LIMIT) {
-                    if (pendingAckSeq > 0) {
-                        await this.confirmForwardGroupAck(gid, pendingAckSeq, groupAid);
-                        pendingAckSeq = 0;
-                    }
                     startPipeline(nextAfter);
                 }
                 if (!pipelineRunning && pullGateKey && opts?.gateLocked && client._rpcPipeline?.yieldPullGate) {
@@ -2754,14 +2757,10 @@ export class V2E2EECoordinator {
                     await client._rpcPipeline.yieldPullGate(pullGateKey, nextKey, true);
                     pullGateKey = nextKey;
                 }
-                const tailDelayMs = v2PullTailDelayMs(rawCount, limit);
+                const tailDelayMs = pipelineRunning ? 0 : v2PullTailDelayMs(rawCount, limit);
                 if (tailDelayMs > 0)
                     await v2Sleep(tailDelayMs);
                 nextAfterSeq = nextAfter;
-                if (pipelinePage) {
-                    pipelineResume.current?.();
-                    pipelineResume.current = null;
-                }
             }
         }
         finally {
@@ -2769,11 +2768,14 @@ export class V2E2EECoordinator {
         }
         if (pageCount >= maxPages) {
             client._clientLog.warn(`group.v2.pull reached max_pages=${maxPages} group=${gid} after_seq=${nextAfterSeq}`);
-            if (pendingAckSeq > 0) {
-                client._clientLog.debug(`group.v2.pull flushing pending auto-ack after max_pages: group=${gid}, ns=${ns}, ack_seq=${pendingAckSeq}`);
-                await this.confirmForwardGroupAck(gid, pendingAckSeq, groupAid);
+        }
+        if (pendingAckSeq > 0) {
+            this.ensureDeliveryCurrent(ns, generation);
+            client._clientLog.debug(`group.v2.pull flushing pending auto-ack: group=${gid}, ns=${ns}, ack_seq=${pendingAckSeq}`);
+            const ackToFlush = pendingAckSeq;
+            await this.confirmForwardGroupAck(gid, ackToFlush, groupAid);
+            if (pendingAckSeq <= ackToFlush)
                 pendingAckSeq = 0;
-            }
         }
         client._clientLog.debug(`group.v2.pull done: group=${gid}, requested_after_seq=${afterSeq}, pages=${pageCount}, decrypted=${decrypted.length}, ns=${ns}`);
         return decrypted;
@@ -2794,8 +2796,10 @@ export class V2E2EECoordinator {
     }
     async confirmForwardGroupAck(groupId, upToSeq, groupAid) {
         const ns = `group:${String(groupId ?? '').trim()}`;
+        const generation = Number(this.client._v2RuntimeGeneration ?? 0);
         try {
             const result = await this.ackGroupV2ForForward(groupId, upToSeq, groupAid);
+            this.ensureDeliveryCurrent(ns, generation);
             const actualAckSeq = this.client._delivery.resolveForwardAckSeq(result, upToSeq);
             if (actualAckSeq < upToSeq) {
                 throw new E2EEError(`group.v2.ack server ACK watermark ${actualAckSeq} is below requested ${upToSeq}`);
@@ -2803,7 +2807,9 @@ export class V2E2EECoordinator {
             this.clearForwardAck(ns, upToSeq);
         }
         catch (exc) {
-            this.recordForwardAck(ns, upToSeq);
+            if (Number(this.client._v2RuntimeGeneration ?? 0) === generation
+                && this.client._rpcPipeline?.isPullNamespaceCurrent?.(ns) !== false)
+                this.recordForwardAck(ns, upToSeq);
             throw exc;
         }
     }