@agentunion/fastaun 0.5.17 → 0.5.19

package/dist/client/v2-e2ee.js

@@ -10,6 +10,52 @@ const V2_GROUP_STALE_BOOTSTRAP_CODE = -33054;
 const V2_PULL_DEFAULT_PAGE_LIMIT = 50;
 const V2_PULL_MAX_PAGE_LIMIT = 50;
 const V2_SENDER_IK_SYNC_FETCH_TIMEOUT_MS = 3_000;
+const V2_PULL_PIPELINE_QUEUE_CAPACITY = 100;
+class V2PullPageQueue {
+    capacity;
+    items = [];
+    takers = [];
+    putters = [];
+    queuedWeight = 0;
+    closed = false;
+    constructor(capacity) {
+        this.capacity = capacity;
+    }
+    async put(item, weight = 1) {
+        const itemWeight = Math.max(1, Math.trunc(weight));
+        while (!this.closed && this.items.length > 0 && this.queuedWeight + itemWeight > this.capacity) {
+            await new Promise((resolve) => this.putters.push(resolve));
+        }
+        if (this.closed)
+            return false;
+        const taker = this.takers.shift();
+        if (taker)
+            taker(item);
+        else {
+            this.items.push(item);
+            this.queuedWeight += itemWeight;
+        }
+        return true;
+    }
+    async take() {
+        const item = this.items.shift();
+        if (item !== undefined) {
+            this.queuedWeight = Math.max(0, this.queuedWeight - Math.max(1, Math.trunc(Number(item.weight ?? 1))));
+            this.putters.shift()?.();
+            return item;
+        }
+        if (this.closed)
+            return undefined;
+        return await new Promise((resolve) => this.takers.push(resolve));
+    }
+    close() {
+        this.closed = true;
+        for (const resolve of this.takers.splice(0))
+            resolve(undefined);
+        for (const resolve of this.putters.splice(0))
+            resolve();
+    }
+}
 function pullGateKeyForClient(client, method, params, fallback) {
     const key = client._rpcPipeline?.pullGateKeyForCall?.(method, params);
     return typeof key === 'string' && key ? key : fallback;
@@ -779,11 +825,12 @@ export class V2E2EECoordinator {
                     client._clientLog.debug(`V2 sender IK pending retry delivered: key=${key}`);
                     continue;
                 }
-                pending.delete(key);
                 const seq = Number(entry.msg.seq ?? 0);
                 if (entry.groupId) {
-                    if (client._delivery.isSelfSentGroupMessage?.(entry.msg))
+                    if (client._delivery.isSelfSentGroupMessage?.(entry.msg)) {
+                        pending.delete(key);
                         continue;
+                    }
                     plaintext = normalizeGroupMentionMode(plaintext, entry.msg, entry.msg.envelope_json);
                     plaintext.group_id = entry.groupId;
                     await client._publishPulledMessage('group.message_created', `group:${entry.groupId}`, seq, plaintext, false, 'pending_retry');
@@ -791,6 +838,8 @@ export class V2E2EECoordinator {
                 else {
                     await client._publishPulledMessage('message.received', `p2p:${client._aid ?? ''}`, seq, plaintext, false, 'pending_retry');
                 }
+                if (generationIsCurrent())
+                    pending.delete(key);
                 client._clientLog.debug(`V2 sender IK pending retry delivered: key=${key}`);
             }
         }
@@ -1076,6 +1125,11 @@ export class V2E2EECoordinator {
             history_error: { code: 'decrypt_failed', message: reason },
         };
     }
+    ensureDeliveryCurrent(ns, generation) {
+        if (Number(this.client._v2RuntimeGeneration ?? 0) !== generation
+            || this.client._rpcPipeline?.isPullNamespaceCurrent?.(ns) === false)
+            throw new StateError('pull invalidated');
+    }
     async decodeP2PWindowMessage(msg, publish, history, source, orderedPublish = false) {
         const client = this.client;
         const seq = strictWindowSeq(msg.seq, 'messages[].seq', true);
@@ -1097,6 +1151,11 @@ export class V2E2EECoordinator {
                     payload: payload,
                     encrypted: false,
                 };
+                if (msg.sender_device_id !== undefined)
+                    plaintext.sender_device_id = msg.sender_device_id;
+                const direction = String(msg.direction ?? '').trim();
+                if (direction)
+                    plaintext.direction = direction;
                 attachGatewayProximity(plaintext, msg);
             }
             else if (isJsonObject(payload)
@@ -1114,6 +1173,9 @@ export class V2E2EECoordinator {
             client._clientLog.warn(`P2P Tail 单条消息解密失败，连续性证明仍保留: seq=${seq}`);
             return null;
         }
+        if (publish && client._delivery.isSelfSentP2PMessage?.(plaintext)) {
+            return plaintext;
+        }
         if (publish) {
             const event = client._delivery.p2pAppEventForMessage(plaintext);
             await client._publishAppEvent(event.event, event.payload, source);
@@ -1166,6 +1228,8 @@ export class V2E2EECoordinator {
                     payload: payload,
                     encrypted: false,
                 };
+                if (msg.sender_device_id !== undefined)
+                    plaintext.sender_device_id = msg.sender_device_id;
                 plaintext = normalizeGroupMentionMode(plaintext, msg, msg.envelope_json);
                 attachGatewayProximity(plaintext, msg);
             }
@@ -1194,6 +1258,7 @@ export class V2E2EECoordinator {
     }
     async pullV2TailInternal(params, deferPublish = false) {
         const client = this.client;
+        const generation = Number(client._v2RuntimeGeneration ?? 0);
         if (params.window_mode !== 'tail')
             throw new ValidationError('window_mode must equal tail');
         if ('ack_up_to_seq' in params || params.force === true)
@@ -1208,6 +1273,14 @@ export class V2E2EECoordinator {
         }, `${ns}|tail|after=${afterSeq}|limit=${limit}`);
         const result = await client._callRawV2Rpc('message.v2.pull', { window_mode: 'tail', after_seq: afterSeq, limit, _rpc_foreground: true }, pullGateKey);
         const page = validateTailPage(result, afterSeq, limit);
+        const decoded = [];
+        for (const msg of page.messages) {
+            this.ensureDeliveryCurrent(ns, generation);
+            const plaintext = await this.decodeP2PWindowMessage(msg, true, false, 'tail', deferPublish);
+            if (plaintext)
+                decoded.push(plaintext);
+        }
+        this.ensureDeliveryCurrent(ns, generation);
         if (ns) {
             client._seqTracker.commitTailWindow(ns, {
                 windowStartSeq: page.windowStart,
@@ -1217,12 +1290,7 @@ export class V2E2EECoordinator {
             });
             client._persistSeq(ns);
             await client._saveSeqTrackerState?.();
-        }
-        const decoded = [];
-        for (const msg of page.messages) {
-            const plaintext = await this.decodeP2PWindowMessage(msg, true, false, 'tail', deferPublish);
-            if (plaintext)
-                decoded.push(plaintext);
+            this.ensureDeliveryCurrent(ns, generation);
         }
         const ack = ns ? client._seqTracker.getContiguousSeq(ns) : 0;
         if (ns)
@@ -1252,6 +1320,7 @@ export class V2E2EECoordinator {
     }
     async pullV2Impl(afterSeq = 0, limit = 50, opts) {
         const client = this.client;
+        const generation = Number(client._v2RuntimeGeneration ?? 0);
         await client._ensureV2SessionReady('message.pull');
         const ns = client._aid ? `p2p:${client._aid}` : '';
         if (ns)
@@ -1290,288 +1359,434 @@ export class V2E2EECoordinator {
         let lastAutoAckSeq = 0;
         let pendingAckSeq = deferredForwardAck;
         const maxPages = Math.max(1, Math.min(100, Math.trunc(Number(opts?.maxPages ?? 100) || 100)));
-        while (pageCount < maxPages) {
-            pageCount += 1;
-            const requestedVolatileCursor = volatileCursor;
-            const ackUpToSeq = pendingAckSeq;
-            const 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>'}`);
-            let result;
-            try {
-                result = await client._callRawV2Rpc('message.v2.pull', {
-                    after_seq: nextAfterSeq,
-                    limit,
-                    ...(volatileCursor ? { after_volatile_cursor: volatileCursor } : {}),
-                    ...(opts?.force ? { force: true } : {}),
-                    ...(ackUpToSeq > 0 ? { ack_up_to_seq: ackUpToSeq } : {}),
-                }, pullGateKey);
-            }
-            catch (exc) {
-                if (!volatileCursor || !String(exc instanceof Error ? exc.message : exc).toLowerCase().includes('volatile cursor epoch mismatch')) {
-                    throw exc;
+        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, startVolatileCursor) => {
+            if (pipelineRunning || pageCount >= maxPages || limit < V2_PULL_MAX_PAGE_LIMIT)
+                return;
+            pipelineRunning = true;
+            pipelineProducer = (async () => {
+                let producerAfterSeq = startAfterSeq;
+                let producerVolatileCursor = startVolatileCursor;
+                for (let produced = pageCount; produced < maxPages; produced += 1) {
+                    if (pipelineStopped)
+                        break;
+                    const requestedVolatileCursor = producerVolatileCursor;
+                    const result = await client._callRawV2Rpc('message.v2.pull', {
+                        after_seq: producerAfterSeq,
+                        limit,
+                        ...(producerVolatileCursor ? { after_volatile_cursor: producerVolatileCursor } : {}),
+                        ...(opts?.force ? { force: true } : {}),
+                    }, pullGateKey);
+                    if (pipelineStopped)
+                        break;
+                    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,
+                        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;
+                    const messages = deduplicateForwardPageMessages(rawPageMessages, 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 cursor = isJsonObject(result.cursor)
+                        ? result.cursor : null;
+                    const shouldContinue = shouldContinueForwardPage({
+                        rawCount: messages.length,
+                        nextAfterSeq: producerAfterSeq,
+                        nextAfter,
+                        limit,
+                        hasMoreField: Object.prototype.hasOwnProperty.call(result, 'has_more'),
+                        hasMore: result.has_more === true,
+                        serverHead: safeNonNegativeSeq(cursor?.latest_seq) ?? 0,
+                        observedUpper: Math.max(nextAfter, Number(client._pendingP2pPullUpper?.get?.(ns) ?? 0)),
+                        pendingAckSeq: 0,
+                    });
+                    if (!shouldContinue)
+                        break;
+                    producerAfterSeq = nextAfter;
+                    producerVolatileCursor = '';
                 }
-                client._delivery.resetVolatilePullCursor?.();
-                volatileCursor = '';
-                pageCount -= 1;
-                continue;
-            }
-            if (ackUpToSeq > 0) {
-                const actualAckSeq = client._delivery.resolveP2PPullAckSeq(result, ackUpToSeq);
-                if (actualAckSeq >= ackUpToSeq) {
-                    if (inlineAckGeneration !== null) {
-                        client._delivery.onP2PV2PullAckResult(result, ackUpToSeq, inlineAckGeneration);
+            })().catch((error) => {
+                pipelineError = error;
+            }).finally(() => {
+                pipelineQueue.close();
+            });
+        };
+        const stopPipeline = async () => {
+            pipelineStopped = true;
+            pipelineResume.current?.();
+            pipelineResume.current = null;
+            pipelineQueue.close();
+            if (pipelineProducer) {
+                const producer = pipelineProducer;
+                pipelineProducer = null;
+                await producer;
+            }
+            pipelineRunning = false;
+        };
+        try {
+            while (pageCount < maxPages) {
+                let pipelinePage;
+                if (pipelineRunning) {
+                    pipelinePage = await pipelineQueue.take();
+                    if (!pipelinePage) {
+                        pipelineRunning = false;
+                        if (pipelineError)
+                            throw pipelineError;
+                        break;
                     }
-                    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);
+                pageCount += 1;
+                const requestedVolatileCursor = pipelinePage?.requestedVolatileCursor ?? volatileCursor;
+                const ackUpToSeq = pipelinePage?.ackUpToSeq ?? pendingAckSeq;
+                const inlineAckGeneration = 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>'}`);
+                let result;
+                if (pipelinePage) {
+                    nextAfterSeq = pipelinePage.afterSeq;
+                    result = pipelinePage.result;
                 }
-            }
-            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();
-            }
-            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 volatileHasMore = result.volatile_has_more === true;
-            const serverHead = safeNonNegativeSeq(cursor?.latest_seq) ?? 0;
-            client._clientLog.debug(`message.v2.pull page response: page=${pageCount}, raw_count=${messages.length}, stale_count=${Math.max(0, pageMessages.length - messages.length)}, has_more=${String(result.has_more ?? '')}, server_head=${serverHead}, server_ack_seq=${String(result.server_ack_seq ?? '')}`);
-            for (const msg of messages) {
-                client._logMessageDebug('pull-raw', 'message.v2.pull', 'message.received', msg);
-            }
-            const seqs = messages
-                .map((msg) => Number(msg.seq ?? 0))
-                .filter((seq) => Number.isFinite(seq) && seq > 0);
-            const pageContigBefore = ns ? client._seqTracker.getContiguousSeq(ns) : 0;
-            const pageTrackerSnapshot = ns && typeof client._seqTracker.snapshotNamespace === 'function'
-                ? client._seqTracker.snapshotNamespace(ns)
-                : null;
-            let pageMaxSeq = nextAfterSeq;
-            if (seqs.length > 0) {
-                pageMaxSeq = Math.max(...seqs);
-            }
-            const pageContiguousSeq = contiguousPullSeq(pageContigBefore, seqs, result.contiguous_seq);
-            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,
-                        };
-                        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>'}`);
+                else {
+                    try {
+                        result = await client._callRawV2Rpc('message.v2.pull', {
+                            after_seq: nextAfterSeq,
+                            limit,
+                            ...(volatileCursor ? { after_volatile_cursor: volatileCursor } : {}),
+                            ...(opts?.force ? { force: true } : {}),
+                            ...(ackUpToSeq > 0 ? { ack_up_to_seq: ackUpToSeq } : {}),
+                        }, pullGateKey);
                     }
-                    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 ?? '' });
-                            }
+                    catch (exc) {
+                        if (!volatileCursor || !String(exc instanceof Error ? exc.message : exc).toLowerCase().includes('volatile cursor epoch mismatch')) {
+                            throw exc;
                         }
-                        if (plaintext) {
-                            if (ns)
-                                await client._publishPulledMessage('message.received', ns, seq, plaintext, false);
-                            else
-                                await client._publishAppEvent('message.received', plaintext, 'pull');
-                            decrypted.push(plaintext);
+                        client._delivery.resetVolatilePullCursor?.();
+                        volatileCursor = '';
+                        pageCount -= 1;
+                        continue;
+                    }
+                }
+                if (ackUpToSeq > 0) {
+                    const actualAckSeq = client._delivery.resolveP2PPullAckSeq(result, ackUpToSeq);
+                    if (actualAckSeq >= ackUpToSeq) {
+                        if (inlineAckGeneration !== null) {
+                            client._delivery.onP2PV2PullAckResult(result, ackUpToSeq, inlineAckGeneration);
                         }
+                        pendingAckSeq = 0;
+                        lastAutoAckSeq = Math.max(lastAutoAckSeq, ackUpToSeq);
+                        this.clearForwardAck(ns, ackUpToSeq);
                     }
                     else {
-                        client._clientLog.debug(`message.v2.pull skipping V1 envelope seq=${seq} payload_type=${payloadType || '<none>'} (V1 E2EE removed)`);
+                        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);
                     }
-                    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 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();
                 }
-                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;
+                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 volatileHasMore = result.volatile_has_more === true;
+                const serverHead = safeNonNegativeSeq(cursor?.latest_seq) ?? 0;
+                client._clientLog.debug(`message.v2.pull page response: page=${pageCount}, raw_count=${messages.length}, stale_count=${Math.max(0, pageMessages.length - messages.length)}, has_more=${String(result.has_more ?? '')}, server_head=${serverHead}, server_ack_seq=${String(result.server_ack_seq ?? '')}`);
+                for (const msg of messages) {
+                    client._logMessageDebug('pull-raw', 'message.v2.pull', 'message.received', msg);
                 }
-                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 ?? '',
-                    });
+                const seqs = messages
+                    .map((msg) => Number(msg.seq ?? 0))
+                    .filter((seq) => Number.isFinite(seq) && seq > 0);
+                const pageContigBefore = ns ? client._seqTracker.getContiguousSeq(ns) : 0;
+                let pageTrackerSnapshot = null;
+                let trackerMutated = false;
+                let pageMaxSeq = nextAfterSeq;
+                if (seqs.length > 0) {
+                    pageMaxSeq = Math.max(...seqs);
                 }
-                if (plaintext === null) {
-                    client._clientLog.debug(`message.v2.pull decrypt returned null: seq=${seq}, ns=${ns || '<none>'}`);
-                    continue;
+                const pageContiguousSeq = contiguousPullSeq(pageContigBefore, seqs, result.contiguous_seq);
+                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';
+                            }
+                            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>'}`);
+                        }
+                        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 {
+                            client._clientLog.debug(`message.v2.pull skipping V1 envelope seq=${seq} payload_type=${payloadType || '<none>'} (V1 E2EE removed)`);
+                        }
+                        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;
+                    }
+                    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) {
-                    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 {
-                    if (commitTarget > pageContigBefore) {
-                        client._seqTracker.forceContiguousSeq(ns, commitTarget);
-                        if (retentionFloor > pageContigBefore) {
-                            client._clientLog.info(`message.v2.pull retention-floor advance: ns=${ns} contiguous=${pageContigBefore} -> retention_floor_seq=${retentionFloor}`);
+                    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 {
+                        this.ensureDeliveryCurrent(ns, generation);
+                        const window = client._seqTracker.getSyncState?.(ns);
+                        const deliveryTarget = window && commitTarget >= window.tail - 1
+                            ? Math.max(commitTarget, window.head) : commitTarget;
+                        if (deliveryTarget > pageContigBefore) {
+                            await client._drainOrderedMessages(ns, undefined, false, false, 'pull', deliveryTarget);
+                        }
+                        this.ensureDeliveryCurrent(ns, generation);
+                        pageTrackerSnapshot = client._seqTracker.snapshotNamespace?.(ns) ?? null;
+                        if (commitTarget > pageContigBefore) {
+                            trackerMutated = true;
+                            client._seqTracker.forceContiguousSeq(ns, commitTarget);
+                            if (retentionFloor > pageContigBefore) {
+                                client._clientLog.info(`message.v2.pull retention-floor advance: ns=${ns} contiguous=${pageContigBefore} -> retention_floor_seq=${retentionFloor}`);
+                            }
+                            if (deferredServerCursor > pageContigBefore && pageCount === 1) {
+                                client._clientLog.info(`message.v2.pull restore local A from deferred server ACK cursor: ns=${ns}, contiguous=${pageContigBefore} -> server_ack_seq=${deferredServerCursor}`);
+                            }
+                            if (seqs.length > 0) {
+                                client._clientLog.debug(`message.v2.pull force contiguous: ns=${ns}, page_max_seq=${pageMaxSeq}, previous=${pageContigBefore}`);
+                            }
                         }
-                        if (deferredServerCursor > pageContigBefore && pageCount === 1) {
-                            client._clientLog.info(`message.v2.pull restore local A from deferred server ACK cursor: ns=${ns}, contiguous=${pageContigBefore} -> server_ack_seq=${deferredServerCursor}`);
+                        ackSeq = client._seqTracker.getContiguousSeq(ns);
+                        contigAdvanced = ackSeq !== pageContigBefore;
+                        if (contigAdvanced) {
+                            await client._commitSeqTrackerState(ns);
+                            this.ensureDeliveryCurrent(ns, generation);
+                            if (pageCount === 1 && deferredServerCursor > 0)
+                                this.clearForwardCursor(ns, ackSeq);
                         }
-                        if (seqs.length > 0) {
-                            client._clientLog.debug(`message.v2.pull force contiguous: ns=${ns}, page_max_seq=${pageMaxSeq}, previous=${pageContigBefore}`);
+                    }
+                    catch (exc) {
+                        if (trackerMutated && Number(client._v2RuntimeGeneration ?? 0) === generation
+                            && client._rpcPipeline?.isPullNamespaceCurrent?.(ns) !== false
+                            && typeof client._seqTracker.restoreNamespaceSnapshot === 'function') {
+                            (client._seqTracker._restoreNamespaceSnapshotPreservingPush ?? client._seqTracker.restoreNamespaceSnapshot)
+                                .call(client._seqTracker, ns, pageTrackerSnapshot);
                         }
+                        client._clientLog.error?.(`message.v2.pull Forward commit rolled back: ns=${ns} target=${commitTarget} error=${formatE2EEError(exc)}`);
+                        throw exc;
                     }
-                    ackSeq = client._seqTracker.getContiguousSeq(ns);
-                    contigAdvanced = ackSeq !== pageContigBefore;
-                    if (contigAdvanced) {
-                        await client._commitSeqTrackerState(ns);
-                        if (pageCount === 1 && deferredServerCursor > 0)
-                            this.clearForwardCursor(ns, ackSeq);
+                    for (const fetch of deferredKeyFetches.values()) {
+                        this.scheduleSenderIKFetch(fetch.fromAid, fetch.senderDeviceId, fetch.groupId);
                     }
-                }
-                catch (exc) {
-                    if (typeof client._seqTracker.restoreNamespaceSnapshot === 'function') {
-                        client._seqTracker.restoreNamespaceSnapshot(ns, pageTrackerSnapshot);
+                    if (parsedServerAckSeq !== null && serverAckSeq > ackSeq) {
+                        this.recordForwardCursor(ns, serverAckSeq, ackSeq);
+                    }
+                    // 无本页服务端水位时，只有本页成功提交了比已知服务端更高的 A
+                    // 才新增 ACK 义务。空页不能仅因本地已有 A 而重复 ACK。
+                    const knownServerAckSeq = hasServerAckSeq
+                        ? serverAckSeq
+                        : (pageCount === 1 ? deferredServerCursor : 0);
+                    const ackNeeded = ackSeq > 0
+                        && ackSeq > lastAutoAckSeq
+                        && ((hasServerAckSeq && ackSeq > serverAckSeq)
+                            || (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);
+                        }
                     }
-                    client._clientLog.error?.(`message.v2.pull Forward commit rolled back: ns=${ns} target=${commitTarget} error=${formatE2EEError(exc)}`);
-                    throw exc;
-                }
-                if (contigAdvanced)
-                    await client._drainOrderedMessages(ns, undefined, false, false, 'pull');
-                for (const fetch of deferredKeyFetches.values()) {
-                    this.scheduleSenderIKFetch(fetch.fromAid, fetch.senderDeviceId, fetch.groupId);
-                }
-                if (parsedServerAckSeq !== null && serverAckSeq > ackSeq) {
-                    this.recordForwardCursor(ns, serverAckSeq, ackSeq);
                 }
-                // 无本页服务端水位时，只有本页成功提交了比已知服务端更高的 A
-                // 才新增 ACK 义务。空页不能仅因本地已有 A 而重复 ACK。
-                const knownServerAckSeq = hasServerAckSeq
-                    ? serverAckSeq
-                    : (pageCount === 1 ? deferredServerCursor : 0);
-                const ackNeeded = ackSeq > 0
-                    && ackSeq > lastAutoAckSeq
-                    && ((hasServerAckSeq && ackSeq > serverAckSeq)
-                        || (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) {
-                        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}`);
+                if (!ns) {
+                    for (const fetch of deferredKeyFetches.values()) {
+                        this.scheduleSenderIKFetch(fetch.fromAid, fetch.senderDeviceId, fetch.groupId);
                     }
-                    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);
+                }
+                if (ns)
+                    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);
+                const rawCount = messages.length;
+                if (blockedSeq > 0)
+                    break;
+                const shouldContinuePersistent = shouldContinueForwardPage({
+                    rawCount,
+                    nextAfterSeq,
+                    nextAfter,
+                    limit,
+                    hasMoreField,
+                    hasMore,
+                    serverHead,
+                    observedUpper: Math.max(client._seqTracker.getMaxSeenSeq(ns), Number(client._pendingP2pPullUpper?.get?.(ns) ?? 0)),
+                    pendingAckSeq,
+                });
+                const shouldContinueForPipeline = shouldContinueForwardPage({
+                    rawCount,
+                    nextAfterSeq,
+                    nextAfter,
+                    limit,
+                    hasMoreField,
+                    hasMore,
+                    serverHead,
+                    observedUpper: Math.max(client._seqTracker.getMaxSeenSeq(ns), Number(client._pendingP2pPullUpper?.get?.(ns) ?? 0)),
+                    pendingAckSeq: 0,
+                });
+                const shouldContinueVolatile = (hasMore || volatileHasMore)
+                    && volatileMessages.length > 0
+                    && Boolean(volatileCursor)
+                    && volatileCursor !== requestedVolatileCursor;
+                if (!shouldContinuePersistent && !shouldContinueVolatile)
+                    break;
+                if (shouldContinueForPipeline && !pipelineRunning && limit >= V2_PULL_MAX_PAGE_LIMIT) {
+                    if (pendingAckSeq > 0) {
+                        await this.confirmForwardP2PAck(pendingAckSeq);
+                        pendingAckSeq = 0;
                     }
+                    startPipeline(nextAfter, volatileCursor);
                 }
-            }
-            if (!ns) {
-                for (const fetch of deferredKeyFetches.values()) {
-                    this.scheduleSenderIKFetch(fetch.fromAid, fetch.senderDeviceId, fetch.groupId);
+                if (!pipelineRunning && pullGateKey && opts?.gateLocked && client._rpcPipeline?.yieldPullGate) {
+                    const nextKey = pullGateKeyForClient(client, 'message.v2.pull', {
+                        after_seq: nextAfter, force: opts?.force === true, limit,
+                    }, `${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);
+                if (tailDelayMs > 0)
+                    await v2Sleep(tailDelayMs);
+                nextAfterSeq = nextAfter;
+                if (pipelinePage) {
+                    pipelineResume.current?.();
+                    pipelineResume.current = null;
                 }
             }
-            if (ns)
-                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);
-            const rawCount = messages.length;
-            if (blockedSeq > 0)
-                break;
-            const shouldContinuePersistent = shouldContinueForwardPage({
-                rawCount,
-                nextAfterSeq,
-                nextAfter,
-                limit,
-                hasMoreField,
-                hasMore,
-                serverHead,
-                observedUpper: Math.max(client._seqTracker.getMaxSeenSeq(ns), Number(client._pendingP2pPullUpper?.get?.(ns) ?? 0)),
-                pendingAckSeq,
-            });
-            const shouldContinueVolatile = (hasMore || volatileHasMore)
-                && volatileMessages.length > 0
-                && Boolean(volatileCursor)
-                && volatileCursor !== requestedVolatileCursor;
-            if (!shouldContinuePersistent && !shouldContinueVolatile)
-                break;
-            if (pullGateKey && opts?.gateLocked && client._rpcPipeline?.yieldPullGate) {
-                const nextKey = pullGateKeyForClient(client, 'message.v2.pull', {
-                    after_seq: nextAfter, force: opts?.force === true, limit,
-                }, `${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);
-            if (tailDelayMs > 0)
-                await v2Sleep(tailDelayMs);
-            nextAfterSeq = nextAfter;
+        }
+        finally {
+            await stopPipeline();
         }
         if (pageCount >= maxPages) {
             client._clientLog.warn(`message.v2.pull reached max_pages=${maxPages} after_seq=${nextAfterSeq}`);
@@ -1948,6 +2163,7 @@ export class V2E2EECoordinator {
     }
     async pullGroupV2TailInternal(params, deferPublish = false) {
         const client = this.client;
+        const generation = Number(client._v2RuntimeGeneration ?? 0);
         if (params.window_mode !== 'tail')
             throw new ValidationError('window_mode must equal tail');
         if ('ack_up_to_seq' in params || params.force === true)
@@ -1987,6 +2203,15 @@ export class V2E2EECoordinator {
         if (resultAid)
             groupAid = resultAid;
         const page = validateTailPage(result, afterSeq, limit);
+        const decoded = [];
+        for (const msg of page.messages) {
+            this.ensureDeliveryCurrent(ns, generation);
+            client._logMessageDebug('tail-raw', 'group.v2.pull', 'group.message_created', msg);
+            const plaintext = await this.decodeGroupWindowMessage(msg, groupId, groupAid, true, false, 'tail', deferPublish);
+            if (plaintext)
+                decoded.push(plaintext);
+        }
+        this.ensureDeliveryCurrent(ns, generation);
         client._seqTracker.commitTailWindow(ns, {
             windowStartSeq: page.windowStart,
             headSeq: page.head,
@@ -1995,13 +2220,7 @@ export class V2E2EECoordinator {
         });
         client._persistSeq(ns);
         await client._saveSeqTrackerState?.();
-        const decoded = [];
-        for (const msg of page.messages) {
-            client._logMessageDebug('tail-raw', 'group.v2.pull', 'group.message_created', msg);
-            const plaintext = await this.decodeGroupWindowMessage(msg, groupId, groupAid, true, false, 'tail', deferPublish);
-            if (plaintext)
-                decoded.push(plaintext);
-        }
+        this.ensureDeliveryCurrent(ns, generation);
         const ack = client._seqTracker.getContiguousSeq(ns);
         if (ownsCursor)
             client._delivery.syncProgress(ns, {
@@ -2049,6 +2268,7 @@ export class V2E2EECoordinator {
     }
     async pullGroupV2Impl(groupId, afterSeq = 0, limit = 50, opts) {
         const client = this.client;
+        const generation = Number(client._v2RuntimeGeneration ?? 0);
         await client._ensureV2SessionReady('group.pull');
         const gid = String(groupId ?? '').trim();
         if (!gid)
@@ -2109,91 +2329,214 @@ export class V2E2EECoordinator {
         let lastAutoAckSeq = 0;
         let pendingAckSeq = deferredForwardAck;
         const maxPages = Math.max(1, Math.min(100, Math.trunc(Number(opts?.maxPages ?? 100) || 100)));
-        while (pageCount < maxPages) {
-            pageCount += 1;
-            const ackUpToSeq = ownsCursor ? pendingAckSeq : 0;
-            const 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}`);
-            const 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);
-            if (ackUpToSeq > 0) {
-                const actualAckSeq = client._delivery.resolveGroupPullAckSeq(result, ackUpToSeq);
-                if (actualAckSeq >= ackUpToSeq) {
-                    if (inlineAckGeneration !== null) {
-                        client._delivery.onGroupV2PullAckResult(gid, result, ackUpToSeq, inlineAckGeneration);
+        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;
+            pipelineRunning = true;
+            pipelineProducer = (async () => {
+                let producerAfterSeq = startAfterSeq;
+                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);
+                    if (pipelineStopped)
+                        break;
+                    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,
+                        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 cursor = isJsonObject(result.cursor)
+                        ? result.cursor : null;
+                    const shouldContinue = shouldContinueForwardPage({
+                        rawCount: messages.length,
+                        nextAfterSeq: producerAfterSeq,
+                        nextAfter,
+                        limit,
+                        hasMoreField: Object.prototype.hasOwnProperty.call(result, 'has_more'),
+                        hasMore: result.has_more === true,
+                        serverHead: Math.max(safeNonNegativeSeq(result.latest_message_seq) ?? 0, safeNonNegativeSeq(cursor?.latest_seq) ?? 0),
+                        observedUpper: Math.max(nextAfter, client._seqTracker.getMaxSeenSeq(ns)),
+                        pendingAckSeq: 0,
+                    });
+                    if (!shouldContinue)
+                        break;
+                    producerAfterSeq = nextAfter;
+                }
+            })().catch((error) => {
+                pipelineError = error;
+            }).finally(() => {
+                pipelineQueue.close();
+            });
+        };
+        const stopPipeline = async () => {
+            pipelineStopped = true;
+            pipelineResume.current?.();
+            pipelineResume.current = null;
+            pipelineQueue.close();
+            if (pipelineProducer) {
+                const producer = pipelineProducer;
+                pipelineProducer = null;
+                await producer;
+            }
+            pipelineRunning = false;
+        };
+        try {
+            while (pageCount < maxPages) {
+                let pipelinePage;
+                if (pipelineRunning) {
+                    pipelinePage = await pipelineQueue.take();
+                    if (!pipelinePage) {
+                        pipelineRunning = false;
+                        if (pipelineError)
+                            throw pipelineError;
+                        break;
                     }
-                    pendingAckSeq = 0;
-                    lastAutoAckSeq = Math.max(lastAutoAckSeq, ackUpToSeq);
-                    this.clearForwardAck(ns, ackUpToSeq);
+                }
+                pageCount += 1;
+                const ackUpToSeq = ownsCursor ? (pipelinePage?.ackUpToSeq ?? pendingAckSeq) : 0;
+                const inlineAckGeneration = 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}`);
+                let result;
+                if (pipelinePage) {
+                    nextAfterSeq = pipelinePage.afterSeq;
+                    result = pipelinePage.result;
                 }
                 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);
+                    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);
                 }
-            }
-            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 pageTrackerSnapshot = typeof client._seqTracker.snapshotNamespace === 'function'
-                ? client._seqTracker.snapshotNamespace(ns)
-                : null;
-            let pageMaxSeq = nextAfterSeq;
-            if (seqs.length > 0) {
-                pageMaxSeq = Math.max(...seqs);
-            }
-            const pageContiguousSeq = contiguousPullSeq(pageContigBefore, seqs, result.contiguous_seq);
-            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}`);
-                        continue;
+                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;
+                        lastAutoAckSeq = Math.max(lastAutoAckSeq, ackUpToSeq);
+                        this.clearForwardAck(ns, ackUpToSeq);
                     }
-                    if (payloadObj) {
-                        if (!['e2ee.encrypted', 'e2ee.group_encrypted', 'e2ee.p2p_encrypted'].includes(payloadType)) {
+                    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();
+                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);
+                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);
+                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}`);
+                            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,
+                                };
+                                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 ?? ''),
@@ -2205,209 +2548,224 @@ export class V2E2EECoordinator {
                                 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);
-                            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;
                         }
+                        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);
+                                }
+                                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;
                     }
-                    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,
-                        };
-                        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}`);
+                    if (version !== 'v2') {
+                        client._clientLog.debug(`group.v2.pull skipping non-V2 row group=${gid} seq=${seq} version=${String(msg.version ?? '')}`);
                         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 ?? '' });
-                            }
+                    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;
+                    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 {
+                        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);
                         }
-                        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);
+                        this.ensureDeliveryCurrent(ns, generation);
+                        pageTrackerSnapshot = client._seqTracker.snapshotNamespace?.(ns) ?? null;
+                        if (commitTarget > pageContigBefore) {
+                            trackerMutated = true;
+                            client._seqTracker.forceContiguousSeq(ns, commitTarget);
+                            if (effectiveFloor > pageContigBefore) {
+                                client._clientLog.info(`group.v2.pull floor advance: ns=${ns} contiguous=${pageContigBefore} -> effective_floor=${effectiveFloor} retention_floor=${retentionFloor} visibility_floor=${visibilityFloor}`);
                             }
-                            else {
-                                client._markPublishedSeq(ns, 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}`);
                             }
-                            decrypted.push(plaintext);
+                            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 (pageCount === 1 && deferredServerCursor > 0)
+                                this.clearForwardCursor(ns, ackSeq);
                         }
                     }
-                    else {
-                        client._clientLog.debug(`group.v2.pull skipping V1 envelope group=${gid} seq=${seq} payload_type=${payloadObj ? String(payloadObj.type ?? '') : '<none>'} (V1 E2EE removed)`);
+                    catch (exc) {
+                        if (trackerMutated && Number(client._v2RuntimeGeneration ?? 0) === generation
+                            && client._rpcPipeline?.isPullNamespaceCurrent?.(ns) !== false
+                            && typeof client._seqTracker.restoreNamespaceSnapshot === 'function') {
+                            (client._seqTracker._restoreNamespaceSnapshotPreservingPush ?? client._seqTracker.restoreNamespaceSnapshot)
+                                .call(client._seqTracker, ns, pageTrackerSnapshot);
+                        }
+                        client._clientLog.error?.(`group.v2.pull Forward commit rolled back: group=${gid} ns=${ns} target=${commitTarget} error=${formatE2EEError(exc)}`);
+                        throw exc;
                     }
-                    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;
-                if (!client._delivery.isSelfSentGroupMessage?.(msg)) {
-                    await client._publishPulledMessage('group.message_created', ns, seq, plaintext, false);
+                for (const fetch of deferredKeyFetches.values()) {
+                    this.scheduleSenderIKFetch(fetch.fromAid, fetch.senderDeviceId, fetch.groupId);
                 }
-                else {
-                    client._markPublishedSeq(ns, seq);
+                if (ownsCursor && parsedCursorCurrentSeq !== null && cursorCurrentSeq > ackSeq) {
+                    this.recordForwardCursor(ns, cursorCurrentSeq, ackSeq);
                 }
-                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 {
-                    if (commitTarget > pageContigBefore) {
-                        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}`);
-                        }
+                // 无本页 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);
+                    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}`);
                     }
-                    ackSeq = client._seqTracker.getContiguousSeq(ns);
-                    contigAdvanced = ackSeq !== pageContigBefore;
-                    if (contigAdvanced) {
-                        await client._commitSeqTrackerState(ns);
-                        if (pageCount === 1 && deferredServerCursor > 0)
-                            this.clearForwardCursor(ns, ackSeq);
+                    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);
                     }
                 }
-                catch (exc) {
-                    if (typeof client._seqTracker.restoreNamespaceSnapshot === 'function') {
-                        client._seqTracker.restoreNamespaceSnapshot(ns, pageTrackerSnapshot);
+                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({
+                    rawCount,
+                    nextAfterSeq,
+                    nextAfter,
+                    limit,
+                    hasMoreField,
+                    hasMore,
+                    serverHead,
+                    observedUpper: Math.max(client._seqTracker.getMaxSeenSeq(ns), Number(client._delivery.pendingPullUpper?.(ns) ?? 0)),
+                    pendingAckSeq,
+                });
+                const shouldContinueForPipeline = shouldContinueForwardPage({
+                    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) {
+                    if (pendingAckSeq > 0) {
+                        await this.confirmForwardGroupAck(gid, pendingAckSeq, groupAid);
+                        pendingAckSeq = 0;
                     }
-                    client._clientLog.error?.(`group.v2.pull Forward commit rolled back: group=${gid} ns=${ns} target=${commitTarget} error=${formatE2EEError(exc)}`);
-                    throw exc;
+                    startPipeline(nextAfter);
                 }
-                if (contigAdvanced)
-                    await client._drainOrderedMessages(ns, undefined, false, false, 'pull');
-            }
-            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);
-                const nextAfter = Math.max(pageContiguousSeq, nextAfterSeq);
-                const canContinuePage = blockedSeq <= 0 && messages.length > 0 && nextAfter > nextAfterSeq && ownsCursor;
-                if (canContinuePage) {
-                    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}`);
+                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;
                 }
-                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);
+                const tailDelayMs = v2PullTailDelayMs(rawCount, limit);
+                if (tailDelayMs > 0)
+                    await v2Sleep(tailDelayMs);
+                nextAfterSeq = nextAfter;
+                if (pipelinePage) {
+                    pipelineResume.current?.();
+                    pipelineResume.current = null;
                 }
             }
-            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({
-                rawCount,
-                nextAfterSeq,
-                nextAfter,
-                limit,
-                hasMoreField,
-                hasMore,
-                serverHead,
-                observedUpper: Math.max(client._seqTracker.getMaxSeenSeq(ns), Number(client._delivery.pendingPullUpper?.(ns) ?? 0)),
-                pendingAckSeq,
-            });
-            if (!shouldContinue)
-                break;
-            if (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);
-            if (tailDelayMs > 0)
-                await v2Sleep(tailDelayMs);
-            nextAfterSeq = nextAfter;
+        }
+        finally {
+            await stopPipeline();
         }
         if (pageCount >= maxPages) {
             client._clientLog.warn(`group.v2.pull reached max_pages=${maxPages} group=${gid} after_seq=${nextAfterSeq}`);
@@ -2945,10 +3303,16 @@ export class V2E2EECoordinator {
             encrypted: true,
             e2ee,
         };
+        if (typeof plaintext.type === 'string' && plaintext.type.startsWith('aun.ownership.'))
+            result.from_aid = fromAid;
         const senderDeviceId = String(aad.from_device ?? '').trim();
         if (senderDeviceId)
             result.sender_device_id = senderDeviceId;
-        result.direction = fromAid && fromAid === client._aid ? 'outbound_sync' : 'inbound';
+        const direction = String(msg.direction ?? '').trim();
+        if (direction)
+            result.direction = direction;
+        else if (fromAid && fromAid !== client._aid)
+            result.direction = 'inbound';
         if (msg.t_server !== undefined)
             result.t_server = msg.t_server;
         if (msg.device_id !== undefined)
@@ -2990,10 +3354,10 @@ export class V2E2EECoordinator {
         }
         return await this.publishEncryptedPushAsUndecryptable(undecryptableEvent, ns, seq, msg, group);
     }
-    async decryptV2PushMessage(data) {
+    async decryptV2PushMessage(data, deferStatus) {
         if (!isJsonObject(data))
             return null;
-        return await this.client._decryptV2Message(data, false, false, false, false, undefined, false, 'inline_push');
+        return await this.client._decryptV2Message(data, false, true, false, false, deferStatus, false, 'inline_push');
     }
     handleGroupChangedSpk(data, groupId, action) {
         if (!this.client._v2Session || !groupId || !MEMBERSHIP_ACTIONS.has(action))