evolclaw 3.1.0 → 3.1.1

package/dist/cli/index.js

@@ -231,11 +231,53 @@ function reportOrphans(orphans) {
     console.log('  这些进程不属于当前 HOME 的实例登记簿，自动清理不会处理它们。');
     console.log('  使用 evolclaw restart --clear 一并清掉，或手动 kill。');
 }
-async function cmdStart() {
-    const cmdStartedAt = Date.now();
+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');
-    console.log(`⏱ ${new Date().toLocaleString()}  [${isNpmInstall ? 'pkg' : 'dev'}] ${pkgRoot}`);
+    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 → 新结构）
@@ -263,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) {
@@ -444,9 +486,7 @@ 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}`);
+    printStartupInfo();
     console.log('🔄 Restarting EvolClaw...');
     // 版本检查与自动升级
     console.log('📦 Checking for updates...');
@@ -1523,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 = [];
@@ -1773,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)
@@ -1790,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;
@@ -1841,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;
@@ -1851,13 +1903,53 @@ 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}`;
@@ -2698,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' || sub === '--help' || sub === '-h' || args.includes('--help') || args.includes('-h')) {
+    if (!sub || sub === 'help' || sub === '--help' || sub === '-h' || args.includes('--help') || args.includes('-h')) {
         console.log(`用法: evolclaw agent <command>
 
 Commands:
@@ -2750,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;
     }
@@ -3161,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' || sub === '--help' || sub === '-h' || args.includes('--help') || args.includes('-h')) {
+    if (!sub || sub === 'help' || sub === '--help' || sub === '-h' || args.includes('--help') || args.includes('-h')) {
         console.log(`用法: evolclaw aid <command>
 
 Commands:

package/dist/cli/init.js

@@ -1,9 +1,9 @@
 import fs from 'fs';
-import path from 'path';
 import readline from 'readline';
 import { resolvePaths, ensureDataDirs } from '../paths.js';
 import { commandExists } from '../utils/cross-platform.js';
 import { scanInstances } from '../utils/instance-registry.js';
+import { saveDefaultsSafe } from '../config-store.js';
 // ==================== Helpers ====================
 function ask(rl, question) {
     return new Promise(resolve => rl.question(question, resolve));
@@ -28,9 +28,8 @@ function buildDefaults(chosen) {
         baseagents: { [chosen]: env ? { apiKey: `$ENV:${env}` } : {} },
     };
 }
-function writeDefaults(defaultsPath, chosen) {
-    fs.mkdirSync(path.dirname(defaultsPath), { recursive: true });
-    fs.writeFileSync(defaultsPath, JSON.stringify(buildDefaults(chosen), null, 2) + '\n');
+function writeDefaults(_defaultsPath, chosen) {
+    saveDefaultsSafe(buildDefaults(chosen));
 }
 // ==================== Main ====================
 export async function cmdInit(options) {

package/dist/cli/watch-msg.js

@@ -1,6 +1,6 @@
 import fs from 'fs';
 import path from 'path';
-import { resolvePaths, getPackageRoot } from '../paths.js';
+import { resolvePaths } from '../paths.js';
 import { decodeDirSegment, readAllJsonlLines } from '../core/session/session-fs-store.js';
 // ==================== ANSI ====================
 const isTTY = !!process.stdout.isTTY;
@@ -84,6 +84,34 @@ function formatTimeAgo(ms) {
         return `${hour}h`;
     return `${Math.floor(hour / 24)}d`;
 }
+function getCodeTime(pkgRoot) {
+    let latestMtime = 0;
+    const scanDir = fs.existsSync(path.join(pkgRoot, 'dist')) ? path.join(pkgRoot, 'dist') : path.join(pkgRoot, 'src');
+    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);
+    if (!latestMtime)
+        return '?';
+    const d = new Date(latestMtime);
+    return `${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')}`;
+}
 function formatNumber(n) {
     return n.toLocaleString('en-US');
 }
@@ -267,43 +295,71 @@ function renderStatsPanel(state, width, height) {
 // ==================== Messages Panel ====================
 function renderMessagesPanel(state, width, height) {
     const lines = [];
-    const title = `${DIM}─ Messages ─${RST}`;
+    const lastTs = state.messages.length > 0 ? state.messages[state.messages.length - 1].ts : 0;
+    const lastTimeStr = lastTs ? formatDateTime(lastTs) : '--';
+    const title = `${DIM}─ Messages (${state.messages.length}, last: ${lastTimeStr}) ─${RST}`;
     lines.push(padRight(title, width));
     const contentHeight = height - 1;
     const msgs = state.messages;
     const totalMsgs = msgs.length;
-    const visibleCount = contentHeight;
-    const startIdx = Math.max(0, totalMsgs - visibleCount - state.messageScrollOffset);
-    const endIdx = Math.min(totalMsgs, startIdx + visibleCount);
-    const scrollbar = renderScrollbar(totalMsgs, visibleCount, state.messageScrollOffset, contentHeight);
     const msgWidth = width - 3;
     const contentLineWidth = msgWidth - 2;
     const maxContentLines = 3;
-    for (let i = startIdx; i < endIdx; i++) {
-        const m = msgs[i];
+    // 先构造每条消息的渲染行，从最末尾的可见消息往回收集，直到填满 contentHeight
+    function renderOneMsg(m) {
         const time = formatDateTime(m.ts);
         const dir = m.dir === 'in' ? `${GREEN}↓${RST}` : `${BLUE}↑${RST}`;
         const isGroup = m.chatType === 'group';
-        const chatTag = isGroup ? `${MAGENTA}[群聊]${RST} ` : '';
+        const chatTag = isGroup ? `${MAGENTA}[群聊]${RST}` : '';
+        const encLabel = m.encrypt ? '密文' : '明文';
+        const modeLabel = m.chatmode === 'proactive' ? '自主' : '响应';
+        const metaTags = (m.encrypt != null || m.chatmode) ? `${MAGENTA}[${encLabel}|${modeLabel}]${RST}` : '';
+        let typeTag = '';
+        if (m.dir === 'out') {
+            const source = m.source === 'cli' ? 'cli' : 'daemon';
+            const method = m.msgType === 'thought' ? 'thought' : 'send';
+            typeTag = `${DIM}[${source}|${method}]${RST}`;
+        }
         const byteLen = Buffer.byteLength(m.content, 'utf-8');
         const lenTag = `${DIM}${formatNumber(byteLen)}B${RST}`;
-        const fromDisplay = isGroup && m.groupId && m.dir === 'in' ? m.groupId : m.from;
-        const toDisplay = isGroup && m.groupId && m.dir === 'out' ? m.groupId : m.to;
-        const header = `${DIM}${time}${RST} ${dir}${chatTag} ${ORANGE}${fromDisplay}${RST}${DIM}→${RST}${GREEN}${toDisplay}${RST} ${lenTag}`;
-        const headerLine = padRight(header, msgWidth);
-        const sbIdx = lines.length - 1;
-        lines.push(`${headerLine} ${scrollbar[sbIdx] || ' '}`);
-        if (lines.length - 1 < contentHeight) {
-            const rawContent = m.content.replace(/\n/g, ' ');
-            const wrappedLines = wrapText(rawContent, contentLineWidth, maxContentLines);
-            for (const wl of wrappedLines) {
-                if (lines.length - 1 >= contentHeight)
-                    break;
-                const contentLine = padRight(`  ${wl}`, msgWidth);
-                const sbIdx2 = lines.length - 1;
-                lines.push(`${contentLine} ${scrollbar[sbIdx2] || ' '}`);
-            }
+        const fromDisplay = isGroup && m.groupId && m.dir === 'in' ? m.groupId : m.from.split('.')[0];
+        const toDisplay = isGroup && m.groupId && m.dir === 'out' ? m.groupId : m.to.split('.')[0];
+        const header = `${DIM}${time}${RST} ${dir}${chatTag}${metaTags}${typeTag} ${ORANGE}${fromDisplay}${RST}${DIM}→${RST}${GREEN}${toDisplay}${RST} ${lenTag}`;
+        const out = [padRight(header, msgWidth)];
+        const rawContent = m.content.replace(/\n/g, ' ');
+        const wrappedLines = wrapText(rawContent, contentLineWidth, maxContentLines);
+        for (const wl of wrappedLines) {
+            out.push(padRight(`  ${wl}`, msgWidth));
+        }
+        return out;
+    }
+    // 从 endIdx-1 开始倒序，往回累积，直到行数填满 contentHeight
+    const endIdx = Math.max(0, totalMsgs - state.messageScrollOffset);
+    const collected = []; // 每条消息的行数组
+    let totalLines = 0;
+    let firstShownIdx = endIdx; // 首条可见消息的下标
+    for (let i = endIdx - 1; i >= 0; i--) {
+        const rendered = renderOneMsg(msgs[i]);
+        if (totalLines + rendered.length > contentHeight && collected.length > 0)
+            break;
+        collected.unshift(rendered);
+        totalLines += rendered.length;
+        firstShownIdx = i;
+        if (totalLines >= contentHeight)
+            break;
+    }
+    const visibleMsgCount = endIdx - firstShownIdx;
+    const scrollbar = renderScrollbar(totalMsgs, visibleMsgCount, state.messageScrollOffset, contentHeight);
+    // 正序输出（旧→新）
+    for (const rendered of collected) {
+        for (const line of rendered) {
+            if (lines.length - 1 >= contentHeight)
+                break;
+            const sbIdx = lines.length - 1;
+            lines.push(`${line} ${scrollbar[sbIdx] || ' '}`);
         }
+        if (lines.length - 1 >= contentHeight)
+            break;
     }
     while (lines.length < height) {
         const sbIdx = lines.length - 1;
@@ -314,11 +370,11 @@ function renderMessagesPanel(state, width, height) {
 // ==================== Main Render ====================
 function renderFrame(state) {
     const cols = process.stdout.columns || 120;
-    const rows = (process.stdout.rows || 40) - 3;
+    const rows = (process.stdout.rows || 40);
+    const bodyHeight = rows - 4;
     const leftW = Math.max(20, Math.floor(cols * 0.20));
     const midW = Math.max(24, Math.floor(cols * 0.22));
     const rightW = Math.max(40, cols - leftW - midW - 4);
-    const bodyHeight = rows - 2;
     const leftLines = renderScopePanel(state, leftW, bodyHeight);
     const midLines = renderStatsPanel(state, midW, bodyHeight);
     const msgLines = renderMessagesPanel(state, rightW, bodyHeight);
@@ -334,11 +390,11 @@ function renderFrame(state) {
     }
     const bottomBorder = `${DIM}├${'─'.repeat(leftW)}┴${'─'.repeat(midW)}┴${'─'.repeat(rightW + 1)}┤${RST}`;
     buf += `\x1b[2K${bottomBorder}\n`;
-    const pkgRoot = getPackageRoot();
-    const helpLine = `${DIM}│ Tab: panel  ↑↓: nav  Enter: select  Backspace: back  ESC: exit  ${pkgRoot}${RST}`;
+    const helpText = `Tab: panel  ↑↓: nav  Enter: select  Backspace: back  ESC: exit`;
+    const helpLine = `${DIM}│ ${helpText.slice(0, cols - 4)} ${RST}`;
     buf += `\x1b[2K${helpLine}\n`;
     const closeBorder = `${DIM}└${'─'.repeat(cols - 2)}┘${RST}`;
-    buf += `\x1b[2K${closeBorder}\n`;
+    buf += `\x1b[2K${closeBorder}`;
     return buf;
 }
 // ==================== Main ====================
@@ -409,6 +465,7 @@ export async function cmdWatchMsg() {
         if (!state.selectedLocalAid)
             return;
         state.peers = loadPeerInfos(aunDir, state.selectedLocalAid);
+        const prevCount = state.messages.length;
         if (state.selectedPeer) {
             state.messages = readMessages(aunDir, state.selectedLocalAid, state.selectedPeer);
             if (state.messages.length > 1000)
@@ -417,6 +474,10 @@ export async function cmdWatchMsg() {
         else {
             state.messages = loadAllMessages(aunDir, state.selectedLocalAid);
         }
+        // 有新消息时自动滚到底部
+        if (state.messages.length > prevCount) {
+            state.messageScrollOffset = 0;
+        }
         // Also refresh scope stats for the selected AID
         const idx = state.localAids.findIndex(a => a.aid === state.selectedLocalAid);
         if (idx >= 0) {
@@ -431,6 +492,7 @@ export async function cmdWatchMsg() {
             watcher.close();
             watcher = null;
         }
+        clearInterval(pollTimer);
         if (process.stdin.isTTY)
             try {
                 process.stdin.setRawMode(false);
@@ -579,6 +641,21 @@ export async function cmdWatchMsg() {
     loadScope();
     process.stdout.write('\x1b[?25l\x1b[2J\x1b[H');
     render();
+    // 定时轮询：5 秒检查一次，有变化才刷新
+    let lastMsgCount = state.messages.length;
+    let lastMsgTs = state.messages.length > 0 ? state.messages[state.messages.length - 1].ts : 0;
+    const pollTimer = setInterval(() => {
+        if (!state.selectedLocalAid)
+            return;
+        refreshData();
+        const newCount = state.messages.length;
+        const newTs = newCount > 0 ? state.messages[newCount - 1].ts : 0;
+        if (newCount !== lastMsgCount || newTs !== lastMsgTs) {
+            lastMsgCount = newCount;
+            lastMsgTs = newTs;
+            render();
+        }
+    }, 5000);
     if (process.stdin.isTTY) {
         process.stdin.setRawMode(true);
         process.stdin.resume();

package/dist/config-store.js

@@ -75,8 +75,53 @@ export function loadDefaults() {
     return expandEnvRefs(raw);
 }
 export function saveDefaults(value) {
+    backupDefaults(resolvePaths().defaultsConfig);
     atomicWriteJson(resolvePaths().defaultsConfig, value);
 }
+/**
+ * 备份 defaults.json 为 defaults_YYYYMMDDhhmmss.json。文件不存在时为 no-op。
+ * 同秒重复调用会被覆盖（同一秒内的内容相同，可接受）。
+ */
+function backupDefaults(filePath) {
+    if (!fs.existsSync(filePath))
+        return;
+    const now = new Date();
+    const ts = now.getFullYear().toString()
+        + String(now.getMonth() + 1).padStart(2, '0')
+        + String(now.getDate()).padStart(2, '0')
+        + String(now.getHours()).padStart(2, '0')
+        + String(now.getMinutes()).padStart(2, '0')
+        + String(now.getSeconds()).padStart(2, '0');
+    const backupPath = path.join(path.dirname(filePath), `defaults_${ts}.json`);
+    try {
+        fs.copyFileSync(filePath, backupPath);
+    }
+    catch (e) {
+        logger.warn(`[config] backup failed: ${backupPath}: ${e}`);
+    }
+}
+/**
+ * 安全写入 defaults.json：备份现有文件 → 深合并 patch → 原子写入。
+ *
+ * 与 saveDefaults() 不同，本函数保留现有字段，仅覆盖 patch 中显式指定的字段。
+ * 适用场景：evolclaw init 仅修改 active_baseagent/baseagents 时，不应丢失 chatmode/projects 等其它字段。
+ */
+export function saveDefaultsSafe(patch) {
+    const p = resolvePaths().defaultsConfig;
+    let existing = null;
+    try {
+        existing = atomicReadJson(p);
+    }
+    catch (e) {
+        logger.warn(`[config] existing defaults.json unparsable, will be backed up and replaced: ${e}`);
+    }
+    fs.mkdirSync(path.dirname(p), { recursive: true });
+    backupDefaults(p);
+    const merged = existing
+        ? deepMergeObject(existing, patch)
+        : { $schema_version: CONFIG_SCHEMA_VERSION, ...patch };
+    atomicWriteJson(p, merged);
+}
 export function loadProcessConfig() {
     const raw = atomicReadJson(resolvePaths().processConfig);
     if (raw === null)