ccus-cli 0.2.10 → 0.2.11

package/README.md

@@ -147,7 +147,7 @@ ccus aggregate --input-dir ./team-exports --out-dir ./team-report
 ccus aggregate serve --input-dir ./team-exports
 ```
 
-`serve` 会启动一个本地 HTTP 服务，默认监听 `127.0.0.1` 上的随机端口，并在每次请求时实时读取最新日志生成页面。`serve` 默认查看 `this-week`（整周）使用量曲线（`build` / `open` 仍默认 `today`），可用 `--range` 覆盖。
+`dashboard build/open` 会在看板同目录生成独立 `pricing.html`。两种 `serve` 都通过 `/pricing.html` 提供当前价格页；看板的合计成本卡下可直接进入。`serve` 默认监听 `127.0.0.1` 上的随机端口，并在每次请求时实时读取最新日志生成页面。`dashboard serve` 默认查看 `this-week`（整周）使用量曲线（`build` / `open` 仍默认 `today`），可用 `--range` 覆盖。
 
 其中：
 
@@ -167,7 +167,9 @@ ccus aggregate serve --input-dir ./team-exports
 - 默认输出一个 `json` 数据包，里面同时包含 `rawEvents`、`weeklySummary`、`dailySummaries`
 - 导出文件内容为**紧凑 JSON**（无缩进），并默认 **gzip 压缩**后写成 `.json.gz`；gzip 与紧凑化都只是存储/展示层变化，解压后的字段集合与 `schemaVersion` 不变
 - 默认写 `.json.gz`；若用 `--out` 指定一个非 `.gz` 结尾的路径，则按明文 JSON 写出（不压缩）
-- 当前导出 bundle / weeklySummary 的 `schemaVersion` 为 `9`：v7 起新增 `weeklySummary.codex` 与 `dailySummaries[].codex`（Codex CLI 的消息/请求/token 统计），v8 起该 codex 段再加 5h/7d 的 peak/latest 额度（从 `source="codex"` 事件重算、与 Claude 额度分开看），v9 起 codex `inputTokens` 改为净输入（`input_tokens - cached_input_tokens`，不含缓存命中）以对齐 Claude 的 `input_tokens` 口径；aggregate daily/weekly CSV 的主字段（消息/请求/token/额度）已把 Codex **叠加进 Claude 合计**（累加量相加、额度 peak 取两源 max、latest 两源相加、7d 累计含两源读数），不再单列 `codex*` 列，detail.csv 加 `source` 列区分来源
+- 当前导出 bundle / weeklySummary 的 `schemaVersion` 为 `10`。顶层 `pricing` 记录本地价格目录版本、USD 币种和 `event-time-standard-api` 基准；`weeklySummary.apiEquivalentCost` 与 `dailySummaries[].apiEquivalentCost` 分别包含 `claude`、`codex`、`total` 的金额及定价覆盖度。v10 延续 v9 的 Codex token 口径：`inputTokens = max(0, input_tokens - cached_input_tokens)`，缓存输入由 `cacheReadInputTokens` 单列
+- 等效 API 成本按每次请求的模型、发生时间和 token 分类套用内置标准同步 API 价格。Claude 区分输入、输出、缓存读取及 5 分钟/1 小时缓存写入；Codex 区分净输入、缓存输入和输出。它不是 Claude/Codex 订阅账单，也不含税费、折扣、批处理、工具附加费或区域溢价
+- 未知模型不会丢弃：有部分请求可定价时金额是已知小计，页面显示“至少为”；全部请求均无法定价时金额为不可用。个人 dashboard 在顶部第五张卡显示 Claude 与 Codex 的合计成本，不显示来源分项。全部模型价格集中维护在 `src/lib/api-pricing-catalog.json`，价格目录随 ccus 发布，统计过程不联网；个人与多人 dashboard 的合计成本卡下链接独立 `pricing.html` 并在新页面打开，价格页只保留一套标题，Codex 排在 Claude 前并按模型版本从新到旧排列。当前 Claude 目录包含 Opus 4.7、Opus 4.8、Opus 5、Sonnet 5 和 Fable 5；Sonnet 5 按事件时间区分活动价与标准价
 - 默认文件名会带 git email 的帐号名前缀和起止日期，例如：`alice_export_2026-05-26_to_2026-06-01.json.gz`
 - `userMessageCount` 来自 `~/.claude/projects/**/*.jsonl` 的非 meta `type:user` 事件
 - `apiRequestCount` 与 token 指标来自 `~/.claude/projects/**/*.jsonl` 中带 `message.usage` 的 `type:assistant` 事件
@@ -184,13 +186,14 @@ ccus aggregate serve --input-dir ./team-exports
 ## 多人汇总
 
 - 输入目录放很多通过 `ccus export` 导出的 bundle 文件，`.json.gz`（gzip 压缩）与明文 `.json` 都能识别，gzip 文件读取时自动解压
-- `aggregate` 接受 `schemaVersion: 6/7/8/9` 的 bundle（v9 codex inputTokens 为净输入，v8 含 codex 额度，v7/v6 容错回退 null/零值）；更旧的导出请先用当前版本重新 `ccus export`
+- `aggregate` 接受 `schemaVersion: 6/7/8/9/10`。v6–v9 继续聚合原统计；存在 API 请求时成本为空并全部计入未定价，没有请求时成本为 0。旧版与 v10 或不同价格目录混用时，`pricingCatalogVersion` 按规则标记为 `mixed`
 - 同一个人在多台电脑上各自导出 bundle 时会自动合并去重：去重以**天**为粒度，对每个「同人同天」取 `generatedAt` 最新的那份导出，避免同一台机器重复导出或周与周重叠造成翻倍；**周汇总不取整周单份，而是把按天去重后的各天数据上卷累加**，所以多台电脑在不同天产生的用量会正确合进同一周。usage（5h / 7d）从选中事件按真实时间戳重算，Claude+Codex 合并：peak 取两源 max、latest 两源相加
 - `ccus aggregate --input-dir DIR --out-dir DIR`
 - 输出三个文件：
   - `detail.csv`：来自 winner bundle 的 `rawEvents`（同人同天只展开最新那份的事件），`contextUsedM` / `contextMaxM` 为单条事件的 context window token；另附带 `inputTokensM` / `outputTokensM` / `cacheReadInputTokensM`（按 `date` 取自当天 `dailySummaries` 的日总量，同一天多行会重复，不能按行求和）
   - `daily.csv`：同人同天取最新导出 bundle 的 `dailySummaries`，usage 从该 bundle 当天事件重算
   - `weekly.csv`：把同人同周的各天 winner（已按天去重）上卷累加得到，usage 从该周全部 winner 天的事件重算
+- `daily.csv` / `weekly.csv` 在列尾包含 `estimatedApiEquivalentCostUsd`、`pricingCatalogVersion`，金额最多 6 位小数，无法定价时留空；成本沿 token 的按天代表选择与周上卷路径去重。`pricedApiRequestCount`、`unpricedApiRequestCount` 保留在 bundle 与 dashboard，不写入 CSV；`detail.csv` 保持原列集合，不包含成本字段
 - `daily.csv` / `weekly.csv` 还各带一列 `sevenDayCumulativeUsagePct`：7 天额度的**累计真实使用量**，把锯齿波（涨到峰值→窗口重置归零→再涨）还原成实际消耗。计算分两层：先**去毛刺**（把持续短于 2 分钟的 stale 瞬时读数尖峰抹平，只保留真实持续的水平），再做**分段峰谷和**（按 reset 跌破段峰值一半切成上升段，每段累加「段内峰值−谷值」）。以百分比累加表达、可大于 100（用掉多于一个 7d 额度）。对 ±1 采样抖动和 stale 读数尖峰都鲁棒，不会被噪声虚增
   - 该列**绕开按天 winner**，对同一个人**所有机器、所有周**的 bundle `rawEvents`（含 Claude 与 Codex 两源 7d 读数，codex 事件不再过滤）先按时间合并去重成一条账号级曲线再算，绝不分机相加（同账号 7d 额度共享）
   - 区间内第一个有效样本无前值、不贡献增量，所以 **`daily.csv` 逐行相加只是对全局总量的近似**（跨天边界增量不计入单天）；`weekly.csv` 在整周连续算、把跨天增量也计入，更连续，恒有 `weekly ≥ Σ 同周 daily`，想要更准的总量请看 weekly 这列

package/dist/cli.js

@@ -45,6 +45,8 @@ const node_path_1 = __importDefault(require("node:path"));
 const dashboard_1 = require("./lib/dashboard");
 const dashboard_2 = require("./lib/dashboard");
 const aggregate_dashboard_1 = require("./lib/aggregate-dashboard");
+const api_pricing_table_1 = require("./lib/api-pricing-table");
+const dashboard_pages_1 = require("./lib/dashboard-pages");
 const claude_1 = require("./lib/claude");
 const codex_sessions_1 = require("./lib/codex-sessions");
 const export_1 = require("./lib/export");
@@ -64,6 +66,7 @@ const sync_1 = require("./lib/sync");
 const storage_1 = require("./lib/storage");
 const time_1 = require("./lib/time");
 const update_check_1 = require("./lib/update-check");
+const api_equivalent_cost_1 = require("./lib/api-equivalent-cost");
 const version_1 = require("./lib/version");
 /** CLI 帮助信息保持简洁，方便直接挂到 README 或终端里查看。 */
 function printHelp() {
@@ -245,10 +248,10 @@ async function handleStatuslineEmit(options) {
     }
 }
 /**
- * 加载某个时间窗口内的 dashboard 渲染数据：statusline 事件 + 每日用户消息数。
+ * 加载 dashboard 渲染数据：statusline 事件、Claude/Codex 每日消息数与标准 API 等效成本。
  *
- * 每日用户消息数与导出契约同源（Claude 本地 transcript 的真实用户请求数），仅供 dashboard 展示，
- * 不落盘、不进任何导出/聚合契约。`defaultRange` 让 build/open 与 serve 各自决定缺省窗口。
+ * 消息数和成本与导出契约同源，当前结果仅供 dashboard 展示。
+ * `defaultRange` 让 build/open 与 serve 各自决定缺省窗口。
  */
 async function loadDashboardData(options, defaultRange) {
     const dataDir = getDataDir(options);
@@ -268,8 +271,14 @@ async function loadDashboardData(options, defaultRange) {
         userMessageCount: claudeDailyUsage.get(date)?.userMessageCount ?? 0,
         codexUserMessageCount: codexDailyUsage.get(date)?.userMessageCount ?? 0,
     }));
+    const claudeCost = (0, api_equivalent_cost_1.mergeApiEquivalentCosts)([...claudeDailyUsage.values()].map((day) => day.apiEquivalentCost));
+    const codexCost = (0, api_equivalent_cost_1.mergeApiEquivalentCosts)([...codexDailyUsage.values()].map((day) => day.apiEquivalentCost));
     (0, debug_1.debugLog)("dashboard", "events loaded", { range, label: window.label, sampleCount: events.length, days: dailyUserMessages.length });
-    const html = (0, dashboard_1.buildDashboardHtml)(events, window.label, window.start, window.end, dailyUserMessages);
+    const html = (0, dashboard_1.buildDashboardHtml)(events, window.label, window.start, window.end, dailyUserMessages, {
+        claude: claudeCost,
+        codex: codexCost,
+        total: (0, api_equivalent_cost_1.mergeApiEquivalentCosts)([claudeCost, codexCost]),
+    }, api_equivalent_cost_1.API_PRICING_METADATA.catalogVersion);
     return { html, window };
 }
 /** 构建 dashboard 的公共逻辑，build/open 复用同一套生成流程。 */
@@ -277,8 +286,16 @@ async function buildDashboard(options) {
     const dataDir = getDataDir(options);
     const { html, window } = await loadDashboardData(options, "today");
     const outputPath = node_path_1.default.resolve(getStringOption(options, "out") ?? node_path_1.default.join((0, paths_1.getDashboardDir)(dataDir), `${window.label}.html`));
-    await (0, export_1.writeTextFile)(outputPath, html);
-    (0, debug_1.debugLog)("dashboard", "html written", { outputPath, bytes: html.length });
+    if (node_path_1.default.basename(outputPath).toLowerCase() === api_pricing_table_1.API_PRICING_PAGE_FILE.toLowerCase()) {
+        throw new Error(`--out cannot be named ${api_pricing_table_1.API_PRICING_PAGE_FILE}.`);
+    }
+    const pricingPath = node_path_1.default.join(node_path_1.default.dirname(outputPath), api_pricing_table_1.API_PRICING_PAGE_FILE);
+    const pricingHtml = (0, api_pricing_table_1.buildApiPricingPage)();
+    await Promise.all([
+        (0, export_1.writeTextFile)(outputPath, html),
+        (0, export_1.writeTextFile)(pricingPath, pricingHtml),
+    ]);
+    (0, debug_1.debugLog)("dashboard", "html written", { outputPath, pricingPath, bytes: html.length });
     return outputPath;
 }
 /** 直接返回 dashboard HTML 字符串，供本地 HTTP 服务复用。serve 默认看整周使用量曲线。 */
@@ -309,9 +326,15 @@ async function handleDashboardServe(options) {
     if (!Number.isInteger(port) || port < 0 || port > 65535) {
         throw new Error(`Invalid port: ${portOption ?? ""}`);
     }
-    const server = node_http_1.default.createServer(async (_request, response) => {
+    const server = node_http_1.default.createServer(async (request, response) => {
+        const url = new URL(request.url ?? "/", "http://localhost");
         try {
-            const html = await renderDashboardHtml(options);
+            const html = await (0, dashboard_pages_1.renderDashboardPage)(url.pathname, () => renderDashboardHtml(options));
+            if (html === null) {
+                response.writeHead(404);
+                response.end();
+                return;
+            }
             response.writeHead(200, {
                 "Content-Type": "text/html; charset=utf-8",
                 "Cache-Control": "no-store",
@@ -378,6 +401,8 @@ async function runExport(options) {
     const claudeDailyUsage = await (0, claude_1.summarizeClaudeProjectUsageByDay)(window.start, window.end);
     const codexUsage = await (0, codex_sessions_1.summarizeCodexSessionUsage)(window.start, window.end);
     const codexDailyUsage = await (0, codex_sessions_1.summarizeCodexSessionUsageByDay)(window.start, window.end);
+    const claudeWeeklyCost = (0, api_equivalent_cost_1.mergeApiEquivalentCosts)([...claudeDailyUsage.values()].map((day) => day.apiEquivalentCost));
+    const codexWeeklyCost = (0, api_equivalent_cost_1.mergeApiEquivalentCosts)([...codexDailyUsage.values()].map((day) => day.apiEquivalentCost));
     (0, debug_1.debugLog)("export", "data collected", {
         statuslineSamples: records.length,
         claudeProjectFiles: claudeUsage.matchedFileCount,
@@ -395,7 +420,7 @@ async function runExport(options) {
         exportUserName = gitIdentity.userName;
     }
     const weeklySummary = {
-        schemaVersion: 9,
+        schemaVersion: 10,
         generatedAt: new Date().toISOString(),
         range: {
             label: window.label,
@@ -426,6 +451,11 @@ async function runExport(options) {
             sevenDayPeakUsagePct: codexStatuslineSummary.sevenDayPeakUsagePct,
             sevenDayLatestUsagePct: codexStatuslineSummary.sevenDayLatestUsagePct,
         },
+        apiEquivalentCost: {
+            claude: claudeWeeklyCost,
+            codex: codexWeeklyCost,
+            total: (0, api_equivalent_cost_1.mergeApiEquivalentCosts)([claudeWeeklyCost, codexWeeklyCost]),
+        },
         statusline: {
             sampleCount: statuslineSummary.sampleCount,
             uniqueSessions: statuslineSummary.uniqueSessions,
@@ -451,6 +481,8 @@ async function runExport(options) {
         const claudeDay = claudeDailyUsage.get(date);
         const codexDay = codexDailyUsage.get(date);
         const codexRow = codexStatuslineDailyMap.get(date);
+        const claudeCost = claudeDay?.apiEquivalentCost ?? (0, api_equivalent_cost_1.emptyApiEquivalentCost)();
+        const codexCost = codexDay?.apiEquivalentCost ?? (0, api_equivalent_cost_1.emptyApiEquivalentCost)();
         return {
             date,
             userMessageCount: claudeDay?.userMessageCount ?? 0,
@@ -469,6 +501,11 @@ async function runExport(options) {
                 sevenDayPeakUsagePct: codexRow?.sevenDayPeakUsagePct ?? null,
                 sevenDayLatestUsagePct: codexRow?.sevenDayLatestUsagePct ?? null,
             },
+            apiEquivalentCost: {
+                claude: claudeCost,
+                codex: codexCost,
+                total: (0, api_equivalent_cost_1.mergeApiEquivalentCosts)([claudeCost, codexCost]),
+            },
             sampleCount: row?.sampleCount ?? 0,
             fiveHourLatestUsagePct: row?.fiveHourLatestUsagePct ?? null,
             fiveHourPeakUsagePct: row?.fiveHourPeakUsagePct ?? null,
@@ -479,7 +516,7 @@ async function runExport(options) {
         };
     });
     const bundle = {
-        schemaVersion: 9,
+        schemaVersion: 10,
         generatedAt: new Date().toISOString(),
         range: {
             label: window.label,
@@ -490,6 +527,7 @@ async function runExport(options) {
             gitUserName: exportUserName,
             gitUserEmail: exportUserEmail,
         },
+        pricing: api_equivalent_cost_1.API_PRICING_METADATA,
         rawEvents: records,
         weeklySummary,
         dailySummaries,
@@ -574,13 +612,13 @@ async function handleAggregateServe(options) {
     }
     const server = node_http_1.default.createServer(async (request, response) => {
         const url = new URL(request.url ?? "/", "http://localhost");
-        if (url.pathname !== "/") {
-            response.writeHead(404);
-            response.end();
-            return;
-        }
         try {
-            const html = await renderAggregateDashboardHtml(resolvedInputDir);
+            const html = await (0, dashboard_pages_1.renderDashboardPage)(url.pathname, () => renderAggregateDashboardHtml(resolvedInputDir));
+            if (html === null) {
+                response.writeHead(404);
+                response.end();
+                return;
+            }
             response.writeHead(200, {
                 "Content-Type": "text/html; charset=utf-8",
                 "Cache-Control": "no-store",

package/dist/lib/aggregate-dashboard.js

@@ -6,6 +6,8 @@ exports.summarizeOverall = summarizeOverall;
 exports.buildAggregateDashboardHtml = buildAggregateDashboardHtml;
 const chart_assets_1 = require("./chart-assets");
 const time_1 = require("./time");
+const api_equivalent_cost_1 = require("./api-equivalent-cost");
+const api_pricing_table_1 = require("./api-pricing-table");
 /** 折线 / 图例统一的调色板，保证同一个人在不同图表里颜色一致。 */
 const CHART_PALETTE = ["#5eead4", "#f59e0b", "#a855f7", "#22c55e", "#f87171", "#60a5fa", "#fbbf24", "#34d399"];
 /**
@@ -28,6 +30,26 @@ function maxOrNull(values) {
     const numbers = values.filter((value) => value !== null);
     return numbers.length > 0 ? Math.max(...numbers) : null;
 }
+function mergePricingCatalogVersions(contributions) {
+    const values = new Set(contributions
+        .map((contribution) => contribution.catalogVersion)
+        .filter((value) => value !== null));
+    if (values.size === 0)
+        return null;
+    if (values.has("mixed") || values.size > 1 || contributions.some((contribution) => contribution.legacyRequestCount > 0)) {
+        return "mixed";
+    }
+    return [...values][0];
+}
+function formatCostUsd(value) {
+    return `$${value < 0.01 ? value.toFixed(4) : value.toFixed(2)}`;
+}
+function costDisplay(estimatedUsd, priced, unpriced) {
+    if (priced === 0 && unpriced > 0)
+        return `不可用（${formatNumber(unpriced)} 个未定价）`;
+    const amount = formatCostUsd(estimatedUsd ?? 0);
+    return unpriced > 0 ? `≥ ${amount}（${formatNumber(unpriced)} 个未定价）` : amount;
+}
 /**
  * 把多条不规则时间戳的 series 并集对齐到一个统一 x 轴。
  *
@@ -92,6 +114,11 @@ function summarizePeople(dailyRows, weeklyRows = []) {
             .reverse()
             .find((row) => row.sevenDayLatestUsagePct !== null);
         const activeDays = items.filter((row) => row.sampleCount > 0 || row.userMessageCount > 0 || row.apiRequestCount > 0).length;
+        const cost = (0, api_equivalent_cost_1.mergeApiEquivalentCosts)(items.map((row) => ({
+            estimatedUsd: row.estimatedApiEquivalentCostUsd,
+            pricedApiRequestCount: row.pricedApiRequestCount,
+            unpricedApiRequestCount: row.unpricedApiRequestCount,
+        })));
         summaries.push({
             personKey,
             userMessageCount: items.reduce((sum, row) => sum + row.userMessageCount, 0),
@@ -110,6 +137,13 @@ function summarizePeople(dailyRows, weeklyRows = []) {
             activeDays,
             firstDate: sortedByDate[0]?.date ?? null,
             lastDate: sortedByDate.at(-1)?.date ?? null,
+            estimatedApiEquivalentCostUsd: cost.estimatedUsd,
+            pricedApiRequestCount: cost.pricedApiRequestCount,
+            unpricedApiRequestCount: cost.unpricedApiRequestCount,
+            pricingCatalogVersion: mergePricingCatalogVersions(items.map((row) => ({
+                catalogVersion: row.pricingCatalogVersion,
+                legacyRequestCount: row.pricingCatalogVersion === null ? row.apiRequestCount : 0,
+            }))),
         });
     }
     return summaries.sort((left, right) => {
@@ -122,6 +156,11 @@ function summarizePeople(dailyRows, weeklyRows = []) {
 /** 把整体摘要算出来，方便顶部卡片直接展示。 */
 function summarizeOverall(dailyRows, people) {
     const dates = dailyRows.map((row) => row.date).sort((left, right) => left.localeCompare(right));
+    const cost = (0, api_equivalent_cost_1.mergeApiEquivalentCosts)(people.map((person) => ({
+        estimatedUsd: person.estimatedApiEquivalentCostUsd,
+        pricedApiRequestCount: person.pricedApiRequestCount,
+        unpricedApiRequestCount: person.unpricedApiRequestCount,
+    })));
     return {
         personCount: people.length,
         totalUserMessageCount: people.reduce((sum, person) => sum + person.userMessageCount, 0),
@@ -132,6 +171,13 @@ function summarizeOverall(dailyRows, people) {
         totalSampleCount: people.reduce((sum, person) => sum + person.sampleCount, 0),
         startDate: dates[0] ?? null,
         endDate: dates.at(-1) ?? null,
+        estimatedApiEquivalentCostUsd: cost.estimatedUsd,
+        pricedApiRequestCount: cost.pricedApiRequestCount,
+        unpricedApiRequestCount: cost.unpricedApiRequestCount,
+        pricingCatalogVersion: mergePricingCatalogVersions(people.map((person) => ({
+            catalogVersion: person.pricingCatalogVersion,
+            legacyRequestCount: person.pricingCatalogVersion === null ? person.apiRequestCount : 0,
+        }))),
     };
 }
 /** 列出所有日期键，用于在按日柱状图上对齐 X 轴。 */
@@ -368,7 +414,7 @@ function renderFiveHourUsageChart(people, detailRows) {
     </section>
   `;
 }
-/** 按人渲染汇总卡片，给出请求 / 消息 / token / usage 几个核心指标。 */
+/** 按人渲染汇总表，给出消息、token、成本和 usage 核心指标。 */
 function renderPeopleLeaderboard(people) {
     if (people.length === 0) {
         return `
@@ -392,13 +438,14 @@ function renderPeopleLeaderboard(people) {
         <td>${formatTokensM(person.inputTokens)}</td>
         <td>${formatTokensM(person.outputTokens)}</td>
         <td>${formatTokensM(person.cacheReadInputTokens)}</td>
+        <td>${escapeHtml(costDisplay(person.estimatedApiEquivalentCostUsd, person.pricedApiRequestCount, person.unpricedApiRequestCount))}</td>
+        <td>${escapeHtml(person.pricingCatalogVersion ?? "--")}</td>
         <td>${escapeHtml(statValue(person.fiveHourPeakUsagePct))}</td>
         <td>${escapeHtml(statValue(person.fiveHourLatestUsagePct))}</td>
         <td>${escapeHtml(statValue(person.sevenDayPeakUsagePct))}</td>
         <td>${escapeHtml(statValue(person.sevenDayLatestUsagePct))}</td>
         <td>${escapeHtml(statValue(person.sevenDayCumulativeUsagePct))}</td>
         <td>${person.activeDays}</td>
-        <td class="muted-col">${formatNumber(person.apiRequestCount)}</td>
       </tr>`)
         .join("");
     return `
@@ -420,13 +467,14 @@ function renderPeopleLeaderboard(people) {
               <th>Input tokens</th>
               <th>Output tokens</th>
               <th>Cache read tokens</th>
+              <th>等效 API 成本</th>
+              <th>价格目录</th>
               <th>5h Peak</th>
               <th>5h Latest</th>
               <th>7d Peak</th>
               <th>7d Latest</th>
               <th>7d 累计</th>
               <th>活跃天数</th>
-              <th class="muted-col">API 请求</th>
             </tr>
           </thead>
           <tbody>${rows}</tbody>
@@ -500,6 +548,8 @@ function renderWeeklyTable(weeklyRows) {
         <td>${formatTokensM(row.inputTokens)}</td>
         <td>${formatTokensM(row.outputTokens)}</td>
         <td>${formatTokensM(row.cacheReadInputTokens)}</td>
+        <td>${escapeHtml(costDisplay(row.estimatedApiEquivalentCostUsd, row.pricedApiRequestCount, row.unpricedApiRequestCount))}</td>
+        <td>${escapeHtml(row.pricingCatalogVersion ?? "--")}</td>
         <td>${escapeHtml(statValue(row.fiveHourPeakUsagePct))}</td>
         <td>${escapeHtml(statValue(row.fiveHourLatestUsagePct))}</td>
         <td>${escapeHtml(statValue(row.sevenDayPeakUsagePct))}</td>
@@ -527,6 +577,8 @@ function renderWeeklyTable(weeklyRows) {
               <th>Input tokens</th>
               <th>Output tokens</th>
               <th>Cache read tokens</th>
+              <th>等效 API 成本</th>
+              <th>价格目录</th>
               <th>5h Peak</th>
               <th>5h Latest</th>
               <th>7d Peak</th>
@@ -555,6 +607,9 @@ function buildAggregateDashboardHtml(detailRows, dailyRows, weeklyRows, generate
     const peakUsage = maxOrNull(people.map((person) => person.fiveHourPeakUsagePct));
     const peakSevenDay = maxOrNull(people.map((person) => person.sevenDayPeakUsagePct));
     const rangeLabel = overall.startDate && overall.endDate ? `${overall.startDate} → ${overall.endDate}` : "--";
+    const mixedPricingNotice = overall.pricingCatalogVersion === "mixed"
+        ? `<p class="muted">成本结果混合了旧版 schema 或不同价格目录，已知金额仅作不完整估算。</p>`
+        : "";
     return `<!doctype html>
 <html lang="zh-CN">
   <head>
@@ -644,6 +699,7 @@ function buildAggregateDashboardHtml(detailRows, dailyRows, weeklyRows, generate
       .stat-card h2 { font-size: 14px; color: var(--muted); font-weight: 500; }
       .stat-value { margin-top: 16px; font-size: 36px; line-height: 0.95; }
       .stat-note { margin-top: 12px; color: var(--muted); font-size: 13px; }
+      .pricing-link { display: inline-block; margin-top: 12px; color: var(--accent); font-size: 13px; }
       .panel-header {
         display: flex;
         align-items: end;
@@ -705,7 +761,9 @@ function buildAggregateDashboardHtml(detailRows, dailyRows, weeklyRows, generate
           <span class="hero-chip">人数：${overall.personCount}</span>
           <span class="hero-chip">时间范围：${escapeHtml(rangeLabel)}</span>
           <span class="hero-chip">生成时间：${escapeHtml(generatedAt.toISOString())}</span>
+          <span class="hero-chip">价格目录：${escapeHtml(overall.pricingCatalogVersion ?? "不可用")}</span>
         </div>
+        ${mixedPricingNotice}
       </section>
       <section class="stats">
         <article class="panel stat-card">
@@ -723,11 +781,6 @@ function buildAggregateDashboardHtml(detailRows, dailyRows, weeklyRows, generate
           <p class="stat-value">${formatTokensM(overall.totalCacheReadInputTokens)}</p>
           <p class="stat-note">来自 assistant usage 的 cache_read_input_tokens</p>
         </article>
-        <article class="panel stat-card">
-          <h2>Total API requests</h2>
-          <p class="stat-value">${formatNumber(overall.totalApiRequestCount)}</p>
-          <p class="stat-note">所有人 API 请求数合计（次要参考）</p>
-        </article>
         <article class="panel stat-card">
           <h2>Peak 5h usage</h2>
           <p class="stat-value">${escapeHtml((0, time_1.roundNumber)(peakUsage, 1) === null ? "--" : statValue((0, time_1.roundNumber)(peakUsage, 1)))}</p>
@@ -738,6 +791,12 @@ function buildAggregateDashboardHtml(detailRows, dailyRows, weeklyRows, generate
           <p class="stat-value">${escapeHtml((0, time_1.roundNumber)(peakSevenDay, 1) === null ? "--" : statValue((0, time_1.roundNumber)(peakSevenDay, 1)))}</p>
           <p class="stat-note">团队内观测到的 7 天额度峰值</p>
         </article>
+        <article class="panel stat-card">
+          <h2>合计等效 API 成本</h2>
+          <p class="stat-value">${escapeHtml(costDisplay(overall.estimatedApiEquivalentCostUsd, overall.pricedApiRequestCount, overall.unpricedApiRequestCount))}</p>
+          <p class="stat-note">标准同步 API 等效成本，不是订阅或实际账单</p>
+          <a class="pricing-link" href="${api_pricing_table_1.API_PRICING_PAGE_FILE}" target="_blank" rel="noopener noreferrer">查看当前价格表</a>
+        </article>
       </section>
       ${renderPeopleLeaderboard(people)}
       ${renderSevenDayCumulativeChart(people)}