ccus-cli 0.2.10 → 0.2.11

package/dist/lib/codex-sessions.js

@@ -8,6 +8,7 @@ exports.summarizeCodexSessionUsage = summarizeCodexSessionUsage;
 exports.summarizeCodexSessionUsageByDay = summarizeCodexSessionUsageByDay;
 const promises_1 = __importDefault(require("node:fs/promises"));
 const node_path_1 = __importDefault(require("node:path"));
+const api_equivalent_cost_1 = require("./api-equivalent-cost");
 const paths_1 = require("./paths");
 const time_1 = require("./time");
 function isRecord(value) {
@@ -19,6 +20,13 @@ function getNumber(value) {
 function getString(value) {
     return typeof value === "string" && value.length > 0 ? value : null;
 }
+function splitInputTokens(usage) {
+    const cacheReadInputTokens = getNumber(usage.cached_input_tokens);
+    return {
+        inputTokens: Math.max(0, getNumber(usage.input_tokens) - cacheReadInputTokens),
+        cacheReadInputTokens,
+    };
+}
 /** Guardian 是 Codex Desktop 的动作安全审查子代理，不代表用户请求或业务模型调用。 */
 function isGuardianRollout(content) {
     let offset = 0;
@@ -178,8 +186,7 @@ async function findActiveCodexSessionFiles(start, end) {
 /**
  * 从 `token_count` 事件的 `info.last_token_usage` 取 token 用量对象（缺失返回 null）。
  * 必须用 last_token_usage（本次增量），不能用 total_token_usage（会话累计，会重复计）。
- * 注意：Codex 的 `input_tokens` 含缓存命中（`cached_input_tokens` 是其子集），
- * 累加 inputTokens 时要减去 cached 得到净输入，对齐 Claude 的 `input_tokens` 口径。
+ * `cached_input_tokens` 是 `input_tokens` 的子集；普通输入需扣除缓存输入并钳制为非负数。
  */
 function extractLastTokenUsage(payload) {
     if (!isRecord(payload.info)) {
@@ -204,19 +211,28 @@ function summarizeRollout(content, start, end) {
         inputTokens: 0,
         outputTokens: 0,
         cacheReadInputTokens: 0,
+        apiEquivalentCost: (0, api_equivalent_cost_1.emptyApiEquivalentCost)(),
     };
+    let currentModel = null;
     for (const line of lines) {
         try {
             const record = JSON.parse(line);
-            if (!isRecord(record) || !timestampInRange(getString(record.timestamp), start, end)) {
+            if (!isRecord(record) || !isRecord(record.payload)) {
                 continue;
             }
-            if (record.type !== "event_msg" || !isRecord(record.payload)) {
+            const payload = record.payload;
+            if (record.type === "turn_context") {
+                if (typeof payload.model === "string") {
+                    currentModel = payload.model;
+                }
+                continue;
+            }
+            const timestamp = getString(record.timestamp);
+            if (!timestampInRange(timestamp, start, end) || record.type !== "event_msg") {
                 continue;
             }
-            const payload = record.payload;
             if (payload.type === "task_started" && typeof payload.turn_id === "string") {
-                const ms = new Date(getString(record.timestamp) ?? "").getTime();
+                const ms = new Date(timestamp ?? "").getTime();
                 if (Number.isFinite(ms)) {
                     result.turns.push({ turnId: payload.turn_id, ms });
                 }
@@ -224,12 +240,23 @@ function summarizeRollout(content, start, end) {
             if (payload.type === "token_count") {
                 const usage = extractLastTokenUsage(payload);
                 if (usage) {
-                    // 净输入 = input_tokens - cached_input_tokens（input_tokens 含缓存命中，减去对齐 Claude 口径）。
-                    const netInputTokens = Math.max(0, getNumber(usage.input_tokens) - getNumber(usage.cached_input_tokens));
+                    const { inputTokens, cacheReadInputTokens } = splitInputTokens(usage);
+                    const outputTokens = getNumber(usage.output_tokens);
                     result.apiRequestCount += 1;
-                    result.inputTokens += netInputTokens;
-                    result.outputTokens += getNumber(usage.output_tokens);
-                    result.cacheReadInputTokens += getNumber(usage.cached_input_tokens);
+                    result.inputTokens += inputTokens;
+                    result.outputTokens += outputTokens;
+                    result.cacheReadInputTokens += cacheReadInputTokens;
+                    result.apiEquivalentCost = (0, api_equivalent_cost_1.mergeApiEquivalentCosts)([
+                        result.apiEquivalentCost,
+                        (0, api_equivalent_cost_1.priceApiRequest)({
+                            provider: "codex",
+                            timestamp: timestamp,
+                            model: currentModel,
+                            inputTokens,
+                            outputTokens,
+                            cacheReadInputTokens,
+                        }),
+                    ]);
                 }
             }
         }
@@ -240,7 +267,7 @@ function summarizeRollout(content, start, end) {
     return result;
 }
 /**
- * 从标准 Codex 与 Orca 本地 session rollout 统计消息数、请求数和 token 用量。
+ * 从标准 Codex 与 Orca 本地 session rollout 统计消息数、请求数、token 用量和标准 API 等效成本。
  * Codex Desktop 的 guardian 安全审查 rollout 整体排除，避免把内部审批轮次计为用户使用量。
  *
  * 消息数 = task_started 的 distinct turn_id（跨文件去重）。重放副本会让同一 turn_id 出现在多个文件，
@@ -254,6 +281,7 @@ async function summarizeCodexSessionUsage(start, end) {
     let inputTokens = 0;
     let outputTokens = 0;
     let cacheReadInputTokens = 0;
+    let apiEquivalentCost = (0, api_equivalent_cost_1.emptyApiEquivalentCost)();
     for (const group of groups) {
         try {
             const content = await readMergedRollout(group);
@@ -271,6 +299,7 @@ async function summarizeCodexSessionUsage(start, end) {
             inputTokens += parsed.inputTokens;
             outputTokens += parsed.outputTokens;
             cacheReadInputTokens += parsed.cacheReadInputTokens;
+            apiEquivalentCost = (0, api_equivalent_cost_1.mergeApiEquivalentCosts)([apiEquivalentCost, parsed.apiEquivalentCost]);
         }
         catch {
             continue;
@@ -282,12 +311,13 @@ async function summarizeCodexSessionUsage(start, end) {
         inputTokens,
         outputTokens,
         cacheReadInputTokens,
+        apiEquivalentCost,
         matchedFileCount: groups.length,
         codexDataDir,
     };
 }
 /**
- * 按天汇总 Codex session rollout 中的消息数、请求数和 token 用量。
+ * 按天汇总 Codex session rollout 中的消息数、请求数、token 用量和标准 API 等效成本。
  * 与周汇总一致，排除 Codex Desktop 的 guardian 安全审查 rollout。
  *
  * 消息数同 weekly：先全局 Map<turn_id, minMs> 去重，再按 minMs 的本地日归桶（保证 weekly = Σ daily、
@@ -307,6 +337,7 @@ async function summarizeCodexSessionUsageByDay(start, end) {
                 inputTokens: 0,
                 outputTokens: 0,
                 cacheReadInputTokens: 0,
+                apiEquivalentCost: (0, api_equivalent_cost_1.emptyApiEquivalentCost)(),
             };
             daily.set(date, current);
         }
@@ -318,20 +349,27 @@ async function summarizeCodexSessionUsageByDay(start, end) {
             continue;
         }
         const lines = content.split(/\r?\n/).map((line) => line.trim()).filter((line) => line.length > 0);
+        let currentModel = null;
         for (const line of lines) {
             try {
                 const record = JSON.parse(line);
-                if (!isRecord(record)) {
+                if (!isRecord(record) || !isRecord(record.payload)) {
+                    continue;
+                }
+                const payload = record.payload;
+                if (record.type === "turn_context") {
+                    if (typeof payload.model === "string") {
+                        currentModel = payload.model;
+                    }
                     continue;
                 }
                 const timestamp = getString(record.timestamp);
                 if (!timestampInRange(timestamp, start, end)) {
                     continue;
                 }
-                if (record.type !== "event_msg" || !isRecord(record.payload)) {
+                if (record.type !== "event_msg") {
                     continue;
                 }
-                const payload = record.payload;
                 const ms = new Date(timestamp).getTime();
                 if (payload.type === "task_started" && typeof payload.turn_id === "string") {
                     if (Number.isFinite(ms)) {
@@ -345,12 +383,23 @@ async function summarizeCodexSessionUsageByDay(start, end) {
                     const usage = extractLastTokenUsage(payload);
                     if (usage) {
                         const current = ensureDay((0, time_1.localDateKey)(new Date(ms)));
-                        // 同 summarizeRollout：累加净输入（input - cached），对齐 Claude 口径。
-                        const netInputTokens = Math.max(0, getNumber(usage.input_tokens) - getNumber(usage.cached_input_tokens));
+                        const { inputTokens, cacheReadInputTokens } = splitInputTokens(usage);
+                        const outputTokens = getNumber(usage.output_tokens);
                         current.apiRequestCount += 1;
-                        current.inputTokens += netInputTokens;
-                        current.outputTokens += getNumber(usage.output_tokens);
-                        current.cacheReadInputTokens += getNumber(usage.cached_input_tokens);
+                        current.inputTokens += inputTokens;
+                        current.outputTokens += outputTokens;
+                        current.cacheReadInputTokens += cacheReadInputTokens;
+                        current.apiEquivalentCost = (0, api_equivalent_cost_1.mergeApiEquivalentCosts)([
+                            current.apiEquivalentCost,
+                            (0, api_equivalent_cost_1.priceApiRequest)({
+                                provider: "codex",
+                                timestamp: timestamp,
+                                model: currentModel,
+                                inputTokens,
+                                outputTokens,
+                                cacheReadInputTokens,
+                            }),
+                        ]);
                     }
                 }
             }

package/dist/lib/dashboard-pages.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.renderDashboardPage = renderDashboardPage;
+const api_pricing_table_1 = require("./api-pricing-table");
+/** 两类 dashboard serve 共用的页面路由；null 表示 404。 */
+async function renderDashboardPage(pathname, renderDashboard, generatedAt = new Date()) {
+    if (pathname === "/") {
+        return renderDashboard();
+    }
+    if (pathname === api_pricing_table_1.API_PRICING_PAGE_PATH) {
+        return (0, api_pricing_table_1.buildApiPricingPage)(generatedAt);
+    }
+    return null;
+}
+//# sourceMappingURL=dashboard-pages.js.map

package/dist/lib/dashboard.js

@@ -5,6 +5,7 @@ exports.bucketizeEvents = bucketizeEvents;
 exports.buildDashboardHtml = buildDashboardHtml;
 const aggregate_1 = require("./aggregate");
 const chart_assets_1 = require("./chart-assets");
+const api_pricing_table_1 = require("./api-pricing-table");
 const payload_1 = require("./payload");
 const time_1 = require("./time");
 /** 所有插入到 HTML/SVG 的动态文本都先转义，避免本地页面被注入内容。 */
@@ -216,6 +217,36 @@ function renderDailyMessages(points) {
 function statValue(value, suffix = "%") {
     return value === null ? "--" : `${value.toFixed(1)}${suffix}`;
 }
+function formatCostUsd(value) {
+    return `$${value < 0.01 ? value.toFixed(4) : value.toFixed(2)}`;
+}
+function costDisplay(result) {
+    if (result.pricedApiRequestCount === 0 && result.unpricedApiRequestCount > 0) {
+        return { value: "不可用", note: `${result.unpricedApiRequestCount} 个请求未定价` };
+    }
+    const amount = formatCostUsd(result.estimatedUsd ?? 0);
+    if (result.unpricedApiRequestCount > 0) {
+        return { value: `≥ ${amount}`, note: `${result.unpricedApiRequestCount} 个请求未定价，结果不完整` };
+    }
+    return { value: amount, note: `${result.pricedApiRequestCount} 个请求已定价` };
+}
+function renderApiEquivalentCostCard(costs) {
+    if (!costs) {
+        return "";
+    }
+    const display = costDisplay(costs.total);
+    return `<article class="panel stat-card">
+    <h2>合计等效 API 成本</h2>
+    <p class="stat-value">${escapeHtml(display.value)}</p>
+    <p class="stat-note">${escapeHtml(display.note)}</p>
+    <a class="pricing-link" href="${api_pricing_table_1.API_PRICING_PAGE_FILE}" target="_blank" rel="noopener noreferrer">查看当前价格表</a>
+  </article>`;
+}
+function renderApiEquivalentCostNote(costs, pricingCatalogVersion) {
+    return costs
+        ? `<p class="muted">标准同步 API 等效成本，不是订阅或实际账单 · 事件时间计价 · 目录 ${escapeHtml(pricingCatalogVersion ?? "不可用")}</p>`
+        : "";
+}
 /** 最近事件表帮助回看 statusline 在某一时刻到底输出了什么。 */
 function renderRecentEvents(events) {
     const rows = [...events]
@@ -263,7 +294,7 @@ function renderRecentEvents(events) {
  *
  * 整个 dashboard 保持“单文件可打开”，方便导出和直接分享本地结果。
  */
-function buildDashboardHtml(events, rangeLabel, start, end, dailyUserMessages = []) {
+function buildDashboardHtml(events, rangeLabel, start, end, dailyUserMessages = [], apiEquivalentCost = null, pricingCatalogVersion = null) {
     const summary = summarizeEvents(events);
     const buckets = bucketizeEvents(events, start, end, pickBucketMinutes(start, end));
     const totalUserMessages = dailyUserMessages.reduce((sum, point) => sum + point.userMessageCount, 0);
@@ -373,6 +404,7 @@ function buildDashboardHtml(events, rangeLabel, start, end, dailyUserMessages =
         color: var(--muted);
         font-size: 14px;
       }
+      .pricing-link { display: inline-block; margin-top: 12px; color: var(--accent); font-size: 13px; }
       .panel-header {
         display: flex;
         align-items: end;
@@ -464,7 +496,9 @@ function buildDashboardHtml(events, rangeLabel, start, end, dailyUserMessages =
           <p class="stat-value">${combinedUserMessages}</p>
           <p class="stat-note">窗口内每日真实用户请求数合计（Claude ${totalUserMessages} · Codex ${codexTotalUserMessages}）</p>
         </article>
+        ${renderApiEquivalentCostCard(apiEquivalentCost)}
       </section>
+      ${renderApiEquivalentCostNote(apiEquivalentCost, pricingCatalogVersion)}
       ${renderChart(buckets)}
       ${renderDailyMessages(dailyUserMessages)}
       ${renderRecentEvents(events)}

package/dist/lib/export.js

@@ -28,6 +28,10 @@ function quoteCsv(value) {
 function toMillions(value) {
     return value === null ? null : (0, time_1.roundNumber)(value / 1_000_000, 6);
 }
+/** 等效 API 成本以美元输出，最多保留 6 位小数；不可用时留空。 */
+function formatApiEquivalentCost(value) {
+    return value === null ? null : (0, time_1.roundNumber)(value, 6);
+}
 /**
  * 清理控制字符，并防止 Excel/Sheets 把值解释成公式。
  *
@@ -219,6 +223,8 @@ function buildAggregatedDailyCsv(rows) {
         "sevenDayCumulativeUsagePct",
         "uniqueSessions",
         "uniqueWorkspaces",
+        "estimatedApiEquivalentCostUsd",
+        "pricingCatalogVersion",
     ];
     const lines = rows.map((row) => toCsvLine([
         row.personKey,
@@ -236,6 +242,8 @@ function buildAggregatedDailyCsv(rows) {
         row.sevenDayCumulativeUsagePct,
         row.uniqueSessions,
         row.uniqueWorkspaces,
+        formatApiEquivalentCost(row.estimatedApiEquivalentCostUsd),
+        row.pricingCatalogVersion,
     ]));
     return [header.join(","), ...lines].join("\n");
 }
@@ -257,6 +265,8 @@ function buildAggregatedWeeklyCsv(rows) {
         "sevenDayCumulativeUsagePct",
         "uniqueSessions",
         "uniqueWorkspaces",
+        "estimatedApiEquivalentCostUsd",
+        "pricingCatalogVersion",
     ];
     const lines = rows.map((row) => toCsvLine([
         row.personKey,
@@ -274,6 +284,8 @@ function buildAggregatedWeeklyCsv(rows) {
         row.sevenDayCumulativeUsagePct,
         row.uniqueSessions,
         row.uniqueWorkspaces,
+        formatApiEquivalentCost(row.estimatedApiEquivalentCostUsd),
+        row.pricingCatalogVersion,
     ]));
     return [header.join(","), ...lines].join("\n");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccus-cli",
-  "version": "0.2.10",
+  "version": "0.2.11",
   "description": "Claude Code statusline usage logger and dashboard CLI",
   "type": "commonjs",
   "bin": {
@@ -9,6 +9,7 @@
   "files": [
     "dist/cli.js",
     "dist/lib/**/*.js",
+    "dist/lib/api-pricing-catalog.json",
     "dist/types.js",
     "dist/vendor/**"
   ],
@@ -16,7 +17,7 @@
     "build": "tsc -p tsconfig.json && node scripts/copy-vendor.js",
     "prepublishOnly": "npm run build",
     "test": "node --test --test-concurrency 1 \"dist/test/**/*.test.js\"",
-    "test:src": "node --import tsx --test --test-concurrency 1 src/test/payload.test.ts src/test/dashboard.test.ts src/test/export.test.ts src/test/storage.test.ts src/test/claude.test.ts src/test/aggregate.test.ts src/test/aggregate-dashboard.test.ts src/test/install.test.ts src/test/debug.test.ts src/test/time.test.ts src/test/update-check.test.ts src/test/sync.test.ts src/test/scheduler.test.ts src/test/api-mode.test.ts src/test/codex-fetcher.test.ts src/test/codex-sessions.test.ts src/test/sessions.test.ts src/test/codex-install.test.ts src/test/cli-codex-notify.test.ts src/test/cli-codex-hook.test.ts src/test/cli-install-codex.test.ts",
+    "test:src": "node --import tsx --test --test-concurrency 1 src/test/payload.test.ts src/test/dashboard.test.ts src/test/export.test.ts src/test/storage.test.ts src/test/api-equivalent-cost.test.ts src/test/claude.test.ts src/test/aggregate.test.ts src/test/aggregate-dashboard.test.ts src/test/install.test.ts src/test/debug.test.ts src/test/time.test.ts src/test/update-check.test.ts src/test/sync.test.ts src/test/scheduler.test.ts src/test/api-mode.test.ts src/test/codex-fetcher.test.ts src/test/codex-sessions.test.ts src/test/sessions.test.ts src/test/codex-install.test.ts src/test/cli-codex-notify.test.ts src/test/cli-codex-hook.test.ts src/test/cli-install-codex.test.ts",
     "smoke:api": "node scripts/smoke-api.mjs"
   },
   "keywords": [