evolclaw 3.0.0 → 3.1.0

package/dist/cli/index.js

@@ -2,7 +2,7 @@
 import fs from 'fs';
 import path from 'path';
 import os from 'os';
-import { spawn, execFile } from 'child_process';
+import { spawn, execFileSync, execFile } from 'child_process';
 import { promisify } from 'util';
 import { resolveRoot, resolvePaths, ensureDataDirs, getPackageRoot } from '../paths.js';
 import { loadDefaults, loadAllAgents, mergeForAgent } from '../config-store.js';
@@ -13,7 +13,8 @@ import { ipcQuery } from '../ipc.js';
 import { cmdInitWechat, cmdInitFeishu, cmdInitDingtalk, cmdInitQQBot, cmdInitWecom } from './init-channel.js';
 import * as platform from '../utils/cross-platform.js';
 import { EventBus } from '../core/event-bus.js';
-import { tryUpgrade } from '../utils/npm-ops.js';
+import { tryUpgrade, tryUpgradeAunSdk } from '../utils/npm-ops.js';
+import { resolveAunCoreSdkPkg, AUN_CORE_SDK_PKG } from '../aun/aid/client.js';
 import { scanInstances, cleanupInstances, writeRestartMonitor, removeRestartMonitor, isRestartMonitorWinner, findOrphanProcesses, killOrphans } from '../utils/instance-registry.js';
 // Suppress Node.js ExperimentalWarning (e.g. SQLite) from cluttering CLI output
 process.removeAllListeners('warning');
@@ -231,6 +232,10 @@ function reportOrphans(orphans) {
     console.log('  使用 evolclaw restart --clear 一并清掉，或手动 kill。');
 }
 async function cmdStart() {
+    const cmdStartedAt = Date.now();
+    const pkgRoot = getPackageRoot();
+    const isNpmInstall = pkgRoot.includes('node_modules');
+    console.log(`⏱ ${new Date().toLocaleString()}  [${isNpmInstall ? 'pkg' : 'dev'}] ${pkgRoot}`);
     const p = resolvePaths();
     ensureDataDirs();
     // 旧配置自动迁移（evolclaw.json → 新结构）
@@ -315,7 +320,14 @@ async function cmdStart() {
     const checkReady = () => {
         // ready signal 出现（优先检查，避免 Windows 上误判进程状态）
         if (fs.existsSync(p.readySignal)) {
-            console.log(`✓ EvolClaw started successfully (PID: ${childPid})`);
+            const pkg = JSON.parse(fs.readFileSync(path.join(getPackageRoot(), 'package.json'), 'utf-8'));
+            let aunVer = 'unknown';
+            try {
+                const aunPkg = JSON.parse(fs.readFileSync(path.join(getPackageRoot(), 'node_modules', '@agentunion', 'fastaun', 'package.json'), 'utf-8'));
+                aunVer = aunPkg.version;
+            }
+            catch { /* ignore */ }
+            console.log(`✓ EvolClaw v${pkg.version} started successfully (PID: ${childPid})  fastaun v${aunVer}`);
             console.log(`  EVOLCLAW_HOME: ${resolveRoot()}`);
             console.log(`  Logs: ${p.logs}/`);
             // 从主日志提取渠道连接摘要
@@ -358,6 +370,7 @@ async function cmdStart() {
             if (resolveRoot() === getPackageRoot()) {
                 countLines(getPackageRoot(), p.logs);
             }
+            console.log(`⏱ done in ${((Date.now() - cmdStartedAt) / 1000).toFixed(1)}s`);
             return;
         }
         // 超时
@@ -369,6 +382,7 @@ async function cmdStart() {
                 const content = fs.readFileSync(stdoutLog, 'utf-8').trim().split('\n');
                 console.log(content.slice(-10).map(l => `  ${l}`).join('\n'));
             }
+            console.log(`⏱ failed after ${((Date.now() - cmdStartedAt) / 1000).toFixed(1)}s`);
             process.exit(1);
             return;
         }
@@ -383,6 +397,7 @@ async function cmdStart() {
                     const content = fs.readFileSync(stdoutLog, 'utf-8').trim().split('\n');
                     console.log(content.slice(-10).map(l => `  ${l}`).join('\n'));
                 }
+                console.log(`⏱ failed after ${((Date.now() - cmdStartedAt) / 1000).toFixed(1)}s`);
                 process.exit(1);
                 return;
             }
@@ -428,6 +443,10 @@ async function cmdStop() {
     }
 }
 async function cmdRestart(opts = {}) {
+    const cmdStartedAt = Date.now();
+    const pkgRoot = getPackageRoot();
+    const isNpmInstall = pkgRoot.includes('node_modules');
+    console.log(`⏱ ${new Date().toLocaleString()}  [${isNpmInstall ? 'pkg' : 'dev'}] ${pkgRoot}`);
     console.log('🔄 Restarting EvolClaw...');
     // 版本检查与自动升级
     console.log('📦 Checking for updates...');
@@ -448,6 +467,18 @@ async function cmdRestart(opts = {}) {
             console.log(`⚠ Upgrade failed (${upgrade.from} → ${upgrade.to}), continuing with current version`);
             break;
     }
+    // AUN SDK 版本检查与升级
+    const aunUpgrade = await tryUpgradeAunSdk(resolveAunCoreSdkPkg, AUN_CORE_SDK_PKG);
+    switch (aunUpgrade.status) {
+        case 'upgraded':
+            console.log(`✅ AUN SDK upgraded: ${aunUpgrade.from} → ${aunUpgrade.to}`);
+            break;
+        case 'no-update':
+            break; // silent
+        case 'failed':
+            console.log(`⚠ AUN SDK upgrade failed (${aunUpgrade.from} → ${aunUpgrade.to})`);
+            break;
+    }
     // 停止所有活 main 进程（可能不止一个）
     const status = scanInstances();
     const aliveMains = status.mains.filter(m => m.alive);
@@ -457,20 +488,164 @@ async function cmdRestart(opts = {}) {
         }
         await Promise.all(aliveMains.map(m => stopPid(m.record.pid)));
         await sleep(500);
-        cleanupInstances();
     }
-    // 跨 HOME 孤儿处理：只在 --clear 时主动 kill；
-    // 否则交给后续 cmdStart() 统一警告，避免重复输出。
-    if (opts.clear) {
+    cleanupInstances();
+    // 孤儿处理：同 HOME 的孤儿无条件 kill（restart 必须替换旧实例）；
+    // 跨 HOME 的孤儿只在 --clear 时 kill，否则仅警告。
+    {
         const orphans = findOrphanProcesses();
-        if (orphans.length > 0) {
-            const killed = killOrphans(orphans);
-            console.log(`☠ 已 SIGKILL ${killed.length} 个孤儿进程: ${killed.join(', ')}`);
+        const currentHome = resolveRoot();
+        const sameHome = orphans.filter(o => o.evolclawHome === currentHome);
+        const otherHome = orphans.filter(o => o.evolclawHome !== currentHome);
+        if (sameHome.length > 0) {
+            const killed = killOrphans(sameHome);
+            console.log(`☠ 已 SIGKILL ${killed.length} 个同 HOME 孤儿进程: ${killed.join(', ')}`);
+            await sleep(500);
+        }
+        if (opts.clear && otherHome.length > 0) {
+            const killed = killOrphans(otherHome);
+            console.log(`☠ 已 SIGKILL ${killed.length} 个跨 HOME 孤儿进程: ${killed.join(', ')}`);
             await sleep(500);
         }
     }
+    console.log(`⏱ restart prep done in ${((Date.now() - cmdStartedAt) / 1000).toFixed(1)}s, starting...`);
     setTimeout(() => cmdStart(), 1000);
 }
+async function cmdDev(args) {
+    const pkgRoot = getPackageRoot();
+    const isNpmInstall = pkgRoot.includes('node_modules');
+    const p = resolvePaths();
+    const devMarker = path.join(p.dataDir, 'dev-repo.path');
+    const sub = args[0];
+    if (!sub) {
+        if (!isNpmInstall) {
+            console.log(`当前: [dev] ${pkgRoot}`);
+            console.log('');
+            console.log('断开开发仓链接:');
+            console.log('  evolclaw dev off');
+        }
+        else {
+            console.log(`当前: [pkg] ${pkgRoot}`);
+            console.log('');
+            let devPath = null;
+            try {
+                devPath = fs.readFileSync(devMarker, 'utf-8').trim();
+            }
+            catch { }
+            if (devPath && fs.existsSync(devPath)) {
+                console.log('链接到开发仓:');
+                console.log(`  evolclaw dev on`);
+                console.log(`  (已记录路径: ${devPath})`);
+            }
+            else {
+                console.log('链接到开发仓:');
+                console.log('  evolclaw dev <开发仓路径>');
+            }
+        }
+        return;
+    }
+    if (sub === 'off') {
+        if (isNpmInstall) {
+            console.log('当前已是 [pkg] 模式，无需断开');
+            return;
+        }
+        console.log('🔗 断开开发仓链接...');
+        let npmPrefix;
+        if (process.platform === 'win32' && process.env.APPDATA) {
+            npmPrefix = path.join(process.env.APPDATA, 'npm');
+        }
+        else {
+            npmPrefix = execFileSync('npm', ['prefix', '-g'], { encoding: 'utf-8', shell: true }).trim();
+        }
+        const linkPath = path.join(npmPrefix, 'node_modules', 'evolclaw');
+        const binPath = path.join(npmPrefix, 'evolclaw');
+        try {
+            fs.rmSync(linkPath, { recursive: true });
+        }
+        catch { }
+        try {
+            fs.unlinkSync(binPath);
+        }
+        catch { }
+        try {
+            fs.unlinkSync(binPath + '.cmd');
+        }
+        catch { }
+        try {
+            fs.unlinkSync(binPath + '.ps1');
+        }
+        catch { }
+        console.log('✓ 已断开');
+        console.log(`  已删除: ${linkPath}`);
+        console.log(`  如需恢复: evolclaw dev on（需从已安装的 evolclaw 执行）`);
+        return;
+    }
+    if (sub === 'on') {
+        if (!isNpmInstall) {
+            console.log(`当前已是 [dev] 模式: ${pkgRoot}`);
+            return;
+        }
+        let devPath = null;
+        try {
+            devPath = fs.readFileSync(devMarker, 'utf-8').trim();
+        }
+        catch { }
+        if (!devPath || !fs.existsSync(devPath)) {
+            console.log('未记录开发仓路径');
+            console.log('');
+            console.log('用法: evolclaw dev <开发仓路径>');
+            process.exit(1);
+        }
+        console.log(`🔗 链接开发仓: ${devPath}`);
+        try {
+            execFileSync('npm', ['link'], { stdio: 'inherit', cwd: devPath, shell: true });
+            console.log(`✓ 已链接 [dev] ${devPath}`);
+        }
+        catch (e) {
+            console.error('❌ npm link 失败:', e.message);
+            process.exit(1);
+        }
+        return;
+    }
+    // evolclaw dev <path> — 记录路径 + 建立链接
+    const devPath = path.resolve(sub);
+    const pkgJson = path.join(devPath, 'package.json');
+    if (!fs.existsSync(pkgJson)) {
+        console.error(`❌ 路径不存在或无 package.json: ${devPath}`);
+        process.exit(1);
+    }
+    let pkg;
+    try {
+        pkg = JSON.parse(fs.readFileSync(pkgJson, 'utf-8'));
+    }
+    catch {
+        console.error(`❌ 无法解析 package.json: ${pkgJson}`);
+        process.exit(1);
+    }
+    if (pkg.name !== 'evolclaw') {
+        console.error(`❌ package.json name 不是 evolclaw（是 "${pkg.name}"）`);
+        process.exit(1);
+    }
+    // 已经链接到同一路径，只记录不重复 link
+    if (!isNpmInstall && path.resolve(pkgRoot) === devPath) {
+        fs.mkdirSync(p.dataDir, { recursive: true });
+        fs.writeFileSync(devMarker, devPath, 'utf-8');
+        console.log(`✓ 当前已链接到该路径，路径已记录`);
+        return;
+    }
+    console.log(`🔗 链接开发仓: ${devPath}`);
+    try {
+        execFileSync('npm', ['link'], { stdio: 'inherit', cwd: devPath, shell: true });
+    }
+    catch (e) {
+        console.error('❌ npm link 失败:', e.message);
+        process.exit(1);
+    }
+    fs.mkdirSync(p.dataDir, { recursive: true });
+    fs.writeFileSync(devMarker, devPath, 'utf-8');
+    console.log(`✓ 已链接 [dev] ${devPath}`);
+    console.log(`  路径已记录，下次可用 evolclaw dev on 快速切换`);
+}
 function formatTimeAgo(ms) {
     const sec = Math.floor(ms / 1000);
     if (sec < 60)
@@ -1250,7 +1425,7 @@ async function cmdWatchMenu() {
                     await cmdWatchAid();
                 }
                 else if (chosen === 'msg') {
-                    const { cmdWatchMsg } = await import('../watch-msg.js');
+                    const { cmdWatchMsg } = await import('./watch-msg.js');
                     await cmdWatchMsg();
                 }
                 resolve();
@@ -1686,7 +1861,31 @@ async function cmdWatchAid() {
         const subLine1 = `    ${nameColor}${namePart}${nameReset}${msgPreview ? '  ' + msgPreview : ''}`;
         const dirLabel = projectPath || '—';
         const subLine2 = `${DIM}    ${dirLabel}${RST}`;
-        return [mainLine, subLine1, subLine2];
+        const result = [mainLine, subLine1, subLine2];
+        if (aid.status === 'failed' || aid.status === 'kicked' || aid.status === 'kicked_no_retry') {
+            const parts = [];
+            if (aid.lastAttemptAt) {
+                const d = new Date(aid.lastAttemptAt);
+                const ts = `${String(d.getHours()).padStart(2, '0')}:${String(d.getMinutes()).padStart(2, '0')}:${String(d.getSeconds()).padStart(2, '0')}`;
+                parts.push(`last_attempt=${ts}`);
+            }
+            if (aid.kickDetail?.code) {
+                parts.push(`code=${aid.kickDetail.code}`);
+            }
+            if (aid.kickDetail?.reason) {
+                parts.push(`reason=${aid.kickDetail.reason}`);
+            }
+            if (aid.lastError) {
+                parts.push(`error=${aid.lastError}`);
+            }
+            if (aid.gatewayUrl) {
+                parts.push(`gateway=${aid.gatewayUrl}`);
+            }
+            if (parts.length > 0) {
+                result.push(`${RED}    ⚠ ${parts.join('  ')}${RST}`);
+            }
+        }
+        return result;
     }
     let lastLineCount = 0;
     async function render() {
@@ -1905,6 +2104,19 @@ async function cmdRestartMonitor() {
             await notifyChannel(p, pendingInfo, `⚠️ 升级失败，使用当前版本继续`, log);
             break;
     }
+    // AUN SDK 版本检查与升级
+    const aunUpgrade = await tryUpgradeAunSdk(resolveAunCoreSdkPkg, AUN_CORE_SDK_PKG);
+    switch (aunUpgrade.status) {
+        case 'upgraded':
+            log(`✅ AUN SDK upgraded: ${aunUpgrade.from} → ${aunUpgrade.to}`);
+            await notifyChannel(p, pendingInfo, `📦 AUN SDK 已升级 ${aunUpgrade.from} → ${aunUpgrade.to}`, log);
+            break;
+        case 'no-update':
+            break;
+        case 'failed':
+            log(`⚠ AUN SDK upgrade failed (${aunUpgrade.from} → ${aunUpgrade.to}): ${aunUpgrade.error}`);
+            break;
+    }
     // 启动并检测 ready signal
     let started = await spawnAndWaitReady(p, log, READY_TIMEOUT);
     if (started) {
@@ -2486,7 +2698,7 @@ async function cmdCtl(args) {
 async function cmdAgent(args) {
     const sub = args[0];
     const formatJson = args.includes('--format') && args[args.indexOf('--format') + 1] === 'json';
-    if (sub === 'help') {
+    if (sub === 'help' || sub === '--help' || sub === '-h' || args.includes('--help') || args.includes('-h')) {
         console.log(`用法: evolclaw agent <command>
 
 Commands:
@@ -2949,7 +3161,7 @@ async function cmdAid(args) {
     const sub = args[0] || 'list';
     const formatJson = args.includes('--format') && args[args.indexOf('--format') + 1] === 'json';
     const aunPath = resolveAunPath(args);
-    if (sub === 'help') {
+    if (sub === 'help' || sub === '--help' || sub === '-h' || args.includes('--help') || args.includes('-h')) {
         console.log(`用法: evolclaw aid <command>
 
 Commands:
@@ -3495,7 +3707,8 @@ Options:
             }
             body = { mode: 'text', text };
         }
-        const result = await msgSend({ from, to, body, ...commonOpts });
+        const encrypt = args.includes('--encrypt');
+        const result = await msgSend({ from, to, body, encrypt, ...commonOpts });
         if (!result.ok) {
             if (formatJson) {
                 console.log(JSON.stringify(result));
@@ -3789,7 +4002,8 @@ Options:
             body = { mode: 'text', text };
         }
         const mentions = collectMentions();
-        const result = await groupSend({ from, groupId, body, mentions: mentions.length ? mentions : undefined, ...commonOpts });
+        const encryptGroup = args.includes('--encrypt');
+        const result = await groupSend({ from, groupId, body, mentions: mentions.length ? mentions : undefined, encrypt: encryptGroup, ...commonOpts });
         outputResult(result, () => {
             const r = result;
             console.log(`✓ 已发送 message_id=${r.message?.message_id ?? '-'} seq=${r.message?.seq ?? '-'}`);
@@ -4125,7 +4339,26 @@ export async function main(args) {
                 await cmdWatchAid();
             }
             else if (args[1] === 'msg') {
-                const { cmdWatchMsg } = await import('../watch-msg.js');
+                if (args[2] === '--help' || args[2] === '-h' || args[2] === 'help') {
+                    console.log(`用法: evolclaw watch msg
+
+三面板交互式消息监控 TUI。
+
+面板:
+  左 (Scope)     本地 AID 列表，显示收发统计和对端数量
+  中 (Stats)     选中 AID 的对端列表（默认 All），显示 per-peer 收发数
+  右 (Messages)  消息流，带滚动条
+
+操作:
+  ↑↓             当前面板内导航
+  ←→ / Tab       切换面板
+  Enter          选中 AID / 选中对端
+  Backspace      返回上一级
+  Page Up/Down   消息滚动
+  ESC            退出`);
+                    break;
+                }
+                const { cmdWatchMsg } = await import('./watch-msg.js');
                 await cmdWatchMsg();
             }
             else if (args[1] === 'log') {
@@ -4141,12 +4374,20 @@ export async function main(args) {
         case 'restart-monitor':
             await cmdRestartMonitor();
             break;
+        case 'dev':
+            await cmdDev(args.slice(1));
+            break;
         case 'mv':
             await cmdMv(args[1], args[2]);
             break;
         case 'diagnose':
             await cmdDiagnose();
             break;
+        case 'net': {
+            const { cmdNet } = await import('./net-check.js');
+            await cmdNet(args.slice(1));
+            break;
+        }
         case 'ctl':
             await cmdCtl(args.slice(1));
             break;
@@ -4183,8 +4424,20 @@ export async function main(args) {
             await cmdGroup(args.slice(1));
             break;
         }
+        case 'bench': {
+            const { suppressSdkLogs } = await import('../aun/aid/index.js');
+            suppressSdkLogs();
+            const { cmdBench } = await import('./bench.js');
+            await cmdBench(args.slice(1));
+            break;
+        }
+        case 'link-rules': {
+            const { cmdLinkRules } = await import('./link-rules.js');
+            cmdLinkRules(args.slice(1));
+            break;
+        }
         default:
-            console.log(`Usage: evolclaw {init|start|stop|restart|status|logs|watch|ctl|diagnose|mv}
+            console.log(`Usage: evolclaw {init|start|stop|restart|status|logs|watch|ctl|diagnose|net|mv}
 
 Commands:
   init          初始化 evolclaw home (${resolvePaths().defaultsConfig})
@@ -4202,8 +4455,10 @@ Commands:
                   --level error|warn   只显示指定级别及以上
                   --module <name>      只显示指定模块（如 feishu、AgentRunner）
                   --raw                原始输出，不着色
-  watch         监控 logs/ 下所有 .log 文件（汇总实时输出，启动时显示最近 20 条）
+  watch         监控面板选择菜单（↑↓ 选择 log/aid/msg）
+  watch log     监控 logs/ 下所有 .log 文件（汇总实时输出，启动时显示最近 20 条）
   watch aid     AID 连接状态实时监控（显示各 AID 在线/离线/重连状态）
+  watch msg     消息监控（三面板交互式 TUI：AID 列表 / 对端统计 / 消息流）
   ctl           运行时自管理（模型切换、推理强度、压缩上下文等）
                   evolclaw ctl help 查看完整命令列表
   agent         管理 EvolAgent
@@ -4228,6 +4483,9 @@ Commands:
                   aid lookup <aid>   远程探测 AID（是否存在 + 网关 + agent.md）
                   aid agentmd put <aid>  签名并上传 agent.md
                   aid agentmd get <aid>  下载并验签 agent.md
+  net           网络链路诊断
+                  net check [<aid>]  10 步链路检测（DNS→Discovery→TCP→TLS→WSS→Auth→Ping→Echo）
+                  net help           查看详细帮助
   rpc           AUN RPC 调用
                   rpc --as <aid> --params <json|jsonl|file>
   storage       文件存储
@@ -4238,6 +4496,8 @@ Commands:
                   storage quota <aid>
   diagnose      诊断启动环境（配置、数据库、进程）
   mv <old> <new>  迁移项目目录（保留 Claude/Codex/EvolClaw 会话）
+  bench         AUN 消息性能基准测试
+                  bench --aids 5 --rounds 10 --concurrency 5
 
 Environment:
   EVOLCLAW_HOME   数据目录 (默认: ~/.evolclaw)