evolcore 0.0.7 → 0.0.9

package/dist/cli/init.js

@@ -6,11 +6,12 @@ import { resolvePaths, ensureDataDirs } from '../paths.js';
 import { commandExists } from '../utils/cross-platform.js';
 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 { generateControlAid, resolveControlAidDomain } 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';
+import { autostartInstalled, autostartPlatformLabel, configureAutostart } from '../utils/autostart.js';
 // ==================== Helpers ====================
 function ask(rl, question) {
     return new Promise(resolve => rl.question(question, resolve));
@@ -66,6 +67,40 @@ function buildDefaults(chosen, available, projectsDefaultPath) {
 function writeDefaults(chosen, available, projectsDefaultPath) {
     saveDefaultsSafe(buildDefaults(chosen, available, projectsDefaultPath));
 }
+function hasCompletedInitConfig() {
+    const p = resolvePaths();
+    const daemon = loadDaemonConfig();
+    if (!daemon.aid || !Array.isArray(daemon.owners) || daemon.owners.length === 0)
+        return false;
+    try {
+        const defaults = JSON.parse(fs.readFileSync(p.defaultsConfig, 'utf8'));
+        return typeof defaults?.active_baseagent === 'string' && defaults.active_baseagent.trim().length > 0;
+    }
+    catch {
+        return false;
+    }
+}
+function isAutostartOnlyRequest(options) {
+    return options?.autoStart !== undefined
+        && !options.baseagent
+        && !options.force
+        && !options.owner
+        && options.projectpath === undefined
+        && options.ecweb === undefined
+        && options.format === undefined;
+}
+function applyExplicitAutostart(enabled, runtimeRoot) {
+    const result = configureAutostart(enabled, runtimeRoot);
+    if (!result.ok) {
+        console.log(`❌ ${autostartPlatformLabel() || '登录自启'}配置失败: ${result.error || '未知错误'}`);
+    }
+    else {
+        console.log(enabled
+            ? `✓ 已启用 ${autostartPlatformLabel() || '登录'}自启`
+            : `✓ 已禁用 ${autostartPlatformLabel() || '登录'}自启`);
+    }
+    return result.ok;
+}
 /** 启动门禁判定：缺控制 AID 且处于交互式终端时，应进 init 向导补全。
  *  非 TTY（restart-monitor/systemd/管道）即使缺 aid 也不进 init（无法交互），由 daemon 侧 warn 兜底。 */
 export function needsControlAidInit(aid, isTty) {
@@ -128,14 +163,29 @@ export async function cmdInit(options) {
             ecweb: options.ecweb,
             force: options.force,
             format: options.format,
+            autoStart: options.autoStart,
         });
         return true;
     }
+    if (options?.autoStart === true && !autostartPlatformLabel()) {
+        console.log('❌ --auto-start 仅支持 Windows 和 macOS 主机');
+        return false;
+    }
     const p = resolvePaths();
     ensureDataDirs();
+    // A bound installation may toggle login autostart independently of the
+    // Baseagent setup wizard. This is also the path used by public installers.
+    if (isAutostartOnlyRequest(options) && hasCompletedInitConfig()) {
+        return applyExplicitAutostart(options.autoStart, p.root);
+    }
     // ── 1. 单进程互斥 ──
     const aliveMains = scanInstances().mains.filter(m => m.alive);
     if (aliveMains.length > 0) {
+        // Explicit autostart flags only change the login task; they do not need
+        // to rewrite init configuration or stop an already running daemon.
+        if (isAutostartOnlyRequest(options)) {
+            return applyExplicitAutostart(options.autoStart, p.root);
+        }
         const pids = aliveMains.map(m => m.record.pid).join(', ');
         console.log(`❌ EvolCore 正在运行 (PID: ${pids})，请先执行 ec stop`);
         return false;
@@ -207,7 +257,11 @@ export async function cmdInit(options) {
         await runInteractive();
     }
     // ── 共享 tail（单一出口）：提示创建 agent + 生成控制 AID ──
-    return initTail({ invokedByStart: options?.invokedByStart });
+    return initTail({
+        invokedByStart: options?.invokedByStart,
+        nonInteractive: options?.nonInteractive,
+        autoStart: options?.autoStart,
+    });
     // ── 内部函数 ──
     async function runInteractive() {
         const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
@@ -313,38 +367,35 @@ export async function initTail(options = {}) {
     const { agents } = loadAllAgents();
     if (agents.length === 0 && !options.invokedByStart) {
         console.log('\n提示：尚无 agent，运行以下命令创建：');
-        console.log('  ec agent new <aid>.agentid.pub');
+        console.log('  ec agent new <aid>.example.com');
     }
     // 控制 AID：daemon 进程身份。缺失则生成并写回 daemon.json（幂等：已存在则跳过）。
     const daemonConfig = loadDaemonConfig();
     let controlAidReady = !!daemonConfig.aid;
+    let autoStartReady = true;
     if (daemonConfig.aid) {
-        const targetIssuer = resolveControlIssuer();
-        const currentIssuer = daemonConfig.aid.split('.').slice(1).join('.');
-        if (currentIssuer !== targetIssuer) {
-            console.log(`⚠️  控制 AID issuer (${currentIssuer}) 与目标 issuer (${targetIssuer}) 不一致`);
-            console.log(`    如需切换，请删除 daemon.json 中的 aid 字段后重新运行 init`);
-        }
         console.log(`✓ 控制 AID 已存在: ${daemonConfig.aid}`);
     }
     else {
         try {
-            const { aid } = await generateControlAid();
+            const aidDomain = resolveControlAidDomain(daemonConfig.aun?.defaultAidDomain);
+            const { aid } = await generateControlAid(aidDomain);
             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}`);
+            console.error(`⚠️ 控制 AID 生成失败（请检查 AID domain 配置或 Gateway 连通性）: ${e?.message || e}`);
             controlAidReady = false;
         }
     }
     // 交互式询问：使用单一 readline 实例避免 stdin 状态混乱
-    if (process.stdin.isTTY) {
+    if (!options.nonInteractive && process.stdin.isTTY) {
         const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
         try {
             await handleOwnersPrompt(rl);
             await handleEcwebPrompt(rl);
+            await handleAutostartPrompt(rl);
         }
         finally {
             try {
@@ -353,6 +404,38 @@ export async function initTail(options = {}) {
             catch { /* ignore */ }
         }
     }
+    else if (options.autoStart !== undefined) {
+        autoStartReady = applyAutostart(options.autoStart);
+    }
+    async function handleAutostartPrompt(rl) {
+        if (options.autoStart !== undefined) {
+            autoStartReady = applyAutostart(options.autoStart);
+            return;
+        }
+        if (!autostartPlatformLabel())
+            return;
+        if (autostartInstalled()) {
+            console.log(`✓ ${autostartPlatformLabel()} 登录自启已启用`);
+            return;
+        }
+        const platform = autostartPlatformLabel();
+        const answer = (await ask(rl, `\n是否启用 ${platform} 登录自启？[y/N] `)).trim().toLowerCase();
+        if (answer === 'y' || answer === 'yes')
+            autoStartReady = applyAutostart(true);
+        else
+            console.log(`  已跳过 ${platform} 登录自启（可日后重新运行 ec init 开启）`);
+    }
+    function applyAutostart(enabled) {
+        const result = configureAutostart(enabled, resolvePaths().root);
+        if (!result.ok) {
+            console.log(`  ❌ ${autostartPlatformLabel() || '登录自启'}配置失败: ${result.error || '未知错误'}`);
+            return false;
+        }
+        console.log(enabled
+            ? `  ✓ 已启用 ${autostartPlatformLabel() || '登录'}自启`
+            : `  ✓ 已禁用 ${autostartPlatformLabel() || '登录'}自启`);
+        return true;
+    }
     async function handleOwnersPrompt(rl) {
         const daemonConfigForOwners = loadDaemonConfig();
         if (daemonConfigForOwners.aid && (!daemonConfigForOwners.owners || daemonConfigForOwners.owners.length === 0)) {
@@ -432,11 +515,13 @@ export async function initTail(options = {}) {
     }
     // ec start 会接着启动 daemon，并在其 ready 后给出可用的 Agent 创建入口。
     if (options.invokedByStart)
-        return controlAidReady;
+        return controlAidReady && autoStartReady;
     if (!controlAidReady) {
         console.error('\n❌ EvolCore 初始化未完成：控制 AID 未配置。联网后重新运行 ec init。');
         return false;
     }
+    if (!autoStartReady)
+        return false;
     // 初始化完成总结
     console.log('\n✓ EvolCore 初始化完成');
     const finalCfg = loadDaemonConfig();
@@ -446,7 +531,7 @@ export async function initTail(options = {}) {
     const { agents: finalAgents } = loadAllAgents();
     if (finalAgents.length === 0) {
         console.log('\n📌 下一步：创建 agent');
-        console.log('  ec agent new <your-aid>.agentid.pub');
+        console.log('  ec agent new <your-aid>.example.com');
         console.log('  ec init feishu    # 绑定飞书');
         console.log('  ec start          # 启动服务');
     }
@@ -530,6 +615,9 @@ export async function cmdInitNonInteractive(opts, dependencies = {}) {
     if (format !== undefined && format !== 'json') {
         fail('INVALID_FORMAT', `--format only supports json: ${format}`, EXIT_USAGE, format);
     }
+    if (opts.autoStart === true && !autostartPlatformLabel()) {
+        fail('AUTOSTART_UNSUPPORTED', '--auto-start is supported only on Windows and macOS hosts', EXIT_USAGE, format);
+    }
     // ── 1. owner 校验 ──
     if (!opts.owner) {
         fail('MISSING_OWNER', '--owner is required in non-interactive mode', EXIT_USAGE, format);
@@ -632,11 +720,12 @@ export async function cmdInitNonInteractive(opts, dependencies = {}) {
     let controlAid = existingCfg.aid;
     if (!controlAid) {
         try {
-            const { aid } = await generateControlAid();
+            const aidDomain = resolveControlAidDomain(existingCfg.aun?.defaultAidDomain);
+            const { aid } = await generateControlAid(aidDomain);
             controlAid = aid;
         }
         catch (e) {
-            fail('CONTROL_AID_CREATE_FAILED', `gateway unreachable: ${e?.message || e}`, EXIT_RUNTIME, format);
+            fail('CONTROL_AID_CREATE_FAILED', `control AID creation failed: ${e?.message || e}`, EXIT_RUNTIME, format);
         }
     }
     // ── 9. 写 daemon.json（aid + owners + ecweb）──
@@ -653,6 +742,12 @@ export async function cmdInitNonInteractive(opts, dependencies = {}) {
     catch (e) {
         fail('IO_ERROR', `failed to write daemon.json: ${e?.message || e}`, EXIT_RUNTIME, format);
     }
+    if (opts.autoStart !== undefined) {
+        const autostart = configureAutostart(opts.autoStart, p.root);
+        if (!autostart.ok) {
+            fail('AUTOSTART_CONFIG_FAILED', autostart.error || 'failed to configure login autostart', EXIT_RUNTIME, format);
+        }
+    }
     // ── 10. 输出 init.result ──
     const result = {
         type: 'init.result',
@@ -660,7 +755,7 @@ export async function cmdInitNonInteractive(opts, dependencies = {}) {
         controlAid: controlAid,
         ownerAid,
         owners: [ownerAid],
-        ecwebEnabled: opts.ecweb === true,
+        ecwebEnabled: opts.ecweb === true || existingCfg.ecweb?.enabled === true,
         baseagent: chosenBaseagent,
         projectsDefaultPath: projectsDefaultPath ?? null,
         defaultsPath: p.defaultsConfig,

package/dist/cli/model.js

@@ -205,7 +205,7 @@ function modelScopeFromSource(source) {
     return undefined;
 }
 function resolveModelConfig(sel, baseagent) {
-    const effortKey = baseagent === 'codex' ? 'reasoning' : 'effort';
+    const effortKey = 'effort';
     const model = resolveEffectiveFieldWithSource(`baseagents.${baseagent}.model`, sel, { cache: true });
     const effort = resolveEffectiveFieldWithSource(`baseagents.${baseagent}.${effortKey}`, sel, { cache: true });
     const modelDecision = sel.role
@@ -448,12 +448,12 @@ async function cmdUse(args, formatJson) {
     const effortVal = effort === 'auto' ? null : (effort ?? undefined);
     if (isManagedTargetedWriteEnv(args)) {
         if (effortVal !== undefined) {
-            const effortKey = ba === 'codex' ? 'reasoning' : 'effort';
+            const effortKey = 'effort';
             preflightManagedFieldOverride(sel, role, `baseagents.${ba}.${effortKey}`, effortVal, formatJson);
         }
         await setManagedModelField(sel, `baseagents.${ba}.model`, modelId, formatJson);
         if (effortVal !== undefined) {
-            const effortKey = ba === 'codex' ? 'reasoning' : 'effort';
+            const effortKey = 'effort';
             await setManagedModelField(sel, `baseagents.${ba}.${effortKey}`, effortVal, formatJson);
         }
         describeWrite(scope, sel, modelId, effort ?? null, formatJson);
@@ -490,7 +490,7 @@ async function cmdEffort(args, formatJson) {
     const ba = activeBaseagent(sel.self);
     const val = level === 'auto' ? null : level;
     if (isManagedTargetedWriteEnv(args)) {
-        const effortKey = ba === 'codex' ? 'reasoning' : 'effort';
+        const effortKey = 'effort';
         preflightManagedFieldOverride(sel, explicitOrDerivedRole(args, sel), `baseagents.${ba}.${effortKey}`, val, formatJson);
         await setManagedModelField(sel, `baseagents.${ba}.${effortKey}`, val, formatJson);
         describeWrite(scope, sel, null, level, formatJson);
@@ -520,7 +520,7 @@ async function cmdReset(args, formatJson) {
     const scope = determineWriteScope(sel, formatJson);
     const ba = activeBaseagent(sel.self);
     if (isManagedTargetedWriteEnv(args)) {
-        const effortKey = ba === 'codex' ? 'reasoning' : 'effort';
+        const effortKey = 'effort';
         const role = explicitOrDerivedRole(args, sel);
         preflightManagedFieldOverride(sel, role, `baseagents.${ba}.model`, null, formatJson);
         preflightManagedFieldOverride(sel, role, `baseagents.${ba}.${effortKey}`, null, formatJson);

package/dist/cli/restart-monitor.js

@@ -93,6 +93,37 @@ export async function cmdRestartMonitor() {
             await sleep(500);
         }
     }
+    // A stale instance record can disappear while the real Windows process is
+    // still alive. Refuse to create a second daemon when an unregistered process
+    // from this package is found; a duplicate would connect AUN and kick the
+    // existing session before failing on IPC/port ownership.
+    const runtimeOrphans = findOrphanProcesses().filter(o => {
+        if (o.confirmedTestDaemon)
+            return false;
+        const homeMatches = o.evolcoreHome && normalizePath(o.evolcoreHome) === normalizePath(p.root);
+        const packageMatches = !o.evolcoreHome && normalizePath(o.cmdline).includes(normalizePath(getPackageRoot()));
+        return Boolean(homeMatches || packageMatches);
+    });
+    if (runtimeOrphans.length > 0) {
+        const pids = runtimeOrphans.map(o => o.pid).join(', ');
+        log(`Stopping unregistered EvolCore process(es): ${pids}`);
+        for (const orphan of runtimeOrphans) {
+            platform.killProcess(orphan.pid, false);
+        }
+        const exited = await Promise.all(runtimeOrphans.map(async (orphan) => {
+            if (await platform.waitForProcessExit(orphan.pid, 10_000))
+                return true;
+            platform.killProcess(orphan.pid, true);
+            return platform.waitForProcessExit(orphan.pid, 5_000);
+        }));
+        if (exited.some(result => !result)) {
+            const message = `未登记的 EvolCore 进程仍未退出（PID: ${pids}），已停止重启以避免重复连接 AUN。`;
+            log(message);
+            await notifyDaemonOwners(p, `❌ ${message}`, log);
+            process.exit(1);
+        }
+        cleanupInstances();
+    }
     // restart-pending.json 只留给新主进程发送发起会话内的“重启成功”回执。
     const pendingFile = path.join(daemonControlDir(), 'restart-pending.json');
     // 等待所有活 main 进程退出（可能不止一个）
@@ -108,24 +139,24 @@ export async function cmdRestartMonitor() {
             }
             catch { }
         }
-        await Promise.all(oldPids.map(oldPid => new Promise((resolve) => {
-            let waited = 0;
-            const interval = setInterval(() => {
-                waited++;
-                if (!platform.isProcessRunning(oldPid)) {
-                    clearInterval(interval);
-                    log(`Process ${oldPid} has exited`);
-                    resolve();
-                    return;
-                }
-                if (waited >= 30) {
-                    clearInterval(interval);
-                    log(`ERROR: Process ${oldPid} still running after 30s, force killing`);
-                    platform.killProcess(oldPid, true);
-                    resolve();
-                }
-            }, 1000);
-        })));
+        const exited = await Promise.all(oldPids.map(async (oldPid) => {
+            if (await platform.waitForProcessExit(oldPid, 30_000)) {
+                log(`Process ${oldPid} has exited`);
+                return true;
+            }
+            log(`ERROR: Process ${oldPid} still running after 30s, force killing`);
+            platform.killProcess(oldPid, true);
+            const forced = await platform.waitForProcessExit(oldPid, 5_000);
+            if (!forced)
+                log(`ERROR: Process ${oldPid} survived forced termination`);
+            return forced;
+        }));
+        if (exited.some(result => !result)) {
+            log('❌ Existing daemon process could not be stopped; refusing to spawn a replacement');
+            await notifyDaemonOwners(p, '❌ 旧 EvolCore 进程未能退出，已停止重启，避免重复连接 AUN。', log);
+            cleanupPendingFile(pendingFile, log);
+            process.exit(1);
+        }
         await sleep(3000);
         cleanupInstances();
     }
@@ -206,10 +237,25 @@ export async function cmdRestartMonitor() {
         cleanupPendingFile(pendingFile, log);
         process.exit(1);
     }
+    if (hasStartupResourceConflict(p)) {
+        const message = '服务启动失败：IPC 管道或端口仍被占用，已跳过自动修复，避免重复连接 AUN。';
+        log(message);
+        await notifyDaemonOwners(p, `❌ ${message}`, log);
+        cleanupPendingFile(pendingFile, log);
+        process.exit(1);
+    }
     // 启动失败，进入 self-heal 循环
     log('❌ Service failed to start, entering self-heal loop');
     eventBus.publish({ type: 'self-heal:started', reason: 'Service failed to start after restart' });
     await notifyDaemonOwners(p, '⚠️ 服务启动失败，正在尝试自动修复...', log);
+    const claudePath = platform.resolveCommandPath('claude');
+    if (!claudePath) {
+        const message = '找不到 claude CLI，已停止自动修复；请检查后台进程 PATH。';
+        log(message);
+        await notifyDaemonOwners(p, `❌ ${message}`, log);
+        cleanupPendingFile(pendingFile, log);
+        process.exit(1);
+    }
     for (let attempt = 1; attempt <= MAX_HEAL_ATTEMPTS; attempt++) {
         // 前置检查：服务可能已被上一轮 claude 修复并启动
         if (isServiceAlive()) {
@@ -223,7 +269,7 @@ export async function cmdRestartMonitor() {
         log(`Self-heal attempt ${attempt}/${MAX_HEAL_ATTEMPTS}`);
         eventBus.publish({ type: 'self-heal:attempt', attemptNumber: attempt, maxAttempts: MAX_HEAL_ATTEMPTS });
         await notifyDaemonOwners(p, `🔧 自动修复中（第 ${attempt}/${MAX_HEAL_ATTEMPTS} 次）...`, log);
-        const healed = await invokeClaude(p, attempt, MAX_HEAL_ATTEMPTS, HEAL_TIMEOUT, log);
+        const healed = await invokeClaude(claudePath, p, attempt, MAX_HEAL_ATTEMPTS, HEAL_TIMEOUT, log);
         // 后置检查：不管 invokeClaude 返回什么，都检查服务实际状态
         if (isServiceAlive()) {
             log(`✓ Service is running after attempt ${attempt}`);
@@ -290,6 +336,30 @@ async function sendHealSummary(p, attempts, log) {
 function sleep(ms) {
     return new Promise(resolve => setTimeout(resolve, ms));
 }
+function normalizePath(value) {
+    return value.replace(/[\\/]+/g, '/').toLowerCase();
+}
+function hasStartupResourceConflict(p) {
+    let daemonLog = null;
+    try {
+        daemonLog = fs.readdirSync(p.logs, { withFileTypes: true })
+            .filter(entry => entry.isFile() && /^daemon-.*\.log$/.test(entry.name))
+            .sort((a, b) => b.name.localeCompare(a.name))
+            .slice(0, 1)
+            .map(entry => path.join(p.logs, entry.name))[0] ?? null;
+    }
+    catch { }
+    const files = [path.join(p.logs, 'stdout.log'), ...(daemonLog ? [daemonLog] : [])];
+    return files.some(file => {
+        try {
+            const content = fs.readFileSync(file, 'utf-8');
+            return /EADDRINUSE|address already in use|pipe-.*already in use/i.test(content.slice(-64 * 1024));
+        }
+        catch {
+            return false;
+        }
+    });
+}
 function cleanupPendingFile(filePath, log) {
     try {
         if (fs.existsSync(filePath)) {
@@ -353,9 +423,17 @@ async function spawnAndWaitReady(p, log, timeout) {
         }
     }
     log(`Ready signal not received within ${timeout / 1000}s`);
-    // 超时后杀掉进程
+    // A timeout is still a live-process race: do not let self-heal spawn a
+    // replacement while the timed-out daemon owns the IPC endpoint or a port.
     if (platform.isProcessRunning(childPid)) {
         platform.killProcess(childPid);
+        if (!await platform.waitForProcessExit(childPid, 5_000)) {
+            log(`Process ${childPid} survived graceful termination, forcing kill`);
+            platform.killProcess(childPid, true);
+            if (!await platform.waitForProcessExit(childPid, 5_000)) {
+                log(`ERROR: Process ${childPid} survived forced termination`);
+            }
+        }
     }
     cleanupInstances();
     return false;
@@ -363,7 +441,7 @@ async function spawnAndWaitReady(p, log, timeout) {
 /**
  * 调用 claude CLI 进行自动修复
  */
-async function invokeClaude(p, attempt, maxAttempts, timeout, log) {
+async function invokeClaude(claudePath, p, attempt, maxAttempts, timeout, log) {
     const projectDir = getPackageRoot();
     const selfHealLog = p.selfHealLog;
     const stdoutLog = path.join(p.logs, 'stdout.log');
@@ -401,7 +479,7 @@ async function invokeClaude(p, attempt, maxAttempts, timeout, log) {
 注意：只修复导致启动失败的问题，不要做额外的重构或优化。`;
     try {
         log(`Invoking claude CLI (attempt ${attempt}, timeout ${timeout / 60000}min)...`);
-        const { stdout, stderr } = await execFileAsync('claude', [
+        const { stdout, stderr } = await execFileAsync(claudePath, [
             '-p', prompt,
             '--allowedTools', 'Read,Write,Edit,Bash,Glob,Grep',
             '--output-format', 'text',
@@ -409,6 +487,8 @@ async function invokeClaude(p, attempt, maxAttempts, timeout, log) {
         ], {
             cwd: projectDir,
             timeout,
+            // Windows npm CLIs are .cmd shims; execFile needs a shell to run them.
+            shell: platform.isWindows,
             env: { ...process.env, CLAUDE_CODE_ENTRYPOINT: 'cli' },
             maxBuffer: 10 * 1024 * 1024,
         });

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

@@ -1,18 +1,19 @@
 import path from 'path';
 import { kitsRoleTemplatesDir } from '../paths.js';
 import { createErrorCapturingReader, fileCache } from '../core/daemon-file-cache.js';
-import { validateRoleConfig } from './role-schema.js';
+import { normalizeRoleEffortCompat, 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);
+    const normalizedRaw = normalizeRoleEffortCompat(raw);
+    const issues = validateRoleConfig(normalizedRaw);
     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;
+    const { $schema_version: _schemaVersion, ...definition } = normalizedRaw;
     if (BUILTIN_ROLE_IDS.includes(roleId)) {
         const expectedRank = expectedRoleRank(roleId);
         if (definition.rank !== expectedRank) {

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

@@ -75,7 +75,7 @@ export function resolveConfigFieldRule(fieldPath) {
         const [, baseagent, leaf] = parts;
         if (!SUPPORTED_BASEAGENTS.has(baseagent))
             return { class: 'unknown' };
-        const permissionKey = `baseagents.${baseagent}.${leaf}`;
+        const permissionKey = `baseagents.${baseagent}.${leaf === 'reasoning' ? 'effort' : leaf}`;
         if (leaf === 'model' && parts.length === 3)
             return scalar(permissionKey, 'string');
         if ((leaf === 'effort' || leaf === 'reasoning') && parts.length === 3)
@@ -178,7 +178,11 @@ export function resolveRoleFieldPermission(permissions, fieldPath) {
     const rule = resolveConfigFieldRule(fieldPath);
     if (!rule.rolePermissionKey)
         return undefined;
-    return permissions[fieldPath] ?? permissions[rule.rolePermissionKey];
+    return permissions[fieldPath]
+        ?? permissions[rule.rolePermissionKey]
+        ?? (rule.rolePermissionKey === 'baseagents.codex.effort'
+            ? permissions['baseagents.codex.reasoning']
+            : undefined);
 }
 /**
  * Map relation-scoped config fields back to their public command capability.