evolcore 0.0.25 → 0.0.27

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,

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);