ec-web 0.0.3 → 0.0.5

package/dist/sources/session.js

@@ -13,8 +13,10 @@
 import fs from 'fs';
 import path from 'path';
 import { resolvePaths, ccProjectsDir } from '../paths.js';
-import { encodePath, scanChatDirs, readJsonFile } from '../fs-utils.js';
+import { encodePath } from '../fs-utils.js';
 import { snapshotCodex, subscribeCodex, setDebugLog as setCodexDebugLog } from './session-codex.js';
+import { getAgentSelfNames } from './msg.js';
+import { buildSessionBindMap, classifyTranscriptSource, isSyntheticCliPrompt, resolveSessionBindSelfName, } from './session-origin.js';
 let _dlog = null;
 export function setDebugLog(log) {
     _dlog = log;
@@ -25,7 +27,7 @@ function dlog(line) { if (_dlog)
         _dlog(line);
     }
     catch { } }
-const CACHE_VERSION = 4;
+const CACHE_VERSION = 5;
 const _metaCache = new Map();
 function cacheDir(encoded) {
     const dataDir = resolvePaths().dataDir;
@@ -120,7 +122,8 @@ function extractMeta(file, id, stat) {
         raw = fs.readFileSync(file, 'utf-8');
     }
     catch { }
-    let title = '', firstUser = '', gitBranch = '', version = '', userMsgs = 0, totalMsgs = 0;
+    let title = '', firstUser = '', gitBranch = '', version = '', entrypoint = '', userMsgs = 0, totalMsgs = 0;
+    let hasRealCliMessage = false, internalSubagent = id.startsWith('agent-');
     for (const line of raw.split('\n')) {
         if (!line)
             continue;
@@ -140,8 +143,20 @@ function extractMeta(file, id, stat) {
             totalMsgs++;
         else if (isUser) {
             totalMsgs++;
-            if (o && isCountableUserMessage(o, id))
-                userMsgs++;
+            if (o) {
+                if (isCountableUserMessage(o, id))
+                    userMsgs++;
+                if (!entrypoint && typeof o.entrypoint === 'string')
+                    entrypoint = o.entrypoint;
+                if (o.isSidechain || o.agentId)
+                    internalSubagent = true;
+                const content = o.message?.content;
+                if (!isToolResultOnly(content)) {
+                    const text = extractMessageText(content);
+                    if (text.trim() && !isSyntheticCliPrompt(text, 'claude'))
+                        hasRealCliMessage = true;
+                }
+            }
         }
         if ((!gitBranch || !version || !firstUser) && (line.indexOf('gitBranch') !== -1 || line.indexOf('"version"') !== -1 || line.indexOf('ai-title') !== -1 || (isUser && !firstUser))) {
             if (!o) {
@@ -165,7 +180,12 @@ function extractMeta(file, id, stat) {
             }
         }
     }
-    return { id, title, firstUser, gitBranch, version, userMsgs, totalMsgs, sizeKB: Math.round(stat.size / 1024), lastActivity: stat.mtimeMs };
+    return {
+        id, title, firstUser, gitBranch, version, userMsgs, totalMsgs,
+        sizeKB: Math.round(stat.size / 1024),
+        lastActivity: stat.mtimeMs,
+        cliCandidate: !internalSubagent && (entrypoint === 'cli' || entrypoint === 'sdk-cli') && hasRealCliMessage,
+    };
 }
 function listTranscripts(encoded) {
     const dir = path.join(ccProjectsDir(), encoded);
@@ -293,25 +313,162 @@ function resolveProject(params, projects) {
     return projects[0] || null;
 }
 export function buildBindMap() {
-    const map = new Map();
+    return buildSessionBindMap();
+}
+// ── EvolCore runner 子任务事件 ──
+const RUNNER_TASK_EVENT_TYPES = new Set([
+    'runner:task-started',
+    'runner:task-progress',
+    'runner:task-notification',
+]);
+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 {
-        const p = resolvePaths();
-        for (const dir of scanChatDirs(p.sessionsDir)) {
-            const active = readJsonFile(path.join(dir.dirPath, 'active.json'));
-            if (!active || !active.agentSessionId)
-                continue;
-            map.set(active.agentSessionId, {
-                channelType: active.channelType || dir.channelType,
-                channelId: active.channelId || dir.channelId,
-                selfAID: active.selfAID || dir.selfAID,
-                peerName: (active.metadata && active.metadata.peerName) || null,
-                name: active.name,
-                updatedAt: active.updatedAt || 0,
-            });
+        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;
     }
-    catch { }
-    return map;
+    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 = {
@@ -425,16 +582,24 @@ function readTranscriptFile(file) {
     const shown = turns.length > 500 ? turns.slice(-500) : turns;
     return { turns: shown, totalTurns: turns.length, userMsgs, totalMsgs, counts, inputTokens: inTok, outputTokens: outTok, contextTokens, costUsd, model, gitBranch: branch, version, title, cwd };
 }
-function buildSnapshot(params) {
+async function buildSnapshot(params) {
     const projects = listProjects();
     const bindMap = buildBindMap();
     const project = resolveProject(params, projects);
     if (!project)
         return { baseagent: 'claude', projects: [], project: null, transcripts: [], turns: [], sessionId: null };
     const metas = listTranscripts(project.encoded);
+    const selfNames = await getAgentSelfNames();
     const transcripts = metas.map(m => {
         const bind = bindMap.get(m.id);
-        return { ...m, bound: !!bind, boundChannel: bind?.channelType ?? null, boundPeer: bind ? (bind.peerName || bind.channelId) : null, online: bind ? (Date.now() - bind.updatedAt < 5 * 60 * 1000) : false };
+        return {
+            ...m,
+            sourceType: classifyTranscriptSource(bind, m.cliCandidate),
+            bound: !!bind,
+            boundChannel: bind?.channelType ?? null,
+            boundSelf: resolveSessionBindSelfName(bind, selfNames),
+            online: bind ? (Date.now() - bind.updatedAt < 5 * 60 * 1000) : false,
+        };
     });
     const projList = projects.map(p => ({ encoded: p.encoded, label: p.label, cwd: p.cwd, count: p.count }));
     const sessionId = params.sessionId || null;
@@ -442,8 +607,13 @@ function buildSnapshot(params) {
         return { baseagent: 'claude', projects: projList, project: project.encoded, transcripts, turns: [], sessionId: null };
     const detail = readTranscriptFile(path.join(ccProjectsDir(), project.encoded, `${sessionId}.jsonl`));
     const bind = bindMap.get(sessionId);
-    const header = { sessionId, title: detail.title, model: detail.model, gitBranch: detail.gitBranch, version: detail.version, cwd: detail.cwd || project.cwd, totalTurns: detail.totalTurns, userMsgs: detail.userMsgs, totalMsgs: detail.totalMsgs, counts: detail.counts, inputTokens: detail.inputTokens, outputTokens: detail.outputTokens, contextTokens: detail.contextTokens, costUsd: detail.costUsd, bound: !!bind, boundChannel: bind?.channelType ?? null, boundPeer: bind ? (bind.peerName || bind.channelId) : null, online: bind ? (Date.now() - bind.updatedAt < 5 * 60 * 1000) : false };
-    return { baseagent: 'claude', projects: projList, project: project.encoded, transcripts, turns: detail.turns, sessionId, header };
+    const taskTurns = bind?.evolSessionId ? readRunnerTaskTurns(resolvePaths().logs, bind.evolSessionId) : [];
+    const turns = detail.turns.concat(taskTurns).sort((a, b) => (a.ts || 0) - (b.ts || 0));
+    const shownTurns = turns.length > 500 ? turns.slice(-500) : turns;
+    const counts = { ...detail.counts, subtask: taskTurns.length };
+    const transcript = metas.find(meta => meta.id === sessionId);
+    const header = { sessionId, title: detail.title, model: detail.model, gitBranch: detail.gitBranch, version: detail.version, cwd: detail.cwd || project.cwd, totalTurns: detail.totalTurns, userMsgs: detail.userMsgs, totalMsgs: detail.totalMsgs, counts, inputTokens: detail.inputTokens, outputTokens: detail.outputTokens, contextTokens: detail.contextTokens, costUsd: detail.costUsd, sourceType: classifyTranscriptSource(bind, transcript?.cliCandidate === true), bound: !!bind, boundChannel: bind?.channelType ?? null, boundSelf: resolveSessionBindSelfName(bind, selfNames), online: bind ? (Date.now() - bind.updatedAt < 5 * 60 * 1000) : false };
+    return { baseagent: 'claude', projects: projList, project: project.encoded, transcripts, turns: shownTurns, sessionId, header };
 }
 export const sessionSource = {
     kind: 'session',
@@ -460,12 +630,12 @@ export const sessionSource = {
             return subscribeCodex(params, push);
         }
         const p = resolvePaths();
-        let projectWatcher = null, sessionWatcher = null, debounce = null;
-        const fire = () => { if (debounce)
-            clearTimeout(debounce); debounce = setTimeout(() => { try {
-            push(buildSnapshot(params));
-        }
-        catch { } }, 150); };
+        let projectWatcher = null, sessionWatcher = null, logWatcher = null, debounce = null;
+        const fire = () => {
+            if (debounce)
+                clearTimeout(debounce);
+            debounce = setTimeout(() => { void buildSnapshot(params).then(push).catch(() => { }); }, 150);
+        };
         const projects = listProjects();
         const project = resolveProject(params, projects);
         if (project) {
@@ -481,9 +651,17 @@ export const sessionSource = {
                 fire(); });
         }
         catch { }
+        if (params.sessionId) {
+            try {
+                logWatcher = fs.watch(p.logs, (_evt, filename) => { if (!filename || EVENT_LOG_RE.test(String(filename)))
+                    fire(); });
+            }
+            catch { }
+        }
         return () => { if (projectWatcher)
             projectWatcher.close(); if (sessionWatcher)
-            sessionWatcher.close(); if (debounce)
+            sessionWatcher.close(); if (logWatcher)
+            logWatcher.close(); if (debounce)
             clearTimeout(debounce); };
     },
 };