evolclaw 3.1.11 → 3.3.0

package/dist/cli/init.js

@@ -4,8 +4,9 @@ import readline from 'readline';
 import { resolvePaths, ensureDataDirs } from '../paths.js';
 import { commandExists } from '../utils/cross-platform.js';
 import { scanInstances } from '../utils/instance-registry.js';
-import { saveDefaultsSafe, loadAllAgents } from '../config-store.js';
-import { isCodexSdkAvailable } from '../agents/codex-runner.js';
+import { saveDefaultsSafe, loadAllAgents, migrateProcessConfigIfNeeded, loadEvolclawConfig, saveEvolclawConfig } from '../config-store.js';
+import { generateControlAid } from '../aun/aid/control-aid.js';
+import { getCodexAppServerAvailability, isCodexAppServerAvailable } from '../agents/codex-runner.js';
 // ==================== Helpers ====================
 function ask(rl, question) {
     return new Promise(resolve => rl.question(question, resolve));
@@ -13,7 +14,7 @@ function ask(rl, question) {
 const BASEAGENT_CANDIDATES = ['claude', 'codex', 'gemini'];
 function isBaseagentAvailable(baseagent) {
     if (baseagent === 'codex')
-        return isCodexSdkAvailable();
+        return isCodexAppServerAvailable();
     return commandExists(baseagent);
 }
 function detectAvailable() {
@@ -36,10 +37,35 @@ function buildDefaults(chosen, available, projectsDefaultPath) {
 function writeDefaults(chosen, available, projectsDefaultPath) {
     saveDefaultsSafe(buildDefaults(chosen, available, projectsDefaultPath));
 }
+/** 启动门禁判定：缺控制 AID 且处于交互式终端时，应进 init 向导补全。
+ *  非 TTY（restart-monitor/systemd/管道）即使缺 aid 也不进 init（无法交互），由 daemon 侧 warn 兜底。 */
+export function needsControlAidInit(aid, isTty) {
+    return !aid && isTty;
+}
+/** 解析用户输入的 owner AID 列表：按空白/逗号分隔，去空、去重、按 isValid 分流。
+ *  空输入 → valid:[]（视为跳过）。 */
+export function parseOwnerAids(raw, isValid) {
+    const tokens = raw.split(/[\s,]+/).map(t => t.trim()).filter(Boolean);
+    const valid = [];
+    const invalid = [];
+    for (const t of tokens) {
+        if (isValid(t)) {
+            if (!valid.includes(t))
+                valid.push(t);
+        }
+        else {
+            invalid.push(t);
+        }
+    }
+    return { valid, invalid };
+}
 // ==================== Main ====================
 export async function cmdInit(options) {
     const p = resolvePaths();
     ensureDataDirs();
+    // config.json → evolclaw.json：init 路径也可能先于 daemon 触发 AID 生成（走 getAidStore），
+    // 须在任何 getAidStore 之前迁移 encryptionSeed。
+    migrateProcessConfigIfNeeded();
     // ── 1. 单进程互斥 ──
     const aliveMains = scanInstances().mains.filter(m => m.alive);
     if (aliveMains.length > 0) {
@@ -53,7 +79,7 @@ export async function cmdInit(options) {
         console.log('❌ 未检测到可用 baseagent。请安装至少一款：');
         console.log('  - claude CLI');
         console.log('  - gemini CLI');
-        console.log('  - optional dependency @openai/codex-sdk');
+        console.log('  - codex CLI with app-server');
         console.log('\n安装后重新运行 evolclaw init');
         return;
     }
@@ -66,110 +92,191 @@ export async function cmdInit(options) {
     // ── 3. 非交互式分支 ──
     if (options?.nonInteractive) {
         if (exists && !options.force) {
-            console.log(`❌ 配置已存在: ${defaultsPath}（加 --force 可覆盖）`);
-            return;
+            // 配置已存在且未 --force：不重写 defaults，但仍落到共享 tail（幂等补生成控制 AID）
+            console.log(`配置已存在: ${defaultsPath}（加 --force 可覆盖）`);
         }
-        let chosen;
-        if (options.baseagent) {
-            if (!BASEAGENT_CANDIDATES.includes(options.baseagent)) {
-                console.log(`❌ 无效 baseagent: ${options.baseagent}（可选: ${BASEAGENT_CANDIDATES.join('/')}）`);
-                return;
+        else {
+            let chosen;
+            if (options.baseagent) {
+                if (!BASEAGENT_CANDIDATES.includes(options.baseagent)) {
+                    console.log(`❌ 无效 baseagent: ${options.baseagent}（可选: ${BASEAGENT_CANDIDATES.join('/')}）`);
+                    return; // 硬错误：不落 tail
+                }
+                if (!available.includes(options.baseagent)) {
+                    const reason = options.baseagent === 'codex'
+                        ? getCodexAppServerAvailability().reason
+                        : undefined;
+                    console.log(`❌ ${options.baseagent} 当前环境不可用${reason ? `：${reason}` : `（可用: ${available.join('/')}）`}`);
+                    return; // 硬错误：不落 tail
+                }
+                chosen = options.baseagent;
             }
-            if (!available.includes(options.baseagent)) {
-                console.log(`❌ ${options.baseagent} 当前环境不可用（可用: ${available.join('/')}）`);
-                return;
+            else {
+                chosen = pickDefault(available);
             }
-            chosen = options.baseagent;
-        }
-        else {
-            chosen = pickDefault(available);
+            writeDefaults(chosen, available);
+            console.log(`✓ 已${exists ? '覆盖' : '创建'}: ${defaultsPath}`);
+            console.log(`  active_baseagent: ${chosen}`);
         }
-        writeDefaults(chosen, available);
-        console.log(`✓ 已${exists ? '覆盖' : '创建'}: ${defaultsPath}`);
-        console.log(`  active_baseagent: ${chosen}`);
-        const { agents } = loadAllAgents();
-        if (agents.length === 0) {
-            console.log('\n提示：尚无 agent，运行以下命令创建：');
-            console.log('  evolclaw agent new <aid>.agentid.pub');
-        }
-        return;
+        // 落到共享 tail（不 return）
     }
-    // ── 4. 交互式分支 ──
-    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-    async function askBaseagent() {
-        const defaultBa = pickDefault(available);
-        if (available.length === 1) {
-            console.log(`  baseagent: ${defaultBa}`);
-            return defaultBa;
-        }
-        let chosen = null;
-        while (chosen === null) {
-            const input = (await ask(rl, `默认 baseagent (${available.join('/')}) [${defaultBa}]: `)).trim() || defaultBa;
-            if (!BASEAGENT_CANDIDATES.includes(input)) {
-                console.log(`  无效选择，可选: ${BASEAGENT_CANDIDATES.join('/')}`);
-                continue;
+    else {
+        // ── 4. 交互式分支（rl 生命周期封装在内部函数，tail 不引用 rl）──
+        await runInteractive();
+    }
+    // ── 共享 tail（单一出口）：提示创建 agent + 生成控制 AID ──
+    await initTail();
+    // ── 内部函数 ──
+    async function runInteractive() {
+        const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+        async function askBaseagent() {
+            const defaultBa = pickDefault(available);
+            if (available.length === 1) {
+                console.log(`  baseagent: ${defaultBa}`);
+                return defaultBa;
             }
-            if (!available.includes(input)) {
-                console.log(`  ${input} 当前环境不可用（可用: ${available.join('/')}）`);
-                continue;
+            let chosen = null;
+            while (chosen === null) {
+                const input = (await ask(rl, `默认 baseagent (${available.join('/')}) [${defaultBa}]: `)).trim() || defaultBa;
+                if (!BASEAGENT_CANDIDATES.includes(input)) {
+                    console.log(`  无效选择，可选: ${BASEAGENT_CANDIDATES.join('/')}`);
+                    continue;
+                }
+                if (!available.includes(input)) {
+                    console.log(`  ${input} 当前环境不可用（可用: ${available.join('/')}）`);
+                    continue;
+                }
+                chosen = input;
             }
-            chosen = input;
-        }
-        return chosen;
-    }
-    async function askProjectsDefaultPath() {
-        const defaultDir = path.join(p.root, 'projects', 'default');
-        const input = (await ask(rl, `项目默认目录 [${defaultDir}]: `)).trim();
-        const resolved = input || defaultDir;
-        if (!path.isAbsolute(resolved)) {
-            console.log('  ⚠ 需要绝对路径，已跳过');
-            return undefined;
+            return chosen;
         }
-        if (!fs.existsSync(resolved)) {
-            const create = (await ask(rl, `  目录不存在，是否创建？[Y/n]: `)).trim().toLowerCase();
-            if (create === '' || create === 'y' || create === 'yes') {
-                fs.mkdirSync(resolved, { recursive: true });
-                console.log(`  ✓ 已创建 ${resolved}`);
-            }
-            else {
+        async function askProjectsDefaultPath() {
+            const defaultDir = path.join(p.root, 'projects', 'default');
+            const input = (await ask(rl, `项目默认目录 [${defaultDir}]: `)).trim();
+            const resolved = input || defaultDir;
+            if (!path.isAbsolute(resolved)) {
+                console.log('  ⚠ 需要绝对路径，已跳过');
                 return undefined;
             }
+            if (!fs.existsSync(resolved)) {
+                const create = (await ask(rl, `  目录不存在，是否创建？[Y/n]: `)).trim().toLowerCase();
+                if (create === '' || create === 'y' || create === 'yes') {
+                    fs.mkdirSync(resolved, { recursive: true });
+                    console.log(`  ✓ 已创建 ${resolved}`);
+                }
+                else {
+                    return undefined;
+                }
+            }
+            return resolved;
         }
-        return resolved;
-    }
-    try {
-        if (exists) {
-            const ans = (await ask(rl, `配置文件已存在: ${defaultsPath}\n  是否覆盖？[y/N] `)).trim().toLowerCase();
-            if (ans === 'y' || ans === 'yes') {
+        try {
+            if (exists) {
+                const ans = (await ask(rl, `配置文件已存在: ${defaultsPath}\n  是否覆盖？[y/N] `)).trim().toLowerCase();
+                if (ans === 'y' || ans === 'yes') {
+                    const chosen = await askBaseagent();
+                    const projectsDefaultPath = await askProjectsDefaultPath();
+                    writeDefaults(chosen, available, projectsDefaultPath);
+                    console.log(`\n✓ 已覆盖: ${defaultsPath}`);
+                    console.log(`  active_baseagent: ${chosen}\n`);
+                }
+                else {
+                    console.log('  已跳过（保留现有配置）\n');
+                }
+            }
+            else {
                 const chosen = await askBaseagent();
                 const projectsDefaultPath = await askProjectsDefaultPath();
                 writeDefaults(chosen, available, projectsDefaultPath);
-                console.log(`\n✓ 已覆盖: ${defaultsPath}`);
+                console.log(`\n✓ 已创建: ${defaultsPath}`);
                 console.log(`  active_baseagent: ${chosen}\n`);
             }
-            else {
-                console.log('  已跳过（保留现有配置）\n');
+        }
+        finally {
+            try {
+                rl.close();
             }
+            catch { /* ignore */ }
         }
-        else {
-            const chosen = await askBaseagent();
-            const projectsDefaultPath = await askProjectsDefaultPath();
-            writeDefaults(chosen, available, projectsDefaultPath);
-            console.log(`\n✓ 已创建: ${defaultsPath}`);
-            console.log(`  active_baseagent: ${chosen}\n`);
+    }
+}
+/** 补全控制 AID + owners（可单独调用，不走 baseagent 向导）。 */
+export async function initTail() {
+    // 提示创建 agent（两分支汇合后执行一次）
+    const { agents } = loadAllAgents();
+    if (agents.length === 0) {
+        console.log('\n提示：尚无 agent，运行以下命令创建：');
+        console.log('  evolclaw agent new <aid>.agentid.pub');
+    }
+    // 控制 AID：daemon 进程身份。缺失则生成并写回 evolclaw.json（幂等：已存在则跳过）。
+    const evc = loadEvolclawConfig();
+    if (evc.aid) {
+        console.log(`✓ 控制 AID 已存在: ${evc.aid}`);
+    }
+    else {
+        try {
+            const { aid } = await generateControlAid();
+            saveEvolclawConfig({ ...evc, $schema_version: evc.$schema_version ?? 1, aid });
+            console.log(`✓ 已生成控制 AID: ${aid}`);
         }
-        // ── 5. 提示创建 agent ──
-        const { agents } = loadAllAgents();
-        if (agents.length === 0) {
-            console.log('提示：尚无 agent，运行以下命令创建：');
-            console.log('  evolclaw agent new <aid>.agentid.pub');
+        catch (e) {
+            console.error(`⚠️ 控制 AID 生成失败（Gateway 不可达？联网后重跑 evolclaw init 补全）: ${e?.message || e}`);
         }
     }
-    finally {
+    // 配置进程级管理者（owners）：仅交互式 + aid 已配置 + owners 未配置时询问
+    const evcForOwners = loadEvolclawConfig();
+    if (process.stdin.isTTY && evcForOwners.aid && (!evcForOwners.owners || evcForOwners.owners.length === 0)) {
+        const { isValidAid } = await import('../aun/aid/index.js');
+        const rlOwners = readline.createInterface({ input: process.stdin, output: process.stdout });
         try {
-            rl.close();
+            const raw = (await ask(rlOwners, '\n请输入 EvolClaw 管理者 AID: ')).trim();
+            if (raw) {
+                const { valid, invalid } = parseOwnerAids(raw, isValidAid);
+                if (invalid.length > 0)
+                    console.log(`  ⚠ 跳过非法 AID: ${invalid.join(', ')}`);
+                if (valid.length > 0) {
+                    saveEvolclawConfig({ ...loadEvolclawConfig(), owners: valid });
+                    console.log(`  ✓ 已配置管理者: ${valid.join(', ')}`);
+                }
+                else {
+                    console.log('  未输入合法 AID，已跳过 owners 配置');
+                }
+            }
+            else {
+                console.log('  已跳过 owners 配置（可日后编辑 evolclaw.json 或重跑 evolclaw init）');
+            }
+        }
+        finally {
+            try {
+                rlOwners.close();
+            }
+            catch { /* ignore */ }
+        }
+    }
+    // ECWeb：交互式 + 未配置时询问是否启用
+    if (process.stdin.isTTY) {
+        const evcEcweb = loadEvolclawConfig();
+        if (evcEcweb.ecweb?.enabled === undefined) {
+            const rlEcweb = readline.createInterface({ input: process.stdin, output: process.stdout });
+            try {
+                const ans = (await ask(rlEcweb, '\n是否在 evolclaw start 时自动启动 ECWeb 控制台？[y/N] ')).trim().toLowerCase();
+                if (ans === 'y' || ans === 'yes') {
+                    saveEvolclawConfig({ ...loadEvolclawConfig(), ecweb: { enabled: true } });
+                    console.log('  ✓ 已启用 ECWeb（evolclaw start 将自动在后台启动）');
+                    console.log('  提示：首次访问运行 ec watch web 查看配对码和 URL');
+                }
+                else {
+                    saveEvolclawConfig({ ...loadEvolclawConfig(), ecweb: { enabled: false } });
+                    console.log('  已跳过（可日后运行 ec watch web 手动启动，或编辑 evolclaw.json）');
+                }
+            }
+            finally {
+                try {
+                    rlEcweb.close();
+                }
+                catch { }
+            }
         }
-        catch { /* ignore */ }
     }
 }
 /**

package/dist/cli/model.js

@@ -13,7 +13,7 @@
 import { isHelpFlag, wantsHelp, getArgValue } from './help.js';
 import { ModelScopeError, normalizePeer, determineScope, activeBaseagent, readScope, writeScope, clearScope, resolveEffectiveModel, } from '../core/model/model-scope.js';
 import { loadDefaults, loadAgent } from '../config-store.js';
-import { resolveAnthropicConfig } from '../agents/resolve.js';
+import { resolveAnthropicConfig } from '../agents/baseagent.js';
 import { getCatalog, getModelInfo } from '../core/model/model-catalog.js';
 const ALL_EFFORTS = ['low', 'medium', 'high', 'xhigh', 'max', 'auto'];
 const SCOPE_LABEL = {