ec-web 0.0.3 → 0.0.4

package/dist/server.js

@@ -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 ──

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,

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,12 +4,12 @@
  * 功能：
  * 1. 读取 roles.json 或内置角色配置
  * 2. 提供角色定义的 CRUD API
- * 3. WebSocket 推送角色配置变化
+ * 3. WebSocket 提供按需快照
  *
  * 数据流：
  * - 读取：从 evolcore/dist/config/roles.ts 导入 readRolesConfig
  * - 写入：保存到 .evolcore/roles.json
- * - 推送：2秒轮询 + JSON diff
+ * - 刷新：进入页面、切换 Agent 或完成写操作时按需加载
  */
 import { getModelCatalogSnapshot } from './models.js';
 import { resolveParentDistModule, toFileUrl } from './parent-package.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)));
@@ -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) {

package/dist/static/app.js

@@ -374,13 +374,11 @@ const translations = {
     'monitor.card.systemMemory': '系统内存',
     'monitor.chart.cpu': 'CPU 占用',
     'monitor.chart.memory': '内存占用',
-    'monitor.chart.activity1h': '近一小时活动',
+    'monitor.chart.disk': '磁盘读写',
     'monitor.chart.network': '网络占用',
-    'monitor.activity.received': '接收',
-    'monitor.activity.completed': '完成',
-    'monitor.activity.errors': '错误',
-    'monitor.activity.interrupts': '中断',
-    'monitor.activity.toolErrors': '工具错误',
+    'monitor.series.diskRead': '读取',
+    'monitor.series.diskWrite': '写入',
+    'monitor.series.processTotal': '关联进程',
     'monitor.series.processRss': 'Daemon 进程组 RSS',
     'monitor.processes.daemon': '主进程',
     'monitor.processes.ecweb': 'ECWeb',
@@ -394,7 +392,7 @@ const translations = {
     'monitor.processes.sandbox': '沙箱',
     'monitor.processes.runner-helper': 'Runner 辅助',
     'monitor.processes.child': '关联进程',
-    'monitor.series.systemUsed': '系统已用',
+    'monitor.series.systemUsed': '整机系统（已用）',
     'monitor.series.networkDownload': '下载',
     'monitor.series.networkUpload': '上传',
     'monitor.th.received': '收',
@@ -705,7 +703,7 @@ const translations = {
     // Usage view
     'usage.subtab.overview': '总览',
     'usage.subtab.explorer': '详细统计',
-    'usage.overview.range.today': '今日',
+    'usage.overview.range.last24': '最近24小时',
     'usage.overview.range.week': '本周',
     'usage.overview.range.lastWeek': '上周',
     'usage.overview.range.month': '本月',
@@ -1232,13 +1230,11 @@ const translations = {
     'monitor.card.systemMemory': 'System Memory',
     'monitor.chart.cpu': 'CPU Usage',
     'monitor.chart.memory': 'Memory Usage',
-    'monitor.chart.activity1h': 'Activity in Last Hour',
+    'monitor.chart.disk': 'Disk I/O',
     'monitor.chart.network': 'Network Usage',
-    'monitor.activity.received': 'Received',
-    'monitor.activity.completed': 'Completed',
-    'monitor.activity.errors': 'Errors',
-    'monitor.activity.interrupts': 'Interrupts',
-    'monitor.activity.toolErrors': 'ToolErr',
+    'monitor.series.diskRead': 'Read',
+    'monitor.series.diskWrite': 'Write',
+    'monitor.series.processTotal': 'Related Processes',
     'monitor.series.processRss': 'Daemon process group RSS',
     'monitor.processes.daemon': 'Daemon',
     'monitor.processes.ecweb': 'ECWeb',
@@ -1563,7 +1559,7 @@ const translations = {
     // Usage view
     'usage.subtab.overview': 'Overview',
     'usage.subtab.explorer': 'Detailed Statistics',
-    'usage.overview.range.today': 'Today',
+    'usage.overview.range.last24': 'Last 24 Hours',
     'usage.overview.range.week': 'This Week',
     'usage.overview.range.lastWeek': 'Last Week',
     'usage.overview.range.month': 'This Month',
@@ -7002,7 +6998,7 @@ function disposeWindowChart(key) {
 }
 
 function refreshThemeSensitiveViews() {
-  ['_hourlyChart', '_modelChart', '_monCpu', '_monMem', '_monMsg', '_monNet'].forEach(disposeWindowChart);
+  ['_hourlyChart', '_modelChart', '_monCpu', '_monMem', '_monDisk', '_monNet'].forEach(disposeWindowChart);
   if (typeof _explorerChart !== 'undefined' && _explorerChart) {
     _explorerChart.dispose();
     _explorerChart = null;
@@ -7060,7 +7056,12 @@ function fmtTokens(n) {
 }
 
 // ── Usage Overview（总览，支持日期范围筛选）──
-let _ovCurrentRange = 'today'; // 当前选择的范围
+let _ovCurrentRange = 'last24'; // 当前选择的范围
+
+function rollingLast24HourRange(now) {
+  const toTs = (now || new Date()).getTime();
+  return { fromTs: toTs - 24 * 60 * 60 * 1000, toTs };
+}
 
 async function loadUsageOverview(rangeType, customFrom, customTo) {
   rangeType = rangeType || _ovCurrentRange;
@@ -7073,9 +7074,8 @@ async function loadUsageOverview(rangeType, customFrom, customTo) {
   const todayEnd = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59, 999).getTime();
 
   switch (rangeType) {
-    case 'today':
-      fromTs = todayStart;
-      toTs = todayEnd;
+    case 'last24':
+      ({ fromTs, toTs } = rollingLast24HourRange(now));
       break;
     case 'week': // 本周（周一到今天）
       const dayOfWeek = now.getDay() || 7; // 周日=7
@@ -7104,8 +7104,7 @@ async function loadUsageOverview(rangeType, customFrom, customTo) {
         fromTs = new Date(customFrom).getTime();
         toTs = new Date(customTo).getTime();
       } else {
-        fromTs = todayStart;
-        toTs = todayEnd;
+        ({ fromTs, toTs } = rollingLast24HourRange(now));
       }
       break;
     default:
@@ -7559,7 +7558,7 @@ var _usageSubtabsBound = false;
 
 function activeOverviewRange() {
   const active = document.querySelector('.ov-range-btn.active');
-  return active ? active.getAttribute('data-range') || 'today' : 'today';
+  return active ? active.getAttribute('data-range') || 'last24' : 'last24';
 }
 
 function refreshUsageView() {
@@ -7609,16 +7608,16 @@ function initUsageSubtabs() {
     });
   });
 
-  // 初始化总览页面的过滤器并加载默认数据（今日）
+  // 初始化总览页面的过滤器并加载默认数据（最近 24 小时）
   initOverviewFilters();
-  loadUsageOverview('today');
+  loadUsageOverview('last24');
 }
 
 // ── Explorer ──
 var _explorerChart = null;
 var _explorerInited = false;
 var _expSelection = { type: null, key: null }; // { type: 'agent'|'peer', key: string } or null
-var _expCurrentRange = 'today'; // Explorer 当前选择的时间范围
+var _expCurrentRange = 'last24'; // Explorer 当前选择的时间范围
 var _expTimeRange = { fromTs: null, toTs: null }; // Explorer 的时间范围
 
 function initExplorer() {
@@ -7653,6 +7652,7 @@ function initExplorerTimeFilters() {
         if (customDateEl) customDateEl.style.display = 'none';
         _expCurrentRange = range;
         calculateExplorerTimeRange(range);
+        setExplorerGranularityForRange(range);
         loadExplorerModels(); // 加载可用模型
         runExplorerQuery();
       }
@@ -7675,15 +7675,22 @@ function initExplorerTimeFilters() {
     });
   }
 
-  // 设置默认时间范围（今日）并初始化日期选择器
+  // 设置默认时间范围（最近 24 小时）并初始化日期选择器
   const now = new Date();
+  const last24 = rollingLast24HourRange(now);
   const fromEl = $('#exp-from');
   const toEl = $('#exp-to');
-  if (fromEl) fromEl.value = formatDatetimeLocal(new Date(now.getFullYear(), now.getMonth(), now.getDate()));
+  if (fromEl) fromEl.value = formatDatetimeLocal(new Date(last24.fromTs));
   if (toEl) toEl.value = formatDatetimeLocal(now);
 
-  // 计算默认时间范围（今日）
-  calculateExplorerTimeRange('today');
+  // 计算默认时间范围（最近 24 小时）
+  calculateExplorerTimeRange('last24');
+  setExplorerGranularityForRange('last24');
+}
+
+function setExplorerGranularityForRange(rangeType) {
+  const granularityEl = $('#exp-granularity');
+  if (rangeType === 'last24' && granularityEl) granularityEl.value = 'hour';
 }
 
 // 计算 Explorer 的时间范围
@@ -7693,9 +7700,8 @@ function calculateExplorerTimeRange(rangeType) {
   const todayEnd = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59, 999).getTime();
 
   switch (rangeType) {
-    case 'today':
-      _expTimeRange.fromTs = todayStart;
-      _expTimeRange.toTs = todayEnd;
+    case 'last24':
+      _expTimeRange = rollingLast24HourRange(now);
       break;
     case 'week':
       const dayOfWeek = now.getDay() || 7;
@@ -8108,12 +8114,12 @@ function monitorLayoutHtml() {
     '</div>' +
     `<div id="mon-cards" class="usage-cards"><div class="empty" style="grid-column:1/-1">${t('common.loading')}</div></div>` +
     '<div class="mon-row2"><div id="mon-cpu-chart" class="mon-chart"></div><div id="mon-mem-chart" class="mon-chart"></div></div>' +
-    '<div class="mon-row2"><div id="mon-msg-chart" class="mon-chart"></div><div id="mon-net-chart" class="mon-chart"></div></div>' +
+    '<div class="mon-row2"><div id="mon-disk-chart" class="mon-chart"></div><div id="mon-net-chart" class="mon-chart"></div></div>' +
   '</div>';
 }
 
 function disposeMonitorCharts() {
-  ['_monCpu', '_monMem', '_monMsg', '_monNet'].forEach(disposeWindowChart);
+  ['_monCpu', '_monMem', '_monDisk', '_monNet'].forEach(disposeWindowChart);
 }
 
 function bindMonRangeTabs(wrap) {
@@ -8136,36 +8142,65 @@ function formatMonitorResponse(ms) {
   return value >= 10000 ? (value / 1000).toFixed(1) + 's' : Math.round(value) + 'ms';
 }
 
-function monitorProcessLabel(process) {
+function monitorProcessKind(process) {
   var knownKinds = ['daemon', 'ecweb', 'watch-web', 'restart-monitor', 'watch', 'watch-aid', 'codex-app-server', 'claude-runner', 'gemini-runner', 'sandbox', 'runner-helper', 'child'];
-  var kind = knownKinds.includes(process.kind) ? process.kind : 'child';
-  return `${t('monitor.processes.' + kind)} · ${process.name || 'process'} · #${process.pid}`;
+  return knownKinds.includes(process.kind) ? process.kind : 'child';
+}
+
+function monitorProcessKey(process) {
+  return `${monitorProcessKind(process)}\u0000${process.name || 'process'}`;
+}
+
+function monitorProcessLabel(process) {
+  return `${t('monitor.processes.' + monitorProcessKind(process))} · ${process.name || 'process'}`;
 }
 
-function monitorProcessColor(pid) {
+function monitorProcessColor(key) {
   var colors = ['#4f6ef7', '#38a169', '#dd6b20', '#805ad5', '#d53f8c', '#319795', '#e53e3e', '#3182ce', '#718096', '#b7791f'];
-  var value = Math.abs(Number(pid) || 0);
+  var value = 0;
+  for (var i = 0; i < key.length; i += 1) value = ((value * 31) + key.charCodeAt(i)) | 0;
+  value = Math.abs(value);
   return colors[value % colors.length];
 }
 
 function monitorProcessSeries(history, currentProcesses, metric) {
   var catalog = new Map();
-  for (const process of (currentProcesses || [])) catalog.set(process.pid, process);
+  function addProcess(process) {
+    var key = monitorProcessKey(process);
+    if (!catalog.has(key)) catalog.set(key, { key: key, kind: monitorProcessKind(process), name: process.name || 'process' });
+  }
+  for (const process of (currentProcesses || [])) addProcess(process);
   for (const point of history) {
-    for (const process of (point.processes || [])) catalog.set(process.pid, process);
+    for (const process of (point.processes || [])) addProcess(process);
   }
-  return [...catalog.values()].sort(function (a, b) { return a.pid - b.pid; }).map(function (process) {
+  return [...catalog.values()].sort(function (a, b) { return monitorProcessLabel(a).localeCompare(monitorProcessLabel(b)); }).map(function (process) {
     return {
       name: monitorProcessLabel(process),
       data: history.map(function (point) {
-        var sample = (point.processes || []).find(function (item) { return item.pid === process.pid; });
-        return sample ? sample[metric] : null;
+        var value = 0;
+        var hasSample = false;
+        for (const sample of (point.processes || [])) {
+          if (monitorProcessKey(sample) !== process.key) continue;
+          value += Number(sample[metric]) || 0;
+          hasSample = true;
+        }
+        return hasSample ? value : null;
       }),
-      color: monitorProcessColor(process.pid),
+      color: monitorProcessColor(process.key),
     };
   });
 }
 
+function monitorAggregateSeries(name, history, metric, color) {
+  return {
+    name: name,
+    data: history.map(function (point) { return point[metric] != null ? point[metric] : null; }),
+    color: color,
+    width: 3,
+    areaOpacity: 0.12,
+  };
+}
+
 function renderMonitor(data) {
   var wrap = $('#sys-content .mon-layout');
   if (!wrap) return;
@@ -8187,6 +8222,8 @@ function renderMonitor(data) {
   var lh = (s.stats && s.stats.lastHour) || {};
   var errRate = (lh.received > 0) ? ((lh.errors / lh.received) * 100).toFixed(1) + '%' : '0%';
   var processTree = s.processTree || {};
+  var cpuCount = Math.max(1, Number(s.cpuCount) || 1);
+  var processCpuPercent = (Number(s.cpuPercent) || 0) / cpuCount;
 
   // ── Stat cards ──
   var sysMemPct = (sys.memTotal > 0) ? Math.round((sys.memUsed / sys.memTotal) * 100) : 0;
@@ -8195,7 +8232,7 @@ function renderMonitor(data) {
     [t('monitor.card.messages1h'), lh.received || 0],
     [t('monitor.card.avgResponse'), formatMonitorResponse(lh.avgResponseMs)],
     [t('monitor.card.errorRate'), errRate],
-    [t('monitor.card.processCpu'), (s.cpuPercent != null ? s.cpuPercent : 0) + '%'],
+    [t('monitor.card.processCpu'), processCpuPercent.toFixed(1) + '%'],
     [t('monitor.card.systemCpu'), (sys.cpuPercent != null ? sys.cpuPercent : 0) + '%'],
     [t('monitor.card.processMemory'), fmtBytes(s.memory ? s.memory.rss : 0)],
     [t('monitor.card.processCount'), processTree.processCount || 1],
@@ -8211,52 +8248,32 @@ function renderMonitor(data) {
   var cProc = css('--accent'), cSys = css('--orange');
 
   var currentProcesses = Array.isArray(processTree.processes) ? processTree.processes : [];
-  var cpuSeries = monitorProcessSeries(h, currentProcesses, 'cpuPercent');
-  cpuSeries.push({ name: t('monitor.legend.system'), data: h.map(function (p) { return p.sysCpu != null ? p.sysCpu : null; }), color: cSys });
+  var cpuSeries = [
+    monitorAggregateSeries(t('monitor.legend.system'), h, 'sysCpu', cSys),
+    monitorAggregateSeries(t('monitor.series.processTotal'), h, 'procCpu', cProc),
+  ].concat(monitorProcessSeries(h, currentProcesses, 'cpuPercent'));
 
-  // ── CPU：每个关联 PID + 系统 ──
+  // ── CPU：整机系统、关联进程、每类关联进程 ──
   monDualLine('mon-cpu-chart', '_monCpu', ts, isDark, t('monitor.chart.cpu'),
     cpuSeries,
     function (v) { return Number(v).toFixed(1) + '%'; }, null);
 
-  // ── Memory：每个关联 PID ──
+  // ── Memory：整机系统、关联进程、每类关联进程 ──
+  var memorySeries = [
+    monitorAggregateSeries(t('monitor.series.systemUsed'), h, 'sysMemUsed', cSys),
+    monitorAggregateSeries(t('monitor.series.processTotal'), h, 'procRss', cProc),
+  ].concat(monitorProcessSeries(h, currentProcesses, 'rss'));
   monDualLine('mon-mem-chart', '_monMem', ts, isDark, t('monitor.chart.memory'),
-    monitorProcessSeries(h, currentProcesses, 'rss'),
+    memorySeries,
     function (v) { return fmtBytes(v); }, null);
 
-  // ── Message activity bar chart ──
-  var msgEl = $('#mon-msg-chart');
-  if (msgEl) {
-    if (!window._monMsg) window._monMsg = echarts.init(msgEl, isDark ? 'dark' : null);
-    window._monMsg.setOption({
-      title: { text: t('monitor.chart.activity1h'), left: 'center', top: 4, textStyle: { fontSize: 12, color: isDark ? '#e6edf3' : '#1a202c' } },
-      tooltip: { trigger: 'axis' },
-      grid: { top: 36, bottom: 24, left: 44, right: 12 },
-      xAxis: {
-        type: 'category',
-        data: [
-          t('monitor.activity.received'),
-          t('monitor.activity.completed'),
-          t('monitor.activity.errors'),
-          t('monitor.activity.interrupts'),
-          t('monitor.activity.toolErrors'),
-        ],
-        axisLabel: { fontSize: 9 },
-      },
-      yAxis: { type: 'value', minInterval: 1 },
-      series: [{
-        type: 'bar', barWidth: '45%',
-        data: [
-          { value: lh.received || 0, itemStyle: { color: css('--accent') } },
-          { value: lh.completed || 0, itemStyle: { color: css('--green') } },
-          { value: lh.errors || 0, itemStyle: { color: css('--red') } },
-          { value: lh.interrupts || 0, itemStyle: { color: css('--orange') } },
-          { value: lh.toolErrors || 0, itemStyle: { color: css('--blue') } },
-        ],
-      }],
-      animation: false,
-    });
-  }
+  // ── Disk throughput ──
+  monDualLine('mon-disk-chart', '_monDisk', ts, isDark, t('monitor.chart.disk'),
+    [
+      { name: t('monitor.series.diskRead'), data: h.map(function (p) { return p.diskReadBps || 0; }), color: css('--blue') || cProc },
+      { name: t('monitor.series.diskWrite'), data: h.map(function (p) { return p.diskWriteBps || 0; }), color: cSys },
+    ],
+    function (v) { return fmtBytes(v) + '/s'; }, null);
 
   // ── Network throughput ──
   monDualLine('mon-net-chart', '_monNet', ts, isDark, t('monitor.chart.network'),
@@ -8268,7 +8285,7 @@ function renderMonitor(data) {
 
 }
 
-// 双线时序图（进程 + 系统）。series: [{name,data,color}]
+// 时序图。series: [{name,data,color,width?,areaOpacity?}]
 function monDualLine(elId, varKey, times, isDark, title, series, fmtY, yRange) {
   var el = $('#' + elId);
   if (!el) return;
@@ -8307,8 +8324,8 @@ function monDualLine(elId, varKey, times, isDark, title, series, fmtY, yRange) {
       return {
         name: sr.name, type: 'line', data: sr.data, smooth: true, symbol: 'none',
         connectNulls: true,
-        lineStyle: { width: 2, color: sr.color },
-        areaStyle: { color: sr.color, opacity: 0.08 },
+        lineStyle: { width: sr.width || 2, color: sr.color },
+        areaStyle: { color: sr.color, opacity: sr.areaOpacity != null ? sr.areaOpacity : 0.08 },
         itemStyle: { color: sr.color },
       };
     }),
@@ -8769,8 +8786,7 @@ function renderRoleDefinitions(data) {
   }
 
   if (!data) {
-    console.warn('[roleDefinitions] No data received');
-    grid.innerHTML = '<div class="role-error">❌ 未收到角色定义数据</div>';
+    grid.innerHTML = `<div class="role-error">${esc(t('common.loading'))}</div>`;
     return;
   }
 
@@ -8877,6 +8893,8 @@ function renderDefaultRoleSelector(data) {
         alert('保存默认角色失败' + (detail ? ': ' + detail : ''));
         privateSelect.value = defaults.private;
         groupSelect.value = defaults.group;
+      } else {
+        subscribe('roleDefinitions', roleDefinitionsParams());
       }
     } catch (err) {
       console.error('[roleDefinitions] Failed to save defaultRoles:', err);
@@ -9154,6 +9172,7 @@ function renderCommandPermissionsList(roleDef, operations, readonly = false) {
 
 function renderCommandPermissionsEditor(roleDef, operations) {
   const stats = getCommandPermissionStats(roleDef?.commandPermissions);
+  const rawPermissions = formatCommandPermissions(roleDef?.commandPermissions);
   return `
     <div class="form-section command-permissions-section">
       <h4>Command / CLI Permissions</h4>
@@ -9168,6 +9187,18 @@ function renderCommandPermissionsEditor(roleDef, operations) {
           ? '清单来自后端 operation registry。每行显示当前有效权限和命中的规则；修改后会写入精确 operation 规则。若要撤销内置继承规则，请对同名 operation 设置“拒绝”。'
           : 'The list comes from the backend operation registry. Each row shows the current effective permission and matched rule. Changes are saved as exact operation rules.'}
       </div>
+      <details class="cli-raw-editor">
+        <summary>${currentLang === 'zh-CN' ? '编辑原始规则 JSON' : 'Edit raw rules JSON'}</summary>
+        <div class="cli-help">
+          ${currentLang === 'zh-CN'
+            ? '用于编辑通配符或未出现在 operation 清单中的规则。下方结构化修改会合并到这份 JSON。'
+            : 'Use this for wildcard rules or operations missing from the catalog. Structured changes below are merged into this JSON.'}
+        </div>
+        <textarea id="edit-commandPermissions"
+                  class="form-textarea cli-raw-textarea"
+                  rows="12"
+                  spellcheck="false">${esc(rawPermissions)}</textarea>
+      </details>
       ${renderCommandPermissionsList(roleDef, operations, false)}
     </div>
   `;
@@ -9209,21 +9240,24 @@ function validateCommandPermissionsClient(commandPermissions) {
 
 function collectCommandPermissions(container, fallback = {}) {
   const rows = Array.from(container.querySelectorAll('[data-command-operation]'));
-  if (rows.length === 0) {
-    const input = container.querySelector('#edit-commandPermissions');
-    if (!input) return { ok: true, value: getCommandPermissionsObject(fallback) };
+  const input = container.querySelector('#edit-commandPermissions');
+  let commandPermissions = getCommandPermissionsObject(fallback);
+
+  if (input) {
     try {
       const parsed = JSON.parse(input.value.trim() || '{}');
       const validationError = validateCommandPermissionsClient(parsed);
       if (validationError) return { ok: false, error: validationError };
-      return { ok: true, value: parsed };
+      commandPermissions = parsed;
     } catch (err) {
       return { ok: false, error: `Command permissions JSON is invalid: ${err.message}` };
     }
   }
 
+  if (rows.length === 0) return { ok: true, value: commandPermissions };
+
   const operationsById = new Map((roleOperationsCache || []).map(operation => [operation.id, operation]));
-  const commandPermissions = { ...getCommandPermissionsObject(fallback) };
+  commandPermissions = { ...commandPermissions };
 
   for (const row of rows) {
     const operationId = row.dataset.commandOperation;
@@ -9435,7 +9469,7 @@ function createRoleCard(roleName, roleDef) {
   const commandStats = getCommandPermissionStats(roleDef.commandPermissions);
 
   // 判断是否为内置角色
-  const builtinRoles = ['member', 'visitor'];
+  const builtinRoles = ['admin', 'member', 'visitor'];
   const isBuiltin = builtinRoles.includes(roleName);
 
   card.innerHTML = `
@@ -9530,6 +9564,7 @@ function initRoleDefinitionsTab() {
           alert(t('roleDefs.saveFailed'));
         } else {
           alert(t('roleDefs.saveSuccess'));
+          subscribe('roleDefinitions', roleDefinitionsParams());
         }
       } catch (err) {
         alert(t('pair.error.network'));
@@ -9575,6 +9610,7 @@ function initRoleDefinitionsTab() {
           alert(t('roleDefs.saveFailed') + ': ' + (err.error || 'unknown'));
         } else {
           alert('角色已删除');
+          subscribe('roleDefinitions', roleDefinitionsParams());
         }
       } catch (err) {
         alert(t('pair.error.network'));
@@ -10244,14 +10280,8 @@ async function showRoleEditModal(roleName, roleDef) {
   formHtml += renderRoleUsageLimitsEditor(roleDef);
 
   formHtml += `
-    <div class="role-editor-tabs" role="tablist">
-      <button type="button" class="role-editor-tab active" data-role-tab="fields">Field Permissions</button>
-      <button type="button" class="role-editor-tab" data-role-tab="cli">CLI Permissions</button>
-    </div>
-
-    <div class="role-editor-tab-panel active" data-role-tab-panel="fields">
-      <div class="form-section">
-        <h4>权限配置</h4>
+    <div class="form-section field-permissions-section">
+      <h4>Field Permissions</h4>
   `;
 
   const permissions = roleDef.permissions || {};
@@ -10421,16 +10451,13 @@ async function showRoleEditModal(roleName, roleDef) {
     formHtml += `</div>`;
   });
 
-  formHtml += `</div></div>
-    <div class="role-editor-tab-panel" data-role-tab-panel="cli">
-      ${renderCommandPermissionsEditor(roleDef, operations)}
-    </div>
+  formHtml += `</div>
+    ${renderCommandPermissionsEditor(roleDef, operations)}
   </div>`;
 
   body.innerHTML = formHtml;
 
   bindTagsInputEvents(body);
-  initRoleEditorTabs(body);
   initCommandPermissionEditor(body);
   initRoleModelPermissionEditor(body, roleName, roleDef);
 

package/dist/static/index.html

@@ -47,7 +47,7 @@
 
       </nav>
       <span style="flex:1"></span>
-      2026-07-23 12:11
+      2026-07-25 03:26
       <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>
@@ -141,7 +141,7 @@
           <div id="usage-overview" class="usage-subpanel active">
             <div class="overview-filters">
               <div class="ov-range-tabs">
-                <button class="ov-range-btn active" data-range="today" data-i18n="usage.overview.range.today">Today</button>
+                <button class="ov-range-btn active" data-range="last24" data-i18n="usage.overview.range.last24">Last 24 Hours</button>
                 <button class="ov-range-btn" data-range="week" data-i18n="usage.overview.range.week">This Week</button>
                 <button class="ov-range-btn" data-range="lastWeek" data-i18n="usage.overview.range.lastWeek">Last Week</button>
                 <button class="ov-range-btn" data-range="month" data-i18n="usage.overview.range.month">This Month</button>
@@ -218,7 +218,7 @@
                 <!-- 时间范围选择（与总览类似，但支持精确到时分秒） -->
                 <div class="exp-time-filters">
                   <div class="exp-range-tabs">
-                    <button class="exp-range-btn active" data-range="today" data-i18n="usage.overview.range.today">Today</button>
+                    <button class="exp-range-btn active" data-range="last24" data-i18n="usage.overview.range.last24">Last 24 Hours</button>
                     <button class="exp-range-btn" data-range="week" data-i18n="usage.overview.range.week">This Week</button>
                     <button class="exp-range-btn" data-range="lastWeek" data-i18n="usage.overview.range.lastWeek">Last Week</button>
                     <button class="exp-range-btn" data-range="month" data-i18n="usage.overview.range.month">This Month</button>
@@ -245,8 +245,8 @@
                   <label>
                     <span data-i18n="usage.explorer.filter.granularity">Granularity</span>
                     <select id="exp-granularity">
-                      <option value="hour" data-i18n="usage.explorer.filter.granularity.hour">Hour</option>
-                      <option value="day" selected data-i18n="usage.explorer.filter.granularity.day">Day</option>
+                      <option value="hour" selected data-i18n="usage.explorer.filter.granularity.hour">Hour</option>
+                      <option value="day" data-i18n="usage.explorer.filter.granularity.day">Day</option>
                       <option value="week" data-i18n="usage.explorer.filter.granularity.week">Week</option>
                       <option value="month" data-i18n="usage.explorer.filter.granularity.month">Month</option>
                     </select>

package/dist/static/style.css

@@ -3643,6 +3643,32 @@ tr.ag-disabled .ag-name { color: var(--dim); }
   line-height: 1.5;
 }
 
+.cli-raw-editor {
+  border: 1px solid var(--border);
+  border-radius: 6px;
+  background: var(--bg2);
+  padding: 10px 12px;
+}
+
+.cli-raw-editor summary {
+  color: var(--fg);
+  cursor: pointer;
+  font-size: 13px;
+  font-weight: 600;
+}
+
+.cli-raw-editor[open] summary {
+  margin-bottom: 8px;
+}
+
+.cli-raw-textarea {
+  margin-top: 10px;
+  min-height: 180px;
+  font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", monospace;
+  font-size: 12px;
+  line-height: 1.5;
+}
+
 .cli-category-section {
   display: flex;
   flex-direction: column;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ec-web",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Web console and monitoring dashboard for EvolCore",
   "type": "module",
   "bin": {
@@ -22,7 +22,7 @@
   "author": "",
   "license": "MIT",
   "peerDependencies": {
-    "evolcore": ">=0.0.2"
+    "evolcore": ">=0.0.3"
   },
   "dependencies": {
     "ws": "^8.18.0"