evolcore 0.0.5 → 0.0.7

package/dist/cli/init.js

@@ -8,6 +8,7 @@ import { scanInstances } from '../utils/instance-registry.js';
 import { saveDefaultsSafe, loadAllAgents, loadDaemonConfig, saveDaemonConfig } from '../config-store.js';
 import { generateControlAid, resolveControlIssuer } from '../aun/aid/control-aid.js';
 import { getCodexAppServerAvailability, isCodexAppServerAvailable } from '../agents/codex-runner.js';
+import { resolveEcagentConfig } from '../agents/baseagent.js';
 import { defaultProjectsRoot } from '../utils/project-path.js';
 import { WEB_CLI_BIN, WEB_PACKAGE_LATEST } from '../product.js';
 // ==================== Helpers ====================
@@ -23,22 +24,38 @@ export function expandLeadingTildePath(value, homeDir = os.homedir()) {
     }
     return value;
 }
-const BASEAGENT_CANDIDATES = ['claude', 'codex', 'gemini'];
+const BASEAGENT_CANDIDATES = ['claude', 'codex', 'gemini', 'ecagent'];
+const AUTO_BASEAGENT_CANDIDATES = ['claude', 'codex', 'gemini'];
 function isBaseagentAvailable(baseagent) {
     if (baseagent === 'codex')
         return isCodexAppServerAvailable();
+    if (baseagent === 'ecagent')
+        return true;
     return commandExists(baseagent);
 }
 function detectAvailable() {
     return BASEAGENT_CANDIDATES.filter(isBaseagentAvailable);
 }
 function pickDefault(available) {
-    return (available.includes('claude') ? 'claude' : available[0]);
+    return AUTO_BASEAGENT_CANDIDATES.find(candidate => available.includes(candidate));
+}
+function ecagentUnavailableReason() {
+    try {
+        resolveEcagentConfig({ agents: { ecagent: {} } });
+        return undefined;
+    }
+    catch (error) {
+        return error instanceof Error ? error.message : String(error);
+    }
 }
 function buildDefaults(chosen, available, projectsDefaultPath) {
     const baseagents = {};
-    for (const b of available)
+    for (const b of available) {
+        // ecagent is bundled but opt-in; do not declare it merely because it is available.
+        if (b === 'ecagent' && chosen !== 'ecagent')
+            continue;
         baseagents[b] = {};
+    }
     return {
         $schema_version: 1,
         active_baseagent: chosen,
@@ -104,7 +121,7 @@ export async function cmdInit(options) {
     // 云部署非交互式路径：当带 --owner 或 --format json 时走结构化分支，与交互式 tail 完全隔离。
     // 预留方案 B：当 daemon 支持 Control Plane 无 agent 启动时，可在此分支跳过 agent new 预创建。
     if (options?.nonInteractive && (options.owner || options.format === 'json' || options.projectpath || options.ecweb)) {
-        return cmdInitNonInteractive({
+        await cmdInitNonInteractive({
             owner: options.owner,
             baseagent: options.baseagent,
             projectpath: options.projectpath,
@@ -112,6 +129,7 @@ export async function cmdInit(options) {
             force: options.force,
             format: options.format,
         });
+        return true;
     }
     const p = resolvePaths();
     ensureDataDirs();
@@ -120,17 +138,17 @@ export async function cmdInit(options) {
     if (aliveMains.length > 0) {
         const pids = aliveMains.map(m => m.record.pid).join(', ');
         console.log(`❌ EvolCore 正在运行 (PID: ${pids})，请先执行 ec stop`);
-        return;
+        return false;
     }
     // ── 2. 探测 baseagent ──
     const available = detectAvailable();
-    if (available.length === 0) {
+    if (available.length === 0 || (available.length === 1 && available[0] === 'ecagent' && ecagentUnavailableReason())) {
         console.log('❌ 未检测到可用 baseagent。请安装至少一款：');
         console.log('  - claude CLI');
         console.log('  - gemini CLI');
         console.log('  - codex CLI with app-server');
         console.log('\n安装后重新运行 ec init');
-        return;
+        return false;
     }
     console.log('检测到可用的 baseagent:');
     for (const b of available)
@@ -152,19 +170,31 @@ export async function cmdInit(options) {
             if (options.baseagent) {
                 if (!BASEAGENT_CANDIDATES.includes(options.baseagent)) {
                     console.log(`❌ 无效 baseagent: ${options.baseagent}（可选: ${BASEAGENT_CANDIDATES.join('/')}）`);
-                    return; // 硬错误：不落 tail
+                    return false; // 硬错误：不落 tail
                 }
                 if (!available.includes(options.baseagent)) {
                     const reason = options.baseagent === 'codex'
                         ? getCodexAppServerAvailability().reason
                         : undefined;
                     console.log(`❌ ${options.baseagent} 当前环境不可用${reason ? `：${reason}` : `（可用: ${available.join('/')}）`}`);
-                    return; // 硬错误：不落 tail
+                    return false; // 硬错误：不落 tail
+                }
+                if (options.baseagent === 'ecagent') {
+                    const reason = ecagentUnavailableReason();
+                    if (reason) {
+                        console.log(`❌ ecagent 当前环境不可用：${reason}`);
+                        return false;
+                    }
                 }
                 chosen = options.baseagent;
             }
             else {
-                chosen = pickDefault(available);
+                const defaultBaseagent = pickDefault(available);
+                if (!defaultBaseagent) {
+                    console.log('❌ ecagent 为可选 baseagent，请显式使用 --baseagent ecagent，并配置 API key');
+                    return false;
+                }
+                chosen = defaultBaseagent;
             }
             writeDefaults(chosen, available);
             console.log(`✓ 已${defaultsExisted ? '覆盖' : '创建'}: ${defaultsPath}`);
@@ -177,19 +207,24 @@ export async function cmdInit(options) {
         await runInteractive();
     }
     // ── 共享 tail（单一出口）：提示创建 agent + 生成控制 AID ──
-    await initTail({ invokedByStart: options?.invokedByStart });
+    return initTail({ invokedByStart: options?.invokedByStart });
     // ── 内部函数 ──
     async function runInteractive() {
         const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
         async function askBaseagent() {
             const defaultBa = pickDefault(available);
-            if (available.length === 1) {
+            if (available.length === 1 && defaultBa) {
                 console.log(`  baseagent: ${defaultBa}`);
                 return defaultBa;
             }
             let chosen = null;
             while (chosen === null) {
-                const input = (await ask(rl, `默认 baseagent (${available.join('/')}) [${defaultBa}]: `)).trim() || defaultBa;
+                const defaultHint = defaultBa ? ` [${defaultBa}]` : '';
+                const input = (await ask(rl, `默认 baseagent (${available.join('/')})${defaultHint}: `)).trim() || defaultBa;
+                if (!input) {
+                    console.log('  ecagent 为可选项，请显式输入 ecagent');
+                    continue;
+                }
                 if (!BASEAGENT_CANDIDATES.includes(input)) {
                     console.log(`  无效选择，可选: ${BASEAGENT_CANDIDATES.join('/')}`);
                     continue;
@@ -198,6 +233,13 @@ export async function cmdInit(options) {
                     console.log(`  ${input} 当前环境不可用（可用: ${available.join('/')}）`);
                     continue;
                 }
+                if (input === 'ecagent') {
+                    const reason = ecagentUnavailableReason();
+                    if (reason) {
+                        console.log(`  ecagent 当前环境不可用：${reason}`);
+                        continue;
+                    }
+                }
                 chosen = input;
             }
             return chosen;
@@ -275,6 +317,7 @@ export async function initTail(options = {}) {
     }
     // 控制 AID：daemon 进程身份。缺失则生成并写回 daemon.json（幂等：已存在则跳过）。
     const daemonConfig = loadDaemonConfig();
+    let controlAidReady = !!daemonConfig.aid;
     if (daemonConfig.aid) {
         const targetIssuer = resolveControlIssuer();
         const currentIssuer = daemonConfig.aid.split('.').slice(1).join('.');
@@ -288,10 +331,12 @@ export async function initTail(options = {}) {
         try {
             const { aid } = await generateControlAid();
             saveDaemonConfig({ ...daemonConfig, $schema_version: daemonConfig.$schema_version ?? 1, aid });
+            controlAidReady = true;
             console.log(`✓ 已生成控制 AID: ${aid}`);
         }
         catch (e) {
             console.error(`⚠️ 控制 AID 生成失败（Gateway 不可达？联网后重跑 ec init 补全）: ${e?.message || e}`);
+            controlAidReady = false;
         }
     }
     // 交互式询问：使用单一 readline 实例避免 stdin 状态混乱
@@ -387,7 +432,11 @@ export async function initTail(options = {}) {
     }
     // ec start 会接着启动 daemon，并在其 ready 后给出可用的 Agent 创建入口。
     if (options.invokedByStart)
-        return;
+        return controlAidReady;
+    if (!controlAidReady) {
+        console.error('\n❌ EvolCore 初始化未完成：控制 AID 未配置。联网后重新运行 ec init。');
+        return false;
+    }
     // 初始化完成总结
     console.log('\n✓ EvolCore 初始化完成');
     const finalCfg = loadDaemonConfig();
@@ -405,6 +454,7 @@ export async function initTail(options = {}) {
         console.log(`\n✓ 已有 ${finalAgents.length} 个 agent，可直接运行:`);
         console.log('  ec start');
     }
+    return controlAidReady;
 }
 /**
  * Present instance selection menu when existing instances are found.
@@ -500,8 +550,8 @@ export async function cmdInitNonInteractive(opts, dependencies = {}) {
     }
     // ── 3. baseagent 探测 + 校验 ──
     const available = dependencies.availableBaseagents ?? detectAvailable();
-    if (available.length === 0) {
-        fail('BASEAGENT_UNAVAILABLE', 'no baseagent CLI detected (install claude/codex/gemini)', EXIT_USAGE, format);
+    if (available.length === 0 || (available.length === 1 && available[0] === 'ecagent' && ecagentUnavailableReason())) {
+        fail('BASEAGENT_UNAVAILABLE', 'no usable baseagent detected (install claude/codex/gemini or configure bundled ecagent)', EXIT_USAGE, format);
     }
     let chosenBaseagent;
     if (opts.baseagent) {
@@ -512,10 +562,19 @@ export async function cmdInitNonInteractive(opts, dependencies = {}) {
             const reason = opts.baseagent === 'codex' ? getCodexAppServerAvailability().reason : undefined;
             fail('BASEAGENT_UNAVAILABLE', `${opts.baseagent} not available${reason ? `: ${reason}` : ''}`, EXIT_USAGE, format);
         }
+        if (opts.baseagent === 'ecagent') {
+            const reason = ecagentUnavailableReason();
+            if (reason)
+                fail('BASEAGENT_UNAVAILABLE', reason, EXIT_USAGE, format);
+        }
         chosenBaseagent = opts.baseagent;
     }
     else {
-        chosenBaseagent = pickDefault(available);
+        const defaultBaseagent = pickDefault(available);
+        if (!defaultBaseagent) {
+            fail('BASEAGENT_UNAVAILABLE', 'ecagent is optional; pass --baseagent ecagent after configuring its API key', EXIT_USAGE, format);
+        }
+        chosenBaseagent = defaultBaseagent;
     }
     // ── 4. projectpath 校验 + 创建 ──
     let projectsDefaultPath;

package/dist/cli/net-check.js

@@ -307,31 +307,20 @@ async function runCheck(aid, formatJson, kickTest) {
         // 统计每个 AID 的总消息活跃度（遍历所有本地 AID 的 sessions）
         const { resolvePaths } = await import('../paths.js');
         const p = resolvePaths();
-        const sessAunDir = path.join(p.sessionsDir, 'aun');
-        const encode = (s) => s.replace(/[/%\\:*?"<>|]/g, ch => '%' + ch.charCodeAt(0).toString(16).toUpperCase().padStart(2, '0'));
-        const decode = (s) => s.replace(/%([0-9A-Fa-f]{2})/g, (_, hex) => String.fromCharCode(parseInt(hex, 16)));
+        const { scanChatDirs } = await import('../core/session/session-fs-store.js');
         function getGlobalMessageCounts() {
             const counts = new Map();
             try {
-                const localDirs = fs.readdirSync(sessAunDir, { withFileTypes: true });
-                for (const localDir of localDirs) {
-                    if (!localDir.isDirectory())
+                for (const chat of scanChatDirs(p.sessionsDir)) {
+                    if (chat.channelType !== 'aun')
                         continue;
-                    const localAid = decode(localDir.name);
-                    const peerDirs = fs.readdirSync(path.join(sessAunDir, localDir.name), { withFileTypes: true });
-                    for (const peerDir of peerDirs) {
-                        if (!peerDir.isDirectory())
-                            continue;
-                        const peerId = decode(peerDir.name);
-                        const msgFile = path.join(sessAunDir, localDir.name, peerDir.name, 'messages.jsonl');
-                        try {
-                            const content = fs.readFileSync(msgFile, 'utf-8');
-                            const lineCount = content.split('\n').filter(l => l.trim()).length;
-                            counts.set(peerId, (counts.get(peerId) ?? 0) + lineCount);
-                            counts.set(localAid, (counts.get(localAid) ?? 0) + lineCount);
-                        }
-                        catch { }
+                    const msgFile = path.join(chat.dirPath, 'messages.jsonl');
+                    try {
+                        const lineCount = fs.readFileSync(msgFile, 'utf-8').split('\n').filter(l => l.trim()).length;
+                        counts.set(chat.channelId, (counts.get(chat.channelId) ?? 0) + lineCount);
+                        counts.set(chat.selfAID, (counts.get(chat.selfAID) ?? 0) + lineCount);
                     }
+                    catch { }
                 }
             }
             catch { }

package/dist/cli/restart-monitor.js

@@ -2,7 +2,7 @@ import fs from 'fs';
 import path from 'path';
 import { spawn, execFile } from 'child_process';
 import { promisify } from 'util';
-import { resolvePaths, getPackageRoot } from '../paths.js';
+import { resolvePaths, getPackageRoot, daemonControlDir } from '../paths.js';
 import { loadDaemonConfig } from '../config-store.js';
 import * as platform from '../utils/cross-platform.js';
 import { EventBus } from '../core/event-bus.js';
@@ -14,6 +14,8 @@ import { scanInstances, cleanupInstances, writeRestartMonitor, removeRestartMoni
 import { WEB_PACKAGE_NAME } from '../product.js';
 import { shouldSuppressRealRestart } from '../utils/restart-safety.js';
 import { rotateStdoutLog } from '../utils/log-writer.js';
+import { inspectDataMigrationRequirement } from '../core/data-migration.js';
+import { serviceProxyNeedsEcweb, startEcwebIfEnabled } from './daemon-commands.js';
 const execFileAsync = promisify(execFile);
 // 清理 Claude Code 环境变量，防止 SDK 认为是嵌套会话
 function cleanEnv() {
@@ -72,6 +74,14 @@ export async function cmdRestartMonitor() {
         return s.mains.some(m => m.alive);
     };
     log('Restart monitor started');
+    const migrationRequirement = inspectDataMigrationRequirement(p.root);
+    if (migrationRequirement.required) {
+        const message = `Pending user-data migration (${migrationRequirement.operationCount} operations); leaving the current service running. Run ec data migrate --dry-run, then ec data migrate --apply.`;
+        log(message);
+        console.error(`❌ ${message}`);
+        process.exitCode = 2;
+        return;
+    }
     // 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.
@@ -84,7 +94,7 @@ export async function cmdRestartMonitor() {
         }
     }
     // restart-pending.json 只留给新主进程发送发起会话内的“重启成功”回执。
-    const pendingFile = path.join(p.dataDir, 'restart-pending.json');
+    const pendingFile = path.join(daemonControlDir(), 'restart-pending.json');
     // 等待所有活 main 进程退出（可能不止一个）
     const oldStatus = scanInstances();
     const aliveMains = oldStatus.mains.filter(m => m.alive);
@@ -168,9 +178,22 @@ export async function cmdRestartMonitor() {
             await notifyDaemonOwners(p, `⚠️ ${WEB_PACKAGE_NAME} 升级失败，使用当前版本继续\n${ecwebUpgrade.error ?? ''}`.trim(), log);
             break;
     }
+    // source=ecweb 的 Service Proxy 只在 daemon 启动后的短窗口内发现实例。
+    // restart-monitor 直接 spawn daemon，必须在此先启动独立的 ec-web，不能绕过
+    // cmdStart 的 ECWeb 生命周期逻辑。
+    const ecwebStartedBeforeDaemon = serviceProxyNeedsEcweb(loadDaemonConfig())
+        ? await startEcwebIfEnabled(p)
+        : false;
+    if (ecwebStartedBeforeDaemon)
+        log('ECWeb started before daemon');
     // 启动并检测 ready signal
     let started = await spawnAndWaitReady(p, log, READY_TIMEOUT);
     if (started) {
+        // 没有 Service Proxy 时可以等 daemon ready 后再启动；有代理时已在上方启动，
+        // 避免重新拉起造成实例记录和反向隧道短暂失配。
+        if (!ecwebStartedBeforeDaemon && await startEcwebIfEnabled(p)) {
+            log('ECWeb started after daemon');
+        }
         log('✓ Service restarted successfully');
         archiveSelfHealLog(p, log);
         // 发起会话内的“重启成功”通知由新进程自行发送，此处只负责失败/自愈告警。

package/dist/cli/trigger-command.js

@@ -110,7 +110,7 @@ Create 参数模式支持:
   --tz <时区> (仅 cron)
   --target-channel <channelKey> --target-channel-id <ID>  (AUN 可简写为 aun)
   --target-session <main|thread> [--target-thread-id <threadId>]
-  --trigger-thread <per-run|by-trigger>
+  --trigger-thread <by-run|by-trigger>  (兼容旧值 per-run)
   --name <名称>
 
 通用输出参数:

package/dist/cli/watch-msg.js

@@ -1,7 +1,7 @@
 import fs from 'fs';
 import path from 'path';
 import { resolvePaths } from '../paths.js';
-import { decodeDirSegment, readAllJsonlLines } from '../core/session/session-fs-store.js';
+import { chatDirPath, readAllJsonlLines, scanChatDirs } from '../core/session/session-fs-store.js';
 import { isTransientProtocolMessage } from '../core/message/message-log.js';
 // ==================== ANSI ====================
 const isTTY = !!process.stdout.isTTY;
@@ -135,36 +135,26 @@ function shortAid(aid) {
 // ==================== Data Layer ====================
 export function getSessionsAunDir() {
     const p = resolvePaths();
-    return path.join(p.sessionsDir, 'aun');
+    return p.sessionsDir;
 }
 export function listLocalAids(aunDir) {
-    try {
-        return fs.readdirSync(aunDir, { withFileTypes: true })
-            .filter(e => e.isDirectory())
-            .map(e => decodeDirSegment(e.name));
-    }
-    catch {
-        return [];
-    }
+    return [...new Set(scanChatDirs(aunDir)
+            .filter(chat => chat.channelType === 'aun')
+            .map(chat => chat.selfAID))].sort();
 }
 export function listPeers(aunDir, localAid) {
-    const aidDir = path.join(aunDir, encodeSegment(localAid));
-    try {
-        return fs.readdirSync(aidDir, { withFileTypes: true })
-            .filter(e => e.isDirectory() && !e.name.startsWith('_'))
-            .map(e => decodeDirSegment(e.name));
-    }
-    catch {
-        return [];
-    }
+    return scanChatDirs(aunDir)
+        .filter(chat => chat.channelType === 'aun' && chat.selfAID === localAid)
+        .map(chat => chat.channelId)
+        .sort();
 }
 export function readMessages(aunDir, localAid, peerId) {
-    const msgPath = path.join(aunDir, encodeSegment(localAid), encodeSegment(peerId), 'messages.jsonl');
+    const msgPath = path.join(chatDirPath(aunDir, 'aun', peerId, localAid), 'messages.jsonl');
     return readAllJsonlLines(msgPath)
         .filter(m => !isTransientProtocolMessage(m));
 }
 function readPeerName(aunDir, localAid, peerId) {
-    const activePath = path.join(aunDir, encodeSegment(localAid), encodeSegment(peerId), 'active.json');
+    const activePath = path.join(chatDirPath(aunDir, 'aun', peerId, localAid), 'active.json');
     try {
         const data = JSON.parse(fs.readFileSync(activePath, 'utf-8'));
         return data?.metadata?.peerName || null;
@@ -173,9 +163,6 @@ function readPeerName(aunDir, localAid, peerId) {
         return null;
     }
 }
-function encodeSegment(s) {
-    return s.replace(/[/%\\:*?"<>|]/g, ch => '%' + ch.charCodeAt(0).toString(16).toUpperCase().padStart(2, '0'));
-}
 export function loadAidInfo(aunDir, aid) {
     const peers = listPeers(aunDir, aid);
     let totalIn = 0, totalOut = 0;
@@ -457,7 +444,7 @@ export async function cmdWatchMsg() {
             watcher.close();
             watcher = null;
         }
-        const aidDir = path.join(aunDir, encodeSegment(aid));
+        const aidDir = path.dirname(path.dirname(chatDirPath(aunDir, 'aun', '__watch__', aid)));
         try {
             watcher = fs.watch(aidDir, { recursive: true }, (_, filename) => {
                 if (filename && filename.endsWith('messages.jsonl')) {

package/dist/config/builtin-roles.js

@@ -40,7 +40,9 @@ export function getManagementCommandPermissions(role) {
         'config.unset': { allow: true, scopes: ['agent', 'relation'] },
         'role.policy.write': { allow: true, dangerous: true, scopes: ['agent'], constraints: { requireAgentAdmin: true } },
         '*': { allow: true },
-        'agent.reload': { allow: true, dangerous: true, scopes: ['agent'], constraints: { targetCurrentAgentOnly: true, requireAgentAdmin: true } },
+        // Reload is valid from an Agent's own channel and the daemon control plane.
+        // The control-channel gate still requires a daemon owner for cross-Agent reloads.
+        'agent.reload': { allow: true, dangerous: true, scopes: ['agent', 'control'], constraints: { targetCurrentAgentOnly: true, requireAgentAdmin: true } },
         'dangerous:*': { allow: true, dangerous: true, constraints: { requireDaemonOwner: true } },
     };
 }

package/dist/config/config-field-policy.js

@@ -25,7 +25,7 @@ const BASEAGENT_BEHAVIOR_FIELDS = new Set([
     'mode',
     'useVertex',
 ]);
-const SUPPORTED_BASEAGENTS = new Set(['claude', 'codex', 'gemini', 'hermes']);
+const SUPPORTED_BASEAGENTS = new Set(['claude', 'codex', 'gemini', 'ecagent', 'hermes']);
 const SENSITIVE_TOP_FIELDS = new Set([
     '$schema_version',
     'aid',

package/dist/config/gateway-config.js

@@ -15,16 +15,17 @@ import fs from 'fs';
 import path from 'path';
 import { resolvePaths } from '../paths.js';
 import { saveDefaultsSafe, saveAgent } from '../config-store.js';
-import { resolveAnthropicConfig, resolveOpenaiConfig } from '../agents/baseagent.js';
+import { resolveAnthropicConfig, resolveEcagentConfig, resolveOpenaiConfig } from '../agents/baseagent.js';
 import { resolvePriceRow } from '../stats/billing.js';
 import { ipcQuery } from '../ipc.js';
 import { logger } from '../utils/logger.js';
 /** 已知 baseagent 类型（网关可管理范围）。 */
-const GATEWAY_TYPES = ['claude', 'codex', 'gemini'];
+const GATEWAY_TYPES = ['claude', 'codex', 'gemini', 'ecagent'];
 const DISPLAY_NAMES = {
     claude: 'Claude',
     codex: 'Codex (OpenAI)',
     gemini: 'Gemini',
+    ecagent: 'ecagent (EvolCore)',
 };
 // ── 掩码 ──
 const ENV_PREFIX = '$ENV:';
@@ -362,7 +363,7 @@ function buildPatch(type, patch) {
         else
             return { error: 'apiKey 仅接受 "$ENV:NAME" 环境变量引用，不接受明文' };
     }
-    if (type === 'claude' || type === 'codex') {
+    if (type === 'claude' || type === 'codex' || type === 'ecagent') {
         if (patch.effort !== undefined)
             f.effort = String(patch.effort).trim() || undefined;
     }
@@ -383,6 +384,16 @@ function buildPatch(type, patch) {
         if (patch.location !== undefined)
             f.location = String(patch.location).trim() || undefined;
     }
+    if (type === 'ecagent') {
+        for (const key of ['timeoutMs', 'maxRetries', 'maxRetryDelayMs']) {
+            if (patch[key] !== undefined) {
+                const value = Number(patch[key]);
+                if (!Number.isFinite(value) || value < 0)
+                    return { error: `${key} 必须是非负数字` };
+                f[key] = value;
+            }
+        }
+    }
     return { fields: f };
 }
 /** 触发 reload：defaults 改动影响全部 agent（resync），单 agent 改动只 reload 它。 */
@@ -485,6 +496,10 @@ function resolveGatewayCreds(scope, type) {
             const r = resolveAnthropicConfig(synth, expanded);
             return { baseUrl: r.baseUrl, apiKey: r.apiKey };
         }
+        else if (type === 'ecagent') {
+            const r = resolveEcagentConfig(synth, expanded);
+            return { baseUrl: r.baseUrl, apiKey: r.apiKey };
+        }
         return { error: 'gemini 暂不支持 HTTP 探测（CLI 后端）', code: 'NOT_SUPPORTED' };
     }
     catch (e) {
@@ -507,7 +522,9 @@ export async function gatewayTest(args) {
     try {
         const controller = new AbortController();
         const timer = setTimeout(() => controller.abort(), 5000);
-        const resp = await fetch(`${baseUrl.replace(/\/+$/, '')}/v1/models`, {
+        const base = baseUrl.replace(/\/+$/, '');
+        const modelsUrl = base.endsWith('/v1') ? `${base}/models` : `${base}/v1/models`;
+        const resp = await fetch(modelsUrl, {
             headers: apiKey ? { Authorization: `Bearer ${apiKey}` } : {},
             signal: controller.signal,
         });

package/dist/config/resolved-config-op.js

@@ -110,6 +110,16 @@ function resolveFieldCommand(argv, subcommand, options = {}) {
             reason: 'Agent role policies are managed through the role policy editor',
         };
     }
+    const canContainFallbackModels = field === 'baseagents'
+        || /^baseagents\.[^.]+$/.test(field)
+        || /^baseagents\.[^.]+\.fallbackModels(?:\.|$)/.test(field);
+    if (subcommand !== 'get' && canContainFallbackModels) {
+        return {
+            ok: false,
+            code: 'DEFAULTS_FILE_ONLY',
+            reason: 'fallbackModels is configured only by editing agents/defaults.json',
+        };
+    }
     const fieldRule = resolveConfigFieldRule(field);
     if (subcommand !== 'get' && fieldRule.class === 'safe-readonly-object') {
         return {

package/dist/core/command/command-handler.js

@@ -803,10 +803,10 @@ export class CommandHandler {
         };
         if (s.agentSessionId) {
             item.agentSessionId = s.agentSessionId;
-            const fileInfo = this.sessionManager.getSessionFileInfo(s.projectPath, s.agentSessionId, s.baseagent);
+            const fileInfo = this.sessionManager.getSessionFileInfo(s.projectPath, s.agentSessionId, s.baseagent, s.selfAID);
             if (fileInfo.turns)
                 item.turns = fileInfo.turns;
-            const firstMsg = this.sessionManager.readSessionFirstMessage(s.projectPath, s.agentSessionId, s.baseagent);
+            const firstMsg = this.sessionManager.readSessionFirstMessage(s.projectPath, s.agentSessionId, s.baseagent, s.selfAID);
             if (firstMsg)
                 item.preview = firstMsg.length > 80 ? firstMsg.slice(0, 80) + '...' : firstMsg;
         }

package/dist/core/command/menu-handler.js

@@ -4,7 +4,7 @@ import { modelMatches } from '../model/model-catalog.js';
 import { constrainResolvedModelForRole, filterModelsForRole, validateModelSelectionForRole } from '../model/model-permission.js';
 import { hasModelSwitcher } from '../../agents/runner-types.js';
 import { getCodexEfforts } from '../../agents/codex-runner.js';
-import { resolvePaths, getPackageRoot } from '../../paths.js';
+import { resolvePaths, getPackageRoot, daemonControlDir } from '../../paths.js';
 import { buildEnvelope } from '../message/message-utils.js';
 import path from 'path';
 import fs from 'fs';
@@ -1038,6 +1038,8 @@ function buildRoleMenuContext(owner, channel, subject) {
     return {
         self,
         actorRole: subject.role,
+        actorRoleSource: subject.roleSource,
+        actorAllowAccess: subject.allowAccess,
         actorAid: subject.actorId,
         chatType: subject.chatType,
         aunAvailable,
@@ -1537,10 +1539,10 @@ export async function getSubMenuItems(cmd, channel, channelId, userId, args, ove
             };
             if (s.agentSessionId) {
                 item.agentSessionId = s.agentSessionId;
-                const fileInfo = this.sessionManager.getSessionFileInfo(s.projectPath, s.agentSessionId, s.baseagent);
+                const fileInfo = this.sessionManager.getSessionFileInfo(s.projectPath, s.agentSessionId, s.baseagent, s.selfAID);
                 if (fileInfo.turns)
                     item.turns = fileInfo.turns;
-                const firstMsg = this.sessionManager.readSessionFirstMessage(s.projectPath, s.agentSessionId, s.baseagent);
+                const firstMsg = this.sessionManager.readSessionFirstMessage(s.projectPath, s.agentSessionId, s.baseagent, s.selfAID);
                 if (firstMsg)
                     item.preview = firstMsg.length > 80 ? firstMsg.slice(0, 80) + '…' : firstMsg;
             }
@@ -1903,7 +1905,7 @@ export async function execMenuQuery(cmd, channel, channelId, userId, args, expli
         }
         let turns = 0;
         if (session.agentSessionId) {
-            const fileInfo = this.sessionManager.getSessionFileInfo(session.projectPath, session.agentSessionId, session.baseagent);
+            const fileInfo = this.sessionManager.getSessionFileInfo(session.projectPath, session.agentSessionId, session.baseagent, session.selfAID);
             turns = fileInfo.turns;
         }
         const data = {
@@ -1950,7 +1952,7 @@ export async function execMenuQuery(cmd, channel, channelId, userId, args, expli
         }
         let turns = 0;
         if (topic.agentSessionId) {
-            turns = this.sessionManager.getSessionFileInfo(topic.projectPath, topic.agentSessionId, topic.baseagent).turns;
+            turns = this.sessionManager.getSessionFileInfo(topic.projectPath, topic.agentSessionId, topic.baseagent, topic.selfAID).turns;
         }
         const data = {
             threadId: topic.threadId,
@@ -2878,7 +2880,7 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
                 return { error: `无效 targetSession: ${targetSession}`, code: 'INVALID_ARGS' };
             }
             const triggerThread = args.triggerThread;
-            if (triggerThread !== undefined && triggerThread !== 'per_run' && triggerThread !== 'by_trigger') {
+            if (triggerThread !== undefined && triggerThread !== 'per_run' && triggerThread !== 'by_run' && triggerThread !== 'by_trigger') {
                 return { error: `无效 triggerThread: ${triggerThread}`, code: 'INVALID_ARGS' };
             }
             const parsed = {
@@ -3269,9 +3271,9 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
             const suppressRealRestart = shouldSuppressRealRestart();
             if (!suppressRealRestart) {
                 const restartInfo = { channel, channelId, timestamp: Date.now() };
-                const dataDir = resolvePaths().dataDir;
-                fs.mkdirSync(dataDir, { recursive: true });
-                fs.writeFileSync(path.join(dataDir, 'restart-pending.json'), JSON.stringify(restartInfo));
+                const controlDir = daemonControlDir();
+                fs.mkdirSync(controlDir, { recursive: true });
+                fs.writeFileSync(path.join(controlDir, 'restart-pending.json'), JSON.stringify(restartInfo));
                 const { spawn } = await import('child_process');
                 spawn('node', [path.join(getPackageRoot(), 'dist', 'cli', 'index.js'), 'restart-monitor'], {
                     detached: true,

package/dist/core/command/role-menu.js

@@ -785,6 +785,7 @@ async function targetSnapshot(context, args, policyRevision) {
         target,
         relationRevision: relation?.revision ?? null,
         ...targetRoleView(self, target, relation?.config ?? null),
+        ...(target.kind === 'group' ? { requesterRole: requesterRoleResult(context) } : {}),
         relationConfig: relationConfigView(context, target, relation?.config ?? null),
     };
 }
@@ -1157,6 +1158,16 @@ function relationConfigView(context, target, config) {
 function roleResult(roleId, source, self) {
     return { roleId, source: roleId ? source : 'none', allowAccess: roleId ? checkRoleAccess(roleId, self) : false };
 }
+function requesterRoleResult(context) {
+    const roleId = isManagementRole(context.actorRole) ? context.actorRole : null;
+    return {
+        roleId,
+        source: roleId ? context.actorRoleSource ?? 'authenticated' : 'none',
+        allowAccess: roleId
+            ? context.actorAllowAccess ?? checkRoleAccess(roleId, context.self)
+            : false,
+    };
+}
 function readAgent(self) {
     const agent = read(ConfigTarget.Agent, { self }, { cache: false });
     if (!agent)