@zhangferry-dev/tokendash 1.5.0 → 1.6.0

package/dist/electron-server.cjs

@@ -255,20 +255,24 @@ var TokenUsageSchema = import_zod2.z.object({
 }).default({ input_tokens: 0, cached_input_tokens: 0, output_tokens: 0, reasoning_output_tokens: 0, total_tokens: 0 });
 var TokenCountInfoSchema = import_zod2.z.object({
   total_token_usage: TokenUsageSchema,
-  last_token_usage: TokenUsageSchema
+  last_token_usage: TokenUsageSchema.optional()
 }).nullable().default(null);
 var TokenCountPayloadSchema = import_zod2.z.object({
   type: import_zod2.z.literal("token_count"),
   info: TokenCountInfoSchema
 });
-function tokenUsageKey(usage) {
-  return [
-    usage.input_tokens,
-    usage.cached_input_tokens,
-    usage.output_tokens,
-    usage.reasoning_output_tokens,
-    usage.total_tokens
-  ].join(":");
+function subtractTokenUsage(current, previous) {
+  return {
+    timestamp: "",
+    inputTokens: Math.max(0, current.input_tokens - (previous?.input_tokens ?? 0)),
+    cachedInputTokens: Math.max(0, current.cached_input_tokens - (previous?.cached_input_tokens ?? 0)),
+    outputTokens: Math.max(0, current.output_tokens - (previous?.output_tokens ?? 0)),
+    reasoningOutputTokens: Math.max(0, current.reasoning_output_tokens - (previous?.reasoning_output_tokens ?? 0)),
+    totalTokens: Math.max(0, current.total_tokens - (previous?.total_tokens ?? 0))
+  };
+}
+function displayInputTokens(inputTokens, cachedInputTokens) {
+  return Math.max(0, inputTokens - cachedInputTokens);
 }
 function getSessionsDir() {
   return (0, import_node_path2.join)((0, import_node_os2.homedir)(), ".codex", "sessions");
@@ -314,7 +318,9 @@ function parseCodexSession(filepath) {
   let model = "";
   let createdAt = "";
   const tokenEvents = [];
+  let previousTotalUsage = null;
   const seenTotalUsageSnapshots = /* @__PURE__ */ new Set();
+  const seenUsageEvents = /* @__PURE__ */ new Set();
   for (const line of lines) {
     const trimmed = line.trim();
     if (!trimmed) continue;
@@ -348,18 +354,40 @@ function parseCodexSession(filepath) {
         }
         const info = parseResult.data.info;
         if (!info) continue;
-        const totalUsageKey = tokenUsageKey(info.total_token_usage);
+        const totalUsageKey = [
+          info.total_token_usage.input_tokens,
+          info.total_token_usage.cached_input_tokens,
+          info.total_token_usage.output_tokens,
+          info.total_token_usage.reasoning_output_tokens,
+          info.total_token_usage.total_tokens
+        ].join(":");
         if (seenTotalUsageSnapshots.has(totalUsageKey)) continue;
         seenTotalUsageSnapshots.add(totalUsageKey);
-        const last = info.last_token_usage;
-        tokenEvents.push({
+        const last = info.last_token_usage ?? info.total_token_usage;
+        const rawEvent = info.last_token_usage ? subtractTokenUsage(last, null) : subtractTokenUsage(last, previousTotalUsage);
+        previousTotalUsage = info.total_token_usage;
+        if (rawEvent.inputTokens === 0 && rawEvent.cachedInputTokens === 0 && rawEvent.outputTokens === 0 && rawEvent.reasoningOutputTokens === 0) {
+          continue;
+        }
+        const event = {
+          ...rawEvent,
           timestamp,
-          inputTokens: last.input_tokens,
-          cachedInputTokens: last.cached_input_tokens,
-          outputTokens: last.output_tokens,
-          reasoningOutputTokens: last.reasoning_output_tokens,
-          totalTokens: last.total_tokens
-        });
+          cachedInputTokens: Math.min(rawEvent.cachedInputTokens, rawEvent.inputTokens)
+        };
+        const eventKey = [
+          timestamp,
+          model,
+          event.inputTokens,
+          event.cachedInputTokens,
+          event.outputTokens,
+          event.reasoningOutputTokens,
+          event.totalTokens
+        ].join(":");
+        if (seenUsageEvents.has(eventKey)) {
+          continue;
+        }
+        seenUsageEvents.add(eventKey);
+        tokenEvents.push(event);
       }
     }
   }
@@ -409,6 +437,12 @@ function addAcc(a, ev) {
   a.reasoningOutputTokens += ev.reasoningOutputTokens;
   a.totalTokens += ev.totalTokens;
 }
+function displayAcc(acc) {
+  return {
+    ...acc,
+    inputTokens: displayInputTokens(acc.inputTokens, acc.cachedInputTokens)
+  };
+}
 function mergeAcc(a, b) {
   a.inputTokens += b.inputTokens;
   a.cachedInputTokens += b.cachedInputTokens;
@@ -423,30 +457,34 @@ function addAccToBucket(bucket, ev, model) {
   addAcc(bucket.models.get(model), ev);
 }
 function accToEntry(date, acc, modelAccs) {
+  const display = displayAcc(acc);
   const modelNames = [...modelAccs.keys()];
   const modelBreakdowns = buildModelBreakdowns(modelAccs);
   const totalCost = modelBreakdowns.reduce((sum, model) => sum + model.cost, 0);
   return {
     date,
-    inputTokens: acc.inputTokens,
-    outputTokens: acc.outputTokens,
+    inputTokens: display.inputTokens,
+    outputTokens: display.outputTokens,
     cacheCreationTokens: 0,
-    cacheReadTokens: acc.cachedInputTokens,
-    totalTokens: acc.totalTokens,
+    cacheReadTokens: display.cachedInputTokens,
+    totalTokens: display.totalTokens,
     totalCost,
     modelsUsed: modelNames,
     modelBreakdowns
   };
 }
 function buildModelBreakdowns(modelAccs) {
-  return [...modelAccs.entries()].map(([modelName, acc]) => ({
-    modelName,
-    inputTokens: acc.inputTokens,
-    outputTokens: acc.outputTokens,
-    cacheCreationTokens: 0,
-    cacheReadTokens: acc.cachedInputTokens,
-    cost: calculateCost(acc, /* @__PURE__ */ new Set([modelName]))
-  }));
+  return [...modelAccs.entries()].map(([modelName, acc]) => {
+    const display = displayAcc(acc);
+    return {
+      modelName,
+      inputTokens: display.inputTokens,
+      outputTokens: display.outputTokens,
+      cacheCreationTokens: 0,
+      cacheReadTokens: display.cachedInputTokens,
+      cost: calculateCost(acc, /* @__PURE__ */ new Set([modelName]))
+    };
+  });
 }
 function groupSessions(sessions, options) {
   const tz = options.timezone || "Asia/Shanghai";
@@ -501,7 +539,7 @@ function buildDailyResponse(sessions, options) {
   return {
     daily,
     totals: {
-      inputTokens: totalsAcc.inputTokens,
+      inputTokens: displayInputTokens(totalsAcc.inputTokens, totalsAcc.cachedInputTokens),
       outputTokens: totalsAcc.outputTokens,
       cacheCreationTokens: 0,
       cacheReadTokens: totalsAcc.cachedInputTokens,
@@ -552,7 +590,7 @@ function buildBlocksResponse(sessions, options) {
       isGap: false,
       entries: acc.totalTokens > 0 ? 1 : 0,
       tokenCounts: {
-        inputTokens: acc.inputTokens,
+        inputTokens: displayInputTokens(acc.inputTokens, acc.cachedInputTokens),
         outputTokens: acc.outputTokens,
         cacheCreationInputTokens: 0,
         cacheReadInputTokens: acc.cachedInputTokens
@@ -1165,18 +1203,18 @@ var import_node_path5 = require("node:path");
 var import_node_os5 = require("node:os");
 var MODEL_PRICING2 = {
   // Claude 4.6
-  "claude-opus-4-6": { inputPer1M: 15, cacheReadPer1M: 1.5, outputPer1M: 75 },
-  "claude-sonnet-4-6": { inputPer1M: 3, cacheReadPer1M: 0.3, outputPer1M: 15 },
+  "claude-opus-4-6": { inputPer1M: 15, cacheCreationPer1M: 18.75, cacheReadPer1M: 1.5, outputPer1M: 75 },
+  "claude-sonnet-4-6": { inputPer1M: 3, cacheCreationPer1M: 3.75, cacheReadPer1M: 0.3, outputPer1M: 15 },
   // Claude 4.5
-  "claude-sonnet-4-5-20250514": { inputPer1M: 3, cacheReadPer1M: 0.3, outputPer1M: 15 },
-  "claude-haiku-4-5-20251001": { inputPer1M: 0.8, cacheReadPer1M: 0.08, outputPer1M: 4 },
+  "claude-sonnet-4-5-20250514": { inputPer1M: 3, cacheCreationPer1M: 3.75, cacheReadPer1M: 0.3, outputPer1M: 15 },
+  "claude-haiku-4-5-20251001": { inputPer1M: 0.8, cacheCreationPer1M: 1, cacheReadPer1M: 0.08, outputPer1M: 4 },
   // Older Claude models
-  "claude-3-5-sonnet-20241022": { inputPer1M: 3, cacheReadPer1M: 0.3, outputPer1M: 15 },
-  "claude-3-5-haiku-20241022": { inputPer1M: 0.8, cacheReadPer1M: 0.08, outputPer1M: 4 },
-  "claude-3-opus-20240229": { inputPer1M: 15, cacheReadPer1M: 1.5, outputPer1M: 75 },
-  "claude-3-haiku-20240307": { inputPer1M: 0.25, cacheReadPer1M: 0.03, outputPer1M: 1.25 }
+  "claude-3-5-sonnet-20241022": { inputPer1M: 3, cacheCreationPer1M: 3.75, cacheReadPer1M: 0.3, outputPer1M: 15 },
+  "claude-3-5-haiku-20241022": { inputPer1M: 0.8, cacheCreationPer1M: 1, cacheReadPer1M: 0.08, outputPer1M: 4 },
+  "claude-3-opus-20240229": { inputPer1M: 15, cacheCreationPer1M: 18.75, cacheReadPer1M: 1.5, outputPer1M: 75 },
+  "claude-3-haiku-20240307": { inputPer1M: 0.25, cacheCreationPer1M: 0.3, cacheReadPer1M: 0.03, outputPer1M: 1.25 }
 };
-var DEFAULT_PRICING2 = { inputPer1M: 3, cacheReadPer1M: 0.3, outputPer1M: 15 };
+var DEFAULT_PRICING2 = { inputPer1M: 3, cacheCreationPer1M: 3.75, cacheReadPer1M: 0.3, outputPer1M: 15 };
 function getPricing(model) {
   if (MODEL_PRICING2[model]) return MODEL_PRICING2[model];
   const lower = model.toLowerCase();
@@ -1185,10 +1223,12 @@ function getPricing(model) {
   }
   return DEFAULT_PRICING2;
 }
-function calculateCost2(inputTokens, cacheReadTokens, outputTokens, model) {
+function calculateCost2(inputTokens, cacheReadTokens, outputTokens, model, cacheCreationTokens = 0) {
   const p = getPricing(model);
-  const nonCachedInput = Math.max(inputTokens - cacheReadTokens, 0);
-  return nonCachedInput / 1e6 * p.inputPer1M + cacheReadTokens / 1e6 * p.cacheReadPer1M + outputTokens / 1e6 * p.outputPer1M;
+  return inputTokens / 1e6 * p.inputPer1M + cacheCreationTokens / 1e6 * p.cacheCreationPer1M + cacheReadTokens / 1e6 * p.cacheReadPer1M + outputTokens / 1e6 * p.outputPer1M;
+}
+function totalClaudeTokens(inputTokens, outputTokens, cacheCreationTokens, cacheReadTokens) {
+  return inputTokens + outputTokens + cacheCreationTokens + cacheReadTokens;
 }
 var CLAUDE_PROJECTS_DIR = (0, import_node_path5.join)((0, import_node_os5.homedir)(), ".claude", "projects");
 var fileCache = /* @__PURE__ */ new Map();
@@ -1293,7 +1333,7 @@ function parseAllSessions2(project) {
         const outputTokens = usage.output_tokens || 0;
         const cacheCreationTokens = usage.cache_creation_input_tokens || 0;
         const cacheReadTokens = usage.cache_read_input_tokens || 0;
-        const totalTokens = inputTokens + outputTokens + cacheReadTokens;
+        const totalTokens = totalClaudeTokens(inputTokens, outputTokens, cacheCreationTokens, cacheReadTokens);
         if (totalTokens === 0) continue;
         entries.push({
           timestamp: obj.timestamp,
@@ -1377,8 +1417,8 @@ function getDailyResponse4(project, tz = DEFAULT_TZ) {
     agg.outputTokens += e.outputTokens;
     agg.cacheCreationTokens += e.cacheCreationTokens;
     agg.cacheReadTokens += e.cacheReadTokens;
-    agg.totalTokens += e.inputTokens + e.outputTokens + e.cacheReadTokens;
-    const cost = calculateCost2(e.inputTokens, e.cacheReadTokens, e.outputTokens, e.model);
+    agg.totalTokens += totalClaudeTokens(e.inputTokens, e.outputTokens, e.cacheCreationTokens, e.cacheReadTokens);
+    const cost = calculateCost2(e.inputTokens, e.cacheReadTokens, e.outputTokens, e.model, e.cacheCreationTokens);
     agg.totalCost += cost;
     if (!agg.models.has(e.model)) {
       agg.models.set(e.model, { input: 0, output: 0, cacheCreation: 0, cacheRead: 0, cost: 0 });
@@ -1428,8 +1468,8 @@ function getProjectsResponse4(tz = DEFAULT_TZ) {
     agg.outputTokens += e.outputTokens;
     agg.cacheCreationTokens += e.cacheCreationTokens;
     agg.cacheReadTokens += e.cacheReadTokens;
-    agg.totalTokens += e.inputTokens + e.outputTokens + e.cacheReadTokens;
-    const cost = calculateCost2(e.inputTokens, e.cacheReadTokens, e.outputTokens, e.model);
+    agg.totalTokens += totalClaudeTokens(e.inputTokens, e.outputTokens, e.cacheCreationTokens, e.cacheReadTokens);
+    const cost = calculateCost2(e.inputTokens, e.cacheReadTokens, e.outputTokens, e.model, e.cacheCreationTokens);
     agg.totalCost += cost;
     if (!agg.models.has(e.model)) {
       agg.models.set(e.model, { input: 0, output: 0, cacheCreation: 0, cacheRead: 0, cost: 0 });
@@ -1467,13 +1507,13 @@ function getBlocksResponse4(project, tz = DEFAULT_TZ) {
     bucket.outputTokens += e.outputTokens;
     bucket.cacheCreationTokens += e.cacheCreationTokens;
     bucket.cacheReadTokens += e.cacheReadTokens;
-    bucket.costUSD += calculateCost2(e.inputTokens, e.cacheReadTokens, e.outputTokens, e.model);
+    bucket.costUSD += calculateCost2(e.inputTokens, e.cacheReadTokens, e.outputTokens, e.model, e.cacheCreationTokens);
     bucket.models.add(e.model);
   }
   const blocks = [];
   let idx = 0;
   for (const [hourKey, bucket] of hourMap) {
-    const totalTokens = bucket.inputTokens + bucket.outputTokens + bucket.cacheReadTokens;
+    const totalTokens = totalClaudeTokens(bucket.inputTokens, bucket.outputTokens, bucket.cacheCreationTokens, bucket.cacheReadTokens);
     blocks.push({
       id: `claude-${idx}`,
       startTime: `${hourKey}:00:00`,