evolcore 0.0.10 → 0.0.12

package/dist/config/contact-request-service.js

@@ -1,6 +1,5 @@
 import crypto from 'crypto';
 import fs from 'fs';
-import path from 'path';
 import { isValidAid } from '../aun/aid/validation.js';
 import { agentContactOperations } from '../paths.js';
 import { listStaticAgentAdmins, listStaticAgentOwners } from './peer-role-resolver.js';
@@ -12,6 +11,7 @@ export const CONTACT_REQUEST_MAX_PER_WINDOW = 3;
 export const CONTACT_REQUEST_MAX_PENDING = 100;
 export const CONTACT_REQUEST_MAX_RETAINED = 1000;
 export const CONTACT_REQUEST_NOTE_MAX_LENGTH = 500;
+export const CONTACT_REQUEST_ID_MAX_LENGTH = 128;
 export async function mutateContactWithOperation(input) {
     const at = new Date(input.now ?? Date.now()).toISOString();
     const logFile = agentContactOperations(input.selfAid);
@@ -26,7 +26,7 @@ export async function mutateContactWithOperation(input) {
             mutation: input.mutation,
             actor: input.actorId,
             value: undefined,
-            beforeCommit: ({ contactRevision: nextRevision }) => appendOperationRecords(logFile, [operationRecord({
+            beforeCommit: ({ contactRevision: nextRevision }) => operationLogChange(logFile, [operationRecord({
                     at,
                     op: input.operation,
                     primaryId: input.primaryId,
@@ -73,7 +73,17 @@ export async function submitContactRequest(input) {
             && Date.parse(record.at) > windowStart
             && Date.parse(record.at) <= nowMs)).length;
         if (recentCount >= CONTACT_REQUEST_MAX_PER_WINDOW) {
-            return preparedWithExpirations(expiration, { code: 'rate-limited', contactRevision: '' }, logFile);
+            return preparedWithExpirations(expiration, {
+                code: 'rate-limited',
+                ...(effectiveEntry?.status === 'pending' && effectiveEntry.pendingRequest
+                    ? {
+                        requestId: effectiveEntry.pendingRequest.id,
+                        submittedAt: effectiveEntry.pendingRequest.submittedAt,
+                        expiresAt: effectiveEntry.pendingRequest.expiresAt,
+                    }
+                    : {}),
+                contactRevision: '',
+            }, logFile);
         }
         const counts = countRequestRecordsAfterExpirations(contact, nowMs);
         const isExistingPending = effectiveEntry?.status === 'pending';
@@ -103,13 +113,14 @@ export async function submitContactRequest(input) {
             mutation: { type: 'batch', mutations },
             actor: applicantAid,
             value,
-            beforeCommit: ({ contactRevision }) => appendOperationRecords(logFile, [
+            beforeCommit: ({ contactRevision }) => operationLogChange(logFile, [
                 ...expiration.events.map(event => ({ ...event, contactRevision })),
                 operationRecord({
                     at: nowIso,
                     op,
                     primaryId: applicantAid,
                     requestId,
+                    expiresAt,
                     sourceChannelKey: input.sourceChannelKey,
                     ...(note ? { note } : {}),
                     contactRevision,
@@ -143,6 +154,10 @@ export async function reviewContactRequest(input) {
             if (!entry || entry.status !== 'pending' || entry.pendingRequest?.id !== input.requestId) {
                 return preparedNoop({ code: 'request-stale', contactRevision });
             }
+            const requestMetadata = {
+                requestId: entry.pendingRequest.id,
+                expiresAt: entry.pendingRequest.expiresAt,
+            };
             if (Date.parse(entry.pendingRequest.expiresAt) <= nowMs) {
                 const mutation = {
                     type: 'expire-request',
@@ -153,8 +168,8 @@ export async function reviewContactRequest(input) {
                 return {
                     mutation,
                     actor: input.actorId,
-                    value: { code: 'request-expired', contactRevision },
-                    beforeCommit: ({ contactRevision: nextRevision }) => appendOperationRecords(logFile, [operationRecord({
+                    value: { code: 'request-expired', contactRevision, ...requestMetadata },
+                    beforeCommit: ({ contactRevision: nextRevision }) => operationLogChange(logFile, [operationRecord({
                             at: nowIso,
                             op: 'expire',
                             primaryId: input.primaryId,
@@ -177,8 +192,8 @@ export async function reviewContactRequest(input) {
                     now: nowIso,
                 },
                 actor: input.actorId,
-                value: { code, contactRevision },
-                beforeCommit: ({ contactRevision: nextRevision }) => appendOperationRecords(logFile, [operationRecord({
+                value: { code, contactRevision, ...requestMetadata },
+                beforeCommit: ({ contactRevision: nextRevision }) => operationLogChange(logFile, [operationRecord({
                         at: nowIso,
                         op: input.decision === 'approve' ? 'approve' : input.decision === 'reject' ? 'reject' : 'block',
                         primaryId: input.primaryId,
@@ -208,7 +223,7 @@ export async function expirePendingContactRequests(selfAid, now = Date.now()) {
             mutation: { type: 'batch', mutations: expiration.mutations },
             actor: 'contact-request-expiry',
             value: expiration.mutations.length,
-            beforeCommit: ({ contactRevision }) => appendOperationRecords(logFile, expiration.events.map(event => ({ ...event, contactRevision }))),
+            beforeCommit: ({ contactRevision }) => operationLogChange(logFile, expiration.events.map(event => ({ ...event, contactRevision }))),
         };
     });
     return result.value;
@@ -226,6 +241,91 @@ export async function listPendingContactRequests(selfAid, now = Date.now()) {
     }))));
     return result.value;
 }
+/** Return only the authenticated applicant's own admission/request state. */
+export async function queryOwnContactRequestStatus(input) {
+    const applicantAid = String(input.applicantAid || '').trim();
+    if (!isValidAid(applicantAid))
+        return protocolResult('NOT_ALLOWED');
+    const now = input.now ?? Date.now();
+    const rawRequestId = input.requestId;
+    if (rawRequestId !== undefined && typeof rawRequestId !== 'string')
+        return protocolResult('NOT_ALLOWED');
+    const requestedRequestId = rawRequestId?.trim();
+    if (requestedRequestId !== undefined
+        && (!requestedRequestId || requestedRequestId.length > CONTACT_REQUEST_ID_MAX_LENGTH)) {
+        return protocolResult('NOT_ALLOWED');
+    }
+    const owners = listAgentOwners(input.selfAid);
+    const result = await mutateContactBookPrepared(input.selfAid, ({ contact }) => {
+        const logFile = agentContactOperations(input.selfAid);
+        const expiration = collectExpiredMutations(contact, now);
+        const entry = effectiveEntryAfterExpirations(contact.contacts[applicantAid], now);
+        const operations = readOperationLog(logFile).filter(record => record.primaryId === applicantAid);
+        const latestRequestOperation = [...operations].reverse().find(record => (!!record.requestId
+            && (record.op === 'request' || record.op === 'resubmit' || record.op === 'approve'
+                || record.op === 'reject' || record.op === 'expire' || record.op === 'block')));
+        if (requestedRequestId !== undefined && latestRequestOperation?.requestId !== requestedRequestId) {
+            return preparedNoop(protocolResult('NOT_ALLOWED'));
+        }
+        const requestMetadata = requestMetadataFor(operations, latestRequestOperation?.requestId);
+        let value;
+        if (owners.includes(applicantAid)
+            || (entry && (entry.status === undefined || entry.status === 'active'))) {
+            value = protocolResult('APPROVED', requestMetadata);
+        }
+        else if (entry?.status === 'blocked') {
+            value = protocolResult('NOT_ALLOWED');
+        }
+        else if (entry?.status === 'pending' && entry.pendingRequest) {
+            value = protocolResult('PENDING', {
+                requestId: entry.pendingRequest.id,
+                expiresAt: entry.pendingRequest.expiresAt,
+            });
+        }
+        else if (entry?.status === 'declined') {
+            value = protocolResult('EXPIRED', {
+                requestId: latestRequestOperation?.op === 'expire' ? latestRequestOperation.requestId : requestMetadata.requestId,
+                expiresAt: entry.declinedAt ?? requestMetadata.expiresAt,
+            });
+        }
+        else if (latestRequestOperation?.op === 'reject') {
+            value = protocolResult('REJECTED', requestMetadata);
+        }
+        else if (latestRequestOperation?.op === 'expire') {
+            value = protocolResult('EXPIRED', requestMetadata);
+        }
+        else if (owners.length === 0) {
+            value = protocolResult('NOT_ALLOWED');
+        }
+        else {
+            value = protocolResult('CONTACT_REQUIRED');
+        }
+        if (expiration.mutations.length === 0)
+            return preparedNoop(value);
+        return {
+            mutation: { type: 'batch', mutations: expiration.mutations },
+            actor: 'contact-request-expiry',
+            value,
+            beforeCommit: ({ contactRevision }) => operationLogChange(logFile, expiration.events.map(event => ({ ...event, contactRevision }))),
+        };
+    });
+    return result.value;
+}
+export function contactRequestSubmissionProtocolResult(result) {
+    const metadata = { requestId: result.requestId, expiresAt: result.expiresAt };
+    switch (result.code) {
+        case 'submitted':
+        case 'resubmitted':
+            return protocolResult('SUBMITTED', metadata);
+        case 'already-contact':
+        case 'owner':
+            return protocolResult('APPROVED', metadata);
+        case 'rate-limited':
+            return protocolResult('RATE_LIMITED', metadata);
+        default:
+            return protocolResult('NOT_ALLOWED', metadata);
+    }
+}
 export function findContactRequestNote(selfAid, requestId) {
     const records = readOperationLog(agentContactOperations(selfAid));
     return [...records].reverse().find(record => (record.requestId === requestId
@@ -237,6 +337,24 @@ function normalizeNote(value) {
         return null;
     return note;
 }
+function requestMetadataFor(operations, requestId) {
+    if (!requestId)
+        return {};
+    const submitted = [...operations].reverse().find(record => (record.requestId === requestId && (record.op === 'request' || record.op === 'resubmit')));
+    const submittedAt = submitted ? Date.parse(submitted.at) : Number.NaN;
+    return {
+        requestId,
+        expiresAt: submitted?.expiresAt
+            ?? (Number.isFinite(submittedAt) ? new Date(submittedAt + CONTACT_REQUEST_TTL_MS).toISOString() : undefined),
+    };
+}
+function protocolResult(status, metadata = {}) {
+    return {
+        status,
+        requestId: metadata.requestId ?? null,
+        expiresAt: metadata.expiresAt ?? null,
+    };
+}
 function collectExpiredMutations(book, now) {
     const mutations = [];
     const events = [];
@@ -286,7 +404,7 @@ function preparedWithExpirations(expiration, value, logFile) {
         mutation: { type: 'batch', mutations: expiration.mutations },
         actor: 'contact-request-expiry',
         value,
-        beforeCommit: ({ contactRevision }) => appendOperationRecords(logFile, expiration.events.map(event => ({ ...event, contactRevision }))),
+        beforeCommit: ({ contactRevision }) => operationLogChange(logFile, expiration.events.map(event => ({ ...event, contactRevision }))),
     };
 }
 function preparedNoop(value) {
@@ -310,7 +428,14 @@ function readOperationLog(file) {
             const record = JSON.parse(line);
             if (!record || typeof record !== 'object' || typeof record.at !== 'string'
                 || !Number.isFinite(Date.parse(record.at)) || typeof record.op !== 'string'
-                || typeof record.primaryId !== 'string')
+                || !['request', 'resubmit', 'approve', 'reject', 'expire', 'block', 'unblock', 'manual-add'].includes(record.op)
+                || typeof record.primaryId !== 'string' || !isValidAid(record.primaryId)
+                || (record.requestId !== undefined && typeof record.requestId !== 'string')
+                || (record.expiresAt !== undefined && (!isValidIsoDate(record.expiresAt)))
+                || (record.actorId !== undefined && typeof record.actorId !== 'string')
+                || (record.sourceChannelKey !== undefined && typeof record.sourceChannelKey !== 'string')
+                || (record.note !== undefined && (typeof record.note !== 'string' || record.note.length > CONTACT_REQUEST_NOTE_MAX_LENGTH))
+                || typeof record.contactRevision !== 'string')
                 throw new Error('invalid record');
             records.push(record);
         }
@@ -320,11 +445,32 @@ function readOperationLog(file) {
     }
     return records;
 }
-function appendOperationRecords(file, records) {
+function isValidIsoDate(value) {
+    return Number.isFinite(Date.parse(value));
+}
+function operationLogChange(file, records) {
     if (records.length === 0)
-        return;
-    fs.mkdirSync(path.dirname(file), { recursive: true });
-    fs.appendFileSync(file, `${records.map(record => JSON.stringify(record)).join('\n')}\n`, 'utf8');
+        return undefined;
+    // Validate the existing log while the Contact Book lock is held. The log is
+    // part of the same journal transaction as contact.json, so a malformed log
+    // must fail closed before either file is changed.
+    readOperationLog(file);
+    let before;
+    try {
+        before = fs.readFileSync(file, 'utf8');
+    }
+    catch (error) {
+        if (error?.code === 'ENOENT')
+            before = null;
+        else
+            throw error;
+    }
+    const prefix = before && !before.endsWith('\n') ? `${before}\n` : (before ?? '');
+    return {
+        file,
+        before,
+        after: `${prefix}${records.map(record => JSON.stringify(record)).join('\n')}\n`,
+    };
 }
 function operationRecord(input) {
     return { id: `evt_${crypto.randomUUID().replace(/-/g, '')}`, ...input };

package/dist/config/gateway-config.js

@@ -16,9 +16,11 @@ import path from 'path';
 import { resolvePaths } from '../paths.js';
 import { saveDefaultsSafe, saveAgent } from '../config-store.js';
 import { resolveAnthropicConfig, resolveEcagentConfig, resolveOpenaiConfig } from '../agents/baseagent.js';
+import { buildModelRequestHeaders } from '../agents/request-identity.js';
 import { resolvePriceRow } from '../stats/billing.js';
 import { ipcQuery } from '../ipc.js';
 import { logger } from '../utils/logger.js';
+import { ConfigTarget, read as readConfig } from './config-manager.js';
 /** 已知 baseagent 类型（网关可管理范围）。 */
 const GATEWAY_TYPES = ['claude', 'codex', 'gemini', 'ecagent'];
 const DISPLAY_NAMES = {
@@ -522,8 +524,10 @@ export async function gatewayDelete(args) {
 }
 /** 解析某 scope/type 的真实 baseUrl + apiKey（在 daemon 内展开 $ENV，不出站）。 */
 function resolveGatewayCreds(scope, type) {
-    const raw = scope === 'defaults' ? readDefaultsRaw() : readAgentRaw(scope);
-    const block = raw?.baseagents?.[type];
+    const expandedConfig = scope === 'defaults'
+        ? readConfig(ConfigTarget.Defaults, undefined, { expand: true, cache: true })
+        : readConfig(ConfigTarget.Agent, { self: scope }, { expand: true, cache: true });
+    const block = expandedConfig?.baseagents?.[type];
     if (!block)
         return { error: `${scope}/${type} 未配置`, code: 'NOT_FOUND' };
     const expanded = expandEnv(block);
@@ -531,15 +535,27 @@ function resolveGatewayCreds(scope, type) {
         const synth = { agents: { [type]: expanded } };
         if (type === 'codex') {
             const r = resolveOpenaiConfig(synth, expanded);
-            return { baseUrl: r.baseUrl, apiKey: r.apiKey };
+            return {
+                baseUrl: r.baseUrl,
+                apiKey: r.apiKey,
+                headers: buildModelRequestHeaders({ baseagent: 'codex', baseUrl: r.baseUrl, agentAid: scope === 'defaults' ? undefined : scope, configuredHeaders: r.headers }),
+            };
         }
         else if (type === 'claude') {
             const r = resolveAnthropicConfig(synth, expanded);
-            return { baseUrl: r.baseUrl, apiKey: r.apiKey };
+            return {
+                baseUrl: r.baseUrl,
+                apiKey: r.apiKey,
+                headers: buildModelRequestHeaders({ baseagent: 'claude', baseUrl: r.baseUrl, agentAid: scope === 'defaults' ? undefined : scope, configuredHeaders: r.headers }),
+            };
         }
         else if (type === 'ecagent') {
             const r = resolveEcagentConfig(synth, expanded);
-            return { baseUrl: r.baseUrl, apiKey: r.apiKey };
+            return {
+                baseUrl: r.baseUrl,
+                apiKey: r.apiKey,
+                headers: buildModelRequestHeaders({ baseagent: 'ecagent', baseUrl: r.baseUrl, agentAid: scope === 'defaults' ? undefined : scope, configuredHeaders: r.headers }),
+            };
         }
         return { error: 'gemini 暂不支持 HTTP 探测（CLI 后端）', code: 'NOT_SUPPORTED' };
     }
@@ -556,7 +572,7 @@ export async function gatewayTest(args) {
     const creds = resolveGatewayCreds(scope, type);
     if ('error' in creds)
         return creds;
-    const { baseUrl, apiKey } = creds;
+    const { baseUrl, apiKey, headers } = creds;
     if (!baseUrl)
         return { error: '未配置 baseUrl（或为官方占位地址）', code: 'INVALID_ARGS' };
     const start = Date.now();
@@ -566,7 +582,7 @@ export async function gatewayTest(args) {
         const base = baseUrl.replace(/\/+$/, '');
         const modelsUrl = base.endsWith('/v1') ? `${base}/models` : `${base}/v1/models`;
         const resp = await fetch(modelsUrl, {
-            headers: apiKey ? { Authorization: `Bearer ${apiKey}` } : {},
+            headers: { ...(apiKey ? { Authorization: `Bearer ${apiKey}` } : {}), ...headers },
             signal: controller.signal,
         });
         clearTimeout(timer);
@@ -614,7 +630,7 @@ export async function gatewayModels(args) {
     const creds = resolveGatewayCreds(scope, type);
     if ('error' in creds)
         return creds;
-    const { baseUrl, apiKey } = creds;
+    const { baseUrl, apiKey, headers } = creds;
     if (!baseUrl)
         return { error: '未配置 baseUrl（或为官方占位地址）', code: 'INVALID_ARGS' };
     let arr = [];
@@ -623,7 +639,7 @@ export async function gatewayModels(args) {
         const controller = new AbortController();
         const timer = setTimeout(() => controller.abort(), 8000);
         const resp = await fetch(`${baseUrl.replace(/\/+$/, '')}/v1/models`, {
-            headers: apiKey ? { Authorization: `Bearer ${apiKey}` } : {},
+            headers: { ...(apiKey ? { Authorization: `Bearer ${apiKey}` } : {}), ...headers },
             signal: controller.signal,
         });
         clearTimeout(timer);
@@ -906,7 +922,7 @@ function expandEnv(obj) {
     if (typeof obj === 'string') {
         if (obj.startsWith(ENV_PREFIX))
             return process.env[obj.slice(ENV_PREFIX.length)] ?? '';
-        return obj;
+        return obj.replace(/\$\{([A-Za-z_][A-Za-z0-9_]*)\}/g, (_, name) => process.env[name] ?? '');
     }
     if (Array.isArray(obj))
         return obj.map(expandEnv);

package/dist/config/mention-mode.js

@@ -1,27 +1,11 @@
-/**
- * mentionMode ↔ AUN 协议 dispatch_mode 词汇翻译（单一事实源）。
- *
- * 配置层用 mentionMode（disabled / mention-only），AUN 协议层用 dispatch_mode
- * （broadcast / mention）。二者语义等价，仅词汇不同：
- *   - mention-only（只处理被 @ 的消息）≡ mention（仅被 @ 时响应）
- *   - disabled（关闭 mention 过滤）    ≡ broadcast（全部响应）
- *
- * 仅在协议边界（AUN resolver、render fallback）翻译；配置层、命令层一律用
- * mentionMode 词汇。
- */
-/** config → AUN 协议词汇；未知/未设值返回 undefined（回退服务端 dispatch_mode）。 */
-export function mentionModeToDispatch(mode) {
-    if (mode === 'mention-only')
-        return 'mention';
-    if (mode === 'disabled')
-        return 'broadcast';
-    return undefined;
-}
-/** AUN 协议词汇 → config；未知返回 undefined。 */
-export function dispatchToMentionMode(dispatch) {
-    if (dispatch === 'mention')
-        return 'mention-only';
-    if (dispatch === 'broadcast')
+/** AUN `mention_mode` and EvolCore `mentionMode` share these wire values. */
+export function normalizeMentionMode(mode) {
+    if (typeof mode !== 'string')
+        return undefined;
+    const normalized = mode.trim().toLowerCase();
+    if (normalized === 'disabled')
         return 'disabled';
+    if (normalized === 'mention-only' || normalized === 'mention_only')
+        return 'mention-only';
     return undefined;
 }

package/dist/core/agent-reload-coordinator.js

@@ -0,0 +1,53 @@
+export class AgentReloadBusyError extends Error {
+    aid;
+    busyCount;
+    code = 'AGENT_BUSY';
+    constructor(aid, busyCount) {
+        super(`Agent "${aid}" has ${busyCount} task(s) in progress`);
+        this.aid = aid;
+        this.busyCount = busyCount;
+        this.name = 'AgentReloadBusyError';
+    }
+}
+export class AgentReloadCoordinator {
+    deps;
+    inFlight = new Map();
+    constructor(deps) {
+        this.deps = deps;
+    }
+    busyCount(aid) {
+        return Math.max(0, this.deps.getBusyCount(aid));
+    }
+    runExclusive(aid, operation, options = {}) {
+        const previous = this.inFlight.get(aid) ?? Promise.resolve();
+        const pending = previous
+            .catch(() => undefined)
+            .then(async () => {
+            const releaseWorkGate = await this.deps.acquireWorkGate?.(aid);
+            try {
+                const busyCount = this.busyCount(aid);
+                if (!options.force && busyCount > 0)
+                    throw new AgentReloadBusyError(aid, busyCount);
+                if (options.force && busyCount > 0)
+                    await this.deps.forceReload?.(aid);
+                return await operation();
+            }
+            finally {
+                await releaseWorkGate?.();
+            }
+        });
+        this.inFlight.set(aid, pending);
+        return pending.finally(() => {
+            if (this.inFlight.get(aid) === pending)
+                this.inFlight.delete(aid);
+        });
+    }
+    reload(aid, options = {}) {
+        return this.runExclusive(aid, async () => {
+            if (!this.deps.registry.get(aid))
+                throw new Error(`Agent "${aid}" not found`);
+            await this.deps.beforeReload?.();
+            await this.deps.registry.reload(aid, this.deps.hooks);
+        }, options);
+    }
+}

package/dist/core/auth/agent-delegation.js

@@ -155,7 +155,6 @@ export function authorizeDelegatedAunMsgSend(registry, input) {
         channelId,
         chatType: grant.chatType,
         conversationId: channelId,
-        identity: { role: grant.issuedRole, mode: 'interactive' },
         processOwners: [],
         fromControlChannel: false,
     });