codebuddy-stats 1.4.1 → 1.4.2

package/dist/lib/code-usage.worker.js

@@ -4,6 +4,7 @@ import path from 'node:path';
 import { createInterface } from 'node:readline';
 import { parentPort, workerData } from 'node:worker_threads';
 import { DEFAULT_MODEL_ID, getPricingForModel, tokensToCost } from './pricing.js';
+import { normalizeUsageFromRecord } from './utils.js';
 function getProjectName(filePath) {
     const parts = filePath.split(path.sep);
     const projectsIndex = parts.lastIndexOf('projects');
@@ -80,7 +81,7 @@ async function main() {
         for await (const line of rl) {
             try {
                 const record = JSON.parse(line);
-                const usage = record?.providerData?.rawUsage;
+                const usage = normalizeUsageFromRecord(record);
                 const timestamp = record?.timestamp;
                 if (!usage || timestamp == null)
                     continue;

package/dist/lib/data-loader.js

@@ -8,7 +8,7 @@ import { createInterface } from 'node:readline';
 import { Worker } from 'node:worker_threads';
 import { getIdeDataDir, getProjectsDir, getSettingsPath } from './paths.js';
 import { DEFAULT_MODEL_ID, getPricingForModel, tokensToCost } from './pricing.js';
-import { compareByCostThenTokens } from './utils.js';
+import { compareByCostThenTokens, normalizeUsageFromRecord, } from './utils.js';
 import { loadWorkspaceMappings, resolveProjectName } from './workspace-resolver.js';
 export const BASE_DIR = getProjectsDir();
 const memoryCache = new Map();
@@ -411,7 +411,7 @@ async function loadCodeUsageData(options = {}) {
         for await (const line of rl) {
             try {
                 const record = JSON.parse(line);
-                const usage = record?.providerData?.rawUsage;
+                const usage = normalizeUsageFromRecord(record);
                 const timestamp = record?.timestamp;
                 if (!usage || timestamp == null)
                     continue;

package/dist/lib/utils.js

@@ -65,3 +65,55 @@ export function compareByCostThenTokens(a, b) {
         return costDiff;
     return b[1].tokens - a[1].tokens;
 }
+function toNonNegativeNumber(value) {
+    if (typeof value !== 'number' || !Number.isFinite(value))
+        return null;
+    return Math.max(0, value);
+}
+function sumCachedTokensFromDetails(details) {
+    if (!Array.isArray(details))
+        return 0;
+    let total = 0;
+    for (const item of details) {
+        if (!item || typeof item !== 'object')
+            continue;
+        const maybeCachedTokens = item.cached_tokens ??
+            item.cachedTokens;
+        const cachedTokens = toNonNegativeNumber(maybeCachedTokens);
+        if (cachedTokens != null)
+            total += cachedTokens;
+    }
+    return total;
+}
+/**
+ * 统一将不同来源的 usage 结构归一为 RawUsage
+ * 优先使用 providerData.rawUsage，否则回退到 providerData.usage / message.usage
+ */
+export function normalizeUsageFromRecord(record) {
+    const rawUsage = record?.providerData?.rawUsage;
+    if (rawUsage)
+        return rawUsage;
+    const usage = (record?.providerData?.usage ?? record?.message?.usage);
+    if (!usage || typeof usage !== 'object')
+        return null;
+    const inputTokens = toNonNegativeNumber(usage.inputTokens);
+    const outputTokens = toNonNegativeNumber(usage.outputTokens);
+    const totalTokens = toNonNegativeNumber(usage.totalTokens);
+    const cacheHitTokens = sumCachedTokensFromDetails(usage.inputTokensDetails);
+    if (inputTokens == null && outputTokens == null && totalTokens == null && cacheHitTokens <= 0) {
+        return null;
+    }
+    const normalizedPromptTokens = inputTokens ?? Math.max((totalTokens ?? 0) - (outputTokens ?? 0), 0);
+    const normalizedCompletionTokens = outputTokens ?? Math.max((totalTokens ?? 0) - normalizedPromptTokens, 0);
+    const normalizedTotalTokens = totalTokens ?? normalizedPromptTokens + normalizedCompletionTokens;
+    const normalizedCacheHitTokens = Math.min(cacheHitTokens, normalizedPromptTokens);
+    const normalizedCacheMissTokens = Math.max(normalizedPromptTokens - normalizedCacheHitTokens, 0);
+    return {
+        prompt_tokens: normalizedPromptTokens,
+        completion_tokens: normalizedCompletionTokens,
+        total_tokens: normalizedTotalTokens,
+        prompt_cache_hit_tokens: normalizedCacheHitTokens,
+        prompt_cache_miss_tokens: normalizedCacheMissTokens,
+        cache_creation_input_tokens: 0,
+    };
+}

package/package.json

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