ec-web 0.0.7 → 0.0.9

package/dist/paths.js

@@ -42,6 +42,7 @@ export function resolvePaths() {
     const root = resolveRoot();
     return {
         root,
+        daemonConfig: path.join(root, 'daemon.json'),
         sessionsDir: path.join(root, 'agents'),
         instanceDir: path.join(root, 'data', 'instance'),
         dataDir: path.join(root, 'data'),

package/dist/sources/system.js

@@ -1,7 +1,7 @@
 /**
  * System 数据源 — 纯进程级看板。
  *
- * snapshot: menu.list（探活）+ menu.query name=system（version/fastaunVersion/uptime/pid/node）。
+ * snapshot: menu.list（探活）+ menu.query name=system（version/fastaunVersion/uptime/pid/nodejs）。
  * 另注入 ecwebVersion（ECWeb 进程自身 package.json 版本，由 server.ts 合并，不走 daemon IPC）。
  * check / upgrade 结果不在快照里——由前端按钮触发 menu.action 后写入 state。
  *

package/dist/sources/triggers.js

@@ -24,6 +24,20 @@ function readTriggerControlToken(instanceDir) {
         return undefined;
     }
 }
+/**
+ * The system upgrade trigger belongs to the daemon/control AID, which is not
+ * returned by the regular self-agent menu. Read the process-level config so
+ * the Triggers view can include that scheduler owner in its agent selector.
+ */
+function readDaemonOwnerAid(p) {
+    try {
+        const raw = JSON.parse(fs.readFileSync(p.daemonConfig, 'utf8'));
+        return typeof raw?.aid === 'string' && raw.aid.trim() ? raw.aid.trim() : '__daemon__';
+    }
+    catch {
+        return null;
+    }
+}
 function normalizeAgent(item) {
     const aid = String(item?.value || item?.aid || '').trim();
     if (!aid)
@@ -102,6 +116,19 @@ async function buildSnapshot(params) {
     const agentInfos = agents
         .map((item) => normalizeAgent({ ...runtimeByAid.get(String(item?.value || item?.aid || '')), ...item }))
         .filter((x) => !!x);
+    const controlAid = readDaemonOwnerAid(p);
+    if (controlAid) {
+        const daemonOwnerAid = agentInfos.some(agentInfo => agentInfo.aid === controlAid)
+            ? `${controlAid}#daemon`
+            : controlAid;
+        if (!agentInfos.some(agentInfo => agentInfo.aid === daemonOwnerAid)) {
+            agentInfos.push({
+                aid: daemonOwnerAid,
+                label: `${daemonOwnerAid} (daemon)`,
+                channels: ['daemon'],
+            });
+        }
+    }
     if (agent) {
         const found = agentInfos.find((x) => x.aid === agent);
         const triggers = await listTriggersForAgent(agent, found?.label || agent);

package/dist/static/app.js

@@ -139,7 +139,8 @@ const translations = {
     'agents.daemonStopped': '⚠ Daemon 主进程未运行，仅显示最近活动记录',
     'agents.empty.disabled': '暂无禁用 Agent',
     'agents.empty.enabled': '暂无启用 Agent',
-    'agents.stats.gateway': 'Gateway',
+    'agents.stats.gateway': 'Daemon Gateway',
+    'agents.stats.openGatewayDrawer': '查看全部 AUN 网关',
     'agents.stats.aids': 'AIDs',
     'agents.stats.total': 'total',
     'agents.stats.online': '在线',
@@ -148,6 +149,13 @@ const translations = {
     'agents.stats.version': 'Version',
     'agents.stats.pid': 'PID',
     'agents.stats.uptime': 'Uptime',
+    'agents.gatewayDrawer.title': 'AUN 网关',
+    'agents.gatewayDrawer.control': 'Daemon 控制 AID',
+    'agents.gatewayDrawer.agent': 'Agent',
+    'agents.gatewayDrawer.unresolved': '等待发现网关',
+    'agents.gatewayDrawer.empty': '暂无 AUN 连接状态',
+    'agents.gatewayDrawer.reconnects': '重连 {count}',
+    'agents.gatewayDrawer.connectedFor': '已连接 {duration}',
 
     // Agent table headers
     'agents.th.agent': 'Agent',
@@ -1019,7 +1027,8 @@ const translations = {
     'agents.daemonStopped': '⚠ Daemon process is not running, showing recent activity only',
     'agents.empty.disabled': 'No disabled agents',
     'agents.empty.enabled': 'No enabled agents',
-    'agents.stats.gateway': 'Gateway',
+    'agents.stats.gateway': 'Daemon Gateway',
+    'agents.stats.openGatewayDrawer': 'View all AUN gateways',
     'agents.stats.aids': 'AIDs',
     'agents.stats.total': 'total',
     'agents.stats.online': 'online',
@@ -1028,6 +1037,13 @@ const translations = {
     'agents.stats.version': 'Version',
     'agents.stats.pid': 'PID',
     'agents.stats.uptime': 'Uptime',
+    'agents.gatewayDrawer.title': 'AUN Gateways',
+    'agents.gatewayDrawer.control': 'Daemon control AID',
+    'agents.gatewayDrawer.agent': 'Agent',
+    'agents.gatewayDrawer.unresolved': 'Gateway discovery pending',
+    'agents.gatewayDrawer.empty': 'No AUN connection status available',
+    'agents.gatewayDrawer.reconnects': '{count} reconnects',
+    'agents.gatewayDrawer.connectedFor': 'connected {duration}',
 
     // Agent table headers
     'agents.th.agent': 'Agent',
@@ -2469,6 +2485,7 @@ function compareVer(a, b) {
 // 逐 AID 异步操作状态：aid → 操作中的描述文字
 const _agentOps = new Map(); // Map<aid, string>
 let _agSubtab = 'enabled'; // 'enabled' | 'disabled'
+let _gatewayDrawer = null;
 
 // 工作状态徽标：一旦收到过消息就不再回 connected。
 // stopped → connected(仅首次连接无消息时) → idle(收到第一条后) → working → idle ...
@@ -2640,7 +2657,138 @@ function initMsgTipFloat() {
   window.addEventListener('scroll', hideNow, true);
 }
 
-// 顶部统计条：Gateway / AIDs total·connected·offline / Messages / Version·PID·Uptime
+function gatewayConnectionStatus(entry) {
+  const status = String(entry?.status || '').trim().toLowerCase();
+  if (status) return status;
+  return entry?.connected === true ? 'connected' : 'disconnected';
+}
+
+function gatewayConnectionStatusClass(entry) {
+  const status = gatewayConnectionStatus(entry);
+  if (status === 'connected') return 'on';
+  if (status === 'connecting' || status === 'reconnecting') return 'idle';
+  return 'off';
+}
+
+function gatewayConnectionStatusLabel(entry) {
+  const status = gatewayConnectionStatus(entry);
+  if (status === 'connected') return t('status.connected');
+  if (status === 'connecting') return t('status.connecting');
+  if (status === 'reconnecting') return t('status.reconnecting');
+  if (status === 'disconnected') return t('status.disconnected');
+  return status || t('common.unknown');
+}
+
+function gatewayConnectionUrl(entry) {
+  return typeof entry?.gatewayUrl === 'string' ? entry.gatewayUrl.trim() : '';
+}
+
+function gatewayConnections(data, aids) {
+  const connections = [];
+  const control = data?.status?.controlAid;
+  if (control?.aid) connections.push({ ...control, role: 'control' });
+  for (const aid of Array.isArray(aids) ? aids : []) {
+    if (aid?.aid) connections.push({ ...aid, role: 'agent' });
+  }
+  return connections;
+}
+
+function groupGatewayConnections(data, aids) {
+  const groups = [];
+  const byGateway = new Map();
+  for (const connection of gatewayConnections(data, aids)) {
+    const url = gatewayConnectionUrl(connection);
+    const key = url || '__unresolved__';
+    let group = byGateway.get(key);
+    if (!group) {
+      group = { url, connections: [] };
+      byGateway.set(key, group);
+      groups.push(group);
+    }
+    group.connections.push(connection);
+  }
+  return groups;
+}
+
+function gatewayConnectionHtml(connection) {
+  const status = gatewayConnectionStatusLabel(connection);
+  const meta = [status];
+  if (gatewayConnectionStatus(connection) === 'connected' && connection.lastConnectedAt) {
+    meta.push(tf('agents.gatewayDrawer.connectedFor', {
+      duration: fmtDur((Date.now() - connection.lastConnectedAt) / 1000),
+    }));
+  }
+  if (connection.reconnectCount) {
+    meta.push(tf('agents.gatewayDrawer.reconnects', { count: connection.reconnectCount }));
+  }
+  const role = connection.role === 'control'
+    ? t('agents.gatewayDrawer.control')
+    : t('agents.gatewayDrawer.agent');
+  const error = connection.lastError
+    ? `<div class="gateway-connection-error">${esc(connection.lastError)}</div>`
+    : '';
+  return `<div class="gateway-connection">` +
+    `<span class="dot ${gatewayConnectionStatusClass(connection)}" title="${esc(status)}"></span>` +
+    '<div class="gateway-connection-main">' +
+    `<div class="gateway-connection-id"><span class="gateway-connection-role">${esc(role)}</span><code>${esc(connection.aid)}</code></div>` +
+    `<div class="gateway-connection-meta">${meta.map(esc).join(' · ')}</div>` +
+    error +
+    '</div></div>';
+}
+
+function gatewayDrawerContentHtml(data, aids) {
+  const groups = groupGatewayConnections(data, aids);
+  if (!groups.length) return `<div class="empty">${t('agents.gatewayDrawer.empty')}</div>`;
+  return groups.map(group => {
+    const connected = group.connections.filter(connection => gatewayConnectionStatus(connection) === 'connected').length;
+    const url = group.url || t('agents.gatewayDrawer.unresolved');
+    return '<section class="gateway-group">' +
+      '<header class="gateway-group-head">' +
+      `<code class="gateway-group-url" title="${esc(url)}">${esc(url)}</code>` +
+      `<span class="gateway-group-count">${connected}/${group.connections.length} ${t('agents.stats.online')}</span>` +
+      '</header>' +
+      `<div class="gateway-connection-list">${group.connections.map(gatewayConnectionHtml).join('')}</div>` +
+      '</section>';
+  }).join('');
+}
+
+function closeGatewayDrawer() {
+  const ctx = _gatewayDrawer;
+  if (!ctx) return;
+  document.removeEventListener('keydown', ctx.onKeydown);
+  try { ctx.backdrop.remove(); } catch {}
+  _gatewayDrawer = null;
+}
+
+function openGatewayDrawer(data, aids) {
+  closeGatewayDrawer();
+  const wrap = document.createElement('div');
+  wrap.innerHTML = `<div class="ag-edit-backdrop gateway-drawer-backdrop" id="gateway-drawer-backdrop">` +
+    `<aside class="ag-edit-drawer gateway-drawer" role="dialog" aria-modal="true" aria-labelledby="gateway-drawer-title">` +
+    '<header class="ag-edit-head">' +
+    `<div id="gateway-drawer-title" class="ag-edit-title">${t('agents.gatewayDrawer.title')}</div>` +
+    `<button class="ag-edit-close" id="gateway-drawer-close" type="button" aria-label="${t('common.close')}">×</button>` +
+    '</header>' +
+    `<div class="gateway-drawer-body">${gatewayDrawerContentHtml(data, aids)}</div>` +
+    '</aside></div>';
+  const backdrop = wrap.firstChild;
+  document.body.appendChild(backdrop);
+  const ctx = {
+    backdrop,
+    onKeydown: e => { if (e.key === 'Escape') closeGatewayDrawer(); },
+  };
+  _gatewayDrawer = ctx;
+  backdrop.addEventListener('click', e => { if (e.target === backdrop) closeGatewayDrawer(); });
+  backdrop.querySelector('#gateway-drawer-close').addEventListener('click', closeGatewayDrawer);
+  document.addEventListener('keydown', ctx.onKeydown);
+}
+
+function refreshGatewayDrawer(data, aids) {
+  const body = _gatewayDrawer?.backdrop?.querySelector('.gateway-drawer-body');
+  if (body) body.innerHTML = gatewayDrawerContentHtml(data, aids);
+}
+
+// 顶部统计条：Daemon Gateway / AIDs total·connected·offline / Messages / Version·PID·Uptime
 function agentsStatsBar(data, aids, agentStats) {
   const connected = aids.filter(a => (a.status || 'connected') === 'connected').length;
   const offline = aids.length - connected;
@@ -2652,15 +2800,16 @@ function agentsStatsBar(data, aids, agentStats) {
     errors += s.errors || 0;
     interrupts += s.interrupts || 0;
   }
-  const gws = [...new Set(aids.filter(a => a.gatewayUrl).map(a => a.gatewayUrl))];
-  const gw = gws.length ? gws.map(esc).join(', ') : '—';
+  const control = data?.status?.controlAid;
+  const gw = gatewayConnectionUrl(control) || (control?.aid ? t('agents.gatewayDrawer.unresolved') : '—');
   const st = data.status || {};
   const pid = st.pid != null ? st.pid : '—';
   const uptime = st.uptime != null ? fmtDur(st.uptime / 1000) : '—';
   const ver = data.version || '—';
 
   let h = '<div class="agents-stats">';
-  h += `<span class="sg"><span class="sg-k">${t('agents.stats.gateway')}</span><span class="sg-gw">${gw}</span></span>`;
+  h += `<span class="sg"><span class="sg-k">${t('agents.stats.gateway')}</span><span class="dot ${gatewayConnectionStatusClass(control)}"></span><span class="sg-gw">${esc(gw)}</span>` +
+    `<button id="gateway-drawer-open" class="sg-gateway-open" type="button" title="${t('agents.stats.openGatewayDrawer')}" aria-label="${t('agents.stats.openGatewayDrawer')}">›</button></span>`;
   h += `<span class="sg"><span class="sg-k">${t('agents.stats.aids')}</span>${aids.length} ${t('agents.stats.total')} · <span class="num-on">${connected} ${t('agents.stats.online')}</span>` +
     `${offline ? ` · <span class="num-off">${offline} ${t('agents.stats.offline')}</span>` : ''}</span>`;
   h += `<span class="sg"><span class="sg-k">${t('agents.stats.messages')}</span>${t('monitor.th.received')} ${recv} · ${t('monitor.th.sent')} ${sent} · ${t('monitor.th.errors')} ${errors} · ${t('monitor.th.interrupts')} ${interrupts} · ${t('monitor.th.completed')} ${done}</span>`;
@@ -2724,6 +2873,7 @@ function renderAgents(data) {
 
   const allAgents = data.agents || [];
   const aids = data.aids || [];
+  refreshGatewayDrawer(data, aids);
   const statsByAid = {};
   for (const s of (data.stats || [])) statsByAid[s.aid] = s;
   const agentStatsByAid = {};
@@ -3677,6 +3827,9 @@ function ensureOpsOutsideClose() {
 
 function bindAgentsEvents(el) {
   el.querySelector('#agent-new-btn')?.addEventListener('click', agentOpNew);
+  el.querySelector('#gateway-drawer-open')?.addEventListener('click', () => {
+    openGatewayDrawer(state.agents, state.agents?.aids || []);
+  });
   ensureOpsOutsideClose();
   // 子标签切换：仅切视图变量并重渲，不重新订阅
   el.querySelectorAll('.ag-subtab').forEach(btn => {
@@ -4956,7 +5109,7 @@ function renderSystem(data) {
     remote: up.ecweb.remote,
     hasUpdate: !!(up.ecweb.remote && data.ecwebVersion && compareVer(data.ecwebVersion, up.ecweb.remote) < 0),
   } : null);
-  html += `<div class="cache-card"><div class="card-label">NodeJS</div><div class="card-val">${esc(sys.node || '—')}</div></div>`;
+  html += `<div class="cache-card"><div class="card-label">NodeJS</div><div class="card-val">${esc(sys.nodejs || '—')}</div></div>`;
   html += `<div class="cache-card"><div class="card-label">${t('system.card.uptime')}</div><div class="card-val">${esc(fmtDur(sys.uptime))}</div></div>`;
   html += `<div class="cache-card"><div class="card-label">PID</div><div class="card-val">${sys.pid || '—'}</div></div>`;
   html += '</div>';

package/dist/static/index.html

@@ -48,7 +48,7 @@
 
       </nav>
       <span style="flex:1"></span>
-      2026-08-03 19:27
+      2026-08-06 06:08
       <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/dist/static/style.css

@@ -1011,11 +1011,61 @@ tr.ag-disabled .ag-name { color: var(--dim); }
 .agents-stats .sg { display: inline-flex; align-items: center; gap: 5px; white-space: nowrap; }
 .agents-stats .sg-k { color: var(--green); font-weight: 600; }
 .agents-stats .sg-gw { font-family: ui-monospace, Consolas, monospace; color: var(--fg); }
+.agents-stats .dot { margin: 0; }
+.sg-gateway-open {
+  width: 22px;
+  height: 22px;
+  padding: 0;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  background: transparent;
+  color: var(--dim);
+  cursor: pointer;
+  font: 16px/1 ui-monospace, Consolas, monospace;
+}
+.sg-gateway-open:hover,
+.sg-gateway-open:focus-visible { color: var(--accent); border-color: var(--border); outline: none; }
 .agents-stats .num-on { color: var(--green); font-weight: 600; }
 .agents-stats .num-off { color: var(--red); font-weight: 600; }
 .agents-stats .in { color: var(--green); }
 .agents-stats .out { color: var(--blue); }
 
+/* AUN 网关状态抽屉 */
+.gateway-drawer { width: min(680px, 100vw); }
+.gateway-drawer-body { flex: 1; overflow-y: auto; padding: 0 18px 18px; }
+.gateway-group { padding: 18px 0; border-bottom: 1px solid var(--border); }
+.gateway-group:last-child { border-bottom: none; }
+.gateway-group-head {
+  display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+  gap: 12px;
+  margin-bottom: 8px;
+}
+.gateway-group-url {
+  min-width: 0;
+  overflow-wrap: anywhere;
+  color: var(--accent);
+  font: 12px/1.45 ui-monospace, Consolas, monospace;
+}
+.gateway-group-count { flex-shrink: 0; color: var(--dim); font-size: 12px; font-variant-numeric: tabular-nums; }
+.gateway-connection-list { border-top: 1px solid var(--border); }
+.gateway-connection {
+  display: flex;
+  align-items: flex-start;
+  gap: 9px;
+  padding: 10px 2px;
+  border-bottom: 1px solid var(--border);
+}
+.gateway-connection:last-child { border-bottom: none; }
+.gateway-connection .dot { margin-top: 4px; flex-shrink: 0; }
+.gateway-connection-main { min-width: 0; flex: 1; }
+.gateway-connection-id { display: flex; align-items: baseline; gap: 8px; min-width: 0; }
+.gateway-connection-role { flex-shrink: 0; color: var(--dim); font-size: 11px; font-weight: 600; }
+.gateway-connection-id code { min-width: 0; overflow-wrap: anywhere; color: var(--fg); font: 12px/1.4 ui-monospace, Consolas, monospace; }
+.gateway-connection-meta { margin-top: 3px; color: var(--dim); font-size: 11px; }
+.gateway-connection-error { margin-top: 4px; color: var(--red); font-size: 11px; overflow-wrap: anywhere; }
+
 /* 两行一个 agent：主行 + 信息行 */
 #view-agents tr.ag-main > td { border-bottom: none; padding-bottom: 3px; }
 #view-agents tr.ag-sub > td { padding-top: 0; padding-bottom: 9px; color: var(--dim); }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ec-web",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "Web console and monitoring dashboard for EvolCore",
   "type": "module",
   "bin": {