evolclaw 3.1.11 → 3.2.0

package/dist/cli/index.js

@@ -6,11 +6,12 @@ import { spawn, execFileSync, execFile } from 'child_process';
 import { promisify } from 'util';
 import { resolveRoot, resolvePaths, ensureDataDirs, getPackageRoot, agentMdPath } from '../paths.js';
 import { loadDefaults, loadAllAgents, mergeForAgent } from '../config-store.js';
+import { loadEvolclawConfig } from '../evolclaw-config.js';
 import { resolveAnthropicConfig } from '../agents/resolve.js';
 import { migrateProject } from '../config-store.js';
-import { cmdInit } from './init.js';
+import { cmdInit, needsControlAidInit, initTail } from './init.js';
 import { ipcQuery } from '../ipc.js';
-import { cmdInitWechat, cmdInitFeishu, cmdInitDingtalk, cmdInitQQBot, cmdInitWecom } from './init-channel.js';
+import { cmdInitWechat, cmdInitFeishu, cmdInitDingtalk, cmdInitQQBot, cmdInitWecom, cmdInitAun } from './init-channel.js';
 import { isHelpFlag, wantsHelp, getArgValue } from './help.js';
 import * as platform from '../utils/cross-platform.js';
 import { EventBus } from '../core/event-bus.js';
@@ -299,6 +300,19 @@ async function cmdStart() {
         await cmdInit();
         return;
     }
+    // 控制 AID 门禁：缺 aid 且交互式 → 只补全控制 AID + owners（不重走 baseagent 向导）。
+    // 非 TTY（restart-monitor/systemd/管道）不补全（无法交互），只提示后继续启动，daemon 侧 warn 兜底。
+    const evolclawCfgStart = loadEvolclawConfig();
+    if (needsControlAidInit(evolclawCfgStart.aid, !!process.stdin.isTTY)) {
+        console.log('⚡ 控制 AID 未配置，自动补全...\n');
+        const { suppressSdkLogs } = await import('../aun/aid/index.js');
+        suppressSdkLogs();
+        await initTail();
+        return;
+    }
+    if (!evolclawCfgStart.aid) {
+        console.log('⚠ 控制 AID 未配置（非交互式启动，跳过补全）。如需进程身份/远程管理，请运行 evolclaw init');
+    }
     // 检查至少有一个 self-agent
     const { agents, skipped } = loadAllAgents();
     if (agents.length === 0) {
@@ -968,6 +982,14 @@ async function cmdStatus() {
                     }
                 }
                 catch { /* ignore */ }
+                // 控制 AID（daemon 进程身份）状态
+                if (status.controlAid) {
+                    const state = status.controlAid.connected ? 'connected' : 'disconnected';
+                    console.log(`control: ${status.controlAid.aid}  [${state}]`);
+                }
+                else {
+                    console.log('control: not configured');
+                }
                 if (status.stats) {
                     console.log('');
                     console.log('📊 Last hour:');
@@ -4870,12 +4892,18 @@ export async function main(args) {
     --force                              已存在 defaults.json 时覆盖
 
 配置渠道（先 evolclaw agent new 创建 agent）:
+  evolclaw init aun           AUN 渠道配置（AID 创建/绑定）
   evolclaw init feishu        飞书扫码登录
   evolclaw init wechat        微信扫码登录
   evolclaw init dingtalk      钉钉扫码登录
   evolclaw init qqbot         QQ 机器人扫码绑定
   evolclaw init wecom         企业微信 AI Bot 配置（手动输入）`);
             }
+            else if (args[1] === 'aun') {
+                const { suppressSdkLogs } = await import('../aun/aid/index.js');
+                suppressSdkLogs();
+                await cmdInitAun();
+            }
             else if (args[1] === 'wechat') {
                 const { suppressSdkLogs } = await import('../aun/aid/index.js');
                 suppressSdkLogs();
@@ -4900,7 +4928,7 @@ export async function main(args) {
                 await cmdInitWecom();
             }
             else if (args[1] && !args[1].startsWith('-')) {
-                const supported = ['feishu', 'wechat', 'dingtalk', 'qqbot', 'wecom'];
+                const supported = ['feishu', 'wechat', 'aun', 'dingtalk', 'qqbot', 'wecom'];
                 console.error(`❌ 不支持的渠道: ${args[1]}`);
                 console.error(`   支持的渠道: ${supported.join(', ')}`);
                 process.exit(1);

package/dist/cli/init-channel.js

@@ -5,16 +5,12 @@
  *   - cmdInit<Channel>()  — standalone `evolclaw init <channel>` entry
  *   - run<Channel>QrFlow() or setupAun*() — reusable primitives for the main init wizard
  */
-import fs from 'fs';
 import readline from 'readline';
-import path from 'path';
 import crypto from 'crypto';
-import { aidLocalDir, aunPath as defaultAunPath } from '../paths.js';
 import { selectInstance } from './init.js';
-import { npmInstallGlobal } from '../utils/npm-ops.js';
-import { loadAllAgents, loadAgent } from '../config-store.js';
+import { loadAllAgents, loadAgent, saveAgent } from '../config-store.js';
 import { agentChannelUpsert } from './agent.js';
-import { AUN_CORE_SDK_PKG, MIN_AUN_CORE_SDK, resolveAunCoreSdkPkg, isAunSdkVersionOk, isValidAid, aidCreate, agentmdPut, buildInitialAgentMd, } from '../aun/aid/index.js';
+import { isValidAid } from '../aun/aid/index.js';
 function ask(rl, question) {
     return new Promise(resolve => rl.question(question, resolve));
 }
@@ -372,156 +368,50 @@ export async function cmdInitWechat() {
     await commitChannel(aid, channel, choice.action);
 }
 // ==================== AUN ====================
-//
-// AUN 原子操作（aidCreate, agentmdPut, downloadCaRoot, isValidAid, ...）
-// 已迁移至 src/channels/aun-ops.ts。本节仅保留交互式 UI 编排。
-export async function checkAunEnvironment(rl) {
-    console.log('\n🔍 AUN 环境检查...\n');
-    const minVer = MIN_AUN_CORE_SDK.join('.');
-    const installed = resolveAunCoreSdkPkg();
-    if (!installed) {
-        console.log(`  ✗ ${AUN_CORE_SDK_PKG} 未安装`);
-        const answer = (await ask(rl, `  → 是否安装 ${AUN_CORE_SDK_PKG}@latest？[Y/n] `)).trim().toLowerCase();
-        if (answer === 'n' || answer === 'no') {
-            console.log('  已取消');
-            return false;
-        }
-        console.log(`  正在安装 ${AUN_CORE_SDK_PKG}...`);
-        try {
-            await npmInstallGlobal(`${AUN_CORE_SDK_PKG}@latest`);
-            console.log(`  ✓ ${AUN_CORE_SDK_PKG} 安装完成`);
-        }
-        catch (e) {
-            console.log(`  ✗ 安装失败: ${e.message?.slice(0, 200) || e}`);
-            return false;
-        }
-        console.log('');
-        return true;
-    }
-    if (isAunSdkVersionOk(installed.version)) {
-        console.log(`  ✓ ${AUN_CORE_SDK_PKG} v${installed.version}`);
-        console.log('');
-        return true;
-    }
-    console.log(`  ✗ ${AUN_CORE_SDK_PKG} v${installed.version} — 需要 >= ${minVer}`);
-    const answer = (await ask(rl, `  → 是否升级 ${AUN_CORE_SDK_PKG}？[Y/n] `)).trim().toLowerCase();
-    if (answer === 'n' || answer === 'no') {
-        console.log('  已取消');
-        return false;
-    }
-    console.log(`  正在升级 ${AUN_CORE_SDK_PKG}...`);
+export async function cmdInitAun() {
+    // AUN channel 从 agent.aid 隐式派生，AID 密钥在 `agent new` 时已创建就绪——本命令不碰 aid。
+    // 与其他渠道一致，职责是配置 owner；AUN 的 owner 存于 agent 顶层 owners[]（见 evolagent.ts）。
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
     try {
-        await npmInstallGlobal(`${AUN_CORE_SDK_PKG}@latest`);
-        console.log(`  ✓ ${AUN_CORE_SDK_PKG} 升级完成`);
-    }
-    catch (e) {
-        console.log(`  ✗ 升级失败: ${e.message?.slice(0, 200) || e}`);
-        return false;
-    }
-    console.log('');
-    return true;
-}
-// isValidAid, createAidSilent → 已迁移至 src/channels/aun-ops.ts
-// appendAunInstance → 已迁移至 src/channels/aun-ops.ts
-export async function setupAunAid(rl, _config) {
-    let aid = '';
-    // Outer loop: allows retrying with a different AID
-    while (true) {
-        // Ask AID with format validation
-        aid = '';
-        while (!aid) {
-            aid = (await ask(rl, '  AUN Agent ID (例: mybot.agentid.pub): ')).trim();
-            if (!aid) {
-                console.log('  ⚠ 不能为空');
-                continue;
-            }
-            if (!isValidAid(aid)) {
-                console.log('  ⚠ 无效 AID 格式（需要合法域名，至少三级，如 alice.agentid.pub）');
-                aid = '';
-            }
-        }
-        // Check if AID exists locally
-        const aunPath = defaultAunPath();
-        const aidDir = path.join(aunPath, 'AIDs', aid);
-        if (fs.existsSync(aidDir) && fs.existsSync(path.join(aidDir, 'private'))) {
-            console.log(`  ✓ AID ${aid} 已存在`);
-            break;
-        }
-        const answer = (await ask(rl, `  ⚠ AID ${aid} 本地不存在，是否创建？[Y/n] `)).trim().toLowerCase();
-        if (answer === 'n' || answer === 'no') {
-            console.log('  已跳过 AID 创建（启动时可能连接失败）');
-            break;
+        const agentId = await pickAgentForChannel(rl);
+        if (!agentId)
+            return;
+        const agentConfig = loadAgent(agentId);
+        if (!agentConfig) {
+            console.error(`❌ 无法加载 agent ${agentId} 的配置`);
+            return;
         }
-        // Create AID + agent.md via atomic ops
-        console.log('  正在创建 AID...');
-        let failed = false;
-        try {
-            const result = await aidCreate(aid);
-            console.log(`  ✓ AID ${result.aid} 创建成功`);
-            // Collect agent.md type and upload
-            const typeInput = (await ask(rl, '  Agent 类型 human/ai [ai]: ')).trim().toLowerCase();
-            const agentType = typeInput === 'human' ? 'human' : 'ai';
-            const content = buildInitialAgentMd({ aid, type: agentType });
-            try {
-                await agentmdPut(content, { aid });
-                console.log('  ✓ agent.md 已发布并写入本地');
-            }
-            catch (e) {
-                console.log(`  ⚠ agent.md 发布失败（首次连接将自动重试）: ${String(e.message || e).slice(0, 100)}`);
-                // Still write local copy as fallback
-                try {
-                    const localDir = aidLocalDir(aid);
-                    fs.mkdirSync(localDir, { recursive: true });
-                    fs.writeFileSync(path.join(localDir, 'agent.md'), content, 'utf-8');
-                    console.log('  ✓ agent.md 已写入本地');
+        console.log(`\n📡 AUN 渠道配置 — agent ${agentConfig.aid}`);
+        const current = agentConfig.owners?.[0];
+        if (current)
+            console.log(`  当前 Owner: ${current}`);
+        console.log('  Owner 将接收欢迎消息并拥有管理权限\n');
+        let owner = '';
+        while (!owner) {
+            const input = (await ask(rl, `  Owner AID${current ? ` [${current}]` : ''}: `)).trim();
+            if (!input) {
+                if (current) {
+                    owner = current;
+                    break;
                 }
-                catch (we) {
-                    console.log(`  ✗ agent.md 本地写入失败: ${String(we.message || we).slice(0, 100)}`);
-                    failed = true;
-                }
-            }
-            try {
-                await result.client.close();
+                console.log('  ⚠ Owner AID 不能为空');
+                continue;
             }
-            catch { /* ignore */ }
-            try {
-                result.store?.close();
+            if (!isValidAid(input)) {
+                console.log('  ⚠ Owner AID 格式无效（需合法多级域名，如 alice.agentid.pub）');
+                continue;
             }
-            catch { /* ignore */ }
+            owner = input;
         }
-        catch (e) {
-            const msg = e.message || String(e);
-            console.log(`  ✗ AID 创建失败: ${msg.slice(0, 200)}`);
-            failed = true;
-        }
-        if (!failed)
-            break;
-        // Creation failed — retry or give up
-        const retry = (await ask(rl, '  → 重新输入 (r) / 跳过 (s) / 取消 (c)？[r/s/c] ')).trim().toLowerCase();
-        if (retry === 'c')
-            return null;
-        if (retry === 's')
-            break;
-        // default: retry with new AID
+        // 写入顶层 owners：新 owner 置首位（getOwner 取 owners[0]），保留其余去重
+        agentConfig.owners = [owner, ...(agentConfig.owners || []).filter(o => o !== owner)];
+        saveAgent(agentConfig);
+        console.log(`\n✅ AUN 渠道 Owner 已设置: ${owner}`);
+        console.log(`\n重启生效: evolclaw restart`);
     }
-    // Owner 必填
-    console.log('\n📋 Owner 配置');
-    console.log('  Owner 将接收欢迎消息并拥有管理权限');
-    let owner = '';
-    while (!owner) {
-        const ownerInput = (await ask(rl, '  Owner AID (必填): ')).trim();
-        if (!ownerInput) {
-            console.log('  ⚠ Owner AID 不能为空');
-            continue;
-        }
-        if (!isValidAid(ownerInput)) {
-            console.log('  ⚠ Owner AID 格式无效');
-            continue;
-        }
-        owner = ownerInput;
-        console.log(`  ✓ Owner 已设置: ${owner}`);
+    finally {
+        rl.close();
     }
-    return { aid, owner };
 }
 // ==================== DingTalk ====================
 const DINGTALK_BASE_URL = 'https://oapi.dingtalk.com';

package/dist/cli/init.js

@@ -4,7 +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 { saveDefaultsSafe, loadAllAgents, migrateProcessConfigIfNeeded } from '../config-store.js';
+import { loadEvolclawConfig, saveEvolclawConfig } from '../evolclaw-config.js';
+import { generateControlAid } from '../aun/aid/control-aid.js';
 import { isCodexSdkAvailable } from '../agents/codex-runner.js';
 // ==================== Helpers ====================
 function ask(rl, question) {
@@ -36,10 +38,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) {
@@ -66,110 +93,163 @@ 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)) {
+                    console.log(`❌ ${options.baseagent} 当前环境不可用（可用: ${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}`);
-        const { agents } = loadAllAgents();
-        if (agents.length === 0) {
-            console.log('\n提示：尚无 agent，运行以下命令创建：');
-            console.log('  evolclaw agent new <aid>.agentid.pub');
+            writeDefaults(chosen, available);
+            console.log(`✓ 已${exists ? '覆盖' : '创建'}: ${defaultsPath}`);
+            console.log(`  active_baseagent: ${chosen}`);
         }
-        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;
         }
-        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;
-        }
-        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 */ }
         }
-        catch { /* ignore */ }
     }
 }
 /**

package/dist/config-store.js

@@ -17,6 +17,7 @@ import fs from 'fs';
 import path from 'path';
 import { resolvePaths, agentConfig as agentConfigPath, agentDir, } from './paths.js';
 import { atomicReadJson, atomicWriteJson } from './utils/atomic-write.js';
+import * as evolclawConfigModule from './evolclaw-config.js';
 import { checkAgentDir, isValidAid } from './aun/aid/validation.js';
 import { isValidChannelName } from './core/channel-loader.js';
 import { CONFIG_SCHEMA_VERSION } from './types.js';
@@ -122,14 +123,42 @@ export function saveDefaultsSafe(patch) {
         : { $schema_version: CONFIG_SCHEMA_VERSION, ...patch };
     atomicWriteJson(p, merged);
 }
-export function loadProcessConfig() {
-    const raw = atomicReadJson(resolvePaths().processConfig);
+// ── 进程配置迁移（旧 {root}/config.json ProcessConfig → evolclaw.json）──────
+//
+// ProcessConfig 类型 + loadProcessConfig/saveProcessConfig 已废弃并删除：
+// 唯一有效字段 aun.encryptionSeed 已迁入 evolclaw.json（见 migrateProcessConfigIfNeeded），
+// 读取源切到 loadEvolclawConfig（store.ts）。log / aun.gateway / aun.keystorePath 是死字段。
+/**
+ * 一次性迁移：{root}/config.json（旧 ProcessConfig）→ {root}/evolclaw.json。
+ * - 仅搬运 aun.encryptionSeed（逐字节原样，含 null）；log / aun.gateway / aun.keystorePath 是死字段，丢弃。
+ * - 合并写入（不覆盖 evolclaw.json 已有字段如 aid）。
+ * - 完成后归档 config.json → config.json.migrated（保留备份，不直接删）。
+ *
+ * ⚠️ encryptionSeed 是 AID 私钥的加密种子，迁移前后 getAidStore 拿到的 seed 必须逐字节一致，
+ * 否则所有已注册 AID 私钥解不开。这里只搬运不改值（含 null）。
+ */
+export function migrateProcessConfigIfNeeded() {
+    const p = resolvePaths();
+    const oldPath = p.processConfig; // {root}/config.json
+    const raw = atomicReadJson(oldPath);
     if (raw === null)
-        return {};
-    return expandEnvRefs(raw);
-}
-export function saveProcessConfig(value) {
-    atomicWriteJson(resolvePaths().processConfig, value);
+        return; // 不存在 → no-op
+    const { loadEvolclawConfig, saveEvolclawConfig } = evolclawConfigModule;
+    const evc = loadEvolclawConfig();
+    // 仅当旧文件确实带 aun.encryptionSeed 字段时才搬（hasOwnProperty，保 null 语义）
+    const didMigrateSeed = !!(raw.aun && Object.prototype.hasOwnProperty.call(raw.aun, 'encryptionSeed'));
+    if (didMigrateSeed) {
+        evc.aun = { ...(evc.aun ?? {}), encryptionSeed: raw.aun.encryptionSeed };
+    }
+    evc.$schema_version = evc.$schema_version ?? 1;
+    saveEvolclawConfig(evc);
+    // 归档旧文件（不删，留备份）
+    try {
+        fs.renameSync(oldPath, oldPath + '.migrated');
+    }
+    catch { /* ignore */ }
+    const what = didMigrateSeed ? 'aun.encryptionSeed 已搬运' : 'aun.encryptionSeed 不存在（无需搬运）';
+    logger.info(`[migrate] config.json → evolclaw.json (${what}，config.json 已归档为 .migrated)`);
 }
 // ── 自动迁移 ───────────────────────────────────────────────────────────
 /**
@@ -492,6 +521,8 @@ export function mergeForAgent(agent, defaults) {
         debounce: agent.debounce ?? d.debounce,
         debug: deepMergeBlocks(d.debug, agent.debug),
         enable_rich_content: agent.enable_rich_content ?? d.enable_rich_content,
+        dispatch: agent.dispatch,
+        observable: agent.observable,
     };
     return merged;
 }