@agentunion/fastaun-browser 0.5.9 → 0.5.11

package/dist/client/v2-e2ee.js

@@ -847,11 +847,17 @@ export class V2E2EECoordinator {
         if (!fromAid || client._v2SenderIKFetching.has(fetchKey))
             return;
         client._v2SenderIKFetching.add(fetchKey);
-        client._safeAsync(this.resolveSenderIKPending(fromAid, senderDeviceId, groupId, fetchKey));
+        const releasePullWork = client._rpcPipeline?.reservePullWork?.() ?? (() => { });
+        const generation = client._delivery.captureInlineGeneration?.();
+        client._safeAsync(this.resolveSenderIKPending(fromAid, senderDeviceId, groupId, fetchKey, generation).finally(releasePullWork));
     }
-    async resolveSenderIKPending(fromAid, senderDeviceId, groupId, fetchKey) {
+    async resolveSenderIKPending(fromAid, senderDeviceId, groupId, fetchKey, generation) {
         const client = this.client;
+        const generationCurrent = () => generation === undefined
+            || client._delivery.isInlineGenerationCurrent?.(generation) !== false;
         try {
+            if (!generationCurrent())
+                return;
             const session = client._v2Session;
             if (session && fromAid) {
                 try {
@@ -887,18 +893,26 @@ export class V2E2EECoordinator {
                     await this.getV2SenderPubDer(fromAid, senderDeviceId);
                 }
             }
+            if (!generationCurrent())
+                return;
             const pendingItems = [...client._v2SenderIKPending.entries()].filter(([, entry]) => entry.fromAid === fromAid && entry.senderDeviceId === senderDeviceId && entry.groupId === groupId);
             for (const [key, entry] of pendingItems) {
+                if (!generationCurrent())
+                    return;
                 let plaintext = null;
                 const retryStatus = {};
                 try {
-                    plaintext = await client._decryptV2Message(entry.msg, false, true, true, true, retryStatus);
+                    plaintext = await client._decryptV2Message(entry.msg, false, true, true, true, retryStatus, false, 'pending_retry');
                 }
                 catch (exc) {
+                    if (!generationCurrent())
+                        return;
                     client._clientLog.warn(`V2 sender IK pending retry raised: key=${key} err=${String(formatE2EEError(exc))}`);
                     client._v2SenderIKPending.delete(key);
                     continue;
                 }
+                if (!generationCurrent())
+                    return;
                 if (plaintext === null) {
                     if (retryStatus.deferred) {
                         client._clientLog.warn(`V2 pending retry still missing key material: key=${key}`);
@@ -918,10 +932,10 @@ export class V2E2EECoordinator {
                 if (entry.groupId) {
                     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);
+                    await client._publishPulledMessage('group.message_created', `group:${entry.groupId}`, seq, plaintext, false, 'pending_retry');
                 }
                 else {
-                    await client._publishPulledMessage('message.received', `p2p:${client._aid ?? ''}`, seq, plaintext);
+                    await client._publishPulledMessage('message.received', `p2p:${client._aid ?? ''}`, seq, plaintext, false, 'pending_retry');
                 }
                 client._clientLog.debug(`V2 sender IK pending retry delivered: key=${key}`);
             }
@@ -951,6 +965,7 @@ export class V2E2EECoordinator {
             return client.call('message.send', {
                 to: toAid,
                 payload: envelope,
+                message_id: opts?.messageId,
                 encrypt: false,
                 _skip_send_result_envelope: true,
             });
@@ -999,10 +1014,10 @@ export class V2E2EECoordinator {
         if (String(msg.version ?? '') === 'v1') {
             const legacy = isJsonObject(msg.legacy_v1)
                 ? msg.legacy_v1 : {};
-            const payload = legacy.payload;
+            const payload = legacy.payload !== undefined ? legacy.payload : msg.payload;
             const payloadType = isJsonObject(payload)
                 ? String(payload.type ?? '').trim() : '';
-            if (payload !== undefined && payload !== null && !['e2ee.encrypted', 'e2ee.group_encrypted'].includes(payloadType)) {
+            if (payload !== undefined && payload !== null && !['e2ee.encrypted', 'e2ee.group_encrypted', 'e2ee.p2p_encrypted'].includes(payloadType)) {
                 plaintext = {
                     message_id: String(msg.message_id ?? ''), from: String(msg.from_aid ?? ''),
                     to: String(legacy.to ?? client._aid ?? ''), seq, type: String(msg.type ?? ''),
@@ -1010,6 +1025,11 @@ export class V2E2EECoordinator {
                 };
                 attachGatewayProximity(plaintext, msg);
             }
+            else if (isJsonObject(payload)
+                && ['e2ee.p2p_encrypted', 'e2ee.encrypted'].includes(payloadType)) {
+                msg = { ...msg, envelope_json: JSON.stringify(payload) };
+                plaintext = await client._decryptV2Message(msg, false, !history, true, true, undefined, false, source);
+            }
         }
         else {
             plaintext = source === 'inline_push'
@@ -1025,7 +1045,7 @@ export class V2E2EECoordinator {
         if (publish) {
             const event = client._delivery.p2pAppEventForMessage(plaintext);
             if (orderedPublish) {
-                await client._delivery.publishOrderedMessage(event.event, client._aid ? `p2p:${client._aid}` : '', seq, event.payload);
+                await client._delivery.publishOrderedMessage(event.event, client._aid ? `p2p:${client._aid}` : '', seq, event.payload, source);
             }
             else {
                 await client._publishAppEvent(event.event, event.payload, source);
@@ -1039,26 +1059,48 @@ export class V2E2EECoordinator {
         let plaintext = null;
         if (String(msg.version ?? '') === 'v1') {
             const payload = msg.payload;
+            const recall = typeof client._delivery?.recallEventFromGroupMessage === 'function'
+                ? client._delivery.recallEventFromGroupMessage(msg)
+                : null;
+            if (recall) {
+                const recallPayload = {
+                    ...recall,
+                    group_id: groupId,
+                    group_aid: groupAid,
+                    seq,
+                };
+                if (publish) {
+                    if (orderedPublish) {
+                        await client._delivery.publishOrderedMessage('group.message_recalled', `group:${groupId}`, seq, recallPayload, source);
+                    }
+                    else {
+                        await client._publishAppEvent('group.message_recalled', recallPayload, source);
+                    }
+                }
+                return recallPayload;
+            }
             if (payload === undefined || payload === null) {
                 if (history)
                     return this.historyDecryptFailure(msg, 'legacy payload is missing');
                 client._clientLog.warn(`Group Tail 缺少 payload 的 V1 行已跳过，连续性证明仍保留: group=${groupId}, seq=${seq}`);
                 return null;
             }
+            const payloadType = isJsonObject(payload)
+                ? String(payload.type ?? '').trim() : '';
             if (isJsonObject(payload)
-                && ['e2ee.encrypted', 'e2ee.group_encrypted'].includes(String(payload.type ?? ''))) {
-                if (history)
-                    return this.historyDecryptFailure(msg, 'unsupported legacy encrypted envelope');
-                client._clientLog.warn(`Group Tail 不支持的旧加密消息已跳过，连续性证明仍保留: group=${groupId}, seq=${seq}`);
-                return null;
+                && ['e2ee.group_encrypted', 'e2ee.p2p_encrypted', 'e2ee.encrypted'].includes(payloadType)) {
+                msg = { ...msg, envelope_json: JSON.stringify(payload) };
+                plaintext = await client._decryptV2Message(msg, false, !history, true, true, undefined, false, source);
+            }
+            else {
+                plaintext = {
+                    message_id: String(msg.message_id ?? ''), from: String(msg.from_aid ?? ''),
+                    group_id: groupId, group_aid: groupAid, seq, type: String(msg.type ?? ''),
+                    timestamp: msg.t_server, payload: payload, encrypted: false,
+                };
+                plaintext = normalizeGroupMentionMode(plaintext, msg, msg.envelope_json);
+                attachGatewayProximity(plaintext, msg);
             }
-            plaintext = {
-                message_id: String(msg.message_id ?? ''), from: String(msg.from_aid ?? ''),
-                group_id: groupId, group_aid: groupAid, seq, type: String(msg.type ?? ''),
-                timestamp: msg.t_server, payload: payload, encrypted: false,
-            };
-            plaintext = normalizeGroupMentionMode(plaintext, msg, msg.envelope_json);
-            attachGatewayProximity(plaintext, msg);
         }
         else {
             plaintext = source === 'inline_push'
@@ -1083,7 +1125,7 @@ export class V2E2EECoordinator {
         }
         if (publish) {
             if (orderedPublish) {
-                await client._delivery.publishOrderedMessage('group.message_created', `group:${groupId}`, seq, plaintext);
+                await client._delivery.publishOrderedMessage('group.message_created', `group:${groupId}`, seq, plaintext, source);
             }
             else {
                 await client._publishAppEvent('group.message_created', plaintext, source);
@@ -1114,6 +1156,8 @@ export class V2E2EECoordinator {
         const afterSeq = strictWindowSeq(params.after_seq ?? 0, 'after_seq');
         const limit = strictWindowLimit(params.limit ?? V2_PULL_DEFAULT_PAGE_LIMIT);
         const ns = client._aid ? `p2p:${client._aid}` : '';
+        if (ns)
+            client._delivery.onPullStarted?.(ns);
         const result = await client._callRawV2Rpc('message.v2.pull', { window_mode: 'tail', after_seq: afterSeq, limit, _rpc_foreground: true });
         const floor = Number(result.retention_floor_seq ?? 0);
         const previous = ns ? client._seqTracker.getSyncState(ns) : null;
@@ -1135,6 +1179,9 @@ export class V2E2EECoordinator {
         const ack = ns ? client._seqTracker.getContiguousSeq(ns) : 0;
         if (previous && ack > previous.ack)
             await this.ackV2(ack);
+        if (ns)
+            client._delivery.onPullPage?.(ns, decoded.length, result.has_more === true, page.head, typeof result.remaining === 'number' && Number.isSafeInteger(result.remaining) && result.remaining >= 0 ? result.remaining : null, page.messages.length, ack, page.head);
+        client._delivery.onPullWorkSettled?.();
         return { ...result, messages: decoded, raw_count: page.messages.length };
     }
     async historyV2Internal(params) {
@@ -1150,16 +1197,33 @@ export class V2E2EECoordinator {
         }
         return { ...result, messages: decoded };
     }
+    async runPullWithLifecycle(ns, operation) {
+        if (ns)
+            this.client._delivery.onPullStarted?.(ns);
+        try {
+            return await operation();
+        }
+        catch (error) {
+            this.client._delivery.onPullAborted?.();
+            throw error;
+        }
+    }
     async pullV2(afterSeq = 0, limit = 50, opts) {
+        const ns = this.client._aid ? `p2p:${this.client._aid}` : '';
+        return await this.runPullWithLifecycle(ns, () => this.pullV2Impl(afterSeq, limit, opts));
+    }
+    async pullV2Impl(afterSeq = 0, limit = 50, opts) {
         const client = this.client;
         await client._ensureV2SessionReady('message.pull');
         const ns = client._aid ? `p2p:${client._aid}` : '';
+        if (ns)
+            client._delivery.onPullStarted?.(ns);
         if (opts?.windowMode === 'tail') {
             if (!opts.gateLocked) {
                 const key = pullGateKeyForClient(client, 'message.v2.pull', {
                     window_mode: 'tail', after_seq: afterSeq, limit,
                 }, `${ns}|tail|after=${afterSeq}|limit=${limit}`);
-                return await client._runPullSerialized(key, () => this.pullV2(afterSeq, limit, {
+                return await client._runPullSerialized(key, () => this.pullV2Impl(afterSeq, limit, {
                     ...(opts ?? {}),
                     gateLocked: true,
                 }), false);
@@ -1171,7 +1235,7 @@ export class V2E2EECoordinator {
             const key = pullGateKeyForClient(client, 'message.v2.pull', {
                 after_seq: afterSeq, force: opts?.force === true, limit,
             }, `${ns}|forward|after=${afterSeq}|force=${String(Boolean(opts?.force))}|limit=${limit}`);
-            return await client._runPullSerialized(key, () => this.pullV2(afterSeq, limit, {
+            return await client._runPullSerialized(key, () => this.pullV2Impl(afterSeq, limit, {
                 ...(opts ?? {}),
                 gateLocked: true,
             }), true);
@@ -1235,6 +1299,7 @@ export class V2E2EECoordinator {
             const pageMaxSeq = seqs.length > 0 ? Math.max(...seqs) : nextAfterSeq;
             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)
@@ -1242,12 +1307,12 @@ export class V2E2EECoordinator {
                 const version = String(msg.version ?? 'v2');
                 if (version === 'v1') {
                     const legacy = isJsonObject(msg.legacy_v1) ? msg.legacy_v1 : {};
-                    const legacyPayload = legacy.payload;
+                    const legacyPayload = legacy.payload !== undefined ? legacy.payload : msg.payload;
                     const payloadType = isJsonObject(legacyPayload)
                         ? String(legacyPayload.type ?? '').trim()
                         : '';
                     if (legacyPayload !== undefined && legacyPayload !== null
-                        && payloadType !== 'e2ee.encrypted' && payloadType !== 'e2ee.group_encrypted') {
+                        && !['e2ee.encrypted', 'e2ee.group_encrypted', 'e2ee.p2p_encrypted'].includes(payloadType)) {
                         const v1Msg = {
                             message_id: String(msg.message_id ?? ''),
                             from: String(msg.from_aid ?? ''),
@@ -1263,9 +1328,28 @@ export class V2E2EECoordinator {
                         if (ns)
                             await client._publishPulledMessage(appEvent.event, ns, seq, appEvent.payload, false);
                         else
-                            await client._publishAppEvent(appEvent.event, appEvent.payload);
+                            await client._publishAppEvent(appEvent.event, appEvent.payload, 'pull');
                         decrypted.push(v1Msg);
                     }
+                    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)`);
                     }
@@ -1280,7 +1364,7 @@ export class V2E2EECoordinator {
                     client._v2Session.trackOldSPKMaxSeq(msgSpkId, seq);
                 }
                 const deferStatus = {};
-                const plaintext = await client._decryptV2Message(msg, true, true, true, true, deferStatus, true);
+                const plaintext = await client._decryptV2Message(msg, true, true, true, true, deferStatus, true, 'pull');
                 if (deferStatus.deferred) {
                     blockedSeq = blockedSeq > 0 ? Math.min(blockedSeq, seq) : seq;
                 }
@@ -1299,7 +1383,7 @@ export class V2E2EECoordinator {
                     decrypted.push(plaintext);
                 }
                 else {
-                    await client._publishAppEvent('message.received', plaintext);
+                    await client._publishAppEvent('message.received', plaintext, 'pull');
                     decrypted.push(plaintext);
                 }
             }
@@ -1360,7 +1444,7 @@ export class V2E2EECoordinator {
                 if (ackNeeded) {
                     this.recordForwardAck(ns, ackSeq);
                     const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
-                    const canContinuePage = messages.length > 0 && nextAfter > nextAfterSeq;
+                    const canContinuePage = blockedSeq <= 0 && messages.length > 0 && nextAfter > nextAfterSeq;
                     if (canContinuePage) {
                         pendingAckSeq = Math.max(pendingAckSeq, ackSeq);
                         lastAutoAckSeq = Math.max(lastAutoAckSeq, ackSeq);
@@ -1371,6 +1455,8 @@ export class V2E2EECoordinator {
                     }
                 }
             }
+            if (ns)
+                client._delivery.onPullPage?.(ns, decrypted.length - pageDecryptedBefore, hasMore, pageMaxSeq, typeof result.remaining === 'number' && Number.isSafeInteger(result.remaining) && result.remaining >= 0 ? result.remaining : null, messages.length, client._seqTracker.getContiguousSeq(ns), pageMaxSeq);
             const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
             const rawCount = messages.length;
             if (blockedSeq > 0)
@@ -1406,6 +1492,7 @@ export class V2E2EECoordinator {
                 pendingAckSeq = 0;
             }
         }
+        client._delivery.onPullWorkSettled?.();
         return decrypted;
     }
     async confirmForwardP2PAck(upToSeq, inlineGeneration) {
@@ -1496,6 +1583,7 @@ export class V2E2EECoordinator {
             return client.call('group.v2.send', withExplicitGroupAid({
                 group_id: gid,
                 envelope,
+                message_id: opts?.messageId,
             }, groupAid));
         };
         try {
@@ -1558,6 +1646,14 @@ export class V2E2EECoordinator {
         const afterSeq = strictWindowSeq(params.after_seq ?? 0, 'after_seq');
         const limit = strictWindowLimit(params.limit ?? V2_PULL_DEFAULT_PAGE_LIMIT);
         const ns = `group:${groupId}`;
+        const cursorParams = isJsonObject(params._group_cursor_params)
+            ? params._group_cursor_params : params;
+        const requestDeviceId = String(cursorParams.device_id ?? '').trim();
+        const requestSlotId = String(cursorParams.slot_id ?? '').trim();
+        const ownsCursor = (!requestDeviceId || requestDeviceId === String(client._deviceId ?? ''))
+            && (!requestSlotId || requestSlotId === String(client._slotId ?? ''));
+        if (ownsCursor)
+            client._delivery.onPullStarted?.(ns);
         const result = await client._callRawV2Rpc('group.v2.pull', withExplicitGroupAid({
             group_id: groupId, window_mode: 'tail', after_seq: afterSeq, limit, _rpc_foreground: true,
         }, groupAid));
@@ -1583,6 +1679,9 @@ export class V2E2EECoordinator {
         const ack = client._seqTracker.getContiguousSeq(ns);
         if (ack > previous.ack)
             await this.ackGroupV2(groupId, ack, groupAid);
+        if (ownsCursor)
+            client._delivery.onPullPage?.(ns, decoded.length, result.has_more === true, page.head, typeof result.remaining === 'number' && Number.isSafeInteger(result.remaining) && result.remaining >= 0 ? result.remaining : null, page.messages.length, ack, page.head);
+        client._delivery.onPullWorkSettled?.();
         return { ...result, messages: decoded, raw_count: page.messages.length };
     }
     async historyGroupV2Internal(params) {
@@ -1615,6 +1714,13 @@ export class V2E2EECoordinator {
         });
     }
     async pullGroupV2(groupId, afterSeq = 0, limit = 50, opts) {
+        const lifecycleNs = `group:${String(groupId ?? '').trim()}`;
+        if (opts?.ownsCursor === false) {
+            return await this.pullGroupV2Impl(groupId, afterSeq, limit, opts);
+        }
+        return await this.runPullWithLifecycle(lifecycleNs, () => this.pullGroupV2Impl(groupId, afterSeq, limit, opts));
+    }
+    async pullGroupV2Impl(groupId, afterSeq = 0, limit = 50, opts) {
         const client = this.client;
         await client._ensureV2SessionReady('group.pull');
         const gid = String(groupId ?? '').trim();
@@ -1628,12 +1734,13 @@ export class V2E2EECoordinator {
                     group_id: gid, window_mode: 'tail', after_seq: afterSeq, limit,
                     _group_cursor_params: opts?.cursorParams,
                 }, `${ns}|tail|after=${afterSeq}|limit=${limit}`);
-                return await client._runPullSerialized(key, () => this.pullGroupV2(gid, afterSeq, limit, {
+                return await client._runPullSerialized(key, () => this.pullGroupV2Impl(gid, afterSeq, limit, {
                     ...(opts ?? {}),
                     gateLocked: true,
                 }), false);
             }
             const result = await this.pullGroupV2TailInternal({
+                ...(opts?.cursorParams ?? {}),
                 group_id: String(opts.wireGroupId ?? gid), group_aid: groupAid || undefined,
                 window_mode: 'tail', after_seq: afterSeq, limit,
             });
@@ -1644,7 +1751,7 @@ export class V2E2EECoordinator {
                 group_id: gid, after_seq: afterSeq, force: opts?.force === true, limit,
                 _group_cursor_params: opts?.cursorParams,
             }, `${ns}|forward|after=${afterSeq}|force=${String(Boolean(opts?.force))}|limit=${limit}`);
-            return await client._runPullSerialized(key, () => this.pullGroupV2(gid, afterSeq, limit, {
+            return await client._runPullSerialized(key, () => this.pullGroupV2Impl(gid, afterSeq, limit, {
                 ...(opts ?? {}),
                 gateLocked: true,
             }), true);
@@ -1653,6 +1760,8 @@ export class V2E2EECoordinator {
         const wireGroupId = String(opts?.wireGroupId ?? groupId ?? '').trim() || gid;
         const cursorParams = opts?.cursorParams ?? {};
         const ownsCursor = opts?.ownsCursor !== false;
+        if (ownsCursor)
+            client._delivery.onPullStarted?.(ns);
         let pullGateKey = ownsCursor
             ? pullGateKeyForClient(client, 'group.v2.pull', {
                 group_id: gid, after_seq: afterSeq, force: opts?.force === true, limit,
@@ -1721,28 +1830,31 @@ export class V2E2EECoordinator {
             const pageMaxSeq = seqs.length > 0 ? Math.max(...seqs) : nextAfterSeq;
             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 payload = msg.payload;
+                    const legacy = isJsonObject(msg.legacy_v1) ? msg.legacy_v1 : {};
+                    const payload = msg.payload !== undefined ? msg.payload : legacy.payload;
                     const payloadObj = isJsonObject(payload) ? payload : null;
                     // 群撤回 tombstone（占位 / 通知）：归一化为 group.message_recalled 事件，仍占 seq。
-                    if (client._delivery.recallEventFromGroupMessage(msg)) {
+                    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) {
                         const payloadType = String(payloadObj.type ?? '').trim();
-                        if (payloadType !== 'e2ee.encrypted' && payloadType !== 'e2ee.group_encrypted') {
+                        if (payloadType !== 'e2ee.encrypted' && payloadType !== 'e2ee.group_encrypted' && payloadType !== 'e2ee.p2p_encrypted') {
                             let v1Msg = {
                                 message_id: String(msg.message_id ?? ''),
                                 from: String(msg.from_aid ?? ''),
@@ -1779,6 +1891,23 @@ export class V2E2EECoordinator {
                         decrypted.push(v1Msg);
                         continue;
                     }
+                    if (payloadObj && ['e2ee.group_encrypted', 'e2ee.p2p_encrypted', 'e2ee.encrypted'].includes(String(payloadObj.type ?? '').trim())) {
+                        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;
+                            await client._publishPulledMessage('group.message_created', ns, seq, plaintext, false);
+                            decrypted.push(plaintext);
+                        }
+                    }
                     client._clientLog.debug(`group.v2.pull skipping V1 envelope group=${gid} seq=${seq} payload_type=${payloadObj ? String(payloadObj.type ?? '') : '<none>'} (V1 E2EE removed)`);
                     continue;
                 }
@@ -1787,7 +1916,7 @@ export class V2E2EECoordinator {
                     continue;
                 }
                 const deferStatus = {};
-                let plaintext = await client._decryptV2Message(msg, true, true, true, true, deferStatus, true);
+                let plaintext = await client._decryptV2Message(msg, true, true, true, true, deferStatus, true, 'pull');
                 if (deferStatus.deferred) {
                     blockedSeq = blockedSeq > 0 ? Math.min(blockedSeq, seq) : seq;
                 }
@@ -1851,6 +1980,7 @@ export class V2E2EECoordinator {
             for (const fetch of deferredKeyFetches.values()) {
                 this.scheduleSenderIKFetch(fetch.fromAid, fetch.senderDeviceId, fetch.groupId);
             }
+            client._delivery.onPullPage?.(ns, decrypted.length - pageDecryptedBefore, hasMore, pageMaxSeq, typeof result.remaining === 'number' && Number.isSafeInteger(result.remaining) && result.remaining >= 0 ? result.remaining : null, messages.length, client._seqTracker.getContiguousSeq(ns), pageMaxSeq);
             if (ownsCursor && parsedCursorCurrentSeq !== null && cursorCurrentSeq > ackSeq) {
                 this.recordForwardCursor(ns, cursorCurrentSeq, ackSeq);
             }
@@ -1868,7 +1998,7 @@ export class V2E2EECoordinator {
             if (ackNeeded) {
                 this.recordForwardAck(ns, ackSeq);
                 const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
-                const canContinuePage = messages.length > 0 && nextAfter > nextAfterSeq && ownsCursor;
+                const canContinuePage = blockedSeq <= 0 && messages.length > 0 && nextAfter > nextAfterSeq && ownsCursor;
                 if (canContinuePage) {
                     pendingAckSeq = Math.max(pendingAckSeq, ackSeq);
                     lastAutoAckSeq = Math.max(lastAutoAckSeq, ackSeq);
@@ -1916,6 +2046,7 @@ export class V2E2EECoordinator {
                 pendingAckSeq = 0;
             }
         }
+        client._delivery.onPullWorkSettled?.();
         return decrypted;
     }
     async confirmForwardGroupAck(groupId, upToSeq, groupAid) {
@@ -2470,7 +2601,7 @@ export class V2E2EECoordinator {
     async decryptV2PushMessage(data) {
         if (!isJsonObject(data))
             return null;
-        return await this.client._decryptV2Message(data);
+        return await this.client._decryptV2Message(data, false, false, false, false, undefined, false, 'inline_push');
     }
     async buildV2P2PEnvelope(opts) {
         const client = this.client;