@yishiguji/tokenarena 0.16.1 → 0.16.2

package/dist/index.js

@@ -626,16 +626,22 @@ function readRollout(path) {
   let rootMeta = null;
   let model = "unknown";
   let latestTimestampOrder = 0n;
+  let minLineTimestampOrder = null;
   let line = 0;
+  let lineCount = 0;
   for (const text of content.split("\n")) {
     line++;
     if (!text.trim()) continue;
+    lineCount++;
     try {
       const event = JSON.parse(text);
       const timestamp = readTimestamp(event.timestamp);
       const order = timestampOrder(event.timestamp, timestamp);
-      if (order !== null && order > latestTimestampOrder)
-        latestTimestampOrder = order;
+      if (order !== null) {
+        if (order > latestTimestampOrder) latestTimestampOrder = order;
+        if (minLineTimestampOrder === null || order < minLineTimestampOrder)
+          minLineTimestampOrder = order;
+      }
       if (event.type === "session_meta" && !rootMeta) rootMeta = event;
       if (event.type === "turn_context") {
         model = readId(event.payload?.model) || readId(event.payload?.info?.model) || model;
@@ -678,11 +684,14 @@ function readRollout(path) {
     parentConflict: Boolean(
       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,
     rootTimestampOrder: timestampOrder(
       rootMeta?.timestamp,
       readTimestamp(rootMeta?.timestamp)
     ),
     latestTimestampOrder,
+    minLineTimestampOrder,
     tokens,
     prompts
   };
@@ -743,6 +752,7 @@ var CodexParser = class {
           files: [],
           timeline: [],
           latestTimestampOrder: 0n,
+          minLineTimestampOrder: null,
           invalidTokenTimestamp: false,
           status: "new"
         };
@@ -751,6 +761,8 @@ var CodexParser = class {
       thread.files.push(file);
       if (file.latestTimestampOrder > thread.latestTimestampOrder)
         thread.latestTimestampOrder = file.latestTimestampOrder;
+      if (file.minLineTimestampOrder !== null && (thread.minLineTimestampOrder === null || file.minLineTimestampOrder < thread.minLineTimestampOrder))
+        thread.minLineTimestampOrder = file.minLineTimestampOrder;
       thread.invalidTokenTimestamp ||= file.tokens.some(
         (token) => !token.timestamp
       );
@@ -776,7 +788,16 @@ var CodexParser = class {
         if (file.parentConflict || file.parentId) {
           const parent = file.parentId ? threadIndex.get(file.parentId) : void 0;
           const cutoff = file.rootTimestampOrder;
-          if (file.parentConflict || !parent || parent === thread || cutoff === null || !processThread(parent) || parent.invalidTokenTimestamp || parent.latestTimestampOrder < cutoff) {
+          const coverageOk = parent ? file.forkOrdinalExclusive !== null ? (
+            // 多文件父线程按最新文件（通常就是产生该 fork 的 rollout）
+            // 的行数核验；其余文件属于同一线程的历史分段。
+            parent.files.some(
+              (rollout) => rollout.lineCount >= (file.forkOrdinalExclusive ?? 0)
+            )
+          ) : 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) {
             logger.warn(
               "Codex fork replay could not be verified; skipping " + basename2(file.path)
             );