@agentunion/fastaun 0.5.28 → 0.5.30

package/dist/client.d.ts

@@ -89,6 +89,7 @@ export declare class AUNClient {
     private _ownershipStorage;
     private _ownershipFiles;
     private _ownershipWorkflow;
+    private _ownershipConsensusCache;
     private _getOwnershipStorage;
     private _getOwnershipFiles;
     private _createOwnershipFiles;
@@ -210,7 +211,6 @@ export declare class AUNClient {
     private _v2RuntimeGeneration;
     private _controlMessageCoordinator?;
     private _agentMdChanges?;
-    private _agentMdCommitUnsubscribe?;
     private _installAgentMdChangeHooks;
     private _getAgentMdChanges;
     private _onSdkControl;
@@ -302,7 +302,7 @@ export declare class AUNClient {
     private _localOwnershipOperation;
     releaseSubaid(subAid: string): Promise<OwnershipTaskResult>;
     transferSubaid(subAid: string, newOwnerAid: string): Promise<OwnershipTaskResult>;
-    checkOwnershipConsensus(subAid?: string): Promise<OwnershipConsensusResult>;
+    checkOwnershipConsensus(subAid?: string, force?: boolean): Promise<OwnershipConsensusResult>;
     private _checkOwnershipConsensusFresh;
     bindAid(subjectAid: string, options?: {
         subjectType?: string;

package/dist/client.js

@@ -51,7 +51,7 @@ import { isJsonObject, ConnectionState, STATE_TO_PUBLIC, } from './types.js';
 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 { OwnershipFiles, OwnershipStorageAdapter, ownershipAid, ownershipFailure, ownershipSha256, parseOwnershipFile } from './ownership-v21.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';
 import { SemanticProtocolError } from './semantic-protocol.js';
@@ -345,7 +345,7 @@ function createAgentMdManagerForRuntime(opts) {
     return new AgentMdManager({
         aunPath: opts.config().aunPath,
         verifySsl: opts.config().verifySsl,
-        onChanged: (aid) => opts.dispatcher().enqueue('agentmd.changed', aid),
+        onChanged: (aid) => opts.dispatcher().enqueue('agentmd.changed', { aid }),
         discoveryPort: opts.config().discoveryPort,
         uploadViaGatewayHost: true,
         logger: opts.logger(),
@@ -489,6 +489,7 @@ export class AUNClient {
     _ownershipStorage = null;
     _ownershipFiles = null;
     _ownershipWorkflow = null;
+    _ownershipConsensusCache = new Map();
     _getOwnershipStorage() {
         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) });
     }
@@ -500,6 +501,10 @@ export class AUNClient {
             currentAid: () => { if (!this._currentAid)
                 throw ownershipFailure('forbidden', 'ownership requires a loaded identity'); return this._currentAid; },
             currentType: () => this.getType(),
+            currentExttype: () => {
+                const metadata = this._tokenStore.loadMetadata?.(String(this._aid ?? ''));
+                return String(metadata?.identity_exttype ?? metadata?.registration_intent?.exttype ?? '');
+            },
             now: () => Math.trunc(Date.now() / 1000),
             readAgentMdFresh,
             submitAgentMdRaw: (subAid, raw, condition, assertActive, stage) => this._agentMdManager.submitOwnershipRaw(subAid, raw, condition, assertActive, stage),
@@ -515,40 +520,59 @@ export class AUNClient {
             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),
+            emit: (event, payload) => { this._ownershipConsensusCache = new Map(); this._dispatcher.enqueue(event, payload); },
         });
     }
     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 });
+        const query = { filter: 'all', limit: 200 }, tokens = new Set();
+        for (;;) {
+            const catalog = await this.call('message.peers', query);
             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;
+            for (const peer of Array.isArray(catalog.peers) ? catalog.peers : []) {
+                const sender = String(peer.sender_aid ?? ''), head = Number(peer.head_seq);
+                const snapshot = Number.isSafeInteger(head) && head > 0 && head < Number.MAX_SAFE_INTEGER ? { snapshot_head_seq: head } : {};
+                let before = snapshot.snapshot_head_seq === undefined ? Number.MAX_SAFE_INTEGER : head + 1;
+                for (;;) {
+                    const history = await this.call('message.history', { sender_aid: sender, before_seq: before, ...snapshot, 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 }) };
                     }
+                    if (history.has_older !== true)
+                        break;
+                    const next = Number(history.next_before_seq);
+                    if (!Number.isSafeInteger(next) || next <= 0 || next >= before)
+                        throw ownershipFailure('unavailable', 'ownership history pagination did not advance');
+                    before = next;
                 }
-                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 }) };
             }
+            if (catalog.has_more !== true)
+                return null;
+            const token = catalog.next_page_token;
+            if (typeof token !== 'string' || !token || tokens.has(token))
+                throw ownershipFailure('unavailable', 'peer directory pagination did not advance');
+            tokens.add(token);
+            query.page_token = token;
         }
-        return null;
     }
     _restoreIdentityType() {
         const aid = String(this._aid ?? '').trim();
@@ -934,15 +958,8 @@ export class AUNClient {
     _v2RuntimeGeneration = 0;
     _controlMessageCoordinator;
     _agentMdChanges;
-    _agentMdCommitUnsubscribe;
     _installAgentMdChangeHooks() {
-        this._agentMdCommitUnsubscribe?.();
-        this._agentMdCommitUnsubscribe = AgentMdManager.subscribeCommits(this._configModel.aunPath, () => {
-            const coordinator = this._getAgentMdChanges();
-            if (this._state === 'ready')
-                void coordinator.flushNotifications().catch((error) => this._clientLog.debug(String(error)));
-            coordinator.schedule();
-        });
+        this._agentMdManager.setOnCommitted((aid, notice) => this._getAgentMdChanges().committed(aid, notice));
     }
     _getAgentMdChanges() {
         return this._agentMdChanges ??= new AgentMdChangeCoordinator(this);
@@ -1066,6 +1083,7 @@ export class AUNClient {
         this._ownershipStorage = null;
         this._ownershipFiles = null;
         this._ownershipWorkflow = null;
+        this._ownershipConsensusCache = new Map();
         this._slotId = inputAid?.slotId || 'default';
         this._connectDeliveryMode = normalizeDeliveryModeConfig({ mode: 'fanout' });
         this._defaultConnectDeliveryMode = { ...this._connectDeliveryMode };
@@ -1306,12 +1324,12 @@ export class AUNClient {
     }
     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');
+        if (sources.some((source, index) => !(source instanceof AUNClient) || !source._currentAid?.isPrivateKeyValid() || !source._currentAid.isCertValid() || !source._currentAid.privateKeyPem || source._currentAid.aid !== source._aid || (index === 1 ? source.getType() !== 'agent' : !['human', 'agent'].includes(source.getType()))) || new Set(sources.map((source) => source._aid)).size !== sources.length)
+            throw ownershipFailure('forbidden', 'local ownership requires a distinct agent subaid and human or agent owners 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) {
+        for (const [index, source] of sources.entries()) {
             guard();
             const document = await source._agentMdManager.readAgentMdFresh(source._aid);
             guard();
@@ -1319,8 +1337,8 @@ export class AUNClient {
                 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');
+            if ((index === 1 ? verified.frontmatter.type !== 'agent' : typeof verified.frontmatter.type !== 'string' || !['human', 'agent'].includes(verified.frontmatter.type)))
+                throw ownershipFailure('forbidden', 'local ownership requires an agent subaid and human or agent owners');
         }
         const slot = `ownership-${crypto.randomUUID()}`, clients = [];
         try {
@@ -1342,13 +1360,48 @@ export class AUNClient {
     }
     async releaseSubaid(subAid) { return this._getOwnershipWorkflow().releaseSubaid(subAid); }
     async transferSubaid(subAid, newOwnerAid) { return this._getOwnershipWorkflow().transferSubaid(subAid, newOwnerAid); }
-    async checkOwnershipConsensus(subAid) {
+    async checkOwnershipConsensus(subAid, force = false) {
         const target = ownershipAid(subAid ?? this._aid, 'sub_aid');
-        const result = await this._createOwnershipFiles((aid) => this._agentMdManager._readOwnershipQuery(aid)).checkConsensus(target);
-        return result.status === 'consensus' ? result : this._checkOwnershipConsensusFresh(target);
+        const record = this._agentMdManager.loadRecord(target);
+        const observedEtag = String(record?.remote_etag ?? '');
+        const cache = this._ownershipConsensusCache ??= new Map();
+        const cached = cache.get(target);
+        if (!force && cached?.result.status === 'consensus' && record?.remote_status !== 'missing'
+            && (observedEtag === cached.observedEtag || observedEtag === cached.result.agent_md_etag)) {
+            cached.observedEtag = observedEtag;
+            return { ...cached.result };
+        }
+        cache.delete(target);
+        const result = { status: 'unavailable', sub_aid: target, owner_aid: null, relation_version: 0, lock: 'unlocked', agent_md_etag: '', agent_md_sha256: '' };
+        const entry = { observedEtag, result: { ...result } };
+        cache.set(target, entry);
+        try {
+            const snapshot = await this._agentMdManager.readOwnershipFresh(target);
+            Object.assign(result, { relation_version: snapshot.relation_version, lock: snapshot.lock, agent_md_etag: snapshot.etag,
+                agent_md_sha256: snapshot.exists ? ownershipSha256(snapshot.content) : '' });
+            if (snapshot.ownership_status)
+                result.ownership_status = snapshot.ownership_status;
+            const statement = snapshot.exists ? parseOwnershipFile(snapshot.content, 'agent', { expectedSubAid: target }).statement : undefined;
+            if (snapshot.relation_version !== (statement?.relation_version ?? 0) || snapshot.lock === 'locked' && !statement
+                || snapshot.ownership_status === 'pending' && snapshot.lock !== 'unlocked')
+                throw ownershipFailure('unavailable', 'NS relationship metadata does not match agent.md', true);
+            result.status = snapshot.ownership_status === 'pending' ? 'single_sided' : statement ? snapshot.lock === 'locked' ? 'consensus' : 'released' : 'unbound';
+            result.owner_aid = result.status === 'consensus' ? statement.owner_aid : null;
+        }
+        catch (error) {
+            const code = error instanceof StateError && error.stringCode ? error.stringCode : error instanceof ValidationError ? 'invalid' : 'unavailable';
+            result.status = code === 'not_applicable' ? 'not_applicable' : code === 'invalid' ? 'invalid' : 'unavailable';
+            result.owner_aid = null;
+            result.code = code;
+            result.reason = error instanceof Error ? error.message : String(error);
+            result.retryable = result.status === 'unavailable';
+        }
+        if (cache.get(target) === entry)
+            entry.result = { ...result };
+        return result;
     }
     async _checkOwnershipConsensusFresh(subAid) {
-        return this._getOwnershipWorkflow().checkOwnershipConsensus(subAid);
+        return this.checkOwnershipConsensus(subAid, true);
     }
     async bindAid(subjectAid, options = {}) {
         throw ownershipFailure('unsupported_protocol', 'legacy bindAid is unsupported; use bindSubaid');
@@ -1533,6 +1586,7 @@ export class AUNClient {
         this._ownershipStorage = null;
         this._ownershipFiles = null;
         this._ownershipWorkflow = null;
+        this._ownershipConsensusCache = new Map();
         this._auth = new AuthFlow({
             tokenStore,
             crypto: new CryptoProvider(),
@@ -1921,7 +1975,7 @@ export class AUNClient {
     }
     async _ensureInitialAgentMd() {
         const aid = this._aid;
-        if (!aid || !this._currentAid)
+        if (!aid || !this._currentAid || this.getType() !== 'human')
             return false;
         const observed = await this._agentMdManager.readAgentMdFresh(aid);
         if (observed.exists || String(this._agentMdManager._loadRecord?.(aid, true)?.local_draft_content ?? this._agentMdManager.loadRecord(aid)?.local_draft_content ?? '') || this._agentMdManager.pendingUpload(aid))
@@ -2072,7 +2126,7 @@ export class AUNClient {
         this._aidStore = store;
         let identity = store.load(orgAid);
         if (!identity.ok) {
-            const registered = await store.register(orgAid, { type: 'org', owner: owner.aid });
+            const registered = await store._registerIdentity(orgAid, { type: 'org', owner: owner.aid, exttype: String(params.exttype ?? '') });
             if (!registered.ok)
                 throw ownershipFailure('unavailable', registered.error.message, true);
             identity = store.load(orgAid);
@@ -2290,7 +2344,7 @@ export class AUNClient {
             return;
         const identity = this._localEntityCertificate(orgAid);
         const content = String(params.org_agent_md ?? buildDefaultAgentMd(orgAid, { type: 'org', owner: owner.aid, entityCertFingerprint: identity.certFingerprint, name: String(params.name ?? orgAid) }));
-        const uploaded = await store.uploadAgentMd(orgAid, content, { uploaderAid: owner.aid, entityOwnerResolver: (aid, type) => this._resolveEntityAgentMdOwner(aid, type, bootstrap), entityIdentityGetter: (aid) => this._freshEntityCertificate(aid, 'org') });
+        const uploaded = await store._uploadAgentMd(orgAid, content, { uploaderAid: owner.aid, entityOwnerResolver: (aid, type) => this._resolveEntityAgentMdOwner(aid, type, bootstrap), entityIdentityGetter: (aid) => this._freshEntityCertificate(aid, 'org') }, (aid, notice, manager) => this._getAgentMdChanges().committed(aid, notice, manager));
         if (!uploaded.ok) {
             const code = ['invalid', 'unavailable', 'forbidden', 'conflict', 'persistence_unavailable'].includes(uploaded.error.code) ? uploaded.error.code : uploaded.error.code === 'NETWORK_ERROR' ? 'unavailable' : 'invalid';
             throw ownershipFailure(code, uploaded.error.message, code === 'unavailable');
@@ -2491,6 +2545,7 @@ export class AUNClient {
             aunPath: store.aunPath,
             verifySsl: identityStore._verifySsl,
             logger: identityStore._log.for('aun_core.agent_md'),
+            onCommitted: (aid, notice) => this._getAgentMdChanges().committed(aid, notice, manager),
             uploadViaGatewayHost: true,
             ownerAidGetter: () => identity.aid,
             currentAidGetter: () => identity,
@@ -2518,7 +2573,7 @@ export class AUNClient {
         const bootstrap = initialCertificate ? { aid: groupAid, ownerAid: String(group.owner_aid ?? '').trim(), certFingerprint: certFingerprint(initialCertificate), type: 'group' } : undefined;
         if (await this._resumeGroupAgentMdUpload(store, groupAid, bootstrap))
             return;
-        const uploaded = await store.uploadAgentMd(groupAid, this._groupAgentMdContent(groupAid, params, group), { uploaderAid, entityOwnerResolver: (aid, type) => this._resolveEntityAgentMdOwner(aid, type, bootstrap), entityIdentityGetter: (aid) => this._freshEntityCertificate(aid) });
+        const uploaded = await store._uploadAgentMd(groupAid, this._groupAgentMdContent(groupAid, params, group), { uploaderAid, entityOwnerResolver: (aid, type) => this._resolveEntityAgentMdOwner(aid, type, bootstrap), entityIdentityGetter: (aid) => this._freshEntityCertificate(aid) }, (aid, notice, manager) => this._getAgentMdChanges().committed(aid, notice, manager));
         if (!uploaded.ok) {
             const code = ['invalid', 'unavailable', 'forbidden', 'conflict', 'persistence_unavailable'].includes(uploaded.error.code) ? uploaded.error.code : uploaded.error.code === 'NETWORK_ERROR' ? 'unavailable' : 'invalid';
             throw ownershipFailure(code, `group agent.md upload failed: ${uploaded.error.message}`, code === 'unavailable');
@@ -2996,10 +3051,6 @@ export class AUNClient {
         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 === 'agent_md_changed') {
-            this._getAgentMdChanges().schedule();
-            void this._getAgentMdChanges().deliverEvents().catch((error) => this._clientLog.debug(String(error)));
-        }
         if (messageEvent) {
             if (this._p2pPeerPullEnabled && !hadMessageConsumer)
                 this._delivery.refreshPendingPeers();
@@ -4421,7 +4472,6 @@ export class AUNClient {
             this._safeAsync(this._controlMessages().recover());
             this._agentMdChanges?.close();
             this._agentMdChanges = new AgentMdChangeCoordinator(this);
-            this._agentMdChanges.schedule();
             // connect/reconnect 成功后自动触发一次 P2P message.v2.pull，补齐离线期间积压
             // 群消息按惰性触发，不在此处主动 pull
             if (backgroundSyncEnabled) {