@agentunion/fastaun-browser 0.5.10 → 0.5.12

package/dist/client/delivery.js

@@ -58,11 +58,35 @@ function positiveSafeSequenceHint(value) {
     const parsed = Number(value);
     return Number.isSafeInteger(parsed) && parsed > 0 ? parsed : 0;
 }
+function hasNonEmptyInlineMessage(value) {
+    return isJsonObject(value)
+        && Object.keys(value).length > 0;
+}
 function nonNegativeSafeSequenceHint(value) {
     if (typeof value !== 'number' || !Number.isSafeInteger(value) || value < 0)
         return null;
     return value;
 }
+function canonicalDeliverySource(source) {
+    switch (String(source ?? '').trim()) {
+        case 'group-push':
+        case 'ordered':
+        case 'legacy':
+            return 'push';
+        case 'tail':
+        case 'pull-drained':
+        case 'pull_drained':
+            return 'pull';
+        case 'inline-push':
+            return 'inline_push';
+        case 'pending-retry':
+            return 'pending_retry';
+        case '':
+            return 'direct';
+        default:
+            return String(source).trim();
+    }
+}
 function deduplicatePlainForwardPageMessages(value, afterSeq) {
     if (!Array.isArray(value))
         return [];
@@ -95,6 +119,9 @@ function p2pAppEventFromPlainPullMessage(message) {
 }
 export class MessageDeliveryEngine {
     runtime;
+    syncRun = 0;
+    syncingNamespaces = new Set();
+    syncSessions = new Map();
     pendingPullDeliveryChanges = null;
     deliveryGeneration = 0;
     realtimeTailResults = null;
@@ -116,6 +143,7 @@ export class MessageDeliveryEngine {
         this.runtime = runtime;
     }
     resetInlineAckState() {
+        this.syncStopped('aborted');
         this.inlineGeneration += 1;
         this.deliveryGeneration += 1;
         this.pendingPullDeliveryChanges = null;
@@ -131,6 +159,8 @@ export class MessageDeliveryEngine {
         this.pendingP2PInlineAcks = null;
         this.pendingGroupInlineAcks = null;
         this.pendingGroupInlineAckNamespaces = null;
+        this.syncingNamespaces.clear();
+        this.syncSessions.clear();
     }
     isInlineGenerationCurrent(generation) {
         return generation === this.inlineGeneration;
@@ -163,6 +193,95 @@ export class MessageDeliveryEngine {
     endRealtimeSync(ns) {
         this.realtimeSyncing?.delete(ns);
     }
+    onPullStarted(ns) {
+        if (!ns || this.syncingNamespaces.has(ns))
+            return;
+        if (this.syncingNamespaces.size === 0) {
+            this.syncRun += 1;
+            this.syncSessions.clear();
+            this.runtime.client._dispatcher?.enqueue?.('sync.started', {
+                run_id: this.syncRun,
+                source: 'pull',
+                syncing: true,
+                namespaces_pending: 1,
+                received_total: 0,
+                namespace: ns,
+                started_at: Date.now(),
+            });
+        }
+        this.syncingNamespaces.add(ns);
+        this.syncSessions.set(ns, { pages: 0, raw: 0, pulled: 0 });
+    }
+    onPullPage(ns, pulledCount, hasMore, maxSeen, remaining, rawCount = pulledCount, currentSeq, targetSeq) {
+        this.onPullStarted(ns);
+        if (!ns)
+            return;
+        const session = this.syncSessions.get(ns) ?? { pages: 0, raw: 0, pulled: 0 };
+        session.pages += 1;
+        session.raw += Math.max(0, rawCount);
+        session.pulled += Math.max(0, pulledCount);
+        this.syncSessions.set(ns, session);
+        const received = session.pulled;
+        const progress = {
+            run_id: this.syncRun,
+            source: 'pull',
+            namespace: ns,
+            page: session.pages,
+            page_raw_count: Math.max(0, rawCount),
+            page_pulled_count: Math.max(0, pulledCount),
+            pulled_count: received,
+            received_total: received,
+            batch_size: Math.max(0, pulledCount),
+            estimated_remaining: hasMore ? undefined : 0,
+            max_seen: maxSeen,
+            has_more: hasMore,
+        };
+        if (typeof currentSeq === 'number' && Number.isSafeInteger(currentSeq) && currentSeq >= 0) {
+            progress.current_seq = currentSeq;
+        }
+        if (typeof targetSeq === 'number' && Number.isSafeInteger(targetSeq) && targetSeq >= 0) {
+            progress.target_seq = targetSeq;
+        }
+        if (typeof remaining === 'number' && Number.isSafeInteger(remaining) && remaining >= 0) {
+            progress.remaining = remaining;
+            progress.estimated_remaining = progress.remaining;
+        }
+        this.runtime.client._dispatcher?.enqueue?.('sync.progress', progress);
+    }
+    onPullAborted() {
+        this.syncStopped('aborted');
+    }
+    syncStopped(reason = 'pull_drained') {
+        if (this.syncingNamespaces.size === 0)
+            return;
+        const sessions = [...this.syncSessions.entries()];
+        const receivedTotal = sessions.reduce((total, [, session]) => total + session.pulled, 0);
+        this.syncingNamespaces.clear();
+        this.syncSessions.clear();
+        const payload = {
+            run_id: this.syncRun,
+            source: 'pull',
+            syncing: false,
+            namespaces_pending: 0,
+            received_total: receivedTotal,
+            reason,
+            stopped_at: Date.now(),
+        };
+        if (sessions.length === 1) {
+            const [namespace, session] = sessions[0];
+            payload.namespace = namespace;
+            payload.pages = session.pages;
+            payload.pulled_count = session.pulled;
+        }
+        else if (sessions.length > 1) {
+            payload.namespaces = sessions.map(([namespace]) => namespace);
+            payload.pages = sessions.reduce((total, [, session]) => total + session.pages, 0);
+            payload.pulled_count = receivedTotal;
+        }
+        this.runtime.client._dispatcher?.enqueue?.('sync.stopped', {
+            ...payload,
+        });
+    }
     hasPendingPull(ns) {
         const pending = ns.startsWith('p2p:') ? this.pendingP2pPullUpper : this.pendingGroupPullUpper;
         return (pending?.get(ns) ?? 0) > 0;
@@ -176,7 +295,7 @@ export class MessageDeliveryEngine {
         const pipeline = this.runtime.client._rpcPipeline;
         if (pipeline?.hasAnyPullActivity?.() === true)
             return;
-        void this.flushPullDeliveryChanges();
+        void this.flushPullDeliveryChanges().finally(() => this.syncStopped('pull_drained'));
     }
     deliveryChangeNamespace(event, payload, ns = '') {
         if (event === 'message.received')
@@ -236,7 +355,11 @@ export class MessageDeliveryEngine {
         const changes = this.deliveryChangesPayload(batch.changes);
         if (changes.length === 0)
             return;
-        this.runtime.client._dispatcher.enqueue('delivery.changed', { trigger: batch.trigger, changes });
+        this.runtime.client._dispatcher.enqueue('delivery.changed', {
+            trigger: batch.trigger,
+            source: batch.trigger,
+            changes,
+        });
     }
     async flushPullDeliveryChanges() {
         const generation = this.deliveryGeneration;
@@ -249,7 +372,11 @@ export class MessageDeliveryEngine {
         const changes = this.deliveryChangesPayload(pending);
         if (changes.length === 0)
             return;
-        this.runtime.client._dispatcher.enqueue('delivery.changed', { trigger: 'pull_drained', changes });
+        this.runtime.client._dispatcher.enqueue('delivery.changed', {
+            trigger: 'pull_drained',
+            source: 'pull',
+            changes,
+        });
     }
     recordPendingPull(ns, seq) {
         if (!ns || !Number.isSafeInteger(seq) || seq <= 0)
@@ -852,20 +979,28 @@ export class MessageDeliveryEngine {
                 }
                 const message = normalizeGroupMentionMode(rawMessage);
                 if (this.recallEventFromGroupMessage(message)) {
-                    if (await this.publishGroupRecallTombstone(groupId, seq, message)) {
+                    if (await this.publishGroupRecallTombstone(groupId, seq, message, 'pull')) {
                         this.ensurePullOperationCurrent();
                         this.markPublishedSeq(ns, seq);
                         publishedCount += 1;
                     }
                 }
+                else if (this.isSelfSentGroupMessage(message)) {
+                    this.markPublishedSeq(ns, seq);
+                }
                 else if (await this.publishPulledMessage('group.message_created', ns, seq, message, false)) {
                     this.ensurePullOperationCurrent();
                     publishedCount += 1;
                 }
             }
             this.ensurePullOperationCurrent();
-            if (messages.length > 0)
+            const contiguousSeq = Number.isSafeInteger(result.contiguous_seq)
+                ? result.contiguous_seq
+                : undefined;
+            if (contiguousSeq === undefined)
                 client._seqTracker.onPullResult(ns, messages, afterSeq);
+            else
+                client._seqTracker.onPullResult(ns, messages, afterSeq, contiguousSeq);
             const commitTarget = Math.max(client._seqTracker.getContiguousSeq(ns), retentionFloor, visibilityFloor, deferredServerCursor);
             if (commitTarget > client._seqTracker.getContiguousSeq(ns)) {
                 client._seqTracker.forceContiguousSeq(ns, commitTarget);
@@ -919,6 +1054,9 @@ export class MessageDeliveryEngine {
             this.ensurePullOperationCurrent();
             await this.confirmPlainForwardAck(ns, ackMethod, pendingAckSeq, groupId);
         }
+        const remaining = typeof response.remaining === 'number' && Number.isSafeInteger(response.remaining) && response.remaining >= 0
+            ? response.remaining : null;
+        this.onPullPage(ns, publishedCount, response.has_more === true, messages.length > 0 ? Number(messages[messages.length - 1].seq ?? 0) : undefined, remaining, messages.length, client._seqTracker.getContiguousSeq(ns), messages.length > 0 ? Number(messages[messages.length - 1].seq ?? 0) : undefined);
         return { rawCount: messages.length, publishedCount };
     }
     enqueueOrderedMessage(ns, event, seq, payload, source = 'push') {
@@ -941,11 +1079,11 @@ export class MessageDeliveryEngine {
     async publishOrderedQueueItem(ns, event, seq, payload, pullResponse = false, source = 'push', batch) {
         const client = this.runtime.client;
         if (event === 'group.changed' && this.isGroupEventNamespace(ns)) {
-            await this.publishOrderedGroupChanged(payload);
+            await this.publishOrderedGroupChanged(payload, source);
             return;
         }
         if (event === 'message.recalled') {
-            await this.publishMessageRecallTombstone(seq, payload);
+            await this.publishMessageRecallTombstone(seq, payload, source);
             return;
         }
         if (pullResponse) {
@@ -954,7 +1092,7 @@ export class MessageDeliveryEngine {
         }
         await client._publishAppEvent(event, payload, source, ns, batch);
     }
-    async publishOrderedGroupChanged(payload) {
+    async publishOrderedGroupChanged(payload, source = 'ordered') {
         const client = this.runtime.client;
         if (isJsonObject(payload)) {
             const eventPayload = payload;
@@ -966,7 +1104,7 @@ export class MessageDeliveryEngine {
                     client._cleanupDissolvedGroup?.(groupId);
             }
         }
-        await client._publishAppEvent('group.changed', payload);
+        await client._publishAppEvent('group.changed', payload, source);
     }
     isInstanceScopedMessageEvent(event) {
         return event === 'message.received'
@@ -989,18 +1127,27 @@ export class MessageDeliveryEngine {
         }
         return result;
     }
-    normalizePublishedMessagePayload(event, payload) {
+    normalizePublishedMessagePayload(event, payload, source = 'direct') {
+        let normalized;
         if (this.isInstanceScopedMessageEvent(event)) {
             payload = this.stripInlineInternalFields(payload);
             if (event === 'group.message_created')
                 payload = normalizeGroupMentionMode(payload);
-            return this.attachAppMessageEnvelope(this.stripInternalSenderDeviceFields(this.attachCurrentInstanceContext(payload)));
+            normalized = this.attachAppMessageEnvelope(this.stripInternalSenderDeviceFields(this.attachCurrentInstanceContext(payload)));
         }
-        if (this.isGroupScopedEvent(event)) {
+        else if (this.isGroupScopedEvent(event)) {
             payload = this.stripInlineInternalFields(payload);
-            return this.attachAppGroupEventEnvelope(this.attachCurrentInstanceContext(payload));
+            normalized = this.attachAppGroupEventEnvelope(this.attachCurrentInstanceContext(payload));
+        }
+        else {
+            normalized = payload;
         }
-        return payload;
+        const canonicalSource = canonicalDeliverySource(source);
+        if (canonicalSource === 'direct' || !isJsonObject(normalized))
+            return normalized;
+        if (!this.isInstanceScopedMessageEvent(event) && !this.isGroupScopedEvent(event))
+            return normalized;
+        return { ...normalized, source: canonicalSource };
     }
     stripInlineInternalFields(payload) {
         if (!isJsonObject(payload))
@@ -1269,7 +1416,7 @@ export class MessageDeliveryEngine {
             return `p2p|tombstone:${tombstoneId}`;
         return `p2p|unknown:${Date.now()}:${Math.random()}`;
     }
-    async publishMessageRecallTombstone(seq, message) {
+    async publishMessageRecallTombstone(seq, message, source = 'push') {
         const client = this.runtime.client;
         const eventPayload = this.recallEventFromMessage(message);
         if (!eventPayload)
@@ -1290,7 +1437,7 @@ export class MessageDeliveryEngine {
             for (const [oldKey] of drop)
                 seen.delete(oldKey);
         }
-        await client._publishAppEvent('message.recalled', eventPayload);
+        await client._publishAppEvent('message.recalled', eventPayload, source);
         client._clientLog.debug(`message.recalled published: seq=${String(seq)} ids=${JSON.stringify(eventPayload.message_ids)}`);
         return true;
     }
@@ -1373,7 +1520,7 @@ export class MessageDeliveryEngine {
             return `${normalizedGroupId}|tombstone:${tombstoneId}`;
         return `${normalizedGroupId}|unknown:${Date.now()}:${Math.random()}`;
     }
-    async publishGroupRecallTombstone(groupId, seq, message) {
+    async publishGroupRecallTombstone(groupId, seq, message, source = 'push') {
         const client = this.runtime.client;
         const eventPayload = this.recallEventFromGroupMessage(message);
         if (!eventPayload)
@@ -1396,16 +1543,12 @@ export class MessageDeliveryEngine {
             for (const [oldKey] of drop)
                 seen.delete(oldKey);
         }
-        await client._publishAppEvent('group.message_recalled', eventPayload);
+        await client._publishAppEvent('group.message_recalled', eventPayload, source);
         client._clientLog.debug(`group.message_recalled published: group=${groupId} seq=${String(seq)} ids=${JSON.stringify(eventPayload.message_ids)}`);
         return true;
     }
     async onRawGroupMessageRecalled(data) {
-        // 在线 push 是实时通道，与 pull 兜底的双 tombstone 互补。push 携带的 seq 是通知
-        // tombstone 的 notice_seq；必须像普通群消息 push 一样推进 seqTracker + markPublished +
-        // auto-ack，否则该 seq 在本地 contiguous 序列留洞，后续 pull/reconnect 会重复拉到并
-        // 重复处理。publishGroupRecallTombstone 内部再按 (group_id, message_ids) 去重，
-        // 确保应用层只回调一次。
+        // 非 inline push 仅作为实时通知，不推进 seqTracker/cursor/ACK。
         const client = this.runtime.client;
         if (!isJsonObject(data))
             return;
@@ -1436,41 +1579,13 @@ export class MessageDeliveryEngine {
             return;
         }
         const ns = `group:${groupId}`;
-        if (seqNum > 0) {
-            client._seqTracker.updateMaxSeen(ns, seqNum);
-            if (client._seqTracker.getContiguousSeq(ns) === seqNum) {
-                // 已覆盖（pull 先到并推进过），仍走去重发布兜底，不重复推进 seq。
-                await this.publishGroupRecallTombstone(groupId, seq, wrapped);
-                return;
-            }
-            client._repairPushContiguousBound(ns, seqNum, true, '_raw.group.message_recalled');
-        }
-        // 该 notice_seq 已由 pull 路径处理过（已发布或挂起待发布）时，去重发布兜底后返回。
-        const pushed = client._pushedSeqs.get(ns);
-        const pending = client._pendingOrderedMsgs.get(ns);
-        if (pushed?.has(seqNum) || pending?.has(seqNum)) {
-            await this.publishGroupRecallTombstone(groupId, seq, wrapped);
-            return;
-        }
-        const contigBefore = client._seqTracker.getContiguousSeq(ns);
-        client._seqTracker.onMessageSeq(ns, seqNum);
+        client._seqTracker.updateMaxSeen(ns, seqNum);
+        if (seqNum > client._seqTracker.getContiguousSeq(ns)
+            && client._sessionOptions?.background_sync !== false)
+            client._safeAsync(this.fillGroupGap(groupId));
         await this.publishGroupRecallTombstone(groupId, seq, wrapped);
-        this.markPublishedSeq(ns, seqNum);
-        const contig = client._seqTracker.getContiguousSeq(ns);
-        if (contig > 0) {
-            const ackSeq = this.clampAckSeq('group.ack_messages', 'msg_seq', ns, contig);
-            client._transport.call('group.ack_messages', {
-                group_id: groupId,
-                msg_seq: ackSeq,
-                device_id: client._deviceId,
-                slot_id: client._slotId,
-                _rpc_background: true,
-            }).catch((e) => { client._clientLog.warn('group recall auto-ack failed: group=' + groupId, e); });
-        }
-        if (contig !== contigBefore)
-            this.persistSeq(ns);
     }
-    async publishAppEvent(event, payload, source = '', ns = '', batch) {
+    async publishAppEvent(event, payload, source = 'direct', ns = '', batch) {
         const client = this.runtime.client;
         const generation = this.deliveryGeneration;
         if ((event === 'message.received' || event === 'group.message_created') && isJsonObject(payload)) {
@@ -1492,14 +1607,21 @@ export class MessageDeliveryEngine {
                 client._clientLog.debug(`agent_md etag inject skipped: ${String(exc)}`);
             }
         }
-        client._dispatcher.enqueue(event, this.normalizePublishedMessagePayload(event, payload));
+        const canonicalSource = canonicalDeliverySource(source);
+        let normalized = this.normalizePublishedMessagePayload(event, payload, source);
+        if (isJsonObject(normalized)
+            && (this.isInstanceScopedMessageEvent(event) || this.isGroupScopedEvent(event))
+            && canonicalSource !== 'direct') {
+            normalized = { ...normalized, source: canonicalSource };
+        }
+        client._dispatcher.enqueue(event, normalized);
         if (generation !== this.deliveryGeneration)
             return;
-        if (source !== 'pull' && source !== 'tail' && source !== 'pending_retry'
-            && source !== 'push' && source !== 'inline_push')
+        if (canonicalSource !== 'pull' && canonicalSource !== 'pending_retry'
+            && canonicalSource !== 'push' && canonicalSource !== 'inline_push')
             return;
-        if (source === 'push' || source === 'inline_push') {
-            const localBatch = batch ?? this.createDeliveryChangeBatch(source);
+        if (canonicalSource === 'push' || canonicalSource === 'inline_push') {
+            const localBatch = batch ?? this.createDeliveryChangeBatch(canonicalSource);
             this.recordDeliveryChange(localBatch.changes, event, payload, ns, generation);
             if (!batch)
                 await this.flushRealtimeDeliveryChanges(localBatch);
@@ -1542,6 +1664,21 @@ export class MessageDeliveryEngine {
         }
         return true;
     }
+    isSelfSentGroupMessage(message) {
+        if (!isJsonObject(message))
+            return false;
+        const client = this.runtime.client;
+        const selfAid = String(client._aid ?? '').trim().toLowerCase();
+        const senderAid = String(message.sender_aid ?? message.from_aid ?? message.from ?? '').trim().toLowerCase();
+        if (!selfAid || senderAid !== selfAid)
+            return false;
+        const senderDevice = Object.prototype.hasOwnProperty.call(message, 'sender_device_id')
+            ? message.sender_device_id
+            : message.from_device_id;
+        if (typeof senderDevice !== 'string' || !senderDevice.trim() || !String(client._deviceId ?? '').trim())
+            return false;
+        return senderDevice.trim() === String(client._deviceId).trim();
+    }
     strictTargetString(source, key) {
         if (!Object.prototype.hasOwnProperty.call(source, key)) {
             return { present: false, valid: false, value: '' };
@@ -1611,13 +1748,12 @@ export class MessageDeliveryEngine {
         const ns = isJsonObject(data) && client._aid && data.seq !== undefined
             ? `p2p:${client._aid}`
             : '';
-        const seq = isJsonObject(data) && typeof data.seq === 'number' ? data.seq : 0;
-        if (client._v2Session && ns && Number.isSafeInteger(seq) && seq > 0
-            && this.messageTargetsCurrentInstance(data)) {
+        const seq = isJsonObject(data) ? positiveSafeSequenceHint(data.seq) : 0;
+        if (client._v2Session && ns && seq > 0 && this.messageTargetsCurrentInstance(data)) {
             client._seqTracker.updateMaxSeen(ns, seq);
         }
         const hasInlineObject = isJsonObject(data)
-            && isJsonObject(data.inline_message);
+            && hasNonEmptyInlineMessage(data.inline_message);
         const inlineGeneration = hasInlineObject ? this.captureInlineGeneration() : undefined;
         const operation = () => this.processAndPublishMessage(data, inlineGeneration);
         client._safeAsync(client._v2Session && ns && !hasInlineObject
@@ -1634,33 +1770,15 @@ export class MessageDeliveryEngine {
             msg.type = 'message.recalled';
         if (!this.messageTargetsCurrentInstance(msg))
             return;
-        const seq = msg.seq;
-        if (seq !== undefined && seq !== null && client._aid) {
+        const seq = positiveSafeSequenceHint(msg.seq);
+        if (client._aid && seq > 0) {
             const ns = `p2p:${client._aid}`;
-            if (seq > 0)
-                client._seqTracker.updateMaxSeen(ns, seq);
-            const contigBefore = client._seqTracker.getContiguousSeq(ns);
-            const seqNeedsPull = client._seqTracker.onMessageSeq(ns, seq);
-            const published = await this.publishOrderedMessage('message.recalled', ns, seq, msg);
-            const contigAfter = client._seqTracker.getContiguousSeq(ns);
-            if (seqNeedsPull && !published && client._sessionOptions?.background_sync !== false) {
+            client._seqTracker.updateMaxSeen(ns, seq);
+            if (seq > client._seqTracker.getContiguousSeq(ns)
+                && client._sessionOptions?.background_sync !== false)
                 client._safeAsync(this.fillP2pGap());
-            }
-            const contig = client._seqTracker.getContiguousSeq(ns);
-            if (contig > 0) {
-                const ackSeq = this.clampAckSeq('message.ack', 'seq', ns, contig);
-                client._transport.call('message.ack', {
-                    seq: ackSeq,
-                    device_id: client._deviceId,
-                    slot_id: client._slotId,
-                    _rpc_background: true,
-                }).catch((e) => { client._clientLog.warn(`P2P recall auto-ack failed:${String(e)}`); });
-            }
-            if (contigAfter !== contigBefore)
-                this.persistSeq(ns);
-            return;
         }
-        await this.publishMessageRecallTombstone(seq, msg);
+        await this.publishMessageRecallTombstone(msg.seq, msg);
     }
     async processAndPublishMessage(data, inlineGeneration) {
         const client = this.runtime.client;
@@ -1677,47 +1795,36 @@ export class MessageDeliveryEngine {
             // 新服务端为兼容旧 SDK 仍可能发送 message.received；V2 会话下必须
             // 在旧 seq tracking / ordered publish 之前转入前台 Tail 协调器。
             const legacyPushSeq = positiveSafeSequenceHint(msg.seq);
-            const hasInlineField = Object.prototype.hasOwnProperty.call(msg, 'inline_message');
+            const hasInlineField = hasNonEmptyInlineMessage(msg.inline_message);
             if (client._v2Session && client._aid && (legacyPushSeq > 0 || hasInlineField)) {
                 await this.processV2P2PNotification(msg, 'v1', inlineGeneration);
                 return;
             }
+            if (client._aid && legacyPushSeq > 0) {
+                const ns = `p2p:${client._aid}`;
+                client._seqTracker.updateMaxSeen(ns, legacyPushSeq);
+                if (client._sessionOptions?.background_sync !== false)
+                    client._safeAsync(this.fillP2pGap());
+                return;
+            }
             const seq = msg.seq;
             const encryptedPush = client._isEncryptedPushMessage(msg);
-            if (seq !== undefined && seq !== null && client._aid) {
-                const ns = `p2p:${client._aid}`;
-                if (seq > 0)
-                    client._seqTracker.updateMaxSeen(ns, seq);
-                const contigBefore = client._seqTracker.getContiguousSeq(ns);
-                const seqNeedsPull = client._seqTracker.onMessageSeq(ns, seq);
-                const published = encryptedPush
-                    ? await client._publishEncryptedPushMessage('message.received', 'message.undecryptable', ns, seq, msg, false)
-                    : await this.publishOrderedMessage('message.received', ns, seq, msg);
-                const contigAfter = client._seqTracker.getContiguousSeq(ns);
-                const needPull = seqNeedsPull && !published;
-                if (needPull && client._sessionOptions?.background_sync !== false) {
+            const ns = client._aid ? `p2p:${client._aid}` : '';
+            const seqNum = positiveSafeSequenceHint(seq);
+            if (ns && seqNum > 0) {
+                client._seqTracker.updateMaxSeen(ns, seqNum);
+                if (seqNum > client._seqTracker.getContiguousSeq(ns)
+                    && client._sessionOptions?.background_sync !== false)
                     client._safeAsync(this.fillP2pGap());
-                }
-                const contig = client._seqTracker.getContiguousSeq(ns);
-                if (contig > 0) {
-                    const ackSeq = this.clampAckSeq('message.ack', 'seq', ns, contig);
-                    client._transport.call('message.ack', {
-                        seq: ackSeq,
-                        device_id: client._deviceId,
-                        slot_id: client._slotId,
-                        _rpc_background: true,
-                    }).catch((e) => { client._clientLog.warn(`P2P auto-ack failed:${String(e)}`); });
-                }
-                if (contigAfter !== contigBefore)
-                    this.persistSeq(ns);
-                if (encryptedPush)
-                    return;
+            }
+            if (encryptedPush) {
+                await client._publishEncryptedPushMessage('message.received', 'message.undecryptable', ns, seq ?? 0, msg, false);
+                return;
+            }
+            if (ns && seq !== undefined && seq !== null) {
+                await this.publishOrderedMessage('message.received', ns, seq, msg);
             }
             else {
-                if (encryptedPush) {
-                    await client._publishEncryptedPushMessage('message.received', 'message.undecryptable', '', seq ?? 0, msg, false);
-                    return;
-                }
                 await client._publishAppEvent('message.received', msg, 'push');
             }
         }
@@ -1734,7 +1841,7 @@ export class MessageDeliveryEngine {
                     _decrypt_error: String(exc),
                 };
                 client._attachV2EnvelopeMetadataFromSource(safeEvent, data);
-                await client._publishAppEvent('message.undecryptable', safeEvent);
+                await client._publishAppEvent('message.undecryptable', safeEvent, 'push');
             }
         }
     }
@@ -1742,15 +1849,14 @@ export class MessageDeliveryEngine {
         const client = this.runtime.client;
         client._clientLog.debug(`_onRawGroupMessageCreated enter: group_id=${data?.group_id ?? '-'} from=${data?.from ?? '-'} seq=${data?.seq ?? '-'}`);
         const groupId = isJsonObject(data) && typeof data.group_id === 'string' ? data.group_id.trim() : '';
-        const seq = isJsonObject(data) && typeof data.seq === 'number' ? data.seq : 0;
         const kind = isJsonObject(data) ? String(data.kind ?? '').trim() : '';
-        if (client._v2Session && groupId && kind !== 'group.online_unread_hint'
-            && Number.isSafeInteger(seq) && seq > 0) {
-            client._seqTracker.updateMaxSeen(`group:${groupId}`, seq);
-        }
         const ns = groupId ? `group:${groupId}` : '';
+        const seq = isJsonObject(data) ? positiveSafeSequenceHint(data.seq) : 0;
+        if (client._v2Session && ns && kind !== 'group.online_unread_hint' && seq > 0) {
+            client._seqTracker.updateMaxSeen(ns, seq);
+        }
         const hasInlineObject = isJsonObject(data)
-            && isJsonObject(data.inline_message);
+            && hasNonEmptyInlineMessage(data.inline_message);
         const inlineGeneration = hasInlineObject ? this.captureInlineGeneration() : undefined;
         const operation = () => this.processAndPublishGroupMessage(data, inlineGeneration);
         client._safeAsync(client._v2Session && ns && !hasInlineObject
@@ -1775,74 +1881,61 @@ export class MessageDeliveryEngine {
             // V2 会话中旧 group.message_created 也只是 Head 通知；必须先 Tail，
             // 不能让 payload 路径直接推进旧 ordered publish 状态。
             const legacyPushSeq = positiveSafeSequenceHint(seq);
-            const hasInlineField = Object.prototype.hasOwnProperty.call(msg, 'inline_message');
+            const hasInlineField = hasNonEmptyInlineMessage(msg.inline_message);
             if (client._v2Session && groupId && (legacyPushSeq > 0 || hasInlineField)) {
                 await this.processGroupV2MessageCreated(msg, 'v1', inlineGeneration);
                 return;
             }
+            if (groupId && legacyPushSeq > 0) {
+                const ns = `group:${groupId}`;
+                client._seqTracker.updateMaxSeen(ns, legacyPushSeq);
+                if (client._sessionOptions?.background_sync !== false)
+                    client._safeAsync(this.fillGroupGap(groupId));
+                return;
+            }
             if (payload === undefined || payload === null
                 || (typeof payload === 'object' && Object.keys(payload).length === 0)) {
-                await this.autoPullGroupMessages(msg);
+                if (client._v2Session)
+                    await this.autoPullGroupMessages(msg);
+                else if (groupId && seq !== undefined && seq !== null) {
+                    const ns = `group:${groupId}`;
+                    const seqNum = positiveSafeSequenceHint(seq);
+                    if (seqNum > 0) {
+                        client._seqTracker.updateMaxSeen(ns, seqNum);
+                        if (seqNum > client._seqTracker.getContiguousSeq(ns)
+                            && client._sessionOptions?.background_sync !== false)
+                            client._safeAsync(this.fillGroupGap(groupId));
+                    }
+                    await this.publishOrderedMessage('group.message_created', ns, seq, msg);
+                }
+                else
+                    await client._publishAppEvent('group.message_created', msg, 'push');
                 return;
             }
             const encryptedPush = client._isEncryptedPushMessage(msg);
-            if (groupId && seq !== undefined && seq !== null) {
-                const ns = `group:${groupId}`;
-                if (seq > 0)
-                    client._seqTracker.updateMaxSeen(ns, seq);
-                const contigBefore = client._seqTracker.getContiguousSeq(ns);
-                const seqNeedsPull = client._seqTracker.onMessageSeq(ns, seq);
-                // 群撤回 tombstone（占位 / 通知）：归一化为 group.message_recalled，仍占 seq。
-                if (!encryptedPush && this.recallEventFromGroupMessage(msg)) {
-                    await this.publishGroupRecallTombstone(groupId, seq, msg);
-                    this.markPublishedSeq(ns, Number(seq));
-                    const contigAfter = client._seqTracker.getContiguousSeq(ns);
-                    const contig = client._seqTracker.getContiguousSeq(ns);
-                    if (contig > 0) {
-                        const ackSeq = this.clampAckSeq('group.ack_messages', 'msg_seq', ns, contig);
-                        client._transport.call('group.ack_messages', {
-                            group_id: groupId,
-                            msg_seq: ackSeq,
-                            device_id: client._deviceId,
-                            slot_id: client._slotId,
-                            _rpc_background: true,
-                        }).catch((e) => { client._clientLog.warn('group recall auto-ack failed: group=' + groupId, e); });
-                    }
-                    if (contigAfter !== contigBefore)
-                        this.persistSeq(ns);
-                    return;
-                }
-                const published = encryptedPush
-                    ? await client._publishEncryptedPushMessage('group.message_created', 'group.message_undecryptable', ns, seq, msg, true)
-                    : await this.publishOrderedMessage('group.message_created', ns, seq, msg);
-                const contigAfter = client._seqTracker.getContiguousSeq(ns);
-                const needPull = seqNeedsPull && !published;
-                if (needPull && client._sessionOptions?.background_sync !== false) {
+            const ns = groupId ? `group:${groupId}` : '';
+            const seqNum = positiveSafeSequenceHint(seq);
+            if (ns && seqNum > 0) {
+                client._seqTracker.updateMaxSeen(ns, seqNum);
+                if (seqNum > client._seqTracker.getContiguousSeq(ns)
+                    && client._sessionOptions?.background_sync !== false)
                     client._safeAsync(this.fillGroupGap(groupId));
-                }
-                const contig = client._seqTracker.getContiguousSeq(ns);
-                if (contig > 0) {
-                    const ackSeq = this.clampAckSeq('group.ack_messages', 'msg_seq', ns, contig);
-                    client._transport.call('group.ack_messages', {
-                        group_id: groupId,
-                        msg_seq: ackSeq,
-                        device_id: client._deviceId,
-                        slot_id: client._slotId,
-                        _rpc_background: true,
-                    }).catch((e) => { client._clientLog.warn('group message auto-ack failed: group=' + groupId, e); });
-                }
-                if (contigAfter !== contigBefore)
-                    this.persistSeq(ns);
-                if (encryptedPush)
-                    return;
             }
-            else {
-                if (encryptedPush) {
-                    await client._publishEncryptedPushMessage('group.message_created', 'group.message_undecryptable', '', seq ?? 0, msg, true);
-                    return;
-                }
-                await client._publishAppEvent('group.message_created', msg, 'push');
+            if (this.isSelfSentGroupMessage(msg))
+                return;
+            if (!encryptedPush && this.recallEventFromGroupMessage(msg)) {
+                await this.publishGroupRecallTombstone(groupId, seq, msg);
+                return;
             }
+            if (encryptedPush) {
+                await client._publishEncryptedPushMessage('group.message_created', 'group.message_undecryptable', ns, seq ?? 0, msg, true);
+                return;
+            }
+            if (ns && seq !== undefined && seq !== null) {
+                await this.publishOrderedMessage('group.message_created', ns, seq, msg);
+            }
+            else
+                await client._publishAppEvent('group.message_created', msg, 'push');
         }
         catch (exc) {
             client._clientLog.warn(`group push processing failed:${String(exc)}`);
@@ -1857,7 +1950,7 @@ export class MessageDeliveryEngine {
                     _decrypt_error: String(exc),
                 };
                 client._attachV2EnvelopeMetadataFromSource(safeEvent, data);
-                await client._publishAppEvent('group.message_undecryptable', safeEvent);
+                await client._publishAppEvent('group.message_undecryptable', safeEvent, 'push');
             }
         }
     }
@@ -1865,7 +1958,7 @@ export class MessageDeliveryEngine {
         const client = this.runtime.client;
         const groupId = (notification.group_id ?? '');
         if (!groupId) {
-            await client._publishAppEvent('group.message_created', notification);
+            await client._publishAppEvent('group.message_created', notification, 'push');
             return;
         }
         if (client._sessionOptions?.background_sync === false) {
@@ -1882,7 +1975,7 @@ export class MessageDeliveryEngine {
             }
             catch (exc) {
                 client._clientLog.warn(`auto pull group message failed:${String(exc)}`);
-                await client._publishAppEvent('group.message_created', notification);
+                await client._publishAppEvent('group.message_created', notification, 'push');
                 return;
             }
         }
@@ -1912,7 +2005,7 @@ export class MessageDeliveryEngine {
             // 两种情况都不能再把原始通知当作第二条业务消息发布。
             client._clientLog.warn(`auto pull group message commit/ack failed:${String(exc)}`);
             if (!rawCompleted) {
-                await client._publishAppEvent('group.message_created', notification);
+                await client._publishAppEvent('group.message_created', notification, 'push');
             }
         }
     }
@@ -2050,6 +2143,8 @@ export class MessageDeliveryEngine {
         client._gapFillDone.add(dedupKey);
         this.runtime.delivery.setGapFillActive(true);
         let continuationAfterSeq = 0;
+        let pendingAckSeq = 0;
+        let failed = false;
         try {
             let nextAfterSeq = afterSeq;
             const maxPages = singlePage ? 1 : 100;
@@ -2071,9 +2166,11 @@ export class MessageDeliveryEngine {
                     return;
                 const pageContigBefore = client._seqTracker.getContiguousSeq(ns);
                 const eventObjects = events.filter((evt) => isJsonObject(evt));
-                if (eventObjects.length > 0) {
+                const contiguousSeq = Number.isSafeInteger(result.contiguous_seq) ? result.contiguous_seq : undefined;
+                if (contiguousSeq === undefined)
                     client._seqTracker.onPullResult(ns, eventObjects, nextAfterSeq);
-                }
+                else
+                    client._seqTracker.onPullResult(ns, eventObjects, nextAfterSeq, contiguousSeq);
                 const cursor = isJsonObject(result.cursor) ? result.cursor : null;
                 const retentionFloor = Math.max(0, Number(result.retention_floor_event_seq ?? 0), Number(cursor?.retention_floor_seq ?? 0));
                 const serverAckFloor = Math.max(0, Number(cursor?.current_seq ?? 0));
@@ -2089,6 +2186,7 @@ export class MessageDeliveryEngine {
                 }
                 const eventSeqs = [];
                 let hasDissolvedEvent = false;
+                let publishedEventCount = 0;
                 for (const evt of eventObjects) {
                     const eventSeq = Number(evt.event_seq ?? 0);
                     if (Number.isFinite(eventSeq) && eventSeq > 0)
@@ -2110,7 +2208,8 @@ export class MessageDeliveryEngine {
                         }
                     }
                     if (Number.isFinite(eventSeq) && eventSeq > 0 && !client._pushedSeqs.get(ns)?.has(eventSeq)) {
-                        this.enqueueOrderedMessage(ns, 'group.changed', eventSeq, evt);
+                        this.enqueueOrderedMessage(ns, 'group.changed', eventSeq, evt, 'pull');
+                        publishedEventCount += 1;
                     }
                 }
                 const ackContig = client._seqTracker.getContiguousSeq(ns);
@@ -2119,41 +2218,45 @@ export class MessageDeliveryEngine {
                     this.persistSeq(ns);
                 }
                 if (eventObjects.length > 0 && ackContig > 0 && ackContig !== pageContigBefore) {
-                    try {
-                        const ackPromise = client._transport.call('group.ack_events', {
-                            group_id: groupId,
-                            event_seq: ackContig,
-                            device_id: client._deviceId,
-                            slot_id: client._slotId,
-                            _rpc_background: true,
-                        });
-                        if (singlePage)
-                            await ackPromise;
-                        else
-                            ackPromise.catch((e) => { client._clientLog.warn('group event auto-ack failed: group=' + groupId, e); });
-                    }
-                    catch (e) {
-                        client._clientLog.warn('group event auto-ack failed: group=' + groupId, e);
-                    }
+                    pendingAckSeq = Math.max(pendingAckSeq, ackContig);
                 }
+                this.onPullPage(ns, publishedEventCount, result.has_more === true, eventObjects.length > 0 ? Number(eventObjects[eventObjects.length - 1].event_seq ?? 0) : undefined, typeof result.remaining === 'number' && Number.isSafeInteger(result.remaining) && result.remaining >= 0 ? result.remaining : null, eventObjects.length, ackContig, eventObjects.length > 0 ? Number(eventObjects[eventObjects.length - 1].event_seq ?? 0) : undefined);
                 const nextAfter = Math.max(eventSeqs.length > 0 ? Math.max(...eventSeqs) : nextAfterSeq, nextAfterSeq);
-                if (singlePage && result.has_more === true && nextAfter > nextAfterSeq) {
+                const needsMore = result.has_more === true || client._seqTracker.getMaxSeenSeq(ns) > nextAfter;
+                if (singlePage && needsMore && nextAfter > nextAfterSeq) {
                     continuationAfterSeq = nextAfter;
                 }
-                if (eventObjects.length === 0 || nextAfter <= nextAfterSeq || result.has_more !== true)
+                if (eventObjects.length === 0 || nextAfter <= nextAfterSeq || !needsMore)
                     break;
                 nextAfterSeq = nextAfter;
             }
             if (pageCount >= maxPages) {
                 client._clientLog.warn(`group event gap fill reached max_pages=${maxPages} group=${groupId} after_seq=${nextAfterSeq}`);
             }
+            if (pendingAckSeq > 0) {
+                try {
+                    await client._transport.call('group.ack_events', {
+                        group_id: groupId,
+                        event_seq: pendingAckSeq,
+                        device_id: client._deviceId,
+                        slot_id: client._slotId,
+                        _rpc_background: true,
+                    });
+                }
+                catch (e) {
+                    client._clientLog.warn('group event auto-ack failed: group=' + groupId, e);
+                }
+            }
         }
         catch (exc) {
+            failed = true;
             client._clientLog.warn(`group event gap-fill failed:${String(exc)}`);
         }
         finally {
             client._gapFillDone.delete(dedupKey);
             this.runtime.delivery.setGapFillActive(false);
+            if (!client._rpcPipeline)
+                this.syncStopped(failed ? 'aborted' : 'pull_drained');
             if (singlePage && continuationAfterSeq > afterSeq) {
                 this.enqueueOnlineUnreadEventHint({
                     group_id: groupId,
@@ -2182,43 +2285,15 @@ export class MessageDeliveryEngine {
             this.enqueueOnlineUnreadEventHint(data);
             return;
         }
-        if (this.isSelfJoinGroupChanged(data)) {
-            const contig = client._seqTracker.getContiguousSeq(ns);
-            const maxSeen = client._seqTracker.getMaxSeenSeq(ns);
-            if (contig === 0 && maxSeen === 0 && eventSeq > 1) {
-                client._clientLog.debug(`group.changed self-join baseline: group=${groupId}, event_seq=${eventSeq}, baseline=${eventSeq - 1}`);
-                client._seqTracker.forceContiguousSeq(ns, eventSeq - 1);
-            }
-        }
         const contigBefore = client._seqTracker.getContiguousSeq(ns);
+        client._seqTracker.updateMaxSeen(ns, eventSeq);
         const publishedDuplicate = client._pushedSeqs.get(ns)?.has(eventSeq) === true;
         if (eventSeq <= contigBefore || publishedDuplicate) {
             client._clientLog.debug(`group.changed skipped duplicate/stale: group=${groupId}, event_seq=${eventSeq}, contiguous=${contigBefore}`);
-            if (eventSeq <= contigBefore) {
-                this.fireGroupEventAck(groupId, ns, eventSeq, 'group event covered push ack');
-            }
-            else if (contigBefore > 0) {
-                this.fireGroupEventAck(groupId, ns, contigBefore, 'group event covered push ack');
-            }
             return;
         }
         this.enqueueOrderedMessage(ns, 'group.changed', eventSeq, data);
-        needPull = client._seqTracker.onMessageSeq(ns, eventSeq);
-        const ackContig = client._seqTracker.getContiguousSeq(ns);
-        await this.drainOrderedMessages(ns);
-        if (ackContig > 0 && ackContig !== contigBefore) {
-            if (data.action !== 'dissolved')
-                this.persistSeq(ns);
-            client._transport.call('group.ack_events', {
-                group_id: groupId,
-                event_seq: ackContig,
-                device_id: client._deviceId,
-                slot_id: client._slotId,
-                _rpc_background: true,
-            }).catch((e) => {
-                client._clientLog.warn('group event push auto-ack failed: group=' + groupId, e);
-            });
-        }
+        needPull = eventSeq > contigBefore;
         if (needPull && groupId && !data._from_gap_fill && client._sessionOptions?.background_sync !== false) {
             client._safeAsync(this.fillGroupEventGap(groupId));
         }
@@ -2837,20 +2912,19 @@ export class MessageDeliveryEngine {
         if (forceTail || order[0] === 'tail')
             result = await run(true, false, undefined, false, forceTail);
         const state = this.syncState(ns);
-        // Tail 的连续性证明只覆盖其返回的 head。Tail 进行期间到达的新
-        // Push 不能再次进入 realtime planner（那会再做一次 Tail）；以已经
-        // 落盘的 ack 为起点，至多补一页普通 Forward 即可恢复该小窗口。
-        const tailMissedDuringPull = tailCompleted
-            && Number(client._seqTracker.getMaxSeenSeq(ns) || 0) > state.head;
         const maxSeen = Number(client._seqTracker.getMaxSeenSeq(ns) || 0);
+        // Tail 期间到达的新 Push 只记录在 pending Pull 上界，不写入 SeqTracker。
+        const pendingUpper = Number(this.pendingP2pPullUpper?.get(ns) ?? 0);
+        const observedUpper = Math.max(maxSeen, pendingUpper);
+        const tailMissedDuringPull = tailCompleted && observedUpper > state.head;
         const pendingThroughSeq = tailMissedDuringPull
-            ? maxSeen
+            ? observedUpper
             : 0;
-        const tailForward = tailCompleted && (state.ack < state.tail - 1 || tailMissedDuringPull);
+        const tailForward = tailCompleted && (state.ack < state.head || tailMissedDuringPull);
         const backgroundWindowForward = order[0] === 'forward' && !headForward;
         if (headForward || tailForward
             || (client._sessionOptions?.background_sync !== false && backgroundWindowForward)) {
-            const forwardTarget = Math.max(headForward ? Math.max(pushSeq, maxSeen) : 0, (tailForward || backgroundWindowForward) ? state.tail - 1 : 0, tailMissedDuringPull ? maxSeen : 0);
+            const forwardTarget = Math.max(headForward ? Math.max(pushSeq, maxSeen) : 0, (tailForward || backgroundWindowForward) ? state.tail - 1 : 0, tailMissedDuringPull ? observedUpper : 0);
             const forwardMaxPages = this.forwardMaxPages(state.ack, forwardTarget, pageLimit);
             result = await run(false, !(headForward || tailForward), forwardMaxPages, headForward || tailMissedDuringPull);
             if (pendingThroughSeq > 0) {
@@ -2912,17 +2986,18 @@ export class MessageDeliveryEngine {
         const state = this.syncState(ns);
         // 与 P2P 相同：真实完成 Tail 后，至多用一页 Forward 收敛 Tail
         // 期间新到达的序号；绝不重新规划或再执行 Tail。
-        const tailMissedDuringPull = tailCompleted
-            && Number(client._seqTracker.getMaxSeenSeq(ns) || 0) > state.head;
         const maxSeen = Number(client._seqTracker.getMaxSeenSeq(ns) || 0);
+        const pendingUpper = Number(this.pendingGroupPullUpper?.get(ns) ?? 0);
+        const observedUpper = Math.max(maxSeen, pendingUpper);
+        const tailMissedDuringPull = tailCompleted && observedUpper > state.head;
         const pendingThroughSeq = tailMissedDuringPull
-            ? maxSeen
+            ? observedUpper
             : 0;
-        const tailForward = tailCompleted && (state.ack < state.tail - 1 || tailMissedDuringPull);
+        const tailForward = tailCompleted && (state.ack < state.head || tailMissedDuringPull);
         const backgroundWindowForward = order[0] === 'forward' && !headForward;
         if (headForward || tailForward
             || (client._sessionOptions?.background_sync !== false && backgroundWindowForward)) {
-            const forwardTarget = Math.max(headForward ? Math.max(pushSeq, maxSeen) : 0, (tailForward || backgroundWindowForward) ? state.tail - 1 : 0, tailMissedDuringPull ? maxSeen : 0);
+            const forwardTarget = Math.max(headForward ? Math.max(pushSeq, maxSeen) : 0, (tailForward || backgroundWindowForward) ? state.tail - 1 : 0, tailMissedDuringPull ? observedUpper : 0);
             const forwardMaxPages = this.forwardMaxPages(state.ack, forwardTarget, pageLimit);
             result = await run(false, !(headForward || tailForward), forwardMaxPages, headForward || tailMissedDuringPull);
             if (pendingThroughSeq > 0) {
@@ -2979,15 +3054,13 @@ export class MessageDeliveryEngine {
         const groupId = typeof row.group_id === 'string' ? row.group_id.trim() : '';
         if (!groupId)
             return;
-        const seq = typeof row.seq === 'number' ? row.seq : 0;
         const eventKind = String(row.kind ?? '').trim();
         const ns = this.resolvePendingGroupInlineAckNamespace(`group:${groupId}`);
-        if (client._v2Session && eventKind !== 'group.online_unread_hint'
-            && Number.isSafeInteger(seq) && seq > 0) {
-            // 必须在进入 namespace 队列前登记，才能让在途 Tail 看见后来 Push。
+        const seq = positiveSafeSequenceHint(row.seq);
+        if (client._v2Session && eventKind !== 'group.online_unread_hint' && seq > 0) {
             client._seqTracker.updateMaxSeen(ns, seq);
         }
-        const hasInlineObject = isJsonObject(row.inline_message)
+        const hasInlineObject = hasNonEmptyInlineMessage(row.inline_message)
             && eventKind !== 'group.online_unread_hint';
         const inlineGeneration = hasInlineObject ? this.captureInlineGeneration() : undefined;
         const operation = () => this.processGroupV2MessageCreated(data, 'v2', inlineGeneration);
@@ -3004,7 +3077,6 @@ export class MessageDeliveryEngine {
             return;
         const groupId = typeof data.group_id === 'string' ? data.group_id.trim() : '';
         const seq = positiveSafeSequenceHint(data.seq);
-        const strictSeq = typeof data.seq === 'number' && Number.isSafeInteger(data.seq) && data.seq > 0;
         if (!groupId)
             return;
         const eventKind = String(data.kind ?? '').trim();
@@ -3016,12 +3088,13 @@ export class MessageDeliveryEngine {
             return;
         }
         const ns = this.resolvePendingGroupInlineAckNamespace(`group:${groupId}`);
-        const inlinePresent = Object.prototype.hasOwnProperty.call(data, 'inline_message');
+        const inlinePresent = hasNonEmptyInlineMessage(data.inline_message);
         if (seq <= 0) {
             if (inlinePresent)
                 await this.recoverInvalidGroupRealtimeHead(groupId, ns, data.seq);
             return;
         }
+        client._seqTracker.updateMaxSeen(ns, seq);
         const inline = this.inlineMessage(data);
         const inlineMatches = inline !== null
             && this.inlineGroupBindingMatches(data, inline, groupId, seq, expectedInlineVersion);
@@ -3040,15 +3113,13 @@ export class MessageDeliveryEngine {
         const before = this.syncState(ns);
         // 无正文的旧服务端 Head 可把 JSON-safe 数字字符串作为恢复 hint；
         // inline 绑定仍要求原始 seq 是严格 number，避免类型归一化后消费正文。
-        if (strictSeq || !inlinePresent)
-            client._seqTracker.updateMaxSeen(ns, seq);
         if (seq <= before.ack && before.ack >= before.tail - 1) {
             const canonicalNs = this.resolvePendingGroupInlineAckNamespace(ns);
             const pending = this.pendingGroupInlineAcks?.get(canonicalNs);
-            if (pending && seq >= pending.seq) {
+            if (inlinePresent && pending && seq >= pending.seq) {
                 this.retryPendingGroupInlineAck(canonicalNs, pending.seq, 'covered inline Group ack', seq);
             }
-            else if (!inlinePresent || inlineMatches) {
+            else if (inlineMatches) {
                 this.fireGroupV2Ack(groupId, ns, seq, 'group v2 covered push ack', inlineMatches ? inlineGeneration : null);
             }
             return;
@@ -3084,11 +3155,10 @@ export class MessageDeliveryEngine {
         }
         const pushSeq = isJsonObject(data) && typeof data.seq === 'number' ? data.seq : 0;
         if (client._v2Session && Number.isSafeInteger(pushSeq) && pushSeq > 0) {
-            // 与 Group 相同，在排队前暴露更高 Head 给当前在途 Tail。
             client._seqTracker.updateMaxSeen(ns, pushSeq);
         }
         const hasInlineObject = isJsonObject(data)
-            && isJsonObject(data.inline_message);
+            && hasNonEmptyInlineMessage(data.inline_message);
         const inlineGeneration = hasInlineObject ? this.captureInlineGeneration() : undefined;
         const operation = () => this.processV2P2PNotification(data, 'v2', inlineGeneration);
         if (hasInlineObject)
@@ -3103,12 +3173,12 @@ export class MessageDeliveryEngine {
         if (!client._v2Session)
             return;
         const pushSeq = isJsonObject(data) ? positiveSafeSequenceHint(data.seq) : 0;
-        const strictSeq = isJsonObject(data)
-            && typeof data.seq === 'number' && Number.isSafeInteger(data.seq) && data.seq > 0;
         const ns = client._aid ? `p2p:${client._aid}` : '';
         if (!ns)
             return;
-        const inlinePresent = isJsonObject(data) && Object.prototype.hasOwnProperty.call(data, 'inline_message');
+        if (pushSeq > 0)
+            client._seqTracker.updateMaxSeen(ns, pushSeq);
+        const inlinePresent = isJsonObject(data) && hasNonEmptyInlineMessage(data.inline_message);
         if (pushSeq <= 0) {
             if (inlinePresent)
                 await this.recoverInvalidP2PRealtimeHead(ns, isJsonObject(data) ? data.seq : undefined);
@@ -3128,11 +3198,9 @@ export class MessageDeliveryEngine {
         if (inlineMatches && !this.isInlineGenerationCurrent(inlineGeneration))
             return;
         const before = this.syncState(ns);
-        if (strictSeq || !inlinePresent)
-            client._seqTracker.updateMaxSeen(ns, pushSeq);
         if (pushSeq <= before.ack && before.ack >= before.tail - 1) {
             const pending = this.pendingP2PInlineAcks?.get(ns);
-            if (pending && pushSeq >= pending.seq) {
+            if (inlinePresent && pending && pushSeq >= pending.seq) {
                 this.retryPendingP2PInlineAck(ns, pending.seq, 'covered inline P2P ack', pushSeq);
             }
             else if (inlineMatches) {
@@ -3651,7 +3719,7 @@ export class MessageDeliveryEngine {
             const seqNum = Number(seq);
             if (!Number.isFinite(seqNum) || !Number.isInteger(seqNum) || seqNum <= 0 || !ns) {
                 if (event === 'message.recalled') {
-                    const published = await client._withPullResponseProcessing(ns, () => this.publishMessageRecallTombstone(seq, payload));
+                    const published = await client._withPullResponseProcessing(ns, () => this.publishMessageRecallTombstone(seq, payload, source));
                     this.ensurePullOperationCurrent();
                     return published;
                 }
@@ -3672,7 +3740,7 @@ export class MessageDeliveryEngine {
             if (queue && queue.size === 0)
                 client._pendingOrderedMsgs.delete(ns);
             if (event === 'message.recalled') {
-                const published = await client._withPullResponseProcessing(ns, () => this.publishMessageRecallTombstone(seqNum, payload));
+                const published = await client._withPullResponseProcessing(ns, () => this.publishMessageRecallTombstone(seqNum, payload, source));
                 this.ensurePullOperationCurrent();
                 this.markPublishedSeq(ns, seqNum);
                 return published;