@agentunion/fastaun 0.5.10 → 0.5.12

package/dist/client/v2-e2ee.js

@@ -60,11 +60,16 @@ function deduplicateForwardPageMessages(value, afterSeq) {
     }
     return [...bySeq.entries()].sort(([a], [b]) => a - b).map(([, row]) => row);
 }
-function shouldContinueForwardPage({ rawCount, nextAfterSeq, nextAfter, limit, hasMoreField, hasMore, serverHead, pendingAckSeq, }) {
+function contiguousPullSeq(afterSeq, seqs, proof) {
+    const pulledMax = seqs.length > 0 ? Math.max(...seqs) : 0;
+    const serverProof = safeNonNegativeSeq(proof);
+    return Math.max(afterSeq, pulledMax, serverProof ?? 0);
+}
+function shouldContinueForwardPage({ rawCount, nextAfterSeq, nextAfter, limit, hasMoreField, hasMore, serverHead, observedUpper, pendingAckSeq, }) {
     // 无新 seq 或游标未前进时必须停止，避免错误元数据造成循环。
     if (rawCount <= 0 || nextAfter <= nextAfterSeq)
         return false;
-    if (hasMore || serverHead > nextAfter || pendingAckSeq > 0)
+    if (hasMore || serverHead > nextAfter || observedUpper > nextAfter || pendingAckSeq > 0)
         return true;
     // 仅旧服务缺失 has_more 时，以满页保留兼容续拉。
     return !hasMoreField && limit > 0 && rawCount >= limit;
@@ -734,7 +739,7 @@ export class V2E2EECoordinator {
                 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) {
                     client._clientLog.warn(`V2 sender IK pending retry raised: key=${key} err=${formatE2EEError(exc)}`);
@@ -767,12 +772,14 @@ export class V2E2EECoordinator {
                 pending.delete(key);
                 const seq = Number(entry.msg.seq ?? 0);
                 if (entry.groupId) {
+                    if (client._delivery.isSelfSentGroupMessage?.(entry.msg))
+                        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);
+                    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}`);
             }
@@ -1018,10 +1025,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 ?? ''),
@@ -1034,9 +1041,14 @@ 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 = await client._decryptV2Message(msg, false, !history);
+            plaintext = await client._decryptV2Message(msg, false, !history, true, true, undefined, false, source);
         }
         if (!plaintext) {
             if (history)
@@ -1046,12 +1058,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, source);
-            }
-            else {
-                await client._publishAppEvent(event.event, event.payload, source);
-            }
+            await client._publishAppEvent(event.event, event.payload, source);
         }
         return plaintext;
     }
@@ -1061,35 +1068,52 @@ 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) {
+                    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 = await client._decryptV2Message(msg, false, !history);
+            plaintext = await client._decryptV2Message(msg, false, !history, true, true, undefined, false, source);
             if (plaintext) {
                 plaintext.group_id = groupId;
                 plaintext.group_aid = groupAid;
@@ -1102,24 +1126,14 @@ export class V2E2EECoordinator {
             client._clientLog.warn(`Group Tail 单条消息解密失败，连续性证明仍保留: group=${groupId}, seq=${seq}`);
             return null;
         }
+        if (publish && !history && client._delivery.isSelfSentGroupMessage?.(msg)) {
+            return plaintext;
+        }
         if (publish) {
-            if (orderedPublish) {
-                await client._delivery.publishOrderedMessage('group.message_created', `group:${groupId}`, seq, plaintext, source);
-            }
-            else {
-                await client._publishAppEvent('group.message_created', plaintext, source);
-            }
+            await client._publishAppEvent('group.message_created', plaintext, source);
         }
         return plaintext;
     }
-    async applyTailFloor(ns, floor) {
-        const client = this.client;
-        if (!ns || floor <= 0 || client._seqTracker.getContiguousSeq(ns) >= floor)
-            return;
-        client._seqTracker.forceContiguousSeq(ns, floor);
-        client._persistSeq(ns);
-        await client._saveSeqTrackerState?.();
-    }
     async pullV2TailInternal(params, deferPublish = false) {
         const client = this.client;
         if (params.window_mode !== 'tail')
@@ -1129,10 +1143,9 @@ 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.syncStarted(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;
-        await this.applyTailFloor(ns, Number.isSafeInteger(floor) ? floor : 0);
         const page = validateTailPage(result, afterSeq, limit);
         if (ns) {
             client._seqTracker.commitTailWindow(ns, {
@@ -1151,8 +1164,15 @@ export class V2E2EECoordinator {
                 decoded.push(plaintext);
         }
         const ack = ns ? client._seqTracker.getContiguousSeq(ns) : 0;
-        if (previous && ack > previous.ack)
-            await this.ackV2(ack);
+        if (ns)
+            client._delivery.syncProgress(ns, {
+                rawCount: page.messages.length,
+                pulledCount: decoded.length,
+                remaining: result.remaining,
+                hasMore: typeof result.has_more === 'boolean' ? result.has_more : undefined,
+                currentSeq: ack,
+                targetSeq: page.head,
+            });
         return { ...result, messages: decoded, raw_count: page.messages.length };
     }
     async historyV2Internal(params) {
@@ -1169,21 +1189,23 @@ export class V2E2EECoordinator {
         }
         return { ...result, messages: decoded };
     }
-    async pullV2(afterSeq = 0, limit = 50, 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.syncStarted(ns);
         if (opts?.windowMode === 'tail') {
             if (!opts.gateLocked) {
                 const key = `${ns}|tail|after=${afterSeq}|limit=${limit}`;
-                return (await client._runPullSerialized(key, () => this.pullV2(afterSeq, limit, { ...opts, gateLocked: true }), false));
+                return (await client._runPullSerialized(key, () => this.pullV2Impl(afterSeq, limit, { ...opts, gateLocked: true }), false));
             }
             const result = await this.pullV2TailInternal({ window_mode: 'tail', after_seq: afterSeq, limit });
             return (Array.isArray(result.messages) ? result.messages : []);
         }
         if (ns && !opts?.gateLocked) {
             const key = `${ns}|forward|after=${afterSeq}|force=${String(Boolean(opts?.force))}|limit=${limit}`;
-            return await client._runPullSerialized(key, async () => this.pullV2(afterSeq, limit, {
+            return await client._runPullSerialized(key, async () => this.pullV2Impl(afterSeq, limit, {
                 ...(opts ?? {}),
                 gateLocked: true,
                 scheduleFollowup: true,
@@ -1251,8 +1273,10 @@ export class V2E2EECoordinator {
             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)
@@ -1260,11 +1284,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') {
+                    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 ?? ''),
@@ -1286,6 +1311,25 @@ export class V2E2EECoordinator {
                         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)`);
                     }
@@ -1300,7 +1344,7 @@ export class V2E2EECoordinator {
                     client._v2Session.trackOldSPKMaxSeq(spkId, 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;
                 }
@@ -1330,7 +1374,7 @@ export class V2E2EECoordinator {
             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, blockedSeq > 0 ? blockedSeq - 1 : (seqs.length > 0 ? pageMaxSeq : pageContigBefore));
+                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 {
@@ -1380,7 +1424,7 @@ export class V2E2EECoordinator {
                         || (contigAdvanced && ackSeq > knownServerAckSeq));
                 if (ackNeeded) {
                     this.recordForwardAck(ns, ackSeq);
-                    const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
+                    const nextAfter = Math.max(pageContiguousSeq, nextAfterSeq);
                     const canContinuePage = blockedSeq <= 0 && messages.length > 0 && nextAfter > nextAfterSeq;
                     if (canContinuePage) {
                         pendingAckSeq = Math.max(pendingAckSeq, ackSeq);
@@ -1399,8 +1443,19 @@ export class V2E2EECoordinator {
                     this.scheduleSenderIKFetch(fetch.fromAid, fetch.senderDeviceId, fetch.groupId);
                 }
             }
-            const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
+            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 shouldContinue = shouldContinueForwardPage({
                 rawCount,
                 nextAfterSeq,
@@ -1409,6 +1464,7 @@ export class V2E2EECoordinator {
                 hasMoreField,
                 hasMore,
                 serverHead,
+                observedUpper: Math.max(client._seqTracker.getMaxSeenSeq(ns), Number(client._pendingP2pPullUpper?.get?.(ns) ?? 0)),
                 pendingAckSeq,
             });
             if (!shouldContinue)
@@ -1434,6 +1490,19 @@ export class V2E2EECoordinator {
         client._clientLog.debug(`message.v2.pull done: requested_after_seq=${afterSeq}, pages=${pageCount}, decrypted=${decrypted.length}, ns=${ns || '<none>'}`);
         return decrypted;
     }
+    async pullV2(afterSeq = 0, limit = 50, opts) {
+        const ns = this.client._aid ? `p2p:${this.client._aid}` : '';
+        if (!ns)
+            return await this.pullV2Impl(afterSeq, limit, opts);
+        this.client._delivery.syncStarted(ns);
+        try {
+            return await this.pullV2Impl(afterSeq, limit, opts);
+        }
+        catch (error) {
+            this.client._delivery.onPullAborted?.();
+            throw error;
+        }
+    }
     async confirmForwardP2PAck(upToSeq) {
         const ns = this.client._aid ? `p2p:${this.client._aid}` : '';
         try {
@@ -1536,22 +1605,8 @@ export class V2E2EECoordinator {
             client._clientLog.debug(`group.v2.send ok: group=${gid}, use_cache=${useCache}, seq=${String((isJsonObject(result) ? result.seq : '') ?? '')}`);
             return result;
         };
-        const markSentSeq = async (result) => {
-            if (!isJsonObject(result))
-                return;
-            const obj = result;
-            const seq = Number(obj.seq ?? 0);
-            if (!Number.isFinite(seq) || seq <= 0)
-                return;
-            const ns = `group:${gid}`;
-            client._seqTracker.onMessageSeq(ns, seq);
-            client._markPublishedSeq(ns, seq);
-            await client._saveSeqTrackerState();
-            client._clientLog.debug(`group.v2.send marked own seq: group=${gid}, ns=${ns}, seq=${seq}`);
-        };
         try {
             const result = await attempt(true);
-            await markSentSeq(result);
             return client._delivery.attachSendResultEnvelope('group.send', withExplicitGroupAid({
                 group_id: gid,
                 payload,
@@ -1567,7 +1622,6 @@ export class V2E2EECoordinator {
                 client._clientLog.debug(`V2 group speculative send rejected (code=${String(excCode)}), refreshing bootstrap`);
                 this.deleteBootstrapCacheEntry(`group:${gid}`);
                 const result = await attempt(false);
-                await markSentSeq(result);
                 return client._delivery.attachSendResultEnvelope('group.send', withExplicitGroupAid({
                     group_id: gid,
                     payload,
@@ -1739,6 +1793,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.syncStarted(ns);
         const result = await client._callRawV2Rpc('group.v2.pull', withExplicitGroupAid({
             group_id: groupId,
             window_mode: 'tail',
@@ -1749,9 +1811,6 @@ export class V2E2EECoordinator {
         const resultAid = String(result.group_aid ?? result.groupAid ?? '').trim();
         if (resultAid)
             groupAid = resultAid;
-        const floor = Number(result.retention_floor_message_seq ?? result.retention_floor_seq ?? 0);
-        const previous = client._seqTracker.getSyncState(ns);
-        await this.applyTailFloor(ns, Number.isSafeInteger(floor) ? floor : 0);
         const page = validateTailPage(result, afterSeq, limit);
         client._seqTracker.commitTailWindow(ns, {
             windowStartSeq: page.windowStart,
@@ -1769,8 +1828,15 @@ export class V2E2EECoordinator {
                 decoded.push(plaintext);
         }
         const ack = client._seqTracker.getContiguousSeq(ns);
-        if (ack > previous.ack)
-            await this.ackGroupV2(groupId, ack, groupAid);
+        if (ownsCursor)
+            client._delivery.syncProgress(ns, {
+                rawCount: page.messages.length,
+                pulledCount: decoded.length,
+                remaining: result.remaining,
+                hasMore: typeof result.has_more === 'boolean' ? result.has_more : undefined,
+                currentSeq: ack,
+                targetSeq: page.head,
+            });
         return { ...result, messages: decoded, raw_count: page.messages.length };
     }
     async historyGroupV2Internal(params) {
@@ -1806,7 +1872,7 @@ export class V2E2EECoordinator {
             force: params.force === true,
         });
     }
-    async pullGroupV2(groupId, afterSeq = 0, limit = 50, opts) {
+    async pullGroupV2Impl(groupId, afterSeq = 0, limit = 50, opts) {
         const client = this.client;
         await client._ensureV2SessionReady('group.pull');
         const gid = String(groupId ?? '').trim();
@@ -1814,15 +1880,18 @@ export class V2E2EECoordinator {
             throw new ValidationError('group.pull requires group_id');
         let groupAid = String(opts?.groupAid ?? '').trim();
         const ns = `group:${gid}`;
+        if (opts?.ownsCursor !== false)
+            client._delivery.syncStarted(ns);
         if (opts?.windowMode === 'tail') {
             if (!opts.gateLocked) {
                 const key = `${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',
@@ -1833,7 +1902,7 @@ export class V2E2EECoordinator {
         }
         if (!opts?.gateLocked) {
             const key = `${ns}|forward|after=${afterSeq}|force=${opts?.force === true}|limit=${limit}`;
-            return await client._runPullSerialized(key, async () => this.pullGroupV2(gid, afterSeq, limit, {
+            return await client._runPullSerialized(key, async () => this.pullGroupV2Impl(gid, afterSeq, limit, {
                 ...(opts ?? {}),
                 gateLocked: true,
                 scheduleFollowup: true,
@@ -1914,30 +1983,34 @@ export class V2E2EECoordinator {
             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 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;
+                    const payloadType = payloadObj ? String(payloadObj.type ?? '').trim() : '';
                     // 群撤回 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 (!['e2ee.encrypted', 'e2ee.group_encrypted', 'e2ee.p2p_encrypted'].includes(payloadType)) {
                             let v1Msg = {
                                 message_id: String(msg.message_id ?? ''),
                                 from: String(msg.from_aid ?? ''),
@@ -1951,7 +2024,12 @@ export class V2E2EECoordinator {
                             };
                             v1Msg = normalizeGroupMentionMode(v1Msg, msg, msg.envelope_json);
                             attachGatewayProximity(v1Msg, msg);
-                            await client._publishPulledMessage('group.message_created', ns, seq, v1Msg, false);
+                            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;
@@ -1976,7 +2054,31 @@ export class V2E2EECoordinator {
                         client._clientLog.debug(`group.v2.pull plaintext V1 delivered: group=${gid}, seq=${seq}`);
                         continue;
                     }
-                    client._clientLog.debug(`group.v2.pull skipping V1 envelope group=${gid} seq=${seq} payload_type=${payloadObj ? String(payloadObj.type ?? '') : '<none>'} (V1 E2EE removed)`);
+                    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;
                 }
                 if (version !== 'v2') {
@@ -1984,7 +2086,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;
                 }
@@ -2003,7 +2105,12 @@ export class V2E2EECoordinator {
                 plaintext = normalizeGroupMentionMode(plaintext, msg, msg.envelope_json);
                 plaintext.group_id = gid;
                 plaintext.group_aid = eventGroupAid;
-                await client._publishPulledMessage('group.message_created', ns, seq, plaintext, false);
+                if (!client._delivery.isSelfSentGroupMessage?.(msg)) {
+                    await client._publishPulledMessage('group.message_created', ns, seq, plaintext, false);
+                }
+                else {
+                    client._markPublishedSeq(ns, seq);
+                }
                 decrypted.push(plaintext);
                 client._logMessageDebug('decrypt-ok', 'group.v2.pull', 'group.message_created', plaintext);
             }
@@ -2013,7 +2120,7 @@ export class V2E2EECoordinator {
             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, blockedSeq > 0 ? blockedSeq - 1 : (seqs.length > 0 ? pageMaxSeq : pageContigBefore));
+            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) {
@@ -2066,7 +2173,7 @@ export class V2E2EECoordinator {
                     || (contigAdvanced && ackSeq > knownServerCursorSeq));
             if (ackNeeded) {
                 this.recordForwardAck(ns, ackSeq);
-                const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
+                const nextAfter = Math.max(pageContiguousSeq, nextAfterSeq);
                 const canContinuePage = blockedSeq <= 0 && messages.length > 0 && nextAfter > nextAfterSeq && ownsCursor;
                 if (canContinuePage) {
                     pendingAckSeq = Math.max(pendingAckSeq, ackSeq);
@@ -2079,10 +2186,20 @@ export class V2E2EECoordinator {
                     lastAutoAckSeq = Math.max(lastAutoAckSeq, ackSeq);
                 }
             }
-            const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
+            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,
@@ -2091,6 +2208,7 @@ export class V2E2EECoordinator {
                 hasMoreField,
                 hasMore,
                 serverHead,
+                observedUpper: Math.max(client._seqTracker.getMaxSeenSeq(ns), Number(client._delivery.pendingPullUpper?.(ns) ?? 0)),
                 pendingAckSeq,
             });
             if (!shouldContinue)
@@ -2116,6 +2234,20 @@ export class V2E2EECoordinator {
         client._clientLog.debug(`group.v2.pull done: group=${gid}, requested_after_seq=${afterSeq}, pages=${pageCount}, decrypted=${decrypted.length}, ns=${ns}`);
         return decrypted;
     }
+    async pullGroupV2(groupId, afterSeq = 0, limit = 50, opts) {
+        if (opts?.ownsCursor === false) {
+            return await this.pullGroupV2Impl(groupId, afterSeq, limit, opts);
+        }
+        const ns = `group:${String(groupId ?? '').trim()}`;
+        this.client._delivery.syncStarted(ns);
+        try {
+            return await this.pullGroupV2Impl(groupId, afterSeq, limit, opts);
+        }
+        catch (error) {
+            this.client._delivery.onPullAborted?.();
+            throw error;
+        }
+    }
     async confirmForwardGroupAck(groupId, upToSeq, groupAid) {
         const ns = `group:${String(groupId ?? '').trim()}`;
         try {
@@ -2675,7 +2807,7 @@ export class V2E2EECoordinator {
     async decryptV2PushMessage(data) {
         if (!isJsonObject(data))
             return null;
-        return await this.client._decryptV2Message(data, false, false, false, false);
+        return await this.client._decryptV2Message(data, false, false, false, false, undefined, false, 'inline_push');
     }
     handleGroupChangedSpk(data, groupId, action) {
         if (!this.client._v2Session || !groupId || !MEMBERSHIP_ACTIONS.has(action))