llm-usage-metrics 0.5.1 → 0.5.2

package/dist/index.js

@@ -2302,8 +2302,9 @@ function addOutcomeTotals(left, right) {
   };
 }
 function addUsageTotals(left, right) {
+  const hasAnyBucketUsage = (value) => value.inputTokens > 0 || value.outputTokens > 0 || value.reasoningTokens > 0 || value.cacheReadTokens > 0 || value.cacheWriteTokens > 0;
   const hasUnknownCost = left.costIncomplete === true && left.costUsd === void 0 || right.costIncomplete === true && right.costUsd === void 0;
-  const isNeutralZeroCost = (value) => value.totalTokens === 0 && value.costUsd === 0 && value.costIncomplete !== true;
+  const isNeutralZeroCost = (value) => !hasAnyBucketUsage(value) && value.totalTokens === 0 && value.costUsd === 0 && value.costIncomplete !== true;
   const leftKnownCost = left.costUsd !== void 0 && !isNeutralZeroCost(left) ? left.costUsd : void 0;
   const rightKnownCost = right.costUsd !== void 0 && !isNeutralZeroCost(right) ? right.costUsd : void 0;
   let costUsd = leftKnownCost !== void 0 && rightKnownCost !== void 0 ? addUsd2(leftKnownCost, rightKnownCost) : leftKnownCost ?? rightKnownCost;
@@ -2321,6 +2322,9 @@ function addUsageTotals(left, right) {
     costIncomplete: left.costIncomplete || right.costIncomplete ? true : void 0
   };
 }
+function hasMeaningfulUsageSignal(usageTotals) {
+  return usageTotals.totalTokens > 0 || usageTotals.inputTokens > 0 || usageTotals.outputTokens > 0 || usageTotals.reasoningTokens > 0 || usageTotals.cacheReadTokens > 0 || usageTotals.cacheWriteTokens > 0 || usageTotals.costUsd !== void 0 || usageTotals.costIncomplete === true;
+}
 function computeDerivedMetrics(usage, outcomes) {
   const costUsd = usage.costUsd;
   const nonCacheTotalTokens = usage.inputTokens + usage.outputTokens + usage.reasoningTokens;
@@ -2343,7 +2347,7 @@ function aggregateEfficiency(options) {
     const usageTotals = usageTotalsByPeriod.get(periodKey) ?? createEmptyEfficiencyUsageTotals();
     const outcomeTotals = options.periodOutcomes.get(periodKey) ?? createEmptyEfficiencyOutcomeTotals();
     const hasUsageRow = usageTotalsByPeriod.has(periodKey);
-    const hasUsageSignal3 = hasUsageRow && (usageTotals.totalTokens > 0 || usageTotals.costUsd !== void 0 || usageTotals.costIncomplete === true);
+    const hasUsageSignal3 = hasUsageRow && hasMeaningfulUsageSignal(usageTotals);
     if (outcomeTotals.commitCount === 0 || !hasUsageSignal3) {
       continue;
     }
@@ -2854,88 +2858,6 @@ async function attributeUsageEventsToRepo(events, repoDir, resolveRepoRoot3 = re
   };
 }
 
-// src/cli/build-usage-data-diagnostics.ts
-function buildUsageDiagnostics(params) {
-  const parseResultBySource = new Map(
-    params.successfulParseResults.map((result) => [result.source.toLowerCase(), result])
-  );
-  const sessionStats = params.adaptersToParse.map((adapter) => {
-    const parseResult = parseResultBySource.get(adapter.id.toLowerCase());
-    return {
-      source: adapter.id,
-      filesFound: parseResult?.filesFound ?? 0,
-      eventsParsed: parseResult?.events.length ?? 0
-    };
-  });
-  const skippedRows = params.successfulParseResults.filter((result) => result.skippedRows > 0).map((result) => ({
-    source: result.source,
-    skippedRows: result.skippedRows,
-    reasons: result.skippedRowReasons
-  }));
-  return {
-    sessionStats,
-    sourceFailures: params.sourceFailures,
-    skippedRows,
-    pricingOrigin: params.pricingOrigin,
-    pricingWarning: params.pricingWarning,
-    activeEnvOverrides: params.activeEnvOverrides,
-    timezone: params.timezone,
-    runtimeProfile: params.runtimeProfile
-  };
-}
-function assembleUsageDataResult(events, rows, diagnostics) {
-  return {
-    events,
-    rows,
-    diagnostics
-  };
-}
-
-// src/config/env-var-display.ts
-var ENV_VARS_TO_DISPLAY = [
-  { name: "LLM_USAGE_SKIP_UPDATE_CHECK", description: "skip startup update check" },
-  {
-    name: "LLM_USAGE_UPDATE_CACHE_SCOPE",
-    description: "update-check cache scope (global/session)"
-  },
-  { name: "LLM_USAGE_UPDATE_CACHE_SESSION_KEY", description: "update-check session cache key" },
-  { name: "LLM_USAGE_UPDATE_CACHE_TTL_MS", description: "update-check cache TTL" },
-  { name: "LLM_USAGE_UPDATE_FETCH_TIMEOUT_MS", description: "update-check fetch timeout" },
-  { name: "LLM_USAGE_PRICING_CACHE_TTL_MS", description: "pricing cache TTL" },
-  { name: "LLM_USAGE_PRICING_FETCH_TIMEOUT_MS", description: "pricing fetch timeout" },
-  { name: "LLM_USAGE_PARSE_MAX_PARALLEL", description: "max parallel file parsing" },
-  { name: "LLM_USAGE_PARSE_CACHE_ENABLED", description: "enable file parse cache" },
-  { name: "LLM_USAGE_PARSE_CACHE_TTL_MS", description: "file parse cache TTL" },
-  { name: "LLM_USAGE_PARSE_CACHE_MAX_ENTRIES", description: "file parse cache max entries" },
-  { name: "LLM_USAGE_PARSE_CACHE_MAX_BYTES", description: "file parse cache max bytes" },
-  { name: "LLM_USAGE_PROFILE_RUNTIME", description: "emit runtime profiling diagnostics" }
-];
-function getActiveEnvVarOverrides() {
-  const overrides = [];
-  for (const { name, description } of ENV_VARS_TO_DISPLAY) {
-    const value = process.env[name];
-    if (value !== void 0 && value !== "") {
-      overrides.push({ name, value, description });
-    }
-  }
-  return overrides;
-}
-function formatEnvVarOverrides(overrides) {
-  if (overrides.length === 0) {
-    return [];
-  }
-  const lines = [];
-  lines.push("Active environment overrides:");
-  for (const { name, value, description } of overrides) {
-    lines.push(`  ${name}=${value}  (${description})`);
-  }
-  return lines;
-}
-
-// src/sources/codex/codex-source-adapter.ts
-import os2 from "os";
-import path6 from "path";
-
 // src/domain/provider-normalization.ts
 var billingProviderAliases = /* @__PURE__ */ new Map([
   ["openai-codex", "openai"],
@@ -3095,7 +3017,7 @@ function createUsageEvent(input) {
   const cacheWriteTokens = normalizeNonNegativeInteger(input.cacheWriteTokens);
   const declaredTotalTokens = normalizeNonNegativeInteger(input.totalTokens);
   const componentTotalTokens = inputTokens + outputTokens + reasoningTokens + cacheReadTokens + cacheWriteTokens;
-  const totalTokens = declaredTotalTokens > 0 ? declaredTotalTokens : componentTotalTokens;
+  const totalTokens = input.totalTokens === void 0 ? componentTotalTokens : declaredTotalTokens;
   const costUsd = normalizeUsdCost(input.costUsd);
   const costMode = resolveCostMode(input.costMode, costUsd);
   return {
@@ -3122,8 +3044,90 @@ function isPriceableEvent(event) {
   return hasBillableTokenBuckets(event);
 }
 
+// src/cli/build-usage-data-diagnostics.ts
+function buildUsageDiagnostics(params) {
+  const parseResultBySource = new Map(
+    params.successfulParseResults.map((result) => [result.source.toLowerCase(), result])
+  );
+  const sessionStats = params.adaptersToParse.map((adapter) => {
+    const parseResult = parseResultBySource.get(adapter.id.toLowerCase());
+    return {
+      source: adapter.id,
+      filesFound: parseResult?.filesFound ?? 0,
+      eventsParsed: parseResult?.events.length ?? 0
+    };
+  });
+  const skippedRows = params.successfulParseResults.filter((result) => result.skippedRows > 0).map((result) => ({
+    source: result.source,
+    skippedRows: result.skippedRows,
+    reasons: result.skippedRowReasons
+  }));
+  return {
+    sessionStats,
+    sourceFailures: params.sourceFailures,
+    skippedRows,
+    pricingOrigin: params.pricingOrigin,
+    pricingWarning: params.pricingWarning,
+    activeEnvOverrides: params.activeEnvOverrides,
+    timezone: params.timezone,
+    runtimeProfile: params.runtimeProfile
+  };
+}
+function assembleUsageDataResult(events, rows, diagnostics) {
+  return {
+    events,
+    rows,
+    diagnostics
+  };
+}
+
+// src/config/env-var-display.ts
+var ENV_VARS_TO_DISPLAY = [
+  { name: "LLM_USAGE_SKIP_UPDATE_CHECK", description: "skip startup update check" },
+  {
+    name: "LLM_USAGE_UPDATE_CACHE_SCOPE",
+    description: "update-check cache scope (global/session)"
+  },
+  { name: "LLM_USAGE_UPDATE_CACHE_SESSION_KEY", description: "update-check session cache key" },
+  { name: "LLM_USAGE_UPDATE_CACHE_TTL_MS", description: "update-check cache TTL" },
+  { name: "LLM_USAGE_UPDATE_FETCH_TIMEOUT_MS", description: "update-check fetch timeout" },
+  { name: "LLM_USAGE_PRICING_CACHE_TTL_MS", description: "pricing cache TTL" },
+  { name: "LLM_USAGE_PRICING_FETCH_TIMEOUT_MS", description: "pricing fetch timeout" },
+  { name: "LLM_USAGE_PARSE_MAX_PARALLEL", description: "max parallel file parsing" },
+  { name: "LLM_USAGE_PARSE_CACHE_ENABLED", description: "enable file parse cache" },
+  { name: "LLM_USAGE_PARSE_CACHE_TTL_MS", description: "file parse cache TTL" },
+  { name: "LLM_USAGE_PARSE_CACHE_MAX_ENTRIES", description: "file parse cache max entries" },
+  { name: "LLM_USAGE_PARSE_CACHE_MAX_BYTES", description: "file parse cache max bytes" },
+  { name: "LLM_USAGE_PROFILE_RUNTIME", description: "emit runtime profiling diagnostics" }
+];
+function getActiveEnvVarOverrides() {
+  const overrides = [];
+  for (const { name, description } of ENV_VARS_TO_DISPLAY) {
+    const value = process.env[name];
+    if (value !== void 0 && value !== "") {
+      overrides.push({ name, value, description });
+    }
+  }
+  return overrides;
+}
+function formatEnvVarOverrides(overrides) {
+  if (overrides.length === 0) {
+    return [];
+  }
+  const lines = [];
+  lines.push("Active environment overrides:");
+  for (const { name, value, description } of overrides) {
+    lines.push(`  ${name}=${value}  (${description})`);
+  }
+  return lines;
+}
+
+// src/sources/codex/codex-source-adapter.ts
+import os2 from "os";
+import path6 from "path";
+
 // src/utils/discover-files.ts
-import { readdir } from "fs/promises";
+import { readdir, realpath as realpath2, stat as stat2 } from "fs/promises";
 import path5 from "path";
 function getNodeErrorCode2(error) {
   const record = asRecord(error);
@@ -3148,7 +3152,22 @@ function normalizeExtension(extension) {
   }
   return normalized;
 }
-async function walkDirectory(rootDir, acc, options) {
+async function walkDirectory(rootDir, acc, options, ancestryRealPaths) {
+  let resolvedRootDir;
+  try {
+    resolvedRootDir = await realpath2(rootDir);
+  } catch (error) {
+    if (getNodeErrorCode2(error) === "ENOENT") {
+      return;
+    }
+    if (options.allowPermissionSkip && isSkippableDirectoryReadError(error)) {
+      return;
+    }
+    throw error;
+  }
+  if (ancestryRealPaths.has(resolvedRootDir)) {
+    return;
+  }
   let entries;
   try {
     entries = await readdir(rootDir, { withFileTypes: true, encoding: "utf8" });
@@ -3161,13 +3180,37 @@ async function walkDirectory(rootDir, acc, options) {
     }
     throw error;
   }
+  const nextAncestryRealPaths = new Set(ancestryRealPaths);
+  nextAncestryRealPaths.add(resolvedRootDir);
   if (options.sort) {
     entries.sort((left, right) => compareByCodePoint(left.name, right.name));
   }
   for (const entry of entries) {
     const entryPath = path5.join(rootDir, entry.name);
+    if (entry.isSymbolicLink()) {
+      try {
+        const entryStats = await stat2(entryPath);
+        const resolvedEntryPath = await realpath2(entryPath);
+        if (entryStats.isDirectory() && options.recursive) {
+          await walkDirectory(entryPath, acc, options, nextAncestryRealPaths);
+          continue;
+        }
+        if (entryStats.isFile() && (matchesExtension(entry.name, options.extension) || matchesExtension(path5.basename(resolvedEntryPath), options.extension))) {
+          acc.push(entryPath);
+        }
+      } catch (error) {
+        if (getNodeErrorCode2(error) === "ENOENT") {
+          continue;
+        }
+        if (options.allowPermissionSkip && isSkippableDirectoryReadError(error)) {
+          continue;
+        }
+        throw error;
+      }
+      continue;
+    }
     if (entry.isDirectory() && options.recursive) {
-      await walkDirectory(entryPath, acc, options);
+      await walkDirectory(entryPath, acc, options, nextAncestryRealPaths);
       continue;
     }
     if (entry.isFile() && matchesExtension(entry.name, options.extension)) {
@@ -3175,6 +3218,33 @@ async function walkDirectory(rootDir, acc, options) {
     }
   }
 }
+async function toCanonicalFiles(files, options) {
+  const canonicalFiles = [];
+  const seenRealPaths = /* @__PURE__ */ new Set();
+  for (const filePath of files) {
+    let resolvedFilePath;
+    try {
+      resolvedFilePath = await realpath2(filePath);
+    } catch (error) {
+      if (getNodeErrorCode2(error) === "ENOENT") {
+        continue;
+      }
+      if (options.allowPermissionSkip && isSkippableDirectoryReadError(error)) {
+        continue;
+      }
+      throw error;
+    }
+    if (seenRealPaths.has(resolvedFilePath)) {
+      continue;
+    }
+    seenRealPaths.add(resolvedFilePath);
+    canonicalFiles.push(resolvedFilePath);
+  }
+  if (options.sort) {
+    canonicalFiles.sort(compareByCodePoint);
+  }
+  return canonicalFiles;
+}
 async function discoverFiles(rootDir, options) {
   const files = [];
   const resolvedOptions = {
@@ -3183,8 +3253,8 @@ async function discoverFiles(rootDir, options) {
     allowPermissionSkip: options.allowPermissionSkip ?? true,
     sort: options.sort ?? true
   };
-  await walkDirectory(rootDir, files, resolvedOptions);
-  return files;
+  await walkDirectory(rootDir, files, resolvedOptions, /* @__PURE__ */ new Set());
+  return toCanonicalFiles(files, resolvedOptions);
 }
 
 // src/utils/discover-jsonl-files.ts
@@ -3193,7 +3263,7 @@ async function discoverJsonlFiles(rootDir) {
 }
 
 // src/utils/fs-helpers.ts
-import { access as access2, constants as constants2, stat as stat2 } from "fs/promises";
+import { access as access2, constants as constants2, stat as stat3 } from "fs/promises";
 async function pathExists(filePath) {
   try {
     await access2(filePath, constants2.F_OK);
@@ -3212,21 +3282,21 @@ async function pathReadable(filePath) {
 }
 async function pathIsDirectory(filePath) {
   try {
-    return (await stat2(filePath)).isDirectory();
+    return (await stat3(filePath)).isDirectory();
   } catch {
     return false;
   }
 }
 async function pathIsFile(filePath) {
   try {
-    return (await stat2(filePath)).isFile();
+    return (await stat3(filePath)).isFile();
   } catch {
     return false;
   }
 }
 async function pathStat(filePath) {
   try {
-    return await stat2(filePath);
+    return await stat3(filePath);
   } catch {
     return void 0;
   }
@@ -3274,6 +3344,8 @@ async function* readJsonlObjects(filePath, options = {}) {
 }
 
 // src/sources/parsing-utils.ts
+var MIN_PLAUSIBLE_UNIX_SECONDS_ABS = 1e8;
+var UNIX_SECONDS_ABS_CUTOFF = 1e10;
 function asTrimmedText(value) {
   if (typeof value !== "string") {
     return void 0;
@@ -3290,6 +3362,38 @@ function toNumberLike(value) {
   }
   return void 0;
 }
+function normalizeTimestampCandidate(candidate) {
+  if (candidate instanceof Date) {
+    return Number.isNaN(candidate.getTime()) ? void 0 : candidate.toISOString();
+  }
+  if (typeof candidate === "number" && Number.isFinite(candidate)) {
+    if (Math.abs(candidate) < MIN_PLAUSIBLE_UNIX_SECONDS_ABS) {
+      return void 0;
+    }
+    const timestampMs = Math.abs(candidate) <= UNIX_SECONDS_ABS_CUTOFF ? candidate * 1e3 : candidate;
+    const date2 = new Date(timestampMs);
+    if (Number.isNaN(date2.getTime())) {
+      return void 0;
+    }
+    return date2.toISOString();
+  }
+  const normalizedText = asTrimmedText(candidate);
+  if (!normalizedText) {
+    return void 0;
+  }
+  const numericTimestamp = /^-?\d+$/u.test(normalizedText) && normalizedText.length >= 9 ? Number(normalizedText) : NaN;
+  if (Number.isFinite(numericTimestamp)) {
+    return normalizeTimestampCandidate(numericTimestamp);
+  }
+  if (/^-?\d+$/u.test(normalizedText)) {
+    return void 0;
+  }
+  const date = new Date(normalizedText);
+  if (Number.isNaN(date.getTime())) {
+    return void 0;
+  }
+  return date.toISOString();
+}
 
 // src/sources/codex/codex-source-adapter.ts
 var defaultSessionsDir = path6.join(os2.homedir(), ".codex", "sessions");
@@ -3345,10 +3449,22 @@ function addUsage(left, right) {
 function hasUsageSignal(usage) {
   return usage.inputTokens > 0 || usage.cacheReadTokens > 0 || usage.outputTokens > 0 || usage.reasoningTokens > 0 || usage.totalTokens > 0;
 }
+function hasUsageRollback(current, previous) {
+  return current.inputTokens < previous.inputTokens || current.cacheReadTokens < previous.cacheReadTokens || current.outputTokens < previous.outputTokens || current.reasoningTokens < previous.reasoningTokens || current.totalTokens < previous.totalTokens;
+}
 function deriveDeltaUsage(info, previousTotalUsage) {
   const totalUsage = toUsage(info.total_token_usage);
   const lastUsage = toUsage(info.last_token_usage);
   if (totalUsage && previousTotalUsage) {
+    if (hasUsageRollback(totalUsage, previousTotalUsage)) {
+      if (lastUsage && hasUsageSignal(lastUsage)) {
+        return { deltaUsage: lastUsage, latestTotalUsage: totalUsage };
+      }
+      return {
+        deltaUsage: hasUsageSignal(totalUsage) ? totalUsage : void 0,
+        latestTotalUsage: totalUsage
+      };
+    }
     const deltaFromTotals = subtractUsage(totalUsage, previousTotalUsage);
     if (hasUsageSignal(deltaFromTotals)) {
       return { deltaUsage: deltaFromTotals, latestTotalUsage: totalUsage };
@@ -3356,7 +3472,7 @@ function deriveDeltaUsage(info, previousTotalUsage) {
     return { latestTotalUsage: totalUsage };
   }
   if (lastUsage) {
-    return { deltaUsage: lastUsage, latestTotalUsage: totalUsage };
+    return { deltaUsage: lastUsage, latestTotalUsage: totalUsage, fromLastUsageOnly: true };
   }
   if (!totalUsage) {
     return {};
@@ -3364,6 +3480,16 @@ function deriveDeltaUsage(info, previousTotalUsage) {
   const deltaUsage = previousTotalUsage ? subtractUsage(totalUsage, previousTotalUsage) : totalUsage;
   return { deltaUsage, latestTotalUsage: totalUsage };
 }
+function createLastUsageOnlyKey(timestamp, usage) {
+  return [
+    timestamp,
+    usage.inputTokens,
+    usage.cacheReadTokens,
+    usage.outputTokens,
+    usage.reasoningTokens,
+    usage.totalTokens
+  ].join(":");
+}
 function getFallbackSessionId(filePath) {
   return path6.basename(filePath, ".jsonl");
 }
@@ -3435,16 +3561,33 @@ var CodexSourceAdapter = class {
       if (!info) {
         continue;
       }
-      const { deltaUsage, latestTotalUsage } = deriveDeltaUsage(info, state.previousTotalUsage);
+      const { deltaUsage, latestTotalUsage, fromLastUsageOnly } = deriveDeltaUsage(
+        info,
+        state.previousTotalUsage
+      );
       if (!deltaUsage || !hasUsageSignal(deltaUsage)) {
+        if (!fromLastUsageOnly) {
+          state.previousLastUsageOnlyKey = void 0;
+        }
         state.previousTotalUsage = latestTotalUsage ?? state.previousTotalUsage;
         continue;
       }
-      const timestamp = asTrimmedText(line.timestamp);
+      const timestamp = normalizeTimestampCandidate(line.timestamp);
       if (!timestamp) {
-        state.previousTotalUsage = latestTotalUsage ?? state.previousTotalUsage;
+        if (!fromLastUsageOnly) {
+          state.previousLastUsageOnlyKey = void 0;
+        }
         continue;
       }
+      if (fromLastUsageOnly) {
+        const currentLastUsageOnlyKey = createLastUsageOnlyKey(timestamp, deltaUsage);
+        if (state.previousLastUsageOnlyKey === currentLastUsageOnlyKey) {
+          continue;
+        }
+        state.previousLastUsageOnlyKey = currentLastUsageOnlyKey;
+      } else {
+        state.previousLastUsageOnlyKey = void 0;
+      }
       const model = state.model ?? LEGACY_CODEX_MODEL_FALLBACK;
       try {
         events.push(
@@ -3506,24 +3649,6 @@ var DROID_MESSAGE_LINE_PATTERN = /"type"\s*:\s*"message"/u;
 function shouldParseDroidJsonlLine(lineText) {
   return DROID_SESSION_START_LINE_PATTERN.test(lineText) || DROID_MESSAGE_LINE_PATTERN.test(lineText);
 }
-var UNIX_SECONDS_ABS_CUTOFF = 1e10;
-function normalizeTimestampCandidate(candidate) {
-  let date;
-  if (typeof candidate === "number" && Number.isFinite(candidate)) {
-    const timestampMs = Math.abs(candidate) <= UNIX_SECONDS_ABS_CUTOFF ? candidate * 1e3 : candidate;
-    date = new Date(timestampMs);
-  } else {
-    const normalizedText = asTrimmedText(candidate);
-    if (!normalizedText) {
-      return void 0;
-    }
-    date = new Date(normalizedText);
-  }
-  if (Number.isNaN(date.getTime())) {
-    return void 0;
-  }
-  return date.toISOString();
-}
 function getSettingsSessionId(filePath) {
   return path7.basename(filePath, ".settings.json");
 }
@@ -3604,7 +3729,8 @@ var DroidSourceAdapter = class {
       toNumberLike(tokenUsage.cacheCreationTokens)
     );
     const billableTokens = inputTokens + outputTokens + cacheReadTokens + cacheWriteTokens;
-    if (billableTokens === 0) {
+    const hasUsageSignal3 = billableTokens > 0 || reasoningTokens > 0;
+    if (!hasUsageSignal3) {
       skippedRows++;
       incrementSkippedReason(skippedRowReasons, "no_token_usage");
       return toParseDiagnostics(events, skippedRows, skippedRowReasons);
@@ -3724,7 +3850,7 @@ async function discoverSessionFiles(geminiDir) {
   for (const projectEntry of projectEntries.sort(
     (left, right) => compareByCodePoint(left.name, right.name)
   )) {
-    if (!projectEntry.isDirectory()) {
+    if (!projectEntry.isDirectory() && !projectEntry.isSymbolicLink()) {
       continue;
     }
     const chatsDir = path8.join(tmpDir, projectEntry.name, "chats");
@@ -3790,16 +3916,6 @@ function extractTokenUsage(tokens) {
     totalTokens
   };
 }
-function normalizeTimestamp2(candidate) {
-  if (typeof candidate !== "string" || isBlankText(candidate)) {
-    return void 0;
-  }
-  const date = new Date(candidate.trim());
-  if (Number.isNaN(date.getTime())) {
-    return void 0;
-  }
-  return date.toISOString();
-}
 var GeminiSourceAdapter = class {
   id = "gemini";
   capabilities = {
@@ -3889,7 +4005,7 @@ var GeminiSourceAdapter = class {
         incrementSkippedReason(skippedRowReasons, "no_token_usage");
         continue;
       }
-      const timestamp = normalizeTimestamp2(message.timestamp);
+      const timestamp = normalizeTimestampCandidate(message.timestamp);
       if (!timestamp) {
         skippedRows++;
         incrementSkippedReason(skippedRowReasons, "invalid_timestamp");
@@ -3924,8 +4040,15 @@ import path9 from "path";
 function deduplicate(paths) {
   return [...new Set(paths)];
 }
+function normalizeEnvPath(value) {
+  if (value === void 0) {
+    return void 0;
+  }
+  const normalized = value.trim();
+  return normalized || void 0;
+}
 function getLinuxLikeCandidates(homeDir, env) {
-  const xdgDataHome = env.XDG_DATA_HOME ?? path9.join(homeDir, ".local", "share");
+  const xdgDataHome = normalizeEnvPath(env.XDG_DATA_HOME) ?? path9.join(homeDir, ".local", "share");
   return [
     path9.join(xdgDataHome, "opencode", "opencode.db"),
     path9.join(xdgDataHome, "opencode", "db.sqlite"),
@@ -3943,7 +4066,8 @@ function getMacOsCandidates(homeDir) {
   ];
 }
 function getWindowsCandidates(homeDir, env) {
-  const roamingBase = env.APPDATA ?? env.LOCALAPPDATA ?? (env.USERPROFILE ? path9.join(env.USERPROFILE, "AppData", "Roaming") : void 0);
+  const userProfile = normalizeEnvPath(env.USERPROFILE);
+  const roamingBase = normalizeEnvPath(env.APPDATA) ?? normalizeEnvPath(env.LOCALAPPDATA) ?? (userProfile ? path9.join(userProfile, "AppData", "Roaming") : void 0);
   const roamingCandidates = roamingBase ? [
     path9.join(roamingBase, "opencode", "opencode.db"),
     path9.join(roamingBase, "opencode", "db.sqlite")
@@ -4022,33 +4146,6 @@ async function loadNodeSqliteModule() {
 }
 
 // src/sources/opencode/opencode-row-parser.ts
-var UNIX_SECONDS_ABS_CUTOFF2 = 1e10;
-function normalizeTimestampCandidate2(candidate) {
-  if (typeof candidate === "number" && Number.isFinite(candidate)) {
-    const timestampMs = Math.abs(candidate) <= UNIX_SECONDS_ABS_CUTOFF2 ? candidate * 1e3 : candidate;
-    const date = new Date(timestampMs);
-    if (Number.isNaN(date.getTime())) {
-      return void 0;
-    }
-    return date.toISOString();
-  }
-  if (typeof candidate === "string") {
-    const trimmed = candidate.trim();
-    if (!trimmed) {
-      return void 0;
-    }
-    const numericTimestamp = Number(trimmed);
-    if (Number.isFinite(numericTimestamp)) {
-      return normalizeTimestampCandidate2(numericTimestamp);
-    }
-    const date = new Date(trimmed);
-    if (Number.isNaN(date.getTime())) {
-      return void 0;
-    }
-    return date.toISOString();
-  }
-  return void 0;
-}
 function resolveTimestamp(rowTimestamp, messagePayload) {
   const timestampCandidates = [
     rowTimestamp,
@@ -4057,7 +4154,7 @@ function resolveTimestamp(rowTimestamp, messagePayload) {
     messagePayload.time_created
   ];
   for (const candidate of timestampCandidates) {
-    const resolved = normalizeTimestampCandidate2(candidate);
+    const resolved = normalizeTimestampCandidate(candidate);
     if (resolved) {
       return resolved;
     }
@@ -4481,28 +4578,10 @@ var PI_MODEL_CHANGE_LINE_PATTERN = /"type"\s*:\s*"model_change"/u;
 function shouldParsePiJsonlLine(lineText) {
   return PI_MESSAGE_LINE_PATTERN.test(lineText) || PI_SESSION_LINE_PATTERN.test(lineText) || PI_MODEL_CHANGE_LINE_PATTERN.test(lineText);
 }
-var UNIX_SECONDS_ABS_CUTOFF3 = 1e10;
-function normalizeTimestampCandidate3(candidate) {
-  let date;
-  if (typeof candidate === "number" && Number.isFinite(candidate)) {
-    const timestampMs = Math.abs(candidate) <= UNIX_SECONDS_ABS_CUTOFF3 ? candidate * 1e3 : candidate;
-    date = new Date(timestampMs);
-  } else {
-    const normalizedText = asTrimmedText(candidate);
-    if (!normalizedText) {
-      return void 0;
-    }
-    date = new Date(normalizedText);
-  }
-  if (Number.isNaN(date.getTime())) {
-    return void 0;
-  }
-  return date.toISOString();
-}
 function resolveTimestamp2(line, message, state) {
   const candidates = [line.timestamp, message?.timestamp, state.sessionTimestamp];
   for (const candidate of candidates) {
-    const normalizedTimestamp = normalizeTimestampCandidate3(candidate);
+    const normalizedTimestamp = normalizeTimestampCandidate(candidate);
     if (normalizedTimestamp) {
       return normalizedTimestamp;
     }
@@ -5027,7 +5106,7 @@ function throwOnExplicitSourceScopeConflicts(adapters, selectedAdapters, options
 }
 
 // src/cli/build-usage-data-parsing.ts
-import { stat as stat4 } from "fs/promises";
+import { stat as stat5 } from "fs/promises";
 
 // src/cli/normalize-skipped-row-reasons.ts
 function toPositiveInteger(value) {
@@ -5055,7 +5134,7 @@ function normalizeSkippedRowReasons(value) {
 }
 
 // src/cli/parse-file-cache.ts
-import { mkdir as mkdir2, readFile as readFile4, rename, rm, stat as stat3, writeFile as writeFile2 } from "fs/promises";
+import { mkdir as mkdir2, readFile as readFile4, rename, rm, stat as stat4, writeFile as writeFile2 } from "fs/promises";
 import path11 from "path";
 var PARSE_FILE_CACHE_VERSION = 5;
 var CACHE_KEY_SEPARATOR = "\0";
@@ -5148,7 +5227,7 @@ function cloneUsageEvents(events) {
   return events.map((event) => cloneUsageEvent(event));
 }
 function cloneSkippedRowReasons(skippedRowReasons) {
-  return (skippedRowReasons ?? []).map((stat5) => ({ reason: stat5.reason, count: stat5.count }));
+  return (skippedRowReasons ?? []).map((stat6) => ({ reason: stat6.reason, count: stat6.count }));
 }
 function normalizeCachedEvents(value) {
   if (!Array.isArray(value)) {
@@ -5429,7 +5508,7 @@ var ParseFileCache = class _ParseFileCache {
   async loadFromDisk() {
     let cacheFileSizeBytes;
     try {
-      const cacheStat = await stat3(this.cacheFilePath);
+      const cacheStat = await stat4(this.cacheFilePath);
       cacheFileSizeBytes = cacheStat.size;
     } catch {
       return;
@@ -5504,7 +5583,7 @@ function isMissingPathError(error) {
 }
 async function createParseDependencyFingerprint(filePath, options) {
   try {
-    const fileStat = await stat4(filePath);
+    const fileStat = await stat5(filePath);
     return {
       path: filePath,
       exists: true,
@@ -6884,7 +6963,7 @@ function resolveScopeNote(options) {
   return `Usage filters (${activeFilters.join(", ")}) affect commit attribution too: only commit days with matching repo-attributed usage events are counted.`;
 }
 function hasMeaningfulEfficiencyUsageSignal(event) {
-  return event.totalTokens > 0 || event.costUsd !== void 0 && event.costUsd > 0;
+  return event.totalTokens > 0 || hasBillableTokenBuckets(event) || event.costUsd !== void 0;
 }
 async function buildEfficiencyData(granularity, options, deps = {}) {
   const buildDataset = deps.buildUsageEventDataset ?? buildUsageEventDataset;
@@ -7654,6 +7733,9 @@ var USD_PRECISION_SCALE3 = 1e12;
 function roundUsd(value) {
   return Math.round(value * USD_PRECISION_SCALE3) / USD_PRECISION_SCALE3;
 }
+function addUsd3(left, right) {
+  return roundUsd(left + right);
+}
 function hasAnyUsageSignal(period) {
   return period.totalTokens > 0 || period.baselineCostIncomplete || (period.baselineCostUsd ?? 0) > 0;
 }
@@ -7811,9 +7893,22 @@ function resolveBaselinePeriods(usageRows) {
       periodRows.set(row.periodKey, row);
       continue;
     }
-    if (!periodRows.has(row.periodKey)) {
+    const existingRow = periodRows.get(row.periodKey);
+    if (!existingRow) {
       periodRows.set(row.periodKey, row);
+      continue;
     }
+    periodRows.set(row.periodKey, {
+      ...existingRow,
+      inputTokens: existingRow.inputTokens + row.inputTokens,
+      outputTokens: existingRow.outputTokens + row.outputTokens,
+      reasoningTokens: existingRow.reasoningTokens + row.reasoningTokens,
+      cacheReadTokens: existingRow.cacheReadTokens + row.cacheReadTokens,
+      cacheWriteTokens: existingRow.cacheWriteTokens + row.cacheWriteTokens,
+      totalTokens: existingRow.totalTokens + row.totalTokens,
+      costUsd: row.costUsd !== void 0 ? addUsd3(existingRow.costUsd ?? 0, row.costUsd) : existingRow.costUsd,
+      costIncomplete: existingRow.costIncomplete === true || row.costIncomplete === true ? true : void 0
+    });
   }
   const sortedPeriodKeys = [...periodRows.keys()].sort(compareByCodePoint);
   const periods = sortedPeriodKeys.map((periodKey) => {
@@ -8403,6 +8498,13 @@ function renderTrendsReport(trendsData, format, options = {}) {
 }
 
 // src/trends/aggregate-trends.ts
+var VALUE_PRECISION_SCALE = 1e12;
+function addValue(left, right) {
+  return Math.round((left + right) * VALUE_PRECISION_SCALE) / VALUE_PRECISION_SCALE;
+}
+function divideValue(value, divisor) {
+  return Math.round(value / divisor * VALUE_PRECISION_SCALE) / VALUE_PRECISION_SCALE;
+}
 function toTrendBucket(row, metric) {
   return {
     date: row.periodKey,
@@ -8431,12 +8533,12 @@ function buildTrendSummary(buckets) {
       observedDayCount: 0
     };
   }
-  const total = buckets.reduce((sum, bucket) => sum + bucket.value, 0);
+  const total = buckets.reduce((sum, bucket) => addValue(sum, bucket.value), 0);
   const observedBuckets = buckets.filter((bucket) => bucket.observed);
   if (observedBuckets.length === 0) {
     return {
       total,
-      average: buckets.length > 0 ? total / buckets.length : 0,
+      average: buckets.length > 0 ? divideValue(total, buckets.length) : 0,
       peak: {
         date: "",
         value: 0
@@ -8452,7 +8554,7 @@ function buildTrendSummary(buckets) {
   );
   return {
     total,
-    average: buckets.length > 0 ? total / buckets.length : 0,
+    average: buckets.length > 0 ? divideValue(total, buckets.length) : 0,
     peak: {
       date: peak.date,
       value: peak.value
@@ -8472,6 +8574,46 @@ function buildSeries(source, rowsByDate, dateKeys, metric) {
     summary: buildTrendSummary(buckets)
   };
 }
+function createEmptyUsageRow(periodKey, rowType, source) {
+  return rowType === "period_combined" ? {
+    rowType,
+    periodKey,
+    source: "combined",
+    models: [],
+    modelBreakdown: [],
+    inputTokens: 0,
+    outputTokens: 0,
+    reasoningTokens: 0,
+    cacheReadTokens: 0,
+    cacheWriteTokens: 0,
+    totalTokens: 0
+  } : {
+    rowType,
+    periodKey,
+    source,
+    models: [],
+    modelBreakdown: [],
+    inputTokens: 0,
+    outputTokens: 0,
+    reasoningTokens: 0,
+    cacheReadTokens: 0,
+    cacheWriteTokens: 0,
+    totalTokens: 0
+  };
+}
+function addRowTotals(target, row) {
+  return {
+    ...target,
+    inputTokens: target.inputTokens + row.inputTokens,
+    outputTokens: target.outputTokens + row.outputTokens,
+    reasoningTokens: target.reasoningTokens + row.reasoningTokens,
+    cacheReadTokens: target.cacheReadTokens + row.cacheReadTokens,
+    cacheWriteTokens: target.cacheWriteTokens + row.cacheWriteTokens,
+    totalTokens: target.totalTokens + row.totalTokens,
+    costUsd: row.costUsd !== void 0 ? addValue(target.costUsd ?? 0, row.costUsd) : target.costUsd,
+    costIncomplete: target.costIncomplete === true || row.costIncomplete === true ? true : void 0
+  };
+}
 function toCombinedRowsByDate(rows) {
   const combinedByDate = /* @__PURE__ */ new Map();
   const sourceOnlyByDate = /* @__PURE__ */ new Map();
@@ -8483,9 +8625,8 @@ function toCombinedRowsByDate(rows) {
       combinedByDate.set(row.periodKey, row);
       continue;
     }
-    if (!sourceOnlyByDate.has(row.periodKey)) {
-      sourceOnlyByDate.set(row.periodKey, row);
-    }
+    const existingSourceOnlyRow = sourceOnlyByDate.get(row.periodKey) ?? createEmptyUsageRow(row.periodKey, "period_combined", "combined");
+    sourceOnlyByDate.set(row.periodKey, addRowTotals(existingSourceOnlyRow, row));
   }
   const resolved = /* @__PURE__ */ new Map();
   for (const [date, row] of sourceOnlyByDate) {
@@ -8506,7 +8647,8 @@ function toSourceSeries(rows, dateKeys, options) {
       continue;
     }
     const sourceRows = rowsBySource.get(row.source) ?? /* @__PURE__ */ new Map();
-    sourceRows.set(row.periodKey, row);
+    const existingSourceRow = sourceRows.get(row.periodKey) ?? createEmptyUsageRow(row.periodKey, "period_source", row.source);
+    sourceRows.set(row.periodKey, addRowTotals(existingSourceRow, row));
     rowsBySource.set(row.source, sourceRows);
   }
   const observedSources = [...rowsBySource.keys()].sort((left, right) => {