@agentunion/fastaun-browser 0.4.13 → 0.5.1

package/dist/client/rpc-pipeline.js

@@ -1,8 +1,9 @@
 import { normalizeSlotId, slotIsolationKey } from '../config.js';
 import { ClientSignatureError, ConnectionError, PermissionError, StateError, ValidationError } from '../errors.js';
 import { normalizeGroupId } from '../group-id.js';
+import { validateAIDFormat, validateGroupIDFormat } from '../validators.js';
 import { p1363ToDer, pemToArrayBuffer, uint8ToBase64 } from '../crypto.js';
-import { isJsonObject, } from '../types.js';
+import { ConnectionState, isJsonObject, } from '../types.js';
 const INTERNAL_ONLY_METHODS = new Set([
     'auth.login1',
     'auth.aid_login1',
@@ -12,9 +13,6 @@ const INTERNAL_ONLY_METHODS = new Set([
     'auth.refresh_token',
     'initialize',
 ]);
-const REMOVED_E2EE_METHODS = new Set([
-    'group.rotate_epoch',
-]);
 const PROTECTED_HEADERS_METHODS = new Set([
     'message.send',
     'group.send',
@@ -32,40 +30,101 @@ const SIGNED_METHODS = new Set([
     'group.v2.propose_state', 'group.v2.confirm_state',
     'group.v2.get_proposal',
     'group.kick', 'group.add_member',
-    'group.leave', 'group.remove_member', 'group.update_rules',
-    'group.update', 'group.update_announcement',
-    'group.update_join_requirements', 'group.set_role',
-    'group.transfer_owner', 'group.review_join_request',
+    'group.leave', 'group.remove_member',
+    'group.update',
+    'group.set_role',
+    'group.transfer_owner', 'group.bind_group_aid', 'group.renew_group_aid', 'group.complete_transfer',
+    'group.review_join_request',
     'group.batch_review_join_request',
     'group.request_join', 'group.use_invite_code',
     'group.thought.put',
     'message.thought.put',
     'group.set_settings',
-    'group.resources.put', 'group.resources.create_folder',
-    'group.resources.rename', 'group.resources.move',
-    'group.resources.mount_object', 'group.resources.update',
-    'group.resources.delete', 'group.resources.cleanup_by_storage_ref',
-    'group.resources.request_add', 'group.resources.request_mount_object',
-    'group.resources.direct_add', 'group.resources.approve_request',
-    'group.resources.reject_request', 'group.resources.unmount',
-    'group.resources.get_access', 'group.resources.resolve_access_ticket',
+    'group.update_announcement',
+    'group.update_rules',
+    'group.fs.mkdir', 'group.fs.rm', 'group.fs.cp', 'group.fs.mv',
+    'group.fs.set_acl', 'group.fs.remove_acl',
+    'group.fs.mount', 'group.fs.umount',
+    'group.fs.check_upload', 'group.fs.create_upload_session',
+    'group.fs.complete_upload', 'group.fs.create_download_ticket',
     'storage.put_object', 'storage.delete_object', 'storage.get_by_share',
     'storage.create_share_link', 'storage.revoke_share_link',
     'storage.create_upload_session', 'storage.complete_upload',
     'storage.create_folder', 'storage.rename_folder', 'storage.move_folder',
     'storage.delete_folder', 'storage.move_object', 'storage.copy_object',
     'storage.batch_delete', 'storage.set_object_meta', 'storage.append_object',
+    'storage.set_acl', 'storage.remove_acl', 'storage.set_visibility',
+    'storage.check_access',
+    'storage.issue_token', 'storage.revoke_token',
+    'storage.create_symlink', 'storage.atomic_repoint',
+    'storage.rename_symlink', 'storage.delete_symlink',
+    'storage.fs.mkdir', 'storage.fs.remove', 'storage.fs.rename', 'storage.fs.copy',
+    'storage.fs.mount', 'storage.fs.approve', 'storage.fs.reject', 'storage.fs.unmount',
+    'storage.fs.invalidate_membership',
+    'storage.volume.create', 'storage.volume.renew', 'storage.volume.expire_due',
+    'collab.create', 'collab.commit', 'collab.clone',
+    'collab.prune', 'collab.unregister',
+    'collab.tag.create', 'collab.tag.restore',
+    'collab.tag.rm', 'collab.tag.prune',
     'group.commit_state',
     'group.ban', 'group.unban',
     'group.dissolve', 'group.suspend', 'group.resume',
 ]);
+const SIGNING_KEY_CACHE_MAX = 32;
+const signingKeyCache = new Map();
+const certFingerprintCache = new Map();
+function cacheGet(cache, key) {
+    const value = cache.get(key);
+    if (value !== undefined) {
+        cache.delete(key);
+        cache.set(key, value);
+    }
+    return value;
+}
+function cachePut(cache, key, value) {
+    cache.set(key, value);
+    while (cache.size > SIGNING_KEY_CACHE_MAX) {
+        const first = cache.keys().next().value;
+        if (first === undefined)
+            break;
+        cache.delete(first);
+    }
+    return value;
+}
+async function sha256HexText(text) {
+    const digest = await crypto.subtle.digest('SHA-256', new TextEncoder().encode(text));
+    return Array.from(new Uint8Array(digest)).map(b => b.toString(16).padStart(2, '0')).join('');
+}
+async function signingPrivateKey(privateKeyPem) {
+    const key = await sha256HexText(privateKeyPem);
+    let cached = cacheGet(signingKeyCache, key);
+    if (!cached) {
+        const pkcs8 = pemToArrayBuffer(privateKeyPem);
+        cached = crypto.subtle.importKey('pkcs8', pkcs8, { name: 'ECDSA', namedCurve: 'P-256' }, false, ['sign']);
+        cachePut(signingKeyCache, key, cached);
+    }
+    return await cached;
+}
+async function signingCertFingerprint(certPem) {
+    const key = await sha256HexText(certPem);
+    let cached = cacheGet(certFingerprintCache, key);
+    if (!cached) {
+        cached = (async () => {
+            const certDer = pemToArrayBuffer(certPem);
+            const fpBuf = await crypto.subtle.digest('SHA-256', certDer);
+            return 'sha256:' + Array.from(new Uint8Array(fpBuf)).map(b => b.toString(16).padStart(2, '0')).join('');
+        })();
+        cachePut(certFingerprintCache, key, cached);
+    }
+    return await cached;
+}
 const PULL_GATE_STALE_MS = 30000;
 const NON_IDEMPOTENT_TIMEOUT = 35;
 const NON_IDEMPOTENT_METHODS = new Set([
     'message.send', 'group.send', 'group.create', 'group.invite',
     'group.kick', 'group.remove_member', 'group.leave', 'group.dissolve',
-    'group.update_name', 'group.update_avatar', 'group.update_announcement',
-    'group.update_settings',
+    'group.set_settings',
+    'group.update_announcement', 'group.update_rules',
     'storage.put_object', 'storage.delete_object',
     'storage.create_share_link', 'storage.revoke_share_link',
     'storage.get_by_share',
@@ -73,19 +132,39 @@ const NON_IDEMPOTENT_METHODS = new Set([
     'storage.create_folder', 'storage.rename_folder', 'storage.move_folder',
     'storage.delete_folder', 'storage.move_object', 'storage.copy_object',
     'storage.batch_delete', 'storage.set_object_meta', 'storage.append_object',
+    'storage.set_acl', 'storage.remove_acl', 'storage.set_visibility',
+    'storage.issue_token', 'storage.revoke_token',
+    'storage.create_symlink', 'storage.atomic_repoint',
+    'storage.rename_symlink', 'storage.delete_symlink',
+    'storage.fs.mkdir', 'storage.fs.remove', 'storage.fs.rename', 'storage.fs.copy',
+    'storage.fs.mount', 'storage.fs.approve', 'storage.fs.reject', 'storage.fs.unmount',
+    'storage.fs.invalidate_membership',
+    'storage.volume.create', 'storage.volume.renew', 'storage.volume.expire_due',
     'auth.create_aid', 'auth.renew_cert', 'auth.rekey',
     'message.thought.put', 'group.thought.put',
-    'group.add_member',
-    'group.resources.put', 'group.resources.create_folder',
-    'group.resources.rename', 'group.resources.move',
-    'group.resources.mount_object', 'group.resources.update',
-    'group.resources.delete', 'group.resources.cleanup_by_storage_ref',
-    'group.resources.request_add', 'group.resources.request_mount_object',
-    'group.resources.direct_add', 'group.resources.approve_request',
-    'group.resources.reject_request', 'group.resources.unmount',
-    'group.resources.get_access',
-    'group.resources.resolve_access_ticket',
+    'group.add_member', 'group.bind_group_aid', 'group.complete_transfer',
+    'group.fs.mkdir', 'group.fs.rm', 'group.fs.cp', 'group.fs.mv',
+    'group.fs.set_acl', 'group.fs.remove_acl',
+    'group.fs.mount', 'group.fs.umount',
+    'group.fs.check_upload', 'group.fs.create_upload_session',
+    'group.fs.complete_upload', 'group.fs.create_download_ticket',
+    'collab.create', 'collab.commit', 'collab.clone',
+    'collab.prune', 'collab.unregister',
+    'collab.tag.create', 'collab.tag.restore',
+    'collab.tag.rm', 'collab.tag.prune',
 ]);
+function hasMatchingV2Session(client) {
+    const session = client._v2Session;
+    if (!session)
+        return false;
+    if (session.currentIkPubDer === undefined)
+        return true;
+    return session.aid === client._aid && session.deviceId === client._deviceId;
+}
+function isTransientV2PullFallbackError(error) {
+    const text = (error instanceof Error ? error.message : String(error)).toLowerCase();
+    return text.includes('no_service') || text.includes('service plane unavailable');
+}
 export class RpcPipeline {
     runtime;
     constructor(runtime) {
@@ -107,7 +186,14 @@ export class RpcPipeline {
     }
     async callImpl(method, params) {
         const client = this.runtime.client;
-        const p = this.preflight(method, params).params;
+        const preflight = this.preflight(method, params);
+        const p = preflight.params;
+        const rpcBackground = preflight.rpcBackground;
+        const runWithRpcPriority = async (operation) => {
+            if (!rpcBackground)
+                return await operation();
+            return await client._withBackgroundRpc(operation);
+        };
         const skipSendResultEnvelope = Boolean(p._skip_send_result_envelope);
         delete p._skip_send_result_envelope;
         if (method === 'message.send') {
@@ -131,7 +217,7 @@ export class RpcPipeline {
             if (encrypt) {
                 await client._ensureV2SessionReady('group.send', 'V2 session not initialized; encrypted group.send requires V2 (V1 E2EE removed)');
                 client._clientLog.debug('call route: group.send -> V2 encrypted send');
-                return await client._sendGroupV2(String(p.group_id ?? ''), p.payload ?? {}, {
+                return await client._sendGroupV2(String(p.group_aid ?? p.group_id ?? ''), p.payload ?? {}, {
                     messageId: String(p.message_id ?? '') || undefined,
                     timestamp: p.timestamp,
                     protectedHeaders: client._protectedHeadersFromParams(p),
@@ -161,27 +247,35 @@ export class RpcPipeline {
         const pullGateKey = this.pullGateKeyForCall(method, p);
         if (pullGateKey) {
             return await this.runPullSerialized(pullGateKey, async () => {
-                return await this.callImplInner(method, p, skipSendResultEnvelope);
+                return await runWithRpcPriority(() => this.callImplInner(method, p, skipSendResultEnvelope));
             });
         }
-        return await this.callImplInner(method, p, skipSendResultEnvelope);
+        return await runWithRpcPriority(() => this.callImplInner(method, p, skipSendResultEnvelope));
     }
     async callImplInner(method, p, skipSendResultEnvelope = false) {
         const client = this.runtime.client;
-        if (method === 'message.pull') {
-            await client._ensureV2SessionReady('message.pull');
-            client._clientLog.debug('call route: message.pull -> V2 pull');
-            const messages = await client._pullV2(Number(p.after_seq ?? 0) || 0, Number(p.limit ?? 50) || 50, { force: p.force === true });
-            return { messages };
+        if (method === 'message.v2.pull' || (method === 'message.pull' && hasMatchingV2Session(client))) {
+            try {
+                await client._ensureV2SessionReady('message.pull');
+                client._clientLog.debug(`call route: ${method} -> V2 pull`);
+                const messages = await client._pullV2(Number(p.after_seq ?? 0) || 0, Number(p.limit ?? 50) || 50, { force: p.force === true });
+                return { messages };
+            }
+            catch (exc) {
+                if (method !== 'message.pull' || !isTransientV2PullFallbackError(exc)) {
+                    throw exc;
+                }
+                client._clientLog.warn(`message.pull V2 route unavailable, fallback to plain pull: ${exc instanceof Error ? exc.message : String(exc)}`);
+            }
         }
-        if (method === 'message.ack') {
+        if (method === 'message.v2.ack' || (method === 'message.ack' && hasMatchingV2Session(client))) {
             await client._ensureV2SessionReady('message.ack');
-            client._clientLog.debug('call route: message.ack -> V2 ack');
+            client._clientLog.debug(`call route: ${method} -> V2 ack`);
             return await client._ackV2(Number(p.seq ?? p.up_to_seq ?? 0) || undefined);
         }
-        if (method === 'group.pull' && p.group_id) {
+        if ((method === 'group.v2.pull' || method === 'group.pull') && p.group_id && (method === 'group.v2.pull' || hasMatchingV2Session(client))) {
             await client._ensureV2SessionReady('group.pull');
-            client._clientLog.debug('call route: group.pull -> V2 pull');
+            client._clientLog.debug(`call route: ${method} -> V2 pull`);
             const hasExplicitAfterSeq = 'after_seq' in p || 'after_message_seq' in p;
             const cursorParams = client._explicitGroupCursorParams(p);
             const ownsCursor = Object.keys(cursorParams).length === 0 || client._groupCursorTargetsCurrentInstance(cursorParams);
@@ -192,24 +286,27 @@ export class RpcPipeline {
                 pullOpts.cursorParams = cursorParams;
             if (!ownsCursor)
                 pullOpts.ownsCursor = false;
-            const messages = await client._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);
+            if (String(p.group_id ?? '').trim())
+                pullOpts.wireGroupId = String(p.group_id).trim();
+            const messages = await client._pullGroupV2(String(p.group_aid ?? 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 };
         }
-        if (method === 'group.ack_messages' && p.group_id) {
+        if ((method === 'group.v2.ack' || method === 'group.ack_messages') && p.group_id && (method === 'group.v2.ack' || hasMatchingV2Session(client))) {
             await client._ensureV2SessionReady('group.ack_messages');
-            client._clientLog.debug('call route: group.ack_messages -> V2 ack');
+            client._clientLog.debug(`call route: ${method} -> V2 ack`);
             const cursorParams = client._explicitGroupCursorParams(p);
             const ownsCursor = Object.keys(cursorParams).length === 0 || client._groupCursorTargetsCurrentInstance(cursorParams);
             if (!ownsCursor) {
                 return await client._rawGroupAckMessages(p);
             }
-            return await client._ackGroupV2(String(p.group_id), Number(p.seq ?? p.msg_seq ?? p.up_to_seq ?? 0) || undefined);
+            return await client._ackGroupV2(String(p.group_aid ?? p.group_id), Number(p.seq ?? p.msg_seq ?? p.up_to_seq ?? 0) || undefined);
         }
         await this.applyClientSignature(method, p);
         const callTimeout = NON_IDEMPOTENT_METHODS.has(method) ? NON_IDEMPOTENT_TIMEOUT : undefined;
+        const rpcBackground = client._backgroundRpcDepth > 0;
         let result = callTimeout
-            ? await client._transport.call(method, p, callTimeout)
-            : await client._transport.call(method, p);
+            ? await client._transport.call(method, p, callTimeout, undefined, rpcBackground)
+            : await client._transport.call(method, p, undefined, undefined, rpcBackground);
         result = await this.postprocessResult(method, p, result);
         if (!skipSendResultEnvelope) {
             result = client._delivery.attachSendResultEnvelope(method, p, result, Boolean(p.encrypted));
@@ -218,20 +315,20 @@ export class RpcPipeline {
     }
     preflight(method, params) {
         const client = this.runtime.client;
-        if (client._state !== 'connected') {
+        if (client.state !== ConnectionState.READY) {
             throw new ConnectionError('client is not connected');
         }
         if (INTERNAL_ONLY_METHODS.has(method)) {
             throw new PermissionError(`method is internal_only: ${method}`);
         }
-        if (method.startsWith('message.e2ee.') || method.startsWith('group.e2ee.') || REMOVED_E2EE_METHODS.has(method)) {
-            throw new PermissionError(`legacy E2EE method is removed in this SDK: ${method}`);
-        }
         const p = { ...(params ?? {}) };
         this.mergeInstanceProtectedHeaders(method, p);
+        const rpcBackground = Boolean(p._rpc_background) || client._backgroundRpcDepth > 0;
+        delete p._rpc_background;
         if (method === 'message.send' || method === 'group.send') {
             this.normalizeOutboundMessagePayload(p, method);
         }
+        this.normalizeGroupCallIdentifier(method, p);
         this.validateOutboundCall(method, p);
         this.injectMessageCursorContext(method, p);
         this.captureGroupCursorParams(method, p);
@@ -239,7 +336,7 @@ export class RpcPipeline {
         const clampedParams = typeof client._clampAckParams === 'function'
             ? client._clampAckParams(method, p)
             : p;
-        return { params: clampedParams };
+        return { params: clampedParams, rpcBackground };
     }
     mergeInstanceProtectedHeaders(method, params) {
         const client = this.runtime.client;
@@ -264,6 +361,8 @@ export class RpcPipeline {
     validateOutboundCall(method, params) {
         if (method === 'message.send') {
             this.validateMessageRecipient(params.to);
+            // 校验目标 AID 格式（拒绝 __system__ 等非法格式）
+            validateAIDFormat(params.to, 'message.send.to');
             if ('persist' in params) {
                 throw new ValidationError("message.send no longer accepts 'persist'; configure delivery_mode during connect");
             }
@@ -272,6 +371,8 @@ export class RpcPipeline {
             }
         }
         if (method === 'group.send') {
+            // 校验目标 Group ID 格式
+            validateGroupIDFormat(params.group_id, 'group.send.group_id');
             if ('persist' in params) {
                 throw new ValidationError("group.send does not accept 'persist'; group messages are always fanout");
             }
@@ -289,17 +390,33 @@ export class RpcPipeline {
                 throw new ValidationError(`${method} requires context.type + context.id`);
             }
         }
-        if (method === 'group.thought.get' && !String(params.sender_aid ?? '').trim()) {
-            throw new ValidationError('group.thought.get requires sender_aid');
+        if (method === 'group.thought.put') {
+            // 校验目标 Group ID 格式
+            validateGroupIDFormat(params.group_id, 'group.thought.put.group_id');
+        }
+        if (method === 'group.thought.get') {
+            if (!String(params.sender_aid ?? '').trim()) {
+                throw new ValidationError('group.thought.get requires sender_aid');
+            }
+            // 校验 sender_aid 格式
+            validateAIDFormat(params.sender_aid, 'group.thought.get.sender_aid');
+            // 校验目标 Group ID 格式
+            validateGroupIDFormat(params.group_id, 'group.thought.get.group_id');
         }
         if (method === 'message.thought.put') {
             this.validateMessageRecipient(params.to);
             if (!String(params.to ?? '').trim()) {
                 throw new ValidationError('message.thought.put requires to');
             }
+            // 校验目标 AID 格式
+            validateAIDFormat(params.to, 'message.thought.put.to');
         }
-        if (method === 'message.thought.get' && !String(params.sender_aid ?? '').trim()) {
-            throw new ValidationError('message.thought.get requires sender_aid');
+        if (method === 'message.thought.get') {
+            if (!String(params.sender_aid ?? '').trim()) {
+                throw new ValidationError('message.thought.get requires sender_aid');
+            }
+            // 校验 sender_aid 格式
+            validateAIDFormat(params.sender_aid, 'message.thought.get.sender_aid');
         }
     }
     injectMessageCursorContext(method, params) {
@@ -318,14 +435,19 @@ export class RpcPipeline {
         params.slot_id = client._slotId;
     }
     async applyClientSignature(method, params) {
-        if (!SIGNED_METHODS.has(method)) {
-            return;
+        try {
+            if (!SIGNED_METHODS.has(method)) {
+                return;
+            }
+            if (this.shouldSkipClientSignature(method, params)) {
+                delete params.client_signature;
+                return;
+            }
+            await this.runtime.client._signClientOperation(method, params);
         }
-        if (this.shouldSkipClientSignature(method, params)) {
-            delete params.client_signature;
-            return;
+        finally {
+            delete params._client_signature_identity;
         }
-        await this.runtime.client._signClientOperation(method, params);
     }
     shouldSkipClientSignature(method, params) {
         if (method !== 'message.send' && method !== 'group.send')
@@ -335,7 +457,10 @@ export class RpcPipeline {
         return this.runtime.client._isEchoPayload(params.payload);
     }
     async signClientOperation(method, params) {
-        const currentAid = this.runtime.client._currentAid;
+        const internal = params._client_signature_identity;
+        const currentAid = (internal && typeof internal === 'object')
+            ? internal
+            : this.runtime.client._currentAid;
         if (!currentAid?.privateKeyPem)
             return;
         try {
@@ -353,16 +478,13 @@ export class RpcPipeline {
                 .map(b => b.toString(16).padStart(2, '0'))
                 .join('');
             const signData = new TextEncoder().encode(`${method}|${aid}|${ts}|${paramsHash}`);
-            const pkcs8 = pemToArrayBuffer(currentAid.privateKeyPem);
-            const cryptoKey = await crypto.subtle.importKey('pkcs8', pkcs8, { name: 'ECDSA', namedCurve: 'P-256' }, false, ['sign']);
+            const cryptoKey = await signingPrivateKey(currentAid.privateKeyPem);
             const sigP1363 = await crypto.subtle.sign({ name: 'ECDSA', hash: 'SHA-256' }, cryptoKey, signData);
             const sigDer = p1363ToDer(new Uint8Array(sigP1363));
             let certFingerprint = '';
             const certPem = currentAid.certPem;
             if (certPem) {
-                const certDer = pemToArrayBuffer(certPem);
-                const fpBuf = await crypto.subtle.digest('SHA-256', certDer);
-                certFingerprint = 'sha256:' + Array.from(new Uint8Array(fpBuf)).map(b => b.toString(16).padStart(2, '0')).join('');
+                certFingerprint = await signingCertFingerprint(certPem);
             }
             params.client_signature = {
                 aid,
@@ -383,11 +505,11 @@ export class RpcPipeline {
             return client._aid ? `p2p:${client._aid}` : '';
         }
         if (method === 'group.pull' || method === 'group.v2.pull') {
-            const gid = String(params.group_id ?? '').trim();
+            const gid = String(params.group_aid ?? params.group_id ?? '').trim();
             return gid ? `group:${gid}` : '';
         }
         if (method === 'group.pull_events') {
-            const gid = String(params.group_id ?? '').trim();
+            const gid = String(params.group_aid ?? params.group_id ?? '').trim();
             return gid ? `group_event:${gid}` : '';
         }
         return '';
@@ -441,12 +563,14 @@ export class RpcPipeline {
     async rawCall(method, params, options) {
         const client = this.runtime.client;
         const payload = { ...(params ?? {}) };
+        const rpcBackground = Boolean(payload._rpc_background) || client._backgroundRpcDepth > 0 || options?.background === true;
+        delete payload._rpc_background;
         const signed = options?.signed ?? true;
         if (signed) {
             await this.applyClientSignature(method, payload);
         }
         const timeout = options?.timeout;
-        if (options?.background) {
+        if (rpcBackground) {
             return await client._transport.call(method, payload, timeout, options?.trace, true);
         }
         if (options?.trace !== undefined) {
@@ -501,13 +625,13 @@ export class RpcPipeline {
             }
         }
         if (client._seqTracker.getContiguousSeq(ns) !== contigBefore) {
-            client._saveSeqTrackerState?.();
+            client._persistSeq?.(ns);
         }
         result._contig_before = contigBefore;
     }
     postprocessGroupPull(params, result) {
         const client = this.runtime.client;
-        const gid = String(params.group_id ?? '').trim();
+        const gid = String(params.group_aid ?? params.group_id ?? '').trim();
         if (!gid || !client._seqTracker) {
             return;
         }
@@ -528,7 +652,7 @@ export class RpcPipeline {
             }
         }
         if (client._seqTracker.getContiguousSeq(ns) !== contigBefore) {
-            client._saveSeqTrackerState?.();
+            client._persistSeq?.(ns);
         }
         result._contig_before = contigBefore;
     }
@@ -548,14 +672,7 @@ export class RpcPipeline {
             return;
         }
         const client = this.runtime.client;
-        if (params.group_id !== undefined && params.group_id !== null) {
-            const rawGroupId = String(params.group_id);
-            const normalizedGroupId = normalizeGroupId(rawGroupId);
-            if (normalizedGroupId && normalizedGroupId !== rawGroupId) {
-                client._clientLog?.debug?.(`call group_id normalized: ${rawGroupId} -> ${normalizedGroupId} method=${method}`);
-            }
-            params.group_id = normalizedGroupId;
-        }
+        this.normalizeGroupCallIdentifier(method, params);
         if (params.device_id === undefined) {
             params.device_id = client._deviceId;
         }
@@ -563,6 +680,42 @@ export class RpcPipeline {
             params.slot_id = client._slotId;
         }
     }
+    normalizeGroupCallIdentifier(method, params) {
+        if (!method.startsWith('group.')) {
+            return;
+        }
+        const record = params;
+        const rawEntries = [
+            ['group_aid', record.group_aid],
+            ['groupAid', record.groupAid],
+            ['group_id', record.group_id],
+            ['groupId', record.groupId],
+        ];
+        const found = rawEntries.find(([, value]) => String(value ?? '').trim());
+        if (found) {
+            const [key, raw] = found;
+            const rawGroupId = String(raw).trim();
+            const normalizedGroupId = normalizeGroupId(rawGroupId);
+            if (normalizedGroupId) {
+                if (normalizedGroupId !== rawGroupId) {
+                    this.runtime.client._clientLog?.debug?.(`call group identifier normalized: ${key}=${rawGroupId} -> ${normalizedGroupId} method=${method}`);
+                }
+                const existingGroupId = String(record.group_id ?? record.groupId ?? '').trim();
+                if (key === 'group_id' || key === 'groupId') {
+                    params.group_id = rawGroupId;
+                }
+                else if (existingGroupId) {
+                    params.group_id = existingGroupId;
+                }
+                else {
+                    params.group_id = normalizedGroupId;
+                }
+                params.group_aid = normalizedGroupId;
+            }
+        }
+        delete record.groupAid;
+        delete record.groupId;
+    }
     groupCursorParams(params) {
         const cursorParams = {};
         for (const key of ['device_id', 'slot_id', 'device_name', 'device_type']) {