tokentracker-cli 0.84.9 → 0.86.0

package/src/lib/install-resolver.js

@@ -45,13 +45,21 @@ function ensureNamespacedCursors(cursors, providerName, activeKeys = ["native",
   return cursors[providerName];
 }
 
-function ensureFlatCursor(cursors, providerName, env) {
+// Collapse { native, wsl } namespaces back into a flat cursor when only one
+// install remains. `preferredKey` names the SURVIVING install's namespace —
+// its keys must win the merge, otherwise the vanished install's cursor
+// (lastDbId watermarks, dedup maps) is donated to the survivor and its next
+// parse double-counts everything past the foreign cursor. Callers that don't
+// know the survivor fall back to the mode preference (legacy behavior).
+function ensureFlatCursor(cursors, providerName, env, preferredKey) {
   const state = cursors[providerName];
   if (!state || typeof state !== "object") return;
   if (state.native === undefined && state.wsl === undefined) return;
 
   const mode = wsl.getWslMode(env || process.env);
-  const preferWsl = mode === "wsl-first" || mode === "wsl-only";
+  const preferWsl = preferredKey === "wsl" || preferredKey === "native"
+    ? preferredKey === "wsl"
+    : mode === "wsl-first" || mode === "wsl-only";
   const merged = preferWsl ? { ...state.native, ...state.wsl } : { ...state.wsl, ...state.native };
   cursors[providerName] = merged;
 }

package/src/lib/local-api.js

@@ -57,6 +57,7 @@ const {
 } = require("./claude-categorizer");
 
 const { computeCodexContextBreakdown } = require("./codex-context-breakdown");
+const { computeGrokContextBreakdown } = require("./grok-context-breakdown");
 
 const {
   deriveProjectKeyFromRef,
@@ -2308,11 +2309,11 @@ function createLocalApiHandler({ queuePath }) {
       return true;
     }
 
-    // --- usage-category-breakdown (Claude + Codex) ---
+    // --- usage-category-breakdown (Claude + Codex + Grok) ---
     // Claude: splits historical Claude usage into seven semantic categories
     // mirroring Claude Code's /context view (approx).
-    // Codex: provides a tool-oriented breakdown, attributing per-turn token
-    // deltas to observed tool calls (heuristic).
+    // Codex/Grok: tool-oriented breakdown, attributing per-turn token
+    // totals to observed tool calls (heuristic).
     if (p === "/functions/tokentracker-usage-category-breakdown") {
       const from = url.searchParams.get("from") || "";
       const to = url.searchParams.get("to") || "";
@@ -2354,6 +2355,23 @@ function createLocalApiHandler({ queuePath }) {
         return true;
       }
 
+      if (requestedSource === "grok") {
+        try {
+          const timeZoneContext = getTimeZoneContext(url);
+          const result = await computeGrokContextBreakdown({
+            from,
+            to,
+            top: 50,
+            timeZoneContext,
+          });
+          json(res, { from, to, ...result });
+        } catch (e) {
+          console.error("[LocalAPI] usage-category-breakdown(grok):", e?.message || e);
+          json(res, { from, to, ...unsupportedCategoryPayload("grok"), error: "compute_failed" }, 500);
+        }
+        return true;
+      }
+
       json(res, { from, to, ...unsupportedCategoryPayload(requestedSource) });
       return true;
     }

package/src/lib/multi-install-parser.js

@@ -11,7 +11,15 @@ async function multiInstallParse({ paths, parserFn, providerName, cursors, getPa
   const env = shared.env || process.env;
 
   if (installKeys.length === 1) {
-    ensureFlatCursor(cursors, providerName, env);
+    // Flatten toward the SURVIVING install's namespace, not the mode
+    // preference: under wsl-first a vanished WSL install (deleted distro,
+    // transient wsl.exe probe failure) must not donate its cursor to the
+    // remaining native install. Non-both modes park the pick in the `native`
+    // slot regardless of identity, so the slot name is unreliable — WSL
+    // installs are always addressed via UNC paths, which identifies the
+    // survivor directly.
+    const survivorKey = wsl.isUncPath(paths[installKeys[0]]) ? "wsl" : "native";
+    ensureFlatCursor(cursors, providerName, env, survivorKey);
     return await parserFn({
       ...getParams(paths[installKeys[0]], installKeys[0]),
       ...shared,