ec-web 0.0.26 → 0.0.27

package/dist/sources/session.js

@@ -1,9 +1,11 @@
 /**
- * 会话数据源 — 多 baseagent 支持（Claude / Codex）。
+ * 会话数据源 — 多 baseagent 支持（Claude / Codex / EC Agent）。
  *
- * 根据 params.baseagent 参数路由到对应的实现：
+ * 读取器按 base agent 标识路由，标识来自 params.baseagent，缺省时取
+ * defaults.json 的 active_baseagent（见 resolveSessionBaseagent）：
  * - claude: ~/.claude/projects/<encodedProject>/*.jsonl
  * - codex: ~/.codex/state_*.sqlite + ~/.codex/sessions/YYYY/MM/DD/*.jsonl
+ * - ecagent: $EVOLCORE_HOME/agents/<aid>/sessions/--<encodedProject>--/*.jsonl
  *
  * snapshot:
  *   - 无 sessionId: 项目列表 + 选中项目的全部 transcript 概要
@@ -15,13 +17,18 @@ import path from 'path';
 import { resolvePaths, ccProjectsDir } from '../paths.js';
 import { encodePath } from '../fs-utils.js';
 import { snapshotCodex, subscribeCodex, setDebugLog as setCodexDebugLog } from './session-codex.js';
+import { snapshotEcagent, subscribeEcagent, setDebugLog as setEcagentDebugLog } from './session-ecagent.js';
+import { resolveParentDistModule, toFileUrl } from './parent-package.js';
+// 保持原有公开面：runner 子任务聚合器从这里导出（实现见 session-origin.ts）。
+export { readRunnerTaskTurns };
 import { getAgentSelfNames } from './msg.js';
 import { parseTranscriptResultKey, previewLargeToolResults, windowTranscriptTurns } from './transcript-window.js';
-import { buildSessionBindMap, classifyTranscriptSource, isSyntheticCliPrompt, resolveSessionBindSelfName, } from './session-origin.js';
+import { buildSessionBindMap, readRunnerTaskTurns, classifyTranscriptSource, isSyntheticCliPrompt, resolveSessionBindSelfName, } from './session-origin.js';
 let _dlog = null;
 export function setDebugLog(log) {
     _dlog = log;
     setCodexDebugLog(log); // 同步传递给 Codex 模块
+    setEcagentDebugLog(log); // 同步传递给 EC Agent 模块
 }
 function dlog(line) { if (_dlog)
     try {
@@ -328,161 +335,8 @@ function resolveProject(params, projects) {
 export function buildBindMap() {
     return buildSessionBindMap();
 }
-// ── EvolCore runner 子任务事件 ──
-const RUNNER_TASK_EVENT_TYPES = new Set([
-    'runner:task-started',
-    'runner:task-progress',
-    'runner:task-notification',
-]);
+// ── EvolCore runner 子任务事件（见 session-origin.ts，与 Codex / EC Agent 会话源共用）──
 const EVENT_LOG_RE = /^events(?:-.+)?\.log$/;
-const _runnerLogCache = new Map();
-function parseRunnerTaskLines(raw) {
-    const events = [];
-    for (const line of raw.split(/\r?\n/)) {
-        if (!line.includes('"type":"runner:task-'))
-            continue;
-        try {
-            const event = JSON.parse(line);
-            if (RUNNER_TASK_EVENT_TYPES.has(event.type) && event.sessionId)
-                events.push(event);
-        }
-        catch { }
-    }
-    return events;
-}
-function readRunnerLogFile(file) {
-    let stat;
-    try {
-        stat = fs.statSync(file);
-    }
-    catch {
-        _runnerLogCache.delete(file);
-        return [];
-    }
-    let cached = _runnerLogCache.get(file);
-    if (!cached || stat.size < cached.offset)
-        cached = { offset: 0, events: [] };
-    if (stat.size === cached.offset) {
-        _runnerLogCache.set(file, cached);
-        return cached.events;
-    }
-    const bytes = stat.size - cached.offset;
-    const buffer = Buffer.allocUnsafe(bytes);
-    let fd = null;
-    try {
-        fd = fs.openSync(file, 'r');
-        fs.readSync(fd, buffer, 0, bytes, cached.offset);
-    }
-    catch {
-        return cached.events;
-    }
-    finally {
-        if (fd != null)
-            try {
-                fs.closeSync(fd);
-            }
-            catch { }
-    }
-    // 只推进到最后一个完整 JSONL 行，避免 watcher 在写入中途触发时丢事件。
-    const lastBreak = buffer.lastIndexOf(0x0a);
-    if (lastBreak < 0) {
-        _runnerLogCache.set(file, cached);
-        return cached.events;
-    }
-    const parsed = parseRunnerTaskLines(buffer.subarray(0, lastBreak + 1).toString('utf8'));
-    cached = {
-        offset: cached.offset + lastBreak + 1,
-        events: cached.events.concat(parsed),
-    };
-    _runnerLogCache.set(file, cached);
-    return cached.events;
-}
-function runnerEventTimestamp(event) {
-    const timestamp = Number(event.timestamp);
-    if (Number.isFinite(timestamp) && timestamp > 0)
-        return timestamp;
-    const parsed = event.ts ? Date.parse(event.ts) : 0;
-    return Number.isFinite(parsed) ? parsed : 0;
-}
-export function readRunnerTaskTurns(logsDir, evolSessionId) {
-    let files;
-    try {
-        files = fs.readdirSync(logsDir)
-            .filter(name => EVENT_LOG_RE.test(name))
-            .sort()
-            .map(name => path.join(logsDir, name));
-    }
-    catch {
-        return [];
-    }
-    const validFiles = new Set(files);
-    for (const cachedFile of _runnerLogCache.keys()) {
-        if (path.dirname(cachedFile) === logsDir && !validFiles.has(cachedFile))
-            _runnerLogCache.delete(cachedFile);
-    }
-    const events = files
-        .flatMap(readRunnerLogFile)
-        .filter(event => event.sessionId === evolSessionId)
-        .sort((a, b) => runnerEventTimestamp(a) - runnerEventTimestamp(b));
-    const tasks = new Map();
-    for (const event of events) {
-        const taskId = event.taskId || event.toolUseId;
-        if (!taskId)
-            continue;
-        const at = runnerEventTimestamp(event);
-        let task = tasks.get(taskId);
-        if (!task) {
-            task = {
-                taskId,
-                taskKind: event.taskKind || 'agent',
-                toolUseId: event.toolUseId || null,
-                description: event.description || taskId,
-                subagentType: event.subagentType || null,
-                status: 'running',
-                terminalReason: '',
-                progress: '',
-                lastToolName: '',
-                totalTokens: 0,
-                toolUses: 0,
-                durationMs: 0,
-                startedAt: at,
-                updatedAt: at,
-            };
-            tasks.set(taskId, task);
-        }
-        if (event.type === 'runner:task-started') {
-            task.startedAt = task.startedAt ? Math.min(task.startedAt, at) : at;
-            task.status = 'running';
-        }
-        else if (event.type === 'runner:task-progress') {
-            task.progress = event.summary || event.description || task.progress;
-        }
-        else if (event.type === 'runner:task-notification') {
-            task.status = event.status || 'completed';
-            task.terminalReason = event.terminalReason || task.terminalReason;
-        }
-        task.updatedAt = Math.max(task.updatedAt || 0, at);
-        task.taskKind = event.taskKind || task.taskKind;
-        task.toolUseId = event.toolUseId || task.toolUseId;
-        task.description = event.type === 'runner:task-progress'
-            ? task.description
-            : (event.description || task.description);
-        task.subagentType = event.subagentType || task.subagentType;
-        task.lastToolName = event.lastToolName || task.lastToolName;
-        task.totalTokens = event.usage?.totalTokens ?? event.totalTokens ?? task.totalTokens;
-        task.toolUses = event.usage?.toolUses ?? event.toolUses ?? task.toolUses;
-        task.durationMs = event.usage?.durationMs ?? event.durationMs ?? task.durationMs;
-    }
-    return Array.from(tasks.values())
-        .sort((a, b) => a.startedAt - b.startedAt)
-        .map(task => ({
-        role: 'system',
-        ts: task.startedAt,
-        uuid: `runner-task:${evolSessionId}:${task.taskId}`,
-        category: 'subtask',
-        blocks: [{ kind: 'subtask', ...task }],
-    }));
-}
 // ── 完整 transcript 解析（省略 tool 参数/chat send 检测等细节，保留费用计算）──
 const PRICING = {
     'claude-opus-4-8': [5, 6.25, 0.5, 25], 'claude-opus-4': [5, 6.25, 0.5, 25],
@@ -615,7 +469,7 @@ function readTranscriptFile(file, readStats) {
     cacheTranscriptDetail(file, stat.mtimeMs, stat.size, detail);
     return detail;
 }
-export function readClaudeSessionResult(params) {
+export async function readClaudeSessionResult(params) {
     const projects = listProjects();
     const project = resolveProject(params, projects);
     const sessionId = typeof params.sessionId === 'string' ? params.sessionId : '';
@@ -627,7 +481,7 @@ export function readClaudeSessionResult(params) {
         return null;
     const detail = readTranscriptFile(file);
     const bind = buildBindMap().get(sessionId);
-    const taskTurns = bind?.evolSessionId ? readRunnerTaskTurns(resolvePaths().logs, bind.evolSessionId) : [];
+    const taskTurns = bind?.evolSessionId ? await readRunnerTaskTurns(resolvePaths().logs, bind.evolSessionId) : [];
     const turns = detail.turns.concat(taskTurns).sort((a, b) => (a.ts || 0) - (b.ts || 0));
     const block = turns[key[0]]?.blocks?.[key[1]];
     return block?.kind === 'tool_result' && typeof block.text === 'string' ? block.text : null;
@@ -679,7 +533,7 @@ async function buildSnapshot(params) {
     const detail = readTranscriptFile(path.join(ccProjectsDir(), project.encoded, `${sessionId}.jsonl`), metrics);
     metrics.detailMs = Date.now() - detailStartedAt;
     const bind = bindMap.get(sessionId);
-    const taskTurns = bind?.evolSessionId ? readRunnerTaskTurns(resolvePaths().logs, bind.evolSessionId) : [];
+    const taskTurns = bind?.evolSessionId ? await readRunnerTaskTurns(resolvePaths().logs, bind.evolSessionId) : [];
     const turns = detail.turns.concat(taskTurns).sort((a, b) => (a.ts || 0) - (b.ts || 0));
     const page = windowTranscriptTurns(turns, params.turnLimit, params.turnBefore);
     const counts = { ...detail.counts, subtask: taskTurns.length };
@@ -688,19 +542,69 @@ async function buildSnapshot(params) {
     metrics.totalMs = Date.now() - startedAt;
     return { baseagent: 'claude', projects: projList, project: project.encoded, transcripts, turns: previewLargeToolResults(page.turns, page.turnPage.start), turnPage: page.turnPage, sessionId, header, metrics };
 }
+/**
+ * 会话读取器按 base agent 标识路由；标识来自显式参数，缺省时取
+ * defaults.json 的 active_baseagent。这里不再硬编码 claude 回落：没有配置
+ * 默认后端时返回空快照，由前端提示，而不是悄悄展示另一个后端的转录。
+ */
+export function resolveSessionBaseagent(params) {
+    const explicit = typeof params.baseagent === 'string' ? params.baseagent.trim() : '';
+    if (explicit)
+        return explicit;
+    return configuredActiveBaseagent;
+}
+let configuredActiveBaseagent = null;
+/** 刷新 defaults.json 里的 active_baseagent（server 启动与配置变更时调用）。 */
+export async function refreshConfiguredBaseagent() {
+    try {
+        const core = await import(toFileUrl(resolveParentDistModule('agents', 'baseagent-availability.js')));
+        const snapshot = await core.getBaseagentSnapshot({ probe: false });
+        configuredActiveBaseagent = snapshot.active;
+    }
+    catch {
+        configuredActiveBaseagent = null;
+    }
+    return configuredActiveBaseagent;
+}
+export function getConfiguredBaseagent() {
+    return configuredActiveBaseagent;
+}
+const EMPTY_SNAPSHOT = (baseagent) => ({
+    baseagent,
+    projects: [],
+    project: null,
+    transcripts: [],
+    turns: [],
+    sessionId: null,
+    noConfiguredBaseagent: baseagent == null,
+});
 export const sessionSource = {
     kind: 'session',
     async snapshot(params = {}) {
-        const baseagent = params.baseagent || 'claude';
+        if (!params.baseagent)
+            await refreshConfiguredBaseagent();
+        const baseagent = resolveSessionBaseagent(params);
+        if (!baseagent)
+            return EMPTY_SNAPSHOT(null);
         if (baseagent === 'codex') {
-            return snapshotCodex(params);
+            return snapshotCodex({ ...params, baseagent });
         }
-        return buildSnapshot(params);
+        if (baseagent === 'ecagent') {
+            return snapshotEcagent({ ...params, baseagent });
+        }
+        return buildSnapshot({ ...params, baseagent });
     },
     subscribe(params, push) {
-        const baseagent = params.baseagent || 'claude';
+        const baseagent = resolveSessionBaseagent(params);
+        if (!baseagent) {
+            push(EMPTY_SNAPSHOT(null));
+            return () => { };
+        }
         if (baseagent === 'codex') {
-            return subscribeCodex(params, push);
+            return subscribeCodex({ ...params, baseagent }, push);
+        }
+        if (baseagent === 'ecagent') {
+            return subscribeEcagent({ ...params, baseagent }, push);
         }
         const p = resolvePaths();
         let projectWatcher = null, sessionWatcher = null, logWatcher = null, debounce = null;

package/dist/sources/system.js

@@ -7,34 +7,9 @@
  *
  * subscribe: 30s 轮询 + JSON diff，仅变化时 push。
  */
-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();
-        const defaultsPath = path.join(p.root, 'agents', 'defaults.json');
-        const raw = JSON.parse(fs.readFileSync(defaultsPath, 'utf-8'));
-        const baseagents = raw?.baseagents;
-        if (!baseagents || typeof baseagents !== 'object')
-            return [];
-        const active = typeof raw.active_baseagent === 'string' ? raw.active_baseagent : null;
-        return Object.entries(baseagents).map(([name, cfg]) => {
-            const c = cfg && typeof cfg === 'object' ? cfg : {};
-            return {
-                name,
-                active: name === active,
-                model: c.model ?? null,
-                effort: c.effort ?? c.reasoning ?? null,
-            };
-        });
-    }
-    catch {
-        return [];
-    }
-}
 async function menuExec(payload, params) {
     const p = resolvePaths();
     const r = await ipcQuery(p.socket, { type: 'menu.exec', payload, auth: watchMenuRequestAuth(params) }, 5000);
@@ -48,14 +23,7 @@ async function buildSnapshot(params = {}) {
     const daemonRunning = listResp !== null;
     // sysResp 形如 { type:'menu.response', id, name, data | error }
     const system = sysResp?.data ?? null;
-    // baseagents：以 defaults.json 的 active/model/effort 为主，
-    // 再从后端返回的 baseagents（[{name,version}]）按 name 补上 CLI 版本号。
-    let baseagents = readDefaultBaseagents();
-    if (system && Array.isArray(system.baseagents)) {
-        const verByName = new Map(system.baseagents.map((b) => [b.name, b.version ?? null]));
-        baseagents = baseagents.map((b) => ({ ...b, version: verByName.get(b.name) ?? null }));
-    }
-    return { daemonRunning, system: system ? { ...system, baseagents } : system, upgrade: null, check: null };
+    return { daemonRunning, system, upgrade: null, check: null };
 }
 export const systemSource = {
     kind: 'system',

package/dist/sources/triggers.js

@@ -42,7 +42,7 @@ function readDaemonOwnerAid(p) {
 function readFullAccessEnabled(p) {
     try {
         const raw = JSON.parse(fs.readFileSync(p.daemonConfig, 'utf8'));
-        return raw?.fullaccess?.enabled === true;
+        return raw?.fullaccess?.enabled === undefined || raw.fullaccess.enabled === true;
     }
     catch {
         return false;