@agentunion/fastaun-browser 0.5.18 → 0.5.19

package/dist/client/delivery.js

@@ -1,5 +1,6 @@
 import { slotIsolationKey } from '../config.js';
 import { normalizeGroupAid } from '../group-id.js';
+import { SeqTracker } from '../seq-tracker.js';
 import { ConnectionState, isJsonObject } from '../types.js';
 import { hasGroupMentionModeField, normalizeGroupMentionMode } from './mention-mode.js';
 const PUSHED_SEQS_LIMIT = 50_000;
@@ -136,6 +137,7 @@ export class MessageDeliveryEngine {
     pendingP2PInlineAcks = null;
     pendingGroupInlineAcks = null;
     pendingGroupInlineAckNamespaces = null;
+    pendingTailWindows = new Map();
     volatileContext = '';
     volatilePullCursorValue = '';
     volatileSeenMessages = new Map();
@@ -164,6 +166,7 @@ export class MessageDeliveryEngine {
         this.pendingP2PInlineAcks = null;
         this.pendingGroupInlineAcks = null;
         this.pendingGroupInlineAckNamespaces = null;
+        this.pendingTailWindows.clear();
         this.syncingNamespaces.clear();
         this.syncSessions.clear();
     }
@@ -186,6 +189,35 @@ export class MessageDeliveryEngine {
     captureInlineGeneration() {
         return this.inlineGeneration;
     }
+    deferTailWindow(ns, proof) {
+        const tracker = new SeqTracker();
+        tracker.restoreNamespaceSnapshot(ns, this.runtime.client._seqTracker.snapshotNamespace(ns));
+        tracker.commitTailWindow(ns, proof);
+        this.pendingTailWindows.set(ns, proof);
+    }
+    prospectiveTailState(ns) {
+        const proof = this.pendingTailWindows.get(ns);
+        if (!proof)
+            return this.syncState(ns);
+        const tracker = new SeqTracker();
+        tracker.restoreNamespaceSnapshot(ns, this.runtime.client._seqTracker.snapshotNamespace(ns));
+        tracker.commitTailWindow(ns, proof);
+        return tracker.getSyncState(ns);
+    }
+    pendingTailDeliveryThrough(ns, scanThrough) {
+        const proof = this.pendingTailWindows.get(ns);
+        return proof && scanThrough >= proof.windowStartSeq - 1 ? Math.max(scanThrough, proof.headSeq) : scanThrough;
+    }
+    commitPendingTailWindow(ns, scanThrough) {
+        const proof = this.pendingTailWindows.get(ns);
+        if (proof && scanThrough >= proof.windowStartSeq - 1)
+            this.runtime.client._seqTracker.commitTailWindow(ns, proof);
+    }
+    completePendingTailWindow(ns) {
+        const proof = this.pendingTailWindows.get(ns);
+        if (proof && this.runtime.client._seqTracker.getContiguousSeq(ns) >= proof.headSeq)
+            this.pendingTailWindows.delete(ns);
+    }
     beginRealtimeSync(ns) {
         if (!ns || this.realtimeSyncing?.has(ns))
             return false;
@@ -295,6 +327,18 @@ export class MessageDeliveryEngine {
             return;
         this.schedulePendingPullIfNeeded(ns, 'pull-gate-idle');
     }
+    onForegroundPullsDrained() {
+        const client = this.runtime.client;
+        if (!client._aid || client._sessionOptions?.background_sync === false
+            || client.state !== ConnectionState.READY || client._closing)
+            return;
+        const ns = `p2p:${client._aid}`;
+        const state = this.syncState(ns);
+        const maxSeen = client._seqTracker.getMaxSeenSeq(ns);
+        if (maxSeen <= state.ack && state.ack >= state.tail - 1)
+            return;
+        client._safeAsync(this.fillP2pGap());
+    }
     onPullWorkSettled() {
         const pipeline = this.runtime.client._rpcPipeline;
         if (pipeline?.hasAnyPullActivity?.() === true)
@@ -952,9 +996,7 @@ export class MessageDeliveryEngine {
         const pageInlineGeneration = this.captureInlineGeneration();
         const deferredServerCursor = Number(coordinator.pendingForwardCursor(ns, pageContigBefore) ?? 0);
         const deferredForwardAck = Number(coordinator.pendingForwardAck(ns, pageContigBefore) ?? 0);
-        const pageTrackerSnapshot = typeof client._seqTracker.snapshotNamespace === 'function'
-            ? client._seqTracker.snapshotNamespace(ns)
-            : null;
+        let pageTrackerSnapshot;
         response._contig_before = pageContigBefore;
         const cursor = isJsonObject(response.cursor)
             ? response.cursor
@@ -1005,6 +1047,15 @@ export class MessageDeliveryEngine {
             const contiguousSeq = Number.isSafeInteger(result.contiguous_seq)
                 ? result.contiguous_seq
                 : undefined;
+            const scanThrough = Math.max(pageContigBefore, contiguousSeq ?? 0, retentionFloor, visibilityFloor, deferredServerCursor, ...messages.map((message) => positiveSafeSequenceHint(message.seq)));
+            const state = this.syncState(ns);
+            const deliveryThrough = this.pendingTailDeliveryThrough(ns, scanThrough >= state.tail - 1 ? Math.max(scanThrough, state.head) : scanThrough);
+            await this.drainOrderedMessages(ns, undefined, false, false, undefined, 'pull', deliveryThrough);
+            this.ensurePullOperationCurrent(ns);
+            if (!this.isInlineGenerationCurrent(pageInlineGeneration))
+                throw new Error('pull invalidated');
+            pageTrackerSnapshot = client._seqTracker.snapshotNamespace(ns);
+            this.commitPendingTailWindow(ns, scanThrough);
             if (contiguousSeq === undefined)
                 client._seqTracker.onPullResult(ns, messages, afterSeq);
             else
@@ -1014,16 +1065,19 @@ export class MessageDeliveryEngine {
                 client._seqTracker.forceContiguousSeq(ns, commitTarget);
             }
             if (client._seqTracker.getContiguousSeq(ns) !== pageContigBefore) {
-                this.ensurePullOperationCurrent(ns);
-                await this.drainOrderedMessages(ns, undefined, false, false);
                 this.ensurePullOperationCurrent(ns);
                 await client._commitSeqTrackerState(ns);
+                this.ensurePullOperationCurrent(ns);
+                if (!this.isInlineGenerationCurrent(pageInlineGeneration))
+                    throw new Error('pull invalidated');
             }
+            this.completePendingTailWindow(ns);
             committed = true;
         }
         catch (exc) {
-            if (this.isPullOperationCurrent(ns) && !committed && typeof client._seqTracker.restoreNamespaceSnapshot === 'function') {
-                client._seqTracker.restoreNamespaceSnapshot(ns, pageTrackerSnapshot);
+            if (this.isPullOperationCurrent(ns) && this.isInlineGenerationCurrent(pageInlineGeneration)
+                && pageTrackerSnapshot !== undefined && !committed && typeof client._seqTracker.restoreNamespaceSnapshot === 'function') {
+                client._seqTracker._restoreNamespaceSnapshotPreservingPush(ns, pageTrackerSnapshot);
                 this.dropSeqTrackerPending(ns);
             }
             throw exc;
@@ -1103,6 +1157,8 @@ export class MessageDeliveryEngine {
         }
         if (pullResponse) {
             await client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload, source, ns, batch));
+            if (pullScoped)
+                this.ensurePullOperationCurrent(ns);
             return;
         }
         await client._publishAppEvent(event, payload, source, ns, batch);
@@ -1111,6 +1167,10 @@ export class MessageDeliveryEngine {
     }
     async publishOrderedGroupChanged(payload, source = 'ordered') {
         const client = this.runtime.client;
+        const generation = this.captureInlineGeneration();
+        await client._publishAppEvent('group.changed', payload, source);
+        if (!this.isInlineGenerationCurrent(generation))
+            throw new Error('pull invalidated');
         if (isJsonObject(payload)) {
             const eventPayload = payload;
             client._groupState?.handleGroupChangedV2Membership?.(eventPayload);
@@ -1121,7 +1181,6 @@ export class MessageDeliveryEngine {
                     client._cleanupDissolvedGroup?.(groupId);
             }
         }
-        await client._publishAppEvent('group.changed', payload, source);
     }
     isInstanceScopedMessageEvent(event) {
         return event === 'message.received'
@@ -1559,6 +1618,7 @@ export class MessageDeliveryEngine {
     }
     async publishMessageRecallTombstone(seq, message, source = 'push') {
         const client = this.runtime.client;
+        const generation = this.captureInlineGeneration();
         const eventPayload = this.recallEventFromMessage(message);
         if (!eventPayload)
             return false;
@@ -1572,13 +1632,15 @@ export class MessageDeliveryEngine {
             client._clientLog.debug(`message.recalled dedup suppressed: seq=${String(seq)} key=${dedupKey}`);
             return false;
         }
+        await client._publishAppEvent('message.recalled', eventPayload, source);
+        if (!this.isInlineGenerationCurrent(generation))
+            throw new Error('pull invalidated');
         seen.set(dedupKey, Date.now());
         if (seen.size > MESSAGE_RECALL_SEEN_LIMIT) {
             const drop = [...seen.entries()].sort((a, b) => a[1] - b[1]).slice(0, seen.size - MESSAGE_RECALL_SEEN_LIMIT);
             for (const [oldKey] of drop)
                 seen.delete(oldKey);
         }
-        await client._publishAppEvent('message.recalled', eventPayload, source);
         client._clientLog.debug(`message.recalled published: seq=${String(seq)} ids=${JSON.stringify(eventPayload.message_ids)}`);
         return true;
     }
@@ -1663,6 +1725,7 @@ export class MessageDeliveryEngine {
     }
     async publishGroupRecallTombstone(groupId, seq, message, source = 'push') {
         const client = this.runtime.client;
+        const generation = this.captureInlineGeneration();
         const eventPayload = this.recallEventFromGroupMessage(message);
         if (!eventPayload)
             return false;
@@ -1678,13 +1741,15 @@ export class MessageDeliveryEngine {
             client._clientLog.debug(`group.message_recalled dedup suppressed: group=${groupId} seq=${String(seq)} key=${dedupKey}`);
             return false;
         }
+        await client._publishAppEvent('group.message_recalled', eventPayload, source);
+        if (!this.isInlineGenerationCurrent(generation))
+            throw new Error('pull invalidated');
         seen.set(dedupKey, Date.now());
         if (seen.size > GROUP_RECALL_SEEN_LIMIT) {
             const drop = [...seen.entries()].sort((a, b) => a[1] - b[1]).slice(0, seen.size - GROUP_RECALL_SEEN_LIMIT);
             for (const [oldKey] of drop)
                 seen.delete(oldKey);
         }
-        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;
     }
@@ -1755,7 +1820,13 @@ export class MessageDeliveryEngine {
             && canonicalSource !== 'direct') {
             normalized = { ...normalized, source: canonicalSource };
         }
-        client._dispatcher.enqueue(event, normalized);
+        if (['message.received', 'group.message_created', 'message.recalled', 'group.message_recalled', 'group.changed'].includes(event)
+            && typeof client._dispatcher._publishAndWait === 'function') {
+            await client._dispatcher._publishAndWait(event, normalized);
+        }
+        else {
+            client._dispatcher.enqueue(event, normalized);
+        }
         if (generation !== this.deliveryGeneration)
             return;
         if (canonicalSource !== 'pull' && canonicalSource !== 'pending_retry'
@@ -1997,6 +2068,8 @@ export class MessageDeliveryEngine {
             }
         }
         catch (exc) {
+            if (exc?.stringCode === 'persistence_unavailable')
+                throw exc;
             client._clientLog.warn(`P2P push processing failed:${String(exc)}`);
             if (isJsonObject(data)) {
                 const src = data;
@@ -2300,6 +2373,7 @@ export class MessageDeliveryEngine {
     }
     async fillGroupEventGap(groupId, options) {
         const client = this.runtime.client;
+        const generation = this.captureInlineGeneration();
         if (client._sessionOptions?.background_sync === false)
             return;
         if (client.state !== ConnectionState.READY || client._closing)
@@ -2343,23 +2417,12 @@ export class MessageDeliveryEngine {
                 const pageContigBefore = client._seqTracker.getContiguousSeq(ns);
                 const eventObjects = events.filter((evt) => isJsonObject(evt));
                 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));
                 const earliestAvailable = Number(result.earliest_available_event_seq ?? 0);
                 const visibilityFloor = Math.max(0, Number(cursor?.join_seq ?? 0), Number.isFinite(earliestAvailable) && earliestAvailable > 0 ? earliestAvailable - 1 : 0);
                 const effectiveFloor = Math.max(...[retentionFloor, serverAckFloor, visibilityFloor].filter((value) => Number.isFinite(value)));
-                if (effectiveFloor > 0) {
-                    const contigBeforeFloor = client._seqTracker.getContiguousSeq(ns);
-                    if (contigBeforeFloor < effectiveFloor) {
-                        client._clientLog.info('group.pull_events floor advance: ns=' + ns + ' contiguous=' + contigBeforeFloor + ' -> effective_floor=' + effectiveFloor + ' retention_floor=' + retentionFloor + ' server_ack=' + serverAckFloor + ' visibility_floor=' + visibilityFloor);
-                        client._seqTracker.forceContiguousSeq(ns, effectiveFloor);
-                    }
-                }
                 const eventSeqs = [];
                 let hasDissolvedEvent = false;
                 let publishedEventCount = 0;
@@ -2388,8 +2451,20 @@ export class MessageDeliveryEngine {
                         publishedEventCount += 1;
                     }
                 }
+                const deliveryThrough = Math.max(pageContigBefore, contiguousSeq ?? 0, effectiveFloor, ...eventSeqs);
+                await this.drainOrderedMessages(ns, undefined, false, false, undefined, 'pull', deliveryThrough);
+                if (!this.isInlineGenerationCurrent(generation))
+                    throw new Error('pull invalidated');
+                if (hasDissolvedEvent)
+                    break;
+                if (contiguousSeq === undefined)
+                    client._seqTracker.onPullResult(ns, eventObjects, nextAfterSeq);
+                else
+                    client._seqTracker.onPullResult(ns, eventObjects, nextAfterSeq, contiguousSeq);
+                if (effectiveFloor > client._seqTracker.getContiguousSeq(ns)) {
+                    client._seqTracker.forceContiguousSeq(ns, effectiveFloor);
+                }
                 const ackContig = client._seqTracker.getContiguousSeq(ns);
-                await this.drainOrderedMessages(ns);
                 if (ackContig !== pageContigBefore && !hasDissolvedEvent) {
                     this.persistSeq(ns);
                 }
@@ -2879,9 +2954,8 @@ export class MessageDeliveryEngine {
     async commitInlineMessage(ns, seq, event, payload, generation) {
         const client = this.runtime.client;
         const tracker = client._seqTracker;
-        const snapshot = typeof tracker.snapshotNamespace === 'function'
-            ? tracker.snapshotNamespace(ns)
-            : null;
+        let snapshot = null;
+        let trackerChanged = false;
         try {
             const selfSync = (event === 'message.received' && this.isSelfSentP2PMessage(payload))
                 || (event === 'group.message_created' && this.isSelfSentGroupMessage(payload));
@@ -2892,6 +2966,8 @@ export class MessageDeliveryEngine {
                 return false;
             if (!published)
                 return false;
+            snapshot = typeof tracker.snapshotNamespace === 'function' ? tracker.snapshotNamespace(ns) : null;
+            trackerChanged = true;
             const needsPull = Boolean(tracker.onMessageSeq(ns, seq));
             const committed = this.syncState(ns);
             if (needsPull || committed.ack !== seq || committed.tail !== seq || committed.head !== seq) {
@@ -2905,8 +2981,8 @@ export class MessageDeliveryEngine {
             return true;
         }
         catch (exc) {
-            if (this.isInlineGenerationCurrent(generation) && typeof tracker.restoreNamespaceSnapshot === 'function') {
-                tracker.restoreNamespaceSnapshot(ns, snapshot);
+            if (trackerChanged && this.isInlineGenerationCurrent(generation) && typeof tracker.restoreNamespaceSnapshot === 'function') {
+                tracker._restoreNamespaceSnapshotPreservingPush(ns, snapshot);
             }
             client._clientLog.debug(`inline realtime consume rolled back: ns=${ns} seq=${seq} err=${formatDeliveryError(exc)}`);
             return false;
@@ -2995,7 +3071,7 @@ export class MessageDeliveryEngine {
         }
     }
     hasOutstandingRealtimeGap(ns) {
-        const state = this.syncState(ns);
+        const state = this.prospectiveTailState(ns);
         // Tail 已建立可靠后缀窗口；后台续拉只针对尚未接上窗口的真实缺口。
         // maxSeen 可能只是 Tail 期间到达的通知，不能单独据此启动全量补洞。
         return state.ack < state.tail - 1;
@@ -3051,8 +3127,8 @@ export class MessageDeliveryEngine {
     }
     async runP2PRealtimeSync(ns, pushSeq, pageLimit = 50, forceTail = false) {
         const client = this.runtime.client;
-        const before = this.syncState(ns);
-        const order = forceTail ? ['tail'] : typeof client._seqTracker.planRealtimeSync === 'function'
+        const before = this.prospectiveTailState(ns);
+        const order = forceTail ? ['tail'] : this.pendingTailWindows.has(ns) ? ['forward'] : typeof client._seqTracker.planRealtimeSync === 'function'
             ? client._seqTracker.planRealtimeSync(ns, pushSeq, pageLimit)
             : (() => {
                 const gap = pushSeq - before.ack;
@@ -3065,7 +3141,7 @@ export class MessageDeliveryEngine {
         let result = { messages: [], raw_count: 0 };
         let tailCompleted = false;
         const run = async (tail, background, maxPages, forceForward = false, bypassCoveredHead = false) => {
-            const live = this.syncState(ns);
+            const live = this.prospectiveTailState(ns);
             if (tail && !bypassCoveredHead && pushSeq <= live.head)
                 return { messages: [], raw_count: 0 };
             if (!tail && !forceForward && live.ack >= live.tail - 1)
@@ -3089,7 +3165,7 @@ export class MessageDeliveryEngine {
         };
         if (forceTail || order[0] === 'tail')
             result = await run(true, false, undefined, false, forceTail);
-        const state = this.syncState(ns);
+        const state = this.prospectiveTailState(ns);
         const maxSeen = Number(client._seqTracker.getMaxSeenSeq(ns) || 0);
         // Tail 期间到达的新 Push 只记录在 pending Pull 上界，不写入 SeqTracker。
         const pendingUpper = Number(this.pendingP2pPullUpper?.get(ns) ?? 0);
@@ -3104,16 +3180,16 @@ export class MessageDeliveryEngine {
             || (client._sessionOptions?.background_sync !== false && backgroundWindowForward)) {
             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);
+            result = await run(false, !(headForward || tailForward), forwardMaxPages, headForward || tailForward || tailMissedDuringPull);
             if (pendingThroughSeq > 0) {
-                const committedAck = this.syncState(ns).ack;
+                const committedAck = this.prospectiveTailState(ns).ack;
                 if (committedAck >= pendingThroughSeq)
                     this.consumePendingPull(ns, pendingThroughSeq);
                 else if (committedAck <= state.ack)
                     this.markPendingPullNoProgress(ns, committedAck);
             }
         }
-        const finalState = this.syncState(ns);
+        const finalState = this.prospectiveTailState(ns);
         if (tailCompleted && finalState.ack < finalState.tail - 1) {
             this.scheduleP2PRealtimeFullGapFill(ns);
         }
@@ -3123,8 +3199,8 @@ export class MessageDeliveryEngine {
     }
     async runGroupRealtimeSync(groupId, ns, pushSeq, pageLimit = 50, forceTail = false) {
         const client = this.runtime.client;
-        const before = this.syncState(ns);
-        const order = forceTail ? ['tail'] : typeof client._seqTracker.planRealtimeSync === 'function'
+        const before = this.prospectiveTailState(ns);
+        const order = forceTail ? ['tail'] : this.pendingTailWindows.has(ns) ? ['forward'] : typeof client._seqTracker.planRealtimeSync === 'function'
             ? client._seqTracker.planRealtimeSync(ns, pushSeq, pageLimit)
             : (() => {
                 const gap = pushSeq - before.ack;
@@ -3137,7 +3213,7 @@ export class MessageDeliveryEngine {
         let result = { messages: [], raw_count: 0 };
         let tailCompleted = false;
         const run = async (tail, background, maxPages, forceForward = false, bypassCoveredHead = false) => {
-            const live = this.syncState(ns);
+            const live = this.prospectiveTailState(ns);
             if (tail && !bypassCoveredHead && pushSeq <= live.head)
                 return { messages: [], raw_count: 0 };
             if (!tail && !forceForward && live.ack >= live.tail - 1)
@@ -3161,7 +3237,7 @@ export class MessageDeliveryEngine {
         };
         if (forceTail || order[0] === 'tail')
             result = await run(true, false, undefined, false, forceTail);
-        const state = this.syncState(ns);
+        const state = this.prospectiveTailState(ns);
         // 与 P2P 相同：真实完成 Tail 后，至多用一页 Forward 收敛 Tail
         // 期间新到达的序号；绝不重新规划或再执行 Tail。
         const maxSeen = Number(client._seqTracker.getMaxSeenSeq(ns) || 0);
@@ -3177,16 +3253,16 @@ export class MessageDeliveryEngine {
             || (client._sessionOptions?.background_sync !== false && backgroundWindowForward)) {
             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);
+            result = await run(false, !(headForward || tailForward), forwardMaxPages, headForward || tailForward || tailMissedDuringPull);
             if (pendingThroughSeq > 0) {
-                const committedAck = this.syncState(ns).ack;
+                const committedAck = this.prospectiveTailState(ns).ack;
                 if (committedAck >= pendingThroughSeq)
                     this.consumePendingPull(ns, pendingThroughSeq);
                 else if (committedAck <= state.ack)
                     this.markPendingPullNoProgress(ns, committedAck);
             }
         }
-        const finalState = this.syncState(ns);
+        const finalState = this.prospectiveTailState(ns);
         if (tailCompleted && finalState.ack < finalState.tail - 1) {
             this.scheduleGroupRealtimeFullGapFill(groupId, ns);
         }
@@ -3803,7 +3879,7 @@ export class MessageDeliveryEngine {
         }
         return params;
     }
-    async drainOrderedMessages(ns, beforeSeq, pullResponse = false, persist = true, batch, source = 'pull') {
+    async drainOrderedMessages(ns, beforeSeq, pullResponse = false, persist = true, batch, source = 'pull', throughSeq) {
         const client = this.runtime.client;
         const pullScoped = this.isPullScopedSource(source);
         if (pullScoped)
@@ -3811,7 +3887,8 @@ export class MessageDeliveryEngine {
         const queue = client._pendingOrderedMsgs.get(ns);
         if (!queue || queue.size === 0)
             return;
-        const contig = client._seqTracker.getContiguousSeq(ns);
+        const generation = this.captureInlineGeneration();
+        const contig = throughSeq ?? client._seqTracker.getContiguousSeq(ns);
         const ready = [...queue.keys()]
             .filter((seq) => seq <= contig && (beforeSeq === undefined || seq < beforeSeq))
             .sort((a, b) => a - b);
@@ -3822,9 +3899,12 @@ export class MessageDeliveryEngine {
                 if (pullScoped)
                     this.ensurePullOperationCurrent(ns);
                 const item = queue.get(seq);
-                queue.delete(seq);
-                if (!item || client._pushedSeqs.get(ns)?.has(seq))
+                if (!item)
                     continue;
+                if (client._pushedSeqs.get(ns)?.has(seq)) {
+                    queue.delete(seq);
+                    continue;
+                }
                 const itemSource = item.source ?? source;
                 let itemBatch = batch;
                 if ((itemSource === 'push' || itemSource === 'inline_push')
@@ -3836,8 +3916,13 @@ export class MessageDeliveryEngine {
                     }
                 }
                 await this.publishOrderedQueueItem(ns, item.event, seq, item.payload, pullResponse, itemSource, itemBatch);
+                if (!this.isInlineGenerationCurrent(generation))
+                    throw new Error('pull invalidated');
                 if (pullScoped)
                     this.ensurePullOperationCurrent(ns);
+                queue.delete(seq);
+                if (item.event === 'group.changed' && isJsonObject(item.payload) && item.payload.action === 'dissolved')
+                    continue;
                 this.markPublishedSeq(ns, seq);
                 delivered = true;
             }
@@ -3858,6 +3943,7 @@ export class MessageDeliveryEngine {
     }
     async publishOrderedMessage(event, ns, seq, payload, source = 'push', operationBatch) {
         const client = this.runtime.client;
+        const generation = this.captureInlineGeneration();
         const ownsBatch = !operationBatch && (source === 'push' || source === 'inline_push');
         const batch = operationBatch ?? (ownsBatch ? this.createDeliveryChangeBatch(source) : undefined);
         try {
@@ -3887,10 +3973,12 @@ export class MessageDeliveryEngine {
             if (client._pushedSeqs.get(ns)?.has(seqNum))
                 return false;
             const queue = client._pendingOrderedMsgs.get(ns);
+            await this.publishOrderedQueueItem(ns, event, seqNum, payload, false, source, batch);
+            if (!this.isInlineGenerationCurrent(generation))
+                throw new Error('pull invalidated');
             queue?.delete(seqNum);
             if (queue && queue.size === 0)
                 client._pendingOrderedMsgs.delete(ns);
-            await this.publishOrderedQueueItem(ns, event, seqNum, payload, false, source, batch);
             this.markPublishedSeq(ns, seqNum);
             await this.drainOrderedMessages(ns, undefined, false, true, batch, source);
             if (!client._pendingOrderedMsgs.get(ns))
@@ -3904,6 +3992,7 @@ export class MessageDeliveryEngine {
     }
     async publishPulledMessage(event, ns, seq, payload, persist = true, source = 'pull', operationBatch) {
         const client = this.runtime.client;
+        const generation = this.captureInlineGeneration();
         const ownsBatch = !operationBatch && (source === 'push' || source === 'inline_push');
         const batch = operationBatch ?? (ownsBatch ? this.createDeliveryChangeBatch(source) : undefined);
         const pullScoped = this.isPullScopedSource(source);
@@ -3938,19 +4027,26 @@ export class MessageDeliveryEngine {
             await this.drainOrderedMessages(ns, seqNum, false, persist, batch, source);
             if (pullScoped)
                 this.ensurePullOperationCurrent(ns);
-            queue?.delete(seqNum);
-            if (queue && queue.size === 0)
-                client._pendingOrderedMsgs.delete(ns);
             if (event === 'message.recalled') {
                 const published = await client._withPullResponseProcessing(ns, () => this.publishMessageRecallTombstone(seqNum, payload, source));
+                if (!this.isInlineGenerationCurrent(generation))
+                    throw new Error('pull invalidated');
                 if (pullScoped)
                     this.ensurePullOperationCurrent(ns);
+                queue?.delete(seqNum);
+                if (queue && queue.size === 0)
+                    client._pendingOrderedMsgs.delete(ns);
                 this.markPublishedSeq(ns, seqNum);
                 return published;
             }
             await client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload, source, ns, batch));
+            if (!this.isInlineGenerationCurrent(generation))
+                throw new Error('pull invalidated');
             if (pullScoped)
                 this.ensurePullOperationCurrent(ns);
+            queue?.delete(seqNum);
+            if (queue && queue.size === 0)
+                client._pendingOrderedMsgs.delete(ns);
             this.markPublishedSeq(ns, seqNum);
             return true;
         }