evolclaw-web 1.0.0 → 1.1.0

package/dist/index.js

@@ -3,7 +3,7 @@
  * ecweb — EvolClaw 监控面板独立程序。
  *
  * 用法:
- *   ecweb [--port 20030] [--home <EVOLCLAW_HOME>]
+ *   ecweb [--port 42705] [--home <EVOLCLAW_HOME>]
  *
  * 通过 EVOLCLAW_HOME 定位 evolclaw 数据目录，启动 HTTP+WS 服务，浏览器配对码登录。
  * 与 evolclaw daemon 通过 IPC socket（live 状态）+ 文件系统（历史数据）旁路通信。
@@ -22,7 +22,7 @@ for (let i = 0; i < argv.length; i++) {
     else if (a === '--home' || a === '-h')
         home = argv[++i];
     else if (a === '--help') {
-        process.stdout.write(`ecweb — EvolClaw 监控面板\n\n用法:\n  ecweb [--port 20030] [--home <EVOLCLAW_HOME>]\n\n选项:\n  --port, -p   监听端口（默认 20030，占用则自动 +1）\n  --home       EVOLCLAW_HOME 数据目录（默认读环境变量或 ~/.evolclaw）\n`);
+        process.stdout.write(`ecweb — EvolClaw 监控面板\n\n用法:\n  ecweb [--port 42705] [--home <EVOLCLAW_HOME>]\n\n选项:\n  --port, -p   监听端口（默认 42705，占用则自动 +1）\n  --home       EVOLCLAW_HOME 数据目录（默认读环境变量或 ~/.evolclaw）\n`);
         process.exit(0);
     }
 }
@@ -73,7 +73,7 @@ const killedWebs = cleanupWatchWebs();
 for (const r of killedWebs)
     logLine(`${YELLOW}↺ 已清理旧 watch 进程 PID ${r.pid}（端口 ${r.port}）${RST}`);
 // 2) 兜底：按端口杀掉 instance 文件已丢失的孤儿进程（杀不掉的僵尸）
-const WATCH_WEB_PORT = port ?? 20030;
+const WATCH_WEB_PORT = port ?? 42705;
 const killedByPort = cleanupWatchWebByPort(WATCH_WEB_PORT);
 for (const pid of killedByPort)
     logLine(`${YELLOW}↺ 已强占端口 ${WATCH_WEB_PORT}：杀掉占用进程 PID ${pid}${RST}`);
@@ -110,8 +110,16 @@ if (handle.displaced) {
 }
 process.stdout.write(`\n  ${DIM}绑定 0.0.0.0，远程可访问。Ctrl-C 退出。${RST}\n`);
 process.stdout.write(`  ${DIM}调试日志: ${logFile}${RST}\n\n`);
+let cleaningUp = false;
 const cleanup = () => {
+    if (cleaningUp)
+        return; // 幂等：raw 模式下连按 Ctrl-C/q 不应重复触发
+    cleaningUp = true;
+    logLine(`${YELLOW}退出中…${RST}`);
     removeWatchWeb();
+    // 兜底：close() 万一卡住也强制退出，避免进程挂死
+    const force = setTimeout(() => process.exit(0), 2000);
+    force.unref();
     handle.close().finally(() => process.exit(0));
 };
 process.on('exit', () => removeWatchWeb());
@@ -123,7 +131,6 @@ if (process.stdin.isTTY) {
     process.stdin.on('data', (key) => {
         // Ctrl-C (0x03) 或 q 退出
         if (key[0] === 0x03 || key.toString() === 'q') {
-            logLine(`${YELLOW}退出中…${RST}`);
             cleanup();
         }
     });

package/dist/server.js

@@ -20,13 +20,30 @@ import { setDebugLog, dlog } from './debug-log.js';
 import { aidSource } from './sources/aid.js';
 import { msgSource } from './sources/msg.js';
 import { sessionSource } from './sources/session.js';
+import { cacheSource } from './sources/cache.js';
+import { systemSource } from './sources/system.js';
+import { triggersSource } from './sources/triggers.js';
+import { queryStatsForDashboard, queryStatsExplorer, queryStatsByPeer, queryStatsByAgent, queryStatsOverview } from './sources/stats.js';
+import { getSessionsAunDir, listLocalAids, listPeers, readMessages } from './fs-utils.js';
+import { ccProjectsDir } from './paths.js';
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const STATIC_DIR = path.join(__dirname, 'static');
 const TOKEN_TTL_MS = 24 * 60 * 60 * 1000; // 24h
 const PAIRING_TTL_MS = 5 * 60 * 1000; // 5min
-const DEFAULT_PORT = 20030;
+const DEFAULT_PORT = 42705;
 const PROTOCOL_VERSION = 1; // 与 evolclaw ping response 对齐的软校验版本
-const SOURCES = { aid: aidSource, msg: msgSource, session: sessionSource };
+const SOURCES = { agents: aidSource, msg: msgSource, session: sessionSource, cache: cacheSource, system: systemSource, triggers: triggersSource };
+// ECWeb 自身版本：渲染 System 页时随快照下发（不走 daemon IPC，ECWeb 就是这个进程）。
+function readEcwebVersion() {
+    try {
+        const pkg = JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'package.json'), 'utf-8'));
+        return pkg?.version ?? '0.0.0';
+    }
+    catch {
+        return '0.0.0';
+    }
+}
+const ECWEB_VERSION = readEcwebVersion();
 const MIME = {
     '.html': 'text/html; charset=utf-8',
     '.js': 'text/javascript; charset=utf-8',
@@ -108,12 +125,116 @@ function parseUrl(rawUrl) {
     }
     return { path: rawUrl.slice(0, qIdx), query };
 }
+function handleStatsApi(req, res) {
+    const { path: urlPath, query } = parseUrl(req.url || '');
+    res.setHeader('Content-Type', 'application/json');
+    if (urlPath === '/api/stats/dashboard') {
+        const data = queryStatsForDashboard();
+        if (!data) {
+            res.writeHead(503);
+            res.end(JSON.stringify({ error: 'stats unavailable (node:sqlite missing or no data)' }));
+        }
+        else {
+            res.writeHead(200);
+            res.end(JSON.stringify(data));
+        }
+    }
+    else if (urlPath === '/api/stats/explorer') {
+        const params = {};
+        if (query.from)
+            params.from_ts = Number(query.from);
+        if (query.to)
+            params.to_ts = Number(query.to);
+        if (query.agent)
+            params.agent_aid = query.agent;
+        if (query.peer)
+            params.peer_key = query.peer;
+        if (query.model)
+            params.model = query.model;
+        if (query.granularity)
+            params.granularity = query.granularity;
+        const data = queryStatsExplorer(params);
+        res.writeHead(200);
+        res.end(JSON.stringify(data));
+    }
+    else if (urlPath === '/api/stats/peers') {
+        const params = {};
+        if (query.from)
+            params.from_ts = Number(query.from);
+        if (query.to)
+            params.to_ts = Number(query.to);
+        if (query.agent)
+            params.agent_aid = query.agent;
+        if (query.limit)
+            params.limit = Number(query.limit);
+        const data = queryStatsByPeer(params);
+        res.writeHead(200);
+        res.end(JSON.stringify(data));
+    }
+    else if (urlPath === '/api/stats/agents') {
+        const params = {};
+        if (query.from)
+            params.from_ts = Number(query.from);
+        if (query.to)
+            params.to_ts = Number(query.to);
+        if (query.limit)
+            params.limit = Number(query.limit);
+        const data = queryStatsByAgent(params);
+        res.writeHead(200);
+        res.end(JSON.stringify(data));
+    }
+    else if (urlPath === '/api/stats/overview') {
+        const tokenStats = queryStatsOverview();
+        // session count: scan all CC project dirs
+        let sessionCount = 0;
+        try {
+            const base = ccProjectsDir();
+            for (const d of fs.readdirSync(base, { withFileTypes: true })) {
+                if (!d.isDirectory())
+                    continue;
+                try {
+                    sessionCount += fs.readdirSync(path.join(base, d.name)).filter(f => f.endsWith('.jsonl')).length;
+                }
+                catch { }
+            }
+        }
+        catch { }
+        // message counts: scan aun dir
+        let msgIn = 0, msgOut = 0;
+        try {
+            const aunDir = getSessionsAunDir();
+            for (const aid of listLocalAids(aunDir)) {
+                for (const peer of listPeers(aunDir, aid)) {
+                    for (const m of readMessages(aunDir, aid, peer)) {
+                        if (m.dir === 'in')
+                            msgIn++;
+                        else
+                            msgOut++;
+                    }
+                }
+            }
+        }
+        catch { }
+        res.writeHead(200);
+        res.end(JSON.stringify({ token_stats: tokenStats, session_count: sessionCount, msg_in: msgIn, msg_out: msgOut }));
+    }
+    else {
+        res.writeHead(404);
+        res.end(JSON.stringify({ error: 'not found' }));
+    }
+}
 function clientIp(req) {
     const fwd = req.headers['x-forwarded-for'];
     if (typeof fwd === 'string' && fwd)
         return fwd.split(',')[0].trim();
     return req.socket.remoteAddress || '?';
 }
+// 仅 localhost 可访问（取配对码）：直连 socket 地址必须是回环。
+// 不信任 x-forwarded-for（代理头可伪造），只看真实 TCP 来源。
+function isLocalhost(req) {
+    const addr = req.socket.remoteAddress || '';
+    return addr === '127.0.0.1' || addr === '::1' || addr === '::ffff:127.0.0.1';
+}
 function genPairingCode() {
     return String(crypto.randomInt(0, 1000000)).padStart(6, '0');
 }
@@ -173,15 +294,17 @@ function handleConnection(ws, req, log) {
             send({ type: 'error', message: `unknown view: ${view}` });
             return;
         }
+        // System 视图：把 ECWeb 自身版本合并进快照（前端版本卡用）
+        const decorate = (data) => (view === 'system' && data ? { ...data, ecwebVersion: ECWEB_VERSION } : data);
         try {
-            send({ type: 'snapshot', view, data: await source.snapshot(params) });
+            send({ type: 'snapshot', view, data: decorate(await source.snapshot(params)) });
         }
         catch (e) {
             send({ type: 'error', message: `snapshot failed: ${e?.message || e}` });
         }
         unsubscribe = source.subscribe(params, (data) => {
             if (currentView === view)
-                send({ type: 'delta', view, data });
+                send({ type: 'delta', view, data: decorate(data) });
         });
     };
     ws.on('message', async (raw) => {
@@ -206,11 +329,43 @@ function handleConnection(ws, req, log) {
                 params.sessionId = msg.sessionId;
             if (msg.project)
                 params.project = msg.project;
+            if (msg.agent)
+                params.agent = msg.agent;
             dlog(`▸ 订阅 ${msg.view}${msg.aid ? ` aid=${String(msg.aid).split('.')[0]}` : ''}${msg.peer ? ` peer=${String(msg.peer).split('.')[0]}` : ''}${msg.sessionId ? ` session=${String(msg.sessionId).slice(0, 8)}` : ''} from ${ip}`);
             await switchSubscription(msg.view, params);
+            return;
+        }
+        if (msg.type === 'menu' && msg.payload) {
+            const p = resolvePaths();
+            const resp = await ipcQuery(p.socket, { type: 'menu.exec', payload: msg.payload }, 5000);
+            if (resp?.ok) {
+                send({ type: 'menu.response', requestId: msg.requestId, data: resp.response });
+            }
+            else {
+                send({ type: 'menu.response', requestId: msg.requestId, data: {
+                        type: 'menu.response', id: msg.payload?.id ?? '',
+                        error: { code: 'INTERNAL', message: resp?.error ?? 'daemon unreachable' },
+                    } });
+            }
+            return;
         }
     });
-    ws.on('close', () => { if (unsubscribe) {
+    // NAT keepalive: ping every 25s to prevent middlebox from cutting the connection
+    let alive = true;
+    const heartbeat = setInterval(() => {
+        if (ws.readyState !== ws.OPEN) {
+            clearInterval(heartbeat);
+            return;
+        }
+        if (!alive) {
+            ws.terminate();
+            return;
+        }
+        alive = false;
+        ws.ping();
+    }, 25000);
+    ws.on('pong', () => { alive = true; });
+    ws.on('close', () => { clearInterval(heartbeat); if (unsubscribe) {
         unsubscribe();
         unsubscribe = null;
     } log(`◇ WS 断开 from ${ip}`); });
@@ -255,6 +410,12 @@ export async function startWatchWebServer(opts = {}) {
     }
     const server = http.createServer((req, res) => {
         if (req.method === 'GET' && (req.url || '') === '/api/pair-code') {
+            // 仅 localhost 可取码：远程浏览器拿不到，必须由同机的 `ec watch web` 显示给用户
+            if (!isLocalhost(req)) {
+                res.writeHead(403, { 'Content-Type': 'application/json' });
+                res.end(JSON.stringify({ error: 'forbidden' }));
+                return;
+            }
             const { code, expiresAt } = freshPairing();
             res.writeHead(200, { 'Content-Type': 'application/json' });
             res.end(JSON.stringify({ code, expiresAt }));
@@ -262,6 +423,19 @@ export async function startWatchWebServer(opts = {}) {
         else if (req.method === 'POST' && (req.url || '').startsWith('/api/pair')) {
             handlePair(req, res, pairingCode, pairingExpiry, log);
         }
+        else if (req.method === 'GET' && (req.url || '').startsWith('/api/stats/')) {
+            // Stats API — requires auth
+            const authHeader = req.headers.authorization || '';
+            const bearerToken = authHeader.startsWith('Bearer ') ? authHeader.slice(7) : '';
+            const { query } = parseUrl(req.url || '');
+            const token = bearerToken || query.token || '';
+            if (!validateAndRenew(token, Date.now())) {
+                res.writeHead(401, { 'Content-Type': 'application/json' });
+                res.end(JSON.stringify({ error: 'unauthorized' }));
+                return;
+            }
+            handleStatsApi(req, res);
+        }
         else {
             serveStatic(req, res);
         }
@@ -287,13 +461,20 @@ export async function startWatchWebServer(opts = {}) {
         pairingCode,
         close() {
             return new Promise((resolve) => {
+                // 强制断开所有 WS 客户端（graceful close 握手可能永不完成）
                 for (const client of wss.clients)
                     try {
-                        client.close();
+                        client.terminate();
                     }
                     catch { }
                 wss.close();
+                // server.close() 仅停止接受新连接，会等待存量连接（含 HTTP keep-alive、已升级的 WS）排空，
+                // 否则回调永不触发 → 进程挂起。Node 18.2+ 用 closeAllConnections() 强制关闭。
                 server.close(() => resolve());
+                try {
+                    server.closeAllConnections();
+                }
+                catch { }
             });
         },
     };

package/dist/sources/aid.js

@@ -92,7 +92,7 @@ async function buildSnapshot() {
     };
 }
 export const aidSource = {
-    kind: 'aid',
+    kind: 'agents',
     async snapshot() {
         return buildSnapshot();
     },

package/dist/sources/cache.js

@@ -0,0 +1,43 @@
+/**
+ * Cache 数据源 — daemon 统一 FileCache 的运行统计（命中率/读盘/驱逐/失效）。
+ *
+ * 复用 daemon 的 IPC socket：拉 `cache-stats`（只读）。IPC 无推送，
+ * 故 1s 轮询 + JSON diff，仅在变化时 push（与 aidSource 同款）。
+ * daemon 未运行（ipcQuery 返回 null）→ { daemonRunning:false, stats:null }。
+ */
+import { resolvePaths } from '../paths.js';
+import { ipcQuery } from '../ipc-client.js';
+async function buildSnapshot() {
+    const p = resolvePaths();
+    const resp = await ipcQuery(p.socket, { type: 'cache-stats' });
+    if (resp === null || !resp.ok) {
+        // daemon 离线，或旧 daemon 不认识 cache-stats（回 {error:...}，ok 为 undefined）
+        return { daemonRunning: resp !== null, supported: !!resp?.ok, stats: null };
+    }
+    return { daemonRunning: true, supported: true, stats: resp.stats };
+}
+export const cacheSource = {
+    kind: 'cache',
+    async snapshot() {
+        return buildSnapshot();
+    },
+    subscribe(_params, push) {
+        let lastJson = '';
+        let stopped = false;
+        const tick = async () => {
+            if (stopped)
+                return;
+            try {
+                const snap = await buildSnapshot();
+                const json = JSON.stringify(snap);
+                if (json !== lastJson) {
+                    lastJson = json;
+                    push(snap);
+                }
+            }
+            catch { /* ignore transient IPC errors */ }
+        };
+        const timer = setInterval(tick, 1000);
+        return () => { stopped = true; clearInterval(timer); };
+    },
+};

package/dist/sources/control.js

@@ -0,0 +1,58 @@
+/**
+ * Control 数据源 — 通过 daemon IPC 的 menu.exec 代理拉取 menu.* 当前状态。
+ *
+ * snapshot: 一批 menu.list + menu.query（各 name 当前值）+ menu.options（列表类）。
+ * subscribe: 1s 轮询 + JSON diff，仅变化时 push（IPC 无推送，与 aid.ts 同款）。
+ *
+ * 写操作（update/action）不走这里——浏览器经 WS `menu` 消息直发，requestId 配对响应。
+ */
+import { resolvePaths } from '../paths.js';
+import { ipcQuery } from '../ipc-client.js';
+// 支持 query 当前值的 name
+const QUERY_NAMES = ['system', 'pwd', 'baseagent', 'model', 'effort',
+    'chatmode', 'permission', 'activity', 'dispatch', 'session'];
+// 列表类（options）
+const OPTIONS_NAMES = ['session', 'agent', 'trigger'];
+async function menuExec(payload) {
+    const p = resolvePaths();
+    const r = await ipcQuery(p.socket, { type: 'menu.exec', payload }, 5000);
+    return r?.ok ? r.response : null;
+}
+async function buildSnapshot() {
+    const [listResp, ...queryResps] = await Promise.all([
+        menuExec({ type: 'menu.list', id: 'ctrl-list' }),
+        ...QUERY_NAMES.map((name, i) => menuExec({ type: 'menu.query', id: `ctrl-q-${i}`, name })),
+    ]);
+    const optResps = await Promise.all(OPTIONS_NAMES.map((name, i) => menuExec({ type: 'menu.options', id: `ctrl-o-${i}`, name })));
+    const daemonRunning = listResp !== null;
+    const queries = {};
+    QUERY_NAMES.forEach((name, i) => { queries[name] = queryResps[i]; });
+    const options = {};
+    OPTIONS_NAMES.forEach((name, i) => { options[name] = optResps[i]; });
+    return { daemonRunning, list: listResp, queries, options };
+}
+export const controlSource = {
+    kind: 'control',
+    async snapshot() {
+        return buildSnapshot();
+    },
+    subscribe(_params, push) {
+        let lastJson = '';
+        let stopped = false;
+        const tick = async () => {
+            if (stopped)
+                return;
+            try {
+                const snap = await buildSnapshot();
+                const json = JSON.stringify(snap);
+                if (json !== lastJson) {
+                    lastJson = json;
+                    push(snap);
+                }
+            }
+            catch { /* ignore transient IPC errors */ }
+        };
+        const timer = setInterval(tick, 1000);
+        return () => { stopped = true; clearInterval(timer); };
+    },
+};

package/dist/sources/session.js

@@ -259,6 +259,7 @@ function readTranscriptFile(file) {
         return empty;
     }
     const turns = [];
+    const counts = { userInput: 0, modelOutput: 0, toolCall: 0, toolResult: 0, msgSend: 0 };
     let inTok = 0, outTok = 0, model = '', branch = '', version = '', title = '', cwd = '', userMsgs = 0, totalMsgs = 0, contextTokens = 0, costUsd = 0, lastUsageKey = '';
     for (const line of raw.split('\n')) {
         if (!line.trim())
@@ -304,12 +305,45 @@ function readTranscriptFile(file) {
             if (o.message.model)
                 model = o.message.model;
         }
-        // 简化：turns 仅记录必要字段（省略完整 block 解析）
-        if (o.type === 'user' || o.type === 'assistant')
-            turns.push({ role: o.type, ts: o.timestamp ? Date.parse(o.timestamp) : 0, uuid: o.uuid });
+        if (o.type === 'user' || o.type === 'assistant') {
+            const content = o.message?.content;
+            const arr = typeof content === 'string' ? [{ type: 'text', text: content }] : (Array.isArray(content) ? content : []);
+            const blocks = [];
+            let hasToolUse = false, hasToolResult = false;
+            for (const item of arr) {
+                if (!item || typeof item !== 'object')
+                    continue;
+                if (item.type === 'text' && item.text) {
+                    blocks.push({ kind: 'text', text: item.text });
+                }
+                else if (item.type === 'thinking' && item.thinking) {
+                    blocks.push({ kind: 'thinking', text: item.thinking });
+                }
+                else if (item.type === 'tool_use') {
+                    const inputStr = item.input ? JSON.stringify(item.input, null, 2) : '';
+                    blocks.push({ kind: 'tool_use', name: item.name || '', input: item.input || {}, inputStr });
+                    hasToolUse = true;
+                }
+                else if (item.type === 'tool_result') {
+                    const c = item.content;
+                    const text = typeof c === 'string' ? c : (Array.isArray(c) ? c.filter((x) => x?.type === 'text').map((x) => x.text).join('\n') : '');
+                    blocks.push({ kind: 'tool_result', text, isError: !!item.is_error });
+                    hasToolResult = true;
+                }
+            }
+            let category;
+            if (o.type === 'user') {
+                category = hasToolResult ? 'tool_result' : 'user_input';
+            }
+            else {
+                category = hasToolUse ? 'tool_call' : 'model_output';
+            }
+            counts[category === 'user_input' ? 'userInput' : category === 'model_output' ? 'modelOutput' : category === 'tool_call' ? 'toolCall' : 'toolResult']++;
+            turns.push({ role: o.type, ts: o.timestamp ? Date.parse(o.timestamp) : 0, uuid: o.uuid, category, blocks });
+        }
     }
     const shown = turns.length > 500 ? turns.slice(-500) : turns;
-    return { turns: shown, totalTurns: turns.length, userMsgs, totalMsgs, counts: { userInput: 0, modelOutput: 0, toolCall: 0, toolResult: 0, msgSend: 0 }, inputTokens: inTok, outputTokens: outTok, contextTokens, costUsd, model, gitBranch: branch, version, title, cwd };
+    return { turns: shown, totalTurns: turns.length, userMsgs, totalMsgs, counts, inputTokens: inTok, outputTokens: outTok, contextTokens, costUsd, model, gitBranch: branch, version, title, cwd };
 }
 function buildSnapshot(params) {
     const projects = listProjects();