codebuddy-stats 1.2.10 → 1.2.11

package/dist/index.js

@@ -5,7 +5,7 @@ import { fileURLToPath } from 'node:url';
 import blessed from 'blessed';
 import { loadUsageData } from './lib/data-loader.js';
 import { resolveProjectName } from './lib/workspace-resolver.js';
-import { formatCost, formatNumber, formatPercent, formatTokens, truncate } from './lib/utils.js';
+import { compareByCostThenTokens, formatCost, formatNumber, formatPercent, formatTokens, truncate } from './lib/utils.js';
 // 读取 package.json 获取版本号
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const pkgPath = path.resolve(__dirname, '../package.json');
@@ -259,7 +259,7 @@ function renderOverview(box, data, width, height, note) {
 // 渲染 By Model 视图
 function renderByModel(box, data, scrollOffset = 0, width, note, pageSize) {
     const { modelTotals, grandTotal } = data;
-    const sorted = Object.entries(modelTotals).sort((a, b) => b[1].cost - a[1].cost);
+    const sorted = Object.entries(modelTotals).sort(compareByCostThenTokens);
     // 根据宽度计算列宽
     const availableWidth = width - 6; // padding
     const fixedCols = 12 + 12 + 12 + 10; // Cost + Requests + Tokens + Avg/Req
@@ -447,8 +447,13 @@ function renderDailyDetail(box, data, date, scrollOffset = 0, width, pageSize) {
             totalTokens += tokens;
             totalRequests += requests;
         }
-        // 按 cost 降序排序 models
-        modelList.sort((a, b) => b.cost - a.cost);
+        // 按 cost 降序排序 models，cost 相同时按 tokens 降序
+        modelList.sort((a, b) => {
+            const costDiff = b.cost - a.cost;
+            if (Math.abs(costDiff) > 0.001)
+                return costDiff;
+            return b.tokens - a.tokens;
+        });
         projectDetails.push({
             name: projectName,
             shortName,
@@ -544,7 +549,7 @@ function printTextReport(data) {
     }
     console.log('\n' + '-'.repeat(50));
     console.log('By Model:');
-    for (const [model, stats] of Object.entries(modelTotals).sort((a, b) => b[1].cost - a[1].cost)) {
+    for (const [model, stats] of Object.entries(modelTotals).sort(compareByCostThenTokens)) {
         console.log(`  ${model}: ${formatCost(stats.cost)} (${formatNumber(stats.requests)} req)`); // eslint-disable-line no-console
     }
     console.log('\n' + '-'.repeat(50));

package/dist/lib/data-loader.js

@@ -4,6 +4,7 @@ import path from 'node:path';
 import { createInterface } from 'node:readline';
 import { getIdeDataDir, getProjectsDir, getSettingsPath } from './paths.js';
 import { DEFAULT_MODEL_ID, getPricingForModel, tokensToCost } from './pricing.js';
+import { compareByCostThenTokens } from './utils.js';
 import { loadWorkspaceMappings } from './workspace-resolver.js';
 export const BASE_DIR = getProjectsDir();
 async function loadModelFromSettings() {
@@ -127,7 +128,7 @@ function finalizeAnalysis(defaultModelId, dailyData, modelTotals, projectTotals,
             }
         }
     }
-    const topModelEntry = Object.entries(modelTotals).sort((a, b) => b[1].cost - a[1].cost)[0];
+    const topModelEntry = Object.entries(modelTotals).sort(compareByCostThenTokens)[0];
     const topProjectEntry = Object.entries(projectTotals).sort((a, b) => b[1].cost - a[1].cost)[0];
     const cacheHitRate = grandTotal.cacheHitTokens + grandTotal.cacheMissTokens > 0
         ? grandTotal.cacheHitTokens / (grandTotal.cacheHitTokens + grandTotal.cacheMissTokens)

package/dist/lib/utils.js

@@ -55,3 +55,13 @@ export function padLeft(str, len) {
 export function padRight(str, len) {
     return str.padEnd(len);
 }
+/**
+ * 按 cost 和 tokens 排序的比较函数
+ * 优先按 cost 降序，cost 相同时按 tokens 降序
+ */
+export function compareByCostThenTokens(a, b) {
+    const costDiff = b[1].cost - a[1].cost;
+    if (Math.abs(costDiff) > 0.001)
+        return costDiff;
+    return b[1].tokens - a[1].tokens;
+}

package/package.json

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