tokentracker-cli 0.86.0 → 0.87.0

package/src/lib/rollout.js

@@ -6,6 +6,7 @@ const readline = require("node:readline");
 
 const crypto = require("node:crypto");
 const { ensureDir, writeJson, chmod600IfPossible } = require("./fs");
+const { physicalJsonlRecords } = require("./jsonl-lines");
 const { readSqliteJsonRows, readSqliteJsonRowsAsync } = require("./sqlite-reader");
 const wsl = require("./wsl-probe");
 const { resolveInstallPaths } = require("./install-resolver");
@@ -180,7 +181,11 @@ async function parseRolloutIncremental({
   source,
   publicRepoResolver,
   diagnostics,
+  invalidRecordPolicy = "skip",
 }) {
+  if (invalidRecordPolicy !== "skip" && invalidRecordPolicy !== "throw") {
+    throw new TypeError(`unsupported invalidRecordPolicy: ${invalidRecordPolicy}`);
+  }
   await ensureDir(path.dirname(queuePath));
   let filesProcessed = 0;
   let eventsAggregated = 0;
@@ -446,6 +451,7 @@ async function parseRolloutIncremental({
           publicRepoCache,
           publicRepoResolver,
           projectContext,
+          invalidRecordPolicy,
         })
       : await parseRolloutFile({
           filePath,
@@ -467,6 +473,7 @@ async function parseRolloutIncremental({
           projectContext,
           seenCodexEvents: codexEventTracker,
           sessionId: codexSessionIdFromPath(filePath),
+          invalidRecordPolicy,
         });
 
     const nextCursor = {
@@ -760,6 +767,11 @@ async function parseClaudeIncremental({
   const projectTouchedBuckets = projectEnabled ? new Set() : null;
   const projectMetaCache = projectEnabled ? new Map() : null;
   const publicRepoCache = projectEnabled ? new Map() : null;
+  // Sessions cluster into few repos, so the per-file freshness checks below
+  // keep stat-ing the same handful of .git/config paths. Share one stat per
+  // config per run, as the Codex path does — it matters most for WSL installs,
+  // where every stat crosses the \\wsl$ bridge (#374).
+  const projectFreshnessCache = projectEnabled ? new Map() : null;
   const touchedBuckets = new Set();
   // Persist seenMessageHashes across syncs to prevent cross-file duplicates
   // (e.g. subagent file created after main session was already parsed).
@@ -878,7 +890,9 @@ async function parseClaudeIncremental({
     const cachedContextAbsent = cachedProjectFileContext?.absent === true;
     const projectContextFresh =
       projectEnabled && cachedProjectFileContext && !cachedContextAbsent
-        ? await isProjectFileContextFresh(cachedProjectFileContext)
+        ? await isProjectFileContextFresh(cachedProjectFileContext, {
+            freshnessCache: projectFreshnessCache,
+          })
         : false;
     const projectKnownAbsent = cachedCwd === null || cachedContextAbsent;
     const projectSettled =
@@ -909,7 +923,7 @@ async function parseClaudeIncremental({
       }
       if (nextCwd) {
         const projectContext = await resolveProjectContextForPath({
-          startDir: nextCwd,
+          startDir: wsl.mapWslCwdToUnc(nextCwd, filePath),
           projectMetaCache,
           publicRepoCache,
           publicRepoResolver,
@@ -1945,6 +1959,7 @@ async function parseRolloutFile({
   projectContext,
   seenCodexEvents,
   sessionId,
+  invalidRecordPolicy,
 }) {
   const st = fileStat || (await fs.stat(filePath));
   const endOffset = st.size;
@@ -1961,8 +1976,10 @@ async function parseRolloutFile({
     };
   }
 
-  const stream = fssync.createReadStream(filePath, { encoding: "utf8", start: startOffset });
-  const rl = readline.createInterface({ input: stream, crlfDelay: Infinity });
+  const stream = fssync.createReadStream(filePath, {
+    start: startOffset,
+    end: endOffset - 1,
+  });
 
   let model = typeof lastModel === "string" ? lastModel : null;
   const usageDeltaState = createUsageDeltaState({
@@ -1987,8 +2004,19 @@ async function parseRolloutFile({
   let currentProjectRef = projectRef || null;
   let currentProjectKey = projectKey || null;
   let eventsAggregated = 0;
+  let scannedEndOffset = startOffset;
+  let committedEndOffset = startOffset;
+
+  const invalidUtf8 = invalidRecordPolicy === "throw" ? "throw" : "record";
+  for await (const record of physicalJsonlRecords(stream, { invalidUtf8 })) {
+    scannedEndOffset += record.physicalBytes;
+    if (record.terminated) committedEndOffset = scannedEndOffset;
+    if (!record.utf8Valid) {
+      if (!record.terminated) break;
+      continue;
+    }
 
-  for await (const line of rl) {
+    const { line } = record;
     if (!line) continue;
     const maybeTokenCount = line.includes('"token_count"');
     const maybeTurnContext =
@@ -1998,14 +2026,28 @@ async function parseRolloutFile({
         line.includes('"cwd"') ||
         line.includes('"current_date"') ||
         line.includes('"forked_from_id"'));
-    if (!maybeTokenCount && !maybeTurnContext) continue;
+    if (!maybeTokenCount && !maybeTurnContext) {
+      if (invalidRecordPolicy === "throw" || !record.terminated) {
+        try {
+          JSON.parse(line);
+          committedEndOffset = scannedEndOffset;
+        } catch (error) {
+          if (invalidRecordPolicy === "throw") throw error;
+          break;
+        }
+      }
+      continue;
+    }
 
     let obj;
     try {
       obj = JSON.parse(line);
-    } catch (_e) {
+    } catch (error) {
+      if (invalidRecordPolicy === "throw") throw error;
+      if (!record.terminated) break;
       continue;
     }
+    if (!record.terminated) committedEndOffset = scannedEndOffset;
 
     if (
       (obj?.type === "turn_context" || obj?.type === "session_meta") &&
@@ -2025,7 +2067,7 @@ async function parseRolloutFile({
         const nextCwd = obj.payload.cwd.trim();
         if (nextCwd && nextCwd !== currentCwd) {
           const context = await resolveProjectContextForPath({
-            startDir: nextCwd,
+            startDir: wsl.mapWslCwdToUnc(nextCwd, filePath),
             projectMetaCache,
             publicRepoCache,
             publicRepoResolver,
@@ -2149,7 +2191,7 @@ async function parseRolloutFile({
   }
 
   return {
-    endOffset,
+    endOffset: committedEndOffset,
     lastTotal: latestTotal,
     tokenUsageBaselines: snapshotUsageBaselines(usageDeltaState),
     lastModel: model,
@@ -2169,6 +2211,7 @@ async function scanRolloutProjectFileContexts({
   publicRepoCache,
   publicRepoResolver,
   projectContext,
+  invalidRecordPolicy,
 }) {
   const st = fileStat || (await fs.stat(filePath));
   const endOffset = st.size;
@@ -2185,11 +2228,21 @@ async function scanRolloutProjectFileContexts({
     };
   }
 
-  const stream = fssync.createReadStream(filePath, { encoding: "utf8", start: 0 });
-  const rl = readline.createInterface({ input: stream, crlfDelay: Infinity });
+  const stream = fssync.createReadStream(filePath, { start: 0, end: endOffset - 1 });
   let currentCwd = null;
+  let scannedEndOffset = 0;
+  let committedEndOffset = 0;
+
+  const invalidUtf8 = invalidRecordPolicy === "throw" ? "throw" : "record";
+  for await (const record of physicalJsonlRecords(stream, { invalidUtf8 })) {
+    scannedEndOffset += record.physicalBytes;
+    if (record.terminated) committedEndOffset = scannedEndOffset;
+    if (!record.utf8Valid) {
+      if (!record.terminated) break;
+      continue;
+    }
 
-  for await (const line of rl) {
+    const { line } = record;
     if (
       !line ||
       !(
@@ -2198,15 +2251,27 @@ async function scanRolloutProjectFileContexts({
       ) ||
       !line.includes('"cwd"')
     ) {
+      if (line && (invalidRecordPolicy === "throw" || !record.terminated)) {
+        try {
+          JSON.parse(line);
+          committedEndOffset = scannedEndOffset;
+        } catch (error) {
+          if (invalidRecordPolicy === "throw") throw error;
+          break;
+        }
+      }
       continue;
     }
 
     let obj;
     try {
       obj = JSON.parse(line);
-    } catch (_e) {
+    } catch (error) {
+      if (invalidRecordPolicy === "throw") throw error;
+      if (!record.terminated) break;
       continue;
     }
+    if (!record.terminated) committedEndOffset = scannedEndOffset;
     if (
       (obj?.type !== "turn_context" && obj?.type !== "session_meta") ||
       !obj?.payload ||
@@ -2219,7 +2284,7 @@ async function scanRolloutProjectFileContexts({
     const nextCwd = obj.payload.cwd.trim();
     if (!nextCwd || nextCwd === currentCwd) continue;
     const context = await resolveProjectContextForPath({
-      startDir: nextCwd,
+      startDir: wsl.mapWslCwdToUnc(nextCwd, filePath),
       projectMetaCache,
       publicRepoCache,
       publicRepoResolver,
@@ -2230,7 +2295,7 @@ async function scanRolloutProjectFileContexts({
   }
 
   return {
-    endOffset,
+    endOffset: committedEndOffset,
     lastTotal,
     tokenUsageBaselines,
     lastModel,
@@ -4129,6 +4194,7 @@ function readZcodeDbMessages(dbPath, sqliteOptions = {}) {
 
 async function parseOpencodeDbIncremental({
   dbMessages,
+  dbPath,
   cursors,
   queuePath,
   projectQueuePath,
@@ -4225,6 +4291,7 @@ async function parseOpencodeDbIncremental({
     if (projectEnabled) {
       const projectContext = await resolveProjectContextForDb({
         msg,
+        dbPath,
         projectMetaCache,
         publicRepoCache,
         publicRepoResolver,
@@ -4444,6 +4511,7 @@ function qoderProjectPath(row) {
 
 async function parseQoderDbIncremental({
   dbMessages,
+  dbPath,
   cursors,
   queuePath,
   projectQueuePath,
@@ -4515,7 +4583,7 @@ async function parseQoderDbIncremental({
       const projectPath = qoderProjectPath(row);
       if (projectPath) {
         const context = await resolveProjectContextForPath({
-          startDir: projectPath,
+          startDir: wsl.mapWslCwdToUnc(projectPath, dbPath),
           projectMetaCache,
           publicRepoCache,
           publicRepoResolver,
@@ -4975,6 +5043,7 @@ async function parseClaudeScienceIncremental({
 // Resolve project context from DB message (no file path available)
 async function resolveProjectContextForDb({
   msg,
+  dbPath,
   projectMetaCache,
   publicRepoCache,
   publicRepoResolver,
@@ -4983,7 +5052,9 @@ async function resolveProjectContextForDb({
   const cwd = msg?.path?.cwd;
   if (!cwd || typeof cwd !== "string") return null;
   return resolveProjectContextForPath({
-    startDir: cwd,
+    // The DB itself is read over the distro's UNC bridge on Windows, so its
+    // path carries the prefix the recorded POSIX cwd needs (#374).
+    startDir: wsl.mapWslCwdToUnc(cwd, dbPath),
     projectMetaCache,
     publicRepoCache,
     publicRepoResolver,
@@ -11141,7 +11212,7 @@ async function parseOmpIncremental({
       const cwd = await resolveOmpFileCwd(filePath);
       const projectContext = cwd
         ? await resolveProjectContextForPath({
-            startDir: cwd,
+            startDir: wsl.mapWslCwdToUnc(cwd, filePath),
             projectMetaCache,
             publicRepoCache,
             publicRepoResolver,

package/src/lib/wsl-probe.js

@@ -164,6 +164,40 @@ function isUncPath(p) {
   return typeof p === "string" && (p.startsWith("\\\\") || p.startsWith("//"));
 }
 
+const WSL_UNC_ROOT_RE = /^[\\/]{2}(wsl\$|wsl\.localhost)[\\/]([^\\/]+)[\\/]/i;
+const WINDOWS_DRIVE_PREFIX_RE = /^\/[A-Za-z]:[\\/]/;
+
+// `\\wsl$\Ubuntu-24.04\home\u\...` -> `\\wsl$\Ubuntu-24.04\`. Returns null for
+// native and non-WSL UNC paths.
+function wslUncRoot(p) {
+  if (typeof p !== "string") return null;
+  const match = WSL_UNC_ROOT_RE.exec(p);
+  return match ? `\\\\${match[1]}\\${match[2]}\\` : null;
+}
+
+// A WSL session records its cwd as a POSIX path (`/home/u/dev/app`) while the
+// transcript itself is read over the distro's UNC bridge. Probing that raw
+// POSIX path from Windows resolves it against the current drive
+// (`C:\home\u\dev\app`), which never exists — so project attribution finds no
+// `.git`, and every WSL session ends up with a null projectKey (#374).
+// Re-anchor the cwd onto the UNC prefix the transcript came from.
+//
+// The prefix is taken from the transcript path rather than re-probed, which
+// also picks whichever of `\\wsl$` / `\\wsl.localhost` actually resolves on
+// this machine — they are not interchangeable everywhere. Anything that isn't
+// a POSIX cwd from a WSL-hosted file is returned untouched.
+function mapWslCwdToUnc(cwd, transcriptPath) {
+  if (typeof cwd !== "string" || !cwd.startsWith("/")) return cwd;
+  // `new URL("file:///C:/dev/app").pathname` is "/C:/dev/app" — a leading
+  // slash, but a Windows path rather than a POSIX one. Qoder feeds exactly
+  // that shape in via `project_uri`; re-anchoring it would invent
+  // `\\wsl$\Distro\C:\dev\app`.
+  if (WINDOWS_DRIVE_PREFIX_RE.test(cwd)) return cwd;
+  const root = wslUncRoot(transcriptPath);
+  if (!root) return cwd;
+  return root + cwd.slice(1).replaceAll("/", "\\");
+}
+
 function snapshotSqliteDb(dbPath) {
   const tmpRoot = fssync.mkdtempSync(
     path.join(require("node:os").tmpdir(), "tokentracker-wsl-snap-"),
@@ -191,6 +225,8 @@ module.exports = {
   resetWslProbeCache,
   discoverWslHome,
   isUncPath,
+  wslUncRoot,
+  mapWslCwdToUnc,
   snapshotSqliteDb,
   getWslMode,
   isInvalidWslMode,

package/dashboard/dist/assets/DialogDescription-D6zxtOM5.js

@@ -1 +0,0 @@
-import{r as n,A as a}from"./__vite-browser-external-SU8sCTLB.js";import{u as p}from"./DialogTitle-gRzunAqv.js";import{u as c}from"./useScrollLock-7-hejkNC.js";const x=n.forwardRef(function(e,r){const{render:l,className:u,style:m,id:s,...t}=e,{store:i}=p(),o=c(s);return i.useSyncedValueWithCleanup("descriptionElementId",o),a("p",e,{ref:r,props:[{id:o},t]})});export{x as D};