@intentius/chant 0.124.27 → 0.124.29

package/src/cli/handlers/pr.ts

@@ -29,6 +29,20 @@
  *
  * Every run writes `pr-plan.json` or `pr-apply.json` (`pr-report.schema.json`),
  * `change-set.json` and `pr-note.md` under `--output` (default `.chant/pr`). *
+ * `--events-json` (#4041, #4007) streams the stage's run events to stdout,
+ * one `run-event.schema.json` line each: the planning as a `plan` phase with
+ * a step per component, the gate's decision as a `gate` phase, and on
+ * pr-apply the apply's waves and components as `chant run --components`
+ * streams them. A component the apply does not start settles too, `blocked`
+ * behind a failed dependency or `already-applied` on a resumed apply.
+ * With or without it, pr-apply prints a line on stderr as each wave starts
+ * and as each component settles, so a job log shows the waves in order.
+ *
+ * `--report-url <s3 or file URL>` (#4007) copies `pr-<stage>.json`,
+ * `change-set.json` and, with `--events-json`, the events to
+ * `<url>/<pr>/<commit>/`, the events again as each wave and component
+ * settles (`../../pr-report-url.ts`).
+ *
  * `--member <name>` (#3465) runs a workspace member's loop: the member's
  * generated pipeline passes it from the member's directory. The gate is
  * recorded under `pr-<n>-<member>`, and the note and the statuses carry the
@@ -53,8 +67,13 @@ import {
   type PrPlanSet,
 } from "../../components/pr-run";
 import { readFanOutAttempt, writeFanOutAttempt, type FanOutAttempt, type PrApplyRecord } from "../../components/fan-out-record";
+import { componentInputDigests, progressThatCarries } from "../../components/fan-out-inputs";
 import { samePlanDigest } from "../../lifecycle/plan-digest";
-import { gitGateLedgerPort } from "../../op/gate";
+import { gitGateLedgerPort, type GateCheck } from "../../op/gate";
+import { emitGateStep, gateEventsOf, GATE_PHASE, type RunEventSink, type RunEventStream } from "../../run-event-stream";
+import type { RunEventBody, RunEventComponentSettle, RunEventSettleStatus } from "../../run-event";
+import { openCliRunEvents, refusesEventsWithJson } from "../run-events";
+import { openPrReportUpload, parseReportUrl, reportKey, type PrReportUpload, type ReportTarget } from "../../pr-report-url";
 import {
   describePlanChanged,
   PR_APPLY_GATE,
@@ -74,7 +93,7 @@ import { resolveCliBuildParams, parseParamFlags } from "../build-params-cli";
 import { formatError, formatInfo, formatSuccess, formatWarning } from "../format";
 import { findWorkspaceRoot } from "../../project-root";
 import { resolveChangedUnits } from "./fan-out";
-import { GATED_EXIT_CODE, recordAutoReleasesForRun } from "./run";
+import { GATED_EXIT_CODE, autoReleaseRun, recordAutoReleasesForRun } from "./run";
 import type { CommandContext } from "../registry";
 import type { ComponentChangeSignal, FanOutPlan } from "../../components/fan-out";
 import type { DriverComponent } from "../../components/driver";
@@ -225,16 +244,46 @@ async function checkMember(projectPath: string, names: string[]): Promise<string
 }
 
 /** Plan every member the derivation selects. */
-function planAll(p: Prepared): Promise<PrPlanSet> {
-  return planPrSet({ components: p.components, plan: p.plan, registry: p.registry, env: p.env, seededOutputs: p.seededOutputs });
+function planAll(p: Prepared, onRunEvent?: RunEventSink): Promise<PrPlanSet> {
+  return planPrSet({
+    components: p.components,
+    plan: p.plan,
+    registry: p.registry,
+    env: p.env,
+    seededOutputs: p.seededOutputs,
+    ...(onRunEvent ? { onRunEvent } : {}),
+  });
 }
 
-/** Write the report, the change set and the note; print the note's path. */
-function writeOutputs(ctx: CommandContext, report: PrReport, note: string): void {
+/**
+ * How a stage's report settles its run's events (#4041): a refusal waits on
+ * a person, as a gate does, and exits the same way.
+ */
+function settleOf(status: PrReport["status"]): RunEventSettleStatus {
+  switch (status) {
+    case "nothing":
+    case "planned":
+    case "applied":
+      return "ok";
+    case "refused":
+      return "gated";
+    default:
+      return "failed";
+  }
+}
+
+/** Write the report, the change set and the note, and hand the first two to `--report-url`'s upload. */
+function writeOutputs(ctx: CommandContext, report: PrReport, note: string, upload?: PrReportUpload): void {
   const dir = resolve(ctx.args.output ?? PR_REPORT_DIR);
   mkdirSync(dir, { recursive: true });
-  writeFileSync(join(dir, `pr-${report.stage}.json`), JSON.stringify(report, null, 2) + "\n");
-  writeFileSync(join(dir, "change-set.json"), JSON.stringify(report.changeSet, null, 2) + "\n");
+  const files: Array<[string, string]> = [
+    [`pr-${report.stage}.json`, JSON.stringify(report, null, 2) + "\n"],
+    ["change-set.json", JSON.stringify(report.changeSet, null, 2) + "\n"],
+  ];
+  for (const [name, body] of files) {
+    writeFileSync(join(dir, name), body);
+    upload?.file(name, body);
+  }
   writeFileSync(join(dir, "pr-note.md"), note);
 }
 
@@ -277,27 +326,88 @@ function printMembers(report: PrReport): void {
   }
 }
 
-async function finish(ctx: CommandContext, p: Prepared, report: PrReport): Promise<void> {
+async function finish(ctx: CommandContext, p: Prepared, report: PrReport, upload?: PrReportUpload): Promise<void> {
   const note = noteFor(report, p.forge);
-  writeOutputs(ctx, report, note);
+  writeOutputs(ctx, report, note, upload);
   await publish(p.forge, report, note);
   if (ctx.args.json) console.log(JSON.stringify(report, null, 2));
 }
 
-/** chant components pr-plan --base <ref> --pr <n> [--env <env>] [--gate <name>] [--forge <kind>] [--output <dir>] [--json] */
-export async function runComponentsPrPlan(ctx: CommandContext): Promise<number> {
+/**
+ * A stage's stream and its `--report-url` upload, held so that a stage that
+ * returns or throws before it settles still ends the stream and uploads.
+ */
+interface StageEvents {
+  stream?: RunEventStream;
+  /** Where `--report-url` points, read before the stage starts. */
+  target?: ReportTarget;
+  upload?: PrReportUpload;
+}
+
+/** Run a stage, end its stream as `failed` when the stage did not settle it, and finish its upload. */
+async function withStageEvents(stage: string, ctx: CommandContext, run: (events: StageEvents) => Promise<number>): Promise<number> {
+  const events: StageEvents = {};
+  if (ctx.args.reportUrl !== undefined) {
+    const target = parseReportUrl(ctx.args.reportUrl);
+    if ("error" in target) return fail(target.error);
+    events.target = target;
+  }
+  try {
+    return await run(events);
+  } catch (err) {
+    events.stream?.settle("failed", err instanceof Error ? err.message : String(err));
+    throw err;
+  } finally {
+    events.stream?.settle("failed", `${stage} stopped before it finished`);
+    if (events.upload) {
+      await events.upload.close();
+      console.error(formatInfo(`report  : ${events.upload.where}/`));
+    }
+  }
+}
+
+/**
+ * Open the stage's `--report-url` upload under its pull request and commit,
+ * when the flag was given. Its events are the lines `openCliRunEvents` writes.
+ */
+function openUpload(events: StageEvents, stage: "plan" | "apply", pr: number | null, p: Prepared): PrReportUpload | undefined {
+  if (!events.target) return undefined;
+  events.upload = openPrReportUpload({
+    target: events.target,
+    key: reportKey(pr, p.head, p.member),
+    stage,
+    warn: (message) => console.error(formatWarning({ message })),
+  });
+  return events.upload;
+}
+
+/** chant components pr-plan --base <ref> --pr <n> [--env <env>] [--gate <name>] [--forge <kind>] [--output <dir>] [--json] [--events-json] [--report-url <url>] */
+export function runComponentsPrPlan(ctx: CommandContext): Promise<number> {
+  if (refusesEventsWithJson(ctx.args, "the stage's report")) return Promise.resolve(1);
+  return withStageEvents("pr-plan", ctx, (events) => prPlan(ctx, events));
+}
+
+async function prPlan(ctx: CommandContext, stage: StageEvents): Promise<number> {
   if (ctx.args.pr === undefined) {
     return fail("pr-plan needs the pull or merge request: --pr <n>", "Its approval is recorded under op pr-<n>, so one pull request's approval never answers another's.");
   }
   const p = await prepare(ctx, "plan");
   if (typeof p === "number") return p;
-  const set = await planAll(p);
   const op = prOp(ctx.args.pr, p.member);
+  const upload = openUpload(stage, "plan", ctx.args.pr, p);
+  // `--events-json` (#4041): planning, then where the approval stands.
+  const events = await openCliRunEvents(ctx.args, { kind: "component", name: `pr-plan ${op}`, cwd: resolve(".") }, upload?.line);
+  stage.stream = events;
+  events?.emit({ type: "run-start", waves: p.plan.waves });
+  const set = await planAll(p, events?.emit);
 
   let approval: PrApproval = { status: "pending" };
   if (p.plan.order.length > 0) {
     try {
-      approval = approvalOf(await decidePrGate(readOnlyLedger(gitGateLedgerPort()), { op, gate: p.gate, digest: set.doc.digest }));
+      const check = await emitGateStep(events?.emit, { op, gate: p.gate }, () =>
+        decidePrGate(readOnlyLedger(gitGateLedgerPort()), { op, gate: p.gate, digest: set.doc.digest }),
+      );
+      approval = approvalOf(check);
     } catch (err) {
       console.error(formatWarning({ message: `could not read the gate ledger, so the approval reads as pending: ${err instanceof Error ? err.message : String(err)}` }));
     }
@@ -318,7 +428,9 @@ export async function runComponentsPrPlan(ctx: CommandContext): Promise<number>
     approval,
     status,
   });
-  await finish(ctx, p, report);
+  await finish(ctx, p, report, upload);
+  // The plan stage settles on its planning: an approval still to come is what it reports, not a stop.
+  events?.settle(settleOf(status), status === "plan-failed" ? "a member failed to plan" : undefined);
 
   console.error(formatInfo(`pr-plan: ${report.members.length} member(s), ${status}`));
   printMembers(report);
@@ -329,8 +441,13 @@ export async function runComponentsPrPlan(ctx: CommandContext): Promise<number>
   return status === "plan-failed" ? 1 : 0;
 }
 
-/** chant components pr-apply --base <ref> [--pr <n>] [--env <env>] [--gate <name>] [--forge <kind>] [--require-review] [--output <dir>] [--json] */
-export async function runComponentsPrApply(ctx: CommandContext): Promise<number> {
+/** chant components pr-apply --base <ref> [--pr <n>] [--env <env>] [--gate <name>] [--forge <kind>] [--require-review] [--output <dir>] [--json] [--events-json] [--report-url <url>] */
+export function runComponentsPrApply(ctx: CommandContext): Promise<number> {
+  if (refusesEventsWithJson(ctx.args, "the stage's report")) return Promise.resolve(1);
+  return withStageEvents("pr-apply", ctx, (events) => prApply(ctx, events));
+}
+
+async function prApply(ctx: CommandContext, stage: StageEvents): Promise<number> {
   const { args } = ctx;
   if (args.requireReview && !args.forge) return fail("--require-review reads the pull request's reviews, so it needs --forge <kind>");
   const p = await prepare(ctx, "apply");
@@ -345,6 +462,13 @@ export async function runComponentsPrApply(ctx: CommandContext): Promise<number>
     }
   }
   const op = pr === null ? "pr-unknown" : prOp(pr, p.member);
+  // The run id the release records carry, chosen before the run so that
+  // `--events-json` (#4041, #4007) names the run by it too.
+  const release = autoReleaseRun(`${op}-${Date.now()}`);
+  const upload = openUpload(stage, "apply", pr, p);
+  const events = await openCliRunEvents(args, { kind: "component", name: `pr-apply ${op}`, runId: release.runId, cwd: resolve(".") }, upload?.line);
+  stage.stream = events;
+  events?.emit({ type: "run-start", waves: p.plan.waves });
 
   // `--resume` (#3464): an earlier attempt at this change on this commit
   // applied part of an approved set. When the members left are covered by
@@ -358,13 +482,28 @@ export async function runComponentsPrApply(ctx: CommandContext): Promise<number>
       return fail(`--resume: could not read "${args.resume}": ${err instanceof Error ? err.message : String(err)}`);
     }
   }
-  const resumed = pr !== null && p.plan.order.length > 0 && attempt ? await tryResume(p, attempt, args.resume!, op) : undefined;
+  // What each component would apply now (#4081): progress carries only where it is unchanged.
+  const inputsNow = resumePath ? componentInputDigests(p.components, { projectRoot: resolve("."), env: p.env }) : {};
+  const resumed = pr !== null && p.plan.order.length > 0 && attempt ? await tryResume(p, attempt, args.resume!, op, inputsNow) : undefined;
 
-  const set = resumed?.set ?? (await planAll(p));
+  // The components an earlier attempt applied settle first (#4007), each in
+  // the wave the derivation gave it, which is the run-start's.
+  const log = applyLog();
+  if (resumed) {
+    const waveOf = new Map(p.plan.waves.flatMap((wave, i) => wave.map((name) => [name, i + 1] as const)));
+    for (const component of p.plan.order.filter((name) => resumed.completed.includes(name))) {
+      const body: RunEventComponentSettle = { type: "component-settle", wave: waveOf.get(component)!, component, status: "already-applied" };
+      events?.emit(body);
+      log(body);
+    }
+    emitResumedGate(events, op, p.gate, resumed.check);
+  }
+  const set = resumed?.set ?? (await planAll(p, events?.emit));
   const base = { stage: "apply" as const, pr, env: p.env, ...(p.member ? { member: p.member } : {}), base: p.base, head: p.head, op, gate: p.gate, plan: p.plan, signal: p.signal, set };
 
-  const stop = async (report: PrReport, code: number): Promise<number> => {
-    await finish(ctx, p, report);
+  const stop = async (report: PrReport, code: number, settle?: RunEventSettleStatus): Promise<number> => {
+    events?.settle(settle ?? settleOf(report.status), report.status === "plan-failed" || report.status === "failed" ? report.message ?? `pr-apply ${report.status}` : undefined);
+    await finish(ctx, p, report, upload);
     console.error((code === 0 ? formatInfo : (m: string) => formatWarning({ message: m }))(`pr-apply: ${report.status}${report.refusal ? ` (${report.refusal})` : ""}`));
     if (report.message) console.error(report.message);
     printMembers(report);
@@ -398,16 +537,32 @@ export async function runComponentsPrApply(ctx: CommandContext): Promise<number>
     );
   }
 
+  // #4022: keep the change set the gate binds on chant/lifecycle under its
+  // digest before deciding the gate, so the plan an approval bound, or the
+  // one a pending fact waits on, can be read once this job is gone.
+  await storeChangeSetForGate(ctx, p, set.doc);
+
   let approval: PrApproval;
   if (resumed) {
     approval = resumed.approval;
   } else {
-    const check = await decidePrGate(gitGateLedgerPort(), {
-      op,
-      gate: p.gate,
-      digest: set.doc.digest,
-      description: `pull request #${pr}: ${p.plan.order.join(", ")}`,
-    });
+    const check = await emitGateStep(
+      events?.emit,
+      { op, gate: p.gate },
+      () =>
+        decidePrGate(gitGateLedgerPort(), {
+          op,
+          gate: p.gate,
+          digest: set.doc.digest,
+          description: `pull request #${pr}: ${p.plan.order.join(", ")}`,
+        }),
+      (unapproved) => {
+        const a = approvalOf(unapproved);
+        return a.status === "changed"
+          ? describePlanChanged({ op, gate: p.gate, digest: set.doc.digest, approval: a })
+          : `No approval stands for this plan. Approve it: ${prApproveCommand({ op, gate: p.gate, digest: set.doc.digest })}`;
+      },
+    );
     approval = approvalOf(check);
     if (!check.satisfied) {
       const partial = { ...base, approval, status: "refused" as const };
@@ -431,19 +586,12 @@ export async function runComponentsPrApply(ctx: CommandContext): Promise<number>
     }
     const strangers = approversWithoutReview(approval.approvedBy ?? [], reviewers);
     if (strangers.length > 0) {
-      return stop(
-        prReport({
-          ...base,
-          approval,
-          status: "refused",
-          refusal: "not-a-reviewer",
-          message:
-            `The plan is approved by ${strangers.join(", ")}, who ${strangers.length === 1 ? "has" : "have"} no approving review on #${pr}` +
-            ` (approving reviews: ${reviewers.join(", ") || "none"}). Nothing was applied. ` +
-            `An approval counts when it names the reviewer the way the forge does: ${p.forge.principalOf("<login>")}.`,
-        }),
-        GATED_EXIT_CODE,
-      );
+      const message =
+        `The plan is approved by ${strangers.join(", ")}, who ${strangers.length === 1 ? "has" : "have"} no approving review on #${pr}` +
+        ` (approving reviews: ${reviewers.join(", ") || "none"}). Nothing was applied. ` +
+        `An approval counts when it names the reviewer the way the forge does: ${p.forge.principalOf("<login>")}.`;
+      emitReviewStop(events, message);
+      return stop(prReport({ ...base, approval, status: "refused", refusal: "not-a-reviewer", message }), GATED_EXIT_CODE);
     }
   }
 
@@ -451,6 +599,9 @@ export async function runComponentsPrApply(ctx: CommandContext): Promise<number>
   // one settles, so a run killed partway still knows what applied.
   const prior = resumed ? { completed: resumed.completed, outputs: resumed.outputs } : { completed: [], outputs: {} };
   const completedSoFar = new Set<string>(prior.completed);
+  const inputsSoFar: Record<string, string> = Object.fromEntries(
+    prior.completed.filter((name) => inputsNow[name] !== undefined).map((name) => [name, inputsNow[name]!]),
+  );
   const failedSoFar: string[] = [];
   const outputsSoFar: Record<string, Record<string, unknown>> = { ...prior.outputs };
   const record: PrApplyRecord = {
@@ -470,6 +621,7 @@ export async function runComponentsPrApply(ctx: CommandContext): Promise<number>
       completed: [...completedSoFar].sort(),
       failed: [...failedSoFar].sort(),
       outputs: outputsSoFar,
+      inputs: Object.fromEntries(Object.entries(inputsSoFar).sort(([a], [b]) => a.localeCompare(b))),
       prApply: record,
     });
   };
@@ -482,11 +634,18 @@ export async function runComponentsPrApply(ctx: CommandContext): Promise<number>
     env: p.env,
     set,
     ...(resumed ? { resumed: prior } : {}),
+    // The apply is this run's waves, so the fan-out's own run framing is
+    // dropped. The log's lines go to stderr with or without --events-json.
+    onRunEvent: (body: RunEventBody) => {
+      events?.nested(body);
+      log(body);
+    },
     ...(resumePath
       ? {
           onComponentSettled: (settled, outputs) => {
             if (settled.status === "ok") {
               completedSoFar.add(settled.component);
+              if (inputsNow[settled.component] !== undefined) inputsSoFar[settled.component] = inputsNow[settled.component]!;
               if (outputs) outputsSoFar[settled.component] = outputs;
             } else if (settled.status === "fail") {
               failedSoFar.push(settled.component);
@@ -497,7 +656,7 @@ export async function runComponentsPrApply(ctx: CommandContext): Promise<number>
       : {}),
   });
   recordAttempt();
-  await recordAutoReleasesForRun(applied.run.results, p.env, `${op}-${Date.now()}`, resolveAutoReleaseDisabled(p.config, args.noReleaseRecord));
+  await recordAutoReleasesForRun(applied.run.results, p.env, release.runId, resolveAutoReleaseDisabled(p.config, args.noReleaseRecord), release.runOrigin);
   const report = prReport({
     ...base,
     approval,
@@ -505,14 +664,90 @@ export async function runComponentsPrApply(ctx: CommandContext): Promise<number>
     members: applied.members,
     ...(resumed ? { resumed: resumed.completed } : {}),
   });
-  const code = await stop(report, applied.status === "applied" ? 0 : 1);
+  // A component that stopped at a gate of its own leaves the apply waiting on a person.
+  const code = await stop(report, applied.status === "applied" ? 0 : 1, applied.run.status === "gated" ? "gated" : undefined);
   if (applied.status === "applied") console.error(formatSuccess(`applied the plan ${report.digest} approved by ${(approval.approvedBy ?? []).join(", ")}`));
   return code;
 }
 
+/** What a component's settle says in the job log. */
+function settleWords(body: RunEventComponentSettle): string {
+  switch (body.status) {
+    case "ok":
+      return "applied";
+    case "failed":
+      return "failed";
+    case "gated":
+      return "stopped at its own gate";
+    case "waiting":
+      return "waiting on a decision";
+    case "blocked":
+      return `blocked by ${body.blockedBy ?? "a dependency"}, not run`;
+    case "already-applied":
+      return "already applied in an earlier attempt";
+  }
+}
+
+/**
+ * pr-apply's job log (#4007): a line on stderr as each wave starts and as
+ * each component settles, so the log shows the waves in order while they run.
+ */
+function applyLog(): (body: RunEventBody) => void {
+  let waves = 0;
+  return (body) => {
+    if (body.type === "run-start") waves = body.waves?.length ?? 0;
+    else if (body.type === "wave-start") console.error(formatInfo(`wave ${body.wave}${waves ? `/${waves}` : ""}: ${body.components.join(", ")}`));
+    else if (body.type === "component-settle") console.error(formatInfo(`  ${body.component}: ${settleWords(body)}`));
+  };
+}
+
+/** A resumed apply's gate (#3464), decided against the approved digest, as the run's `gate` phase. */
+function emitResumedGate(events: RunEventStream | undefined, op: string, gate: string, check: GateCheck): void {
+  if (!events) return;
+  const where = { component: null, phase: GATE_PHASE, step: `gate:${gate}` };
+  events.emit({ type: "phase-start", component: null, phase: GATE_PHASE });
+  events.emit({ type: "step-start", ...where });
+  for (const body of gateEventsOf(check, { ...where, op, gate }, { durationMs: null })) events.emit(body);
+  events.emit({ type: "phase-settle", component: null, phase: GATE_PHASE, status: check.satisfied ? "ok" : "gated" });
+}
+
+/** An approval by someone with no approving review (#3183) stops the apply: a `review` phase that settles `gated`. */
+function emitReviewStop(events: RunEventStream | undefined, message: string): void {
+  if (!events) return;
+  events.emit({ type: "phase-start", component: null, phase: "review" });
+  events.emit({ type: "step-start", component: null, phase: "review", step: "review" });
+  events.emit({ type: "step-settle", component: null, phase: "review", step: "review", status: "gated", durationMs: null, message });
+  events.emit({ type: "phase-settle", component: null, phase: "review", status: "gated" });
+}
+
+/**
+ * Store `doc` under its digest with its entries mapped onto the member's
+ * graph (`storeGateChangeSet`), and push. A failure is a warning: the gate
+ * decides the same either way.
+ */
+async function storeChangeSetForGate(ctx: CommandContext, p: Prepared, doc: PrPlanSet["doc"]): Promise<void> {
+  const { storeGateChangeSet, gateGraphReader } = await import("../../lifecycle/gate-change-set");
+  const { pushLifecycleReport } = await import("../../lifecycle/git");
+  const graphArgs = [
+    ...(ctx.args.param ?? []).flatMap((kv) => ["--param", kv]),
+    ...(ctx.args.paramsFile ? ["--params-file", ctx.args.paramsFile] : []),
+  ];
+  try {
+    const stored = await storeGateChangeSet({ doc, cwd: resolve("."), at: p.head, readGraph: gateGraphReader(graphArgs) });
+    if (stored.warning) console.error(formatWarning({ message: stored.warning }));
+    // The push's own outcome is said by the gate's pending fact, or by the
+    // release records the apply writes, which push the same branch.
+    if (stored.written) await pushLifecycleReport();
+  } catch (err) {
+    console.error(formatWarning({ message: `could not store the change set ${doc.digest}: ${err instanceof Error ? err.message : String(err)}` }));
+  }
+}
+
 interface Resumed {
   plan: FanOutPlan;
   set: PrPlanSet;
+  /** The gate's decision against the approved digest. */
+  check: GateCheck;
   approval: PrApproval;
   completed: string[];
   outputs: Record<string, Record<string, unknown>>;
@@ -524,8 +759,13 @@ interface Resumed {
  * derivation; when its approval still stands; and when every member left is
  * covered by the approved set. Otherwise it says why on stderr and the apply
  * runs as it would with no record.
+ *
+ * Of the components it applied, only those whose input digest is the same
+ * now carry (#4081), as in `components fan-out --resume`. One that changed
+ * runs again, under the same approval when the approved set covers its new
+ * plan. A record without input digests carries nothing.
  */
-async function tryResume(p: Prepared, attempt: FanOutAttempt, file: string, op: string): Promise<Resumed | undefined> {
+async function tryResume(p: Prepared, attempt: FanOutAttempt, file: string, op: string, inputsNow: Record<string, string>): Promise<Resumed | undefined> {
   const skip = (why: string): undefined => {
     console.error(formatWarning({ message: `--resume: "${file}" does not carry: ${why}`, hint: "Every member is planned again, and the plan needs an approval of its own." }));
     return undefined;
@@ -536,6 +776,11 @@ async function tryResume(p: Prepared, attempt: FanOutAttempt, file: string, op:
   if (record.head !== p.head) return skip(`it records an apply of ${record.head.slice(0, 12)}, not ${p.head.slice(0, 12)}`);
   if (!samePlanDigest(attempt.digest, p.plan.digest)) return skip("the change selects other components than it did");
   if (attempt.completed.length === 0) return undefined;
+  const split = progressThatCarries(attempt, inputsNow);
+  if (split.unrecorded) return skip("it does not record what each component applied, since it was written before chant recorded component inputs");
+  for (const name of split.changed) console.error(formatInfo(`${name}: changed since the earlier attempt, so it runs again`));
+  if (split.carried.length === 0) return undefined;
+  const completed = split.carried;
 
   let check;
   try {
@@ -545,7 +790,7 @@ async function tryResume(p: Prepared, attempt: FanOutAttempt, file: string, op:
   }
   if (!check.satisfied) return skip(`no approval stands for the plan it applied (${record.digest}) any more`);
 
-  const outputs = Object.fromEntries(Object.entries(attempt.outputs).filter(([name]) => attempt.completed.includes(name)));
+  const outputs = Object.fromEntries(Object.entries(attempt.outputs).filter(([name]) => completed.includes(name)));
   const resumed = await resumePrSet({
     components: p.components,
     plan: p.plan,
@@ -553,9 +798,9 @@ async function tryResume(p: Prepared, attempt: FanOutAttempt, file: string, op:
     env: p.env,
     seededOutputs: p.seededOutputs,
     record,
-    completed: attempt.completed,
+    completed,
   });
   if (!resumed.ok) return skip(`what is left is not what was approved. ${resumed.reasons.join("; ")}`);
-  console.error(formatInfo(`resume  : ${attempt.completed.join(", ")} applied in an earlier attempt; applying ${resumed.plan.order.join(", ") || "nothing more"} under the approval of ${record.digest}`));
-  return { plan: resumed.plan, set: resumed.set, approval: approvalOf(check), completed: attempt.completed, outputs };
+  console.error(formatInfo(`resume  : ${completed.join(", ")} applied in an earlier attempt; applying ${resumed.plan.order.join(", ") || "nothing more"} under the approval of ${record.digest}`));
+  return { plan: resumed.plan, set: resumed.set, check, approval: approvalOf(check), completed, outputs };
 }