atris 3.71.3 → 3.72.0

package/lib/campaign-trace.js

@@ -7,7 +7,7 @@
 'use strict';
 
 const crypto = require('crypto');
-const { compareEvents, fold, foldWithPrefixes } = require('./campaign-core');
+const { compareEvents, fold, foldWithSummaryPrefixes } = require('./campaign-core');
 const { judgeReading } = require('./campaign-reading');
 
 const SCHEMA = 'atris.campaign.trace';
@@ -55,16 +55,14 @@ function foldOrder(events) {
 }
 
 function compactState(view, run) {
-  const missions = { proposed: 0, claimed: 0, running: 0, ended: 0, vetoed: 0, dropped: 0 };
-  for (const m of view.missions) missions[m.status] = (missions[m.status] || 0) + 1;
   return {
     state: view.state,
     reading: readingOf(run).value,
-    confidence: view.answer.confidence,
+    confidence: view.confidence,
     judge_runs: view.judge_runs,
     budget: view.budget,
-    missions,
-    open_asks: view.asks.length,
+    missions: view.mission_counts,
+    open_asks: view.open_asks,
   };
 }
 
@@ -141,21 +139,49 @@ function buildTrace(events, options = {}) {
   // Reuse one event traversal and retain only the compact state needed for
   // ended missions. Reading lookup below still uses the original position.
   const prefixStates = ended.length
-    ? foldWithPrefixes(sequence, ended.map((m) => Math.max(1, m.firstPos === null ? m.endPos : m.firstPos)),
-      (view) => compactState(view, null)).prefixes
+    ? foldWithSummaryPrefixes(sequence, ended.map((m) => Math.max(1, m.firstPos === null ? m.endPos : m.firstPos))).prefixes
     : new Map();
   const lastRunBefore = (pos) => {
-    let found = null;
-    for (const run of judgeRuns) if (run.pos < pos) found = run;
-    return found;
+    let lo = 0;
+    let hi = judgeRuns.length;
+    while (lo < hi) {
+      const mid = Math.floor((lo + hi) / 2);
+      if (judgeRuns[mid].pos < pos) lo = mid + 1;
+      else hi = mid;
+    }
+    return judgeRuns[lo - 1] || null;
+  };
+  const firstRunAfter = (pos) => {
+    let lo = 0;
+    let hi = judgeRuns.length;
+    while (lo < hi) {
+      const mid = Math.floor((lo + hi) / 2);
+      if (judgeRuns[mid].pos <= pos) lo = mid + 1;
+      else hi = mid;
+    }
+    return judgeRuns[lo] || null;
+  };
+  const judgeChangedBetween = (beforePos, afterPos) => {
+    let lo = 0;
+    let hi = judgeChanges.length;
+    while (lo < hi) {
+      const mid = Math.floor((lo + hi) / 2);
+      if (judgeChanges[mid] <= beforePos) lo = mid + 1;
+      else hi = mid;
+    }
+    return lo < judgeChanges.length && judgeChanges[lo] < afterPos;
   };
-  const firstRunAfter = (pos) => judgeRuns.find((run) => run.pos > pos) || null;
 
   // Where the campaign finished, if it did: the first position whose prefix is done.
   let finishPos = null;
   if (final.state === 'done') {
     let lo = 0;
     let hi = sequence.length - 1;
+    for (const [count, snapshot] of prefixStates) {
+      if (snapshot.state === 'done') { hi = count - 1; break; }
+      lo = count;
+    }
+
     while (lo < hi) {
       const mid = Math.floor((lo + hi) / 2);
       if (fold(sequence.slice(0, mid + 1)).state === 'done') hi = mid;
@@ -190,7 +216,7 @@ function buildTrace(events, options = {}) {
     const batch = batches.get(`${before ? before.pos : -1}:${after ? after.pos : 'open'}`);
     const size = batch.missions.length;
     const outcome = outcomeOf(m);
-    const judgeChanged = before && after && judgeChanges.some(pos => pos > before.pos && pos < after.pos);
+    const judgeChanged = before && after && judgeChangedBetween(before.pos, after.pos);
     const readBefore = readingOf(before);
     // A replacement baseline is real campaign state, but cannot score earlier
     // work. Null also prevents a replacement pass becoming fallback RSI proof.
@@ -226,7 +252,7 @@ function buildTrace(events, options = {}) {
       step: i + 1,
       at: m.endAt,
       batch: { index: batch.index, size },
-      state_before: { ...prefixStates.get(Math.max(1, startPos)), reading: readingOf(lastRunBefore(startPos)).value },
+      state_before: compactState(prefixStates.get(Math.max(1, startPos)), lastRunBefore(startPos)),
       action,
       outcome,
       cost_usd: folded.cost_usd === undefined || folded.cost_usd === null ? m.endData.cost_usd : folded.cost_usd,

package/lib/engine-resource.js

@@ -93,7 +93,11 @@ const SYSTEM_TOOLS = {
 
 function defaultRun(cmd, args) {
   const full = SYSTEM_TOOLS[cmd];
-  return spawnSync(full && fs.existsSync(full) ? full : cmd, args, { encoding: 'utf8', timeout: 3000 });
+  const options = { encoding: 'utf8', timeout: 3000 };
+  // Environment listings grow with local jobs; keep a finite allowance above
+  // Node's default 1 MiB without changing the deadline or failed-read policy.
+  if (cmd === 'ps') options.maxBuffer = 8 * 1024 * 1024;
+  return spawnSync(full && fs.existsSync(full) ? full : cmd, args, options);
 }
 
 function parseFreePct(text) {