@agentunion/fastaun-browser 0.4.3 → 0.4.4

package/dist/client.js

@@ -52,6 +52,14 @@ function getV2DeviceId(dev) {
     }
     return { present: false, value: '' };
 }
+function isAIDObject(value) {
+    const candidate = value;
+    return Boolean(candidate
+        && typeof candidate === 'object'
+        && typeof candidate.aid === 'string'
+        && typeof candidate.aunPath === 'string'
+        && typeof candidate.isPrivateKeyValid === 'function');
+}
 function sortObjectKeys(obj) {
     if (obj === null || obj === undefined || typeof obj !== 'object')
         return obj;
@@ -169,6 +177,20 @@ const DEFAULT_SESSION_OPTIONS = {
         http: 30.0,
     },
 };
+const PUBLIC_CONNECTION_OPTION_KEYS = new Set([
+    'auto_reconnect',
+    'connect_timeout',
+    'retry_initial_delay',
+    'retry_max_delay',
+    'retry_max_attempts',
+    'heartbeat_interval',
+    'call_timeout',
+    'connection_kind',
+    'short_ttl_ms',
+    'delivery_mode',
+    'extra_info',
+    'background_sync',
+]);
 const PROTECTED_HEADERS_METHODS = new Set([
     'message.send',
     'group.send',
@@ -656,6 +678,7 @@ export class AUNClient {
     // V2 E2EE 状态
     _v2Session;
     _v2KeyStore;
+    _v2SessionInitInFlight = null;
     _v2BootstrapCache = new Map();
     _v2SenderIKPending = new Map();
     _v2SenderIKFetching = new Set();
@@ -732,10 +755,10 @@ export class AUNClient {
     _logDiscovery;
     _logEvents;
     constructor(aid) {
-        const inputAid = (aid !== null && aid !== undefined && typeof aid.aunPath === 'string' && typeof aid.isPrivateKeyValid === 'function') ? aid : null;
-        if (typeof aid === 'string') {
-            throw new ValidationError('AUNClient aid must be an AID object, not a string');
+        if (aid !== null && aid !== undefined && !isAIDObject(aid)) {
+            throw new ValidationError('AUNClient only accepts an AID object or no argument');
         }
+        const inputAid = aid ?? null;
         const rawConfig = {};
         if (inputAid)
             rawConfig.aun_path = inputAid.aunPath;
@@ -761,7 +784,7 @@ export class AUNClient {
         this._clientLog.info(`AUNClient initialized: debug=${_debug} aunPath=${this.configModel.aunPath} aid=${initAid ?? '-'}`);
         this._dispatcher = new EventDispatcher();
         this._discovery = new GatewayDiscovery();
-        this._keystore = new IndexedDBKeyStore({ encryptionSeed: this.configModel.seedPassword ?? undefined });
+        this._keystore = new IndexedDBKeyStore({});
         this._slotId = inputAid?.slotId || 'default';
         this._connectDeliveryMode = normalizeDeliveryModeConfig({ mode: 'fanout' });
         this._defaultConnectDeliveryMode = { ...this._connectDeliveryMode };
@@ -790,7 +813,7 @@ export class AUNClient {
                 this._currentAid = inputAid;
                 this._identity = {
                     aid: inputAid.aid,
-                    private_key_pem: inputAid._privateKeyPem ?? '',
+                    private_key_pem: inputAid.privateKeyPem,
                     public_key_der_b64: inputAid.publicKey,
                     cert: inputAid.certPem,
                 };
@@ -1564,6 +1587,63 @@ export class AUNClient {
     get lastError() { return this._lastError; }
     /** 最近一次错误码（对齐 Python last_error_code） */
     get lastErrorCode() { return this._lastErrorCode; }
+    _applyAidRuntimeContext(aid) {
+        const nextConfig = createConfig({
+            aunPath: aid.aunPath,
+            rootCaPem: aid.rootCaPath,
+            verifySsl: aid.verifySsl,
+        });
+        Object.assign(this.configModel, nextConfig);
+        this.config.aun_path = nextConfig.aunPath;
+        this.config.root_ca_path = nextConfig.rootCaPem;
+        this.config.seed_password = nextConfig.seedPassword;
+        this._agentMdPath = this._agentMdDefaultRoot();
+        this._agentMdCache.clear();
+        this._agentMdFetchInflight.clear();
+        this._peerCache.clear();
+        this._certCache.clear();
+        this._gatewayUrl = null;
+        this._deviceId = aid.deviceId || getDeviceId();
+        this._slotId = aid.slotId || 'default';
+        this._logger = new AUNLogger({ debug: aid.debug, aunPath: nextConfig.aunPath });
+        this._logger.bindDeviceId(this._deviceId);
+        this._clientLog = this._logger.for('aun_core.client');
+        this._logAuth = this._logger.for('aun_core.auth');
+        this._logTransport = this._logger.for('aun_core.transport');
+        this._logKeystore = this._logger.for('aun_core.keystore');
+        this._logDiscovery = this._logger.for('aun_core.discovery');
+        this._logEvents = this._logger.for('aun_core.events');
+        this._discovery = new GatewayDiscovery();
+        this._keystore = new IndexedDBKeyStore({});
+        this._auth = new AuthFlow({
+            keystore: this._keystore,
+            crypto: new CryptoProvider(),
+            aid: aid.aid,
+            deviceId: this._deviceId,
+            slotId: this._slotId,
+            rootCaPem: nextConfig.rootCaPem,
+            verifySsl: nextConfig.verifySsl,
+        });
+        this._transport = new RPCTransport({
+            eventDispatcher: this._dispatcher,
+            timeout: DEFAULT_SESSION_OPTIONS.timeouts.call,
+            onDisconnect: (error, closeCode) => this._handleTransportDisconnect(error, closeCode),
+        });
+        this._transport.setMetaObserver((meta) => {
+            void this._observeRpcMeta(meta).catch((exc) => {
+                this._clientLog.debug(`agent.md meta observer skipped: ${String(exc)}`);
+            });
+        });
+        this._auth.setLogger(this._logAuth);
+        this._transport.setLogger(this._logTransport);
+        this._dispatcher.setLogger(this._logEvents);
+        if (typeof this._discovery.setLogger === 'function') {
+            this._discovery.setLogger(this._logDiscovery);
+        }
+        if (typeof this._keystore.setLogger === 'function') {
+            this._keystore.setLogger(this._logKeystore);
+        }
+    }
     loadIdentity(aid) {
         if (!aid?.isPrivateKeyValid())
             throw new StateError('loadIdentity requires an AID with a valid private key');
@@ -1571,16 +1651,15 @@ export class AUNClient {
         if (publicState !== ConnectionState.NO_IDENTITY && publicState !== ConnectionState.CLOSED) {
             throw new StateError(`loadIdentity not allowed in state ${publicState}`);
         }
+        this._applyAidRuntimeContext(aid);
         this._currentAid = aid;
         this._aid = aid.aid;
         this._identity = {
             aid: aid.aid,
-            private_key_pem: aid._privateKeyPem ?? '',
+            private_key_pem: aid.privateKeyPem,
             public_key_der_b64: aid.publicKey,
             cert: aid.certPem,
         };
-        this._auth._aid = aid.aid;
-        this._slotId = aid.slotId || 'default';
         this._state = 'disconnected';
         this._closing = false;
     }
@@ -1632,9 +1711,6 @@ export class AUNClient {
     get gatewayUrl() {
         return this._gatewayUrl;
     }
-    set gatewayUrl(url) {
-        this._gatewayUrl = url;
-    }
     get discovery() {
         return this._discovery;
     }
@@ -1676,10 +1752,11 @@ export class AUNClient {
     /** 连接到 Gateway；身份来自构造函数或 loadIdentity(aid)，认证由 SDK 内部自动完成。 */
     async connect(opts) {
         const tStart = Date.now();
-        if (opts !== undefined && typeof opts === 'object') {
+        if (opts !== undefined && opts !== null && typeof opts === 'object') {
             const raw = opts;
-            if ('access_token' in raw || 'aid' in raw || 'token' in raw) {
-                throw new ValidationError('connect options must not include access_token/aid; these are managed internally');
+            const invalid = Object.keys(raw).filter((key) => !PUBLIC_CONNECTION_OPTION_KEYS.has(key)).sort();
+            if (invalid.length > 0) {
+                throw new ValidationError(`connect options contain unsupported field(s): ${invalid.join(', ')}`);
             }
         }
         const target = this._currentAid?.aid ?? this._aid ?? '';
@@ -1855,6 +1932,14 @@ export class AUNClient {
         }
         this._validateOutboundCall(method, p);
         this._injectMessageCursorContext(method, p);
+        if (method.startsWith('group.')
+            && !('_group_cursor_params' in p)
+            && !Boolean(p._pull_gate_locked)) {
+            const explicitCursorParams = this._groupCursorParams(p);
+            if (Object.keys(explicitCursorParams).length > 0) {
+                p._group_cursor_params = explicitCursorParams;
+            }
+        }
         // group.* 方法的 group_id 归一化为 canonical 格式（兼容老/污染数据）
         if (method.startsWith('group.') && p.group_id !== undefined && p.group_id !== null) {
             const rawGroupId = String(p.group_id);
@@ -1876,9 +1961,7 @@ export class AUNClient {
             const encrypt = p.encrypt !== undefined ? p.encrypt : true;
             delete p.encrypt;
             if (encrypt) {
-                if (!this._v2Session) {
-                    throw new StateError('V2 session not initialized; encrypted message.send requires V2 (V1 E2EE removed)');
-                }
+                await this._ensureV2SessionReady('message.send', 'V2 session not initialized; encrypted message.send requires V2 (V1 E2EE removed)');
                 this._clientLog.debug('call route: message.send → V2 encrypted send');
                 return await this._sendV2(String(p.to ?? ''), p.payload ?? {}, {
                     messageId: String(p.message_id ?? '') || undefined,
@@ -1895,9 +1978,7 @@ export class AUNClient {
             const encrypt = p.encrypt !== undefined ? p.encrypt : true;
             delete p.encrypt;
             if (encrypt) {
-                if (!this._v2Session) {
-                    throw new StateError('V2 session not initialized; encrypted group.send requires V2 (V1 E2EE removed)');
-                }
+                await this._ensureV2SessionReady('group.send', 'V2 session not initialized; encrypted group.send requires V2 (V1 E2EE removed)');
                 this._clientLog.debug('call route: group.send → V2 encrypted send');
                 return await this._sendGroupV2(String(p.group_id ?? ''), p.payload ?? {}, {
                     messageId: String(p.message_id ?? '') || undefined,
@@ -1912,9 +1993,7 @@ export class AUNClient {
             const encrypt = p.encrypt !== undefined ? p.encrypt : true;
             delete p.encrypt;
             if (encrypt) {
-                if (!this._v2Session) {
-                    throw new StateError('V2 session not initialized; encrypted group.thought.put requires V2 (V1 E2EE removed)');
-                }
+                await this._ensureV2SessionReady('group.thought.put', 'V2 session not initialized; encrypted group.thought.put requires V2 (V1 E2EE removed)');
                 this._clientLog.debug('call route: group.thought.put → V2 encrypted put');
                 return this._putGroupThoughtEncryptedV2(p);
             }
@@ -1923,9 +2002,7 @@ export class AUNClient {
             const encrypt = p.encrypt !== undefined ? p.encrypt : true;
             delete p.encrypt;
             if (encrypt) {
-                if (!this._v2Session) {
-                    throw new StateError('V2 session not initialized; encrypted message.thought.put requires V2 (V1 E2EE removed)');
-                }
+                await this._ensureV2SessionReady('message.thought.put', 'V2 session not initialized; encrypted message.thought.put requires V2 (V1 E2EE removed)');
                 this._clientLog.debug('call route: message.thought.put → V2 encrypted put');
                 return this._putMessageThoughtEncryptedV2(p);
             }
@@ -1944,26 +2021,45 @@ export class AUNClient {
      * 拆分出来以便 pull gate 包裹整个操作。
      */
     async _callImplInner(method, p) {
-        // message.pull：V2 就绪时走 V2 pull
-        if (method === 'message.pull' && this._v2Session) {
+        // message.pull：V2-only，按需初始化后走 V2 pull
+        if (method === 'message.pull') {
+            await this._ensureV2SessionReady('message.pull');
             this._clientLog.debug('call route: message.pull → V2 pull');
             const messages = await this._pullV2(Number(p.after_seq ?? 0) || 0, Number(p.limit ?? 50) || 50, { force: p.force === true });
             return { messages };
         }
-        // message.ack：V2 就绪时走 V2 ack
-        if (method === 'message.ack' && this._v2Session) {
+        // message.ack：V2-only，按需初始化后走 V2 ack
+        if (method === 'message.ack') {
+            await this._ensureV2SessionReady('message.ack');
             this._clientLog.debug('call route: message.ack → V2 ack');
             return await this._ackV2(Number(p.seq ?? p.up_to_seq ?? 0) || undefined);
         }
-        // group.pull：V2 就绪时走 V2 pull
-        if (method === 'group.pull' && this._v2Session && p.group_id) {
+        // group.pull：V2-only，按需初始化后走 V2 pull
+        if (method === 'group.pull' && p.group_id) {
+            await this._ensureV2SessionReady('group.pull');
             this._clientLog.debug('call route: group.pull → V2 pull');
-            const messages = await this._pullGroupV2(String(p.group_id), Number(p.after_seq ?? p.after_message_seq ?? 0) || 0, Number(p.limit ?? 50) || 50);
+            const hasExplicitAfterSeq = 'after_seq' in p || 'after_message_seq' in p;
+            const cursorParams = this._explicitGroupCursorParams(p);
+            const ownsCursor = Object.keys(cursorParams).length === 0 || this._groupCursorTargetsCurrentInstance(cursorParams);
+            const pullOpts = {};
+            if (hasExplicitAfterSeq)
+                pullOpts.explicitAfterSeq = true;
+            if (Object.keys(cursorParams).length > 0)
+                pullOpts.cursorParams = cursorParams;
+            if (!ownsCursor)
+                pullOpts.ownsCursor = false;
+            const messages = await this._pullGroupV2(String(p.group_id), Number(p.after_seq ?? p.after_message_seq ?? 0) || 0, Number(p.limit ?? 50) || 50, Object.keys(pullOpts).length > 0 ? pullOpts : undefined);
             return { messages };
         }
-        // group.ack_messages：V2 就绪时走 V2 ack
-        if (method === 'group.ack_messages' && this._v2Session && p.group_id) {
+        // group.ack_messages：V2-only，按需初始化后走 V2 ack
+        if (method === 'group.ack_messages' && p.group_id) {
+            await this._ensureV2SessionReady('group.ack_messages');
             this._clientLog.debug('call route: group.ack_messages → V2 ack');
+            const cursorParams = this._explicitGroupCursorParams(p);
+            const ownsCursor = Object.keys(cursorParams).length === 0 || this._groupCursorTargetsCurrentInstance(cursorParams);
+            if (!ownsCursor) {
+                return await this._rawGroupAckMessages(p);
+            }
             return await this._ackGroupV2(String(p.group_id), Number(p.seq ?? p.msg_seq ?? p.up_to_seq ?? 0) || undefined);
         }
         // 关键操作自动附加客户端签名
@@ -2070,6 +2166,7 @@ export class AUNClient {
         delete p._pull_gate_locked;
         delete p._skip_auto_ack;
         delete p.skip_auto_ack;
+        delete p._group_cursor_params;
         if (method.startsWith('group.') && p.group_id !== undefined && p.group_id !== null) {
             p.group_id = normalizeGroupId(String(p.group_id)) || String(p.group_id);
         }
@@ -2433,6 +2530,9 @@ export class AUNClient {
         // 状态保护：非 connected 或正在关闭时跳过（与 Python 对齐）
         if (this._state !== 'connected' || this._closing)
             return;
+        groupId = normalizeGroupId(groupId) || String(groupId ?? '').trim();
+        if (!groupId)
+            return;
         const ns = `group:${groupId}`;
         const afterSeq = this._seqTracker.getContiguousSeq(ns);
         // per-namespace 去重：同一 group namespace 只允许 1 个 in-flight pull
@@ -2441,45 +2541,11 @@ export class AUNClient {
             return;
         this._gapFillDone.add(dedupKey);
         this._gapFillActive = true;
+        let filled = 0;
         try {
-            const result = await this.call('group.pull', {
-                group_id: groupId,
-                after_message_seq: afterSeq,
-                device_id: this._deviceId,
-                limit: 50,
-            });
-            if (isJsonObject(result)) {
-                const messages = result.messages;
-                if (Array.isArray(messages)) {
-                    // ⚠️ 不再重复调用 onPullResult：call('group.pull') 拦截器已在内部调用过一次
-                    const pushed = this._pushedSeqs.get(ns);
-                    for (const msg of messages) {
-                        if (isJsonObject(msg)) {
-                            const s = msg.seq;
-                            if (pushed && s !== undefined && s !== null && pushed.has(s))
-                                continue;
-                            if (s !== undefined && s !== null) {
-                                await this._publishPulledMessage('group.message_created', ns, s, msg);
-                            }
-                            else {
-                                await this._publishAppEvent('group.message_created', msg);
-                            }
-                        }
-                    }
-                    this._prunePushedSeqs(ns);
-                    // publish 完成后 auto-ack
-                    const contig = this._seqTracker.getContiguousSeq(ns);
-                    if (contig > 0) {
-                        const gid = groupId;
-                        this._transport.call('group.ack_messages', {
-                            group_id: gid,
-                            msg_seq: contig,
-                            device_id: this._deviceId,
-                            slot_id: this._slotId,
-                        }).catch((e) => { this._clientLog.warn(`group gap-fill auto-ack failed: group=${gid}`, e); });
-                    }
-                }
-            }
+            const messages = await this._pullGroupV2(groupId, afterSeq, 50);
+            filled = messages.length;
+            this._prunePushedSeqs(ns);
         }
         catch (exc) {
             this._clientLog.warn(`group message gap-fill failed:${String(exc)}`);
@@ -2488,6 +2554,9 @@ export class AUNClient {
             // S1: 成功 / 失败路径都必须清理飞行标记
             this._gapFillDone.delete(dedupKey);
             this._gapFillActive = false;
+            if (filled > 0 && this._seqTracker.getContiguousSeq(ns) > afterSeq) {
+                this._safeAsync(this._fillGroupGap(groupId));
+            }
         }
     }
     /** 后台补齐群事件空洞 */
@@ -2604,42 +2673,11 @@ export class AUNClient {
             return;
         this._gapFillDone.add(dedupKey);
         this._gapFillActive = true;
+        let filled = 0;
         try {
-            const result = await this.call('message.pull', {
-                after_seq: afterSeq,
-                limit: 50,
-            });
-            if (isJsonObject(result)) {
-                const messages = result.messages;
-                if (Array.isArray(messages)) {
-                    // ⚠️ 不再重复调用 onPullResult：call('message.pull') 拦截器已在内部调用过一次
-                    // 与 _fillGroupGap 路径对齐，避免双重 tracker 推进。
-                    const pushed = this._pushedSeqs.get(ns);
-                    for (const msg of messages) {
-                        if (isJsonObject(msg)) {
-                            const s = msg.seq;
-                            if (pushed && s !== undefined && s !== null && pushed.has(s))
-                                continue;
-                            if (s !== undefined && s !== null) {
-                                await this._publishPulledMessage('message.received', ns, s, msg);
-                            }
-                            else {
-                                await this._publishAppEvent('message.received', msg);
-                            }
-                        }
-                    }
-                    this._prunePushedSeqs(ns);
-                    // publish 完成后 auto-ack
-                    const contig = this._seqTracker.getContiguousSeq(ns);
-                    if (contig > 0) {
-                        this._transport.call('message.ack', {
-                            seq: contig,
-                            device_id: this._deviceId,
-                            slot_id: this._slotId,
-                        }).catch((e) => { this._clientLog.warn(`P2P gap-fill auto-ack failed:${String(e)}`); });
-                    }
-                }
-            }
+            const messages = await this._pullV2(afterSeq, 50);
+            filled = messages.length;
+            this._prunePushedSeqs(ns);
         }
         catch (exc) {
             this._clientLog.warn(`P2P message gap-fill failed:${String(exc)}`);
@@ -2648,6 +2686,9 @@ export class AUNClient {
             // S1: 成功 / 失败路径都必须清理飞行标记
             this._gapFillDone.delete(dedupKey);
             this._gapFillActive = false;
+            if (filled > 0 && this._seqTracker.getContiguousSeq(ns) > afterSeq) {
+                this._safeAsync(this._fillP2pGap());
+            }
         }
     }
     /** 只按硬上限裁剪 published guard，不能按 contiguousSeq 清理。 */
@@ -3582,11 +3623,11 @@ export class AUNClient {
      * 使用 SubtleCrypto 异步签名。
      */
     async _signClientOperation(method, params) {
-        const identity = this._identity;
-        if (!identity || !identity.private_key_pem)
+        const currentAid = this._currentAid;
+        if (!currentAid?.privateKeyPem)
             return;
         try {
-            const aid = (identity.aid ?? '');
+            const aid = currentAid.aid;
             const ts = String(Math.floor(Date.now() / 1000));
             // 计算 params hash：覆盖所有非 _ 前缀且非 client_signature 的业务字段
             const paramsForHash = {};
@@ -3603,14 +3644,14 @@ export class AUNClient {
                 .join('');
             const signData = new TextEncoder().encode(`${method}|${aid}|${ts}|${paramsHash}`);
             // 导入私钥并签名
-            const pkcs8 = pemToArrayBuffer(identity.private_key_pem);
+            const pkcs8 = pemToArrayBuffer(currentAid.privateKeyPem);
             const cryptoKey = await crypto.subtle.importKey('pkcs8', pkcs8, { name: 'ECDSA', namedCurve: 'P-256' }, false, ['sign']);
             const sigP1363 = await crypto.subtle.sign({ name: 'ECDSA', hash: 'SHA-256' }, cryptoKey, signData);
             // P1363 → DER 格式（与 Python 兼容）
             const sigDer = p1363ToDer(new Uint8Array(sigP1363));
             // 证书指纹
             let certFingerprint = '';
-            const certPem = (identity.cert ?? '');
+            const certPem = currentAid.certPem;
             if (certPem) {
                 const certDer = pemToArrayBuffer(certPem);
                 const fpBuf = await crypto.subtle.digest('SHA-256', certDer);
@@ -3706,15 +3747,25 @@ export class AUNClient {
                 await this._restoreSeqTrackerState();
             }
             this._startBackgroundTasks();
-            // V2 E2EE: 初始化 session 并注册设备 SPK（与 Python `_init_v2_session` 对齐）
-            try {
-                await this._initV2Session();
+            const connectionKind = String(params.connection_kind ?? 'long');
+            const isShortConnection = connectionKind === 'short';
+            if (!isShortConnection) {
+                // V2 E2EE: 长连接上线时初始化 session 并注册设备 SPK（与 Python `_init_v2_session` 对齐）
+                try {
+                    await this._initV2Session();
+                }
+                catch (exc) {
+                    this._clientLog.warn(`V2 session init failed (non-fatal): ${String(exc)}`);
+                }
             }
-            catch (exc) {
-                this._clientLog.warn(`V2 session init failed (non-fatal): ${String(exc)}`);
+            else {
+                this._clientLog.debug('V2 session init deferred for short connection');
             }
             // connect/reconnect 成功后自动触发一次 P2P message.pull，补齐离线期间积压
-            if (this._sessionOptions?.background_sync !== false) {
+            const hasExplicitBackgroundSync = Object.prototype.hasOwnProperty.call(params, 'background_sync');
+            const backgroundSyncEnabled = this._sessionOptions?.background_sync !== false
+                && (!isShortConnection || hasExplicitBackgroundSync);
+            if (backgroundSyncEnabled) {
                 this._safeAsync(this._fillP2pGap());
             }
             this._clientLog.debug(`_connectOnce exit: elapsed=${Date.now() - tStart}ms aid=${this._aid ?? '-'}`);
@@ -4660,6 +4711,20 @@ export class AUNClient {
         this._clientLog.warn(`${label} push repaired contiguous_seq: ns=${ns} payload=${hasPayload} push_seq=${pushSeq} contiguous=${contig}->${repaired}`);
         return repaired;
     }
+    async _ensureV2SessionReady(method, errorMessage) {
+        if (!this._v2Session) {
+            if (!this._v2SessionInitInFlight) {
+                this._v2SessionInitInFlight = this._initV2Session()
+                    .finally(() => {
+                    this._v2SessionInitInFlight = null;
+                });
+            }
+            await this._v2SessionInitInFlight;
+        }
+        if (!this._v2Session) {
+            throw new StateError(errorMessage ?? `V2 session not initialized; encrypted ${method} requires E2EE V2`);
+        }
+    }
     // ── V2 E2EE API（async，与 Python `client.py` `_init_v2_session` / `send_v2` / `pull_v2` / `ack_v2` 对齐） ──
     /**
      * 初始化 V2 session：从 AID PEM 私钥提取 raw scalar + DER 公钥，
@@ -4670,35 +4735,16 @@ export class AUNClient {
     async _initV2Session() {
         if (!this._aid)
             return;
-        let identity = this._identity;
-        if (!identity?.private_key_pem) {
-            // fallback：缓存的 identity 可能被 instance_state 污染，重新从 keystore 加载
-            try {
-                const reloaded = await this._keystore.loadIdentity(this._aid);
-                if (reloaded?.private_key_pem) {
-                    this._identity = reloaded;
-                    identity = reloaded;
-                    this._clientLog.warn('V2 session init: identity cache was stale, reloaded from keystore');
-                    // 自愈：重新持久化，清理 instance_state 中的脏数据
-                    try {
-                        const persistIdentity = this._auth._persistIdentity;
-                        if (typeof persistIdentity === 'function') {
-                            await persistIdentity.call(this._auth, reloaded);
-                        }
-                    }
-                    catch { /* best-effort */ }
-                }
-            }
-            catch { /* ignore */ }
-        }
-        if (!identity?.private_key_pem) {
+        // 私钥由 AIDStore 管理，直接从 _currentAid 读取明文私钥
+        const currentAid = this._currentAid;
+        if (!currentAid?.privateKeyPem) {
             this._clientLog.warn('V2 session init skipped: no AID private key');
             return;
         }
         if (this._v2Session)
             return;
         // 1. PEM → DER PKCS8（去掉 header/footer 后 base64 解码）
-        const pem = String(identity.private_key_pem).trim();
+        const pem = currentAid.privateKeyPem.trim();
         const pemBody = pem
             .replace(/-----BEGIN [^-]+-----/g, '')
             .replace(/-----END [^-]+-----/g, '')
@@ -5096,6 +5142,7 @@ export class AUNClient {
                     decrypted.push(plaintext);
                 }
             }
+            const hasServerAckSeq = Object.prototype.hasOwnProperty.call(result, 'server_ack_seq');
             const serverAckSeq = Number(result.server_ack_seq ?? 0);
             if (ns && Number.isFinite(serverAckSeq) && serverAckSeq > 0) {
                 const contig = this._seqTracker.getContiguousSeq(ns);
@@ -5111,7 +5158,10 @@ export class AUNClient {
                     await this._drainOrderedMessages(ns);
                     this._saveSeqTrackerState();
                 }
-                if (messages.length > 0 && contigAdvanced && ackSeq > 0) {
+                const ackNeeded = messages.length > 0
+                    && ackSeq > 0
+                    && (contigAdvanced || (hasServerAckSeq && ackSeq > serverAckSeq));
+                if (ackNeeded) {
                     this._safeAsync(this._ackV2(ackSeq).then(() => undefined));
                 }
             }
@@ -5143,7 +5193,7 @@ export class AUNClient {
                 seq = maxSeen;
             }
         }
-        const raw = await this.call('message.v2.ack', { up_to_seq: seq });
+        const raw = await this._callRawV2Rpc('message.v2.ack', { up_to_seq: seq });
         const result = isJsonObject(raw)
             ? { ...raw }
             : { result: raw };
@@ -5435,7 +5485,7 @@ export class AUNClient {
      * @param afterSeq 从此 seq 之后开始拉取（0/省略 = 从当前 contiguous 开始）
      * @param limit 最多拉取条数
      */
-    async _pullGroupV2(groupId, afterSeq = 0, limit = 50) {
+    async _pullGroupV2(groupId, afterSeq = 0, limit = 50, opts) {
         if (!this._v2Session) {
             throw new StateError('V2 session not initialized (not connected?)');
         }
@@ -5444,15 +5494,18 @@ export class AUNClient {
             throw new ValidationError('group.pull requires group_id');
         const ns = `group:${gid}`;
         const decrypted = [];
-        let nextAfterSeq = afterSeq || this._seqTracker.getContiguousSeq(ns);
+        const cursorParams = opts?.cursorParams ?? {};
+        const ownsCursor = opts?.ownsCursor !== false;
+        let nextAfterSeq = opts?.explicitAfterSeq ? afterSeq : (afterSeq || this._seqTracker.getContiguousSeq(ns));
         let pageCount = 0;
         const maxPages = 100;
         while (pageCount < maxPages) {
             pageCount += 1;
-            const result = await this.call('group.v2.pull', {
+            const result = await this._callRawV2Rpc('group.v2.pull', {
                 group_id: gid,
                 after_seq: nextAfterSeq,
                 limit,
+                ...cursorParams,
             });
             const messages = (Array.isArray(result?.messages) ? result.messages : []);
             const seqs = messages
@@ -5519,6 +5572,7 @@ export class AUNClient {
                 decrypted.push(plaintext);
             }
             const cursor = isJsonObject(result.cursor) ? result.cursor : null;
+            const hasServerCursor = cursor !== null && Object.prototype.hasOwnProperty.call(cursor, 'current_seq');
             const serverAckSeq = Number(cursor?.current_seq ?? 0);
             if (Number.isFinite(serverAckSeq) && serverAckSeq > 0) {
                 const contig = this._seqTracker.getContiguousSeq(ns);
@@ -5533,10 +5587,16 @@ export class AUNClient {
                 await this._drainOrderedMessages(ns);
                 this._saveSeqTrackerState();
             }
-            if (messages.length > 0 && contigAdvanced && ackSeq > 0) {
+            const ackNeeded = messages.length > 0
+                && ackSeq > 0
+                && ownsCursor
+                && (contigAdvanced || (hasServerCursor && ackSeq > serverAckSeq));
+            if (ackNeeded) {
                 this._safeAsync(this._ackGroupV2(gid, ackSeq).then(() => undefined));
             }
             const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
+            if (!ownsCursor)
+                break;
             if (messages.length === 0 || nextAfter <= nextAfterSeq || result.has_more === false)
                 break;
             nextAfterSeq = nextAfter;
@@ -5546,6 +5606,31 @@ export class AUNClient {
         }
         return decrypted;
     }
+    _groupCursorParams(params) {
+        const cursorParams = {};
+        for (const key of ['device_id', 'slot_id', 'device_name', 'device_type']) {
+            const value = params[key];
+            if (value !== undefined && value !== null)
+                cursorParams[key] = value;
+        }
+        return cursorParams;
+    }
+    _explicitGroupCursorParams(params) {
+        const value = params._group_cursor_params;
+        if (!isJsonObject(value))
+            return {};
+        return { ...value };
+    }
+    _groupCursorTargetsCurrentInstance(params) {
+        const deviceId = String(params.device_id ?? '').trim();
+        const slotId = String(params.slot_id ?? '').trim();
+        return (!deviceId || deviceId === (this._deviceId ?? ''))
+            && (!slotId || slotId === (this._slotId ?? ''));
+    }
+    async _rawGroupAckMessages(params) {
+        const p = { ...params };
+        return await this._callRawV2Rpc('group.ack_messages', p);
+    }
     /**
      * 确认 V2 群消息已消费。
      *
@@ -5566,7 +5651,7 @@ export class AUNClient {
             this._clientLog.warn(`ackGroupV2 clamp: group=${gid} up_to_seq=${seq} > max_seen=${maxSeen}, clamp`);
             seq = maxSeen;
         }
-        return this.call('group.v2.ack', { group_id: gid, up_to_seq: seq });
+        return this._callRawV2Rpc('group.v2.ack', { group_id: gid, up_to_seq: seq });
     }
     // ── V2 thought（per-device wrap，服务端透传，不持久化）──────────
     /**
@@ -6387,8 +6472,8 @@ export class AUNClient {
                 return;
             }
             let signature = '';
-            const identity = this._identity;
-            if (identity?.private_key_pem) {
+            const currentAid = this._currentAid;
+            if (currentAid?.privateKeyPem) {
                 try {
                     const signPayloadObj = {
                         group_id: groupId,
@@ -6398,7 +6483,7 @@ export class AUNClient {
                     };
                     const signPayload = stableStringify(signPayloadObj);
                     const signPayloadBytes = new TextEncoder().encode(signPayload);
-                    const privKey = await importPrivateKeyEcdsa(identity.private_key_pem);
+                    const privKey = await importPrivateKeyEcdsa(currentAid.privateKeyPem);
                     const sigBytes = await ecdsaSignDer(privKey, signPayloadBytes);
                     signature = uint8ToBase64(sigBytes);
                 }
@@ -6594,7 +6679,7 @@ export class AUNClient {
                     if (newContig > 0 && newContig !== contigBefore) {
                         const maxSeen = this._seqTracker.getMaxSeenSeq(ns);
                         const ackSeq = maxSeen > 0 ? Math.min(newContig, maxSeen) : newContig;
-                        this.call('message.v2.ack', { up_to_seq: ackSeq })
+                        this._callRawV2Rpc('message.v2.ack', { up_to_seq: ackSeq })
                             .catch(e => this._clientLog.debug(`V2 P2P push-ack failed: ${e}`));
                     }
                     this._clientLog.debug(`_onV2PushNotification: push 带 payload 解密成功, contiguous_seq=${contigBefore}->${newContig} push_seq=${pushSeq}`);