evolclaw 3.1.0 → 3.1.2

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,73 @@ 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 rawSource = m.source;
+            // 4 种来源: daemon | ctl | msg | cli
+            const source = (rawSource === 'ctl' || rawSource === 'msg' || rawSource === 'cli') ? rawSource : '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 +372,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 +392,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 +467,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 +476,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 +494,7 @@ export async function cmdWatchMsg() {
             watcher.close();
             watcher = null;
         }
+        clearInterval(pollTimer);
         if (process.stdin.isTTY)
             try {
                 process.stdin.setRawMode(false);
@@ -579,6 +643,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)
@@ -303,9 +348,30 @@ export function loadAgent(aid) {
     if (raw.aid !== aid) {
         throw new Error(`[config] ${p}: aid field "${raw.aid}" != directory name "${aid}"`);
     }
-    return expandEnvRefs(raw);
+    const cfg = expandEnvRefs(raw);
+    if (cfg.projects?.defaultPath) {
+        cfg.projects.defaultPath = cfg.projects.defaultPath.replace(/[/\\]+$/, '');
+    }
+    return cfg;
 }
 export function saveAgent(value) {
+    if (!isValidAid(value.aid)) {
+        throw new Error(`[config] saveAgent: invalid aid "${value.aid}" (must be a valid multi-level domain like mybot.agentid.pub)`);
+    }
+    if (value.owners) {
+        for (const o of value.owners) {
+            if (!isValidAid(o)) {
+                throw new Error(`[config] saveAgent: invalid owner AID "${o}" in ${value.aid} (must be a valid multi-level domain like alice.agentid.pub)`);
+            }
+        }
+    }
+    if (value.admins) {
+        for (const a of value.admins) {
+            if (!isValidAid(a)) {
+                throw new Error(`[config] saveAgent: invalid admin AID "${a}" in ${value.aid} (must be a valid multi-level domain like alice.agentid.pub)`);
+            }
+        }
+    }
     atomicWriteJson(agentConfigPath(value.aid), value);
 }
 /**

package/dist/core/channel-loader.js

@@ -128,18 +128,18 @@ export class ChannelLoader {
 }
 const SEP = '#';
 export function formatChannelKey(k) {
-    return `${k.aid}${SEP}${k.type}${SEP}${k.name}`;
+    return `${k.type}${SEP}${encodeURIComponent(k.selfPeerId)}${SEP}${k.name}`;
 }
 export function parseChannelKey(key) {
     const parts = key.split(SEP);
     if (parts.length !== 3) {
         throw new Error(`Invalid channel key (expected 3 segments separated by '#'): ${key}`);
     }
-    const [aid, type, name] = parts;
-    if (!aid || !type || !name) {
+    const [type, encodedSelfPeerId, name] = parts;
+    if (!type || !encodedSelfPeerId || !name) {
         throw new Error(`Invalid channel key (empty segment): ${key}`);
     }
-    return { aid, type, name };
+    return { type, selfPeerId: decodeURIComponent(encodedSelfPeerId), name };
 }
 export function tryParseChannelKey(key) {
     try {