ec-web 0.0.19 → 0.0.20

package/dist/index.js

@@ -33,6 +33,11 @@ if (home)
 const { resolvePaths } = await import('./paths.js');
 const { startWatchWebServer } = await import('./server.js');
 const p = resolvePaths();
+// 统一行为：无论是 supervisor 启动（已设 env）还是手动启动（未设 env），
+// 都确保 EVOLCORE_HOME 环境变量存在，让所有依赖 env 的模块（如 ipc-client）行为一致
+if (!process.env.EVOLCORE_HOME) {
+    process.env.EVOLCORE_HOME = p.root;
+}
 // 校验 home 目录存在
 if (!fs.existsSync(p.root)) {
     process.stderr.write(`❌ EVOLCORE_HOME 不存在: ${p.root}\n   用 --home 指定正确路径，或设置 EVOLCORE_HOME 环境变量。\n`);

package/dist/ipc-client.js

@@ -17,10 +17,23 @@ export function ipcQuery(socketPath, cmd, timeoutMs = 3000) {
     let request = cmd;
     if (LOCAL_CONTROL_COMMANDS.has(cmd.type) && typeof cmd.controlToken !== 'string') {
         try {
-            const tokenPath = process.platform === 'win32'
-                ? path.join(process.env.EVOLCORE_HOME || '', 'data', 'instance', 'control.token')
-                : path.join(path.dirname(socketPath), 'control.token');
-            const controlToken = fs.readFileSync(tokenPath, 'utf8').trim();
+            // 入口会设置 EVOLCORE_HOME；保留 socket 旁路回退，便于独立调用和
+            // 旧版本地布局继续完成受保护 IPC 查询。
+            const tokenPaths = [
+                ...(process.env.EVOLCORE_HOME
+                    ? [path.join(process.env.EVOLCORE_HOME, 'data', 'instance', 'control.token')]
+                    : []),
+                path.join(path.dirname(socketPath), 'control.token'),
+            ];
+            let controlToken = '';
+            for (const tokenPath of tokenPaths) {
+                try {
+                    controlToken = fs.readFileSync(tokenPath, 'utf8').trim();
+                    if (controlToken)
+                        break;
+                }
+                catch { }
+            }
             if (controlToken)
                 request = { ...cmd, controlToken };
         }

package/dist/sources/aid.js

@@ -2,14 +2,14 @@
  * AID 数据源 — 复用 daemon 的 IPC socket（与 evolcore `watch aid` 同源）。
  *
  * daemon 运行时：拉 aun-aids / aun-aid-stats / agent-stats / status / evolagent.list。
- * daemon 未运行时：降级到读 instance/ 目录的 aid-*.jsonl（精简版 scanInstances）。
+ * daemon IPC 连续不可达时：降级到读 instance/ 目录的 aid-*.jsonl（精简版 scanInstances）。
  * IPC 无推送能力，故 1s 轮询 + JSON diff，仅在变化时 push。
  */
 import fs from 'fs';
 import path from 'path';
 import { resolvePaths } from '../paths.js';
 import { ipcQuery } from '../ipc-client.js';
-/** 精简版实例扫描：仅在 daemon 离线时降级用，读各 alive main 进程的 aid 活动日志 */
+/** 精简版实例扫描：仅在 daemon IPC 不可达时降级用，读各 alive main 进程的 aid 活动日志 */
 function scanAidActivity() {
     const result = new Map();
     const dir = resolvePaths().instanceDir;
@@ -81,7 +81,7 @@ async function fetchVersion(socket) {
         return null;
     }
 }
-async function buildSnapshot() {
+async function buildSnapshot(fallback = null) {
     const p = resolvePaths();
     const [aidsResp, statsResp, agentStatsResp, statusResp, agentsResp, version] = await Promise.all([
         ipcQuery(p.socket, { type: 'aun-aids' }),
@@ -91,7 +91,10 @@ async function buildSnapshot() {
         ipcQuery(p.socket, { type: 'evolagent.list' }),
         fetchVersion(p.socket),
     ]);
-    const daemonRunning = aidsResp !== null || statusResp !== null;
+    // 任一只读命令能返回就说明 IPC/daemon 仍可达。慢主机上某个较重的
+    // 统计命令单独超时，不应把整个 Agent 页面判成离线。
+    const daemonRunning = [aidsResp, statsResp, agentStatsResp, statusResp, agentsResp]
+        .some((response) => response !== null);
     if (!daemonRunning) {
         const activity = scanAidActivity();
         const aids = Array.from(activity.entries()).map(([aid, info]) => ({
@@ -102,38 +105,105 @@ async function buildSnapshot() {
         }));
         return { daemonRunning: false, aids, stats: [], agents: [] };
     }
+    const previous = fallback?.daemonRunning ? fallback : null;
     return {
         daemonRunning: true,
-        aids: aidsResp?.aids ?? [],
-        stats: statsResp?.stats ?? [],
-        agentStats: agentStatsResp?.stats ?? [],
-        status: statusResp ?? null,
-        agents: agentsResp?.agents ?? [],
-        version: version ?? null,
+        aids: Array.isArray(aidsResp?.aids) ? aidsResp.aids : (previous?.aids ?? []),
+        stats: Array.isArray(statsResp?.stats) ? statsResp.stats : (previous?.stats ?? []),
+        agentStats: Array.isArray(agentStatsResp?.stats) ? agentStatsResp.stats : (previous?.agentStats ?? []),
+        status: statusResp !== null ? statusResp : (previous?.status ?? null),
+        agents: Array.isArray(agentsResp?.agents) ? agentsResp.agents : (previous?.agents ?? []),
+        version: version ?? previous?.version ?? null,
     };
 }
+const AID_POLL_INTERVAL_MS = 1000;
+const DAEMON_FAILURE_THRESHOLD = 3;
+// IPC 查询是整页共享的：每个浏览器标签页各自发起一组查询会在慢主机上
+// 形成请求堆积。共享 promise 还可以让初始 snapshot 和轮询复用同一轮结果。
+const subscribers = new Set();
+let pollTimer = null;
+let pollInFlight = null;
+let lastSuccessfulSnapshot = null;
+let lastResolvedSnapshot = null;
+let consecutiveDaemonFailures = 0;
+async function readStableSnapshot() {
+    if (!pollInFlight) {
+        pollInFlight = (async () => {
+            let snapshot;
+            try {
+                snapshot = await buildSnapshot(lastSuccessfulSnapshot);
+            }
+            catch {
+                snapshot = { daemonRunning: false, aids: [], stats: [], agentStats: [], agents: [] };
+            }
+            if (snapshot?.daemonRunning) {
+                consecutiveDaemonFailures = 0;
+                lastSuccessfulSnapshot = snapshot;
+                lastResolvedSnapshot = snapshot;
+                return snapshot;
+            }
+            consecutiveDaemonFailures += 1;
+            // 单轮 IPC 超时不代表 daemon 已停止。保留最近一次成功数据，直到
+            // 连续多轮都失败，避免页面在慢主机上反复清空和恢复。
+            if (lastSuccessfulSnapshot && consecutiveDaemonFailures < DAEMON_FAILURE_THRESHOLD) {
+                lastResolvedSnapshot = lastSuccessfulSnapshot;
+                return lastSuccessfulSnapshot;
+            }
+            lastResolvedSnapshot = snapshot;
+            return snapshot;
+        })().finally(() => {
+            pollInFlight = null;
+        });
+    }
+    return pollInFlight;
+}
+function notifySubscribers(snapshot) {
+    const json = JSON.stringify(snapshot);
+    for (const subscriber of subscribers) {
+        if (json === subscriber.lastJson)
+            continue;
+        subscriber.lastJson = json;
+        try {
+            subscriber.push(snapshot);
+        }
+        catch { /* subscriber disconnected */ }
+    }
+}
+function schedulePoll(delayMs = AID_POLL_INTERVAL_MS) {
+    if (pollTimer !== null || subscribers.size === 0)
+        return;
+    pollTimer = setTimeout(async () => {
+        pollTimer = null;
+        if (subscribers.size === 0)
+            return;
+        try {
+            notifySubscribers(await readStableSnapshot());
+        }
+        catch { /* ignore transient IPC errors */ }
+        // 下一轮从本轮完成后开始计时，绝不与上一轮重叠。
+        schedulePoll();
+    }, delayMs);
+}
 export const aidSource = {
     kind: 'agents',
     async snapshot() {
-        return buildSnapshot();
+        return readStableSnapshot();
     },
     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);
-                }
+        // server 会在 subscribe 前先发送 snapshot；以最近成功值作为基线，避免
+        // 第一轮轮询把同一份数据再推送一次。
+        const subscriber = {
+            push,
+            lastJson: lastResolvedSnapshot ? JSON.stringify(lastResolvedSnapshot) : '',
+        };
+        subscribers.add(subscriber);
+        schedulePoll();
+        return () => {
+            subscribers.delete(subscriber);
+            if (subscribers.size === 0 && pollTimer !== null) {
+                clearTimeout(pollTimer);
+                pollTimer = null;
             }
-            catch { /* ignore transient IPC errors */ }
         };
-        const timer = setInterval(tick, 1000);
-        return () => { stopped = true; clearInterval(timer); };
     },
 };

package/dist/static/app.js

@@ -139,7 +139,7 @@ const translations = {
     // Agents view
     'agents.subtitle.enabled': '启用',
     'agents.subtitle.disabled': '禁用',
-    'agents.daemonStopped': '⚠ Daemon 主进程未运行，仅显示最近活动记录',
+    'agents.daemonStopped': '⚠ Daemon IPC 暂时不可用，仅显示最近活动记录',
     'agents.empty.disabled': '暂无禁用 Agent',
     'agents.empty.enabled': '暂无启用 Agent',
     'agents.stats.gateway': 'Daemon Gateway',
@@ -1045,7 +1045,7 @@ const translations = {
     // Agents view
     'agents.subtitle.enabled': 'Enabled',
     'agents.subtitle.disabled': 'Disabled',
-    'agents.daemonStopped': '⚠ Daemon process is not running, showing recent activity only',
+    'agents.daemonStopped': '⚠ Daemon IPC is temporarily unavailable, showing recent activity only',
     'agents.empty.disabled': 'No disabled agents',
     'agents.empty.enabled': 'No enabled agents',
     'agents.stats.gateway': 'Daemon Gateway',

package/dist/static/index.html

@@ -48,7 +48,7 @@
 
       </nav>
       <span style="flex:1"></span>
-      2026-08-27 15:27
+      2026-08-28 04:38
       <span id="conn-status" class="conn-status" data-i18n="status.connecting">连接中…</span>
       <button id="lang-btn" class="theme-btn" data-i18n-title="language.buttonTitle" title="切换语言">🌐</button>
       <button id="theme-btn" class="theme-btn" data-i18n-title="theme.buttonTitle" title="主题">🌗</button>

package/ecweb-wrapper.cjs

@@ -0,0 +1,64 @@
+#!/usr/bin/env node
+/**
+ * ecweb 智能启动包装器
+ * 检测源码变化，需要时自动重新编译，然后启动
+ */
+
+const fs = require('fs');
+const path = require('path');
+const { execSync } = require('child_process');
+
+const ECWEB_DIR = path.resolve(__dirname);
+const SRC_DIR = path.join(ECWEB_DIR, 'src');
+const DIST_DIR = path.join(ECWEB_DIR, 'dist');
+const DIST_INDEX = path.join(DIST_DIR, 'index.js');
+
+function needsBuild() {
+  if (!fs.existsSync(DIST_INDEX)) return true;
+  // Published packages contain the compiled dist/ tree but not the TypeScript
+  // source or devDependencies. Only source checkouts should trigger a build.
+  if (!fs.existsSync(SRC_DIR)) return false;
+
+  try {
+    const distStat = fs.statSync(DIST_INDEX);
+    const distMtime = distStat.mtimeMs;
+
+    // 递归检查所有 src 文件
+    let newestSrcMtime = 0;
+    function walkDir(dir) {
+      const entries = fs.readdirSync(dir, { withFileTypes: true });
+      for (const entry of entries) {
+        const fullPath = path.join(dir, entry.name);
+        if (entry.isDirectory()) {
+          walkDir(fullPath);
+        } else if (entry.isFile() && /\.(ts|tsx|json)$/.test(entry.name)) {
+          const stat = fs.statSync(fullPath);
+          if (stat.mtimeMs > newestSrcMtime) {
+            newestSrcMtime = stat.mtimeMs;
+          }
+        }
+      }
+    }
+    walkDir(SRC_DIR);
+
+    return newestSrcMtime > distMtime;
+  } catch {
+    return false;
+  }
+}
+
+if (needsBuild()) {
+  console.error('🔨 检测到代码变化，编译中...');
+  try {
+    execSync('npm run build', { cwd: ECWEB_DIR, stdio: 'inherit' });
+  } catch (e) {
+    console.error('❌ 编译失败');
+    process.exit(1);
+  }
+}
+
+// 执行真正的入口（ES module 需要用 import，Windows 路径需转 file:// URL）
+(async () => {
+  const { pathToFileURL } = require('url');
+  await import(pathToFileURL(DIST_INDEX).href);
+})();

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "ec-web",
-  "version": "0.0.19",
+  "version": "0.0.20",
   "description": "Web console and monitoring dashboard for EvolCore",
   "type": "module",
   "bin": {
-    "ec-web": "dist/index.js"
+    "ec-web": "ecweb-wrapper.cjs"
   },
   "files": [
     "dist/"