evolcore 0.0.2 → 0.0.3

package/dist/cli/init.js

@@ -64,27 +64,36 @@ export function parseOwnerAids(raw, isValid) {
 function installErrorMessage(e) {
     return String(e?.stderr || e?.message || e).trim();
 }
-async function ensureEcwebInstalledForInit() {
-    if (commandExists(WEB_CLI_BIN))
-        return true;
-    console.log(`  📦 EC Web 组件未安装，正在安装 ${WEB_PACKAGE_LATEST}...`);
+export async function ensureEcwebInstalledForInit(options = {}) {
+    const isInstalled = options.isInstalled ?? (() => commandExists(WEB_CLI_BIN));
+    if (isInstalled())
+        return { ok: true, installedNow: false };
+    if (!options.quiet)
+        console.log(`  📦 EC Web 组件未安装，正在安装 ${WEB_PACKAGE_LATEST}...`);
     try {
-        const { npmInstallGlobal } = await import('../utils/npm-ops.js');
-        await npmInstallGlobal(WEB_PACKAGE_LATEST);
-        console.log('  ✓ EC Web 组件安装完成');
-        return true;
+        const install = options.install ?? (async (pkg) => {
+            const { npmInstallGlobal } = await import('../utils/npm-ops.js');
+            await npmInstallGlobal(pkg);
+        });
+        await install(WEB_PACKAGE_LATEST);
+        if (!options.quiet)
+            console.log('  ✓ EC Web 组件安装完成');
+        return { ok: true, installedNow: true };
     }
     catch (e) {
-        console.log(`  ⚠ EC Web 组件安装失败: ${installErrorMessage(e)}`);
-        console.log(`  可稍后运行 ec watch web 自动安装并启动，或手动运行 npm install -g ${WEB_PACKAGE_LATEST}`);
-        return false;
+        const error = installErrorMessage(e);
+        if (!options.quiet) {
+            console.log(`  ⚠ EC Web 组件安装失败: ${error}`);
+            console.log(`  可稍后运行 ec watch web 自动安装并启动，或手动运行 npm install -g ${WEB_PACKAGE_LATEST}`);
+        }
+        return { ok: false, error };
     }
 }
 // ==================== Main ====================
 export async function cmdInit(options) {
     // 云部署非交互式路径：当带 --owner 或 --format json 时走结构化分支，与交互式 tail 完全隔离。
     // 预留方案 B：当 daemon 支持 Control Plane 无 agent 启动时，可在此分支跳过 agent new 预创建。
-    if (options?.nonInteractive && (options.owner || options.format === 'json')) {
+    if (options?.nonInteractive && (options.owner || options.format === 'json' || options.projectpath || options.ecweb)) {
         return cmdInitNonInteractive({
             owner: options.owner,
             baseagent: options.baseagent,
@@ -339,16 +348,22 @@ export async function initTail() {
         if (daemonConfigForEcweb.ecweb?.enabled === undefined) {
             const ans = (await ask(rl, '\n是否在 ec start 时自动启动 ECWeb 控制台？[y/N] ')).trim().toLowerCase();
             if (ans === 'y' || ans === 'yes') {
-                const cfg = loadDaemonConfig();
-                saveDaemonConfig({ ...cfg, ecweb: { ...(cfg.ecweb ?? {}), enabled: true } });
-                console.log('  ✓ 已启用 ECWeb（ec start 将自动在后台启动）');
-                const installed = await ensureEcwebInstalledForInit();
-                console.log(installed
-                    ? '  提示：首次访问运行 ec watch web 查看配对码和 URL'
-                    : '  提示：安装完成后运行 ec start；如需立即打开控制台，运行 ec watch web');
+                const installResult = await ensureEcwebInstalledForInit();
+                if (installResult.ok) {
+                    const cfg = loadDaemonConfig();
+                    saveDaemonConfig({ ...cfg, ecweb: { ...(cfg.ecweb ?? {}), enabled: true } });
+                    console.log('  ✓ 已启用 ECWeb（ec start 将自动在后台启动）');
+                    console.log('  提示：首次访问运行 ec watch web 查看配对码和 URL');
+                }
+                else {
+                    const cfg = loadDaemonConfig();
+                    saveDaemonConfig({ ...cfg, ecweb: { ...(cfg.ecweb ?? {}), enabled: false } });
+                    console.log('  提示：安装完成后运行 ec start；如需立即打开控制台，运行 ec watch web');
+                }
             }
             else {
-                saveDaemonConfig({ ...loadDaemonConfig(), ecweb: { enabled: false } });
+                const cfg = loadDaemonConfig();
+                saveDaemonConfig({ ...cfg, ecweb: { ...(cfg.ecweb ?? {}), enabled: false } });
                 console.log('  已跳过（可日后运行 ec watch web 手动启动，或编辑 daemon.json）');
             }
         }
@@ -436,10 +451,13 @@ function fail(code, message, exitCode, format) {
     emitResult({ type: 'init.result', success: false, error: { code, message } }, format);
     process.exit(exitCode);
 }
-export async function cmdInitNonInteractive(opts) {
+export async function cmdInitNonInteractive(opts, dependencies = {}) {
     const format = opts.format;
     const p = resolvePaths();
     ensureDataDirs();
+    if (format !== undefined && format !== 'json') {
+        fail('INVALID_FORMAT', `--format only supports json: ${format}`, EXIT_USAGE, format);
+    }
     // ── 1. owner 校验 ──
     if (!opts.owner) {
         fail('MISSING_OWNER', '--owner is required in non-interactive mode', EXIT_USAGE, format);
@@ -459,7 +477,7 @@ export async function cmdInitNonInteractive(opts) {
         fail('DAEMON_RUNNING', `EvolCore daemon is running (PID: ${pids}); run 'ec stop' first`, EXIT_USAGE, format);
     }
     // ── 3. baseagent 探测 + 校验 ──
-    const available = detectAvailable();
+    const available = dependencies.availableBaseagents ?? detectAvailable();
     if (available.length === 0) {
         fail('BASEAGENT_UNAVAILABLE', 'no baseagent CLI detected (install claude/codex/gemini)', EXIT_USAGE, format);
     }
@@ -503,14 +521,33 @@ export async function cmdInitNonInteractive(opts) {
     }
     const forced = differentOwner && !!opts.force;
     const previousOwners = forced ? [...existingOwners] : undefined;
-    // ── 6. 写 defaults.json ──
+    // ── 6. EC Web 安装（先安装成功，再写 enabled 配置）──
+    if (opts.ecweb === true) {
+        const ensureEcweb = dependencies.ensureEcweb ?? (() => ensureEcwebInstalledForInit({ quiet: true }));
+        const installResult = await ensureEcweb();
+        if (!installResult.ok) {
+            if (existingCfg.ecweb?.enabled === true) {
+                try {
+                    saveDaemonConfig({
+                        ...existingCfg,
+                        ecweb: { ...(existingCfg.ecweb ?? {}), enabled: false },
+                    });
+                }
+                catch (e) {
+                    fail('ECWEB_INSTALL_FAILED', `failed to install ${WEB_PACKAGE_LATEST}: ${installResult.error}; failed to disable ecweb: ${e?.message || e}`, EXIT_RUNTIME, format);
+                }
+            }
+            fail('ECWEB_INSTALL_FAILED', `failed to install ${WEB_PACKAGE_LATEST}: ${installResult.error}`, EXIT_RUNTIME, format);
+        }
+    }
+    // ── 7. 写 defaults.json ──
     try {
         saveDefaultsSafe(buildDefaults(chosenBaseagent, available, projectsDefaultPath));
     }
     catch (e) {
         fail('IO_ERROR', `failed to write defaults.json: ${e?.message || e}`, EXIT_RUNTIME, format);
     }
-    // ── 7. 控制 AID：缺失则生成 ──
+    // ── 8. 控制 AID：缺失则生成 ──
     let controlAid = existingCfg.aid;
     if (!controlAid) {
         try {
@@ -521,7 +558,7 @@ export async function cmdInitNonInteractive(opts) {
             fail('CONTROL_AID_CREATE_FAILED', `gateway unreachable: ${e?.message || e}`, EXIT_RUNTIME, format);
         }
     }
-    // ── 8. 写 daemon.json（aid + owners + ecweb）──
+    // ── 9. 写 daemon.json（aid + owners + ecweb）──
     try {
         const next = {
             ...existingCfg,
@@ -535,7 +572,7 @@ export async function cmdInitNonInteractive(opts) {
     catch (e) {
         fail('IO_ERROR', `failed to write daemon.json: ${e?.message || e}`, EXIT_RUNTIME, format);
     }
-    // ── 9. 输出 init.result ──
+    // ── 10. 输出 init.result ──
     const result = {
         type: 'init.result',
         success: true,

package/dist/cli/model.js

@@ -243,13 +243,14 @@ Commands:
   check               诊断网关连通性与模型可用性（分阶段输出进度）
 
 作用域（越具体越优先：关系 > 角色 > agent > defaults）:
-  (无参数)                       只读 catalog/defaults，不允许写入
+  (无参数)                       本机 CLI 只读 catalog/defaults，不允许写入
   --self <aid>                   agent级   → config.json
   --self <aid> --role <role>     角色策略预览（只读）
   --self <aid> --peer <X>        关系级    → relations/<peerKey>/config.json
 
 修改 agent/关系作用域后，对应范围所有会话的下一条消息即时生效。
 角色策略请通过角色策略编辑器修改。
+托管会话内省略 --self/--peer/--role 时，命令作用于当前会话。
 
 Options:
   --self <aid>        本端 AID

package/dist/cli/net-check.js

@@ -10,7 +10,7 @@ import { WebSocket } from 'ws';
 import { aunPath as defaultAunPath } from '../paths.js';
 import { isHostChinese } from '../utils/locale.js';
 import { getAidStore, loadClient, SLOT } from '../aun/aid/store.js';
-import { isHelpFlag } from './help.js';
+import { isHelpFlag, wantsHelp } from './help.js';
 const GREEN = '\x1b[32m';
 const RED = '\x1b[31m';
 const YELLOW = '\x1b[33m';
@@ -645,7 +645,7 @@ export async function cmdNet(args) {
     const sub = args[0];
     const formatJson = args.includes('--format') && args.includes('json');
     const kickTest = args.includes('--kick-test');
-    if (isHelpFlag(sub)) {
+    if (isHelpFlag(sub) || wantsHelp(args)) {
         console.log(`用法: ec net check [<aid>] [--format json] [--kick-test]
 
 检查 AUN 网络链路连通性（11 步逐层诊断）。

package/dist/cli/queue-command.js

@@ -1,8 +1,8 @@
 import { resolvePaths } from '../paths.js';
 import { ipcQuery } from '../ipc.js';
-import { isHelpFlag } from './help.js';
+import { getArgValue, isHelpFlag, wantsHelp } from './help.js';
 export async function cmdQueue(args) {
-    if (args.length === 0 || isHelpFlag(args[0])) {
+    if (args.length === 0 || isHelpFlag(args[0]) || wantsHelp(args)) {
         console.log(`用法: ec queue --agent <aid> [选项]
 
 查询与操作 EvolAgent 的消息队列。
@@ -24,7 +24,7 @@ export async function cmdQueue(args) {
   ec queue --agent mybot.agentid.pub --clear
   ec queue --agent mybot.agentid.pub --cancel msg_d4e5f6
   ec queue --agent mybot.agentid.pub --interrupt --sessionkey feishu#oc_abc123#main`);
-        process.exit(0);
+        return;
     }
     // 解析参数
     const agentIdx = args.indexOf('--agent');
@@ -33,15 +33,39 @@ export async function cmdQueue(args) {
         process.exit(1);
     }
     const agent = args[agentIdx + 1];
+    if (agent.startsWith('--')) {
+        console.error('❌ --agent 缺少 <aid> 参数');
+        process.exit(1);
+    }
     const showId = args.includes('--showid');
     const full = args.includes('--full');
-    const formatJson = args.includes('--format json');
+    const formatValue = getArgValue(args, '--format');
+    if (formatValue !== undefined && formatValue !== 'json') {
+        console.error(`❌ --format 仅支持 json: ${formatValue}`);
+        process.exit(1);
+    }
+    const formatJson = formatValue === 'json';
     const clear = args.includes('--clear');
     const cancelIdx = args.indexOf('--cancel');
-    const cancelMsgId = cancelIdx >= 0 && cancelIdx + 1 < args.length ? args[cancelIdx + 1] : undefined;
+    const cancelCandidate = cancelIdx >= 0 && cancelIdx + 1 < args.length ? args[cancelIdx + 1] : undefined;
+    const cancelMsgId = cancelCandidate && !cancelCandidate.startsWith('--') ? cancelCandidate : undefined;
     const interrupt = args.includes('--interrupt');
     const sessionKeyIdx = args.indexOf('--sessionkey');
-    const sessionKey = sessionKeyIdx >= 0 && sessionKeyIdx + 1 < args.length ? args[sessionKeyIdx + 1] : undefined;
+    const sessionCandidate = sessionKeyIdx >= 0 && sessionKeyIdx + 1 < args.length ? args[sessionKeyIdx + 1] : undefined;
+    const sessionKey = sessionCandidate && !sessionCandidate.startsWith('--') ? sessionCandidate : undefined;
+    const actionCount = [clear, cancelIdx >= 0, interrupt].filter(Boolean).length;
+    if (actionCount > 1) {
+        console.error('❌ --clear、--cancel、--interrupt 互斥，只能指定一个');
+        process.exit(1);
+    }
+    if (cancelIdx >= 0 && !cancelMsgId) {
+        console.error('❌ --cancel 缺少 <messageId>');
+        process.exit(1);
+    }
+    if (interrupt && !sessionKey) {
+        console.error('❌ --interrupt 必须配合 --sessionkey <key>');
+        process.exit(1);
+    }
     // 构建 IPC 请求
     const action = clear ? 'clear'
         : cancelMsgId ? 'cancel'

package/dist/cli/raw-key-input.js

@@ -0,0 +1,25 @@
+/**
+ * Temporarily listen for single-key input and restore stdin's previous state.
+ *
+ * Standalone init commands enter this flow after closing readline, so stdin is
+ * paused and must be paused again during cleanup or Node will stay alive. Some
+ * parent wizards keep readline active, so an already-flowing stdin must remain
+ * flowing for their next prompt.
+ */
+export function setupRawKeyListener(onKey, input = process.stdin) {
+    if (!input.isTTY)
+        return () => { };
+    const wasPaused = input.isPaused();
+    const wasRaw = Boolean(input.isRaw);
+    input.setRawMode(true);
+    input.resume();
+    input.setEncoding('utf8');
+    const handler = (chunk) => onKey(String(chunk));
+    input.on('data', handler);
+    return () => {
+        input.removeListener('data', handler);
+        input.setRawMode(wasRaw);
+        if (wasPaused)
+            input.pause();
+    };
+}

package/dist/cli/response.js

@@ -3,8 +3,7 @@
  *
  * 查看/切换/配置会话的响应模式。作用域由 --self/--peer 决定。
  *
- * 三级作用域（越具体越优先：关系 > agent > 全局）：
- *   (无)             → 全局   defaults.json
+ * 读取解析链（越具体越优先：关系 > agent > defaults）：
  *   --self           → agent  config.json
  *   --self --peer    → 关系   relations/<peerKey>/config.json
  *
@@ -149,11 +148,11 @@ Options:
 示例:
   ec response list
   ec response current --self bot.agentid.pub
-  ec response info dual-session
+  ec response info single-session
   ec response set single-session --self bot.agentid.pub
-  ec response set workflow --self bot.agentid.pub --peer aun#team.group.com
-  ec response config dual-session --self bot.agentid.pub
-  ec response config set debounceMs 5000 --mode dual-session --self bot.agentid.pub
+  ec response set single-session --self bot.agentid.pub --peer aun#team.group.com
+  ec response config single-session --self bot.agentid.pub
+  ec response config set tool_use_reminder false --mode single-session --self bot.agentid.pub
   ec response reset --self bot.agentid.pub --peer alice.agentid.pub`;
 // ── list ────────────────────────────────────────────────────────────────
 function cmdList(args, formatJson) {

package/dist/cli/restart-monitor.js

@@ -10,8 +10,10 @@ import { tryUpgrade, tryUpgradeAunSdk, tryUpgradeGlobalPkg, resolveGlobalPkg } f
 import { resolveAunCoreSdkPkg, AUN_CORE_SDK_PKG } from '../aun/aid/client.js';
 import { isValidAid } from '../aun/aid/index.js';
 import { msgSend } from '../aun/msg/index.js';
-import { scanInstances, cleanupInstances, writeRestartMonitor, removeRestartMonitor, isRestartMonitorWinner } from '../utils/instance-registry.js';
+import { scanInstances, cleanupInstances, writeRestartMonitor, removeRestartMonitor, isRestartMonitorWinner, findOrphanProcesses, killOrphans } from '../utils/instance-registry.js';
 import { WEB_PACKAGE_NAME } from '../product.js';
+import { shouldSuppressRealRestart } from '../utils/restart-safety.js';
+import { rotateStdoutLog } from '../utils/log-writer.js';
 const execFileAsync = promisify(execFile);
 // 清理 Claude Code 环境变量，防止 SDK 认为是嵌套会话
 function cleanEnv() {
@@ -24,6 +26,10 @@ function cleanEnv() {
     }
 }
 export async function cmdRestartMonitor() {
+    // Defense in depth: a unit test that accidentally executes the real restart
+    // path must not detach a persistent daemon from the test worker.
+    if (shouldSuppressRealRestart())
+        return;
     const p = resolvePaths();
     const restartLog = path.join(p.logs, 'restart.log');
     const MAX_HEAL_ATTEMPTS = 3;
@@ -66,6 +72,17 @@ export async function cmdRestartMonitor() {
         return s.mains.some(m => m.alive);
     };
     log('Restart monitor started');
+    // Test daemons live in one temporary HOME per test, so the current HOME's
+    // instance registry cannot see them. Their strict environment markers make
+    // them safe to reap globally on every real restart.
+    {
+        const leakedTestDaemons = findOrphanProcesses().filter(o => o.confirmedTestDaemon);
+        if (leakedTestDaemons.length > 0) {
+            const killed = killOrphans(leakedTestDaemons);
+            log(`Cleaned ${killed.length} leaked test daemon(s): ${killed.join(', ')}`);
+            await sleep(500);
+        }
+    }
     // restart-pending.json 只留给新主进程发送发起会话内的“重启成功”回执。
     const pendingFile = path.join(p.dataDir, 'restart-pending.json');
     // 等待所有活 main 进程退出（可能不止一个）
@@ -271,6 +288,13 @@ async function spawnAndWaitReady(p, log, timeout) {
     // 清理残留 instance 文件和进程
     cleanupInstances();
     cleanEnv();
+    const stdoutRotation = rotateStdoutLog(p.logs);
+    if (stdoutRotation.rotatedPath) {
+        log(`Rotated stdout.log -> ${path.basename(stdoutRotation.rotatedPath)}`);
+    }
+    if (stdoutRotation.removedArchives.length > 0) {
+        log(`Removed ${stdoutRotation.removedArchives.length} expired stdout archive(s)`);
+    }
     const stdoutLog = path.join(p.logs, 'stdout.log');
     const out = fs.openSync(stdoutLog, 'a');
     const err = fs.openSync(stdoutLog, 'a');

package/dist/cli/stats.js

@@ -32,12 +32,14 @@ Usage: ec stats [options]
   --context <id>          会话 context breakdown 细目
   --budget                预算状态
   --top-peers [--limit N] 对端排行
+  --top-models [--limit N] 模型排行
+  --traffic               消息收发条数与字节数
   --sql "<query>"         直接执行只读 SQL
   --rebuild               全量重建日聚合表 usage_daily（运维兜底/排查）
-  --peers [--limit N]    私聊对端列表（带累计 token/calls/活跃日）
-  --groups [--limit N]   群聊列表（同上）
-  --summary              指定时间范围总消耗汇总（token/USD/CNY）
-  --peer-detail <id>     指定对端 AID 或 peer_key，按天返回消耗明细
+  --peers [--limit N]     私聊对端列表（带累计 token/calls/活跃日）
+  --groups [--limit N]    群聊列表（同上）
+  --summary               指定时间范围总消耗汇总（token/USD/CNY）
+  --peer-detail <id>      指定对端 AID 或 peer_key，按天返回消耗明细
   --task-calls <taskId>   一个 task 的逐次大模型调用明细
   --session-calls <id>    一个会话的逐次大模型调用明细
 

package/dist/cli/trigger-command.js

@@ -2,7 +2,7 @@ import fs from 'fs';
 import path from 'path';
 import { resolvePaths } from '../paths.js';
 import { ipcQuery } from '../ipc.js';
-import { isHelpFlag } from './help.js';
+import { isHelpFlag, wantsHelp } from './help.js';
 import { AGENT_DELEGATION_TOKEN_ENV } from '../core/auth/agent-delegation.js';
 import { readTaskRuntimeContextFromEnv } from './task-context.js';
 import { normalizeTriggerDefinition, resolveScriptPath, } from '../trigger/validation.js';
@@ -12,12 +12,25 @@ export async function cmdTrigger(args) {
         printHelp();
         return;
     }
-    if (sub === 'template') {
-        handleTemplate(args.slice(1));
+    if (wantsHelp(args)) {
+        printHelp();
         return;
     }
     const rest = args.slice(1);
     const json = hasFlag(rest, '--json') || flagValue(rest, '--format') === 'json';
+    if (sub === 'template') {
+        try {
+            handleTemplate(rest);
+        }
+        catch (err) {
+            if (json)
+                console.log(JSON.stringify({ ok: false, error: err?.message || String(err) }, null, 2));
+            else
+                console.error(err?.message || String(err));
+            process.exit(1);
+        }
+        return;
+    }
     try {
         switch (sub) {
             case 'list':
@@ -30,6 +43,7 @@ export async function cmdTrigger(args) {
                 await showHistory(rest, json);
                 return;
             case 'create':
+            case 'set':
                 await createTrigger(rest, json);
                 return;
             case 'update':
@@ -72,11 +86,12 @@ function printHelp() {
   create --file <trigger.json|trigger-dir> [--enable] [--json]
     OR
   create [--agent <aid>] --cron <expr>|--event <pattern> --prompt <text> [--enable] [其他flag]
+  set ...  (create 的兼容别名)
   update [--agent <aid>] <triggerId> <参数...> [--if-revision <sha256:...>] [--json]
   enable [--agent <aid>] <triggerId>
   disable [--agent <aid>] <triggerId>
   cancel [--agent <aid>] <triggerId>  (disable 的兼容别名)
-  delete [--agent <aid>] <triggerId>
+  delete|remove|rm [--agent <aid>] <triggerId>
   run [--agent <aid>] <triggerId> [--dry-run] [--json]
   template list|show <name> [--json]
 
@@ -85,7 +100,9 @@ Create 参数模式支持:
   --exec <script|trigger-session|target-session>
   --prompt <文本>
   --script-path <路径> --script-runtime <node|python|bash>
-  --feedback <target|origin|silent> (create 参数模式仅支持 target)
+  --script-args <JSON> --script-timeout <时长>
+  --feedback <target>  (origin/silent 仅可通过 --file 导入)
+  --baseagent <name>  (仅 --exec trigger-session)
   --model <模型>  --effort <low|medium|high|xhigh|max>
   --max-runs <次数>  --max-duration <时长: 30s|15m|2h|1d>
   --permission <readonly|auto|request|bypass>（省略则继承当前身份配置）
@@ -95,6 +112,9 @@ Create 参数模式支持:
   --trigger-thread <per-run|by-trigger>
   --name <名称>
 
+通用输出参数:
+  --json | --format json
+
 Update 仅支持常用字段:
   --once | --delay | --at | --cron | --every | --event [--tz]
   --prompt <文本>  --name <名称>
@@ -120,7 +140,7 @@ async function listTriggers(args, json) {
 }
 async function showTrigger(args, json) {
     const agentAid = resolveAgentAid(args);
-    const triggerId = positional(args, 0, ['--agent']);
+    const triggerId = positional(args, 0, ['--agent', '--format']);
     const res = await request({ type: 'trigger.show', agentAid, triggerId });
     if (json)
         return printJson(res);
@@ -149,6 +169,8 @@ async function showTrigger(args, json) {
         console.log(`limit state: ${parts.join(', ')}`);
     }
     console.log(`execution: ${t.execution.type}`);
+    if (t.execution.type === 'trigger_session')
+        console.log(`baseagent: ${t.execution.baseagent ?? 'legacy/inherit'}`);
     if (t.execution.type === 'script')
         console.log(`script: ${scriptCommandLabel(t.execution.script)}`);
     console.log(`model: ${t.execution.model ?? 'inherit'}`);
@@ -208,9 +230,8 @@ async function createTrigger(args, json) {
         return;
     }
     // Flag mode: use parser
-    const { parseTriggerSet } = await import('../trigger/parser.js');
-    const flagStr = args.filter(a => a !== '--enable' && a !== '--json' && !a.startsWith('--format')).join(' ');
-    const parseResult = parseTriggerSet(flagStr);
+    const { parseTriggerSetArgv } = await import('../trigger/parser.js');
+    const parseResult = parseTriggerSetArgv(triggerCreateArgs(args));
     if (!parseResult.ok) {
         throw new Error(parseResult.error);
     }
@@ -246,7 +267,10 @@ async function createTrigger(args, json) {
             ...(parsed.model ? { model: parsed.model } : {}),
             ...(parsed.effort ? { effort: parsed.effort } : {}),
             ...(parsed.permissionMode ? { permissionMode: parsed.permissionMode } : {}),
-            ...(parsed.executionType === 'trigger_session' ? { thread: parsed.triggerThread ?? 'by_trigger' } : {}),
+            ...(parsed.executionType === 'trigger_session' ? {
+                thread: parsed.triggerThread ?? 'by_trigger',
+                ...(parsed.baseagent ? { baseagent: parsed.baseagent } : {}),
+            } : {}),
             onError: 'retry',
             noopSentinel: '[[NOOP]]',
         },
@@ -272,6 +296,22 @@ async function createTrigger(args, json) {
         return printJson(res);
     console.log(`✓ created ${res.trigger.id} (${res.trigger.name})`);
 }
+function triggerCreateArgs(args) {
+    const out = [];
+    for (let i = 0; i < args.length; i++) {
+        const arg = args[i];
+        if (arg === '--enable' || arg === '--json')
+            continue;
+        if (arg === '--format') {
+            i += 1;
+            continue;
+        }
+        if (arg.startsWith('--format='))
+            continue;
+        out.push(arg);
+    }
+    return out;
+}
 function sourceFromParsed(parsed) {
     if (parsed.scheduleType === 'once')
         return { type: 'once' };
@@ -362,7 +402,7 @@ function triggerUpdateArgs(args) {
 }
 async function setEnabled(args, enabled, json) {
     const agentAid = resolveAgentAid(args);
-    const triggerId = positional(args, 0, ['--agent']);
+    const triggerId = positional(args, 0, ['--agent', '--format']);
     const res = await request({ type: 'trigger.setEnabled', agentAid, triggerId, enabled });
     if (json)
         return printJson(res);
@@ -370,7 +410,7 @@ async function setEnabled(args, enabled, json) {
 }
 async function cancelTrigger(args, json) {
     const agentAid = resolveAgentAid(args);
-    const triggerId = positional(args, 0, ['--agent']);
+    const triggerId = positional(args, 0, ['--agent', '--format']);
     const res = await request({ type: 'trigger.cancel', agentAid, triggerId });
     if (json)
         return printJson(res);
@@ -378,7 +418,7 @@ async function cancelTrigger(args, json) {
 }
 async function deleteTrigger(args, json) {
     const agentAid = resolveAgentAid(args);
-    const triggerId = positional(args, 0, ['--agent']);
+    const triggerId = positional(args, 0, ['--agent', '--format']);
     const res = await request({ type: 'trigger.delete', agentAid, triggerId });
     if (json)
         return printJson(res);
@@ -386,7 +426,7 @@ async function deleteTrigger(args, json) {
 }
 async function runTrigger(args, json) {
     const agentAid = resolveAgentAid(args);
-    const triggerId = positional(args, 0, ['--agent']);
+    const triggerId = positional(args, 0, ['--agent', '--format']);
     const res = await request({ type: 'trigger.run', agentAid, triggerId, dryRun: hasFlag(args, '--dry-run') }, 120_000);
     if (json)
         return printJson(res);
@@ -406,7 +446,7 @@ function handleTemplate(args) {
         return;
     }
     if (sub === 'show') {
-        const name = args.find(a => !a.startsWith('-') && a !== 'show');
+        const name = optionalPositional(args.slice(1), 0, ['--format']);
         if (!name)
             throw new Error('missing template name');
         if (json)

package/dist/cli/version.js

@@ -5,6 +5,7 @@ import fs from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
 import { MAIN_PACKAGE_NAME, PRODUCT_DISPLAY_NAME, WEB_PACKAGE_NAME } from '../product.js';
+import { getArgValue, wantsHelp } from './help.js';
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const PACKAGE_ROOT = path.resolve(__dirname, '../..');
 const RESET = '\x1b[0m';
@@ -44,7 +45,11 @@ function findInstalledVersion(pkgName) {
     return { name: pkg.name || pkgName, version: pkg.version || '?', buildTs: ts || undefined, path: dir };
 }
 export function handleVersion(args) {
-    const isJson = args.includes('--format') && args.includes('json') || args.includes('--json');
+    if (wantsHelp(args)) {
+        console.log(`用法: ec version [--format json|--json]\n\n显示 EvolCore、EC Web、AUN SDK、WebSocket 与 Node.js 版本。`);
+        return;
+    }
+    const isJson = getArgValue(args, '--format') === 'json' || args.includes('--json');
     // 主包
     const mainPkg = readPkgJson(PACKAGE_ROOT);
     const mainEntry = path.join(PACKAGE_ROOT, 'dist', 'cli', 'index.js');

package/dist/config/builtin-role-templates.js

@@ -2,7 +2,28 @@ import fs from 'fs';
 import path from 'path';
 import { kitsRoleTemplatesDir } from '../paths.js';
 import { validateRoleConfig } from './role-schema.js';
+import { expectedRoleRank } from './role-ranks.js';
 export const BUILTIN_ROLE_IDS = ['owner', 'admin', 'member', 'visitor'];
+export function validateBuiltinRoleTemplateDefinition(roleId, raw) {
+    const issues = validateRoleConfig(raw);
+    if (issues.length) {
+        return {
+            definition: null,
+            error: `built-in role template failed validation: ${issues.map(issue => `${issue.field} ${issue.message}`).join('; ')}`,
+        };
+    }
+    const { $schema_version: _schemaVersion, ...definition } = raw;
+    if (BUILTIN_ROLE_IDS.includes(roleId)) {
+        const expectedRank = expectedRoleRank(roleId);
+        if (definition.rank !== expectedRank) {
+            return {
+                definition: null,
+                error: `built-in role template rank must be ${expectedRank}`,
+            };
+        }
+    }
+    return { definition: definition };
+}
 /** Load the versioned package template that defines a built-in role policy. */
 export function readBuiltinRoleTemplate(roleId) {
     const file = path.join(kitsRoleTemplatesDir(), `${roleId}.json`);
@@ -17,14 +38,5 @@ export function readBuiltinRoleTemplate(roleId) {
             error: `cannot read built-in role template: ${error instanceof Error ? error.message : String(error)}`,
         };
     }
-    const issues = validateRoleConfig(raw);
-    if (issues.length) {
-        return {
-            definition: null,
-            file,
-            error: `built-in role template failed validation: ${issues.map(issue => `${issue.field} ${issue.message}`).join('; ')}`,
-        };
-    }
-    const { $schema_version: _schemaVersion, ...definition } = raw;
-    return { definition: definition, file };
+    return { ...validateBuiltinRoleTemplateDefinition(roleId, raw), file };
 }