@agentunion/fastaun 0.5.19 → 0.5.21

package/dist/client/v2-e2ee.js

@@ -1,4 +1,5 @@
 import * as crypto from 'node:crypto';
+import { _INTERNAL_MESSAGE_FLOW_LIMITS } from '../config.js';
 import { E2EEError, StateError, ValidationError } from '../errors.js';
 import { decryptMessage, encryptGroupMessage, encryptP2PMessage, } from '../v2/e2ee/index.js';
 import { V2Session } from '../v2/session/index.js';
@@ -113,13 +114,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;
@@ -349,6 +350,13 @@ export class V2E2EECoordinator {
     get client() {
         return this.runtime.client;
     }
+    async withApplicationPage(ns, source, operation, reservation, handlers) {
+        const delivery = this.client._delivery;
+        return typeof delivery.runApplicationPage === 'function'
+            ? await (handlers ? delivery.runApplicationPage(ns, source, operation, reservation, handlers)
+                : reservation ? delivery.runApplicationPage(ns, source, operation, reservation) : delivery.runApplicationPage(ns, source, operation))
+            : await operation();
+    }
     resetForwardCursorState() {
         this.pendingForwardCursors.clear();
         this.pendingForwardAcks.clear();
@@ -621,11 +629,13 @@ export class V2E2EECoordinator {
             return null;
         }
     }
-    pendingSenderIKMessageKey(msg, groupId) {
+    pendingSenderIKMessageKey(msg, groupId, fromAid = '') {
         const client = this.client;
         const messageId = String(msg.message_id ?? '').trim();
         const seq = String(msg.seq ?? '').trim();
-        const prefix = groupId ? `group:${groupId}` : `p2p:${client._aid ?? ''}`;
+        const prefix = groupId ? `group:${groupId}` : client._p2pPeerPullEnabled
+            ? client._delivery.peerNamespace(fromAid || String(msg.sender_aid ?? msg.from_aid ?? msg.from ?? ''))
+            : `p2p:${client._aid ?? ''}`;
         return `${prefix}:${messageId || seq || Math.random().toString(36).slice(2)}`;
     }
     pendingSenderIKFetchKey(fromAid, senderDeviceId, groupId) {
@@ -717,7 +727,7 @@ export class V2E2EECoordinator {
             return;
         const senderDeviceId = String(args.senderDeviceId ?? '');
         const groupId = String(args.groupId ?? '').trim();
-        const messageKey = this.pendingSenderIKMessageKey(args.msg, groupId);
+        const messageKey = this.pendingSenderIKMessageKey(args.msg, groupId, fromAid);
         client._v2SenderIKPending.set(messageKey, {
             msg: { ...args.msg },
             fromAid,
@@ -833,10 +843,19 @@ export class V2E2EECoordinator {
                     }
                     plaintext = normalizeGroupMentionMode(plaintext, entry.msg, entry.msg.envelope_json);
                     plaintext.group_id = entry.groupId;
+                    plaintext.need_render = typeof entry.msg.need_render === 'boolean' ? entry.msg.need_render : plaintext.need_render !== false;
                     await client._publishPulledMessage('group.message_created', `group:${entry.groupId}`, seq, plaintext, false, 'pending_retry');
                 }
                 else {
-                    await client._publishPulledMessage('message.received', `p2p:${client._aid ?? ''}`, seq, plaintext, false, 'pending_retry');
+                    const ns = client._p2pPeerPullEnabled
+                        ? await client._delivery.initializePeer(entry.fromAid) : `p2p:${client._aid ?? ''}`;
+                    if (!generationIsCurrent())
+                        return;
+                    plaintext.sender_aid = entry.fromAid;
+                    plaintext.need_render = typeof entry.msg.need_render === 'boolean' ? entry.msg.need_render : plaintext.need_render !== false;
+                    await client._publishPulledMessage('message.received', ns, seq, plaintext, false, 'pending_retry');
+                    if (client._p2pPeerPullEnabled && generationIsCurrent())
+                        client._delivery.schedulePeerRecovery(entry.fromAid, seq);
                 }
                 if (generationIsCurrent())
                     pending.delete(key);
@@ -852,6 +871,8 @@ export class V2E2EECoordinator {
     }
     async publishPendingV2VolatileMessage(rawMessage, plaintext, source) {
         const delivery = this.client._delivery;
+        const generation = Number(this.client._v2RuntimeGeneration ?? 0);
+        const context = JSON.stringify([this.client._aid, this.client._deviceId, this.client._slotId]);
         const claim = delivery.beginVolatileDelivery(rawMessage);
         if (claim === 'inflight')
             return;
@@ -865,8 +886,14 @@ export class V2E2EECoordinator {
                 if (Object.prototype.hasOwnProperty.call(rawMessage, key))
                     publicMessage[key] = rawMessage[key];
             }
+            publicMessage.need_render = typeof rawMessage.need_render === 'boolean' ? rawMessage.need_render : plaintext.need_render !== false;
             const appEvent = delivery.p2pAppEventForMessage(publicMessage);
             await this.client._publishAppEvent(appEvent.event, appEvent.payload, source);
+            if (this.client._p2pPeerPullEnabled) {
+                if (context !== JSON.stringify([this.client._aid, this.client._deviceId, this.client._slotId]))
+                    throw new StateError('delivery invalidated');
+                this.ensureDeliveryCurrent(delivery.peerNamespace(String(rawMessage.sender_aid ?? rawMessage.from_aid ?? rawMessage.from ?? '')), generation);
+            }
             delivery.markVolatileSeen(rawMessage);
         }
         finally {
@@ -917,10 +944,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 +1038,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 +1055,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}`);
             }
         }
@@ -1028,6 +1067,7 @@ export class V2E2EECoordinator {
             timestamp: opts.timestamp,
             protectedHeaders: opts.protectedHeaders,
             context: opts.context,
+            needRender: opts.needRender,
         });
         client._logMessageDebug('send-envelope', 'message.send.v2', 'message.send', {
             message_id: envelope.message_id,
@@ -1072,6 +1112,7 @@ export class V2E2EECoordinator {
                 deviceId: targetDeviceId || undefined,
                 protectedHeaders: opts?.protectedHeaders,
                 context: opts?.context,
+                needRender: opts?.needRender,
                 useCache,
             });
             const result = await client.call('message.send', {
@@ -1081,6 +1122,7 @@ export class V2E2EECoordinator {
                 ...(targetDeviceId ? { device_id: targetDeviceId } : {}),
                 ...(opts?.ttl !== undefined ? { ttl: opts.ttl } : {}),
                 encrypt: false,
+                need_render: opts?.needRender ?? true,
                 _skip_send_result_envelope: true,
             });
             client._clientLog.debug(`message.v2.send ok: to=${toAid}, use_cache=${useCache}, seq=${String((isJsonObject(result) ? result.seq : '') ?? '')}`);
@@ -1094,6 +1136,7 @@ export class V2E2EECoordinator {
                 message_id: messageId,
                 timestamp: opts?.timestamp,
                 ttl: opts?.ttl,
+                need_render: opts?.needRender ?? true,
                 protected_headers: opts?.protectedHeaders,
                 context: opts?.context,
             }, result, true);
@@ -1110,6 +1153,7 @@ export class V2E2EECoordinator {
                     message_id: messageId,
                     timestamp: opts?.timestamp,
                     ttl: opts?.ttl,
+                    need_render: opts?.needRender ?? true,
                     protected_headers: opts?.protectedHeaders,
                     context: opts?.context,
                 }, result, true);
@@ -1125,12 +1169,13 @@ export class V2E2EECoordinator {
             history_error: { code: 'decrypt_failed', message: reason },
         };
     }
-    ensureDeliveryCurrent(ns, generation) {
+    ensureDeliveryCurrent(ns, generation, inlineGeneration) {
         if (Number(this.client._v2RuntimeGeneration ?? 0) !== generation
+            || (inlineGeneration !== undefined && this.client._delivery.captureInlineAckGeneration() !== inlineGeneration)
             || this.client._rpcPipeline?.isPullNamespaceCurrent?.(ns) === false)
             throw new StateError('pull invalidated');
     }
-    async decodeP2PWindowMessage(msg, publish, history, source, orderedPublish = false) {
+    async decodeP2PWindowMessage(msg, publish, history, source, orderedPublish = false, deferredEffects) {
         const client = this.client;
         const seq = strictWindowSeq(msg.seq, 'messages[].seq', true);
         let plaintext = null;
@@ -1161,11 +1206,11 @@ export class V2E2EECoordinator {
             else if (isJsonObject(payload)
                 && ['e2ee.p2p_encrypted', 'e2ee.encrypted'].includes(payloadType)) {
                 msg = { ...msg, envelope_json: JSON.stringify(payload) };
-                plaintext = await client._decryptV2Message(msg, false, !history, true, true, undefined, false, source);
+                plaintext = await client._decryptV2Message(msg, false, !history, true, true, undefined, false, source, ...(deferredEffects ? [deferredEffects] : []));
             }
         }
         else {
-            plaintext = await client._decryptV2Message(msg, false, !history, true, true, undefined, false, source);
+            plaintext = await client._decryptV2Message(msg, false, !history, true, true, undefined, false, source, ...(deferredEffects ? [deferredEffects] : []));
         }
         if (!plaintext) {
             if (history)
@@ -1248,6 +1293,7 @@ export class V2E2EECoordinator {
             client._clientLog.warn(`Group Tail 单条消息解密失败，连续性证明仍保留: group=${groupId}, seq=${seq}`);
             return null;
         }
+        plaintext.need_render = typeof msg.need_render === 'boolean' ? msg.need_render : plaintext.need_render !== false;
         if (publish && !history && client._delivery.isSelfSentGroupMessage?.(msg)) {
             return plaintext;
         }
@@ -1256,6 +1302,363 @@ export class V2E2EECoordinator {
         }
         return plaintext;
     }
+    async pullPeerV2(senderAid, opts = {}) {
+        const client = this.client;
+        const generation = Number(client._v2RuntimeGeneration ?? 0);
+        const inlineGeneration = client._delivery.captureInlineAckGeneration?.();
+        await client._ensureV2SessionReady('message.pull');
+        this.ensureDeliveryCurrent(client._delivery.peerNamespace(senderAid), generation, inlineGeneration);
+        const ns = await client._delivery.initializePeer(senderAid);
+        this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+        const limit = Number(opts.limit ?? _INTERNAL_MESSAGE_FLOW_LIMITS.pullPageSize);
+        if (!Number.isSafeInteger(limit) || limit < 1 || limit > 200)
+            throw new ValidationError('peer limit must be between 1 and 200');
+        const mode = opts.window_mode === 'tail' ? 'tail' : 'forward';
+        const source = mode === 'tail' ? 'tail' : 'pull';
+        if (mode === 'tail' && (opts.force === true || 'ack_up_to_seq' in opts))
+            throw new ValidationError('Tail does not accept force or ACK');
+        const budget = opts.budget ?? { remaining: Math.max(1, Number(opts.max_pages ?? 100)) };
+        let after = opts.after_seq === undefined ? client._seqTracker.getContiguousSeq(ns) : strictWindowSeq(opts.after_seq, 'after_seq');
+        if (opts.force !== true && after > client._seqTracker.getContiguousSeq(ns))
+            throw new ValidationError('after_seq cannot exceed the peer delivery cursor');
+        let volatileCursor = String(opts.after_volatile_cursor ?? client._delivery.peerVolatilePullCursor(senderAid));
+        const decoded = [];
+        let complete = false;
+        let head = after;
+        let pages = 0;
+        let durableAck = 0;
+        let initializedAck = false;
+        let confirmedAck = 0;
+        const confirmAck = (seq) => {
+            confirmedAck = Math.max(confirmedAck, Math.min(seq, durableAck));
+            this.clearForwardAck(ns, confirmedAck);
+        };
+        const prefetched = [];
+        const stopping = new AbortController();
+        const validatePage = (response, requestAfter, committedAck, preparing = false) => {
+            this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+            this.validatePeerResponse(response, senderAid);
+            const rows = Array.isArray(response.messages) ? response.messages : null;
+            if (!rows || rows.length > limit)
+                throw new ValidationError('invalid peer messages page');
+            const persistent = rows.filter((row) => row.storage !== 'volatile');
+            const volatile = rows.filter((row) => row.storage === 'volatile');
+            const end = strictWindowSeq(response.covered_through_seq, 'covered_through_seq');
+            const pageHead = strictWindowSeq(response.head_seq, 'head_seq');
+            let start;
+            if (mode === 'tail') {
+                if (response.window_mode !== 'tail')
+                    throw new ValidationError('peer Tail response mode mismatch');
+                start = strictWindowSeq(response.window_start_seq, 'window_start_seq');
+                if (start > end || end !== pageHead || (end > requestAfter && start < requestAfter + 1))
+                    throw new ValidationError('invalid peer Tail proof');
+            }
+            else {
+                start = strictWindowSeq(response.scan_after_seq, 'scan_after_seq');
+                const retention = safeNonNegativeSeq(response.retention_floor_seq) ?? 0;
+                if (start < requestAfter || (!preparing && start > Math.max(requestAfter, retention, opts.force === true ? 0 : committedAck))
+                    || end < start || end > pageHead || response.next_after_seq !== end)
+                    throw new ValidationError('invalid peer Forward proof');
+                if (typeof response.persistent_has_more !== 'boolean' || typeof response.volatile_has_more !== 'boolean'
+                    || response.has_more !== (response.persistent_has_more || response.volatile_has_more)
+                    || (!response.persistent_has_more && end < pageHead))
+                    throw new ValidationError('invalid peer continuation proof');
+            }
+            let previous = mode === 'tail' ? start - 1 : start;
+            for (const row of persistent) {
+                const seq = strictWindowSeq(row.seq, 'messages[].seq', true);
+                if (seq <= previous || seq > end || String(row.sender_aid ?? row.from_aid ?? row.from ?? '') !== senderAid)
+                    throw new ValidationError('peer message is outside proof or sender');
+                previous = seq;
+            }
+            if (mode === 'forward' && opts.force !== true)
+                confirmAck(safeNonNegativeSeq(response.server_ack_seq) ?? 0);
+            return { persistent, volatile, end, pageHead, start };
+        };
+        const decodeRows = async (rows) => {
+            const prepared = { messages: [], effects: [] };
+            try {
+                for (const row of rows) {
+                    if (stopping.signal.aborted)
+                        throw new StateError('pull invalidated');
+                    const plaintext = await this.decodeP2PWindowMessage(row, false, false, source, false, prepared.effects);
+                    this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+                    if (!plaintext)
+                        throw new E2EEError('peer message could not be decrypted');
+                    plaintext.sender_aid = senderAid;
+                    plaintext.need_render = typeof row.need_render === 'boolean' ? row.need_render : plaintext.need_render !== false;
+                    prepared.messages.push(plaintext);
+                }
+            }
+            catch (error) {
+                prepared.error = error;
+            }
+            return prepared;
+        };
+        const fetchPage = async (requestAfter, requestCursor) => {
+            const key = `${ns}|mode=${mode}|after=${requestAfter}|volatile=${requestCursor}|force=${Boolean(opts.force)}|limit=${limit}`;
+            const request = (cursor) => client._runPullSerialized(key, () => client._callRawV2Rpc('message.v2.pull', {
+                cursor_scope: 'peer', sender_aid: senderAid, device_id: client._deviceId, slot_id: client._slotId,
+                after_seq: requestAfter, limit,
+                ...(mode === 'forward' && opts.force !== true && durableAck > 0 ? { ack_up_to_seq: durableAck } : {}),
+                ...(mode === 'tail' ? { window_mode: 'tail' } : {}),
+                ...(opts.force === true ? { force: true } : {}),
+                ...(cursor ? { after_volatile_cursor: cursor } : {}),
+                ...(opts.background ? { _rpc_background: true } : { _rpc_foreground: true }),
+            }, key), Boolean(opts.background));
+            const reservation = await client._dispatcher?._reserveMessageCapacity?.(limit, stopping.signal);
+            try {
+                if (stopping.signal.aborted)
+                    throw new StateError('pull invalidated');
+                try {
+                    return { response: await request(requestCursor), reservation };
+                }
+                catch (error) {
+                    this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+                    if (!requestCursor || !String(error instanceof Error ? error.message : error).toLowerCase().includes('volatile cursor epoch mismatch'))
+                        throw error;
+                    client._delivery.setPeerVolatilePullCursor(senderAid, '');
+                    return { response: await request(''), reservation };
+                }
+            }
+            catch (error) {
+                reservation?.release();
+                throw error;
+            }
+        };
+        const prefetchPage = (requestAfter, cursor) => {
+            const existing = prefetched.find((page) => page.after === requestAfter && page.cursor === cursor);
+            if (existing)
+                return existing;
+            if (prefetched.length >= 2 || budget.remaining <= 0 || stopping.signal.aborted)
+                return undefined;
+            budget.remaining -= 1;
+            const page = { after: requestAfter, cursor, response: fetchPage(requestAfter, cursor) };
+            void page.response.catch(() => undefined);
+            prefetched.push(page);
+            return page;
+        };
+        const preparePage = (page) => {
+            if (page.prepared)
+                return;
+            page.prepared = page.response.then(async (fetched) => {
+                try {
+                    const proof = validatePage(fetched.response, page.after, durableAck, true);
+                    const handlers = client._delivery.snapshotApplicationHandlers?.();
+                    if (proof.volatile.length === 0 && proof.end > page.after && fetched.response.persistent_has_more === true) {
+                        prefetchPage(proof.end, page.cursor);
+                    }
+                    return { ...fetched, handlers, prepared: await decodeRows(proof.persistent) };
+                }
+                catch (error) {
+                    fetched.reservation?.release();
+                    throw error;
+                }
+            });
+            void page.prepared.catch(() => undefined);
+        };
+        client._delivery.syncStarted(ns);
+        let failed = false;
+        try {
+            while (budget.remaining > 0 || prefetched.length > 0) {
+                const cached = prefetched.shift();
+                if (!cached)
+                    budget.remaining -= 1;
+                pages += 1;
+                let requestedAfter = cached ? cached.after : after;
+                const requestedVolatile = cached ? cached.cursor : volatileCursor;
+                const page = await client._delivery.runPeerPageSerialized(ns, async () => {
+                    const committedAck = client._delivery.peerCommittedAck(ns);
+                    if (!initializedAck) {
+                        durableAck = committedAck;
+                        initializedAck = true;
+                    }
+                    if (!cached && mode === 'forward' && opts.force !== true)
+                        requestedAfter = Math.max(requestedAfter, committedAck);
+                    if (!cached)
+                        this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+                    const fetched = await (cached ? cached.prepared ?? cached.response : fetchPage(requestedAfter, requestedVolatile));
+                    const { response, reservation } = fetched;
+                    try {
+                        this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+                        const { persistent, volatile, end, pageHead, start } = validatePage(response, requestedAfter, committedAck);
+                        const handlers = fetched.handlers ?? client._delivery.snapshotApplicationHandlers?.();
+                        if (mode === 'forward' && opts.force !== true && volatile.length === 0 && end > requestedAfter
+                            && (response.persistent_has_more === true || response.has_more === true)) {
+                            const pending = prefetchPage(end, requestedVolatile);
+                            if (pending)
+                                preparePage(pending);
+                        }
+                        const messages = [];
+                        const prepared = fetched.prepared ?? await decodeRows(persistent);
+                        this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+                        for (const effect of prepared.effects)
+                            effect();
+                        if ('error' in prepared)
+                            throw prepared.error;
+                        await this.withApplicationPage(ns, source, async () => {
+                            for (let index = 0; index < persistent.length; index += 1) {
+                                const row = persistent[index], plaintext = prepared.messages[index];
+                                const event = client._delivery.p2pAppEventForMessage(plaintext);
+                                await client._delivery.publishPulledMessage(event.event, ns, row.seq, event.payload, false, source);
+                                this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+                                messages.push(plaintext);
+                            }
+                            if (volatile.length > 0) {
+                                for (const row of volatile)
+                                    if (String(row.sender_aid ?? row.from_aid ?? row.from ?? '') !== senderAid)
+                                        throw new ValidationError('volatile peer sender mismatch');
+                                messages.push(...await this.publishV2VolatileMessages(volatile, source, true));
+                                this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+                            }
+                        }, reservation, handlers);
+                        this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+                        if (!volatile.every((row) => client._delivery.isVolatileSeen(row)))
+                            throw new E2EEError('volatile peer delivery remains pending');
+                        const before = client._seqTracker.snapshotNamespace(ns);
+                        try {
+                            if (mode === 'tail') {
+                                client._seqTracker.commitTailWindow(ns, { windowStartSeq: start, headSeq: pageHead, coveredThroughSeq: end, pageLimit: limit, sparse: true });
+                            }
+                            else if (opts.force !== true) {
+                                client._seqTracker.onPullResult(ns, persistent, requestedAfter, end);
+                            }
+                            if (opts.force !== true) {
+                                await client._commitSeqTrackerState(ns);
+                                durableAck = Math.max(durableAck, client._seqTracker.getContiguousSeq(ns));
+                            }
+                            this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+                        }
+                        catch (error) {
+                            if (Number(client._v2RuntimeGeneration ?? 0) === generation
+                                && (inlineGeneration === undefined || client._delivery.captureInlineAckGeneration() === inlineGeneration)
+                                && client._rpcPipeline?.isPullNamespaceCurrent?.(ns) !== false)
+                                client._seqTracker._restoreNamespaceSnapshotPreservingPush(ns, before);
+                            throw error;
+                        }
+                        const ack = client._seqTracker.getContiguousSeq(ns);
+                        if (mode === 'forward' && opts.force !== true) {
+                            this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+                            const next = safeNonNegativeSeq(response.next_pending_seq);
+                            client._delivery.consumePeerPullHint(ns, end, response.persistent_has_more === true && next !== null && next > end && next <= pageHead ? next : undefined);
+                            confirmAck(Math.max(confirmedAck, safeNonNegativeSeq(response.server_ack_seq) ?? 0));
+                            if (ack > confirmedAck)
+                                this.recordForwardAck(ns, ack);
+                        }
+                        return { response, messages, end, head: pageHead };
+                    }
+                    finally {
+                        reservation?.release();
+                    }
+                });
+                this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+                if (opts.retainMessages !== false)
+                    decoded.push(...page.messages);
+                head = page.head;
+                volatileCursor = client._delivery.peerVolatilePullCursor(senderAid);
+                const more = page.response.persistent_has_more === true || page.response.volatile_has_more === true || page.response.has_more === true;
+                complete = !more;
+                client._delivery.syncProgress(ns, { rawCount: page.response.messages.length, pulledCount: page.messages.length, hasMore: more,
+                    currentSeq: client._seqTracker.getContiguousSeq(ns), targetSeq: head });
+                after = page.end;
+                if (mode === 'tail' || complete || (after <= requestedAfter && volatileCursor === requestedVolatile))
+                    break;
+            }
+        }
+        catch (error) {
+            failed = true;
+            throw error;
+        }
+        finally {
+            stopping.abort();
+            for (const pending of prefetched) {
+                try {
+                    (await (pending.prepared ?? pending.response)).reservation?.release();
+                }
+                catch { }
+            }
+            if (mode === 'forward' && opts.force !== true) {
+                try {
+                    this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+                    const pending = this.pendingForwardAck(ns, durableAck);
+                    if (pending > 0) {
+                        await this.ackPeerV2(senderAid, pending);
+                        this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+                        confirmAck(pending);
+                    }
+                }
+                catch (error) {
+                    if (!failed)
+                        throw error;
+                }
+            }
+        }
+        const ack = client._seqTracker.getContiguousSeq(ns);
+        if (!opts.background && opts.force !== true && (!complete || (mode === 'tail' && ack < head)))
+            client._delivery.schedulePeerRecovery(senderAid, head, true);
+        return { sender_aid: senderAid, messages: decoded, complete: mode === 'tail' ? ack >= head : complete,
+            ack_seq: ack, head_seq: head, pages };
+    }
+    validatePeerResponse(response, senderAid) {
+        const client = this.client;
+        if (!response || response.cursor_scope !== 'peer' || response.sender_aid !== senderAid
+            || (response.device_id !== undefined && response.device_id !== client._deviceId)
+            || (response.slot_id !== undefined && response.slot_id !== client._slotId))
+            throw new ValidationError('peer response scope mismatch');
+    }
+    async ackPeerV2(senderAid, upToSeq, volatileCursors = [], volatileIds = []) {
+        const client = this.client;
+        const generation = Number(client._v2RuntimeGeneration ?? 0);
+        const inlineGeneration = client._delivery.captureInlineAckGeneration?.();
+        const ns = await client._delivery.initializePeer(senderAid);
+        this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+        const localAck = client._delivery.peerCommittedAck(ns);
+        const requested = upToSeq === undefined ? (volatileCursors.length || volatileIds.length ? 0 : localAck) : strictWindowSeq(upToSeq, 'up_to_seq');
+        const seq = Math.min(requested, localAck);
+        if (!seq && !volatileCursors.length && !volatileIds.length)
+            return { cursor_scope: 'peer', sender_aid: senderAid, peer_ack_seq: 0 };
+        const result = await client._callRawV2Rpc('message.v2.ack', { cursor_scope: 'peer', sender_aid: senderAid,
+            device_id: client._deviceId, slot_id: client._slotId,
+            ...(seq ? { up_to_seq: seq } : {}), ...(volatileCursors.length ? { volatile_cursors: volatileCursors } : {}),
+            ...(volatileIds.length ? { volatile_ids: volatileIds } : {}), _rpc_background: true });
+        this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+        this.validatePeerResponse(result, senderAid);
+        const actual = safeNonNegativeSeq(result.peer_ack_seq ?? result.effective_ack_seq ?? result.up_to_seq);
+        if (seq > 0 && (actual === null || actual < seq))
+            throw new E2EEError('peer ACK watermark is below requested');
+        client._delivery.peerAckChanged();
+        return result;
+    }
+    async peerHistoryV2(params) {
+        const sender = String(params.sender_aid ?? '').trim();
+        if (!sender)
+            throw new ValidationError('peer History requires sender_aid');
+        const client = this.client;
+        const ns = await client._delivery.initializePeer(sender);
+        const generation = Number(client._v2RuntimeGeneration ?? 0);
+        const before = strictWindowSeq(params.before_seq, 'before_seq', true);
+        const limit = Number(params.limit ?? _INTERNAL_MESSAGE_FLOW_LIMITS.pullPageSize);
+        if (!Number.isSafeInteger(limit) || limit < 1 || limit > 200)
+            throw new ValidationError('peer limit must be between 1 and 200');
+        const key = pullGateKeyForClient(client, 'message.history', { ...params, sender_aid: sender, before_seq: before, limit }, `${ns}|history|before=${before}|limit=${limit}`);
+        const result = await client._runPullSerialized(key, () => client._callRawV2Rpc('message.history', { ...params, cursor_scope: 'peer', sender_aid: sender,
+            before_seq: before, limit, device_id: client._deviceId, slot_id: client._slotId, _rpc_foreground: true }, key), false);
+        this.ensureDeliveryCurrent(ns, generation);
+        this.validatePeerResponse(result, sender);
+        const rows = validateHistoryPage(result, before);
+        if (rows.length > limit)
+            throw new ValidationError('peer History exceeds limit');
+        const messages = [];
+        for (const row of rows) {
+            if (String(row.sender_aid ?? row.from_aid ?? row.from ?? '') !== sender)
+                throw new ValidationError('peer History sender mismatch');
+            const plaintext = await this.decodeP2PWindowMessage(row, false, true, 'history');
+            this.ensureDeliveryCurrent(ns, generation);
+            if (plaintext)
+                messages.push({ ...plaintext, need_render: typeof row.need_render === 'boolean' ? row.need_render : plaintext.need_render !== false });
+        }
+        return { ...result, messages };
+    }
     async pullV2TailInternal(params, deferPublish = false) {
         const client = this.client;
         const generation = Number(client._v2RuntimeGeneration ?? 0);
@@ -1274,12 +1677,14 @@ export class V2E2EECoordinator {
         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);
-        }
+        await this.withApplicationPage(ns, 'tail', async () => {
+            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, {
@@ -1361,10 +1766,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 +1779,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 +1811,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 +1838,6 @@ export class V2E2EECoordinator {
         };
         const stopPipeline = async () => {
             pipelineStopped = true;
-            pipelineResume.current?.();
-            pipelineResume.current = null;
             pipelineQueue.close();
             if (pipelineProducer) {
                 const producer = pipelineProducer;
@@ -1458,7 +1861,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,28 +1890,30 @@ 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 (volatileMessages.length > 0) {
-                    decrypted.push(...await this.publishV2VolatileMessages(volatileMessages, 'pull', true));
-                    volatileCursor = String(client._delivery.volatilePullCursor?.() ?? '').trim();
+                if (pipelinePage && volatileMessages.length > 0) {
+                    if (pipelineProducer)
+                        await pipelineProducer;
+                    pipelineProducer = null;
+                    pipelineRunning = false;
+                    pipelineQueue = new V2PullPageQueue(V2_PULL_PIPELINE_QUEUE_CAPACITY);
                 }
                 const messages = deduplicateForwardPageMessages(pageMessages, nextAfterSeq);
                 const cursor = isJsonObject(result.cursor) ? result.cursor : null;
@@ -1531,118 +1936,128 @@ 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;
-                for (const msg of messages) {
-                    const seq = Number(msg.seq ?? 0);
-                    if (!Number.isFinite(seq) || seq <= 0)
-                        continue;
-                    const version = String(msg.version ?? 'v2');
-                    if (version === 'v1') {
-                        const legacy = isJsonObject(msg.legacy_v1) ? msg.legacy_v1 : {};
-                        const legacyPayload = legacy.payload !== undefined ? legacy.payload : msg.payload;
-                        const payloadType = isJsonObject(legacyPayload)
-                            ? String(legacyPayload.type ?? '').trim()
-                            : '';
-                        if (legacyPayload !== undefined && legacyPayload !== null
-                            && !['e2ee.encrypted', 'e2ee.group_encrypted', 'e2ee.p2p_encrypted'].includes(payloadType)) {
-                            const v1Msg = {
-                                message_id: String(msg.message_id ?? ''),
-                                from: String(msg.from_aid ?? ''),
-                                to: String(legacy.to ?? client._aid ?? ''),
-                                seq: msg.seq,
-                                type: String(msg.type ?? ''),
-                                timestamp: msg.t_server,
-                                payload: legacyPayload,
-                                encrypted: false,
-                            };
-                            const direction = String(msg.direction ?? '').trim();
-                            if (direction)
-                                v1Msg.direction = direction;
-                            else if (String(msg.from_aid ?? '').trim() && String(msg.from_aid ?? '').trim() !== String(client._aid ?? '').trim()) {
-                                v1Msg.direction = 'inbound';
+                let pageDecryptedBefore = decrypted.length;
+                const hasServerAckSeq = Object.prototype.hasOwnProperty.call(result, 'server_ack_seq');
+                const parsedServerAckSeq = hasServerAckSeq ? safeNonNegativeSeq(result.server_ack_seq) : null;
+                const serverAckSeq = parsedServerAckSeq ?? 0;
+                const retentionFloor = Math.max(0, Number(result.retention_floor_seq ?? 0));
+                let commitTarget = pageContigBefore;
+                await this.withApplicationPage(ns, 'pull', async () => {
+                    if (volatileMessages.length > 0) {
+                        decrypted.push(...await this.publishV2VolatileMessages(volatileMessages, 'pull', true));
+                        pageDecryptedBefore = decrypted.length;
+                    }
+                    for (const msg of messages) {
+                        const seq = Number(msg.seq ?? 0);
+                        if (!Number.isFinite(seq) || seq <= 0)
+                            continue;
+                        const version = String(msg.version ?? 'v2');
+                        if (version === 'v1') {
+                            const legacy = isJsonObject(msg.legacy_v1) ? msg.legacy_v1 : {};
+                            const legacyPayload = legacy.payload !== undefined ? legacy.payload : msg.payload;
+                            const payloadType = isJsonObject(legacyPayload)
+                                ? String(legacyPayload.type ?? '').trim()
+                                : '';
+                            if (legacyPayload !== undefined && legacyPayload !== null
+                                && !['e2ee.encrypted', 'e2ee.group_encrypted', 'e2ee.p2p_encrypted'].includes(payloadType)) {
+                                const v1Msg = {
+                                    message_id: String(msg.message_id ?? ''),
+                                    from: String(msg.from_aid ?? ''),
+                                    to: String(legacy.to ?? client._aid ?? ''),
+                                    seq: msg.seq,
+                                    type: String(msg.type ?? ''),
+                                    timestamp: msg.t_server,
+                                    payload: legacyPayload,
+                                    encrypted: false,
+                                };
+                                const direction = String(msg.direction ?? '').trim();
+                                if (direction)
+                                    v1Msg.direction = direction;
+                                else if (String(msg.from_aid ?? '').trim() && String(msg.from_aid ?? '').trim() !== String(client._aid ?? '').trim()) {
+                                    v1Msg.direction = 'inbound';
+                                }
+                                if (msg.sender_device_id !== undefined)
+                                    v1Msg.sender_device_id = msg.sender_device_id;
+                                attachGatewayProximity(v1Msg, msg);
+                                const appEvent = client._delivery.p2pAppEventForMessage(v1Msg);
+                                if (ns) {
+                                    await client._publishPulledMessage(appEvent.event, ns, seq, appEvent.payload, false);
+                                }
+                                else {
+                                    await client._publishAppEvent(appEvent.event, appEvent.payload, 'pull');
+                                }
+                                decrypted.push(v1Msg);
+                                client._clientLog.debug(`message.v2.pull plaintext V1 delivered: seq=${seq}, ns=${ns || '<none>'}`);
                             }
-                            if (msg.sender_device_id !== undefined)
-                                v1Msg.sender_device_id = msg.sender_device_id;
-                            attachGatewayProximity(v1Msg, msg);
-                            const appEvent = client._delivery.p2pAppEventForMessage(v1Msg);
-                            if (ns) {
-                                await client._publishPulledMessage(appEvent.event, ns, seq, appEvent.payload, false);
+                            else if (isJsonObject(legacyPayload)
+                                && ['e2ee.p2p_encrypted', 'e2ee.encrypted'].includes(payloadType)) {
+                                const deferStatus = {};
+                                const plaintext = await client._decryptV2Message({ ...msg, envelope_json: JSON.stringify(legacyPayload) }, true, true, true, true, deferStatus, true, 'pull');
+                                if (deferStatus.deferred) {
+                                    blockedSeq = blockedSeq > 0 ? Math.min(blockedSeq, seq) : seq;
+                                    if (deferStatus.fromAid) {
+                                        const key = `${deferStatus.fromAid}\u0000${deferStatus.senderDeviceId ?? ''}\u0000${deferStatus.groupId ?? ''}`;
+                                        deferredKeyFetches.set(key, { fromAid: deferStatus.fromAid, senderDeviceId: deferStatus.senderDeviceId ?? '', groupId: deferStatus.groupId ?? '' });
+                                    }
+                                }
+                                if (plaintext) {
+                                    if (ns)
+                                        await client._publishPulledMessage('message.received', ns, seq, plaintext, false);
+                                    else
+                                        await client._publishAppEvent('message.received', plaintext, 'pull');
+                                    decrypted.push(plaintext);
+                                }
                             }
                             else {
-                                await client._publishAppEvent(appEvent.event, appEvent.payload, 'pull');
+                                client._clientLog.debug(`message.v2.pull skipping V1 envelope seq=${seq} payload_type=${payloadType || '<none>'} (V1 E2EE removed)`);
                             }
-                            decrypted.push(v1Msg);
-                            client._clientLog.debug(`message.v2.pull plaintext V1 delivered: seq=${seq}, ns=${ns || '<none>'}`);
+                            continue;
                         }
-                        else if (isJsonObject(legacyPayload)
-                            && ['e2ee.p2p_encrypted', 'e2ee.encrypted'].includes(payloadType)) {
-                            const deferStatus = {};
-                            const plaintext = await client._decryptV2Message({ ...msg, envelope_json: JSON.stringify(legacyPayload) }, true, true, true, true, deferStatus, true, 'pull');
-                            if (deferStatus.deferred) {
-                                blockedSeq = blockedSeq > 0 ? Math.min(blockedSeq, seq) : seq;
-                                if (deferStatus.fromAid) {
-                                    const key = `${deferStatus.fromAid}\u0000${deferStatus.senderDeviceId ?? ''}\u0000${deferStatus.groupId ?? ''}`;
-                                    deferredKeyFetches.set(key, { fromAid: deferStatus.fromAid, senderDeviceId: deferStatus.senderDeviceId ?? '', groupId: deferStatus.groupId ?? '' });
-                                }
-                            }
-                            if (plaintext) {
-                                if (ns)
-                                    await client._publishPulledMessage('message.received', ns, seq, plaintext, false);
-                                else
-                                    await client._publishAppEvent('message.received', plaintext, 'pull');
-                                decrypted.push(plaintext);
-                            }
+                        if (version !== 'v2') {
+                            client._clientLog.debug(`message.v2.pull skipping non-V2 row seq=${seq} version=${String(msg.version ?? '')}`);
+                            continue;
+                        }
+                        const spkId = String(msg.spk_id ?? '');
+                        if (spkId && client._v2Session && !client._v2Session.isCurrentSPK(spkId)) {
+                            client._v2Session.trackOldSPKMaxSeq(spkId, seq);
+                        }
+                        const deferStatus = {};
+                        const plaintext = await client._decryptV2Message(msg, true, true, true, true, deferStatus, true, 'pull');
+                        if (deferStatus.deferred) {
+                            blockedSeq = blockedSeq > 0 ? Math.min(blockedSeq, seq) : seq;
+                        }
+                        if (deferStatus.deferred && deferStatus.fromAid) {
+                            const key = `${deferStatus.fromAid}\u0000${deferStatus.senderDeviceId ?? ''}\u0000${deferStatus.groupId ?? ''}`;
+                            deferredKeyFetches.set(key, {
+                                fromAid: deferStatus.fromAid,
+                                senderDeviceId: deferStatus.senderDeviceId ?? '',
+                                groupId: deferStatus.groupId ?? '',
+                            });
+                        }
+                        if (plaintext === null) {
+                            client._clientLog.debug(`message.v2.pull decrypt returned null: seq=${seq}, ns=${ns || '<none>'}`);
+                            continue;
+                        }
+                        if (ns) {
+                            await client._publishPulledMessage('message.received', ns, seq, plaintext, false);
                         }
                         else {
-                            client._clientLog.debug(`message.v2.pull skipping V1 envelope seq=${seq} payload_type=${payloadType || '<none>'} (V1 E2EE removed)`);
+                            await client._publishAppEvent('message.received', plaintext, 'pull');
                         }
-                        continue;
-                    }
-                    if (version !== 'v2') {
-                        client._clientLog.debug(`message.v2.pull skipping non-V2 row seq=${seq} version=${String(msg.version ?? '')}`);
-                        continue;
-                    }
-                    const spkId = String(msg.spk_id ?? '');
-                    if (spkId && client._v2Session && !client._v2Session.isCurrentSPK(spkId)) {
-                        client._v2Session.trackOldSPKMaxSeq(spkId, seq);
-                    }
-                    const deferStatus = {};
-                    const plaintext = await client._decryptV2Message(msg, true, true, true, true, deferStatus, true, 'pull');
-                    if (deferStatus.deferred) {
-                        blockedSeq = blockedSeq > 0 ? Math.min(blockedSeq, seq) : seq;
-                    }
-                    if (deferStatus.deferred && deferStatus.fromAid) {
-                        const key = `${deferStatus.fromAid}\u0000${deferStatus.senderDeviceId ?? ''}\u0000${deferStatus.groupId ?? ''}`;
-                        deferredKeyFetches.set(key, {
-                            fromAid: deferStatus.fromAid,
-                            senderDeviceId: deferStatus.senderDeviceId ?? '',
-                            groupId: deferStatus.groupId ?? '',
-                        });
-                    }
-                    if (plaintext === null) {
-                        client._clientLog.debug(`message.v2.pull decrypt returned null: seq=${seq}, ns=${ns || '<none>'}`);
-                        continue;
+                        decrypted.push(plaintext);
+                        client._logMessageDebug('decrypt-ok', 'message.v2.pull', 'message.received', plaintext);
                     }
                     if (ns) {
-                        await client._publishPulledMessage('message.received', ns, seq, plaintext, false);
-                    }
-                    else {
-                        await client._publishAppEvent('message.received', plaintext, 'pull');
-                    }
-                    decrypted.push(plaintext);
-                    client._logMessageDebug('decrypt-ok', 'message.v2.pull', 'message.received', plaintext);
-                }
-                const hasServerAckSeq = Object.prototype.hasOwnProperty.call(result, 'server_ack_seq');
-                const parsedServerAckSeq = hasServerAckSeq ? safeNonNegativeSeq(result.server_ack_seq) : null;
-                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 ackSeq = pageContigBefore;
-                    let contigAdvanced = false;
-                    try {
+                        commitTarget = Math.max(pageContigBefore, Number.isFinite(retentionFloor) ? retentionFloor : 0, pageCount === 1 ? deferredServerCursor : 0, serverAckSeq, blockedSeq > 0 ? blockedSeq - 1 : pageContiguousSeq);
                         this.ensureDeliveryCurrent(ns, generation);
                         const window = client._seqTracker.getSyncState?.(ns);
                         const deliveryTarget = window && commitTarget >= window.tail - 1
@@ -1651,6 +2066,15 @@ export class V2E2EECoordinator {
                             await client._drainOrderedMessages(ns, undefined, false, false, 'pull', deliveryTarget);
                         }
                         this.ensureDeliveryCurrent(ns, generation);
+                    }
+                });
+                if (volatileMessages.length > 0)
+                    volatileCursor = String(client._delivery.volatilePullCursor?.() ?? '').trim();
+                if (ns) {
+                    let ackSeq = pageContigBefore;
+                    let contigAdvanced = false;
+                    try {
+                        this.ensureDeliveryCurrent(ns, generation);
                         pageTrackerSnapshot = client._seqTracker.snapshotNamespace?.(ns) ?? null;
                         if (commitTarget > pageContigBefore) {
                             trackerMutated = true;
@@ -1701,18 +2125,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 +2143,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 +2175,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 +2185,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 +2196,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;
@@ -1816,11 +2225,27 @@ export class V2E2EECoordinator {
         const client = this.client;
         if (!client._v2Session)
             return [];
+        const generation = Number(client._v2RuntimeGeneration ?? 0);
+        const context = JSON.stringify([client._aid, client._deviceId, client._slotId]);
+        const ensureCurrent = () => {
+            if (!client._p2pPeerPullEnabled)
+                return;
+            if (context !== JSON.stringify([client._aid, client._deviceId, client._slotId]))
+                throw new StateError('delivery invalidated');
+            const sender = String(messages[0]?.sender_aid ?? messages[0]?.from_aid ?? messages[0]?.from ?? '').trim();
+            if (sender)
+                this.ensureDeliveryCurrent(client._delivery.peerNamespace(sender), generation);
+        };
         const processed = [];
         const plaintextMessages = [];
         let complete = true;
         for (const rawMessage of messages) {
-            const claim = client._delivery.beginVolatileDelivery(rawMessage);
+            let claim = client._delivery.beginVolatileDelivery(rawMessage);
+            if (claim === 'inflight' && typeof client._delivery.waitVolatileDelivery === 'function') {
+                await client._delivery.waitVolatileDelivery(rawMessage);
+                ensureCurrent();
+                claim = client._delivery.beginVolatileDelivery(rawMessage);
+            }
             if (claim === 'seen') {
                 processed.push(rawMessage);
                 continue;
@@ -1859,13 +2284,16 @@ export class V2E2EECoordinator {
                     complete = false;
                     continue;
                 }
+                ensureCurrent();
                 const publicMessage = client._delivery.publicVolatileMessage(plaintext);
                 for (const key of ['storage', 'volatile_cursor', 'created_at', 'expires_at', 'persist']) {
                     if (Object.prototype.hasOwnProperty.call(rawMessage, key))
                         publicMessage[key] = rawMessage[key];
                 }
+                publicMessage.need_render = typeof rawMessage.need_render === 'boolean' ? rawMessage.need_render : publicMessage.need_render !== false;
                 const appEvent = client._delivery.p2pAppEventForMessage(publicMessage);
                 await client._publishAppEvent(appEvent.event, appEvent.payload, source);
+                ensureCurrent();
                 client._delivery.markVolatileSeen(rawMessage);
                 processed.push(rawMessage);
                 plaintextMessages.push(publicMessage);
@@ -1875,14 +2303,17 @@ export class V2E2EECoordinator {
             }
         }
         if (processed.length > 0) {
+            ensureCurrent();
             await client._delivery.ackVolatileMessages(processed, true, advanceCursor && complete && processed.length === messages.length);
         }
         return plaintextMessages;
     }
     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 +2321,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;
         }
     }
@@ -1985,6 +2418,7 @@ export class V2E2EECoordinator {
                 timestamp: opts?.timestamp,
                 protectedHeaders: opts?.protectedHeaders,
                 context: opts?.context,
+                needRender: opts?.needRender,
                 useCache,
             });
             const result = await client.call('group.v2.send', withExplicitGroupAid({
@@ -2001,6 +2435,7 @@ export class V2E2EECoordinator {
                 payload,
                 message_id: messageId,
                 timestamp: opts?.timestamp,
+                need_render: opts?.needRender ?? true,
                 protected_headers: opts?.protectedHeaders,
                 context: opts?.context,
             }, groupAid), result, true);
@@ -2016,6 +2451,7 @@ export class V2E2EECoordinator {
                     payload,
                     message_id: messageId,
                     timestamp: opts?.timestamp,
+                    need_render: opts?.needRender ?? true,
                     protected_headers: opts?.protectedHeaders,
                     context: opts?.context,
                 }, groupAid), result, true);
@@ -2140,6 +2576,7 @@ export class V2E2EECoordinator {
             timestamp: opts.timestamp,
             protectedHeaders: opts.protectedHeaders,
             context: opts.context,
+            needRender: opts.needRender,
         }, stateCommitment);
         client._logMessageDebug('send-envelope', 'group.send.v2', 'group.send', {
             group_id: groupId,
@@ -2161,7 +2598,7 @@ export class V2E2EECoordinator {
         });
         return envelope;
     }
-    async pullGroupV2TailInternal(params, deferPublish = false) {
+    async pullGroupV2TailInternal(params, deferPublish = false, namespaceLocked = false) {
         const client = this.client;
         const generation = Number(client._v2RuntimeGeneration ?? 0);
         if (params.window_mode !== 'tail')
@@ -2175,6 +2612,7 @@ export class V2E2EECoordinator {
         const afterSeq = strictWindowSeq(params.after_seq ?? 0, 'after_seq');
         const limit = strictWindowLimit(params.limit ?? V2_PULL_DEFAULT_PAGE_LIMIT);
         const ns = `group:${groupId}`;
+        const namespaceGeneration = client._delivery.captureSeqNamespaceGeneration?.(ns);
         const explicitCursorParams = isJsonObject(params._group_cursor_params)
             ? params._group_cursor_params : {};
         const cursorParams = Object.keys(explicitCursorParams).length > 0 ? explicitCursorParams : params;
@@ -2191,35 +2629,55 @@ export class V2E2EECoordinator {
             limit,
             _group_cursor_params: explicitCursorParams,
         }, `${ns}|tail|after=${afterSeq}|limit=${limit}`);
-        const result = await client._callRawV2Rpc('group.v2.pull', withExplicitGroupAid({
+        if (!namespaceLocked)
+            return await client._rpcPipeline.runPullNamespaceSerialized(pullGateKey, () => this.pullGroupV2TailInternal(params, deferPublish, true), false);
+        const result = await client._runPullSerialized(pullGateKey, () => client._callRawV2Rpc('group.v2.pull', withExplicitGroupAid({
             group_id: groupId,
             window_mode: 'tail',
             after_seq: afterSeq,
             limit,
             _group_cursor_params: explicitCursorParams,
             _rpc_foreground: true,
-        }, groupAid), pullGateKey);
+        }, groupAid), pullGateKey), false);
         const resultAid = String(result.group_aid ?? result.groupAid ?? '').trim();
         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,
-            coveredThroughSeq: page.head,
-            pageLimit: limit,
+        await this.withApplicationPage(ns, 'tail', async () => {
+            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);
+            }
         });
-        client._persistSeq(ns);
-        await client._saveSeqTrackerState?.();
+        this.ensureDeliveryCurrent(ns, generation);
+        if (client._delivery.isSeqNamespaceGenerationCurrent?.(ns, namespaceGeneration) === false)
+            throw new Error('pull invalidated');
+        client._delivery.rememberCommittedSeqState?.(ns);
+        const snapshot = client._seqTracker.snapshotNamespace?.(ns) ?? null;
+        try {
+            client._seqTracker.commitTailWindow(ns, {
+                windowStartSeq: page.windowStart,
+                headSeq: page.head,
+                coveredThroughSeq: page.head,
+                pageLimit: limit,
+            });
+            await client._commitSeqTrackerState(ns);
+            if (client._delivery.isSeqNamespaceGenerationCurrent?.(ns, namespaceGeneration) === false)
+                throw new Error('pull invalidated');
+        }
+        catch (error) {
+            if (Number(client._v2RuntimeGeneration ?? 0) === generation
+                && client._delivery.isSeqNamespaceGenerationCurrent?.(ns, namespaceGeneration) !== false
+                && client._rpcPipeline?.isPullNamespaceCurrent?.(ns) !== false) {
+                (client._seqTracker._restoreNamespaceSnapshotPreservingPush ?? client._seqTracker.restoreNamespaceSnapshot)
+                    .call(client._seqTracker, ns, snapshot);
+            }
+            throw error;
+        }
         this.ensureDeliveryCurrent(ns, generation);
         const ack = client._seqTracker.getContiguousSeq(ns);
         if (ownsCursor)
@@ -2241,12 +2699,13 @@ export class V2E2EECoordinator {
         let groupAid = String(params.group_aid ?? '').trim();
         const beforeSeq = strictWindowSeq(params.before_seq, 'before_seq', true);
         const limit = strictWindowLimit(params.limit ?? V2_PULL_DEFAULT_PAGE_LIMIT);
-        const result = await client._callRawV2Rpc('group.history', withExplicitGroupAid({
+        const key = pullGateKeyForClient(client, 'group.history', { group_id: groupId, before_seq: beforeSeq, limit }, `group:${groupId}|history|before=${beforeSeq}|limit=${limit}`);
+        const result = await client._runPullSerialized(key, () => client._callRawV2Rpc('group.history', withExplicitGroupAid({
             group_id: groupId,
             before_seq: beforeSeq,
             limit,
             _rpc_foreground: true,
-        }, groupAid));
+        }, groupAid), key), false);
         const resultAid = String(result.group_aid ?? result.groupAid ?? '').trim();
         if (resultAid)
             groupAid = resultAid;
@@ -2283,7 +2742,7 @@ export class V2E2EECoordinator {
                     group_id: gid, window_mode: 'tail', after_seq: afterSeq, limit,
                     _group_cursor_params: opts?.cursorParams,
                 }, `${ns}|tail|after=${afterSeq}|limit=${limit}`);
-                return (await client._runPullSerialized(key, () => this.pullGroupV2Impl(gid, afterSeq, limit, {
+                return (await client._rpcPipeline.runPullNamespaceSerialized(key, () => this.pullGroupV2Impl(gid, afterSeq, limit, {
                     ...opts,
                     gateLocked: true,
                 }), false));
@@ -2296,7 +2755,7 @@ export class V2E2EECoordinator {
                 window_mode: 'tail',
                 after_seq: afterSeq,
                 limit,
-            });
+            }, false, true);
             return (Array.isArray(result.messages) ? result.messages : []);
         }
         if (!opts?.gateLocked) {
@@ -2304,20 +2763,17 @@ export class V2E2EECoordinator {
                 group_id: gid, after_seq: afterSeq, force: opts?.force === true, limit,
                 _group_cursor_params: opts?.cursorParams,
             }, `${ns}|forward|after=${afterSeq}|force=${opts?.force === true}|limit=${limit}`);
-            return await client._runPullSerialized(key, async () => this.pullGroupV2Impl(gid, afterSeq, limit, {
+            return await client._rpcPipeline.runPullNamespaceSerialized(key, async () => this.pullGroupV2Impl(gid, afterSeq, limit, {
                 ...(opts ?? {}),
                 gateLocked: true,
                 scheduleFollowup: true,
-            }), true);
+            }), opts?.background !== false);
         }
         const decrypted = [];
         const wireGroupId = String(opts?.wireGroupId ?? groupId ?? '').trim() || gid;
         const cursorParams = opts?.cursorParams ?? {};
         const ownsCursor = opts?.ownsCursor !== false;
-        let pullGateKey = pullGateKeyForClient(client, 'group.v2.pull', {
-            group_id: gid, after_seq: afterSeq, force: opts?.force === true, limit,
-            _group_cursor_params: cursorParams,
-        }, `${ns}|forward|after=${afterSeq}|force=${String(Boolean(opts?.force))}|limit=${limit}`);
+        const background = opts?.background !== false;
         let nextAfterSeq = (opts?.explicitAfterSeq || opts?.force)
             ? afterSeq
             : (afterSeq || client._seqTracker.getContiguousSeq(ns));
@@ -2328,13 +2784,27 @@ export class V2E2EECoordinator {
         let pageCount = 0;
         let lastAutoAckSeq = 0;
         let pendingAckSeq = deferredForwardAck;
+        let committedAckSeq = ownsCursor ? client._seqTracker.getContiguousSeq(ns) : 0;
+        const fetchPage = async (after, ack) => {
+            const key = pullGateKeyForClient(client, 'group.v2.pull', {
+                group_id: gid, after_seq: after, force: opts?.force === true, limit, _group_cursor_params: cursorParams,
+            }, `${ns}|forward|after=${after}|force=${String(Boolean(opts?.force))}|limit=${limit}`);
+            return await client._runPullSerialized(key, async () => {
+                this.ensureDeliveryCurrent(ns, generation);
+                return await client._callRawV2Rpc('group.v2.pull', withExplicitGroupAid({
+                    group_id: wireGroupId, after_seq: after, limit, ...cursorParams,
+                    ...(opts?.force ? { force: true } : {}),
+                    ...(ack > 0 ? { ack_up_to_seq: Math.min(ack, committedAckSeq) } : {}),
+                    _rpc_background: background, _rpc_foreground: !background,
+                }, groupAid), key);
+            }, background);
+        };
         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 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 +2814,29 @@ export class V2E2EECoordinator {
                 for (let produced = pageCount; produced < maxPages; produced += 1) {
                     if (pipelineStopped)
                         break;
-                    const result = await client._callRawV2Rpc('group.v2.pull', withExplicitGroupAid({
-                        group_id: wireGroupId,
-                        after_seq: producerAfterSeq,
-                        limit,
-                        ...cursorParams,
-                        ...(opts?.force ? { force: true } : {}),
-                    }, groupAid), pullGateKey);
+                    this.ensureDeliveryCurrent(ns, generation);
+                    const ackUpToSeq = Math.min(pendingAckSeq, committedAckSeq);
+                    const inlineAckGeneration = ackUpToSeq > 0 ? client._delivery.captureGroupInlineAckGeneration() : null;
+                    const result = await fetchPage(producerAfterSeq, ackUpToSeq);
                     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 +2862,6 @@ export class V2E2EECoordinator {
         };
         const stopPipeline = async () => {
             pipelineStopped = true;
-            pipelineResume.current?.();
-            pipelineResume.current = null;
             pipelineQueue.close();
             if (pipelineProducer) {
                 const producer = pipelineProducer;
@@ -2422,7 +2884,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}`);
@@ -2432,30 +2894,23 @@ export class V2E2EECoordinator {
                     result = pipelinePage.result;
                 }
                 else {
-                    result = await client._callRawV2Rpc('group.v2.pull', withExplicitGroupAid({
-                        group_id: wireGroupId,
-                        after_seq: nextAfterSeq,
-                        limit,
-                        ...cursorParams,
-                        ...(opts?.force ? { force: true } : {}),
-                        ...(ackUpToSeq > 0 ? { ack_up_to_seq: ackUpToSeq } : {}),
-                    }, groupAid), pullGateKey);
+                    result = await fetchPage(nextAfterSeq, ackUpToSeq);
                 }
+                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();
@@ -2476,6 +2931,7 @@ export class V2E2EECoordinator {
                     .map((msg) => Number(msg.seq ?? 0))
                     .filter((seq) => Number.isFinite(seq) && seq > 0);
                 const pageContigBefore = client._seqTracker.getContiguousSeq(ns);
+                const namespaceGeneration = client._delivery.captureSeqNamespaceGeneration?.(ns);
                 let pageTrackerSnapshot = null;
                 let trackerMutated = false;
                 let pageMaxSeq = nextAfterSeq;
@@ -2483,33 +2939,76 @@ 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;
-                for (const msg of messages) {
-                    const seq = Number(msg.seq ?? 0);
-                    if (!Number.isFinite(seq) || seq <= 0)
-                        continue;
-                    const version = String(msg.version ?? 'v2');
-                    if (version === 'v1') {
-                        const legacy = isJsonObject(msg.legacy_v1) ? msg.legacy_v1 : {};
-                        const payload = msg.payload !== undefined ? msg.payload : legacy.payload;
-                        const payloadObj = isJsonObject(payload) ? payload : null;
-                        const payloadType = payloadObj ? String(payloadObj.type ?? '').trim() : '';
-                        // 群撤回 tombstone（占位 / 通知）：归一化为 group.message_recalled 事件，仍占 seq。
-                        if (typeof client._delivery?.recallEventFromGroupMessage === 'function'
-                            && client._delivery.recallEventFromGroupMessage(msg)) {
-                            await client._delivery.publishGroupRecallTombstone(gid, seq, {
-                                ...msg,
-                                group_id: gid,
-                                group_aid: eventGroupAid,
-                            }, 'pull');
-                            client._markPublishedSeq(ns, seq);
-                            client._clientLog.debug(`group.v2.pull recall tombstone delivered: group=${gid}, seq=${seq}`);
+                const hasServerCursor = cursor !== null && Object.prototype.hasOwnProperty.call(cursor, 'current_seq');
+                const parsedCursorCurrentSeq = hasServerCursor ? safeNonNegativeSeq(cursor?.current_seq) : null;
+                const cursorCurrentSeq = parsedCursorCurrentSeq ?? 0;
+                const retentionFloor = Math.max(client._pullRetentionFloor(result, 'retention_floor_message_seq', 'retention_floor_message_seq'));
+                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);
+                let commitTarget = pageContigBefore;
+                await this.withApplicationPage(ns, 'pull', async () => {
+                    for (const msg of messages) {
+                        const seq = Number(msg.seq ?? 0);
+                        if (!Number.isFinite(seq) || seq <= 0)
                             continue;
-                        }
-                        if (payloadObj) {
-                            if (!['e2ee.encrypted', 'e2ee.group_encrypted', 'e2ee.p2p_encrypted'].includes(payloadType)) {
+                        const version = String(msg.version ?? 'v2');
+                        if (version === 'v1') {
+                            const legacy = isJsonObject(msg.legacy_v1) ? msg.legacy_v1 : {};
+                            const payload = msg.payload !== undefined ? msg.payload : legacy.payload;
+                            const payloadObj = isJsonObject(payload) ? payload : null;
+                            const payloadType = payloadObj ? String(payloadObj.type ?? '').trim() : '';
+                            // 群撤回 tombstone（占位 / 通知）：归一化为 group.message_recalled 事件，仍占 seq。
+                            if (typeof client._delivery?.recallEventFromGroupMessage === 'function'
+                                && client._delivery.recallEventFromGroupMessage(msg)) {
+                                await client._delivery.publishGroupRecallTombstone(gid, seq, {
+                                    ...msg,
+                                    group_id: gid,
+                                    group_aid: eventGroupAid,
+                                }, 'pull');
+                                client._markPublishedSeq(ns, seq);
+                                client._clientLog.debug(`group.v2.pull recall tombstone delivered: group=${gid}, seq=${seq}`);
+                                continue;
+                            }
+                            if (payloadObj) {
+                                if (!['e2ee.encrypted', 'e2ee.group_encrypted', 'e2ee.p2p_encrypted'].includes(payloadType)) {
+                                    let v1Msg = {
+                                        message_id: String(msg.message_id ?? ''),
+                                        from: String(msg.from_aid ?? ''),
+                                        group_id: gid,
+                                        group_aid: eventGroupAid,
+                                        seq: msg.seq,
+                                        type: String(msg.type ?? ''),
+                                        timestamp: msg.t_server,
+                                        payload,
+                                        encrypted: false,
+                                        need_render: msg.need_render !== false,
+                                    };
+                                    if (msg.sender_device_id !== undefined)
+                                        v1Msg.sender_device_id = msg.sender_device_id;
+                                    v1Msg = normalizeGroupMentionMode(v1Msg, msg, msg.envelope_json);
+                                    attachGatewayProximity(v1Msg, msg);
+                                    if (!client._delivery.isSelfSentGroupMessage?.(msg)) {
+                                        await client._publishPulledMessage('group.message_created', ns, seq, v1Msg, false);
+                                    }
+                                    else {
+                                        client._markPublishedSeq(ns, seq);
+                                    }
+                                    decrypted.push(v1Msg);
+                                    client._clientLog.debug(`group.v2.pull plaintext V1 delivered: group=${gid}, seq=${seq}`);
+                                    continue;
+                                }
+                            }
+                            else if (payload !== undefined && payload !== null) {
                                 let v1Msg = {
                                     message_id: String(msg.message_id ?? ''),
                                     from: String(msg.from_aid ?? ''),
@@ -2520,114 +3019,81 @@ export class V2E2EECoordinator {
                                     timestamp: msg.t_server,
                                     payload,
                                     encrypted: false,
+                                    need_render: msg.need_render !== false,
                                 };
                                 if (msg.sender_device_id !== undefined)
                                     v1Msg.sender_device_id = msg.sender_device_id;
                                 v1Msg = normalizeGroupMentionMode(v1Msg, msg, msg.envelope_json);
                                 attachGatewayProximity(v1Msg, msg);
-                                if (!client._delivery.isSelfSentGroupMessage?.(msg)) {
-                                    await client._publishPulledMessage('group.message_created', ns, seq, v1Msg, false);
-                                }
-                                else {
-                                    client._markPublishedSeq(ns, seq);
-                                }
+                                await client._publishPulledMessage('group.message_created', ns, seq, v1Msg, false);
                                 decrypted.push(v1Msg);
                                 client._clientLog.debug(`group.v2.pull plaintext V1 delivered: group=${gid}, seq=${seq}`);
                                 continue;
                             }
-                        }
-                        else if (payload !== undefined && payload !== null) {
-                            let v1Msg = {
-                                message_id: String(msg.message_id ?? ''),
-                                from: String(msg.from_aid ?? ''),
-                                group_id: gid,
-                                group_aid: eventGroupAid,
-                                seq: msg.seq,
-                                type: String(msg.type ?? ''),
-                                timestamp: msg.t_server,
-                                payload,
-                                encrypted: false,
-                            };
-                            if (msg.sender_device_id !== undefined)
-                                v1Msg.sender_device_id = msg.sender_device_id;
-                            v1Msg = normalizeGroupMentionMode(v1Msg, msg, msg.envelope_json);
-                            attachGatewayProximity(v1Msg, msg);
-                            await client._publishPulledMessage('group.message_created', ns, seq, v1Msg, false);
-                            decrypted.push(v1Msg);
-                            client._clientLog.debug(`group.v2.pull plaintext V1 delivered: group=${gid}, seq=${seq}`);
-                            continue;
-                        }
-                        if (payloadObj && ['e2ee.group_encrypted', 'e2ee.p2p_encrypted', 'e2ee.encrypted'].includes(payloadType)) {
-                            const deferStatus = {};
-                            const plaintext = await client._decryptV2Message({ ...msg, envelope_json: JSON.stringify(payloadObj) }, true, true, true, true, deferStatus, true, 'pull');
-                            if (deferStatus.deferred) {
-                                blockedSeq = blockedSeq > 0 ? Math.min(blockedSeq, seq) : seq;
-                                if (deferStatus.fromAid) {
-                                    const key = `${deferStatus.fromAid}\u0000${deferStatus.senderDeviceId ?? ''}\u0000${deferStatus.groupId ?? ''}`;
-                                    deferredKeyFetches.set(key, { fromAid: deferStatus.fromAid, senderDeviceId: deferStatus.senderDeviceId ?? '', groupId: deferStatus.groupId ?? '' });
+                            if (payloadObj && ['e2ee.group_encrypted', 'e2ee.p2p_encrypted', 'e2ee.encrypted'].includes(payloadType)) {
+                                const deferStatus = {};
+                                const plaintext = await client._decryptV2Message({ ...msg, envelope_json: JSON.stringify(payloadObj) }, true, true, true, true, deferStatus, true, 'pull');
+                                if (deferStatus.deferred) {
+                                    blockedSeq = blockedSeq > 0 ? Math.min(blockedSeq, seq) : seq;
+                                    if (deferStatus.fromAid) {
+                                        const key = `${deferStatus.fromAid}\u0000${deferStatus.senderDeviceId ?? ''}\u0000${deferStatus.groupId ?? ''}`;
+                                        deferredKeyFetches.set(key, { fromAid: deferStatus.fromAid, senderDeviceId: deferStatus.senderDeviceId ?? '', groupId: deferStatus.groupId ?? '' });
+                                    }
                                 }
-                            }
-                            if (plaintext) {
-                                plaintext.group_id = gid;
-                                plaintext.group_aid = eventGroupAid;
-                                if (!client._delivery.isSelfSentGroupMessage?.(msg)) {
-                                    await client._publishPulledMessage('group.message_created', ns, seq, plaintext, false);
+                                if (plaintext) {
+                                    plaintext.group_id = gid;
+                                    plaintext.group_aid = eventGroupAid;
+                                    plaintext.need_render = typeof msg.need_render === 'boolean' ? msg.need_render : plaintext.need_render !== false;
+                                    if (!client._delivery.isSelfSentGroupMessage?.(msg)) {
+                                        await client._publishPulledMessage('group.message_created', ns, seq, plaintext, false);
+                                    }
+                                    else {
+                                        client._markPublishedSeq(ns, seq);
+                                    }
+                                    decrypted.push(plaintext);
                                 }
-                                else {
-                                    client._markPublishedSeq(ns, seq);
-                                }
-                                decrypted.push(plaintext);
                             }
+                            else {
+                                client._clientLog.debug(`group.v2.pull skipping V1 envelope group=${gid} seq=${seq} payload_type=${payloadObj ? String(payloadObj.type ?? '') : '<none>'} (V1 E2EE removed)`);
+                            }
+                            continue;
+                        }
+                        if (version !== 'v2') {
+                            client._clientLog.debug(`group.v2.pull skipping non-V2 row group=${gid} seq=${seq} version=${String(msg.version ?? '')}`);
+                            continue;
+                        }
+                        const deferStatus = {};
+                        let plaintext = await client._decryptV2Message(msg, true, true, true, true, deferStatus, true, 'pull');
+                        if (deferStatus.deferred) {
+                            blockedSeq = blockedSeq > 0 ? Math.min(blockedSeq, seq) : seq;
+                        }
+                        if (deferStatus.deferred && deferStatus.fromAid) {
+                            const key = `${deferStatus.fromAid}\u0000${deferStatus.senderDeviceId ?? ''}\u0000${deferStatus.groupId ?? ''}`;
+                            deferredKeyFetches.set(key, {
+                                fromAid: deferStatus.fromAid,
+                                senderDeviceId: deferStatus.senderDeviceId ?? '',
+                                groupId: deferStatus.groupId ?? '',
+                            });
+                        }
+                        if (plaintext === null) {
+                            client._clientLog.debug(`group.v2.pull decrypt returned null: group=${gid}, seq=${seq}`);
+                            continue;
+                        }
+                        plaintext = normalizeGroupMentionMode(plaintext, msg, msg.envelope_json);
+                        plaintext.group_id = gid;
+                        plaintext.group_aid = eventGroupAid;
+                        plaintext.need_render = typeof msg.need_render === 'boolean' ? msg.need_render : plaintext.need_render !== false;
+                        if (!client._delivery.isSelfSentGroupMessage?.(msg)) {
+                            await client._publishPulledMessage('group.message_created', ns, seq, plaintext, false);
                         }
                         else {
-                            client._clientLog.debug(`group.v2.pull skipping V1 envelope group=${gid} seq=${seq} payload_type=${payloadObj ? String(payloadObj.type ?? '') : '<none>'} (V1 E2EE removed)`);
+                            client._markPublishedSeq(ns, seq);
                         }
-                        continue;
-                    }
-                    if (version !== 'v2') {
-                        client._clientLog.debug(`group.v2.pull skipping non-V2 row group=${gid} seq=${seq} version=${String(msg.version ?? '')}`);
-                        continue;
-                    }
-                    const deferStatus = {};
-                    let plaintext = await client._decryptV2Message(msg, true, true, true, true, deferStatus, true, 'pull');
-                    if (deferStatus.deferred) {
-                        blockedSeq = blockedSeq > 0 ? Math.min(blockedSeq, seq) : seq;
-                    }
-                    if (deferStatus.deferred && deferStatus.fromAid) {
-                        const key = `${deferStatus.fromAid}\u0000${deferStatus.senderDeviceId ?? ''}\u0000${deferStatus.groupId ?? ''}`;
-                        deferredKeyFetches.set(key, {
-                            fromAid: deferStatus.fromAid,
-                            senderDeviceId: deferStatus.senderDeviceId ?? '',
-                            groupId: deferStatus.groupId ?? '',
-                        });
-                    }
-                    if (plaintext === null) {
-                        client._clientLog.debug(`group.v2.pull decrypt returned null: group=${gid}, seq=${seq}`);
-                        continue;
+                        decrypted.push(plaintext);
+                        client._logMessageDebug('decrypt-ok', 'group.v2.pull', 'group.message_created', plaintext);
                     }
-                    plaintext = normalizeGroupMentionMode(plaintext, msg, msg.envelope_json);
-                    plaintext.group_id = gid;
-                    plaintext.group_aid = eventGroupAid;
-                    if (!client._delivery.isSelfSentGroupMessage?.(msg)) {
-                        await client._publishPulledMessage('group.message_created', ns, seq, plaintext, false);
-                    }
-                    else {
-                        client._markPublishedSeq(ns, seq);
-                    }
-                    decrypted.push(plaintext);
-                    client._logMessageDebug('decrypt-ok', 'group.v2.pull', 'group.message_created', plaintext);
-                }
-                const hasServerCursor = cursor !== null && Object.prototype.hasOwnProperty.call(cursor, 'current_seq');
-                const parsedCursorCurrentSeq = hasServerCursor ? safeNonNegativeSeq(cursor?.current_seq) : null;
-                const cursorCurrentSeq = parsedCursorCurrentSeq ?? 0;
-                const retentionFloor = Math.max(client._pullRetentionFloor(result, 'retention_floor_message_seq', 'retention_floor_message_seq'));
-                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, effectiveFloor, ownsCursor && pageCount === 1 ? deferredServerCursor : 0, ownsCursor ? cursorCurrentSeq : 0, blockedSeq > 0 ? blockedSeq - 1 : pageContiguousSeq);
-                let ackSeq = pageContigBefore;
-                let contigAdvanced = false;
-                if (ownsCursor) {
-                    try {
+                    commitTarget = Math.max(pageContigBefore, effectiveFloor, ownsCursor && pageCount === 1 ? deferredServerCursor : 0, ownsCursor ? cursorCurrentSeq : 0, blockedSeq > 0 ? blockedSeq - 1 : pageContiguousSeq);
+                    if (ownsCursor) {
                         this.ensureDeliveryCurrent(ns, generation);
                         const window = client._seqTracker.getSyncState?.(ns);
                         const deliveryTarget = window && commitTarget >= window.tail - 1
@@ -2636,6 +3102,16 @@ export class V2E2EECoordinator {
                             await client._drainOrderedMessages(ns, undefined, false, false, 'pull', deliveryTarget);
                         }
                         this.ensureDeliveryCurrent(ns, generation);
+                    }
+                });
+                let ackSeq = pageContigBefore;
+                let contigAdvanced = false;
+                if (ownsCursor) {
+                    try {
+                        this.ensureDeliveryCurrent(ns, generation);
+                        if (client._delivery.isSeqNamespaceGenerationCurrent?.(ns, namespaceGeneration) === false)
+                            throw new Error('pull invalidated');
+                        client._delivery.rememberCommittedSeqState?.(ns);
                         pageTrackerSnapshot = client._seqTracker.snapshotNamespace?.(ns) ?? null;
                         if (commitTarget > pageContigBefore) {
                             trackerMutated = true;
@@ -2655,12 +3131,16 @@ export class V2E2EECoordinator {
                         if (contigAdvanced) {
                             await client._commitSeqTrackerState(ns);
                             this.ensureDeliveryCurrent(ns, generation);
+                            if (client._delivery.isSeqNamespaceGenerationCurrent?.(ns, namespaceGeneration) === false)
+                                throw new Error('pull invalidated');
                             if (pageCount === 1 && deferredServerCursor > 0)
                                 this.clearForwardCursor(ns, ackSeq);
                         }
+                        committedAckSeq = ackSeq;
                     }
                     catch (exc) {
                         if (trackerMutated && Number(client._v2RuntimeGeneration ?? 0) === generation
+                            && client._delivery.isSeqNamespaceGenerationCurrent?.(ns, namespaceGeneration) !== false
                             && client._rpcPipeline?.isPullNamespaceCurrent?.(ns) !== false
                             && typeof client._seqTracker.restoreNamespaceSnapshot === 'function') {
                             (client._seqTracker._restoreNamespaceSnapshotPreservingPush ?? client._seqTracker.restoreNamespaceSnapshot)
@@ -2688,18 +3168,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 +3179,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,28 +3210,12 @@ 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) {
-                    const nextKey = pullGateKeyForClient(client, 'group.v2.pull', {
-                        group_id: gid, after_seq: nextAfter, force: opts?.force === true, limit,
-                        _group_cursor_params: cursorParams,
-                    }, `${ns}|forward|after=${nextAfter}|force=${String(Boolean(opts?.force))}|limit=${limit}`);
-                    await client._rpcPipeline.yieldPullGate(pullGateKey, nextKey, true);
-                    pullGateKey = nextKey;
-                }
-                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 +3223,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, background);
+            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;
@@ -2792,10 +3249,12 @@ export class V2E2EECoordinator {
             throw error;
         }
     }
-    async confirmForwardGroupAck(groupId, upToSeq, groupAid) {
+    async confirmForwardGroupAck(groupId, upToSeq, groupAid, background = false) {
         const ns = `group:${String(groupId ?? '').trim()}`;
+        const generation = Number(this.client._v2RuntimeGeneration ?? 0);
         try {
-            const result = await this.ackGroupV2ForForward(groupId, upToSeq, groupAid);
+            const result = await this.ackGroupV2ForForward(groupId, upToSeq, groupAid, background);
+            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,17 +3262,19 @@ 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;
         }
     }
     async ackGroupV2(groupId, upToSeq, groupAid) {
         return this.ackGroupV2WithConfirmation(groupId, upToSeq, groupAid, false);
     }
-    async ackGroupV2ForForward(groupId, upToSeq, groupAid) {
-        return this.ackGroupV2WithConfirmation(groupId, upToSeq, groupAid, true);
+    async ackGroupV2ForForward(groupId, upToSeq, groupAid, background = false) {
+        return this.ackGroupV2WithConfirmation(groupId, upToSeq, groupAid, true, background);
     }
-    async ackGroupV2WithConfirmation(groupId, upToSeq, groupAid, requireServerWatermark) {
+    async ackGroupV2WithConfirmation(groupId, upToSeq, groupAid, requireServerWatermark, background) {
         const client = this.client;
         const gid = String(groupId ?? '').trim();
         if (!gid)
@@ -2831,7 +3292,9 @@ export class V2E2EECoordinator {
             return { acked: 0 };
         const inlineAckGeneration = client._delivery.captureGroupInlineAckGeneration();
         client._clientLog.debug(`group.v2.ack send: group=${gid}, ns=${ns}, up_to_seq=${seq}`);
-        const result = await client._callRawV2Rpc('group.v2.ack', withExplicitGroupAid({ group_id: gid, up_to_seq: seq }, explicitGroupAid));
+        const result = await client._callRawV2Rpc('group.v2.ack', withExplicitGroupAid({ group_id: gid, up_to_seq: seq,
+            ...(background === undefined ? {} : { _rpc_background: background, _rpc_foreground: !background }),
+        }, explicitGroupAid));
         const actualAckSeq = requireServerWatermark
             ? client._delivery.resolveForwardAckSeq(result, seq)
             : client._delivery.resolveActualAckSeq(result, seq);