@zhangferry-dev/tokendash 1.4.0 → 1.4.2

package/dist/server/codexParser.d.ts

@@ -29,11 +29,10 @@ export declare function scanCodexSessions(): string[];
 /**
  * Parse a single Codex session JSONL file.
  *
- * CRITICAL INVARIANT: Sum ALL token_count events without any deduplication.
- * Each Codex turn emits TWO token_count events with identical last_token_usage
- * values (~1-2s apart) — one for reasoning, one for output completion.
- * Both are distinct billable events. Deduplicating would produce the wrong
- * total (4.7M instead of the correct 9.2M).
+ * Codex can emit duplicate token_count events for the same turn, with identical
+ * total_token_usage and last_token_usage snapshots a few seconds apart. These
+ * are repeated status updates, not separate billable usage records, so only the
+ * first occurrence of each cumulative total_token_usage snapshot should count.
  */
 export declare function parseCodexSession(filepath: string): ParsedSession | null;
 /** Parse all Codex sessions. */

package/dist/server/codexParser.js

@@ -21,6 +21,15 @@ const TokenCountPayloadSchema = z.object({
     type: 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(':');
+}
 // ---------------------------------------------------------------------------
 // Helpers
 // ---------------------------------------------------------------------------
@@ -73,11 +82,10 @@ export function scanCodexSessions() {
 /**
  * Parse a single Codex session JSONL file.
  *
- * CRITICAL INVARIANT: Sum ALL token_count events without any deduplication.
- * Each Codex turn emits TWO token_count events with identical last_token_usage
- * values (~1-2s apart) — one for reasoning, one for output completion.
- * Both are distinct billable events. Deduplicating would produce the wrong
- * total (4.7M instead of the correct 9.2M).
+ * Codex can emit duplicate token_count events for the same turn, with identical
+ * total_token_usage and last_token_usage snapshots a few seconds apart. These
+ * are repeated status updates, not separate billable usage records, so only the
+ * first occurrence of each cumulative total_token_usage snapshot should count.
  */
 export function parseCodexSession(filepath) {
     let content;
@@ -93,6 +101,7 @@ export function parseCodexSession(filepath) {
     let model = '';
     let createdAt = '';
     const tokenEvents = [];
+    const seenTotalUsageSnapshots = new Set();
     for (const line of lines) {
         const trimmed = line.trim();
         if (!trimmed)
@@ -118,7 +127,6 @@ export function parseCodexSession(filepath) {
             }
         }
         // Extract token counts from event_msg with nested token_count payload.
-        // NEVER deduplicate — see invariant comment above.
         if (type === 'event_msg') {
             const payload = obj.payload || {};
             if (payload.type === 'token_count') {
@@ -131,6 +139,10 @@ export 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,

package/electron/main.cjs

@@ -51,7 +51,7 @@ let popover = null;
 let server = null;
 let trayProcess = null;
 let selectedAgents = null; // null = use all available agents
-const serverPort = parseInt(process.env.TOKENDASH_PORT || '3456', 10);
+let serverPort = parseInt(process.env.TOKENDASH_PORT || '3456', 10);
 const POPOVER_WIDTH = 380;
 const POPOVER_HEIGHT = 540;
 const PACKAGE_NAME = '@zhangferry-dev/tokendash';
@@ -250,6 +250,27 @@ function stopTrayHelper() {
 // ---------------------------------------------------------------------------
 
 let updateTimer = null;
+let lastTraySnapshot = null;
+
+function getTrayAgentKey(agents) {
+  return agents.slice().sort().join(',');
+}
+
+function applyTraySnapshot(snapshot) {
+  const totalTokens = Number(snapshot && snapshot.totalTokens) || 0;
+  const totalCost = Number(snapshot && snapshot.totalCost) || 0;
+  const totalCacheRead = Number(snapshot && snapshot.totalCacheRead) || 0;
+  const today = snapshot && snapshot.today;
+  const agentKey = snapshot && snapshot.agentKey;
+
+  lastTraySnapshot = { today, agentKey, totalTokens, totalCost, totalCacheRead };
+
+  const tokenStr = formatTokens(totalTokens);
+  sendTrayCommand('title:' + tokenStr);
+
+  const cacheRate = totalTokens > 0 ? ((totalCacheRead / totalTokens) * 100).toFixed(1) : '0.0';
+  sendTrayCommand('tooltip:TokenDash - ' + tokenStr + ' tokens today ($' + totalCost.toFixed(2) + ') | cache: ' + cacheRate + '%');
+}
 
 function updateTrayBadge() {
   const d = new Date(); const today = d.getFullYear() + "-" + String(d.getMonth()+1).padStart(2,"0") + "-" + String(d.getDate()).padStart(2,"0");
@@ -257,20 +278,35 @@ function updateTrayBadge() {
   // Fetch agents list, then fetch daily data for each agent in parallel
   fetchJson(`http://localhost:${serverPort}/api/agents`)
     .then((agentData) => {
-      let agents = (agentData && agentData.available) ? agentData.available : ['claude'];
+      let agents = (agentData && Array.isArray(agentData.available)) ? agentData.available : ['claude'];
+      if (agents.length === 0) {
+        // Transient agent detection failures should not clear a previously valid tray badge.
+        return null;
+      }
+
       // Apply agent filter from popover settings
       if (selectedAgents && selectedAgents.length > 0) {
-        agents = agents.filter(a => selectedAgents.includes(a));
-        if (agents.length === 0) agents = (agentData && agentData.available) ? agentData.available : ['claude'];
+        const filtered = agents.filter(a => selectedAgents.includes(a));
+        if (filtered.length > 0) agents = filtered;
       }
+
+      const agentKey = getTrayAgentKey(agents);
       return Promise.all(
         agents.map(agent =>
           fetchJson(`http://localhost:${serverPort}/api/daily?agent=${agent}`)
             .catch(() => null)
         )
-      );
+      ).then(results => ({ agentKey, results }));
     })
-    .then((results) => {
+    .then((payload) => {
+      if (!payload) return;
+      const { agentKey, results } = payload;
+      const successfulResults = results.filter(data => data && data.daily);
+      if (successfulResults.length === 0) {
+        // Keep the last good value when every daily request failed.
+        return;
+      }
+
       let totalTokens = 0;
       let totalCost = 0;
       let totalInput = 0;
@@ -288,13 +324,20 @@ function updateTrayBadge() {
         totalCacheRead += entry.cacheReadTokens || 0;
       }
 
-      // Show token count on tray icon
-      const tokenStr = formatTokens(totalTokens);
-      sendTrayCommand('title:' + tokenStr);
+      const shouldPreserveLastPositive =
+        totalTokens === 0 &&
+        lastTraySnapshot &&
+        lastTraySnapshot.today === today &&
+        lastTraySnapshot.agentKey === agentKey &&
+        lastTraySnapshot.totalTokens > 0;
+
+      if (shouldPreserveLastPositive) {
+        // Daily usage should not drop to zero during the same day for the same agent filter.
+        // Treat a zero refresh after a positive value as transient empty data and keep the badge stable.
+        return;
+      }
 
-      // Tooltip with breakdown
-      const cacheRate = totalTokens > 0 ? ((totalCacheRead / totalTokens) * 100).toFixed(1) : '0.0';
-      sendTrayCommand('tooltip:TokenDash - ' + tokenStr + ' tokens today ($' + totalCost.toFixed(2) + ') | cache: ' + cacheRate + '%');
+      applyTraySnapshot({ today, agentKey, totalTokens, totalCost, totalCacheRead });
     })
     .catch((err) => {
       if (err.code !== 'ECONNREFUSED') {
@@ -403,10 +446,17 @@ function registerIpcHandlers() {
 
   ipcMain.handle('tokendash:set-selected-agents', (_event, agents) => {
     selectedAgents = Array.isArray(agents) ? agents : null;
+    lastTraySnapshot = null;
     // Immediately refresh badge with new filter
     updateTrayBadge();
     return { ok: true };
   });
+
+  ipcMain.handle('tokendash:update-tray-snapshot', (_event, snapshot) => {
+    if (!snapshot || typeof snapshot !== 'object') return { ok: false };
+    applyTraySnapshot(snapshot);
+    return { ok: true };
+  });
 }
 
 // ---------------------------------------------------------------------------
@@ -414,6 +464,10 @@ function registerIpcHandlers() {
 // ---------------------------------------------------------------------------
 
 app.whenReady().then(async () => {
+  if (process.platform === 'darwin' && app.dock) {
+    app.dock.hide();
+  }
+
   registerIpcHandlers();
 
   app.on('before-quit', () => {
@@ -430,6 +484,7 @@ app.whenReady().then(async () => {
   try {
     const result = await listenWithFallback(expressApp, serverPort);
     server = result.server;
+    serverPort = result.port;
     console.log(`tokendash running on http://localhost:${result.port}`);
   } catch (err) {
     console.error('Failed to start server:', err);

package/electron/preload.cjs

@@ -19,4 +19,7 @@ contextBridge.exposeInMainWorld('electronAPI', {
   setSelectedAgents(agents) {
     return ipcRenderer.invoke('tokendash:set-selected-agents', agents);
   },
+  updateTraySnapshot(snapshot) {
+    return ipcRenderer.invoke('tokendash:update-tray-snapshot', snapshot);
+  },
 });

package/electron/trayBadge.cjs

@@ -5,10 +5,12 @@
  * Examples: 1234 -> "1.2K", 567890 -> "567.9K", 1500000 -> "1.5M"
  */
 function formatTokens(tokens) {
+  tokens = Number(tokens) || 0;
+
   if (tokens >= 1e6) return (tokens / 1e6).toFixed(1) + 'M';
   if (tokens >= 1e3) return (tokens / 1e3).toFixed(1) + 'K';
   if (tokens > 0) return String(tokens);
-  return '0.0M';
+  return '0';
 }
 
 /**

package/electron/trayHelper.swift

@@ -9,18 +9,17 @@ import Cocoa
 class AppDelegate: NSObject, NSApplicationDelegate {
     var statusItem: NSStatusItem!
     var readHandle: FileHandle?
+    var currentTitle = "0"
 
     func applicationDidFinishLaunching(_ notification: Notification) {
         // Create status bar item
         statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
 
-        // Add a small template icon (filled circle) before the title
-        let icon = createTemplateIcon(size: NSSize(width: 18, height: 18))
-        statusItem.button?.image = icon
-        statusItem.button?.imagePosition = .imageLeft
+        statusItem.button?.image = renderCombinedImage(title: currentTitle)
+        statusItem.button?.imagePosition = .imageOnly
         statusItem.button?.imageScaling = .scaleProportionallyDown
-
-        statusItem.button?.title = "0.0M"
+        statusItem.button?.isBordered = false
+        statusItem.button?.title = ""
         statusItem.button?.toolTip = "TokenDash"
 
         // Set up click actions — both left and right click
@@ -42,9 +41,39 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         sendEvent("ready")
     }
 
+    /// Render icon + title text into a single template image for the status bar.
+    func renderCombinedImage(title: String) -> NSImage {
+        let iconW: CGFloat = 18
+        let iconH: CGFloat = 18
+        let fontSize: CGFloat = 13
+        let font = NSFont.monospacedSystemFont(ofSize: fontSize, weight: .medium)
+        let textAttrs: [NSAttributedString.Key: Any] = [.font: font]
+        let textWidth = (title as NSString).size(withAttributes: textAttrs).width
+        let padding: CGFloat = 4  // gap between icon and text
+
+        let totalWidth = iconW + padding + textWidth
+        // Status bar height is ~22pt; center vertically
+        let totalHeight: CGFloat = 20
+
+        let image = NSImage(size: NSSize(width: totalWidth, height: totalHeight))
+        image.lockFocus()
+
+        // Draw icon centered vertically
+        let icon = createTemplateIcon(size: NSSize(width: iconW, height: iconH))
+        let iconY = (totalHeight - iconH) / 2.0
+        icon.draw(in: NSRect(x: 0, y: iconY, width: iconW, height: iconH))
+
+        // Draw text centered vertically (baseline-adjusted)
+        let textY = (totalHeight - fontSize) / 2.0 - 1
+        (title as NSString).draw(at: NSPoint(x: iconW + padding, y: textY), withAttributes: textAttrs)
+
+        image.unlockFocus()
+        image.isTemplate = true
+        return image
+    }
+
     @objc func handleClick(_ sender: Any?) {
         guard let _ = NSApp.currentEvent else { return }
-        // Send click with screen coordinates so Electron can position the popover
         let loc = NSEvent.mouseLocation
         sendEvent("click:\(Int(loc.x)),\(Int(loc.y))")
     }
@@ -60,7 +89,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
                 let cmd = command.trimmingCharacters(in: .whitespacesAndNewlines)
                 if cmd.hasPrefix("title:") {
                     let title = String(cmd.dropFirst(6))
-                    statusItem.button?.title = title
+                    currentTitle = title
+                    statusItem.button?.image = renderCombinedImage(title: title)
                 } else if cmd.hasPrefix("tooltip:") {
                     let tooltip = String(cmd.dropFirst(8))
                     statusItem.button?.toolTip = tooltip
@@ -83,32 +113,24 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         let image = NSImage(size: size)
         image.lockFocus()
 
-        // Draw the TokenDash wavy line icon (from SVG, 64x64 viewBox scaled to size)
-        // SVG coords use top-left origin; AppKit uses bottom-left, so flip Y: y = (64 - svgY)
         let sx = size.width / 64.0
         let sy = size.height / 64.0
 
         let path = NSBezierPath()
-        // M6,32 H18
         path.move(to: NSPoint(x: 6 * sx, y: (64 - 32) * sy))
         path.line(to: NSPoint(x: 18 * sx, y: (64 - 32) * sy))
-        // C21,32 22.5,34 24.5,39
         path.curve(to: NSPoint(x: 24.5 * sx, y: (64 - 39) * sy),
                    controlPoint1: NSPoint(x: 21 * sx, y: (64 - 32) * sy),
                    controlPoint2: NSPoint(x: 22.5 * sx, y: (64 - 34) * sy))
-        // C27,45.5 30,50 34,50
         path.curve(to: NSPoint(x: 34 * sx, y: (64 - 50) * sy),
                    controlPoint1: NSPoint(x: 27 * sx, y: (64 - 45.5) * sy),
                    controlPoint2: NSPoint(x: 30 * sx, y: (64 - 50) * sy))
-        // C38,50 40.5,42 44,22
         path.curve(to: NSPoint(x: 44 * sx, y: (64 - 22) * sy),
                    controlPoint1: NSPoint(x: 38 * sx, y: (64 - 50) * sy),
                    controlPoint2: NSPoint(x: 40.5 * sx, y: (64 - 42) * sy))
-        // C46,11 49,8 52,8
         path.curve(to: NSPoint(x: 52 * sx, y: (64 - 8) * sy),
                    controlPoint1: NSPoint(x: 46 * sx, y: (64 - 11) * sy),
                    controlPoint2: NSPoint(x: 49 * sx, y: (64 - 8) * sy))
-        // C55,8 57.5,13 60,22
         path.curve(to: NSPoint(x: 60 * sx, y: (64 - 22) * sy),
                    controlPoint1: NSPoint(x: 55 * sx, y: (64 - 8) * sy),
                    controlPoint2: NSPoint(x: 57.5 * sx, y: (64 - 13) * sy))

package/electron-builder.yml

@@ -10,8 +10,11 @@ files:
 mac:
   target: dmg
   category: public.app-category.developer-tools
-  icon: resources/icon.png
+  icon: resources/icon.icns
   identity: null
   darkModeSupport: true
+  minimumSystemVersion: '14.0'
+  extendInfo:
+    LSUIElement: true
 extraMetadata:
   main: electron/main.cjs

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhangferry-dev/tokendash",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "type": "module",
   "description": "Token Usage Analytics Dashboard",
   "publishConfig": {