evolclaw 3.2.0 → 3.4.0

package/dist/utils/npm-ops.js

@@ -8,7 +8,7 @@
  */
 import fs from 'fs';
 import path from 'path';
-import { execFile } from 'child_process';
+import { execFile, execSync } from 'child_process';
 import { promisify } from 'util';
 import { getPackageRoot } from '../paths.js';
 import { isWindows } from './cross-platform.js';
@@ -92,6 +92,28 @@ export function getLocalVersion() {
     const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
     return pkg.version;
 }
+/**
+ * 解析全局安装包的已装版本（通过 `npm root -g` 定位全局 node_modules）。
+ * 用于 evolclaw-web 这类独立全局命令包——它们不在 evolclaw 的依赖树里。
+ * 未安装或查询失败返回 null。
+ */
+export function resolveGlobalPkg(pkgName) {
+    try {
+        // 命令完全静态（npm root -g，无用户输入），用 execSync 传完整命令字符串，
+        // 避免 "args 数组 + shell:true" 组合触发 Node DeprecationWarning，且无注入风险。
+        const npmCmd = isWindows ? 'npm.cmd' : 'npm';
+        const globalRoot = execSync(`${npmCmd} root -g`, {
+            encoding: 'utf-8', timeout: 10000,
+        }).trim();
+        const pkgPath = path.join(globalRoot, ...pkgName.split('/'), 'package.json');
+        if (fs.existsSync(pkgPath)) {
+            const data = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
+            return { version: data.version, path: pkgPath };
+        }
+    }
+    catch { /* not found */ }
+    return null;
+}
 /**
  * 查询 npm registry 上指定包的最新版本。
  * 使用 HTTP fetch 直接查 registry API，不依赖 npm CLI。
@@ -147,19 +169,20 @@ export async function tryUpgrade() {
     return { status: 'failed', from: localVer, to: remoteVer, error: lastError };
 }
 /**
- * AUN SDK 升级流程：检查 → 比较 → 安装
- * 仅在 SDK 已安装时检查升级，未安装则跳过。
+ * 通用全局包升级流程：检查 → 比较 → 安装（失败重试一次）。
+ * 仅在包已安装时检查升级，未安装则跳过（resolveFn 返回 null）。
+ * fastaun / evolclaw-web 等独立全局包共用此逻辑。
  */
-export async function tryUpgradeAunSdk(resolveAunCoreSdkPkg, AUN_CORE_SDK_PKG) {
+export async function tryUpgradeGlobalPkg(resolveInstalled, pkgName) {
     if (isLinkedInstall()) {
         return { status: 'skipped' };
     }
-    const installed = resolveAunCoreSdkPkg();
+    const installed = resolveInstalled();
     if (!installed) {
-        return { status: 'skipped' }; // SDK not installed, skip
+        return { status: 'skipped' }; // not installed, skip
     }
     const localVer = installed.version;
-    const remoteVer = await checkLatestVersion(AUN_CORE_SDK_PKG);
+    const remoteVer = await checkLatestVersion(pkgName);
     if (!remoteVer) {
         return { status: 'skipped', error: 'Failed to check remote version' };
     }
@@ -169,7 +192,7 @@ export async function tryUpgradeAunSdk(resolveAunCoreSdkPkg, AUN_CORE_SDK_PKG) {
     let lastError;
     for (let attempt = 0; attempt < 2; attempt++) {
         try {
-            await npmInstallGlobal(`${AUN_CORE_SDK_PKG}@latest`);
+            await npmInstallGlobal(`${pkgName}@latest`);
             return { status: 'upgraded', from: localVer, to: remoteVer };
         }
         catch (e) {
@@ -178,3 +201,10 @@ export async function tryUpgradeAunSdk(resolveAunCoreSdkPkg, AUN_CORE_SDK_PKG) {
     }
     return { status: 'failed', from: localVer, to: remoteVer, error: lastError };
 }
+/**
+ * AUN SDK 升级流程：检查 → 比较 → 安装
+ * 仅在 SDK 已安装时检查升级，未安装则跳过。
+ */
+export async function tryUpgradeAunSdk(resolveAunCoreSdkPkg, AUN_CORE_SDK_PKG) {
+    return tryUpgradeGlobalPkg(resolveAunCoreSdkPkg, AUN_CORE_SDK_PKG);
+}

package/dist/utils/stats.js

@@ -2,6 +2,8 @@ import fs from 'fs';
 import path from 'path';
 export class StatsCollector {
     events = [];
+    recentErrors = [];
+    MAX_RECENT_ERRORS = 50;
     startTime;
     HOUR_MS = 3_600_000;
     constructor(eventBus) {
@@ -17,7 +19,12 @@ export class StatsCollector {
         });
         eventBus.subscribe('task:error', (event) => {
             const e = event;
-            this.recordEvent({ type: 'error', timestamp: Date.now(), errorType: e.errorType, agentName: e.agentName });
+            const ts = Date.now();
+            this.recordEvent({ type: 'error', timestamp: ts, errorType: e.errorType, agentName: e.agentName });
+            this.recordRecentError({
+                ts, kind: 'task', agentName: e.agentName, errorType: e.errorType,
+                message: this.truncate(e.error),
+            });
         });
         eventBus.subscribe('task:interrupted', (event) => {
             const e = event;
@@ -26,10 +33,26 @@ export class StatsCollector {
         eventBus.subscribe('tool:result', (event) => {
             const e = event;
             if (e.isError) {
-                this.recordEvent({ type: 'tool-error', timestamp: Date.now(), toolName: e.toolName, agentName: e.agentName });
+                const ts = Date.now();
+                this.recordEvent({ type: 'tool-error', timestamp: ts, toolName: e.toolName, agentName: e.agentName });
+                this.recordRecentError({
+                    ts, kind: 'tool', agentName: e.agentName, toolName: e.toolName,
+                });
             }
         });
     }
+    truncate(s) {
+        if (!s)
+            return undefined;
+        const oneLine = String(s).replace(/\s+/g, ' ').trim();
+        return oneLine.length > 200 ? oneLine.slice(0, 200) + '…' : oneLine;
+    }
+    recordRecentError(err) {
+        this.recentErrors.unshift(err); // 新在前
+        if (this.recentErrors.length > this.MAX_RECENT_ERRORS) {
+            this.recentErrors.length = this.MAX_RECENT_ERRORS;
+        }
+    }
     recordEvent(record) {
         this.events.push(record);
     }
@@ -84,6 +107,10 @@ export class StatsCollector {
                     break;
             }
         }
+        // 最近错误：按 agent 过滤（与上面一致），取前 20 条
+        const recentErrors = (agentName === undefined
+            ? this.recentErrors
+            : this.recentErrors.filter(e => (e.agentName ?? '<unknown>') === agentName)).slice(0, 20);
         return {
             uptimeMs: now - this.startTime,
             lastHour: {
@@ -95,7 +122,8 @@ export class StatsCollector {
                 toolErrorsByName,
                 interrupts,
                 avgResponseMs: durationCount > 0 ? totalDuration / durationCount : 0
-            }
+            },
+            recentErrors,
         };
     }
 }
@@ -104,6 +132,8 @@ export class AidStatsCollector {
     queueStatsProvider;
     /** sessionId → 当前正在跑该 session 的 agent，task:started 写入，task:completed/error 清除 */
     sessionToAgent = new Map();
+    /** 外部注入的持久化回调（写入 message_events 表） */
+    onMessage;
     constructor(eventBus) {
         if (!eventBus)
             return;
@@ -128,6 +158,14 @@ export class AidStatsCollector {
             if (e.sessionId)
                 this.sessionToAgent.delete(e.sessionId);
         });
+        // 用户主动打断（新消息/​/stop/​撤回）：任务有自己的生命周期收尾，不计为 error
+        eventBus.subscribe('task:interrupted', (event) => {
+            const e = event;
+            if (e.agentName)
+                this.onTaskEnd(e.agentName, 'interrupted');
+            if (e.sessionId)
+                this.sessionToAgent.delete(e.sessionId);
+        });
         // thought.put 次数 + 最后一次 thought 文本
         // 注意：thought.put 是 fire-and-forget async，可能在 task:completed 之后才到达，
         // 所以同时累加到 currentTask（task 进行中）或 lastTaskEnd（task 已结束但 thought 属于它）
@@ -192,7 +230,10 @@ export class AidStatsCollector {
                 lastSentTo: null,
                 lastSentEncrypt: null,
                 lastSentChatmode: null,
+                lastReceivedKind: null,
+                lastSentKind: null,
                 uniquePeers: new Set(),
+                recentMessages: [],
                 currentTaskStartAt: null,
                 currentTaskReplyCount: 0,
                 currentTaskThoughtPutCount: 0,
@@ -324,7 +365,7 @@ export class AidStatsCollector {
         const entry = this.getOrCreate(aid);
         entry.selfName = name;
     }
-    recordInbound(aid, fromPeer, byteLength, text, isSystem = false, encrypt, chatmode) {
+    recordInbound(aid, fromPeer, byteLength, text, isSystem = false, encrypt, chatmode, kind = 'send') {
         const entry = this.getOrCreate(aid);
         if (isSystem) {
             entry.systemReceived++;
@@ -339,11 +380,24 @@ export class AidStatsCollector {
                 entry.lastReceivedEncrypt = encrypt;
             if (chatmode)
                 entry.lastReceivedChatmode = chatmode;
+            entry.lastReceivedKind = kind;
+            // ring buffer：最近 10 轮
+            if (text) {
+                entry.recentMessages.unshift({ dir: 'in', peer: fromPeer, text: text.slice(0, 100), ts: Date.now(), kind, encrypt: encrypt ?? null, chatmode: chatmode ?? null });
+                if (entry.recentMessages.length > 10)
+                    entry.recentMessages.pop();
+            }
         }
         entry.bytesReceived += byteLength;
         entry.uniquePeers.add(fromPeer);
+        // 持久化
+        this.onMessage?.({
+            ts: Date.now(), agent_aid: aid, peer_key: `aun#${fromPeer}`,
+            direction: 'in', msg_type: isSystem ? 'system' : 'private',
+            bytes: byteLength, encrypted: encrypt, chatmode,
+        });
     }
-    recordOutbound(aid, toPeer, byteLength, text, isSystem = false, encrypt, chatmode) {
+    recordOutbound(aid, toPeer, byteLength, text, isSystem = false, encrypt, chatmode, kind = 'send') {
         const entry = this.getOrCreate(aid);
         if (isSystem) {
             entry.systemSent++;
@@ -358,6 +412,13 @@ export class AidStatsCollector {
                 entry.lastSentEncrypt = encrypt;
             if (chatmode)
                 entry.lastSentChatmode = chatmode;
+            entry.lastSentKind = kind;
+            // ring buffer：最近 10 轮
+            if (text) {
+                entry.recentMessages.unshift({ dir: 'out', peer: toPeer, text: text.slice(0, 100), ts: Date.now(), kind, encrypt: encrypt ?? null, chatmode: chatmode ?? null });
+                if (entry.recentMessages.length > 10)
+                    entry.recentMessages.pop();
+            }
             // 累计当前 task 的回复数
             if (entry.currentTaskStartAt != null) {
                 entry.currentTaskReplyCount++;
@@ -369,13 +430,19 @@ export class AidStatsCollector {
         }
         entry.bytesSent += byteLength;
         entry.uniquePeers.add(toPeer);
+        // 持久化
+        this.onMessage?.({
+            ts: Date.now(), agent_aid: aid, peer_key: `aun#${toPeer}`,
+            direction: 'out', msg_type: isSystem ? 'system' : 'private',
+            bytes: byteLength, encrypted: encrypt, chatmode,
+        });
     }
     getAllSnapshots() {
         const out = [];
         for (const entry of this.entries.values()) {
             const queueStats = this.queueStatsProvider
                 ? this.queueStatsProvider(entry.aid)
-                : { processing: 0, queued: 0 };
+                : { processing: 0, queued: 0, muted: false };
             out.push({
                 aid: entry.aid,
                 selfName: entry.selfName,
@@ -395,9 +462,13 @@ export class AidStatsCollector {
                 lastSentTo: entry.lastSentTo,
                 lastSentEncrypt: entry.lastSentEncrypt,
                 lastSentChatmode: entry.lastSentChatmode,
+                lastReceivedKind: entry.lastReceivedKind,
+                lastSentKind: entry.lastSentKind,
                 uniquePeerCount: entry.uniquePeers.size,
                 processing: queueStats.processing,
                 queued: queueStats.queued,
+                muted: queueStats.muted,
+                recentMessages: entry.recentMessages,
                 lastTaskEnd: entry.lastTaskEnd,
             });
         }

package/kits/docs/evolclaw/INDEX.md

@@ -14,7 +14,8 @@
 | `ec msg` | 私聊收发消息 | 回复/发消息/拉取/撤回/查在线 | 有对端（peerId） | `msg.md` |
 | `ec group` | 群聊收发与群管理 | 群发/建群/邀请/踢人/退群/群成员 | 群聊（groupId） | `group.md` |
 | `ec aid` | AID 身份管理 | 身份/证书/名片/探测对端 | 任意有渠道场景 | `aid.md` |
-| `ec storage` | 文件存储 | 上传/下载/配额 | 任意有渠道场景 | `storage.md` |
+| `ec fs` | 网络文件系统（统一前端） | 上传/下载/看文件/列目录/分享/共享/挂载/配额 | 任意有渠道场景 | `fs.md`（架构全景 `fs-architecture.md`） |
+| `ec storage` | 文件存储（底层调试） | 上传/下载/配额 | 任意有渠道场景 | `storage.md` |
 | `ec agent` | EvolAgent 生命周期 | 创建/启停/热重载/改配置 | 管理员（owner/admin） | `agent.md` |
 | `ec rpc` | 底层 AUN RPC（逃生通道） | 直接调协议方法 | 高级/兜底 | `rpc.md` |
 
@@ -29,6 +30,7 @@
 | 命令集 | 用途 | 触发词 | 文档 |
 |--------|------|--------|------|
 | `ec model` | 模型管理（按作用域持久化） | 切模型/列模型/看当前/改强度 | `model.md` |
+| `ec stats` | Token 用量与费用统计 | 用量/费用/统计/预算/token/cost | `stats.md` |
 
 ## 开发者工具（非 agent 会话能力）