evolclaw 3.0.0 → 3.1.1

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');
@@ -230,7 +231,53 @@ function reportOrphans(orphans) {
     console.log('  这些进程不属于当前 HOME 的实例登记簿，自动清理不会处理它们。');
     console.log('  使用 evolclaw restart --clear 一并清掉，或手动 kill。');
 }
+function formatLocalTime(ms) {
+    const d = new Date(ms);
+    return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')} ${String(d.getHours()).padStart(2, '0')}:${String(d.getMinutes()).padStart(2, '0')}:${String(d.getSeconds()).padStart(2, '0')}`;
+}
+function printStartupInfo() {
+    const pkgRoot = getPackageRoot();
+    const isNpmInstall = pkgRoot.includes('node_modules');
+    const cliRunsSource = !import.meta.url.includes('/dist/');
+    const daemonEntry = path.join(pkgRoot, 'dist', 'index.js');
+    const daemonRunsDist = fs.existsSync(daemonEntry);
+    const scanDir = path.join(pkgRoot, daemonRunsDist ? 'dist' : 'src');
+    let latestMtime = 0;
+    const scanRecursive = (dir) => {
+        try {
+            for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+                if (entry.name === 'node_modules')
+                    continue;
+                const full = path.join(dir, entry.name);
+                if (entry.isDirectory()) {
+                    scanRecursive(full);
+                    continue;
+                }
+                if (entry.name.endsWith('.js') || entry.name.endsWith('.ts')) {
+                    const mt = fs.statSync(full).mtimeMs;
+                    if (mt > latestMtime)
+                        latestMtime = mt;
+                }
+            }
+        }
+        catch { }
+    };
+    scanRecursive(scanDir);
+    let version = '?';
+    try {
+        version = JSON.parse(fs.readFileSync(path.join(pkgRoot, 'package.json'), 'utf-8')).version;
+    }
+    catch { }
+    console.log(`  EvolClaw v${version}`);
+    console.log(`  包路径:     ${pkgRoot}`);
+    console.log(`  安装类型:   ${isNpmInstall ? 'npm全局安装' : '开发仓(link)'}`);
+    console.log(`  CLI执行:    ${cliRunsSource ? '源码(tsx)' : '编译产物(dist)'}`);
+    console.log(`  Daemon执行: ${daemonRunsDist ? '编译产物(dist)' : '未知'}`);
+    console.log(`  代码时间:   ${latestMtime ? formatLocalTime(latestMtime) : '?'}`);
+}
 async function cmdStart() {
+    const cmdStartedAt = Date.now();
+    printStartupInfo();
     const p = resolvePaths();
     ensureDataDirs();
     // 旧配置自动迁移（evolclaw.json → 新结构）
@@ -258,7 +305,7 @@ async function cmdStart() {
     if (aliveMains.length > 0) {
         const first = aliveMains[0];
         console.log(`❌ EvolClaw is already running (PID: ${aliveMains.map(m => m.record.pid).join(', ')})`);
-        console.log(`  启动于: ${first.record.startedAtIso}`);
+        console.log(`  启动于: ${new Date(first.record.startedAtIso).toLocaleString()}`);
         console.log(`  启动方式: ${first.record.launchedBy}`);
         // 报告 AID 状态
         if (status.aidLastActivity.size > 0) {
@@ -315,7 +362,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 +412,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 +424,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 +439,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 +485,8 @@ async function cmdStop() {
     }
 }
 async function cmdRestart(opts = {}) {
+    const cmdStartedAt = Date.now();
+    printStartupInfo();
     console.log('🔄 Restarting EvolClaw...');
     // 版本检查与自动升级
     console.log('📦 Checking for updates...');
@@ -448,6 +507,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 +528,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 +1465,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();
@@ -1348,7 +1563,7 @@ function cmdWatch() {
         }
         const m = aliveMainEntries[0].record;
         const uptime = formatTimeAgo(Date.now() - m.startedAt);
-        console.log(`📦 Instance: PID ${m.pid} | 启动于 ${m.startedAtIso} (${uptime}) | via ${m.launchedBy}`);
+        console.log(`📦 Instance: PID ${m.pid} | 启动于 ${new Date(m.startedAtIso).toLocaleString()} (${uptime}) | via ${m.launchedBy}`);
         if (instStatus.aidLastActivity.size > 0) {
             const now = Date.now();
             const aidLines = [];
@@ -1598,6 +1813,11 @@ async function cmdWatchAid() {
     const COL_LRECV = 10;
     const COL_LSENT = 10;
     const COL_PEERS = 5;
+    // 表头跟随系统语言
+    const isChinese = (process.env.LANG || process.env.LC_ALL || process.env.LANGUAGE || Intl.DateTimeFormat().resolvedOptions().locale || '').toLowerCase().includes('zh');
+    const HEADERS = isChinese
+        ? { aid: 'AID', status: '状态', uptime: '运行', state: '工作', reconn: '重连', recv: '收', sent: '发', sys: '系统', bin: '入流量', bout: '出流量', lrecv: '最后收', lsent: '最后发', peers: '对端' }
+        : { aid: 'AID', status: 'STATUS', uptime: 'UPTIME', state: 'STATE', reconn: 'RECONN', recv: 'RECV', sent: 'SENT', sys: 'SYS R/S', bin: 'BYTES IN', bout: 'BYTES OUT', lrecv: 'LAST RECV', lsent: 'LAST SENT', peers: 'PEERS' };
     function formatDuration(ms) {
         const sec = Math.floor(ms / 1000);
         if (sec < 60)
@@ -1615,19 +1835,19 @@ async function cmdWatchAid() {
     }
     function renderHeader() {
         return '  ' +
-            padRight('AID', COL_AID) +
-            padRight('STATUS', COL_STATUS) +
-            padRight('UPTIME', COL_UPTIME) +
-            padRight('STATE', COL_STATE) +
-            padRight('RECONN', COL_RECONN) +
-            padRight('RECV', COL_RECV) +
-            padRight('SENT', COL_SENT) +
-            padRight('SYS R/S', COL_SYS) +
-            padRight('BYTES IN', COL_BIN) +
-            padRight('BYTES OUT', COL_BOUT) +
-            padRight('LAST RECV', COL_LRECV) +
-            padRight('LAST SENT', COL_LSENT) +
-            padRight('PEERS', COL_PEERS);
+            padRight(HEADERS.aid, COL_AID) +
+            padRight(HEADERS.status, COL_STATUS) +
+            padRight(HEADERS.uptime, COL_UPTIME) +
+            padRight(HEADERS.state, COL_STATE) +
+            padRight(HEADERS.reconn, COL_RECONN) +
+            padRight(HEADERS.recv, COL_RECV) +
+            padRight(HEADERS.sent, COL_SENT) +
+            padRight(HEADERS.sys, COL_SYS) +
+            padRight(HEADERS.bin, COL_BIN) +
+            padRight(HEADERS.bout, COL_BOUT) +
+            padRight(HEADERS.lrecv, COL_LRECV) +
+            padRight(HEADERS.lsent, COL_LSENT) +
+            padRight(HEADERS.peers, COL_PEERS);
     }
     function renderRow(aid, stats, projectPath) {
         const aidLabel = aid.aid.length > COL_AID - 2 ? aid.aid.slice(0, COL_AID - 4) + '..' : aid.aid;
@@ -1666,6 +1886,13 @@ async function cmdWatchAid() {
         const nameReset = refreshedAids.has(aid.aid) ? '' : RST;
         const BLUE = useColor ? '\x1b[34m' : '';
         const ORANGE = useColor ? '\x1b[38;5;208m' : '';
+        const MAGENTA = useColor ? '\x1b[35m' : '';
+        // 标记生成：[明文/密文|自主/响应]（紫色=工具渲染标记）
+        const mkTags = (encrypt, chatmode) => {
+            const enc = encrypt ? '密文' : '明文';
+            const mode = chatmode === 'proactive' ? '自主' : '响应';
+            return `${MAGENTA}[${enc}|${mode}]${RST}`;
+        };
         let msgPreview = '';
         if (stats?.lastReceivedAt || stats?.lastSentAt) {
             const recvTs = stats.lastReceivedAt ?? 0;
@@ -1676,17 +1903,81 @@ async function cmdWatchAid() {
             }
             else if (stats.lastSentText) {
                 const toShort = stats.lastSentTo ? stats.lastSentTo.split('.')[0] : '';
-                msgPreview = `${BLUE}↑ ${toShort ? `${ORANGE}${toShort}${RST}${BLUE}: ` : ''}${stats.lastSentText.replace(/\n/g, ' ').slice(0, 60)}${RST}`;
+                const tags = mkTags(stats.lastSentEncrypt, stats.lastSentChatmode);
+                // task 进行中时也显示计数（processing > 0 说明还在跑）
+                const isWorking = (stats.processing ?? 0) > 0;
+                const taskEnd = stats?.lastTaskEnd;
+                const counts = isWorking && taskEnd
+                    ? `${MAGENTA}[大模型${taskEnd.numTurns}|调用${taskEnd.toolUseCount}|thought${taskEnd.thoughtPutCount}|msg${taskEnd.replyCount}]${RST}`
+                    : '';
+                msgPreview = `${BLUE}↑${tags}${counts} ${toShort ? `${ORANGE}${toShort}${RST}${BLUE}: ` : ''}${stats.lastSentText.replace(/\n/g, ' ').slice(0, 60)}${RST}`;
             }
             else if (stats.lastReceivedText) {
                 const fromShort = stats.lastReceivedFrom ? stats.lastReceivedFrom.split('.')[0] : '';
                 msgPreview = `${GREEN}↓ ${fromShort ? `${ORANGE}${fromShort}${RST}${GREEN}: ` : ''}${stats.lastReceivedText.replace(/\n/g, ' ').slice(0, 60)}${RST}`;
             }
         }
+        // 任务结束状态覆盖：仅当 taskEnd 比最后收发都新时才覆盖
+        const taskEnd = stats?.lastTaskEnd;
+        if (taskEnd && taskEnd.ts >= (stats?.lastSentAt ?? 0) && taskEnd.ts >= (stats?.lastReceivedAt ?? 0)) {
+            const tags = mkTags(taskEnd.encrypt, taskEnd.chatmode);
+            // 计数标记: [大模型N|调用N|thoughtN(streamN)|msgN]
+            const thoughtLabel = taskEnd.thoughtPutCount > 0
+                ? `thought${taskEnd.numTurns}(stream${taskEnd.thoughtPutCount})`
+                : `thought${taskEnd.numTurns}`;
+            const counts = `${MAGENTA}[大模型${taskEnd.numTurns}|调用${taskEnd.toolUseCount}|${thoughtLabel}|msg${taskEnd.replyCount}]${RST}`;
+            if (taskEnd.status === 'error') {
+                msgPreview = `${RED}${tags}${counts} 错误: ${taskEnd.errorType ?? '未知错误'}${RST}`;
+            }
+            else if (taskEnd.sentDuringTask) {
+                // 有 message.send：蓝色加粗 + 内容
+                const toShort = stats?.lastSentTo ? stats.lastSentTo.split('.')[0] : '';
+                const textPreview = stats?.lastSentText ? stats.lastSentText.replace(/\n/g, ' ').slice(0, 60) : '';
+                msgPreview = `${BOLD}${BLUE}↑${tags}${counts} ${toShort ? `${ORANGE}${toShort}${RST}${BOLD}${BLUE}: ` : ''}${textPreview}${RST}`;
+            }
+            else if (taskEnd.thoughtDuringTask) {
+                // 只有 thought：普通蓝色 + thought 内容
+                const textPreview = taskEnd.lastThoughtText
+                    ? taskEnd.lastThoughtText.replace(/\n/g, ' ').slice(0, 60)
+                    : (taskEnd.finalText ? taskEnd.finalText.replace(/\n/g, ' ').slice(0, 60) : '');
+                msgPreview = `${BLUE}↑${tags}${counts} ${textPreview}${RST}`;
+            }
+            else {
+                // 既没 send 也没 thought
+                const textPreview = taskEnd.finalText
+                    ? taskEnd.finalText.replace(/\n/g, ' ').slice(0, 60)
+                    : '(无输出)';
+                msgPreview = `${ORANGE}${tags}${counts} ${textPreview}${RST}`;
+            }
+        }
         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 +2196,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 +2790,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 || sub === 'help' || sub === '--help' || sub === '-h' || args.includes('--help') || args.includes('-h')) {
         console.log(`用法: evolclaw agent <command>
 
 Commands:
@@ -2538,17 +2842,43 @@ Options:
             console.log('No agents configured.');
             return;
         }
-        console.log('NAME'.padEnd(14) + 'STATUS'.padEnd(10) + 'CHANNELS'.padEnd(24) +
-            'PROJECT'.padEnd(22) + 'BASEAGENT'.padEnd(11) + 'LAST ACTIVE');
+        // 表头跟随系统语言
+        const isChinese = (process.env.LANG || process.env.LC_ALL || process.env.LANGUAGE || Intl.DateTimeFormat().resolvedOptions().locale || '').toLowerCase().includes('zh');
+        const headers = isChinese
+            ? { name: '名称', status: '状态', channels: '渠道', project: '项目', baseagent: '基座', lastActive: '最后活跃' }
+            : { name: 'NAME', status: 'STATUS', channels: 'CHANNELS', project: 'PROJECT', baseagent: 'BASEAGENT', lastActive: 'LAST ACTIVE' };
+        // 计算各列实际需要的宽度
+        let maxNameLen = headers.name.length;
+        let maxStatusLen = headers.status.length;
+        let maxChannelsLen = headers.channels.length;
+        let maxProjectLen = headers.project.length;
+        let maxBaseagentLen = headers.baseagent.length;
+        for (const info of result.agents) {
+            maxNameLen = Math.max(maxNameLen, info.name.length);
+            maxStatusLen = Math.max(maxStatusLen, (info.status || 'stopped').length);
+            const channelsStr = info.channels?.length > 0 ? info.channels.join(', ') : '—';
+            maxChannelsLen = Math.max(maxChannelsLen, channelsStr.length);
+            const projectStr = info.projectPath ? path.basename(info.projectPath) : '—';
+            maxProjectLen = Math.max(maxProjectLen, projectStr.length);
+            maxBaseagentLen = Math.max(maxBaseagentLen, (info.baseagent || '—').length);
+        }
+        // 加 2 作为列间距
+        const colName = maxNameLen + 2;
+        const colStatus = maxStatusLen + 2;
+        const colChannels = maxChannelsLen + 1;
+        const colProject = maxProjectLen + 2;
+        const colBaseagent = maxBaseagentLen + 2;
+        console.log(headers.name.padEnd(colName) + headers.status.padEnd(colStatus) + headers.channels.padEnd(colChannels) +
+            headers.project.padEnd(colProject) + headers.baseagent.padEnd(colBaseagent) + headers.lastActive);
         for (const info of result.agents) {
             const name = info.name;
             const status = info.status || 'stopped';
-            const channels = info.channels?.length > 0 ? info.channels.join(', ').slice(0, 22) : '—';
+            const channels = info.channels?.length > 0 ? info.channels.join(', ') : '—';
             const project = info.projectPath ? path.basename(info.projectPath) : '—';
             const baseagent = info.baseagent || '—';
             const lastActive = info.lastActivity ? formatTimeAgo(Date.now() - info.lastActivity) : '—';
-            console.log(name.padEnd(14) + status.padEnd(10) + channels.padEnd(24) +
-                project.padEnd(22) + baseagent.padEnd(11) + lastActive);
+            console.log(name.padEnd(colName) + status.padEnd(colStatus) + channels.padEnd(colChannels) +
+                project.padEnd(colProject) + baseagent.padEnd(colBaseagent) + lastActive);
         }
         return;
     }
@@ -2949,7 +3279,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 || sub === 'help' || sub === '--help' || sub === '-h' || args.includes('--help') || args.includes('-h')) {
         console.log(`用法: evolclaw aid <command>
 
 Commands:
@@ -3495,7 +3825,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 +4120,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 +4457,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 +4492,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 +4542,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 +4573,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 +4601,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 +4614,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)