@bensandee/tooling 0.34.0 → 0.36.0

package/dist/bin.mjs

@@ -10,7 +10,7 @@ import JSON5 from "json5";
 import { parse } from "jsonc-parser";
 import { z } from "zod";
 import { FatalError, TransientError, UnexpectedError } from "@bensandee/common";
-import { isMap, isScalar, isSeq, parse as parse$1, parseDocument, stringify } from "yaml";
+import { isMap, isScalar, parse as parse$1, parseDocument, stringify, visit } from "yaml";
 import picomatch from "picomatch";
 import { tmpdir } from "node:os";
 //#region src/types.ts
@@ -956,17 +956,82 @@ function runDockerPublish(executor, config) {
 //#endregion
 //#region src/utils/yaml-merge.ts
 const IGNORE_PATTERN = "@bensandee/tooling:ignore";
+const CUSTOM_START = "# @tooling:custom";
+const CUSTOM_END = "# @tooling:endcustom";
 const FORGEJO_SCHEMA_COMMENT = "# yaml-language-server: $schema=../../.vscode/forgejo-workflow.schema.json\n";
+/** Extract custom blocks from a workflow file, recording their anchor lines. */
+function extractCustomBlocks(content) {
+	const lines = content.split("\n");
+	const blocks = [];
+	let i = 0;
+	while (i < lines.length) if (lines[i].trim() === CUSTOM_START) {
+		let anchor = "";
+		for (let j = i - 1; j >= 0; j--) if (lines[j].trim() !== "") {
+			anchor = lines[j].trim();
+			break;
+		}
+		const blockLines = [lines[i]];
+		i++;
+		while (i < lines.length && lines[i].trim() !== CUSTOM_END) {
+			blockLines.push(lines[i]);
+			i++;
+		}
+		if (i < lines.length) {
+			blockLines.push(lines[i]);
+			i++;
+		}
+		blocks.push({
+			anchor,
+			lines: blockLines
+		});
+	} else i++;
+	return blocks;
+}
+/** Remove custom blocks (markers + content) from a workflow string. */
+function stripCustomBlocks(content) {
+	const lines = content.split("\n");
+	const result = [];
+	let inCustom = false;
+	for (const line of lines) {
+		if (line.trim() === CUSTOM_START) {
+			inCustom = true;
+			continue;
+		}
+		if (inCustom && line.trim() === CUSTOM_END) {
+			inCustom = false;
+			continue;
+		}
+		if (!inCustom) result.push(line);
+	}
+	return result.join("\n");
+}
+/** Insert previously extracted custom blocks into freshly generated content, anchored by preceding line. */
+function insertCustomBlocks(generated, blocks) {
+	if (blocks.length === 0) return generated;
+	const lines = generated.split("\n");
+	const insertions = [];
+	for (const block of blocks) {
+		let insertAfter = -1;
+		for (let i = 0; i < lines.length; i++) if (lines[i].trim() === block.anchor) {
+			insertAfter = i;
+			break;
+		}
+		if (insertAfter < 0) insertAfter = lines.length - 1;
+		insertions.push({
+			afterIndex: insertAfter,
+			block
+		});
+	}
+	insertions.sort((a, b) => b.afterIndex - a.afterIndex);
+	for (const { afterIndex, block } of insertions) lines.splice(afterIndex + 1, 0, ...block.lines);
+	return lines.join("\n");
+}
 /** Prepend the Forgejo schema comment if it's not already present. No-op for GitHub. */
 function ensureSchemaComment(content, ci) {
 	if (ci !== "forgejo") return content;
 	if (content.includes("yaml-language-server")) return content;
 	return FORGEJO_SCHEMA_COMMENT + content;
 }
-/** Migrate content from old tooling binary name to new. */
-function migrateToolingBinary(content) {
-	return content.replaceAll("pnpm exec tooling ", "pnpm exec bst ");
-}
 /** Check if a YAML file has an opt-out comment in the first 10 lines. */
 function isToolingIgnored(content) {
 	return content.split("\n", 10).some((line) => line.includes(IGNORE_PATTERN));
@@ -1011,14 +1076,42 @@ function mergeLefthookCommands(existing, requiredCommands) {
 		};
 	}
 }
-/** Extract only the mergeable steps (those with a match) as RequiredSteps. */
-function toRequiredSteps(steps) {
-	return steps.filter((s) => s.match !== void 0).map((s) => ({
-		match: s.match,
-		step: s.step
-	}));
+/**
+* Normalize a workflow YAML string for comparison purposes.
+* Parses the YAML DOM to strip action versions from `uses:` values and remove all comments,
+* then re-serializes so that pinned hashes, older tags, or formatting differences
+* don't cause unnecessary overwrites.
+*/
+function normalizeWorkflow(content) {
+	const doc = parseDocument(stripCustomBlocks(content).replaceAll(/node\s+packages\/tooling-cli\/dist\/bin\.mjs/g, "pnpm exec bst"));
+	doc.comment = null;
+	doc.commentBefore = null;
+	visit(doc, {
+		Node(_key, node) {
+			if ("comment" in node) node.comment = null;
+			if ("commentBefore" in node) node.commentBefore = null;
+		},
+		Pair(_key, node) {
+			if (isScalar(node.key) && node.key.value === "uses" && isScalar(node.value) && typeof node.value.value === "string") node.value.value = node.value.value.replace(/@.*$/, "");
+		}
+	});
+	return doc.toString({
+		lineWidth: 0,
+		nullStr: ""
+	});
+}
+const DEV_BINARY_PATTERN = /node\s+packages\/tooling-cli\/dist\/bin\.mjs/;
+/**
+* If the existing file uses the dev binary path (`node packages/tooling-cli/dist/bin.mjs`),
+* substitute it back into the generated content so we don't overwrite it with `pnpm exec bst`.
+*/
+function preserveDevBinaryPath(generated, existing) {
+	if (!existing) return generated;
+	const match = DEV_BINARY_PATTERN.exec(existing);
+	if (!match) return generated;
+	return generated.replaceAll("pnpm exec bst", match[0]);
 }
-/** Build a complete workflow YAML string from structured options. Single source of truth for both new files and merge steps. */
+/** Build a complete workflow YAML string from structured options. Single source of truth for workflow files. */
 function buildWorkflowYaml(options) {
 	const doc = { name: options.name };
 	if (options.enableEmailNotifications) doc["enable-email-notifications"] = true;
@@ -1032,132 +1125,7 @@ function buildWorkflowYaml(options) {
 	return ensureSchemaComment(stringify(doc, {
 		lineWidth: 0,
 		nullStr: ""
-	}), options.ci);
-}
-/**
-* Ensure required steps exist in a workflow job's steps array.
-* Only adds missing steps at the end — never modifies existing ones.
-* Returns unchanged content if the file has an opt-out comment or can't be parsed.
-*/
-function mergeWorkflowSteps(existing, jobName, requiredSteps) {
-	if (isToolingIgnored(existing)) return {
-		content: existing,
-		changed: false
-	};
-	try {
-		const doc = parseDocument(existing);
-		const steps = doc.getIn([
-			"jobs",
-			jobName,
-			"steps"
-		]);
-		if (!isSeq(steps)) return {
-			content: existing,
-			changed: false
-		};
-		let changed = false;
-		for (const { match, step } of requiredSteps) if (!steps.items.some((item) => {
-			if (!isMap(item)) return false;
-			if (match.run) {
-				const run = item.get("run");
-				return typeof run === "string" && run.includes(match.run);
-			}
-			if (match.uses) {
-				const uses = item.get("uses");
-				return typeof uses === "string" && uses.startsWith(match.uses);
-			}
-			return false;
-		})) {
-			steps.add(doc.createNode(step));
-			changed = true;
-		}
-		return {
-			content: changed ? doc.toString() : existing,
-			changed
-		};
-	} catch {
-		return {
-			content: existing,
-			changed: false
-		};
-	}
-}
-/**
-* Add a job to an existing workflow YAML if it doesn't already exist.
-* Returns unchanged content if the job already exists, the file has an opt-out comment,
-* or the document can't be parsed.
-*/
-/**
-* Ensure a `concurrency` block exists at the workflow top level.
-* Adds it if missing — never modifies an existing one.
-* Returns unchanged content if the file has an opt-out comment or can't be parsed.
-*/
-/**
-* Ensure `on.push` has `tags-ignore: ["**"]` so tag pushes don't trigger CI.
-* Only adds the filter when `on.push` exists and `tags-ignore` is absent.
-*/
-function ensureWorkflowTagsIgnore(existing) {
-	if (isToolingIgnored(existing)) return {
-		content: existing,
-		changed: false
-	};
-	try {
-		const doc = parseDocument(existing);
-		const on = doc.get("on");
-		if (!isMap(on)) return {
-			content: existing,
-			changed: false
-		};
-		const push = on.get("push");
-		if (!isMap(push)) return {
-			content: existing,
-			changed: false
-		};
-		if (push.has("tags-ignore")) return {
-			content: existing,
-			changed: false
-		};
-		push.set("tags-ignore", ["**"]);
-		return {
-			content: doc.toString(),
-			changed: true
-		};
-	} catch {
-		return {
-			content: existing,
-			changed: false
-		};
-	}
-}
-function ensureWorkflowConcurrency(existing, concurrency) {
-	if (isToolingIgnored(existing)) return {
-		content: existing,
-		changed: false
-	};
-	try {
-		const doc = parseDocument(existing);
-		if (doc.has("concurrency")) return {
-			content: existing,
-			changed: false
-		};
-		doc.set("concurrency", concurrency);
-		const contents = doc.contents;
-		if (isMap(contents)) {
-			const items = contents.items;
-			const nameIdx = items.findIndex((p) => isScalar(p.key) && p.key.value === "name");
-			const concPair = items.pop();
-			if (concPair) items.splice(nameIdx + 1, 0, concPair);
-		}
-		return {
-			content: doc.toString(),
-			changed: true
-		};
-	} catch {
-		return {
-			content: existing,
-			changed: false
-		};
-	}
+	}).replace(/^(?=\S)/gm, (match, offset) => offset === 0 ? match : `\n${match}`), options.ci);
 }
 //#endregion
 //#region src/generators/ci-utils.ts
@@ -1177,38 +1145,24 @@ function computeNodeVersionYaml(ctx) {
 //#region src/generators/publish-ci.ts
 function publishSteps(nodeVersionYaml) {
 	return [
-		{
-			match: { uses: "actions/checkout" },
-			step: { uses: "actions/checkout@v6" }
-		},
-		{
-			match: { uses: "pnpm/action-setup" },
-			step: { uses: "pnpm/action-setup@v5" }
-		},
-		{
-			match: { uses: "actions/setup-node" },
-			step: {
-				uses: "actions/setup-node@v6",
-				with: nodeVersionYaml.startsWith("node-version-file") ? { "node-version-file": "package.json" } : { "node-version": "24" }
-			}
-		},
-		{
-			match: { run: "pnpm install" },
-			step: { run: "pnpm install --frozen-lockfile" }
-		},
-		{
-			match: { run: "docker:publish" },
-			step: {
-				name: "Publish Docker images",
-				env: {
-					DOCKER_REGISTRY_HOST: actionsExpr("vars.DOCKER_REGISTRY_HOST"),
-					DOCKER_REGISTRY_NAMESPACE: actionsExpr("vars.DOCKER_REGISTRY_NAMESPACE"),
-					DOCKER_USERNAME: actionsExpr("secrets.DOCKER_USERNAME"),
-					DOCKER_PASSWORD: actionsExpr("secrets.DOCKER_PASSWORD")
-				},
-				run: "pnpm exec bst docker:publish"
-			}
-		}
+		{ step: { uses: "actions/checkout@v6" } },
+		{ step: { uses: "pnpm/action-setup@v5" } },
+		{ step: {
+			uses: "actions/setup-node@v6",
+			with: nodeVersionYaml.startsWith("node-version-file") ? { "node-version-file": "package.json" } : { "node-version": "24" }
+		} },
+		{ step: { run: "pnpm install --frozen-lockfile" } },
+		{ step: {
+			name: "Publish Docker images",
+			env: {
+				DOCKER_REGISTRY_HOST: actionsExpr("vars.DOCKER_REGISTRY_HOST"),
+				DOCKER_REGISTRY_NAMESPACE: actionsExpr("vars.DOCKER_REGISTRY_NAMESPACE"),
+				DOCKER_USERNAME: actionsExpr("secrets.DOCKER_USERNAME"),
+				DOCKER_PASSWORD: actionsExpr("secrets.DOCKER_PASSWORD"),
+				RELEASE_DEBUG: actionsExpr("vars.RELEASE_DEBUG || 'false'")
+			},
+			run: "pnpm exec bst docker:publish"
+		} }
 	];
 }
 const DockerMapSchema = z.object({ docker: z.record(z.string(), z.unknown()).optional() });
@@ -1257,59 +1211,26 @@ async function generateDeployCi(ctx) {
 		jobName: "publish",
 		steps
 	});
-	if (ctx.exists(workflowPath)) {
-		const raw = ctx.read(workflowPath);
-		if (raw) {
-			const existing = migrateToolingBinary(raw);
-			if (existing === content || ensureSchemaComment(existing, ctx.config.ci) === content) {
-				if (existing !== raw) {
-					ctx.write(workflowPath, ensureSchemaComment(existing, ctx.config.ci));
-					return {
-						filePath: workflowPath,
-						action: "updated",
-						description: "Migrated tooling binary name in publish workflow"
-					};
-				}
-				return {
-					filePath: workflowPath,
-					action: "skipped",
-					description: "Publish workflow already up to date"
-				};
-			}
-			const merged = mergeWorkflowSteps(existing, "publish", toRequiredSteps(steps));
-			const withComment = ensureSchemaComment(merged.content, ctx.config.ci);
-			if (!merged.changed) {
-				if (withComment !== raw) {
-					ctx.write(workflowPath, withComment);
-					return {
-						filePath: workflowPath,
-						action: "updated",
-						description: existing !== raw ? "Migrated tooling binary name in publish workflow" : "Added schema comment to publish workflow"
-					};
-				}
-				return {
-					filePath: workflowPath,
-					action: "skipped",
-					description: "Existing publish workflow preserved"
-				};
-			}
-			ctx.write(workflowPath, withComment);
-			return {
-				filePath: workflowPath,
-				action: "updated",
-				description: "Added missing steps to publish workflow"
-			};
-		}
-		return {
+	const alreadyExists = ctx.exists(workflowPath);
+	const existing = alreadyExists ? ctx.read(workflowPath) : void 0;
+	if (existing) {
+		if (isToolingIgnored(existing)) return {
+			filePath: workflowPath,
+			action: "skipped",
+			description: "Publish workflow has ignore comment"
+		};
+		if (normalizeWorkflow(existing) === normalizeWorkflow(content)) return {
 			filePath: workflowPath,
 			action: "skipped",
 			description: "Publish workflow already up to date"
 		};
 	}
-	ctx.write(workflowPath, content);
+	const withDevPath = preserveDevBinaryPath(content, existing);
+	const final = existing ? insertCustomBlocks(withDevPath, extractCustomBlocks(existing)) : withDevPath;
+	ctx.write(workflowPath, final);
 	return {
 		filePath: workflowPath,
-		action: "created",
+		action: alreadyExists ? "updated" : "created",
 		description: `Generated ${isGitHub ? "GitHub" : "Forgejo"} Actions publish workflow`
 	};
 }
@@ -1577,7 +1498,7 @@ function getAddedDevDepNames(config) {
 	const deps = { ...ROOT_DEV_DEPS };
 	if (config.structure !== "monorepo") Object.assign(deps, PER_PACKAGE_DEV_DEPS);
 	deps["@bensandee/config"] = "0.9.1";
-	deps["@bensandee/tooling"] = "0.34.0";
+	deps["@bensandee/tooling"] = "0.36.0";
 	if (config.formatter === "oxfmt") deps["oxfmt"] = {
 		"@changesets/cli": "2.30.0",
 		"@release-it/bumper": "7.0.5",
@@ -1632,7 +1553,7 @@ async function generatePackageJson(ctx) {
 	const devDeps = { ...ROOT_DEV_DEPS };
 	if (!isMonorepo) Object.assign(devDeps, PER_PACKAGE_DEV_DEPS);
 	devDeps["@bensandee/config"] = isWorkspacePackage(ctx, "@bensandee/config") ? "workspace:*" : "0.9.1";
-	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.34.0";
+	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.36.0";
 	if (ctx.config.useEslintPlugin) devDeps["@bensandee/eslint-plugin"] = isWorkspacePackage(ctx, "@bensandee/eslint-plugin") ? "workspace:*" : "0.9.2";
 	if (ctx.config.formatter === "oxfmt") devDeps["oxfmt"] = {
 		"@changesets/cli": "2.30.0",
@@ -1680,10 +1601,6 @@ async function generatePackageJson(ctx) {
 			changes.push("set type: \"module\"");
 		}
 		const existingScripts = pkg.scripts ?? {};
-		for (const [key, value] of Object.entries(existingScripts)) if (typeof value === "string" && value.includes("pnpm exec tooling ")) {
-			existingScripts[key] = migrateToolingBinary(value);
-			changes.push(`migrated script: ${key}`);
-		}
 		for (const [key, value] of Object.entries(allScripts)) if (!(key in existingScripts)) {
 			existingScripts[key] = value;
 			changes.push(`added script: ${key}`);
@@ -2170,41 +2087,58 @@ async function generateGitignore(ctx) {
 }
 //#endregion
 //#region src/generators/ci.ts
+/** Build the release step for the check job (changesets strategy). */
+function changesetsReleaseStep(ci, publishesNpm) {
+	if (ci === "github") return { step: {
+		uses: "changesets/action@v1",
+		if: "github.ref == 'refs/heads/main'",
+		with: {
+			publish: "pnpm changeset publish",
+			version: "pnpm changeset version"
+		},
+		env: {
+			GITHUB_TOKEN: actionsExpr("github.token"),
+			...publishesNpm && { NPM_TOKEN: actionsExpr("secrets.NPM_TOKEN") }
+		}
+	} };
+	return { step: {
+		name: "Release",
+		if: "github.ref == 'refs/heads/main'",
+		env: {
+			FORGEJO_SERVER_URL: actionsExpr("github.server_url"),
+			FORGEJO_REPOSITORY: actionsExpr("github.repository"),
+			RELEASE_TOKEN: actionsExpr("secrets.RELEASE_TOKEN"),
+			...publishesNpm && { NODE_AUTH_TOKEN: actionsExpr("secrets.NPM_TOKEN") },
+			RELEASE_DEBUG: actionsExpr("vars.RELEASE_DEBUG || 'false'")
+		},
+		run: "pnpm exec bst release:changesets"
+	} };
+}
 const CI_CONCURRENCY = {
 	group: `ci-${actionsExpr("github.ref")}`,
 	"cancel-in-progress": actionsExpr("github.ref != 'refs/heads/main'")
 };
-function checkSteps(nodeVersionYaml) {
+function checkSteps(nodeVersionYaml, publishesNpm) {
+	const isNodeVersionFile = nodeVersionYaml.startsWith("node-version-file");
 	return [
-		{
-			match: { uses: "actions/checkout" },
-			step: { uses: "actions/checkout@v6" }
-		},
-		{
-			match: { uses: "pnpm/action-setup" },
-			step: { uses: "pnpm/action-setup@v5" }
-		},
-		{
-			match: { uses: "actions/setup-node" },
-			step: {
-				uses: "actions/setup-node@v6",
-				with: {
-					...nodeVersionYaml.startsWith("node-version-file") ? { "node-version-file": "package.json" } : { "node-version": "24" },
-					cache: "pnpm"
-				}
-			}
-		},
-		{
-			match: { run: "pnpm install" },
-			step: { run: "pnpm install --frozen-lockfile" }
-		},
-		{
-			match: { run: "check" },
-			step: {
-				name: "Run all checks",
-				run: "pnpm ci:check"
+		{ step: {
+			uses: "actions/checkout@v6",
+			with: { "fetch-depth": 0 }
+		} },
+		{ step: { uses: "pnpm/action-setup@v5" } },
+		{ step: {
+			uses: "actions/setup-node@v6",
+			with: {
+				...isNodeVersionFile ? { "node-version-file": "package.json" } : { "node-version": "24" },
+				cache: "pnpm",
+				...publishesNpm && { "registry-url": actionsExpr("vars.NPM_REGISTRY_URL || 'https://registry.npmjs.org'") }
 			}
-		}
+		} },
+		{ step: { run: "pnpm install --frozen-lockfile" } },
+		{ step: {
+			name: "Run all checks",
+			run: "pnpm ci:check"
+		} }
 	];
 }
 /** Resolve the CI workflow filename based on release strategy. */
@@ -2220,7 +2154,9 @@ async function generateCi(ctx) {
 	const isGitHub = ctx.config.ci === "github";
 	const isForgejo = !isGitHub;
 	const isChangesets = ctx.config.releaseStrategy === "changesets";
-	const steps = checkSteps(computeNodeVersionYaml(ctx));
+	const nodeVersionYaml = computeNodeVersionYaml(ctx);
+	const publishesNpm = ctx.config.publishNpm === true;
+	const steps = [...checkSteps(nodeVersionYaml, isChangesets && publishesNpm), ...isChangesets ? [changesetsReleaseStep(ctx.config.ci, publishesNpm)] : []];
 	const content = buildWorkflowYaml({
 		ci: ctx.config.ci,
 		name: "CI",
@@ -2237,42 +2173,26 @@ async function generateCi(ctx) {
 		steps
 	});
 	const filePath = ciWorkflowPath(ctx.config.ci, ctx.config.releaseStrategy);
-	if (ctx.exists(filePath)) {
-		const existing = ctx.read(filePath);
-		if (existing) {
-			let result = mergeWorkflowSteps(existing, "check", toRequiredSteps(steps));
-			const withTagsIgnore = ensureWorkflowTagsIgnore(result.content);
-			result = {
-				content: withTagsIgnore.content,
-				changed: result.changed || withTagsIgnore.changed
-			};
-			if (isChangesets) {
-				const withConcurrency = ensureWorkflowConcurrency(result.content, CI_CONCURRENCY);
-				result = {
-					content: withConcurrency.content,
-					changed: result.changed || withConcurrency.changed
-				};
-			}
-			const withComment = ensureSchemaComment(result.content, isGitHub ? "github" : "forgejo");
-			if (result.changed || withComment !== result.content) {
-				ctx.write(filePath, withComment);
-				return {
-					filePath,
-					action: "updated",
-					description: "Added missing steps to CI workflow"
-				};
-			}
-		}
-		return {
+	const alreadyExists = ctx.exists(filePath);
+	const existing = alreadyExists ? ctx.read(filePath) : void 0;
+	if (existing) {
+		if (isToolingIgnored(existing)) return {
+			filePath,
+			action: "skipped",
+			description: "CI workflow has ignore comment"
+		};
+		if (normalizeWorkflow(existing) === normalizeWorkflow(content)) return {
 			filePath,
 			action: "skipped",
 			description: "CI workflow already up to date"
 		};
 	}
-	ctx.write(filePath, content);
+	const withDevPath = preserveDevBinaryPath(content, existing);
+	const final = existing ? insertCustomBlocks(withDevPath, extractCustomBlocks(existing)) : withDevPath;
+	ctx.write(filePath, final);
 	return {
 		filePath,
-		action: "created",
+		action: alreadyExists ? "updated" : "created",
 		description: `Generated ${isGitHub ? "GitHub" : "Forgejo"} Actions CI workflow`
 	};
 }
@@ -2749,47 +2669,33 @@ async function generateChangesets(ctx) {
 function commonSteps(nodeVersionYaml, publishesNpm) {
 	const isNodeVersionFile = nodeVersionYaml.startsWith("node-version-file");
 	return [
-		{
-			match: { uses: "actions/checkout" },
-			step: {
-				uses: "actions/checkout@v6",
-				with: { "fetch-depth": 0 }
-			}
-		},
-		{
-			match: { uses: "pnpm/action-setup" },
-			step: { uses: "pnpm/action-setup@v5" }
-		},
-		{
-			match: { uses: "actions/setup-node" },
-			step: {
-				uses: "actions/setup-node@v6",
-				with: {
-					...isNodeVersionFile ? { "node-version-file": "package.json" } : { "node-version": "24" },
-					cache: "pnpm",
-					...publishesNpm && { "registry-url": "https://registry.npmjs.org" }
-				}
+		{ step: {
+			uses: "actions/checkout@v6",
+			with: { "fetch-depth": 0 }
+		} },
+		{ step: { uses: "pnpm/action-setup@v5" } },
+		{ step: {
+			uses: "actions/setup-node@v6",
+			with: {
+				...isNodeVersionFile ? { "node-version-file": "package.json" } : { "node-version": "24" },
+				cache: "pnpm",
+				...publishesNpm && { "registry-url": actionsExpr("vars.NPM_REGISTRY_URL || 'https://registry.npmjs.org'") }
 			}
-		},
-		{
-			match: { run: "pnpm install" },
-			step: { run: "pnpm install --frozen-lockfile" }
-		}
+		} },
+		{ step: { run: "pnpm install --frozen-lockfile" } }
 	];
 }
 function releaseItSteps(ci, nodeVersionYaml, publishesNpm) {
 	const tokenEnv = ci === "github" ? { GITHUB_TOKEN: actionsExpr("github.token") } : { RELEASE_TOKEN: actionsExpr("secrets.RELEASE_TOKEN") };
 	const npmEnv = publishesNpm ? { NODE_AUTH_TOKEN: actionsExpr("secrets.NPM_TOKEN") } : {};
-	return [...commonSteps(nodeVersionYaml, publishesNpm), {
-		match: { run: "release-it" },
-		step: {
-			run: "pnpm release-it --ci",
-			env: {
-				...tokenEnv,
-				...npmEnv
-			}
+	return [...commonSteps(nodeVersionYaml, publishesNpm), { step: {
+		run: "pnpm release-it --ci",
+		env: {
+			...tokenEnv,
+			...npmEnv,
+			RELEASE_DEBUG: actionsExpr("vars.RELEASE_DEBUG || 'false'")
 		}
-	}];
+	} }];
 }
 /** Build the workflow_dispatch trigger with optional inputs for the simple strategy. */
 function simpleWorkflowDispatchTrigger() {
@@ -2827,70 +2733,36 @@ function simpleReleaseCommand() {
 	].join("\n");
 }
 function simpleReleaseSteps(ci, nodeVersionYaml, publishesNpm, hasDocker) {
-	const releaseStep = {
-		match: { run: "release:simple" },
-		step: {
-			name: "Release",
-			env: ci === "github" ? { GITHUB_TOKEN: actionsExpr("github.token") } : {
+	const releaseStep = { step: {
+		name: "Release",
+		env: {
+			...ci === "github" ? { GITHUB_TOKEN: actionsExpr("github.token") } : {
 				FORGEJO_SERVER_URL: actionsExpr("github.server_url"),
 				FORGEJO_REPOSITORY: actionsExpr("github.repository"),
 				RELEASE_TOKEN: actionsExpr("secrets.RELEASE_TOKEN")
 			},
-			run: simpleReleaseCommand()
-		}
-	};
-	const dockerStep = {
-		match: { run: "docker:publish" },
-		step: {
-			name: "Publish Docker images",
-			if: "success()",
-			env: {
-				DOCKER_REGISTRY_HOST: actionsExpr("vars.DOCKER_REGISTRY_HOST"),
-				DOCKER_REGISTRY_NAMESPACE: actionsExpr("vars.DOCKER_REGISTRY_NAMESPACE"),
-				DOCKER_USERNAME: actionsExpr("secrets.DOCKER_USERNAME"),
-				DOCKER_PASSWORD: actionsExpr("secrets.DOCKER_PASSWORD")
-			},
-			run: "pnpm exec bst docker:publish"
-		}
-	};
+			RELEASE_DEBUG: actionsExpr("vars.RELEASE_DEBUG || 'false'")
+		},
+		run: simpleReleaseCommand()
+	} };
+	const dockerStep = { step: {
+		name: "Publish Docker images",
+		if: "success()",
+		env: {
+			DOCKER_REGISTRY_HOST: actionsExpr("vars.DOCKER_REGISTRY_HOST"),
+			DOCKER_REGISTRY_NAMESPACE: actionsExpr("vars.DOCKER_REGISTRY_NAMESPACE"),
+			DOCKER_USERNAME: actionsExpr("secrets.DOCKER_USERNAME"),
+			DOCKER_PASSWORD: actionsExpr("secrets.DOCKER_PASSWORD"),
+			RELEASE_DEBUG: actionsExpr("vars.RELEASE_DEBUG || 'false'")
+		},
+		run: "pnpm exec bst docker:publish"
+	} };
 	return [
 		...commonSteps(nodeVersionYaml, publishesNpm),
 		releaseStep,
 		...hasDocker ? [dockerStep] : []
 	];
 }
-/** Build the required release step for the check job (changesets). */
-function changesetsReleaseStep(ci, publishesNpm) {
-	if (ci === "github") return {
-		match: { uses: "changesets/action" },
-		step: {
-			uses: "changesets/action@v1",
-			if: "github.ref == 'refs/heads/main'",
-			with: {
-				publish: "pnpm changeset publish",
-				version: "pnpm changeset version"
-			},
-			env: {
-				GITHUB_TOKEN: actionsExpr("github.token"),
-				...publishesNpm && { NPM_TOKEN: actionsExpr("secrets.NPM_TOKEN") }
-			}
-		}
-	};
-	return {
-		match: { run: "release:changesets" },
-		step: {
-			name: "Release",
-			if: "github.ref == 'refs/heads/main'",
-			env: {
-				FORGEJO_SERVER_URL: actionsExpr("github.server_url"),
-				FORGEJO_REPOSITORY: actionsExpr("github.repository"),
-				RELEASE_TOKEN: actionsExpr("secrets.RELEASE_TOKEN"),
-				...publishesNpm && { NODE_AUTH_TOKEN: actionsExpr("secrets.NPM_TOKEN") }
-			},
-			run: "pnpm exec bst release:changesets"
-		}
-	};
-}
 function buildSteps(strategy, ci, nodeVersionYaml, publishesNpm, hasDocker) {
 	switch (strategy) {
 		case "release-it": return releaseItSteps(ci, nodeVersionYaml, publishesNpm);
@@ -2898,40 +2770,6 @@ function buildSteps(strategy, ci, nodeVersionYaml, publishesNpm, hasDocker) {
 		default: return null;
 	}
 }
-function generateChangesetsReleaseCi(ctx, publishesNpm) {
-	const ciPath = ciWorkflowPath(ctx.config.ci, ctx.config.releaseStrategy);
-	const raw = ctx.read(ciPath);
-	if (!raw) return {
-		filePath: ciPath,
-		action: "skipped",
-		description: "CI workflow not found — run check generator first"
-	};
-	const existing = migrateToolingBinary(raw);
-	const merged = mergeWorkflowSteps(existing, "check", [changesetsReleaseStep(ctx.config.ci, publishesNpm)]);
-	if (!merged.changed) {
-		if (existing !== raw) {
-			const withComment = ensureSchemaComment(existing, ctx.config.ci);
-			ctx.write(ciPath, withComment);
-			return {
-				filePath: ciPath,
-				action: "updated",
-				description: "Migrated tooling binary name in CI workflow"
-			};
-		}
-		return {
-			filePath: ciPath,
-			action: "skipped",
-			description: "Release step in CI workflow already up to date"
-		};
-	}
-	const withComment = ensureSchemaComment(merged.content, ctx.config.ci);
-	ctx.write(ciPath, withComment);
-	return {
-		filePath: ciPath,
-		action: "updated",
-		description: "Added release step to CI workflow"
-	};
-}
 async function generateReleaseCi(ctx) {
 	const filePath = "release-ci";
 	if (ctx.config.releaseStrategy === "none" || ctx.config.ci === "none") return {
@@ -2940,7 +2778,11 @@ async function generateReleaseCi(ctx) {
 		description: "Release CI workflow not applicable"
 	};
 	const publishesNpm = ctx.config.publishNpm === true;
-	if (ctx.config.releaseStrategy === "changesets") return generateChangesetsReleaseCi(ctx, publishesNpm);
+	if (ctx.config.releaseStrategy === "changesets") return {
+		filePath,
+		action: "skipped",
+		description: "Release step included in CI workflow"
+	};
 	const isGitHub = ctx.config.ci === "github";
 	const workflowPath = isGitHub ? ".github/workflows/release.yml" : ".forgejo/workflows/release.yml";
 	const nodeVersionYaml = computeNodeVersionYaml(ctx);
@@ -2960,59 +2802,26 @@ async function generateReleaseCi(ctx) {
 		jobName: "release",
 		steps
 	});
-	if (ctx.exists(workflowPath)) {
-		const raw = ctx.read(workflowPath);
-		if (raw) {
-			const existing = migrateToolingBinary(raw);
-			if (existing === content || ensureSchemaComment(existing, ctx.config.ci) === content) {
-				if (existing !== raw) {
-					ctx.write(workflowPath, ensureSchemaComment(existing, ctx.config.ci));
-					return {
-						filePath: workflowPath,
-						action: "updated",
-						description: "Migrated tooling binary name in release workflow"
-					};
-				}
-				return {
-					filePath: workflowPath,
-					action: "skipped",
-					description: "Release workflow already up to date"
-				};
-			}
-			const merged = mergeWorkflowSteps(existing, "release", toRequiredSteps(steps));
-			const withComment = ensureSchemaComment(merged.content, ctx.config.ci);
-			if (!merged.changed) {
-				if (withComment !== raw) {
-					ctx.write(workflowPath, withComment);
-					return {
-						filePath: workflowPath,
-						action: "updated",
-						description: existing !== raw ? "Migrated tooling binary name in release workflow" : "Added schema comment to release workflow"
-					};
-				}
-				return {
-					filePath: workflowPath,
-					action: "skipped",
-					description: "Existing release workflow preserved"
-				};
-			}
-			ctx.write(workflowPath, withComment);
-			return {
-				filePath: workflowPath,
-				action: "updated",
-				description: "Added missing steps to release workflow"
-			};
-		}
-		return {
+	const alreadyExists = ctx.exists(workflowPath);
+	const existing = alreadyExists ? ctx.read(workflowPath) : void 0;
+	if (existing) {
+		if (isToolingIgnored(existing)) return {
+			filePath: workflowPath,
+			action: "skipped",
+			description: "Release workflow has ignore comment"
+		};
+		if (normalizeWorkflow(existing) === normalizeWorkflow(content)) return {
 			filePath: workflowPath,
 			action: "skipped",
 			description: "Release workflow already up to date"
 		};
 	}
-	ctx.write(workflowPath, content);
+	const withDevPath = preserveDevBinaryPath(content, existing);
+	const final = existing ? insertCustomBlocks(withDevPath, extractCustomBlocks(existing)) : withDevPath;
+	ctx.write(workflowPath, final);
 	return {
 		filePath: workflowPath,
-		action: "created",
+		action: alreadyExists ? "updated" : "created",
 		description: `Generated ${isGitHub ? "GitHub" : "Forgejo"} Actions release workflow`
 	};
 }
@@ -3308,7 +3117,7 @@ function generateMigratePrompt(results, config, detected) {
 	const timestamp = (/* @__PURE__ */ new Date()).toISOString();
 	sections.push("# Migration Prompt");
 	sections.push("");
-	sections.push(`_Generated by \`@bensandee/tooling@0.34.0 repo:sync\` on ${timestamp}_`);
+	sections.push(`_Generated by \`@bensandee/tooling@0.36.0 repo:sync\` on ${timestamp}_`);
 	sections.push("");
 	sections.push("The following prompt was generated by `@bensandee/tooling repo:sync`. Paste it into Claude Code or another AI assistant to finish migrating this repository.");
 	sections.push("");
@@ -5181,7 +4990,7 @@ const dockerCheckCommand = defineCommand({
 const main = defineCommand({
 	meta: {
 		name: "bst",
-		version: "0.34.0",
+		version: "0.36.0",
 		description: "Bootstrap and maintain standardized TypeScript project tooling"
 	},
 	subCommands: {
@@ -5197,7 +5006,7 @@ const main = defineCommand({
 		"docker:check": dockerCheckCommand
 	}
 });
-console.log(`@bensandee/tooling v0.34.0`);
+console.log(`@bensandee/tooling v0.36.0`);
 async function run() {
 	await runMain(main);
 	process.exit(process.exitCode ?? 0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bensandee/tooling",
-  "version": "0.34.0",
+  "version": "0.36.0",
   "description": "CLI tool to bootstrap and maintain standardized TypeScript project tooling",
   "bin": {
     "bst": "./dist/bin.mjs"