@varlock/bumpy 1.14.0-rc.1 → 1.14.0

package/dist/{ci-ChYmDuwy.mjs → ci-BRJNl-VN.mjs}

@@ -77,9 +77,10 @@ async function ciCheckCommand(rootDir, opts) {
 	const config = await loadConfig(rootDir);
 	const { packages } = await discoverWorkspace(rootDir, config);
 	const depGraph = new DependencyGraph(packages);
-	const { bumpFiles: allBumpFiles, errors: parseErrors } = await readBumpFiles(rootDir);
+	const { bumpFiles: allBumpFiles, errors: parseErrors } = await readBumpFiles(rootDir, { channels: channelNames(config) });
 	const prBranchName = detectPrBranch(rootDir);
-	const releasePrBranches = new Set([config.versionPr.branch, ...[...resolveChannels(config).values()].map((c) => c.versionPr.branch)]);
+	const channels = resolveChannels(config);
+	const releasePrBranches = new Set([config.versionPr.branch, ...[...channels.values()].map((c) => c.versionPr.branch)]);
 	if (prBranchName && releasePrBranches.has(prBranchName)) {
 		log.dim("  Skipping — this is a release PR branch.");
 		return;
@@ -122,7 +123,7 @@ async function ciCheckCommand(rootDir, opts) {
 		console.log(`  ${r.name}: ${r.oldVersion} → ${colorize(`${r.newVersion}${releaseSuffix}`, "cyan")}${tag}`);
 	}
 	if (plan.warnings.length > 0) for (const w of plan.warnings) log.warn(w);
-	if (shouldComment && prNumber) await postOrUpdatePrComment(prNumber, formatReleasePlanComment(plan, prBumpFiles, prNumber, detectPrBranch(rootDir), pm, plan.warnings, parseErrors, emptyBumpFileIds, prChannel), rootDir);
+	if (shouldComment && prNumber) await postOrUpdatePrComment(prNumber, formatReleasePlanComment(plan, prBumpFiles, prNumber, detectPrBranch(rootDir), pm, plan.warnings, parseErrors, emptyBumpFileIds, prChannel, channels), rootDir);
 	if (parseErrors.length > 0 && !opts.noFail) process.exit(1);
 	const coveredPackages = new Set(plan.releases.map((r) => r.name));
 	for (const bf of prBumpFiles) for (const release of bf.releases) coveredPackages.add(release.name);
@@ -169,7 +170,7 @@ async function ciPlanCommand(rootDir) {
 		packageNames: plan.releases.map((r) => r.name)
 	};
 	else {
-		const { findUnpublishedPackages } = await import("./publish-Ak6jmwi_.mjs");
+		const { findUnpublishedPackages } = await import("./publish-DWxi552d.mjs");
 		const unpublished = await findUnpublishedPackages(packages, config);
 		if (unpublished.length > 0) output = {
 			mode: "publish",
@@ -253,7 +254,7 @@ async function ciReleaseCommand(rootDir, opts) {
 		const msg = bumpFiles.length === 0 ? "No pending bump files — checking for unpublished packages..." : "Bump files found but no packages would be released — checking for unpublished packages...";
 		log.info(msg);
 		const recoveredBumpFiles = recoverDeletedBumpFiles(rootDir);
-		const { publishCommand } = await import("./publish-Ak6jmwi_.mjs");
+		const { publishCommand } = await import("./publish-DWxi552d.mjs");
 		await publishCommand(rootDir, {
 			tag: opts.tag,
 			recoveredBumpFiles
@@ -306,7 +307,7 @@ async function autoPublish(rootDir, config, plan, tag) {
 		], { cwd: rootDir });
 	}
 	log.step("Running bumpy publish...");
-	const { publishCommand } = await import("./publish-Ak6jmwi_.mjs");
+	const { publishCommand } = await import("./publish-DWxi552d.mjs");
 	await publishCommand(rootDir, { tag });
 }
 /**
@@ -475,6 +476,93 @@ async function createVersionPr(rootDir, plan, config, packageDirs, branchName) {
 		"checkout",
 		baseBranch
 	], { cwd: rootDir });
+	await closePromotedChannelReleasePrs(rootDir, config, plan.bumpFiles);
+}
+/**
+* Channels whose dirs gained bump files in the triggering push — i.e. this push is
+* the promotion/graduation merge that delivered them. (Same range detection as the
+* channel publish trigger.)
+*/
+function detectArrivedChannelFiles(rootDir, config) {
+	const range = getPushEventRange();
+	let diffRange;
+	if (range) diffRange = `${range.before}..${range.after}`;
+	else {
+		if (!tryRunArgs([
+			"git",
+			"rev-parse",
+			"--verify",
+			"HEAD^"
+		], { cwd: rootDir })) return /* @__PURE__ */ new Set();
+		diffRange = "HEAD^..HEAD";
+	}
+	const out = tryRunArgs([
+		"git",
+		"diff",
+		"--name-only",
+		"--diff-filter=A",
+		"--no-renames",
+		diffRange,
+		"--",
+		".bumpy/"
+	], { cwd: rootDir });
+	if (!out) return /* @__PURE__ */ new Set();
+	const knownChannels = new Set(channelNames(config));
+	const arrived = /* @__PURE__ */ new Set();
+	for (const f of out.split("\n")) {
+		if (!f.endsWith(".md") || f.endsWith("README.md")) continue;
+		const parts = f.split("/");
+		if (parts.length === 3 && knownChannels.has(parts[1])) arrived.add(parts[1]);
+	}
+	return arrived;
+}
+/**
+* Close lingering channel release PRs whose cycles were promoted: once a channel's
+* bump files are pending on this branch (via a promotion or graduation merge), the
+* source channel's own release PR is obsolete — merging it would re-publish a cycle
+* that's already moving to its next stage. A fresh release PR is created automatically
+* if new work lands on the channel branch.
+*
+* Only channels whose files arrived in the TRIGGERING push are considered: the files
+* stay pending here until our version/release PR merges, and re-closing on every
+* later push in that window would kill the release PR of a newly restarted cycle.
+*/
+async function closePromotedChannelReleasePrs(rootDir, config, bumpFiles, currentChannel) {
+	const arrived = detectArrivedChannelFiles(rootDir, config);
+	const promoted = [...new Set(bumpFiles.map((bf) => bf.channel))].filter((name) => name != null && name !== currentChannel?.name && arrived.has(name));
+	if (promoted.length === 0) return;
+	const channels = resolveChannels(config);
+	for (const name of promoted) {
+		const channel = channels.get(name);
+		if (!channel) continue;
+		const pr = tryRunArgs([
+			"gh",
+			"pr",
+			"list",
+			"--head",
+			channel.versionPr.branch,
+			"--json",
+			"number",
+			"--jq",
+			".[0].number"
+		], { cwd: rootDir });
+		if (!pr) continue;
+		const validPr = validatePrNumber(pr);
+		log.step(`Closing release PR #${validPr} — the "${name}" cycle's changes are pending here now...`);
+		try {
+			await withPatToken(() => runArgsAsync([
+				"gh",
+				"pr",
+				"close",
+				validPr,
+				"--comment",
+				`Closing — the \`${name}\` cycle's bump files were promoted and are now pending a release here. A new release PR will be created automatically if more changes land on \`${channel.branch}\`.`
+			], { cwd: rootDir }));
+			log.success(`🐸 Closed obsolete release PR #${validPr}`);
+		} catch (e) {
+			log.warn(`  Failed to close release PR #${validPr}: ${e}`);
+		}
+	}
 }
 /** Read the push event's before/after range, if running on a GitHub Actions push event */
 function getPushEventRange() {
@@ -555,7 +643,7 @@ async function ciChannelRelease(rootDir, config, channel, opts) {
 				"--no-verify"
 			], { cwd: rootDir });
 		}
-		const { publishCommand } = await import("./publish-Ak6jmwi_.mjs");
+		const { publishCommand } = await import("./publish-DWxi552d.mjs");
 		await publishCommand(rootDir, {
 			channel: channel.name,
 			tag: opts.tag
@@ -566,7 +654,7 @@ async function ciChannelRelease(rootDir, config, channel, opts) {
 	const shouldPublish = movedIds.length > 0 && opts.assertMode !== "version-pr";
 	if (shouldPublish) {
 		log.step(`Release PR merge detected (${movedIds.map((id) => `${id}.md`).join(", ")}) — publishing prereleases...`);
-		const { publishCommand } = await import("./publish-Ak6jmwi_.mjs");
+		const { publishCommand } = await import("./publish-DWxi552d.mjs");
 		await publishCommand(rootDir, {
 			channel: channel.name,
 			tag: opts.tag
@@ -732,6 +820,7 @@ async function createChannelReleasePr(rootDir, config, channel, packages, branch
 		"checkout",
 		baseBranch
 	], { cwd: rootDir });
+	await closePromotedChannelReleasePrs(rootDir, config, result.movedFiles, channel);
 }
 function buildChannelPrPreamble(config, channel) {
 	return [
@@ -824,11 +913,13 @@ function pmRunCommand(pm) {
 	if (pm === "yarn") return "yarn bumpy";
 	return "npx bumpy";
 }
-function formatReleasePlanComment(plan, bumpFiles, prNumber, prBranch, pm, warnings = [], parseErrors = [], emptyBumpFileIds = [], channel = null) {
+function formatReleasePlanComment(plan, bumpFiles, prNumber, prBranch, pm, warnings = [], parseErrors = [], emptyBumpFileIds = [], channel = null, allChannels = null) {
 	const repo = process.env.GITHUB_REPOSITORY;
 	const lines = [];
 	const versionSuffix = channel ? `-${channel.preid}.x` : "";
-	const headline = channel ? `**This PR targets the \`${channel.name}\` prerelease channel** — merging it ships these packages as a **prerelease** to the \`@${channel.tag}\` dist-tag, not a stable release.` : "**The changes in this PR will be included in the next version bump.**";
+	const promotedChannels = channel ? [] : [...new Set(bumpFiles.map((bf) => bf.channel))].filter((c) => c != null);
+	const channelTag = (name) => `\`@${allChannels?.get(name)?.tag ?? name}\``;
+	const headline = channel ? `**This PR targets the \`${channel.name}\` prerelease channel** — merging it ships these packages as a **prerelease** to the \`@${channel.tag}\` dist-tag, not a stable release.` : promotedChannels.length > 0 ? `**This PR promotes the ${promotedChannels.map((c) => `\`${c}\``).join(", ")} prerelease cycle${promotedChannels.length > 1 ? "s" : ""} to a stable release.** The changes below that already shipped to the ${promotedChannels.map(channelTag).join(", ")} dist-tag${promotedChannels.length > 1 ? "s" : ""} will be consolidated into the next stable version bump.` : "**The changes in this PR will be included in the next version bump.**";
 	const preamble = [
 		`<a href="https://bumpy.varlock.dev"><img src="${FROG_IMG_BASE}/frog-clipboard.png" alt="bumpy-frog" width="60" align="left" style="image-rendering: pixelated;" title="Hi! I'm bumpy!" /></a>`,
 		"",
@@ -867,8 +958,9 @@ function formatReleasePlanComment(plan, bumpFiles, prNumber, prBranch, pm, warni
 	lines.push(`#### Bump files in this PR`);
 	lines.push("");
 	for (const bf of bumpFiles) {
-		const filename = `${bf.id}.md`;
+		const filename = bf.channel ? `${bf.channel}/${bf.id}.md` : `${bf.id}.md`;
 		const parts = [`\`${filename}\``];
+		if (bf.channel) parts.push(`_(shipped on ${channelTag(bf.channel)})_`);
 		if (repo) {
 			parts.push(`([view diff](https://github.com/${repo}/pull/${prNumber}/changes#diff-${sha256Hex(`.bumpy/${filename}`)}))`);
 			if (prBranch) parts.push(`([edit](https://github.com/${repo}/edit/${prBranch}/.bumpy/${filename}))`);

package/dist/cli.mjs

@@ -94,17 +94,17 @@ async function main() {
 				const subcommand = args[1];
 				const ciFlags = parseFlags(args.slice(2));
 				if (subcommand === "check") {
-					const { ciCheckCommand } = await import("./ci-ChYmDuwy.mjs");
+					const { ciCheckCommand } = await import("./ci-BRJNl-VN.mjs");
 					await ciCheckCommand(rootDir, {
 						comment: ciFlags.comment !== void 0 ? ciFlags.comment === true : void 0,
 						strict: ciFlags.strict === true,
 						noFail: ciFlags["no-fail"] === true
 					});
 				} else if (subcommand === "plan") {
-					const { ciPlanCommand } = await import("./ci-ChYmDuwy.mjs");
+					const { ciPlanCommand } = await import("./ci-BRJNl-VN.mjs");
 					await ciPlanCommand(rootDir);
 				} else if (subcommand === "release") {
-					const { ciReleaseCommand } = await import("./ci-ChYmDuwy.mjs");
+					const { ciReleaseCommand } = await import("./ci-BRJNl-VN.mjs");
 					const expectModeFlag = ciFlags["expect-mode"];
 					const autoPublishFlag = ciFlags["auto-publish"] === true;
 					if (expectModeFlag !== void 0 && expectModeFlag !== "version-pr" && expectModeFlag !== "publish") {
@@ -132,7 +132,7 @@ async function main() {
 			}
 			case "publish": {
 				const rootDir = await findRoot();
-				const { publishCommand } = await import("./publish-Ak6jmwi_.mjs");
+				const { publishCommand } = await import("./publish-DWxi552d.mjs");
 				await publishCommand(rootDir, {
 					dryRun: flags["dry-run"] === true,
 					tag: flags.tag,
@@ -157,7 +157,7 @@ async function main() {
 			}
 			case "--version":
 			case "-v":
-				console.log(`bumpy 1.13.2`);
+				console.log(`bumpy 1.14.0`);
 				break;
 			case "help":
 			case "--help":
@@ -177,7 +177,7 @@ async function main() {
 }
 function printHelp() {
 	console.log(`
-  ${colorize(`🐸 bumpy v1.13.2`, "bold")} - Modern monorepo versioning
+  ${colorize(`🐸 bumpy v1.14.0`, "bold")} - Modern monorepo versioning
 
   Usage: bumpy <command> [options]
 

package/dist/{publish-Ak6jmwi_.mjs → publish-DWxi552d.mjs}

@@ -9,7 +9,7 @@ import { f as tagExists, l as hasUncommittedChanges, n as forcePushTag } from ".
 import { n as willUseOidcExclusively, t as publishPackages } from "./publish-pipeline-BD8mLbL9.mjs";
 import { channelNames, resolveActiveChannel } from "./channels-CFXZkyGd.mjs";
 import { i as writeChannelVersionsInPlace, t as buildChannelReleasePlan } from "./prerelease-B2PVfXkm.mjs";
-import { CI_PLAN_CACHE_PATH } from "./ci-ChYmDuwy.mjs";
+import { CI_PLAN_CACHE_PATH } from "./ci-BRJNl-VN.mjs";
 //#region src/core/github-release.ts
 var import_semver = /* @__PURE__ */ __toESM(require_semver(), 1);
 /** Get the current HEAD commit SHA */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlock/bumpy",
-  "version": "1.14.0-rc.1",
+  "version": "1.14.0",
   "description": "Modern monorepo versioning and changelog tool",
   "keywords": [
     "bump",