npm - tokentracker-cli - Versions diffs - 0.6.7 → 0.8.0 - Mend

tokentracker-cli 0.6.7 → 0.8.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 (10) hide show

package/dashboard/dist/assets/{main-CuwxhzW4.js → main-CBVhF0BE.js} +169 -168
package/dashboard/dist/index.html +1 -1
package/dashboard/dist/share.html +1 -1
package/package.json +2 -2
package/src/commands/init.js +16 -4
package/src/commands/status.js +13 -0
package/src/commands/sync.js +154 -2
package/src/lib/pricing/seed-snapshot.json +1 -1
package/src/lib/rollout.js +285 -1
package/src/lib/source-metadata.js +5 -3

package/dashboard/dist/index.html CHANGED Viewed

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

package/dashboard/dist/share.html CHANGED Viewed

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

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "tokentracker-cli",
-  "version": "0.6.7",
-  "description": "Token usage tracker for AI agent CLIs (Claude Code, Codex, Cursor, Gemini, Kiro, OpenCode, OpenClaw, Every Code, Hermes, GitHub Copilot, Kimi Code, CodeBuddy, oh-my-pi, Craft Agents)",
+  "version": "0.8.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, oh-my-pi, pi, Craft Agents)",
   "main": "src/cli.js",
   "bin": {
     "tokentracker-cli": "bin/tracker.js",

package/src/commands/init.js CHANGED Viewed

@@ -44,6 +44,11 @@ const {
   probeOpenclawSessionPluginState,
 } = require("../lib/openclaw-session-plugin");
 const { resolveTrackerPaths } = require("../lib/tracker-paths");
+const {
+  resolveOmpAgentDir,
+  resolvePiAgentDir,
+  piAgentDirCollidesWithOmp,
+} = require("../lib/rollout");
 const { resolveRuntimeConfig, DEFAULT_BASE_URL } = require("../lib/runtime-config");
 const {
   BOLD,
@@ -428,15 +433,22 @@ async function applyIntegrationSetup({ home, trackerDir, notifyPath, notifyOrigi
   // oh-my-pi: passive reader — no hook installation needed.
   // TokenTracker reads ~/.omp/agent/sessions/**/*.jsonl directly.
   {
-    const ompHome = process.env.OMP_HOME ||
-      (process.env.PI_CONFIG_DIR ? path.join(home, process.env.PI_CONFIG_DIR) : path.join(home, ".omp"));
-    const ompAgentDir = process.env.PI_CODING_AGENT_DIR || path.join(ompHome, "agent");
-    const ompSessions = path.join(ompAgentDir, "sessions");
+    const ompSessions = path.join(resolveOmpAgentDir(process.env), "sessions");
     if (fssync.existsSync(ompSessions)) {
       summary.push({ label: "oh-my-pi", status: "detected", detail: "Passive reader (no hook needed)" });
     }
   }
+  // pi (@mariozechner/pi-coding-agent): passive reader — no hook installation needed.
+  // TokenTracker reads ~/.pi/agent/sessions/**/*.jsonl directly. Skip when its
+  // agent dir collides with omp's so the summary matches what sync will scan.
+  if (!piAgentDirCollidesWithOmp(process.env)) {
+    const piSessions = path.join(resolvePiAgentDir(process.env), "sessions");
+    if (fssync.existsSync(piSessions)) {
+      summary.push({ label: "pi", status: "detected", detail: "Passive reader (no hook needed)" });
+    }
+  }
   // Craft Agents: passive reader — no hook installation needed.
   // TokenTracker reads ~/.craft-agent/workspaces/<id>/sessions/**/session.jsonl
   // (and any user-relocated workspace listed in ~/.craft-agent/config.json).

package/src/commands/status.js CHANGED Viewed

@@ -41,6 +41,9 @@ const {
   resolveCodebuddyProjectFiles,
   resolveOmpSessionFiles,
   resolveOmpAgentDir,
+  resolvePiSessionFiles,
+  resolvePiAgentDir,
+  piAgentDirCollidesWithOmp,
   resolveCraftSessionFiles,
   resolveCraftConfigDir,
 } = require("../lib/rollout");
@@ -185,6 +188,13 @@ async function cmdStatus(argv = []) {
   const ompInstalled = fssync.existsSync(path.join(ompAgentDir, "sessions"));
   const ompFiles = ompInstalled ? resolveOmpSessionFiles(process.env) : [];
+  // pi (@mariozechner/pi-coding-agent) — passive scan only (no hooks).
+  // Skip when its agent dir collides with omp's; sync would dedupe anyway.
+  const piCollides = piAgentDirCollidesWithOmp(process.env);
+  const piAgentDir = resolvePiAgentDir(process.env);
+  const piInstalled = !piCollides && fssync.existsSync(path.join(piAgentDir, "sessions"));
+  const piFiles = piInstalled ? resolvePiSessionFiles(process.env) : [];
   // Craft Agents — passive scan only (no hooks).
   const craftConfigDir = resolveCraftConfigDir(process.env);
   const craftInstalled = fssync.existsSync(craftConfigDir);
@@ -231,6 +241,9 @@ async function cmdStatus(argv = []) {
       ompInstalled
         ? `- oh-my-pi: passive reader (${ompFiles.length} session jsonl file${ompFiles.length !== 1 ? "s" : ""} found)`
         : null,
+      piInstalled
+        ? `- pi: passive reader (${piFiles.length} session jsonl file${piFiles.length !== 1 ? "s" : ""} found)`
+        : null,
       craftInstalled
         ? `- Craft Agents: passive reader (${craftFiles.length} session jsonl file${craftFiles.length !== 1 ? "s" : ""} found)`
         : null,

package/src/commands/sync.js CHANGED Viewed

@@ -3,6 +3,7 @@ const path = require("node:path");
 const fs = require("node:fs/promises");
 const fssync = require("node:fs");
 const cp = require("node:child_process");
+const readline = require("node:readline");
 const { ensureDir, readJson, writeJson, openLock } = require("../lib/fs");
 const {
@@ -29,6 +30,9 @@ const {
   parseKimiIncremental,
   resolveOmpSessionFiles,
   parseOmpIncremental,
+  resolvePiSessionFiles,
+  parsePiIncremental,
+  piAgentDirCollidesWithOmp,
   resolveCraftSessionFiles,
   parseCraftIncremental,
   resolveCodebuddyProjectFiles,
@@ -57,6 +61,8 @@ 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 CLAUDE_MEM_OBSERVER_PATH_SEGMENT = "--claude-mem-observer-sessions";
 async function cmdSync(argv) {
   const opts = parseArgs(argv);
@@ -171,6 +177,7 @@ async function cmdSync(argv) {
     openclawResult.bucketsQueued += openclawFallback.bucketsQueued;
     const claudeFiles = await listClaudeProjectFiles(claudeProjectsDir);
+    await reincludeClaudeMemObserverFiles({ cursors, claudeFiles, queuePath });
     let claudeResult = { filesProcessed: 0, eventsAggregated: 0, bucketsQueued: 0 };
     if (claudeFiles.length > 0) {
       if (progress?.enabled) {
@@ -473,6 +480,33 @@ async function cmdSync(argv) {
       });
     }
+    // ── pi (@mariozechner/pi-coding-agent) — passive ~/.pi/agent/sessions/**/*.jsonl reader ──
+    // Skip pi parse if its agent dir resolves to the same path as omp's. This
+    // prevents double-counting when explicit overrides (TOKENTRACKER_OMP_AGENT_DIR /
+    // TOKENTRACKER_PI_AGENT_DIR) bypass the install-signal disambiguator.
+    let piResult = { recordsProcessed: 0, eventsAggregated: 0, bucketsQueued: 0 };
+    const piFiles = piAgentDirCollidesWithOmp(process.env)
+      ? []
+      : resolvePiSessionFiles(process.env);
+    if (piFiles.length > 0) {
+      if (progress?.enabled) {
+        progress.start(`Parsing pi ${renderBar(0)} | buckets 0`);
+      }
+      piResult = await parsePiIncremental({
+        sessionFiles: piFiles,
+        cursors,
+        queuePath,
+        env: process.env,
+        onProgress: (p) => {
+          if (!progress?.enabled) return;
+          const pct = p.total > 0 ? p.index / p.total : 1;
+          progress.update(
+            `Parsing pi ${renderBar(pct)} ${formatNumber(p.index)}/${formatNumber(p.total)} files | buckets ${formatNumber(p.bucketsQueued)}`,
+          );
+        },
+      });
+    }
     // ── Craft Agents (passive ~/.craft-agent + workspaces session.jsonl reader) ──
     let craftResult = { recordsProcessed: 0, eventsAggregated: 0, bucketsQueued: 0 };
     const craftFiles = resolveCraftSessionFiles(process.env);
@@ -615,6 +649,7 @@ async function cmdSync(argv) {
         kimiResult.recordsProcessed +
         codebuddyResult.recordsProcessed +
         ompResult.recordsProcessed +
+        piResult.recordsProcessed +
         craftResult.recordsProcessed +
         copilotResult.recordsProcessed;
       const totalBuckets =
@@ -630,6 +665,7 @@ async function cmdSync(argv) {
         kimiResult.bucketsQueued +
         codebuddyResult.bucketsQueued +
         ompResult.bucketsQueued +
+        piResult.bucketsQueued +
         craftResult.bucketsQueued +
         copilotResult.bucketsQueued;
       process.stdout.write(
@@ -680,8 +716,10 @@ module.exports = {
   cmdSync,
   migrateCursorUnknownBuckets,
   migrateRolloutCumulativeDeltaBuckets,
+  reincludeClaudeMemObserverFiles,
   CURSOR_UNKNOWN_MIGRATION_KEY,
   ROLLOUT_CUMULATIVE_DELTA_MIGRATION_KEY,
+  CLAUDE_MEM_OBSERVER_REINCLUDE_KEY,
 };
 function normalizeString(value) {
@@ -959,8 +997,6 @@ async function writeOpenclawSignal(trackerDir) {
 const AUTO_RETRY_FILENAME = "auto.retry.json";
 const AUTO_RETRY_MAX_DELAY_MS = 2 * 60 * 60 * 1000;
-const readline = require("node:readline");
 const INGEST_SLUG = "tokentracker-ingest";
 const MAX_INGEST_BUCKETS = 500;
@@ -1159,3 +1195,119 @@ async function migrateRolloutCumulativeDeltaBuckets({ cursors, queuePath, rollou
   cursors.migrations[ROLLOUT_CUMULATIVE_DELTA_MIGRATION_KEY] = new Date().toISOString();
 }
+async function reincludeClaudeMemObserverFiles({ cursors, claudeFiles, queuePath }) {
+  if (!cursors || typeof cursors !== "object") return false;
+  const migrations = (cursors.migrations ||= {});
+  if (migrations[CLAUDE_MEM_OBSERVER_REINCLUDE_KEY]) return false;
+  const observerPaths = (Array.isArray(claudeFiles) ? claudeFiles : [])
+    .map((entry) => (typeof entry === "string" ? entry : entry?.path))
+    .filter((p) => typeof p === "string" && p.includes(CLAUDE_MEM_OBSERVER_PATH_SEGMENT));
+  if (!cursors.files || typeof cursors.files !== "object") {
+    cursors.files = {};
+  }
+  let filesReset = 0;
+  for (const filePath of observerPaths) {
+    if (cursors.files[filePath]) {
+      delete cursors.files[filePath];
+      filesReset += 1;
+    }
+  }
+  const hashesToRemove = observerPaths.length > 0
+    ? await collectClaudeMessageHashes(observerPaths)
+    : new Set();
+  let hashesRemoved = 0;
+  if (Array.isArray(cursors.claudeHashes) && hashesToRemove.size > 0) {
+    const nextHashes = [];
+    for (const hash of cursors.claudeHashes) {
+      if (hashesToRemove.has(hash)) {
+        hashesRemoved += 1;
+        continue;
+      }
+      nextHashes.push(hash);
+    }
+    cursors.claudeHashes = nextHashes;
+  }
+  const queueRowsRelabeled = typeof queuePath === "string" && queuePath
+    ? await relabelClaudeMemQueueRows(queuePath)
+    : 0;
+  migrations[CLAUDE_MEM_OBSERVER_REINCLUDE_KEY] = {
+    appliedAt: new Date().toISOString(),
+    filesReset,
+    hashesRemoved,
+    queueRowsRelabeled,
+  };
+  return filesReset > 0 || hashesRemoved > 0 || queueRowsRelabeled > 0;
+}
+async function relabelClaudeMemQueueRows(queuePath) {
+  let raw;
+  try {
+    raw = await fs.readFile(queuePath, "utf8");
+  } catch (_e) {
+    return 0;
+  }
+  if (!raw || !raw.includes('"claude-mem"')) return 0;
+  const lines = raw.split("\n");
+  const out = [];
+  let relabeled = 0;
+  for (const line of lines) {
+    if (!line) {
+      out.push(line);
+      continue;
+    }
+    let obj;
+    try {
+      obj = JSON.parse(line);
+    } catch (_e) {
+      out.push(line);
+      continue;
+    }
+    if (obj && obj.source === "claude-mem") {
+      obj.source = "claude";
+      relabeled += 1;
+      out.push(JSON.stringify(obj));
+    } else {
+      out.push(line);
+    }
+  }
+  if (relabeled === 0) return 0;
+  await fs.writeFile(queuePath, out.join("\n"), "utf8");
+  return relabeled;
+}
+async function collectClaudeMessageHashes(filePaths) {
+  const hashes = new Set();
+  for (const filePath of filePaths) {
+    let stream;
+    try {
+      stream = fssync.createReadStream(filePath, { encoding: "utf8" });
+    } catch (_e) {
+      continue;
+    }
+    const rl = readline.createInterface({ input: stream, crlfDelay: Infinity });
+    for await (const line of rl) {
+      if (!line.includes('"usage"')) continue;
+      let obj;
+      try {
+        obj = JSON.parse(line);
+      } catch (_e) {
+        continue;
+      }
+      const msgId = obj?.message?.id;
+      const reqId = obj?.requestId;
+      if (msgId && reqId) hashes.add(`${msgId}:${reqId}`);
+    }
+    rl.close();
+    stream.close?.();
+  }
+  return hashes;
+}