evolclaw 3.1.0 → 3.1.2

package/dist/index.js

@@ -1,7 +1,7 @@
 import { ClaudeSessionFileAdapter } from './core/session/adapters/claude-session-file-adapter.js';
 import { CodexSessionFileAdapter } from './core/session/adapters/codex-session-file-adapter.js';
 import { GeminiSessionFileAdapter } from './core/session/adapters/gemini-session-file-adapter.js';
-import { ensureDataDirs, resolvePaths, getPackageRoot } from './paths.js';
+import { ensureDataDirs, resolvePaths, getPackageRoot, agentMdPath } from './paths.js';
 import { resolveAnthropicConfig } from './agents/resolve.js';
 import { loadDefaults, autoMigrateIfNeeded, migrateIdentitiesIfNeeded } from './config-store.js';
 import { CONFIG_SCHEMA_VERSION } from './types.js';
@@ -41,7 +41,6 @@ import { agentTriggersDir } from './paths.js';
 import { isLinkedInstall } from './utils/npm-ops.js';
 import path from 'path';
 import fs from 'fs';
-import os from 'os';
 import crypto from 'crypto';
 import { fileURLToPath } from 'url';
 /** 出站 payload 摘要（用于 channel-out.log） */
@@ -124,6 +123,46 @@ function readFastaunVersion() {
     }
 }
 async function main() {
+    // 启动信息：目录类型 + 版本号 + 代码最新时间戳
+    {
+        const pkgRoot = getPackageRoot();
+        const runDir = path.dirname(new URL(import.meta.url).pathname.replace(/^\/([A-Z]:)/, '$1'));
+        const isDist = runDir.includes(path.join(pkgRoot, 'dist'));
+        const isLinked = fs.existsSync(path.join(pkgRoot, '.git'));
+        const dirType = isDist ? (isLinked ? '开发仓/dist' : '安装路径/dist') : '源码(tsx)';
+        const scanDir = isDist ? path.join(pkgRoot, 'dist') : path.join(pkgRoot, '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 { }
+        const fmtTime = (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')}`; };
+        console.error(`[EvolClaw] EvolClaw v${version}`);
+        console.error(`[EvolClaw] 执行类型: ${dirType}`);
+        console.error(`[EvolClaw] 包路径:   ${pkgRoot}`);
+        console.error(`[EvolClaw] 代码时间: ${latestMtime ? fmtTime(latestMtime) : '?'}`);
+    }
     // 过滤飞书 SDK 的 info 日志
     const originalLog = console.log;
     const originalInfo = console.info;
@@ -261,16 +300,22 @@ async function main() {
     // 统计收集器（近 1 小时滚动统计）
     const statsCollector = new StatsCollector(eventBus);
     // Per-AID 消息统计收集器（累计，供 watch aid 实时展示）
-    const aidStatsCollector = new AidStatsCollector();
+    const aidStatsCollector = new AidStatsCollector(eventBus);
+    aidStatsCollector.setSessionsDir(paths.sessionsDir);
     // 初始化 SessionManager（文件系统后端）
     const sessionManager = new SessionManager(paths.sessionsDir, eventBus, (channel, userId) => agentRegistry.isOwner(channel, userId), (channel, userId) => agentRegistry.isAdmin(channel, userId));
     // sessionMode 解析：从 channel 路由到具体 agent，按 agent.config.chatmode
-    sessionManager.setSessionModeResolver((channelKey, chatType) => {
+    sessionManager.setSessionModeResolver((channelKey, chatType, peerType) => {
         const agent = agentRegistry.resolveByChannel(channelKey);
         const cm = agent?.config.chatmode;
         if (!cm)
             return undefined;
-        return chatType === 'group' ? cm.group : cm.private;
+        // 优先级：群聊 > nothuman > private
+        if (chatType === 'group')
+            return cm.group;
+        if (peerType && peerType !== 'human' && peerType !== 'unknown')
+            return cm.nothuman;
+        return cm.private;
     });
     logger.info('✓ Database initialized');
     // 注册会话文件适配器（Claude / Codex 各自的会话文件操作）
@@ -427,7 +472,7 @@ async function main() {
             logger.error(`[Trigger] Scheduler init failed for ${agent.aid}: ${err}`);
         }
     }
-    // Inject primary agent's trigger scheduler into cmdHandler
+    // Inject primary agent's trigger scheduler as fallback (used when owning agent has no scheduler)
     const primaryAgentForTrigger = agentRegistry.runnableAgents()[0];
     if (primaryAgentForTrigger?.triggerScheduler && primaryAgentForTrigger?.triggerManager) {
         cmdHandler.setTriggerScheduler(primaryAgentForTrigger.triggerScheduler, primaryAgentForTrigger.triggerManager);
@@ -502,10 +547,10 @@ async function main() {
         if (inst.onProjectPathRequest && inst.channel.onProjectPathRequest) {
             inst.channel.onProjectPathRequest(async (channelId) => {
                 // Effective default path: use the agent that owns this channel.
-                const owningAgent = agentRegistry.resolveByChannel(inst.adapter.channelName);
+                const owningAgent = agentRegistry.resolveByChannel(inst.adapter.channelKey);
                 const effectiveDefault = owningAgent?.projectPath
                     ?? primaryAgent.projectPath;
-                const session = await sessionManager.getOrCreateSession(inst.adapter.channelName, channelId, effectiveDefault, undefined, undefined, undefined, undefined);
+                const session = await sessionManager.getOrCreateSession(inst.adapter.channelKey, channelId, effectiveDefault, undefined, undefined, undefined, undefined);
                 return path.isAbsolute(session.projectPath)
                     ? session.projectPath
                     : path.resolve(process.cwd(), session.projectPath);
@@ -547,10 +592,10 @@ async function main() {
     }
     // Bind adapters to their owning agents and mark running
     for (const inst of channelInstances) {
-        const agent = agentRegistry.resolveByChannel(inst.adapter.channelName);
+        const agent = agentRegistry.resolveByChannel(inst.adapter.channelKey);
         if (!agent || agent.status === 'error')
             continue;
-        agent.channels.set(inst.adapter.channelName, inst.adapter);
+        agent.channels.set(inst.adapter.channelKey, inst.adapter);
         if (agent.status === 'stopped') {
             agent.status = 'running';
         }
@@ -565,7 +610,7 @@ async function main() {
     for (const inst of channelInstances) {
         const channelType = inst.channelType || inst.adapter.channelName;
         if (channelType === 'feishu' && 'preloadThreads' in inst.channel) {
-            const threadIds = sessionManager.getKnownThreadIds(inst.adapter.channelName);
+            const threadIds = sessionManager.getKnownThreadIds(inst.adapter.channelKey);
             inst.channel.preloadThreads(threadIds);
         }
     }
@@ -597,9 +642,8 @@ async function main() {
             // 尝试从 agent.md 读取 name
             let agentName = agent.aid;
             try {
-                const aunPath = process.env.AUN_HOME || path.join(os.homedir(), '.aun');
-                const agentMdPath = path.join(aunPath, 'AIDs', agent.aid, 'agent.md');
-                const content = fs.readFileSync(agentMdPath, 'utf-8');
+                const mdPath = agentMdPath(agent.aid);
+                const content = fs.readFileSync(mdPath, 'utf-8');
                 const nameMatch = content.match(/^name:\s*"?([^"\n]+)/m);
                 if (nameMatch)
                     agentName = nameMatch[1].trim().replace(/"$/, '');
@@ -636,14 +680,14 @@ async function main() {
                 continue; // 跳过同类型通道
             if (notified.has(otherType))
                 continue; // 同类型已通知过
-            const ownerId = agentRegistry.getOwner(other.adapter.channelName);
+            const ownerId = agentRegistry.getOwner(other.adapter.channelKey);
             if (!ownerId)
                 continue;
             notified.add(otherType);
-            const owningAgent = agentRegistry.resolveByChannel(other.adapter.channelName);
+            const owningAgent = agentRegistry.resolveByChannel(other.adapter.channelKey);
             const envelope = buildEnvelope({
                 taskId: `system-channel-down-${crypto.randomBytes(5).toString('hex')}`,
-                channel: other.adapter.channelName,
+                channel: other.adapter.channelKey,
                 channelId: ownerId,
                 agentName: owningAgent?.aid || 'evolclaw',
             });
@@ -734,10 +778,10 @@ async function main() {
                 const replyContext = pending.rootId
                     ? { replyToMessageId: pending.rootId, replyInThread: !!pending.threadId }
                     : undefined;
-                const owningAgent = agentRegistry.resolveByChannel(adapter.channelName);
+                const owningAgent = agentRegistry.resolveByChannel(adapter.channelKey);
                 const envelope = buildEnvelope({
                     taskId: `system-restart-${process.pid}`,
-                    channel: adapter.channelName,
+                    channel: adapter.channelKey,
                     channelId: pending.channelId,
                     agentName: owningAgent?.aid || 'evolclaw',
                     replyContext,
@@ -837,7 +881,7 @@ async function main() {
         const instances = await channelLoader.createForAgent(agent);
         for (const inst of instances) {
             registerChannelInstance(inst);
-            agent.channels.set(inst.adapter.channelName, inst.adapter);
+            agent.channels.set(inst.adapter.channelKey, inst.adapter);
             channelInstances.push(inst);
         }
         agent.status = 'running';

package/dist/paths.js

@@ -45,6 +45,16 @@ export function resolvePaths() {
         aidLogsDir: path.join(root, 'logs', 'aids'),
     };
 }
+// ── AID 路径（agent.md 存放在 $EVOLCLAW_HOME/AIDs/<aid>/）──
+export function aidsDir() {
+    return path.join(resolveRoot(), 'AIDs');
+}
+export function aidLocalDir(aid) {
+    return path.join(resolveRoot(), 'AIDs', aid);
+}
+export function agentMdPath(aid) {
+    return path.join(resolveRoot(), 'AIDs', aid, 'agent.md');
+}
 // ── per-agent 路径（参数化，不进 resolvePaths() 的固定 map）──
 export function agentDir(aid) {
     return path.join(resolveRoot(), 'agents', aid);
@@ -98,6 +108,31 @@ export function ensureDataDirs() {
     fs.mkdirSync(p.outboxDir, { recursive: true });
     fs.mkdirSync(p.eckDir, { recursive: true });
     fs.mkdirSync(eckDebugDir(), { recursive: true });
+    fs.mkdirSync(aidsDir(), { recursive: true });
+    migrateAgentMdFromAun();
+}
+/**
+ * One-time migration: copy agent.md from ~/.aun/AIDs/<aid>/ to $EVOLCLAW_HOME/AIDs/<aid>/
+ * if the new location doesn't have it yet.
+ */
+function migrateAgentMdFromAun() {
+    const aunAidsDir = path.join(os.homedir(), '.aun', 'AIDs');
+    const ecAids = aidsDir();
+    if (!fs.existsSync(aunAidsDir) || aunAidsDir === ecAids)
+        return;
+    try {
+        for (const entry of fs.readdirSync(aunAidsDir, { withFileTypes: true })) {
+            if (!entry.isDirectory())
+                continue;
+            const oldMd = path.join(aunAidsDir, entry.name, 'agent.md');
+            const newMd = path.join(ecAids, entry.name, 'agent.md');
+            if (fs.existsSync(oldMd) && !fs.existsSync(newMd)) {
+                fs.mkdirSync(path.join(ecAids, entry.name), { recursive: true });
+                fs.copyFileSync(oldMd, newMd);
+            }
+        }
+    }
+    catch { /* best-effort migration */ }
 }
 // ── kits 路径（始终从包内读取，不复制到 EVOLCLAW_HOME）──
 export function kitsDir() {

package/dist/utils/cross-platform.js

@@ -12,7 +12,8 @@ export const isWindows = process.platform === 'win32';
  *      C:\Users\project -> C--Users-project
  */
 export function encodePath(projectPath) {
-    return projectPath.replace(/[/\\:]/g, '-');
+    const normalized = projectPath.replace(/[/\\]+$/, '');
+    return normalized.replace(/[/\\:]/g, '-');
 }
 /**
  * Cross-platform process liveness check.

package/dist/utils/error-utils.js

@@ -245,27 +245,29 @@ export function isRetryableError(error) {
         return true;
     return false;
 }
-export function getErrorMessage(error, terminalReason) {
+export function getErrorMessage(error, terminalReason, includeEmoji = true) {
     // terminalReason 提供更精确的错误提示（SDK 0.2.100+）
     if (terminalReason) {
+        const prefix = includeEmoji ? '❌ ' : '';
+        const warnPrefix = includeEmoji ? '⚠️ ' : '';
         switch (terminalReason) {
             case 'max_turns':
-                return '❌ 任务达到最大轮次限制，请简化需求或分步执行';
+                return `${prefix}任务达到最大轮次限制，请简化需求或分步执行`;
             case 'prompt_too_long':
-                return '⚠️ 输入过长，请精简提问或使用 /compact 压缩上下文';
+                return `${warnPrefix}输入过长，请精简提问或使用 /compact 压缩上下文`;
             case 'rapid_refill_breaker':
-                return '⚠️ API 限流中，请稍后重试';
+                return `${warnPrefix}API 限流中，请稍后重试`;
             case 'context_compact_failed':
-                return '⚠️ 上下文过长，自动压缩失败，请手动输入 /compact 重试';
+                return `${warnPrefix}上下文过长，自动压缩失败，请手动输入 /compact 重试`;
             case 'model_error':
-                return '❌ 模型服务异常，请稍后重试';
+                return `${prefix}模型服务异常，请稍后重试`;
             case 'tool_error':
-                return '❌ 工具执行失败，请检查操作或重试';
+                return `${prefix}工具执行失败，请检查操作或重试`;
             case 'permission_denied':
-                return '❌ 权限被拒绝，操作已取消';
+                return `${prefix}权限被拒绝，操作已取消`;
             case 'aborted_streaming':
             case 'aborted_tools':
-                return '❌ 任务已中断';
+                return `${prefix}任务已中断`;
         }
     }
     // 回退到原有的错误消息匹配逻辑
@@ -275,15 +277,17 @@ export function getErrorMessage(error, terminalReason) {
     if (rule?.message)
         return rule.message;
     // 内置兜底规则（结构性错误）
+    const warnPrefix = includeEmoji ? '⚠️ ' : '';
+    const errPrefix = includeEmoji ? '❌ ' : '';
     if (msg.includes('CONTEXT_COMPACT_FAILED') || msg.includes('context_length_exceeded')
         || msg.includes('Context limit')) {
-        return '⚠️ 上下文过长，自动压缩失败，请手动输入 /compact 重试';
+        return `${warnPrefix}上下文过长，自动压缩失败，请手动输入 /compact 重试`;
     }
     if (msg.includes('401') || msg.includes('authentication_error')) {
-        return '❌ API Key 无效，请检查密钥配置。使用 /status 查看当前配置';
+        return `${errPrefix}API Key 无效，请检查密钥配置。使用 /status 查看当前配置`;
     }
     if (msg.includes('timeout')) {
-        return '⚠️ 请求超时，请重试';
+        return `${warnPrefix}请求超时，请重试`;
     }
-    return '❌ 处理消息时出错，请稍后重试';
+    return `${errPrefix}处理消息时出错，请稍后重试`;
 }

package/dist/utils/stats.js

@@ -1,3 +1,5 @@
+import fs from 'fs';
+import path from 'path';
 export class StatsCollector {
     events = [];
     startTime;
@@ -100,6 +102,71 @@ export class StatsCollector {
 export class AidStatsCollector {
     entries = new Map();
     queueStatsProvider;
+    /** sessionId → 当前正在跑该 session 的 agent，task:started 写入，task:completed/error 清除 */
+    sessionToAgent = new Map();
+    constructor(eventBus) {
+        if (!eventBus)
+            return;
+        eventBus.subscribe('task:started', (event) => {
+            const e = event;
+            if (e.agentName)
+                this.onTaskStart(e.agentName, e.encrypt, e.chatmode);
+            if (e.agentName && e.sessionId)
+                this.sessionToAgent.set(e.sessionId, e.agentName);
+        });
+        eventBus.subscribe('task:completed', (event) => {
+            const e = event;
+            if (e.agentName)
+                this.onTaskEnd(e.agentName, 'completed', undefined, e.finalText, e.numTurns);
+            if (e.sessionId)
+                this.sessionToAgent.delete(e.sessionId);
+        });
+        eventBus.subscribe('task:error', (event) => {
+            const e = event;
+            if (e.agentName)
+                this.onTaskEnd(e.agentName, 'error', e.errorType);
+            if (e.sessionId)
+                this.sessionToAgent.delete(e.sessionId);
+        });
+        // thought.put 次数 + 最后一次 thought 文本
+        // 注意：thought.put 是 fire-and-forget async，可能在 task:completed 之后才到达，
+        // 所以同时累加到 currentTask（task 进行中）或 lastTaskEnd（task 已结束但 thought 属于它）
+        eventBus.subscribe('message:thought-put', (event) => {
+            const e = event;
+            if (!e.agentName)
+                return;
+            const entry = this.entries.get(e.agentName);
+            if (!entry)
+                return;
+            if (entry.currentTaskStartAt != null) {
+                // task 进行中
+                entry.currentTaskThoughtPutCount++;
+                if (e.text)
+                    entry.currentTaskLastThoughtText = e.text;
+            }
+            else if (entry.lastTaskEnd) {
+                // task 已结束，回填到最近一次 task
+                entry.lastTaskEnd.thoughtPutCount++;
+                entry.lastTaskEnd.thoughtDuringTask = true;
+                if (e.text) {
+                    const t = e.text.length > 100 ? e.text.slice(0, 100) + '…' : e.text;
+                    entry.lastTaskEnd.lastThoughtText = t;
+                }
+            }
+        });
+        // 工具调用次数（tool:use 事件）
+        eventBus.subscribe('tool:use', (event) => {
+            const e = event;
+            if (!e.sessionId)
+                return;
+            const agent = this.sessionToAgent.get(e.sessionId);
+            if (!agent)
+                return;
+            const entry = this.entries.get(agent);
+            if (entry && entry.currentTaskStartAt != null)
+                entry.currentTaskToolUseCount++;
+        });
+    }
     setQueueStatsProvider(provider) {
         this.queueStatsProvider = provider;
     }
@@ -119,19 +186,145 @@ export class AidStatsCollector {
                 lastSentAt: null,
                 lastReceivedText: null,
                 lastReceivedFrom: null,
+                lastReceivedEncrypt: null,
+                lastReceivedChatmode: null,
                 lastSentText: null,
                 lastSentTo: null,
+                lastSentEncrypt: null,
+                lastSentChatmode: null,
                 uniquePeers: new Set(),
+                currentTaskStartAt: null,
+                currentTaskReplyCount: 0,
+                currentTaskThoughtPutCount: 0,
+                currentTaskToolUseCount: 0,
+                currentTaskNumTurns: 0,
+                currentTaskLastThoughtText: null,
+                currentTaskSessionId: null,
+                currentTaskChatmode: null,
+                currentTaskEncrypt: null,
+                lastTaskEnd: undefined,
             };
             this.entries.set(aid, entry);
         }
         return entry;
     }
+    sessionsDir;
+    setSessionsDir(dir) {
+        this.sessionsDir = dir;
+    }
+    onTaskStart(aid, encrypt, chatmode) {
+        const entry = this.getOrCreate(aid);
+        entry.currentTaskStartAt = Date.now();
+        entry.currentTaskReplyCount = 0;
+        entry.currentTaskThoughtPutCount = 0;
+        entry.currentTaskToolUseCount = 0;
+        entry.currentTaskNumTurns = 0;
+        entry.currentTaskLastThoughtText = null;
+        entry.currentTaskChatmode = chatmode ?? null;
+        entry.currentTaskEncrypt = encrypt ?? null;
+    }
+    onTaskEnd(aid, status, errorType, finalText, numTurns) {
+        const entry = this.getOrCreate(aid);
+        const startedAt = entry.currentTaskStartAt;
+        const taskEndTs = Date.now();
+        // 先用内存计数写入初始值（立即可用）
+        const buildTaskEnd = (msgCount, thoughtCount, lastThought) => ({
+            ts: taskEndTs,
+            status,
+            errorType,
+            sentDuringTask: msgCount > 0,
+            thoughtDuringTask: thoughtCount > 0,
+            lastThoughtText: lastThought,
+            replyCount: msgCount,
+            thoughtPutCount: thoughtCount,
+            toolUseCount: entry.currentTaskToolUseCount,
+            numTurns: numTurns ?? entry.currentTaskNumTurns,
+            finalText: finalText ? (finalText.length > 100 ? finalText.slice(0, 100) + '…' : finalText) : undefined,
+            chatmode: entry.currentTaskChatmode ?? undefined,
+            encrypt: entry.currentTaskEncrypt ?? undefined,
+        });
+        entry.lastTaskEnd = buildTaskEnd(entry.currentTaskReplyCount, entry.currentTaskThoughtPutCount, entry.currentTaskLastThoughtText ?? undefined);
+        // 500ms 后从 jsonl 重新统计（覆盖 thought.put 异步延迟问题）
+        if (this.sessionsDir && startedAt != null) {
+            const sessionsDir = this.sessionsDir;
+            const toolUseCount = entry.currentTaskToolUseCount;
+            const resolvedNumTurns = numTurns ?? entry.currentTaskNumTurns;
+            const chatmode = entry.currentTaskChatmode;
+            const encrypt = entry.currentTaskEncrypt;
+            setTimeout(() => {
+                try {
+                    const { chatDirPath } = require('../core/session/session-fs-store.js');
+                    // 找该 aid 下所有 peer 的 messages.jsonl，统计 ts >= startedAt 的出站条目
+                    const aidDir = path.join(sessionsDir, 'aun', aid.replace(/[/%\\:*?"<>|]/g, ch => '%' + ch.charCodeAt(0).toString(16).toUpperCase().padStart(2, '0')));
+                    if (!fs.existsSync(aidDir))
+                        return;
+                    let msgCount = 0, thoughtCount = 0;
+                    let lastThoughtText;
+                    let lastMsgText;
+                    for (const peerDir of fs.readdirSync(aidDir, { withFileTypes: true })) {
+                        if (!peerDir.isDirectory() || peerDir.name.startsWith('_'))
+                            continue;
+                        const msgFile = path.join(aidDir, peerDir.name, 'messages.jsonl');
+                        if (!fs.existsSync(msgFile))
+                            continue;
+                        const lines = fs.readFileSync(msgFile, 'utf-8').split('\n').filter(Boolean);
+                        for (const line of lines) {
+                            try {
+                                const rec = JSON.parse(line);
+                                if (rec.dir !== 'out' || rec.ts < startedAt || rec.ts > taskEndTs + 2000)
+                                    continue;
+                                if (rec.msgType === 'thought') {
+                                    thoughtCount++;
+                                    if (rec.content)
+                                        lastThoughtText = rec.content.length > 100 ? rec.content.slice(0, 100) + '…' : rec.content;
+                                }
+                                else if (rec.msgType === 'text') {
+                                    msgCount++;
+                                    if (rec.content)
+                                        lastMsgText = rec.content.length > 100 ? rec.content.slice(0, 100) + '…' : rec.content;
+                                }
+                            }
+                            catch { }
+                        }
+                    }
+                    const currentEntry = this.entries.get(aid);
+                    if (currentEntry?.lastTaskEnd?.ts === taskEndTs) {
+                        currentEntry.lastTaskEnd = {
+                            ts: taskEndTs,
+                            status,
+                            errorType,
+                            sentDuringTask: msgCount > 0,
+                            thoughtDuringTask: thoughtCount > 0,
+                            lastThoughtText: lastThoughtText,
+                            replyCount: msgCount,
+                            thoughtPutCount: thoughtCount,
+                            toolUseCount,
+                            numTurns: resolvedNumTurns,
+                            finalText: finalText ? (finalText.length > 100 ? finalText.slice(0, 100) + '…' : finalText) : undefined,
+                            chatmode: chatmode ?? undefined,
+                            encrypt: encrypt ?? undefined,
+                        };
+                        // 更新 lastSentText 为最后一条 msg（如果有）
+                        if (lastMsgText && msgCount > 0) {
+                            currentEntry.lastSentText = lastMsgText;
+                        }
+                    }
+                }
+                catch { }
+            }, 500);
+        }
+        entry.currentTaskStartAt = null;
+        entry.currentTaskReplyCount = 0;
+        entry.currentTaskThoughtPutCount = 0;
+        entry.currentTaskToolUseCount = 0;
+        entry.currentTaskNumTurns = 0;
+        entry.currentTaskLastThoughtText = null;
+    }
     setSelfName(aid, name) {
         const entry = this.getOrCreate(aid);
         entry.selfName = name;
     }
-    recordInbound(aid, fromPeer, byteLength, text, isSystem = false) {
+    recordInbound(aid, fromPeer, byteLength, text, isSystem = false, encrypt, chatmode) {
         const entry = this.getOrCreate(aid);
         if (isSystem) {
             entry.systemReceived++;
@@ -142,11 +335,15 @@ export class AidStatsCollector {
             entry.lastReceivedFrom = fromPeer;
             if (text)
                 entry.lastReceivedText = text.length > 100 ? text.slice(0, 100) + '…' : text;
+            if (encrypt != null)
+                entry.lastReceivedEncrypt = encrypt;
+            if (chatmode)
+                entry.lastReceivedChatmode = chatmode;
         }
         entry.bytesReceived += byteLength;
         entry.uniquePeers.add(fromPeer);
     }
-    recordOutbound(aid, toPeer, byteLength, text, isSystem = false) {
+    recordOutbound(aid, toPeer, byteLength, text, isSystem = false, encrypt, chatmode) {
         const entry = this.getOrCreate(aid);
         if (isSystem) {
             entry.systemSent++;
@@ -157,6 +354,18 @@ export class AidStatsCollector {
             entry.lastSentTo = toPeer;
             if (text)
                 entry.lastSentText = text.length > 100 ? text.slice(0, 100) + '…' : text;
+            if (encrypt != null)
+                entry.lastSentEncrypt = encrypt;
+            if (chatmode)
+                entry.lastSentChatmode = chatmode;
+            // 累计当前 task 的回复数
+            if (entry.currentTaskStartAt != null) {
+                entry.currentTaskReplyCount++;
+                if (chatmode)
+                    entry.currentTaskChatmode = chatmode;
+                if (encrypt != null)
+                    entry.currentTaskEncrypt = encrypt;
+            }
         }
         entry.bytesSent += byteLength;
         entry.uniquePeers.add(toPeer);
@@ -180,11 +389,16 @@ export class AidStatsCollector {
                 lastSentAt: entry.lastSentAt,
                 lastReceivedText: entry.lastReceivedText,
                 lastReceivedFrom: entry.lastReceivedFrom,
+                lastReceivedEncrypt: entry.lastReceivedEncrypt,
+                lastReceivedChatmode: entry.lastReceivedChatmode,
                 lastSentText: entry.lastSentText,
                 lastSentTo: entry.lastSentTo,
+                lastSentEncrypt: entry.lastSentEncrypt,
+                lastSentChatmode: entry.lastSentChatmode,
                 uniquePeerCount: entry.uniquePeers.size,
                 processing: queueStats.processing,
                 queued: queueStats.queued,
+                lastTaskEnd: entry.lastTaskEnd,
             });
         }
         return out;

package/kits/docs/INDEX.md

@@ -50,3 +50,9 @@
 | 路径注册表模板 | `eck_templates/path-registry.template.md` | 路径实例模板 |
 | 索引模板 | `eck_templates/INDEX.template.md` | agent 级索引模板 |
 | 指南模板 | `eck_templates/GUIDE.template.md` | agent 级查阅指南模板 |
+
+## Base Agent
+
+| 文档 | 路径 | 说明 |
+|------|------|------|
+| Claude Code 日志 | `baseagent/cc-logs.md` | CC 会话日志查阅（找完整对话/工具调用/注入） |

package/kits/docs/evolclaw/MSG_PRIVATE.md

@@ -1,25 +1,72 @@
 # 私聊消息命令
 
-<!-- TODO: 填充私聊消息命令详细参考 -->
-
 ## 发送消息
 
+### 以指定 AID 发送（首选）
+
+```bash
+# 明文
+ec msg send <from-aid> <to-aid> "<message>"
+
+# 密文（E2EE）
+ec msg send <from-aid> <to-aid> "<message>" --encrypt
+```
+
+### 发送文件
+
 ```bash
-evolclaw msg send <from-aid> <to-aid> "<message>"
+ec msg send <from-aid> <to-aid> --file <path>
+ec msg send <from-aid> <to-aid> --file <path> --as image
+ec msg send <from-aid> <to-aid> --file <path> --encrypt
 ```
 
+`--as` 可选值：`image` | `video` | `voice` | `file`（默认按扩展名推断）
+
 ## 拉取消息
 
 ```bash
-evolclaw msg pull <self-aid> --app <app-name>
+ec msg pull <self-aid> --app <app-name>
+ec msg pull <self-aid> --app <app-name> --after-seq <N> --limit <N>
+```
+
+## 确认消息已读
+
+```bash
+ec msg ack <self-aid> <seq> --app <app-name>
 ```
 
-## 确认消息
+`--app` 必须传，否则会污染 daemon 游标。
+
+## 撤回消息
 
 ```bash
-evolclaw msg ack <self-aid> --app <app-name> --seq <seq>
+ec msg recall <self-aid> <message-id>
+```
+
+## 查询在线状态
+
+```bash
+ec msg online <self-aid> <target-aid>
 ```
 
 ## 自主回复策略
 
 收到消息 ≠ 必须回复。是否回复、怎么回复、何时回复由 agent 自主决定。
+
+加密策略：
+- 对端发来密文消息时，回复也应使用 `--encrypt`（保持对话加密一致性）
+- 对端发来明文消息时，默认明文回复
+
+## 在当前会话中快速回复（备选）
+
+仅当无法使用 `ec msg send` 时（如不知道自己的 AID），可用 `ec ctl send`：
+
+```bash
+# 明文
+ec ctl send "<text>"
+
+# 密文
+ec ctl send --encrypt "<text>"
+```
+
+`ec ctl send` 自动继承当前会话的 AID 和对端，无需指定。