@intentius/chant 0.124.33 → 0.124.35

package/dist/components/green-cover.d.ts

@@ -0,0 +1,77 @@
+/**
+ * Apply on merge per green commit (#4168 step 9): whether the change sets
+ * approved for the merges since the last applied green commit cover the plan
+ * at the green one.
+ *
+ * Each member of the fresh plan is checked against the newest approved change
+ * set that planned it, with the same rule `pr-apply` uses for one pull request
+ * (`planCoveredBy`, ./pr-run.ts). A member with nothing to do is covered by
+ * nothing. Any member left uncovered sends the whole plan to a gate of its own,
+ * bound to the combined digest.
+ */
+import type { ChangeSetDocument } from "../change-set.js";
+import type { GateLedgerPort } from "../op/gate.js";
+/** One merge's approved change set, with who approved it. */
+export interface ApprovedMerge {
+    commit: string;
+    pr?: number;
+    doc: ChangeSetDocument;
+    approvedBy: readonly string[];
+}
+export interface GreenCover {
+    covered: boolean;
+    /** Why each uncovered member is not covered, one line each. */
+    uncovered: string[];
+    /** The approvers of the change sets that covered a member, sorted. */
+    approvedBy: string[];
+    /** The merges whose approval covered a member, in trunk order. */
+    coveredBy: string[];
+}
+/**
+ * Check `fresh` against `merges`, given oldest first, as the first-parent
+ * history between the last applied green commit and this one runs.
+ */
+export declare function coverByMerges(fresh: ChangeSetDocument, merges: readonly ApprovedMerge[]): GreenCover;
+/** The green commit `pr-apply --green` applies, what it is measured from, and the approved merges between. */
+export interface GreenTarget {
+    commit: string;
+    /** The last green commit applied to the environment, else `--base`, else the green commit before this one, else its parent. */
+    base: string;
+    /** Where `base` came from. */
+    baseFrom: "applied" | "flag" | "previous-green" | "parent";
+    /** The first-parent commits after `base` up to `commit`, oldest first. */
+    merges: string[];
+    /** Their pull requests, from the merge records, in trunk order. */
+    prs: number[];
+    /** The merges whose approved change set still stands, oldest first. */
+    approved: ApprovedMerge[];
+}
+export type GreenTargetResult = {
+    status: "target";
+    target: GreenTarget;
+}
+/** The checkout is the green commit last applied. */
+ | {
+    status: "applied";
+    commit: string;
+} | {
+    status: "error";
+    message: string;
+    hint?: string;
+};
+/**
+ * Resolve the green target for `env` at `cwd`'s HEAD (#4168 step 9). HEAD must
+ * carry a counting `ci/green` tag and no `ci/revoked` one, judged by the
+ * declaration's `ci.green` as `release cut` judges them. Reads the local tags
+ * and `chant/lifecycle` and never fetches.
+ */
+export declare function resolveGreenTarget(req: {
+    cwd: string;
+    env: string;
+    base?: string;
+    gate: string;
+    ledger?: GateLedgerPort;
+}): Promise<GreenTargetResult>;
+/** The op a green commit's own gate is recorded under: `green-<sha>`, or `green-<sha>-<member>` for a workspace member. */
+export declare function greenOp(commit: string, member?: string): string;
+//# sourceMappingURL=green-cover.d.ts.map

package/dist/components/green-cover.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"green-cover.d.ts","sourceRoot":"","sources":["../../src/components/green-cover.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAGjD,6DAA6D;AAC7D,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,iBAAiB,CAAC;IACvB,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,+DAA+D;IAC/D,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,sEAAsE;IACtE,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,kEAAkE;IAClE,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB;AAUD;;;GAGG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,iBAAiB,EAAE,MAAM,EAAE,SAAS,aAAa,EAAE,GAAG,UAAU,CAyBpG;AAED,8GAA8G;AAC9G,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,+HAA+H;IAC/H,IAAI,EAAE,MAAM,CAAC;IACb,8BAA8B;IAC9B,QAAQ,EAAE,SAAS,GAAG,MAAM,GAAG,gBAAgB,GAAG,QAAQ,CAAC;IAC3D,0EAA0E;IAC1E,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,mEAAmE;IACnE,GAAG,EAAE,MAAM,EAAE,CAAC;IACd,uEAAuE;IACvE,QAAQ,EAAE,aAAa,EAAE,CAAC;CAC3B;AAED,MAAM,MAAM,iBAAiB,GACzB;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,WAAW,CAAA;CAAE;AAC3C,qDAAqD;GACnD;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACrC;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAUxD;;;;;GAKG;AACH,wBAAsB,kBAAkB,CAAC,GAAG,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,cAAc,CAAA;CAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAuE5J;AAED,2HAA2H;AAC3H,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAE/D"}

package/dist/components/green-cover.js

@@ -0,0 +1,153 @@
+/**
+ * Apply on merge per green commit (#4168 step 9): whether the change sets
+ * approved for the merges since the last applied green commit cover the plan
+ * at the green one.
+ *
+ * Each member of the fresh plan is checked against the newest approved change
+ * set that planned it, with the same rule `pr-apply` uses for one pull request
+ * (`planCoveredBy`, ./pr-run.ts). A member with nothing to do is covered by
+ * nothing. Any member left uncovered sends the whole plan to a gate of its own,
+ * bound to the combined digest.
+ */
+import { execFileSync } from "node:child_process";
+import { planCoveredBy } from "./pr-run.js";
+/** Whether `member` has anything to apply in `doc`. */
+function hasWork(doc, member) {
+    const m = doc.members.find((x) => x.member === member);
+    if (m && m.status === "failed")
+        return true;
+    if (doc.entries.some((e) => e.member === member && e.action !== "no-op" && e.action !== "read"))
+        return true;
+    return (doc.sideEffects ?? []).some((s) => s.member === member);
+}
+/**
+ * Check `fresh` against `merges`, given oldest first, as the first-parent
+ * history between the last applied green commit and this one runs.
+ */
+export function coverByMerges(fresh, merges) {
+    const uncovered = [];
+    const approvers = new Set();
+    const used = new Set();
+    for (const member of fresh.members.map((m) => m.member)) {
+        if (!hasWork(fresh, member))
+            continue;
+        const newest = [...merges].reverse().find((m) => m.doc.members.some((x) => x.member === member));
+        if (!newest) {
+            uncovered.push(`${member}: no merge since the last applied green commit had an approved plan for it`);
+            continue;
+        }
+        const why = planCoveredBy(newest.doc, fresh, member);
+        if (why) {
+            uncovered.push(`${why} (checked against ${newest.pr !== undefined ? `#${newest.pr}` : newest.commit.slice(0, 12)})`);
+            continue;
+        }
+        used.add(newest.commit);
+        for (const a of newest.approvedBy)
+            approvers.add(a);
+    }
+    return {
+        covered: uncovered.length === 0,
+        uncovered,
+        approvedBy: [...approvers].sort(),
+        coveredBy: merges.filter((m) => used.has(m.commit)).map((m) => m.commit),
+    };
+}
+function gitOut(cwd, args) {
+    try {
+        return execFileSync("git", args, { cwd, encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] }).trim();
+    }
+    catch {
+        return undefined;
+    }
+}
+/**
+ * Resolve the green target for `env` at `cwd`'s HEAD (#4168 step 9). HEAD must
+ * carry a counting `ci/green` tag and no `ci/revoked` one, judged by the
+ * declaration's `ci.green` as `release cut` judges them. Reads the local tags
+ * and `chant/lifecycle` and never fetches.
+ */
+export async function resolveGreenTarget(req) {
+    const { readGreen, CI_GREEN_TAG_PREFIX } = await import("../workspace/ci-green.js");
+    const { judgedCiTags } = await import("../lifecycle/release-revocation.js");
+    let green;
+    let top;
+    try {
+        ({ green, top } = readGreen(req.cwd));
+    }
+    catch (err) {
+        return {
+            status: "error",
+            message: `apply on merge applies green commits (#4168), and ${err instanceof Error ? err.message : String(err)}`,
+            hint: "Declare ci.green in chant.workspace.json, or run chant ci init --workflow trunk-curated+apply-on-merge.",
+        };
+    }
+    const head = gitOut(req.cwd, ["rev-parse", "HEAD"]);
+    if (!head)
+        return { status: "error", message: "pr-apply --green applies the checkout's HEAD, and it has none" };
+    const tags = await judgedCiTags(top, green);
+    const counts = (sha) => tags.green.has(sha) && !tags.revoked.has(sha);
+    if (!counts(head)) {
+        return {
+            status: "error",
+            message: `${head.slice(0, 12)} is not a green commit (no counting ${CI_GREEN_TAG_PREFIX}${head.slice(0, 12)}… tag, or a ci/revoked one), so apply on merge does not apply it`,
+            hint: "Check out the newest green commit first: git checkout --detach \"$(chant ci last-green)\"",
+        };
+    }
+    const { readGreenApply } = await import("../lifecycle/green-apply.js");
+    const last = await readGreenApply(req.env, { cwd: req.cwd });
+    if (last?.commit === head)
+        return { status: "applied", commit: head };
+    let base;
+    let baseFrom = "applied";
+    if (last && gitOut(req.cwd, ["merge-base", "--is-ancestor", last.commit, head]) !== undefined)
+        base = last.commit;
+    if (!base && req.base) {
+        base = gitOut(req.cwd, ["rev-parse", "--verify", "--quiet", `${req.base}^{commit}`]);
+        baseFrom = "flag";
+        if (!base)
+            return { status: "error", message: `--base ${req.base} names no commit here` };
+    }
+    if (!base) {
+        const before = (gitOut(req.cwd, ["rev-list", "--first-parent", `${head}^`]) ?? "").split("\n").filter(Boolean);
+        base = before.find(counts);
+        baseFrom = "previous-green";
+        if (!base) {
+            base = before[0];
+            baseFrom = "parent";
+        }
+    }
+    if (!base)
+        return { status: "error", message: `${head.slice(0, 12)} is a root commit, so there is nothing to measure its change from; pass --base` };
+    const merges = (gitOut(req.cwd, ["rev-list", "--first-parent", "--reverse", `${base}..${head}`]) ?? "").split("\n").filter(Boolean);
+    const { readMergeRecord } = await import("../lifecycle/merge-record.js");
+    const { readStoredChangeSet } = await import("../lifecycle/change-set-store.js");
+    const { gitGateLedgerPort } = await import("../op/gate.js");
+    const { decidePrGate, readOnlyLedger, approvalOf } = await import("./pr-run.js");
+    const prs = [];
+    const approved = [];
+    for (const commit of merges) {
+        const record = await readMergeRecord(commit, { cwd: req.cwd }).catch(() => null);
+        if (!record || record.env !== req.env)
+            continue;
+        const pr = record.source.kind === "pull-request" ? record.source.pr : undefined;
+        if (pr !== undefined)
+            prs.push(pr);
+        // The digest a person approved: the merged plan's when it matched, else the one approved before it moved.
+        const digest = record.plan === "approved" ? record.digest : record.plan === "changed" ? record.approvedDigest : undefined;
+        if (!digest || !record.op)
+            continue;
+        const stored = await readStoredChangeSet(digest, { cwd: req.cwd }).catch(() => ({ status: "missing" }));
+        if (stored.status !== "found")
+            continue;
+        // The approval must still stand: one revoked since the merge covers nothing.
+        const check = await decidePrGate(readOnlyLedger(req.ledger ?? gitGateLedgerPort()), { op: record.op, gate: record.gate ?? req.gate, digest }).catch(() => undefined);
+        if (!check?.satisfied)
+            continue;
+        approved.push({ commit, ...(pr !== undefined ? { pr } : {}), doc: stored.document, approvedBy: approvalOf(check).approvedBy ?? [] });
+    }
+    return { status: "target", target: { commit: head, base, baseFrom, merges, prs, approved } };
+}
+/** The op a green commit's own gate is recorded under: `green-<sha>`, or `green-<sha>-<member>` for a workspace member. */
+export function greenOp(commit, member) {
+    return member ? `green-${commit.slice(0, 12)}-${member}` : `green-${commit.slice(0, 12)}`;
+}

package/dist/components/pr-pipeline.d.ts

@@ -176,10 +176,23 @@ export interface PrLoopJob {
     env: Record<string, string>;
     /** Shell lines to run before the command, to settle values the forge may leave unusable. */
     setup?: string[];
+    /**
+     * Shell lines a generated job runs first, before `setup`, to check out the
+     * commit it works on (#4168 step 9): the apply checks out the newest green
+     * commit. `chant ci run` and `ci serve` already run the job at that commit,
+     * so they skip these.
+     */
+    checkout?: string[];
     /** With `build` (#4088): the build line and the lint line, run in this order before the command. */
     build?: string[];
     /** With `waveGate` (#4003): the wave a generated apply job runs, 1-based. */
     wave?: number;
+    /**
+     * The branch an apply job takes its green commit from (#4168 step 9). A
+     * wave after the first checks out the commit wave 1 took, which the job
+     * receives as `GREEN_SHA` (#4221).
+     */
+    greenBranch?: string;
     /**
      * What the generated job runs in place of `command` (#4156): `chant ci run
      * <job> --in-place` with the same environment, gate, forge, events and
@@ -202,6 +215,14 @@ export declare function prLoopBuildLines(env: string, options?: PrLoopPipelineOp
  * the commands then run in its directory, so `--output` is relative to it.
  */
 export declare function prLoopJobs(forge: ForgeKind, env: string, options?: PrLoopPipelineOptions, member?: string): PrLoopJob[];
+/**
+ * What starts the apply under apply on merge (#4168 step 9): on GitHub the
+ * tick's workflow finishing (`workflow_run`, since tags its token pushes start
+ * no workflow), elsewhere a pushed `ci/green/*` tag. The name is
+ * `CI_GREEN_WORKFLOW_NAME` (../workspace/ci-green-workflow.ts).
+ */
+export declare const GREEN_TICK_WORKFLOW = "chant-ci-green";
+export declare const GREEN_TAG_PATTERN = "ci/green/**";
 /** The job a push to the target branch runs (#4168): `record`, or `apply` when the pipeline opts into apply on merge. */
 export declare function prLoopMergeJob(jobs: readonly PrLoopJob[], options?: PrLoopPipelineOptions): PrLoopJob;
 /**
@@ -243,6 +264,19 @@ export declare function prRecordGroup(env: string, member?: string): string;
  * refuses a record made for another pull request, gate or digest.
  */
 export declare function prApplyRecordKey(env: string, commit: string, member?: string): string;
+/**
+ * The line that checks out the newest green commit of `branch` (#4168 step
+ * 9), after fetching the branch and its tags, for the apply job. `chant ci
+ * last-green` exits 1 when no commit is green, which fails the job.
+ */
+export declare function greenCheckout(branch: string): string;
+/**
+ * The line a wave after the first runs in place of {@link greenCheckout}
+ * (#4221): it checks out `GREEN_SHA`, the commit wave 1 took, so a commit
+ * that goes green while the waves run waits for a run of its own. An empty
+ * `GREEN_SHA` fails the job.
+ */
+export declare function pinnedGreenCheckout(branch: string): string;
 /**
  * GitLab sets `CI_COMMIT_BEFORE_SHA` to forty zeros on a branch's first push.
  * The line replaces it with the merge request's diff base when the pipeline

package/dist/components/pr-pipeline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pr-pipeline.d.ts","sourceRoot":"","sources":["../../src/components/pr-pipeline.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pr-pipeline.d.ts","sourceRoot":"","sources":["../../src/components/pr-pipeline.ts"],"names":[],"mappings":"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"}

package/dist/components/pr-pipeline.js

@@ -142,7 +142,7 @@ export function prLoopJobs(forge, env, options = {}, member) {
     // #4156: the flags `chant ci run` rebuilds `command` from. It finds the member from the directory it runs in.
     const ciRun = (job) => [
         "chant", "ci", "run", job, "--in-place", ...(job === "plan" ? ["--no-push"] : []),
-        "--base", '"$BASE_SHA"', ...(job === "plan" ? ["--pr", '"$PR_NUMBER"'] : []),
+        ...(job === "apply" ? [] : ["--base", '"$BASE_SHA"']), ...(job === "plan" ? ["--pr", '"$PR_NUMBER"'] : []),
         "--env", env, "--gate", gate, "--forge", forge,
         ...(job !== "record" && options.waveGate ? ["--wave-gate", options.waveGate] : []),
         ...(job !== "plan" && options.branch ? ["--branch", JSON.stringify(options.branch)] : []),
@@ -155,6 +155,7 @@ export function prLoopJobs(forge, env, options = {}, member) {
     const planEnv = github
         ? { BASE_SHA: "${{ github.event.pull_request.base.sha }}", PR_NUMBER: "${{ github.event.pull_request.number }}", ...jobEnv }
         : { BASE_SHA: "$CI_MERGE_REQUEST_DIFF_BASE_SHA", PR_NUMBER: "$CI_MERGE_REQUEST_IID", ...jobEnv };
+    const greenBranch = github ? JSON.stringify(options.branch ?? "main") : options.branch ? JSON.stringify(options.branch) : "$CI_DEFAULT_BRANCH";
     const applyEnv = github ? { BASE_SHA: "${{ github.event.before }}", ...jobEnv } : { BASE_SHA: "$CI_COMMIT_BEFORE_SHA", ...jobEnv };
     return [
         {
@@ -166,17 +167,19 @@ export function prLoopJobs(forge, env, options = {}, member) {
             run: { command: ciRun("plan").join(" "), env: runEnv(planEnv) },
         },
         {
+            // #4168 step 9: the apply applies the newest green commit, measured from the one applied before it.
             jobName: "apply",
             command: [
-                "chant", "components", "pr-apply", "--base", '"$BASE_SHA"', ...common,
+                "chant", "components", "pr-apply", "--green", ...common,
                 ...(options.requireReview === true ? ["--require-review"] : []),
                 ...(options.waveGate ? ["--wave-gate", options.waveGate] : []),
                 "--resume", PR_APPLY_RECORD,
             ].join(" "),
-            env: applyEnv,
-            setup: [github ? githubBaseFallback(options.branch) : gitlabBaseFallback(options.branch)],
+            env: jobEnv,
+            checkout: [greenCheckout(greenBranch)],
+            greenBranch,
             ...build,
-            run: { command: ciRun("apply").join(" "), env: runEnv(applyEnv) },
+            run: { command: ciRun("apply").join(" "), env: runEnv(jobEnv) },
         },
         {
             jobName: "record",
@@ -188,6 +191,14 @@ export function prLoopJobs(forge, env, options = {}, member) {
         },
     ];
 }
+/**
+ * What starts the apply under apply on merge (#4168 step 9): on GitHub the
+ * tick's workflow finishing (`workflow_run`, since tags its token pushes start
+ * no workflow), elsewhere a pushed `ci/green/*` tag. The name is
+ * `CI_GREEN_WORKFLOW_NAME` (../workspace/ci-green-workflow.ts).
+ */
+export const GREEN_TICK_WORKFLOW = "chant-ci-green";
+export const GREEN_TAG_PATTERN = "ci/green/**";
 /** The job a push to the target branch runs (#4168): `record`, or `apply` when the pipeline opts into apply on merge. */
 export function prLoopMergeJob(jobs, options = {}) {
     return jobs.find((j) => j.jobName === (options.applyOnMerge ? "apply" : "record"));
@@ -226,6 +237,8 @@ export function prLoopWaveJobs(components, apply) {
         ...apply,
         command: `${apply.command} --wave ${i + 1}`,
         wave: i + 1,
+        // #4221: every wave after the first applies the commit wave 1 took.
+        ...(i > 0 && apply.greenBranch !== undefined ? { checkout: [pinnedGreenCheckout(apply.greenBranch)] } : {}),
         // #4156: the job runs it through chant ci run, which appends the same --wave to pr-apply.
         run: { ...apply.run, command: `${apply.run.command} --wave ${i + 1}` },
     }));
@@ -273,6 +286,27 @@ function pushBaseFallback(target, commit, diffBase) {
         (diffBase ? `BASE_SHA="\${${diffBase}:-}"; if [ -z "$BASE_SHA" ]; then ${fromBranch}fi; ` : fromBranch) +
         "fi; export BASE_SHA");
 }
+/**
+ * The line that checks out the newest green commit of `branch` (#4168 step
+ * 9), after fetching the branch and its tags, for the apply job. `chant ci
+ * last-green` exits 1 when no commit is green, which fails the job.
+ */
+export function greenCheckout(branch) {
+    return `${fetchBranch(branch)} && GREEN_SHA="$(chant ci last-green)" && git checkout --quiet --detach "$GREEN_SHA"`;
+}
+/**
+ * The line a wave after the first runs in place of {@link greenCheckout}
+ * (#4221): it checks out `GREEN_SHA`, the commit wave 1 took, so a commit
+ * that goes green while the waves run waits for a run of its own. An empty
+ * `GREEN_SHA` fails the job.
+ */
+export function pinnedGreenCheckout(branch) {
+    return `test -n "$GREEN_SHA" && ${fetchBranch(branch)} && git checkout --quiet --detach "$GREEN_SHA"`;
+}
+function fetchBranch(branch) {
+    const name = branch.replace(/^"|"$/g, "");
+    return `git fetch --quiet --tags origin "+refs/heads/${name}:refs/remotes/origin/${name}"`;
+}
 /**
  * GitLab sets `CI_COMMIT_BEFORE_SHA` to forty zeros on a branch's first push.
  * The line replaces it with the merge request's diff base when the pipeline

package/dist/components/promote-rounds.d.ts

@@ -0,0 +1,102 @@
+/**
+ * A promote under a release that plans again once an upstream applied, and a
+ * gate per wave (#4168 step 4). Merging deploys nothing since step 1, so what
+ * `pr-apply` did on merge happens here, at promote:
+ *
+ * - **Rounds** (#3999's rule, `../pr-loop.ts`). The release gate approves a
+ *   change set in which each dependent was planned against its upstream's
+ *   planned outputs (`planReleaseSet` in ./release-gate.ts). The promote runs
+ *   a wave at a time. Before a wave runs, a component whose plan read an
+ *   upstream output that the run left as another value
+ *   (`movedWiringReferences`) is planned again against what stands. When the
+ *   approved change set covers the new plan (`waveNotCovered`, the test a
+ *   pull request's resume uses), it applies under the approval it has.
+ *   Otherwise its gates are decided as `<gate>-round-<n>` (`prRoundGate`),
+ *   bound to the new plan's digest.
+ * - **A gate per wave** (`--wave-gate <gate>`, #4157's rule). Every wave
+ *   after the first is planned again against what the waves before it left,
+ *   and a wave the approved change set does not cover waits at
+ *   `<gate>-wave-<k>` (`waveGateName`), one gate for the whole wave, bound to
+ *   that wave's digest.
+ *
+ * A stage whose components declare no gate has nowhere to wait, so the
+ * promote stops there with nothing more deployed.
+ *
+ * A promote that stops at a round's or a wave's gate writes a resume record
+ * ({@link PromoteResume}): the components that applied and the outputs they
+ * left. The same promote run again with it skips what applied and carries on
+ * from the wave it stopped at, so an approval of the round or wave it waits on
+ * is decided against the same plan.
+ */
+import { type DriverComponent, type DriverRunResult, type ReleaseGateBinding } from "./driver.js";
+import type { ChangeSetDocument } from "../change-set.js";
+import type { ReleasePlan } from "./release-gate.js";
+export declare const PROMOTE_RESUME_SCHEMA = "chant-promote-resume/v1";
+/** What a promote that stopped at a round's or a wave's gate leaves for the next attempt. */
+export interface PromoteResume {
+    schema: typeof PROMOTE_RESUME_SCHEMA;
+    env: string;
+    releaseDigest: string;
+    /** The change set the release gate approved before anything applied. */
+    approvedDigest: string;
+    /** Components that applied, in run order. */
+    completed: string[];
+    /** The outputs standing after them. */
+    outputs: Record<string, Record<string, unknown>>;
+    /** ISO 8601. */
+    at: string;
+}
+/** One round or wave that needed its own approval. */
+export interface PromoteStage {
+    kind: "round" | "wave";
+    /** The round number (2 and up) or the wave number (1-based). */
+    number: number;
+    components: string[];
+    /** The plan the stage's gates bind. */
+    digest: string;
+    /** Why the approved change set did not cover it, one line per member. */
+    notCovered: string[];
+    status: "applied" | "waiting" | "failed";
+    /** With `failed` before anything ran: why. */
+    message?: string;
+}
+export interface PromoteRoundsOptions {
+    /** The promoted compositions, in no particular order. */
+    components: DriverComponent[];
+    /** Outputs standing before the run: the seeds, and on a resume the record's. */
+    outputs: Record<string, Record<string, unknown>>;
+    /** The release gate the change set was approved under. */
+    binding: ReleaseGateBinding;
+    /** The approved change set, and what each component's plan read. */
+    approved: ChangeSetDocument;
+    reads: ReleasePlan["reads"];
+    /** Components an earlier attempt applied. Skipped. */
+    completed?: readonly string[];
+    /** `--wave-gate <gate>`: check every wave after the first, not only the components whose inputs moved, and name a wave's gate `<gate>-wave-<k>`. */
+    waveGate?: string;
+    /** Run one subset of the components with `outputs` standing (`runPromotion` with the binding). */
+    run: (components: DriverComponent[], outputs: Record<string, Record<string, unknown>>, binding: ReleaseGateBinding) => Promise<DriverRunResult>;
+    /** Plan `only` again with `outputs` standing (`planReleaseSet`). */
+    replan: (only: ReadonlySet<string>, outputs: Record<string, Record<string, unknown>>) => Promise<ChangeSetDocument>;
+    /** Store a stage's plan and bind its gates (empty resolutions included). */
+    bind: (doc: ChangeSetDocument, gates: string[]) => Promise<ReleaseGateBinding>;
+}
+export interface PromoteRoundsResult {
+    run: DriverRunResult;
+    /** The rounds and waves that needed their own approval. */
+    stages: PromoteStage[];
+    /** Every component that applied, earlier attempts included, in run order. */
+    completed: string[];
+    outputs: Record<string, Record<string, unknown>>;
+}
+/** `component` with each gate renamed by `rename`, nested phases included. */
+export declare function renameGates(component: DriverComponent, rename: (gate: string) => string): DriverComponent;
+/** The references `component`'s steps make that resolve to another value now than when its plan read them. */
+export declare function movedInputs(component: DriverComponent, read: Record<string, Record<string, unknown>> | undefined, now: Record<string, Record<string, unknown>>): string[];
+/**
+ * Run the promote a wave at a time, planning again where an upstream applied
+ * as another value, and with `waveGate`, checking each wave. Stops at the
+ * first wave that fails or waits on a gate.
+ */
+export declare function runPromotionInRounds(options: PromoteRoundsOptions): Promise<PromoteRoundsResult>;
+//# sourceMappingURL=promote-rounds.d.ts.map

package/dist/components/promote-rounds.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"promote-rounds.d.ts","sourceRoot":"","sources":["../../src/components/promote-rounds.ts"],"names":[],"mappings":"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"}