tokentracker-cli 0.5.98 → 0.5.99

package/src/lib/proxy-env.js

@@ -0,0 +1,81 @@
+const cp = require("node:child_process");
+
+function hasProxyEnv(env = process.env) {
+  return Boolean(
+    env.HTTPS_PROXY ||
+    env.https_proxy ||
+    env.HTTP_PROXY ||
+    env.http_proxy ||
+    env.ALL_PROXY ||
+    env.all_proxy,
+  );
+}
+
+function parseMacProxyOutput(output) {
+  const values = {};
+  for (const line of String(output || "").split(/\r?\n/)) {
+    const match = line.match(/^\s*([A-Za-z]+)\s*:\s*(.+?)\s*$/);
+    if (match) values[match[1]] = match[2];
+  }
+  if (values.HTTPSEnable !== "1" || !values.HTTPSProxy || !values.HTTPSPort) return null;
+  return `http://${values.HTTPSProxy}:${values.HTTPSPort}`;
+}
+
+function resolveSystemProxyEnv({ env = process.env, platform = process.platform, commandRunner = cp.spawnSync } = {}) {
+  const out = {};
+  if (hasProxyEnv(env)) {
+    out.NODE_USE_ENV_PROXY = env.NODE_USE_ENV_PROXY || "1";
+    return out;
+  }
+
+  if (platform !== "darwin") return null;
+  const result = commandRunner("scutil", ["--proxy"], {
+    encoding: "utf8",
+    timeout: 2000,
+  });
+  if (result?.error || result?.status !== 0) return null;
+  const proxyUrl = parseMacProxyOutput(result.stdout);
+  if (!proxyUrl) return null;
+
+  return {
+    NODE_USE_ENV_PROXY: "1",
+    HTTPS_PROXY: proxyUrl,
+    HTTP_PROXY: proxyUrl,
+  };
+}
+
+function shouldRelaunchForProxy(argv, env = process.env) {
+  if (env.TOKENTRACKER_PROXY_ENV_APPLIED === "1") return false;
+  const command = Array.isArray(argv) ? argv[0] : null;
+  return !command || command === "serve";
+}
+
+function relaunchWithProxyEnvIfNeeded({
+  argv,
+  originalArgv,
+  env = process.env,
+  platform = process.platform,
+  commandRunner = cp.spawnSync,
+  nodePath = process.execPath,
+} = {}) {
+  if (!shouldRelaunchForProxy(argv, env)) return null;
+  const proxyEnv = resolveSystemProxyEnv({ env, platform, commandRunner });
+  if (!proxyEnv || proxyEnv.NODE_USE_ENV_PROXY === env.NODE_USE_ENV_PROXY) return null;
+
+  const childEnv = {
+    ...env,
+    ...proxyEnv,
+    TOKENTRACKER_PROXY_ENV_APPLIED: "1",
+  };
+  return commandRunner(nodePath, originalArgv, {
+    stdio: "inherit",
+    env: childEnv,
+  });
+}
+
+module.exports = {
+  hasProxyEnv,
+  parseMacProxyOutput,
+  resolveSystemProxyEnv,
+  relaunchWithProxyEnvIfNeeded,
+};

package/src/lib/rollout.js

@@ -1244,6 +1244,7 @@ async function enqueueTouchedBuckets({ queuePath, hourlyState, touchedBuckets })
             output_tokens: zeroTotals.output_tokens,
             reasoning_output_tokens: zeroTotals.reasoning_output_tokens,
             total_tokens: zeroTotals.total_tokens,
+            billable_total_tokens: zeroTotals.billable_total_tokens,
             conversation_count: zeroTotals.conversation_count,
           }),
         );
@@ -1265,6 +1266,7 @@ async function enqueueTouchedBuckets({ queuePath, hourlyState, touchedBuckets })
               output_tokens: zeroTotals.output_tokens,
               reasoning_output_tokens: zeroTotals.reasoning_output_tokens,
               total_tokens: zeroTotals.total_tokens,
+              billable_total_tokens: zeroTotals.billable_total_tokens,
               conversation_count: zeroTotals.conversation_count,
             }),
           );
@@ -1292,6 +1294,7 @@ async function enqueueTouchedBuckets({ queuePath, hourlyState, touchedBuckets })
             output_tokens: totals.output_tokens,
             reasoning_output_tokens: totals.reasoning_output_tokens,
             total_tokens: totals.total_tokens,
+            billable_total_tokens: totals.billable_total_tokens ?? totals.total_tokens,
             conversation_count: totals.conversation_count,
           }),
         );
@@ -1318,6 +1321,7 @@ async function enqueueTouchedBuckets({ queuePath, hourlyState, touchedBuckets })
           output_tokens: zeroTotals.output_tokens,
           reasoning_output_tokens: zeroTotals.reasoning_output_tokens,
           total_tokens: zeroTotals.total_tokens,
+          billable_total_tokens: zeroTotals.billable_total_tokens,
           conversation_count: zeroTotals.conversation_count,
         }),
       );
@@ -1340,6 +1344,7 @@ async function enqueueTouchedBuckets({ queuePath, hourlyState, touchedBuckets })
             output_tokens: zeroTotals.output_tokens,
             reasoning_output_tokens: zeroTotals.reasoning_output_tokens,
             total_tokens: zeroTotals.total_tokens,
+            billable_total_tokens: zeroTotals.billable_total_tokens,
             conversation_count: zeroTotals.conversation_count,
           }),
         );
@@ -1361,6 +1366,7 @@ async function enqueueTouchedBuckets({ queuePath, hourlyState, touchedBuckets })
         output_tokens: unknownBucket.totals.output_tokens,
         reasoning_output_tokens: unknownBucket.totals.reasoning_output_tokens,
         total_tokens: unknownBucket.totals.total_tokens,
+        billable_total_tokens: unknownBucket.totals.billable_total_tokens ?? unknownBucket.totals.total_tokens,
         conversation_count: unknownBucket.totals.conversation_count,
       }),
     );
@@ -1407,6 +1413,7 @@ async function enqueueTouchedBuckets({ queuePath, hourlyState, touchedBuckets })
           output_tokens: group.totals.output_tokens,
           reasoning_output_tokens: group.totals.reasoning_output_tokens,
           total_tokens: group.totals.total_tokens,
+          billable_total_tokens: group.totals.billable_total_tokens ?? group.totals.total_tokens,
           conversation_count: group.totals.conversation_count,
         }),
       );
@@ -1461,6 +1468,7 @@ async function enqueueTouchedProjectBuckets({
         output_tokens: totals.output_tokens,
         reasoning_output_tokens: totals.reasoning_output_tokens,
         total_tokens: totals.total_tokens,
+        billable_total_tokens: totals.billable_total_tokens ?? totals.total_tokens,
         conversation_count: totals.conversation_count,
       }),
     );
@@ -1716,6 +1724,7 @@ function initTotals() {
     output_tokens: 0,
     reasoning_output_tokens: 0,
     total_tokens: 0,
+    billable_total_tokens: 0,
     conversation_count: 0,
   };
 }
@@ -1727,6 +1736,7 @@ function addTotals(target, delta) {
   target.output_tokens += delta.output_tokens || 0;
   target.reasoning_output_tokens += delta.reasoning_output_tokens || 0;
   target.total_tokens += delta.total_tokens || 0;
+  target.billable_total_tokens += delta.billable_total_tokens ?? delta.total_tokens ?? 0;
   target.conversation_count += delta.conversation_count || 0;
 }
 
@@ -1738,6 +1748,7 @@ function totalsKey(totals) {
     totals.output_tokens || 0,
     totals.reasoning_output_tokens || 0,
     totals.total_tokens || 0,
+    totals.billable_total_tokens ?? totals.total_tokens ?? 0,
     totals.conversation_count || 0,
   ].join("|");
 }
@@ -2056,7 +2067,9 @@ function normalizeGeminiTokens(tokens) {
   const output = toNonNegativeInt(tokens.output);
   const tool = toNonNegativeInt(tokens.tool);
   const thoughts = toNonNegativeInt(tokens.thoughts);
-  const total = toNonNegativeInt(tokens.total);
+  const reportedTotal = toNonNegativeInt(tokens.total);
+  const computedTotal = input + cached + output + tool + thoughts;
+  const total = Math.max(reportedTotal, computedTotal);
 
   return {
     input_tokens: input,
@@ -2150,26 +2163,18 @@ function pickDelta(lastUsage, totalUsage, prevTotals) {
   const hasTotal = isNonEmptyObject(totalUsage);
   const hasPrevTotals = isNonEmptyObject(prevTotals);
 
-  // NOTE: We used to guard against "duplicate token_count records where
-  // total_token_usage is unchanged" by returning null here. We removed that
-  // guard to align token counts with ccusage exactly (audited against 10 days
-  // of real rollouts). When last_token_usage is present we trust it as the
-  // per-turn delta; when it's absent the cumulative-subtract path naturally
-  // yields an all-zero delta on duplicates and is still filtered below.
-  if (!hasLast && hasTotal && hasPrevTotals && totalsReset(totalUsage, prevTotals)) {
-    const normalized = normalizeUsage(totalUsage);
-    return isAllZeroUsage(normalized) ? null : normalized;
-  }
-
-  if (hasLast) {
-    return normalizeUsage(lastUsage);
-  }
-
   if (hasTotal && hasPrevTotals) {
+    if (totalsReset(totalUsage, prevTotals)) {
+      const resetUsage = hasLast ? lastUsage : totalUsage;
+      const normalized = normalizeUsage(resetUsage);
+      return isAllZeroUsage(normalized) ? null : normalized;
+    }
+
     const delta = {};
     for (const k of [
       "input_tokens",
       "cached_input_tokens",
+      "cache_creation_input_tokens",
       "output_tokens",
       "reasoning_output_tokens",
       "total_tokens",
@@ -2182,6 +2187,11 @@ function pickDelta(lastUsage, totalUsage, prevTotals) {
     return isAllZeroUsage(normalized) ? null : normalized;
   }
 
+  if (hasLast) {
+    const normalized = normalizeUsage(lastUsage);
+    return isAllZeroUsage(normalized) ? null : normalized;
+  }
+
   if (hasTotal) {
     const normalized = normalizeUsage(totalUsage);
     return isAllZeroUsage(normalized) ? null : normalized;
@@ -2554,21 +2564,31 @@ async function parseCursorApiIncremental({
   const hourlyState = normalizeHourlyState(cursors?.hourly);
   const touchedBuckets = new Set();
 
-  // Incremental: skip records we already processed
+  // Cursor's CSV is an account-level API export, not an append-only local log.
+  // Treat the fetched CSV as authoritative so historical backfills and row
+  // corrections replace prior local bucket totals instead of being skipped.
   const lastTs = cursors?.cursorApi?.lastRecordTimestamp || null;
   let latestTs = lastTs;
   let eventsAggregated = 0;
   const cb = typeof onProgress === "function" ? onProgress : null;
   const total = records.length;
 
+  if (records.length > 0) {
+    for (const [key, bucket] of Object.entries(hourlyState.buckets || {})) {
+      const parsed = parseBucketKey(key);
+      const sourceKey = normalizeSourceInput(parsed.source) || DEFAULT_SOURCE;
+      if (sourceKey !== defaultSource) continue;
+      if (!bucket?.totals) continue;
+      bucket.totals = initTotals();
+      touchedBuckets.add(key);
+    }
+  }
+
   for (let i = 0; i < records.length; i++) {
     const record = records[i];
     const recordDate = record.date;
     if (!recordDate) continue;
 
-    // Skip records we already processed (CSV is ordered newest-first)
-    if (lastTs && recordDate <= lastTs) continue;
-
     const { normalizeCursorUsage } = require("./cursor-config");
     const delta = normalizeCursorUsage(record);
     if (isAllZeroUsage(delta)) continue;

package/src/lib/source-metadata.js

@@ -0,0 +1,46 @@
+const ACCOUNT_LEVEL_SOURCES = new Set(["cursor"]);
+
+function normalizeSource(value) {
+  return String(value || "").trim().toLowerCase();
+}
+
+function getSourceScope(source) {
+  return ACCOUNT_LEVEL_SOURCES.has(normalizeSource(source)) ? "account" : "local";
+}
+
+function isAccountLevelSource(source) {
+  return getSourceScope(source) === "account";
+}
+
+function normalizeUsageScope(value) {
+  const raw = String(value || "").trim().toLowerCase();
+  return raw === "all" || raw === "raw" ? "all" : "personal";
+}
+
+function filterRowsByUsageScope(rows, scope = "personal") {
+  const normalizedScope = normalizeUsageScope(scope);
+  if (normalizedScope === "all") return Array.isArray(rows) ? rows : [];
+  return (Array.isArray(rows) ? rows : []).filter((row) => !isAccountLevelSource(row?.source));
+}
+
+function listExcludedSources(rows, scope = "personal") {
+  const normalizedScope = normalizeUsageScope(scope);
+  if (normalizedScope === "all") return [];
+  const seen = new Set();
+  const out = [];
+  for (const row of Array.isArray(rows) ? rows : []) {
+    const source = normalizeSource(row?.source);
+    if (!source || seen.has(source) || !isAccountLevelSource(source)) continue;
+    seen.add(source);
+    out.push({ source, source_scope: getSourceScope(source), reason: "account_level_source" });
+  }
+  return out.sort((a, b) => a.source.localeCompare(b.source));
+}
+
+module.exports = {
+  getSourceScope,
+  isAccountLevelSource,
+  normalizeUsageScope,
+  filterRowsByUsageScope,
+  listExcludedSources,
+};