ec-web 0.0.20 → 0.0.22

package/dist/sources/session-codex.js

@@ -77,6 +77,128 @@ function getDb() {
     }
     return _db;
 }
+function messageContentText(content) {
+    if (typeof content === 'string')
+        return content;
+    if (content && typeof content === 'object' && !Array.isArray(content)) {
+        return typeof content.text === 'string' ? content.text.trim() : '';
+    }
+    if (!Array.isArray(content))
+        return '';
+    return content
+        .map((part) => {
+        if (typeof part === 'string')
+            return part;
+        if (!part || typeof part !== 'object')
+            return '';
+        if (typeof part.text === 'string')
+            return part.text;
+        return '';
+    })
+        .filter(Boolean)
+        .join('\n')
+        .trim();
+}
+function parseRolloutEvents(raw) {
+    const events = [];
+    for (const line of raw.split('\n')) {
+        if (!line.trim())
+            continue;
+        try {
+            events.push(JSON.parse(line));
+        }
+        catch { }
+    }
+    return events;
+}
+/**
+ * Normalize both Codex CLI events and Codex app-server lifecycle events.
+ * The app-server writes the same message twice: response_item.message and
+ * event_msg.item_completed. We intentionally consume the latter because it
+ * carries the canonical UserMessage/AgentMessage item and stable id.
+ */
+export function parseCodexMessageEvent(event) {
+    if (!event || !event.payload)
+        return null;
+    const payload = event.payload;
+    if (event.type === 'response_item') {
+        if (payload.type !== 'message' || (payload.role !== 'user' && payload.role !== 'assistant'))
+            return null;
+        const text = messageContentText(payload.content ?? payload.message ?? payload.text);
+        if (!text)
+            return null;
+        return {
+            role: payload.role,
+            text,
+            id: String(payload.id || ''),
+        };
+    }
+    if (event.type !== 'event_msg')
+        return null;
+    if (payload.type === 'user_message' && payload.message) {
+        const text = messageContentText(payload.message);
+        if (!text)
+            return null;
+        return {
+            role: 'user',
+            text,
+            id: String(payload.id || ''),
+        };
+    }
+    if (payload.type === 'agent_message' && payload.message) {
+        const text = messageContentText(payload.message);
+        if (!text)
+            return null;
+        return {
+            role: 'assistant',
+            text,
+            id: String(payload.id || ''),
+        };
+    }
+    if (payload.type !== 'item_completed' || !payload.item)
+        return null;
+    const item = payload.item;
+    const role = item.type === 'UserMessage'
+        ? 'user'
+        : item.type === 'AgentMessage'
+            ? 'assistant'
+            : null;
+    if (!role)
+        return null;
+    const text = messageContentText(item.content ?? item.message ?? item.text);
+    if (!text)
+        return null;
+    return {
+        role,
+        text,
+        id: String(item.id || payload.id || ''),
+    };
+}
+function normalizedCodexMessages(events) {
+    // app-server emits response_item.message followed by item_completed for
+    // the same logical message; prefer lifecycle items when available. This
+    // also prevents injected context response items from being counted as user
+    // turns in an app-server rollout.
+    const hasCanonicalMessages = events.some(event => event?.type === 'event_msg' && parseCodexMessageEvent(event) !== null);
+    const out = [];
+    for (const event of events) {
+        const message = parseCodexMessageEvent(event);
+        if (!message)
+            continue;
+        if (event.type === 'response_item' && hasCanonicalMessages)
+            continue;
+        if (event.type === 'response_item' && message.role === 'user' && isSyntheticCodexContext(message.text))
+            continue;
+        out.push({ event, message });
+    }
+    return out;
+}
+function isSyntheticCodexContext(text) {
+    const trimmed = text.trimStart();
+    return trimmed.startsWith('# AGENTS.md instructions')
+        || trimmed.startsWith('<system-reminder>')
+        || trimmed.startsWith('<environment_context>');
+}
 // ── 项目列表 ──
 function listProjects() {
     const db = getDb();
@@ -110,7 +232,7 @@ function listProjects() {
     }
 }
 // ── 会话列表 ──
-const CACHE_VERSION = 2;
+const CACHE_VERSION = 4;
 const _metaCache = new Map();
 const _detailCache = new Map();
 const MAX_DETAIL_CACHE_ENTRIES = 6;
@@ -186,36 +308,29 @@ function extractMetaFromRollout(file, id) {
     catch { }
     let title = '', firstUser = '', gitBranch = '', version = '', userMsgs = 0, totalMsgs = 0;
     let hasRealUserInput = false;
-    const lines = raw.split('\n');
-    for (const line of lines) {
-        if (!line.trim())
-            continue;
-        try {
-            const event = JSON.parse(line);
-            // 提取 cwd 和 version
-            if (event.type === 'session_meta' && event.payload) {
-                if (!gitBranch && event.payload.cwd)
-                    gitBranch = event.payload.cwd;
-                if (!version && event.payload.cli_version)
-                    version = event.payload.cli_version;
-            }
-            // 提取 title（从第一个 user_message）
-            if (event.type === 'event_msg' && event.payload?.type === 'user_message' && event.payload.message) {
-                totalMsgs++;
-                userMsgs++;
-                if (!isSyntheticCliPrompt(event.payload.message, 'codex'))
-                    hasRealUserInput = true;
-                if (!firstUser) {
-                    const text = event.payload.message.trim().replace(/\s+/g, ' ');
-                    firstUser = text.substring(0, 120);
-                }
-            }
-            // 统计 assistant 消息
-            if (event.type === 'event_msg' && event.payload?.type === 'assistant_message') {
-                totalMsgs++;
+    const events = parseRolloutEvents(raw);
+    for (const event of events) {
+        // 提取 cwd 和 version
+        if (event.type === 'session_meta' && event.payload) {
+            if (!gitBranch && event.payload.cwd)
+                gitBranch = event.payload.cwd;
+            if (!version && event.payload.cli_version)
+                version = event.payload.cli_version;
+        }
+    }
+    for (const { message } of normalizedCodexMessages(events)) {
+        if (message.role === 'user') {
+            totalMsgs++;
+            userMsgs++;
+            if (!isSyntheticCliPrompt(message.text, 'codex'))
+                hasRealUserInput = true;
+            if (!firstUser) {
+                firstUser = message.text.replace(/\s+/g, ' ').substring(0, 120);
             }
         }
-        catch { }
+        else {
+            totalMsgs++;
+        }
     }
     let stat;
     try {
@@ -241,8 +356,15 @@ function extractMetaFromRollout(file, id) {
     };
 }
 function withThreadSource(meta, row) {
+    const dbFirstUser = typeof row.first_user_message === 'string'
+        ? row.first_user_message.trim().replace(/\s+/g, ' ').substring(0, 120)
+        : '';
+    const dbTitle = typeof row.title === 'string' ? row.title.trim() : '';
     return {
         ...meta,
+        title: dbTitle || meta.title,
+        firstUser: dbFirstUser || meta.firstUser,
+        hasRealUserInput: meta.hasRealUserInput || (!!dbFirstUser && !isSyntheticCliPrompt(dbFirstUser, 'codex')),
         backendSource: typeof row.source === 'string' ? row.source : '',
         threadSource: typeof row.thread_source === 'string' ? row.thread_source : '',
         evolcoreRouted: isEvolcoreRoutedMessage(row.first_user_message),
@@ -459,20 +581,32 @@ function approvalAuditFromPayload(payload) {
 }
 function classifyCodexToolRejection(text, payload) {
     const normalized = text.replace(/\\(["'])/g, '$1');
-    if (!/Rejected\(\s*["']rejected by user["']\s*\)/i.test(normalized))
+    const hookMatch = normalized.match(/(?:Command|Tool call) blocked by PreToolUse hook:\s*(.+?)(?:\.\s+(?:Command|Tool):|$)/is);
+    const genericRejected = /Rejected\(\s*["']rejected by user["']\s*\)/i.test(normalized);
+    if (!hookMatch && !genericRejected)
         return undefined;
     const audit = approvalAuditFromPayload(payload);
-    const source = audit.policyCode || audit.decisionSource?.toLowerCase().includes('policy')
+    const source = hookMatch || audit.policyCode || audit.decisionSource?.toLowerCase().includes('policy')
         ? 'evolcore-policy'
         : 'codex-approval';
+    const backendReason = hookMatch?.[1]?.trim()
+        || 'Rejected("rejected by user")';
+    const inferredPolicyCode = audit.policyCode
+        || (hookMatch && /工具调用已达到\s*\d+\s*次/.test(backendReason)
+            ? 'proactive_tool_report_required'
+            : hookMatch && /请先用\s+ec\s+(?:group\s+send|msg\s+send)/.test(backendReason)
+                ? 'proactive_first_send_required'
+                : undefined);
     return {
-        kind: 'approval_rejected',
+        kind: source === 'evolcore-policy' ? 'policy_blocked' : 'approval_rejected',
         source,
-        reason: 'rejected_by_user',
+        reason: source === 'evolcore-policy' ? 'policy_denied' : 'rejected_by_user',
         executed: false,
         evidence: audit.available ? 'structured_metadata' : 'backend_text',
-        backendReason: 'Rejected("rejected by user")',
-        audit,
+        backendReason,
+        audit: inferredPolicyCode && !audit.policyCode
+            ? { ...audit, policyCode: inferredPolicyCode }
+            : audit,
     };
 }
 export function parseCodexToolEvent(event) {
@@ -584,16 +718,9 @@ function readTranscriptFile(threadId, cwd, readStats) {
     let lastUsageKey = '';
     const seenToolCalls = new Set();
     const seenToolResults = new Set();
-    for (const line of raw.split('\n')) {
-        if (!line.trim())
-            continue;
-        let event;
-        try {
-            event = JSON.parse(line);
-        }
-        catch {
-            continue;
-        }
+    const events = parseRolloutEvents(raw);
+    const messagesByEvent = new Map(normalizedCodexMessages(events).map(({ event, message }) => [event, message]));
+    for (const event of events) {
         // 提取 session_meta
         if (event.type === 'session_meta' && event.payload) {
             if (!version && event.payload.cli_version)
@@ -624,44 +751,37 @@ function readTranscriptFile(threadId, cwd, readStats) {
                 }
             }
         }
-        // 处理消息事件
-        if (event.type === 'event_msg' && event.payload) {
-            const payload = event.payload;
-            if (payload.type === 'user_message' && payload.message) {
-                totalMsgs++;
-                userMsgs++;
-                counts.userInput++;
-                const text = payload.message.trim();
-                turns.push({
-                    role: 'user',
-                    ts: event.timestamp ? Date.parse(event.timestamp) : 0,
-                    uuid: payload.id || '',
-                    category: 'user_input',
-                    blocks: [{ kind: 'text', text }],
-                });
-            }
-            else if (payload.type === 'agent_message' && payload.message) {
-                totalMsgs++;
-                counts.modelOutput++;
-                const blocks = [];
-                // 提取 message
-                if (payload.message) {
-                    blocks.push({ kind: 'text', text: payload.message });
-                }
-                turns.push({
-                    role: 'assistant',
-                    ts: event.timestamp ? Date.parse(event.timestamp) : 0,
-                    uuid: payload.id || '',
-                    category: 'model_output',
-                    blocks,
-                });
-            }
-            else if (payload.type === 'reasoning' && payload.message) {
-                // Codex reasoning 对应 Claude 的 thinking
-                const lastTurn = turns[turns.length - 1];
-                if (lastTurn && lastTurn.role === 'assistant') {
-                    lastTurn.blocks.unshift({ kind: 'thinking', text: payload.message });
-                }
+        // 处理用户/助手消息。托管 app-server 使用 item_completed，旧版 CLI
+        // 使用 payload.type=user_message/agent_message；统一入口避免重复解析。
+        const message = messagesByEvent.get(event);
+        if (message?.role === 'user') {
+            totalMsgs++;
+            userMsgs++;
+            counts.userInput++;
+            turns.push({
+                role: 'user',
+                ts: event.timestamp ? Date.parse(event.timestamp) : 0,
+                uuid: message.id,
+                category: 'user_input',
+                blocks: [{ kind: 'text', text: message.text }],
+            });
+        }
+        else if (message?.role === 'assistant') {
+            totalMsgs++;
+            counts.modelOutput++;
+            turns.push({
+                role: 'assistant',
+                ts: event.timestamp ? Date.parse(event.timestamp) : 0,
+                uuid: message.id,
+                category: 'model_output',
+                blocks: [{ kind: 'text', text: message.text }],
+            });
+        }
+        else if (event.type === 'event_msg' && event.payload?.type === 'reasoning' && event.payload.message) {
+            // Codex reasoning 对应 Claude 的 thinking
+            const lastTurn = turns[turns.length - 1];
+            if (lastTurn && lastTurn.role === 'assistant') {
+                lastTurn.blocks.unshift({ kind: 'thinking', text: event.payload.message });
             }
         }
         const toolEvent = parseCodexToolEvent(event);
@@ -748,6 +868,9 @@ async function buildSnapshot(params) {
         metrics.totalMs = Date.now() - startedAt;
         return {
             ...m,
+            // EvolCore topics carry the user-facing name; Codex's DB title is often
+            // the routed envelope text for AUN-hosted sessions.
+            title: bind?.name?.trim() || m.title,
             sourceType: classifyTranscriptSource(bind, isCodexCliCandidate(m)),
             bound: !!bind,
             boundChannel: bind?.channelType ?? null,
@@ -781,7 +904,7 @@ async function buildSnapshot(params) {
     const transcript = metas.find(meta => meta.id === sessionId);
     const header = {
         sessionId,
-        title: detail.title,
+        title: bind?.name?.trim() || detail.title,
         model: detail.model,
         gitBranch: detail.gitBranch,
         version: detail.version,

package/dist/sources/system.js

@@ -11,6 +11,7 @@ import fs from 'fs';
 import path from 'path';
 import { resolvePaths } from '../paths.js';
 import { ipcQuery } from '../ipc-client.js';
+import { watchMenuRequestAuth } from './types.js';
 function readDefaultBaseagents() {
     try {
         const p = resolvePaths();
@@ -34,15 +35,15 @@ function readDefaultBaseagents() {
         return [];
     }
 }
-async function menuExec(payload) {
+async function menuExec(payload, params) {
     const p = resolvePaths();
-    const r = await ipcQuery(p.socket, { type: 'menu.exec', payload, auth: { source: 'ecweb', localDirect: true } }, 5000);
+    const r = await ipcQuery(p.socket, { type: 'menu.exec', payload, auth: watchMenuRequestAuth(params) }, 5000);
     return r?.ok ? r.response : null;
 }
-async function buildSnapshot() {
+async function buildSnapshot(params = {}) {
     const [listResp, sysResp] = await Promise.all([
-        menuExec({ type: 'menu.list', id: 'sys-list' }),
-        menuExec({ type: 'menu.query', id: 'sys-q', name: 'system' }),
+        menuExec({ type: 'menu.list', id: 'sys-list' }, params),
+        menuExec({ type: 'menu.query', id: 'sys-q', name: 'system' }, params),
     ]);
     const daemonRunning = listResp !== null;
     // sysResp 形如 { type:'menu.response', id, name, data | error }
@@ -58,17 +59,17 @@ async function buildSnapshot() {
 }
 export const systemSource = {
     kind: 'system',
-    async snapshot() {
-        return buildSnapshot();
+    async snapshot(params = {}) {
+        return buildSnapshot(params);
     },
-    subscribe(_params, push) {
+    subscribe(params, push) {
         let lastJson = '';
         let stopped = false;
         const tick = async () => {
             if (stopped)
                 return;
             try {
-                const snap = await buildSnapshot();
+                const snap = await buildSnapshot(params);
                 const json = JSON.stringify(snap);
                 if (json !== lastJson) {
                     lastJson = json;

package/dist/sources/triggers.js

@@ -11,9 +11,10 @@ import fs from 'fs';
 import path from 'path';
 import { resolvePaths } from '../paths.js';
 import { ipcQuery } from '../ipc-client.js';
-async function menuExec(payload) {
+import { watchMenuAuth, watchMenuRequestAuth } from './types.js';
+async function menuExec(payload, params) {
     const p = resolvePaths();
-    const r = await ipcQuery(p.socket, { type: 'menu.exec', payload, auth: { source: 'ecweb', localDirect: true } }, 5000);
+    const r = await ipcQuery(p.socket, { type: 'menu.exec', payload, auth: watchMenuRequestAuth(params) }, 5000);
     return r?.ok ? r.response : null;
 }
 function readTriggerControlToken(instanceDir) {
@@ -38,6 +39,15 @@ function readDaemonOwnerAid(p) {
         return null;
     }
 }
+function readFullAccessEnabled(p) {
+    try {
+        const raw = JSON.parse(fs.readFileSync(p.daemonConfig, 'utf8'));
+        return raw?.fullaccess?.enabled === true;
+    }
+    catch {
+        return false;
+    }
+}
 function normalizeAgent(item) {
     const aid = String(item?.value || item?.aid || '').trim();
     if (!aid)
@@ -50,17 +60,71 @@ function normalizeAgent(item) {
         baseagent: typeof item?.baseagent === 'string' ? item.baseagent : undefined,
     };
 }
+function channelTypeFromKey(channelKey) {
+    const value = typeof channelKey === 'string' ? channelKey.trim() : '';
+    if (!value)
+        return '';
+    const separator = value.indexOf('#');
+    return separator > 0 ? value.slice(0, separator) : value;
+}
+function triggerScheduleView(definition, fallback) {
+    const source = definition?.source ?? fallback?.source;
+    if (source && typeof source === 'object') {
+        switch (source.type) {
+            case 'once': return { scheduleType: 'once', scheduleValue: '' };
+            case 'delay': return { scheduleType: 'delay', scheduleValue: String(source.afterMs ?? '') };
+            case 'at': return { scheduleType: 'at', scheduleValue: String(source.at ?? '') };
+            case 'cron': return { scheduleType: 'cron', scheduleValue: String(source.expression ?? '') };
+            case 'interval': return { scheduleType: 'interval', scheduleValue: String(source.everyMs ?? '') };
+            case 'event': return { scheduleType: 'event', scheduleValue: String(source.eventPattern ?? '') };
+            default: break;
+        }
+    }
+    return {
+        scheduleType: String(fallback?.scheduleType ?? ''),
+        scheduleValue: String(fallback?.scheduleValue ?? ''),
+    };
+}
+function triggerDisplayFields(definition, fallback) {
+    const feedback = definition?.feedback ?? fallback?.feedback;
+    const origin = definition?.origin;
+    const target = feedback?.strategy === 'target'
+        ? (feedback.target ?? fallback?.feedback?.target)
+        : feedback?.strategy === 'origin'
+            ? {
+                channelKey: origin?.channelKey,
+                channelId: origin?.channelId ?? origin?.peerId,
+                channelType: origin?.channelType,
+            }
+            : null;
+    const schedule = triggerScheduleView(definition, fallback);
+    const targetChannel = target?.channelKey ?? fallback?.targetChannel ?? '';
+    const targetChannelType = target?.channelType
+        ?? fallback?.targetChannelType
+        ?? (feedback?.strategy === 'target'
+            ? channelTypeFromKey(targetChannel)
+            : (origin?.channelType ?? channelTypeFromKey(targetChannel)));
+    return {
+        scheduleType: schedule.scheduleType,
+        scheduleValue: schedule.scheduleValue,
+        targetChannel,
+        targetChannelName: targetChannel || fallback?.targetChannelName || '',
+        targetChannelId: target?.channelId ?? fallback?.targetChannelId ?? '',
+        targetChannelType,
+        createdByPeerId: origin?.peerId ?? fallback?.createdByPeerId ?? '',
+        createdByChannel: origin?.channelKey ?? fallback?.createdByChannel ?? '',
+        createdAt: definition?.createdAt ?? fallback?.createdAt,
+        updatedAt: definition?.updatedAt ?? fallback?.updatedAt,
+    };
+}
 async function listTriggersForAgent(agentAid, agentLabel) {
     const p = resolvePaths();
     const controlToken = readTriggerControlToken(p.instanceDir);
-    const resp = await menuExec({
-        type: 'menu.options',
-        id: `tr-list-${agentAid}`,
-        name: 'trigger',
-        args: { options: 'all' },
-        agent: agentAid,
-    });
-    const items = Array.isArray(resp?.data) ? resp.data : [];
+    // ECWeb is a management surface, so use the canonical Trigger IPC rather
+    // than routing through a regular Agent channel. This also covers the
+    // daemon-owned scheduler, which has no self-agent channel in the registry.
+    const resp = await ipcQuery(p.socket, { type: 'trigger.list', agentAid, all: true, controlToken }, 5000);
+    const items = Array.isArray(resp?.triggers) ? resp.triggers : [];
     return Promise.all(items.map(async (trigger) => {
         const effectiveAgentAid = trigger.agentAid || trigger.schedulerAid || agentAid;
         let definition = null;
@@ -99,14 +163,19 @@ async function listTriggersForAgent(agentAid, agentLabel) {
             revision,
             definitionError,
             subscription,
+            ...triggerDisplayFields(definition, trigger),
         };
     }));
 }
 async function buildSnapshot(params) {
     const p = resolvePaths();
+    const fullaccessEnabled = readFullAccessEnabled(p);
+    // This capability is derived from the server-injected ECWeb connection
+    // context; browser-supplied subscription parameters are never trusted for it.
+    const canApprovePersistentFullAccess = watchMenuAuth(params).canApprovePersistentFullAccess;
     const agent = typeof params?.agent === 'string' && params.agent ? params.agent : null;
     const [agentsResp, runtimeAgentsResp] = await Promise.all([
-        menuExec({ type: 'menu.options', id: 'tr-agents', name: 'agent' }),
+        menuExec({ type: 'menu.options', id: 'tr-agents', name: 'agent' }, params),
         ipcQuery(p.socket, { type: 'evolagent.list' }, 5000),
     ]);
     // menu.options 响应形如 { type:'menu.response', id, name, data: MenuItem[] }
@@ -132,11 +201,11 @@ async function buildSnapshot(params) {
     if (agent) {
         const found = agentInfos.find((x) => x.aid === agent);
         const triggers = await listTriggersForAgent(agent, found?.label || agent);
-        return { agents: agentInfos, triggers, selectedAgent: agent };
+        return { agents: agentInfos, triggers, selectedAgent: agent, fullaccessEnabled, canApprovePersistentFullAccess };
     }
     const batches = await Promise.all(agentInfos.map((x) => listTriggersForAgent(x.aid, x.label)));
     const triggers = batches.flat();
-    return { agents: agentInfos, triggers, selectedAgent: agent };
+    return { agents: agentInfos, triggers, selectedAgent: agent, fullaccessEnabled, canApprovePersistentFullAccess };
 }
 export const triggersSource = {
     kind: 'triggers',

package/dist/sources/types.js

@@ -7,4 +7,23 @@
  *
  * aid/cache 走 IPC 轮询（无推送），msg/session 走 fs.watch 文件监听。
  */
-export {};
+/** Read only the server-injected auth marker; browser parameters never decide it. */
+export function watchMenuAuth(params) {
+    const auth = params?.__menuAuth;
+    return {
+        localDirect: auth?.localDirect === true,
+        actorAid: typeof auth?.actorAid === 'string' ? auth.actorAid : null,
+        // This marker is injected by the ECWeb server, never read from browser
+        // request parameters. Authenticated ECWeb has daemon-owner authority.
+        canApprovePersistentFullAccess: auth?.canApprovePersistentFullAccess === true,
+    };
+}
+export function watchMenuRequestAuth(params) {
+    const auth = watchMenuAuth(params);
+    return {
+        source: 'ecweb',
+        localDirect: auth.localDirect,
+        actorAid: auth.actorAid ?? null,
+        canApprovePersistentFullAccess: auth.canApprovePersistentFullAccess,
+    };
+}