codebuddy-stats 1.3.5 → 1.4.0

package/dist/index.js

@@ -195,9 +195,10 @@ async function main() {
     function updateContent() {
         const t0 = prof ? performance.now() : 0;
         const width = Number(screen.width) || 80;
+        const estimatedRate = formatPercent(state.data.ideEstimatedCacheHitRate ?? 0.9);
         const note = state.currentSource === 'code'
             ? `针对 CodeBuddy Code < 2.20.0 版本产生的数据，由于没有请求级别的 model ID，用量是基于当前 CodeBuddy Code 设置的 model ID（${state.data.defaultModelId}）计算价格的`
-            : 'IDE 的 usage 不包含缓存命中/写入 tokens，无法计算缓存相关价格与命中率；成本按 input/output tokens 估算';
+            : `IDE 的数据有缺，成本根据 Code 最近 90 天的平均缓存命中率估算（当前为 ${estimatedRate}）`;
         const screenHeight = Number(screen.height) || 24;
         const contentBoxHeight = Math.max(1, screenHeight - 5); // 对应 contentBox: height = '100%-5'
         const paddingTop = Number(contentBox.padding?.top ?? 0);

package/dist/lib/data-loader.js

@@ -12,6 +12,8 @@ import { compareByCostThenTokens } from './utils.js';
 import { loadWorkspaceMappings, resolveProjectName } from './workspace-resolver.js';
 export const BASE_DIR = getProjectsDir();
 const memoryCache = new Map();
+const IDE_CACHE_HIT_RATE_LOOKBACK_DAYS = 90;
+const IDE_CACHE_HIT_RATE_FALLBACK = 0.9;
 function getCacheKey(source, days) {
     return `${source}:${days ?? 'all'}`;
 }
@@ -461,6 +463,23 @@ async function loadCodeUsageData(options = {}) {
     }
     return data;
 }
+async function resolveIdeEstimatedCacheHitRate() {
+    try {
+        const codeData = await loadCodeUsageData({ days: IDE_CACHE_HIT_RATE_LOOKBACK_DAYS });
+        const hitTokens = codeData.grandTotal.cacheHitTokens;
+        const missTokens = codeData.grandTotal.cacheMissTokens;
+        const totalTokens = hitTokens + missTokens;
+        if (totalTokens <= 0)
+            return IDE_CACHE_HIT_RATE_FALLBACK;
+        const rate = hitTokens / totalTokens;
+        if (!Number.isFinite(rate))
+            return IDE_CACHE_HIT_RATE_FALLBACK;
+        return Math.min(1, Math.max(0, rate));
+    }
+    catch {
+        return IDE_CACHE_HIT_RATE_FALLBACK;
+    }
+}
 async function findIdeHistoryDirs() {
     const root = getIdeDataDir();
     const out = new Set();
@@ -565,6 +584,7 @@ async function loadIdeUsageData(options = {}) {
     const t0 = prof ? performance.now() : 0;
     const defaultModelId = await loadModelFromSettings();
     const minDate = computeMinDate(options.days);
+    const estimatedCacheHitRate = await resolveIdeEstimatedCacheHitRate();
     // 加载工作区映射
     const workspaceMappings = await loadWorkspaceMappings();
     const dailyData = {};
@@ -581,7 +601,7 @@ async function loadIdeUsageData(options = {}) {
     // 同进程内存缓存（不落盘）：refresh 时如果 IDE 索引未变，直接复用结果
     const sortedHistoryDirs = [...historyDirs].sort();
     const ideHash = createHash('sha1');
-    ideHash.update(`ide|defaultModelId=${defaultModelId}|minDate=${minDate ?? ''}|historyDirs=${sortedHistoryDirs.length}\n`);
+    ideHash.update(`ide|defaultModelId=${defaultModelId}|minDate=${minDate ?? ''}|historyDirs=${sortedHistoryDirs.length}|ideEstimatedCacheHitRate=${estimatedCacheHitRate.toFixed(6)}|lookbackDays=${IDE_CACHE_HIT_RATE_LOOKBACK_DAYS}\n`);
     const mappingKeys = [...workspaceMappings.keys()].sort();
     ideHash.update(`mappings=${mappingKeys.length}\n`);
     for (const k of mappingKeys) {
@@ -682,10 +702,16 @@ async function loadIdeUsageData(options = {}) {
                         continue;
                     const inferredModelId = await inferIdeModelIdForRequest(conversationDir, req, messageModelCache);
                     const usedModelId = inferredModelId || defaultModelId;
+                    // IDE 的 usage 不包含缓存 token 明细，按 CBC 最近 90 天平均命中率估算（无数据回退 90%）
+                    const safeInput = Math.max(0, inputTokens);
+                    const estimatedCacheHit = Math.round(safeInput * estimatedCacheHitRate);
+                    const estimatedCacheMiss = safeInput - estimatedCacheHit;
                     const rawUsage = {
-                        prompt_tokens: Math.max(0, inputTokens),
+                        prompt_tokens: safeInput,
                         completion_tokens: Math.max(0, outputTokens),
                         total_tokens: Math.max(0, totalTokens),
+                        prompt_cache_hit_tokens: estimatedCacheHit,
+                        prompt_cache_miss_tokens: estimatedCacheMiss,
                     };
                     const { cost, stats } = computeUsageCost(rawUsage, usedModelId);
                     const projectName = workspaceHash;
@@ -694,6 +720,8 @@ async function loadIdeUsageData(options = {}) {
                     dayStats.promptTokens += stats.promptTokens;
                     dayStats.completionTokens += stats.completionTokens;
                     dayStats.totalTokens += stats.totalTokens;
+                    dayStats.cacheHitTokens += stats.cacheHitTokens;
+                    dayStats.cacheMissTokens += stats.cacheMissTokens;
                     dayStats.requests += 1;
                     modelTotals[usedModelId] ??= { cost: 0, tokens: 0, requests: 0 };
                     modelTotals[usedModelId].cost += cost;
@@ -706,11 +734,14 @@ async function loadIdeUsageData(options = {}) {
                     grandTotal.cost += cost;
                     grandTotal.tokens += stats.totalTokens;
                     grandTotal.requests += 1;
+                    grandTotal.cacheHitTokens += stats.cacheHitTokens;
+                    grandTotal.cacheMissTokens += stats.cacheMissTokens;
                 }
             }
         }
     }
     const data = finalizeAnalysis(defaultModelId, dailyData, modelTotals, projectTotals, grandTotal, workspaceMappings);
+    data.ideEstimatedCacheHitRate = estimatedCacheHitRate;
     cacheSet('ide', options.days, { fingerprint, data });
     if (profLog) {
         const ms = performance.now() - t0;

package/dist/lib/pricing.js

@@ -25,12 +25,31 @@ export const MODEL_PRICING = {
     "gpt-5-nano": createPricing(0.05, 0.005, 0.4),
     "gpt-5.1-chat-latest": createPricing(1.25, 0.125, 10.0),
     "gpt-5-chat-latest": createPricing(1.25, 0.125, 10.0),
+    "gpt-5.3-codex": createPricing(1.75, 0.175, 14.0),
     "gpt-5.2-codex": createPricing(1.75, 0.175, 14.0),
     "gpt-5.1-codex": createPricing(1.25, 0.125, 10.0),
     "gpt-5.1-codex-max": createPricing(1.25, 0.125, 10.0),
     "gpt-5.1-codex-mini": createPricing(0.25, 0.025, 2.0),
     "gpt-5-codex": createPricing(1.25, 0.125, 10.0),
     // Claude 系列
+    "claude-sonnet-4.6": {
+        prompt: [
+            { limit: 200_000, pricePerMTok: 3.0 },
+            { limit: Number.POSITIVE_INFINITY, pricePerMTok: 6.0 },
+        ],
+        completion: [
+            { limit: 200_000, pricePerMTok: 15.0 },
+            { limit: Number.POSITIVE_INFINITY, pricePerMTok: 22.5 },
+        ],
+        cacheRead: [
+            { limit: 200_000, pricePerMTok: 0.3 },
+            { limit: Number.POSITIVE_INFINITY, pricePerMTok: 0.6 },
+        ],
+        cacheWrite: [
+            { limit: 200_000, pricePerMTok: 6.0 },
+            { limit: Number.POSITIVE_INFINITY, pricePerMTok: 12.0 },
+        ],
+    },
     "claude-opus-4.6": {
         prompt: [
             { limit: 200_000, pricePerMTok: 5.0 },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codebuddy-stats",
-  "version": "1.3.5",
+  "version": "1.4.0",
   "type": "module",
   "main": "dist/index.js",
   "files": [