evolcore 0.0.25 → 0.0.26

package/dist/stats/eck-vars.js

@@ -27,15 +27,15 @@ function _calcTodayCosts(evolcoreHome, agentAid, peerKey) {
         params.push(peerKey);
     }
     try {
-        const row = db.prepare(`
-      SELECT
-        SUM(input_tokens) AS input,
-        SUM(output_tokens) AS output,
-        SUM(cache_read_tokens) AS cacheRead,
-        COUNT(*) AS calls,
-        COALESCE(SUM(cost_gateway_usd), 0) AS usd,
-        COALESCE(SUM(cost_gateway_cny), 0) AS cny
-      FROM usage_events WHERE ${conds.join(' AND ')}
+        const row = db.prepare(`
+      SELECT
+        SUM(input_tokens) AS input,
+        SUM(output_tokens) AS output,
+        SUM(cache_read_tokens) AS cacheRead,
+        COUNT(*) AS calls,
+        COALESCE(SUM(cost_gateway_usd), 0) AS usd,
+        COALESCE(SUM(cost_gateway_cny), 0) AS cny
+      FROM usage_events WHERE ${conds.join(' AND ')}
     `).get(...params);
         return {
             usd: row?.usd ?? 0,

package/dist/stats/price-resolver.js

@@ -2,7 +2,7 @@
  * price-resolver.ts — 统一价格解析逻辑，支持官方价格和网关价格。
  * 供 writer.ts 写入时调用，供 rebuild 命令回填历史数据。
  */
-import { resolvePriceRow, BILLING_FNS } from './billing.js';
+import { resolvePriceRow, modelLookupKeys, BILLING_FNS } from './billing.js';
 import fs from 'fs';
 import path from 'path';
 /** Keep wire/log metadata readable while preserving full precision in storage. */
@@ -44,10 +44,28 @@ function loadGatewayPrices(evolcoreHome) {
  */
 function resolveGatewayPriceRow(evolcoreHome, model, ts) {
     const prices = loadGatewayPrices(evolcoreHome);
-    const candidates = prices.filter(p => p.model === model && p.effective_from <= ts);
-    if (!candidates.length)
+    // 精确匹配优先（允许给某个窗口变体单独定价），再回落到基础 ID。
+    for (const key of modelLookupKeys(evolcoreHome, model)) {
+        const candidates = prices.filter(p => p.model === key && p.effective_from <= ts);
+        if (candidates.length) {
+            return candidates.reduce((a, b) => a.effective_from >= b.effective_from ? a : b);
+        }
+    }
+    return null;
+}
+/**
+ * 从网关价格 Map 里取价：Map 的键是网关原样下发的 ID（可能带 `[1m]` 后缀），
+ * 而 usage 事件记录的可能是基础 ID，反之亦然——两侧都要按候选键链匹配。
+ */
+function pickGatewayQuad(evolcoreHome, map, model) {
+    if (!map)
         return null;
-    return candidates.reduce((a, b) => a.effective_from >= b.effective_from ? a : b);
+    for (const key of modelLookupKeys(evolcoreHome, model)) {
+        const quad = map.get(key);
+        if (quad)
+            return quad;
+    }
+    return null;
 }
 /**
  * 从 PriceQuad 构造一个符合 billing.ts 规范的 PriceRecord。
@@ -80,9 +98,9 @@ export function resolvePrices(evolcoreHome, event, gatewayPricing) {
     // ── 1. 官方价格（Official Price）──────────────────────────────────────────
     let officialCost = null;
     // 优先级 1: 网关接口返回的 pricing 字段
-    if (gatewayPricing?.official.has(event.model)) {
-        const quad = gatewayPricing.official.get(event.model);
-        const priceRow = priceQuadToRecord(event.model, event.ts, quad, event.billing_fn);
+    const officialQuad = pickGatewayQuad(evolcoreHome, gatewayPricing?.official, event.model);
+    if (officialQuad) {
+        const priceRow = priceQuadToRecord(event.model, event.ts, officialQuad, event.billing_fn);
         const fn = BILLING_FNS[event.billing_fn];
         if (fn) {
             officialCost = fn(event, priceRow);
@@ -109,9 +127,9 @@ export function resolvePrices(evolcoreHome, event, gatewayPricing) {
         }
     }
     // 优先级 2: 网关接口返回的 effective_pricing 字段
-    if (!gatewayCost && gatewayPricing?.gateway.has(event.model)) {
-        const quad = gatewayPricing.gateway.get(event.model);
-        const priceRow = priceQuadToRecord(event.model, event.ts, quad, event.billing_fn);
+    const gatewayQuad = gatewayCost ? null : pickGatewayQuad(evolcoreHome, gatewayPricing?.gateway, event.model);
+    if (gatewayQuad) {
+        const priceRow = priceQuadToRecord(event.model, event.ts, gatewayQuad, event.billing_fn);
         const fn = BILLING_FNS[event.billing_fn];
         if (fn) {
             gatewayCost = fn(event, priceRow);

package/dist/stats/query.js

@@ -137,25 +137,25 @@ function _queryAggregatedDaily(evolcoreHome, granularity, filter) {
     if (!db)
         return [];
     try {
-        const sql = `
-      SELECT
-        ${periodExpr} AS period,
-        SUM(input_tokens)          AS input_tokens,
-        SUM(output_tokens)         AS output_tokens,
-        SUM(cache_creation_tokens) AS cache_creation_tokens,
-        SUM(cache_read_tokens)     AS cache_read_tokens,
-        SUM(cache_hit_tokens)      AS cache_hit_tokens,
-        SUM(cache_miss_tokens)     AS cache_miss_tokens,
-        SUM(image_tokens)          AS image_tokens,
-        SUM(total_context_tokens)  AS total_context_tokens,
-        SUM(turns)                 AS turns,
-        SUM(calls)                 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_gateway_usd,
-        COALESCE(SUM(cost_gateway_cny), 0)  AS cost_gateway_cny
-      FROM usage_daily ${clause}
-      GROUP BY ${periodExpr}
+        const sql = `
+      SELECT
+        ${periodExpr} AS period,
+        SUM(input_tokens)          AS input_tokens,
+        SUM(output_tokens)         AS output_tokens,
+        SUM(cache_creation_tokens) AS cache_creation_tokens,
+        SUM(cache_read_tokens)     AS cache_read_tokens,
+        SUM(cache_hit_tokens)      AS cache_hit_tokens,
+        SUM(cache_miss_tokens)     AS cache_miss_tokens,
+        SUM(image_tokens)          AS image_tokens,
+        SUM(total_context_tokens)  AS total_context_tokens,
+        SUM(turns)                 AS turns,
+        SUM(calls)                 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_gateway_usd,
+        COALESCE(SUM(cost_gateway_cny), 0)  AS cost_gateway_cny
+      FROM usage_daily ${clause}
+      GROUP BY ${periodExpr}
     `;
         const rows = db.prepare(sql).all(...params);
         if (groupCol) {
@@ -180,45 +180,45 @@ function _queryAggregatedEvents(evolcoreHome, granularity, filter) {
     let sql;
     if (groupCol) {
         // 非时间维度：按字段分组
-        sql = `
-      SELECT
-        ${groupCol} AS period,
-        SUM(input_tokens)           AS input_tokens,
-        SUM(output_tokens)          AS output_tokens,
-        SUM(cache_creation_tokens)  AS cache_creation_tokens,
-        SUM(cache_read_tokens)      AS cache_read_tokens,
-        SUM(COALESCE(cache_hit_tokens,0))  AS cache_hit_tokens,
-        SUM(COALESCE(cache_miss_tokens,0)) AS cache_miss_tokens,
-        SUM(COALESCE(image_tokens,0))      AS image_tokens,
-        SUM(COALESCE(total_context_tokens,0)) AS total_context_tokens,
-        SUM(turns)                  AS turns,
-        COUNT(*)                    AS call_count
-      FROM usage_events ${clause}
-      GROUP BY ${groupCol} ORDER BY (input_tokens + output_tokens) DESC
+        sql = `
+      SELECT
+        ${groupCol} AS period,
+        SUM(input_tokens)           AS input_tokens,
+        SUM(output_tokens)          AS output_tokens,
+        SUM(cache_creation_tokens)  AS cache_creation_tokens,
+        SUM(cache_read_tokens)      AS cache_read_tokens,
+        SUM(COALESCE(cache_hit_tokens,0))  AS cache_hit_tokens,
+        SUM(COALESCE(cache_miss_tokens,0)) AS cache_miss_tokens,
+        SUM(COALESCE(image_tokens,0))      AS image_tokens,
+        SUM(COALESCE(total_context_tokens,0)) AS total_context_tokens,
+        SUM(turns)                  AS turns,
+        COUNT(*)                    AS call_count
+      FROM usage_events ${clause}
+      GROUP BY ${groupCol} ORDER BY (input_tokens + output_tokens) DESC
     `;
     }
     else {
         // 时间维度：strftime 分组
         const fmt = GRAN_FMT[granularity] || GRAN_FMT.day;
-        sql = `
-      SELECT
-        strftime('${fmt}', ts/1000, 'unixepoch', 'localtime') AS period,
-        SUM(input_tokens)           AS input_tokens,
-        SUM(output_tokens)          AS output_tokens,
-        SUM(cache_creation_tokens)  AS cache_creation_tokens,
-        SUM(cache_read_tokens)      AS cache_read_tokens,
-        SUM(COALESCE(cache_hit_tokens,0))  AS cache_hit_tokens,
-        SUM(COALESCE(cache_miss_tokens,0)) AS cache_miss_tokens,
-        SUM(COALESCE(image_tokens,0))      AS image_tokens,
-        SUM(COALESCE(total_context_tokens,0)) AS total_context_tokens,
-        SUM(turns)                  AS turns,
-        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_gateway_usd,
-        COALESCE(SUM(cost_gateway_cny), 0)  AS cost_gateway_cny
-      FROM usage_events ${clause}
-      GROUP BY period ORDER BY period
+        sql = `
+      SELECT
+        strftime('${fmt}', ts/1000, 'unixepoch', 'localtime') AS period,
+        SUM(input_tokens)           AS input_tokens,
+        SUM(output_tokens)          AS output_tokens,
+        SUM(cache_creation_tokens)  AS cache_creation_tokens,
+        SUM(cache_read_tokens)      AS cache_read_tokens,
+        SUM(COALESCE(cache_hit_tokens,0))  AS cache_hit_tokens,
+        SUM(COALESCE(cache_miss_tokens,0)) AS cache_miss_tokens,
+        SUM(COALESCE(image_tokens,0))      AS image_tokens,
+        SUM(COALESCE(total_context_tokens,0)) AS total_context_tokens,
+        SUM(turns)                  AS turns,
+        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_gateway_usd,
+        COALESCE(SUM(cost_gateway_cny), 0)  AS cost_gateway_cny
+      FROM usage_events ${clause}
+      GROUP BY period ORDER BY period
     `;
     }
     // 收集所有相关 DB 的原始行，再按 period 合并
@@ -295,17 +295,17 @@ export function querySessionSummary(evolcoreHome, sessionId) {
         cost_official_usd: 0, cost_official_cny: 0, cost_gateway_usd: 0, cost_gateway_cny: 0,
         usd: 0, cny: 0,
     };
-    const sql = `
-    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 calls,
-      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_gateway_usd,
-      COALESCE(SUM(cost_gateway_cny), 0)      AS cost_gateway_cny
+    const sql = `
+    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 calls,
+      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_gateway_usd,
+      COALESCE(SUM(cost_gateway_cny), 0)      AS cost_gateway_cny
     FROM usage_events WHERE session_id = ?`;
     const acc = { ...empty };
     for (const dbPath of _relevantDbs(evolcoreHome, {})) {
@@ -355,11 +355,11 @@ export function queryContextBreakdown(evolcoreHome, sessionId) {
 /** Top-N 对端（按 token 总量排序）。读预聚合表 usage_daily。 */
 export function queryTopPeers(evolcoreHome, filter, limit = 10) {
     const { clause, params } = _buildDailyWhere(filter);
-    const sql = `
-    SELECT peer_key, SUM(input_tokens+output_tokens) AS total_tokens,
-           SUM(calls) AS call_count
-    FROM usage_daily ${clause}
-    GROUP BY peer_key ORDER BY total_tokens DESC LIMIT ${limit}
+    const sql = `
+    SELECT peer_key, SUM(input_tokens+output_tokens) AS total_tokens,
+           SUM(calls) AS call_count
+    FROM usage_daily ${clause}
+    GROUP BY peer_key ORDER BY total_tokens DESC LIMIT ${limit}
   `;
     const db = openReadonlyDb(getDbPath(evolcoreHome));
     if (!db)
@@ -374,11 +374,11 @@ export function queryTopPeers(evolcoreHome, filter, limit = 10) {
 /** Top-N 模型（按 token 总量排序）。读预聚合表 usage_daily。 */
 export function queryTopModels(evolcoreHome, filter, limit = 10) {
     const { clause, params } = _buildDailyWhere(filter);
-    const sql = `
-    SELECT model, SUM(input_tokens+output_tokens) AS total_tokens,
-           SUM(calls) AS call_count
-    FROM usage_daily ${clause}
-    GROUP BY model ORDER BY total_tokens DESC LIMIT ${limit}
+    const sql = `
+    SELECT model, SUM(input_tokens+output_tokens) AS total_tokens,
+           SUM(calls) AS call_count
+    FROM usage_daily ${clause}
+    GROUP BY model ORDER BY total_tokens DESC LIMIT ${limit}
   `;
     const db = openReadonlyDb(getDbPath(evolcoreHome));
     if (!db)
@@ -446,29 +446,29 @@ export function queryPeerList(evolcoreHome, opts) {
     if (!db)
         return [];
     try {
-        const listSql = `
-      SELECT peer_key,
-        SUM(input_tokens) AS input_tokens, SUM(output_tokens) AS output_tokens,
-        SUM(cache_creation_tokens) AS cache_creation_tokens,
-        SUM(cache_read_tokens) AS cache_read_tokens,
-        SUM(input_tokens+output_tokens+cache_read_tokens+cache_creation_tokens) AS total_tokens,
-        SUM(calls) AS calls,
-        COUNT(DISTINCT session_id) AS session_count,
-        MIN(day) AS first_day, MAX(day) AS last_day,
-        MAX(peer_type) AS peer_type
-      FROM usage_daily ${peerCond}
-      GROUP BY peer_key ORDER BY total_tokens DESC LIMIT ${limit}
+        const listSql = `
+      SELECT peer_key,
+        SUM(input_tokens) AS input_tokens, SUM(output_tokens) AS output_tokens,
+        SUM(cache_creation_tokens) AS cache_creation_tokens,
+        SUM(cache_read_tokens) AS cache_read_tokens,
+        SUM(input_tokens+output_tokens+cache_read_tokens+cache_creation_tokens) AS total_tokens,
+        SUM(calls) AS calls,
+        COUNT(DISTINCT session_id) AS session_count,
+        MIN(day) AS first_day, MAX(day) AS last_day,
+        MAX(peer_type) AS peer_type
+      FROM usage_daily ${peerCond}
+      GROUP BY peer_key ORDER BY total_tokens DESC LIMIT ${limit}
     `;
         const rows = db.prepare(listSql).all(...listParams);
         // 每个 peer 的成本：按 (peer_key, model, billing_fn) 分组算 calcCost 累加。
-        const costSql = `
-      SELECT peer_key, model, COALESCE(billing_fn,'') AS billing_fn,
-        SUM(input_tokens) AS input_tokens, SUM(output_tokens) AS output_tokens,
-        SUM(cache_creation_tokens) AS cache_creation_tokens, SUM(cache_read_tokens) AS cache_read_tokens,
-        SUM(cache_hit_tokens) AS cache_hit_tokens, SUM(cache_miss_tokens) AS cache_miss_tokens,
-        SUM(image_tokens) AS image_tokens, SUM(total_context_tokens) AS total_context_tokens
-      FROM usage_daily ${peerCond}
-      GROUP BY peer_key, model, billing_fn
+        const costSql = `
+      SELECT peer_key, model, COALESCE(billing_fn,'') AS billing_fn,
+        SUM(input_tokens) AS input_tokens, SUM(output_tokens) AS output_tokens,
+        SUM(cache_creation_tokens) AS cache_creation_tokens, SUM(cache_read_tokens) AS cache_read_tokens,
+        SUM(cache_hit_tokens) AS cache_hit_tokens, SUM(cache_miss_tokens) AS cache_miss_tokens,
+        SUM(image_tokens) AS image_tokens, SUM(total_context_tokens) AS total_context_tokens
+      FROM usage_daily ${peerCond}
+      GROUP BY peer_key, model, billing_fn
     `;
         const costByPeer = new Map();
         for (const r of db.prepare(costSql).all(...listParams)) {
@@ -519,17 +519,17 @@ export function querySummary(evolcoreHome, opts) {
     if (!db)
         return empty;
     try {
-        const row = db.prepare(`
-      SELECT
-        SUM(input_tokens) AS input_tokens, SUM(output_tokens) AS output_tokens,
-        SUM(cache_creation_tokens) AS cache_creation_tokens,
-        SUM(cache_read_tokens) AS cache_read_tokens,
-        SUM(calls) AS calls,
-        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_gateway_usd,
-        COALESCE(SUM(cost_gateway_cny), 0) AS cost_gateway_cny
-      FROM usage_daily ${clause}
+        const row = db.prepare(`
+      SELECT
+        SUM(input_tokens) AS input_tokens, SUM(output_tokens) AS output_tokens,
+        SUM(cache_creation_tokens) AS cache_creation_tokens,
+        SUM(cache_read_tokens) AS cache_read_tokens,
+        SUM(calls) AS calls,
+        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_gateway_usd,
+        COALESCE(SUM(cost_gateway_cny), 0) AS cost_gateway_cny
+      FROM usage_daily ${clause}
     `).get(...params);
         if (!row || row.calls == null)
             return empty;
@@ -571,28 +571,28 @@ export function queryPeerDaily(evolcoreHome, opts) {
     if (!db)
         return [];
     try {
-        const sql = `
-      SELECT day AS period,
-        SUM(input_tokens) AS input_tokens, SUM(output_tokens) AS output_tokens,
-        SUM(cache_creation_tokens) AS cache_creation_tokens,
-        SUM(cache_read_tokens) AS cache_read_tokens,
-        SUM(cache_hit_tokens) AS cache_hit_tokens, SUM(cache_miss_tokens) AS cache_miss_tokens,
-        SUM(image_tokens) AS image_tokens, SUM(total_context_tokens) AS total_context_tokens,
-        SUM(turns) AS turns, SUM(calls) AS call_count
-      FROM usage_daily ${where}
-      GROUP BY day ORDER BY day
+        const sql = `
+      SELECT day AS period,
+        SUM(input_tokens) AS input_tokens, SUM(output_tokens) AS output_tokens,
+        SUM(cache_creation_tokens) AS cache_creation_tokens,
+        SUM(cache_read_tokens) AS cache_read_tokens,
+        SUM(cache_hit_tokens) AS cache_hit_tokens, SUM(cache_miss_tokens) AS cache_miss_tokens,
+        SUM(image_tokens) AS image_tokens, SUM(total_context_tokens) AS total_context_tokens,
+        SUM(turns) AS turns, SUM(calls) AS call_count
+      FROM usage_daily ${where}
+      GROUP BY day ORDER BY day
     `;
         const periodMap = new Map();
         for (const r of db.prepare(sql).all(...qParams))
             periodMap.set(r.period, r);
-        const costSql = `
-      SELECT day AS period, model, COALESCE(billing_fn,'') AS billing_fn,
-        SUM(input_tokens) AS input_tokens, SUM(output_tokens) AS output_tokens,
-        SUM(cache_creation_tokens) AS cache_creation_tokens, SUM(cache_read_tokens) AS cache_read_tokens,
-        SUM(cache_hit_tokens) AS cache_hit_tokens, SUM(cache_miss_tokens) AS cache_miss_tokens,
-        SUM(image_tokens) AS image_tokens, SUM(total_context_tokens) AS total_context_tokens
-      FROM usage_daily ${where}
-      GROUP BY day, model, billing_fn
+        const costSql = `
+      SELECT day AS period, model, COALESCE(billing_fn,'') AS billing_fn,
+        SUM(input_tokens) AS input_tokens, SUM(output_tokens) AS output_tokens,
+        SUM(cache_creation_tokens) AS cache_creation_tokens, SUM(cache_read_tokens) AS cache_read_tokens,
+        SUM(cache_hit_tokens) AS cache_hit_tokens, SUM(cache_miss_tokens) AS cache_miss_tokens,
+        SUM(image_tokens) AS image_tokens, SUM(total_context_tokens) AS total_context_tokens
+      FROM usage_daily ${where}
+      GROUP BY day, model, billing_fn
     `;
         const costMap = new Map();
         const byPeriod = new Map();
@@ -674,26 +674,26 @@ export function queryMessageAggregated(evolcoreHome, granularity, filter) {
     let sql;
     if (groupCol) {
         const col = groupCol === 'model' ? 'agent_aid' : groupCol; // model 无意义，降级 agent
-        sql = `
-      SELECT ${col} AS period,
-        SUM(CASE WHEN direction='in' THEN 1 ELSE 0 END) AS msg_in,
-        SUM(CASE WHEN direction='out' THEN 1 ELSE 0 END) AS msg_out,
-        SUM(CASE WHEN direction='in' THEN bytes ELSE 0 END) AS bytes_in,
-        SUM(CASE WHEN direction='out' THEN bytes ELSE 0 END) AS bytes_out
-      FROM message_events ${clause}
-      GROUP BY ${col} ORDER BY (bytes_in + bytes_out) DESC
+        sql = `
+      SELECT ${col} AS period,
+        SUM(CASE WHEN direction='in' THEN 1 ELSE 0 END) AS msg_in,
+        SUM(CASE WHEN direction='out' THEN 1 ELSE 0 END) AS msg_out,
+        SUM(CASE WHEN direction='in' THEN bytes ELSE 0 END) AS bytes_in,
+        SUM(CASE WHEN direction='out' THEN bytes ELSE 0 END) AS bytes_out
+      FROM message_events ${clause}
+      GROUP BY ${col} ORDER BY (bytes_in + bytes_out) DESC
     `;
     }
     else {
         const fmt = GRAN_FMT[granularity] || GRAN_FMT.day;
-        sql = `
-      SELECT strftime('${fmt}', ts/1000, 'unixepoch', 'localtime') AS period,
-        SUM(CASE WHEN direction='in' THEN 1 ELSE 0 END) AS msg_in,
-        SUM(CASE WHEN direction='out' THEN 1 ELSE 0 END) AS msg_out,
-        SUM(CASE WHEN direction='in' THEN bytes ELSE 0 END) AS bytes_in,
-        SUM(CASE WHEN direction='out' THEN bytes ELSE 0 END) AS bytes_out
-      FROM message_events ${clause}
-      GROUP BY period ORDER BY period
+        sql = `
+      SELECT strftime('${fmt}', ts/1000, 'unixepoch', 'localtime') AS period,
+        SUM(CASE WHEN direction='in' THEN 1 ELSE 0 END) AS msg_in,
+        SUM(CASE WHEN direction='out' THEN 1 ELSE 0 END) AS msg_out,
+        SUM(CASE WHEN direction='in' THEN bytes ELSE 0 END) AS bytes_in,
+        SUM(CASE WHEN direction='out' THEN bytes ELSE 0 END) AS bytes_out
+      FROM message_events ${clause}
+      GROUP BY period ORDER BY period
     `;
     }
     const periodMap = new Map();

package/dist/stats/role-budget.js

@@ -137,12 +137,12 @@ function queryPeriodUsage(evolcoreHome, opts) {
             where.push('usage_subject_key = ?');
             params.push(opts.usageSubjectKey);
         }
-        const row = db.prepare(`
-      SELECT
-        COALESCE(SUM(${prefix}_cny), 0) AS cny,
-        COALESCE(SUM(${prefix}_usd), 0) AS usd
-      FROM usage_events
-      WHERE ${where.join(' AND ')}
+        const row = db.prepare(`
+      SELECT
+        COALESCE(SUM(${prefix}_cny), 0) AS cny,
+        COALESCE(SUM(${prefix}_usd), 0) AS usd
+      FROM usage_events
+      WHERE ${where.join(' AND ')}
     `).get(...params);
         return {
             cny: Number(row?.cny ?? 0),

package/dist/stats/writer.js

@@ -48,43 +48,43 @@ function isSchemaMismatchError(error) {
 function writeUsageEvent(db, event, prices) {
     // 明细 INSERT + rollup UPSERT 包进同一事务：进程在两者间崩溃也不会让 rollup 与明细漂移。
     db.exec('BEGIN');
-    db.prepare(`
-    INSERT INTO usage_events
-      (ts, agent_aid, peer_key, usage_subject_key, role, peer_type, session_id, model, billing_fn,
-       input_tokens, output_tokens, cache_creation_tokens, cache_read_tokens,
-       cache_hit_tokens, cache_miss_tokens, image_tokens, total_context_tokens,
-       turns, duration_ms, context_window_pct,
-       cost_official_usd, cost_official_cny, cost_gateway_usd, cost_gateway_cny)
-    VALUES
-      (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    db.prepare(`
+    INSERT INTO usage_events
+      (ts, agent_aid, peer_key, usage_subject_key, role, peer_type, session_id, model, billing_fn,
+       input_tokens, output_tokens, cache_creation_tokens, cache_read_tokens,
+       cache_hit_tokens, cache_miss_tokens, image_tokens, total_context_tokens,
+       turns, duration_ms, context_window_pct,
+       cost_official_usd, cost_official_cny, cost_gateway_usd, cost_gateway_cny)
+    VALUES
+      (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
   `).run(event.ts, event.agent_aid, event.peer_key, event.usage_subject_key ?? event.peer_key ?? '', event.role ?? '', event.peer_type ?? null, event.session_id ?? null, event.model, event.billing_fn, event.input_tokens, event.output_tokens, event.cache_creation_tokens, event.cache_read_tokens, event.cache_hit_tokens ?? null, event.cache_miss_tokens ?? null, event.image_tokens ?? null, event.total_context_tokens ?? null, event.turns, event.duration_ms ?? null, event.context_window_pct ?? null, prices.official?.usd ?? null, prices.official?.cny ?? null, prices.gateway?.usd ?? null, prices.gateway?.cny ?? null);
     // 写时增量：累加到日级预聚合表（grain 与 db.ts rebuildDailyRollup 一致）。
-    db.prepare(`
-    INSERT INTO usage_daily
-      (day, agent_aid, peer_key, peer_type, session_id, model, billing_fn,
-       input_tokens, output_tokens, cache_creation_tokens, cache_read_tokens,
-       cache_hit_tokens, cache_miss_tokens, image_tokens, total_context_tokens,
-       turns, calls,
-       cost_official_usd, cost_official_cny, cost_gateway_usd, cost_gateway_cny)
-    VALUES
-      (strftime('%Y-%m-%d', ?/1000, 'unixepoch', 'localtime'),
-       ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1, ?, ?, ?, ?)
-    ON CONFLICT(day, agent_aid, peer_key, session_id, model, billing_fn) DO UPDATE SET
-      peer_type             = excluded.peer_type,
-      input_tokens          = input_tokens          + excluded.input_tokens,
-      output_tokens         = output_tokens         + excluded.output_tokens,
-      cache_creation_tokens = cache_creation_tokens + excluded.cache_creation_tokens,
-      cache_read_tokens     = cache_read_tokens     + excluded.cache_read_tokens,
-      cache_hit_tokens      = cache_hit_tokens      + excluded.cache_hit_tokens,
-      cache_miss_tokens     = cache_miss_tokens     + excluded.cache_miss_tokens,
-      image_tokens          = image_tokens          + excluded.image_tokens,
-      total_context_tokens  = total_context_tokens  + excluded.total_context_tokens,
-      turns                 = turns                 + excluded.turns,
-      calls                 = calls                 + 1,
-      cost_official_usd     = COALESCE(cost_official_usd, 0) + COALESCE(excluded.cost_official_usd, 0),
-      cost_official_cny     = COALESCE(cost_official_cny, 0) + COALESCE(excluded.cost_official_cny, 0),
-      cost_gateway_usd      = COALESCE(cost_gateway_usd, 0)  + COALESCE(excluded.cost_gateway_usd, 0),
-      cost_gateway_cny      = COALESCE(cost_gateway_cny, 0)  + COALESCE(excluded.cost_gateway_cny, 0)
+    db.prepare(`
+    INSERT INTO usage_daily
+      (day, agent_aid, peer_key, peer_type, session_id, model, billing_fn,
+       input_tokens, output_tokens, cache_creation_tokens, cache_read_tokens,
+       cache_hit_tokens, cache_miss_tokens, image_tokens, total_context_tokens,
+       turns, calls,
+       cost_official_usd, cost_official_cny, cost_gateway_usd, cost_gateway_cny)
+    VALUES
+      (strftime('%Y-%m-%d', ?/1000, 'unixepoch', 'localtime'),
+       ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1, ?, ?, ?, ?)
+    ON CONFLICT(day, agent_aid, peer_key, session_id, model, billing_fn) DO UPDATE SET
+      peer_type             = excluded.peer_type,
+      input_tokens          = input_tokens          + excluded.input_tokens,
+      output_tokens         = output_tokens         + excluded.output_tokens,
+      cache_creation_tokens = cache_creation_tokens + excluded.cache_creation_tokens,
+      cache_read_tokens     = cache_read_tokens     + excluded.cache_read_tokens,
+      cache_hit_tokens      = cache_hit_tokens      + excluded.cache_hit_tokens,
+      cache_miss_tokens     = cache_miss_tokens     + excluded.cache_miss_tokens,
+      image_tokens          = image_tokens          + excluded.image_tokens,
+      total_context_tokens  = total_context_tokens  + excluded.total_context_tokens,
+      turns                 = turns                 + excluded.turns,
+      calls                 = calls                 + 1,
+      cost_official_usd     = COALESCE(cost_official_usd, 0) + COALESCE(excluded.cost_official_usd, 0),
+      cost_official_cny     = COALESCE(cost_official_cny, 0) + COALESCE(excluded.cost_official_cny, 0),
+      cost_gateway_usd      = COALESCE(cost_gateway_usd, 0)  + COALESCE(excluded.cost_gateway_usd, 0),
+      cost_gateway_cny      = COALESCE(cost_gateway_cny, 0)  + COALESCE(excluded.cost_gateway_cny, 0)
   `).run(event.ts, event.agent_aid, event.peer_key, event.peer_type ?? '', event.session_id ?? '', event.model, event.billing_fn, event.input_tokens, event.output_tokens, event.cache_creation_tokens, event.cache_read_tokens, event.cache_hit_tokens ?? 0, event.cache_miss_tokens ?? 0, event.image_tokens ?? 0, event.total_context_tokens ?? 0, event.turns, prices.official?.usd ?? null, prices.official?.cny ?? null, prices.gateway?.usd ?? null, prices.gateway?.cny ?? null);
     db.exec('COMMIT');
 }
@@ -93,12 +93,12 @@ export function insertContextBreakdown(evolcoreHome, bd) {
     if (!db)
         return;
     try {
-        db.prepare(`
-      INSERT INTO context_breakdown
-        (ts, agent_aid, session_id, turn_count, model, max_tokens,
-         system_prompt, system_tools, mcp_tools, custom_agents,
-         memory_files, skills, messages, free_space, total_estimated)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+        db.prepare(`
+      INSERT INTO context_breakdown
+        (ts, agent_aid, session_id, turn_count, model, max_tokens,
+         system_prompt, system_tools, mcp_tools, custom_agents,
+         memory_files, skills, messages, free_space, total_estimated)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
     `).run(bd.ts, bd.agent_aid, bd.session_id, bd.turn_count, bd.model, bd.max_tokens, bd.system_prompt ?? null, bd.system_tools ?? null, bd.mcp_tools ?? null, bd.custom_agents ?? null, bd.memory_files ?? null, bd.skills ?? null, bd.messages ?? null, bd.free_space ?? null, bd.total_estimated ?? null);
     }
     catch (e) {
@@ -110,10 +110,10 @@ export function insertMessageEvent(evolcoreHome, event) {
     if (!db)
         return;
     try {
-        db.prepare(`
-      INSERT INTO message_events
-        (ts, agent_aid, peer_key, direction, msg_type, bytes, encrypted, chatmode)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+        db.prepare(`
+      INSERT INTO message_events
+        (ts, agent_aid, peer_key, direction, msg_type, bytes, encrypted, chatmode)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?)
     `).run(event.ts, event.agent_aid, event.peer_key, event.direction, event.msg_type ?? null, event.bytes, event.encrypted ? 1 : 0, event.chatmode ?? null);
     }
     catch (e) {
@@ -128,12 +128,12 @@ export function insertModelCalls(evolcoreHome, rows) {
     if (!db)
         return;
     try {
-        const stmt = db.prepare(`
-      INSERT INTO model_calls
-        (ts, task_id, session_id, agent_session_id, agent_aid, peer_key, call_index, model,
-         request_id, message_id, input_tokens, output_tokens, cache_creation_tokens,
-         cache_read_tokens, context_tokens, max_tokens, auto_compact_tokens, degraded)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+        const stmt = db.prepare(`
+      INSERT INTO model_calls
+        (ts, task_id, session_id, agent_session_id, agent_aid, peer_key, call_index, model,
+         request_id, message_id, input_tokens, output_tokens, cache_creation_tokens,
+         cache_read_tokens, context_tokens, max_tokens, auto_compact_tokens, degraded)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
     `);
         db.exec('BEGIN');
         for (const r of rows) {

package/dist/utils/cross-platform.js

@@ -449,7 +449,10 @@ export function resolveCliEntry(packageRoot) {
         try {
             const require = createRequire(path.join(packageRoot, 'package.json'));
             const tsxUrl = pathToFileURL(require.resolve('tsx')).href;
-            return { args: ['--import', tsxUrl, sourceEntry], usingSource: true, entry: sourceEntry };
+            const imports = process.platform === 'win32'
+                ? ['--import', 'data:text/javascript,globalThis.process.geteuid=()=>-1', '--import', tsxUrl]
+                : ['--import', tsxUrl];
+            return { args: [...imports, sourceEntry], usingSource: true, entry: sourceEntry };
         }
         catch {
             // tsx missing (e.g. `npm prune --production`): fall through to dist.
@@ -488,11 +491,37 @@ export function encodePath(projectPath) {
 /**
  * Cross-platform process liveness check.
  */
+function readLinuxProcessState(pid) {
+    if (process.platform !== 'linux')
+        return null;
+    try {
+        const stat = fs.readFileSync(`/proc/${pid}/stat`, 'utf8');
+        // The comm field may contain ')', so use the final closing parenthesis.
+        const closeParen = stat.lastIndexOf(')');
+        if (closeParen < 0)
+            return null;
+        return stat.slice(closeParen + 2, closeParen + 3) || null;
+    }
+    catch {
+        // Keep the kill(0) fallback below for permission and procfs races.
+        return null;
+    }
+}
+/** Return the Linux proc state (for example Z, D, S, or R), when available. */
+export function getProcessState(pid) {
+    if (!Number.isInteger(pid) || pid <= 0)
+        return null;
+    return readLinuxProcessState(pid);
+}
 export function isProcessRunning(pid) {
     if (!Number.isInteger(pid) || pid <= 0)
         return false;
     if (isWindows)
         return isWindowsProcessRunning(pid);
+    // A zombie has exited; only its unreaped process-table entry remains.  A
+    // kill(pid, 0) probe alone reports such an entry as alive on Linux.
+    if (readLinuxProcessState(pid) === 'Z')
+        return false;
     try {
         process.kill(pid, 0);
         return true;