evolcore 0.0.20 → 0.0.22

package/dist/config/daemon-services.js

@@ -0,0 +1,186 @@
+const SERVICE_TYPES = new Set(['http', 'websocket', 'ssh']);
+const SERVICE_VISIBILITIES = new Set(['public', 'private', 'aun-auth']);
+export const DEFAULT_ECWEB_PORT = 42705;
+function isRecord(value) {
+    return !!value && typeof value === 'object' && !Array.isArray(value);
+}
+/**
+ * Convert the former `ecweb` + `serviceProxy` process configuration into the
+ * service-instance model. The function is intentionally idempotent and does
+ * not mutate its input.
+ */
+export function normalizeDaemonServices(raw, warn) {
+    if (!isRecord(raw))
+        return raw;
+    const next = { ...raw };
+    const hasLegacyEcweb = Object.prototype.hasOwnProperty.call(raw, 'ecweb');
+    const hasLegacyProxy = Object.prototype.hasOwnProperty.call(raw, 'serviceProxy');
+    const hasCanonicalServices = Object.prototype.hasOwnProperty.call(raw, 'services');
+    const services = [];
+    if (hasCanonicalServices) {
+        if (!Array.isArray(raw.services)) {
+            throw new Error('daemon.json.services must be an array');
+        }
+        for (const [index, value] of raw.services.entries()) {
+            if (!isRecord(value)) {
+                throw new Error(`daemon.json.services[${index}] must be an object`);
+            }
+            if (typeof value.name !== 'string' || value.name.trim() === '') {
+                throw new Error(`daemon.json.services[${index}].name must be a non-empty string`);
+            }
+            // Preserve the canonical object for schema validation. In particular,
+            // do not trim/drop fields here, otherwise malformed new-format config
+            // could be silently rewritten into a different valid-looking shape.
+            services.push({ ...value });
+        }
+    }
+    if (hasLegacyEcweb && !isRecord(raw.ecweb)) {
+        throw new Error('daemon.json.ecweb must be an object before it can be migrated');
+    }
+    if (hasLegacyProxy && !isRecord(raw.serviceProxy)) {
+        throw new Error('daemon.json.serviceProxy must be an object before it can be migrated');
+    }
+    const legacyEcweb = hasLegacyEcweb ? raw.ecweb : undefined;
+    const legacyProxy = hasLegacyProxy ? raw.serviceProxy : undefined;
+    if (legacyEcweb?.enabled !== undefined && typeof legacyEcweb.enabled !== 'boolean') {
+        throw new Error('daemon.json.ecweb.enabled must be a boolean before it can be migrated');
+    }
+    if (legacyEcweb?.port !== undefined && typeof legacyEcweb.port !== 'number') {
+        throw new Error('daemon.json.ecweb.port must be a number before it can be migrated');
+    }
+    if (legacyProxy?.enabled !== undefined && typeof legacyProxy.enabled !== 'boolean') {
+        throw new Error('daemon.json.serviceProxy.enabled must be a boolean before it can be migrated');
+    }
+    const legacyProxyServices = [];
+    if (legacyProxy?.services !== undefined) {
+        if (!Array.isArray(legacyProxy.services)) {
+            throw new Error('daemon.json.serviceProxy.services must be an array before it can be migrated');
+        }
+        for (const [index, value] of legacyProxy.services.entries()) {
+            if (!isRecord(value)) {
+                throw new Error(`daemon.json.serviceProxy.services[${index}] cannot be represented by source="instance"`);
+            }
+            if (value.enabled !== undefined && typeof value.enabled !== 'boolean') {
+                throw new Error(`daemon.json.serviceProxy.services[${index}].enabled must be a boolean before it can be migrated`);
+            }
+            if (value.visibility !== undefined && typeof value.visibility !== 'string') {
+                throw new Error(`daemon.json.serviceProxy.services[${index}].visibility must be a string before it can be migrated`);
+            }
+            legacyProxyServices.push(value);
+        }
+    }
+    const legacyEcwebProxy = legacyProxyServices.find((value) => value.name === 'ecweb');
+    const ecwebIndex = services.findIndex((service) => service.name === 'ecweb');
+    // Convert the former flat serviceProxy entries into canonical services[].
+    // Keep every service rather than silently dropping non-ecweb entries.
+    for (const legacy of legacyProxyServices) {
+        const name = typeof legacy.name === 'string' ? legacy.name : '';
+        if (!name || name === 'ecweb')
+            continue;
+        if (services.some((service) => service.name === name))
+            continue;
+        const source = legacy.source === 'ecweb'
+            ? 'instance'
+            : legacy.source === 'instance'
+                ? 'instance'
+                : typeof legacy.endpoint === 'string' && legacy.endpoint.trim()
+                    ? 'static'
+                    : 'static';
+        const proxy = {
+            enabled: legacyProxy?.enabled === true && legacy.enabled !== false,
+            source,
+            ...(typeof legacy.endpoint === 'string' ? { endpoint: legacy.endpoint } : {}),
+            ...(typeof legacy.serviceType === 'string' && SERVICE_TYPES.has(legacy.serviceType)
+                ? { serviceType: legacy.serviceType } : {}),
+            ...(typeof legacy.visibility === 'string' ? { visibility: legacy.visibility } : {}),
+            ...(isRecord(legacy.metadata) ? { metadata: { ...legacy.metadata } } : {}),
+        };
+        services.push({ name, enabled: true, proxy });
+    }
+    if (legacyEcweb || legacyEcwebProxy) {
+        const service = ecwebIndex >= 0
+            ? services[ecwebIndex]
+            : {
+                name: 'ecweb',
+                // The old ECWeb lifecycle switch and Service Proxy switch were
+                // independent. Preserve that distinction during migration: a
+                // proxy-only config must not start managing the local process.
+                enabled: legacyEcweb?.enabled === true,
+            };
+        if (legacyEcweb) {
+            if (service.enabled === undefined && typeof legacyEcweb.enabled === 'boolean')
+                service.enabled = legacyEcweb.enabled;
+            if (service.port === undefined && typeof legacyEcweb.port === 'number')
+                service.port = legacyEcweb.port;
+        }
+        if (service.proxy !== undefined && !isRecord(service.proxy)) {
+            throw new Error('daemon.json.services[ecweb].proxy must be an object before legacy proxy settings can be migrated');
+        }
+        const proxy = { ...(service.proxy ?? {}) };
+        if (legacyEcwebProxy) {
+            if (proxy.enabled === undefined) {
+                proxy.enabled = legacyProxy?.enabled === true && legacyEcwebProxy.enabled !== false;
+            }
+            if (proxy.source === undefined) {
+                proxy.source = legacyEcwebProxy.source === 'static'
+                    || (typeof legacyEcwebProxy.endpoint === 'string' && legacyEcwebProxy.endpoint.trim())
+                    ? 'static'
+                    : 'instance';
+            }
+            if (proxy.endpoint === undefined && typeof legacyEcwebProxy.endpoint === 'string')
+                proxy.endpoint = legacyEcwebProxy.endpoint;
+            if (proxy.serviceType === undefined && typeof legacyEcwebProxy.serviceType === 'string'
+                && SERVICE_TYPES.has(legacyEcwebProxy.serviceType)) {
+                proxy.serviceType = legacyEcwebProxy.serviceType;
+            }
+            if (proxy.visibility === undefined && typeof legacyEcwebProxy.visibility === 'string') {
+                proxy.visibility = legacyEcwebProxy.visibility;
+            }
+            if (proxy.metadata === undefined && isRecord(legacyEcwebProxy.metadata)) {
+                proxy.metadata = { ...legacyEcwebProxy.metadata };
+            }
+            if (proxy.enabled === true && proxy.visibility === undefined)
+                proxy.visibility = 'private';
+        }
+        if (Object.keys(proxy).length > 0)
+            service.proxy = proxy;
+        if (ecwebIndex < 0)
+            services.push(service);
+    }
+    if (hasCanonicalServices || services.length > 0)
+        next.services = services;
+    if (hasLegacyEcweb || hasLegacyProxy) {
+        warn?.('[config] daemon.json: ecweb/serviceProxy 已归一化为 services[]');
+        delete next.ecweb;
+        delete next.serviceProxy;
+    }
+    return next;
+}
+export function findService(services, name) {
+    return (services ?? []).find((service) => service.name === name);
+}
+export function ecwebService(services) {
+    return findService(services, 'ecweb');
+}
+export function upsertService(services, patch) {
+    const current = services ?? [];
+    const index = current.findIndex((service) => service.name === patch.name);
+    if (index < 0)
+        return [...current, patch];
+    const existing = current[index];
+    const replacement = {
+        ...existing,
+        ...patch,
+        ...(existing.proxy || patch.proxy
+            ? { proxy: { ...(existing.proxy ?? {}), ...(patch.proxy ?? {}) } }
+            : {}),
+    };
+    return current.map((service, serviceIndex) => serviceIndex === index ? replacement : service);
+}
+export function setEcwebEnabled(services, enabled, port = ecwebService(services)?.port ?? DEFAULT_ECWEB_PORT) {
+    return upsertService(services, {
+        name: 'ecweb',
+        enabled,
+        port,
+    });
+}

package/dist/config/gateway-config.js

@@ -17,6 +17,7 @@ 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 { appendV1RequestPath } from '../agents/request-identity.js';
 import { resolvePriceRow } from '../stats/billing.js';
 import { ipcQuery } from '../ipc.js';
 import { logger } from '../utils/logger.js';
@@ -541,6 +542,7 @@ function resolveGatewayCreds(scope, type) {
                 baseUrl: r.baseUrl,
                 apiKey: r.apiKey,
                 headers: buildModelRequestHeaders({ baseagent: 'codex', baseUrl: r.baseUrl, agentAid: scope === 'defaults' ? undefined : scope, configuredHeaders: r.headers }),
+                queryParams: r.queryParams,
             };
         }
         else if (type === 'claude') {
@@ -549,6 +551,7 @@ function resolveGatewayCreds(scope, type) {
                 baseUrl: r.baseUrl,
                 apiKey: r.apiKey,
                 headers: buildModelRequestHeaders({ baseagent: 'claude', baseUrl: r.baseUrl, agentAid: scope === 'defaults' ? undefined : scope, configuredHeaders: r.headers }),
+                queryParams: r.queryParams,
             };
         }
         else if (type === 'ecagent') {
@@ -557,6 +560,7 @@ function resolveGatewayCreds(scope, type) {
                 baseUrl: r.baseUrl,
                 apiKey: r.apiKey,
                 headers: buildModelRequestHeaders({ baseagent: 'ecagent', baseUrl: r.baseUrl, agentAid: scope === 'defaults' ? undefined : scope, configuredHeaders: r.headers }),
+                queryParams: r.queryParams,
             };
         }
         return { error: 'gemini 暂不支持 HTTP 探测（CLI 后端）', code: 'NOT_SUPPORTED' };
@@ -574,20 +578,19 @@ export async function gatewayTest(args) {
     const creds = resolveGatewayCreds(scope, type);
     if ('error' in creds)
         return creds;
-    const { baseUrl, apiKey, headers } = creds;
+    const { baseUrl, apiKey, headers, queryParams } = creds;
     if (!baseUrl)
         return { error: '未配置 baseUrl（或为官方占位地址）', code: 'INVALID_ARGS' };
     const start = Date.now();
+    let timer;
     try {
         const controller = new AbortController();
-        const timer = setTimeout(() => controller.abort(), 5000);
-        const base = baseUrl.replace(/\/+$/, '');
-        const modelsUrl = base.endsWith('/v1') ? `${base}/models` : `${base}/v1/models`;
+        timer = setTimeout(() => controller.abort(), 5000);
+        const modelsUrl = appendV1RequestPath(baseUrl, 'models', queryParams);
         const resp = await fetch(modelsUrl, {
             headers: { ...(apiKey ? { Authorization: `Bearer ${apiKey}` } : {}), ...headers },
             signal: controller.signal,
         });
-        clearTimeout(timer);
         const latency = Date.now() - start;
         if (!resp.ok)
             return { data: { ok: false, latency, error: `HTTP ${resp.status}` } };
@@ -600,6 +603,10 @@ export async function gatewayTest(args) {
     catch (e) {
         return { data: { ok: false, latency: Date.now() - start, error: e?.message || String(e) } };
     }
+    finally {
+        if (timer)
+            clearTimeout(timer);
+    }
 }
 /** 从 model-prices.jsonl 的 PriceRecord 提取展示用价格四元组。 */
 function priceRowToQuad(row) {
@@ -632,19 +639,19 @@ export async function gatewayModels(args) {
     const creds = resolveGatewayCreds(scope, type);
     if ('error' in creds)
         return creds;
-    const { baseUrl, apiKey, headers } = creds;
+    const { baseUrl, apiKey, headers, queryParams } = creds;
     if (!baseUrl)
         return { error: '未配置 baseUrl（或为官方占位地址）', code: 'INVALID_ARGS' };
     let arr = [];
     let usdToCny = 7; // 默认汇率
+    let timer;
     try {
         const controller = new AbortController();
-        const timer = setTimeout(() => controller.abort(), 8000);
-        const resp = await fetch(`${baseUrl.replace(/\/+$/, '')}/v1/models`, {
+        timer = setTimeout(() => controller.abort(), 8000);
+        const resp = await fetch(appendV1RequestPath(baseUrl, 'models', queryParams), {
             headers: { ...(apiKey ? { Authorization: `Bearer ${apiKey}` } : {}), ...headers },
             signal: controller.signal,
         });
-        clearTimeout(timer);
         if (!resp.ok)
             return { error: `HTTP ${resp.status}`, code: 'EXEC_FAILED' };
         const json = await resp.json().catch(() => null);
@@ -657,6 +664,10 @@ export async function gatewayModels(args) {
     catch (e) {
         return { error: `请求失败：${e?.message || e}`, code: 'EXEC_FAILED' };
     }
+    finally {
+        if (timer)
+            clearTimeout(timer);
+    }
     const evolcoreHome = resolvePaths().root;
     const now = Date.now();
     const models = arr.map((m) => {

package/dist/config/role-service.js

@@ -54,6 +54,18 @@ export function writeRoleDefinition(selfAid, roleId, value) {
     atomicWriteJson(file, normalized);
     clearRoleStoreCache(selfAid);
 }
+/** Remove an agent-local override so the builtin role template is used again. */
+export function resetRoleDefinition(selfAid, roleId) {
+    if (!isRoleName(roleId))
+        throw new RoleServiceError('INVALID_ROLE_ID', `Invalid role id: ${roleId}`);
+    const file = agentRoleConfig(selfAid, roleId);
+    const changed = fs.existsSync(file);
+    if (changed) {
+        fs.rmSync(file, { force: true });
+        clearRoleStoreCache(selfAid);
+    }
+    return changed;
+}
 export function registerRole(selfAid, roleId, definition) {
     if (!isRoleName(roleId))
         throw new RoleServiceError('INVALID_ROLE_ID', `Invalid role id: ${roleId}`);
@@ -72,17 +84,56 @@ export function registerRole(selfAid, roleId, definition) {
         throw error;
     }
 }
-export function unregisterRole(selfAid, roleId) {
+export function unregisterRole(selfAid, roleId, replacementRoleId) {
     if (roleId === 'visitor' || isManagementRole(roleId)) {
         throw new RoleServiceError('ROLE_PROTECTED', `Role ${roleId} cannot be unregistered`);
     }
     const registry = readRoleRegistry(selfAid);
     if (!registry.roles.includes(roleId))
         return;
+    const hasReplacement = replacementRoleId !== undefined;
+    const replacement = replacementRoleId === undefined ? undefined : (replacementRoleId || null);
+    if (replacement === roleId) {
+        throw new RoleServiceError('INVALID_REPLACEMENT_ROLE', 'replacementRoleId must differ from the role being deleted');
+    }
+    if (replacement !== undefined && replacement !== null) {
+        if (!isRoleName(replacement) || replacement === 'owner' || !registry.roles.includes(replacement)
+            || !hasValidRoleDefinition(selfAid, replacement)) {
+            throw new RoleServiceError('INVALID_REPLACEMENT_ROLE', `Invalid replacement role: ${replacement}`);
+        }
+    }
     const references = findRoleReferences(selfAid, roleId, registry);
-    if (references.length)
+    if (references.length && !hasReplacement) {
         throw new RoleServiceError('ROLE_IN_USE', `Role ${roleId} is still referenced`, { references });
-    writeRoleRegistry(selfAid, { ...registry, roles: registry.roles.filter(item => item !== roleId) });
+    }
+    const nextRegistry = {
+        ...registry,
+        roles: registry.roles.filter(item => item !== roleId),
+        defaultRoles: {
+            private: registry.defaultRoles.private === roleId ? (replacement ?? null) : registry.defaultRoles.private,
+            group: registry.defaultRoles.group === roleId ? (replacement ?? null) : registry.defaultRoles.group,
+        },
+    };
+    if (hasReplacement) {
+        const relations = agentRelationsDir(selfAid);
+        if (fs.existsSync(relations)) {
+            for (const entry of fs.readdirSync(relations, { withFileTypes: true })) {
+                if (!entry.isDirectory() || entry.name.startsWith('_'))
+                    continue;
+                const file = agentRelationConfig(selfAid, entry.name);
+                const config = atomicReadJson(file);
+                if (!config || config.role !== roleId)
+                    continue;
+                const next = { ...config };
+                if (replacement === null)
+                    delete next.role;
+                else
+                    next.role = replacement;
+                atomicWriteJson(file, next);
+            }
+        }
+    }
+    writeRoleRegistry(selfAid, nextRegistry);
     try {
         fs.rmSync(agentRoleConfig(selfAid, roleId), { force: true });
     }