tokentracker-cli 0.19.0 → 0.20.0

package/dashboard/dist/assets/{use-limits-display-prefs-Yy8t7tbB.js → use-limits-display-prefs-BeGKWUuk.js}

@@ -1 +1 @@
-import{r as a}from"./main-DtrPNYb7.js";const d=["claude","codex","cursor","gemini","kimi","kiro","copilot","antigravity"],S={claude:"Claude",codex:"Codex",cursor:"Cursor",gemini:"Gemini",kimi:"Kimi",kiro:"Kiro",copilot:"GitHub Copilot",antigravity:"Antigravity"},v={claude:"/brand-logos/claude-code.svg",codex:"/brand-logos/codex.svg",cursor:"/brand-logos/cursor.svg",gemini:"/brand-logos/gemini.svg",kimi:"/brand-logos/kimi.svg",kiro:"/brand-logos/kiro.svg",copilot:"/brand-logos/copilot.svg",antigravity:"/brand-logos/antigravity.svg"},l="tt.limits.providerOrder",g="tt.limits.providerVisibility";function w(){if(typeof window>"u")return[...d];try{const i=window.localStorage.getItem(l);if(!i)return[...d];const s=JSON.parse(i);if(!Array.isArray(s))return[...d];const r=s.filter(c=>d.includes(c));for(const c of d)r.includes(c)||r.push(c);return r}catch{return[...d]}}function y(){const i=Object.fromEntries(d.map(s=>[s,!0]));if(typeof window>"u")return i;try{const s=window.localStorage.getItem(g);if(!s)return i;const r=JSON.parse(s);if(!r||typeof r!="object")return i;const c={...i};for(const u of d)typeof r[u]=="boolean"&&(c[u]=r[u]);return c}catch{return i}}function C(){const[i,s]=a.useState(w),[r,c]=a.useState(y);a.useEffect(()=>{if(!(typeof window>"u"))try{window.localStorage.setItem(l,JSON.stringify(i))}catch{}},[i]),a.useEffect(()=>{if(!(typeof window>"u"))try{window.localStorage.setItem(g,JSON.stringify(r))}catch{}},[r]),a.useEffect(()=>{if(typeof window>"u")return;const o=t=>{t.key===l&&s(w()),t.key===g&&c(y())};return window.addEventListener("storage",o),()=>window.removeEventListener("storage",o)},[]);const u=a.useCallback(o=>{c(t=>({...t,[o]:!t[o]}))},[]),b=a.useCallback(o=>{s(t=>{const e=t.indexOf(o);if(e<=0)return t;const n=[...t];return[n[e-1],n[e]]=[n[e],n[e-1]],n})},[]),p=a.useCallback(o=>{s(t=>{const e=t.indexOf(o);if(e<0||e>=t.length-1)return t;const n=[...t];return[n[e],n[e+1]]=[n[e+1],n[e]],n})},[]),O=a.useCallback((o,t)=>{o!==t&&s(e=>{const n=e.indexOf(o),m=e.indexOf(t);if(n<0||m<0)return e;const f=[...e],[I]=f.splice(n,1);return f.splice(m,0,I),f})},[]),k=a.useCallback(()=>{s([...d]),c(Object.fromEntries(d.map(o=>[o,!0])))},[]),x=a.useMemo(()=>i.filter(o=>r[o]!==!1),[i,r]);return{order:i,visibility:r,visibleOrdered:x,toggle:u,moveUp:b,moveDown:p,moveToward:O,reset:k}}export{v as L,S as a,C as u};
+import{r as a}from"./main-11hApDak.js";const d=["claude","codex","cursor","gemini","kimi","kiro","copilot","antigravity"],S={claude:"Claude",codex:"Codex",cursor:"Cursor",gemini:"Gemini",kimi:"Kimi",kiro:"Kiro",copilot:"GitHub Copilot",antigravity:"Antigravity"},v={claude:"/brand-logos/claude-code.svg",codex:"/brand-logos/codex.svg",cursor:"/brand-logos/cursor.svg",gemini:"/brand-logos/gemini.svg",kimi:"/brand-logos/kimi.svg",kiro:"/brand-logos/kiro.svg",copilot:"/brand-logos/copilot.svg",antigravity:"/brand-logos/antigravity.svg"},l="tt.limits.providerOrder",g="tt.limits.providerVisibility";function w(){if(typeof window>"u")return[...d];try{const i=window.localStorage.getItem(l);if(!i)return[...d];const s=JSON.parse(i);if(!Array.isArray(s))return[...d];const r=s.filter(c=>d.includes(c));for(const c of d)r.includes(c)||r.push(c);return r}catch{return[...d]}}function y(){const i=Object.fromEntries(d.map(s=>[s,!0]));if(typeof window>"u")return i;try{const s=window.localStorage.getItem(g);if(!s)return i;const r=JSON.parse(s);if(!r||typeof r!="object")return i;const c={...i};for(const u of d)typeof r[u]=="boolean"&&(c[u]=r[u]);return c}catch{return i}}function C(){const[i,s]=a.useState(w),[r,c]=a.useState(y);a.useEffect(()=>{if(!(typeof window>"u"))try{window.localStorage.setItem(l,JSON.stringify(i))}catch{}},[i]),a.useEffect(()=>{if(!(typeof window>"u"))try{window.localStorage.setItem(g,JSON.stringify(r))}catch{}},[r]),a.useEffect(()=>{if(typeof window>"u")return;const o=t=>{t.key===l&&s(w()),t.key===g&&c(y())};return window.addEventListener("storage",o),()=>window.removeEventListener("storage",o)},[]);const u=a.useCallback(o=>{c(t=>({...t,[o]:!t[o]}))},[]),b=a.useCallback(o=>{s(t=>{const e=t.indexOf(o);if(e<=0)return t;const n=[...t];return[n[e-1],n[e]]=[n[e],n[e-1]],n})},[]),p=a.useCallback(o=>{s(t=>{const e=t.indexOf(o);if(e<0||e>=t.length-1)return t;const n=[...t];return[n[e],n[e+1]]=[n[e+1],n[e]],n})},[]),O=a.useCallback((o,t)=>{o!==t&&s(e=>{const n=e.indexOf(o),m=e.indexOf(t);if(n<0||m<0)return e;const f=[...e],[I]=f.splice(n,1);return f.splice(m,0,I),f})},[]),k=a.useCallback(()=>{s([...d]),c(Object.fromEntries(d.map(o=>[o,!0])))},[]),x=a.useMemo(()=>i.filter(o=>r[o]!==!1),[i,r]);return{order:i,visibility:r,visibleOrdered:x,toggle:u,moveUp:b,moveDown:p,moveToward:O,reset:k}}export{v as L,S as a,C as u};

package/dashboard/dist/assets/{use-native-settings-uemf9RSH.js → use-native-settings-nTTHktn0.js}

@@ -1 +1 @@
-import{D as a,a5 as x,r as n,aB as g,aC as m,aD as b,aE as u,aF as f,az as h}from"./main-DtrPNYb7.js";import{C as y}from"./Card-ANC9ZmIT.js";function p({checked:s,onChange:t,disabled:e,ariaLabel:i}){return a.jsx("button",{type:"button",role:"switch","aria-checked":s,"aria-label":i,onClick:t,disabled:e,className:x("relative inline-flex h-5 w-9 shrink-0 items-center rounded-full transition-colors focus:outline-none focus-visible:ring-2 focus-visible:ring-oai-brand-500 disabled:opacity-50 disabled:cursor-not-allowed",s?"bg-oai-brand-500":"bg-oai-gray-300 dark:bg-oai-gray-700"),children:a.jsx("span",{className:x("inline-block h-3.5 w-3.5 rounded-full bg-white transition-transform",s?"translate-x-[18px]":"translate-x-[3px]")})})}function j({label:s,hint:t,control:e}){return a.jsxs("div",{className:"flex items-center justify-between gap-4 py-3",children:[a.jsxs("div",{className:"min-w-0 flex-1",children:[a.jsx("div",{className:"text-sm text-oai-gray-900 dark:text-oai-gray-200",children:s}),t?a.jsx("div",{className:"mt-0.5 text-xs text-oai-gray-500 dark:text-oai-gray-400",children:t}):null]}),a.jsx("div",{className:"shrink-0",children:e})]})}function N({title:s,subtitle:t,action:e,children:i}){return a.jsxs(y,{children:[a.jsxs("div",{className:"mb-3 flex items-start justify-between gap-4",children:[a.jsxs("div",{className:"min-w-0 flex-1",children:[a.jsx("h2",{className:"text-sm font-medium text-oai-gray-500 dark:text-oai-gray-300 uppercase tracking-wide",children:s}),t?a.jsx("p",{className:"mt-1 truncate text-xs text-oai-gray-500 dark:text-oai-gray-400",children:t}):null]}),e?a.jsx("div",{className:"shrink-0",children:e}):null]}),a.jsx("div",{className:"-mb-3 divide-y divide-oai-gray-200/60 dark:divide-oai-gray-800/60",children:i})]})}function w({options:s,value:t,onChange:e}){return a.jsx("div",{className:"inline-flex items-center rounded-lg border border-oai-gray-200 bg-oai-gray-50 p-0.5 dark:border-oai-gray-800 dark:bg-oai-gray-900",children:s.map(({value:i,label:d,Icon:l})=>{const r=t===i;return a.jsxs("button",{type:"button",onClick:()=>e(i),"aria-pressed":r,className:x("inline-flex items-center gap-1.5 rounded-md px-3 py-1.5 text-xs font-medium transition-colors",r?"bg-white text-oai-black shadow-sm dark:bg-oai-gray-800 dark:text-white":"text-oai-gray-500 hover:text-oai-black dark:text-oai-gray-400 dark:hover:text-white"),children:[l?a.jsx(l,{className:"h-3.5 w-3.5","aria-hidden":!0}):null,a.jsx("span",{children:d})]},i)})})}function S(){const[s,t]=n.useState(null),e=g()&&m();n.useEffect(()=>{if(!e)return;const r=b(o=>t(o));return u(),r},[e]);const i=n.useCallback((r,o)=>{e&&(t(c=>c&&{...c,[r]:o}),f(r,o))},[e]),d=n.useCallback(r=>{e&&h(r)},[e]),l=n.useCallback(()=>{e&&u()},[e]);return{available:e,settings:s,setSetting:i,runAction:d,refresh:l}}export{N as S,p as T,j as a,w as b,S as u};
+import{D as a,a5 as x,r as n,aB as g,aC as m,aD as b,aE as u,aF as f,az as h}from"./main-11hApDak.js";import{C as y}from"./Card-jA08WeEw.js";function p({checked:s,onChange:t,disabled:e,ariaLabel:i}){return a.jsx("button",{type:"button",role:"switch","aria-checked":s,"aria-label":i,onClick:t,disabled:e,className:x("relative inline-flex h-5 w-9 shrink-0 items-center rounded-full transition-colors focus:outline-none focus-visible:ring-2 focus-visible:ring-oai-brand-500 disabled:opacity-50 disabled:cursor-not-allowed",s?"bg-oai-brand-500":"bg-oai-gray-300 dark:bg-oai-gray-700"),children:a.jsx("span",{className:x("inline-block h-3.5 w-3.5 rounded-full bg-white transition-transform",s?"translate-x-[18px]":"translate-x-[3px]")})})}function j({label:s,hint:t,control:e}){return a.jsxs("div",{className:"flex items-center justify-between gap-4 py-3",children:[a.jsxs("div",{className:"min-w-0 flex-1",children:[a.jsx("div",{className:"text-sm text-oai-gray-900 dark:text-oai-gray-200",children:s}),t?a.jsx("div",{className:"mt-0.5 text-xs text-oai-gray-500 dark:text-oai-gray-400",children:t}):null]}),a.jsx("div",{className:"shrink-0",children:e})]})}function N({title:s,subtitle:t,action:e,children:i}){return a.jsxs(y,{children:[a.jsxs("div",{className:"mb-3 flex items-start justify-between gap-4",children:[a.jsxs("div",{className:"min-w-0 flex-1",children:[a.jsx("h2",{className:"text-sm font-medium text-oai-gray-500 dark:text-oai-gray-300 uppercase tracking-wide",children:s}),t?a.jsx("p",{className:"mt-1 truncate text-xs text-oai-gray-500 dark:text-oai-gray-400",children:t}):null]}),e?a.jsx("div",{className:"shrink-0",children:e}):null]}),a.jsx("div",{className:"-mb-3 divide-y divide-oai-gray-200/60 dark:divide-oai-gray-800/60",children:i})]})}function w({options:s,value:t,onChange:e}){return a.jsx("div",{className:"inline-flex items-center rounded-lg border border-oai-gray-200 bg-oai-gray-50 p-0.5 dark:border-oai-gray-800 dark:bg-oai-gray-900",children:s.map(({value:i,label:d,Icon:l})=>{const r=t===i;return a.jsxs("button",{type:"button",onClick:()=>e(i),"aria-pressed":r,className:x("inline-flex items-center gap-1.5 rounded-md px-3 py-1.5 text-xs font-medium transition-colors",r?"bg-white text-oai-black shadow-sm dark:bg-oai-gray-800 dark:text-white":"text-oai-gray-500 hover:text-oai-black dark:text-oai-gray-400 dark:hover:text-white"),children:[l?a.jsx(l,{className:"h-3.5 w-3.5","aria-hidden":!0}):null,a.jsx("span",{children:d})]},i)})})}function S(){const[s,t]=n.useState(null),e=g()&&m();n.useEffect(()=>{if(!e)return;const r=b(o=>t(o));return u(),r},[e]);const i=n.useCallback((r,o)=>{e&&(t(c=>c&&{...c,[r]:o}),f(r,o))},[e]),d=n.useCallback(r=>{e&&h(r)},[e]),l=n.useCallback(()=>{e&&u()},[e]);return{available:e,settings:s,setSetting:i,runAction:d,refresh:l}}export{N as S,p as T,j as a,w as b,S as u};

package/dashboard/dist/assets/{use-reduced-motion-DH8DxE18.js → use-reduced-motion-DU8Gm6j1.js}

@@ -1 +1 @@
-import{aG as t,aH as o,r,aI as s}from"./main-DtrPNYb7.js";function u(){!t.current&&o();const[e]=r.useState(s.current);return e}export{u};
+import{aG as t,aH as o,r,aI as s}from"./main-11hApDak.js";function u(){!t.current&&o();const[e]=r.useState(s.current);return e}export{u};

package/dashboard/dist/assets/{use-usage-limits-C3vUT6PH.js → use-usage-limits-DTPmEB8Y.js}

@@ -1 +1 @@
-import{r,aj as l}from"./main-DtrPNYb7.js";function y(i){const[o,a]=r.useState(null),[u,s]=r.useState(null),[c,f]=r.useState(!0),n=!!i?.initialRefresh,g=r.useCallback(async()=>{try{const e=await l({refresh:!0});a(e&&typeof e=="object"?e:null),s(null)}catch(e){s(e?.message||String(e))}},[]);return r.useEffect(()=>{let e=!1;return(async()=>{try{const t=await l(n?{refresh:!0}:{});if(e)return;a(t&&typeof t=="object"?t:null),s(null)}catch(t){if(e)return;s(t?.message||String(t))}finally{e||f(!1)}})(),()=>{e=!0}},[n]),{data:o,error:u,isLoading:c,refresh:g}}export{y as u};
+import{r,aj as l}from"./main-11hApDak.js";function y(i){const[o,a]=r.useState(null),[u,s]=r.useState(null),[c,f]=r.useState(!0),n=!!i?.initialRefresh,g=r.useCallback(async()=>{try{const e=await l({refresh:!0});a(e&&typeof e=="object"?e:null),s(null)}catch(e){s(e?.message||String(e))}},[]);return r.useEffect(()=>{let e=!1;return(async()=>{try{const t=await l(n?{refresh:!0}:{});if(e)return;a(t&&typeof t=="object"?t:null),s(null)}catch(t){if(e)return;s(t?.message||String(t))}finally{e||f(!1)}})(),()=>{e=!0}},[n]),{data:o,error:u,isLoading:c,refresh:g}}export{y as u};

package/dashboard/dist/index.html

@@ -210,7 +210,7 @@
         ]
       }
     </script>
-    <script type="module" crossorigin src="/assets/main-DtrPNYb7.js"></script>
+    <script type="module" crossorigin src="/assets/main-11hApDak.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/main-CITVpx5B.css">
   </head>
   <body>

package/dashboard/dist/share.html

@@ -51,7 +51,7 @@
         "description": "Shareable Token Tracker dashboard snapshot."
       }
     </script>
-    <script type="module" crossorigin src="/assets/main-DtrPNYb7.js"></script>
+    <script type="module" crossorigin src="/assets/main-11hApDak.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/main-CITVpx5B.css">
   </head>
   <body>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tokentracker-cli",
-  "version": "0.19.0",
+  "version": "0.20.0",
   "description": "Token usage tracker for AI agent CLIs (Claude Code, Codex, Cursor, Gemini, Kiro, OpenCode, OpenClaw, Every Code, Hermes, GitHub Copilot, Kimi Code, CodeBuddy, Grok Build, oh-my-pi, pi, Craft Agents, Kilo CLI, Kilo Code)",
   "main": "src/cli.js",
   "bin": {

package/src/commands/init.js

@@ -125,8 +125,6 @@ async function cmdInit(argv) {
     config: existingConfig || {},
     env: process.env,
   });
-  const baseUrl = runtime.baseUrl;
-  let dashboardUrl = runtime.dashboardUrl || DEFAULT_DASHBOARD_URL;
   const notifyPath = path.join(binDir, "notify.cjs");
   const appDir = path.join(trackerDir, "app");
   const trackerBinPath = path.join(appDir, "bin", "tracker.js");
@@ -172,7 +170,6 @@ async function cmdInit(argv) {
     setup = await runSetup({
       opts,
       home,
-      baseUrl,
       trackerDir,
       binDir,
       configPath,
@@ -302,7 +299,6 @@ async function buildDryRunSummary({ opts, home, trackerDir, notifyPath, runtime
 async function runSetup({
   opts,
   home,
-  baseUrl,
   trackerDir,
   binDir,
   configPath,
@@ -323,10 +319,18 @@ async function runSetup({
 
   await installLocalTrackerApp({ appDir });
 
+  const existingPlainConfig =
+    existingConfig && typeof existingConfig === "object" && !Array.isArray(existingConfig)
+      ? existingConfig
+      : {};
   const config = {
+    ...existingPlainConfig,
     installedAt,
-    baseUrl: DEFAULT_BASE_URL,
+    baseUrl: opts.baseUrl || existingPlainConfig.baseUrl || DEFAULT_BASE_URL,
   };
+  if (opts.dashboardUrl) {
+    config.dashboardUrl = opts.dashboardUrl;
+  }
 
   await writeJson(configPath, config);
   await chmod600IfPossible(configPath);

package/src/commands/serve.js

@@ -44,18 +44,6 @@ async function cmdServe(argv) {
     process.stdout.write(`Runtime refresh warning: ${e?.message || e}\n`);
   }
 
-  // 0.1 Ensure config.json baseUrl matches the canonical default
-  try {
-    const { DEFAULT_BASE_URL } = require("../lib/runtime-config");
-    const { readJson, writeJson } = require("../lib/fs");
-    const cfgPath = path.join(trackerDir, "config.json");
-    const cfg = await readJson(cfgPath);
-    if (cfg && cfg.baseUrl !== DEFAULT_BASE_URL) {
-      cfg.baseUrl = DEFAULT_BASE_URL;
-      await writeJson(cfgPath, cfg);
-    }
-  } catch { /* ignore */ }
-
   // 1. Optional sync
   if (opts.sync) {
     process.stdout.write("Syncing local data...\n");

package/src/commands/sync.js

@@ -14,7 +14,7 @@ const {
   readOpencodeDbMessages,
   resolveKiroDbPath,
   resolveKiroJsonlPath,
-  resolveHermesDbPath,
+  resolveHermesPath,
   resolveCopilotOtelPaths,
   parseRolloutIncremental,
   parseClaudeIncremental,
@@ -48,7 +48,6 @@ const {
   parseKilocodeIncremental,
   bucketKey,
   totalsKey,
-  groupBucketKey,
   claudeMessageDedupKey,
 } = require("../lib/rollout");
 const { computeClaudeGroundTruthBuckets } = require("../lib/claude-categorizer");
@@ -73,6 +72,7 @@ const { resolveRuntimeConfig } = require("../lib/runtime-config");
 const CURSOR_UNKNOWN_MIGRATION_KEY = "cursorUnknownPurge_2026_04";
 const ROLLOUT_CUMULATIVE_DELTA_MIGRATION_KEY = "rolloutCumulativeDeltaReparse_2026_05";
 const CLAUDE_MEM_OBSERVER_REINCLUDE_KEY = "claudeMemObserverReinclude_2026_05_v3";
+const GROK_APPEND_ONLY_REPAIR_MIGRATION_KEY = "grokAppendOnlyRepair_2026_05_v4";
 const CLAUDE_MEM_OBSERVER_PATH_SEGMENT = "--claude-mem-observer-sessions";
 // v1 had a cursor-format bug (wrote plain integer instead of {inode, offset,
 // updatedAt}), which made parseClaudeIncremental reread every jsonl from
@@ -500,13 +500,13 @@ async function cmdSync(argv) {
 
     // ── Hermes Agent (SQLite-based) ──
     let hermesResult = { recordsProcessed: 0, eventsAggregated: 0, bucketsQueued: 0 };
-    const hermesDbPath = resolveHermesDbPath();
-    if (fssync.existsSync(hermesDbPath)) {
+    const hermesPath = resolveHermesPath();
+    if (fssync.existsSync(hermesPath)) {
       if (progress?.enabled) {
         progress.start(`Parsing Hermes ${renderBar(0)} | buckets 0`);
       }
       hermesResult = await parseHermesIncremental({
-        dbPath: hermesDbPath,
+        hermesPath,
         cursors,
         queuePath,
         onProgress: (p) => {
@@ -681,18 +681,36 @@ async function cmdSync(argv) {
           ? grokHookSignal.sessionId.trim()
           : null;
       if (hookSessionId) {
+        const hookContextTokens =
+          grokHookSignal.contextTokensUsed != null
+            ? grokHookSignal.contextTokensUsed
+            : grokHookSignal.totalTokens;
+        const hookTotalTokens =
+          grokHookSignal.totalTokens != null
+            ? grokHookSignal.totalTokens
+            : hookContextTokens;
         grokSessionInputs.unshift({
           sessionId: hookSessionId,
+          sessionDir:
+            typeof grokHookSignal.sessionDir === "string" ? grokHookSignal.sessionDir : undefined,
+          updatesPath:
+            typeof grokHookSignal.updatesPath === "string" ? grokHookSignal.updatesPath : undefined,
+          signalsPath:
+            typeof grokHookSignal.signalsPath === "string" ? grokHookSignal.signalsPath : undefined,
+          summaryPath:
+            typeof grokHookSignal.summaryPath === "string" ? grokHookSignal.summaryPath : undefined,
           signals: {
-            contextTokensUsed: grokHookSignal.totalTokens,
+            contextTokensUsed: hookContextTokens,
+            totalTokens: hookTotalTokens,
+            totalTokensBeforeCompaction: grokHookSignal.totalTokensBeforeCompaction,
             assistantMessageCount: grokHookSignal.messageCount,
             primaryModelId: grokHookSignal.model,
             lastActiveAt: grokHookSignal.lastActive,
           },
           summary: { updated_at: grokHookSignal.lastActive },
         });
+        grokHookSignalConsumed = true;
       }
-      grokHookSignalConsumed = true;
     }
     if (grokSessionInputs.length > 0) {
       if (progress?.enabled) {
@@ -717,6 +735,9 @@ async function cmdSync(argv) {
         bucketsQueued: grokResult.bucketsQueued + grokScanResult.bucketsQueued,
       };
     }
+    if (opts.repairGrok) {
+      await repairGrokQueueFromSessionSnapshots({ cursors, queuePath, queueStatePath });
+    }
 
     // ── GitHub Copilot CLI (OTEL JSONL files) ──
     let copilotResult = { recordsProcessed: 0, eventsAggregated: 0, bucketsQueued: 0 };
@@ -899,6 +920,7 @@ function parseArgs(argv) {
     fromRetry: false,
     fromOpenclaw: false,
     drain: false,
+    repairGrok: false,
   };
   for (let i = 0; i < argv.length; i++) {
     const a = argv[i];
@@ -907,6 +929,7 @@ function parseArgs(argv) {
     else if (a === "--from-retry") out.fromRetry = true;
     else if (a === "--from-openclaw") out.fromOpenclaw = true;
     else if (a === "--drain") out.drain = true;
+    else if (a === "--repair-grok") out.repairGrok = true;
     else throw new Error(`Unknown option: ${a}`);
   }
   return out;
@@ -917,9 +940,11 @@ module.exports = {
   migrateCursorUnknownBuckets,
   migrateRolloutCumulativeDeltaBuckets,
   reincludeClaudeMemObserverFiles,
+  repairGrokQueueFromSessionSnapshots,
   CURSOR_UNKNOWN_MIGRATION_KEY,
   ROLLOUT_CUMULATIVE_DELTA_MIGRATION_KEY,
   CLAUDE_MEM_OBSERVER_REINCLUDE_KEY,
+  GROK_APPEND_ONLY_REPAIR_MIGRATION_KEY,
 };
 
 function normalizeString(value) {
@@ -1289,6 +1314,344 @@ async function readQueueBatch(queuePath, startOffset, maxBuckets) {
   return { buckets: Array.from(bucketMap.values()), nextOffset: offset };
 }
 
+function normalizeGrokRepairSource(value) {
+  return typeof value === "string" ? value.trim().toLowerCase() : "";
+}
+
+function normalizeGrokRepairModel(value) {
+  return typeof value === "string" && value.trim() ? value.trim() : "grok-build";
+}
+
+function normalizeGrokRepairNumber(value) {
+  const n = Number(value);
+  return Number.isFinite(n) && n > 0 ? n : 0;
+}
+
+function toGrokRepairHalfHourStart(value) {
+  if (value == null) return null;
+  const millis =
+    typeof value === "number"
+      ? value < 10_000_000_000
+        ? value * 1000
+        : value
+      : Date.parse(String(value));
+  if (!Number.isFinite(millis)) return null;
+  const halfHourMs = 30 * 60 * 1000;
+  return new Date(Math.floor(millis / halfHourMs) * halfHourMs).toISOString();
+}
+
+function estimateGrokRepairTotals(totalTokens, conversationCount) {
+  const total = Math.trunc(normalizeGrokRepairNumber(totalTokens));
+  const inputTokens = Math.round(total * 0.8);
+  const outputTokens = Math.max(0, total - inputTokens);
+  return {
+    input_tokens: inputTokens,
+    cached_input_tokens: 0,
+    cache_creation_input_tokens: 0,
+    output_tokens: outputTokens,
+    reasoning_output_tokens: 0,
+    total_tokens: total,
+    billable_total_tokens: total,
+    conversation_count: Math.trunc(normalizeGrokRepairNumber(conversationCount)),
+  };
+}
+
+function addGrokRepairTotals(target, delta) {
+  target.input_tokens += delta.input_tokens;
+  target.cached_input_tokens += delta.cached_input_tokens;
+  target.cache_creation_input_tokens += delta.cache_creation_input_tokens;
+  target.output_tokens += delta.output_tokens;
+  target.reasoning_output_tokens += delta.reasoning_output_tokens;
+  target.total_tokens += delta.total_tokens;
+  target.billable_total_tokens += delta.billable_total_tokens;
+  target.conversation_count += delta.conversation_count;
+}
+
+function buildGrokRepairRowsFromSnapshots(sessionSnapshots) {
+  if (!sessionSnapshots || typeof sessionSnapshots !== "object") return [];
+
+  const buckets = new Map();
+  for (const snapshot of Object.values(sessionSnapshots)) {
+    if (!snapshot || typeof snapshot !== "object") continue;
+    const totalTokens = Math.trunc(normalizeGrokRepairNumber(snapshot.totalTokens));
+    if (totalTokens <= 0) continue;
+
+    const hourStart = toGrokRepairHalfHourStart(
+      snapshot.lastEventTimestamp || snapshot.updatedAt,
+    );
+    if (!hourStart) continue;
+
+    const model = normalizeGrokRepairModel(snapshot.model);
+    const key = bucketKey("grok", model, hourStart);
+    let totals = buckets.get(key);
+    if (!totals) {
+      totals = {
+        source: "grok",
+        model,
+        hour_start: hourStart,
+        input_tokens: 0,
+        cached_input_tokens: 0,
+        cache_creation_input_tokens: 0,
+        output_tokens: 0,
+        reasoning_output_tokens: 0,
+        total_tokens: 0,
+        billable_total_tokens: 0,
+        conversation_count: 0,
+      };
+      buckets.set(key, totals);
+    }
+    addGrokRepairTotals(
+      totals,
+      estimateGrokRepairTotals(totalTokens, snapshot.messageCount),
+    );
+  }
+
+  return Array.from(buckets.values()).sort((a, b) => {
+    const timeCompare = a.hour_start.localeCompare(b.hour_start);
+    return timeCompare || a.model.localeCompare(b.model);
+  });
+}
+
+function applyGrokRepairHourlyState(cursors, rows) {
+  const hourly = cursors.hourly && typeof cursors.hourly === "object" ? cursors.hourly : {};
+  const buckets = hourly.buckets && typeof hourly.buckets === "object" ? hourly.buckets : {};
+  const groupQueued =
+    hourly.groupQueued && typeof hourly.groupQueued === "object" ? hourly.groupQueued : {};
+
+  for (const key of Object.keys(buckets)) {
+    if (key.startsWith("grok|")) {
+      delete buckets[key];
+    }
+  }
+  for (const key of Object.keys(groupQueued)) {
+    if (key.startsWith("grok|")) {
+      delete groupQueued[key];
+    }
+  }
+
+  for (const row of rows) {
+    const totals = {
+      input_tokens: row.input_tokens,
+      cached_input_tokens: row.cached_input_tokens,
+      cache_creation_input_tokens: row.cache_creation_input_tokens,
+      output_tokens: row.output_tokens,
+      reasoning_output_tokens: row.reasoning_output_tokens,
+      total_tokens: row.total_tokens,
+      billable_total_tokens: row.billable_total_tokens,
+      conversation_count: row.conversation_count,
+    };
+    buckets[bucketKey("grok", row.model, row.hour_start)] = {
+      totals,
+      queuedKey: totalsKey(totals),
+      source: "grok",
+      hour_start: row.hour_start,
+    };
+  }
+
+  cursors.hourly = {
+    ...hourly,
+    version: 3,
+    buckets,
+    groupQueued,
+    updatedAt: typeof hourly.updatedAt === "string" ? hourly.updatedAt : null,
+  };
+}
+
+async function resetGrokRepairUploadOffset(queueStatePath) {
+  if (typeof queueStatePath !== "string" || !queueStatePath) return false;
+  let state = {};
+  try {
+    state = JSON.parse(await fs.readFile(queueStatePath, "utf8"));
+  } catch (_e) {
+    state = {};
+  }
+  state.offset = 0;
+  state.updatedAt = new Date().toISOString();
+  state.note = "reset_after_grok_append_only_repair_2026_05_v4";
+  await ensureDir(path.dirname(queueStatePath));
+  await fs.writeFile(queueStatePath, JSON.stringify(state, null, 2) + "\n", "utf8");
+  return true;
+}
+
+function hasAppliedGrokRepairMigration(value) {
+  if (!value) return false;
+  if (value === true) return true;
+  if (value && typeof value === "object") {
+    if (value.status === "applied" || value.status === "noop") return true;
+    if (value.status) return false;
+    return value.rowsWritten != null || value.rowsRemoved != null;
+  }
+  return false;
+}
+
+function serializeGrokRepairRow(row) {
+  return JSON.stringify({
+    source: "grok",
+    model: normalizeGrokRepairModel(row.model),
+    hour_start: row.hour_start,
+    input_tokens: row.input_tokens || 0,
+    cached_input_tokens: row.cached_input_tokens || 0,
+    cache_creation_input_tokens: row.cache_creation_input_tokens || 0,
+    output_tokens: row.output_tokens || 0,
+    reasoning_output_tokens: row.reasoning_output_tokens || 0,
+    total_tokens: row.total_tokens || 0,
+    billable_total_tokens: row.billable_total_tokens || 0,
+    conversation_count: row.conversation_count || 0,
+  });
+}
+
+async function backupExistingFile(filePath) {
+  if (typeof filePath !== "string" || !filePath) return null;
+  try {
+    const stat = await fs.stat(filePath);
+    if (!stat.isFile()) return null;
+  } catch (e) {
+    if (e?.code === "ENOENT" || e?.code === "ENOTDIR") return null;
+    throw e;
+  }
+  const stamp = new Date().toISOString().replace(/[:.]/g, "-");
+  const backupPath = `${filePath}.bak.${stamp}`;
+  await fs.copyFile(filePath, backupPath);
+  return backupPath;
+}
+
+async function repairGrokQueueFromSessionSnapshots({ cursors, queuePath, queueStatePath } = {}) {
+  if (!cursors || typeof cursors !== "object") return false;
+  const grokState = (cursors.grok ||= {});
+  const migrations = (grokState.migrations ||= {});
+  if (hasAppliedGrokRepairMigration(migrations[GROK_APPEND_ONLY_REPAIR_MIGRATION_KEY])) {
+    return false;
+  }
+
+  let raw = "";
+  try {
+    raw = await fs.readFile(queuePath, "utf8");
+  } catch (e) {
+    if (e?.code !== "ENOENT") throw e;
+  }
+
+  const latestGrokRows = new Map();
+  let existingGrokRows = 0;
+  for (const line of raw.split("\n")) {
+    if (!line.trim()) continue;
+    let row;
+    try {
+      row = JSON.parse(line);
+    } catch (_e) {
+      continue;
+    }
+
+    if (normalizeGrokRepairSource(row?.source) === "grok") {
+      const model = normalizeGrokRepairModel(row.model);
+      const hourStart = typeof row.hour_start === "string" ? row.hour_start : null;
+      if (!hourStart) continue;
+      existingGrokRows += 1;
+      latestGrokRows.set(bucketKey("grok", model, hourStart), {
+        ...row,
+        source: "grok",
+        model,
+        hour_start: hourStart,
+      });
+    }
+  }
+
+  if (existingGrokRows === 0) {
+    migrations[GROK_APPEND_ONLY_REPAIR_MIGRATION_KEY] = {
+      status: "noop",
+      appliedAt: new Date().toISOString(),
+      existingGrokRows: 0,
+      rowsWritten: 0,
+      snapshotsUsed: 0,
+      uploadOffsetReset: false,
+    };
+    return false;
+  }
+
+  const repairRows = buildGrokRepairRowsFromSnapshots(grokState.sessionSnapshots);
+  if (repairRows.length === 0) {
+    migrations[GROK_APPEND_ONLY_REPAIR_MIGRATION_KEY] = {
+      status: "skipped",
+      appliedAt: new Date().toISOString(),
+      reason: "missing-session-snapshots",
+      existingGrokRows,
+      rowsWritten: 0,
+      snapshotsUsed: 0,
+      uploadOffsetReset: false,
+    };
+    return false;
+  }
+
+  applyGrokRepairHourlyState(cursors, repairRows);
+
+  const repairLines = [];
+  const repairKeys = new Set();
+  for (const row of repairRows) {
+    const key = bucketKey("grok", row.model, row.hour_start);
+    repairKeys.add(key);
+    const current = latestGrokRows.get(key);
+    if (current && totalsKey(current) === totalsKey(row)) continue;
+    repairLines.push(serializeGrokRepairRow(row));
+  }
+
+  const zeroTotals = {
+    input_tokens: 0,
+    cached_input_tokens: 0,
+    cache_creation_input_tokens: 0,
+    output_tokens: 0,
+    reasoning_output_tokens: 0,
+    total_tokens: 0,
+    billable_total_tokens: 0,
+    conversation_count: 0,
+  };
+  let staleRowsRetracted = 0;
+  for (const [key, row] of latestGrokRows.entries()) {
+    if (repairKeys.has(key)) continue;
+    if (totalsKey(row) === totalsKey(zeroTotals)) continue;
+    staleRowsRetracted += 1;
+    repairLines.push(serializeGrokRepairRow({
+      ...zeroTotals,
+      model: row.model,
+      hour_start: row.hour_start,
+    }));
+  }
+
+  if (repairLines.length === 0) {
+    migrations[GROK_APPEND_ONLY_REPAIR_MIGRATION_KEY] = {
+      status: "noop",
+      appliedAt: new Date().toISOString(),
+      existingGrokRows,
+      rowsWritten: 0,
+      staleRowsRetracted,
+      snapshotsUsed: repairRows.length,
+      uploadOffsetReset: false,
+    };
+    return false;
+  }
+
+  await ensureDir(path.dirname(queuePath));
+  const queueBackupPath = await backupExistingFile(queuePath);
+  const queueStateBackupPath = await backupExistingFile(queueStatePath);
+  await fs.appendFile(queuePath, `${repairLines.join("\n")}\n`, "utf8");
+
+  const uploadOffsetReset = await resetGrokRepairUploadOffset(queueStatePath);
+  migrations[GROK_APPEND_ONLY_REPAIR_MIGRATION_KEY] = {
+    status: "applied",
+    appliedAt: new Date().toISOString(),
+    existingGrokRows,
+    rowsWritten: repairLines.length,
+    staleRowsRetracted,
+    snapshotsUsed: Object.values(grokState.sessionSnapshots || {}).filter((snapshot) => {
+      if (!snapshot || typeof snapshot !== "object") return false;
+      if (Math.trunc(normalizeGrokRepairNumber(snapshot.totalTokens)) <= 0) return false;
+      return Boolean(toGrokRepairHalfHourStart(snapshot.lastEventTimestamp || snapshot.updatedAt));
+    }).length,
+    uploadOffsetReset,
+    queueBackupPath,
+    queueStateBackupPath,
+  };
+  return true;
+}
+
 async function migrateCursorUnknownBuckets({ cursors, queuePath }) {
   if (!cursors || typeof cursors !== "object") return;
   cursors.migrations = cursors.migrations || {};