ec-web 0.0.4 → 0.0.5

package/dist/server.js

@@ -66,10 +66,26 @@ const ECWEB_VERSION = readEcwebVersion();
 const MIME = {
     '.html': 'text/html; charset=utf-8',
     '.js': 'text/javascript; charset=utf-8',
+    '.mjs': 'text/javascript; charset=utf-8',
     '.css': 'text/css; charset=utf-8',
     '.json': 'application/json; charset=utf-8',
+    '.webmanifest': 'application/manifest+json; charset=utf-8',
     '.svg': 'image/svg+xml',
+    '.png': 'image/png',
+    '.jpg': 'image/jpeg',
+    '.jpeg': 'image/jpeg',
+    '.gif': 'image/gif',
+    '.webp': 'image/webp',
+    '.avif': 'image/avif',
+    '.ico': 'image/x-icon',
+    '.woff': 'font/woff',
+    '.woff2': 'font/woff2',
+    '.ttf': 'font/ttf',
+    '.otf': 'font/otf',
+    '.wasm': 'application/wasm',
 };
+const HTML_CACHE_CONTROL = 'no-cache';
+const STATIC_CACHE_CONTROL = 'public, max-age=0, must-revalidate';
 function tokenStorePath() {
     const dir = resolvePaths().instanceDir;
     const current = path.join(dir, 'ecweb-tokens.json');
@@ -141,7 +157,32 @@ function injectBaseHref(html, prefix) {
         return html.replace(/<base\b[^>]*>/i, tag);
     return html.replace(/<head[^>]*>/i, (m) => `${m}\n  ${tag}`);
 }
-function serveStatic(req, res) {
+function createEtag(content) {
+    return `"${crypto.createHash('sha256').update(content).digest('hex')}"`;
+}
+function matchesIfNoneMatch(req, etag) {
+    const header = req.headers['if-none-match'];
+    const value = Array.isArray(header) ? header.join(',') : header;
+    if (!value)
+        return false;
+    // GET uses weak comparison, so a client may send the validator with W/.
+    return value.split(',').some((candidate) => {
+        const normalized = candidate.trim().replace(/^W\//, '');
+        return normalized === '*' || normalized === etag;
+    });
+}
+function respondWithValidator(req, res, body, contentType, cacheControl, extraHeaders = {}) {
+    const etag = createEtag(body);
+    const headers = { 'Content-Type': contentType, 'Cache-Control': cacheControl, ETag: etag, ...extraHeaders };
+    if (matchesIfNoneMatch(req, etag)) {
+        res.writeHead(304, headers);
+        res.end();
+        return;
+    }
+    res.writeHead(200, headers);
+    res.end(body);
+}
+export function serveStatic(req, res) {
     let urlPath = (req.url || '/').split('?')[0];
     if (urlPath === '/')
         urlPath = '/index.html';
@@ -161,12 +202,13 @@ function serveStatic(req, res) {
         if (ext === '.html') {
             const prefix = forwardedPrefix(req);
             const html = injectBaseHref(data.toString('utf-8'), prefix);
-            res.writeHead(200, { 'Content-Type': MIME[ext] });
-            res.end(html);
+            // The proxy prefix changes the representation, so shared caches must key on it.
+            respondWithValidator(req, res, html, MIME[ext], HTML_CACHE_CONTROL, { Vary: 'X-Forwarded-Prefix' });
             return;
         }
-        res.writeHead(200, { 'Content-Type': MIME[ext] || 'application/octet-stream' });
-        res.end(data);
+        // Static files have stable ETags, including fonts, images, manifests, and vendored libraries.
+        // Their fixed URLs must revalidate so deployments never leave clients on an old asset.
+        respondWithValidator(req, res, data, MIME[ext] || 'application/octet-stream', STATIC_CACHE_CONTROL);
     });
 }
 // ── Helpers ──

package/dist/sources/msg.js

@@ -6,11 +6,16 @@
  */
 import fs from 'fs';
 import path from 'path';
+import { ipcQuery } from '../ipc-client.js';
 import { resolvePaths } from '../paths.js';
 import { resolveParentDistModule, toFileUrl } from './parent-package.js';
 import { isTransientProtocolMessage, readAllJsonlLines, readJsonFile, } from '../fs-utils.js';
 let contextModulesPromise = null;
 const sessionAdapterPromises = new Map();
+let peerDisplayResolverPromise = null;
+const aunGroupNameCache = new Map();
+const aunGroupNameRequests = new Map();
+let agentDisplayNamesCache = null;
 function getContextModules() {
     if (!contextModulesPromise) {
         contextModulesPromise = Promise.all([
@@ -21,6 +26,145 @@ function getContextModules() {
     }
     return contextModulesPromise;
 }
+function getPeerDisplayResolver() {
+    if (!peerDisplayResolverPromise) {
+        peerDisplayResolverPromise = Promise.resolve()
+            .then(() => import(toFileUrl(resolveParentDistModule('config', 'contact-book.js'))))
+            .then(mod => typeof mod.resolvePeerDisplayLabel === 'function' ? mod.resolvePeerDisplayLabel : null)
+            .catch(() => null);
+    }
+    return peerDisplayResolverPromise;
+}
+export function resolveContactPeerName(resolver, identity, peerId, fallback) {
+    if (!resolver)
+        return fallback;
+    try {
+        return resolver(identity.selfAID, identity.channelType, peerId, identity.channel) || fallback;
+    }
+    catch {
+        return fallback;
+    }
+}
+export function aunGroupIdVariants(groupId) {
+    const id = String(groupId || '').trim();
+    if (!id)
+        return [];
+    const variants = new Set([id]);
+    const legacy = /^group\.agentid\.pub\/([^/]+)$/i.exec(id);
+    if (legacy)
+        variants.add(`${legacy[1]}.agentid.pub`);
+    const current = /^([^.]+)\.agentid\.pub$/i.exec(id);
+    if (current)
+        variants.add(`group.agentid.pub/${current[1]}`);
+    return [...variants];
+}
+export function resolveAunGroupName(names, groupId, fallback) {
+    for (const id of aunGroupIdVariants(groupId || '')) {
+        const name = names.get(id);
+        if (name)
+            return name;
+    }
+    return fallback;
+}
+async function fetchAunGroupNames(aid) {
+    const names = new Map();
+    let cursor = null;
+    let page = 0;
+    do {
+        page += 1;
+        const response = await ipcQuery(resolvePaths().socket, {
+            type: 'menu.exec',
+            payload: {
+                type: 'menu.query',
+                name: 'connect',
+                cmd: '/connect',
+                agent: aid,
+                id: `ecweb-msg-groups-${Date.now()}-${page}`,
+                args: { self: aid, view: 'groups', limit: 200, ...(cursor ? { cursor } : {}) },
+            },
+            auth: { source: 'ecweb', localDirect: true },
+        }, 10_000);
+        const data = response?.ok && !response.response?.error ? response.response?.data : null;
+        if (!data || !Array.isArray(data.items))
+            break;
+        for (const item of data.items) {
+            const groupId = String(item?.groupId || '').trim();
+            const displayName = String(item?.displayName || '').trim();
+            if (!groupId || !displayName)
+                continue;
+            for (const variant of aunGroupIdVariants(groupId))
+                names.set(variant, displayName);
+        }
+        cursor = typeof data.nextCursor === 'string' && data.nextCursor ? data.nextCursor : null;
+    } while (cursor && page < 20);
+    return names;
+}
+function getAunGroupNames(aid) {
+    const cached = aunGroupNameCache.get(aid);
+    if (cached && cached.expiresAt > Date.now())
+        return Promise.resolve(cached.names);
+    const pending = aunGroupNameRequests.get(aid);
+    if (pending)
+        return pending;
+    const request = fetchAunGroupNames(aid)
+        .then(names => {
+        aunGroupNameCache.set(aid, {
+            names,
+            expiresAt: Date.now() + (names.size ? 5 * 60_000 : 15_000),
+        });
+        return names;
+    })
+        .catch(() => new Map())
+        .finally(() => aunGroupNameRequests.delete(aid));
+    aunGroupNameRequests.set(aid, request);
+    return request;
+}
+async function hydrateAunGroupNames(chats) {
+    const aids = [...new Set(chats
+            .filter(chat => chat.channelType === 'aun' && chat.chatType === 'group')
+            .map(chat => chat.selfAID))];
+    if (!aids.length)
+        return;
+    const directories = new Map(await Promise.all(aids.map(async (aid) => [aid, await getAunGroupNames(aid)])));
+    for (const chat of chats) {
+        if (chat.channelType !== 'aun' || chat.chatType !== 'group')
+            continue;
+        const groupName = resolveAunGroupName(directories.get(chat.selfAID) || new Map(), chat.groupId, chat.groupName);
+        if (!groupName)
+            continue;
+        chat.groupName = groupName;
+        chat.peerName = groupName;
+    }
+}
+export function resolveSessionBindDisplayName(bind, resolver, aunGroupNames = new Map()) {
+    const isGroup = bind.chatType === 'group' || !!bind.groupId;
+    if (bind.channelType === 'aun' && isGroup) {
+        return resolveAunGroupName(aunGroupNames, bind.groupId || bind.channelId, bind.groupName || null);
+    }
+    if (isGroup)
+        return bind.groupName || null;
+    return resolveContactPeerName(resolver, {
+        selfAID: bind.selfAID,
+        channelType: bind.channelType,
+        channel: bind.channelKey || bind.channelType,
+        channelId: bind.channelId,
+    }, bind.peerId || bind.channelId, bind.peerName);
+}
+/** 为会话页绑定标签补齐联系人名或 AUN 群名，不改变原始 channelId。 */
+export async function hydrateSessionBindDisplayNames(binds) {
+    const items = [...binds];
+    if (!items.length)
+        return;
+    const resolver = await getPeerDisplayResolver();
+    const groupAids = [...new Set(items
+            .filter(bind => bind.channelType === 'aun' && (bind.chatType === 'group' || !!bind.groupId))
+            .map(bind => bind.selfAID)
+            .filter(Boolean))];
+    const groupDirectories = new Map(await Promise.all(groupAids.map(async (aid) => [aid, await getAunGroupNames(aid)])));
+    for (const bind of items) {
+        bind.displayName = resolveSessionBindDisplayName(bind, resolver, groupDirectories.get(bind.selfAID) || new Map());
+    }
+}
 function getSessionAdapter(baseagent) {
     if (!sessionAdapterPromises.has(baseagent)) {
         const classNames = {
@@ -173,6 +317,37 @@ function listConfiguredAgentAids(root) {
     }
     return aids;
 }
+function shortAid(value) {
+    return String(value || '').split('.')[0] || String(value || '');
+}
+/** Returns local Agent display names, preferring the runtime selfName. */
+export async function getAgentSelfNames() {
+    if (agentDisplayNamesCache && agentDisplayNamesCache.expiresAt > Date.now()) {
+        return agentDisplayNamesCache.names;
+    }
+    const names = new Map();
+    try {
+        const [agentsResp, statsResp] = await Promise.all([
+            ipcQuery(resolvePaths().socket, { type: 'evolagent.list' }, 4000),
+            ipcQuery(resolvePaths().socket, { type: 'aun-aid-stats' }, 4000),
+        ]);
+        const statsByAid = new Map((statsResp?.stats || []).map(item => [String(item?.aid || ''), item]));
+        for (const agent of agentsResp?.agents || []) {
+            const aid = String(agent?.aid || '').trim();
+            if (!aid)
+                continue;
+            const stats = statsByAid.get(aid);
+            const displayName = String(stats?.selfName || agent?.displayName || shortAid(aid)).trim();
+            if (displayName)
+                names.set(aid, displayName);
+        }
+    }
+    catch {
+        // daemon unavailable: leave the map empty and use the AID fallback below
+    }
+    agentDisplayNamesCache = { expiresAt: Date.now() + 5000, names };
+    return names;
+}
 function decodeDirSegment(seg) {
     return seg.replace(/%([0-9A-Fa-f]{2})/g, (_, hex) => String.fromCharCode(parseInt(hex, 16)));
 }
@@ -292,7 +467,7 @@ function chatDisplayId(active, messages) {
         groupName: null,
     };
 }
-function loadChats() {
+function loadChats(peerDisplayResolver) {
     const paths = resolvePaths();
     const sessionsDir = paths.sessionsDir;
     const configuredAids = listConfiguredAgentAids(paths.root);
@@ -311,6 +486,9 @@ function loadChats() {
             continue;
         const chatType = String(active.chatType || messages.find(m => m.chatType)?.chatType || 'private');
         const display = chatDisplayId({ ...active, chatType, channelId }, messages);
+        const peerName = chatType === 'group'
+            ? display.peerName
+            : resolveContactPeerName(peerDisplayResolver, identity, display.peerId, display.peerName);
         const threadSessions = loadThreadSessions(dirPath);
         const threadById = new Map(threadSessions.map(item => [item.threadId, item]));
         const mainSessionIds = loadMainSessionIds(dirPath, active);
@@ -331,7 +509,7 @@ function loadChats() {
                 selfAID,
                 chatType,
                 peerId: display.peerId,
-                peerName: display.peerName,
+                peerName,
                 groupId: display.groupId,
                 groupName: display.groupName,
                 partition: item.partition,
@@ -353,7 +531,7 @@ function scopeId(chat) {
 function legacyChannelScopeId(chat) {
     return safeId(`${chat.selfAID}\n${chat.channelType}\n${chat.channel}`);
 }
-function buildScopes(chats) {
+function buildScopes(chats, agentDisplayNames = new Map()) {
     const map = new Map();
     const seenChats = new Map();
     const seenChannels = new Map();
@@ -366,6 +544,7 @@ function buildScopes(chats) {
                 id,
                 aid: id,
                 selfAID: chat.selfAID,
+                displayName: agentDisplayNames.get(chat.selfAID) || shortAid(chat.selfAID),
                 totalIn: 0,
                 totalOut: 0,
                 peerCount: 0,
@@ -566,8 +745,9 @@ async function buildSessionContext(chat) {
     };
 }
 async function buildSnapshot(params) {
-    const chats = loadChats();
-    const scopes = buildScopes(chats);
+    const peerDisplayResolver = await getPeerDisplayResolver();
+    const chats = loadChats(peerDisplayResolver);
+    const scopes = buildScopes(chats, await getAgentSelfNames());
     const requestedScope = params.scope || params.aid || null;
     const scope = requestedScope && !scopes.some(s => s.id === requestedScope)
         ? (chats.find(chat => legacyChannelScopeId(chat) === requestedScope)
@@ -576,6 +756,8 @@ async function buildSnapshot(params) {
         : requestedScope;
     const peer = params.peer || null;
     const inScope = selectedChats(chats, scope);
+    if (scope)
+        await hydrateAunGroupNames(inScope);
     const peers = scope ? mergePeerInfo(inScope) : [];
     const messages = scope ? messagesFor(inScope, peer) : [];
     const currentChat = peer ? inScope.find(chat => chatKey(chat) === peer) : undefined;

package/dist/sources/session-codex.js

@@ -12,7 +12,9 @@ import path from 'path';
 import os from 'os';
 import { createRequire } from 'module';
 import { resolvePaths } from '../paths.js';
-import { encodePath, scanChatDirs, readJsonFile } from '../fs-utils.js';
+import { encodePath } from '../fs-utils.js';
+import { getAgentSelfNames } from './msg.js';
+import { buildSessionBindMap, classifyTranscriptSource, isEvolcoreRoutedMessage, isSyntheticCliPrompt, resolveSessionBindSelfName, } from './session-origin.js';
 const requireFromHere = createRequire(import.meta.url);
 let _dlog = null;
 export function setDebugLog(log) { _dlog = log; }
@@ -107,7 +109,7 @@ function listProjects() {
     }
 }
 // ── 会话列表 ──
-const CACHE_VERSION = 1;
+const CACHE_VERSION = 2;
 const _metaCache = new Map();
 function cacheDir(encoded) {
     const dataDir = resolvePaths().dataDir;
@@ -170,6 +172,7 @@ 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())
@@ -187,6 +190,8 @@ function extractMetaFromRollout(file, id) {
             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);
@@ -216,15 +221,34 @@ function extractMetaFromRollout(file, id) {
         totalMsgs,
         sizeKB: Math.round(stat.size / 1024),
         lastActivity: stat.mtimeMs,
+        hasRealUserInput,
+        backendSource: '',
+        threadSource: '',
+        evolcoreRouted: false,
     };
 }
+function withThreadSource(meta, row) {
+    return {
+        ...meta,
+        backendSource: typeof row.source === 'string' ? row.source : '',
+        threadSource: typeof row.thread_source === 'string' ? row.thread_source : '',
+        evolcoreRouted: isEvolcoreRoutedMessage(row.first_user_message),
+    };
+}
+function isCodexCliCandidate(meta) {
+    if (meta.threadSource === 'subagent')
+        return false;
+    if (meta.backendSource !== 'cli' && meta.backendSource !== 'vscode')
+        return false;
+    return meta.hasRealUserInput && !meta.evolcoreRouted;
+}
 function listTranscripts(encoded, cwd) {
     const db = getDb();
     if (!db)
         return [];
     try {
         const rows = db.prepare(`
-      SELECT id, title, first_user_message, updated_at, rollout_path
+      SELECT id, title, first_user_message, updated_at, rollout_path, source, thread_source
       FROM threads
       WHERE cwd = ? AND archived = 0
       ORDER BY updated_at DESC
@@ -248,6 +272,10 @@ function listTranscripts(encoded, cwd) {
                     totalMsgs: 0,
                     sizeKB: 0,
                     lastActivity: (row.updated_at || 0) * 1000,
+                    hasRealUserInput: !!firstUser && !isSyntheticCliPrompt(firstUser, 'codex'),
+                    backendSource: typeof row.source === 'string' ? row.source : '',
+                    threadSource: typeof row.thread_source === 'string' ? row.thread_source : '',
+                    evolcoreRouted: isEvolcoreRoutedMessage(row.first_user_message),
                 });
                 continue;
             }
@@ -261,21 +289,21 @@ function listTranscripts(encoded, cwd) {
             const mtime = stat.mtimeMs;
             const mem = _metaCache.get(rolloutPath);
             if (mem && mem.mtime === mtime) {
-                out.push(mem.meta);
+                out.push(withThreadSource(mem.meta, row));
                 hitMem++;
                 continue;
             }
             const disk = readDiskCache(encoded, id, mtime, stat.size);
             if (disk) {
                 _metaCache.set(rolloutPath, { mtime, meta: disk });
-                out.push(disk);
+                out.push(withThreadSource(disk, row));
                 hitDisk++;
                 continue;
             }
             const meta = extractMetaFromRollout(rolloutPath, id);
             _metaCache.set(rolloutPath, { mtime, meta });
             writeDiskCache(encoded, id, mtime, stat.size, meta);
-            out.push(meta);
+            out.push(withThreadSource(meta, row));
             parsed++;
         }
         dlog(`[codex] listTranscripts ${cwd.slice(-20)}: ${rows.length} threads (mem=${hitMem} disk=${hitDisk} parsed=${parsed})`);
@@ -288,25 +316,7 @@ function listTranscripts(encoded, cwd) {
 }
 // ── 绑定关系 ──
 export function buildBindMap() {
-    const map = new Map();
-    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,
-            });
-        }
-    }
-    catch { }
-    return map;
+    return buildSessionBindMap();
 }
 // ── 项目解析 ──
 function resolveProject(params, projects) {
@@ -611,7 +621,7 @@ function readTranscriptFile(threadId, cwd) {
     };
 }
 // ── Snapshot ──
-function buildSnapshot(params) {
+async function buildSnapshot(params) {
     const projects = listProjects();
     const bindMap = buildBindMap();
     const project = resolveProject(params, projects);
@@ -626,13 +636,15 @@ function buildSnapshot(params) {
         };
     }
     const metas = listTranscripts(project.encoded, project.cwd);
+    const selfNames = await getAgentSelfNames();
     const transcripts = metas.map(m => {
         const bind = bindMap.get(m.id);
         return {
             ...m,
+            sourceType: classifyTranscriptSource(bind, isCodexCliCandidate(m)),
             bound: !!bind,
             boundChannel: bind?.channelType ?? null,
-            boundPeer: bind ? (bind.peerName || bind.channelId) : null,
+            boundSelf: resolveSessionBindSelfName(bind, selfNames),
             online: bind ? (Date.now() - bind.updatedAt < 5 * 60 * 1000) : false,
         };
     });
@@ -655,6 +667,7 @@ function buildSnapshot(params) {
     }
     const detail = readTranscriptFile(sessionId, project.cwd);
     const bind = bindMap.get(sessionId);
+    const transcript = metas.find(meta => meta.id === sessionId);
     const header = {
         sessionId,
         title: detail.title,
@@ -670,9 +683,10 @@ function buildSnapshot(params) {
         outputTokens: detail.outputTokens,
         contextTokens: detail.contextTokens,
         costUsd: detail.costUsd,
+        sourceType: classifyTranscriptSource(bind, transcript ? isCodexCliCandidate(transcript) : false),
         bound: !!bind,
         boundChannel: bind?.channelType ?? null,
-        boundPeer: bind ? (bind.peerName || bind.channelId) : null,
+        boundSelf: resolveSessionBindSelfName(bind, selfNames),
         online: bind ? (Date.now() - bind.updatedAt < 5 * 60 * 1000) : false,
     };
     return {
@@ -699,7 +713,7 @@ export function subscribeCodex(params, push) {
             clearTimeout(debounce);
         debounce = setTimeout(() => {
             try {
-                push(buildSnapshot(params));
+                void buildSnapshot(params).then(push).catch(() => { });
             }
             catch { }
         }, 150);