@agentunion/fastaun 0.5.0 → 0.5.2

package/dist/client/v2-e2ee.js

@@ -6,6 +6,7 @@ import { V2Session } from '../v2/session/index.js';
 import { isJsonObject } from '../types.js';
 const V2_BOOTSTRAP_TTL_MS = 60 * 60 * 1000;
 const V2_RETRYABLE_CODES = new Set([-33011, -33012, -33050, -33052, -33054]);
+const V2_GROUP_STALE_BOOTSTRAP_CODE = -33054;
 const MEMBERSHIP_ACTIONS = new Set([
     'member_added',
     'member_left',
@@ -17,6 +18,18 @@ const MEMBERSHIP_ACTIONS = new Set([
     'invite_code_used',
 ]);
 const JOIN_ACTIONS = new Set(['member_added', 'joined', 'join_approved', 'invite_code_used']);
+function v2PullTailDelayMs(msgCount, pageLimit) {
+    const count = Math.trunc(Number(msgCount || 0));
+    const limit = Math.trunc(Number(pageLimit || 0));
+    if (count <= 0 || (limit > 0 && count >= limit))
+        return 0;
+    return Math.min(500, Math.max(5, 1000 / (count + 1)));
+}
+function v2Sleep(ms) {
+    return new Promise((resolve) => {
+        globalThis.setTimeout(resolve, ms);
+    });
+}
 function pubDerMatchesFingerprint(pubDer, certFingerprint) {
     const expected = String(certFingerprint ?? '').trim().toLowerCase();
     if (!expected)
@@ -134,6 +147,7 @@ function applyV2WrapPolicyToTargets(targets, policy) {
 export class V2E2EECoordinator {
     runtime;
     _initSessionPromise = null;
+    targetSetCache = new Map();
     constructor(runtime) {
         this.runtime = runtime;
     }
@@ -155,17 +169,49 @@ export class V2E2EECoordinator {
     }
     deleteBootstrapCacheEntry(key) {
         this.bootstrapCache.delete(key);
+        this.targetSetCache.delete(key);
     }
     clearBootstrapCache() {
         this.bootstrapCache.clear();
+        this.targetSetCache.clear();
     }
     pruneExpiredBootstrapCache(ttlMs, now = Date.now()) {
         for (const [key, entry] of this.bootstrapCache) {
             if (now - Number(entry.cachedAt ?? 0) >= ttlMs) {
                 this.bootstrapCache.delete(key);
+                this.targetSetCache.delete(key);
+            }
+        }
+        for (const [key, entry] of this.targetSetCache) {
+            if (now - Number(entry.cachedAt ?? 0) >= ttlMs) {
+                this.targetSetCache.delete(key);
             }
         }
     }
+    getTargetSetCache(key) {
+        const cached = this.targetSetCache.get(key);
+        if (!cached || Date.now() - cached.cachedAt >= V2_BOOTSTRAP_TTL_MS) {
+            if (cached)
+                this.targetSetCache.delete(key);
+            return undefined;
+        }
+        return cached.value;
+    }
+    setTargetSetCache(key, value) {
+        this.targetSetCache.set(key, { cachedAt: Date.now(), value });
+        return value;
+    }
+    cloneP2PTargetSet(value) {
+        return {
+            targets: value.targets.map((target) => ({ ...target })),
+            auditRecipients: value.auditRecipients.map((target) => ({ ...target })),
+        };
+    }
+    cloneGroupTargetSet(value) {
+        return {
+            targets: value.targets.map((target) => ({ ...target })),
+        };
+    }
     async onConnected(opts) {
         const client = this.client;
         try {
@@ -453,6 +499,7 @@ export class V2E2EECoordinator {
             client._clientLog.debug(`message.v2.bootstrap cache hit: to=${to}, devices=${peerDevices.length}, audit=${auditRaw.length}`);
         }
         else {
+            this.targetSetCache.delete(to);
             const bs = await client.call('message.v2.bootstrap', {
                 peer_aid: to,
                 e2ee_wrap_capabilities: v2WrapCapabilities(),
@@ -464,7 +511,7 @@ export class V2E2EECoordinator {
             peerDevices = (Array.isArray(bs?.peer_devices) ? bs.peer_devices : []);
             auditRaw = (Array.isArray(bs?.audit_recipients) ? bs.audit_recipients : []);
             client._clientLog.debug(`message.v2.bootstrap fetched: to=${to}, devices=${peerDevices.length}, audit=${auditRaw.length}`);
-            if (peerDevices.length > 0 && !this.getBootstrapCacheEntry(to)) {
+            if (peerDevices.length > 0) {
                 this.setBootstrapCacheEntry(to, {
                     devices: peerDevices,
                     auditRecipients: auditRaw,
@@ -476,83 +523,92 @@ export class V2E2EECoordinator {
         if (peerDevices.length === 0) {
             throw new E2EEError(`V2 bootstrap: no devices found for ${to}`);
         }
-        const targets = [];
-        for (const dev of peerDevices) {
-            const devId = getV2DeviceId(dev);
-            const target = await client._v2BuildTargetFromDevice({
-                dev,
-                aid: to,
-                deviceId: devId.value,
-                role: 'peer',
-                defaultKeySource: 'peer_device_prekey',
-            });
-            if (target)
-                targets.push(target);
-        }
-        const auditTargets = [];
-        for (const dev of auditRaw) {
-            const target = await client._v2BuildTargetFromDevice({
-                dev,
-                aid: String(dev.aid ?? ''),
-                deviceId: String(dev.device_id ?? ''),
-                role: 'audit',
-                defaultKeySource: 'peer_device_prekey',
-            });
-            if (target)
-                auditTargets.push(target);
+        let targetSet = useCache ? this.getTargetSetCache(to) : undefined;
+        if (targetSet) {
+            targetSet = this.cloneP2PTargetSet(targetSet);
         }
-        if (client._aid && client._aid !== to) {
-            try {
-                const selfCached = this.getBootstrapCacheEntry(client._aid);
-                let selfDevices = [];
-                if (selfCached && Date.now() - Number(selfCached.cachedAt ?? 0) < V2_BOOTSTRAP_TTL_MS) {
-                    selfDevices = (selfCached.devices ?? []);
-                }
-                else {
-                    const selfBs = await client.call('message.v2.bootstrap', {
-                        peer_aid: client._aid,
-                        e2ee_wrap_capabilities: v2WrapCapabilities(),
-                    });
-                    if (typeof client._primeBootstrapPeerCerts === 'function') {
-                        await client._primeBootstrapPeerCerts(selfBs, client._aid);
+        else {
+            const targets = [];
+            for (const dev of peerDevices) {
+                const devId = getV2DeviceId(dev);
+                const target = await client._v2BuildTargetFromDevice({
+                    dev,
+                    aid: to,
+                    deviceId: devId.value,
+                    role: 'peer',
+                    defaultKeySource: 'peer_device_prekey',
+                });
+                if (target)
+                    targets.push(target);
+            }
+            const auditTargets = [];
+            for (const dev of auditRaw) {
+                const target = await client._v2BuildTargetFromDevice({
+                    dev,
+                    aid: String(dev.aid ?? ''),
+                    deviceId: String(dev.device_id ?? ''),
+                    role: 'audit',
+                    defaultKeySource: 'peer_device_prekey',
+                });
+                if (target)
+                    auditTargets.push(target);
+            }
+            if (client._aid && client._aid !== to) {
+                try {
+                    const selfCached = this.getBootstrapCacheEntry(client._aid);
+                    let selfDevices = [];
+                    if (selfCached && Date.now() - Number(selfCached.cachedAt ?? 0) < V2_BOOTSTRAP_TTL_MS) {
+                        selfDevices = (selfCached.devices ?? []);
+                    }
+                    else {
+                        this.targetSetCache.delete(client._aid);
+                        const selfBs = await client.call('message.v2.bootstrap', {
+                            peer_aid: client._aid,
+                            e2ee_wrap_capabilities: v2WrapCapabilities(),
+                        });
+                        if (typeof client._primeBootstrapPeerCerts === 'function') {
+                            await client._primeBootstrapPeerCerts(selfBs, client._aid);
+                        }
+                        selfDevices = (Array.isArray(selfBs?.peer_devices) ? selfBs.peer_devices : []);
+                        const selfWrapPolicy = normalizeV2WrapPolicy(selfBs.e2ee_wrap_policy);
+                        if (selfDevices.length > 0) {
+                            this.setBootstrapCacheEntry(client._aid, {
+                                devices: selfDevices,
+                                auditRecipients: [],
+                                cachedAt: Date.now(),
+                                wrapPolicy: selfWrapPolicy,
+                            });
+                        }
                     }
-                    selfDevices = (Array.isArray(selfBs?.peer_devices) ? selfBs.peer_devices : []);
-                    const selfWrapPolicy = normalizeV2WrapPolicy(selfBs.e2ee_wrap_policy);
-                    if (selfDevices.length > 0) {
-                        this.setBootstrapCacheEntry(client._aid, {
-                            devices: selfDevices,
-                            auditRecipients: [],
-                            cachedAt: Date.now(),
-                            wrapPolicy: selfWrapPolicy,
+                    for (const dev of selfDevices) {
+                        const devId = getV2DeviceId(dev);
+                        if (!devId.present || devId.value === client._deviceId)
+                            continue;
+                        const target = await client._v2BuildTargetFromDevice({
+                            dev,
+                            aid: client._aid,
+                            deviceId: devId.value,
+                            role: 'self_sync',
+                            defaultKeySource: 'peer_device_prekey',
                         });
+                        if (target)
+                            targets.push(target);
                     }
                 }
-                for (const dev of selfDevices) {
-                    const devId = getV2DeviceId(dev);
-                    if (!devId.present || devId.value === client._deviceId)
-                        continue;
-                    const target = await client._v2BuildTargetFromDevice({
-                        dev,
-                        aid: client._aid,
-                        deviceId: devId.value,
-                        role: 'self_sync',
-                        defaultKeySource: 'peer_device_prekey',
-                    });
-                    if (target)
-                        targets.push(target);
+                catch (exc) {
+                    client._clientLog.debug(`V2 self-sync bootstrap failed (non-fatal): ${formatE2EEError(exc)}`);
                 }
             }
-            catch (exc) {
-                client._clientLog.debug(`V2 self-sync bootstrap failed (non-fatal): ${formatE2EEError(exc)}`);
-            }
+            targetSet = this.setTargetSetCache(to, {
+                targets: applyV2WrapPolicyToTargets(targets, wrapPolicy),
+                auditRecipients: applyV2WrapPolicyToTargets(auditTargets, wrapPolicy),
+            });
+            targetSet = this.cloneP2PTargetSet(targetSet);
         }
-        if (targets.length === 0) {
+        if (targetSet.targets.length === 0) {
             throw new E2EEError(`V2 bootstrap: no usable devices found for ${to}`);
         }
-        const envelope = encryptP2PMessage(session.getSenderIdentity(), {
-            targets: applyV2WrapPolicyToTargets(targets, wrapPolicy),
-            auditRecipients: applyV2WrapPolicyToTargets(auditTargets, wrapPolicy),
-        }, opts.payload, {
+        const envelope = encryptP2PMessage(session.getSenderIdentity(), targetSet, opts.payload, {
             messageId: opts.messageId,
             timestamp: opts.timestamp,
             protectedHeaders: opts.protectedHeaders,
@@ -569,8 +625,8 @@ export class V2E2EECoordinator {
             payloadOverride: envelope,
             extra: {
                 plaintext_payload: opts.payload,
-                target_count: targets.length,
-                audit_count: auditTargets.length,
+                target_count: targetSet.targets.length,
+                audit_count: targetSet.auditRecipients.length,
                 use_cache: useCache,
             },
         });
@@ -652,17 +708,29 @@ export class V2E2EECoordinator {
         const decrypted = [];
         let nextAfterSeq = opts?.force ? afterSeq : (afterSeq || (ns ? client._seqTracker.getContiguousSeq(ns) : 0));
         let pageCount = 0;
+        let lastAutoAckSeq = 0;
+        let pendingAckSeq = 0;
         const maxPages = 100;
         while (pageCount < maxPages) {
             pageCount += 1;
-            client._clientLog.debug(`message.v2.pull page request: page=${pageCount}, after_seq=${nextAfterSeq}, limit=${limit}, ns=${ns || '<none>'}`);
+            const ackUpToSeq = opts?.skipAutoAck ? 0 : pendingAckSeq;
+            client._clientLog.debug(`message.v2.pull page request: page=${pageCount}, after_seq=${nextAfterSeq}, limit=${limit}, ack_up_to_seq=${ackUpToSeq}, ns=${ns || '<none>'}`);
             const result = await client._callRawV2Rpc('message.v2.pull', {
                 after_seq: nextAfterSeq,
                 limit,
                 ...(opts?.force ? { force: true } : {}),
+                ...(ackUpToSeq > 0 ? { ack_up_to_seq: ackUpToSeq } : {}),
+            });
+            if (ackUpToSeq > 0) {
+                pendingAckSeq = 0;
+                lastAutoAckSeq = Math.max(lastAutoAckSeq, ackUpToSeq);
+            }
+            const pageMessages = (Array.isArray(result?.messages) ? result.messages : []);
+            const messages = pageMessages.filter((msg) => {
+                const seq = Number(msg.seq ?? 0);
+                return Number.isFinite(seq) && seq > nextAfterSeq;
             });
-            const messages = (Array.isArray(result?.messages) ? result.messages : []);
-            client._clientLog.debug(`message.v2.pull page response: page=${pageCount}, raw_count=${messages.length}, has_more=${String(result.has_more ?? '')}, server_ack_seq=${String(result.server_ack_seq ?? '')}`);
+            client._clientLog.debug(`message.v2.pull page response: page=${pageCount}, raw_count=${messages.length}, stale_count=${Math.max(0, pageMessages.length - messages.length)}, has_more=${String(result.has_more ?? '')}, server_ack_seq=${String(result.server_ack_seq ?? '')}`);
             for (const msg of messages) {
                 client._logMessageDebug('pull-raw', 'message.v2.pull', 'message.received', msg);
             }
@@ -752,24 +820,47 @@ export class V2E2EECoordinator {
                 const contigAdvanced = ackSeq !== pageContigBefore;
                 if (contigAdvanced) {
                     await client._drainOrderedMessages(ns, undefined, true);
-                    client._saveSeqTrackerState();
+                    client._persistSeq(ns);
                 }
-                const ackNeeded = messages.length > 0
+                const ackNeeded = pageMessages.length > 0
                     && ackSeq > 0
+                    && ackSeq > lastAutoAckSeq
                     && !opts?.skipAutoAck
                     && (contigAdvanced || (hasServerAckSeq && ackSeq > serverAckSeq));
                 if (ackNeeded) {
-                    client._clientLog.debug(`message.v2.pull sending auto-ack: ns=${ns}, ack_seq=${ackSeq}, raw_count=${messages.length}`);
-                    await this.ackV2(ackSeq);
+                    const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
+                    const canContinuePage = messages.length > 0 && nextAfter > nextAfterSeq;
+                    if (canContinuePage) {
+                        pendingAckSeq = Math.max(pendingAckSeq, ackSeq);
+                        lastAutoAckSeq = Math.max(lastAutoAckSeq, ackSeq);
+                        client._clientLog.debug(`message.v2.pull queued piggyback auto-ack: ns=${ns}, ack_seq=${pendingAckSeq}, raw_count=${messages.length}`);
+                    }
+                    else {
+                        client._clientLog.debug(`message.v2.pull sending terminal auto-ack: ns=${ns}, ack_seq=${ackSeq}, raw_count=${messages.length}`);
+                        await this.ackV2(ackSeq);
+                        lastAutoAckSeq = Math.max(lastAutoAckSeq, ackSeq);
+                    }
                 }
             }
             const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
-            if (messages.length === 0 || nextAfter <= nextAfterSeq || result.has_more === false)
+            const rawCount = messages.length;
+            const canContinuePage = rawCount > 0 && nextAfter > nextAfterSeq;
+            const fullPage = canContinuePage && limit > 0 && rawCount >= limit;
+            const shouldContinue = canContinuePage && (fullPage || pendingAckSeq > 0);
+            if (!shouldContinue)
                 break;
+            const tailDelayMs = v2PullTailDelayMs(rawCount, limit);
+            if (tailDelayMs > 0)
+                await v2Sleep(tailDelayMs);
             nextAfterSeq = nextAfter;
         }
         if (pageCount >= maxPages) {
             client._clientLog.warn(`message.v2.pull reached max_pages=${maxPages} after_seq=${nextAfterSeq}`);
+            if (pendingAckSeq > 0) {
+                client._clientLog.debug(`message.v2.pull flushing pending auto-ack after max_pages: ns=${ns}, ack_seq=${pendingAckSeq}`);
+                await this.ackV2(pendingAckSeq);
+                pendingAckSeq = 0;
+            }
         }
         client._clientLog.debug(`message.v2.pull done: requested_after_seq=${afterSeq}, pages=${pageCount}, decrypted=${decrypted.length}, ns=${ns || '<none>'}`);
         return decrypted;
@@ -895,7 +986,8 @@ export class V2E2EECoordinator {
         if (!client._v2Session)
             throw new StateError('V2 session not initialized');
         const session = client._v2Session;
-        const groupId = normalizeGroupId(opts.groupId) || String(opts.groupId ?? '').trim();
+        const rawGroupId = String(opts.groupId ?? '').trim();
+        const groupId = normalizeGroupId(rawGroupId) || rawGroupId;
         if (!groupId)
             throw new ValidationError("group.send requires 'group_id'");
         const cacheKey = `group:${groupId}`;
@@ -905,16 +997,27 @@ export class V2E2EECoordinator {
         let epoch = 0;
         let stateCommitment = { state_version: 0, state_hash: '', state_chain: '' };
         let wrapPolicy = normalizeV2WrapPolicy(undefined);
-        const cached = useCache ? this.getBootstrapCacheEntry(cacheKey) : undefined;
+        let usedCachedBootstrap = false;
+        let cached = useCache ? this.getBootstrapCacheEntry(cacheKey) : undefined;
+        if (!cached && useCache && rawGroupId && rawGroupId !== groupId) {
+            const legacyCacheKey = `group:${rawGroupId}`;
+            cached = this.getBootstrapCacheEntry(legacyCacheKey);
+            if (cached) {
+                this.setBootstrapCacheEntry(cacheKey, cached);
+                this.deleteBootstrapCacheEntry(legacyCacheKey);
+            }
+        }
         if (cached && Date.now() - Number(cached.cachedAt ?? 0) < V2_BOOTSTRAP_TTL_MS) {
             allDevices = (cached.devices ?? []);
             auditRecipientsRaw = (cached.auditRecipients ?? []);
             epoch = Number(cached.epoch ?? 0) || 0;
             stateCommitment = cached.stateCommitment ?? stateCommitment;
             wrapPolicy = cached.wrapPolicy ?? wrapPolicy;
+            usedCachedBootstrap = true;
             client._clientLog.debug(`group.v2.bootstrap cache hit: group=${groupId}, devices=${allDevices.length}, audit=${auditRecipientsRaw.length}, epoch=${epoch}, state_version=${stateCommitment.state_version}`);
         }
         else {
+            this.targetSetCache.delete(cacheKey);
             const bs = await client.call('group.v2.bootstrap', {
                 group_id: groupId,
                 e2ee_wrap_capabilities: v2WrapCapabilities(),
@@ -951,38 +1054,63 @@ export class V2E2EECoordinator {
         if (allDevices.length === 0) {
             throw new E2EEError(`V2 group bootstrap: no devices found for group ${groupId}`);
         }
-        const targets = [];
-        for (const dev of allDevices) {
-            const devAid = String(dev.aid ?? '').trim();
-            const devId = getV2DeviceId(dev);
-            if (devAid === client._aid && devId.present && devId.value === client._deviceId)
-                continue;
-            const role = devAid === client._aid ? 'self_sync' : 'member';
-            const target = await client._v2BuildTargetFromDevice({
-                dev,
-                aid: devAid,
-                deviceId: devId.value,
-                role,
-                defaultKeySource: 'peer_device_prekey',
+        let targetSet = useCache ? this.getTargetSetCache(cacheKey) : undefined;
+        if (targetSet) {
+            targetSet = this.cloneGroupTargetSet(targetSet);
+        }
+        else {
+            const targets = [];
+            for (const dev of allDevices) {
+                const devAid = String(dev.aid ?? '').trim();
+                const devId = getV2DeviceId(dev);
+                if (devAid === client._aid && devId.present && devId.value === client._deviceId)
+                    continue;
+                const role = devAid === client._aid ? 'self_sync' : 'member';
+                const target = await client._v2BuildTargetFromDevice({
+                    dev,
+                    aid: devAid,
+                    deviceId: devId.value,
+                    role,
+                    defaultKeySource: 'peer_device_prekey',
+                });
+                if (target)
+                    targets.push(target);
+            }
+            if (targets.length === 0) {
+                if (usedCachedBootstrap) {
+                    throw new E2EEError(`V2 group: no target devices for group ${groupId}; bootstrap may be stale`, {
+                        code: V2_GROUP_STALE_BOOTSTRAP_CODE,
+                        data: { expected_peer_aids: [] },
+                    });
+                }
+                throw new E2EEError(`V2 group: no target devices for group ${groupId}`);
+            }
+            for (const dev of auditRecipientsRaw) {
+                const target = await client._v2BuildTargetFromDevice({
+                    dev,
+                    aid: String(dev.aid ?? ''),
+                    deviceId: String(dev.device_id ?? ''),
+                    role: 'audit',
+                    defaultKeySource: 'peer_device_prekey',
+                });
+                if (target)
+                    targets.push(target);
+            }
+            targetSet = this.setTargetSetCache(cacheKey, {
+                targets: applyV2WrapPolicyToTargets(targets, wrapPolicy),
             });
-            if (target)
-                targets.push(target);
+            targetSet = this.cloneGroupTargetSet(targetSet);
         }
-        if (targets.length === 0) {
+        if (targetSet.targets.length === 0) {
+            if (usedCachedBootstrap) {
+                throw new E2EEError(`V2 group: no target devices for group ${groupId}; bootstrap may be stale`, {
+                    code: V2_GROUP_STALE_BOOTSTRAP_CODE,
+                    data: { expected_peer_aids: [] },
+                });
+            }
             throw new E2EEError(`V2 group: no target devices for group ${groupId}`);
         }
-        for (const dev of auditRecipientsRaw) {
-            const target = await client._v2BuildTargetFromDevice({
-                dev,
-                aid: String(dev.aid ?? ''),
-                deviceId: String(dev.device_id ?? ''),
-                role: 'audit',
-                defaultKeySource: 'peer_device_prekey',
-            });
-            if (target)
-                targets.push(target);
-        }
-        const envelope = encryptGroupMessage(session.getSenderIdentity(), groupId, epoch, applyV2WrapPolicyToTargets(targets, wrapPolicy), opts.payload, {
+        const envelope = encryptGroupMessage(session.getSenderIdentity(), groupId, epoch, targetSet.targets, opts.payload, {
             messageId: opts.messageId,
             timestamp: opts.timestamp,
             protectedHeaders: opts.protectedHeaders,
@@ -1000,7 +1128,7 @@ export class V2E2EECoordinator {
             extra: {
                 plaintext_payload: opts.payload,
                 epoch,
-                target_count: targets.length,
+                target_count: targetSet.targets.length,
                 audit_count: auditRecipientsRaw.length,
                 state_version: stateCommitment.state_version,
                 use_cache: useCache,
@@ -1026,23 +1154,37 @@ export class V2E2EECoordinator {
             }));
         }
         const decrypted = [];
+        const wireGroupId = String(opts?.wireGroupId ?? groupId ?? '').trim() || gid;
         const cursorParams = opts?.cursorParams ?? {};
         const ownsCursor = opts?.ownsCursor !== false;
         let nextAfterSeq = opts?.explicitAfterSeq ? afterSeq : (afterSeq || client._seqTracker.getContiguousSeq(ns));
         let pageCount = 0;
+        let lastAutoAckSeq = 0;
+        let pendingAckSeq = 0;
         const maxPages = 100;
         while (pageCount < maxPages) {
             pageCount += 1;
-            client._clientLog.debug(`group.v2.pull page request: group=${gid}, page=${pageCount}, after_seq=${nextAfterSeq}, limit=${limit}, ns=${ns}`);
+            const ackUpToSeq = ownsCursor ? pendingAckSeq : 0;
+            client._clientLog.debug(`group.v2.pull page request: group=${gid}, page=${pageCount}, after_seq=${nextAfterSeq}, limit=${limit}, ack_up_to_seq=${ackUpToSeq}, ns=${ns}`);
             const result = await client._callRawV2Rpc('group.v2.pull', {
-                group_id: gid,
+                group_id: wireGroupId,
+                group_aid: gid,
                 after_seq: nextAfterSeq,
                 limit,
                 ...cursorParams,
+                ...(ackUpToSeq > 0 ? { ack_up_to_seq: ackUpToSeq } : {}),
+            });
+            if (ackUpToSeq > 0) {
+                pendingAckSeq = 0;
+                lastAutoAckSeq = Math.max(lastAutoAckSeq, ackUpToSeq);
+            }
+            const pageMessages = (Array.isArray(result.messages) ? result.messages : []);
+            const messages = pageMessages.filter((msg) => {
+                const seq = Number(msg.seq ?? 0);
+                return Number.isFinite(seq) && seq > nextAfterSeq;
             });
-            const messages = (Array.isArray(result.messages) ? result.messages : []);
             const cursor = isJsonObject(result.cursor) ? result.cursor : null;
-            client._clientLog.debug(`group.v2.pull page response: group=${gid}, page=${pageCount}, raw_count=${messages.length}, has_more=${String(result.has_more ?? '')}, cursor_current=${String(cursor?.current_seq ?? '')}`);
+            client._clientLog.debug(`group.v2.pull page response: group=${gid}, page=${pageCount}, raw_count=${messages.length}, stale_count=${Math.max(0, pageMessages.length - messages.length)}, has_more=${String(result.has_more ?? '')}, cursor_current=${String(cursor?.current_seq ?? '')}`);
             for (const msg of messages) {
                 client._logMessageDebug('pull-raw', 'group.v2.pull', 'group.message_created', msg);
             }
@@ -1139,25 +1281,48 @@ export class V2E2EECoordinator {
             const contigAdvanced = ackSeq !== pageContigBefore;
             if (contigAdvanced) {
                 await client._drainOrderedMessages(ns, undefined, true);
-                client._saveSeqTrackerState();
+                client._persistSeq(ns);
             }
-            const ackNeeded = messages.length > 0
+            const ackNeeded = pageMessages.length > 0
                 && ackSeq > 0
+                && ackSeq > lastAutoAckSeq
                 && ownsCursor
                 && (contigAdvanced || (hasServerCursor && ackSeq > cursorCurrentSeq));
             if (ackNeeded) {
-                client._clientLog.debug(`group.v2.pull sending auto-ack: group=${gid}, ns=${ns}, ack_seq=${ackSeq}, raw_count=${messages.length}`);
-                await this.ackGroupV2(gid, ackSeq);
+                const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
+                const canContinuePage = messages.length > 0 && nextAfter > nextAfterSeq && ownsCursor;
+                if (canContinuePage) {
+                    pendingAckSeq = Math.max(pendingAckSeq, ackSeq);
+                    lastAutoAckSeq = Math.max(lastAutoAckSeq, ackSeq);
+                    client._clientLog.debug(`group.v2.pull queued piggyback auto-ack: group=${gid}, ns=${ns}, ack_seq=${pendingAckSeq}, raw_count=${messages.length}`);
+                }
+                else {
+                    client._clientLog.debug(`group.v2.pull sending terminal auto-ack: group=${gid}, ns=${ns}, ack_seq=${ackSeq}, raw_count=${messages.length}`);
+                    await this.ackGroupV2(gid, ackSeq);
+                    lastAutoAckSeq = Math.max(lastAutoAckSeq, ackSeq);
+                }
             }
             const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
             if (!ownsCursor)
                 break;
-            if (messages.length === 0 || nextAfter <= nextAfterSeq || result.has_more === false)
+            const rawCount = messages.length;
+            const canContinuePage = rawCount > 0 && nextAfter > nextAfterSeq;
+            const fullPage = canContinuePage && limit > 0 && rawCount >= limit;
+            const shouldContinue = canContinuePage && (fullPage || pendingAckSeq > 0);
+            if (!shouldContinue)
                 break;
+            const tailDelayMs = v2PullTailDelayMs(rawCount, limit);
+            if (tailDelayMs > 0)
+                await v2Sleep(tailDelayMs);
             nextAfterSeq = nextAfter;
         }
         if (pageCount >= maxPages) {
             client._clientLog.warn(`group.v2.pull reached max_pages=${maxPages} group=${gid} after_seq=${nextAfterSeq}`);
+            if (pendingAckSeq > 0) {
+                client._clientLog.debug(`group.v2.pull flushing pending auto-ack after max_pages: group=${gid}, ns=${ns}, ack_seq=${pendingAckSeq}`);
+                await this.ackGroupV2(gid, pendingAckSeq);
+                pendingAckSeq = 0;
+            }
         }
         client._clientLog.debug(`group.v2.pull done: group=${gid}, requested_after_seq=${afterSeq}, pages=${pageCount}, decrypted=${decrypted.length}, ns=${ns}`);
         return decrypted;
@@ -1175,7 +1340,7 @@ export class V2E2EECoordinator {
         }
         seq = client._clampAckSeq('group.v2.ack', 'up_to_seq', ns, seq);
         client._clientLog.debug(`group.v2.ack send: group=${gid}, ns=${ns}, up_to_seq=${seq}`);
-        const result = await client._callRawV2Rpc('group.v2.ack', { group_id: gid, up_to_seq: seq });
+        const result = await client._callRawV2Rpc('group.v2.ack', { group_id: gid, group_aid: gid, up_to_seq: seq });
         client._clientLog.debug(`group.v2.ack ok: group=${gid}, ns=${ns}, requested=${seq}, result=${client._debugJson(result)}`);
         return result;
     }
@@ -1698,26 +1863,5 @@ export class V2E2EECoordinator {
             this.scheduleGroupSpkRotation(groupId, { reason: `group_changed:${action}` });
         }
     }
-    async handleV2EpochRotated(data) {
-        const client = this.client;
-        if (!data || typeof data !== 'object' || Array.isArray(data))
-            return;
-        const d = data;
-        const groupId = String(d.group_id ?? '').trim();
-        if (!groupId)
-            return;
-        const epoch = d.epoch ?? 0;
-        client._clientLog.debug(`_onV2EpochRotated: group=${groupId} epoch=${String(epoch)}`);
-        this.deleteBootstrapCacheEntry(`group:${groupId}`);
-        if (!client._v2Session)
-            return;
-        try {
-            await client._v2Session.rotateSPK(client._v2CallFn());
-            client._clientLog.info(`SPK rotated after V2 epoch change: group=${groupId} epoch=${String(epoch)}`);
-        }
-        catch (exc) {
-            client._clientLog.debug(`SPK rotation after V2 epoch change failed (non-fatal): ${formatE2EEError(exc)}`);
-        }
-    }
 }
 //# sourceMappingURL=v2-e2ee.js.map