@agentunion/fastaun 0.5.33 → 0.5.34

package/dist/client/v2-e2ee.js

@@ -73,10 +73,10 @@ function strictWindowSeq(value, field, positive = false) {
 function safeNonNegativeSeq(value) {
     return typeof value === 'number' && Number.isSafeInteger(value) && value >= 0 ? value : null;
 }
-function strictWindowLimit(value) {
+function strictWindowLimit(value, maxLimit = V2_PULL_MAX_PAGE_LIMIT) {
     const limit = strictWindowSeq(value, 'limit', true);
-    if (limit > V2_PULL_MAX_PAGE_LIMIT)
-        throw new ValidationError(`limit must be <= ${V2_PULL_MAX_PAGE_LIMIT}`);
+    if (limit > maxLimit)
+        throw new ValidationError(`limit must be <= ${maxLimit}`);
     return limit;
 }
 function deduplicateWindowMessages(value, lowerSeq, upperSeq, boundary) {
@@ -1316,12 +1316,91 @@ export class V2E2EECoordinator {
         }
         return plaintext;
     }
+    async pullPeerV2Volatile(senderAid, opts = {}) {
+        const client = this.client;
+        const generation = Number(client._v2RuntimeGeneration ?? 0);
+        const inlineGeneration = client._delivery.captureInlineAckGeneration?.();
+        const ns = client._delivery.peerNamespace(senderAid);
+        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 maxPages = Math.max(1, Math.min(100, Number(opts.maxPages ?? 100) || 100));
+        const maxPageBytes = client._syncChannelCoordinator?.volatilePageBytes?.() ?? 262144;
+        await client._ensureV2SessionReady('message.pull');
+        return await client._delivery.runPeerPageSerialized(`${ns}|volatile`, async () => {
+            const messages = [];
+            let pages = 0, rawCount = 0, hasMore = false;
+            while (pages < maxPages) {
+                this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+                if (opts.background && !client._delivery.hasP2pApplicationSubscription())
+                    break;
+                let cursor = client._delivery.peerVolatilePullCursor(senderAid);
+                const request = () => client._callRawV2Rpc('message.v2.pull', {
+                    cursor_scope: 'peer', sender_aid: senderAid, device_id: client._deviceId, slot_id: client._slotId,
+                    storage_scope: 'volatile', limit, max_page_bytes: maxPageBytes,
+                    ...(cursor ? { after_volatile_cursor: cursor } : {}),
+                    ...(opts.background ? { _rpc_background: true } : { _rpc_foreground: true }),
+                });
+                const reservation = await client._dispatcher?._reserveMessageCapacity?.(limit);
+                try {
+                    this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+                    let response;
+                    try {
+                        response = await request();
+                    }
+                    catch (error) {
+                        this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+                        if (!cursor || !String(error instanceof Error ? error.message : error).toLowerCase().includes('volatile cursor epoch mismatch'))
+                            throw error;
+                        client._delivery.setPeerVolatilePullCursor(senderAid, '');
+                        cursor = '';
+                        response = await request();
+                    }
+                    this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+                    if (!response || response.storage_scope !== 'volatile' || !Array.isArray(response.messages)
+                        || response.messages.length > limit || typeof response.volatile_has_more !== 'boolean'
+                        || response.has_more !== response.volatile_has_more || typeof response.next_volatile_cursor !== 'string'
+                        || new TextEncoder().encode(JSON.stringify(response)).byteLength > maxPageBytes)
+                        throw new ValidationError('invalid volatile peer page');
+                    const rows = response.messages;
+                    for (const row of rows) {
+                        if (!isJsonObject(row) || row.storage !== 'volatile' || String(row.sender_aid ?? row.from_aid ?? row.from ?? '') !== senderAid)
+                            throw new ValidationError('volatile peer sender mismatch');
+                    }
+                    const handlers = client._delivery.snapshotApplicationHandlers?.();
+                    await this.withApplicationPage(ns, 'pull', async () => {
+                        const delivered = await this.publishV2VolatileMessages(rows, 'pull', true);
+                        this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+                        if (opts.retainMessages !== false)
+                            messages.push(...delivered);
+                    }, reservation, handlers);
+                    this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
+                    if (!rows.every(row => client._delivery.isVolatileSeen(row)))
+                        throw new E2EEError('volatile peer delivery remains pending');
+                    client._delivery.setPeerVolatilePullCursor(senderAid, response.next_volatile_cursor);
+                    pages++;
+                    rawCount += rows.length;
+                    hasMore = response.volatile_has_more;
+                    if (!hasMore)
+                        break;
+                    if (response.next_volatile_cursor === cursor)
+                        throw new E2EEError('volatile peer cursor made no progress');
+                }
+                finally {
+                    reservation?.release();
+                }
+            }
+            return { sender_aid: senderAid, messages, complete: !hasMore, pages, raw_count: rawCount, volatile_has_more: hasMore };
+        });
+    }
     async pullPeerV2(senderAid, opts = {}) {
         const client = this.client;
         const generation = Number(client._v2RuntimeGeneration ?? 0);
         const inlineGeneration = client._delivery.captureInlineAckGeneration?.();
         const pullVersion = opts.peerPullVersion ?? client._delivery.capturePeerTailVersion(senderAid);
         await client._ensureV2SessionReady('message.pull');
+        const volatile = opts.background && opts.window_mode !== 'tail' && client._syncChannelCoordinator?.needsSplit?.()
+            ? await this.pullPeerV2Volatile(senderAid, { background: true, limit: opts.limit, retainMessages: opts.retainMessages }) : null;
         this.ensureDeliveryCurrent(client._delivery.peerNamespace(senderAid), generation, inlineGeneration);
         const ns = await client._delivery.initializePeer(senderAid);
         this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
@@ -1337,14 +1416,14 @@ export class V2E2EECoordinator {
         if (mode !== 'tail' && 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 = [];
+        const decoded = volatile?.messages ?? [];
         let complete = false;
         let head = after;
         let tailVolatileHasMore;
         let tailServerAck = null;
         let pages = 0;
-        let rawCount = 0;
-        let forwardVolatileHasMore = false;
+        let rawCount = volatile?.raw_count ?? 0;
+        let forwardVolatileHasMore = volatile?.volatile_has_more ?? false;
         let durableAck = 0;
         let initializedAck = false;
         let confirmedAck = 0;
@@ -1380,7 +1459,7 @@ export class V2E2EECoordinator {
             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))
+                if (start < Math.max(requestAfter, retention) || (!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'
@@ -1492,6 +1571,7 @@ export class V2E2EECoordinator {
                 }
                 catch (error) {
                     fetched.reservation?.release();
+                    client._syncChannelCoordinator?.releaseResponse(fetched.response);
                     throw error;
                 }
             });
@@ -1606,13 +1686,14 @@ export class V2E2EECoordinator {
                     }
                     finally {
                         reservation?.release();
+                        client._syncChannelCoordinator?.releaseResponse(response);
                     }
                 });
                 if (!page)
                     break;
                 this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
                 rawCount += page.response.messages.length;
-                forwardVolatileHasMore = page.response.volatile_has_more === true;
+                forwardVolatileHasMore = volatile ? volatile.volatile_has_more === true : page.response.volatile_has_more === true;
                 if (opts.retainMessages !== false)
                     decoded.push(...page.messages);
                 head = page.head;
@@ -1624,7 +1705,7 @@ export class V2E2EECoordinator {
                 }
                 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;
+                complete = !more && !forwardVolatileHasMore;
                 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;
@@ -1640,7 +1721,9 @@ export class V2E2EECoordinator {
             stopping.abort();
             for (const pending of prefetched) {
                 try {
-                    (await (pending.prepared ?? pending.response))?.reservation?.release();
+                    const fetched = await (pending.prepared ?? pending.response);
+                    fetched?.reservation?.release();
+                    client._syncChannelCoordinator?.releaseResponse(fetched?.response);
                 }
                 catch { }
             }
@@ -1681,7 +1764,7 @@ export class V2E2EECoordinator {
             || (response.slot_id !== undefined && response.slot_id !== client._slotId))
             throw new ValidationError('peer response scope mismatch');
     }
-    async ackPeerV2(senderAid, upToSeq, volatileCursors = [], volatileIds = []) {
+    async ackPeerV2(senderAid, upToSeq, volatileCursors = [], volatileIds = [], background = true) {
         const client = this.client;
         const generation = Number(client._v2RuntimeGeneration ?? 0);
         const inlineGeneration = client._delivery.captureInlineAckGeneration?.();
@@ -1696,7 +1779,7 @@ export class V2E2EECoordinator {
         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 });
+            ...(volatileIds.length ? { volatile_ids: volatileIds } : {}), _rpc_background: background, _rpc_foreground: !background });
         this.ensureDeliveryCurrent(ns, generation, inlineGeneration);
         this.validatePeerResponse(result, senderAid);
         const actual = safeNonNegativeSeq(result.peer_ack_seq ?? result.effective_ack_seq ?? result.up_to_seq);
@@ -2710,7 +2793,7 @@ export class V2E2EECoordinator {
             throw new ValidationError('group_id is required');
         let groupAid = String(params.group_aid ?? '').trim();
         const afterSeq = strictWindowSeq(params.after_seq ?? 0, 'after_seq');
-        const limit = strictWindowLimit(params.limit ?? V2_PULL_DEFAULT_PAGE_LIMIT);
+        const limit = strictWindowLimit(params.limit ?? V2_PULL_DEFAULT_PAGE_LIMIT, 200);
         const ns = `group:${groupId}`;
         const namespaceGeneration = client._delivery.captureSeqNamespaceGeneration?.(ns);
         const explicitCursorParams = isJsonObject(params._group_cursor_params)
@@ -2823,6 +2906,7 @@ export class V2E2EECoordinator {
         await this.pullGroupV2(params.group_id, params.after_seq, params.limit, {
             gateLocked: true,
             explicitAfterSeq: true,
+            retainMessages: false,
             force: params.force === true,
         });
     }
@@ -2871,6 +2955,12 @@ export class V2E2EECoordinator {
             }), opts?.background !== false);
         }
         const decrypted = [];
+        let decryptedCount = 0;
+        const collectMessage = (message) => {
+            decryptedCount += 1;
+            if (opts?.retainMessages !== false)
+                decrypted.push(message);
+        };
         const wireGroupId = String(opts?.wireGroupId ?? groupId ?? '').trim() || gid;
         const cursorParams = opts?.cursorParams ?? {};
         const ownsCursor = opts?.ownsCursor !== false;
@@ -2886,18 +2976,21 @@ export class V2E2EECoordinator {
         let lastAutoAckSeq = 0;
         let pendingAckSeq = deferredForwardAck;
         let committedAckSeq = ownsCursor ? client._seqTracker.getContiguousSeq(ns) : 0;
+        const syncRetainedPages = new Set();
         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({
+                const response = 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);
+                syncRetainedPages.add(response);
+                return response;
             }, background);
         };
         const maxPages = Math.max(1, Math.min(100, Math.trunc(Number(opts?.maxPages ?? 100) || 100)));
@@ -2998,92 +3091,121 @@ export class V2E2EECoordinator {
                 else {
                     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);
+                try {
+                    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);
+                            }
+                            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`);
                         }
-                        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`);
                     }
-                }
-                const resultGroupAid = String(result.group_aid ?? result.groupAid ?? '').trim();
-                if (resultGroupAid)
-                    groupAid = resultGroupAid;
-                const eventGroupAid = resultGroupAid || groupAid || gid;
-                const pageMessages = (Array.isArray(result.messages) ? result.messages : []);
-                const messages = deduplicateForwardPageMessages(pageMessages, nextAfterSeq);
-                const cursor = isJsonObject(result.cursor) ? result.cursor : null;
-                const hasMoreField = Object.prototype.hasOwnProperty.call(result, 'has_more');
-                const hasMore = result.has_more === true;
-                const serverHead = Math.max(safeNonNegativeSeq(result.latest_message_seq) ?? 0, safeNonNegativeSeq(cursor?.latest_seq) ?? 0);
-                client._clientLog.debug(`group.v2.pull page response: group=${gid}, page=${pageCount}, raw_count=${messages.length}, stale_count=${Math.max(0, pageMessages.length - messages.length)}, has_more=${String(result.has_more ?? '')}, server_head=${serverHead}, cursor_current=${String(cursor?.current_seq ?? '')}`);
-                for (const msg of messages) {
-                    client._logMessageDebug('pull-raw', 'group.v2.pull', 'group.message_created', msg);
-                }
-                const seqs = messages
-                    .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;
-                if (seqs.length > 0) {
-                    pageMaxSeq = Math.max(...seqs);
-                }
-                const pageContiguousSeq = contiguousPullSeq(pageContigBefore, seqs, result.contiguous_seq);
-                if (!pipelineRunning && ownsCursor && shouldContinueForwardPage({
-                    allowEmptyCoverage: true,
-                    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;
-                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 () => {
+                    const resultGroupAid = String(result.group_aid ?? result.groupAid ?? '').trim();
+                    if (resultGroupAid)
+                        groupAid = resultGroupAid;
+                    const eventGroupAid = resultGroupAid || groupAid || gid;
+                    const pageMessages = (Array.isArray(result.messages) ? result.messages : []);
+                    const messages = deduplicateForwardPageMessages(pageMessages, nextAfterSeq);
+                    const cursor = isJsonObject(result.cursor) ? result.cursor : null;
+                    const hasMoreField = Object.prototype.hasOwnProperty.call(result, 'has_more');
+                    const hasMore = result.has_more === true;
+                    const serverHead = Math.max(safeNonNegativeSeq(result.latest_message_seq) ?? 0, safeNonNegativeSeq(cursor?.latest_seq) ?? 0);
+                    client._clientLog.debug(`group.v2.pull page response: group=${gid}, page=${pageCount}, raw_count=${messages.length}, stale_count=${Math.max(0, pageMessages.length - messages.length)}, has_more=${String(result.has_more ?? '')}, server_head=${serverHead}, cursor_current=${String(cursor?.current_seq ?? '')}`);
                     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}`);
+                        client._logMessageDebug('pull-raw', 'group.v2.pull', 'group.message_created', msg);
+                    }
+                    const seqs = messages
+                        .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;
+                    if (seqs.length > 0) {
+                        pageMaxSeq = Math.max(...seqs);
+                    }
+                    const pageContiguousSeq = contiguousPullSeq(pageContigBefore, seqs, result.contiguous_seq);
+                    if (!pipelineRunning && ownsCursor && shouldContinueForwardPage({
+                        allowEmptyCoverage: true,
+                        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 = decryptedCount;
+                    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);
+                                        }
+                                        collectMessage(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 ?? ''),
@@ -3100,231 +3222,211 @@ export class V2E2EECoordinator {
                                         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);
+                                    await client._publishPulledMessage('group.message_created', ns, seq, v1Msg, false);
+                                    collectMessage(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,
-                                    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);
-                                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 (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);
+                                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 ?? '' });
+                                        }
                                     }
-                                    else {
-                                        client._markPublishedSeq(ns, seq);
+                                    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);
+                                        }
+                                        collectMessage(plaintext);
                                     }
-                                    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;
                             }
-                            else {
-                                client._clientLog.debug(`group.v2.pull skipping V1 envelope group=${gid} seq=${seq} payload_type=${payloadObj ? String(payloadObj.type ?? '') : '<none>'} (V1 E2EE removed)`);
+                            if (version !== 'v2') {
+                                client._clientLog.debug(`group.v2.pull skipping non-V2 row group=${gid} seq=${seq} version=${String(msg.version ?? '')}`);
+                                continue;
                             }
-                            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._markPublishedSeq(ns, seq);
-                        }
-                        decrypted.push(plaintext);
-                        client._logMessageDebug('decrypt-ok', 'group.v2.pull', 'group.message_created', plaintext);
-                    }
-                    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
-                            ? Math.max(commitTarget, window.head) : commitTarget;
-                        if (deliveryTarget > pageContigBefore) {
-                            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;
-                            client._seqTracker.forceContiguousSeq(ns, commitTarget);
-                            if (effectiveFloor > pageContigBefore) {
-                                client._clientLog.info(`group.v2.pull floor advance: ns=${ns} contiguous=${pageContigBefore} -> effective_floor=${effectiveFloor} retention_floor=${retentionFloor} visibility_floor=${visibilityFloor}`);
+                            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 (deferredServerCursor > pageContigBefore && pageCount === 1) {
-                                client._clientLog.info(`group.v2.pull restore local A from deferred server ACK cursor: group=${gid}, ns=${ns}, contiguous=${pageContigBefore} -> current_seq=${deferredServerCursor}`);
+                            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 (seqs.length > 0) {
-                                client._clientLog.debug(`group.v2.pull force contiguous: group=${gid}, ns=${ns}, page_max_seq=${pageMaxSeq}, previous=${pageContigBefore}`);
+                            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._markPublishedSeq(ns, seq);
                             }
+                            collectMessage(plaintext);
+                            client._logMessageDebug('decrypt-ok', 'group.v2.pull', 'group.message_created', plaintext);
                         }
-                        ackSeq = client._seqTracker.getContiguousSeq(ns);
-                        contigAdvanced = ackSeq !== pageContigBefore;
-                        if (contigAdvanced) {
-                            await client._commitSeqTrackerState(ns);
+                        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
+                                ? Math.max(commitTarget, window.head) : commitTarget;
+                            if (deliveryTarget > pageContigBefore) {
+                                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');
-                            if (pageCount === 1 && deferredServerCursor > 0)
-                                this.clearForwardCursor(ns, ackSeq);
+                            client._delivery.rememberCommittedSeqState?.(ns);
+                            pageTrackerSnapshot = client._seqTracker.snapshotNamespace?.(ns) ?? null;
+                            if (commitTarget > pageContigBefore) {
+                                trackerMutated = true;
+                                client._seqTracker.forceContiguousSeq(ns, commitTarget);
+                                if (effectiveFloor > pageContigBefore) {
+                                    client._clientLog.info(`group.v2.pull floor advance: ns=${ns} contiguous=${pageContigBefore} -> effective_floor=${effectiveFloor} retention_floor=${retentionFloor} visibility_floor=${visibilityFloor}`);
+                                }
+                                if (deferredServerCursor > pageContigBefore && pageCount === 1) {
+                                    client._clientLog.info(`group.v2.pull restore local A from deferred server ACK cursor: group=${gid}, ns=${ns}, contiguous=${pageContigBefore} -> current_seq=${deferredServerCursor}`);
+                                }
+                                if (seqs.length > 0) {
+                                    client._clientLog.debug(`group.v2.pull force contiguous: group=${gid}, ns=${ns}, page_max_seq=${pageMaxSeq}, previous=${pageContigBefore}`);
+                                }
+                            }
+                            ackSeq = client._seqTracker.getContiguousSeq(ns);
+                            contigAdvanced = ackSeq !== pageContigBefore;
+                            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;
                         }
-                        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)
-                                .call(client._seqTracker, ns, pageTrackerSnapshot);
+                        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)
+                                    .call(client._seqTracker, ns, pageTrackerSnapshot);
+                            }
+                            client._clientLog.error?.(`group.v2.pull Forward commit rolled back: group=${gid} ns=${ns} target=${commitTarget} error=${formatE2EEError(exc)}`);
+                            throw exc;
                         }
-                        client._clientLog.error?.(`group.v2.pull Forward commit rolled back: group=${gid} ns=${ns} target=${commitTarget} error=${formatE2EEError(exc)}`);
-                        throw exc;
                     }
+                    for (const fetch of deferredKeyFetches.values()) {
+                        this.scheduleSenderIKFetch(fetch.fromAid, fetch.senderDeviceId, fetch.groupId);
+                    }
+                    if (ownsCursor && parsedCursorCurrentSeq !== null && cursorCurrentSeq > ackSeq) {
+                        this.recordForwardCursor(ns, cursorCurrentSeq, ackSeq);
+                    }
+                    // 无本页 cursor.current_seq 时，只有本页成功提交了比已知 cursor
+                    // 更高的 A 才新增 ACK 义务；空页不得因已有本地 A 重复确认。
+                    const knownServerCursorSeq = hasServerCursor
+                        ? cursorCurrentSeq
+                        : (ownsCursor && pageCount === 1 ? deferredServerCursor : 0);
+                    const ackNeeded = ackSeq > 0
+                        && ackSeq > lastAutoAckSeq
+                        && ownsCursor
+                        && ((hasServerCursor && ackSeq > cursorCurrentSeq)
+                            || (contigAdvanced && ackSeq > knownServerCursorSeq));
+                    if (ackNeeded) {
+                        this.recordForwardAck(ns, 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,
+                        pulledCount: decryptedCount - pageDecryptedBefore,
+                        remaining: result.remaining,
+                        hasMore: hasMoreField ? hasMore : undefined,
+                        currentSeq: client._seqTracker.getContiguousSeq(ns),
+                        targetSeq: serverHead,
+                    });
+                    const nextAfter = Math.max(pageContiguousSeq, nextAfterSeq);
+                    if (!ownsCursor)
+                        break;
+                    const rawCount = messages.length;
+                    if (blockedSeq > 0)
+                        break;
+                    const shouldContinue = shouldContinueForwardPage({
+                        allowEmptyCoverage: true,
+                        rawCount,
+                        nextAfterSeq,
+                        nextAfter,
+                        limit,
+                        hasMoreField,
+                        hasMore,
+                        serverHead,
+                        observedUpper: Math.max(client._seqTracker.getMaxSeenSeq(ns), Number(client._delivery.pendingPullUpper?.(ns) ?? 0)),
+                        pendingAckSeq,
+                    });
+                    const shouldContinueForPipeline = shouldContinueForwardPage({
+                        allowEmptyCoverage: true,
+                        rawCount,
+                        nextAfterSeq,
+                        nextAfter,
+                        limit,
+                        hasMoreField,
+                        hasMore,
+                        serverHead,
+                        observedUpper: Math.max(client._seqTracker.getMaxSeenSeq(ns), Number(client._delivery.pendingPullUpper?.(ns) ?? 0)),
+                        pendingAckSeq: 0,
+                    });
+                    if (!shouldContinue)
+                        break;
+                    if (shouldContinueForPipeline && !pipelineRunning && limit >= V2_PULL_MAX_PAGE_LIMIT) {
+                        startPipeline(nextAfter);
+                    }
+                    const tailDelayMs = pipelineRunning ? 0 : v2PullTailDelayMs(rawCount, limit);
+                    if (tailDelayMs > 0)
+                        await v2Sleep(tailDelayMs);
+                    nextAfterSeq = nextAfter;
                 }
-                for (const fetch of deferredKeyFetches.values()) {
-                    this.scheduleSenderIKFetch(fetch.fromAid, fetch.senderDeviceId, fetch.groupId);
-                }
-                if (ownsCursor && parsedCursorCurrentSeq !== null && cursorCurrentSeq > ackSeq) {
-                    this.recordForwardCursor(ns, cursorCurrentSeq, ackSeq);
-                }
-                // 无本页 cursor.current_seq 时，只有本页成功提交了比已知 cursor
-                // 更高的 A 才新增 ACK 义务；空页不得因已有本地 A 重复确认。
-                const knownServerCursorSeq = hasServerCursor
-                    ? cursorCurrentSeq
-                    : (ownsCursor && pageCount === 1 ? deferredServerCursor : 0);
-                const ackNeeded = ackSeq > 0
-                    && ackSeq > lastAutoAckSeq
-                    && ownsCursor
-                    && ((hasServerCursor && ackSeq > cursorCurrentSeq)
-                        || (contigAdvanced && ackSeq > knownServerCursorSeq));
-                if (ackNeeded) {
-                    this.recordForwardAck(ns, 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,
-                    pulledCount: decrypted.length - pageDecryptedBefore,
-                    remaining: result.remaining,
-                    hasMore: hasMoreField ? hasMore : undefined,
-                    currentSeq: client._seqTracker.getContiguousSeq(ns),
-                    targetSeq: serverHead,
-                });
-                const nextAfter = Math.max(pageContiguousSeq, nextAfterSeq);
-                if (!ownsCursor)
-                    break;
-                const rawCount = messages.length;
-                if (blockedSeq > 0)
-                    break;
-                const shouldContinue = shouldContinueForwardPage({
-                    allowEmptyCoverage: true,
-                    rawCount,
-                    nextAfterSeq,
-                    nextAfter,
-                    limit,
-                    hasMoreField,
-                    hasMore,
-                    serverHead,
-                    observedUpper: Math.max(client._seqTracker.getMaxSeenSeq(ns), Number(client._delivery.pendingPullUpper?.(ns) ?? 0)),
-                    pendingAckSeq,
-                });
-                const shouldContinueForPipeline = shouldContinueForwardPage({
-                    allowEmptyCoverage: true,
-                    rawCount,
-                    nextAfterSeq,
-                    nextAfter,
-                    limit,
-                    hasMoreField,
-                    hasMore,
-                    serverHead,
-                    observedUpper: Math.max(client._seqTracker.getMaxSeenSeq(ns), Number(client._delivery.pendingPullUpper?.(ns) ?? 0)),
-                    pendingAckSeq: 0,
-                });
-                if (!shouldContinue)
-                    break;
-                if (shouldContinueForPipeline && !pipelineRunning && limit >= V2_PULL_MAX_PAGE_LIMIT) {
-                    startPipeline(nextAfter);
+                finally {
+                    client._syncChannelCoordinator?.releaseResponse(result);
+                    syncRetainedPages.delete(result);
                 }
-                const tailDelayMs = pipelineRunning ? 0 : v2PullTailDelayMs(rawCount, limit);
-                if (tailDelayMs > 0)
-                    await v2Sleep(tailDelayMs);
-                nextAfterSeq = nextAfter;
             }
         }
         finally {
             await stopPipeline();
+            for (const response of syncRetainedPages)
+                client._syncChannelCoordinator?.releaseResponse(response);
+            syncRetainedPages.clear();
         }
         if (pageCount >= maxPages) {
             client._clientLog.warn(`group.v2.pull reached max_pages=${maxPages} group=${gid} after_seq=${nextAfterSeq}`);
@@ -3337,7 +3439,8 @@ export class V2E2EECoordinator {
             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}`);
+        client._clientLog.debug(`group.v2.pull done: group=${gid}, requested_after_seq=${afterSeq}, pages=${pageCount}, decrypted=${decryptedCount}, ns=${ns}`);
+        opts?.onMessageCount?.(decryptedCount);
         return decrypted;
     }
     async pullGroupV2(groupId, afterSeq = 0, limit = 50, opts) {