@agentunion/fastaun 0.5.11 → 0.5.12

package/dist/client/delivery.js

@@ -50,6 +50,10 @@ 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) {
     return typeof value === 'number' && Number.isSafeInteger(value) && value >= 0 ? value : null;
 }
@@ -203,14 +207,18 @@ export class MessageDeliveryEngine {
                         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)
-                client._seqTracker.onPullResult(ns, messages, afterSeq);
+            client._seqTracker.onPullResult(ns, messages, afterSeq, Number.isSafeInteger(result.contiguous_seq)
+                ? result.contiguous_seq
+                : undefined);
             const commitTarget = Math.max(client._seqTracker.getContiguousSeq(ns), retentionFloor, visibilityFloor, deferredServerCursor);
             if (commitTarget > client._seqTracker.getContiguousSeq(ns)) {
                 client._seqTracker.forceContiguousSeq(ns, commitTarget);
@@ -554,6 +562,9 @@ export class MessageDeliveryEngine {
     hasPendingPull(ns) {
         return (this.pendingGroupPullUpper?.get(ns) ?? 0) > 0;
     }
+    pendingPullUpper(ns) {
+        return this.pendingGroupPullUpper?.get(ns) ?? 0;
+    }
     hasAnyPendingPull() {
         return [...(this.pendingGroupPullUpper?.values() ?? [])].some((seq) => seq > 0)
             || Boolean(this.onlineUnreadHintTasks?.size)
@@ -1160,35 +1171,11 @@ export class MessageDeliveryEngine {
             return;
         }
         const ns = `group:${groupId}`;
-        if (seqNum > 0) {
+        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;
+        if (seqNum > client._seqTracker.getContiguousSeq(ns) && client._sessionOptions?.background_sync !== false) {
+            this.fillGroupGap(groupId).catch((exc) => client._clientLog.warn(`background recall gap fill failed: ${formatDeliveryError(exc)}`));
         }
-        const contigBefore = client._seqTracker.getContiguousSeq(ns);
-        client._seqTracker.onMessageSeq(ns, seqNum);
-        await this.publishGroupRecallTombstone(groupId, seq, wrapped);
-        this.markPublishedSeq(ns, seqNum);
-        client._markOrderedSeqDelivered?.(ns, seqNum);
-        const contig = client._seqTracker.getContiguousSeq(ns);
-        if (contig > 0) {
-            const ackSeq = this.clampAckSeq('group.ack_messages', 'msg_seq', ns, contig);
-            client._withBackgroundRpc(() => client._ackGroupV2(groupId, ackSeq))
-                .catch((e) => { client._clientLog.debug(`group recall auto-ack failed: group=${groupId} ${formatDeliveryError(e)}`); });
-        }
-        if (contig !== contigBefore)
-            this.persistSeq(ns);
     }
     publishAppEvent(event, payload, source = 'direct', deliveryContext) {
         const client = this.runtime.client;
@@ -1330,6 +1317,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();
+    }
     async runPushProcessSerialized(ns, operation, inlineGeneration) {
         const client = this.runtime.client;
         if (inlineGeneration === undefined) {
@@ -1397,7 +1399,7 @@ export class MessageDeliveryEngine {
             ? `p2p:${client._aid}`
             : '';
         const inlineGeneration = isJsonObject(data)
-            && Object.prototype.hasOwnProperty.call(data, 'inline_message')
+            && hasNonEmptyInlineMessage(data.inline_message)
             ? this.captureInlineAckGeneration() : undefined;
         this.runPushProcessSerialized(ns, () => this.processAndPublishMessage(data, inlineGeneration), inlineGeneration).catch((exc) => {
             client._clientLog.warn(`P2P message decrypt failed: ${formatDeliveryError(exc)}`);
@@ -1432,20 +1434,9 @@ export class MessageDeliveryEngine {
             const seqNum = Number(seq);
             if (Number.isFinite(seqNum) && seqNum > 0)
                 client._seqTracker.updateMaxSeen(ns, seqNum);
-            const contigBefore = client._seqTracker.getContiguousSeq(ns);
-            const published = await this.publishOrderedMessage('message.recalled', ns, seq, msg);
-            const contigAfter = client._seqTracker.getContiguousSeq(ns);
-            if (Number(seq) > contigAfter && !published && client._sessionOptions?.background_sync !== false) {
+            if (Number(seq) > client._seqTracker.getContiguousSeq(ns) && client._sessionOptions?.background_sync !== false) {
                 this.fillP2pGap().catch((exc) => client._clientLog.warn(`background recall gap fill failed: ${formatDeliveryError(exc)}`));
             }
-            const contig = client._seqTracker.getContiguousSeq(ns);
-            if (contig > 0) {
-                const ackSeq = this.clampAckSeq('message.ack', 'seq', ns, contig);
-                client._withBackgroundRpc(() => client._ackV2(ackSeq))
-                    .catch((e) => { client._clientLog.debug(`P2P recall auto-ack failed: ${formatDeliveryError(e)}`); });
-            }
-            if (contigAfter !== contigBefore)
-                this.persistSeq(ns);
             return;
         }
         await this.publishMessageRecallTombstone(seq, msg);
@@ -1464,7 +1455,7 @@ export class MessageDeliveryEngine {
         // 新 SDK 的所有带合法 seq P2P Push 都只作为 Head 通知处理。
         // 新服务端为兼容旧 SDK 仍可能发送 message.received；V2 会话下必须
         // 在旧 seq tracking / ordered publish 之前转入前台 Tail 协调器。
-        const inlinePresent = Object.prototype.hasOwnProperty.call(msg, 'inline_message');
+        const inlinePresent = hasNonEmptyInlineMessage(msg.inline_message);
         const legacyPushSeq = this.realtimeHeadSeq(msg.seq, inlinePresent);
         if (client._v2Session && client._aid && (msg.seq !== undefined && msg.seq !== null || inlinePresent)) {
             if (legacyPushSeq === null) {
@@ -1483,29 +1474,11 @@ export class MessageDeliveryEngine {
             const ns = `p2p:${client._aid}`;
             if (seq > 0)
                 client._seqTracker.updateMaxSeen(ns, seq);
-            const contigBefore = client._seqTracker.getContiguousSeq(ns);
-            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 = Number(seq) > contigAfter && !published;
-            if (needPull && client._sessionOptions?.background_sync !== false) {
-                client._clientLog.debug(`P2P seq gap detected: ns=${ns}, seq=${seq}, contiguous=${contigAfter}`);
+            if (Number(seq) > client._seqTracker.getContiguousSeq(ns) && client._sessionOptions?.background_sync !== false) {
+                client._clientLog.debug(`P2P push triggering Forward: ns=${ns}, seq=${seq}, contiguous=${client._seqTracker.getContiguousSeq(ns)}`);
                 this.fillP2pGap().catch((exc) => client._clientLog.warn(`background gap fill trigger failed: ${formatDeliveryError(exc)}`));
             }
-            const contig = client._seqTracker.getContiguousSeq(ns);
-            if (contig > 0) {
-                const maxSeen = client._seqTracker.getMaxSeenSeq(ns);
-                const ackSeq = this.clampAckSeq('message.ack', 'seq', ns, contig);
-                client._clientLog.debug(`P2P push auto-ack send: ns=${ns}, seq=${ackSeq}, contiguous=${contig}, max_seen=${maxSeen}`);
-                client._withBackgroundRpc(() => client._ackV2(ackSeq))
-                    .then(() => { client._clientLog.debug(`P2P push auto-ack ok: ns=${ns}, seq=${ackSeq}`); })
-                    .catch((e) => { client._clientLog.debug(`P2P auto-ack failed: ${formatDeliveryError(e)}`); });
-            }
-            if (contigAfter !== contigBefore)
-                this.persistSeq(ns);
-            if (encryptedPush)
-                return;
+            return;
         }
         else {
             if (encryptedPush) {
@@ -1529,7 +1502,7 @@ export class MessageDeliveryEngine {
             ? String(data.group_id ?? '').trim()
             : '';
         const inlineGeneration = isJsonObject(data)
-            && Object.prototype.hasOwnProperty.call(data, 'inline_message')
+            && hasNonEmptyInlineMessage(data.inline_message)
             ? this.captureInlineAckGeneration() : undefined;
         this.runPushProcessSerialized(groupNs ? `group:${groupNs}` : '', () => this.processAndPublishGroupMessage(data, inlineGeneration), inlineGeneration).catch((exc) => {
             client._clientLog.warn(`group message decrypt failed: ${formatDeliveryError(exc)}`);
@@ -1564,7 +1537,7 @@ export class MessageDeliveryEngine {
         }
         // V2 会话中旧 group.message_created 也只是 Head 通知；必须先 Tail，
         // 不能让 payload 路径直接推进旧 ordered publish 状态。
-        const inlinePresent = Object.prototype.hasOwnProperty.call(msg, 'inline_message');
+        const inlinePresent = hasNonEmptyInlineMessage(msg.inline_message);
         const legacyPushSeq = this.realtimeHeadSeq(seq, inlinePresent);
         if (client._v2Session && groupId && (seq !== undefined && seq !== null || inlinePresent)) {
             if (legacyPushSeq === null) {
@@ -1589,46 +1562,15 @@ export class MessageDeliveryEngine {
             const ns = `group:${groupId}`;
             if (seq > 0)
                 client._seqTracker.updateMaxSeen(ns, seq);
-            const contigBefore = client._seqTracker.getContiguousSeq(ns);
-            // 群撤回 tombstone（占位 / 通知）：归一化为 group.message_recalled，仍占 seq 推进 contiguous/ack。
-            if (!encryptedPush && this.recallEventFromGroupMessage(msg)) {
-                const published = await this.publishOrderedGroupRecall(ns, seq, msg);
-                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._withBackgroundRpc(() => client._ackGroupV2(groupId, ackSeq))
-                        .catch((e) => { client._clientLog.debug(`group recall auto-ack failed: group=${groupId} ${formatDeliveryError(e)}`); });
-                }
-                if (contigAfter !== contigBefore)
-                    this.persistSeq(ns);
-                void published;
-                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 = Number(seq) > contigAfter && !published;
-            if (needPull && client._sessionOptions?.background_sync !== false) {
-                client._clientLog.debug(`group message seq gap detected: group=${groupId}, seq=${seq}, contiguous=${contigAfter}`);
+            if (Number(seq) > client._seqTracker.getContiguousSeq(ns) && client._sessionOptions?.background_sync !== false) {
+                client._clientLog.debug(`group push triggering Forward: group=${groupId}, seq=${seq}, contiguous=${client._seqTracker.getContiguousSeq(ns)}`);
                 this.fillGroupGap(groupId).catch((exc) => client._clientLog.warn(`background gap fill trigger failed: ${formatDeliveryError(exc)}`));
             }
-            const contig = client._seqTracker.getContiguousSeq(ns);
-            if (contig > 0) {
-                const maxSeen = client._seqTracker.getMaxSeenSeq(ns);
-                const ackSeq = this.clampAckSeq('group.ack_messages', 'msg_seq', ns, contig);
-                client._clientLog.debug(`group push auto-ack send: group=${groupId}, ns=${ns}, seq=${ackSeq}, contiguous=${contig}, max_seen=${maxSeen}`);
-                client._withBackgroundRpc(() => client._ackGroupV2(groupId, ackSeq))
-                    .then(() => { client._clientLog.debug(`group push auto-ack ok: group=${groupId}, seq=${ackSeq}`); })
-                    .catch((e) => { client._clientLog.debug(`group message auto-ack failed: group=${groupId} ${formatDeliveryError(e)}`); });
-            }
-            if (contigAfter !== contigBefore)
-                this.persistSeq(ns);
-            if (encryptedPush)
-                return;
+            return;
         }
         else {
+            if (this.isSelfSentGroupMessage(msg))
+                return;
             if (encryptedPush) {
                 await client._publishEncryptedPushMessage('group.message_created', 'group.message_undecryptable', '', seq ?? 0, msg, true);
                 return;
@@ -1824,9 +1766,9 @@ export class MessageDeliveryEngine {
                     return;
                 const pageContigBefore = client._seqTracker.getContiguousSeq(ns);
                 const eventObjects = events.filter((evt) => isJsonObject(evt));
-                if (eventObjects.length > 0) {
-                    client._seqTracker.onPullResult(ns, eventObjects, nextAfterSeq);
-                }
+                client._seqTracker.onPullResult(ns, eventObjects, nextAfterSeq, Number.isSafeInteger(result.contiguous_seq)
+                    ? result.contiguous_seq
+                    : undefined);
                 const cursor = isJsonObject(result.cursor)
                     ? result.cursor
                     : null;
@@ -1907,10 +1849,13 @@ export class MessageDeliveryEngine {
                     targetSeq: Math.max(Number(cursor?.latest_seq ?? 0), Number(result.latest_event_seq ?? 0)),
                 });
                 const nextAfter = Math.max(eventSeqs.length > 0 ? Math.max(...eventSeqs) : nextAfterSeq, nextAfterSeq);
-                if (singlePage && result.has_more === true && nextAfter > nextAfterSeq) {
+                const pageAdvanced = eventObjects.length > 0 && nextAfter > nextAfterSeq;
+                const needsMore = result.has_more === true
+                    || client._seqTracker.getMaxSeenSeq(ns) > nextAfter;
+                if (singlePage && pageAdvanced && needsMore) {
                     continuationAfterSeq = nextAfter;
                 }
-                if (eventObjects.length === 0 || nextAfter <= nextAfterSeq || result.has_more === false)
+                if (!pageAdvanced || !needsMore)
                     break;
                 nextAfterSeq = nextAfter;
             }
@@ -1973,93 +1918,19 @@ 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);
         if (eventSeq <= contigBefore || client._pushedSeqs.get(ns)?.has(eventSeq)) {
             client._clientLog.debug(`group.changed skipped duplicate/stale: group=${groupId}, event_seq=${eventSeq}, contiguous=${contigBefore}`);
-            this.fireGroupEventAck(groupId, Math.min(eventSeq, contigBefore > 0 ? contigBefore : eventSeq), 'covered push');
             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,
-            }, undefined, undefined, true).catch((e) => {
-                client._clientLog.debug(`group event push auto-ack failed: group=${groupId} ${formatDeliveryError(e)}`);
-            });
-        }
-        if (needPull && groupId && !data._from_gap_fill && client._sessionOptions?.background_sync !== false) {
+        client._seqTracker.updateMaxSeen(ns, eventSeq);
+        needPull = eventSeq > contigBefore;
+        if (needPull && !data._from_gap_fill && client._sessionOptions?.background_sync !== false) {
             this.fillGroupEventGap(groupId).catch((exc) => {
                 client._clientLog.warn(`background gap fill trigger failed: ${formatDeliveryError(exc)}`);
             });
         }
     }
-    fireGroupEventAck(groupId, eventSeq, reason) {
-        const client = this.runtime.client;
-        const gid = String(groupId ?? '').trim();
-        if (!gid)
-            return;
-        const ns = `group_event:${gid}`;
-        const ackSeq = this.clampAckSeq('group.ack_events', 'event_seq', ns, Number(eventSeq) || 0);
-        if (ackSeq <= 0)
-            return;
-        const params = {
-            group_id: gid,
-            event_seq: ackSeq,
-            device_id: client._deviceId,
-            slot_id: client._slotId,
-            _rpc_background: true,
-        };
-        try {
-            Promise.resolve(client.call('group.ack_events', params)).catch((e) => {
-                client._clientLog.debug(`group event ${reason} ack failed: group=${gid} ${formatDeliveryError(e)}`);
-            });
-        }
-        catch (e) {
-            client._clientLog.debug(`group event ${reason} ack failed: group=${gid} ${formatDeliveryError(e)}`);
-        }
-    }
-    fireGroupV2Ack(groupId, upToSeq, reason, groupAid = '') {
-        const client = this.runtime.client;
-        const gid = String(groupId ?? '').trim();
-        if (!gid)
-            return;
-        const ns = `group:${gid}`;
-        const ackSeq = this.clampAckSeq('group.v2.ack', 'up_to_seq', ns, Number(upToSeq) || 0);
-        if (ackSeq <= 0)
-            return;
-        const generation = this.inlineAckGeneration;
-        try {
-            Promise.resolve(client.call('group.v2.ack', {
-                group_id: gid,
-                ...(groupAid ? { group_aid: groupAid } : {}),
-                up_to_seq: ackSeq,
-                _rpc_background: true,
-            })).then((result) => {
-                this.onGroupV2AckResult(gid, result, ackSeq, generation);
-            }).catch((e) => {
-                client._clientLog.debug(`group.v2 ${reason} ack failed: group=${gid} ${formatDeliveryError(e)}`);
-            });
-        }
-        catch (e) {
-            client._clientLog.debug(`group.v2 ${reason} ack failed: group=${gid} ${formatDeliveryError(e)}`);
-        }
-    }
     isSelfJoinGroupChanged(data) {
         const action = String(data.action ?? '').trim();
         if (!['member_added', 'joined', 'join_approved', 'invite_code_used'].includes(action))
@@ -2356,15 +2227,17 @@ export class MessageDeliveryEngine {
         const state = this.syncState(ns);
         const needsForward = state.ack < state.tail - 1;
         const backgroundEnabled = client._sessionOptions?.background_sync !== false;
-        // Tail 期间到达的新 Push 可能只更新 maxSeen 而没有扩展 Tail 窗口。
+        // Tail 期间到达的新 Push 只记录在 pending Pull 上界，不写入 SeqTracker。
         const maxSeen = Number(client._seqTracker.getMaxSeenSeq?.(ns) ?? 0);
-        const tailMissedDuringPull = tailHead !== null && maxSeen > state.head;
+        const pendingUpper = Number(client._pendingP2pPullUpper?.get?.(ns) ?? 0);
+        const observedUpper = Math.max(maxSeen, pendingUpper);
+        const tailMissedDuringPull = tailHead !== null && observedUpper > state.head;
         const tailForward = tailHead !== null && (needsForward || tailMissedDuringPull);
         const backgroundWindowForward = (order.length === 1 && order[0] === 'forward' && !headForward)
             || (order.length === 1 && order[0] === 'tail' && tailHead === null && needsForward);
         const foregroundForward = headForward || tailForward;
         if (foregroundForward || backgroundEnabled && backgroundWindowForward) {
-            const forwardTarget = Math.max(headForward ? pushSeq : 0, tailForward || backgroundWindowForward ? state.tail - 1 : 0, tailMissedDuringPull ? maxSeen : 0);
+            const forwardTarget = Math.max(headForward ? pushSeq : 0, tailForward || backgroundWindowForward ? state.tail - 1 : 0, tailMissedDuringPull ? observedUpper : 0);
             const requiredPages = Math.max(1, Math.ceil(Math.max(0, forwardTarget - state.ack) / pageLimit));
             result = await run({
                 after_seq: state.ack,
@@ -2432,13 +2305,15 @@ export class MessageDeliveryEngine {
         const needsForward = state.ack < state.tail - 1;
         const backgroundEnabled = client._sessionOptions?.background_sync !== false;
         const maxSeen = Number(client._seqTracker.getMaxSeenSeq?.(ns) ?? 0);
-        const tailMissedDuringPull = tailHead !== null && maxSeen > state.head;
+        const pendingUpper = this.pendingPullUpper(ns);
+        const observedUpper = Math.max(maxSeen, pendingUpper);
+        const tailMissedDuringPull = tailHead !== null && observedUpper > state.head;
         const tailForward = tailHead !== null && (needsForward || tailMissedDuringPull);
         const backgroundWindowForward = (order.length === 1 && order[0] === 'forward' && !headForward)
             || (order.length === 1 && order[0] === 'tail' && tailHead === null && needsForward);
         const foregroundForward = headForward || tailForward;
         if (foregroundForward || backgroundEnabled && backgroundWindowForward) {
-            const forwardTarget = Math.max(headForward ? pushSeq : 0, tailForward || backgroundWindowForward ? state.tail - 1 : 0, tailMissedDuringPull ? maxSeen : 0);
+            const forwardTarget = Math.max(headForward ? pushSeq : 0, tailForward || backgroundWindowForward ? state.tail - 1 : 0, tailMissedDuringPull ? observedUpper : 0);
             const requiredPages = Math.max(1, Math.ceil(Math.max(0, forwardTarget - state.ack) / pageLimit));
             result = await run({
                 after_seq: state.ack,
@@ -3048,7 +2923,7 @@ export class MessageDeliveryEngine {
             this.enqueueOnlineUnreadP2pHint(pushData);
             return;
         }
-        const inlinePresent = Object.prototype.hasOwnProperty.call(pushData, 'inline_message');
+        const inlinePresent = hasNonEmptyInlineMessage(pushData.inline_message);
         const pushSeq = this.realtimeHeadSeq(rawPushSeq, inlinePresent);
         if (pushSeq === null) {
             if (inlinePresent) {
@@ -3079,7 +2954,8 @@ export class MessageDeliveryEngine {
         client._seqTracker.updateMaxSeen(ns, pushSeq);
         if (pushSeq <= before.ack && before.ack >= before.tail - 1) {
             client._clientLog.debug(`V2 P2P duplicate push ignored: seq=${pushSeq} A/T/H=${JSON.stringify(before)}`);
-            this.retryPendingP2PInlineAck(ns, pushSeq, 'covered inline push');
+            if (inlinePresent)
+                this.retryPendingP2PInlineAck(ns, pushSeq, 'covered inline push');
             return;
         }
         const pullActive = client._rpcPipeline?.hasPullActivity?.(ns) === true;
@@ -3152,7 +3028,7 @@ export class MessageDeliveryEngine {
         client._logMessageDebug('server-push', '_raw.group.v2.message_created', 'group.message_created', d);
         const groupId = typeof d.group_id === 'string' ? d.group_id.trim() : '';
         const rawSeq = d.seq;
-        const inlinePresent = Object.prototype.hasOwnProperty.call(d, 'inline_message');
+        const inlinePresent = hasNonEmptyInlineMessage(d.inline_message);
         const seq = this.realtimeHeadSeq(rawSeq, inlinePresent);
         if (!groupId) {
             client._clientLog.debug(`_onRawGroupV2MessageCreated skipped: group=${groupId || '<empty>'}, seq=${String(d.seq ?? '')}`);
@@ -3197,12 +3073,9 @@ export class MessageDeliveryEngine {
         if (seq <= before.ack && before.ack >= before.tail - 1) {
             client._clientLog.debug(`V2 group duplicate push ignored: group=${groupId} seq=${seq} A/T/H=${JSON.stringify(before)}`);
             const pending = this.pendingGroupInlineAcks?.get(ns);
-            if (pending?.seq === seq) {
+            if (inlinePresent && pending?.seq === seq) {
                 this.retryPendingGroupInlineAck(ns, seq, 'covered inline push');
             }
-            else if (!inlinePresent) {
-                this.fireGroupV2Ack(groupId, seq, 'covered push');
-            }
             return;
         }
         const pullActive = client._rpcPipeline?.hasPullActivity?.(ns) === true;
@@ -3752,32 +3625,6 @@ export class MessageDeliveryEngine {
         }
         return true;
     }
-    async publishOrderedGroupRecall(ns, seq, message) {
-        const client = this.runtime.client;
-        this.ensurePullOperationCurrent();
-        const seqNum = Number(seq);
-        if (!Number.isFinite(seqNum) || !Number.isInteger(seqNum) || seqNum <= 0) {
-            await this.publishGroupRecallTombstone(ns.replace(/^group:/, ''), seq, message);
-            this.ensurePullOperationCurrent();
-            return true;
-        }
-        // 撤回 tombstone 也占 seq：推进 contiguous 并标记已发布，确保 ack 正常推进、不留空洞。
-        if (client._pushedSeqs.get(ns)?.has(seqNum)) {
-            await this.publishGroupRecallTombstone(ns.replace(/^group:/, ''), seq, message);
-            return false;
-        }
-        client._seqTracker.onMessageSeq(ns, seqNum);
-        await this.publishGroupRecallTombstone(ns.replace(/^group:/, ''), seq, message);
-        this.ensurePullOperationCurrent();
-        this.markPublishedSeq(ns, seqNum);
-        client._markOrderedSeqDelivered?.(ns, seqNum);
-        await this.drainOrderedMessages(ns);
-        if (!client._pendingOrderedMsgs.get(ns)) {
-            this.ensurePullOperationCurrent();
-            await this.saveSeqTrackerState();
-        }
-        return true;
-    }
     async publishPulledMessage(event, ns, seq, payload, persist = true, source = 'pull') {
         const client = this.runtime.client;
         this.ensurePullOperationCurrent();