codebuddy-stats 1.4.2 → 1.4.4

package/dist/lib/data-loader.js

@@ -225,8 +225,10 @@ function finalizeAnalysis(defaultModelId, dailyData, modelTotals, projectTotals,
         const daySummary = { cost: 0, tokens: 0, requests: 0 };
         let topModelId = '-';
         let topModelCost = 0;
+        let topModelTokens = 0;
         let topProjectName = '-';
         let topProjectCost = 0;
+        let topProjectTokens = 0;
         const month = date.slice(0, 7);
         if (month) {
             monthlyAgg[month] ??= {
@@ -242,6 +244,7 @@ function finalizeAnalysis(defaultModelId, dailyData, modelTotals, projectTotals,
         }
         for (const [projectName, models] of Object.entries(dayData ?? {})) {
             let projectCost = 0;
+            let projectTokens = 0;
             if (month) {
                 monthlyByProject[month][projectName] ??= { cost: 0, tokens: 0, requests: 0, modelCost: {} };
             }
@@ -253,8 +256,10 @@ function finalizeAnalysis(defaultModelId, dailyData, modelTotals, projectTotals,
                 daySummary.tokens += tokens;
                 daySummary.requests += requests;
                 projectCost += cost;
-                if (cost > topModelCost) {
+                projectTokens += tokens;
+                if (cost > topModelCost || (cost === topModelCost && tokens > topModelTokens)) {
                     topModelCost = cost;
+                    topModelTokens = tokens;
                     topModelId = modelId;
                 }
                 if (month) {
@@ -264,22 +269,29 @@ function finalizeAnalysis(defaultModelId, dailyData, modelTotals, projectTotals,
                     mAgg.requests += requests;
                     mAgg.cacheHitTokens += stats.cacheHitTokens;
                     mAgg.cacheMissTokens += stats.cacheMissTokens;
-                    mAgg.modelCost[modelId] = (mAgg.modelCost[modelId] ?? 0) + cost;
-                    mAgg.projectCost[projectName] = (mAgg.projectCost[projectName] ?? 0) + cost;
+                    mAgg.modelCost[modelId] ??= { cost: 0, tokens: 0 };
+                    mAgg.modelCost[modelId].cost += cost;
+                    mAgg.modelCost[modelId].tokens += tokens;
+                    mAgg.projectCost[projectName] ??= { cost: 0, tokens: 0 };
+                    mAgg.projectCost[projectName].cost += cost;
+                    mAgg.projectCost[projectName].tokens += tokens;
                     const pAgg = monthlyByProject[month][projectName];
                     pAgg.cost += cost;
                     pAgg.tokens += tokens;
                     pAgg.requests += requests;
-                    pAgg.modelCost[modelId] = (pAgg.modelCost[modelId] ?? 0) + cost;
+                    pAgg.modelCost[modelId] ??= { cost: 0, tokens: 0 };
+                    pAgg.modelCost[modelId].cost += cost;
+                    pAgg.modelCost[modelId].tokens += tokens;
                 }
             }
-            if (projectCost > topProjectCost) {
+            if (projectCost > topProjectCost || (projectCost === topProjectCost && projectTokens > topProjectTokens)) {
                 topProjectCost = projectCost;
+                topProjectTokens = projectTokens;
                 topProjectName = projectName;
             }
         }
         dailySummary[date] = daySummary;
-        dailyTops[date] = { topModelId, topModelCost, topProjectName, topProjectCost };
+        dailyTops[date] = { topModelId, topModelCost, topModelTokens, topProjectName, topProjectCost, topProjectTokens };
     }
     const projectDisplayNames = {};
     for (const projectName of Object.keys(projectTotals)) {

package/dist/lib/pricing.js

@@ -106,7 +106,7 @@ export const MODEL_PRICING = {
         cacheWrite: [
             { limit: 200_000, pricePerMTok: 0.2 },
             { limit: Number.POSITIVE_INFINITY, pricePerMTok: 0.4 },
-        ]
+        ],
     },
     "gemini-3.0-pro": {
         prompt: [
@@ -126,6 +126,7 @@ export const MODEL_PRICING = {
             { limit: Number.POSITIVE_INFINITY, pricePerMTok: 0.4 },
         ],
     },
+    "gemini-3.1-flash-lite": createPricing(0.25, 0.03, 1.5),
     "gemini-3.0-flash": createPricing(0.5, 0.05, 3.0),
     "gemini-2.5-pro": {
         prompt: [
@@ -146,6 +147,7 @@ export const MODEL_PRICING = {
         ],
     },
     // MiniMax
+    "minimax-m2.7": createPricing(0.3, 0.03, 1.2),
     "minimax-m2.5": createPricing(0.3, 0.03, 1.2),
     // GLM 系列 (价格从人民币转换: 1 USD = 7 CNY)
     // 按上下文长度分段定价：[0,32K), [32K,200K)

package/dist/views/daily.js

@@ -42,16 +42,19 @@ export function renderDaily(box, data, scrollOffset = 0, selectedIndex = 0, widt
         else {
             for (const [project, models] of Object.entries(dayData)) {
                 let projectCost = 0;
+                let projectTokens = 0;
                 for (const [model, stats] of Object.entries(models)) {
                     const modelStats = stats;
                     const c = Number(modelStats.cost ?? 0);
+                    const t = Number(modelStats.totalTokens ?? 0);
                     projectCost += c;
-                    if (c > topModel.cost) {
-                        topModel = { id: model, cost: c };
+                    projectTokens += t;
+                    if (c > topModel.cost || (c === topModel.cost && t > (topModel.tokens ?? 0))) {
+                        topModel = { id: model, cost: c, tokens: t };
                     }
                 }
-                if (projectCost > topProject.cost) {
-                    topProject = { name: project, cost: projectCost };
+                if (projectCost > topProject.cost || (projectCost === topProject.cost && projectTokens > (topProject.tokens ?? 0))) {
+                    topProject = { name: project, cost: projectCost, tokens: projectTokens };
                 }
             }
         }

package/dist/views/monthly-detail.js

@@ -20,9 +20,13 @@ export function renderMonthlyDetail(box, data, month, scrollOffset = 0, width, p
             .map(([projectName, agg]) => {
             let topModelId = '-';
             let topModelCost = 0;
-            for (const [modelId, c] of Object.entries(agg.modelCost)) {
-                if (c > topModelCost) {
-                    topModelCost = c;
+            let topModelTokens = 0;
+            for (const [modelId, modelStats] of Object.entries(agg.modelCost)) {
+                const cost = modelStats.cost;
+                const tokens = modelStats.tokens;
+                if (cost > topModelCost || (cost === topModelCost && tokens > topModelTokens)) {
+                    topModelCost = cost;
+                    topModelTokens = tokens;
                     topModelId = modelId;
                 }
             }
@@ -66,7 +70,9 @@ export function renderMonthlyDetail(box, data, month, scrollOffset = 0, width, p
                     p.cost += cost;
                     p.tokens += tokens;
                     p.requests += requests;
-                    p.modelCost[modelId] = (p.modelCost[modelId] ?? 0) + cost;
+                    p.modelCost[modelId] ??= { cost: 0, tokens: 0 };
+                    p.modelCost[modelId].cost += cost;
+                    p.modelCost[modelId].tokens += tokens;
                     totalCost += cost;
                     totalTokens += tokens;
                     totalRequests += requests;
@@ -79,9 +85,13 @@ export function renderMonthlyDetail(box, data, month, scrollOffset = 0, width, p
             .map(p => {
             let topModelId = '-';
             let topModelCost = 0;
-            for (const [modelId, c] of Object.entries(p.modelCost)) {
-                if (c > topModelCost) {
-                    topModelCost = c;
+            let topModelTokens = 0;
+            for (const [modelId, modelStats] of Object.entries(p.modelCost)) {
+                const cost = modelStats.cost;
+                const tokens = modelStats.tokens;
+                if (cost > topModelCost || (cost === topModelCost && tokens > topModelTokens)) {
+                    topModelCost = cost;
+                    topModelTokens = tokens;
                     topModelId = modelId;
                 }
             }

package/dist/views/monthly.js

@@ -30,8 +30,12 @@ export function renderMonthly(box, data, scrollOffset = 0, selectedIndex = 0, wi
                     monthAgg.requests += requests;
                     monthAgg.cacheHitTokens += cacheHit;
                     monthAgg.cacheMissTokens += cacheMiss;
-                    monthAgg.modelCost[modelId] = (monthAgg.modelCost[modelId] ?? 0) + cost;
-                    monthAgg.projectCost[projectName] = (monthAgg.projectCost[projectName] ?? 0) + cost;
+                    monthAgg.modelCost[modelId] ??= { cost: 0, tokens: 0 };
+                    monthAgg.modelCost[modelId].cost += cost;
+                    monthAgg.modelCost[modelId].tokens += tokens;
+                    monthAgg.projectCost[projectName] ??= { cost: 0, tokens: 0 };
+                    monthAgg.projectCost[projectName].cost += cost;
+                    monthAgg.projectCost[projectName].tokens += tokens;
                 }
             }
         }
@@ -64,16 +68,22 @@ export function renderMonthly(box, data, scrollOffset = 0, selectedIndex = 0, wi
         const m = aggByMonth[month];
         if (!m)
             continue;
-        // top model / project by cost
-        let topModel = { id: '-', cost: 0 };
-        let topProject = { name: '-', cost: 0 };
-        for (const [modelId, c] of Object.entries(m.modelCost)) {
-            if (c > topModel.cost)
-                topModel = { id: modelId, cost: c };
+        // top model / project by cost (cost 相等时比较 tokens)
+        let topModel = { id: '-', cost: 0, tokens: 0 };
+        let topProject = { name: '-', cost: 0, tokens: 0 };
+        for (const [modelId, modelStats] of Object.entries(m.modelCost)) {
+            const cost = modelStats.cost;
+            const tokens = modelStats.tokens;
+            if (cost > topModel.cost || (cost === topModel.cost && tokens > topModel.tokens)) {
+                topModel = { id: modelId, cost, tokens };
+            }
         }
-        for (const [projectName, c] of Object.entries(m.projectCost)) {
-            if (c > topProject.cost)
-                topProject = { name: projectName, cost: c };
+        for (const [projectName, projectStats] of Object.entries(m.projectCost)) {
+            const cost = projectStats.cost;
+            const tokens = projectStats.tokens;
+            if (cost > topProject.cost || (cost === topProject.cost && tokens > topProject.tokens)) {
+                topProject = { name: projectName, cost, tokens };
+            }
         }
         const shortProject = data.projectDisplayNames?.[topProject.name] ?? resolveProjectName(topProject.name, data.workspaceMappings);
         const isSelected = scrollOffset + i === selectedIndex;

package/package.json

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