evolclaw 3.1.10 → 3.2.0

package/dist/channels/wechat.js

@@ -3,7 +3,7 @@ import fs from 'fs';
 import path from 'path';
 import { resolvePaths } from '../paths.js';
 import { logger } from '../utils/logger.js';
-import { sanitizeFileName, saveToUploads, safeFetch } from '../utils/media-cache.js';
+import { sanitizeFileName, saveToUploads, safeFetch, bufferToInboundImage } from '../utils/media-cache.js';
 import { markdownToPlainText } from '../utils/rich-content-renderer.js';
 import { formatItemsAsText } from '../core/message/items-formatter.js';
 const CHANNEL_VERSION = '1.0.0';
@@ -527,7 +527,13 @@ export class WechatChannel {
             try {
                 if (item.type === MSG_ITEM_IMAGE && item.image_item?.media) {
                     const buf = await downloadMedia(item.image_item.media, item.image_item.aeskey);
-                    images.push({ data: buf.toString('base64'), mimeType: 'image/jpeg' });
+                    // 统一图片识别：magic bytes 优先正确区分 jpeg/png/gif/webp；
+                    // 检测失败时回退到 image/jpeg（微信入站图片实际均为 jpeg，保留历史行为）。
+                    const img = await bufferToInboundImage(buf, { contentType: 'image/jpeg' });
+                    if (img)
+                        images.push(img);
+                    else
+                        logger.warn('[WeChat] Image validation failed (not a supported image)');
                 }
                 else if (item.type === MSG_ITEM_FILE && item.file_item?.media) {
                     const buf = await downloadMedia(item.file_item.media);

package/dist/cli/agent.js

@@ -450,26 +450,32 @@ export async function agentCreateInteractive(opts = {}) {
 export async function agentCreateNonInteractive(opts) {
     const p = resolvePaths();
     const { isValidAid, aidCreate } = await import('../aun/aid/index.js');
+    opts.onPhase?.('validating', 'begin');
+    /** 校验失败：透出 failed 进度并返回原结构（控制流不变）。 */
+    const failValidating = (error) => {
+        opts.onPhase?.('validating', 'failed', error);
+        return { ok: false, error };
+    };
     if (!isValidAid(opts.aid)) {
-        return { ok: false, error: `Invalid AID "${opts.aid}": must be a valid multi-level domain (e.g. mybot.agentid.pub)` };
+        return failValidating(`Invalid AID "${opts.aid}": must be a valid multi-level domain (e.g. mybot.agentid.pub)`);
     }
     const agentDirPath = path.join(p.agentsDir, opts.aid);
     const configExists = fs.existsSync(path.join(agentDirPath, 'config.json'));
     if (configExists && !opts.force) {
-        return { ok: false, error: `Agent "${opts.aid}" already exists: ${agentDirPath}/config.json (use --force to overwrite)` };
+        return failValidating(`Agent "${opts.aid}" already exists: ${agentDirPath}/config.json (use --force to overwrite)`);
     }
     // Baseagent
     const available = detectAvailableBaseagents();
     if (available.length === 0) {
-        return { ok: false, error: `No usable baseagent detected. Install claude/gemini CLI or optional dependency @openai/codex-sdk.` };
+        return failValidating(`No usable baseagent detected. Install claude/gemini CLI or optional dependency @openai/codex-sdk.`);
     }
     let baseagent;
     if (opts.baseagent) {
         if (!BASEAGENT_CANDIDATES.includes(opts.baseagent)) {
-            return { ok: false, error: `Invalid baseagent: ${opts.baseagent} (options: ${BASEAGENT_CANDIDATES.join('/')})` };
+            return failValidating(`Invalid baseagent: ${opts.baseagent} (options: ${BASEAGENT_CANDIDATES.join('/')})`);
         }
         if (!available.includes(opts.baseagent)) {
-            return { ok: false, error: `${opts.baseagent} is not available in the current environment (available: ${available.join('/')})` };
+            return failValidating(`${opts.baseagent} is not available in the current environment (available: ${available.join('/')})`);
         }
         baseagent = opts.baseagent;
     }
@@ -477,20 +483,22 @@ export async function agentCreateNonInteractive(opts) {
         baseagent = pickDefaultBaseagent(available);
     }
     if (!path.isAbsolute(opts.project)) {
-        return { ok: false, error: `--project must be absolute: ${opts.project}` };
+        return failValidating(`--project must be absolute: ${opts.project}`);
     }
     if (!fs.existsSync(opts.project)) {
         try {
             fs.mkdirSync(opts.project, { recursive: true });
         }
         catch (e) {
-            return { ok: false, error: `Failed to create ${opts.project}: ${e?.message || e}` };
+            return failValidating(`Failed to create ${opts.project}: ${e?.message || e}`);
         }
     }
     if (opts.owner && !isValidAid(opts.owner)) {
-        return { ok: false, error: `Invalid owner: ${opts.owner}` };
+        return failValidating(`Invalid owner: ${opts.owner}`);
     }
+    opts.onPhase?.('validating', 'done');
     // Register AID
+    opts.onPhase?.('registering_aid', 'begin');
     let aidCreated = false;
     try {
         const result = await aidCreate(opts.aid);
@@ -499,9 +507,12 @@ export async function agentCreateNonInteractive(opts) {
         }
         catch { /* ignore */ }
         aidCreated = !result.alreadyExisted;
+        opts.onPhase?.('registering_aid', 'done', aidCreated ? 'created' : 'existed');
     }
     catch (e) {
-        return { ok: false, error: `AID creation failed: ${e?.message || e}` };
+        const error = `AID creation failed: ${e?.message || e}`;
+        opts.onPhase?.('registering_aid', 'failed', error);
+        return { ok: false, error };
     }
     // Force 模式下若 agent 已存在且已 initialized，保留该状态（避免重复发欢迎）
     let preservedInitialized = false;
@@ -526,9 +537,12 @@ export async function agentCreateNonInteractive(opts) {
         chatmode: { ...DEFAULT_CHATMODE },
         dispatch: DEFAULT_DISPATCH,
     };
+    opts.onPhase?.('config_saved', 'begin');
     saveAgent(agentConfig);
     ensureAgentDirSkeleton(opts.aid);
+    opts.onPhase?.('config_saved', 'done');
     // Generate and upload agent.md
+    opts.onPhase?.('uploading_agentmd', 'begin');
     let agentmdUploaded = false;
     try {
         const { buildInitialAgentMd, agentmdPut } = await import('../aun/aid/index.js');
@@ -550,6 +564,7 @@ export async function agentCreateNonInteractive(opts) {
                     await new Promise(r => setTimeout(r, RETRY_DELAY_MS));
                 await agentmdPut(content, { aid: opts.aid, aunPath });
                 agentmdUploaded = true;
+                opts.onPhase?.('uploading_agentmd', 'done');
                 break;
             }
             catch (e) {
@@ -559,11 +574,13 @@ export async function agentCreateNonInteractive(opts) {
         if (!agentmdUploaded) {
             console.warn(`⚠ agent.md upload failed: ${lastError?.message || lastError}`);
             console.warn(`  Retry later with: evolclaw aid agentmd put ${opts.aid}`);
+            opts.onPhase?.('uploading_agentmd', 'warn', `upload failed: ${lastError?.message || lastError}`);
         }
         await new Promise(r => setTimeout(r, 0));
     }
     catch (e) {
         console.warn(`⚠ agent.md generation failed: ${e?.message || e}`);
+        opts.onPhase?.('uploading_agentmd', 'warn', `generation failed: ${e?.message || e}`);
     }
     // Attempt hot-load via IPC (if daemon is running).
     // Cold-starting a new agent (connecting AUN WebSocket) routinely takes
@@ -571,16 +588,24 @@ export async function agentCreateNonInteractive(opts) {
     // report while the daemon actually finishes bringing the agent online.
     let hotLoaded = false;
     let hotLoadError;
+    opts.onPhase?.('hot_loading', 'begin');
     try {
         const ipcResult = await ipcQuery(p.socket, { type: 'evolagent.load', aid: opts.aid }, 30_000);
         if (ipcResult?.ok) {
             hotLoaded = true;
+            opts.onPhase?.('hot_loading', 'done');
         }
         else if (ipcResult) {
             hotLoadError = ipcResult.error;
+            opts.onPhase?.('hot_loading', 'warn', hotLoadError);
+        }
+        else {
+            opts.onPhase?.('hot_loading', 'warn', 'daemon not running');
         }
     }
-    catch { /* daemon not running */ }
+    catch {
+        opts.onPhase?.('hot_loading', 'warn', 'daemon not running'); /* daemon not running */
+    }
     return {
         ok: true,
         aid: opts.aid,
@@ -858,6 +883,9 @@ export async function agentDelete(aid, purge = false) {
     }
     else {
         fs.unlinkSync(configPath);
+        // 清理构建进度文件（非 purge 删除只移除 config.json，需显式清理 create-status.json）
+        const { removeCreateStatus } = await import('../core/message/create-status.js');
+        removeCreateStatus(agentDir);
     }
     // Trigger resync so daemon drops the agent
     try {

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:');
@@ -2127,13 +2149,27 @@ async function cmdWatchWeb() {
     }
     // Node 18.20+/20+/22 起，execFile 拒绝直接 spawn .cmd/.bat（CVE-2024-27980），必须 shell:true。
     // shell 模式下含空格的路径/参数需加引号。
+    // evolclaw-web 是前台长驻服务：用户 Ctrl-C、被新实例的单实例保护 SIGKILL、或正常退出，
+    // execFileSync 都会抛错（signal 终止时 status=null）。这些都是正常生命周期，
+    // 不应让父进程 evolclaw 带堆栈崩溃。只有真正的非信号失败才提示。
     const isBatch = /\.(cmd|bat)$/i.test(exe);
-    if (isBatch) {
-        const q = (s) => `"${s}"`;
-        execFileSync(q(exe), ['--home', q(home)], { stdio: 'inherit', shell: true });
+    try {
+        if (isBatch) {
+            const q = (s) => `"${s}"`;
+            execFileSync(q(exe), ['--home', q(home)], { stdio: 'inherit', shell: true });
+        }
+        else {
+            execFileSync(exe, ['--home', home], { stdio: 'inherit' });
+        }
     }
-    else {
-        execFileSync(exe, ['--home', home], { stdio: 'inherit' });
+    catch (e) {
+        // 信号终止（SIGINT/SIGTERM/SIGKILL）= 用户主动退出或被新实例顶替，静默返回
+        if (e?.signal)
+            return;
+        // 退出码非 0 但非信号：可能是启动失败，提示但不崩溃
+        if (typeof e?.status === 'number' && e.status !== 0) {
+            process.stderr.write(`⚠ evolclaw-web 退出（code ${e.status}）\n`);
+        }
     }
 }
 async function cmdRestartMonitor() {
@@ -4856,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();
@@ -4886,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';