evolclaw-web 1.0.0 → 1.0.1

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

@@ -24,7 +24,7 @@ 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 MIME = {
@@ -210,7 +210,22 @@ function handleConnection(ws, req, log) {
             await switchSubscription(msg.view, params);
         }
     });
-    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}`); });
@@ -287,13 +302,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/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();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "evolclaw-web",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Web-based monitoring dashboard for EvolClaw",
   "type": "module",
   "bin": {
@@ -13,7 +13,11 @@
     "build": "tsc && chmod +x dist/index.js && cp -r src/static dist/",
     "prepublishOnly": "npm run build"
   },
-  "keywords": ["evolclaw", "monitoring", "debug"],
+  "keywords": [
+    "evolclaw",
+    "monitoring",
+    "debug"
+  ],
   "author": "",
   "license": "MIT",
   "peerDependencies": {