ec-web 0.0.26 → 0.0.28

package/dist/index.js

@@ -107,7 +107,7 @@ for (const list of Object.values(ifaces)) {
 }
 process.stdout.write(`\n${BOLD}${CYAN}EC Web — EvolCore${RST}  ${DIM}(home: ${p.root})${RST}\n\n`);
 process.stdout.write(handle.pairingCode
-    ? `  ${BOLD}配对码:${RST}  ${GREEN}${BOLD}${handle.pairingCode}${RST}  ${DIM}(daemon 提供，5 分钟内有效，配对后 token 缓存 7 天，有访问自动续期)${RST}\n\n`
+    ? `  ${BOLD}配对码:${RST}  ${GREEN}${BOLD}${handle.pairingCode}${RST}  ${DIM}(daemon 提供，10 分钟内有效，仅可配对一次，token 缓存 7 天，有访问自动续期)${RST}\n\n`
     : `  ${BOLD}配对码:${RST}  ${YELLOW}daemon 暂不可用，请先启动 EvolCore${RST}\n\n`);
 process.stdout.write(`  ${BOLD}本机:${RST}    http://localhost:${handle.port}\n`);
 for (const ip of lanIps)

package/dist/paths.js

@@ -14,6 +14,10 @@ import os from 'os';
 import crypto from 'crypto';
 const isWindows = process.platform === 'win32';
 let _root = null;
+/** Test helper: drop the cached root so a new EVOLCORE_HOME is picked up. */
+export function _resetRoot() {
+    _root = null;
+}
 export function resolveRoot() {
     if (_root)
         return _root;

package/dist/server.js

@@ -3,7 +3,7 @@
  *
  * - HTTP: 静态资源 + 配对 API
  * - WebSocket: 订阅式实时推送（aid / msg / session）
- * - 鉴权: daemon 通过本地 IPC 提供 6 位配对码（5 分钟有效）和远程访问 token（7 天滑动续期）
+ * - 鉴权: daemon 通过本地 IPC 提供 6 位一次性配对码（10 分钟有效）和远程访问 token（7 天滑动续期）
  * - 安全: 绑定 0.0.0.0（支持远程访问）；本地自动登录，远程配对后使用 token，登录后权限一致
  *
  * 与 evolcore daemon 通过 IPC socket（状态、Menu 和远程访问凭据）+ 文件系统（历史数据）旁路通信。
@@ -20,7 +20,7 @@ import { ipcQuery } from './ipc-client.js';
 import { setDebugLog, dlog } from './debug-log.js';
 import { aidSource } from './sources/aid.js';
 import { msgSource } from './sources/msg.js';
-import { sessionSource, buildBindMap, readClaudeSessionResult } from './sources/session.js';
+import { sessionSource, buildBindMap, readClaudeSessionResult, resolveSessionBaseagent, refreshConfiguredBaseagent } from './sources/session.js';
 import { cacheSource } from './sources/cache.js';
 import { systemSource } from './sources/system.js';
 import { triggersSource } from './sources/triggers.js';
@@ -33,8 +33,8 @@ import { ccProjectsDir } from './paths.js';
 import { relationRolesSource, handleRelationRolesApi, handlePeerRoleApi } from './sources/relation-roles.js';
 import { roleDefinitionsSource, handleRoleDefinitionsApi } from './sources/role-definitions.js';
 import { handleModelsApi } from './sources/models.js';
-import { detectBaseAgentsAsync } from './sources/baseagent-detector.js';
 import { readCodexSessionResult } from './sources/session-codex.js';
+import { readEcagentSessionResult } from './sources/session-ecagent.js';
 import { handleBasicSettingsApi } from './sources/basic-settings.js';
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const STATIC_DIR = path.join(__dirname, 'static');
@@ -585,16 +585,30 @@ function handleConnection(ws, req, log, tokenRecord) {
                 params.source = msg.source;
             if (msg.limit)
                 params.limit = msg.limit;
+            if (msg.archived !== undefined)
+                params.archived = msg.archived;
             dlog(`▸ 订阅 ${msg.view}${msg.aid ? ` aid=${String(msg.aid).split('.')[0]}` : ''}${msg.peer ? ` peer=${String(msg.peer).split('.')[0]}` : ''}${msg.sessionId ? ` session=${String(msg.sessionId).slice(0, 8)}` : ''}${msg.baseagent ? ` baseagent=${msg.baseagent}` : ''} from ${ip}`);
             await switchSubscription(msg.view, params);
             return;
         }
         if (msg.type === 'session.result') {
             const params = msg.params && typeof msg.params === 'object' ? msg.params : {};
-            const result = params.baseagent === 'codex'
-                ? readCodexSessionResult(params)
-                : readClaudeSessionResult(params);
-            send({ type: 'session.result', requestId: msg.requestId, data: result == null ? null : { text: result } });
+            if (!params.baseagent)
+                await refreshConfiguredBaseagent();
+            const baseagent = resolveSessionBaseagent(params);
+            const result = baseagent === 'codex'
+                ? readCodexSessionResult({ ...params, baseagent })
+                : baseagent === 'ecagent'
+                    ? readEcagentSessionResult({ ...params, baseagent })
+                    : baseagent
+                        ? readClaudeSessionResult({ ...params, baseagent })
+                        : Promise.resolve(null);
+            void Promise.resolve(result)
+                .then(text => send({ type: 'session.result', requestId: msg.requestId, data: text == null ? null : { text } }))
+                .catch(error => {
+                dlog(`session.result failed: ${error instanceof Error ? error.message : String(error)}`);
+                send({ type: 'session.result', requestId: msg.requestId, data: null });
+            });
             return;
         }
         if (msg.type === 'menu' && msg.payload) {
@@ -731,6 +745,8 @@ function bindPort(server, preferred, log) {
 export async function startWatchWebServer(opts = {}) {
     const log = opts.log || (() => { });
     setDebugLog(log);
+    // 会话读取器默认后端来自 defaults.json；启动时同步一次。
+    await refreshConfiguredBaseagent();
     // soft 版本校验：ping daemon 检查 protocolVersion
     const p = resolvePaths();
     const pingResp = await ipcQuery(p.socket, { type: 'ping' }, 1000);
@@ -740,17 +756,12 @@ export async function startWatchWebServer(opts = {}) {
     const server = http.createServer(async (req, res) => {
         const pathname = requestPath(req.url || '');
         const localDirect = isLocalDirect(req);
-        if (req.method === 'GET' && (req.url || '') === '/api/available-baseagents') {
-            // Base agent 可用性检测 API
-            try {
-                const available = await detectBaseAgentsAsync();
-                res.writeHead(200, { 'Content-Type': 'application/json', 'Cache-Control': 'no-store' });
-                res.end(JSON.stringify(available));
-            }
-            catch (error) {
-                res.writeHead(500, { 'Content-Type': 'application/json', 'Cache-Control': 'no-store' });
-                res.end(JSON.stringify({ success: false, error: error?.message || String(error) }));
-            }
+        if (req.method === 'GET' && (req.url || '') === '/api/health') {
+            // Keep readiness checks independent from daemon auth and pairing state.
+            // The endpoint is intentionally small so supervisors and proxies can
+            // distinguish ECWeb from an unrelated process on the configured port.
+            res.writeHead(200, { 'Content-Type': 'application/json', 'Cache-Control': 'no-store' });
+            res.end(JSON.stringify({ ok: true, service: 'ecweb', version: ECWEB_VERSION }));
         }
         else if (req.method === 'GET' && (req.url || '') === '/api/pair-code') {
             // 取码 API：仅真本地直连可用（socket 回环 + 无 x-aun-provider-aid）。
@@ -761,7 +772,9 @@ export async function startWatchWebServer(opts = {}) {
                 res.end(JSON.stringify({ error: 'forbidden' }));
                 return;
             }
-            const pair = await remoteAuth('remote-auth.pair-code');
+            const pair = await remoteAuth('remote-auth.pair-code', {
+                source: 'ecweb-local',
+            });
             if (!pair?.ok || typeof pair.code !== 'string' || typeof pair.expiresAt !== 'number') {
                 res.writeHead(503, { 'Content-Type': 'application/json' });
                 res.end(JSON.stringify({ error: 'daemon unavailable' }));
@@ -912,7 +925,9 @@ export async function startWatchWebServer(opts = {}) {
         });
     });
     const { port, displaced } = await bindPort(server, opts.port ?? DEFAULT_PORT, log);
-    const initialPair = await remoteAuth('remote-auth.pair-code');
+    const initialPair = await remoteAuth('remote-auth.pair-code', {
+        source: 'ecweb-local',
+    });
     return {
         url: `http://0.0.0.0:${port}`,
         port,

package/dist/sources/msg.js

@@ -10,6 +10,13 @@ import { ipcQuery } from '../ipc-client.js';
 import { resolvePaths } from '../paths.js';
 import { resolveParentDistModule, toFileUrl } from './parent-package.js';
 import { decodeDirSegment, isTransientProtocolMessage, readAllJsonlLines, readJsonFile, scanChatDirs, tryParseChannelSessionKey, } from '../fs-utils.js';
+// ECWeb builds as a separate package. Keep this wire contract aligned with session-mapper.ts.
+function topicMatchesArchiveFilter(chat, archived) {
+    if (archived === 'all')
+        return true;
+    const isArchived = chat.partition === 'thread' && chat.lable === '归档';
+    return archived === true ? isArchived : !isArchived;
+}
 let contextModulesPromise = null;
 const sessionAdapterPromises = new Map();
 let peerDisplayResolverPromise = null;
@@ -96,6 +103,7 @@ function getSessionAdapter(baseagent) {
             claude: 'ClaudeSessionFileAdapter',
             codex: 'CodexSessionFileAdapter',
             gemini: 'GeminiSessionFileAdapter',
+            ecagent: 'EcagentSessionFileAdapter',
         };
         const className = classNames[baseagent];
         const promise = !className
@@ -581,6 +589,8 @@ function loadChats(peerDisplayResolver, metrics) {
                 threadName: item.partition === 'thread'
                     ? String(partitionActive.name || partitionActive.metadata?.topicName || item.threadId)
                     : null,
+                lable: item.partition === 'thread' && typeof partitionActive.lable === 'string'
+                    ? partitionActive.lable || null : null,
                 updatedAt,
                 messages: item.messages,
                 active: partitionActive,
@@ -690,6 +700,7 @@ function mergePeerInfo(chats) {
                 partition: chat.partition,
                 threadId: chat.threadId,
                 threadName: chat.threadName,
+                lable: chat.lable,
                 inbound: 0,
                 outbound: 0,
                 lastAt: 0,
@@ -766,7 +777,7 @@ async function sessionTurns(active, messages) {
     if (baseagent && agentSessionId && projectPath) {
         try {
             const adapter = await getSessionAdapter(baseagent);
-            const turns = Number(adapter?.getFileInfo(projectPath, agentSessionId)?.turns);
+            const turns = Number(adapter?.getFileInfo(projectPath, agentSessionId, active.selfAID)?.turns);
             if (Number.isFinite(turns) && turns > 0)
                 return turns;
         }
@@ -820,6 +831,7 @@ async function buildSessionContext(chat) {
         sessionId: active.id || null,
         evolcoreSessionId: active.id || null,
         name: active.name || null,
+        lable: chat.lable,
         baseagent: active.baseagent || active.agentType || null,
         chatMode,
         permissionMode,
@@ -830,6 +842,10 @@ async function buildSessionContext(chat) {
     };
 }
 async function buildSnapshot(params) {
+    const archived = params.archived;
+    if (archived !== undefined && archived !== false && archived !== true && archived !== 'all') {
+        throw new Error('archived 必须是布尔值或 "all"');
+    }
     const startedAt = Date.now();
     const metrics = {
         files: 0,
@@ -853,13 +869,14 @@ async function buildSnapshot(params) {
         : requestedScope;
     const peer = params.peer || null;
     const inScope = selectedChats(chats, scope);
-    const peers = scope ? mergePeerInfo(inScope) : [];
+    const visibleChats = inScope.filter(chat => topicMatchesArchiveFilter(chat, archived));
+    const peers = scope ? mergePeerInfo(visibleChats) : [];
     const requestedLimit = Number(params.limit);
     const limit = Number.isFinite(requestedLimit) ? Math.min(Math.max(Math.trunc(requestedLimit), 20), 200) : 100;
     const requestedBefore = params.before == null ? Number.NaN : Number(params.before);
     const before = Number.isFinite(requestedBefore) && requestedBefore >= 0 ? Math.trunc(requestedBefore) : null;
-    const page = scope && peer ? messagesFor(inScope, peer, before, limit) : { messages: [], nextBefore: null, hasMore: false };
-    const currentChat = peer ? inScope.find(chat => chatKey(chat) === peer) : undefined;
+    const page = scope && peer ? messagesFor(visibleChats, peer, before, limit) : { messages: [], nextBefore: null, hasMore: false };
+    const currentChat = peer ? visibleChats.find(chat => chatKey(chat) === peer) : undefined;
     const sessionContext = await buildSessionContext(currentChat);
     metrics.totalMs = Date.now() - startedAt;
     return {

package/dist/sources/role-definitions.js

@@ -29,6 +29,7 @@ async function getRolesModule() {
         const resolverMod = await import(toFileUrl(resolverPath));
         const roleServiceMod = await import(toFileUrl(roleServicePath));
         const authMod = await import(toFileUrl(authPath));
+        const schemaMod = await import(toFileUrl(resolveParentDistModule('config', 'role-schema.js')));
         if (!rolesMod.readRolesConfig)
             throw new Error('readRolesConfig not found in roles.js');
         if (!rolesMod.roleExists)
@@ -54,6 +55,8 @@ async function getRolesModule() {
             read: cmMod.read,
             write: cmMod.write,
             ConfigTarget: cmMod.ConfigTarget,
+            resolveEffective: cmMod.resolveEffective,
+            rolePermissionFields: schemaMod.rolePermissionFields,
             resolver: resolverMod,
             buildAuthSubject: authMod.buildAuthSubject,
             authorizeOperation: authMod.authorizeOperation,
@@ -66,10 +69,10 @@ async function getRolesModule() {
     }
 }
 async function getRoleConstraintsModule() {
-    const constraintsPath = resolveParentDistModule('config', 'role-constraints.js');
+    const constraintsPath = resolveParentDistModule('core', 'model', 'model-permission.js');
     const mod = await import(toFileUrl(constraintsPath));
     if (!mod.isModelAllowedByPatterns)
-        throw new Error('isModelAllowedByPatterns not found in role-constraints.js');
+        throw new Error('isModelAllowedByPatterns not found in model-permission.js');
     return {
         isModelAllowedByPatterns: mod.isModelAllowedByPatterns,
     };
@@ -164,8 +167,16 @@ function isDaemonOwnerAuth(processConfig, auth) {
         : [];
     return !!actor && processOwners.includes(actor);
 }
-const MODEL_PERMISSION_FIELD = 'baseagents.claude.model';
-const MODEL_PATTERN_OPTIONS = ['*', 'claude-opus-*', 'claude-sonnet-*', 'claude-haiku-*'];
+function roleModelContext(modules, aid, requested) {
+    const effective = modules.resolveEffective({ self: aid });
+    const baseagent = requested ?? effective.active_baseagent;
+    const field = `baseagents.${baseagent}.model`;
+    const descriptor = modules.rolePermissionFields().find((item) => item.value === field);
+    if (!descriptor) {
+        throw Object.assign(new Error(`Unsupported role model backend: ${String(baseagent)}`), { statusCode: 400 });
+    }
+    return { baseagent, field, patternOptions: descriptor.patterns?.map((item) => item.value) ?? ['*'] };
+}
 const COMMAND_PERMISSION_SCOPES = new Set(['relation', 'role', 'agent', 'process', 'filesystem', 'control', 'raw-cli']);
 const COMMAND_CONSTRAINT_KEYS = new Set([
     'ownPeerOnly',
@@ -495,11 +506,11 @@ function normalizeRoleDefinitionForSave(roleDef) {
         return roleDef;
     return { ...roleDef, usageLimits: normalizeRoleUsageLimits(roleDef.usageLimits) };
 }
-function getModelPermission(roleDef) {
+function getModelPermission(roleDef, field) {
     const permissions = roleDef?.permissions;
     if (!permissions || typeof permissions !== 'object')
         return {};
-    const perm = permissions[MODEL_PERMISSION_FIELD];
+    const perm = permissions[field];
     return perm && typeof perm === 'object' ? perm : {};
 }
 function stripSelectionModeFromPermission(perm) {
@@ -544,38 +555,42 @@ async function validateRoleModelPermission(roleDef) {
     const permissions = roleDef?.permissions;
     if (!permissions || typeof permissions !== 'object')
         return { ok: true, errors: [] };
-    const perm = permissions[MODEL_PERMISSION_FIELD];
-    if (!perm || typeof perm !== 'object')
-        return { ok: true, errors: [] };
-    permissions[MODEL_PERMISSION_FIELD] = stripSelectionModeFromPermission(perm);
-    const result = await validateModelPermissionInput({
-        defaultModel: permissions[MODEL_PERMISSION_FIELD].default,
-        allowOverride: permissions[MODEL_PERMISSION_FIELD].allowOverride,
-        allowedModels: permissions[MODEL_PERMISSION_FIELD].allowedModels,
-    });
-    return { ok: result.ok, errors: result.errors };
+    const errors = [];
+    for (const [field, perm] of Object.entries(permissions)) {
+        if (!/^baseagents\.[a-z0-9_-]+\.model$/.test(field))
+            continue;
+        permissions[field] = stripSelectionModeFromPermission(perm);
+        const result = await validateModelPermissionInput({
+            defaultModel: permissions[field]?.default,
+            allowOverride: permissions[field]?.allowOverride,
+            allowedModels: permissions[field]?.allowedModels,
+        });
+        errors.push(...result.errors.map(error => `${field}: ${error}`));
+    }
+    return { ok: errors.length === 0, errors };
 }
 async function filterAllowedCatalogModels(models, allowedModels) {
     const { isModelAllowedByPatterns } = await getRoleConstraintsModule();
     return models.filter(model => !model.isAlias && isModelAllowedByPatterns(model.id, allowedModels));
 }
-async function buildModelPermissionResponse(roleName, roleDef, override, aid) {
-    const currentPerm = getModelPermission(roleDef);
+async function buildModelPermissionResponse(roleName, roleDef, modelContext, override, aid) {
+    const currentPerm = getModelPermission(roleDef, modelContext.field);
     const defaultModel = override?.defaultModel ?? currentPerm.default ?? '';
     const allowOverride = override?.allowOverride ?? currentPerm.allowOverride ?? false;
     const allowedModels = override?.allowedModels ?? (Array.isArray(currentPerm.allowedModels) ? currentPerm.allowedModels : []);
-    const catalog = await getModelCatalogSnapshot('claude', aid);
+    const catalog = await getModelCatalogSnapshot(modelContext.baseagent, aid);
     const matchingModels = await filterAllowedCatalogModels(catalog.models, allowedModels);
     return {
         role: roleName,
-        field: MODEL_PERMISSION_FIELD,
+        baseagent: modelContext.baseagent,
+        field: modelContext.field,
         permission: {
             default: defaultModel,
             allowOverride,
             allowedModels,
         },
         selectionMode: inferSelectionMode(allowedModels),
-        patternOptions: MODEL_PATTERN_OPTIONS,
+        patternOptions: modelContext.patternOptions,
         catalog,
         matchingModels,
         stats: {
@@ -613,10 +628,16 @@ async function buildSnapshot(params = {}, auth = {}) {
             };
         }
         const config = modules.readRolesConfig(aid);
+        const activeBaseagent = modules.resolveEffective({ self: aid }).active_baseagent;
+        const modelContext = activeBaseagent ? roleModelContext(modules, aid, activeBaseagent) : undefined;
         return {
             $schema_version: 1,
             aid,
             self: aid,
+            baseagent: modelContext?.baseagent ?? null,
+            modelPermissionField: modelContext?.field ?? null,
+            modelPatternOptions: modelContext?.patternOptions ?? [],
+            permissionFields: modules.rolePermissionFields(),
             agents: summarizeAgents(agents),
             defaultRoles: config.defaultRoles ?? { private: null, group: null },
             policyRevision: JSON.stringify(config),
@@ -866,7 +887,8 @@ export async function handleRoleDefinitionsApi(req, res, auth = {}) {
                 sendJson(res, 404, { success: false, error: 'Role not found' });
                 return;
             }
-            const data = await buildModelPermissionResponse(roleName, roleDef, undefined, aid || undefined);
+            const modelContext = roleModelContext(modules, aid, parsedUrl.query.baseagent);
+            const data = await buildModelPermissionResponse(roleName, roleDef, modelContext, undefined, aid || undefined);
             sendJson(res, 200, { success: true, data });
             return;
         }
@@ -879,13 +901,14 @@ export async function handleRoleDefinitionsApi(req, res, auth = {}) {
                 return;
             }
             const payload = await readJsonBody(req);
-            const currentPerm = getModelPermission(roleDef);
+            const modelContext = roleModelContext(modules, aid, parsedUrl.query.baseagent);
+            const currentPerm = getModelPermission(roleDef, modelContext.field);
             const validation = await validateModelPermissionInput(extractModelPermissionPayload(payload, currentPerm));
             if (!validation.ok || !validation.value) {
                 sendJson(res, 400, { success: false, error: 'Invalid model permissions', errors: validation.errors });
                 return;
             }
-            const data = await buildModelPermissionResponse(roleName, roleDef, validation.value, aid || undefined);
+            const data = await buildModelPermissionResponse(roleName, roleDef, modelContext, validation.value, aid || undefined);
             sendJson(res, 200, { success: true, data });
             return;
         }
@@ -898,7 +921,8 @@ export async function handleRoleDefinitionsApi(req, res, auth = {}) {
                 return;
             }
             const payload = await readJsonBody(req);
-            const currentPerm = getModelPermission(roleDef);
+            const modelContext = roleModelContext(modules, aid, parsedUrl.query.baseagent);
+            const currentPerm = getModelPermission(roleDef, modelContext.field);
             const validation = await validateModelPermissionInput(extractModelPermissionPayload(payload, currentPerm));
             if (!validation.ok || !validation.value) {
                 sendJson(res, 400, { success: false, error: 'Invalid model permissions', errors: validation.errors });
@@ -907,15 +931,15 @@ export async function handleRoleDefinitionsApi(req, res, auth = {}) {
             roleDef.permissions = roleDef.permissions && typeof roleDef.permissions === 'object'
                 ? roleDef.permissions
                 : {};
-            const existingPerm = stripSelectionModeFromPermission(getModelPermission(roleDef));
-            roleDef.permissions[MODEL_PERMISSION_FIELD] = {
+            const existingPerm = stripSelectionModeFromPermission(getModelPermission(roleDef, modelContext.field));
+            roleDef.permissions[modelContext.field] = {
                 ...existingPerm,
                 default: validation.value.defaultModel,
                 allowOverride: validation.value.allowOverride,
                 allowedModels: validation.value.allowedModels,
             };
             modules.roleService.writeRoleDefinition(aid, roleName, roleDef);
-            const data = await buildModelPermissionResponse(roleName, roleDef, validation.value, aid || undefined);
+            const data = await buildModelPermissionResponse(roleName, roleDef, modelContext, validation.value, aid || undefined);
             sendJson(res, 200, { success: true, data });
             return;
         }
@@ -1029,6 +1053,6 @@ export async function handleRoleDefinitionsApi(req, res, auth = {}) {
     }
     catch (err) {
         console.error('[role-definitions] API error:', err);
-        sendJson(res, 500, { error: err.message });
+        sendJson(res, err.statusCode ?? 500, { error: err.message });
     }
 }

package/dist/sources/session-codex.js

@@ -15,7 +15,7 @@ import { resolvePaths } from '../paths.js';
 import { encodePath } from '../fs-utils.js';
 import { getAgentSelfNames } from './msg.js';
 import { parseTranscriptResultKey, previewLargeToolResults, windowTranscriptTurns } from './transcript-window.js';
-import { buildSessionBindMap, classifyTranscriptSource, isEvolcoreRoutedMessage, isSyntheticCliPrompt, resolveSessionBindSelfName, } from './session-origin.js';
+import { buildSessionBindMap, readRunnerTaskTurns, classifyTranscriptSource, isEvolcoreRoutedMessage, isSyntheticCliPrompt, resolveSessionBindSelfName, } from './session-origin.js';
 const requireFromHere = createRequire(import.meta.url);
 let _dlog = null;
 export function setDebugLog(log) { _dlog = log; }
@@ -817,7 +817,7 @@ function readTranscriptFile(threadId, cwd, readStats) {
     cacheTranscriptDetail(rolloutPath, stat.mtimeMs, stat.size, detail);
     return detail;
 }
-export function readCodexSessionResult(params) {
+export async function readCodexSessionResult(params) {
     const projects = listProjects();
     const project = resolveProject(params, projects);
     const sessionId = typeof params.sessionId === 'string' ? params.sessionId : '';
@@ -825,7 +825,10 @@ export function readCodexSessionResult(params) {
     if (!project || !sessionId || !key || !/^[A-Za-z0-9-]+$/.test(sessionId))
         return null;
     const detail = readTranscriptFile(sessionId, project.cwd);
-    const block = detail.turns[key[0]]?.blocks?.[key[1]];
+    const bind = buildBindMap().get(sessionId);
+    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;
 }
 // ── Snapshot ──
@@ -899,8 +902,11 @@ async function buildSnapshot(params) {
     const detailStartedAt = Date.now();
     const detail = readTranscriptFile(sessionId, project.cwd, metrics);
     metrics.detailMs = Date.now() - detailStartedAt;
-    const page = windowTranscriptTurns(detail.turns, params.turnLimit, params.turnBefore);
     const bind = bindMap.get(sessionId);
+    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 };
     const transcript = metas.find(meta => meta.id === sessionId);
     const header = {
         sessionId,
@@ -912,7 +918,7 @@ async function buildSnapshot(params) {
         totalTurns: detail.totalTurns,
         userMsgs: detail.userMsgs,
         totalMsgs: detail.totalMsgs,
-        counts: detail.counts,
+        counts,
         inputTokens: detail.inputTokens,
         outputTokens: detail.outputTokens,
         contextTokens: detail.contextTokens,
@@ -944,6 +950,7 @@ export function subscribeCodex(params, push) {
     const p = resolvePaths();
     let dbWatcher = null;
     let sessionWatcher = null;
+    let logWatcher = null;
     let debounce = null;
     const fire = () => {
         if (debounce)
@@ -971,11 +978,22 @@ export function subscribeCodex(params, push) {
         });
     }
     catch { }
+    if (params.sessionId) {
+        try {
+            logWatcher = fs.watch(p.logs, (_evt, filename) => {
+                if (!filename || /^events(?:-.+)?\.log$/.test(String(filename)))
+                    fire();
+            });
+        }
+        catch { }
+    }
     return () => {
         if (dbWatcher)
             dbWatcher.close();
         if (sessionWatcher)
             sessionWatcher.close();
+        if (logWatcher)
+            logWatcher.close();
         if (debounce)
             clearTimeout(debounce);
     };