evolcore 0.0.23 → 0.0.25

package/dist/ipc.js

@@ -830,12 +830,21 @@ export class IpcServer {
                     || typeof cmd.toolName !== 'string' || !cmd.toolName) {
                     return { ok: false, applicable: true, decision: 'deny', reason: 'invalid Codex hook request' };
                 }
+                // Unmanaged Codex processes carry no credential and are allowed
+                // without consulting any runner; see bin/codex-managed-hook.mjs.
+                const sessionToken = typeof cmd.sessionToken === 'string' && cmd.sessionToken
+                    ? cmd.sessionToken
+                    : undefined;
+                if (!sessionToken) {
+                    return { ok: true, applicable: true, decision: 'allow' };
+                }
                 try {
                     return await this.codexPreToolUseExecutor({
                         threadId: cmd.threadId,
                         toolName: cmd.toolName,
                         toolInput: cmd.toolInput,
                         callId: typeof cmd.callId === 'string' ? cmd.callId : undefined,
+                        sessionToken,
                         signal: requestSignal,
                     });
                 }
@@ -1534,12 +1543,26 @@ export class IpcServer {
             && crypto.timingSafeEqual(provided, this.controlToken);
     }
 }
-/**
- * Query the running EvolCore daemon via Unix socket.
- * Returns null if the service is not running or the socket is unreachable.
- */
+export class IpcTransportError extends Error {
+    code;
+    endpoint;
+    constructor(code, endpoint) {
+        const hint = code === 'EPERM' || code === 'EACCES'
+            ? '权限被拒绝；Windows 下请检查 daemon 与 CLI 是否使用相同用户和提升权限级别。'
+            : code === 'ETIMEDOUT'
+                ? '等待 daemon 响应超时；请求可能已执行，请先检查状态再重试。'
+                : code === 'ENOENT' || code === 'ECONNREFUSED'
+                    ? 'daemon 未运行或 IPC 端点不存在，请先执行 ec start，再重试。'
+                    : '请检查 daemon 进程及 IPC 端点状态。';
+        super(`daemon IPC 失败 (${code}): ${endpoint}。${hint}`);
+        this.code = code;
+        this.endpoint = endpoint;
+        this.name = 'IpcTransportError';
+    }
+}
+/** Query the daemon; opt in to transport errors instead of the legacy null result. */
 /** Pass `null` as timeoutMs to wait without a client-side deadline. */
-export function ipcQuery(socketPath, cmd, timeoutMs = 3000) {
+export async function ipcQuery(socketPath, cmd, timeoutMs = 3000, options = {}) {
     const endpoint = normalizeIpcEndpoint(socketPath);
     let socketCandidates = [endpoint];
     if (isNamedPipe(endpoint)) {
@@ -1547,22 +1570,35 @@ export function ipcQuery(socketPath, cmd, timeoutMs = 3000) {
         if (endpoint === paths.socket)
             socketCandidates = getWindowsInstanceSocketPathCandidates(paths.root);
     }
-    if (socketCandidates.length <= 1)
-        return ipcQueryOnce(endpoint, cmd, timeoutMs);
-    return (async () => {
-        const startedAt = Date.now();
-        for (const candidate of socketCandidates) {
-            const remainingTimeout = timeoutMs === null
-                ? null
-                : Math.max(0, timeoutMs - (Date.now() - startedAt));
-            if (remainingTimeout === 0)
-                return null;
+    const startedAt = Date.now();
+    let failure;
+    for (const candidate of socketCandidates) {
+        const remainingTimeout = timeoutMs === null
+            ? null
+            : Math.max(0, timeoutMs - (Date.now() - startedAt));
+        if (remainingTimeout === 0) {
+            failure ??= new IpcTransportError('ETIMEDOUT', candidate);
+            break;
+        }
+        try {
             const response = await ipcQueryOnce(candidate, cmd, remainingTimeout);
             if (response !== null)
                 return response;
         }
-        return null;
-    })();
+        catch (error) {
+            if (!(error instanceof IpcTransportError))
+                throw error;
+            // A missing legacy pipe must not hide a permission failure on the canonical pipe.
+            if (!failure || ['ENOENT', 'ECONNREFUSED'].includes(failure.code))
+                failure = error;
+            // Only connection failures are safe to retry against a legacy endpoint.
+            if (!['ENOENT', 'ECONNREFUSED', 'EPERM', 'EACCES'].includes(error.code))
+                break;
+        }
+    }
+    if (options.throwOnError && failure)
+        throw failure;
+    return null;
 }
 function ipcQueryOnce(socketPath, cmd, timeoutMs = 3000) {
     let authenticatedCmd = cmd;
@@ -1587,7 +1623,7 @@ function ipcQueryOnce(socketPath, cmd, timeoutMs = 3000) {
             ? { daemonRuntimeEpoch: process.env[DAEMON_RUNTIME_EPOCH_ENV] }
             : {}),
     };
-    return new Promise((resolve) => {
+    return new Promise((resolve, reject) => {
         const startedAtMono = performance.now();
         const queryId = nextIpcQueryId(request);
         const commandType = ipcLogToken(request.type);
@@ -1606,7 +1642,7 @@ function ipcQueryOnce(socketPath, cmd, timeoutMs = 3000) {
                 settled = true;
                 logPhase('timeout', ` timeout_ms=${timeoutMs}`);
                 conn.destroy();
-                resolve(null);
+                reject(new IpcTransportError('ETIMEDOUT', socketPath));
             }, timeoutMs);
         conn.on('connect', () => {
             if (settled)
@@ -1632,7 +1668,10 @@ function ipcQueryOnce(socketPath, cmd, timeoutMs = 3000) {
                     parse = 'invalid_json';
                 }
                 logPhase('response', ` bytes=${idx + 1} parse=${parse}`);
-                resolve(response);
+                if (parse === 'invalid_json')
+                    reject(new IpcTransportError('EPROTO', socketPath));
+                else
+                    resolve(response);
                 conn.destroy();
             }
         });
@@ -1643,7 +1682,15 @@ function ipcQueryOnce(socketPath, cmd, timeoutMs = 3000) {
             if (timer)
                 clearTimeout(timer);
             logPhase('error', ` code=${error.code ?? 'unknown'}`);
-            resolve(null);
+            reject(new IpcTransportError(error.code ?? 'UNKNOWN', socketPath));
+        });
+        conn.on('close', () => {
+            if (settled)
+                return;
+            settled = true;
+            if (timer)
+                clearTimeout(timer);
+            reject(new IpcTransportError('ECONNRESET', socketPath));
         });
     });
 }

package/dist/paths.js

@@ -129,11 +129,22 @@ export function agentHandoffDir(aid) {
     return path.join(agentDataDir(aid), 'handoff');
 }
 export function agentOutboxPath(aid) {
-    return path.join(agentDataDir(aid), 'outbox.jsonl');
+    return path.join(resolvePaths().outboxDir, encodeURIComponent(aid), 'outbox.jsonl');
 }
 export function agentActivityOutboxPath(aid) {
+    return path.join(resolvePaths().outboxDir, encodeURIComponent(aid), 'activity-outbox.jsonl');
+}
+/** Pre-v4 per-Agent outbox paths retained only for compatibility import. */
+export function legacyAgentOutboxPath(aid) {
+    return path.join(agentDataDir(aid), 'outbox.jsonl');
+}
+export function legacyAgentActivityOutboxPath(aid) {
     return path.join(agentDataDir(aid), 'activity-outbox.jsonl');
 }
+/** Earliest global outbox layout: data/outbox/<aid>.jsonl. */
+export function legacyFlatOutboxPath(aid) {
+    return path.join(resolvePaths().outboxDir, `${aid}.jsonl`);
+}
 /** Directory-safe channel instance key used by connector runtime state. */
 function encodePathKey(value) {
     return encodeURIComponent(value);
@@ -283,6 +294,17 @@ function migrateFromAun() {
     const markerPath = path.join(newRoot, MIGRATION_MARKER);
     if (fs.existsSync(markerPath))
         return;
+    // Test workers use isolated temporary homes.  Copying the developer's
+    // machine-wide ~/.aun tree into every fresh fixture is both unnecessary and
+    // can make process-boundary tests exceed their timeout.  Production roots
+    // retain the normal one-time migration behavior.
+    if (process.env.EVOLCORE_TEST === '1') {
+        try {
+            fs.writeFileSync(markerPath, new Date().toISOString(), 'utf-8');
+        }
+        catch { }
+        return;
+    }
     const oldRoot = path.join(os.homedir(), '.aun');
     if (!fs.existsSync(oldRoot) || oldRoot === newRoot) {
         try {

package/dist/stats/billing.js

@@ -1,11 +1,13 @@
 /**
- * billing.ts — 读 model-prices.jsonl，按 billing_fn 调对应算法函数计算费用。
+ * billing.ts — 读 model-prices.jsonl，按模型参数中的 billing_fn 计算费用。
  * 费用查询时实时计算，不存入 DB（价格可能变动）。
  */
 import fs from 'fs';
 import path from 'path';
 import { getPackageRoot } from '../paths.js';
-// 价格表缓存（进程内，5 分钟 TTL）
+// 模型参数缓存（进程内，5 分钟 TTL）
+let _parameterCache = null;
+let _parameterCacheTs = 0;
 let _priceCache = null;
 let _priceCacheTs = 0;
 const PRICE_CACHE_TTL = 5 * 60 * 1000;
@@ -44,6 +46,14 @@ function _loadJsonlMerged(evolcoreHome, filename) {
     }
     return results;
 }
+function loadModelParameters(evolcoreHome) {
+    if (_parameterCache && Date.now() - _parameterCacheTs < PRICE_CACHE_TTL)
+        return _parameterCache;
+    const params = _loadJsonlMerged(evolcoreHome, 'model-prices.jsonl');
+    _parameterCache = params;
+    _parameterCacheTs = Date.now();
+    return params;
+}
 let _aliasCache = null;
 let _aliasCacheTs = 0;
 function loadAliases(evolcoreHome) {
@@ -64,7 +74,8 @@ function loadPrices(evolcoreHome) {
     const now = Date.now();
     if (_priceCache && now - _priceCacheTs < PRICE_CACHE_TTL)
         return _priceCache;
-    _priceCache = _loadJsonlMerged(evolcoreHome, 'model-prices.jsonl');
+    _priceCache = loadModelParameters(evolcoreHome).filter((record) => (typeof record.billing_fn === 'string'
+        && (record.currency === 'USD' || record.currency === 'CNY')));
     _priceCacheTs = now;
     return _priceCache;
 }
@@ -140,13 +151,16 @@ export function calcCost(evolcoreHome, event) {
         return {};
     return fn(event, priceRow);
 }
+// ── Model Specs ──────────────────────────────────────────────────────────────
 let _specCache = null;
 let _specCacheTs = 0;
 function loadSpecs(evolcoreHome) {
     const now = Date.now();
     if (_specCache && now - _specCacheTs < PRICE_CACHE_TTL)
         return _specCache;
-    _specCache = _loadJsonlMerged(evolcoreHome, 'model-specs.jsonl');
+    _specCache = loadModelParameters(evolcoreHome).filter((record) => (typeof record.context_window === 'number'
+        && typeof record.max_input_tokens === 'number'
+        && typeof record.max_output_tokens === 'number'));
     _specCacheTs = now;
     return _specCache;
 }

package/dist/stats/db.js

@@ -85,134 +85,134 @@ export function openReadonlyDb(dbPath) {
     }
 }
 function _initTables(db) {
-    db.exec(`
-    CREATE TABLE IF NOT EXISTS usage_events (
-      id                    INTEGER PRIMARY KEY AUTOINCREMENT,
-      ts                    INTEGER NOT NULL,
-      agent_aid             TEXT    NOT NULL,
-      peer_key              TEXT    NOT NULL,
-      usage_subject_key     TEXT    NOT NULL DEFAULT '',
-      role                  TEXT    NOT NULL DEFAULT '',
-      peer_type             TEXT,
-      session_id            TEXT,
-      model                 TEXT    NOT NULL,
-      billing_fn            TEXT    NOT NULL,
-      input_tokens          INTEGER NOT NULL DEFAULT 0,
-      output_tokens         INTEGER NOT NULL DEFAULT 0,
-      cache_creation_tokens INTEGER NOT NULL DEFAULT 0,
-      cache_read_tokens     INTEGER NOT NULL DEFAULT 0,
-      cache_hit_tokens      INTEGER,
-      cache_miss_tokens     INTEGER,
-      image_tokens          INTEGER,
-      total_context_tokens  INTEGER,
-      turns                 INTEGER NOT NULL DEFAULT 1,
-      duration_ms           INTEGER,
-      context_window_pct    REAL,
-      cost_official_usd     REAL,
-      cost_official_cny     REAL,
-      cost_gateway_usd      REAL,
-      cost_gateway_cny      REAL
-    );
-    CREATE INDEX IF NOT EXISTS idx_ue_ts         ON usage_events(ts);
-    CREATE INDEX IF NOT EXISTS idx_ue_agent_ts   ON usage_events(agent_aid, ts);
-    CREATE INDEX IF NOT EXISTS idx_ue_peer_ts    ON usage_events(agent_aid, peer_key, ts);
-    CREATE INDEX IF NOT EXISTS idx_ue_model_ts   ON usage_events(model, ts);
-    CREATE INDEX IF NOT EXISTS idx_ue_session_ts ON usage_events(session_id, ts);
-
-    CREATE TABLE IF NOT EXISTS context_breakdown (
-      id              INTEGER PRIMARY KEY AUTOINCREMENT,
-      ts              INTEGER NOT NULL,
-      agent_aid       TEXT    NOT NULL,
-      session_id      TEXT    NOT NULL,
-      turn_count      INTEGER NOT NULL,
-      model           TEXT    NOT NULL,
-      max_tokens      INTEGER NOT NULL,
-      system_prompt   INTEGER,
-      system_tools    INTEGER,
-      mcp_tools       INTEGER,
-      custom_agents   INTEGER,
-      memory_files    INTEGER,
-      skills          INTEGER,
-      messages        INTEGER,
-      free_space      INTEGER,
-      total_estimated INTEGER
-    );
-    CREATE INDEX IF NOT EXISTS idx_cb_session ON context_breakdown(session_id, ts);
-    CREATE INDEX IF NOT EXISTS idx_cb_agent   ON context_breakdown(agent_aid, ts);
-
-    CREATE TABLE IF NOT EXISTS message_events (
-      id          INTEGER PRIMARY KEY AUTOINCREMENT,
-      ts          INTEGER NOT NULL,
-      agent_aid   TEXT    NOT NULL,
-      peer_key    TEXT    NOT NULL,
-      direction   TEXT    NOT NULL,
-      msg_type    TEXT,
-      bytes       INTEGER NOT NULL DEFAULT 0,
-      encrypted   INTEGER DEFAULT 0,
-      chatmode    TEXT
-    );
-    CREATE INDEX IF NOT EXISTS idx_me_ts       ON message_events(ts);
-    CREATE INDEX IF NOT EXISTS idx_me_agent_ts ON message_events(agent_aid, ts);
-    CREATE INDEX IF NOT EXISTS idx_me_peer_ts  ON message_events(agent_aid, peer_key, ts);
-
-    -- 按天预聚合表：grain = 天 × agent × peer × session × model × billing_fn。
-    -- 由 writer.ts 写时增量 UPSERT 维护，rebuildDailyRollup() 全量重建纠偏。
-    -- 保留 model+billing_fn 维度以便查询时仍按 calcCost 现算成本。
-    -- 日级行很小，永留主库、不参与年度归档。
-    CREATE TABLE IF NOT EXISTS usage_daily (
-      day          TEXT NOT NULL,           -- 'YYYY-MM-DD' localtime
-      agent_aid    TEXT NOT NULL,
-      peer_key     TEXT NOT NULL,
-      peer_type    TEXT NOT NULL DEFAULT '',-- 'private' | 'group'，由 peer_key 唯一决定
-      session_id   TEXT NOT NULL DEFAULT '',
-      model        TEXT NOT NULL,
-      billing_fn   TEXT NOT NULL,
-      input_tokens          INTEGER NOT NULL DEFAULT 0,
-      output_tokens         INTEGER NOT NULL DEFAULT 0,
-      cache_creation_tokens INTEGER NOT NULL DEFAULT 0,
-      cache_read_tokens     INTEGER NOT NULL DEFAULT 0,
-      cache_hit_tokens      INTEGER NOT NULL DEFAULT 0,
-      cache_miss_tokens     INTEGER NOT NULL DEFAULT 0,
-      image_tokens          INTEGER NOT NULL DEFAULT 0,
-      total_context_tokens  INTEGER NOT NULL DEFAULT 0,
-      turns        INTEGER NOT NULL DEFAULT 0,
-      calls        INTEGER NOT NULL DEFAULT 0,
-      cost_official_usd     REAL,
-      cost_official_cny     REAL,
-      cost_gateway_usd      REAL,
-      cost_gateway_cny      REAL,
-      PRIMARY KEY (day, agent_aid, peer_key, session_id, model, billing_fn)
-    );
-    CREATE INDEX IF NOT EXISTS idx_ud_day     ON usage_daily(day);
-    CREATE INDEX IF NOT EXISTS idx_ud_session ON usage_daily(session_id);
-
-    -- 大模型调用明细：每次大模型调用一行（尽力而为；非 Claude 拿不到逐次时降级为单行累计）。
-    -- 关联三个 ID：task_id（一次 runQuery）、session_id（evolcore 会话）、agent_session_id（SDK 会话）。
-    CREATE TABLE IF NOT EXISTS model_calls (
-      id            INTEGER PRIMARY KEY AUTOINCREMENT,
-      ts            INTEGER NOT NULL,
-      task_id       TEXT    NOT NULL,
-      session_id    TEXT,
-      agent_session_id TEXT,
-      agent_aid     TEXT    NOT NULL,
-      peer_key      TEXT    NOT NULL,
-      call_index    INTEGER NOT NULL,
-      model         TEXT    NOT NULL,
-      request_id    TEXT,
-      message_id    TEXT,
-      input_tokens          INTEGER NOT NULL DEFAULT 0,
-      output_tokens         INTEGER NOT NULL DEFAULT 0,
-      cache_creation_tokens INTEGER NOT NULL DEFAULT 0,
-      cache_read_tokens     INTEGER NOT NULL DEFAULT 0,
-      context_tokens        INTEGER,
-      max_tokens            INTEGER,
-      auto_compact_tokens   INTEGER,
-      degraded      INTEGER NOT NULL DEFAULT 0
-    );
-    CREATE INDEX IF NOT EXISTS idx_mc_task        ON model_calls(task_id);
-    CREATE INDEX IF NOT EXISTS idx_mc_session     ON model_calls(session_id, ts);
-    CREATE INDEX IF NOT EXISTS idx_mc_agentsession ON model_calls(agent_session_id);
-    CREATE INDEX IF NOT EXISTS idx_mc_ts          ON model_calls(ts);
+    db.exec(`
+    CREATE TABLE IF NOT EXISTS usage_events (
+      id                    INTEGER PRIMARY KEY AUTOINCREMENT,
+      ts                    INTEGER NOT NULL,
+      agent_aid             TEXT    NOT NULL,
+      peer_key              TEXT    NOT NULL,
+      usage_subject_key     TEXT    NOT NULL DEFAULT '',
+      role                  TEXT    NOT NULL DEFAULT '',
+      peer_type             TEXT,
+      session_id            TEXT,
+      model                 TEXT    NOT NULL,
+      billing_fn            TEXT    NOT NULL,
+      input_tokens          INTEGER NOT NULL DEFAULT 0,
+      output_tokens         INTEGER NOT NULL DEFAULT 0,
+      cache_creation_tokens INTEGER NOT NULL DEFAULT 0,
+      cache_read_tokens     INTEGER NOT NULL DEFAULT 0,
+      cache_hit_tokens      INTEGER,
+      cache_miss_tokens     INTEGER,
+      image_tokens          INTEGER,
+      total_context_tokens  INTEGER,
+      turns                 INTEGER NOT NULL DEFAULT 1,
+      duration_ms           INTEGER,
+      context_window_pct    REAL,
+      cost_official_usd     REAL,
+      cost_official_cny     REAL,
+      cost_gateway_usd      REAL,
+      cost_gateway_cny      REAL
+    );
+    CREATE INDEX IF NOT EXISTS idx_ue_ts         ON usage_events(ts);
+    CREATE INDEX IF NOT EXISTS idx_ue_agent_ts   ON usage_events(agent_aid, ts);
+    CREATE INDEX IF NOT EXISTS idx_ue_peer_ts    ON usage_events(agent_aid, peer_key, ts);
+    CREATE INDEX IF NOT EXISTS idx_ue_model_ts   ON usage_events(model, ts);
+    CREATE INDEX IF NOT EXISTS idx_ue_session_ts ON usage_events(session_id, ts);
+
+    CREATE TABLE IF NOT EXISTS context_breakdown (
+      id              INTEGER PRIMARY KEY AUTOINCREMENT,
+      ts              INTEGER NOT NULL,
+      agent_aid       TEXT    NOT NULL,
+      session_id      TEXT    NOT NULL,
+      turn_count      INTEGER NOT NULL,
+      model           TEXT    NOT NULL,
+      max_tokens      INTEGER NOT NULL,
+      system_prompt   INTEGER,
+      system_tools    INTEGER,
+      mcp_tools       INTEGER,
+      custom_agents   INTEGER,
+      memory_files    INTEGER,
+      skills          INTEGER,
+      messages        INTEGER,
+      free_space      INTEGER,
+      total_estimated INTEGER
+    );
+    CREATE INDEX IF NOT EXISTS idx_cb_session ON context_breakdown(session_id, ts);
+    CREATE INDEX IF NOT EXISTS idx_cb_agent   ON context_breakdown(agent_aid, ts);
+
+    CREATE TABLE IF NOT EXISTS message_events (
+      id          INTEGER PRIMARY KEY AUTOINCREMENT,
+      ts          INTEGER NOT NULL,
+      agent_aid   TEXT    NOT NULL,
+      peer_key    TEXT    NOT NULL,
+      direction   TEXT    NOT NULL,
+      msg_type    TEXT,
+      bytes       INTEGER NOT NULL DEFAULT 0,
+      encrypted   INTEGER DEFAULT 0,
+      chatmode    TEXT
+    );
+    CREATE INDEX IF NOT EXISTS idx_me_ts       ON message_events(ts);
+    CREATE INDEX IF NOT EXISTS idx_me_agent_ts ON message_events(agent_aid, ts);
+    CREATE INDEX IF NOT EXISTS idx_me_peer_ts  ON message_events(agent_aid, peer_key, ts);
+
+    -- 按天预聚合表：grain = 天 × agent × peer × session × model × billing_fn。
+    -- 由 writer.ts 写时增量 UPSERT 维护，rebuildDailyRollup() 全量重建纠偏。
+    -- 保留 model+billing_fn 维度以便查询时仍按 calcCost 现算成本。
+    -- 日级行很小，永留主库、不参与年度归档。
+    CREATE TABLE IF NOT EXISTS usage_daily (
+      day          TEXT NOT NULL,           -- 'YYYY-MM-DD' localtime
+      agent_aid    TEXT NOT NULL,
+      peer_key     TEXT NOT NULL,
+      peer_type    TEXT NOT NULL DEFAULT '',-- 'private' | 'group'，由 peer_key 唯一决定
+      session_id   TEXT NOT NULL DEFAULT '',
+      model        TEXT NOT NULL,
+      billing_fn   TEXT NOT NULL,
+      input_tokens          INTEGER NOT NULL DEFAULT 0,
+      output_tokens         INTEGER NOT NULL DEFAULT 0,
+      cache_creation_tokens INTEGER NOT NULL DEFAULT 0,
+      cache_read_tokens     INTEGER NOT NULL DEFAULT 0,
+      cache_hit_tokens      INTEGER NOT NULL DEFAULT 0,
+      cache_miss_tokens     INTEGER NOT NULL DEFAULT 0,
+      image_tokens          INTEGER NOT NULL DEFAULT 0,
+      total_context_tokens  INTEGER NOT NULL DEFAULT 0,
+      turns        INTEGER NOT NULL DEFAULT 0,
+      calls        INTEGER NOT NULL DEFAULT 0,
+      cost_official_usd     REAL,
+      cost_official_cny     REAL,
+      cost_gateway_usd      REAL,
+      cost_gateway_cny      REAL,
+      PRIMARY KEY (day, agent_aid, peer_key, session_id, model, billing_fn)
+    );
+    CREATE INDEX IF NOT EXISTS idx_ud_day     ON usage_daily(day);
+    CREATE INDEX IF NOT EXISTS idx_ud_session ON usage_daily(session_id);
+
+    -- 大模型调用明细：每次大模型调用一行（尽力而为；非 Claude 拿不到逐次时降级为单行累计）。
+    -- 关联三个 ID：task_id（一次 runQuery）、session_id（evolcore 会话）、agent_session_id（SDK 会话）。
+    CREATE TABLE IF NOT EXISTS model_calls (
+      id            INTEGER PRIMARY KEY AUTOINCREMENT,
+      ts            INTEGER NOT NULL,
+      task_id       TEXT    NOT NULL,
+      session_id    TEXT,
+      agent_session_id TEXT,
+      agent_aid     TEXT    NOT NULL,
+      peer_key      TEXT    NOT NULL,
+      call_index    INTEGER NOT NULL,
+      model         TEXT    NOT NULL,
+      request_id    TEXT,
+      message_id    TEXT,
+      input_tokens          INTEGER NOT NULL DEFAULT 0,
+      output_tokens         INTEGER NOT NULL DEFAULT 0,
+      cache_creation_tokens INTEGER NOT NULL DEFAULT 0,
+      cache_read_tokens     INTEGER NOT NULL DEFAULT 0,
+      context_tokens        INTEGER,
+      max_tokens            INTEGER,
+      auto_compact_tokens   INTEGER,
+      degraded      INTEGER NOT NULL DEFAULT 0
+    );
+    CREATE INDEX IF NOT EXISTS idx_mc_task        ON model_calls(task_id);
+    CREATE INDEX IF NOT EXISTS idx_mc_session     ON model_calls(session_id, ts);
+    CREATE INDEX IF NOT EXISTS idx_mc_agentsession ON model_calls(agent_session_id);
+    CREATE INDEX IF NOT EXISTS idx_mc_ts          ON model_calls(ts);
   `);
     // ── Schema Migration: 添加 cost 列 ───────────────────────────────────────
     try {
@@ -220,17 +220,17 @@ function _initTables(db) {
         const hasCostCols = cols.some((c) => c.name === 'cost_official_usd');
         if (!hasCostCols) {
             logger.info('[StatsDB] Migrating schema: adding cost columns to usage_events and usage_daily...');
-            db.exec(`
-        ALTER TABLE usage_events ADD COLUMN cost_official_usd REAL;
-        ALTER TABLE usage_events ADD COLUMN cost_official_cny REAL;
-        ALTER TABLE usage_events ADD COLUMN cost_gateway_usd REAL;
-        ALTER TABLE usage_events ADD COLUMN cost_gateway_cny REAL;
+            db.exec(`
+        ALTER TABLE usage_events ADD COLUMN cost_official_usd REAL;
+        ALTER TABLE usage_events ADD COLUMN cost_official_cny REAL;
+        ALTER TABLE usage_events ADD COLUMN cost_gateway_usd REAL;
+        ALTER TABLE usage_events ADD COLUMN cost_gateway_cny REAL;
       `);
-            db.exec(`
-        ALTER TABLE usage_daily ADD COLUMN cost_official_usd REAL;
-        ALTER TABLE usage_daily ADD COLUMN cost_official_cny REAL;
-        ALTER TABLE usage_daily ADD COLUMN cost_gateway_usd REAL;
-        ALTER TABLE usage_daily ADD COLUMN cost_gateway_cny REAL;
+            db.exec(`
+        ALTER TABLE usage_daily ADD COLUMN cost_official_usd REAL;
+        ALTER TABLE usage_daily ADD COLUMN cost_official_cny REAL;
+        ALTER TABLE usage_daily ADD COLUMN cost_gateway_usd REAL;
+        ALTER TABLE usage_daily ADD COLUMN cost_gateway_cny REAL;
       `);
             logger.info('[StatsDB] Migration complete. Run "ec stats --rebuild" to backfill historical costs.');
         }
@@ -295,26 +295,26 @@ export function rebuildDailyRollup(evolcoreHome) {
     try {
         db.exec('BEGIN');
         db.exec('DELETE FROM usage_daily');
-        db.exec(`
-      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)
-      SELECT
-        strftime('%Y-%m-%d', ts/1000, 'unixepoch', 'localtime') AS day,
-        agent_aid, peer_key, MAX(COALESCE(peer_type, '')),
-        COALESCE(session_id, ''), model, billing_fn,
-        SUM(input_tokens), SUM(output_tokens),
-        SUM(cache_creation_tokens), SUM(cache_read_tokens),
-        SUM(COALESCE(cache_hit_tokens, 0)), SUM(COALESCE(cache_miss_tokens, 0)),
-        SUM(COALESCE(image_tokens, 0)), SUM(COALESCE(total_context_tokens, 0)),
-        SUM(turns), COUNT(*),
-        SUM(COALESCE(cost_official_usd, 0)), SUM(COALESCE(cost_official_cny, 0)),
-        SUM(COALESCE(cost_gateway_usd, 0)), SUM(COALESCE(cost_gateway_cny, 0))
-      FROM usage_events
-      GROUP BY day, agent_aid, peer_key, COALESCE(session_id, ''), model, billing_fn
+        db.exec(`
+      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)
+      SELECT
+        strftime('%Y-%m-%d', ts/1000, 'unixepoch', 'localtime') AS day,
+        agent_aid, peer_key, MAX(COALESCE(peer_type, '')),
+        COALESCE(session_id, ''), model, billing_fn,
+        SUM(input_tokens), SUM(output_tokens),
+        SUM(cache_creation_tokens), SUM(cache_read_tokens),
+        SUM(COALESCE(cache_hit_tokens, 0)), SUM(COALESCE(cache_miss_tokens, 0)),
+        SUM(COALESCE(image_tokens, 0)), SUM(COALESCE(total_context_tokens, 0)),
+        SUM(turns), COUNT(*),
+        SUM(COALESCE(cost_official_usd, 0)), SUM(COALESCE(cost_official_cny, 0)),
+        SUM(COALESCE(cost_gateway_usd, 0)), SUM(COALESCE(cost_gateway_cny, 0))
+      FROM usage_events
+      GROUP BY day, agent_aid, peer_key, COALESCE(session_id, ''), model, billing_fn
     `);
         db.exec('COMMIT');
         const row = db.prepare('SELECT COUNT(*) AS n FROM usage_daily').get();
@@ -345,7 +345,7 @@ export function archiveOldData(evolcoreHome) {
     const cutoffYear = now.getFullYear(); // e.g. 2026
     const cutoffTs = Date.UTC(cutoffYear, 0, 1); // 2026-01-01 00:00:00 UTC
     // 找出主库中所有早于 cutoff 的年份
-    const years = db.prepare(`SELECT DISTINCT CAST(strftime('%Y', ts/1000, 'unixepoch') AS INTEGER) AS y
+    const years = db.prepare(`SELECT DISTINCT CAST(strftime('%Y', ts/1000, 'unixepoch') AS INTEGER) AS y
      FROM usage_events WHERE ts < ? ORDER BY y`).all(cutoffTs).map((r) => r.y);
     if (years.length === 0)
         return;

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,