tokentracker-cli 1.1.4 → 1.1.5

package/src/lib/diagnostics.js

@@ -3,6 +3,7 @@ const path = require("node:path");
 const fs = require("node:fs/promises");
 
 const { readJson } = require("./fs");
+const { resolveEnvRoot, resolveScanRoots } = require("./scan-roots");
 const { readCursorStateSummary } = require("./cursor-store");
 const { readCodexNotify, readEveryCodeNotify } = require("./codex-config");
 const { areClaudeUsageHooksConfigured, buildClaudeHookCommand } = require("./claude-config");
@@ -66,7 +67,7 @@ function resolveKiroCliDbPathInline(env, home) {
 
 async function collectTrackerDiagnostics({
   home = os.homedir(),
-  codexHome = process.env.CODEX_HOME || path.join(home, ".codex"),
+  codexHome = resolveEnvRoot("codex", { env: process.env, home }) || path.join(home, ".codex"),
   codeHome = process.env.CODE_HOME || path.join(home, ".code"),
 } = {}) {
   const { trackerDir, binDir } = await resolveTrackerPaths({ home });
@@ -92,6 +93,20 @@ async function collectTrackerDiagnostics({
     path.join(home, ".grok");
 
   const config = await readJson(configPath);
+  // Extra scan roots (#657), resolved as sync does. Paths are home-redacted
+  // like every other entry in `paths`.
+  const scanRoots = resolveScanRoots({
+    home,
+    env: process.env,
+    config,
+    base: { codex: [codexHome], claude: [path.join(home, ".claude")] },
+  });
+  const describeScanRoots = (entries) => entries.map((entry) => ({
+    path: redactValue(entry.path, home),
+    origin: entry.origin,
+    exists: entry.exists,
+    error: entry.error || null,
+  }));
   const cursorSummary = await readCursorStateSummary({ trackerDir, cursorsPath });
   const cursors = cursorSummary.cursors;
   const queueState = (await readJson(queueStatePath)) || { offset: 0 };
@@ -217,6 +232,10 @@ async function collectTrackerDiagnostics({
       merge_policy:
         "Kiro IDE and Kiro CLI both emit source='kiro' in queue.jsonl so token, cost, heatmap, and leaderboard aggregations merge transparently. Use this block to distinguish sub-path contributions.",
     },
+    scan_roots: {
+      codex: describeScanRoots(scanRoots.codex),
+      claude: describeScanRoots(scanRoots.claude),
+    },
     config: {
       base_url: typeof config?.baseUrl === "string" ? config.baseUrl : null,
       device_token: config?.deviceToken ? "set" : "unset",

package/src/lib/doctor.js

@@ -337,6 +337,36 @@ function buildDiagnosticsChecks(diagnostics) {
     });
   }
 
+  // Extra scan roots (#657): surface CODEX_HOME / CLAUDE_CONFIG_DIR / config
+  // roots in the human-readable report and warn when a configured root is not
+  // on disk — a silently missing root is the difference between "no usage"
+  // and "not scanned". Installs without extras get no additional line.
+  const scanRoots = diagnostics?.scan_roots;
+  if (scanRoots && typeof scanRoots === "object") {
+    const extras = [];
+    for (const provider of ["codex", "claude"]) {
+      for (const entry of Array.isArray(scanRoots[provider]) ? scanRoots[provider] : []) {
+        if (!entry || entry.origin === "native") continue;
+        extras.push({ provider, ...entry });
+      }
+    }
+    if (extras.length > 0) {
+      const missing = extras.filter((entry) => !entry.exists);
+      const describe = (list) => list
+        .map((entry) => `${entry.provider} ${entry.path}${entry.error ? ` (unreadable: ${entry.error})` : ""}`)
+        .join(", ");
+      checks.push({
+        id: "scan_roots.extra",
+        status: missing.length > 0 ? "warn" : "ok",
+        detail: missing.length > 0
+          ? `${missing.length} of ${extras.length} extra scan root(s) unavailable: ${describe(missing)}`
+          : `${extras.length} extra scan root(s) present: ${describe(extras)}`,
+        critical: false,
+        meta: { roots: extras },
+      });
+    }
+  }
+
   return checks;
 }