@yishiguji/tokenarena 0.16.3 → 0.16.5

package/dist/index.js

@@ -645,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) {
@@ -702,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)
@@ -809,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) {
@@ -1282,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;
@@ -1292,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 {
@@ -2375,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);
@@ -7421,13 +7416,13 @@ function saveCachedParseResult(toolId, fingerprint2, result) {
 // src/services/parser-service.ts
 var PARSER_CONCURRENCY = 8;
 async function parseWithCache(parser) {
-  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 };
-  }
   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 };
@@ -7564,14 +7559,28 @@ function toDeviceMetadata(config) {
     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,
@@ -7607,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,
@@ -7792,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,
@@ -7846,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 };
     }
@@ -8009,7 +8029,7 @@ View your dashboard at: ${apiUrl}/usage`);
 }
 
 // src/commands/init.ts
-import { execFileSync as execFileSync7, spawn } from "child_process";
+import { execFileSync as execFileSync8, 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";
@@ -8019,18 +8039,24 @@ import { dirname as dirname8, join as join36, posix as posix3, win32 } from "pat
 import { platform as platform4 } from "os";
 
 // src/infrastructure/service/linux-systemd.ts
-import { execFileSync as execFileSync5 } from "child_process";
+import { execFileSync as execFileSync6 } from "child_process";
 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";
 
 // src/utils/command.ts
-import { execSync } from "child_process";
+import { execFileSync as execFileSync5 } from "child_process";
 import { platform } from "os";
+function getCommandCheck(command, currentPlatform = platform()) {
+  if (currentPlatform === "win32") {
+    return { command: "where", args: [command] };
+  }
+  return { command: "/bin/sh", args: ["-c", 'command -v "$1"', "sh", command] };
+}
 function isCommandAvailable(command) {
+  const check = getCommandCheck(command);
   try {
-    const check = platform() === "win32" ? `where ${command}` : `command -v ${command}`;
-    execSync(check, { stdio: "ignore", timeout: 5e3 });
+    execFileSync5(check.command, check.args, { stdio: "ignore", timeout: 5e3 });
     return true;
   } catch {
     return false;
@@ -8142,7 +8168,7 @@ function getSystemdSupport() {
   return { ok: true };
 }
 function execSystemctl(args) {
-  execFileSync5("systemctl", ["--user", ...args], {
+  execFileSync6("systemctl", ["--user", ...args], {
     stdio: "inherit"
   });
 }
@@ -8341,7 +8367,7 @@ function createLinuxSystemdServiceBackend() {
 }
 
 // src/infrastructure/service/macos-launchd.ts
-import { execFileSync as execFileSync6 } from "child_process";
+import { execFileSync as execFileSync7 } from "child_process";
 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";
@@ -8439,7 +8465,7 @@ function getLaunchctlSupport() {
     };
   }
   try {
-    execFileSync6("launchctl", ["print", getMacosLaunchdDomain(uid)], {
+    execFileSync7("launchctl", ["print", getMacosLaunchdDomain(uid)], {
       stdio: "ignore"
     });
     return { ok: true };
@@ -8451,7 +8477,7 @@ function getLaunchctlSupport() {
   }
 }
 function execLaunchctl(args, inherit = true) {
-  execFileSync6("launchctl", args, {
+  execFileSync7("launchctl", args, {
     stdio: inherit ? "inherit" : "ignore"
   });
 }
@@ -8760,7 +8786,7 @@ function resolvePowerShellProfilePath() {
   ];
   for (const command of candidates) {
     try {
-      const output = execFileSync7(
+      const output = execFileSync8(
         command,
         [
           "-NoLogo",