@bensandee/tooling 0.27.0 → 0.28.0

package/dist/bin.mjs

@@ -113,6 +113,7 @@ const LEGACY_PATTERNS = {
 /** Detect existing project state in the target directory. */
 function detectProject(targetDir) {
 	const exists = (rel) => existsSync(path.join(targetDir, rel));
+	const rootPkg = readPackageJson(targetDir);
 	return {
 		hasPackageJson: exists("package.json"),
 		hasTsconfig: exists("tsconfig.json"),
@@ -127,7 +128,8 @@ function detectProject(targetDir) {
 		hasReleaseItConfig: exists(".release-it.json") || exists(".release-it.yaml") || exists(".release-it.toml"),
 		hasSimpleReleaseConfig: exists(".versionrc") || exists(".versionrc.json") || exists(".versionrc.js"),
 		hasChangesetsConfig: exists(".changeset/config.json"),
-		hasRepositoryField: !!readPackageJson(targetDir)?.repository,
+		hasRepositoryField: !!rootPkg?.repository,
+		hasCommitAndTagVersion: !!rootPkg?.devDependencies?.["commit-and-tag-version"],
 		legacyConfigs: detectLegacyConfigs(targetDir)
 	};
 }
@@ -664,6 +666,10 @@ function ensureSchemaComment(content, ci) {
 	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));
@@ -797,7 +803,7 @@ function ensureWorkflowConcurrency(existing, concurrency) {
 	}
 }
 //#endregion
-//#region src/generators/deploy-ci.ts
+//#region src/generators/publish-ci.ts
 /** Build a GitHub Actions expression like `${{ expr }}` without triggering no-template-curly-in-string. */
 function actionsExpr$2(expr) {
 	return `\${{ ${expr} }}`;
@@ -806,14 +812,14 @@ function hasEnginesNode$2(ctx) {
 	return typeof ctx.packageJson?.["engines"]?.["node"] === "string";
 }
 function deployWorkflow(ci, nodeVersionYaml) {
-	return `${workflowSchemaComment(ci)}name: Deploy
+	return `${workflowSchemaComment(ci)}name: Publish
 on:
   push:
     tags:
       - "v[0-9]+.[0-9]+.[0-9]+"
 
 jobs:
-  deploy:
+  publish:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -898,48 +904,59 @@ async function generateDeployCi(ctx) {
 	const nodeVersionYaml = hasEnginesNode$2(ctx) ? "node-version-file: package.json" : "node-version: \"24\"";
 	const content = deployWorkflow(ctx.config.ci, nodeVersionYaml);
 	if (ctx.exists(workflowPath)) {
-		const existing = ctx.read(workflowPath);
-		if (existing) {
-			if (existing === content || ensureSchemaComment(existing, ctx.config.ci) === content) return {
-				filePath: workflowPath,
-				action: "skipped",
-				description: "Deploy workflow already up to date"
-			};
-			const merged = mergeWorkflowSteps(existing, "deploy", requiredDeploySteps());
+		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", requiredDeploySteps());
 			const withComment = ensureSchemaComment(merged.content, ctx.config.ci);
 			if (!merged.changed) {
-				if (withComment !== existing) {
+				if (withComment !== raw) {
 					ctx.write(workflowPath, withComment);
 					return {
 						filePath: workflowPath,
 						action: "updated",
-						description: "Added schema comment to deploy workflow"
+						description: existing !== raw ? "Migrated tooling binary name in publish workflow" : "Added schema comment to publish workflow"
 					};
 				}
 				return {
 					filePath: workflowPath,
 					action: "skipped",
-					description: "Existing deploy workflow preserved"
+					description: "Existing publish workflow preserved"
 				};
 			}
 			ctx.write(workflowPath, withComment);
 			return {
 				filePath: workflowPath,
 				action: "updated",
-				description: "Added missing steps to deploy workflow"
+				description: "Added missing steps to publish workflow"
 			};
 		}
 		return {
 			filePath: workflowPath,
 			action: "skipped",
-			description: "Deploy workflow already up to date"
+			description: "Publish workflow already up to date"
 		};
 	}
 	ctx.write(workflowPath, content);
 	return {
 		filePath: workflowPath,
 		action: "created",
-		description: `Generated ${isGitHub ? "GitHub" : "Forgejo"} Actions deploy workflow`
+		description: `Generated ${isGitHub ? "GitHub" : "Forgejo"} Actions publish workflow`
 	};
 }
 //#endregion
@@ -969,13 +986,21 @@ const STANDARD_SCRIPTS_MONOREPO = {
 };
 /** Scripts that tooling owns — map from script name to keyword that must appear in the value. */
 const MANAGED_SCRIPTS = {
-	check: "checks:run",
+	check: "bst checks:run",
 	"ci:check": "pnpm check",
-	"tooling:check": "repo:sync --check",
-	"tooling:sync": "repo:sync",
-	"docker:build": "docker:build",
-	"docker:check": "docker:check"
+	"tooling:check": "bst repo:sync --check",
+	"tooling:sync": "bst repo:sync",
+	"trigger-release": "bst release:trigger",
+	"docker:build": "bst docker:build",
+	"docker:check": "bst docker:check"
 };
+/** Check if an existing script value satisfies a managed script requirement.
+* Accepts both `bst <cmd>` and `bin.mjs <cmd>` (used in the tooling repo itself). */
+function matchesManagedScript(scriptValue, expectedFragment) {
+	if (scriptValue.includes(expectedFragment)) return true;
+	const binMjsFragment = expectedFragment.replace(/^bst /, "bin.mjs ");
+	return scriptValue.includes(binMjsFragment);
+}
 /** Deprecated scripts to remove during migration. */
 const DEPRECATED_SCRIPTS = ["tooling:init", "tooling:update"];
 /** DevDeps that belong in every project (single repo) or per-package (monorepo). */
@@ -1031,7 +1056,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.27.0";
+	deps["@bensandee/tooling"] = "0.28.0";
 	if (config.formatter === "oxfmt") deps["oxfmt"] = "0.35.0";
 	if (config.formatter === "prettier") deps["prettier"] = "3.8.1";
 	addReleaseDeps(deps, config);
@@ -1056,7 +1081,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.27.0";
+	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.28.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"] = "0.35.0";
 	if (ctx.config.formatter === "prettier") devDeps["prettier"] = "3.8.1";
@@ -1074,10 +1099,14 @@ 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}`);
-		} else if (key in MANAGED_SCRIPTS && !existingScripts[key]?.includes(MANAGED_SCRIPTS[key])) {
+		} else if (key in MANAGED_SCRIPTS && !matchesManagedScript(existingScripts[key] ?? "", MANAGED_SCRIPTS[key] ?? "")) {
 			existingScripts[key] = value;
 			changes.push(`updated script: ${key}`);
 		}
@@ -2135,7 +2164,7 @@ function actionsExpr(expr) {
 function hasEnginesNode(ctx) {
 	return typeof ctx.packageJson?.["engines"]?.["node"] === "string";
 }
-function commonSteps(nodeVersionYaml, publishesNpm) {
+function commonSteps(nodeVersionYaml, publishesNpm, { build = true } = {}) {
 	return `      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
@@ -2144,8 +2173,7 @@ function commonSteps(nodeVersionYaml, publishesNpm) {
         with:
           ${nodeVersionYaml}
           cache: pnpm${publishesNpm ? `\n          registry-url: "https://registry.npmjs.org"` : ""}
-      - run: pnpm install --frozen-lockfile
-      - run: pnpm build`;
+      - run: pnpm install --frozen-lockfile${build ? `\n      - run: pnpm build` : ""}`;
 }
 function releaseItWorkflow(ci, nodeVersionYaml, publishesNpm) {
 	const isGitHub = ci === "github";
@@ -2199,7 +2227,7 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-${commonSteps(nodeVersionYaml, publishesNpm)}${gitConfigStep}${releaseStep}
+${commonSteps(nodeVersionYaml, publishesNpm, { build: false })}${gitConfigStep}${releaseStep}
 `;
 }
 /** Build the required release step for the check job (changesets). */
@@ -2263,10 +2291,10 @@ function requiredReleaseSteps(strategy, nodeVersionYaml, publishesNpm) {
 			match: { run: "pnpm install" },
 			step: { run: "pnpm install --frozen-lockfile" }
 		},
-		{
+		...strategy !== "simple" ? [{
 			match: { run: "build" },
 			step: { run: "pnpm build" }
-		}
+		}] : []
 	];
 	switch (strategy) {
 		case "release-it":
@@ -2299,18 +2327,30 @@ function buildWorkflow(strategy, ci, nodeVersionYaml, publishesNpm) {
 }
 function generateChangesetsReleaseCi(ctx, publishesNpm) {
 	const ciPath = ciWorkflowPath(ctx.config.ci, ctx.config.releaseStrategy);
-	const existing = ctx.read(ciPath);
-	if (!existing) return {
+	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) return {
-		filePath: ciPath,
-		action: "skipped",
-		description: "Release step in CI workflow already up to date"
-	};
+	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 {
@@ -2338,22 +2378,33 @@ async function generateReleaseCi(ctx) {
 		description: "Release CI workflow not applicable"
 	};
 	if (ctx.exists(workflowPath)) {
-		const existing = ctx.read(workflowPath);
-		if (existing) {
-			if (existing === content || ensureSchemaComment(existing, ctx.config.ci) === content) return {
-				filePath: workflowPath,
-				action: "skipped",
-				description: "Release workflow already up to date"
-			};
+		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", requiredReleaseSteps(ctx.config.releaseStrategy, nodeVersionYaml, publishesNpm));
 			const withComment = ensureSchemaComment(merged.content, ctx.config.ci);
 			if (!merged.changed) {
-				if (withComment !== existing) {
+				if (withComment !== raw) {
 					ctx.write(workflowPath, withComment);
 					return {
 						filePath: workflowPath,
 						action: "updated",
-						description: "Added schema comment to release workflow"
+						description: existing !== raw ? "Migrated tooling binary name in release workflow" : "Added schema comment to release workflow"
 					};
 				}
 				return {
@@ -2953,8 +3004,11 @@ function runDockerPublish(executor, config) {
 */
 function generateMigratePrompt(results, config, detected) {
 	const sections = [];
+	const timestamp = (/* @__PURE__ */ new Date()).toISOString();
 	sections.push("# Migration Prompt");
 	sections.push("");
+	sections.push(`_Generated by \`@bensandee/tooling@0.28.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("");
 	sections.push("> **Tip:** Before starting, run `/init` in Claude Code to generate a `CLAUDE.md` that gives the AI a complete picture of your repository's structure, conventions, and build commands.");
@@ -2987,6 +3041,18 @@ function generateMigratePrompt(results, config, detected) {
 	}
 	sections.push("## Migration tasks");
 	sections.push("");
+	if (config.releaseStrategy === "simple" && !detected.hasCommitAndTagVersion) {
+		sections.push("### Add commit-and-tag-version to devDependencies");
+		sections.push("");
+		sections.push("The `simple` release strategy requires `commit-and-tag-version` as a root devDependency so that `pnpm exec commit-and-tag-version` resolves correctly.");
+		sections.push("");
+		sections.push("Run:");
+		sections.push("");
+		sections.push("```sh");
+		sections.push("pnpm add -D -w commit-and-tag-version");
+		sections.push("```");
+		sections.push("");
+	}
 	if (config.releaseStrategy !== "none" && !detected.hasRepositoryField) {
 		sections.push("### Add repository field to package.json");
 		sections.push("");
@@ -4754,7 +4820,7 @@ const dockerCheckCommand = defineCommand({
 const main = defineCommand({
 	meta: {
 		name: "bst",
-		version: "0.27.0",
+		version: "0.28.0",
 		description: "Bootstrap and maintain standardized TypeScript project tooling"
 	},
 	subCommands: {
@@ -4770,7 +4836,7 @@ const main = defineCommand({
 		"docker:check": dockerCheckCommand
 	}
 });
-console.log(`@bensandee/tooling v0.27.0`);
+console.log(`@bensandee/tooling v0.28.0`);
 async function run() {
 	await runMain(main);
 	process.exit(process.exitCode ?? 0);

package/dist/index.d.mts

@@ -100,6 +100,8 @@ interface DetectedProjectState {
   hasChangesetsConfig: boolean;
   /** Whether package.json has a repository field (needed for release workflows) */
   hasRepositoryField: boolean;
+  /** Whether commit-and-tag-version is in root devDependencies (required for simple release strategy) */
+  hasCommitAndTagVersion: boolean;
   /** Legacy tooling configs found */
   legacyConfigs: LegacyConfig[];
 }

package/package.json

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