@agentunion/fastaun 0.5.28 → 0.5.30

package/dist/agent-md.js

@@ -13,6 +13,7 @@ import { AUNError, ClientSignatureError, NotFoundError, StateError, ValidationEr
 import { isJsonObject } from './types.js';
 import { ownershipAid, ownershipFailure, parseOwnershipFile } from './ownership-v21.js';
 import { resultOk } from './result.js';
+import { INVALID_AID_FORMAT } from './error-codes.js';
 const DEFAULT_HTTP_TIMEOUT_MS = 30_000;
 function relationshipFields(meta) {
     return Object.fromEntries(['owner', 'ownership', 'ownership_proof', 'ownership_release'].filter((key) => Object.hasOwn(meta, key)).map((key) => [key, meta[key]]));
@@ -48,7 +49,7 @@ export function updateOwnershipAgentMd(content, fields) {
     document.delete('ownership_release');
     for (const [name, value] of Object.entries(fields))
         document.set(name, value);
-    const yamlText = document.toString().replace(/\r\n/g, '\n');
+    const yamlText = document.toString({ lineWidth: 0, blockQuote: 'literal' }).replace(/\r\n/g, '\n');
     const updated = `${payload.startsWith('\ufeff') ? '\ufeff' : ''}---\n${yamlText.endsWith('\n') ? yamlText : `${yamlText}\n`}---${match[2]}`;
     validateAgentMdDocument(updated, { expectedAid: String(frontmatter.aid ?? '') });
     return updated;
@@ -193,21 +194,6 @@ function requestText(url, opts) {
     });
 }
 export class AgentMdManager {
-    static _commitListeners = new Map();
-    static _commitRoot(aunPath) {
-        const root = path.resolve(aunPath, 'AIDs');
-        return process.platform === 'win32' ? root.toLowerCase() : root;
-    }
-    static subscribeCommits(aunPath, callback) {
-        const root = this._commitRoot(aunPath), listeners = this._commitListeners.get(root) ?? new Set();
-        listeners.add(callback);
-        this._commitListeners.set(root, listeners);
-        return () => {
-            listeners.delete(callback);
-            if (!listeners.size && this._commitListeners.get(root) === listeners)
-                this._commitListeners.delete(root);
-        };
-    }
     _aunPath;
     _verifySsl;
     _log;
@@ -278,7 +264,7 @@ export class AgentMdManager {
     safeAid(aid) {
         const target = String(aid ?? '').trim();
         if (!target || target.includes('/') || target.includes('\\') || target.includes('\0')) {
-            throw new ValidationError('agent.md aid is empty or contains path separators');
+            throw new ValidationError('agent.md aid is empty or contains path separators', { stringCode: INVALID_AID_FORMAT });
         }
         this._aidValidator?.(target);
         return target;
@@ -310,7 +296,9 @@ export class AgentMdManager {
                 loaded.local_etag = AgentMdManager.contentEtag(content);
             }
             catch (err) {
-                if (fs.existsSync(this.metaPath(target))) {
+                delete loaded.content;
+                delete loaded.local_etag;
+                if (err?.code !== 'ENOENT' && fs.existsSync(this.metaPath(target))) {
                     this._log.warn(`agent.md content read failed: aid=${target} err=${err instanceof Error ? err.message : String(err)}`);
                 }
             }
@@ -336,9 +324,6 @@ export class AgentMdManager {
     loadRecord(aid) {
         return this._loadRecord(aid);
     }
-    listRecordedAids() {
-        return fs.readdirSync(this.root, { withFileTypes: true }).filter((entry) => entry.isDirectory() && fs.existsSync(path.join(this.root, entry.name, 'agentmd.json'))).map((entry) => this.safeAid(entry.name));
-    }
     updateRecord(aid, change) {
         const target = this.safeAid(aid);
         this._withRecordLock(target, () => {
@@ -350,11 +335,24 @@ export class AgentMdManager {
         this._cache.delete(target);
     }
     setOnCommitted(callback) { this._onCommitted = callback; }
+    async _saveCommittedRecord(aid, fields, strict = false) {
+        const pending = this._loadRecord(aid, true)?.pending_agent_md_notice;
+        const saved = this._saveRecord(aid, fields, strict);
+        if (saved.aid && pending?.message_id && this._onCommitted) {
+            const notice = (Array.isArray(saved.agent_md_change_outbox) ? saved.agent_md_change_outbox : []).find((item) => item.message_id === pending.message_id);
+            if (notice) {
+                try {
+                    await this._onCommitted(aid, notice);
+                }
+                catch { }
+            }
+        }
+        return saved;
+    }
     _saveRecord(aid, fields, strict = false, observation) {
         const target = String(aid ?? '').trim();
         if (!target)
             return {};
-        let completedNotice = false;
         try {
             const inputFields = { ...fields };
             const hasContent = Object.prototype.hasOwnProperty.call(inputFields, 'content') && inputFields.content !== undefined && inputFields.content !== null;
@@ -369,7 +367,6 @@ export class AgentMdManager {
                         outbox.push(notice);
                     inputFields.agent_md_change_outbox = outbox;
                     inputFields.pending_agent_md_notice = {};
-                    completedNotice = true;
                 }
                 if (observation && (this.root !== observation.root || String(next.remote_etag ?? '') !== observation.etag || Number(next.observation_version ?? 0) !== observation.version))
                     throw ownershipFailure('unavailable', 'agent.md observation changed during download', true);
@@ -398,21 +395,16 @@ export class AgentMdManager {
             }
             else {
                 const current = this._loadRecord(target, strict);
-                if (current && typeof current.content === 'string')
+                if (current && typeof current.content === 'string') {
                     loaded.content = current.content;
-            }
-            this._cache.set(target, { ...loaded });
-            if (completedNotice) {
-                const listeners = new Set(AgentMdManager._commitListeners.get(AgentMdManager._commitRoot(this._aunPath)));
-                if (this._onCommitted)
-                    listeners.add(this._onCommitted);
-                for (const callback of listeners) {
-                    try {
-                        callback(target);
-                    }
-                    catch { }
+                    loaded.local_etag = current.local_etag;
+                }
+                else {
+                    delete loaded.content;
+                    delete loaded.local_etag;
                 }
             }
+            this._cache.set(target, { ...loaded });
             return { ...loaded };
         }
         catch (err) {
@@ -658,15 +650,15 @@ export class AgentMdManager {
                 if (!identity || identity.aid !== aid || this._currentAid()?.aid !== aid || this._ownerAid() !== aid)
                     throw ownershipFailure('forbidden', 'body recovery requires its current subject identity');
                 await this._verifyDocument(pending.content, aid, identity, true, true);
-                const remote = await this.readAgentMdFresh(aid);
-                if (!remote.exists || !isDeepStrictEqual(legacyRelationship(meta), legacyRelationship(validateAgentMdReadDocument(remote.content, { expectedAid: aid }).frontmatter)))
-                    throw ownershipFailure('conflict', 'pending agent.md relationship material changed');
+                const remote = await this.readOwnershipFresh(aid);
+                if (remote.lock === 'locked' && (!remote.exists || !isDeepStrictEqual(legacyRelationship(meta), legacyRelationship(validateAgentMdReadDocument(remote.content, { expectedAid: aid }).frontmatter))))
+                    throw ownershipFailure('conflict', 'locked agent.md relationship material must remain unchanged');
                 if (remote.etag === pending.content_etag && remote.content === pending.content) {
-                    this.saveRecord(aid, { content: pending.content, remote_etag: remote.etag, pending_operation: '', pending_content: '', pending_content_etag: '', pending_error: '', pending_condition: {}, pending_relation: {}, pending_authorization: '' });
+                    await this._saveCommittedRecord(aid, { content: pending.content, remote_etag: remote.etag, pending_operation: '', pending_content: '', pending_content_etag: '', pending_error: '', pending_condition: {}, pending_relation: {}, pending_authorization: '' });
                     this._clearConfirmedDraft(aid, pending.content);
                     return true;
                 }
-                if (!condition.if_match || remote.etag !== condition.if_match)
+                if (condition.if_match && (!remote.exists || remote.etag !== condition.if_match) || condition.if_none_match === '*' && remote.exists)
                     throw ownershipFailure('conflict', 'pending agent.md original document condition changed');
                 await this._uploadPrepared(aid, pending.content, identity, condition);
                 return true;
@@ -689,7 +681,7 @@ export class AgentMdManager {
                 await this._verifyDocument(pending.content, aid, identity, true);
                 const remote = await this._readEntityFresh(aid);
                 if (remote.exists && remote.content === pending.content && remote.etag === pending.content_etag) {
-                    const saved = this.saveRecord(aid, { content: pending.content, remote_etag: remote.etag, pending_operation: '', pending_content: '', pending_content_etag: '', pending_error: '', pending_condition: {}, pending_relation: {}, pending_authorization: '' });
+                    const saved = await this._saveCommittedRecord(aid, { content: pending.content, remote_etag: remote.etag, pending_operation: '', pending_content: '', pending_content_etag: '', pending_error: '', pending_condition: {}, pending_relation: {}, pending_authorization: '' });
                     if (!saved.aid)
                         throw new StateError('agent.md pending completion persistence failed');
                     this._clearConfirmedDraft(aid, pending.content);
@@ -713,9 +705,9 @@ export class AgentMdManager {
                 throw new StateError('pending agent.md requires a signer identity');
             if (!multipleSignatures)
                 verifyAgentMdBodyUpdate(pending.content, identity.certPem, aid);
-            const remote = await this.readAgentMdFresh(aid);
+            const remote = await this.readOwnershipFresh(aid);
             if (remote.exists && remote.etag === pending.content_etag && remote.content === pending.content) {
-                const saved = this.saveRecord(aid, { content: pending.content, remote_etag: remote.etag, pending_operation: '', pending_content: '', pending_content_etag: '', pending_error: '', pending_condition: {}, pending_relation: {}, pending_authorization: '' });
+                const saved = await this._saveCommittedRecord(aid, { content: pending.content, remote_etag: remote.etag, pending_operation: '', pending_content: '', pending_content_etag: '', pending_error: '', pending_condition: {}, pending_relation: {}, pending_authorization: '' });
                 if (!saved.aid)
                     throw new StateError('agent.md pending completion persistence failed');
                 this._clearConfirmedDraft(aid, pending.content);
@@ -723,8 +715,8 @@ export class AgentMdManager {
             }
             if (condition.if_match && (!remote.exists || remote.etag !== condition.if_match) || condition.if_none_match === '*' && remote.exists)
                 throw ownershipFailure('conflict', 'pending agent.md original document condition changed');
-            if (remote.exists && legacyRelationship(validateAgentMdReadDocument(remote.content, { expectedAid: aid }).frontmatter))
-                throw ownershipFailure('conflict', 'legacy relationship material cannot be removed or replaced');
+            if (remote.lock === 'locked' && remote.exists && legacyRelationship(validateAgentMdReadDocument(remote.content, { expectedAid: aid }).frontmatter))
+                throw ownershipFailure('conflict', 'locked agent.md relationship material must remain unchanged');
             await this._uploadPrepared(aid, pending.content, identity, condition);
             return true;
         }
@@ -746,19 +738,24 @@ export class AgentMdManager {
         let condition = originalCondition;
         let relation = entityContext ?? (this._pendingUpload(target, draftStrict))?.relation;
         if (!condition) {
-            const fresh = entity ? await this._readEntityFresh(target) : legacy ? await this._readLegacyBodyBase(target) : await this.readAgentMdFresh(target);
+            const fresh = entity ? await this._readEntityFresh(target) : await this._readBodyOriginalFresh(target);
             condition = fresh.exists ? { if_match: fresh.etag } : { if_none_match: '*' };
             if (!entity) {
-                if (legacy) {
-                    if (!fresh.exists || !fresh.etag || !isDeepStrictEqual(legacy, legacyRelationship(validateAgentMdReadDocument(fresh.content, { expectedAid: target }).frontmatter)))
-                        throw ownershipFailure('conflict', 'legacy relationship material must remain unchanged');
+                // 锁未知时按 locked 处理：关系字段必须与原件完全一致
+                const locked = 'lock' in fresh && fresh.lock !== 'unlocked';
+                const original = fresh.exists ? legacyRelationship(validateAgentMdReadDocument(fresh.content, { expectedAid: target }).frontmatter) : undefined;
+                if (locked && !isDeepStrictEqual(legacy, original))
+                    throw ownershipFailure('conflict', 'locked agent.md relationship material must remain unchanged');
+                if (original)
+                    await this._verifyLegacyBodyContent(target, fresh.content);
+                if (legacy && locked)
                     relation = { legacy: true, base_content: fresh.content, base_content_etag: AgentMdManager.contentEtag(fresh.content), base_etag: fresh.etag, fields: legacy };
+                else if (legacy) {
+                    const statement = parseOwnershipFile(signedContent, 'agent', { expectedSubAid: target }).statement;
+                    relation = { relation_version: statement.relation_version, lock: 'unlocked', owner_aid: statement.owner_aid, statement };
                 }
-                else {
-                    if (fresh.exists && legacyRelationship(validateAgentMdReadDocument(fresh.content, { expectedAid: target }).frontmatter))
-                        throw ownershipFailure('conflict', 'legacy relationship material cannot be removed or replaced');
+                else
                     relation = undefined;
-                }
             }
         }
         const uploader = this._currentAid();
@@ -767,7 +764,8 @@ export class AgentMdManager {
         const ownership = isJsonObject(meta.ownership) ? meta.ownership : {};
         const statement = isJsonObject(ownership.statement) ? ownership.statement : {};
         const noticeOwner = String(statement.owner_aid ?? ownership.owner_aid ?? meta.owner ?? '').trim();
-        const previousNotice = existing?.pending_content === signedContent && isJsonObject(existing.pending_agent_md_notice) ? existing.pending_agent_md_notice : null;
+        const previousNotice = existing?.pending_content === signedContent && isJsonObject(existing.pending_agent_md_notice) ? existing.pending_agent_md_notice
+            : (Array.isArray(existing?.agent_md_change_outbox) ? existing.agent_md_change_outbox : []).find((item) => item.aid === target && item.owner_aid === noticeOwner && item.sender_aid === (uploader?.aid ?? this._ownerAid()) && item.etag === AgentMdManager.contentEtag(signedContent));
         const notice = previousNotice ?? { sender_aid: uploader?.aid ?? this._ownerAid(), owner_aid: noticeOwner, aid: target, document_type: String(meta.type ?? 'agent'), message_id: crypto.randomUUID() };
         const pending = this._saveRecord(target, { pending_operation: 'replace', pending_target_aid: target, pending_content: signedContent, pending_content_etag: AgentMdManager.contentEtag(signedContent), pending_error: '', pending_condition: condition, pending_relation: relation, pending_authorization: entityAuthorization, pending_agent_md_notice: notice }, draftStrict);
         const savedCondition = pending.pending_condition;
@@ -781,7 +779,7 @@ export class AgentMdManager {
             const authorization = entity ? entityAuthorization : delegated ? this._ownerUploadAuthorization(target, signedContent, owner) : '';
             const result = await this._uploadHttp(target, signedContent, authorization, condition);
             const remoteEtag = String(result.etag ?? '').trim();
-            const saved = this._saveRecord(target, {
+            const saved = await this._saveCommittedRecord(target, {
                 content: signedContent, local_etag: AgentMdManager.contentEtag(signedContent), remote_etag: remoteEtag || undefined,
                 last_modified: String(result.last_modified ?? result.lastModified ?? '').trim(), fetched_at: Date.now(), checked_at: Date.now(),
                 remote_status: remoteEtag ? 'found' : 'unknown', last_error: '',
@@ -808,8 +806,19 @@ export class AgentMdManager {
             throw ownershipFailure('invalid', 'stored legacy agent.md signature is invalid');
         return parsed;
     }
+    // 普通正文更新先严格读取以取得 NS 锁；关系 invalid/unavailable 时不阻断，回落普通原件读取，锁未知
+    async _readBodyOriginalFresh(target) {
+        try {
+            return await this.readOwnershipFresh(target);
+        }
+        catch (error) {
+            if (!(error instanceof AUNError) || !['invalid', 'unavailable'].includes(error.stringCode))
+                throw error;
+            return { ...await this.readAgentMdFresh(target), lock: 'unknown' };
+        }
+    }
     async _readLegacyBodyBase(target) {
-        const response = await this.readAgentMdFresh(target);
+        const response = await this._readBodyOriginalFresh(target);
         if (response.exists)
             await this._verifyLegacyBodyContent(target, response.content);
         return response;
@@ -832,7 +841,7 @@ export class AgentMdManager {
         if (!remote.exists)
             throw ownershipFailure('conflict', 'pending legacy agent.md original document is missing');
         if (remote.content === pending.content && remote.etag === pending.content_etag) {
-            const saved = this.saveRecord(target, { content: pending.content, remote_etag: remote.etag, pending_operation: '', pending_content: '', pending_content_etag: '', pending_error: '', pending_condition: {}, pending_relation: {}, pending_authorization: '' });
+            const saved = await this._saveCommittedRecord(target, { content: pending.content, remote_etag: remote.etag, pending_operation: '', pending_content: '', pending_content_etag: '', pending_error: '', pending_condition: {}, pending_relation: {}, pending_authorization: '' });
             if (!saved.aid)
                 throw new StateError('agent.md pending completion persistence failed');
             this._clearConfirmedDraft(target, pending.content);