@agentunion/fastaun-browser 0.5.18 → 0.5.20

package/dist/client/v2-e2ee.js

@@ -113,12 +113,10 @@ function deduplicateForwardPageMessages(value, afterSeq) {
     }
     return [...bySeq.entries()].sort(([a], [b]) => a - b).map(([, row]) => row);
 }
-function contiguousPullSeq(afterSeq, seqs, proof) {
+function contiguousPullSeq(afterSeq, seqs, _proof) {
     // Forward 原始页中的缺号视为服务端永久空号；页完成后按页内最大
     // seq 推进 A，避免单页空洞阻塞后续 pull/ACK。
-    let contiguous = seqs.length > 0 ? Math.max(afterSeq, ...seqs) : afterSeq;
-    const serverProof = safeNonNegativeSeq(proof);
-    return serverProof !== null ? Math.max(contiguous, serverProof) : contiguous;
+    return seqs.length > 0 ? Math.max(afterSeq, ...seqs) : afterSeq;
 }
 function deduplicatePulledResults(messages) {
     const seen = new Set();
@@ -138,7 +136,7 @@ function shouldContinueForwardPage({ rawCount, nextAfterSeq, nextAfter, limit, h
     // 无新 seq 或游标未前进时必须停止，避免错误元数据造成循环。
     if (rawCount <= 0 || nextAfter <= nextAfterSeq)
         return false;
-    if (hasMore || serverHead > nextAfter || pendingAckSeq > 0 || observedUpper > nextAfter)
+    if (hasMore || serverHead > nextAfter || observedUpper > nextAfter)
         return true;
     // 仅旧服务缺失 has_more 时，以满页保留兼容续拉。
     return !hasMoreField && limit > 0 && rawCount >= limit;
@@ -1000,11 +998,12 @@ export class V2E2EECoordinator {
                     client._clientLog.debug(`V2 sender IK pending retry delivered: key=${key}`);
                     continue;
                 }
-                client._v2SenderIKPending.delete(key);
                 const seq = Number(entry.msg.seq ?? 0);
                 if (entry.groupId) {
-                    if (client._delivery.isSelfSentGroupMessage?.(entry.msg))
+                    if (client._delivery.isSelfSentGroupMessage?.(entry.msg)) {
+                        client._v2SenderIKPending.delete(key);
                         continue;
+                    }
                     plaintext = normalizeGroupMentionMode(plaintext, entry.msg, entry.msg.envelope_json);
                     plaintext.group_id = entry.groupId;
                     await client._publishPulledMessage('group.message_created', `group:${entry.groupId}`, seq, plaintext, false, 'pending_retry');
@@ -1012,6 +1011,7 @@ export class V2E2EECoordinator {
                 else {
                     await client._publishPulledMessage('message.received', `p2p:${client._aid ?? ''}`, seq, plaintext, false, 'pending_retry');
                 }
+                client._v2SenderIKPending.delete(key);
                 client._clientLog.debug(`V2 sender IK pending retry delivered: key=${key}`);
             }
         }
@@ -1110,6 +1110,12 @@ export class V2E2EECoordinator {
             history_error: { code: 'decrypt_failed', message: reason },
         };
     }
+    ensureDeliveryCurrent(ns, generation, inlineGeneration) {
+        if (Number(this.client._v2RuntimeGeneration ?? 0) !== generation
+            || (inlineGeneration !== undefined && !this.client._delivery.isInlineGenerationCurrent(inlineGeneration))
+            || this.client._rpcPipeline?.isPullNamespaceCurrent?.(ns) === false)
+            throw new StateError('pull invalidated');
+    }
     async decodeP2PWindowMessage(msg, publish, history, source, orderedPublish = false) {
         const client = this.client;
         const seq = strictWindowSeq(msg.seq, 'messages[].seq', true);
@@ -1257,6 +1263,8 @@ export class V2E2EECoordinator {
     }
     async pullV2TailInternal(params, deferPublish = false) {
         const client = this.client;
+        const generation = Number(client._v2RuntimeGeneration ?? 0);
+        const inlineGeneration = client._delivery.captureInlineGeneration?.();
         if (params.window_mode !== 'tail')
             throw new ValidationError('window_mode must equal tail');
         if ('ack_up_to_seq' in params || params.force === true)
@@ -1271,19 +1279,27 @@ export class V2E2EECoordinator {
         }, `${ns}|tail|after=${afterSeq}|limit=${limit}`);
         const result = await client._callRawV2Rpc('message.v2.pull', { window_mode: 'tail', after_seq: afterSeq, limit, _rpc_foreground: true }, pullGateKey);
         const page = validateTailPage(result, afterSeq, limit);
-        if (ns) {
-            client._seqTracker.commitTailWindow(ns, {
-                windowStartSeq: page.windowStart, headSeq: page.head, coveredThroughSeq: page.head, pageLimit: limit,
-            });
-            client._persistSeq(ns);
-            await client._saveSeqTrackerState?.();
-        }
         const decoded = [];
         for (const msg of page.messages) {
+            this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
             const plaintext = await this.decodeP2PWindowMessage(msg, true, false, 'tail', deferPublish);
             if (plaintext)
                 decoded.push(plaintext);
         }
+        this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+        if (ns) {
+            const proof = {
+                windowStartSeq: page.windowStart, headSeq: page.head, coveredThroughSeq: page.head, pageLimit: limit,
+            };
+            if (deferPublish)
+                client._delivery.deferTailWindow(ns, proof);
+            else {
+                client._seqTracker.commitTailWindow(ns, proof);
+                client._persistSeq(ns);
+                await client._saveSeqTrackerState?.();
+                this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+            }
+        }
         const ack = ns ? client._seqTracker.getContiguousSeq(ns) : 0;
         if (ns)
             client._delivery.onPullPage?.(ns, decoded.length, result.has_more === true, page.head, typeof result.remaining === 'number' && Number.isSafeInteger(result.remaining) && result.remaining >= 0 ? result.remaining : null, page.messages.length, ack, page.head);
@@ -1320,6 +1336,8 @@ export class V2E2EECoordinator {
     }
     async pullV2Impl(afterSeq = 0, limit = 50, opts) {
         const client = this.client;
+        const generation = Number(client._v2RuntimeGeneration ?? 0);
+        const inlineGeneration = client._delivery.captureInlineGeneration?.();
         await client._ensureV2SessionReady('message.pull');
         const ns = client._aid ? `p2p:${client._aid}` : '';
         let volatileCursor = String(opts?.afterVolatileCursor ?? client._delivery.volatilePullCursor() ?? '').trim();
@@ -1359,10 +1377,11 @@ export class V2E2EECoordinator {
         let pageCount = 0;
         let lastAutoAckSeq = 0;
         let pendingAckSeq = deferredForwardAck;
+        let committedAckSeq = ns ? client._seqTracker.getContiguousSeq(ns) : 0;
         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 startPipeline = (startAfterSeq, startVolatileCursor) => {
@@ -1375,21 +1394,27 @@ export class V2E2EECoordinator {
                 for (let produced = pageCount; produced < maxPages; produced += 1) {
                     if (pipelineStopped)
                         break;
+                    this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
                     const requestedVolatileCursor = producerVolatileCursor;
+                    const ackUpToSeq = Math.min(pendingAckSeq, committedAckSeq);
+                    const inlineAckGeneration = ackUpToSeq > 0
+                        ? client._delivery?.pendingP2PInlineAckGeneration?.(ns) ?? null : null;
                     const result = await client._callRawV2Rpc('message.v2.pull', {
                         after_seq: producerAfterSeq,
                         limit,
                         ...(producerVolatileCursor ? { after_volatile_cursor: producerVolatileCursor } : {}),
                         ...(opts?.force ? { force: true } : {}),
+                        ...(ackUpToSeq > 0 ? { ack_up_to_seq: ackUpToSeq } : {}),
                     }, pullGateKey);
                     if (pipelineStopped)
                         break;
+                    this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
                     const rawPageMessages = (Array.isArray(result?.messages) ? result.messages : []);
                     const enqueued = await pipelineQueue.put({
                         result,
                         afterSeq: producerAfterSeq,
-                        ackUpToSeq: 0,
-                        inlineAckGeneration: null,
+                        ackUpToSeq,
+                        inlineAckGeneration,
                         requestedVolatileCursor,
                         weight: rawPageMessages.length,
                     }, rawPageMessages.length);
@@ -1480,21 +1505,24 @@ export class V2E2EECoordinator {
                         continue;
                     }
                 }
+                this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+                if (!opts?.force)
+                    client._delivery.observeBackgroundPullResponse?.(ns, nextAfterSeq, result, limit);
                 if (ackUpToSeq > 0) {
                     const actualAckSeq = client._delivery?.resolveP2PPullAckSeq?.(result, ackUpToSeq) ?? 0;
                     if (actualAckSeq >= ackUpToSeq) {
                         if (pendingInlineGeneration !== null) {
                             client._delivery?.completePendingP2PInlineAckUpTo?.(ns, actualAckSeq, pendingInlineGeneration);
                         }
-                        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, pendingInlineGeneration ?? undefined);
-                        pendingAckSeq = 0;
-                        lastAutoAckSeq = Math.max(lastAutoAckSeq, ackUpToSeq);
+                        pendingAckSeq = Math.max(pendingAckSeq, ackUpToSeq);
+                        this.recordForwardAck(ns, ackUpToSeq);
                     }
                 }
                 const pageMessages = (Array.isArray(result?.messages) ? result.messages : []);
@@ -1514,11 +1542,16 @@ export class V2E2EECoordinator {
                     .map((msg) => Number(msg.seq ?? 0))
                     .filter((seq) => Number.isFinite(seq) && seq > 0);
                 const pageContigBefore = ns ? client._seqTracker.getContiguousSeq(ns) : 0;
-                const pageTrackerSnapshot = ns && typeof client._seqTracker.snapshotNamespace === 'function'
-                    ? client._seqTracker.snapshotNamespace(ns)
-                    : null;
+                let pageTrackerSnapshot;
                 const pageMaxSeq = seqs.length > 0 ? Math.max(...seqs) : nextAfterSeq;
                 const pageContiguousSeq = contiguousPullSeq(pageContigBefore, seqs, result.contiguous_seq);
+                if (!pipelineRunning && volatileMessages.length === 0 && shouldContinueForwardPage({
+                    rawCount: messages.length, nextAfterSeq, nextAfter: pageMaxSeq, limit,
+                    hasMoreField, hasMore, serverHead, pendingAckSeq: 0,
+                    observedUpper: typeof client._seqTracker.getMaxSeenSeq === 'function'
+                        ? client._seqTracker.getMaxSeenSeq(ns) : pageMaxSeq,
+                }))
+                    startPipeline(pageMaxSeq, volatileCursor);
                 const deferredKeyFetches = new Map();
                 let blockedSeq = 0;
                 const pageDecryptedBefore = decrypted.length;
@@ -1622,10 +1655,18 @@ export class V2E2EECoordinator {
                 const serverAckSeq = parsedServerAckSeq ?? 0;
                 const retentionFloor = Math.max(0, Number(result.retention_floor_seq ?? 0));
                 if (ns) {
-                    const commitTarget = Math.max(pageContigBefore, Number.isFinite(retentionFloor) ? retentionFloor : 0, pageCount === 1 ? deferredServerCursor : 0, serverAckSeq, blockedSeq > 0 ? blockedSeq - 1 : pageContiguousSeq);
+                    let commitTarget = Math.max(pageContigBefore, Number.isFinite(retentionFloor) ? retentionFloor : 0, pageCount === 1 ? deferredServerCursor : 0, serverAckSeq, blockedSeq > 0 ? blockedSeq - 1 : pageContiguousSeq);
+                    commitTarget = client._delivery.pendingTailDeliveryThrough?.(ns, commitTarget) ?? commitTarget;
                     let ackSeq = pageContigBefore;
                     let contigAdvanced = false;
                     try {
+                        this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+                        const state = client._seqTracker.getSyncState?.(ns);
+                        const deliveryThrough = client._delivery.pendingTailDeliveryThrough?.(ns, state && commitTarget >= state.tail - 1 ? Math.max(commitTarget, state.head) : commitTarget) ?? (state && commitTarget >= state.tail - 1 ? Math.max(commitTarget, state.head) : commitTarget);
+                        await client._drainOrderedMessages(ns, undefined, false, false, deliveryThrough);
+                        this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+                        pageTrackerSnapshot = client._seqTracker.snapshotNamespace?.(ns);
+                        client._delivery.commitPendingTailWindow?.(ns, commitTarget);
                         if (commitTarget > pageContigBefore) {
                             client._seqTracker.forceContiguousSeq(ns, commitTarget);
                             if (retentionFloor > pageContigBefore) {
@@ -1642,19 +1683,24 @@ export class V2E2EECoordinator {
                         contigAdvanced = ackSeq !== pageContigBefore;
                         if (contigAdvanced) {
                             await client._commitSeqTrackerState(ns);
+                            this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
                             if (pageCount === 1 && deferredServerCursor > 0)
                                 this.clearForwardCursor(ns, ackSeq);
                         }
+                        client._delivery.completePendingTailWindow?.(ns);
+                        committedAckSeq = ackSeq;
                     }
                     catch (exc) {
-                        if (typeof client._seqTracker.restoreNamespaceSnapshot === 'function') {
-                            client._seqTracker.restoreNamespaceSnapshot(ns, pageTrackerSnapshot);
+                        if (Number(client._v2RuntimeGeneration ?? 0) === generation
+                            && (inlineGeneration === undefined || client._delivery.isInlineGenerationCurrent(inlineGeneration))
+                            && client._rpcPipeline?.isPullNamespaceCurrent?.(ns) !== false
+                            && pageTrackerSnapshot !== undefined
+                            && typeof client._seqTracker.restoreNamespaceSnapshot === 'function') {
+                            client._seqTracker._restoreNamespaceSnapshotPreservingPush(ns, pageTrackerSnapshot);
                         }
                         client._clientLog.error?.(`message.v2.pull Forward commit rolled back: ns=${ns} target=${commitTarget} error=${formatE2EEError(exc)}`);
                         throw exc;
                     }
-                    if (contigAdvanced)
-                        await client._drainOrderedMessages(ns, undefined, false, false);
                     for (const fetch of deferredKeyFetches.values()) {
                         this.scheduleSenderIKFetch(fetch.fromAid, fetch.senderDeviceId, fetch.groupId);
                     }
@@ -1672,16 +1718,7 @@ 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);
-                        }
-                        else {
-                            await this.confirmForwardP2PAck(ackSeq);
-                            lastAutoAckSeq = Math.max(lastAutoAckSeq, ackSeq);
-                        }
+                        pendingAckSeq = Math.max(pendingAckSeq, ackSeq);
                     }
                 }
                 if (ns)
@@ -1721,11 +1758,14 @@ export class V2E2EECoordinator {
                 });
                 if (!shouldContinue)
                     break;
+                if (pipelinePage && volatileMessages.length > 0) {
+                    await stopPipeline();
+                    this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+                    pipelineQueue = new V2PullPageQueue(V2_PULL_PIPELINE_QUEUE_CAPACITY);
+                    pipelineStopped = false;
+                    pipelineError = null;
+                }
                 if (shouldContinueForPipeline && !volatileAdvanced && !pipelineRunning && limit >= V2_PULL_MAX_PAGE_LIMIT) {
-                    if (pendingAckSeq > 0) {
-                        await this.confirmForwardP2PAck(pendingAckSeq);
-                        pendingAckSeq = 0;
-                    }
                     startPipeline(nextAfter, volatileCursor);
                 }
                 if (!pipelineRunning && pullGateKey && opts?.gateLocked && client._rpcPipeline?.yieldPullGate) {
@@ -1736,7 +1776,7 @@ export class V2E2EECoordinator {
                     pullGateKey = nextKey;
                 }
                 const tailDelayMs = v2PullTailDelayMs(rawCount, limit);
-                if (tailDelayMs > 0)
+                if (!pipelineRunning && tailDelayMs > 0)
                     await v2Sleep(tailDelayMs);
                 nextAfterSeq = nextAfter;
             }
@@ -1746,10 +1786,11 @@ export class V2E2EECoordinator {
         }
         if (pageCount >= maxPages) {
             client._clientLog.warn(`message.v2.pull reached max_pages=${maxPages} after_seq=${nextAfterSeq}`);
-            if (pendingAckSeq > 0) {
-                await this.confirmForwardP2PAck(pendingAckSeq);
-                pendingAckSeq = 0;
-            }
+        }
+        if (pendingAckSeq > 0) {
+            this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+            await this.confirmForwardP2PAck(pendingAckSeq);
+            pendingAckSeq = 0;
         }
         client._delivery.onPullWorkSettled?.();
         return deduplicatePulledResults(decrypted);
@@ -1823,8 +1864,11 @@ export class V2E2EECoordinator {
     }
     async confirmForwardP2PAck(upToSeq, inlineGeneration) {
         const ns = this.client._aid ? `p2p:${this.client._aid}` : '';
+        const generation = Number(this.client._v2RuntimeGeneration ?? 0);
+        const deliveryGeneration = this.client._delivery.captureInlineGeneration?.();
         try {
             const result = await this.ackV2ForForward(upToSeq, inlineGeneration);
+            this.ensureDeliveryCurrent(ns, generation, deliveryGeneration);
             const actualAckSeq = this.client._delivery?.resolveForwardAckSeq?.(result, upToSeq) ?? 0;
             if (actualAckSeq < upToSeq) {
                 throw new E2EEError(`message.v2.ack server ACK watermark ${actualAckSeq} is below requested ${upToSeq}`);
@@ -1832,7 +1876,10 @@ export class V2E2EECoordinator {
             this.clearForwardAck(ns, upToSeq);
         }
         catch (exc) {
-            this.recordForwardAck(ns, upToSeq);
+            if (Number(this.client._v2RuntimeGeneration ?? 0) === generation
+                && (deliveryGeneration === undefined || this.client._delivery.isInlineGenerationCurrent(deliveryGeneration))
+                && this.client._rpcPipeline?.isPullNamespaceCurrent?.(ns) !== false)
+                this.recordForwardAck(ns, upToSeq);
             throw exc;
         }
     }
@@ -1965,6 +2012,8 @@ export class V2E2EECoordinator {
     }
     async pullGroupV2TailInternal(params, deferPublish = false) {
         const client = this.client;
+        const generation = Number(client._v2RuntimeGeneration ?? 0);
+        const inlineGeneration = client._delivery.captureInlineGeneration?.();
         if (params.window_mode !== 'tail')
             throw new ValidationError('window_mode must equal tail');
         if ('ack_up_to_seq' in params || params.force === true)
@@ -2000,18 +2049,26 @@ export class V2E2EECoordinator {
         if (resultAid)
             groupAid = resultAid;
         const page = validateTailPage(result, afterSeq, limit);
-        client._seqTracker.commitTailWindow(ns, {
-            windowStartSeq: page.windowStart, headSeq: page.head, coveredThroughSeq: page.head, pageLimit: limit,
-        });
-        client._persistSeq(ns);
-        await client._saveSeqTrackerState?.();
         const decoded = [];
         for (const msg of page.messages) {
+            this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
             client._logMessageDebug?.('tail-raw', 'group.v2.pull', 'group.message_created', msg);
             const plaintext = await this.decodeGroupWindowMessage(msg, groupId, groupAid, true, false, 'tail', deferPublish);
             if (plaintext)
                 decoded.push(plaintext);
         }
+        this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+        const proof = {
+            windowStartSeq: page.windowStart, headSeq: page.head, coveredThroughSeq: page.head, pageLimit: limit,
+        };
+        if (deferPublish)
+            client._delivery.deferTailWindow(ns, proof);
+        else {
+            client._seqTracker.commitTailWindow(ns, proof);
+            client._persistSeq(ns);
+            await client._saveSeqTrackerState?.();
+            this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+        }
         const ack = client._seqTracker.getContiguousSeq(ns);
         if (ownsCursor)
             client._delivery.onPullPage?.(ns, decoded.length, result.has_more === true, page.head, typeof result.remaining === 'number' && Number.isSafeInteger(result.remaining) && result.remaining >= 0 ? result.remaining : null, page.messages.length, ack, page.head);
@@ -2056,6 +2113,8 @@ export class V2E2EECoordinator {
     }
     async pullGroupV2Impl(groupId, afterSeq = 0, limit = 50, opts) {
         const client = this.client;
+        const generation = Number(client._v2RuntimeGeneration ?? 0);
+        const inlineGeneration = client._delivery.captureInlineGeneration?.();
         await client._ensureV2SessionReady('group.pull');
         const gid = String(groupId ?? '').trim();
         if (!gid)
@@ -2111,6 +2170,7 @@ export class V2E2EECoordinator {
         let pageCount = 0;
         let lastAutoAckSeq = 0;
         let pendingAckSeq = deferredForwardAck;
+        let committedAckSeq = ownsCursor ? client._seqTracker.getContiguousSeq(ns) : 0;
         const maxPages = Math.max(1, Math.min(100, Math.trunc(Number(opts?.maxPages ?? 100) || 100)));
         let pipelineRunning = false;
         let pipelineError = null;
@@ -2126,21 +2186,27 @@ export class V2E2EECoordinator {
                 for (let produced = pageCount; produced < maxPages; produced += 1) {
                     if (pipelineStopped)
                         break;
+                    this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+                    const ackUpToSeq = Math.min(pendingAckSeq, committedAckSeq);
+                    const inlineAckGeneration = ackUpToSeq > 0
+                        ? client._delivery?.pendingGroupInlineAckGeneration?.(ns) ?? null : 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, inlineGeneration);
                     const pageMessages = (Array.isArray(result?.messages) ? result.messages : []);
                     const enqueued = await pipelineQueue.put({
                         result,
                         afterSeq: producerAfterSeq,
-                        ackUpToSeq: 0,
-                        inlineAckGeneration: null,
+                        ackUpToSeq,
+                        inlineAckGeneration,
                         requestedVolatileCursor: '',
                         weight: pageMessages.length,
                     }, pageMessages.length);
@@ -2214,21 +2280,24 @@ export class V2E2EECoordinator {
                         ...(ackUpToSeq > 0 ? { ack_up_to_seq: ackUpToSeq } : {}),
                     }, groupAid), pullGateKey);
                 }
+                this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+                if (ownsCursor && !opts?.force)
+                    client._delivery.observeBackgroundPullResponse?.(ns, nextAfterSeq, result, limit);
                 if (ackUpToSeq > 0) {
                     const actualAckSeq = client._delivery?.resolveGroupPullAckSeq?.(result, ackUpToSeq) ?? 0;
                     if (actualAckSeq >= ackUpToSeq) {
                         if (pendingInlineGeneration !== null) {
                             client._delivery?.completePendingGroupInlineAckUpTo?.(ns, actualAckSeq, pendingInlineGeneration);
                         }
-                        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);
+                        pendingAckSeq = Math.max(pendingAckSeq, ackUpToSeq);
+                        this.recordForwardAck(ns, ackUpToSeq);
                     }
                 }
                 const resultGroupAid = String(result.group_aid ?? result.groupAid ?? '').trim();
@@ -2245,11 +2314,16 @@ export class V2E2EECoordinator {
                     .map((msg) => Number(msg.seq ?? 0))
                     .filter((seq) => Number.isFinite(seq) && seq > 0);
                 const pageContigBefore = client._seqTracker.getContiguousSeq(ns);
-                const pageTrackerSnapshot = typeof client._seqTracker.snapshotNamespace === 'function'
-                    ? client._seqTracker.snapshotNamespace(ns)
-                    : null;
+                let pageTrackerSnapshot;
                 const pageMaxSeq = seqs.length > 0 ? Math.max(...seqs) : nextAfterSeq;
                 const pageContiguousSeq = contiguousPullSeq(pageContigBefore, seqs, result.contiguous_seq);
+                if (!pipelineRunning && shouldContinueForwardPage({
+                    rawCount: messages.length, nextAfterSeq, nextAfter: pageMaxSeq, limit,
+                    hasMoreField, hasMore, serverHead, pendingAckSeq: 0,
+                    observedUpper: typeof client._seqTracker.getMaxSeenSeq === 'function'
+                        ? client._seqTracker.getMaxSeenSeq(ns) : pageMaxSeq,
+                }))
+                    startPipeline(pageMaxSeq);
                 const deferredKeyFetches = new Map();
                 let blockedSeq = 0;
                 const pageDecryptedBefore = decrypted.length;
@@ -2383,11 +2457,19 @@ export class V2E2EECoordinator {
                 const retentionFloor = Math.max(Number(result.retention_floor_message_seq ?? result.retention_floor_seq ?? 0), Number(cursor?.retention_floor_seq ?? 0));
                 const visibilityFloor = Math.max(0, Math.max(0, Number(result.earliest_available_message_seq ?? 1) - 1), Number(cursor?.join_seq ?? 0));
                 const effectiveFloor = Math.max(retentionFloor, visibilityFloor);
-                const commitTarget = Math.max(pageContigBefore, Number.isFinite(effectiveFloor) ? effectiveFloor : 0, ownsCursor && pageCount === 1 ? deferredServerCursor : 0, cursorCurrentSeq, blockedSeq > 0 ? blockedSeq - 1 : pageContiguousSeq);
+                let commitTarget = Math.max(pageContigBefore, Number.isFinite(effectiveFloor) ? effectiveFloor : 0, ownsCursor && pageCount === 1 ? deferredServerCursor : 0, cursorCurrentSeq, blockedSeq > 0 ? blockedSeq - 1 : pageContiguousSeq);
+                commitTarget = client._delivery.pendingTailDeliveryThrough?.(ns, commitTarget) ?? commitTarget;
                 let ackSeq = pageContigBefore;
                 let contigAdvanced = false;
                 if (ownsCursor) {
                     try {
+                        this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+                        const state = client._seqTracker.getSyncState?.(ns);
+                        const deliveryThrough = client._delivery.pendingTailDeliveryThrough?.(ns, state && commitTarget >= state.tail - 1 ? Math.max(commitTarget, state.head) : commitTarget) ?? (state && commitTarget >= state.tail - 1 ? Math.max(commitTarget, state.head) : commitTarget);
+                        await client._drainOrderedMessages(ns, undefined, false, false, deliveryThrough);
+                        this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+                        pageTrackerSnapshot = client._seqTracker.snapshotNamespace?.(ns);
+                        client._delivery.commitPendingTailWindow?.(ns, commitTarget);
                         if (commitTarget > pageContigBefore) {
                             client._seqTracker.forceContiguousSeq(ns, commitTarget);
                             if (effectiveFloor > pageContigBefore) {
@@ -2404,19 +2486,24 @@ export class V2E2EECoordinator {
                         contigAdvanced = ackSeq !== pageContigBefore;
                         if (contigAdvanced) {
                             await client._commitSeqTrackerState(ns);
+                            this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
                             if (pageCount === 1 && deferredServerCursor > 0)
                                 this.clearForwardCursor(ns, ackSeq);
                         }
+                        client._delivery.completePendingTailWindow?.(ns);
+                        committedAckSeq = ackSeq;
                     }
                     catch (exc) {
-                        if (typeof client._seqTracker.restoreNamespaceSnapshot === 'function') {
-                            client._seqTracker.restoreNamespaceSnapshot(ns, pageTrackerSnapshot);
+                        if (Number(client._v2RuntimeGeneration ?? 0) === generation
+                            && (inlineGeneration === undefined || client._delivery.isInlineGenerationCurrent(inlineGeneration))
+                            && client._rpcPipeline?.isPullNamespaceCurrent?.(ns) !== false
+                            && pageTrackerSnapshot !== undefined
+                            && typeof client._seqTracker.restoreNamespaceSnapshot === 'function') {
+                            client._seqTracker._restoreNamespaceSnapshotPreservingPush(ns, pageTrackerSnapshot);
                         }
                         client._clientLog.error?.(`group.v2.pull Forward commit rolled back: group=${gid} ns=${ns} target=${commitTarget} error=${formatE2EEError(exc)}`);
                         throw exc;
                     }
-                    if (contigAdvanced)
-                        await client._drainOrderedMessages(ns, undefined, false, false);
                 }
                 for (const fetch of deferredKeyFetches.values()) {
                     this.scheduleSenderIKFetch(fetch.fromAid, fetch.senderDeviceId, fetch.groupId);
@@ -2437,16 +2524,7 @@ 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);
-                    }
-                    else {
-                        await this.confirmForwardGroupAck(gid, ackSeq, groupAid);
-                        lastAutoAckSeq = Math.max(lastAutoAckSeq, ackSeq);
-                    }
+                    pendingAckSeq = Math.max(pendingAckSeq, ackSeq);
                 }
                 const nextAfter = Math.max(pageContiguousSeq, nextAfterSeq);
                 if (!ownsCursor)
@@ -2481,10 +2559,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) {
@@ -2496,7 +2570,7 @@ export class V2E2EECoordinator {
                     pullGateKey = nextKey;
                 }
                 const tailDelayMs = v2PullTailDelayMs(rawCount, limit);
-                if (tailDelayMs > 0)
+                if (!pipelineRunning && tailDelayMs > 0)
                     await v2Sleep(tailDelayMs);
                 nextAfterSeq = nextAfter;
             }
@@ -2506,18 +2580,22 @@ export class V2E2EECoordinator {
         }
         if (pageCount >= maxPages) {
             client._clientLog.warn(`group.v2.pull reached max_pages=${maxPages} group=${gid} after_seq=${nextAfterSeq}`);
-            if (pendingAckSeq > 0) {
-                await this.confirmForwardGroupAck(gid, pendingAckSeq, groupAid);
-                pendingAckSeq = 0;
-            }
+        }
+        if (pendingAckSeq > 0) {
+            this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+            await this.confirmForwardGroupAck(gid, pendingAckSeq, groupAid);
+            pendingAckSeq = 0;
         }
         client._delivery.onPullWorkSettled?.();
         return deduplicatePulledResults(decrypted);
     }
     async confirmForwardGroupAck(groupId, upToSeq, groupAid) {
         const ns = `group:${String(groupId ?? '').trim()}`;
+        const generation = Number(this.client._v2RuntimeGeneration ?? 0);
+        const deliveryGeneration = this.client._delivery.captureInlineGeneration?.();
         try {
             const result = await this.ackGroupV2ForForward(groupId, upToSeq, groupAid);
+            this.ensureDeliveryCurrent(ns, generation, deliveryGeneration);
             const actualAckSeq = this.client._delivery?.resolveForwardAckSeq?.(result, upToSeq) ?? 0;
             if (actualAckSeq < upToSeq) {
                 throw new E2EEError(`group.v2.ack server ACK watermark ${actualAckSeq} is below requested ${upToSeq}`);
@@ -2525,7 +2603,10 @@ export class V2E2EECoordinator {
             this.clearForwardAck(ns, upToSeq);
         }
         catch (exc) {
-            this.recordForwardAck(ns, upToSeq);
+            if (Number(this.client._v2RuntimeGeneration ?? 0) === generation
+                && (deliveryGeneration === undefined || this.client._delivery.isInlineGenerationCurrent(deliveryGeneration))
+                && this.client._rpcPipeline?.isPullNamespaceCurrent?.(ns) !== false)
+                this.recordForwardAck(ns, upToSeq);
             throw exc;
         }
     }
@@ -3108,11 +3189,19 @@ export class V2E2EECoordinator {
                 });
             }
         }
+        const targetDeviceId = String(opts.deviceId ?? '').trim();
         if (peerDevices.length === 0) {
+            if (targetDeviceId && useCache) {
+                this.deleteBootstrapCacheEntry(to);
+                return this.buildV2P2PEnvelope({ ...opts, useCache: false });
+            }
             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)) {
+            if (useCache) {
+                this.deleteBootstrapCacheEntry(to);
+                return this.buildV2P2PEnvelope({ ...opts, useCache: false });
+            }
             throw new E2EEError(`V2 bootstrap: target device ${targetDeviceId} not found for ${to}`);
         }
         let targetSet = useCache ? this.getTargetSetCache(to) : undefined;
@@ -3203,6 +3292,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}`);
             }
         }