@patronage/software-factory 1.0.0-alpha.10 → 1.0.0-alpha.13

package/dist/index.d.ts

@@ -743,8 +743,8 @@ declare const mergeFreezeStateSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
   generationId: z.ZodNumber;
   headSha: z.ZodString;
   outcome: z.ZodEnum<{
-    stale: "stale";
     active: "active";
+    stale: "stale";
   }>;
   reason: z.ZodString;
   recordedAt: z.ZodISODateTime;
@@ -1243,8 +1243,8 @@ declare const managedReadinessLedgerSchema: z.ZodObject<{
       status: z.ZodEnum<{
         blocked: "blocked";
         "not-required": "not-required";
-        current: "current";
         stale: "stale";
+        current: "current";
         missing: "missing";
       }>;
     }, z.core.$strip>;
@@ -1255,8 +1255,8 @@ declare const managedReadinessLedgerSchema: z.ZodObject<{
       status: z.ZodEnum<{
         blocked: "blocked";
         "not-required": "not-required";
-        current: "current";
         stale: "stale";
+        current: "current";
         missing: "missing";
       }>;
     }, z.core.$strip>>;
@@ -1267,8 +1267,8 @@ declare const managedReadinessLedgerSchema: z.ZodObject<{
     docsOnlyDeltaAccepted: z.ZodOptional<z.ZodBoolean>;
     docsOnlyVerifiedHeadSha: z.ZodOptional<z.ZodString>;
     prVerify: z.ZodEnum<{
-      passed: "passed";
       stale: "stale";
+      passed: "passed";
       missing: "missing";
     }>;
     trivialDeltaAccepted: z.ZodOptional<z.ZodBoolean>;
@@ -1772,8 +1772,8 @@ declare const REVIEW_STATUS_VALUES: readonly ["not-required", "current", "stale"
 declare const reviewStatusSchema: z.ZodEnum<{
   blocked: "blocked";
   "not-required": "not-required";
-  current: "current";
   stale: "stale";
+  current: "current";
   missing: "missing";
 }>;
 type ReviewStatus = z.infer<typeof reviewStatusSchema>;
@@ -4074,13 +4074,13 @@ declare const evaluateReadiness: (input: EvaluationInput) => {
     reviews: {
       correctness: {
         required: boolean;
-        status: "blocked" | "not-required" | "current" | "stale" | "missing";
+        status: "blocked" | "not-required" | "stale" | "current" | "missing";
         reviewedHeadSha?: string | undefined;
         reviewedPatchId?: string | undefined;
       };
       security?: {
         required: boolean;
-        status: "blocked" | "not-required" | "current" | "stale" | "missing";
+        status: "blocked" | "not-required" | "stale" | "current" | "missing";
         reviewedHeadSha?: string | undefined;
         reviewedPatchId?: string | undefined;
       } | undefined;
@@ -4088,7 +4088,7 @@ declare const evaluateReadiness: (input: EvaluationInput) => {
     schemaVersion: 1;
     verification: {
       command: "patronage-factory pr:verify";
-      prVerify: "passed" | "stale" | "missing";
+      prVerify: "stale" | "passed" | "missing";
       docsOnlyDeltaAccepted?: boolean | undefined;
       docsOnlyVerifiedHeadSha?: string | undefined;
       trivialDeltaAccepted?: boolean | undefined;

package/dist/index.js

@@ -17,7 +17,7 @@ import { parse } from "yaml";
 import { promisify } from "node:util";
 import { FACTORY_PROOF_GATE_STEP_NAME, GitHubApiError, mintInstallationToken, productionImpactTargetOutput, readVitestProfileDocument } from "@patronage/factory-ci";
 //#region package.json
-var version = "1.0.0-alpha.10";
+var version = "1.0.0-alpha.13";
 //#endregion
 //#region src/review-rungs.ts
 const EVIDENCE_REVIEW_RUNGS$1 = [
@@ -268,8 +268,9 @@ const pullRequestTopologyReasons = ({ manifest, pullRequest }) => {
 };
 /**
 * Validate the complete declared member set at boundary closeout. Callers
-* supply only issue-linked and explicit-override PRs; branch names classify
-* those authoritative members' roles but never discover membership.
+* supply only issue-linked PRs and unlinked manifest-fallback PRs; branch
+* names classify those authoritative members' roles but never discover
+* membership.
 */
 const boundaryTopologyReasons = ({ manifest, pullRequests }) => {
 	const integrationBranch = eachToEpicBranch(manifest);
@@ -5319,6 +5320,24 @@ z.object({
 //#endregion
 //#region src/boundary-check.ts
 const DEFAULT_BOUNDARY_CHECK_PROOF_PATH = ".factory-memory/boundary-check.json";
+const liveMembershipLabel = (entry) => entry.issue === void 0 ? `PR #${entry.pr} (wave ${entry.wave})` : `PR #${entry.pr} membership for issue #${entry.issue} (wave ${entry.wave})`;
+const removedMembershipMessage = (reviewed) => reviewed.issue === void 0 ? `PR #${reviewed.pr} was covered by the proof but is no longer in the delivery boundary's live covered set` : `PR #${reviewed.pr} membership for issue #${reviewed.issue} was covered by the proof but is no longer in the delivery boundary's live covered set`;
+const coveredEntriesByPr = (source) => {
+	const byPr = /* @__PURE__ */ new Map();
+	for (const entry of source) {
+		const entries = byPr.get(entry.pr);
+		if (entries) entries.push(entry);
+		else byPr.set(entry.pr, [entry]);
+	}
+	return byPr;
+};
+const contributionDivergences = (entry, reviewed) => {
+	const label = liveMembershipLabel(entry);
+	if (reviewed.state !== entry.state) return [`${label} changed state since the proof (reviewed ${reviewed.state}, now ${entry.state})`];
+	const reviewedSha = reviewed.mergedSha ?? reviewed.headSha;
+	if (!reviewedSha || !sameHeadSha(reviewedSha, entry.sha)) return [entry.state === "open" ? `${label} open head moved since the proof (reviewed ${reviewedSha ?? "unknown"}, now ${entry.sha})` : `${label} merged SHA does not match the proof (reviewed ${reviewedSha ?? "unknown"}, now ${entry.sha})`];
+	return [];
+};
 const CLOSING_PRS_QUERY = `query($owner: String!, $repo: String!, $issue: Int!) {
   repository(owner: $owner, name: $repo) {
     issue(number: $issue) {
@@ -5420,49 +5439,65 @@ const coveredEntryFromRef = (ref, wave, issue, notices) => {
 };
 const computeCoveredSet = (manifest, repo, github) => {
 	const notices = [];
-	const byPr = /* @__PURE__ */ new Map();
-	const pullRequests = /* @__PURE__ */ new Map();
+	const entries = [];
+	const linkedPrs = /* @__PURE__ */ new Set();
+	const pullRequests = [];
 	for (const wave of manifest.waves) for (const issue of wave.issues) {
 		const refs = github.fetchClosingPullRequests(repo, issue);
 		if (refs.length === 0) notices.push(`issue #${issue} (wave ${wave.name}) has no linked closing PR yet`);
 		for (const ref of refs) {
-			if (!pullRequests.has(ref.number)) pullRequests.set(ref.number, ref);
+			pullRequests.push(ref);
+			linkedPrs.add(ref.number);
 			const entry = coveredEntryFromRef(ref, wave.name, issue, notices);
-			if (entry && !byPr.has(entry.pr)) byPr.set(entry.pr, entry);
+			if (entry) entries.push(entry);
 		}
 	}
 	for (const [prKey, waveName] of Object.entries(manifest.prs ?? {})) {
 		const prNumber = Number(prKey);
-		if (byPr.has(prNumber)) continue;
+		if (linkedPrs.has(prNumber)) continue;
 		const ref = github.fetchPullRequest(repo, prNumber);
-		pullRequests.set(prNumber, ref);
+		pullRequests.push(ref);
 		const entry = coveredEntryFromRef(ref, waveName, void 0, notices);
-		if (entry) byPr.set(entry.pr, entry);
+		if (entry) entries.push(entry);
 	}
 	return {
-		entries: [...byPr.values()].toSorted((a, b) => a.pr - b.pr),
+		entries: entries.toSorted((a, b) => a.pr - b.pr || (a.issue ?? 0) - (b.issue ?? 0)),
 		notices,
-		pullRequests: [...pullRequests.values()].toSorted((a, b) => a.number - b.number)
+		pullRequests: pullRequests.toSorted((a, b) => a.number - b.number)
 	};
 };
 const coveredSetDivergences = (computed, proof) => {
 	const divergences = [];
-	const proofByPr = new Map(proof.coveredSet.map((entry) => [entry.pr, entry]));
-	for (const entry of computed) {
-		const reviewed = proofByPr.get(entry.pr);
-		if (!reviewed) {
-			divergences.push(`PR #${entry.pr} (wave ${entry.wave}) joined the boundary after the proof was minted`);
+	const computedByPr = coveredEntriesByPr(computed);
+	const proofByPr = coveredEntriesByPr(proof.coveredSet);
+	for (const [pr, entries] of computedByPr) {
+		const reviewedEntries = proofByPr.get(pr) ?? [];
+		if (reviewedEntries.length === 0) {
+			divergences.push(...entries.map((entry) => `${liveMembershipLabel(entry)} joined the delivery boundary after the proof was minted`));
 			continue;
 		}
-		if (reviewed.state !== entry.state) {
-			divergences.push(`PR #${entry.pr} changed state since the proof (reviewed ${reviewed.state}, now ${entry.state})`);
+		const [firstEntry] = entries;
+		const [firstReviewed] = reviewedEntries;
+		if (!(entries.length > 1 || reviewedEntries.length > 1 || firstEntry?.issue !== firstReviewed?.issue)) {
+			if (firstEntry && firstReviewed) divergences.push(...contributionDivergences(firstEntry, firstReviewed));
 			continue;
 		}
-		const reviewedSha = reviewed.mergedSha ?? reviewed.headSha;
-		if (!reviewedSha || !sameHeadSha(reviewedSha, entry.sha)) divergences.push(entry.state === "open" ? `PR #${entry.pr} open head moved since the proof (reviewed ${reviewedSha ?? "unknown"}, now ${entry.sha})` : `PR #${entry.pr} merged SHA does not match the proof (reviewed ${reviewedSha ?? "unknown"}, now ${entry.sha})`);
+		const unmatchedReviewed = [...reviewedEntries];
+		for (const entry of entries) {
+			const reviewedIndex = unmatchedReviewed.findIndex((candidate) => candidate.issue === entry.issue);
+			if (reviewedIndex === -1) {
+				divergences.push(`${liveMembershipLabel(entry)} joined the delivery boundary after the proof was minted`);
+				continue;
+			}
+			const [reviewed] = unmatchedReviewed.splice(reviewedIndex, 1);
+			if (reviewed) divergences.push(...contributionDivergences(entry, reviewed));
+		}
+		for (const reviewed of unmatchedReviewed) divergences.push(removedMembershipMessage(reviewed));
+	}
+	for (const [pr, reviewedEntries] of proofByPr) {
+		if (computedByPr.has(pr)) continue;
+		divergences.push(...reviewedEntries.map(removedMembershipMessage));
 	}
-	const computedPrs = new Set(computed.map((entry) => entry.pr));
-	for (const reviewed of proof.coveredSet) if (!computedPrs.has(reviewed.pr)) divergences.push(`PR #${reviewed.pr} was covered by the proof but is no longer in the boundary's live covered set`);
 	return divergences;
 };
 const defaultResolveRepo = (cwd) => runCapture("gh", [
@@ -12087,24 +12122,12 @@ const resolveCandidateDemands = ({ changedFiles, profile }) => ({
 });
 /**
 * The wave demand that binds one PR under a boundary manifest — moved from the
-* private resolution inside `pr:merge-check` (#351). A manifest `prs` override
-* wins; otherwise the PR must close exactly one issue in exactly one wave.
-* Every refusal is a named reason, fail closed.
+* private resolution inside `pr:merge-check` (#351). Closing issue links are
+* authoritative: the PR must close exactly one declared issue in exactly one
+* wave. A manifest `prs` entry is consulted only when no declared closing link
+* exists. Every refusal is a named reason, fail closed.
 */
 const waveDemandForPullRequest = ({ fetchClosingPullRequests, manifest, owner, pr, repo }) => {
-	const override = manifest.prs?.[String(pr)];
-	if (override) {
-		const wave = manifest.waves.find((candidate) => candidate.name === override);
-		if (!wave) return { reasons: [`PR #${pr} override names unknown wave "${override}".`] };
-		return {
-			demand: {
-				autoMerge: wave.autoMerge === true,
-				review: wave.review,
-				wave: wave.name
-			},
-			reasons: []
-		};
-	}
 	const matches = manifest.waves.flatMap((wave) => wave.issues.filter((issue) => fetchClosingPullRequests({
 		issue,
 		owner,
@@ -12113,10 +12136,9 @@ const waveDemandForPullRequest = ({ fetchClosingPullRequests, manifest, owner, p
 		issue,
 		wave
 	})));
-	if (matches.length !== 1) return { reasons: [`PR #${pr} must close exactly one issue in exactly one boundary wave; found ${matches.length} matching issue${matches.length === 1 ? "" : "s"}.`] };
+	if (matches.length > 1) return { reasons: [`PR #${pr} must close exactly one issue in exactly one boundary wave; found ${matches.length} matching issue${matches.length === 1 ? "" : "s"}.`] };
 	const [match] = matches;
-	if (!match) return { reasons: [`PR #${pr} has no boundary-wave membership.`] };
-	return {
+	if (match) return {
 		demand: {
 			autoMerge: match.wave.autoMerge === true,
 			review: match.wave.review,
@@ -12124,6 +12146,18 @@ const waveDemandForPullRequest = ({ fetchClosingPullRequests, manifest, owner, p
 		},
 		reasons: []
 	};
+	const fallback = manifest.prs?.[String(pr)];
+	if (!fallback) return { reasons: [`PR #${pr} must close exactly one issue in exactly one boundary wave; found 0 matching issues.`] };
+	const wave = manifest.waves.find((candidate) => candidate.name === fallback);
+	if (!wave) return { reasons: [`PR #${pr} fallback names unknown wave "${fallback}".`] };
+	return {
+		demand: {
+			autoMerge: wave.autoMerge === true,
+			review: wave.review,
+			wave: wave.name
+		},
+		reasons: []
+	};
 };
 const closingPullRequestsQuery = `query($owner: String!, $repo: String!, $issue: Int!) {
   repository(owner: $owner, name: $repo) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patronage/software-factory",
-  "version": "1.0.0-alpha.10",
+  "version": "1.0.0-alpha.13",
   "description": "Shared Patronage software factory CLI and project-profile validation tools",
   "license": "MIT",
   "repository": {
@@ -37,7 +37,7 @@
     "picomatch": "^4.0.5",
     "yaml": "^2.9.0",
     "zod": "4.4.3",
-    "@patronage/factory-ci": "1.0.0-alpha.10"
+    "@patronage/factory-ci": "1.0.0-alpha.13"
   },
   "devDependencies": {
     "@types/node": "24.13.3",