ec-web 0.0.10 → 0.0.12

package/dist/ipc-client.js

@@ -7,7 +7,22 @@
  * watch 用到的只读查询：aun-aids / aun-aid-stats / status / evolagent.list / ping
  */
 import net from 'net';
+import fs from 'fs';
+import path from 'path';
+const LOCAL_CONTROL_COMMANDS = new Set(['menu.exec', 'monitor-snapshot']);
 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();
+            if (controlToken)
+                request = { ...cmd, controlToken };
+        }
+        catch { }
+    }
     return new Promise((resolve) => {
         const conn = net.connect(socketPath);
         let buf = '';
@@ -16,7 +31,7 @@ export function ipcQuery(socketPath, cmd, timeoutMs = 3000) {
             resolve(null);
         }, timeoutMs);
         conn.on('connect', () => {
-            conn.write(JSON.stringify(cmd) + '\n');
+            conn.write(JSON.stringify(request) + '\n');
         });
         conn.on('data', (data) => {
             buf += data.toString();

package/dist/process-utils.js

@@ -66,16 +66,30 @@ function getStartTimeLinux(pid) {
     const starttimeJiffies = parseInt(tail.split(' ')[19], 10);
     if (isNaN(starttimeJiffies))
         return null;
-    let uptimeSec;
+    // Use the kernel boot timestamp, the same source as EvolCore's process
+    // introspection.  Deriving boot time as `Date.now() - /proc/uptime` can
+    // drift when the host clock is stepped while ECWeb is starting, producing
+    // instance records tens of seconds away from the real PID start time.
+    let bootSec = null;
     try {
-        uptimeSec = parseFloat(fs.readFileSync('/proc/uptime', 'utf-8').split(' ')[0]);
+        const statContent = fs.readFileSync('/proc/stat', 'utf-8');
+        const match = statContent.match(/^btime\s+(\d+)$/m);
+        if (match)
+            bootSec = parseInt(match[1], 10);
     }
-    catch {
-        return null;
+    catch { }
+    if (!bootSec || !Number.isFinite(bootSec)) {
+        let uptimeSec;
+        try {
+            uptimeSec = parseFloat(fs.readFileSync('/proc/uptime', 'utf-8').split(' ')[0]);
+        }
+        catch {
+            return null;
+        }
+        bootSec = (Date.now() - uptimeSec * 1000) / 1000;
     }
     const clkTck = 100; // 几乎所有 Linux 为 100
-    const bootMs = Date.now() - uptimeSec * 1000;
-    return Math.round(bootMs + (starttimeJiffies / clkTck) * 1000);
+    return Math.round((bootSec + (starttimeJiffies / clkTck)) * 1000);
 }
 function getStartTimeMacOS(pid) {
     const r = spawnSync('ps', ['-o', 'lstart=', '-p', String(pid)], { encoding: 'utf-8', timeout: 3000 });

package/dist/sources/msg.js

@@ -804,20 +804,35 @@ function selectedChats(chats, scope) {
         return [];
     return chats.filter(chat => scopeId(chat) === scope);
 }
+export function messageDisplayRoute(message) {
+    if (message.chatType !== 'group') {
+        return { displayFrom: message.from, displayTo: message.to };
+    }
+    return {
+        displayFrom: message.dir === 'out' ? (message.selfAID || message.from) : message.from,
+        displayTo: message.groupName || message.groupId || message.to,
+    };
+}
 function messagesFor(chats, peer, before, limit) {
     const selected = peer
         ? chats.filter(chat => chatKey(chat) === peer)
         : chats;
-    const messages = selected.flatMap(chat => chat.messages.map(msg => ({
-        ...msg,
-        channel: chat.channel,
-        channelType: chat.channelType,
-        selfAID: chat.selfAID,
-        peerName: chat.peerName,
-        groupName: chat.groupName,
-        partition: chat.partition,
-        threadName: chat.threadName,
-    })));
+    const messages = selected.flatMap(chat => chat.messages.map(msg => {
+        const message = {
+            ...msg,
+            channelType: chat.channelType,
+            selfAID: chat.selfAID,
+            peerName: chat.peerName,
+            groupName: chat.groupName,
+        };
+        return {
+            ...message,
+            channel: chat.channel,
+            partition: chat.partition,
+            threadName: chat.threadName,
+            ...messageDisplayRoute(message),
+        };
+    }));
     messages.sort((a, b) => (a.ts || 0) - (b.ts || 0));
     const end = before == null ? messages.length : Math.min(Math.max(before, 0), messages.length);
     const start = Math.max(0, end - limit);
@@ -892,7 +907,7 @@ async function buildSessionContext(chat) {
     }
     catch { }
     return {
-        sessionId: active.agentSessionId || active.id || null,
+        sessionId: active.id || null,
         evolcoreSessionId: active.id || null,
         name: active.name || null,
         baseagent: active.baseagent || active.agentType || null,

package/dist/sources/session-codex.js

@@ -430,6 +430,18 @@ function toolOutputText(output) {
         return String(output);
     }
 }
+function classifyCodexToolRejection(text) {
+    const normalized = text.replace(/\\(["'])/g, '$1');
+    if (!/Rejected\(\s*["']rejected by user["']\s*\)/i.test(normalized))
+        return undefined;
+    const isManagedEcSend = /(?:^|[/'\s])ec\s+(?:msg|group)\s+send\b/i.test(text);
+    return {
+        kind: 'approval_rejected',
+        source: isManagedEcSend ? 'evolcore-policy' : 'codex-approval',
+        reason: 'rejected_by_user',
+        executed: false,
+    };
+}
 export function parseCodexToolEvent(event) {
     if (!event || (event.type !== 'event_msg' && event.type !== 'response_item') || !event.payload)
         return null;
@@ -457,6 +469,8 @@ export function parseCodexToolEvent(event) {
         };
     }
     if (payload.type === 'function_call_output' || payload.type === 'custom_tool_call_output') {
+        const text = toolOutputText(payload.output);
+        const rejection = classifyCodexToolRejection(text);
         return {
             kind: 'result',
             callId,
@@ -467,8 +481,9 @@ export function parseCodexToolEvent(event) {
                 category: 'tool_result',
                 blocks: [{
                         kind: 'tool_result',
-                        text: toolOutputText(payload.output),
-                        isError: payload.is_error === true || payload.status === 'failed',
+                        text,
+                        isError: payload.is_error === true || payload.status === 'failed' || !!rejection,
+                        ...(rejection ? { rejection } : {}),
                     }],
             },
         };

package/dist/static/app.js

@@ -278,7 +278,7 @@ const translations = {
     'messages.msgType.command': '命令',
     'messages.groupCount': '群 {count}',
     'messages.privateCount': '单 {count}',
-    'messages.session.field.sessionId': '会话 ID',
+    'messages.session.field.sessionId': 'EvolCore 会话 ID',
     'messages.session.field.baseagent': 'Baseagent',
     'messages.session.field.chatMode': '模式',
     'messages.session.field.permissionMode': '权限',
@@ -342,6 +342,11 @@ const translations = {
     'sessions.block.thinking': '思考',
     'sessions.block.result': '结果',
     'sessions.block.resultError': '结果',
+    'sessions.block.rejection.title': '已拦截',
+    'sessions.block.rejection.source.policy': 'EvolCore 策略自动拦截',
+    'sessions.block.rejection.source.approval': '审批通道拒绝',
+    'sessions.block.rejection.notExecuted': '命令未执行',
+    'sessions.block.rejection.reason': '底层返回：Rejected("rejected by user")',
     'sessions.content.expand': '展开内容',
     'sessions.content.collapse': '收起内容',
     'sessions.contextTitle': '最后一轮喂给模型的完整上下文大小',
@@ -628,6 +633,7 @@ const translations = {
     'triggers.error.promptRequired': 'Prompt 不能为空',
     'triggers.error.channelRequired': '目标渠道不能为空',
     'triggers.error.channelIdRequired': '渠道 ID 不能为空',
+    'triggers.error.chatTypeRequired': 'AUN 目标必须选择私聊或群聊',
     'triggers.error.scriptPathRequired': '脚本路径不能为空',
     'triggers.error.scriptRuntimeRequired': '脚本运行时不能为空',
     'triggers.error.threadRequired': '指定话题会话时必须填写话题会话 ID',
@@ -676,6 +682,9 @@ const translations = {
     'triggers.delivery.off': '禁用',
     'triggers.field.targetChannel': '渠道实例',
     'triggers.field.channelId': '渠道 ID',
+    'triggers.field.chatType': '会话类型',
+    'triggers.chatType.private': '私聊',
+    'triggers.chatType.group': '群聊',
     'triggers.field.sessionStrategy': '会话选择',
     'triggers.field.threadId': '话题会话 ID',
     'triggers.field.maxRuns': '最大执行次数',
@@ -1166,7 +1175,7 @@ const translations = {
     'messages.msgType.command': 'Command',
     'messages.groupCount': '{count} groups',
     'messages.privateCount': '{count} private',
-    'messages.session.field.sessionId': 'Session ID',
+    'messages.session.field.sessionId': 'EvolCore Session ID',
     'messages.session.field.baseagent': 'Baseagent',
     'messages.session.field.chatMode': 'Mode',
     'messages.session.field.permissionMode': 'Perm',
@@ -1230,6 +1239,11 @@ const translations = {
     'sessions.block.thinking': 'Thinking',
     'sessions.block.result': 'Result',
     'sessions.block.resultError': 'Result',
+    'sessions.block.rejection.title': 'Intercepted',
+    'sessions.block.rejection.source.policy': 'EvolCore policy auto-blocked',
+    'sessions.block.rejection.source.approval': 'Approval channel rejected',
+    'sessions.block.rejection.notExecuted': 'Command was not executed',
+    'sessions.block.rejection.reason': 'Backend response: Rejected("rejected by user")',
     'sessions.content.expand': 'Expand content',
     'sessions.content.collapse': 'Collapse content',
     'sessions.contextTitle': 'Full context size sent to the model in the last turn',
@@ -1516,6 +1530,7 @@ const translations = {
     'triggers.error.promptRequired': 'Prompt is required',
     'triggers.error.channelRequired': 'Target channel is required',
     'triggers.error.channelIdRequired': 'Channel ID is required',
+    'triggers.error.chatTypeRequired': 'AUN targets require Private or Group chat type',
     'triggers.error.scriptPathRequired': 'Script path is required',
     'triggers.error.scriptRuntimeRequired': 'Script runtime is required',
     'triggers.error.threadRequired': 'Topic session ID is required',
@@ -1564,6 +1579,9 @@ const translations = {
     'triggers.delivery.off': 'Disabled',
     'triggers.field.targetChannel': 'Channel instance',
     'triggers.field.channelId': 'Channel ID',
+    'triggers.field.chatType': 'Chat Type',
+    'triggers.chatType.private': 'Private',
+    'triggers.chatType.group': 'Group',
     'triggers.field.sessionStrategy': 'Session Selection',
     'triggers.field.threadId': 'Topic Session ID',
     'triggers.field.maxRuns': 'Max Runs',
@@ -3234,7 +3252,7 @@ function renderMsg(data) {
   for (const m of messages) {
     const cls = m.dir === 'in' ? 'in' : 'out';
     const arrow = m.dir === 'in' ? '↓' : '↑';
-    const from = shortId(m.from), to = shortId(m.to);
+    const from = shortId(m.displayFrom || m.from), to = shortId(m.displayTo || m.to);
     const tags = [];
     if (m.channelType) tags.push(m.channelType);
     if (m.chatType === 'group') tags.push(t('messages.tag.group'));
@@ -3682,11 +3700,23 @@ function renderBlocks(blocks, options = {}) {
         : '';
       out += `<details class="blk blk-tool" open><summary class="tool-head">${icon} <span class="tool-name">${esc(tool)}</span></summary>${toolParams}</details>`;
     } else if (b.kind === 'tool_result') {
-      const cls = b.isError ? 'blk-result err' : 'blk-result';
+      const rejection = b.rejection?.kind === 'approval_rejected' ? b.rejection : undefined;
+      const cls = b.isError ? `blk-result err${rejection ? ' rejection' : ''}` : 'blk-result';
       const loadFull = b.truncated && b.resultKey
         ? `<button class="ctrl-btn result-load-full" type="button" data-result-key="${esc(b.resultKey)}">${t('sessions.loadFullResult') || '加载完整结果'}</button>`
         : '';
-      out += `<details class="blk ${cls}" open><summary>${b.isError ? '✗ ' + t('sessions.block.resultError') : '↳ ' + t('sessions.block.result')}</summary>` +
+      const rejectionMeta = rejection
+        ? '<div class="result-rejection-meta">' +
+          `<span class="result-rejection-badge">⚠ ${t('sessions.block.rejection.title')}</span>` +
+          `<span>${rejection.source === 'evolcore-policy' ? t('sessions.block.rejection.source.policy') : t('sessions.block.rejection.source.approval')}</span>` +
+          `<span>${t('sessions.block.rejection.notExecuted')}</span>` +
+          `<span class="result-rejection-reason">${t('sessions.block.rejection.reason')}</span>` +
+          '</div>'
+        : '';
+      const resultLabel = rejection
+        ? t('sessions.block.rejection.title')
+        : b.isError ? t('sessions.block.resultError') : t('sessions.block.result');
+      out += `<details class="blk ${cls}" open><summary>${b.isError ? '✗ ' : '↳ '}${resultLabel}</summary>${rejectionMeta}` +
         `<div class="result-content collapse-content"><pre class="result-body collapse-body">${esc(b.text)}</pre>${loadFull}<button class="collapse-arrow-toggle" type="button" hidden aria-expanded="false"><span class="collapse-arrow-icon" aria-hidden="true"></span></button></div></details>`;
     } else if (b.kind === 'subtask') {
       const knownStatuses = ['running', 'completed', 'failed', 'stopped', 'killed'];
@@ -5361,6 +5391,10 @@ const TRIGGER_TARGET_SESSIONS = [
   ['main', () => t('triggers.session.main')],
   ['thread', () => t('triggers.session.thread')],
 ];
+const TRIGGER_TARGET_CHAT_TYPES = [
+  ['private', () => t('triggers.chatType.private')],
+  ['group', () => t('triggers.chatType.group')],
+];
 const TRIGGER_CONCURRENCY_OPTIONS = [
   ['forbid', () => t('triggers.concurrency.forbid')],
   ['replace', () => t('triggers.concurrency.replace')],
@@ -5873,6 +5907,7 @@ function triggerPrimaryTarget(definition) {
       channelId: definition.origin.channelId || definition.origin.peerId || '',
       session: definition.origin.session || 'main',
       threadId: definition.origin.threadId || '',
+      chatType: definition.origin.delivery?.chatType || '',
     };
   }
   return null;
@@ -5949,6 +5984,7 @@ function triggerOriginalEditState(t) {
     templateFailure: String(feedback.onFailure?.template ?? ''),
     targetChannel: String(target.channelKey ?? t?.targetChannel ?? ''),
     targetChannelId: String(target.channelId ?? t?.targetChannelId ?? ''),
+    targetChatType: String(target.chatType ?? ''),
     targetSessionStrategy: triggerUiSessionStrategy(target.session ?? t?.targetSessionStrategy),
     targetThreadId: String(target.threadId ?? t?.targetThreadId ?? ''),
     maxRuns: limits.maxRuns == null ? '' : String(limits.maxRuns),
@@ -6838,6 +6874,7 @@ function readTriggerEditValues(root) {
     templateFailure: root.querySelector('#trig-edit-template-failure')?.value || '',
     targetChannel: (root.querySelector('#trig-edit-channel')?.value || '').trim(),
     targetChannelId: (root.querySelector('#trig-edit-channel-id')?.value || '').trim(),
+    targetChatType: root.querySelector('#trig-edit-chat-type')?.value || '',
     targetSessionStrategy: root.querySelector('#trig-edit-session-strategy')?.value || 'main',
     targetThreadId: (root.querySelector('#trig-edit-thread')?.value || '').trim(),
     maxRuns: (root.querySelector('#trig-edit-max-runs')?.value || '').trim(),
@@ -6907,6 +6944,7 @@ function triggerEditScheduleChanged(original, values) {
 function triggerEditTargetChanged(original, values) {
   return values.targetChannel !== original.targetChannel
     || values.targetChannelId !== original.targetChannelId
+    || values.targetChatType !== original.targetChatType
     || values.targetSessionStrategy !== original.targetSessionStrategy
     || values.targetThreadId !== original.targetThreadId;
 }
@@ -6973,6 +7011,8 @@ function triggerDefinitionFromEdit(original, values, eventFilter, feedbackStrate
     const target = triggerEditableObject(feedback.target);
     target.channelKey = values.targetChannel;
     target.channelId = values.targetChannelId;
+    if (values.targetChatType) target.chatType = values.targetChatType;
+    else delete target.chatType;
     target.session = values.targetSessionStrategy;
     if (values.targetSessionStrategy === 'thread') target.threadId = values.targetThreadId;
     else delete target.threadId;
@@ -7046,6 +7086,9 @@ function collectTriggerEditPatch(ctx) {
   if (feedbackStrategy === 'target') {
     if (!values.targetChannel) return { error: t('triggers.error.channelRequired') };
     if (!values.targetChannelId) return { error: t('triggers.error.channelIdRequired') };
+    if ((values.targetChannel === 'aun' || values.targetChannel.startsWith('aun#')) && !values.targetChatType) {
+      return { error: t('triggers.error.chatTypeRequired') };
+    }
     if (values.targetSessionStrategy === 'thread' && !values.targetThreadId) return { error: t('triggers.error.threadRequired') };
   }
   if (values.maxRuns) {
@@ -7191,6 +7234,7 @@ function openTriggerEditDrawer(id, agent) {
           `<div id="trig-edit-target-fields" class="ag-edit-grid trig-edit-grid">` +
             `<label class="ag-edit-field"><span>${t('triggers.field.targetChannel')}</span><select id="trig-edit-channel">${channelOptions}</select></label>` +
             `<label class="ag-edit-field"><span>${t('triggers.field.channelId')}</span><input id="trig-edit-channel-id" type="text" autocomplete="off" spellcheck="false" value="${esc(original.targetChannelId)}"></label>` +
+            `<label class="ag-edit-field"><span>${t('triggers.field.chatType')}</span><select id="trig-edit-chat-type">${triggerOptionHtml(TRIGGER_TARGET_CHAT_TYPES, original.targetChatType, t('common.none'))}</select></label>` +
             `<label class="ag-edit-field"><span>${t('triggers.field.sessionStrategy')}</span><select id="trig-edit-session-strategy">${triggerOptionHtml(TRIGGER_TARGET_SESSIONS, original.targetSessionStrategy, null)}</select></label>` +
             `<label id="trig-edit-thread-field" class="ag-edit-field ag-edit-field-wide"><span>${t('triggers.field.threadId')}</span><input id="trig-edit-thread" type="text" autocomplete="off" spellcheck="false" value="${esc(original.targetThreadId)}"></label>` +
           `</div>` +

package/dist/static/index.html

@@ -48,7 +48,7 @@
 
       </nav>
       <span style="flex:1"></span>
-      2026-08-11 03:04
+      2026-08-21 14:14
       <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

@@ -540,6 +540,17 @@ tr:hover td { background: var(--bg2); }
 .blk-result { font-size: 12px; }
 .blk-result summary { cursor: pointer; color: var(--dim); }
 .blk-result.err summary { color: var(--red); }
+.result-rejection-meta {
+  display: flex; flex-wrap: wrap; align-items: center; gap: 6px 10px;
+  margin-top: 7px; color: var(--dim); font-size: 11px;
+}
+.result-rejection-badge {
+  display: inline-flex; align-items: center; gap: 4px;
+  padding: 2px 7px; border: 1px solid color-mix(in srgb, var(--red) 45%, var(--border));
+  border-radius: 4px; color: var(--red); background: color-mix(in srgb, var(--red) 8%, transparent);
+  font-weight: 600;
+}
+.result-rejection-reason { flex-basis: 100%; overflow-wrap: anywhere; }
 .collapse-content { position: relative; }
 .result-content { --collapse-fade-bg: var(--bg); margin-top: 6px; }
 .collapse-content::after {

package/package.json

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