@agentunion/fastaun 0.5.9 → 0.5.11

package/dist/client/delivery.js

@@ -1,11 +1,16 @@
 import { slotIsolationKey } from '../config.js';
 import { ConnectionState, isJsonObject } from '../types.js';
+import { validateGroupAIDFormat } from '../validators.js';
 import { hasGroupMentionModeField, normalizeGroupMentionMode } from './mention-mode.js';
 const PUSHED_SEQS_LIMIT = 50_000;
 const PENDING_ORDERED_LIMIT = 50_000;
 const MESSAGE_RECALL_SEEN_LIMIT = 10_000;
 const GROUP_RECALL_SEEN_LIMIT = 10_000;
 const SEQ_TRACKER_PERSIST_FLUSH_DELAY_MS = 200;
+const DELIVERY_CHANGED_MESSAGE_EVENTS = new Set([
+    'message.received',
+    'group.message_created',
+]);
 const MAX_INLINE_PENDING_ACK_NAMESPACES = 4096;
 const APP_MESSAGE_ENVELOPE_KEYS = [
     'module_id', 'message_type', 'type', 'kind', 'version',
@@ -73,6 +78,10 @@ export class MessageDeliveryEngine {
     pendingGroupInlineAcks = null;
     pendingGroupInlineAckNamespaces = null;
     inlineAckGeneration = 0;
+    pendingDeliveryChanges = null;
+    deliveryChangedGeneration = 0;
+    syncRun = 0;
+    syncSessions = null;
     // 同一实例的 tracker 写入必须串行，避免旧的延迟 flush 覆盖新的 Forward 提交。
     seqTrackerWriteChain = Promise.resolve();
     constructor(runtime) {
@@ -145,6 +154,7 @@ export class MessageDeliveryEngine {
         }
         const client = this.runtime.client;
         this.ensurePullOperationCurrent();
+        this.syncStarted(ns);
         const response = result;
         const messages = deduplicatePlainForwardPageMessages(response.messages, afterSeq);
         const coordinator = this.forwardCoordinator();
@@ -187,7 +197,7 @@ 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;
@@ -207,7 +217,7 @@ export class MessageDeliveryEngine {
             }
             if (client._seqTracker.getContiguousSeq(ns) !== pageContigBefore) {
                 this.ensurePullOperationCurrent();
-                await this.drainOrderedMessages(ns, undefined, false, false);
+                await this.drainOrderedMessages(ns, undefined, false, false, 'pull');
                 this.ensurePullOperationCurrent();
                 await client._commitSeqTrackerState(ns);
             }
@@ -254,9 +264,19 @@ export class MessageDeliveryEngine {
             this.ensurePullOperationCurrent();
             await this.confirmPlainForwardAck(ns, ackMethod, pendingAckSeq, groupId);
         }
+        this.syncProgress(ns, {
+            rawCount: messages.length,
+            pulledCount: publishedCount,
+            remaining: response.remaining,
+            hasMore: typeof response.has_more === 'boolean' ? response.has_more : undefined,
+            currentSeq: client._seqTracker.getContiguousSeq(ns),
+        });
         return { rawCount: messages.length, publishedCount };
     }
     resetInlineAckState() {
+        this.syncStopped('aborted');
+        this.deliveryChangedGeneration += 1;
+        this.pendingDeliveryChanges = null;
         this.inlineAckGeneration += 1;
         void this.runtime.client._rpcPipeline?.invalidatePulls?.();
         this.pendingP2PInlineAcks = null;
@@ -267,6 +287,225 @@ export class MessageDeliveryEngine {
         this.onlineUnreadHintTargets = null;
         this.onlineUnreadHintTasks = null;
         this.realtimeTailHeads = null;
+        this.syncSessions = null;
+    }
+    deliveryChangedNamespace(event, payload) {
+        if (event === 'group.message_created' && isJsonObject(payload)) {
+            const aid = String(this.runtime.client._aid ?? '').trim();
+            const dot = aid.indexOf('.');
+            try {
+                const groupAid = validateGroupAIDFormat(payload.group_aid ?? payload.group_id, { localIssuer: dot >= 0 ? aid.slice(dot + 1) : '' });
+                return groupAid.includes('.') ? `group:${groupAid}` : '';
+            }
+            catch {
+                return '';
+            }
+        }
+        return 'p2p';
+    }
+    isDeliveryChangedMessage(event, payload) {
+        if (!DELIVERY_CHANGED_MESSAGE_EVENTS.has(event)
+            || !isJsonObject(payload))
+            return false;
+        const messageId = payload.message_id;
+        const seq = payload.seq;
+        return (typeof messageId === 'string' && messageId.trim().length > 0)
+            || (typeof seq === 'number' && Number.isSafeInteger(seq) && seq > 0);
+    }
+    deliveryChangedTrigger(source) {
+        if (source === 'inline-push' || source === 'inline_push')
+            return 'inline_push';
+        if (source === 'pull' || source === 'tail' || source === 'pending-retry' || source === 'pending_retry')
+            return 'pull_drained';
+        if (source === 'push' || source === 'group-push' || source === 'ordered')
+            return 'push';
+        return null;
+    }
+    noteDeliveryChanged(event, payload, source, context) {
+        if (!this.isDeliveryChangedMessage(event, payload))
+            return;
+        const trigger = this.deliveryChangedTrigger(source);
+        const namespace = this.deliveryChangedNamespace(event, payload);
+        if (!trigger || !namespace)
+            return;
+        const pending = trigger === 'pull_drained'
+            ? this.pendingDeliveryChanges ?? new Map()
+            : context?.changes ?? this.pendingDeliveryChanges ?? new Map();
+        if (trigger === 'pull_drained' || !context)
+            this.pendingDeliveryChanges = pending;
+        pending.set(namespace, (pending.get(namespace) ?? 0) + 1);
+        if (!context && trigger !== 'pull_drained')
+            this.flushDeliveryChanged(trigger);
+    }
+    flushDeliveryChanged(trigger) {
+        const pending = this.pendingDeliveryChanges;
+        if (!pending || pending.size === 0)
+            return;
+        const changes = [...pending.entries()]
+            .filter(([, deliveredCount]) => deliveredCount > 0)
+            .sort(([left], [right]) => left.localeCompare(right))
+            .map(([namespace, deliveredCount]) => ({ namespace, delivered_count: deliveredCount }));
+        pending.clear();
+        if (changes.length === 0)
+            return;
+        const payload = { source: trigger === 'pull_drained' ? 'pull' : trigger, trigger, changes };
+        const dispatcher = this.runtime.client._dispatcher;
+        const published = typeof dispatcher.enqueue === 'function'
+            ? (dispatcher.enqueue('delivery.changed', payload), undefined)
+            : typeof dispatcher.publishSyncAware === 'function'
+                ? dispatcher.publishSyncAware('delivery.changed', payload)
+                : dispatcher.publish?.('delivery.changed', payload);
+        if (isPromiseLike(published))
+            void Promise.resolve(published).catch((exc) => {
+                this.runtime.client._clientLog.warn(`delivery.changed handler failed: ${formatDeliveryError(exc)}`);
+            });
+    }
+    publishSyncLifecycle(event, payload) {
+        const dispatcher = this.runtime.client._dispatcher;
+        const published = typeof dispatcher.enqueue === 'function'
+            ? (dispatcher.enqueue(event, payload), undefined)
+            : typeof dispatcher.publishSyncAware === 'function'
+                ? dispatcher.publishSyncAware(event, payload)
+                : dispatcher.publish?.(event, payload);
+        if (isPromiseLike(published))
+            void Promise.resolve(published).catch((exc) => {
+                this.runtime.client._clientLog.warn(`${event} handler failed: ${formatDeliveryError(exc)}`);
+            });
+    }
+    syncStarted(ns) {
+        const namespace = String(ns ?? '').trim();
+        if (!namespace)
+            return;
+        const sessions = this.syncSessions ?? new Map();
+        this.syncSessions = sessions;
+        if (sessions.has(namespace))
+            return;
+        if (sessions.size === 0) {
+            this.syncRun += 1;
+            this.publishSyncLifecycle('sync.started', {
+                run_id: this.syncRun,
+                source: 'pull',
+                syncing: true,
+                namespaces_pending: 1,
+                received_total: 0,
+                namespace,
+                started_at: Date.now(),
+            });
+        }
+        const session = { pages: 0, pulled: 0, startedAt: Date.now() };
+        sessions.set(namespace, session);
+    }
+    syncProgress(ns, progress = {}) {
+        const namespace = String(ns ?? '').trim();
+        if (!namespace)
+            return;
+        this.syncStarted(namespace);
+        const session = this.syncSessions?.get(namespace);
+        if (!session)
+            return;
+        const pulledCount = Math.max(0, Number(progress.pulledCount ?? progress.rawCount ?? 0) || 0);
+        const rawCount = Math.max(0, Number(progress.rawCount ?? pulledCount) || 0);
+        session.pages += 1;
+        session.pulled += pulledCount;
+        const payload = {
+            run_id: this.syncRun,
+            source: 'pull',
+            namespace,
+            page: session.pages,
+            page_pulled_count: pulledCount,
+            page_raw_count: rawCount,
+            pulled_count: session.pulled,
+            received_total: session.pulled,
+            batch_size: pulledCount,
+        };
+        if (typeof progress.remaining === 'number'
+            && Number.isSafeInteger(progress.remaining) && progress.remaining >= 0) {
+            payload.remaining = progress.remaining;
+            payload.estimated_remaining = payload.remaining;
+        }
+        if (progress.hasMore !== undefined) {
+            payload.has_more = Boolean(progress.hasMore);
+            if (progress.remaining === undefined || progress.remaining === null) {
+                payload.estimated_remaining = progress.hasMore ? undefined : 0;
+            }
+        }
+        if (progress.currentSeq !== undefined && Number.isFinite(Number(progress.currentSeq))) {
+            payload.current_seq = Math.max(0, Number(progress.currentSeq));
+        }
+        if (progress.targetSeq !== undefined && Number.isFinite(Number(progress.targetSeq))) {
+            payload.target_seq = Math.max(0, Number(progress.targetSeq));
+        }
+        this.publishSyncLifecycle('sync.progress', payload);
+    }
+    onPullDrained() {
+        this.flushDeliveryChanged('pull_drained');
+        this.syncStopped('pull_drained');
+    }
+    onPullAborted() {
+        this.syncStopped('aborted');
+    }
+    syncStopped(reason = 'completed') {
+        const sessions = this.syncSessions;
+        if (!sessions || sessions.size === 0)
+            return;
+        const entries = [...sessions.entries()];
+        const receivedTotal = entries.reduce((total, [, session]) => total + session.pulled, 0);
+        const payload = {
+            run_id: this.syncRun,
+            source: 'pull',
+            syncing: false,
+            namespaces_pending: 0,
+            received_total: receivedTotal,
+            reason,
+            stopped_at: Date.now(),
+        };
+        if (entries.length === 1) {
+            const [namespace, session] = entries[0];
+            payload.namespace = namespace;
+            payload.pages = session.pages;
+            payload.pulled_count = session.pulled;
+        }
+        else {
+            payload.namespaces = entries.map(([namespace]) => namespace);
+            payload.pages = entries.reduce((total, [, session]) => total + session.pages, 0);
+            payload.pulled_count = receivedTotal;
+        }
+        sessions.clear();
+        this.syncSessions = null;
+        this.publishSyncLifecycle('sync.stopped', payload);
+    }
+    flushDeliveryChangedContext(context, trigger) {
+        if (context.generation !== this.deliveryChangedGeneration || context.changes.size === 0)
+            return;
+        const pending = this.pendingDeliveryChanges;
+        if (pending) {
+            for (const [namespace, count] of pending) {
+                context.changes.set(namespace, (context.changes.get(namespace) ?? 0) + count);
+            }
+            pending.clear();
+        }
+        const changes = [...context.changes.entries()]
+            .filter(([, count]) => count > 0)
+            .sort(([left], [right]) => left.localeCompare(right))
+            .map(([namespace, delivered_count]) => ({ namespace, delivered_count }));
+        context.changes.clear();
+        if (changes.length === 0)
+            return;
+        const dispatcher = this.runtime.client._dispatcher;
+        const payload = { trigger, source: trigger, changes };
+        const published = typeof dispatcher.enqueue === 'function'
+            ? (dispatcher.enqueue('delivery.changed', payload), undefined)
+            : typeof dispatcher.publishSyncAware === 'function'
+                ? dispatcher.publishSyncAware('delivery.changed', payload)
+                : dispatcher.publish?.('delivery.changed', payload);
+        if (isPromiseLike(published))
+            void Promise.resolve(published).catch((exc) => {
+                this.runtime.client._clientLog.warn(`delivery.changed handler failed: ${formatDeliveryError(exc)}`);
+            });
+    }
+    invalidateDeliveryChanges() {
+        this.deliveryChangedGeneration += 1;
+        this.pendingDeliveryChanges = null;
     }
     inlineGenerationIsCurrent(generation) {
         return this.inlineAckGeneration === generation;
@@ -310,10 +549,17 @@ export class MessageDeliveryEngine {
     }
     endRealtimeSync(ns) {
         this.realtimeSyncing?.delete(ns);
+        this.runtime.client._rpcPipeline?.requestPullDrainedCheck?.();
     }
     hasPendingPull(ns) {
         return (this.pendingGroupPullUpper?.get(ns) ?? 0) > 0;
     }
+    hasAnyPendingPull() {
+        return [...(this.pendingGroupPullUpper?.values() ?? [])].some((seq) => seq > 0)
+            || Boolean(this.onlineUnreadHintTasks?.size)
+            || Boolean(this.realtimeSyncing?.size)
+            || Boolean(this.runtime.client._v2E2EE?.hasPendingSenderIKWork?.());
+    }
     onPullGateIdle(ns) {
         if (!ns)
             return;
@@ -378,14 +624,14 @@ export class MessageDeliveryEngine {
             client._pushedSeqs.set(ns, new Set(keep));
         }
     }
-    enqueueOrderedMessage(ns, event, seq, payload) {
+    enqueueOrderedMessage(ns, event, seq, payload, source = 'push') {
         const client = this.runtime.client;
         let queue = client._pendingOrderedMsgs.get(ns);
         if (!queue) {
             queue = new Map();
             client._pendingOrderedMsgs.set(ns, queue);
         }
-        queue.set(seq, { event, payload });
+        queue.set(seq, { event, payload, source });
         if (queue.size > PENDING_ORDERED_LIMIT) {
             const drop = [...queue.keys()].sort((a, b) => a - b).slice(0, queue.size - PENDING_ORDERED_LIMIT);
             for (const oldSeq of drop)
@@ -395,7 +641,7 @@ export class MessageDeliveryEngine {
     isGroupEventNamespace(ns) {
         return ns.startsWith('group_event:');
     }
-    async publishOrderedQueueItem(ns, event, seq, payload, source, pullResponse = false) {
+    async publishOrderedQueueItem(ns, event, seq, payload, source, pullResponse = false, deliveryContext) {
         const client = this.runtime.client;
         this.ensurePullOperationCurrent();
         if (event === 'group.changed' && this.isGroupEventNamespace(ns)) {
@@ -404,17 +650,17 @@ export class MessageDeliveryEngine {
             return;
         }
         if (event === 'message.recalled') {
-            await this.publishMessageRecallTombstone(seq, payload);
+            await this.publishMessageRecallTombstone(seq, payload, source);
             this.ensurePullOperationCurrent();
             return;
         }
         if (pullResponse) {
-            const published = client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload, source));
+            const published = client._withPullResponseProcessing(ns, () => this.publishAppEvent(event, payload, source, deliveryContext));
             if (isPromiseLike(published))
                 await published;
         }
         else {
-            const published = client._publishAppEvent(event, payload, source);
+            const published = this.publishAppEvent(event, payload, source, deliveryContext);
             if (isPromiseLike(published))
                 await published;
         }
@@ -457,17 +703,27 @@ export class MessageDeliveryEngine {
         }
         return result;
     }
-    normalizePublishedMessagePayload(event, payload) {
+    normalizePublishedMessagePayload(event, payload, source = 'direct') {
         payload = this.stripInlineInternalFields(payload);
+        let normalized;
         if (this.isInstanceScopedMessageEvent(event)) {
             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)) {
-            return this.attachAppGroupEventEnvelope(this.attachCurrentInstanceContext(payload));
+        else if (this.isGroupScopedEvent(event)) {
+            normalized = this.attachAppGroupEventEnvelope(this.attachCurrentInstanceContext(payload));
         }
-        return payload;
+        else {
+            normalized = payload;
+        }
+        if (source === 'direct' || !isJsonObject(normalized))
+            return normalized;
+        const canonicalSource = source === 'group-push' || source === 'ordered' || source === 'legacy' || source === 'tail'
+            ? (source === 'tail' ? 'pull' : 'push')
+            : source === 'inline-push' || source === 'inline_push' ? 'inline_push'
+                : source === 'pending-retry' || source === 'pending_retry' ? 'pending_retry' : source;
+        return { ...normalized, source: canonicalSource };
     }
     stripInlineInternalFields(payload) {
         if (!isJsonObject(payload))
@@ -737,7 +993,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)
@@ -758,7 +1014,7 @@ export class MessageDeliveryEngine {
             for (const [oldKey] of drop)
                 seen.delete(oldKey);
         }
-        await client._publishAppEvent('message.recalled', eventPayload, 'message-recall');
+        await client._publishAppEvent('message.recalled', eventPayload, source);
         client._clientLog.debug(`message.recalled published: seq=${String(seq)} ids=${JSON.stringify(eventPayload.message_ids)}`);
         return true;
     }
@@ -841,7 +1097,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)
@@ -864,7 +1120,7 @@ export class MessageDeliveryEngine {
             for (const [oldKey] of drop)
                 seen.delete(oldKey);
         }
-        await client._publishAppEvent('group.message_recalled', eventPayload, 'group-recall');
+        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;
     }
@@ -934,7 +1190,7 @@ export class MessageDeliveryEngine {
         if (contig !== contigBefore)
             this.persistSeq(ns);
     }
-    publishAppEvent(event, payload, source = 'direct') {
+    publishAppEvent(event, payload, source = 'direct', deliveryContext) {
         const client = this.runtime.client;
         if ((event === 'message.received' || event === 'group.message_created') && isJsonObject(payload)) {
             client._maybeAppendEchoTraceReceive(payload);
@@ -954,7 +1210,23 @@ export class MessageDeliveryEngine {
                 client._clientLog.debug(`agent_md etag inject skipped: ${err instanceof Error ? err.message : String(err)}`);
             }
         }
-        return client._dispatcher.publishSyncAware(event, this.normalizePublishedMessagePayload(event, payload));
+        const generation = this.deliveryChangedGeneration;
+        const normalized = this.normalizePublishedMessagePayload(event, payload, source);
+        const dispatcher = client._dispatcher;
+        const result = typeof dispatcher.enqueue === 'function'
+            ? (dispatcher.enqueue(event, normalized), undefined)
+            : typeof dispatcher.publishSyncAware === 'function'
+                ? dispatcher.publishSyncAware(event, normalized)
+                : dispatcher.publish?.(event, normalized);
+        const note = () => {
+            if (generation === this.deliveryChangedGeneration) {
+                this.noteDeliveryChanged(event, payload, source, deliveryContext);
+            }
+        };
+        if (isPromiseLike(result))
+            return Promise.resolve(result).then(note);
+        note();
+        return result;
     }
     messagePayloadForDebug(message) {
         if (!isJsonObject(message))
@@ -1140,7 +1412,7 @@ export class MessageDeliveryEngine {
                     _decrypt_error: String(exc),
                 };
                 client._attachV2EnvelopeMetadataFromSource(safeEvent, data);
-                Promise.resolve(client._publishAppEvent('message.undecryptable', safeEvent)).catch(() => { });
+                Promise.resolve(client._publishAppEvent('message.undecryptable', safeEvent, 'push')).catch(() => { });
             }
         });
         client._clientLog.debug(`_onRawMessageReceived exit: elapsed=${Date.now() - tStart}ms (handler dispatched)`);
@@ -1272,7 +1544,7 @@ export class MessageDeliveryEngine {
                     _decrypt_error: String(exc),
                 };
                 client._attachV2EnvelopeMetadataFromSource(safeEvent, data);
-                Promise.resolve(client._publishAppEvent('group.message_undecryptable', safeEvent)).catch(() => { });
+                Promise.resolve(client._publishAppEvent('group.message_undecryptable', safeEvent, 'push')).catch(() => { });
             }
         });
         client._clientLog.debug(`_onRawGroupMessageCreated exit: elapsed=${Date.now() - tStart}ms (handler dispatched)`);
@@ -1368,7 +1640,7 @@ export class MessageDeliveryEngine {
         const client = this.runtime.client;
         let groupId = String(notification.group_id ?? '').trim();
         if (!groupId) {
-            await client._publishAppEvent('group.message_created', notification);
+            await client._publishAppEvent('group.message_created', notification, 'push');
             return;
         }
         if (client._sessionOptions?.background_sync === false) {
@@ -1518,8 +1790,10 @@ export class MessageDeliveryEngine {
             }
         }
         client._gapFillDone.set(dedupKey, Date.now());
+        this.syncStarted(ns);
         let filled = 0;
         let continuationAfterSeq = 0;
+        let failed = false;
         try {
             let nextAfterSeq = afterSeq;
             const maxPages = singlePage ? 1 : 100;
@@ -1571,6 +1845,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)
@@ -1590,10 +1865,12 @@ 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;
                         }
                     }
-                    filled += 1;
+                    if (et !== 'group.message_created')
+                        filled += 1;
                 }
                 const ackContig = client._seqTracker.getContiguousSeq(ns);
                 await this.drainOrderedMessages(ns);
@@ -1620,6 +1897,15 @@ export class MessageDeliveryEngine {
                         client._clientLog.debug(`group event auto-ack failed: group=${groupId} ${formatDeliveryError(e)}`);
                     }
                 }
+                this.syncProgress(ns, {
+                    rawCount: eventObjects.length,
+                    pulledCount: publishedEventCount,
+                    remaining: result.remaining,
+                    hasMore: typeof result.has_more === 'boolean'
+                        ? Boolean(result.has_more) : undefined,
+                    currentSeq: ackContig,
+                    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) {
                     continuationAfterSeq = nextAfter;
@@ -1634,6 +1920,7 @@ export class MessageDeliveryEngine {
             client._clientLog.debug(`group event gap fill done: group=${groupId}, after_seq=${afterSeq}, filled=${filled}`);
         }
         catch (exc) {
+            failed = true;
             client._clientLog.warn(`group event gap fill failed: ${formatDeliveryError(exc)}`);
         }
         finally {
@@ -1650,6 +1937,8 @@ export class MessageDeliveryEngine {
             else if (!singlePage && filled > 0 && client._seqTracker.getContiguousSeq(ns) > afterSeq) {
                 void this.fillGroupEventGap(groupId);
             }
+            if (!client._rpcPipeline)
+                this.syncStopped(failed ? 'aborted' : 'pull_drained');
         }
     }
     enqueueOnlineUnreadEventHint(data) {
@@ -2845,6 +3134,7 @@ export class MessageDeliveryEngine {
                 targets.delete(ns);
                 if (tasks.get(ns) === task)
                     tasks.delete(ns);
+                client._rpcPipeline?.requestPullDrainedCheck?.();
             }
         });
         tasks.set(ns, task);
@@ -2975,13 +3265,13 @@ export class MessageDeliveryEngine {
         catch (exc) {
             const error = formatDeliveryError(exc);
             client._clientLog.warn(`restore SeqTracker state failed: ${error}`);
-            client._dispatcher.publish('seq_tracker.persist_error', {
+            client._dispatcher.enqueue('seq_tracker.persist_error', {
                 phase: 'restore',
                 aid: client._aid,
                 device_id: client._deviceId,
                 slot_id: client._slotId,
                 error: String(error),
-            }).catch(() => { });
+            });
         }
     }
     migrateSeqStateGroupIds(state) {
@@ -3200,13 +3490,13 @@ export class MessageDeliveryEngine {
         catch (exc) {
             const error = formatDeliveryError(exc);
             client._clientLog.warn(`save SeqTracker state failed: ${error}`);
-            client._dispatcher.publish('seq_tracker.persist_error', {
+            client._dispatcher.enqueue('seq_tracker.persist_error', {
                 phase: 'save',
                 aid,
                 device_id: deviceId,
                 slot_id: slotId,
                 error: String(error),
-            }).catch(() => { });
+            });
             if (throwOnError)
                 throw exc;
         }
@@ -3324,45 +3614,67 @@ export class MessageDeliveryEngine {
         }
         return params;
     }
-    async drainOrderedMessages(ns, beforeSeq, pullResponse = false, persist = true) {
+    async drainOrderedMessages(ns, beforeSeq, pullResponse = false, persist = true, source = 'push', context) {
         const client = this.runtime.client;
         this.ensurePullOperationCurrent();
         const queue = client._pendingOrderedMsgs.get(ns);
         if (!queue || queue.size === 0)
             return;
         let delivered = false;
-        while (true) {
-            this.ensurePullOperationCurrent();
-            const contig = client._seqTracker.getContiguousSeq(ns);
-            const ready = [...queue.keys()]
-                .filter((seq) => seq <= contig && (beforeSeq === undefined || seq < beforeSeq))
-                .sort((a, b) => a - b);
-            let seq = ready[0];
-            if (seq === undefined) {
-                const nextSeq = contig + 1;
-                if (beforeSeq !== undefined && nextSeq >= beforeSeq)
-                    break;
-                if (!queue.has(nextSeq))
-                    break;
-                seq = nextSeq;
-            }
-            if (seq === undefined)
-                continue;
-            const item = queue.get(seq);
-            queue.delete(seq);
-            if (!item)
-                continue;
-            if (client._pushedSeqs.get(ns)?.has(seq)) {
-                client._clientLog.debug(`publish ordered drain skipped duplicate: ns=${ns}, seq=${seq}, event=${item.event}`);
+        const rootTrigger = this.deliveryChangedTrigger(source);
+        const drainContexts = new Map();
+        try {
+            while (true) {
+                this.ensurePullOperationCurrent();
+                const contig = client._seqTracker.getContiguousSeq(ns);
+                const ready = [...queue.keys()]
+                    .filter((seq) => seq <= contig && (beforeSeq === undefined || seq < beforeSeq))
+                    .sort((a, b) => a - b);
+                let seq = ready[0];
+                if (seq === undefined) {
+                    const nextSeq = contig + 1;
+                    if (beforeSeq !== undefined && nextSeq >= beforeSeq)
+                        break;
+                    if (!queue.has(nextSeq))
+                        break;
+                    seq = nextSeq;
+                }
+                if (seq === undefined)
+                    continue;
+                const item = queue.get(seq);
+                queue.delete(seq);
+                if (!item)
+                    continue;
+                if (client._pushedSeqs.get(ns)?.has(seq)) {
+                    client._clientLog.debug(`publish ordered drain skipped duplicate: ns=${ns}, seq=${seq}, event=${item.event}`);
+                    client._markOrderedSeqDelivered(ns, seq);
+                    continue;
+                }
+                const itemSource = item.source ?? source;
+                const itemTrigger = this.deliveryChangedTrigger(itemSource);
+                let itemContext = itemTrigger === rootTrigger ? context : undefined;
+                if (itemTrigger === 'push' || itemTrigger === 'inline_push') {
+                    if (!itemContext) {
+                        itemContext = drainContexts.get(itemTrigger);
+                        if (!itemContext) {
+                            itemContext = { generation: this.deliveryChangedGeneration, changes: new Map() };
+                            drainContexts.set(itemTrigger, itemContext);
+                        }
+                    }
+                }
+                await this.publishOrderedQueueItem(ns, item.event, seq, item.payload, itemSource, pullResponse, itemContext);
+                this.ensurePullOperationCurrent();
+                this.markPublishedSeq(ns, seq);
                 client._markOrderedSeqDelivered(ns, seq);
-                continue;
+                delivered = true;
+                client._clientLog.debug(`publish ordered drain delivered: ns=${ns}, seq=${seq}, event=${item.event}`);
+            }
+        }
+        finally {
+            for (const [trigger, drainContext] of drainContexts) {
+                if (drainContext !== context)
+                    this.flushDeliveryChangedContext(drainContext, trigger);
             }
-            await this.publishOrderedQueueItem(ns, item.event, seq, item.payload, 'ordered-drain', pullResponse);
-            this.ensurePullOperationCurrent();
-            this.markPublishedSeq(ns, seq);
-            client._markOrderedSeqDelivered(ns, seq);
-            delivered = true;
-            client._clientLog.debug(`publish ordered drain delivered: ns=${ns}, seq=${seq}, event=${item.event}`);
         }
         if (queue.size === 0) {
             client._pendingOrderedMsgs.delete(ns);
@@ -3372,13 +3684,35 @@ export class MessageDeliveryEngine {
             }
         }
     }
-    async publishOrderedMessage(event, ns, seq, payload) {
+    async publishOrderedMessage(event, ns, seq, payload, source = 'push') {
+        const context = {
+            generation: this.deliveryChangedGeneration,
+            changes: new Map(),
+        };
+        try {
+            return await this.publishOrderedMessageInternal(event, ns, seq, payload, source, context);
+        }
+        finally {
+            const trigger = this.deliveryChangedTrigger(source);
+            if (trigger === 'pull_drained' && context.generation === this.deliveryChangedGeneration) {
+                const pending = this.pendingDeliveryChanges ?? new Map();
+                this.pendingDeliveryChanges = pending;
+                for (const [namespace, count] of context.changes) {
+                    pending.set(namespace, (pending.get(namespace) ?? 0) + count);
+                }
+            }
+            else if (trigger && trigger !== 'pull_drained') {
+                this.flushDeliveryChangedContext(context, trigger);
+            }
+        }
+    }
+    async publishOrderedMessageInternal(event, ns, seq, payload, source, context) {
         const client = this.runtime.client;
         this.ensurePullOperationCurrent();
         const seqNum = Number(seq);
         if (!Number.isFinite(seqNum) || !Number.isInteger(seqNum) || seqNum <= 0) {
             client._clientLog.debug(`publish ordered direct(no-seq): event=${event}, ns=${ns || '<none>'}, seq=${String(seq)}`);
-            await this.publishOrderedQueueItem(ns, event, seqNum, payload, 'ordered');
+            await this.publishOrderedQueueItem(ns, event, seqNum, payload, source, false, context);
             this.ensurePullOperationCurrent();
             return true;
         }
@@ -3393,10 +3727,10 @@ export class MessageDeliveryEngine {
         const contig = client._seqTracker.getContiguousSeq(ns);
         if (seqNum > contig && seqNum !== contig + 1) {
             client._clientLog.debug(`publish ordered enqueue(gap): event=${event}, ns=${ns}, seq=${seqNum}, contiguous=${contig}`);
-            this.enqueueOrderedMessage(ns, event, seqNum, payload);
+            this.enqueueOrderedMessage(ns, event, seqNum, payload, source);
             return false;
         }
-        await this.drainOrderedMessages(ns, seqNum);
+        await this.drainOrderedMessages(ns, seqNum, false, true, source, context);
         this.ensurePullOperationCurrent();
         if (client._pushedSeqs.get(ns)?.has(seqNum)) {
             client._clientLog.debug(`publish ordered skipped after-drain duplicate: event=${event}, ns=${ns}, seq=${seqNum}`);
@@ -3406,12 +3740,12 @@ export class MessageDeliveryEngine {
         queue?.delete(seqNum);
         if (queue && queue.size === 0)
             client._pendingOrderedMsgs.delete(ns);
-        await this.publishOrderedQueueItem(ns, event, seqNum, payload, 'ordered');
+        await this.publishOrderedQueueItem(ns, event, seqNum, payload, source, false, context);
         this.ensurePullOperationCurrent();
         this.markPublishedSeq(ns, seqNum);
         client._markOrderedSeqDelivered(ns, seqNum);
         client._clientLog.debug(`publish ordered delivered: event=${event}, ns=${ns}, seq=${seqNum}`);
-        await this.drainOrderedMessages(ns);
+        await this.drainOrderedMessages(ns, undefined, false, true, source, context);
         if (!client._pendingOrderedMsgs.get(ns)) {
             this.ensurePullOperationCurrent();
             await this.saveSeqTrackerState();
@@ -3444,18 +3778,18 @@ export class MessageDeliveryEngine {
         }
         return true;
     }
-    async publishPulledMessage(event, ns, seq, payload, persist = true) {
+    async publishPulledMessage(event, ns, seq, payload, persist = true, source = 'pull') {
         const client = this.runtime.client;
         this.ensurePullOperationCurrent();
         const seqNum = Number(seq);
         if (!Number.isFinite(seqNum) || !Number.isInteger(seqNum) || seqNum <= 0 || !ns) {
             client._clientLog.debug(`publish pulled direct(no-seq): event=${event}, ns=${ns || '<none>'}, seq=${String(seq)}`);
             if (event === 'message.recalled') {
-                const published = await this.publishMessageRecallTombstone(seq, payload);
+                const published = await this.publishMessageRecallTombstone(seq, payload, source);
                 this.ensurePullOperationCurrent();
                 return published;
             }
-            const published = client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload, 'pull'));
+            const published = client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload, source));
             if (isPromiseLike(published))
                 await published;
             this.ensurePullOperationCurrent();
@@ -3469,27 +3803,27 @@ export class MessageDeliveryEngine {
                 client._pendingOrderedMsgs.delete(ns);
             return false;
         }
-        await this.drainOrderedMessages(ns, seqNum, true, persist);
+        await this.drainOrderedMessages(ns, seqNum, true, persist, source);
         this.ensurePullOperationCurrent();
         queue?.delete(seqNum);
         if (queue && queue.size === 0)
             client._pendingOrderedMsgs.delete(ns);
         if (event === 'message.recalled') {
-            const recallPublished = await this.publishMessageRecallTombstone(seqNum, payload);
+            const recallPublished = await this.publishMessageRecallTombstone(seqNum, payload, source);
             this.ensurePullOperationCurrent();
             this.markPublishedSeq(ns, seqNum);
             client._clientLog.debug(`publish pulled delivered: event=${event}, ns=${ns}, seq=${seqNum}`);
-            await this.drainOrderedMessages(ns, undefined, true, persist);
+            await this.drainOrderedMessages(ns, undefined, true, persist, source);
             this.ensurePullOperationCurrent();
             return recallPublished;
         }
-        const published = client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload, 'pull'));
+        const published = client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload, source));
         if (isPromiseLike(published))
             await published;
         this.ensurePullOperationCurrent();
         this.markPublishedSeq(ns, seqNum);
         client._clientLog.debug(`publish pulled delivered: event=${event}, ns=${ns}, seq=${seqNum}`);
-        await this.drainOrderedMessages(ns, undefined, true, persist);
+        await this.drainOrderedMessages(ns, undefined, true, persist, source);
         this.ensurePullOperationCurrent();
         return true;
     }