@agentunion/fastaun 0.5.18 → 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;
@@ -825,11 +825,12 @@ export class V2E2EECoordinator {
                     client._clientLog.debug(`V2 sender IK pending retry delivered: key=${key}`);
                     continue;
                 }
-                pending.delete(key);
                 const seq = Number(entry.msg.seq ?? 0);
                 if (entry.groupId) {
-                    if (client._delivery.isSelfSentGroupMessage?.(entry.msg))
+                    if (client._delivery.isSelfSentGroupMessage?.(entry.msg)) {
+                        pending.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');
@@ -837,6 +838,8 @@ export class V2E2EECoordinator {
                 else {
                     await client._publishPulledMessage('message.received', `p2p:${client._aid ?? ''}`, seq, plaintext, false, 'pending_retry');
                 }
+                if (generationIsCurrent())
+                    pending.delete(key);
                 client._clientLog.debug(`V2 sender IK pending retry delivered: key=${key}`);
             }
         }
@@ -914,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}`);
         }
@@ -1004,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) {
@@ -1017,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}`);
             }
         }
@@ -1122,6 +1137,11 @@ export class V2E2EECoordinator {
             history_error: { code: 'decrypt_failed', message: reason },
         };
     }
+    ensureDeliveryCurrent(ns, generation) {
+        if (Number(this.client._v2RuntimeGeneration ?? 0) !== generation
+            || 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);
@@ -1250,6 +1270,7 @@ export class V2E2EECoordinator {
     }
     async pullV2TailInternal(params, deferPublish = false) {
         const client = this.client;
+        const generation = Number(client._v2RuntimeGeneration ?? 0);
         if (params.window_mode !== 'tail')
             throw new ValidationError('window_mode must equal tail');
         if ('ack_up_to_seq' in params || params.force === true)
@@ -1264,6 +1285,14 @@ 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);
+        const decoded = [];
+        for (const msg of page.messages) {
+            this.ensureDeliveryCurrent(ns, generation);
+            const plaintext = await this.decodeP2PWindowMessage(msg, true, false, 'tail', deferPublish);
+            if (plaintext)
+                decoded.push(plaintext);
+        }
+        this.ensureDeliveryCurrent(ns, generation);
         if (ns) {
             client._seqTracker.commitTailWindow(ns, {
                 windowStartSeq: page.windowStart,
@@ -1273,12 +1302,7 @@ export class V2E2EECoordinator {
             });
             client._persistSeq(ns);
             await client._saveSeqTrackerState?.();
-        }
-        const decoded = [];
-        for (const msg of page.messages) {
-            const plaintext = await this.decodeP2PWindowMessage(msg, true, false, 'tail', deferPublish);
-            if (plaintext)
-                decoded.push(plaintext);
+            this.ensureDeliveryCurrent(ns, generation);
         }
         const ack = ns ? client._seqTracker.getContiguousSeq(ns) : 0;
         if (ns)
@@ -1308,6 +1332,7 @@ export class V2E2EECoordinator {
     }
     async pullV2Impl(afterSeq = 0, limit = 50, opts) {
         const client = this.client;
+        const generation = Number(client._v2RuntimeGeneration ?? 0);
         await client._ensureV2SessionReady('message.pull');
         const ns = client._aid ? `p2p:${client._aid}` : '';
         if (ns)
@@ -1348,7 +1373,7 @@ 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 startPipeline = (startAfterSeq, startVolatileCursor) => {
@@ -1361,21 +1386,26 @@ 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 enqueued = await pipelineQueue.put({
                         result,
                         afterSeq: producerAfterSeq,
-                        ackUpToSeq: 0,
-                        inlineAckGeneration: null,
+                        ackUpToSeq,
+                        inlineAckGeneration,
                         requestedVolatileCursor,
                         weight: rawPageMessages.length,
                     }, rawPageMessages.length);
@@ -1388,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({
@@ -1438,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>'}`);
@@ -1467,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();
@@ -1504,14 +1540,20 @@ 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 = null;
+                let trackerMutated = false;
                 let pageMaxSeq = nextAfterSeq;
                 if (seqs.length > 0) {
                     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;
@@ -1624,7 +1666,17 @@ export class V2E2EECoordinator {
                     let ackSeq = pageContigBefore;
                     let contigAdvanced = false;
                     try {
+                        this.ensureDeliveryCurrent(ns, generation);
+                        const window = client._seqTracker.getSyncState?.(ns);
+                        const deliveryTarget = window && commitTarget >= window.tail - 1
+                            ? Math.max(commitTarget, window.head) : commitTarget;
+                        if (deliveryTarget > pageContigBefore) {
+                            await client._drainOrderedMessages(ns, undefined, false, false, 'pull', deliveryTarget);
+                        }
+                        this.ensureDeliveryCurrent(ns, generation);
+                        pageTrackerSnapshot = client._seqTracker.snapshotNamespace?.(ns) ?? null;
                         if (commitTarget > pageContigBefore) {
+                            trackerMutated = true;
                             client._seqTracker.forceContiguousSeq(ns, commitTarget);
                             if (retentionFloor > pageContigBefore) {
                                 client._clientLog.info(`message.v2.pull retention-floor advance: ns=${ns} contiguous=${pageContigBefore} -> retention_floor_seq=${retentionFloor}`);
@@ -1640,19 +1692,21 @@ export class V2E2EECoordinator {
                         contigAdvanced = ackSeq !== pageContigBefore;
                         if (contigAdvanced) {
                             await client._commitSeqTrackerState(ns);
+                            this.ensureDeliveryCurrent(ns, generation);
                             if (pageCount === 1 && deferredServerCursor > 0)
                                 this.clearForwardCursor(ns, ackSeq);
                         }
                     }
                     catch (exc) {
-                        if (typeof client._seqTracker.restoreNamespaceSnapshot === 'function') {
-                            client._seqTracker.restoreNamespaceSnapshot(ns, pageTrackerSnapshot);
+                        if (trackerMutated && Number(client._v2RuntimeGeneration ?? 0) === generation
+                            && client._rpcPipeline?.isPullNamespaceCurrent?.(ns) !== false
+                            && typeof client._seqTracker.restoreNamespaceSnapshot === 'function') {
+                            (client._seqTracker._restoreNamespaceSnapshotPreservingPush ?? client._seqTracker.restoreNamespaceSnapshot)
+                                .call(client._seqTracker, 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, 'pull');
                     for (const fetch of deferredKeyFetches.values()) {
                         this.scheduleSenderIKFetch(fetch.fromAid, fetch.senderDeviceId, fetch.groupId);
                     }
@@ -1670,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) {
@@ -1698,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;
@@ -1730,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) {
@@ -1744,7 +1784,7 @@ 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;
@@ -1755,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;
@@ -1846,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}`);
@@ -1855,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;
         }
     }
@@ -2128,6 +2175,7 @@ export class V2E2EECoordinator {
     }
     async pullGroupV2TailInternal(params, deferPublish = false) {
         const client = this.client;
+        const generation = Number(client._v2RuntimeGeneration ?? 0);
         if (params.window_mode !== 'tail')
             throw new ValidationError('window_mode must equal tail');
         if ('ack_up_to_seq' in params || params.force === true)
@@ -2167,6 +2215,15 @@ export class V2E2EECoordinator {
         if (resultAid)
             groupAid = resultAid;
         const page = validateTailPage(result, afterSeq, limit);
+        const decoded = [];
+        for (const msg of page.messages) {
+            this.ensureDeliveryCurrent(ns, generation);
+            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);
         client._seqTracker.commitTailWindow(ns, {
             windowStartSeq: page.windowStart,
             headSeq: page.head,
@@ -2175,13 +2232,7 @@ export class V2E2EECoordinator {
         });
         client._persistSeq(ns);
         await client._saveSeqTrackerState?.();
-        const decoded = [];
-        for (const msg of page.messages) {
-            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);
         const ack = client._seqTracker.getContiguousSeq(ns);
         if (ownsCursor)
             client._delivery.syncProgress(ns, {
@@ -2229,6 +2280,7 @@ export class V2E2EECoordinator {
     }
     async pullGroupV2Impl(groupId, afterSeq = 0, limit = 50, opts) {
         const client = this.client;
+        const generation = Number(client._v2RuntimeGeneration ?? 0);
         await client._ensureV2SessionReady('group.pull');
         const gid = String(groupId ?? '').trim();
         if (!gid)
@@ -2303,21 +2355,26 @@ 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 enqueued = await pipelineQueue.put({
                         result,
                         afterSeq: producerAfterSeq,
-                        ackUpToSeq: 0,
-                        inlineAckGeneration: null,
+                        ackUpToSeq,
+                        inlineAckGeneration,
                         requestedVolatileCursor: '',
                         weight: pageMessages.length,
                     }, pageMessages.length);
@@ -2327,7 +2384,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({
@@ -2375,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}`);
@@ -2394,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();
@@ -2429,14 +2486,20 @@ 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 = null;
+                let trackerMutated = false;
                 let pageMaxSeq = nextAfterSeq;
                 if (seqs.length > 0) {
                     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;
@@ -2582,7 +2645,17 @@ export class V2E2EECoordinator {
                 let contigAdvanced = false;
                 if (ownsCursor) {
                     try {
+                        this.ensureDeliveryCurrent(ns, generation);
+                        const window = client._seqTracker.getSyncState?.(ns);
+                        const deliveryTarget = window && commitTarget >= window.tail - 1
+                            ? Math.max(commitTarget, window.head) : commitTarget;
+                        if (deliveryTarget > pageContigBefore) {
+                            await client._drainOrderedMessages(ns, undefined, false, false, 'pull', deliveryTarget);
+                        }
+                        this.ensureDeliveryCurrent(ns, generation);
+                        pageTrackerSnapshot = client._seqTracker.snapshotNamespace?.(ns) ?? null;
                         if (commitTarget > pageContigBefore) {
+                            trackerMutated = true;
                             client._seqTracker.forceContiguousSeq(ns, commitTarget);
                             if (effectiveFloor > pageContigBefore) {
                                 client._clientLog.info(`group.v2.pull floor advance: ns=${ns} contiguous=${pageContigBefore} -> effective_floor=${effectiveFloor} retention_floor=${retentionFloor} visibility_floor=${visibilityFloor}`);
@@ -2598,19 +2671,21 @@ export class V2E2EECoordinator {
                         contigAdvanced = ackSeq !== pageContigBefore;
                         if (contigAdvanced) {
                             await client._commitSeqTrackerState(ns);
+                            this.ensureDeliveryCurrent(ns, generation);
                             if (pageCount === 1 && deferredServerCursor > 0)
                                 this.clearForwardCursor(ns, ackSeq);
                         }
                     }
                     catch (exc) {
-                        if (typeof client._seqTracker.restoreNamespaceSnapshot === 'function') {
-                            client._seqTracker.restoreNamespaceSnapshot(ns, pageTrackerSnapshot);
+                        if (trackerMutated && Number(client._v2RuntimeGeneration ?? 0) === generation
+                            && client._rpcPipeline?.isPullNamespaceCurrent?.(ns) !== false
+                            && typeof client._seqTracker.restoreNamespaceSnapshot === 'function') {
+                            (client._seqTracker._restoreNamespaceSnapshotPreservingPush ?? client._seqTracker.restoreNamespaceSnapshot)
+                                .call(client._seqTracker, 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, 'pull');
                 }
                 for (const fetch of deferredKeyFetches.values()) {
                     this.scheduleSenderIKFetch(fetch.fromAid, fetch.senderDeviceId, fetch.groupId);
@@ -2630,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,
@@ -2651,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;
@@ -2682,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) {
@@ -2696,7 +2757,7 @@ 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;
@@ -2707,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;
@@ -2732,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}`);
@@ -2741,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;
         }
     }
@@ -3241,6 +3309,8 @@ export class V2E2EECoordinator {
             encrypted: true,
             e2ee,
         };
+        if (typeof plaintext.type === 'string' && plaintext.type.startsWith('aun.ownership.'))
+            result.from_aid = fromAid;
         const senderDeviceId = String(aad.from_device ?? '').trim();
         if (senderDeviceId)
             result.sender_device_id = senderDeviceId;