evolclaw-web 1.2.0 → 1.2.3

package/dist/sources/stats.js

@@ -5,6 +5,7 @@ import path from 'path';
 import fs from 'fs';
 import { createRequire } from 'module';
 import { resolvePaths } from '../paths.js';
+import { encodeSegment } from '../fs-utils.js';
 const requireFromHere = createRequire(import.meta.url);
 let sqliteModule;
 function loadSqlite() {
@@ -36,97 +37,6 @@ function openDb() {
         return null;
     }
 }
-let _priceCache = null;
-let _aliasCache = null;
-let _priceCacheTs = 0;
-const PRICE_CACHE_TTL = 5 * 60 * 1000;
-function _loadPrices() {
-    const now = Date.now();
-    if (_priceCache && now - _priceCacheTs < PRICE_CACHE_TTL)
-        return _priceCache;
-    const { root } = resolvePaths();
-    const file = path.join(root, 'data', 'stats', 'model-prices.jsonl');
-    if (!fs.existsSync(file)) {
-        _priceCache = [];
-        _priceCacheTs = now;
-        return [];
-    }
-    try {
-        _priceCache = fs.readFileSync(file, 'utf-8').split('\n').filter(Boolean).map(l => JSON.parse(l));
-        _priceCacheTs = now;
-        return _priceCache;
-    }
-    catch {
-        return [];
-    }
-}
-function _loadAliases() {
-    const now = Date.now();
-    if (_aliasCache && now - _priceCacheTs < PRICE_CACHE_TTL)
-        return _aliasCache;
-    const { root } = resolvePaths();
-    const file = path.join(root, 'data', 'stats', 'model-aliases.jsonl');
-    if (!fs.existsSync(file)) {
-        _aliasCache = [];
-        return [];
-    }
-    try {
-        _aliasCache = fs.readFileSync(file, 'utf-8').split('\n').filter(Boolean).map(l => JSON.parse(l));
-        return _aliasCache;
-    }
-    catch {
-        return [];
-    }
-}
-function _resolvePrice(model, ts) {
-    const prices = _loadPrices();
-    let candidates = prices.filter(p => p.model === model && p.effective_from <= ts);
-    if (!candidates.length) {
-        const aliases = _loadAliases();
-        const entry = aliases.find(a => a.alias === model);
-        if (entry)
-            candidates = prices.filter(p => p.model === entry.canonical && p.effective_from <= ts);
-    }
-    if (!candidates.length)
-        return null;
-    return candidates.reduce((a, b) => a.effective_from >= b.effective_from ? a : b);
-}
-function _calcRowCost(row) {
-    const p = _resolvePrice(row.model, row.ts);
-    if (!p)
-        return { usd: 0, cny: 0 };
-    let cost = 0;
-    switch (p.billing_fn) {
-        case 'per_token_v1':
-            cost = ((p.price_input ?? 0) * (row.input_tokens ?? 0)
-                + (p.price_output ?? 0) * (row.output_tokens ?? 0)
-                + (p.price_cache_creation ?? 0) * (row.cache_creation_tokens ?? 0)
-                + (p.price_cache_read ?? 0) * (row.cache_read_tokens ?? 0)) / 1e6;
-            break;
-        case 'per_token_deepseek_v1':
-            cost = ((p.price_cache_hit ?? 0) * (row.cache_hit_tokens ?? 0)
-                + (p.price_cache_miss ?? 0) * (row.cache_miss_tokens ?? 0)
-                + (p.price_output ?? 0) * (row.output_tokens ?? 0)) / 1e6;
-            break;
-        case 'per_token_tiered_v1': {
-            const tiers = p.tiers;
-            if (!Array.isArray(tiers))
-                break;
-            const ctx = row.total_context_tokens ?? row.input_tokens ?? 0;
-            const tier = tiers.find(t => t.up_to_tokens == null || ctx <= t.up_to_tokens) ?? tiers[tiers.length - 1];
-            cost = ((tier.price_input ?? 0) * (row.input_tokens ?? 0)
-                + (tier.price_output ?? 0) * (row.output_tokens ?? 0)
-                + (tier.price_cache_read ?? 0) * (row.cache_read_tokens ?? 0)) / 1e6;
-            break;
-        }
-        case 'per_token_image_v1':
-            cost = ((p.price_input ?? 0) * (row.input_tokens ?? 0)
-                + (p.price_output ?? 0) * (row.output_tokens ?? 0)
-                + (p.price_image ?? 0) * (row.image_tokens ?? 0)) / 1e6;
-            break;
-    }
-    return p.currency === 'CNY' ? { usd: 0, cny: cost } : { usd: cost, cny: 0 };
-}
 export function queryStatsForDashboard() {
     const db = openDb();
     if (!db)
@@ -135,26 +45,20 @@ export function queryStatsForDashboard() {
     const todayStart = Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate());
     const h24ago = Date.now() - 24 * 60 * 60 * 1000;
     try {
-        // Today summary
+        // Today summary with cost
         const todayRow = db.prepare(`
       SELECT
         COALESCE(SUM(input_tokens),0) AS input_tokens,
         COALESCE(SUM(output_tokens),0) AS output_tokens,
         COALESCE(SUM(cache_creation_tokens),0) AS cache_creation_tokens,
         COALESCE(SUM(cache_read_tokens),0) AS cache_read_tokens,
-        COUNT(*) AS call_count
+        COUNT(*) AS call_count,
+        COALESCE(SUM(cost_gateway_usd),0) AS cost_usd,
+        COALESCE(SUM(cost_gateway_cny),0) AS cost_cny
       FROM usage_events WHERE ts >= ?
     `).get(todayStart);
         const totalIn = (todayRow.input_tokens ?? 0) + (todayRow.cache_read_tokens ?? 0);
         const hitRate = totalIn > 0 ? (todayRow.cache_read_tokens ?? 0) / totalIn : 0;
-        // Today cost (逐行计算)
-        let costUsd = 0, costCny = 0;
-        const costRows = db.prepare(`SELECT * FROM usage_events WHERE ts >= ?`).all(todayStart);
-        for (const r of costRows) {
-            const c = _calcRowCost(r);
-            costUsd += c.usd;
-            costCny += c.cny;
-        }
         // Hourly (last 24h)
         const hourly = db.prepare(`
       SELECT
@@ -179,7 +83,7 @@ export function queryStatsForDashboard() {
       GROUP BY peer_key ORDER BY total_tokens DESC LIMIT 5
     `).all(todayStart);
         return {
-            today: { ...todayRow, cache_hit_rate: hitRate, cost_usd: costUsd, cost_cny: costCny },
+            today: { ...todayRow, cache_hit_rate: hitRate },
             hourly,
             top_models,
             top_peers,
@@ -258,62 +162,129 @@ export function queryStatsByPeer(params) {
     const where = conds.length ? 'WHERE ' + conds.join(' AND ') : '';
     const limit = params.limit ?? 50;
     try {
-        return db.prepare(`
+        const rows = db.prepare(`
       SELECT peer_key, peer_type,
         COALESCE(SUM(input_tokens),0) AS input_tokens,
         COALESCE(SUM(output_tokens),0) AS output_tokens,
         COALESCE(SUM(cache_read_tokens),0) AS cache_read_tokens,
         COUNT(*) AS call_count
       FROM usage_events ${where}
-      GROUP BY peer_key ORDER BY (input_tokens+output_tokens) DESC LIMIT ${limit}
+      GROUP BY peer_key ORDER BY (COALESCE(SUM(input_tokens),0) + COALESCE(SUM(output_tokens),0)) DESC LIMIT ${limit}
     `).all(...p);
+        // 为每个peer添加名称和详细信息
+        return rows.map((row) => {
+            const peerInfo = getPeerInfo(row.peer_key);
+            return {
+                ...row,
+                peer_name: peerInfo.name,
+                peer_chat_type: peerInfo.chatType,
+                peer_group_member_count: peerInfo.memberCount
+            };
+        });
     }
     finally {
         db.close();
     }
 }
-export function queryStatsOverview() {
+export function queryStatsOverview(params) {
     const db = openDb();
     if (!db)
         return null;
     try {
-        const allRows = db.prepare('SELECT * FROM usage_events').all();
-        let totIn = 0, totOut = 0, totCc = 0, totCr = 0, totCalls = 0, totUsd = 0, totCny = 0;
-        const byAgent = new Map();
-        for (const r of allRows) {
-            totIn += r.input_tokens ?? 0;
-            totOut += r.output_tokens ?? 0;
-            totCc += r.cache_creation_tokens ?? 0;
-            totCr += r.cache_read_tokens ?? 0;
-            totCalls++;
-            const { usd, cny } = _calcRowCost(r);
-            totUsd += usd;
-            totCny += cny;
-            const aid = r.agent_aid || '';
-            let a = byAgent.get(aid);
-            if (!a) {
-                a = { input_tokens: 0, output_tokens: 0, cache_creation_tokens: 0, cache_read_tokens: 0, call_count: 0, cost_usd: 0, cost_cny: 0 };
-                byAgent.set(aid, a);
-            }
-            a.input_tokens += r.input_tokens ?? 0;
-            a.output_tokens += r.output_tokens ?? 0;
-            a.cache_creation_tokens += r.cache_creation_tokens ?? 0;
-            a.cache_read_tokens += r.cache_read_tokens ?? 0;
-            a.call_count++;
-            a.cost_usd += usd;
-            a.cost_cny += cny;
+        // 构建WHERE条件
+        const conds = [];
+        const p = [];
+        if (params?.from_ts) {
+            conds.push('ts >= ?');
+            p.push(params.from_ts);
+        }
+        if (params?.to_ts) {
+            conds.push('ts <= ?');
+            p.push(params.to_ts);
+        }
+        if (params?.agent_aid) {
+            conds.push('agent_aid = ?');
+            p.push(params.agent_aid);
+        }
+        if (params?.peer_key) {
+            conds.push('peer_key = ?');
+            p.push(params.peer_key);
         }
+        const where = conds.length ? 'WHERE ' + conds.join(' AND ') : '';
+        // Token and cost aggregation with filters
+        const allRow = db.prepare(`
+      SELECT
+        COALESCE(SUM(input_tokens),0) AS input_tokens,
+        COALESCE(SUM(output_tokens),0) AS output_tokens,
+        COALESCE(SUM(cache_creation_tokens),0) AS cache_creation_tokens,
+        COALESCE(SUM(cache_read_tokens),0) AS cache_read_tokens,
+        COUNT(*) AS call_count,
+        COALESCE(SUM(cost_official_usd),0) AS cost_official_usd,
+        COALESCE(SUM(cost_official_cny),0) AS cost_official_cny,
+        COALESCE(SUM(cost_gateway_usd),0) AS cost_usd,
+        COALESCE(SUM(cost_gateway_cny),0) AS cost_cny
+      FROM usage_events ${where}
+    `).get(...p);
+        // By agent aggregation with filters
+        const byAgentRows = db.prepare(`
+      SELECT agent_aid,
+        COALESCE(SUM(input_tokens),0) AS input_tokens,
+        COALESCE(SUM(output_tokens),0) AS output_tokens,
+        COALESCE(SUM(cache_creation_tokens),0) AS cache_creation_tokens,
+        COALESCE(SUM(cache_read_tokens),0) AS cache_read_tokens,
+        COUNT(*) AS call_count,
+        COALESCE(SUM(cost_official_usd),0) AS cost_official_usd,
+        COALESCE(SUM(cost_official_cny),0) AS cost_official_cny,
+        COALESCE(SUM(cost_gateway_usd),0) AS cost_usd,
+        COALESCE(SUM(cost_gateway_cny),0) AS cost_cny
+      FROM usage_events ${where}
+      GROUP BY agent_aid
+      ORDER BY (COALESCE(SUM(input_tokens),0) + COALESCE(SUM(output_tokens),0)) DESC
+    `).all(...p);
+        // 为每个agent添加名称
+        const byAgentWithNames = byAgentRows.map((row) => ({
+            ...row,
+            agent_name: getAgentName(row.agent_aid)
+        }));
         return {
-            all_time: { input_tokens: totIn, output_tokens: totOut, cache_creation_tokens: totCc, cache_read_tokens: totCr, call_count: totCalls, cost_usd: totUsd, cost_cny: totCny },
-            by_agent: Array.from(byAgent.entries())
-                .map(([agent_aid, v]) => ({ agent_aid, ...v }))
-                .sort((a, b) => (b.input_tokens + b.output_tokens) - (a.input_tokens + a.output_tokens)),
+            all_time: allRow,
+            by_agent: byAgentWithNames,
         };
     }
     finally {
         db.close();
     }
 }
+/** 获取所有本地agent列表 */
+export function getAllLocalAgents() {
+    try {
+        const root = resolvePaths().root;
+        const aidsDir = path.join(root, 'AIDs');
+        if (!fs.existsSync(aidsDir))
+            return [];
+        const agentDirs = fs.readdirSync(aidsDir);
+        const agents = [];
+        for (const agentAid of agentDirs) {
+            // 跳过非目录项
+            const agentPath = path.join(aidsDir, agentAid);
+            if (!fs.statSync(agentPath).isDirectory())
+                continue;
+            // 获取agent名称
+            const agentName = getAgentName(agentAid);
+            agents.push({ agent_aid: agentAid, agent_name: agentName });
+        }
+        // 按名称排序
+        agents.sort((a, b) => {
+            const nameA = a.agent_name || a.agent_aid;
+            const nameB = b.agent_name || b.agent_aid;
+            return nameA.localeCompare(nameB);
+        });
+        return agents;
+    }
+    catch {
+        return [];
+    }
+}
 /** 按 agent 分组聚合（支持时间范围过滤）。 */
 export function queryStatsByAgent(params) {
     const db = openDb();
@@ -332,17 +303,179 @@ export function queryStatsByAgent(params) {
     const where = conds.length ? 'WHERE ' + conds.join(' AND ') : '';
     const limit = params.limit ?? 50;
     try {
-        return db.prepare(`
+        const rows = db.prepare(`
       SELECT agent_aid,
         COALESCE(SUM(input_tokens),0) AS input_tokens,
         COALESCE(SUM(output_tokens),0) AS output_tokens,
         COALESCE(SUM(cache_read_tokens),0) AS cache_read_tokens,
         COUNT(*) AS call_count
       FROM usage_events ${where}
-      GROUP BY agent_aid ORDER BY (input_tokens+output_tokens) DESC LIMIT ${limit}
+      GROUP BY agent_aid ORDER BY (COALESCE(SUM(input_tokens),0) + COALESCE(SUM(output_tokens),0)) DESC LIMIT ${limit}
+    `).all(...p);
+        // 为每个agent添加名称
+        return rows.map((row) => ({
+            ...row,
+            agent_name: getAgentName(row.agent_aid)
+        }));
+    }
+    finally {
+        db.close();
+    }
+}
+/** 查询模型访问明细（支持分页）*/
+export function queryUsageDetail(params) {
+    const db = openDb();
+    if (!db)
+        return { data: [], total: 0 };
+    const conds = [];
+    const p = [];
+    if (params.from_ts) {
+        conds.push('ts >= ?');
+        p.push(params.from_ts);
+    }
+    if (params.to_ts) {
+        conds.push('ts <= ?');
+        p.push(params.to_ts);
+    }
+    if (params.agent_aid) {
+        conds.push('agent_aid = ?');
+        p.push(params.agent_aid);
+    }
+    if (params.model) {
+        conds.push('model = ?');
+        p.push(params.model);
+    }
+    const where = conds.length ? 'WHERE ' + conds.join(' AND ') : '';
+    const limit = params.limit ?? 50;
+    const offset = params.offset ?? 0;
+    try {
+        // 获取总数
+        const countRow = db.prepare(`SELECT COUNT(*) as total FROM usage_events ${where}`).get(...p);
+        const total = countRow?.total || 0;
+        // 获取数据
+        const data = db.prepare(`
+      SELECT ts, agent_aid, peer_key, model,
+        input_tokens, output_tokens, cache_creation_tokens, cache_read_tokens,
+        COALESCE(cost_official_usd, 0) AS cost_official_usd,
+        COALESCE(cost_official_cny, 0) AS cost_official_cny,
+        COALESCE(cost_gateway_usd, 0) AS cost_gateway_usd,
+        COALESCE(cost_gateway_cny, 0) AS cost_gateway_cny
+      FROM usage_events ${where}
+      ORDER BY ts DESC LIMIT ${limit} OFFSET ${offset}
     `).all(...p);
+        // 为每条记录添加agent_name (需要从文件系统读取agent.md)
+        const dataWithNames = data.map((row) => ({
+            ...row,
+            agent_name: getAgentName(row.agent_aid)
+        }));
+        return { data: dataWithNames, total };
     }
     finally {
         db.close();
     }
 }
+/** 查询指定时间范围内使用过的模型列表 */
+export function queryUsedModels(params) {
+    const db = openDb();
+    if (!db)
+        return [];
+    const conds = [];
+    const p = [];
+    if (params.from_ts) {
+        conds.push('ts >= ?');
+        p.push(params.from_ts);
+    }
+    if (params.to_ts) {
+        conds.push('ts <= ?');
+        p.push(params.to_ts);
+    }
+    const where = conds.length ? 'WHERE ' + conds.join(' AND ') : '';
+    try {
+        const rows = db.prepare(`
+      SELECT DISTINCT model
+      FROM usage_events ${where}
+      ORDER BY model
+    `).all(...p);
+        return rows.map((row) => row.model).filter(Boolean);
+    }
+    finally {
+        db.close();
+    }
+}
+// 辅助函数：从agent.md获取agent名称
+function getAgentName(agentAid) {
+    if (!agentAid)
+        return null;
+    try {
+        const root = resolvePaths().root;
+        const agentMdPath = path.join(root, 'AIDs', agentAid, 'agent.md');
+        if (!fs.existsSync(agentMdPath))
+            return null;
+        const content = fs.readFileSync(agentMdPath, 'utf-8');
+        // 解析YAML frontmatter中的name字段
+        const yamlMatch = content.match(/^---\s*\n([\s\S]*?)\n---/);
+        if (yamlMatch) {
+            const yamlContent = yamlMatch[1];
+            const nameMatch = yamlContent.match(/^name:\s*["']?([^"'\n]+)["']?$/m);
+            if (nameMatch) {
+                return nameMatch[1].trim();
+            }
+        }
+        // fallback: 尝试匹配第一个markdown标题
+        const titleMatch = content.match(/^#\s+(.+)$/m);
+        return titleMatch ? titleMatch[1].trim() : null;
+    }
+    catch {
+        return null;
+    }
+}
+// 辅助函数：从peer_key解析peer信息
+// peer_key格式：
+// 1. 群聊：aun#{agent_aid}#main#{group_id} (URL encoded)
+// 2. 单聊：aun#{agent_aid}#main#{peer_agent_aid}
+function getPeerInfo(peerKey) {
+    if (!peerKey)
+        return { name: null, chatType: null, memberCount: null };
+    try {
+        // peer_key格式：aun#{agent_aid}#main#{target}
+        const parts = peerKey.split('#');
+        if (parts.length < 4)
+            return { name: null, chatType: null, memberCount: null };
+        const agentAid = parts[1]; // 自己的agent_aid
+        const target = parts[3]; // 群ID或对端agent_aid
+        // 判断是群聊还是单聊
+        if (target.startsWith('group.')) {
+            // 群聊：读取群信息
+            const { sessionsDir } = resolvePaths();
+            const groupDir = path.join(sessionsDir, 'aun', encodeSegment(agentAid), encodeSegment(target));
+            const activeJsonPath = path.join(groupDir, 'active.json');
+            if (fs.existsSync(activeJsonPath)) {
+                const activeData = JSON.parse(fs.readFileSync(activeJsonPath, 'utf-8'));
+                // 使用 metadata.groupName 作为显示名称
+                const groupName = activeData.metadata?.groupName || null;
+                // 计算群人数：从groupName中的成员数量（以"、"分隔）+ "..."表示还有更多
+                let memberCount = null;
+                if (groupName) {
+                    // groupName格式："用户1、用户2、用户3..."
+                    const members = groupName.split('、');
+                    memberCount = members.length;
+                    // 如果最后一个成员包含"..."，说明还有更多成员
+                    if (members[members.length - 1].includes('...')) {
+                        memberCount = memberCount - 1; // 减去"..."那个元素
+                        // 实际人数可能更多，但我们只能从显示的名字估算
+                    }
+                }
+                return { name: groupName, chatType: 'group', memberCount };
+            }
+            return { name: null, chatType: 'group', memberCount: null };
+        }
+        else {
+            // 单聊：target是对端agent_aid，获取其名称
+            const name = getAgentName(target);
+            return { name, chatType: 'private', memberCount: null };
+        }
+    }
+    catch {
+        return { name: null, chatType: null, memberCount: null };
+    }
+}

package/dist/sources/system.js

@@ -7,22 +7,57 @@
  *
  * subscribe: 30s 轮询 + JSON diff，仅变化时 push。
  */
+import fs from 'fs';
+import path from 'path';
 import { resolvePaths } from '../paths.js';
 import { ipcQuery } from '../ipc-client.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) {
     const p = resolvePaths();
     const r = await ipcQuery(p.socket, { type: 'menu.exec', payload }, 5000);
     return r?.ok ? r.response : null;
 }
 async function buildSnapshot() {
-    const [listResp, sysResp] = await Promise.all([
+    const [listResp, sysResp, checkResp] = await Promise.all([
         menuExec({ type: 'menu.list', id: 'sys-list' }),
         menuExec({ type: 'menu.query', id: 'sys-q', name: 'system' }),
+        menuExec({ type: 'menu.action', id: 'sys-check', name: 'system', action: 'check' }),
     ]);
     const daemonRunning = listResp !== null;
     // sysResp 形如 { type:'menu.response', id, name, data | error }
     const system = sysResp?.data ?? null;
-    return { daemonRunning, system, upgrade: null, check: 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 }));
+    }
+    // checkResp 包含 evolagents 等健康检查数据
+    const check = checkResp?.data ?? null;
+    return { daemonRunning, system: system ? { ...system, baseagents } : system, upgrade: null, check };
 }
 export const systemSource = {
     kind: 'system',