evolclaw-web 1.2.2 → 1.3.0

package/dist/server.js

@@ -29,6 +29,7 @@ import { gatewaySource } from './sources/gateway.js';
 import { queryStatsForDashboard, queryStatsExplorer, queryStatsByPeer, queryStatsOverview, queryUsageDetail, queryUsedModels } from './sources/stats.js';
 import { getSessionsAunDir, listLocalAids, listPeers, readMessages } from './fs-utils.js';
 import { ccProjectsDir } from './paths.js';
+import { detectBaseAgents } from './sources/baseagent-detector.js';
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const STATIC_DIR = path.join(__dirname, 'static');
 const TOKEN_TTL_MS = 30 * 24 * 60 * 60 * 1000; // 30天（滑动窗口：每次有效访问刷新 lastActive 自动续期）
@@ -486,7 +487,9 @@ function handleConnection(ws, req, log) {
                 params.project = msg.project;
             if (msg.agent)
                 params.agent = msg.agent;
-            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)}` : ''} from ${ip}`);
+            if (msg.baseagent)
+                params.baseagent = msg.baseagent;
+            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;
         }
@@ -614,7 +617,13 @@ export async function startWatchWebServer(opts = {}) {
         return { code: pairingCode, expiresAt: pairingExpiry };
     }
     const server = http.createServer((req, res) => {
-        if (req.method === 'GET' && (req.url || '') === '/api/pair-code') {
+        if (req.method === 'GET' && (req.url || '') === '/api/available-baseagents') {
+            // Base agent 可用性检测 API
+            const available = detectBaseAgents();
+            res.writeHead(200, { 'Content-Type': 'application/json' });
+            res.end(JSON.stringify(available));
+        }
+        else if (req.method === 'GET' && (req.url || '') === '/api/pair-code') {
             // 取码 API：仅真本地直连可用（socket 回环 + 无 x-aun-provider-aid）。
             // 隧道回连虽然 socket 也是 127.0.0.1，但有 x-aun-provider-aid 头 → 拒绝，
             // 防止远程访客通过隧道拿到配对码（安全漏洞）。

package/dist/sources/aid.js

@@ -1,7 +1,7 @@
 /**
  * AID 数据源 — 复用 daemon 的 IPC socket（与 evolclaw `watch aid` 同源）。
  *
- * daemon 运行时：拉 aun-aids / aun-aid-stats / status / evolagent.list。
+ * daemon 运行时：拉 aun-aids / aun-aid-stats / agent-stats / status / evolagent.list。
  * daemon 未运行时：降级到读 instance/ 目录的 aid-*.jsonl（精简版 scanInstances）。
  * IPC 无推送能力，故 1s 轮询 + JSON diff，仅在变化时 push。
  */
@@ -83,9 +83,10 @@ async function fetchVersion(socket) {
 }
 async function buildSnapshot() {
     const p = resolvePaths();
-    const [aidsResp, statsResp, statusResp, agentsResp, version] = await Promise.all([
+    const [aidsResp, statsResp, agentStatsResp, statusResp, agentsResp, version] = await Promise.all([
         ipcQuery(p.socket, { type: 'aun-aids' }),
         ipcQuery(p.socket, { type: 'aun-aid-stats' }),
+        ipcQuery(p.socket, { type: 'agent-stats' }),
         ipcQuery(p.socket, { type: 'status' }),
         ipcQuery(p.socket, { type: 'evolagent.list' }),
         fetchVersion(p.socket),
@@ -105,6 +106,7 @@ async function buildSnapshot() {
         daemonRunning: true,
         aids: aidsResp?.aids ?? [],
         stats: statsResp?.stats ?? [],
+        agentStats: agentStatsResp?.stats ?? [],
         status: statusResp ?? null,
         agents: agentsResp?.agents ?? [],
         version: version ?? null,

package/dist/sources/baseagent-detector.js

@@ -0,0 +1,72 @@
+/**
+ * Base agent 环境检测 — 检测 Claude 和 Codex 的可用性。
+ *
+ * 检测条件：
+ * - Claude: ~/.claude/projects/ 目录存在
+ * - Codex: ~/.codex/sessions/ 和 ~/.codex/state_*.sqlite 存在，且 Node 版本 >= 22.5
+ */
+import fs from 'fs';
+import path from 'path';
+import os from 'os';
+import { createRequire } from 'module';
+const requireFromHere = createRequire(import.meta.url);
+let _cached = null;
+/**
+ * 检测 node:sqlite 模块是否可用（Node 22.5+）
+ */
+function checkSqliteAvailable() {
+    try {
+        requireFromHere('node:sqlite');
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * 检测 Codex state_*.sqlite 文件是否存在
+ */
+function checkCodexStateDb() {
+    const codexHome = path.join(os.homedir(), '.codex');
+    if (!fs.existsSync(codexHome))
+        return false;
+    try {
+        const files = fs.readdirSync(codexHome).filter(f => /^state_\d+\.sqlite$/.test(f));
+        return files.length > 0;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * 检测 Claude projects 目录是否存在
+ */
+function checkClaudeProjects() {
+    const claudeProjects = path.join(os.homedir(), '.claude', 'projects');
+    return fs.existsSync(claudeProjects);
+}
+/**
+ * 检测 Codex sessions 目录是否存在
+ */
+function checkCodexSessions() {
+    const codexSessions = path.join(os.homedir(), '.codex', 'sessions');
+    return fs.existsSync(codexSessions);
+}
+/**
+ * 检测所有 base agent 的可用性
+ * 结果会缓存，避免重复检测
+ */
+export function detectBaseAgents() {
+    if (_cached)
+        return _cached;
+    const claude = checkClaudeProjects();
+    const codex = checkCodexSessions() && checkCodexStateDb() && checkSqliteAvailable();
+    _cached = { claude, codex };
+    return _cached;
+}
+/**
+ * 重置缓存（测试用）
+ */
+export function resetDetectionCache() {
+    _cached = null;
+}

package/dist/sources/msg.js

@@ -1,38 +1,372 @@
 /**
- * 消息数据源 — fs-utils 的数据层函数 + fs.watch 文件监听。
+ * 消息数据源：扫描 data/sessions 下所有渠道的 messages.jsonl。
  *
- * snapshot:
- *   - 无 aid: 本地 AID 列表（含收发统计）
- *   - 有 aid 无 peer: 该 AID 的对端列表 + 全部消息
- *   - 有 aid 有 peer: 该对端的消息
- * subscribe: fs.watch(sessions/aun, recursive)，messages.jsonl 变化时防抖 150ms 后重推。
+ * 左列按 agent 聚合；中列列出该 agent 下所有渠道的私聊/群聊会话。
+ * 兼容旧参数名 aid/peer：前端的 aid 实际上传 scope id。
  */
 import fs from 'fs';
-import { getSessionsAunDir, listLocalAids, loadAidInfo, loadPeerInfos, loadAllMessages, readMessages, } from '../fs-utils.js';
-function buildSnapshot(params) {
-    const aunDir = getSessionsAunDir();
-    if (!fs.existsSync(aunDir)) {
-        return { aids: [], peers: [], messages: [], aid: null, peer: null };
+import path from 'path';
+import { resolvePaths } from '../paths.js';
+import { readAllJsonlLines, readJsonFile, } from '../fs-utils.js';
+function safeId(value) {
+    return Buffer.from(value, 'utf8').toString('base64url');
+}
+function findMessageFiles(root) {
+    const out = [];
+    const visit = (dir) => {
+        let entries;
+        try {
+            entries = fs.readdirSync(dir, { withFileTypes: true });
+        }
+        catch {
+            return;
+        }
+        for (const entry of entries) {
+            const full = path.join(dir, entry.name);
+            if (entry.isDirectory())
+                visit(full);
+            else if (entry.isFile() && entry.name === 'messages.jsonl')
+                out.push(full);
+        }
+    };
+    visit(root);
+    return out;
+}
+function listConfiguredAgentAids(root) {
+    const agentsDir = path.join(root, 'agents');
+    const aids = new Set();
+    let entries;
+    try {
+        entries = fs.readdirSync(agentsDir, { withFileTypes: true });
     }
-    const aid = params.aid || null;
-    const peer = params.peer || null;
-    const aids = listLocalAids(aunDir)
-        .map(a => loadAidInfo(aunDir, a))
-        .sort((a, b) => (b.totalIn + b.totalOut) - (a.totalIn + a.totalOut));
-    if (!aid) {
-        return { aids, peers: [], messages: [], aid: null, peer: null };
+    catch {
+        return aids;
+    }
+    for (const entry of entries) {
+        if (!entry.isDirectory())
+            continue;
+        const config = readJsonFile(path.join(agentsDir, entry.name, 'config.json'));
+        const aid = typeof config?.aid === 'string' ? config.aid : entry.name;
+        if (looksLikeAID(aid))
+            aids.add(aid);
+    }
+    return aids;
+}
+function decodeDirSegment(seg) {
+    return seg.replace(/%([0-9A-Fa-f]{2})/g, (_, hex) => String.fromCharCode(parseInt(hex, 16)));
+}
+function parseChannelKey(value) {
+    if (typeof value !== 'string')
+        return null;
+    const parts = value.split('#');
+    if (parts.length !== 3)
+        return null;
+    const [type, selfAID, name] = parts;
+    if (!type || !selfAID || !name)
+        return null;
+    return { type, selfAID, name };
+}
+function looksLikeAID(value) {
+    return !!value && value !== 'self' && value !== '_unknown' && /^[^./#\s]+\.[^/#\s]+/.test(value);
+}
+function parseLegacySessionKey(value, channelType) {
+    if (typeof value !== 'string')
+        return null;
+    const parts = value.split('#');
+    if (parts.length < 3 || parts[0] !== channelType)
+        return null;
+    if (!looksLikeAID(parts[1]))
+        return null;
+    return { type: parts[0], selfAID: parts[1], name: parts[2] || 'main' };
+}
+function pathIdentity(sessionsDir, dirPath) {
+    const relParts = path.relative(sessionsDir, dirPath).split(path.sep).filter(Boolean);
+    if (!relParts.length)
+        return {};
+    const firstKey = parseChannelKey(decodeDirSegment(relParts[0]));
+    if (firstKey) {
+        return {
+            channelType: firstKey.type,
+            channel: `${firstKey.type}#${firstKey.selfAID}#${firstKey.name}`,
+            channelId: relParts[1] ? decodeDirSegment(relParts[1]) : undefined,
+            selfAID: firstKey.selfAID,
+        };
     }
-    const peers = loadPeerInfos(aunDir, aid);
-    let messages;
-    if (peer) {
-        messages = readMessages(aunDir, aid, peer);
-        if (messages.length > 1000)
-            messages = messages.slice(-1000);
+    if (relParts[0] === 'aun' && relParts.length >= 3) {
+        const selfAID = decodeDirSegment(relParts[1]);
+        return {
+            channelType: 'aun',
+            channel: looksLikeAID(selfAID) ? `aun#${selfAID}#main` : undefined,
+            channelId: decodeDirSegment(relParts[2]),
+            selfAID: looksLikeAID(selfAID) ? selfAID : undefined,
+        };
     }
-    else {
-        messages = loadAllMessages(aunDir, aid);
+    return {
+        channelType: decodeDirSegment(relParts[0]),
+        channelId: relParts[1] ? decodeDirSegment(relParts[1]) : undefined,
+    };
+}
+function inferSelfAID(active, messages, hints) {
+    if (looksLikeAID(active?.selfAID))
+        return String(active.selfAID);
+    if (looksLikeAID(hints.selfAID))
+        return hints.selfAID;
+    const channelKey = parseChannelKey(active?.channel) || parseChannelKey(active?.channelType);
+    if (channelKey)
+        return channelKey.selfAID;
+    const sessionKey = parseLegacySessionKey(active?.sessionKey, hints.channelType || active?.channelType || '');
+    if (sessionKey)
+        return sessionKey.selfAID;
+    const out = messages.find(m => m.dir === 'out' && m.from && m.from !== 'self');
+    if (out?.from)
+        return String(out.from);
+    const inboundTo = messages.find(m => m.dir === 'in' && m.to && m.to !== 'self');
+    if (inboundTo?.to)
+        return String(inboundTo.to);
+    return 'unknown';
+}
+function normalizeChatIdentity(sessionsDir, dirPath, active, messages) {
+    const pathHints = pathIdentity(sessionsDir, dirPath);
+    const activeChannelKey = parseChannelKey(active?.channel);
+    const activeTypeKey = parseChannelKey(active?.channelType);
+    const msgChannelType = messages.find(m => m.channelType)?.channelType;
+    const rawType = String(activeChannelKey?.type
+        || activeTypeKey?.type
+        || active?.channelType
+        || msgChannelType
+        || pathHints.channelType
+        || 'unknown');
+    const channelType = parseChannelKey(rawType)?.type || rawType;
+    const selfAID = inferSelfAID(active, messages, { ...pathHints, channelType });
+    const rawChannel = typeof active?.channel === 'string' && active.channel
+        ? active.channel
+        : pathHints.channel || `${channelType}#${selfAID}#main`;
+    const channelKey = parseChannelKey(rawChannel);
+    const channel = channelKey
+        ? `${channelKey.type}#${channelKey.selfAID}#${channelKey.name}`
+        : (selfAID !== 'unknown' ? `${channelType}#${selfAID}#main` : rawChannel);
+    const channelId = String(active.channelId || pathHints.channelId || path.basename(dirPath));
+    return { channelType, channel, channelId, selfAID };
+}
+function chatDisplayId(active, messages) {
+    const metadata = active?.metadata ?? {};
+    const chatType = active?.chatType || messages.find(m => m.chatType)?.chatType || 'private';
+    const groupId = chatType === 'group'
+        ? String(metadata.groupId || active?.channelId || messages.find(m => m.groupId)?.groupId || '')
+        : null;
+    const groupName = chatType === 'group' && metadata.groupName ? String(metadata.groupName) : null;
+    if (chatType === 'group') {
+        return {
+            peerId: groupId || String(active?.channelId || 'group'),
+            peerName: groupName,
+            groupId,
+            groupName,
+        };
     }
-    return { aids, peers, messages, aid, peer };
+    const peerId = String(metadata.peerId || active?.channelId || messages.find(m => m.dir === 'in')?.from || messages.find(m => m.dir === 'out')?.to || 'unknown');
+    return {
+        peerId,
+        peerName: metadata.peerName ? String(metadata.peerName) : null,
+        groupId: null,
+        groupName: null,
+    };
+}
+function loadChats() {
+    const paths = resolvePaths();
+    const sessionsDir = paths.sessionsDir;
+    const configuredAids = listConfiguredAgentAids(paths.root);
+    const files = findMessageFiles(sessionsDir);
+    const chats = [];
+    for (const file of files) {
+        const dirPath = path.dirname(file);
+        const active = readJsonFile(path.join(dirPath, 'active.json')) ?? {};
+        const messages = readAllJsonlLines(file);
+        if (!messages.length)
+            continue;
+        const identity = normalizeChatIdentity(sessionsDir, dirPath, active, messages);
+        const { channelType, channel, channelId, selfAID } = identity;
+        if (configuredAids.size && !configuredAids.has(selfAID))
+            continue;
+        const chatType = String(active.chatType || messages.find(m => m.chatType)?.chatType || 'private');
+        const display = chatDisplayId({ ...active, chatType, channelId }, messages);
+        const lastMsgAt = messages.reduce((max, m) => Math.max(max, m.ts || 0), 0);
+        const updatedAt = Math.max(Number(active.updatedAt || 0), lastMsgAt);
+        chats.push({
+            id: safeId(`${selfAID}\n${channelType}\n${channelId}\n${chatType}`),
+            dirPath,
+            channelType,
+            channel,
+            channelId,
+            selfAID,
+            chatType,
+            peerId: display.peerId,
+            peerName: display.peerName,
+            groupId: display.groupId,
+            groupName: display.groupName,
+            updatedAt,
+            messages,
+        });
+    }
+    return chats;
+}
+function scopeId(chat) {
+    return safeId(chat.selfAID);
+}
+function legacyChannelScopeId(chat) {
+    return safeId(`${chat.selfAID}\n${chat.channelType}\n${chat.channel}`);
+}
+function buildScopes(chats) {
+    const map = new Map();
+    const seenChats = new Map();
+    const seenChannels = new Map();
+    const seenChannelTypes = new Map();
+    for (const chat of chats) {
+        const id = scopeId(chat);
+        let scope = map.get(id);
+        if (!scope) {
+            scope = {
+                id,
+                aid: id,
+                selfAID: chat.selfAID,
+                totalIn: 0,
+                totalOut: 0,
+                peerCount: 0,
+                groupCount: 0,
+                channelCount: 0,
+                channelTypes: [],
+                channels: [],
+                lastAt: 0,
+            };
+            map.set(id, scope);
+            seenChats.set(id, new Set());
+            seenChannels.set(id, new Set());
+            seenChannelTypes.set(id, new Set());
+        }
+        const channelSeen = seenChannels.get(id);
+        if (!channelSeen.has(chat.channel)) {
+            channelSeen.add(chat.channel);
+            scope.channels.push(chat.channel);
+            scope.channelCount = channelSeen.size;
+        }
+        const typeSeen = seenChannelTypes.get(id);
+        if (!typeSeen.has(chat.channelType)) {
+            typeSeen.add(chat.channelType);
+            scope.channelTypes.push(chat.channelType);
+            scope.channelTypes.sort();
+        }
+        let hasIn = false;
+        let hasOut = false;
+        for (const msg of chat.messages) {
+            if (msg.dir === 'in') {
+                scope.totalIn++;
+                hasIn = true;
+            }
+            else if (msg.dir === 'out') {
+                scope.totalOut++;
+                hasOut = true;
+            }
+            if (msg.ts > scope.lastAt)
+                scope.lastAt = msg.ts;
+        }
+        if (hasIn || hasOut) {
+            const chatKey = `${chat.channel}\n${chat.channelId}\n${chat.chatType}`;
+            const seen = seenChats.get(id);
+            if (!seen.has(chatKey)) {
+                seen.add(chatKey);
+                scope.peerCount++;
+                if (chat.chatType === 'group')
+                    scope.groupCount++;
+            }
+        }
+        if (chat.updatedAt > scope.lastAt)
+            scope.lastAt = chat.updatedAt;
+    }
+    return Array.from(map.values())
+        .sort((a, b) => b.lastAt - a.lastAt);
+}
+function channelName(channel) {
+    return parseChannelKey(channel)?.name ?? null;
+}
+function chatKey(chat) {
+    return safeId(`${chat.channelType}\n${chat.channel}\n${chat.channelId}\n${chat.chatType}`);
+}
+function mergePeerInfo(chats) {
+    const map = new Map();
+    for (const chat of chats) {
+        const key = chatKey(chat);
+        let peer = map.get(key);
+        if (!peer) {
+            peer = {
+                id: key,
+                peerId: key,
+                peerName: chat.chatType === 'group' ? (chat.groupName || chat.groupId || chat.channelId) : (chat.peerName || chat.peerId),
+                channel: chat.channel,
+                channelType: chat.channelType,
+                channelName: channelName(chat.channel),
+                chatType: chat.chatType,
+                groupId: chat.groupId,
+                groupName: chat.groupName,
+                inbound: 0,
+                outbound: 0,
+                lastAt: 0,
+            };
+            map.set(key, peer);
+        }
+        for (const msg of chat.messages) {
+            if (msg.dir === 'in')
+                peer.inbound++;
+            else if (msg.dir === 'out')
+                peer.outbound++;
+            if (msg.ts > peer.lastAt)
+                peer.lastAt = msg.ts;
+        }
+        if (chat.updatedAt > peer.lastAt)
+            peer.lastAt = chat.updatedAt;
+    }
+    return Array.from(map.values()).sort((a, b) => b.lastAt - a.lastAt);
+}
+function selectedChats(chats, scope) {
+    if (!scope)
+        return [];
+    return chats.filter(chat => scopeId(chat) === scope);
+}
+function messagesFor(chats, peer) {
+    const selected = peer
+        ? chats.filter(chat => chatKey(chat) === peer)
+        : chats;
+    const messages = selected.flatMap(chat => chat.messages.map(msg => ({
+        ...msg,
+        channel: chat.channel,
+        channelType: chat.channelType,
+        selfAID: chat.selfAID,
+        peerName: chat.peerName,
+        groupName: chat.groupName,
+    })));
+    messages.sort((a, b) => (a.ts || 0) - (b.ts || 0));
+    return messages.length > 1000 ? messages.slice(-1000) : messages;
+}
+function buildSnapshot(params) {
+    const chats = loadChats();
+    const scopes = buildScopes(chats);
+    const requestedScope = params.scope || params.aid || null;
+    const scope = requestedScope && !scopes.some(s => s.id === requestedScope)
+        ? (chats.find(chat => legacyChannelScopeId(chat) === requestedScope)
+            ? scopeId(chats.find(chat => legacyChannelScopeId(chat) === requestedScope))
+            : requestedScope)
+        : requestedScope;
+    const peer = params.peer || null;
+    const inScope = selectedChats(chats, scope);
+    const peers = scope ? mergePeerInfo(inScope) : [];
+    const messages = scope ? messagesFor(inScope, peer) : [];
+    return {
+        scopes,
+        aids: scopes,
+        peers,
+        messages,
+        scope,
+        aid: scope,
+        peer,
+    };
 }
 export const msgSource = {
     kind: 'msg',
@@ -40,7 +374,7 @@ export const msgSource = {
         return buildSnapshot(params);
     },
     subscribe(params, push) {
-        const aunDir = getSessionsAunDir();
+        const sessionsDir = resolvePaths().sessionsDir;
         let watcher = null;
         let debounce = null;
         const fire = () => {
@@ -54,12 +388,13 @@ export const msgSource = {
             }, 150);
         };
         try {
-            watcher = fs.watch(aunDir, { recursive: true }, (_evt, filename) => {
-                if (filename && String(filename).endsWith('messages.jsonl'))
+            watcher = fs.watch(sessionsDir, { recursive: true }, (_evt, filename) => {
+                const name = String(filename || '');
+                if (name.endsWith('messages.jsonl') || name.endsWith('active.json'))
                     fire();
             });
         }
-        catch { /* aunDir may not exist yet */ }
+        catch { /* sessionsDir may not exist yet */ }
         return () => {
             if (watcher)
                 watcher.close();