@yishiguji/tokenarena 0.16.2 → 0.16.4

package/dist/index.js

@@ -367,8 +367,25 @@ function selectSnapshot(current, candidate) {
     }
   };
 }
+function getScanDirectories() {
+  const directories = [];
+  for (const root of getClaudeRoots()) {
+    directories.push(join2(root, "projects"));
+  }
+  for (const root of getClaudeRoots()) {
+    for (const directory of ["transcripts", "sessions"]) {
+      directories.push(join2(root, directory));
+    }
+  }
+  return directories;
+}
 var ClaudeCodeParser = class {
   tool = TOOL;
+  listSourceFiles() {
+    return getScanDirectories().flatMap(
+      (directory) => findJsonlFiles(directory)
+    );
+  }
   async parse() {
     const snapshots = /* @__PURE__ */ new Map();
     const sessionEvents = /* @__PURE__ */ new Map();
@@ -628,13 +645,15 @@ function readRollout(path) {
   let latestTimestampOrder = 0n;
   let minLineTimestampOrder = null;
   let line = 0;
-  let lineCount = 0;
+  let maxOrdinal = null;
   for (const text of content.split("\n")) {
     line++;
     if (!text.trim()) continue;
-    lineCount++;
     try {
       const event = JSON.parse(text);
+      if (typeof event.ordinal === "number" && Number.isSafeInteger(event.ordinal) && event.ordinal >= 0 && (maxOrdinal === null || event.ordinal > maxOrdinal)) {
+        maxOrdinal = event.ordinal;
+      }
       const timestamp = readTimestamp(event.timestamp);
       const order = timestampOrder(event.timestamp, timestamp);
       if (order !== null) {
@@ -685,7 +704,7 @@ function readRollout(path) {
       forkedFrom && spawnedFrom && forkedFrom !== spawnedFrom
     ),
     forkOrdinalExclusive: typeof meta?.forked_from_ordinal_exclusive === "number" && Number.isSafeInteger(meta.forked_from_ordinal_exclusive) && meta.forked_from_ordinal_exclusive > 0 ? meta.forked_from_ordinal_exclusive : null,
-    lineCount,
+    maxOrdinal,
     rootTimestampOrder: timestampOrder(
       rootMeta?.timestamp,
       readTimestamp(rootMeta?.timestamp)
@@ -737,12 +756,16 @@ var CodexParser = class {
   isInstalled() {
     return this.dataDirs.some((directory) => existsSync4(directory));
   }
+  /** The same list `parse()` reads, so the two can never drift apart. */
+  listSourceFiles() {
+    return [...new Set(this.dataDirs.flatMap(findJsonlFiles))].sort();
+  }
   async parse() {
     const entries = [];
     const sessionEvents = [];
     const threads = /* @__PURE__ */ new Map();
     const threadIndex = /* @__PURE__ */ new Map();
-    const files = [...new Set(this.dataDirs.flatMap(findJsonlFiles))].sort();
+    const files = this.listSourceFiles();
     for (const path of files) {
       const file = readRollout(path);
       if (!file) continue;
@@ -788,13 +811,11 @@ var CodexParser = class {
         if (file.parentConflict || file.parentId) {
           const parent = file.parentId ? threadIndex.get(file.parentId) : void 0;
           const cutoff = file.rootTimestampOrder;
-          const coverageOk = parent ? file.forkOrdinalExclusive !== null ? (
-            // 多文件父线程按最新文件（通常就是产生该 fork 的 rollout）
-            // 的行数核验；其余文件属于同一线程的历史分段。
-            parent.files.some(
-              (rollout) => rollout.lineCount >= (file.forkOrdinalExclusive ?? 0)
-            )
-          ) : cutoff !== null && // 父最大时间戳落后不超过 1 秒，或父内容完全早于截止点
+          const parentMaxOrdinal = parent ? parent.files.reduce(
+            (max, rollout) => rollout.maxOrdinal !== null && (max === null || rollout.maxOrdinal > max) ? rollout.maxOrdinal : max,
+            null
+          ) : null;
+          const coverageOk = parent ? file.forkOrdinalExclusive !== null && parentMaxOrdinal !== null ? parentMaxOrdinal >= file.forkOrdinalExclusive - 1 : cutoff !== null && // 父最大时间戳落后不超过 1 秒，或父内容完全早于截止点
           // 且父最早行时间戳也早于截止点（父在截止前已停止写入）。
           (parent.latestTimestampOrder >= cutoff - 1000000n || parent.minLineTimestampOrder !== null && parent.minLineTimestampOrder < cutoff) : false;
           if (file.parentConflict || !parent || parent === thread || cutoff === null || !processThread(parent) || parent.invalidTokenTimestamp || !coverageOk) {
@@ -1261,7 +1282,15 @@ import { dirname, join as join6 } from "path";
 import { execFileSync } from "child_process";
 import { statSync } from "fs";
 import { pathToFileURL } from "url";
-function withSuppressedSqliteWarning(fn) {
+var warningScope = Promise.resolve();
+async function withSuppressedSqliteWarning(fn) {
+  const previousScope = warningScope;
+  let releaseScope = () => {
+  };
+  warningScope = new Promise((resolve5) => {
+    releaseScope = resolve5;
+  });
+  await previousScope;
   const originalEmitWarning = process.emitWarning;
   process.emitWarning = ((warning, ...args) => {
     const warningName = typeof warning === "string" ? typeof args[0] === "string" ? args[0] : "" : warning.name;
@@ -1271,9 +1300,12 @@ function withSuppressedSqliteWarning(fn) {
     }
     originalEmitWarning.call(process, warning, ...args);
   });
-  return fn().finally(() => {
+  try {
+    return await fn();
+  } finally {
     process.emitWarning = originalEmitWarning;
-  });
+    releaseScope();
+  }
 }
 function warnWhenWalSkipped(dbPath) {
   try {
@@ -2354,25 +2386,9 @@ function getOpenCodeDataDirs(env = process.env) {
   ].filter((value) => Boolean(value));
   return Array.from(new Set(dirs));
 }
-async function withSuppressedSqliteWarning2(fn) {
-  const originalEmitWarning = process.emitWarning;
-  process.emitWarning = ((warning, ...args) => {
-    const warningName = typeof warning === "string" ? typeof args[0] === "string" ? args[0] : "" : warning.name;
-    const warningMessage = typeof warning === "string" ? warning : warning.message;
-    if (warningName === "ExperimentalWarning" && warningMessage.includes("SQLite")) {
-      return;
-    }
-    originalEmitWarning.call(process, warning, ...args);
-  });
-  try {
-    return await fn();
-  } finally {
-    process.emitWarning = originalEmitWarning;
-  }
-}
 async function readSqliteRowsWithBuiltin2(dbPath, query) {
   try {
-    return await withSuppressedSqliteWarning2(async () => {
+    return await withSuppressedSqliteWarning(async () => {
       const sqliteModuleId = "node:sqlite";
       const sqlite = await import(sqliteModuleId);
       const db = new sqlite.DatabaseSync(dbPath);
@@ -6661,7 +6677,7 @@ async function handleConfig(args) {
 }
 
 // src/services/sync-service.ts
-import { hostname as hostname6 } from "os";
+import { hostname as hostname7 } from "os";
 
 // src/domain/project-identity.ts
 import { createHmac } from "crypto";
@@ -7293,38 +7309,179 @@ function saveUploadManifest(manifest) {
   );
 }
 
+// src/services/parse-cache.ts
+import { createHash as createHash7 } from "crypto";
+import { mkdirSync as mkdirSync3, readFileSync as readFileSync14, statSync as statSync6, writeFileSync as writeFileSync5 } from "fs";
+import { hostname as hostname6 } from "os";
+import { join as join35 } from "path";
+
+// src/infrastructure/runtime/cli-version.ts
+import { dirname as dirname7, join as join34 } from "path";
+import { fileURLToPath } from "url";
+var FALLBACK_VERSION = "0.0.0";
+var versionCache = /* @__PURE__ */ new Map();
+function readPackageVersion(startDir) {
+  let dir = startDir;
+  while (true) {
+    const contents = readFileSafe(join34(dir, "package.json"));
+    if (contents !== null) {
+      try {
+        const { version } = JSON.parse(contents);
+        return typeof version === "string" && version.length > 0 ? version : void 0;
+      } catch {
+        return void 0;
+      }
+    }
+    const parent = dirname7(dir);
+    if (parent === dir) {
+      return void 0;
+    }
+    dir = parent;
+  }
+}
+function getCliVersion(metaUrl = import.meta.url) {
+  const startDir = dirname7(fileURLToPath(metaUrl));
+  const cached = versionCache.get(startDir);
+  if (cached !== void 0) {
+    return cached;
+  }
+  const version = readPackageVersion(startDir) ?? FALLBACK_VERSION;
+  versionCache.set(startDir, version);
+  return version;
+}
+
+// src/services/parse-cache.ts
+var CACHE_FORMAT_VERSION = 1;
+var SETTLE_MS = 5e3;
+function getParseCacheDir() {
+  return join35(getStateDir(), "parse-cache");
+}
+function getParseCachePath(toolId) {
+  return join35(getParseCacheDir(), `${toolId}.json`);
+}
+function computeScanFingerprint(files, now = Date.now()) {
+  const hash = createHash7("sha256");
+  hash.update(`v${CACHE_FORMAT_VERSION}\0`);
+  hash.update(`${getCliVersion()}\0`);
+  hash.update(`${hostname6()}\0`);
+  for (const file of [...files].sort()) {
+    let stats;
+    try {
+      stats = statSync6(file);
+    } catch {
+      return null;
+    }
+    if (now - stats.mtimeMs < SETTLE_MS) {
+      return null;
+    }
+    hash.update(`${file}\0${stats.mtimeMs}\0${stats.size}\0`);
+  }
+  return hash.digest("hex");
+}
+function loadCachedParseResult(toolId, fingerprint2) {
+  if (!fingerprint2) {
+    return null;
+  }
+  try {
+    const envelope = JSON.parse(
+      readFileSync14(getParseCachePath(toolId), "utf-8")
+    );
+    if (envelope.formatVersion !== CACHE_FORMAT_VERSION || envelope.fingerprint !== fingerprint2 || !Array.isArray(envelope.result?.buckets) || !Array.isArray(envelope.result?.sessions)) {
+      return null;
+    }
+    return {
+      buckets: envelope.result.buckets,
+      sessions: envelope.result.sessions
+    };
+  } catch {
+    return null;
+  }
+}
+function saveCachedParseResult(toolId, fingerprint2, result) {
+  if (!fingerprint2 || result.incomplete) {
+    return;
+  }
+  const envelope = {
+    formatVersion: CACHE_FORMAT_VERSION,
+    fingerprint: fingerprint2,
+    result: { buckets: result.buckets, sessions: result.sessions }
+  };
+  try {
+    mkdirSync3(getParseCacheDir(), { recursive: true });
+    writeFileSync5(getParseCachePath(toolId), JSON.stringify(envelope), "utf-8");
+  } catch {
+  }
+}
+
 // src/services/parser-service.ts
+var PARSER_CONCURRENCY = 8;
+async function parseWithCache(parser) {
+  try {
+    const files = parser.listSourceFiles?.();
+    const fingerprint2 = files ? computeScanFingerprint(files) : null;
+    const cached = loadCachedParseResult(parser.tool.id, fingerprint2);
+    if (cached) {
+      return { status: "ok", result: cached, cached: true };
+    }
+    const result = await parser.parse();
+    saveCachedParseResult(parser.tool.id, fingerprint2, result);
+    return { status: "ok", result, cached: false };
+  } catch (err) {
+    return {
+      status: "failed",
+      message: err instanceof Error ? err.message : String(err)
+    };
+  }
+}
+async function mapWithConcurrency(items, limit, run2) {
+  const results = new Array(items.length);
+  let cursor = 0;
+  async function worker() {
+    while (cursor < items.length) {
+      const index = cursor++;
+      results[index] = await run2(items[index]);
+    }
+  }
+  await Promise.all(
+    Array.from({ length: Math.min(limit, items.length) }, () => worker())
+  );
+  return results;
+}
 async function runAllParsers() {
   const allBuckets = [];
   const allSessions = [];
   const parserResults = [];
   const failedSources = /* @__PURE__ */ new Set();
-  for (const parser of getAllParsers()) {
-    try {
-      const result = await parser.parse();
-      const buckets = result.buckets;
-      const sessions = result.sessions;
-      if (result.incomplete) {
-        failedSources.add(parser.tool.id);
-        logger.warn(
-          `${parser.tool.id} parser reported an incomplete scan; preserving its remote history.`
-        );
-        continue;
-      }
-      if (buckets.length > 0) allBuckets.push(...buckets);
-      if (sessions.length > 0) allSessions.push(...sessions);
-      if (buckets.length > 0 || sessions.length > 0) {
-        parserResults.push({
-          source: parser.tool.id,
-          buckets: buckets.length,
-          sessions: sessions.length
-        });
-      }
-    } catch (err) {
+  const parsers2 = getAllParsers();
+  const settled = await mapWithConcurrency(
+    parsers2,
+    PARSER_CONCURRENCY,
+    parseWithCache
+  );
+  for (const [index, parser] of parsers2.entries()) {
+    const outcome = settled[index];
+    if (outcome.status === "failed") {
+      failedSources.add(parser.tool.id);
+      logger.warn(`${parser.tool.id} parser failed: ${outcome.message}`);
+      continue;
+    }
+    const { buckets, sessions, incomplete } = outcome.result;
+    if (incomplete) {
       failedSources.add(parser.tool.id);
       logger.warn(
-        `${parser.tool.id} parser failed: ${err instanceof Error ? err.message : String(err)}`
+        `${parser.tool.id} parser reported an incomplete scan; preserving its remote history.`
       );
+      continue;
+    }
+    if (buckets.length > 0) allBuckets.push(...buckets);
+    if (sessions.length > 0) allSessions.push(...sessions);
+    if (buckets.length > 0 || sessions.length > 0) {
+      parserResults.push({
+        source: parser.tool.id,
+        buckets: buckets.length,
+        sessions: sessions.length,
+        ...outcome.cached ? { cached: true } : {}
+      });
     }
   }
   return {
@@ -7399,17 +7556,31 @@ function persistUploadManifest(manifest, quiet) {
 function toDeviceMetadata(config) {
   return {
     deviceId: getOrCreateDeviceId(config),
-    hostname: hostname6().replace(/\.local$/, "")
+    hostname: hostname7().replace(/\.local$/, "")
   };
 }
-function toUploadBuckets(buckets, settings, device) {
+function createProjectIdentityResolver(settings) {
+  const identities = /* @__PURE__ */ new Map();
+  return (project) => {
+    const name = project || "unknown";
+    let identity = identities.get(name);
+    if (!identity) {
+      identity = toProjectIdentity({
+        project: name,
+        mode: settings.projectMode,
+        salt: settings.projectHashSalt
+      });
+      identities.set(name, identity);
+    }
+    return identity;
+  };
+}
+function toUploadBuckets(buckets, settings, device, resolveProject = createProjectIdentityResolver(
+  settings
+)) {
   const aggregated = /* @__PURE__ */ new Map();
   for (const bucket of buckets) {
-    const project = toProjectIdentity({
-      project: bucket.project || "unknown",
-      mode: settings.projectMode,
-      salt: settings.projectHashSalt
-    });
+    const project = resolveProject(bucket.project);
     const key = [
       bucket.source,
       bucket.model,
@@ -7445,13 +7616,11 @@ function toUploadBuckets(buckets, settings, device) {
   }
   return Array.from(aggregated.values());
 }
-function toUploadSessions(sessions, settings, device) {
+function toUploadSessions(sessions, settings, device, resolveProject = createProjectIdentityResolver(
+  settings
+)) {
   return sessions.map((session) => {
-    const project = toProjectIdentity({
-      project: session.project || "unknown",
-      mode: settings.projectMode,
-      salt: settings.projectHashSalt
-    });
+    const project = resolveProject(session.project);
     return {
       source: session.source,
       projectKey: project.projectKey,
@@ -7598,7 +7767,8 @@ async function runSync(config, opts = {}) {
         const parts = [];
         if (p.buckets > 0) parts.push(`${p.buckets} buckets`);
         if (p.sessions > 0) parts.push(`${p.sessions} sessions`);
-        logger.info(`  ${p.source}: ${parts.join(", ")}`);
+        const suffix = p.cached ? " (unchanged)" : "";
+        logger.info(`  ${p.source}: ${parts.join(", ")}${suffix}`);
       }
     }
     const apiUrl = config.apiUrl || "https://token.guji.uno";
@@ -7629,8 +7799,19 @@ async function runSync(config, opts = {}) {
       deviceId: device.deviceId,
       settings
     });
-    const uploadBuckets = toUploadBuckets(allBuckets, settings, device);
-    const uploadSessions = toUploadSessions(allSessions, settings, device);
+    const resolveProject = createProjectIdentityResolver(settings);
+    const uploadBuckets = toUploadBuckets(
+      allBuckets,
+      settings,
+      device,
+      resolveProject
+    );
+    const uploadSessions = toUploadSessions(
+      allSessions,
+      settings,
+      device,
+      resolveProject
+    );
     const previousManifest = loadUploadManifest();
     const uploadDiff = diffUploadManifest({
       buckets: uploadBuckets,
@@ -7683,7 +7864,9 @@ async function runSync(config, opts = {}) {
           skippedParts.length > 0 ? `No new or updated usage data to upload. Skipped ${skippedParts.join(" + ")}.` : "No new or updated usage data to upload."
         );
       }
-      persistUploadManifest(uploadDiff.nextManifest, quiet);
+      if (uploadDiff.removedBuckets > 0 || uploadDiff.removedSessions > 0) {
+        persistUploadManifest(uploadDiff.nextManifest, quiet);
+      }
       markSyncSucceeded(source, { buckets: 0, sessions: 0 });
       return { buckets: 0, sessions: 0 };
     }
@@ -7850,14 +8033,14 @@ import { execFileSync as execFileSync7, spawn } from "child_process";
 import { existsSync as existsSync36 } from "fs";
 import { appendFile, mkdir, readFile } from "fs/promises";
 import { homedir as homedir33, platform as platform5 } from "os";
-import { dirname as dirname7, join as join34, posix as posix3, win32 } from "path";
+import { dirname as dirname8, join as join36, posix as posix3, win32 } from "path";
 
 // src/infrastructure/service/index.ts
 import { platform as platform4 } from "os";
 
 // src/infrastructure/service/linux-systemd.ts
 import { execFileSync as execFileSync5 } from "child_process";
-import { existsSync as existsSync34, mkdirSync as mkdirSync3, rmSync as rmSync4, writeFileSync as writeFileSync5 } from "fs";
+import { existsSync as existsSync34, mkdirSync as mkdirSync4, rmSync as rmSync4, writeFileSync as writeFileSync6 } from "fs";
 import { homedir as homedir31, platform as platform2 } from "os";
 import { posix } from "path";
 
@@ -8019,8 +8202,8 @@ function createLinuxSystemdServiceBackend() {
         execPath: command.execPath,
         args: command.args
       });
-      mkdirSync3(serviceDir, { recursive: true });
-      writeFileSync5(serviceFile, content, "utf-8");
+      mkdirSync4(serviceDir, { recursive: true });
+      writeFileSync6(serviceFile, content, "utf-8");
       execSystemctl(["daemon-reload"]);
       execSystemctl(["enable", SYSTEMD_SERVICE_NAME]);
       execSystemctl(["start", SYSTEMD_SERVICE_NAME]);
@@ -8179,7 +8362,7 @@ function createLinuxSystemdServiceBackend() {
 
 // src/infrastructure/service/macos-launchd.ts
 import { execFileSync as execFileSync6 } from "child_process";
-import { existsSync as existsSync35, mkdirSync as mkdirSync4, rmSync as rmSync5, writeFileSync as writeFileSync6 } from "fs";
+import { existsSync as existsSync35, mkdirSync as mkdirSync5, rmSync as rmSync5, writeFileSync as writeFileSync7 } from "fs";
 import { homedir as homedir32, platform as platform3 } from "os";
 import { posix as posix2 } from "path";
 var MACOS_LAUNCHD_LABEL = "com.guji.tokenarena";
@@ -8321,8 +8504,8 @@ function writeLaunchAgentPlist() {
     standardErrorPath: stderrPath
   });
   ensureAppDirs();
-  mkdirSync4(getMacosLaunchAgentDir(), { recursive: true });
-  writeFileSync6(plistFile, plist, "utf-8");
+  mkdirSync5(getMacosLaunchAgentDir(), { recursive: true });
+  writeFileSync7(plistFile, plist, "utf-8");
   return plistFile;
 }
 function bootstrapLaunchAgent() {
@@ -8593,7 +8776,7 @@ function resolvePowerShellProfilePath() {
   const systemRoot = process.env.SYSTEMROOT || "C:\\Windows";
   const candidates = [
     "pwsh.exe",
-    join34(systemRoot, "System32", "WindowsPowerShell", "v1.0", "powershell.exe")
+    join36(systemRoot, "System32", "WindowsPowerShell", "v1.0", "powershell.exe")
   ];
   for (const command of candidates) {
     try {
@@ -8818,7 +9001,7 @@ async function setupShellAlias() {
     return;
   }
   try {
-    await mkdir(dirname7(setup.configFile), { recursive: true });
+    await mkdir(dirname8(setup.configFile), { recursive: true });
     let existingContent = "";
     if (existsSync36(setup.configFile)) {
       existingContent = await readFile(setup.configFile, "utf-8");
@@ -9083,41 +9266,6 @@ function buildLocalUsageDashboardData(input2) {
   };
 }
 
-// src/infrastructure/runtime/cli-version.ts
-import { dirname as dirname8, join as join35 } from "path";
-import { fileURLToPath } from "url";
-var FALLBACK_VERSION = "0.0.0";
-var versionCache = /* @__PURE__ */ new Map();
-function readPackageVersion(startDir) {
-  let dir = startDir;
-  while (true) {
-    const contents = readFileSafe(join35(dir, "package.json"));
-    if (contents !== null) {
-      try {
-        const { version } = JSON.parse(contents);
-        return typeof version === "string" && version.length > 0 ? version : void 0;
-      } catch {
-        return void 0;
-      }
-    }
-    const parent = dirname8(dir);
-    if (parent === dir) {
-      return void 0;
-    }
-    dir = parent;
-  }
-}
-function getCliVersion(metaUrl = import.meta.url) {
-  const startDir = dirname8(fileURLToPath(metaUrl));
-  const cached = versionCache.get(startDir);
-  if (cached !== void 0) {
-    return cached;
-  }
-  const version = readPackageVersion(startDir) ?? FALLBACK_VERSION;
-  versionCache.set(startDir, version);
-  return version;
-}
-
 // src/infrastructure/ui/local-usage-dashboard.ts
 var MAX_RANK_ROWS = 6;
 var MAX_SESSION_ROWS = 6;
@@ -9516,7 +9664,7 @@ async function runSyncCommand(opts = {}) {
 }
 
 // src/commands/uninstall.ts
-import { existsSync as existsSync37, readFileSync as readFileSync14, rmSync as rmSync6, writeFileSync as writeFileSync7 } from "fs";
+import { existsSync as existsSync37, readFileSync as readFileSync15, rmSync as rmSync6, writeFileSync as writeFileSync8 } from "fs";
 import { homedir as homedir34, platform as platform6 } from "os";
 function removeShellAlias() {
   const shell = process.env.SHELL;
@@ -9543,7 +9691,7 @@ function removeShellAlias() {
   }
   if (!existsSync37(configFile)) return;
   try {
-    let content = readFileSync14(configFile, "utf-8");
+    let content = readFileSync15(configFile, "utf-8");
     const aliasPatterns = [
       // zsh / bash format: alias ta="tokenarena"
       new RegExp(
@@ -9565,7 +9713,7 @@ function removeShellAlias() {
         content = next;
       }
     }
-    writeFileSync7(configFile, content, "utf-8");
+    writeFileSync8(configFile, content, "utf-8");
     logger.info(`Removed shell alias from ${configFile}`);
   } catch (err) {
     logger.warn(