npm - @zhangferry-dev/tokendash - Versions diffs - 1.4.0 → 1.5.0 - Mend

@zhangferry-dev/tokendash 1.4.0 → 1.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (27) hide show

package/README.md +32 -40
package/dist/client/assets/{index-B4YgU_cb.js → index-BPWY9q0y.js} +45 -45
package/dist/client/index.html +1 -1
package/dist/client/popover.html +44 -17
package/dist/electron-server.cjs +180 -53
package/dist/electron-server.cjs.map +3 -3
package/dist/server/analyticsParser.js +66 -2
package/dist/server/claudeBlocksParser.js +48 -5
package/dist/server/claudeJsonlParser.d.ts +6 -0
package/dist/server/claudeJsonlParser.js +53 -4
package/dist/server/codexParser.d.ts +10 -7
package/dist/server/codexParser.js +83 -57
package/dist/server/index.d.ts +4 -0
package/dist/server/index.js +25 -9
package/electron/main.cjs +67 -12
package/electron/preload.cjs +3 -0
package/electron/trayBadge.cjs +3 -1
package/electron/trayHelper +0 -0
package/electron/trayHelper.swift +38 -16
package/electron-builder.yml +4 -1
package/package.json +1 -1
package/resources/icon.icns +0 -0
package/resources/product_menu.png +0 -0
package/resources/cache_diagram.html +0 -456
package/resources/cache_diagram.png +0 -0
package/resources/pr1_preview.png +0 -0
package/resources/test_single_agent.png +0 -0

package/dist/client/index.html CHANGED Viewed

@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>TokenDash</title>
     <link rel="icon" type="image/svg+xml" href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32'><text y='28' font-size='28'>⚡</text></svg>" />
-    <script type="module" crossorigin src="/assets/index-B4YgU_cb.js"></script>
+    <script type="module" crossorigin src="/assets/index-BPWY9q0y.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-iYDpTV63.css">
   </head>
   <body class="antialiased" style="background:#faf9f7">

package/dist/client/popover.html CHANGED Viewed

@@ -177,9 +177,10 @@
     }
     .y-axis {
-      display: grid;
-      grid-template-rows: repeat(4, 1fr);
-      justify-items: end;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      align-items: flex-end;
       width: max-content;
       padding-block: 6px 24px;
       color: var(--muted);
@@ -257,14 +258,14 @@
     .bar-tip {
       position: absolute;
-      inset-block-end: calc(var(--height) + 10px);
+      inset-block-end: calc(var(--height) + 4px);
       font-size: 10px;
       color: var(--fg);
       font-family: var(--font-mono);
-      background: rgba(255, 255, 255, 0.9);
-      border: 1px solid var(--border);
-      border-radius: 999px;
-      padding: 4px 7px;
+      background: transparent;
+      border: none;
+      border-radius: 0;
+      padding: 0;
       white-space: nowrap;
     }
@@ -742,6 +743,7 @@
       var totalOutput = 0;
       var totalCacheRead = 0;
       var totalTokens = 0;
+      var totalCost = 0;
       (allDaily || []).forEach(function(daily) {
         if (!daily || !daily.daily) return;
@@ -751,6 +753,7 @@
         totalOutput += entry.outputTokens || 0;
         totalCacheRead += entry.cacheReadTokens || 0;
         totalTokens += entry.totalTokens || 0;
+        totalCost += entry.totalCost || 0;
       });
       var denominator = totalInput + totalCacheRead;
@@ -760,6 +763,14 @@
       setCardValue('input', formatNumber(totalInput), totalInput === 0);
       setCardValue('output', formatNumber(totalOutput), totalOutput === 0);
       setCardValue('cache-rate', formatPercent(cacheRate), cacheRate === 0);
+      return {
+        today: todayStr,
+        agentKey: selectedAgents.slice().sort().join(','),
+        totalTokens: totalTokens,
+        totalCost: totalCost,
+        totalCacheRead: totalCacheRead
+      };
     }
     function setCardValue(id, text, isEmpty) {
@@ -809,22 +820,34 @@
         return;
       }
+      var axisInfo = niceStep(maxValue);
       renderAxis(maxValue);
       var maxEntry = selected.reduce(function(max, entry) {
         return !max || entry.value > max.value ? entry : max;
       }, null);
-      renderBars(selected, maxValue, maxEntry);
+      renderBars(selected, axisInfo.top, maxEntry);
     }
-    function renderAxis(maxValue) {
+    function niceStep(value) {
+      // Always divide into 3 intervals, pick a step that gives round numbers
+      if (value <= 0) return { top: 3, step: 1 };
+      var rawStep = value / 3;
+      var exp = Math.floor(Math.log10(rawStep));
+      var base = Math.pow(10, exp);
+      var frac = rawStep / base;
+      // Round step up to nearest 1, 2, or 5 × 10^n
+      var nice = frac <= 1 ? base : frac <= 2 ? 2 * base : frac <= 5 ? 5 * base : 10 * base;
+      var top = nice * 3;
+      return { top: top, step: nice };
+    }
+    function renderAxis(axisMax) {
       var axis = document.getElementById('y-axis');
-      var top = maxValue;
-      var midHigh = top * (2 / 3);
-      var midLow = top * (1 / 3);
+      var info = niceStep(axisMax);
       axis.innerHTML = [
-        '<span>' + formatNumber(top) + '</span>',
-        '<span>' + formatNumber(midHigh) + '</span>',
-        '<span>' + formatNumber(midLow) + '</span>',
+        '<span>' + formatNumber(info.top) + '</span>',
+        '<span>' + formatNumber(info.top - info.step) + '</span>',
+        '<span>' + formatNumber(info.top - 2 * info.step) + '</span>',
         '<span>0</span>'
       ].join('');
     }
@@ -969,6 +992,7 @@
         selectedAgents = agents.slice(); // default: all selected
       }
       renderAgentDropdown();
+      saveSelectedAgents();
     }
     // --- Data fetching ---
@@ -1003,8 +1027,11 @@
           });
         })
         .then(function(data) {
-          renderMetrics(data.dailyResults);
+          var traySnapshot = renderMetrics(data.dailyResults);
           renderChart(data.blockResults);
+          if (window.electronAPI && window.electronAPI.updateTraySnapshot && traySnapshot.totalTokens > 0) {
+            window.electronAPI.updateTraySnapshot(traySnapshot).catch(function() {});
+          }
           hideError();
         })
         .catch(function(error) {

package/dist/electron-server.cjs CHANGED Viewed

@@ -32,7 +32,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var index_exports = {};
 __export(index_exports, {
   createApp: () => createApp,
-  main: () => main
+  main: () => main,
+  resolveStaticAssetBaseDir: () => resolveStaticAssetBaseDir
 });
 module.exports = __toCommonJS(index_exports);
 var import_express = __toESM(require("express"), 1);
@@ -260,6 +261,15 @@ 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 getSessionsDir() {
   return (0, import_node_path2.join)((0, import_node_os2.homedir)(), ".codex", "sessions");
 }
@@ -304,6 +314,7 @@ function parseCodexSession(filepath) {
   let model = "";
   let createdAt = "";
   const tokenEvents = [];
+  const seenTotalUsageSnapshots = /* @__PURE__ */ new Set();
   for (const line of lines) {
     const trimmed = line.trim();
     if (!trimmed) continue;
@@ -337,6 +348,9 @@ function parseCodexSession(filepath) {
         }
         const info = parseResult.data.info;
         if (!info) continue;
+        const totalUsageKey = tokenUsageKey(info.total_token_usage);
+        if (seenTotalUsageSnapshots.has(totalUsageKey)) continue;
+        seenTotalUsageSnapshots.add(totalUsageKey);
         const last = info.last_token_usage;
         tokenEvents.push({
           timestamp,
@@ -402,8 +416,16 @@ function mergeAcc(a, b) {
   a.reasoningOutputTokens += b.reasoningOutputTokens;
   a.totalTokens += b.totalTokens;
 }
-function accToEntry(date, acc, models) {
-  const cost = calculateCost(acc, models);
+function addAccToBucket(bucket, ev, model) {
+  addAcc(bucket.acc, ev);
+  if (!model) return;
+  if (!bucket.models.has(model)) bucket.models.set(model, emptyAcc());
+  addAcc(bucket.models.get(model), ev);
+}
+function accToEntry(date, acc, modelAccs) {
+  const modelNames = [...modelAccs.keys()];
+  const modelBreakdowns = buildModelBreakdowns(modelAccs);
+  const totalCost = modelBreakdowns.reduce((sum, model) => sum + model.cost, 0);
   return {
     date,
     inputTokens: acc.inputTokens,
@@ -411,22 +433,19 @@ function accToEntry(date, acc, models) {
     cacheCreationTokens: 0,
     cacheReadTokens: acc.cachedInputTokens,
     totalTokens: acc.totalTokens,
-    totalCost: cost,
-    modelsUsed: [...models],
-    modelBreakdowns: buildModelBreakdowns(acc, models, cost)
+    totalCost,
+    modelsUsed: modelNames,
+    modelBreakdowns
   };
 }
-function buildModelBreakdowns(acc, models, totalCost) {
-  const modelList = [...models];
-  if (modelList.length === 0) return [];
-  const costPerModel = totalCost / modelList.length;
-  return modelList.map((name) => ({
-    modelName: name,
+function buildModelBreakdowns(modelAccs) {
+  return [...modelAccs.entries()].map(([modelName, acc]) => ({
+    modelName,
     inputTokens: acc.inputTokens,
     outputTokens: acc.outputTokens,
     cacheCreationTokens: 0,
     cacheReadTokens: acc.cachedInputTokens,
-    cost: costPerModel
+    cost: calculateCost(acc, /* @__PURE__ */ new Set([modelName]))
   }));
 }
 function groupSessions(sessions, options) {
@@ -457,28 +476,28 @@ function groupSessions(sessions, options) {
           break;
       }
       if (!grouped.has(key)) {
-        grouped.set(key, { acc: emptyAcc(), models: /* @__PURE__ */ new Set() });
+        grouped.set(key, { acc: emptyAcc(), models: /* @__PURE__ */ new Map() });
       }
-      const entry = grouped.get(key);
-      addAcc(entry.acc, ev);
-      if (session.model) entry.models.add(session.model);
+      addAccToBucket(grouped.get(key), ev, session.model);
     }
   }
   return grouped;
 }
-function getDailyResponse(options) {
-  const sessions = parseAllSessions();
+function buildDailyResponse(sessions, options) {
   const grouped = groupSessions(sessions, { groupBy: "day", ...options });
   const daily = [];
   const totalsAcc = emptyAcc();
-  for (const [date, { acc, models: models2 }] of grouped) {
-    daily.push(accToEntry(date, acc, models2));
+  const totalModels = /* @__PURE__ */ new Map();
+  for (const [date, { acc, models }] of grouped) {
+    daily.push(accToEntry(date, acc, models));
     mergeAcc(totalsAcc, acc);
+    for (const [model, modelAcc] of models) {
+      if (!totalModels.has(model)) totalModels.set(model, emptyAcc());
+      mergeAcc(totalModels.get(model), modelAcc);
+    }
   }
   daily.sort((a, b) => a.date.localeCompare(b.date));
-  const models = /* @__PURE__ */ new Set();
-  for (const s of sessions) if (s.model) models.add(s.model);
-  const totalCost = calculateCost(totalsAcc, models);
+  const totalCost = buildModelBreakdowns(totalModels).reduce((sum, model) => sum + model.cost, 0);
   return {
     daily,
     totals: {
@@ -491,41 +510,37 @@ function getDailyResponse(options) {
     }
   };
 }
-function getProjectsResponse(options) {
-  const sessions = parseAllSessions();
+function buildProjectsResponse(sessions, options) {
   const tz = options?.timezone || "Asia/Shanghai";
-  const projects = {};
+  const projectGroups = /* @__PURE__ */ new Map();
   for (const session of sessions) {
     const projectName = extractProjectName(session.cwd);
-    const dailyMap = /* @__PURE__ */ new Map();
+    if (options?.project && projectName !== options.project) continue;
+    if (!projectGroups.has(projectName)) projectGroups.set(projectName, /* @__PURE__ */ new Map());
+    const dailyMap = projectGroups.get(projectName);
     for (const ev of session.tokenEvents) {
       const evDate = new Date(ev.timestamp);
       if (options?.since && evDate < options.since) continue;
       if (options?.until && evDate > options.until) continue;
       const dayKey = getDateKey(ev.timestamp, tz);
       if (!dailyMap.has(dayKey)) {
-        dailyMap.set(dayKey, { acc: emptyAcc(), models: /* @__PURE__ */ new Set() });
+        dailyMap.set(dayKey, { acc: emptyAcc(), models: /* @__PURE__ */ new Map() });
       }
-      addAcc(dailyMap.get(dayKey).acc, ev);
-      if (session.model) dailyMap.get(dayKey).models.add(session.model);
-    }
-    if (!projects[projectName]) projects[projectName] = [];
-    for (const [date, { acc, models }] of dailyMap) {
-      projects[projectName].push(accToEntry(date, acc, models));
+      addAccToBucket(dailyMap.get(dayKey), ev, session.model);
     }
   }
-  for (const key of Object.keys(projects)) {
-    projects[key].sort((a, b) => a.date.localeCompare(b.date));
+  const projects = {};
+  for (const [projectName, dailyMap] of projectGroups) {
+    projects[projectName] = [...dailyMap.entries()].sort(([a], [b]) => a.localeCompare(b)).map(([date, { acc, models }]) => accToEntry(date, acc, models));
   }
   return { projects };
 }
-function getBlocksResponse(options) {
-  const sessions = parseAllSessions();
+function buildBlocksResponse(sessions, options) {
   const grouped = groupSessions(sessions, { groupBy: "hour", ...options });
   const blocks = [];
   let idx = 0;
   for (const [hourKey, { acc, models }] of grouped) {
-    const cost = calculateCost(acc, models);
+    const cost = buildModelBreakdowns(models).reduce((sum, model) => sum + model.cost, 0);
     const [datePart, timePart] = hourKey.split(" ");
     const hour = timePart.split(":")[0];
     blocks.push({
@@ -544,13 +559,22 @@ function getBlocksResponse(options) {
       },
       totalTokens: acc.totalTokens,
       costUSD: cost,
-      models: [...models]
+      models: [...models.keys()]
     });
     idx++;
   }
   blocks.sort((a, b) => a.startTime.localeCompare(b.startTime));
   return { blocks };
 }
+function getDailyResponse(options) {
+  return buildDailyResponse(parseAllSessions(), options);
+}
+function getProjectsResponse(options) {
+  return buildProjectsResponse(parseAllSessions(), options);
+}
+function getBlocksResponse(options) {
+  return buildBlocksResponse(parseAllSessions(), options);
+}
 // src/server/openclawParser.ts
 var import_node_fs3 = require("node:fs");
@@ -1168,9 +1192,46 @@ function calculateCost2(inputTokens, cacheReadTokens, outputTokens, model) {
 }
 var CLAUDE_PROJECTS_DIR = (0, import_node_path5.join)((0, import_node_os5.homedir)(), ".claude", "projects");
 var fileCache = /* @__PURE__ */ new Map();
+var projectNameCache = /* @__PURE__ */ new Map();
 function extractProjectName2(dirName) {
-  const parts = dirName.replace(/^-/, "").split("-");
-  return parts[parts.length - 1] || dirName;
+  if (!dirName.startsWith("-")) return dirName;
+  const cached = projectNameCache.get(dirName);
+  if (cached) return cached;
+  const segments = dirName.replace(/^-/, "").split("-").filter(Boolean);
+  if (segments.length === 0) {
+    projectNameCache.set(dirName, dirName);
+    return dirName;
+  }
+  if (segments.length === 1) {
+    projectNameCache.set(dirName, segments[0]);
+    return segments[0];
+  }
+  let bestName = segments[segments.length - 1];
+  for (let splitAt = segments.length - 1; splitAt >= 1; splitAt--) {
+    const parentSegments = segments.slice(0, splitAt);
+    const candidateName = segments.slice(splitAt).join("-");
+    let parentPath = "/";
+    let valid = true;
+    for (const seg of parentSegments) {
+      const regular = (0, import_node_path5.join)(parentPath, seg);
+      const hidden = (0, import_node_path5.join)(parentPath, "." + seg);
+      if ((0, import_node_fs5.existsSync)(regular)) {
+        parentPath = regular;
+      } else if ((0, import_node_fs5.existsSync)(hidden)) {
+        parentPath = hidden;
+      } else {
+        valid = false;
+        break;
+      }
+    }
+    if (!valid) continue;
+    if ((0, import_node_fs5.existsSync)((0, import_node_path5.join)(parentPath, candidateName)) || (0, import_node_fs5.existsSync)((0, import_node_path5.join)(parentPath, "." + candidateName))) {
+      bestName = candidateName;
+      break;
+    }
+  }
+  projectNameCache.set(dirName, bestName);
+  return bestName;
 }
 function matchesProject(dirName, filter) {
   return extractProjectName2(dirName) === extractProjectName2(filter);
@@ -1345,7 +1406,7 @@ function getProjectsResponse4(tz = DEFAULT_TZ) {
   const projectMap = /* @__PURE__ */ new Map();
   for (const e of entries) {
     const date = getDateKey4(e.timestamp, tz);
-    const projectName = e.projectDir;
+    const projectName = extractProjectName2(e.projectDir);
     if (!projectMap.has(projectName)) {
       projectMap.set(projectName, /* @__PURE__ */ new Map());
     }
@@ -1680,9 +1741,46 @@ function countLines(text) {
   return text.split("\n").length;
 }
 var CLAUDE_PROJECTS_DIR2 = (0, import_node_path6.join)((0, import_node_os6.homedir)(), ".claude", "projects");
+var projectNameCache2 = /* @__PURE__ */ new Map();
 function extractProjectName3(dirName) {
-  const parts = dirName.replace(/^-/, "").split("-");
-  return parts[parts.length - 1] || dirName;
+  if (!dirName.startsWith("-")) return dirName;
+  const cached = projectNameCache2.get(dirName);
+  if (cached) return cached;
+  const segments = dirName.replace(/^-/, "").split("-").filter(Boolean);
+  if (segments.length === 0) {
+    projectNameCache2.set(dirName, dirName);
+    return dirName;
+  }
+  if (segments.length === 1) {
+    projectNameCache2.set(dirName, segments[0]);
+    return segments[0];
+  }
+  let bestName = segments[segments.length - 1];
+  for (let splitAt = segments.length - 1; splitAt >= 1; splitAt--) {
+    const parentSegments = segments.slice(0, splitAt);
+    const candidateName = segments.slice(splitAt).join("-");
+    let parentPath = "/";
+    let valid = true;
+    for (const seg of parentSegments) {
+      const regular = (0, import_node_path6.join)(parentPath, seg);
+      const hidden = (0, import_node_path6.join)(parentPath, "." + seg);
+      if ((0, import_node_fs6.existsSync)(regular)) {
+        parentPath = regular;
+      } else if ((0, import_node_fs6.existsSync)(hidden)) {
+        parentPath = hidden;
+      } else {
+        valid = false;
+        break;
+      }
+    }
+    if (!valid) continue;
+    if ((0, import_node_fs6.existsSync)((0, import_node_path6.join)(parentPath, candidateName)) || (0, import_node_fs6.existsSync)((0, import_node_path6.join)(parentPath, "." + candidateName))) {
+      bestName = candidateName;
+      break;
+    }
+  }
+  projectNameCache2.set(dirName, bestName);
+  return bestName;
 }
 function matchesProject2(dirName, filter) {
   return extractProjectName3(dirName) === extractProjectName3(filter);
@@ -1867,6 +1965,21 @@ function computeAnalytics(toolCalls, timezone = "Asia/Shanghai") {
     toolCallTrend.push(entry);
   }
   toolCallTrend.sort((a, b) => a.date.localeCompare(b.date));
+  if (toolCallTrend.length > 0) {
+    const allTools = /* @__PURE__ */ new Set();
+    for (const entry of toolCallTrend) {
+      for (const key of Object.keys(entry)) {
+        if (key !== "date") allTools.add(key);
+      }
+    }
+    for (const entry of toolCallTrend) {
+      for (const tool of allTools) {
+        if (entry[tool] === void 0) {
+          entry[tool] = 0;
+        }
+      }
+    }
+  }
   return { codeChangeTrend, toolUsageDistribution, productivityKPIs, toolCallTrend };
 }
@@ -2035,11 +2148,11 @@ function resolvePort(value) {
   return Number.isInteger(value) && value && value > 0 ? value : 3456;
 }
 function listen(app, port) {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve2, reject) => {
     const server = app.listen(port);
     const handleListening = () => {
       cleanup();
-      resolve(server);
+      resolve2(server);
     };
     const handleError = (error) => {
       cleanup();
@@ -2068,16 +2181,29 @@ async function listenWithPortFallback(app, preferredPort) {
   }
   throw new Error(`Could not find an available port starting from ${preferredPort}`);
 }
+function resolveStaticAssetBaseDir(moduleUrl = __esbuild_import_meta_url, baseDir) {
+  if (baseDir) return { baseDir: (0, import_node_path8.resolve)(baseDir), isProduction: true };
+  const moduleDir = (0, import_node_path8.dirname)((0, import_node_url.fileURLToPath)(moduleUrl));
+  const isProduction = moduleUrl.includes("/dist/");
+  if (!isProduction) return { baseDir: (0, import_node_path8.resolve)(moduleDir), isProduction: false };
+  if ((0, import_node_path8.basename)(moduleDir) === "server") {
+    return { baseDir: (0, import_node_path8.resolve)((0, import_node_path8.dirname)(moduleDir)), isProduction: true };
+  }
+  return { baseDir: (0, import_node_path8.resolve)(moduleDir), isProduction: true };
+}
 function createApp(_port, baseDir) {
   const app = (0, import_express.default)();
   const router = import_express.default.Router();
   registerApiRoutes(router);
   app.use("/api", router);
-  const _baseDir = baseDir ?? (0, import_node_path8.dirname)((0, import_node_url.fileURLToPath)(__esbuild_import_meta_url));
-  const isProduction = baseDir ? true : __esbuild_import_meta_url.includes("dist/");
+  const { baseDir: _baseDir, isProduction } = resolveStaticAssetBaseDir(__esbuild_import_meta_url, baseDir);
   const popoverPath = isProduction ? (0, import_node_path8.join)(_baseDir, "client", "popover.html") : (0, import_node_path8.join)(_baseDir, "..", "..", "public", "popover.html");
-  app.get("/popover.html", (_req, res) => {
-    res.sendFile(popoverPath);
+  app.get("/popover.html", (_req, res, next) => {
+    if (!(0, import_node_fs8.existsSync)(popoverPath)) {
+      next();
+      return;
+    }
+    res.type("html").send((0, import_node_fs8.readFileSync)(popoverPath, "utf8"));
   });
   if (isProduction) {
     const clientPath = (0, import_node_path8.join)(_baseDir, "client");
@@ -2157,6 +2283,7 @@ async function main() {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createApp,
-  main
+  main,
+  resolveStaticAssetBaseDir
 });
 //# sourceMappingURL=electron-server.cjs.map