@agentunion/fastaun 0.5.23 → 0.5.25

package/dist/client.d.ts

@@ -18,7 +18,7 @@ import { StorageVFS } from './storage/vfs.js';
 import { type JsonObject, type JsonValue, type RpcParams, type RpcResult, ConnectionState } from './types.js';
 import { AID } from './aid.js';
 import { type OwnershipConsensusResult } from './ownership-v21.js';
-import { type OwnershipTaskResult, type OwnershipTaskResetResult } from './ownership-workflow.js';
+import { type OwnershipTaskResult } from './ownership-workflow.js';
 import { type CertificateMaterial } from './org-protocol.js';
 /**
  * 递归排序键的 JSON 序列化（Canonical JSON for AUN）
@@ -82,8 +82,6 @@ export declare class AUNClient {
     private _currentAid;
     private _serviceEventIdentityVersion;
     private _serviceEventIdentityAbort;
-    /** ownership 关系只在 SDK 内存中编排；服务端不保存状态机。 */
-    private _ownershipRecords;
     private _ownershipType;
     private _ownershipStorage;
     private _ownershipFiles;
@@ -92,9 +90,10 @@ export declare class AUNClient {
     private _getOwnershipFiles;
     private _createOwnershipFiles;
     private _getOwnershipWorkflow;
-    private _persistOwnershipRecords;
-    private _restoreOwnershipRecords;
-    private _resumeOwnershipAfterConnect;
+    private _recoverOwnershipRequest;
+    private _restoreIdentityType;
+    private _ownershipOperation;
+    private _ownershipOperationGuard?;
     private _credentialRenewal?;
     private _credentialRenewalTimer;
     private _credentialRenewalAbort;
@@ -111,8 +110,6 @@ export declare class AUNClient {
     _rememberCredential(credential: JsonObject, material: Record<string, unknown>, certificate?: CertificateMaterial): void;
     private _verifyIncomingServiceEvent;
     private _handleCredentialRenewal;
-    private _resumeRegistrationIntent;
-    private _resumeOwnership;
     /** 实例级 protected_headers */
     private _instanceProtectedHeaders;
     /** 重连退避时间戳（ms） */
@@ -124,6 +121,7 @@ export declare class AUNClient {
     /** Gateway URL */
     private _gatewayUrl;
     private _gatewayCandidates;
+    private _peerGatewayCache;
     /** 是否正在关闭 */
     private _closing;
     private _disconnecting;
@@ -263,7 +261,6 @@ export declare class AUNClient {
     get stream(): StreamFacade;
     /** 当前 AID 值对象 */
     get currentAid(): AID | null;
-    private _ownershipKey;
     getType(): string;
     get_type(): string;
     getOwner(): string | null;
@@ -272,7 +269,10 @@ export declare class AUNClient {
     get_ownership_status(): Record<string, unknown>;
     bindOwneraid(ownerAid: string): Promise<OwnershipTaskResult>;
     bindSubaid(subAid: string): Promise<OwnershipTaskResult>;
-    resetOwnershipTask(): Promise<OwnershipTaskResetResult>;
+    bindLocalSubaid(subClient: AUNClient): Promise<OwnershipTaskResult>;
+    transferLocalSubaid(subClient: AUNClient, newOwnerClient: AUNClient): Promise<OwnershipTaskResult>;
+    private _createOwnershipOperationClient;
+    private _localOwnershipOperation;
     releaseSubaid(subAid: string): Promise<OwnershipTaskResult>;
     transferSubaid(subAid: string, newOwnerAid: string): Promise<OwnershipTaskResult>;
     checkOwnershipConsensus(subAid?: string): Promise<OwnershipConsensusResult>;

package/dist/client.js

@@ -49,7 +49,7 @@ import { AID } from './aid.js';
 import { certFingerprint, certMatchesFingerprint, normalizeFingerprintHex, publicKeyMatchesFingerprint } from './cert-utils.js';
 import { validateAgentMdCertificate, validateAgentMdDocument } from './agent-md-schema.js';
 import { OwnershipFiles, OwnershipStorageAdapter, ownershipAid, ownershipFailure } from './ownership-v21.js';
-import { OwnershipWorkflow } from './ownership-workflow.js';
+import { OwnershipWorkflow, OWNERSHIP_SDK_MESSAGE_TYPE, parseOwnershipMessage } from './ownership-workflow.js';
 import { canonicalJson, createCredential, createMemberCredential, signMembershipBinding, digest, validateMembershipBinding, verifyMembershipBinding, verifyCredentialSignature, createRepresentationProof, verifyServiceEvent, buildRequestBinding, validateRequestBinding, CredentialRenewal } from './org-protocol.js';
 function isPromiseLike(value) {
     return Boolean(value && typeof value.then === 'function');
@@ -352,7 +352,9 @@ function createAgentMdManagerForRuntime(opts) {
         entitySignerResolver: opts.fetchEntitySigner,
         gatewayResolver: async (aid) => {
             const gatewayUrl = await opts.gateway.resolve(aid);
-            opts.gateway.set(gatewayUrl);
+            const localAid = opts.ownerAid();
+            if (localAid && aid.slice(aid.indexOf('.') + 1).trim().toLowerCase() === localAid.slice(localAid.indexOf('.') + 1).trim().toLowerCase())
+                opts.gateway.set(gatewayUrl);
             return gatewayUrl;
         },
         accessTokenResolver: async (aid, gatewayUrl) => {
@@ -446,7 +448,7 @@ function createAgentMdManagerForRuntime(opts) {
             }
             if (!opts.gateway.get()) {
                 try {
-                    opts.gateway.set(await opts.gateway.resolve(target));
+                    opts.gateway.set(await opts.gateway.resolve(opts.ownerAid() ?? target));
                 }
                 catch { /* best effort before cert fetch */ }
             }
@@ -479,8 +481,6 @@ export class AUNClient {
     _currentAid = null;
     _serviceEventIdentityVersion = 0;
     _serviceEventIdentityAbort = new AbortController();
-    /** ownership 关系只在 SDK 内存中编排；服务端不保存状态机。 */
-    _ownershipRecords = new Map();
     _ownershipType = 'agent';
     _ownershipStorage = null;
     _ownershipFiles = null;
@@ -489,7 +489,7 @@ export class AUNClient {
         return this._ownershipStorage ??= new OwnershipStorageAdapter({ currentAid: () => this._aid, call: (method, params) => this.call(method, params), httpPut: (url, data, headers) => this.storage.lowlevel.httpPut(url, data, headers) });
     }
     _getOwnershipFiles() {
-        return this._ownershipFiles ??= this._createOwnershipFiles((subAid) => this._agentMdManager.readOwnershipFresh(subAid));
+        return this._ownershipFiles ??= this._createOwnershipFiles((subAid, stage) => this._agentMdManager.readOwnershipFresh(subAid, stage));
     }
     _createOwnershipFiles(readAgentMdFresh) {
         return new OwnershipFiles({
@@ -507,52 +507,56 @@ export class AUNClient {
     }
     _getOwnershipWorkflow() {
         return this._ownershipWorkflow ??= new OwnershipWorkflow({
-            currentAid: () => this._aid, store: this._tokenStore, files: this._getOwnershipFiles(),
-            currentType: () => this.getType(),
+            currentAid: () => this._aid, files: this._getOwnershipFiles(),
+            currentType: () => this.getType(), assertCurrent: () => this._ownershipOperationGuard?.(),
+            recoverRequest: (operationId) => this._recoverOwnershipRequest(operationId),
             send: (to, payload, messageId) => this.call('message.send', { to, encrypt: true, message_id: messageId, payload: payload }),
             emit: (event, payload) => this._dispatcher.enqueue(event, payload),
         });
     }
-    _persistOwnershipRecords() {
-        const aid = String(this._aid ?? '').trim();
-        if (!aid)
-            return;
-        const metadata = this._tokenStore.loadMetadata?.(aid) ?? {};
-        const existing = metadata.ownership_records;
-        const records = existing && typeof existing === 'object' && !Array.isArray(existing)
-            ? { ...existing } : {};
-        for (const [key, record] of this._ownershipRecords) {
-            if (![record.subject_aid, record.owner_aid].some((value) => String(value ?? '').trim().toLowerCase() === aid.toLowerCase()))
-                continue;
-            records[key] = Object.fromEntries(Object.entries(record).filter(([name]) => !['subject_identity', 'escrow_password', 'escrow_download_url'].includes(name)));
+    async _recoverOwnershipRequest(operationId) {
+        const identity = this._aid, version = this._serviceEventIdentityVersion;
+        const current = () => { if (this._aid !== identity || this._serviceEventIdentityVersion !== version)
+            throw ownershipFailure('conflict', 'ownership request identity changed'); };
+        const catalog = await this.call('message.peers', { filter: 'all', limit: 200 });
+        current();
+        for (const peer of Array.isArray(catalog.peers) ? catalog.peers.slice(0, 200) : []) {
+            const sender = String(peer.sender_aid ?? '');
+            const history = await this.call('message.history', { sender_aid: sender, before_seq: Number.MAX_SAFE_INTEGER, limit: 200 });
+            current();
+            for (const row of Array.isArray(history.messages) ? history.messages : []) {
+                const envelope = row, content = envelope.payload ?? envelope;
+                const raw = decryptedOwnershipJsonText(content) ?? content;
+                let value = raw;
+                if (typeof raw === 'string') {
+                    try {
+                        value = JSON.parse(raw);
+                    }
+                    catch {
+                        continue;
+                    }
+                }
+                if (!isJsonObject(value) || value.type !== OWNERSHIP_SDK_MESSAGE_TYPE || value.operation_id !== operationId || !['bind.request', 'transfer.request'].includes(String(value.action)))
+                    continue;
+                const authenticated = String(envelope.from_aid ?? envelope.from ?? envelope.sender_aid ?? '');
+                if (authenticated !== sender)
+                    throw ownershipFailure('forbidden', 'ownership history sender changed');
+                return { from: authenticated, payload: parseOwnershipMessage(raw, { authenticated_from_aid: authenticated, local_aid: identity }) };
+            }
         }
-        this._tokenStore.saveMetadata?.(aid, { ownership_records: records });
+        return null;
     }
-    _restoreOwnershipRecords() {
+    _restoreIdentityType() {
         const aid = String(this._aid ?? '').trim();
         if (!aid)
             return;
         const metadata = this._tokenStore.loadMetadata?.(aid);
-        const intent = metadata?.registration_intent;
-        if (intent?.type)
-            this._ownershipType = String(intent.type);
-        const records = metadata?.ownership_records;
-        if (!records || typeof records !== 'object' || Array.isArray(records))
-            return;
-        for (const [key, value] of Object.entries(records)) {
-            if (!value || typeof value !== 'object' || Array.isArray(value))
-                continue;
-            const record = value;
-            this._ownershipRecords.set(key, record);
-            if (String(record.subject_aid ?? '').toLowerCase() === aid.toLowerCase())
-                this._ownershipType = String(record.type ?? this._ownershipType);
-        }
-    }
-    async _resumeOwnershipAfterConnect() {
-        await this._checkIdentityAdmissionAfterConnect();
-        await this._resumeRegistrationIntent();
-        await this._resumeOwnership();
+        const legacy = metadata?.registration_intent;
+        if (metadata?.identity_type ?? legacy?.type)
+            this._ownershipType = String(metadata?.identity_type ?? legacy?.type);
     }
+    _ownershipOperation = false;
+    _ownershipOperationGuard;
     _credentialRenewal;
     _credentialRenewalTimer = null;
     _credentialRenewalAbort = null;
@@ -750,18 +754,6 @@ export class AUNClient {
         await this._safeAsync(this._getCredentialRenewal().receive(String(envelope.from ?? envelope.from_aid ?? envelope.sender_aid ?? ''), parsed));
         return true;
     }
-    async _resumeRegistrationIntent() {
-        const intent = this._tokenStore.loadMetadata?.(this._aid)?.registration_intent;
-        if (['group', 'org'].includes(String(intent?.type ?? this.getType())))
-            return;
-        if (intent?.protocol !== '2.1' || intent.pending !== true)
-            return;
-        await this._getOwnershipWorkflow().resumeRegistration(String(intent.owner), String(intent.operation_id));
-        this._tokenStore.saveMetadata?.(this._aid, { registration_intent: { ...intent, pending: false } });
-    }
-    async _resumeOwnership() {
-        await this._getOwnershipWorkflow().resume();
-    }
     /** 实例级 protected_headers */
     _instanceProtectedHeaders = null;
     /** 重连退避时间戳（ms） */
@@ -773,6 +765,7 @@ export class AUNClient {
     /** Gateway URL */
     _gatewayUrl = null;
     _gatewayCandidates = [];
+    _peerGatewayCache = new Map();
     /** 是否正在关闭 */
     _closing = false;
     _disconnecting = false;
@@ -957,7 +950,7 @@ export class AUNClient {
             net: dnsNet,
         });
         this._aid = initAid;
-        this._restoreOwnershipRecords();
+        this._restoreIdentityType();
         this._agentMdManager = createAgentMdManagerForRuntime({
             config: () => this._configModel,
             logger: () => this._logger.for('aun_core.agent_md'),
@@ -1138,9 +1131,6 @@ export class AUNClient {
     get currentAid() {
         return this._currentAid;
     }
-    _ownershipKey(subjectAid, ownerAid) {
-        return `${String(subjectAid ?? '').trim().toLowerCase()}|${String(ownerAid ?? '').trim().toLowerCase()}`;
-    }
     getType() {
         return String(this._ownershipType || 'agent').trim() || 'agent';
     }
@@ -1148,45 +1138,12 @@ export class AUNClient {
         return this.getType();
     }
     getOwner() {
-        const aid = String(this._aid ?? '').trim().toLowerCase();
-        let best = null;
-        let bestActive = false;
-        for (const record of this._ownershipRecords.values()) {
-            if (String(record.subject_aid ?? '').trim().toLowerCase() === aid) {
-                if (String(record.status ?? '').trim().toLowerCase() === 'released')
-                    continue;
-                const owner = String(record.owner_aid ?? '').trim();
-                if (!owner)
-                    continue;
-                const active = String(record.status ?? '').trim().toLowerCase() === 'active';
-                if (!best || active && !bestActive) {
-                    best = owner;
-                    bestActive = active;
-                }
-            }
-        }
-        return best;
+        return null;
     }
     get_owner() {
         return this.getOwner();
     }
     getOwnershipStatus() {
-        const aid = String(this._aid ?? '').trim().toLowerCase();
-        let best = null;
-        let bestActive = false;
-        for (const record of this._ownershipRecords.values()) {
-            const subject = String(record.subject_aid ?? '').trim().toLowerCase();
-            const owner = String(record.owner_aid ?? '').trim().toLowerCase();
-            if (aid !== subject && aid !== owner)
-                continue;
-            const active = String(record.status ?? '').trim().toLowerCase() === 'active';
-            if (!best || active && !bestActive) {
-                best = record;
-                bestActive = active;
-            }
-        }
-        if (best)
-            return Object.fromEntries(Object.entries(best).filter(([key]) => key !== 'subject_identity' && key !== 'escrow_password' && key !== 'escrow_download_url'));
         return { subject_aid: this._aid ?? '', owner_aid: null, status: 'legacy_unbound', type: this.getType() };
     }
     get_ownership_status() {
@@ -1194,7 +1151,53 @@ export class AUNClient {
     }
     async bindOwneraid(ownerAid) { return this._getOwnershipWorkflow().bindOwneraid(ownerAid); }
     async bindSubaid(subAid) { return this._getOwnershipWorkflow().bindSubaid(subAid); }
-    async resetOwnershipTask() { return this._getOwnershipWorkflow().resetOwnershipTask(); }
+    async bindLocalSubaid(subClient) { return this._localOwnershipOperation(subClient); }
+    async transferLocalSubaid(subClient, newOwnerClient) { return this._localOwnershipOperation(subClient, newOwnerClient); }
+    _createOwnershipOperationClient(slotId) {
+        const aid = this._currentAid;
+        const client = new AUNClient(AID._create({ aid: aid.aid, aunPath: aid.aunPath, certPem: aid.certPem, privateKeyPem: aid.privateKeyPem,
+            certValid: aid.isCertValid(), privateKeyValid: aid.isPrivateKeyValid(), deviceId: this._deviceId, slotId,
+            verifySsl: aid.verifySsl, rootCaPath: aid.rootCaPath, debug: aid.debug, aidStore: aid._aidStore }));
+        client._ownershipOperation = true;
+        client._ownershipType = this.getType();
+        return client;
+    }
+    async _localOwnershipOperation(sub, next) {
+        const sources = [this, sub, ...(next ? [next] : [])];
+        if (sources.some((source) => !(source instanceof AUNClient) || !source._currentAid?.isPrivateKeyValid() || !source._currentAid.isCertValid() || !source._currentAid.privateKeyPem || source._currentAid.aid !== source._aid || source.getType() !== 'agent') || new Set(sources.map((source) => source._aid)).size !== sources.length)
+            throw ownershipFailure('forbidden', 'local ownership requires distinct agent clients with private identities');
+        const identities = sources.map((source) => [source._aid, source._currentAid, source._serviceEventIdentityVersion]);
+        const guard = () => { if (sources.some((source, index) => source._aid !== identities[index][0] || source._currentAid !== identities[index][1] || source._serviceEventIdentityVersion !== identities[index][2]))
+            throw ownershipFailure('conflict', 'local ownership source identity changed'); };
+        for (const source of sources) {
+            guard();
+            const document = await source._agentMdManager.readAgentMdFresh(source._aid);
+            guard();
+            if (!document.exists)
+                throw ownershipFailure('forbidden', 'local ownership requires a published agent document');
+            const verified = await source._getOwnershipFiles().verifyFile(document.content, 'agent', source._aid);
+            guard();
+            if (verified.frontmatter.type !== 'agent')
+                throw ownershipFailure('forbidden', 'local ownership requires verified agent identities');
+        }
+        const slot = `ownership-${crypto.randomUUID()}`, clients = [];
+        try {
+            for (const source of sources) {
+                const client = source._createOwnershipOperationClient(slot);
+                client._ownershipOperationGuard = guard;
+                clients.push(client);
+            }
+            for (const client of clients) {
+                guard();
+                await client.connect({ connection_kind: 'short', background_sync: false, auto_reconnect: false });
+                guard();
+            }
+            return next ? await clients[0]._getOwnershipWorkflow().transferLocalSubaid(clients[1]._getOwnershipWorkflow(), clients[2]._getOwnershipWorkflow()) : await clients[0]._getOwnershipWorkflow().bindLocalSubaid(clients[1]._getOwnershipWorkflow());
+        }
+        finally {
+            await Promise.all(clients.map((client) => client.close()));
+        }
+    }
     async releaseSubaid(subAid) { return this._getOwnershipWorkflow().releaseSubaid(subAid); }
     async transferSubaid(subAid, newOwnerAid) { return this._getOwnershipWorkflow().transferSubaid(subAid, newOwnerAid); }
     async checkOwnershipConsensus(subAid) {
@@ -1224,7 +1227,28 @@ export class AUNClient {
             return false;
         const envelope = message;
         const content = 'payload' in envelope ? envelope.payload : message;
-        return this._getOwnershipWorkflow().receive(String(envelope.from_aid ?? ''), decryptedOwnershipJsonText(content) ?? content);
+        const raw = decryptedOwnershipJsonText(content) ?? content, sender = String(envelope.from_aid ?? '');
+        let value = raw;
+        if (typeof value === 'string') {
+            try {
+                value = JSON.parse(value);
+            }
+            catch {
+                return false;
+            }
+        }
+        if (value && typeof value === 'object' && !Array.isArray(value) && value.type === OWNERSHIP_SDK_MESSAGE_TYPE) {
+            const control = value, request = control.action === 'bind.request' || control.action === 'transfer.request';
+            try {
+                parseOwnershipMessage(raw, { authenticated_from_aid: sender, local_aid: this._aid, ...(request ? {} : { task: { ...control, initiator_aid: this._aid } }) });
+            }
+            catch (error) {
+                if (error instanceof ValidationError && !error.retryable || error instanceof StateError && !error.retryable && ['invalid', 'forbidden'].includes(error.stringCode))
+                    return true;
+                throw error;
+            }
+        }
+        return this._getOwnershipWorkflow().receive(sender, raw);
     }
     get hasIdentity() {
         return this._currentAid !== null && this.state !== ConnectionState.CLOSED;
@@ -1339,6 +1363,7 @@ export class AUNClient {
         this._certCache.clear();
         this._gatewayUrl = null;
         this._gatewayCandidates = [];
+        this._peerGatewayCache.clear();
         this._deviceId = aid.deviceId || getDeviceId(nextConfig.aunPath);
         this._slotId = aid.slotId || 'default';
         const debugFlag = nextConfig.debug;
@@ -1416,10 +1441,9 @@ export class AUNClient {
         this._serviceEventIdentityAbort = new AbortController();
         this._ensureReadStateIdentity();
         if (previousAid !== this._aid) {
-            this._ownershipRecords.clear();
             this._ownershipType = 'agent';
         }
-        this._restoreOwnershipRecords();
+        this._restoreIdentityType();
     }
     setProtectedHeaders(headers) {
         if (!headers) {
@@ -1502,6 +1526,7 @@ export class AUNClient {
     }
     /** 关闭连接 */
     async close() {
+        this._peerGatewayCache.clear();
         return this._lifecycle.close();
     }
     /**
@@ -2647,9 +2672,11 @@ export class AUNClient {
     on(event, handler) {
         const tStart = Date.now();
         this._clientLog.debug(`on enter: event=${event}`);
+        const messageEvent = event === 'message.received' || event === 'message.recalled' || event === 'message.batch';
+        const hadMessageConsumer = messageEvent && [...this._dispatcher._snapshotApplicationHandlers(['message.received', 'message.recalled', 'message.batch']).values()].some((handlers) => handlers.length > 0);
         const result = this._dispatcher.subscribe(event, handler);
-        if (event === 'message.received' || event === 'message.recalled' || event === 'message.batch') {
-            if (this._p2pPeerPullEnabled)
+        if (messageEvent) {
+            if (this._p2pPeerPullEnabled && !hadMessageConsumer)
                 this._delivery.refreshPendingPeers();
             this._delivery.requestBackgroundPullRecovery();
         }
@@ -4041,7 +4068,8 @@ export class AUNClient {
                     this._clientLog.warn(`schedule post-connect P2P gap fill failed: ${formatCaughtError(exc)}`);
                 });
             }
-            this._safeAsync(this._resumeOwnershipAfterConnect());
+            if (!this._ownershipOperation)
+                this._safeAsync(this._checkIdentityAdmissionAfterConnect());
             this._clientLog.debug(`_connectOnce exit: elapsed=${Date.now() - tStart}ms gateway=${gatewayUrl}, aid=${this._aid ?? ''}`);
         }
         catch (err) {
@@ -4680,20 +4708,15 @@ export class AUNClient {
         return gateways[0];
     }
     async _resolveOwnershipCertificateGateway(aid) {
-        const issuer = aid.slice(aid.indexOf('.') + 1);
-        if (issuer === this._aid?.slice(this._aid.indexOf('.') + 1))
+        const issuer = aid.slice(aid.indexOf('.') + 1).trim().toLowerCase();
+        if (issuer === this._aid?.slice(this._aid.indexOf('.') + 1).trim().toLowerCase())
             return this._resolveGatewayForAid(aid);
-        const port = this._configModel.discoveryPort ? `:${this._configModel.discoveryPort}` : '';
-        let lastError;
-        for (const host of [aid, `gateway.${issuer}`]) {
-            try {
-                return await this._discovery.discover(`https://${host}${port}/.well-known/aun-gateway`);
-            }
-            catch (error) {
-                lastError = error;
-            }
+        try {
+            return await this._resolveGatewayForAid(aid);
+        }
+        catch (error) {
+            throw ownershipFailure('unavailable', error instanceof Error ? error.message : 'signer Gateway discovery failed', true);
         }
-        throw ownershipFailure('unavailable', lastError instanceof Error ? lastError.message : 'signer Gateway discovery failed', true);
     }
     /** 发现并缓存全部 Gateway 候选，供首连和自动重连故障转移使用。 */
     async _resolveGatewayCandidatesForAid(aid) {
@@ -4701,17 +4724,26 @@ export class AUNClient {
         if (!resolvedAid) {
             throw new StateError('gateway discovery requires a loaded AID');
         }
+        const dotIdx = resolvedAid.indexOf('.');
+        const issuerDomain = (dotIdx >= 0 ? resolvedAid.slice(dotIdx + 1) : resolvedAid).trim().toLowerCase();
+        const currentAid = this._aid;
+        const sameIssuer = currentAid !== null && issuerDomain === currentAid.slice(currentAid.indexOf('.') + 1).trim().toLowerCase();
         const discovery = this._discovery;
         const tokenStore = this._tokenStore;
         const discoveryIsCurrent = () => (this._discovery === discovery
             && this._tokenStore === tokenStore
             && !this._closing);
-        if (this._gatewayCandidates.length > 0)
+        if (sameIssuer && this._gatewayCandidates.length > 0)
             return [...this._gatewayCandidates];
-        if (this._gatewayUrl) {
+        if (sameIssuer && this._gatewayUrl) {
             this._gatewayCandidates = [this._gatewayUrl];
             return [...this._gatewayCandidates];
         }
+        if (!sameIssuer) {
+            const cached = this._peerGatewayCache.get(issuerDomain);
+            if (cached)
+                return [...cached];
+        }
         try {
             const loadMetadata = tokenStore.loadMetadata;
             const metadata = typeof loadMetadata === 'function'
@@ -4723,16 +4755,19 @@ export class AUNClient {
             const cachedGateway = cachedList[0]
                 ?? (isJsonObject(metadata) ? String(metadata.gateway_url ?? '').trim() : '');
             if (cachedGateway) {
-                this._gatewayCandidates = [...new Set([cachedGateway, ...cachedList])];
-                this._gatewayUrl = this._gatewayCandidates[0];
-                return [...this._gatewayCandidates];
+                const gatewayUrls = [...new Set([cachedGateway, ...cachedList])];
+                if (sameIssuer) {
+                    this._gatewayCandidates = gatewayUrls;
+                    this._gatewayUrl = gatewayUrls[0];
+                }
+                else
+                    this._peerGatewayCache.set(issuerDomain, gatewayUrls);
+                return [...gatewayUrls];
             }
         }
         catch {
             // 缓存读取失败不影响发现流程。
         }
-        const dotIdx = resolvedAid.indexOf('.');
-        const issuerDomain = dotIdx >= 0 ? resolvedAid.slice(dotIdx + 1) : resolvedAid;
         const portSuffix = this._configModel.discoveryPort ? `:${this._configModel.discoveryPort}` : '';
         const aidUrl = `https://${resolvedAid}${portSuffix}/.well-known/aun-gateway`;
         const gatewayDomainUrl = `https://gateway.${issuerDomain}${portSuffix}/.well-known/aun-gateway`;
@@ -4752,9 +4787,13 @@ export class AUNClient {
                 const gatewayUrls = [...new Set(discovered.map((item) => String(item ?? '').trim()).filter(Boolean))];
                 if (gatewayUrls.length === 0)
                     throw new ValidationError('gateway discovery returned no candidates');
-                this._gatewayCandidates = gatewayUrls;
                 const gateway = gatewayUrls[0];
-                this._gatewayUrl = gateway;
+                if (sameIssuer) {
+                    this._gatewayCandidates = gatewayUrls;
+                    this._gatewayUrl = gateway;
+                }
+                else
+                    this._peerGatewayCache.set(issuerDomain, gatewayUrls);
                 try {
                     const saveMetadata = tokenStore.saveMetadata;
                     if (typeof saveMetadata === 'function') {