@moku-labs/ci 1.2.5 → 1.2.6

package/dist/release.mjs

@@ -685,19 +685,48 @@ function requiredCheckContexts(stdout) {
 	return parseRules(stdout).filter((rule) => rule.type === REQUIRED_CHECKS_RULE).flatMap((rule) => rule.parameters?.required_status_checks ?? []).flatMap((check) => check.context === void 0 ? [] : [check.context]);
 }
 /**
+* What is wrong with a ruleset's required checks, measured against the central ones. A
+* legacy check is a central one without the caller prefix (`lint` for `ci / lint`): the thin
+* caller never reports it. Any other context is the project's own (`ci-pass` of a matrix
+* workflow) and is none of our business.
+*
+* @param required - The contexts the ruleset requires.
+* @param central - The central contexts (`ci / lint`, …).
+* @returns The legacy contexts to drop and the central ones still missing.
+* @example
+* requiredChecksDrift(["lint", "ci-pass"], ["ci / lint"]); // { legacy: ["lint"], missing: ["ci / lint"] }
+*/
+function requiredChecksDrift(required, central) {
+	const bare = new Set(central.map((context) => context.slice(5)));
+	return {
+		legacy: required.filter((context) => bare.has(context)),
+		missing: central.filter((context) => !required.includes(context))
+	};
+}
+/**
 * The body that moves an existing ruleset onto the central required checks. Every other
-* rule of the existing ruleset is kept as it is.
+* rule is kept as it is, and so is every required check the project added itself.
 *
 * @param existing - The full existing ruleset as JSON.
 * @param template - The central ruleset template as JSON.
-* @returns The `PUT` body: the existing rules with the template's required checks.
+* @returns The `PUT` body: the existing rules with the central required checks merged in.
 * @example
 * const body = withCentralRequiredChecks(existingJson, renderMainRuleset());
 */
 function withCentralRequiredChecks(existing, template) {
 	const kept = parseRules(existing).filter((rule) => rule.type !== REQUIRED_CHECKS_RULE);
 	const central = parseRules(template).filter((rule) => rule.type === REQUIRED_CHECKS_RULE);
-	return JSON.stringify({ rules: [...kept, ...central] });
+	const centralContexts = requiredCheckContexts(template);
+	const { legacy } = requiredChecksDrift(requiredCheckContexts(existing), centralContexts);
+	const own = requiredCheckContexts(existing).filter((context) => !legacy.includes(context) && !centralContexts.includes(context));
+	const merged = central.map((rule) => ({
+		...rule,
+		parameters: {
+			...rule.parameters,
+			required_status_checks: [...rule.parameters?.required_status_checks ?? [], ...own.map((context) => ({ context }))]
+		}
+	}));
+	return JSON.stringify({ rules: [...kept, ...merged] });
 }
 /**
 * The id of the newest workflow run from `gh run list --json databaseId`.
@@ -1179,11 +1208,11 @@ function renderMainRuleset() {
 * const stale = await findStaleRuleset(ctx, "moku-labs/system", listing.stdout);
 */
 async function findStaleRuleset(ctx, ownerRepo, listing) {
-	const central = new Set(requiredCheckContexts(renderMainRuleset()));
+	const central = requiredCheckContexts(renderMainRuleset());
 	for (const id of activeBranchRulesetIds(listing)) {
 		const detail = await ctx.exec.capture("gh", ["api", `repos/${ownerRepo}/rulesets/${id}`]);
 		if (detail.code !== 0) continue;
-		const legacy = requiredCheckContexts(detail.stdout).filter((context) => !central.has(context));
+		const { legacy } = requiredChecksDrift(requiredCheckContexts(detail.stdout), central);
 		if (legacy.length > 0) return {
 			id,
 			body: detail.stdout,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moku-labs/ci",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "Central CI and release for the moku family: reusable workflows, caller examples and the moku-release CLI.",
   "type": "module",
   "sideEffects": [