ec-web 0.0.2 → 0.0.4

package/dist/fs-utils.js

@@ -1,12 +1,12 @@
 /**
- * 文件系统工具层（独立版）— 内联自 evolclaw session-fs-store + watch-msg 数据层。
+ * 文件系统工具层（独立版）— 内联自 evolcore session-fs-store + watch-msg 数据层。
  *
  * 只包含 watch-web 实际用到的函数，无任何 npm 依赖。
  */
 import fs from 'fs';
 import path from 'path';
 import { resolvePaths } from './paths.js';
-// ── 编解码（与 evolclaw encodeSegment / decodeDirSegment 一致）──
+// ── 编解码（与 evolcore encodeSegment / decodeDirSegment 一致）──
 const UNSAFE_CHARS_RE = /[<>:"/\\|?*\x00-\x1F%]/g;
 export function encodeSegment(s) {
     return s.replace(UNSAFE_CHARS_RE, ch => '%' + ch.charCodeAt(0).toString(16).toUpperCase().padStart(2, '0'));
@@ -14,7 +14,7 @@ export function encodeSegment(s) {
 export function decodeDirSegment(seg) {
     return seg.replace(/%([0-9A-Fa-f]{2})/g, (_, hex) => String.fromCharCode(parseInt(hex, 16)));
 }
-/** 与 evolclaw cross-platform.ts encodePath 一致（CC transcript 目录名） */
+/** 与 evolcore cross-platform.ts encodePath 一致（CC transcript 目录名） */
 export function encodePath(p) {
     const isWindows = process.platform === 'win32';
     const norm = isWindows ? p.replace(/\\/g, '/') : p;

package/dist/index.js

@@ -3,10 +3,10 @@
  * ec-web — EvolCore 监控面板独立程序。
  *
  * 用法:
- *   ec-web [--port 42705] [--home <EVOLCLAW_HOME>]
+ *   ec-web [--port 42705] [--home <EVOLCORE_HOME>]
  *
- * 通过 EVOLCLAW_HOME 定位 evolclaw 数据目录，启动 HTTP+WS 服务，浏览器配对码登录。
- * 与 evolclaw daemon 通过 IPC socket（live 状态）+ 文件系统（历史数据）旁路通信。
+ * 通过 EVOLCORE_HOME 定位 evolcore 数据目录，启动 HTTP+WS 服务，浏览器配对码登录。
+ * 与 evolcore daemon 通过 IPC socket（live 状态）+ 文件系统（历史数据）旁路通信。
  */
 import fs from 'fs';
 import path from 'path';
@@ -22,20 +22,20 @@ for (let i = 0; i < argv.length; i++) {
     else if (a === '--home' || a === '-h')
         home = argv[++i];
     else if (a === '--help') {
-        process.stdout.write(`ec-web — EvolCore 监控面板\n\n用法:\n  ec-web [--port 42705] [--home <EVOLCLAW_HOME>]\n\n选项:\n  --port, -p   监听端口（默认 42705，占用则自动 +1）\n  --home       当前运行时数据目录（现阶段默认读 EVOLCLAW_HOME 或 ~/.evolclaw）\n`);
+        process.stdout.write(`ec-web — EvolCore 监控面板\n\n用法:\n  ec-web [--port 42705] [--home <EVOLCORE_HOME>]\n\n选项:\n  --port, -p   监听端口（默认 42705，占用则自动 +1）\n  --home       当前运行时数据目录（现阶段默认读 EVOLCORE_HOME 或 ~/.evolcore）\n`);
         process.exit(0);
     }
 }
 // --home 优先级最高：写入环境变量，paths.ts 读取
 if (home)
-    process.env.EVOLCLAW_HOME = path.resolve(home);
+    process.env.EVOLCORE_HOME = path.resolve(home);
 // 延迟到环境变量设置后再导入（paths.ts 缓存 root）
 const { resolvePaths } = await import('./paths.js');
 const { startWatchWebServer } = await import('./server.js');
 const p = resolvePaths();
 // 校验 home 目录存在
 if (!fs.existsSync(p.root)) {
-    process.stderr.write(`❌ EVOLCLAW_HOME 不存在: ${p.root}\n   用 --home 指定正确路径，或设置 EVOLCLAW_HOME 环境变量。\n`);
+    process.stderr.write(`❌ EVOLCORE_HOME 不存在: ${p.root}\n   用 --home 指定正确路径，或设置 EVOLCORE_HOME 环境变量。\n`);
     process.exit(1);
 }
 const useColor = !!process.stdout.isTTY;

package/dist/ipc-client.js

@@ -1,8 +1,8 @@
 /**
- * evolclaw IPC client（独立版）— 通过 Unix socket / 命名管道查询运行中的 daemon。
+ * evolcore IPC client（独立版）— 通过 Unix socket / 命名管道查询运行中的 daemon。
  *
  * 协议：newline-delimited JSON，一问一答即断。
- * 与 evolclaw src/ipc.ts 的 ipcQuery 一致；连不上返回 null（daemon 未运行）。
+ * 与 evolcore src/ipc.ts 的 ipcQuery 一致；连不上返回 null（daemon 未运行）。
  *
  * watch 用到的只读查询：aun-aids / aun-aid-stats / status / evolagent.list / ping
  */

package/dist/paths.js

@@ -1,14 +1,14 @@
 /**
- * evolclaw 路径解析（独立版）。
+ * evolcore 路径解析（独立版）。
  *
- * watch 进程只需要 EVOLCLAW_HOME 根目录，所有地址从它派生。
- * 逻辑与 evolclaw src/paths.ts 对齐，但不依赖 evolclaw 代码。
+ * watch 进程只需要 EVOLCORE_HOME 根目录，所有地址从它派生。
+ * 逻辑与 evolcore src/paths.ts 对齐，但不依赖 evolcore 代码。
  *
  * 根目录解析优先级：
- *   1. --home 命令行参数（由 index.ts 写入 process.env.EVOLCLAW_HOME）
- *   2. EVOLCLAW_HOME 环境变量
+ *   1. --home 命令行参数（由 index.ts 写入 process.env.EVOLCORE_HOME）
+ *   2. EVOLCORE_HOME 环境变量
  *   3. cwd/agents/defaults.json 存在 → cwd（开发模式）
- *   4. ~/.evolclaw
+ *   4. ~/.evolcore
  */
 import path from 'path';
 import os from 'os';
@@ -19,24 +19,24 @@ let _root = null;
 export function resolveRoot() {
     if (_root)
         return _root;
-    if (process.env.EVOLCLAW_HOME) {
-        _root = process.env.EVOLCLAW_HOME;
+    if (process.env.EVOLCORE_HOME) {
+        _root = process.env.EVOLCORE_HOME;
     }
     else if (fs.existsSync(path.join(process.cwd(), 'agents', 'defaults.json'))) {
         _root = process.cwd();
     }
     else {
-        _root = path.join(os.homedir(), '.evolclaw');
+        _root = path.join(os.homedir(), '.evolcore');
     }
     return _root;
 }
-/** socket 路径派生：与 evolclaw resolveInstanceSocketPath 完全一致 */
+/** socket 路径派生：与 evolcore resolveInstanceSocketPath 完全一致 */
 function resolveInstanceSocketPath(root) {
     if (isWindows) {
         const hash = crypto.createHash('sha1').update(root).digest('hex').slice(0, 12);
-        return `\\\\.\\pipe\\evolclaw-${hash}`;
+        return `\\\\.\\pipe\\daemon-${hash}`;
     }
-    return path.join(root, 'data', 'instance', 'evolclaw.sock');
+    return path.join(root, 'data', 'instance', 'daemon.sock');
 }
 export function resolvePaths() {
     const root = resolveRoot();

package/dist/process-utils.js

@@ -1,7 +1,7 @@
 /**
- * 进程工具（独立版）— 内联自 evolclaw cross-platform + process-introspect + instance-registry。
+ * 进程工具（独立版）— 内联自 evolcore cross-platform + process-introspect + instance-registry。
  *
- * 只包含 ecweb 单实例保护实际用到的函数，无任何 evolclaw 代码依赖。
+ * 只包含 ecweb 单实例保护实际用到的函数，无任何 evolcore 代码依赖。
  * 关键不变量：杀进程前用启动时间比对防 PID 复用，按端口兜底时只杀确认是 ecweb 的进程。
  */
 import fs from 'fs';

package/dist/server.js

@@ -6,7 +6,7 @@
  * - 鉴权: 6 位配对码（5 分钟有效）→ token（30 天，有访问自动续期），持久化到磁盘
  * - 安全: 绑定 0.0.0.0（支持远程访问），token 校验，只读
  *
- * 与 evolclaw 的唯一通信：启动时发 ping 检查 protocolVersion（soft 校验）。
+ * 与 evolcore 的唯一通信：启动时发 ping 检查 protocolVersion（soft 校验）。
  */
 import http from 'http';
 import fs from 'fs';
@@ -39,7 +39,7 @@ const STATIC_DIR = path.join(__dirname, 'static');
 const TOKEN_TTL_MS = 30 * 24 * 60 * 60 * 1000; // 30天（滑动窗口：每次有效访问刷新 lastActive 自动续期）
 const PAIRING_TTL_MS = 5 * 60 * 1000; // 5min
 const DEFAULT_PORT = 42705;
-const PROTOCOL_VERSION = 1; // 与 evolclaw ping response 对齐的软校验版本
+const PROTOCOL_VERSION = 1; // 与 evolcore ping response 对齐的软校验版本
 function daemonOwnerMenuAuth() {
     return { localDirect: true, actorAid: null };
 }
@@ -446,6 +446,7 @@ function handleConnection(ws, req, log) {
     const ip = clientIp(req);
     let unsubscribe = null;
     let currentView = null;
+    let subscriptionGeneration = 0;
     log(`◆ WS 连接 from ${ip}`);
     const send = (obj) => {
         if (ws.readyState === ws.OPEN)
@@ -455,6 +456,7 @@ function handleConnection(ws, req, log) {
             catch { }
     };
     const switchSubscription = async (view, params) => {
+        const generation = ++subscriptionGeneration;
         if (unsubscribe) {
             unsubscribe();
             unsubscribe = null;
@@ -468,16 +470,28 @@ function handleConnection(ws, req, log) {
         const sourceParams = { ...params, __menuAuth: daemonOwnerMenuAuth() };
         // System 视图：把 ECWeb 自身版本合并进快照（前端版本卡用）
         const decorate = (data) => (view === 'system' && data ? { ...data, ecwebVersion: ECWEB_VERSION } : data);
+        let initialSnapshot;
         try {
-            send({ type: 'snapshot', view, data: decorate(await source.snapshot(sourceParams)) });
+            initialSnapshot = await source.snapshot(sourceParams);
+            if (generation !== subscriptionGeneration)
+                return;
+            send({ type: 'snapshot', view, data: decorate(initialSnapshot) });
         }
         catch (e) {
+            if (generation !== subscriptionGeneration)
+                return;
             send({ type: 'error', message: `snapshot failed: ${e?.message || e}` });
         }
-        unsubscribe = source.subscribe(sourceParams, (data) => {
-            if (currentView === view)
+        const nextUnsubscribe = source.subscribe(sourceParams, (data) => {
+            if (generation === subscriptionGeneration && currentView === view) {
                 send({ type: 'delta', view, data: decorate(data) });
+            }
         });
+        if (generation !== subscriptionGeneration) {
+            nextUnsubscribe();
+            return;
+        }
+        unsubscribe = nextUnsubscribe;
     };
     ws.on('message', async (raw) => {
         let msg;
@@ -563,10 +577,15 @@ function handleConnection(ws, req, log) {
         ws.ping();
     }, 25000);
     ws.on('pong', () => { alive = true; });
-    ws.on('close', () => { clearInterval(heartbeat); if (unsubscribe) {
-        unsubscribe();
-        unsubscribe = null;
-    } log(`◇ WS 断开 from ${ip}`); });
+    ws.on('close', () => {
+        subscriptionGeneration += 1;
+        clearInterval(heartbeat);
+        if (unsubscribe) {
+            unsubscribe();
+            unsubscribe = null;
+        }
+        log(`◇ WS 断开 from ${ip}`);
+    });
     ws.on('error', () => { });
 }
 // ── Port binding ──
@@ -644,7 +663,7 @@ export async function startWatchWebServer(opts = {}) {
     const p = resolvePaths();
     const pingResp = await ipcQuery(p.socket, { type: 'ping' }, 1000);
     if (pingResp && pingResp.protocolVersion !== undefined && pingResp.protocolVersion < PROTOCOL_VERSION) {
-        log(`⚠️  evolclaw protocolVersion=${pingResp.protocolVersion}，watch 期望 >=${PROTOCOL_VERSION}，部分功能可能异常`);
+        log(`⚠️  evolcore protocolVersion=${pingResp.protocolVersion}，watch 期望 >=${PROTOCOL_VERSION}，部分功能可能异常`);
     }
     let pairingCode = genPairingCode();
     let pairingExpiry = Date.now() + PAIRING_TTL_MS;

package/dist/sources/aid.js

@@ -1,5 +1,5 @@
 /**
- * AID 数据源 — 复用 daemon 的 IPC socket（与 evolclaw `watch aid` 同源）。
+ * AID 数据源 — 复用 daemon 的 IPC socket（与 evolcore `watch aid` 同源）。
  *
  * daemon 运行时：拉 aun-aids / aun-aid-stats / agent-stats / status / evolagent.list。
  * daemon 未运行时：降级到读 instance/ 目录的 aid-*.jsonl（精简版 scanInstances）。
@@ -64,7 +64,7 @@ function scanAidActivity() {
     }
     return result;
 }
-// evolclaw 版本：与 watch aid 状态栏一致。daemon 进程级、整轮 watch 不变，
+// evolcore 版本：与 watch aid 状态栏一致。daemon 进程级、整轮 watch 不变，
 // 故缓存一次（首次 menu.query name=system 拿到后复用），避免每秒多发一次 IPC。
 let _cachedVersion = null;
 async function fetchVersion(socket) {

package/dist/sources/gateway.js

@@ -14,7 +14,7 @@ async function getSnapshot() {
     const sock = resolvePaths().socket;
     const resp = await ipcQuery(sock, { type: 'menu.exec', payload: { type: 'menu.query', name: 'gateway', id: 'ecw-gateway-snap' }, auth: { source: 'ecweb', localDirect: true } }, 5000);
     if (!resp) {
-        return { gateways: [], scopes: [], types: [], error: 'evolclaw 未运行或 socket 不可达' };
+        return { gateways: [], scopes: [], types: [], error: 'evolcore 未运行或 socket 不可达' };
     }
     if (!resp.ok) {
         return { gateways: [], scopes: [], types: [], error: resp.error || 'daemon 返回失败' };

package/dist/sources/logs.js

@@ -2,7 +2,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { resolvePaths } from '../paths.js';
 const LOG_SOURCES = [
-    { id: 'evolclaw', label: 'Daemon', pattern: /^evolclaw(?:-.+)?\.log$/ },
+    { id: 'daemon', label: 'Daemon', pattern: /^daemon(?:-.+)?\.log$/ },
     { id: 'ecweb', label: 'ECWeb', pattern: /^(?:watch-web|ecweb[^/]*)\.(?:log|out)$/ },
     { id: 'stdout', label: 'Standard output', pattern: /^stdout\.log(?:\..+)?$/ },
     { id: 'aun', label: 'AUN', pattern: /^aun(?:-.+)?\.log$/ },
@@ -350,7 +350,7 @@ function buildSnapshot(params = {}) {
     const requested = String(params.source || '');
     const selectedSource = sources.some(source => source.id === requested)
         ? requested
-        : (sources.some(source => source.id === 'evolclaw') ? 'evolclaw' : (sources[0]?.id || null));
+        : (sources.some(source => source.id === 'daemon') ? 'daemon' : (sources[0]?.id || null));
     const source = LOG_SOURCES.find(item => item.id === selectedSource);
     const limit = Math.min(MAX_LIMIT, Math.max(100, Number(params.limit) || DEFAULT_LIMIT));
     const lines = source ? linesFor(files, source, limit) : [];

package/dist/sources/monitor.js

@@ -8,11 +8,44 @@
  *   - fine   : 2s  桶 × 60  ≈ 近 2 分钟
  *   - mid    : 10s 桶 × 60  ≈ 近 10 分钟
  *   - coarse : 60s 桶 × 60  ≈ 近 1 小时
- * 每个桶内对 CPU/内存做均值聚合，避免长周期下点数爆炸。
+ * 每个桶内对 CPU/内存做均值聚合，关联进程先按类型和名称合并，
+ * 避免长周期下点数爆炸，也不让 PID 变化拆散同一条曲线。
  */
 import fs from 'node:fs';
 import { resolvePaths } from '../paths.js';
 import { ipcQuery } from '../ipc-client.js';
+function processGroupKey(process) {
+    return `${process.kind}\u0000${process.name}`;
+}
+/** 同一类、同一可执行名的多个实例在一个采样点中汇总。 */
+export function mergeProcessesByIdentity(processes) {
+    const merged = new Map();
+    for (const process of processes) {
+        const name = String(process.name || 'process');
+        const kind = String(process.kind || 'child');
+        const key = processGroupKey({ name, kind });
+        const current = merged.get(key);
+        if (current) {
+            current.cpuPercent += Number(process.cpuPercent) || 0;
+            current.rss += Number(process.rss) || 0;
+        }
+        else {
+            merged.set(key, {
+                name,
+                kind,
+                cpuPercent: Number(process.cpuPercent) || 0,
+                rss: Number(process.rss) || 0,
+            });
+        }
+    }
+    return [...merged.values()].sort((left, right) => processGroupKey(left).localeCompare(processGroupKey(right)));
+}
+/** 将进程的单核 CPU 百分比换算为整机全部逻辑 CPU 的容量占比。 */
+export function normalizeProcessCpuPercent(cpuPercent, cpuCount) {
+    const count = Number(cpuCount);
+    const divisor = Number.isFinite(count) && count > 0 ? count : 1;
+    return (Number(cpuPercent) || 0) / divisor;
+}
 // 模块级缓冲区——所有订阅者共享同一份累积时序（单一事实源）。
 const resolutions = {
     fine: { bucketMs: 2_000, cap: 60, buf: [] },
@@ -29,10 +62,12 @@ function ingest(res, sample) {
         last.sysCpu = last.sysCpu + (sample.sysCpu - last.sysCpu) / n;
         last.procRss = last.procRss + (sample.procRss - last.procRss) / n;
         last.sysMemUsed = last.sysMemUsed + (sample.sysMemUsed - last.sysMemUsed) / n;
+        last.diskReadBps = last.diskReadBps + (sample.diskReadBps - last.diskReadBps) / n;
+        last.diskWriteBps = last.diskWriteBps + (sample.diskWriteBps - last.diskWriteBps) / n;
         last.netRxBps = last.netRxBps + (sample.netRxBps - last.netRxBps) / n;
         last.netTxBps = last.netTxBps + (sample.netTxBps - last.netTxBps) / n;
         for (const process of sample.processes) {
-            const current = last.processes.find(item => item.pid === process.pid);
+            const current = last.processes.find(item => processGroupKey(item) === processGroupKey(process));
             if (current) {
                 const processSamples = current._n + 1;
                 current.cpuPercent += (process.cpuPercent - current.cpuPercent) / processSamples;
@@ -61,10 +96,11 @@ function exportBuf(res) {
         sysCpu: round1(b.sysCpu),
         procRss: Math.round(b.procRss),
         sysMemUsed: Math.round(b.sysMemUsed),
+        diskReadBps: Math.round(b.diskReadBps),
+        diskWriteBps: Math.round(b.diskWriteBps),
         netRxBps: Math.round(b.netRxBps),
         netTxBps: Math.round(b.netTxBps),
         processes: b.processes.map(process => ({
-            pid: process.pid,
             name: process.name,
             kind: process.kind,
             cpuPercent: round1(process.cpuPercent),
@@ -73,6 +109,49 @@ function exportBuf(res) {
     }));
 }
 function round1(n) { return Math.round(n * 10) / 10; }
+const DISK_SECTOR_BYTES = 512;
+let previousDiskSample = null;
+let latestDiskRate = { readBps: 0, writeBps: 0 };
+/** 解析 Linux diskstats，只累计整盘，避免分区和虚拟映射重复计数。 */
+export function parseLinuxDiskStats(input, isPartition = name => fs.existsSync(`/sys/class/block/${name}/partition`)) {
+    let readBytes = 0;
+    let writeBytes = 0;
+    for (const line of input.split('\n')) {
+        const fields = line.trim().split(/\s+/);
+        if (fields.length < 10)
+            continue;
+        const name = fields[2];
+        if (!name || /^(loop|ram|zram|fd|sr|dm-|md|zd)/.test(name) || isPartition(name))
+            continue;
+        readBytes += (Number(fields[5]) || 0) * DISK_SECTOR_BYTES;
+        writeBytes += (Number(fields[9]) || 0) * DISK_SECTOR_BYTES;
+    }
+    return { readBytes, writeBytes };
+}
+function readDiskTotals() {
+    try {
+        return parseLinuxDiskStats(fs.readFileSync('/proc/diskstats', 'utf8'));
+    }
+    catch {
+        return { readBytes: 0, writeBytes: 0 };
+    }
+}
+function sampleDiskRate(ts) {
+    const totals = readDiskTotals();
+    if (!previousDiskSample) {
+        previousDiskSample = { ...totals, ts };
+        return latestDiskRate;
+    }
+    const elapsedMs = ts - previousDiskSample.ts;
+    if (elapsedMs < 250)
+        return latestDiskRate;
+    latestDiskRate = {
+        readBps: Math.max(0, (totals.readBytes - previousDiskSample.readBytes) * 1000 / elapsedMs),
+        writeBps: Math.max(0, (totals.writeBytes - previousDiskSample.writeBytes) * 1000 / elapsedMs),
+    };
+    previousDiskSample = { ...totals, ts };
+    return latestDiskRate;
+}
 let previousNetworkSample = null;
 let latestNetworkRate = { rxBps: 0, txBps: 0 };
 function readNetworkTotals() {
@@ -122,22 +201,26 @@ async function fetchSnapshot() {
     }
     const s = resp.snapshot;
     const ts = Number(s.ts) || Date.now();
+    const cpuCount = Number(s.cpuCount) || 1;
+    const disk = sampleDiskRate(ts);
     const network = sampleNetworkRate(ts);
     const sample = {
         ts,
-        procCpu: s.cpuPercent ?? 0,
+        procCpu: normalizeProcessCpuPercent(s.cpuPercent, cpuCount),
         sysCpu: s.system?.cpuPercent ?? 0,
         procRss: s.memory?.rss ?? 0,
         sysMemUsed: s.system?.memUsed ?? 0,
+        diskReadBps: disk.readBps,
+        diskWriteBps: disk.writeBps,
         netRxBps: network.rxBps,
         netTxBps: network.txBps,
-        processes: Array.isArray(s.processTree?.processes) ? s.processTree.processes.map((process) => ({
+        processes: mergeProcessesByIdentity(Array.isArray(s.processTree?.processes) ? s.processTree.processes.map((process) => ({
             pid: Number(process.pid),
             name: String(process.name || 'process'),
             kind: String(process.kind || 'child'),
-            cpuPercent: Number(process.cpuPercent) || 0,
+            cpuPercent: normalizeProcessCpuPercent(process.cpuPercent, cpuCount),
             rss: Number(process.rss) || 0,
-        })) : [],
+        })) : []),
     };
     ingest(resolutions.fine, sample);
     ingest(resolutions.mid, sample);

package/dist/sources/msg.js

@@ -67,6 +67,9 @@ function readLastJsonlObject(file) {
     const rows = readAllJsonlLines(file);
     return rows.length ? rows[rows.length - 1] : null;
 }
+export function latestMessageAt(messages) {
+    return messages.reduce((latest, message) => Math.max(latest, Number(message.ts) || 0), 0);
+}
 function loadThreadSessions(dirPath) {
     const threadsDir = path.join(dirPath, '_threads');
     const index = readJsonFile(path.join(threadsDir, 'thread-index.json')) || {};
@@ -316,8 +319,9 @@ function loadChats() {
                 continue;
             const thread = item.threadId ? threadById.get(item.threadId) : undefined;
             const partitionActive = item.partition === 'thread' ? thread?.active || {} : item.partition === 'main' ? active : {};
-            const lastMsgAt = item.messages.reduce((max, message) => Math.max(max, message.ts || 0), 0);
-            const updatedAt = Math.max(Number(partitionActive.updatedAt || 0), lastMsgAt);
+            // active.updatedAt also changes for session metadata maintenance (for example,
+            // a project-path migration), so it is not a conversation activity timestamp.
+            const updatedAt = latestMessageAt(item.messages);
             chats.push({
                 id: safeId(`${selfAID}\n${channelType}\n${channelId}\n${chatType}\n${item.partition}\n${item.threadId || ''}`),
                 dirPath,
@@ -550,7 +554,7 @@ async function buildSessionContext(chat) {
     catch { }
     return {
         sessionId: active.agentSessionId || active.id || null,
-        evolclawSessionId: active.id || null,
+        evolcoreSessionId: active.id || null,
         name: active.name || null,
         baseagent: active.baseagent || active.agentType || null,
         chatMode,

package/dist/sources/parent-package.js

@@ -3,13 +3,13 @@ import path from 'path';
 import { createRequire } from 'module';
 import { fileURLToPath } from 'url';
 let packageRootCache = null;
-function isEvolclawPackageRoot(dir) {
+function isEvolcorePackageRoot(dir) {
     const pkgPath = path.join(dir, 'package.json');
     if (!fs.existsSync(pkgPath))
         return false;
     try {
         const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
-        return pkg?.name === 'evolclaw';
+        return pkg?.name === 'evolcore';
     }
     catch {
         return false;
@@ -18,7 +18,7 @@ function isEvolclawPackageRoot(dir) {
 function findUp(start) {
     let dir = path.resolve(start);
     while (true) {
-        if (isEvolclawPackageRoot(dir))
+        if (isEvolcorePackageRoot(dir))
             return dir;
         const parent = path.dirname(dir);
         if (parent === dir)
@@ -29,14 +29,14 @@ function findUp(start) {
 function candidateStarts() {
     const here = path.dirname(fileURLToPath(import.meta.url));
     const starts = [
-        process.env.EVOLCLAW_PACKAGE_ROOT,
+        process.env.EVOLCORE_PACKAGE_ROOT,
         here,
         process.cwd(),
         process.argv[1] ? path.dirname(process.argv[1]) : undefined,
     ];
     return [...new Set(starts.filter((item) => !!item))];
 }
-export function resolveEvolclawPackageRoot() {
+export function resolveEvolcorePackageRoot() {
     if (packageRootCache)
         return packageRootCache;
     const searched = [];
@@ -50,9 +50,9 @@ export function resolveEvolclawPackageRoot() {
     }
     try {
         const require = createRequire(import.meta.url);
-        const pkgJson = require.resolve('evolclaw/package.json');
+        const pkgJson = require.resolve('evolcore/package.json');
         const root = path.dirname(pkgJson);
-        if (isEvolclawPackageRoot(root)) {
+        if (isEvolcorePackageRoot(root)) {
             packageRootCache = root;
             return root;
         }
@@ -63,7 +63,7 @@ export function resolveEvolclawPackageRoot() {
     throw new Error(`Main package root not found. searched=${searched.join(', ')}`);
 }
 export function resolveParentDistModule(...segments) {
-    const root = resolveEvolclawPackageRoot();
+    const root = resolveEvolcorePackageRoot();
     const modulePath = path.join(root, 'dist', ...segments);
     if (!fs.existsSync(modulePath)) {
         throw new Error(`Main package dist module not found: ${modulePath}. Run npm run build in ${root}.`);

package/dist/sources/relation-roles.js

@@ -661,30 +661,8 @@ export const relationRolesSource = {
             return { agents: [], conversations: [], error: String(err) };
         }
     },
-    subscribe(_params, push) {
-        let lastJson = '';
-        let stopped = false;
-        const tick = async () => {
-            if (stopped)
-                return;
-            try {
-                const snap = await buildSnapshot(_params.__menuAuth ?? {});
-                const json = JSON.stringify(snap);
-                if (json !== lastJson) {
-                    lastJson = json;
-                    push(snap);
-                }
-            }
-            catch (err) {
-                console.error('[relation-roles] polling error:', err);
-            }
-        };
-        tick();
-        const timer = setInterval(tick, 2000);
-        return () => {
-            stopped = true;
-            clearInterval(timer);
-        };
+    subscribe(_params, _push) {
+        return () => { };
     },
 };
 function requireScope(body) {

package/dist/sources/role-definitions.js

@@ -4,18 +4,18 @@
  * 功能：
  * 1. 读取 roles.json 或内置角色配置
  * 2. 提供角色定义的 CRUD API
- * 3. WebSocket 推送角色配置变化
+ * 3. WebSocket 提供按需快照
  *
  * 数据流：
- * - 读取：从 evolclaw/dist/config/roles.ts 导入 readRolesConfig
- * - 写入：保存到 .evolclaw/roles.json
- * - 推送：2秒轮询 + JSON diff
+ * - 读取：从 evolcore/dist/config/roles.ts 导入 readRolesConfig
+ * - 写入：保存到 .evolcore/roles.json
+ * - 刷新：进入页面、切换 Agent 或完成写操作时按需加载
  */
 import { getModelCatalogSnapshot } from './models.js';
 import { resolveParentDistModule, toFileUrl } from './parent-package.js';
 import { resolvePaths } from '../paths.js';
 import { ipcQuery } from '../ipc-client.js';
-// 动态导入 evolclaw 主项目的角色配置模块
+// 动态导入 evolcore 主项目的角色配置模块
 async function getRolesModule() {
     const rolesPath = resolveParentDistModule('config', 'roles.js');
     const cmPath = resolveParentDistModule('config', 'config-manager.js');
@@ -116,6 +116,11 @@ async function rolePolicyRevision(aid, auth) {
         throw Object.assign(new Error(response.error.message), { menuResponse: response });
     return response.data.policyRevision;
 }
+export function visibleRoleDefinitionOptions(roleOptions) {
+    return roleOptions
+        .filter(item => item?.kind === 'user' || item?.value === 'admin')
+        .sort((left, right) => Number(right.value === 'admin') - Number(left.value === 'admin'));
+}
 async function buildMenuSnapshot(aid, agents, auth) {
     const [roleOptions, defaults] = await Promise.all([
         execRoleMenu(aid, { type: 'menu.options', id: `ecweb-role-options-${Date.now()}`, args: { option: 'roles' } }, auth),
@@ -125,8 +130,8 @@ async function buildMenuSnapshot(aid, agents, auth) {
         throw Object.assign(new Error(roleOptions.error.message), { menuResponse: roleOptions });
     if (defaults.error)
         throw Object.assign(new Error(defaults.error.message), { menuResponse: defaults });
-    const userRoles = roleOptions.data.filter(item => item.kind === 'user');
-    const details = await Promise.all(userRoles.map(item => execRoleMenu(aid, {
+    const visibleRoles = visibleRoleDefinitionOptions(roleOptions.data);
+    const details = await Promise.all(visibleRoles.map(item => execRoleMenu(aid, {
         type: 'menu.query', id: `ecweb-role-${item.value}-${Date.now()}`,
         args: { view: 'role', roleId: item.value },
     }, auth)));
@@ -424,8 +429,8 @@ function validateCommandPermissionConstraints(rule, constraints, errors) {
             if (!Number.isInteger(value) || value < 0)
                 errors.push(`${label} must be a non-negative integer`);
         }
-        else if (key === 'cwdPolicy' && !['agentProject', 'evolclawHome', 'none'].includes(String(value))) {
-            errors.push(`${label} must be agentProject, evolclawHome, or none`);
+        else if (key === 'cwdPolicy' && !['agentProject', 'evolcoreHome', 'none'].includes(String(value))) {
+            errors.push(`${label} must be agentProject, evolcoreHome, or none`);
         }
         else if (key === 'allowedArgs' || key === 'deniedArgs') {
             validateScalarArrayMap(value, label, errors);
@@ -634,31 +639,8 @@ export const roleDefinitionsSource = {
     async snapshot(params = {}) {
         return buildSnapshot(params, params.__menuAuth ?? {});
     },
-    subscribe(_params, push) {
-        let lastJson = '';
-        let stopped = false;
-        const tick = async () => {
-            if (stopped)
-                return;
-            try {
-                const snap = await buildSnapshot(_params, _params.__menuAuth ?? {});
-                const json = JSON.stringify(snap);
-                if (json !== lastJson) {
-                    lastJson = json;
-                    push(snap);
-                }
-            }
-            catch (err) {
-                console.error('[role-definitions] Polling error:', err);
-            }
-        };
-        // 立即执行一次
-        tick();
-        const timer = setInterval(tick, 2000); // 2秒轮询
-        return () => {
-            stopped = true;
-            clearInterval(timer);
-        };
+    subscribe(_params, _push) {
+        return () => { };
     }
 };
 async function handleRoleMenuCompatibility(req, res, auth, aid, agents, parsedUrl) {