evolclaw 2.3.0 → 2.5.0

package/dist/cli.js

@@ -6,9 +6,10 @@ import { promisify } from 'util';
 import { resolveRoot, resolvePaths, ensureDataDirs, getPackageRoot } from './paths.js';
 import { loadConfig, validateConfigIntegrity, resolveAnthropicConfig } from './config.js';
 import { migrateProject } from './utils/migrate-project.js';
+import readline from 'readline';
 import { cmdInit } from './utils/init.js';
 import { ipcQuery } from './ipc.js';
-import { cmdInitWechat, cmdInitFeishu, cmdInitAun } from './utils/init-channel.js';
+import { cmdInitWechat, cmdInitFeishu, cmdInitAun, cmdInitDingtalk, cmdInitQQBot, cmdInitWecom } 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
@@ -53,8 +54,8 @@ function rotateLogs(logDir) {
                 console.log(`  Rotated: ${file} -> ${path.basename(newPath)}`);
             }
         }
-        else if (file.includes('.log.')) {
-            // 清理 7 天前的旧日志
+        else if (file.includes('.log.') || /^aun-\d{8}\.log$/.test(file)) {
+            // 清理 7 天前的旧日志（含按日轮转的 aun-YYYYMMDD.log）
             const stat = fs.statSync(filePath);
             if (stat.mtimeMs < cutoff) {
                 fs.unlinkSync(filePath);
@@ -121,7 +122,9 @@ function countLines(pkgRoot, logDir) {
         }
     }
     if (shouldAppend) {
-        const now = new Date().toISOString().replace('T', ' ').slice(0, 19);
+        const _d = new Date();
+        const _p = (n) => String(n).padStart(2, '0');
+        const now = `${_d.getFullYear()}-${_p(_d.getMonth() + 1)}-${_p(_d.getDate())} ${_p(_d.getHours())}:${_p(_d.getMinutes())}:${_p(_d.getSeconds())}`;
         fs.appendFileSync(statsFile, `${now}\t${core}\t${agents}\t${channels}\t${utils}\t${entry}\t${total}\n`);
     }
     showHistory(statsFile);
@@ -391,6 +394,9 @@ function showConfigChannels(config) {
         { 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') },
+        { type: 'dingtalk', isValid: (inst) => !!inst.clientId && inst.enabled !== false && !inst.clientId.includes('your-') && !inst.clientId.includes('placeholder') },
+        { type: 'qqbot', isValid: (inst) => !!inst.appId && inst.enabled !== false && !inst.appId.includes('your-') && !inst.appId.includes('placeholder') },
+        { type: 'wecom', isValid: (inst) => !!inst.botId && inst.enabled !== false && !inst.botId.includes('your-') && !inst.botId.includes('placeholder') },
     ];
     for (const { type, isValid } of channelChecks) {
         const raw = config.channels?.[type];
@@ -568,22 +574,111 @@ async function cmdStatus() {
         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(); });
     }
 }
 /**
@@ -598,7 +693,10 @@ async function cmdRestartMonitor() {
     const HEAL_TIMEOUT = 30 * 60 * 1000; // 30 分钟，让 claude 自然结束
     const eventBus = new EventBus();
     const log = (msg) => {
-        const line = `[${new Date().toISOString().replace('T', ' ').slice(0, 19)}] ${msg}\n`;
+        const _d = new Date();
+        const _p = (n) => String(n).padStart(2, '0');
+        const ts = `${_d.getFullYear()}-${_p(_d.getMonth() + 1)}-${_p(_d.getDate())} ${_p(_d.getHours())}:${_p(_d.getMinutes())}:${_p(_d.getSeconds())}`;
+        const line = `[${ts}] ${msg}\n`;
         fs.appendFileSync(restartLog, line);
     };
     /** 检查服务是否已经在运行（ready signal 存在 + 进程存活） */
@@ -904,7 +1002,7 @@ function archiveSelfHealLog(p, log) {
  * Searches across all channel types (feishu, wechat, aun) for a matching instance.
  */
 function resolveInstanceConfig(config, instanceName) {
-    for (const type of ['feishu', 'wechat', 'aun']) {
+    for (const type of ['feishu', 'wechat', 'aun', 'dingtalk', 'qqbot', 'wecom']) {
         const raw = config.channels?.[type];
         if (!raw)
             continue;
@@ -1156,7 +1254,7 @@ async function cmdTui() {
     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');
+        console.error('  → TUI 依赖 Python 和 aun-core (>=0.2.9): pip3 install -U aun-core');
         process.exit(1);
     }
     const pythonBin = aun.pythonBin || process.env.AUN_PYTHON || 'python3';
@@ -1164,12 +1262,49 @@ async function cmdTui() {
     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');
+        console.error('  → 安装: pip3 install -U 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));
 }
+// ==================== Ctl ====================
+async function cmdCtl(args) {
+    if (args.length === 0) {
+        console.error('用法: evolclaw ctl <command> [args...]');
+        console.error('示例: evolclaw ctl model sonnet');
+        console.error('      evolclaw ctl status');
+        console.error('      evolclaw ctl effort high');
+        process.exit(1);
+    }
+    const sessionId = process.env.EVOLCLAW_SESSION_ID;
+    if (!sessionId) {
+        console.error('错误: EVOLCLAW_SESSION_ID 未设置（仅在 evolclaw 托管环境中可用）');
+        process.exit(1);
+    }
+    const cmd = '/' + args.join(' ');
+    const socketPath = resolvePaths().socket;
+    // compact/restart 等长时操作使用更长超时
+    const longRunning = ['/compact', '/restart'];
+    const timeout = longRunning.some(c => cmd.startsWith(c)) ? 60_000 : 10_000;
+    const result = await ipcQuery(socketPath, {
+        type: 'ctl',
+        cmd,
+        sessionId,
+    }, timeout);
+    if (!result) {
+        console.error('错误: 无法连接 evolclaw 服务');
+        process.exit(1);
+    }
+    const ctlResult = result;
+    if (ctlResult.ok) {
+        console.log(ctlResult.result);
+    }
+    else {
+        console.error(ctlResult.error || '执行失败');
+        process.exit(1);
+    }
+}
 // ==================== Main ====================
 export async function main(args) {
     const cmd = args[0] || 'start';
@@ -1184,6 +1319,15 @@ export async function main(args) {
             else if (args[1] === 'aun') {
                 await cmdInitAun();
             }
+            else if (args[1] === 'dingtalk') {
+                await cmdInitDingtalk();
+            }
+            else if (args[1] === 'qqbot') {
+                await cmdInitQQBot();
+            }
+            else if (args[1] === 'wecom') {
+                await cmdInitWecom();
+            }
             else {
                 await cmdInit();
             }
@@ -1201,7 +1345,7 @@ export async function main(args) {
             await cmdStatus();
             break;
         case 'logs':
-            cmdLogs();
+            cmdLogs(args.slice(1));
             break;
         case 'restart-monitor':
             await cmdRestartMonitor();
@@ -1215,19 +1359,28 @@ export async function main(args) {
         case 'tui':
             await cmdTui();
             break;
+        case 'ctl':
+            await cmdCtl(args.slice(1));
+            break;
         default:
-            console.log(`Usage: evolclaw {init|start|stop|restart|status|logs|tui|diagnose|mv}
+            console.log(`Usage: evolclaw {init|start|stop|restart|status|logs|tui|ctl|diagnose|mv}
 
 Commands:
   init          创建配置文件 (${resolvePaths().config})
   init feishu   飞书扫码登录并写入配置
   init wechat   微信扫码登录并写入配置
+  init dingtalk 钉钉扫码登录并写入配置
+  init qqbot    QQ 机器人扫码绑定并写入配置
+  init wecom    企业微信 AI Bot 配置（手动输入 Bot ID + Secret）
   init aun      AUN (AgentUnin.Network) 配置
   start         启动服务 (默认)
   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 会话）

package/dist/config.js

@@ -174,7 +174,7 @@ export function saveConfig(config, configPath = resolvePaths().config) {
     fs.writeFileSync(configPath, JSON.stringify(config, null, 2), 'utf-8');
 }
 // ── Channel instance normalization ──
-export const channelTypes = ['feishu', 'wechat', 'aun'];
+export const channelTypes = ['feishu', 'wechat', 'aun', 'dingtalk', 'qqbot'];
 /**
  * Normalize a channel config value (single object, array, or undefined) into an array
  * where every element has a `name` field.
@@ -186,7 +186,10 @@ export function normalizeChannelInstances(cfg, defaultName) {
     if (cfg === undefined || cfg === null)
         return [];
     if (Array.isArray(cfg)) {
-        return cfg;
+        return cfg.map((item, i) => ({
+            ...item,
+            name: item.name ?? (cfg.length === 1 ? defaultName : `${defaultName}-${i + 1}`),
+        }));
     }
     return [{ ...cfg, name: cfg.name ?? defaultName }];
 }
@@ -258,6 +261,50 @@ export function setOwner(config, instanceName, userId, configPath = resolvePaths
         return;
     }
 }
+export function getChannelShowActivities(config, instanceName) {
+    for (const type of channelTypes) {
+        const raw = config.channels?.[type];
+        if (raw === undefined)
+            continue;
+        if (Array.isArray(raw)) {
+            const inst = raw.find((item) => item.name === instanceName);
+            if (inst)
+                return inst.showActivities ?? config.showActivities ?? 'all';
+        }
+        else {
+            const effectiveName = raw.name ?? type;
+            if (effectiveName === instanceName)
+                return raw.showActivities ?? config.showActivities ?? 'all';
+        }
+    }
+    return config.showActivities ?? 'all';
+}
+export function setChannelShowActivities(config, instanceName, mode) {
+    if (!config.channels)
+        config.channels = {};
+    const channels = config.channels;
+    for (const type of channelTypes) {
+        const raw = channels[type];
+        if (raw === undefined)
+            continue;
+        if (Array.isArray(raw)) {
+            const inst = raw.find((item) => item.name === instanceName);
+            if (inst) {
+                inst.showActivities = mode;
+                saveConfig(config);
+                return;
+            }
+        }
+        else {
+            const effectiveName = raw.name ?? type;
+            if (effectiveName === instanceName) {
+                raw.showActivities = mode;
+                saveConfig(config);
+                return;
+            }
+        }
+    }
+}
 export function isOwner(config, channelOrType, userId) {
     // 按实例名精确匹配
     if (getOwner(config, channelOrType) === userId)
@@ -275,6 +322,31 @@ export function isOwner(config, channelOrType, userId) {
     }
     return false;
 }
+export function isAdmin(config, channelOrType, userId) {
+    // 按实例名精确匹配
+    for (const type of channelTypes) {
+        const raw = config.channels?.[type];
+        const instances = normalizeChannelInstances(raw, type);
+        const found = instances.find((inst) => inst.name === channelOrType);
+        if (found) {
+            const admins = found.admins || [];
+            return admins.includes(userId);
+        }
+    }
+    // 按 channelType 匹配：检查该类型下所有实例
+    for (const type of channelTypes) {
+        if (type !== channelOrType)
+            continue;
+        const raw = config.channels?.[type];
+        const instances = normalizeChannelInstances(raw, type);
+        for (const inst of instances) {
+            const admins = inst.admins || [];
+            if (admins.includes(userId))
+                return true;
+        }
+    }
+    return false;
+}
 function validateConfig(config) {
     // anthropic 部分不再强制校验，由 resolveAnthropicConfig() 处理
     // Feishu 配置可选，但如果配置了就要完整（支持 array / object 两种格式）
@@ -308,6 +380,30 @@ function validateConfig(config) {
             logger.warn(`⚠ WeChat${label} enabled but token not configured (WeChat channel will be disabled)`);
         }
     }
+    // DingTalk 配置可选，但如果配置了就需要 clientId + clientSecret
+    const dingtalkInstances = normalizeChannelInstances(config.channels?.dingtalk, 'dingtalk');
+    for (const inst of dingtalkInstances) {
+        if (inst.enabled === false)
+            continue;
+        const label = dingtalkInstances.length > 1 ? ` [${inst.name}]` : '';
+        const hasClientId = !!inst.clientId && !inst.clientId.includes('your-');
+        const hasClientSecret = !!inst.clientSecret && !inst.clientSecret.includes('your-');
+        if (hasClientId !== hasClientSecret) {
+            logger.warn(`⚠ DingTalk${label} clientId/clientSecret incomplete (DingTalk channel will be disabled)`);
+        }
+    }
+    // QQBot 配置可选，但如果配置了就需要 appId + clientSecret
+    const qqbotInstances = normalizeChannelInstances(config.channels?.qqbot, 'qqbot');
+    for (const inst of qqbotInstances) {
+        if (inst.enabled === false)
+            continue;
+        const label = qqbotInstances.length > 1 ? ` [${inst.name}]` : '';
+        const hasAppId = !!inst.appId && !inst.appId.includes('your-');
+        const hasSecret = !!inst.clientSecret && !inst.clientSecret.includes('your-');
+        if (hasAppId !== hasSecret) {
+            logger.warn(`⚠ QQBot${label} appId/clientSecret incomplete (QQBot channel will be disabled)`);
+        }
+    }
 }
 export function ensureDir(dirPath) {
     if (!fs.existsSync(dirPath)) {