tokentracker-cli 0.19.0 → 0.20.0

package/src/lib/grok-hook.js

@@ -94,14 +94,15 @@ function buildGrokSessionEndHandler({ trackerDir }) {
   // It must be self-contained enough or rely on the copied runtime.
   // For simplicity and reliability we write a small script that:
   // 1. Reads GROK_SESSION_ID + GROK_WORKSPACE_ROOT from env
-  // 2. Locates the signals.json
-  // 3. Extracts usage
+  // 2. Locates the session metadata files
+  // 3. Extracts usage metadata only
   // 4. Writes a signal file under trackerDir that sync.js will pick up on next run
 
   return `#!/usr/bin/env node
 const fs = require('node:fs');
 const path = require('node:path');
 const os = require('node:os');
+const readline = require('node:readline');
 
 const GROK_HOME = process.env.TOKENTRACKER_GROK_HOME || process.env.GROK_HOME || path.join(os.homedir(), '.grok');
 const SESSION_ID = process.env.GROK_SESSION_ID;
@@ -120,14 +121,17 @@ const encodedCwd = encodeGrokCwd(WORKSPACE_ROOT);
 const sessionDir = path.join(GROK_HOME, 'sessions', encodedCwd, SESSION_ID);
 const signalsPath = path.join(sessionDir, 'signals.json');
 const summaryPath = path.join(sessionDir, 'summary.json');
+const updatesPath = path.join(sessionDir, 'updates.jsonl');
 
-let signals = null;
+let signals = {};
 try {
   const raw = fs.readFileSync(signalsPath, 'utf8');
   signals = JSON.parse(raw);
 } catch (err) {
-  // Session may still be active or signals not written yet; exit quietly
-  process.exit(0);
+  signals = {};
+}
+if (!signals || typeof signals !== 'object') {
+  signals = {};
 }
 
 const summary = (() => {
@@ -143,10 +147,74 @@ function toNonNegativeFiniteNumber(value) {
   return Number.isFinite(number) && number > 0 ? number : 0;
 }
 
-const totalTokens = toNonNegativeFiniteNumber(signals.contextTokensUsed);
+function timestampToIso(value) {
+  if (value == null) return null;
+  if (typeof value === 'number') {
+    if (!Number.isFinite(value) || value <= 0) return null;
+    const millis = value < 10000000000 ? value * 1000 : value;
+    const dt = new Date(millis);
+    return Number.isFinite(dt.getTime()) ? dt.toISOString() : null;
+  }
+  if (typeof value === 'string') {
+    const trimmed = value.trim();
+    if (!trimmed) return null;
+    if (/^[0-9]+(?:\\.[0-9]+)?$/.test(trimmed)) return timestampToIso(Number(trimmed));
+    const dt = new Date(trimmed);
+    return Number.isFinite(dt.getTime()) ? dt.toISOString() : null;
+  }
+  return null;
+}
+
+async function readUpdateTelemetry(filePath) {
+  let totalTokens = 0;
+  let lastEventId = null;
+  let lastEventTimestamp = null;
+  let lineNumber = 0;
+
+  try {
+    const input = fs.createReadStream(filePath, { encoding: 'utf8' });
+    const rl = readline.createInterface({ input, crlfDelay: Infinity });
+    try {
+      for await (const line of rl) {
+        lineNumber += 1;
+        if (!line || !line.trim()) continue;
+        let record = null;
+        try {
+          record = JSON.parse(line);
+        } catch {
+          continue;
+        }
+        const meta = record && record.params && record.params._meta ? record.params._meta : record && record._meta;
+        if (!meta || typeof meta !== 'object') continue;
+        const nextTotal = toNonNegativeFiniteNumber(meta.totalTokens);
+        if (nextTotal <= 0) continue;
+        totalTokens = Math.max(totalTokens, nextTotal);
+        lastEventId = meta.eventId != null ? String(meta.eventId) : String(lineNumber);
+        lastEventTimestamp =
+          timestampToIso(meta.agentTimestampMs) ||
+          timestampToIso(meta.timestampMs) ||
+          timestampToIso(record.timestamp_ms) ||
+          timestampToIso(record.timestamp) ||
+          lastEventTimestamp;
+      }
+    } finally {
+      rl.close();
+    }
+  } catch {
+    return { totalTokens, lastEventId, lastEventTimestamp };
+  }
+  return { totalTokens, lastEventId, lastEventTimestamp };
+}
+
+async function main() {
+const contextTokensUsed = toNonNegativeFiniteNumber(signals.contextTokensUsed ?? signals.totalTokens);
+const totalTokensBeforeCompaction = toNonNegativeFiniteNumber(signals.totalTokensBeforeCompaction);
+const signalTotalTokens = totalTokensBeforeCompaction + contextTokensUsed;
+const updateTelemetry = await readUpdateTelemetry(updatesPath);
+const totalTokens = Math.max(updateTelemetry.totalTokens, signalTotalTokens);
 const messageCount = toNonNegativeFiniteNumber(signals.assistantMessageCount || signals.num_chat_messages);
 const model = signals.primaryModelId || (Array.isArray(signals.modelsUsed) ? signals.modelsUsed[0] : 'grok-build');
-const lastActive = signals.lastActiveAt || summary.updated_at || new Date().toISOString();
+const lastActive = signals.lastActiveAt || updateTelemetry.lastEventTimestamp || summary.updated_at || new Date().toISOString();
 
 if (totalTokens <= 0) {
   process.exit(0);
@@ -163,8 +231,16 @@ const signal = {
   cwd: WORKSPACE_ROOT,
   model,
   totalTokens,
+  contextTokensUsed,
+  totalTokensBeforeCompaction,
   messageCount,
   lastActive,
+  sessionDir,
+  updatesPath,
+  signalsPath,
+  summaryPath,
+  lastEventId: updateTelemetry.lastEventId,
+  lastEventTimestamp: updateTelemetry.lastEventTimestamp,
   capturedAt: new Date().toISOString()
 };
 
@@ -177,6 +253,9 @@ try {
 } catch {}
 
 process.exit(0);
+}
+
+main().catch(() => process.exit(0));
 `;
 }
 

package/src/lib/pricing/curated-overrides.json

@@ -18,7 +18,7 @@
     "deepseek-v4-flash":{ "input": 0.14, "output": 0.28, "cache_read": 0.0028, "cache_write": 0.14 },
     "deepseek-v4-pro":  { "input": 0.435,"output": 0.87, "cache_read": 0.003625, "cache_write": 0.435 },
     "deepseek-chat":    { "input": 0.14, "output": 0.28, "cache_read": 0.0028, "cache_write": 0.14 },
-    "grok-build":       { "input": 1.25, "output": 2.50, "cache_read": 0.20, "note": "Grok Build TUI estimate. signals.json currently exposes contextTokensUsed snapshots, so TokenTracker estimates input/output split until Grok exposes per-call telemetry." },
+    "grok-build":       { "input": 1.25, "output": 2.50, "cache_read": 0.20, "note": "Grok Build TUI estimate. Local telemetry currently exposes totalTokens without a stable prompt/output/cache split, so TokenTracker estimates input/output split until Grok exposes per-call usage details." },
     "grok-4-0709":      { "input": 3.00, "output": 15.00, "cache_read": 0.75 },
     "grok-4":           { "input": 3.00, "output": 15.00, "cache_read": 0.75 },
     "grok-4-latest":    { "input": 3.00, "output": 15.00, "cache_read": 0.75 },