@renzrollon/interlock 1.2.1 → 1.3.1

package/lib/run.mjs

@@ -64,6 +64,7 @@ import { classifySurface } from './surface.mjs'
 import { buildChecklist } from './conformance.mjs'
 import { record as recordAutonomy } from './autonomy.mjs'
 import { writeResumeCard } from './resume-card.mjs'
+import { summarizePlan } from './plan-summary.mjs'
 import {
   applyReplan,
   batchOutcomes,
@@ -439,7 +440,17 @@ export const RELAY_STEP_FIELDS = Object.freeze([
   'reason',
   // The control-plane ping model `run start` decided (design D3). The driver
   // sets its relay pings' model from this field and from nothing else.
-  'pingModel'
+  'pingModel',
+  // For a second reader, the ship meter's wave board, and read by neither
+  // driver (draw-the-wave-board-in-the-meter-pane design D1): the step's wave
+  // and batch positions, a verify step's skip flag, the ids a recorded batch
+  // names, and the plan summary the adoption and replan steps carry.
+  'waveIndex',
+  'batchIndex',
+  'batchCount',
+  'skipped',
+  'recorded',
+  'plan'
 ])
 
 /**
@@ -2582,6 +2593,12 @@ function adoptPlan(ctx, manifest, plan) {
   if (slotsBanner && first && typeof first === 'object') {
     first.banners = [...(Array.isArray(first.banners) ? first.banners : []), slotsBanner]
   }
+  // The waves that will run, once, for the meter's board (design D3): the
+  // state's batches, which a `maxParallel` override re-chunked, with the
+  // planner's own deferral records.
+  if (first && typeof first === 'object' && first.action !== 'halt') {
+    first.plan = summarizePlan(state, { deferred: plan.deferred })
+  }
   return first
 }
 
@@ -3033,6 +3050,13 @@ export function runRecordBatch(ctx, { results, hostRecords }) {
   if (verdict.claimDerived) banners.push(claimDerivedBanner())
   if (verdict.overrides.length) banners.push(overrideBanner(verdict.overrides))
 
+  // The lane that stopped early, plus anything the recorder found no result for
+  // at all. Neither is ticked and neither is a failure. One expression for the
+  // tally and for the step's `recorded`, so the two cannot disagree (design D2).
+  const notAttemptedOf = counts => [
+    ...unattempted,
+    ...counts.recordedNotAttempted.filter(id => !unattempted.includes(id))
+  ]
   verdict.waves.forEach(counts => {
     manifest.waves.push({
       wave: pending.wave,
@@ -3041,12 +3065,7 @@ export function runRecordBatch(ctx, { results, hostRecords }) {
       ok: counts.ok,
       failed: counts.failed,
       failedIds: counts.failedIds,
-      // The lane that stopped early, plus anything the recorder found no result
-      // for at all. Neither is ticked and neither is a failure.
-      notAttempted: [
-        ...unattempted,
-        ...counts.recordedNotAttempted.filter(id => !unattempted.includes(id))
-      ]
+      notAttempted: notAttemptedOf(counts)
     })
   })
 
@@ -3068,7 +3087,17 @@ export function runRecordBatch(ctx, { results, hostRecords }) {
   }
 
   manifest.banners.push(...banners)
-  return finishStep(ctx, manifest, decorate(ctx, nextRaw, manifest, { banners }))
+  const recordedStep = decorate(ctx, nextRaw, manifest, { banners })
+  // What this batch recorded, for the meter's board (design D2): set here, on
+  // the step record-batch returns, so no other subcommand can emit it.
+  if (recordedStep && typeof recordedStep === 'object') {
+    recordedStep.recorded = {
+      ok: verdict.tickIds,
+      failed: verdict.waves.flatMap(counts => counts.failedIds),
+      notAttempted: [...new Set(verdict.waves.flatMap(notAttemptedOf))]
+    }
+  }
+  return finishStep(ctx, manifest, recordedStep)
 }
 
 // --- run judge --------------------------------------------------------------
@@ -3479,7 +3508,12 @@ export function runReplan(ctx, { results, hostRecords }) {
     ctx.warn('an implementer agent-spawn was not recorded on replan')
     return finishStep(ctx, manifest, trajectoryHaltStep('agent-spawn', LANE_SPAWN_APPEND_FAILED))
   }
-  return finishStep(ctx, manifest, decorate(ctx, nextRaw, manifest))
+  const revisedStep = decorate(ctx, nextRaw, manifest)
+  // The revised waves replace the adopted ones on the meter's board (design D3).
+  if (revisedStep && typeof revisedStep === 'object' && revisedStep.action !== 'halt') {
+    revisedStep.plan = summarizePlan(after)
+  }
+  return finishStep(ctx, manifest, revisedStep)
 }
 
 // --- run next ---------------------------------------------------------------