evolcore 0.0.22 → 0.0.24

package/dist/cli/menu-client.js

@@ -0,0 +1,95 @@
+import fs from 'node:fs';
+import { getArgValue, wantsHelp } from './help.js';
+import { executeMenuClientRequest, MenuClientError } from '../aun/menu-client.js';
+function parseDurationMs(value) {
+    if (value === undefined)
+        return undefined;
+    const match = value.trim().match(/^(\d+(?:\.\d+)?)(ms|s|m|h)$/i);
+    if (!match)
+        throw new MenuClientError('INVALID_ARGUMENT', `Invalid timeout: ${value}`);
+    const amount = Number(match[1]);
+    const unit = match[2].toLowerCase();
+    return amount * (unit === 'ms' ? 1 : unit === 's' ? 1_000 : unit === 'm' ? 60_000 : 3_600_000);
+}
+function readRequest(args) {
+    const file = getArgValue(args, '--request-file');
+    const inline = getArgValue(args, '--request-json');
+    if (!!file === !!inline)
+        throw new MenuClientError('INVALID_ARGUMENT', '--request-file and --request-json are mutually exclusive');
+    let raw;
+    try {
+        raw = file ? fs.readFileSync(file, 'utf8') : inline;
+    }
+    catch (error) {
+        throw new MenuClientError('INVALID_ARGUMENT', `Unable to read request: ${error?.message ?? String(error)}`);
+    }
+    try {
+        const parsed = JSON.parse(raw);
+        if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed))
+            throw new Error('request must be a JSON object');
+        return parsed;
+    }
+    catch (error) {
+        throw new MenuClientError('INVALID_ARGUMENT', `Invalid request JSON: ${error?.message ?? String(error)}`);
+    }
+}
+function validateOptions(args) {
+    const valueOptions = new Set(['--request-file', '--request-json', '--timeout', '--remote-token', '--ecweb-token', '--app', '--aun-path', '--format']);
+    const booleanOptions = new Set(['--encrypt', '--no-encrypt']);
+    for (let index = 0; index < args.length; index += 1) {
+        const option = args[index];
+        if (booleanOptions.has(option))
+            continue;
+        if (!valueOptions.has(option))
+            throw new MenuClientError('INVALID_ARGUMENT', `Unknown menu-client option: ${option}`);
+        if (index + 1 >= args.length || args[index + 1].startsWith('--')) {
+            throw new MenuClientError('INVALID_ARGUMENT', `${option} requires a value`);
+        }
+        index += 1;
+    }
+    if (args.includes('--encrypt') && args.includes('--no-encrypt')) {
+        throw new MenuClientError('INVALID_ARGUMENT', '--encrypt and --no-encrypt are mutually exclusive');
+    }
+    const format = getArgValue(args, '--format');
+    if (format !== undefined && format !== 'json')
+        throw new MenuClientError('INVALID_ARGUMENT', '--format currently supports only json');
+}
+export async function cmdMenuClient(args) {
+    if (wantsHelp(args)) {
+        console.log(`用法: ec menu-client request <from-aid> <daemon-aid> [选项]
+
+  --request-file <path>    从 JSON 文件读取一个 menu.* 请求
+  --request-json <json>    直接传入一个 menu.* JSON 请求
+  --timeout <时长>         默认 15s，最大 120s
+  --encrypt                使用 E2EE（默认）
+  --no-encrypt             已拒绝：ec-menu-client 必须使用 E2EE
+  --remote-token <token>   使用 daemon 远程访问 token 临时授权
+  --ecweb-token <token>    --remote-token 的兼容别名
+  --app <slot>             覆盖默认 evolcore-menu-client 消费槽位
+  --aun-path <path>        覆盖本地 AUN keystore 根目录
+  --format json            输出标准 menu.response JSON`);
+        return;
+    }
+    if (args[0] !== 'request')
+        throw new MenuClientError('INVALID_ARGUMENT', 'menu-client currently supports only the request subcommand');
+    const fromAid = args[1]?.trim();
+    const targetAid = args[2]?.trim();
+    if (!fromAid || !targetAid)
+        throw new MenuClientError('INVALID_ARGUMENT', 'request requires <from-aid> and <daemon-aid>');
+    const options = args.slice(3);
+    validateOptions(options);
+    const request = readRequest(options);
+    const timeoutMs = parseDurationMs(getArgValue(args, '--timeout'));
+    const encrypt = args.includes('--no-encrypt') ? false : true;
+    const response = await executeMenuClientRequest({
+        fromAid,
+        targetAid,
+        request,
+        timeoutMs,
+        encrypt,
+        remoteAccessToken: getArgValue(args, '--remote-token') ?? getArgValue(args, '--ecweb-token'),
+        slotId: getArgValue(args, '--app'),
+        aunPath: getArgValue(args, '--aun-path'),
+    });
+    console.log(JSON.stringify(response, null, 2));
+}

package/dist/cli/model.js

@@ -13,7 +13,7 @@
 import { isHelpFlag, wantsHelp, getArgValue } from './help.js';
 import { ModelScopeError, normalizePeer, determineScope, activeBaseagent, writeScope, clearScope, } from '../core/model/config-scope.js';
 import { resolveEffectiveFieldWithSource } from '../config/config-manager.js';
-import { getCatalog, getModelInfo } from '../core/model/model-catalog.js';
+import { getCatalog, getModelInfo, catalogEfforts, resolveCatalogModel, assertCatalogSelectable } from '../core/model/model-catalog.js';
 import { constrainResolvedModelForRole, filterModelsForRole, validateModelSelectionForRole, } from '../core/model/model-permission.js';
 import { resolvePaths } from '../paths.js';
 import { ipcQuery } from '../ipc.js';
@@ -23,7 +23,7 @@ import { getFieldPermission } from '../config/roles.js';
 import { AGENT_DELEGATION_TOKEN_ENV } from '../core/auth/agent-delegation.js';
 import { formatModelCheck, runModelCheck } from '../core/model/model-diagnostics.js';
 import { validateRuntimeStringFieldOverride } from '../core/role/runtime-policy.js';
-const ALL_EFFORTS = ['low', 'medium', 'high', 'xhigh', 'max', 'auto'];
+const ALL_EFFORTS = ['none', 'minimal', 'low', 'medium', 'high', 'xhigh', 'max', 'auto'];
 const SCOPE_LABEL = {
     global: '全局', agent: 'agent级', role: '角色级', relation: '关系级',
 };
@@ -298,7 +298,7 @@ async function cmdList(args, formatJson) {
     const cat = await getCatalog(sel.self, ba);
     const resolved = resolveModelConfig(effectiveSel, ba);
     const allowedModelIds = role
-        ? filterModelsForRole(role, ba, cat.models.map(m => m.id), undefined, sel.self)
+        ? filterModelsForRole(role, ba, cat.models.map(m => m.id), model => resolveCatalogModel(cat, model), sel.self)
         : null;
     const models = allowedModelIds
         ? allowedModelIds.map(id => cat.models.find(m => m.id === id) ?? { id })
@@ -308,15 +308,21 @@ async function cmdList(args, formatJson) {
         effective: { model: resolved.model ?? null, source: resolved.source ?? null },
         role: role ?? null,
         catalogSource: cat.source,
+        freshness: cat.freshness,
+        revision: cat.revision,
+        fetchedAt: cat.fetchedAt,
+        diagnostics: cat.diagnostics,
         models,
     }, () => {
         const lines = [];
         lines.push(`当前生效: ${resolved.model ?? '(未设置，回落 SDK 默认)'}` +
             (resolved.source ? `  (来源: ${SCOPE_LABEL[resolved.source]})` : ''));
         lines.push('');
-        const srcTag = cat.source === 'mock' ? ' [mock]'
-            : cat.source === 'remote' ? ' [remote]'
-                : '';
+        if (resolved.model && !cat.models.some(m => m.id === resolved.model))
+            lines.push('当前配置未列入目录');
+        lines.push(...cat.diagnostics.map(d => d.message));
+        const srcTag = cat.freshness === 'fallback' ? ` [${cat.source}/unverified]`
+            : cat.freshness === 'stale' ? ' [stale]' : '';
         lines.push(`可用模型 (${models.length})${srcTag}:`);
         for (const e of models) {
             const live = resolved.model === e.id ? '✓' : ' ';
@@ -430,6 +436,7 @@ async function cmdUse(args, formatJson) {
     const ba = activeBaseagent(sel.self);
     // 校验模型在 catalog 中
     const cat = await getCatalog(sel.self, ba);
+    assertCatalogSelectable(cat);
     if (!cat.models.some(m => m.id === modelId)) {
         fail(formatJson, 'UNKNOWN_MODEL', `模型不在目录中: ${modelId}（model list 查看可用模型）`);
     }
@@ -439,14 +446,15 @@ async function cmdUse(args, formatJson) {
             baseagent: ba,
             requestedModel: modelId,
             models: cat.models.map(m => m.id),
+            resolveModelId: model => resolveCatalogModel(cat, model),
             selfAid: sel.self,
         });
         if (!decision.ok)
             fail(formatJson, decision.code || 'MODEL_NOT_ALLOWED', decision.message || `model not allowed: ${modelId}`);
     }
     const effort = getArgValue(args, '--effort');
-    if (effort !== undefined && !ALL_EFFORTS.includes(effort)) {
-        fail(formatJson, 'INVALID_EFFORT', `无效推理强度: ${effort}（${ALL_EFFORTS.join('/')})`);
+    if (effort !== undefined && effort !== 'auto' && !catalogEfforts(cat, modelId, ba).includes(effort)) {
+        fail(formatJson, 'INVALID_EFFORT', `当前模型目录未声明支持推理强度: ${effort}`);
     }
     const effortVal = effort === 'auto' ? null : (effort ?? undefined);
     if (isManagedTargetedWriteEnv(args)) {
@@ -492,6 +500,13 @@ async function cmdEffort(args, formatJson) {
     const scope = determineWriteScope(sel, formatJson);
     const ba = activeBaseagent(sel.self);
     const val = level === 'auto' ? null : level;
+    if (val) {
+        const cat = await getCatalog(sel.self, ba);
+        assertCatalogSelectable(cat);
+        const model = resolveModelConfig(selectorWithRole(sel, explicitOrDerivedRole(args, sel)), ba).model;
+        if (!model || !catalogEfforts(cat, model, ba).includes(val))
+            fail(formatJson, 'INVALID_EFFORT', `当前模型目录未声明支持推理强度: ${val}`);
+    }
     if (isManagedTargetedWriteEnv(args)) {
         const effortKey = 'effort';
         preflightManagedFieldOverride(sel, explicitOrDerivedRole(args, sel), `baseagents.${ba}.${effortKey}`, val, formatJson);