tokentracker-cli 0.63.0 → 0.64.0

package/src/lib/rollout.js

@@ -147,9 +147,26 @@ async function parseRolloutIncremental({
     const key = filePath;
     const prev = cursors.files[key] || null;
     const inode = st.ino || 0;
-    const startOffset = prev && prev.inode === inode ? prev.offset || 0 : 0;
-    const lastTotal = prev && prev.inode === inode ? prev.lastTotal || null : null;
-    const lastModel = prev && prev.inode === inode ? prev.lastModel || null : null;
+    const sameInode = prev && prev.inode === inode;
+    const prevOffset = sameInode ? prev.offset || 0 : 0;
+    const truncated = sameInode && prevOffset > st.size;
+    const startOffset = sameInode && !truncated ? prevOffset : 0;
+    const lastTotal = sameInode && !truncated ? prev.lastTotal || null : null;
+    const lastModel = sameInode && !truncated ? prev.lastModel || null : null;
+
+    if (!projectEnabled && sameInode && !truncated && startOffset >= st.size) {
+      if (cb) {
+        cb({
+          index: idx + 1,
+          total: totalFiles,
+          filePath,
+          filesProcessed,
+          eventsAggregated,
+          bucketsQueued: touchedBuckets.size,
+        });
+      }
+      continue;
+    }
 
     const projectContext = projectEnabled
       ? await resolveProjectContextForFile({
@@ -165,6 +182,7 @@ async function parseRolloutIncremental({
 
     const result = await parseRolloutFile({
       filePath,
+      fileStat: st,
       startOffset,
       lastTotal,
       lastModel,
@@ -267,7 +285,24 @@ async function parseClaudeIncremental({
     const key = filePath;
     const prev = cursors.files[key] || null;
     const inode = st.ino || 0;
-    const startOffset = prev && prev.inode === inode ? prev.offset || 0 : 0;
+    const sameInode = prev && prev.inode === inode;
+    const prevOffset = sameInode ? prev.offset || 0 : 0;
+    const truncated = sameInode && prevOffset > st.size;
+    const startOffset = sameInode && !truncated ? prevOffset : 0;
+
+    if (!projectEnabled && sameInode && !truncated && startOffset >= st.size) {
+      if (cb) {
+        cb({
+          index: idx + 1,
+          total: totalFiles,
+          filePath,
+          filesProcessed,
+          eventsAggregated,
+          bucketsQueued: touchedBuckets.size,
+        });
+      }
+      continue;
+    }
 
     const projectContext = projectEnabled
       ? await resolveProjectContextForFile({
@@ -283,6 +318,7 @@ async function parseClaudeIncremental({
 
     const result = await parseClaudeFile({
       filePath,
+      fileStat: st,
       startOffset,
       hourlyState,
       touchedBuckets,
@@ -770,6 +806,7 @@ function codexSessionIdFromPath(filePath) {
 
 async function parseRolloutFile({
   filePath,
+  fileStat,
   startOffset,
   lastTotal,
   lastModel,
@@ -786,7 +823,7 @@ async function parseRolloutFile({
   seenCodexEvents,
   sessionId,
 }) {
-  const st = await fs.stat(filePath);
+  const st = fileStat || (await fs.stat(filePath));
   const endOffset = st.size;
   if (startOffset >= endOffset) {
     return { endOffset, lastTotal, lastModel, eventsAggregated: 0 };
@@ -926,6 +963,7 @@ async function parseRolloutFile({
 
 async function parseClaudeFile({
   filePath,
+  fileStat,
   startOffset,
   hourlyState,
   touchedBuckets,
@@ -936,7 +974,7 @@ async function parseClaudeFile({
   projectKey,
   seenMessageHashes,
 }) {
-  const st = await fs.stat(filePath).catch(() => null);
+  const st = fileStat || (await fs.stat(filePath).catch(() => null));
   if (!st || !st.isFile()) return { endOffset: startOffset, eventsAggregated: 0 };
 
   const endOffset = st.size;

package/src/lib/skills-manager.js

@@ -577,8 +577,8 @@ function targetSkillPath(baseDir, directory) {
   const targetPath = path.resolve(root, safe);
   if (!pathStrictlyWithin(root, targetPath)) return null;
   try {
-    const rootStat = fs.lstatSync(root);
-    if (rootStat.isSymbolicLink() || !rootStat.isDirectory()) return null;
+    const rootStat = fs.statSync(root);
+    if (!rootStat.isDirectory()) return null;
   } catch (e) {
     if (e?.code !== "ENOENT") return null;
   }

package/src/lib/sqlite-reader.js

@@ -1,5 +1,6 @@
 const cp = require("node:child_process");
 const fssync = require("node:fs");
+const { promisify } = require("node:util");
 
 const warnedSqliteReadFailures = new Set();
 
@@ -116,6 +117,63 @@ function readSqliteJsonRows(dbPath, sql, options = {}) {
   return [];
 }
 
+async function readSqliteRowsWithCliAsync(dbPath, sql, { execFile, timeout, maxBuffer }) {
+  const { stdout } = await execFile("sqlite3", ["-json", dbPath, sql], {
+    encoding: "utf8",
+    maxBuffer,
+    timeout,
+  });
+  if (!stdout || !stdout.trim()) return [];
+  const rows = JSON.parse(stdout);
+  return Array.isArray(rows) ? rows : [];
+}
+
+// Async twin of readSqliteJsonRows for hot paths that must not block the event
+// loop (e.g. the usage-limits poll — see the "limits 路径 spawnSync 冻结全端点"
+// lesson). The CLI path runs via async execFile; the node:sqlite fallback is
+// synchronous (no async API exists), but it only runs when the sqlite3 CLI is
+// absent — uncommon on macOS/Linux, where the async path keeps the loop free.
+async function readSqliteJsonRowsAsync(dbPath, sql, options = {}) {
+  if (!dbPath || !sql) return [];
+  try {
+    if (!fssync.existsSync(dbPath)) return [];
+  } catch (_e) {
+    return [];
+  }
+  const execFile = options.execFile || promisify(cp.execFile);
+  const requireFn = options.requireFn || require;
+  const env = options.env || process.env;
+  const timeout = Number.isFinite(options.timeout) ? options.timeout : 30_000;
+  const maxBuffer = Number.isFinite(options.maxBuffer) ? options.maxBuffer : 50 * 1024 * 1024;
+  const label = options.label || "local";
+
+  let cliError = null;
+  try {
+    return await readSqliteRowsWithCliAsync(dbPath, sql, { execFile, timeout, maxBuffer });
+  } catch (err) {
+    cliError = err;
+  }
+
+  let nodeSqliteError = null;
+  try {
+    return readSqliteRowsWithNode(dbPath, sql, { requireFn });
+  } catch (err) {
+    nodeSqliteError = err;
+  }
+
+  if (isSqliteCliUnavailable(cliError) && isNodeSqliteUnavailable(nodeSqliteError)) {
+    warnSqliteUnavailable({
+      dbPath,
+      label,
+      cliError,
+      nodeSqliteError,
+      env,
+      stderr: options.stderr,
+    });
+  }
+  return [];
+}
+
 function readSqliteFirstValue(dbPath, sql, column, options = {}) {
   const rows = readSqliteJsonRows(dbPath, sql, options);
   const row = rows[0];
@@ -131,6 +189,7 @@ function resetSqliteReaderWarningsForTests() {
 
 module.exports = {
   readSqliteJsonRows,
+  readSqliteJsonRowsAsync,
   readSqliteFirstValue,
   resetSqliteReaderWarningsForTests,
 };

package/src/lib/usage-limits.js

@@ -2477,10 +2477,10 @@ async function fetchUsageLimitsUncached({
       .catch((reason) => ({ configured: true, error: reason?.message || "Unknown error" })),
     withProviderTimeout(fetchZcodeLimits({ home, env, fetchImpl: providerFetch }), "ZCode", providerTimeoutMs)
       .catch((reason) => ({ configured: true, error: reason?.message || "Unknown error" })),
-    // OpenCode Go scrapes the workspace dashboard (no public REST API yet,
-    // tracked at anomalyco/opencode#16017). Auth is via two env vars, see
-    // src/lib/opencode-go-limits.js for the exact endpoint + cookie shape.
-    withProviderTimeout(fetchOpencodeGoLimits({ env, fetchImpl: providerFetch }), "OpenCode Go", providerTimeoutMs)
+    // OpenCode Go: local opencode.db cost-vs-dollar-cap estimate by default
+    // (auth-free, zero-config), upgraded to the exact server-side scrape when an
+    // OPENCODE_GO_AUTH_COOKIE is set. See src/lib/opencode-go-limits.js.
+    withProviderTimeout(fetchOpencodeGoLimits({ home, env, fetchImpl: providerFetch }), "OpenCode Go", providerTimeoutMs)
       .catch((reason) => ({ configured: true, error: reason?.message || "Unknown error" })),
   ]);