tokentracker-cli 0.87.6 → 0.87.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tokentracker-cli",
-  "version": "0.87.6",
+  "version": "0.87.8",
   "description": "Local-first AI coding token usage and cost tracker for 29 tools, with a dashboard, desktop pet, widgets, achievements, and native macOS/Windows apps.",
   "main": "src/cli.js",
   "bin": {
@@ -54,11 +54,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/mm7894215/TokenTracker.git"
+    "url": "git+https://github.com/xiufengsun/TokenTracker.git"
   },
   "homepage": "https://www.tokentracker.cc",
   "bugs": {
-    "url": "https://github.com/mm7894215/TokenTracker/issues"
+    "url": "https://github.com/xiufengsun/TokenTracker/issues"
   },
   "keywords": [
     "token",

package/src/commands/init.js

@@ -56,6 +56,10 @@ const {
   removeGrokHook,
   GROK_HOOK_FILENAME
 } = require("../lib/grok-hook");
+const {
+  upsertOmpHook,
+  probeOmpHookState,
+} = require("../lib/omp-hook");
 const { resolveTrackerPaths } = require("../lib/tracker-paths");
 const {
   resolveOmpAgentDir,
@@ -361,6 +365,7 @@ async function runSetup({
     trackerDir,
     notifyPath,
     notifyOriginalPath,
+    dryRun: Boolean(opts.dryRun),
   });
 
   return {
@@ -551,7 +556,13 @@ function buildIntegrationTargets({ home, trackerDir, notifyPath }) {
   };
 }
 
-async function applyIntegrationSetup({ home, trackerDir, notifyPath, notifyOriginalPath }) {
+async function applyIntegrationSetup({
+  home,
+  trackerDir,
+  notifyPath,
+  notifyOriginalPath,
+  dryRun = false,
+}) {
   const context = buildIntegrationTargets({ home, trackerDir, notifyPath });
   context.notifyOriginalPath = notifyOriginalPath;
 
@@ -642,15 +653,44 @@ async function applyIntegrationSetup({ home, trackerDir, notifyPath, notifyOrigi
     }
   }
 
-  // oh-my-pi: passive reader — no hook installation needed.
-  // TokenTracker reads ~/.omp/agent/sessions/**/*.jsonl directly.
+  // oh-my-pi: passive session scan always works; also install an optional
+  // notify extension so turn_end triggers sync --source omp near-real-time.
   {
-    // resolveOmpAgentDir returns null on Windows when ~/.omp doesn't exist (the
-    // win32 path resolver only yields a dir it can see) — null means "not
-    // installed", so skip rather than path.join(null, …) and crash.
+    const fssyncLocal = require("node:fs");
     const ompAgentDir = resolveOmpAgentDir(process.env);
-    if (ompAgentDir && fssync.existsSync(path.join(ompAgentDir, "sessions"))) {
-      summary.push({ label: "oh-my-pi", status: "detected", detail: "Passive reader (no hook needed)" });
+    const ompSessions = ompAgentDir && fssyncLocal.existsSync(path.join(ompAgentDir, "sessions"));
+    if (ompAgentDir && (ompSessions || fssyncLocal.existsSync(ompAgentDir))) {
+      if (dryRun) {
+        const probe = await probeOmpHookState({ home, trackerDir, env: process.env });
+        summary.push({
+          label: "oh-my-pi",
+          status: "detected",
+          detail: probe.configured
+            ? "Notify extension already installed (passive scan still runs)"
+            : "Will install notify extension + keep passive scan",
+        });
+      } else {
+        const result = await upsertOmpHook({ home, trackerDir, env: process.env });
+        if (result.written) {
+          summary.push({
+            label: "oh-my-pi",
+            status: "installed",
+            detail: `Notify extension → ${result.extensionPath} (passive scan still runs)`,
+          });
+        } else if (result.skippedReason === "unmanaged-extension-present") {
+          summary.push({
+            label: "oh-my-pi",
+            status: "skipped",
+            detail: "Existing unmanaged tokentracker-notify extension left untouched",
+          });
+        } else {
+          summary.push({
+            label: "oh-my-pi",
+            status: "detected",
+            detail: "Passive reader (notify extension not written)",
+          });
+        }
+      }
     }
   }
 
@@ -1904,6 +1944,7 @@ module.exports = {
   installLocalTrackerApp,
   repairCodexNotifyIntegration,
   repairRuntimeIntegrations,
+  applyIntegrationSetup,
 };
 
 async function probeFile(p) {

package/src/commands/status.js

@@ -84,6 +84,7 @@ const wsl = require("../lib/wsl-probe");
 const { getWslMode, isInvalidWslMode, shouldProbeWsl, discoverWslHome } = wsl;
 const { resolveInstallPaths } = require("../lib/install-resolver");
 const { probeGrokHookState, resolveGrokHome } = require("../lib/grok-hook");
+const { probeOmpHookState } = require("../lib/omp-hook");
 
 function formatResolvedPaths(paths, filename) {
   const active = [];
@@ -359,10 +360,11 @@ async function cmdStatus(argv = []) {
     ? fssync.existsSync(path.join(workbuddyHome, "workbuddy.db"))
     : false;
 
-  // oh-my-pi — passive scan only (no hooks).
+  // oh-my-pi — passive scan + optional notify extension.
   const ompAgentDir = resolveOmpAgentDir(process.env);
   const ompInstalled = Boolean(ompAgentDir) && fssync.existsSync(path.join(ompAgentDir, "sessions"));
   const ompFiles = ompInstalled ? resolveOmpSessionFiles(process.env) : [];
+  const ompHookState = await probeOmpHookState({ home, trackerDir, env: 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.
@@ -771,8 +773,13 @@ async function cmdStatus(argv = []) {
         workbuddy: workbuddyInstalled
           ? { installed: true, files: workbuddyFiles.length }
           : { installed: false },
-        omp: ompInstalled
-          ? { installed: true, files: ompFiles.length }
+        omp: ompInstalled || ompHookState.ompPresent
+          ? {
+              installed: true,
+              files: ompFiles.length,
+              notify_extension: Boolean(ompHookState.configured),
+              notify_extension_path: ompHookState.extensionPath || null,
+            }
           : { installed: false },
         pi: piInstalled
           ? { installed: true, files: piFiles.length }
@@ -895,8 +902,8 @@ async function cmdStatus(argv = []) {
       workbuddyInstalled
         ? `- WorkBuddy hooks: ${workbuddyHookConfigured ? "set" : "unset"} (${workbuddyFiles.length} session jsonl file${workbuddyFiles.length !== 1 ? "s" : ""} found, SQLite DB ${workbuddyDbExists ? "found" : "not found"})`
         : null,
-      ompInstalled
-        ? `- oh-my-pi: passive reader (${ompFiles.length} session jsonl file${ompFiles.length !== 1 ? "s" : ""} found)`
+      ompInstalled || ompHookState.ompPresent
+        ? `- oh-my-pi: passive reader (${ompFiles.length} session jsonl file${ompFiles.length !== 1 ? "s" : ""} found${ompHookState.configured ? ", notify extension: yes" : ", notify extension: no"})`
         : null,
       piInstalled
         ? `- pi: passive reader (${piFiles.length} session jsonl file${piFiles.length !== 1 ? "s" : ""} found)`

package/src/commands/sync.js

@@ -1377,6 +1377,7 @@ async function cmdSync(argv, context = {}) {
           settingsFiles: droidSettingsFiles,
           cursors,
           queuePath,
+          projectQueuePath,
           // Full-scan sync: drop cursor entries for any session whose
           // settings.json has disappeared off disk so cursors.droid stays
           // bounded by the actual on-disk session count.

package/src/commands/uninstall.js

@@ -24,6 +24,7 @@ const { resolveOpencodeConfigDir, removeOpencodePlugin } = require("../lib/openc
 const { removeOpenclawHookConfig } = require("../lib/openclaw-hook");
 const { removeOpenclawSessionPluginConfig } = require("../lib/openclaw-session-plugin");
 const { removeGrokHook } = require("../lib/grok-hook");
+const { removeOmpHook } = require("../lib/omp-hook");
 const { resolveTrackerPaths } = require("../lib/tracker-paths");
 
 async function cmdUninstall(argv) {
@@ -104,6 +105,7 @@ async function cmdUninstall(argv) {
   });
   const openclawHookRemove = await removeOpenclawHookConfig({ home, trackerDir, env: process.env });
   const grokHookRemove = await removeGrokHook({ home, trackerDir, env: process.env });
+  const ompHookRemove = await removeOmpHook({ home, trackerDir, env: process.env });
 
   // Remove installed notify handler.
   await fs.unlink(notifyPath).catch(() => {});
@@ -195,6 +197,7 @@ async function cmdUninstall(argv) {
       grokHookRemove?.removed
         ? `- Grok Build hook removed: ${grokHookRemove.hookPath}`
         : "- Grok Build hook: no change",
+      formatOmpHookRemoveLine(ompHookRemove),
       opts.purge ? `- Purged: ${path.join(home, ".tokentracker")}` : "- Purge: skipped (use --purge)",
       ...(machineIdSeedKept
         ? [`- Kept: ${machineIdSeedPath} (cloud device identity — a reinstall reuses the same device; delete it to fully reset)`]
@@ -204,6 +207,38 @@ async function cmdUninstall(argv) {
   );
 }
 
+function formatOmpHookRemoveLine(ompHookRemove) {
+  if (ompHookRemove?.removed) {
+    return `- oh-my-pi notify extension removed: ${ompHookRemove.extensionPath}`;
+  }
+  const reason = ompHookRemove?.skippedReason;
+  const residualPath = ompHookRemove?.stagedPath || ompHookRemove?.extensionPath;
+  const residual = residualPath
+    ? ` (left in place: ${residualPath})`
+    : "";
+  if (reason === "unmanaged") {
+    return `- oh-my-pi notify extension: skipped (unmanaged file)${residual}`;
+  }
+  if (reason === "unlink-failed") {
+    const detail = ompHookRemove?.error ? `: ${ompHookRemove.error}` : "";
+    return `- oh-my-pi notify extension: failed to remove${detail}${residual}`;
+  }
+  if (reason === "extension-read-failed") {
+    const detail = ompHookRemove?.error ? `: ${ompHookRemove.error}` : "";
+    return `- oh-my-pi notify extension: failed to read${detail}${residual}`;
+  }
+  if (reason === "identity-changed") {
+    return `- oh-my-pi notify extension: skipped (file changed during uninstall)${residual}`;
+  }
+  if (reason === "omp-agent-dir-unresolved") {
+    return "- oh-my-pi notify extension: skipped (omp agent dir unresolved)";
+  }
+  if (reason === "missing") {
+    return "- oh-my-pi notify extension: no change";
+  }
+  return "- oh-my-pi notify extension: no change";
+}
+
 function parseArgs(argv) {
   const out = { purge: false };
   for (let i = 0; i < argv.length; i++) {
@@ -214,7 +249,7 @@ function parseArgs(argv) {
   return out;
 }
 
-module.exports = { cmdUninstall };
+module.exports = { cmdUninstall, formatOmpHookRemoveLine };
 
 async function isFile(p) {
   try {

package/src/lib/grok-hook.js

@@ -31,10 +31,15 @@ function resolveLegacyTrackerBinDir(trackerDir) {
   return path.join(trackerDir, "bin");
 }
 
-function buildGrokSessionEndHookJson({ notifyGrokHandlerPath }) {
+function buildGrokSessionEndHookJson(
+  { notifyGrokHandlerPath },
+  { platform = process.platform, execPath = process.execPath } = {},
+) {
   // The command runs our dedicated handler.
   // We pass the session id and cwd via environment variables that Grok already sets.
-  const cmd = `/usr/bin/env node ${shellQuote(notifyGrokHandlerPath)}`;
+  const cmd = platform === "win32"
+    ? `${windowsCommandQuote(execPath)} ${windowsCommandQuote(notifyGrokHandlerPath)}`
+    : `/usr/bin/env node ${shellQuote(notifyGrokHandlerPath)}`;
   return {
     hooks: {
       SessionEnd: [
@@ -56,6 +61,10 @@ function shellQuote(value) {
   return `'${String(value).replace(/'/g, "'\\''")}'`;
 }
 
+function windowsCommandQuote(value) {
+  return `"${String(value).replace(/"/g, '""')}"`;
+}
+
 async function ensureGrokHookFiles({
   grokHooksDir,
   trackerDir,