evolclaw 2.2.0 → 2.4.0

package/dist/cli.js

@@ -7,10 +7,9 @@ import { resolveRoot, resolvePaths, ensureDataDirs, getPackageRoot } from './pat
 import { loadConfig, validateConfigIntegrity, resolveAnthropicConfig } from './config.js';
 import { migrateProject } from './utils/migrate-project.js';
 import readline from 'readline';
-import { cmdInit, cmdInitAun, checkAunEnvironment } from './utils/init.js';
-import { ipcQuery } from './utils/ipc-client.js';
-import { cmdInitWechat } from './utils/init-wechat.js';
-import { cmdInitFeishu } from './utils/init-feishu.js';
+import { cmdInit } from './utils/init.js';
+import { ipcQuery } from './ipc.js';
+import { cmdInitWechat, cmdInitFeishu, cmdInitAun } from './utils/init-channel.js';
 import * as platform from './utils/cross-platform.js';
 import { EventBus } from './core/event-bus.js';
 // Suppress Node.js ExperimentalWarning (e.g. SQLite) from cluttering CLI output
@@ -200,9 +199,11 @@ async function cmdStart() {
         process.exit(1);
     }
     // 检查是否有残留进程（PID 文件已丢失但进程还在）
+    // 只清理属于当前 EVOLCLAW_HOME 的进程，避免误杀其他实例
     let hasOrphan = false;
     const evolclawMain = path.join(getPackageRoot(), 'dist', 'index.js');
-    const orphanPids = platform.findProcesses(evolclawMain.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'));
+    const allPids = platform.findProcesses(evolclawMain.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'));
+    const orphanPids = allPids.filter(pid => platform.getProcessEnv(pid, 'EVOLCLAW_HOME') === p.root);
     if (orphanPids.length > 0) {
         console.log(`⚠ 发现 ${orphanPids.length} 个残留进程，正在清理...`);
         for (const p of orphanPids) {
@@ -231,6 +232,7 @@ async function cmdStart() {
         stdio: ['ignore', out, err],
         env: {
             ...process.env,
+            EVOLCLAW_HOME: p.root,
             LOG_LEVEL: process.env.LOG_LEVEL || 'INFO',
             MESSAGE_LOG: process.env.MESSAGE_LOG || 'true',
             EVENT_LOG: process.env.EVENT_LOG || 'true',
@@ -385,27 +387,37 @@ function formatTimeAgo(ms) {
     return `${day}天前`;
 }
 function showConfigChannels(config) {
-    // Feishu
-    if (config.channels?.feishu?.appId) {
-        console.log(`  feishu: Configured (App ID: ${config.channels.feishu.appId.slice(0, 8)}...)`);
-    }
-    else {
-        console.log('  feishu: - Not configured');
-    }
-    // WeChat
-    if (config.channels?.wechat?.token) {
-        console.log(`  wechat: Configured (Token: ${config.channels.wechat.token.slice(0, 20)}...)`);
-    }
-    else {
-        console.log('  wechat: - Not configured');
+    const groups = [];
+    const channelChecks = [
+        { type: 'feishu', isValid: (inst) => !!inst.appId && inst.enabled !== false },
+        { type: 'wechat', isValid: (inst) => !!inst.token && inst.enabled !== false },
+        { type: 'aun', isValid: (inst) => !!inst.aid && inst.enabled !== false && !inst.aid.includes('your-') && !inst.aid.includes('placeholder') },
+    ];
+    for (const { type, isValid } of channelChecks) {
+        const raw = config.channels?.[type];
+        if (!raw)
+            continue;
+        if (Array.isArray(raw)) {
+            const names = raw.filter(isValid).map((inst) => inst.name || type);
+            if (names.length > 0)
+                groups.push({ type, instances: names });
+        }
+        else if (isValid(raw)) {
+            groups.push({ type, instances: [raw.name || type] });
+        }
     }
-    // AUN
-    const aunAid = config.channels?.aun?.aid;
-    if (aunAid && !aunAid.includes('your-') && !aunAid.includes('placeholder')) {
-        console.log(`  aun: Configured (${aunAid})`);
+    if (groups.length > 0) {
+        for (const g of groups) {
+            if (g.instances.length === 1) {
+                console.log(`  ${g.instances[0]}: ✓ Configured`);
+            }
+            else {
+                console.log(`  ${g.type}: [${g.instances.join(', ')}]`);
+            }
+        }
     }
     else {
-        console.log('  aun: - Not configured');
+        console.log('  (no channels configured)');
     }
 }
 async function cmdStatus() {
@@ -421,8 +433,11 @@ async function cmdStatus() {
                 console.log(`  Uptime: ${info.uptime}`);
             if (info.cpu)
                 console.log(`  CPU: ${info.cpu}%`);
-            if (info.memory)
-                console.log(`  Memory: ${info.memory} KB`);
+            if (info.memory) {
+                const memKB = parseInt(info.memory, 10);
+                const memStr = memKB >= 1024 ? `${(memKB / 1024).toFixed(0)} MB` : `${memKB} KB`;
+                console.log(`  Memory: ${memStr}`);
+            }
         }
         catch { }
         console.log(`  EVOLCLAW_HOME: ${resolveRoot()}`);
@@ -493,13 +508,29 @@ async function cmdStatus() {
             const status = await ipcQuery(p.socket, { type: 'status' });
             if (status) {
                 console.log('🔌 Channels (live):');
+                // Group channels by channelType
+                const groups = new Map();
                 for (const [name, ch] of Object.entries(status.channels)) {
-                    const label = ch.connected
-                        ? '✓ Connected'
-                        : ch.reconnectAttempt
-                            ? `⏳ Reconnecting (${ch.reconnectAttempt}/${ch.maxAttempts})`
-                            : '✗ Disconnected';
-                    console.log(`  ${name}: ${label}`);
+                    const type = ch.channelType || name;
+                    if (!groups.has(type))
+                        groups.set(type, []);
+                    groups.get(type).push({ name, ch: ch });
+                }
+                for (const [type, instances] of groups) {
+                    if (instances.length === 1) {
+                        // Single instance: show instance name directly
+                        const { name, ch } = instances[0];
+                        const label = ch.connected ? '✓ Connected' : ch.reconnectAttempt ? `⏳ Reconnecting (${ch.reconnectAttempt}/${ch.maxAttempts})` : '✗ Disconnected';
+                        console.log(`  ${name}: ${label}`);
+                    }
+                    else {
+                        // Multi-instance: feishu [name1 ✓, name2 ✗]
+                        const parts = instances.map(({ name, ch }) => {
+                            const icon = ch.connected ? '✓' : ch.reconnectAttempt ? '⏳' : '✗';
+                            return `${name} ${icon}`;
+                        });
+                        console.log(`  ${type}: [${parts.join(', ')}]`);
+                    }
                 }
                 if (status.stats) {
                     console.log('');
@@ -530,30 +561,119 @@ async function cmdStatus() {
         const sizeMB = (stat.size / 1024 / 1024).toFixed(1);
         console.log(`  Main log: ${mainLog} (${sizeMB} MB)`);
         console.log('');
-        console.log('📝 Recent activity (last 10 lines):');
+        console.log('📝 Recent activity (last 30 lines):');
         const content = fs.readFileSync(mainLog, 'utf-8').trim().split('\n');
-        console.log(content.slice(-10).map(l => `  ${l}`).join('\n'));
+        console.log(content.slice(-30).map(l => `  ${l}`).join('\n'));
     }
     else {
         console.log('  (no log file yet)');
     }
 }
-function cmdLogs() {
+// Log line pattern: [timestamp] [LEVEL] [Module?] message
+const LOG_RE = /^(\[[^\]]+\]) (\[(?:INFO|WARN|ERROR|DEBUG)\]) ((?:\[[^\]]+\] )*)(.*)$/;
+const MAX_MSG = 200; // truncate long messages
+function makeColors(enabled) {
+    const e = (code) => enabled ? code : '';
+    return {
+        reset: e('\x1b[0m'), dim: e('\x1b[2m'), bold: e('\x1b[1m'),
+        red: e('\x1b[31m'), yellow: e('\x1b[33m'), cyan: e('\x1b[36m'),
+        magenta: e('\x1b[35m'), gray: e('\x1b[90m'),
+    };
+}
+function renderLogLine(line, opts) {
+    const m = line.match(LOG_RE);
+    if (!m)
+        return line; // passthrough non-standard lines (stack traces etc.)
+    const [, ts, levelTag, modulePart, msg] = m;
+    const level = levelTag.slice(1, -1); // strip brackets
+    // Level filter
+    if (opts.level) {
+        const want = opts.level.toUpperCase();
+        if (want === 'ERROR' && level !== 'ERROR')
+            return null;
+        if (want === 'WARN' && level !== 'WARN' && level !== 'ERROR')
+            return null;
+    }
+    // Module filter (case-insensitive substring match)
+    if (opts.module) {
+        const mod = modulePart.toLowerCase();
+        if (!mod.includes(opts.module.toLowerCase()))
+            return null;
+    }
+    // Truncate long messages (always, regardless of color)
+    const truncated = msg.length > MAX_MSG ? msg.slice(0, MAX_MSG) + '…' : msg;
+    const C = makeColors(opts.color);
+    // Color by level
+    const levelColor = level === 'ERROR' ? C.red : level === 'WARN' ? C.yellow : level === 'DEBUG' ? C.gray : '';
+    // Highlight user messages: [channel] channelId: text
+    const isUserMsg = modulePart && /^\S+: .+$/.test(truncated);
+    const renderedMsg = isUserMsg
+        ? C.cyan + truncated + C.reset
+        : levelColor + truncated + C.reset;
+    return (C.dim + ts + C.reset + ' ' +
+        levelColor + C.bold + levelTag + C.reset + ' ' +
+        C.magenta + modulePart.trimEnd() + C.reset +
+        (modulePart ? ' ' : '') +
+        renderedMsg);
+}
+function cmdLogs(args) {
+    const raw = args.includes('--raw');
+    const noColor = args.includes('--no-color');
+    const levelIdx = args.indexOf('--level');
+    const moduleIdx = args.indexOf('--module');
+    const level = levelIdx !== -1 ? args[levelIdx + 1] : undefined;
+    const module = moduleIdx !== -1 ? args[moduleIdx + 1] : undefined;
     const p = resolvePaths();
     const mainLog = path.join(p.logs, 'evolclaw.log');
     if (!fs.existsSync(mainLog)) {
         console.log(`❌ Log file not found: ${mainLog}`);
         process.exit(1);
     }
+    if (raw) {
+        // Raw mode: plain tail -f, no rendering at all
+        if (platform.isWindows) {
+            const tail = platform.tailFile(mainLog);
+            platform.onShutdown(() => tail.abort());
+        }
+        else {
+            const child = spawn('tail', ['-f', '-n', '50', mainLog], { stdio: 'inherit' });
+            child.on('exit', (code) => process.exit(code || 0));
+        }
+        return;
+    }
+    // Rendered mode: always filter+truncate, color depends on TTY
+    const useColor = !noColor && !!process.stdout.isTTY;
+    const opts = { level, module, color: useColor };
+    function processLine(line) {
+        const rendered = renderLogLine(line, opts);
+        if (rendered !== null)
+            process.stdout.write(rendered + '\n');
+    }
     if (platform.isWindows) {
-        // Windows: use fs.watch for live tail
-        const tail = platform.tailFile(mainLog);
-        platform.onShutdown(() => tail.abort());
+        // Windows: read existing content + watch
+        const existing = fs.readFileSync(mainLog, 'utf-8').split('\n').slice(-50);
+        existing.forEach(processLine);
+        let size = fs.statSync(mainLog).size;
+        const watcher = fs.watch(mainLog, () => {
+            const newSize = fs.statSync(mainLog).size;
+            if (newSize <= size)
+                return;
+            const buf = Buffer.alloc(newSize - size);
+            const fd = fs.openSync(mainLog, 'r');
+            fs.readSync(fd, buf, 0, buf.length, size);
+            fs.closeSync(fd);
+            size = newSize;
+            buf.toString().split('\n').forEach(l => l && processLine(l));
+        });
+        platform.onShutdown(() => watcher.close());
     }
     else {
-        // Unix: use tail -f
-        const child = spawn('tail', ['-f', mainLog], { stdio: 'inherit' });
+        // Unix: spawn tail -f, pipe through renderer
+        const child = spawn('tail', ['-f', '-n', '50', mainLog]);
+        const rl = readline.createInterface({ input: child.stdout });
+        rl.on('line', processLine);
         child.on('exit', (code) => process.exit(code || 0));
+        platform.onShutdown(() => { child.kill(); });
     }
 }
 /**
@@ -617,6 +737,13 @@ async function cmdRestartMonitor() {
         // 通知由新进程自行发送（channel-agnostic），此处不再调用 notifyChannel
         process.exit(0);
     }
+    // 启动失败 — 测试环境下跳过 self-heal（避免 claude -p 污染会话列表、误杀生产进程）
+    if (p.root.startsWith('/tmp/') || process.env.EVOLCLAW_TEST === '1') {
+        log('❌ Service failed to start (test environment detected, skipping self-heal)');
+        await notifyChannel(p, pendingInfo, '❌ 服务启动失败（测试环境，已跳过自动修复）', 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' });
@@ -719,7 +846,13 @@ async function spawnAndWaitReady(p, log, timeout) {
         fs.unlinkSync(p.readySignal);
     }
     catch { }
-    // 杀掉可能残留的进程
+    // 杀掉可能残留的进程（先读 PID 再删文件，避免数据库锁）
+    try {
+        const stalePid = parseInt(fs.readFileSync(p.pid, 'utf-8').trim(), 10);
+        if (!isNaN(stalePid))
+            platform.killProcess(stalePid, true);
+    }
+    catch { }
     try {
         fs.unlinkSync(p.pid);
     }
@@ -734,6 +867,7 @@ async function spawnAndWaitReady(p, log, timeout) {
         stdio: ['ignore', out, err],
         env: {
             ...process.env,
+            EVOLCLAW_HOME: p.root,
             LOG_LEVEL: process.env.LOG_LEVEL || 'INFO',
             MESSAGE_LOG: process.env.MESSAGE_LOG || 'true',
             EVENT_LOG: process.env.EVENT_LOG || 'true',
@@ -813,6 +947,7 @@ async function invokeClaude(p, attempt, maxAttempts, timeout, log) {
             '-p', prompt,
             '--allowedTools', 'Read,Write,Edit,Bash,Glob,Grep',
             '--output-format', 'text',
+            '--no-session-persistence',
         ], {
             cwd: projectDir,
             timeout,
@@ -854,6 +989,28 @@ function archiveSelfHealLog(p, log) {
     fs.renameSync(p.selfHealLog, archivePath);
     log(`Archived self-heal log to ${archivePath}`);
 }
+/**
+ * Resolve a channel instance name to its type and config object.
+ * Searches across all channel types (feishu, wechat, aun) for a matching instance.
+ */
+function resolveInstanceConfig(config, instanceName) {
+    for (const type of ['feishu', 'wechat', 'aun']) {
+        const raw = config.channels?.[type];
+        if (!raw)
+            continue;
+        if (Array.isArray(raw)) {
+            const inst = raw.find((i) => i.name === instanceName);
+            if (inst)
+                return { type, config: inst };
+        }
+        else {
+            const name = raw.name || type;
+            if (name === instanceName)
+                return { type, config: raw };
+        }
+    }
+    return null;
+}
 /**
  * 通过对应渠道 API 发送通知（轻量级，不依赖 Channel 实例）
  * 支持 feishu / wechat，根据 pendingInfo.channel 路由
@@ -865,14 +1022,20 @@ async function notifyChannel(p, pendingInfo, message, log) {
     if (!fs.existsSync(configPath))
         return;
     const config = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
-    if (pendingInfo.channel === 'feishu') {
+    const resolved = resolveInstanceConfig(config, pendingInfo.channel);
+    if (!resolved) {
+        log(`Channel instance "${pendingInfo.channel}" not found in config`);
+        return;
+    }
+    if (resolved.type === 'feishu') {
         try {
-            if (!config.channels?.feishu?.appId || !config.channels?.feishu?.appSecret)
+            const inst = resolved.config;
+            if (!inst.appId || !inst.appSecret)
                 return;
             const lark = await import('@larksuiteoapi/node-sdk');
             const client = new lark.Client({
-                appId: config.channels.feishu.appId,
-                appSecret: config.channels.feishu.appSecret,
+                appId: inst.appId,
+                appSecret: inst.appSecret,
             });
             if (pendingInfo.rootId) {
                 await client.im.message.reply({
@@ -900,13 +1063,14 @@ async function notifyChannel(p, pendingInfo, message, log) {
             log(`Feishu notification failed: ${error.message?.slice(0, 200) || error}`);
         }
     }
-    else if (pendingInfo.channel === 'wechat') {
+    else if (resolved.type === 'wechat') {
         try {
-            if (!config.channels?.wechat?.token)
+            const inst = resolved.config;
+            if (!inst.token)
                 return;
             const crypto = await import('node:crypto');
-            const baseUrl = (config.channels.wechat.baseUrl || 'https://ilinkai.weixin.qq.com').replace(/\/$/, '');
-            const token = config.channels.wechat.token;
+            const baseUrl = (inst.baseUrl || 'https://ilinkai.weixin.qq.com').replace(/\/$/, '');
+            const token = inst.token;
             // 读取缓存的 context_token
             const syncBufPath = path.join(p.dataDir, 'wechat-context-tokens.json');
             let contextToken;
@@ -1030,7 +1194,7 @@ async function cmdDiagnose() {
     }
     // 4. 检查数据库
     try {
-        const { SessionManager } = await import('./core/session-manager.js');
+        const { SessionManager } = await import('./core/session/session-manager.js');
         const eventBus = new EventBus();
         new SessionManager(p.db, eventBus);
         console.log(`[diagnose] ✓ 数据库初始化成功: ${p.db}`);
@@ -1071,20 +1235,28 @@ async function cmdDiagnose() {
 }
 async function cmdTui() {
     const config = loadConfig();
-    const aun = config.channels?.aun;
+    // Find the first AUN instance (TUI connects to one AUN instance)
+    const aunResolved = resolveInstanceConfig(config, 'aun');
+    const aun = aunResolved?.type === 'aun' ? aunResolved.config : null;
     if (!aun?.owner || !aun?.aid) {
         console.error('[tui] AUN 未配置，请先运行: evolclaw init aun');
         process.exit(1);
     }
-    // Check Python + aun_core, interactive install if missing
-    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-    const ready = await checkAunEnvironment(rl);
-    rl.close();
-    if (!ready) {
+    // TUI requires Python + aun_core (independent of init aun which is now pure TS)
+    const pythonCheck = aun.pythonBin || process.env.AUN_PYTHON || 'python3';
+    if (!platform.commandExists(pythonCheck)) {
+        console.error(`[tui] Python 未找到 (${pythonCheck})`);
+        console.error('  → TUI 依赖 Python 和 aun-core: pip3 install aun-core');
         process.exit(1);
     }
     const pythonBin = aun.pythonBin || process.env.AUN_PYTHON || 'python3';
     const cliScript = path.join(getPackageRoot(), 'aun', 'aun_cli.py');
+    if (!fs.existsSync(cliScript)) {
+        console.error(`[tui] aun_cli.py 不存在: ${cliScript}`);
+        console.error('  → TUI 需要 AUN CLI 工具，请确认源码目录包含 aun/aun_cli.py');
+        console.error('  → 安装: pip3 install aun-core && 从源码仓库获取 aun_cli.py');
+        process.exit(1);
+    }
     const child = spawn(pythonBin, [cliScript, '-a', aun.owner, '-t', aun.aid], { stdio: 'inherit' });
     child.on('exit', (code) => process.exit(code ?? 0));
 }
@@ -1119,7 +1291,7 @@ export async function main(args) {
             await cmdStatus();
             break;
         case 'logs':
-            cmdLogs();
+            cmdLogs(args.slice(1));
             break;
         case 'restart-monitor':
             await cmdRestartMonitor();
@@ -1145,7 +1317,10 @@ Commands:
   stop          停止服务
   restart       重启服务
   status        查看状态
-  logs          查看日志 (tail -f)
+  logs          查看日志 (tail -f, 着色渲染)
+                  --level error|warn   只显示指定级别及以上
+                  --module <name>      只显示指定模块（如 feishu、AgentRunner）
+                  --raw                原始输出，不着色
   tui           启动 AUN TUI 客户端
   diagnose      诊断启动环境（配置、数据库、进程）
   mv <old> <new>  迁移项目目录（保留 Claude/Codex/EvolClaw 会话）