@intentius/chant 0.116.0 → 0.117.0

package/src/op/gate.ts

@@ -52,6 +52,7 @@ import { sortedJsonReplacer } from "../utils";
 import type { GateApprover, ResolvedGateApproval } from "./gate-approval";
 import { pushLifecycle, requireLifecycleLedger } from "../lifecycle/git";
 import { parseDuration } from "./duration";
+import { resolveGateRunLocator } from "./gate-resume";
 
 /**
  * What appending a pending fact learned about reaching the remote.
@@ -505,6 +506,8 @@ export async function evaluateGate(port: GateLedgerPort, input: GateCheckInput):
   }
 
   const url = resolveApprovalUrl();
+  // #3683: in CI, where this job runs, so an approval can start it again.
+  const resume = resolveGateRunLocator();
   const { record, pushed, pushWarning } = await port.appendPending({
     op: input.op,
     gate: input.gate,
@@ -515,6 +518,7 @@ export async function evaluateGate(port: GateLedgerPort, input: GateCheckInput):
     ...(input.description ? { description: input.description } : {}),
     ...(input.runId ? { runId: input.runId } : {}),
     ...(url ? { url } : {}),
+    ...(resume ? { resume } : {}),
     ...(input.planDigest !== undefined ? { planDigest: input.planDigest } : {}),
     ...(env !== undefined ? { environment: env } : {}),
     ...(input.approval ? { approval: input.approval } : {}),

package/src/op/op-waves-run.ts

@@ -295,7 +295,7 @@ export async function runOpWave(options: RunOpWaveOptions): Promise<RunOpWaveRes
       `digest ${digest}: ${decision.status}${decision.approvedBy ? ` by ${decision.approvedBy}` : ""}`,
   );
   if (decision.status === "waiting") {
-    log(`Nothing in wave ${k} or after it ran. Read the plans, then approve: ${decision.approve}`);
+    log(`Nothing in wave ${k} or after it ran. Read the plans, then approve: ${decision.approve} (with --resume, the approval also starts this job again)`);
     return { ...result, exitCode: 3 };
   }
   if (options.decide) return result;

package/src/op/op-waves.ts

@@ -103,6 +103,29 @@ export interface OpWavesSpec {
   /** Apply one run whose plan is at `{plan}`. Default `chant run {op} --env {target}`. */
   apply?: string[];
   waves: OpWave[];
+  /**
+   * A scheduled job that starts again a wave job whose approval has arrived
+   * (#3683): it runs `chant run resume --op <name>`, which re-runs the
+   * GitHub run, retries the GitLab job or dispatches the Forgejo workflow.
+   * It approves nothing. Absent, no such job is rendered and an approval is
+   * followed by `chant approve --resume` or a re-run by hand.
+   */
+  resume?: OpWavesResume;
+}
+
+/** The scheduled resume job of an Op waves pipeline (#3683). */
+export interface OpWavesResume {
+  /**
+   * Five-field cron, such as `"*\/10 * * * *"`. GitHub and Forgejo put it
+   * in the workflow; GitLab runs the job in a pipeline schedule you create,
+   * which sets the cron.
+   */
+  schedule: string;
+}
+
+/** The command a resume job runs. */
+export function opWavesResumeCommand(spec: Pick<OpWavesSpec, "name">): string[] {
+  return ["chant", "run", "resume", "--op", spec.name];
 }
 
 /** The default apply command. */
@@ -146,6 +169,9 @@ export function assertOpWavesSpec(spec: OpWavesSpec): void {
     throw new Error(`${where}: the \`plan\` command never names {plan}, the file it writes the plan digest to.`);
   }
   if (spec.waves.length === 0) throw new Error(`${where} has no waves.`);
+  if (spec.resume !== undefined && (typeof spec.resume.schedule !== "string" || spec.resume.schedule.trim().split(/\s+/).length !== 5)) {
+    throw new Error(`${where}: resume.schedule must be a five-field cron expression, such as "*/10 * * * *".`);
+  }
   const names = new Set<string>();
   for (const wave of spec.waves) {
     if (!NAME.test(wave.name)) {