@bensandee/tooling 0.31.0 → 0.33.0

package/README.md

@@ -63,11 +63,37 @@ The generated `ci:check` script defaults to `pnpm check --skip 'docker:*'` since
 | Command                          | Description                                                                                                                     |
 | -------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- |
 | `tooling release:changesets`     | Changesets version/publish for Forgejo CI. Flag: `--dry-run`. Env: `FORGEJO_SERVER_URL`, `FORGEJO_REPOSITORY`, `RELEASE_TOKEN`. |
-| `tooling release:simple`         | Streamlined release using commit-and-tag-version.                                                                               |
+| `tooling release:simple`         | Streamlined release using commit-and-tag-version. Flags: `--release-as`, `--first-release`, `--prerelease`.                     |
 | `tooling release:trigger`        | Trigger a release workflow.                                                                                                     |
 | `tooling forgejo:create-release` | Create a Forgejo release from a tag.                                                                                            |
 | `tooling changesets:merge`       | Merge a changesets version PR.                                                                                                  |
 
+#### `release:simple`
+
+Uses `commit-and-tag-version` under the hood. Version bumps are auto-detected from [Conventional Commits](https://www.conventionalcommits.org/):
+
+| Commit prefix           | Bump  | Example                              |
+| ----------------------- | ----- | ------------------------------------ |
+| `fix:`                  | patch | `fix: handle null response`          |
+| `feat:`                 | minor | `feat: add retry logic`              |
+| `feat!:` / `fix!:` etc  | major | `feat!: drop v1 API`                 |
+| `BREAKING CHANGE:` body | major | Any type with breaking change footer |
+
+Override auto-detection with CLI flags:
+
+```bash
+# Force a major bump
+tooling release:simple --release-as major
+
+# Force a specific version
+tooling release:simple --release-as 2.0.0
+
+# Create a prerelease
+tooling release:simple --release-as major --prerelease beta  # → 2.0.0-beta.0
+```
+
+The generated release workflow exposes these as optional `workflow_dispatch` inputs (`bump` and `prerelease`), so bumps can also be controlled from the CI UI.
+
 ### Docker
 
 | Command                  | Description                                         |
@@ -133,14 +159,16 @@ Each package is tagged independently using its own version, so packages in a mon
 
 **Flags:** `--dry-run` (build and tag only, skip login/push/logout)
 
-**Required environment variables:**
+**Required CI variables:**
+
+| Variable                    | Type     | Description                                                           |
+| --------------------------- | -------- | --------------------------------------------------------------------- |
+| `DOCKER_REGISTRY_HOST`      | variable | Registry hostname (e.g. `code.orangebikelabs.com`)                    |
+| `DOCKER_REGISTRY_NAMESPACE` | variable | Full namespace for tagging (e.g. `code.orangebikelabs.com/bensandee`) |
+| `DOCKER_USERNAME`           | secret   | Registry username                                                     |
+| `DOCKER_PASSWORD`           | secret   | Registry password                                                     |
 
-| Variable                    | Description                                                           |
-| --------------------------- | --------------------------------------------------------------------- |
-| `DOCKER_REGISTRY_HOST`      | Registry hostname (e.g. `code.orangebikelabs.com`)                    |
-| `DOCKER_REGISTRY_NAMESPACE` | Full namespace for tagging (e.g. `code.orangebikelabs.com/bensandee`) |
-| `DOCKER_USERNAME`           | Registry username                                                     |
-| `DOCKER_PASSWORD`           | Registry password                                                     |
+**Forgejo setup:** On Forgejo, `DOCKER_USERNAME` is your Forgejo account username, and `DOCKER_PASSWORD` can reuse the same token as `RELEASE_TOKEN`. The token needs write permissions on the org, package, and repository scopes. These permissions should be set for the **user** if the package is under a user namespace (e.g. `bensandee`), or the **organization** if it's under an org namespace (e.g. `orangebikelabs`).
 
 ## Config file
 

package/dist/bin.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { l as createRealExecutor$1, t as runDockerCheck, u as isExecSyncError } from "./check-DMDdHanG.mjs";
+import { l as createRealExecutor$1, t as runDockerCheck, u as isExecSyncError } from "./check-B2AAPCBO.mjs";
 import { defineCommand, runMain } from "citty";
 import * as clack from "@clack/prompts";
 import { isCancel, select } from "@clack/prompts";
@@ -970,10 +970,6 @@ function runDockerPublish(executor, config) {
 //#region src/utils/yaml-merge.ts
 const IGNORE_PATTERN = "@bensandee/tooling:ignore";
 const FORGEJO_SCHEMA_COMMENT = "# yaml-language-server: $schema=../../.vscode/forgejo-workflow.schema.json\n";
-/** Returns a yaml-language-server schema comment for Forgejo workflows, empty string otherwise. */
-function workflowSchemaComment(ci) {
-	return ci === "forgejo" ? FORGEJO_SCHEMA_COMMENT : "";
-}
 /** Prepend the Forgejo schema comment if it's not already present. No-op for GitHub. */
 function ensureSchemaComment(content, ci) {
 	if (ci !== "forgejo") return content;
@@ -1028,6 +1024,29 @@ 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
+	}));
+}
+/** Build a complete workflow YAML string from structured options. Single source of truth for both new files and merge steps. */
+function buildWorkflowYaml(options) {
+	const doc = { name: options.name };
+	if (options.enableEmailNotifications) doc["enable-email-notifications"] = true;
+	doc["on"] = options.on;
+	if (options.permissions) doc["permissions"] = options.permissions;
+	if (options.concurrency) doc["concurrency"] = options.concurrency;
+	doc["jobs"] = { [options.jobName]: {
+		"runs-on": options.runsOn ?? "ubuntu-latest",
+		steps: options.steps.map((s) => s.step)
+	} };
+	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.
@@ -1169,43 +1188,22 @@ function computeNodeVersionYaml(ctx) {
 }
 //#endregion
 //#region src/generators/publish-ci.ts
-function deployWorkflow(ci, nodeVersionYaml) {
-	return `${workflowSchemaComment(ci)}name: Publish
-on:
-  workflow_dispatch:
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v4
-      - uses: actions/setup-node@v4
-        with:
-          ${nodeVersionYaml}
-      - run: pnpm install --frozen-lockfile
-      - 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
-`;
-}
-function requiredDeploySteps() {
+function publishSteps(nodeVersionYaml) {
 	return [
 		{
 			match: { uses: "actions/checkout" },
-			step: { uses: "actions/checkout@v4" }
+			step: { uses: "actions/checkout@v6" }
 		},
 		{
 			match: { uses: "pnpm/action-setup" },
-			step: { uses: "pnpm/action-setup@v4" }
+			step: { uses: "pnpm/action-setup@v5" }
 		},
 		{
 			match: { uses: "actions/setup-node" },
-			step: { uses: "actions/setup-node@v4" }
+			step: {
+				uses: "actions/setup-node@v6",
+				with: nodeVersionYaml.startsWith("node-version-file") ? { "node-version-file": "package.json" } : { "node-version": "24" }
+			}
 		},
 		{
 			match: { run: "pnpm install" },
@@ -1213,7 +1211,16 @@ function requiredDeploySteps() {
 		},
 		{
 			match: { run: "docker:publish" },
-			step: { run: "pnpm exec bst 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"
+			}
 		}
 	];
 }
@@ -1255,8 +1262,14 @@ async function generateDeployCi(ctx) {
 	};
 	const isGitHub = ctx.config.ci === "github";
 	const workflowPath = isGitHub ? ".github/workflows/publish.yml" : ".forgejo/workflows/publish.yml";
-	const nodeVersionYaml = computeNodeVersionYaml(ctx);
-	const content = deployWorkflow(ctx.config.ci, nodeVersionYaml);
+	const steps = publishSteps(computeNodeVersionYaml(ctx));
+	const content = buildWorkflowYaml({
+		ci: ctx.config.ci,
+		name: "Publish",
+		on: { workflow_dispatch: null },
+		jobName: "publish",
+		steps
+	});
 	if (ctx.exists(workflowPath)) {
 		const raw = ctx.read(workflowPath);
 		if (raw) {
@@ -1276,7 +1289,7 @@ async function generateDeployCi(ctx) {
 					description: "Publish workflow already up to date"
 				};
 			}
-			const merged = mergeWorkflowSteps(existing, "publish", requiredDeploySteps());
+			const merged = mergeWorkflowSteps(existing, "publish", toRequiredSteps(steps));
 			const withComment = ensureSchemaComment(merged.content, ctx.config.ci);
 			if (!merged.changed) {
 				if (withComment !== raw) {
@@ -1362,6 +1375,7 @@ const PER_PACKAGE_DEV_DEPS = {
 	"@types/node": {
 		"@changesets/cli": "2.30.0",
 		"@release-it/bumper": "7.0.5",
+		"@types/node": "24.12.0",
 		"commit-and-tag-version": "12.7.0",
 		"knip": "5.87.0",
 		"lefthook": "2.1.4",
@@ -1369,7 +1383,6 @@ const PER_PACKAGE_DEV_DEPS = {
 		"oxlint": "1.56.0",
 		"prettier": "3.8.1",
 		"release-it": "19.2.4",
-		"@types/node": "24.12.0",
 		"tsdown": "0.21.4",
 		"typescript": "5.9.3",
 		"vitest": "4.1.0",
@@ -1378,6 +1391,7 @@ const PER_PACKAGE_DEV_DEPS = {
 	tsdown: {
 		"@changesets/cli": "2.30.0",
 		"@release-it/bumper": "7.0.5",
+		"@types/node": "24.12.0",
 		"commit-and-tag-version": "12.7.0",
 		"knip": "5.87.0",
 		"lefthook": "2.1.4",
@@ -1385,7 +1399,6 @@ const PER_PACKAGE_DEV_DEPS = {
 		"oxlint": "1.56.0",
 		"prettier": "3.8.1",
 		"release-it": "19.2.4",
-		"@types/node": "24.12.0",
 		"tsdown": "0.21.4",
 		"typescript": "5.9.3",
 		"vitest": "4.1.0",
@@ -1394,6 +1407,7 @@ const PER_PACKAGE_DEV_DEPS = {
 	typescript: {
 		"@changesets/cli": "2.30.0",
 		"@release-it/bumper": "7.0.5",
+		"@types/node": "24.12.0",
 		"commit-and-tag-version": "12.7.0",
 		"knip": "5.87.0",
 		"lefthook": "2.1.4",
@@ -1401,7 +1415,6 @@ const PER_PACKAGE_DEV_DEPS = {
 		"oxlint": "1.56.0",
 		"prettier": "3.8.1",
 		"release-it": "19.2.4",
-		"@types/node": "24.12.0",
 		"tsdown": "0.21.4",
 		"typescript": "5.9.3",
 		"vitest": "4.1.0",
@@ -1410,6 +1423,7 @@ const PER_PACKAGE_DEV_DEPS = {
 	vitest: {
 		"@changesets/cli": "2.30.0",
 		"@release-it/bumper": "7.0.5",
+		"@types/node": "24.12.0",
 		"commit-and-tag-version": "12.7.0",
 		"knip": "5.87.0",
 		"lefthook": "2.1.4",
@@ -1417,7 +1431,6 @@ const PER_PACKAGE_DEV_DEPS = {
 		"oxlint": "1.56.0",
 		"prettier": "3.8.1",
 		"release-it": "19.2.4",
-		"@types/node": "24.12.0",
 		"tsdown": "0.21.4",
 		"typescript": "5.9.3",
 		"vitest": "4.1.0",
@@ -1429,6 +1442,7 @@ const ROOT_DEV_DEPS = {
 	knip: {
 		"@changesets/cli": "2.30.0",
 		"@release-it/bumper": "7.0.5",
+		"@types/node": "24.12.0",
 		"commit-and-tag-version": "12.7.0",
 		"knip": "5.87.0",
 		"lefthook": "2.1.4",
@@ -1436,7 +1450,6 @@ const ROOT_DEV_DEPS = {
 		"oxlint": "1.56.0",
 		"prettier": "3.8.1",
 		"release-it": "19.2.4",
-		"@types/node": "24.12.0",
 		"tsdown": "0.21.4",
 		"typescript": "5.9.3",
 		"vitest": "4.1.0",
@@ -1445,6 +1458,7 @@ const ROOT_DEV_DEPS = {
 	lefthook: {
 		"@changesets/cli": "2.30.0",
 		"@release-it/bumper": "7.0.5",
+		"@types/node": "24.12.0",
 		"commit-and-tag-version": "12.7.0",
 		"knip": "5.87.0",
 		"lefthook": "2.1.4",
@@ -1452,7 +1466,6 @@ const ROOT_DEV_DEPS = {
 		"oxlint": "1.56.0",
 		"prettier": "3.8.1",
 		"release-it": "19.2.4",
-		"@types/node": "24.12.0",
 		"tsdown": "0.21.4",
 		"typescript": "5.9.3",
 		"vitest": "4.1.0",
@@ -1461,6 +1474,7 @@ const ROOT_DEV_DEPS = {
 	oxlint: {
 		"@changesets/cli": "2.30.0",
 		"@release-it/bumper": "7.0.5",
+		"@types/node": "24.12.0",
 		"commit-and-tag-version": "12.7.0",
 		"knip": "5.87.0",
 		"lefthook": "2.1.4",
@@ -1468,7 +1482,6 @@ const ROOT_DEV_DEPS = {
 		"oxlint": "1.56.0",
 		"prettier": "3.8.1",
 		"release-it": "19.2.4",
-		"@types/node": "24.12.0",
 		"tsdown": "0.21.4",
 		"typescript": "5.9.3",
 		"vitest": "4.1.0",
@@ -1504,6 +1517,7 @@ function addReleaseDeps(deps, config) {
 			deps["release-it"] = {
 				"@changesets/cli": "2.30.0",
 				"@release-it/bumper": "7.0.5",
+				"@types/node": "24.12.0",
 				"commit-and-tag-version": "12.7.0",
 				"knip": "5.87.0",
 				"lefthook": "2.1.4",
@@ -1511,7 +1525,6 @@ function addReleaseDeps(deps, config) {
 				"oxlint": "1.56.0",
 				"prettier": "3.8.1",
 				"release-it": "19.2.4",
-				"@types/node": "24.12.0",
 				"tsdown": "0.21.4",
 				"typescript": "5.9.3",
 				"vitest": "4.1.0",
@@ -1520,6 +1533,7 @@ function addReleaseDeps(deps, config) {
 			if (config.structure === "monorepo") deps["@release-it/bumper"] = {
 				"@changesets/cli": "2.30.0",
 				"@release-it/bumper": "7.0.5",
+				"@types/node": "24.12.0",
 				"commit-and-tag-version": "12.7.0",
 				"knip": "5.87.0",
 				"lefthook": "2.1.4",
@@ -1527,7 +1541,6 @@ function addReleaseDeps(deps, config) {
 				"oxlint": "1.56.0",
 				"prettier": "3.8.1",
 				"release-it": "19.2.4",
-				"@types/node": "24.12.0",
 				"tsdown": "0.21.4",
 				"typescript": "5.9.3",
 				"vitest": "4.1.0",
@@ -1538,6 +1551,7 @@ function addReleaseDeps(deps, config) {
 			deps["commit-and-tag-version"] = {
 				"@changesets/cli": "2.30.0",
 				"@release-it/bumper": "7.0.5",
+				"@types/node": "24.12.0",
 				"commit-and-tag-version": "12.7.0",
 				"knip": "5.87.0",
 				"lefthook": "2.1.4",
@@ -1545,7 +1559,6 @@ function addReleaseDeps(deps, config) {
 				"oxlint": "1.56.0",
 				"prettier": "3.8.1",
 				"release-it": "19.2.4",
-				"@types/node": "24.12.0",
 				"tsdown": "0.21.4",
 				"typescript": "5.9.3",
 				"vitest": "4.1.0",
@@ -1556,6 +1569,7 @@ function addReleaseDeps(deps, config) {
 			deps["@changesets/cli"] = {
 				"@changesets/cli": "2.30.0",
 				"@release-it/bumper": "7.0.5",
+				"@types/node": "24.12.0",
 				"commit-and-tag-version": "12.7.0",
 				"knip": "5.87.0",
 				"lefthook": "2.1.4",
@@ -1563,7 +1577,6 @@ function addReleaseDeps(deps, config) {
 				"oxlint": "1.56.0",
 				"prettier": "3.8.1",
 				"release-it": "19.2.4",
-				"@types/node": "24.12.0",
 				"tsdown": "0.21.4",
 				"typescript": "5.9.3",
 				"vitest": "4.1.0",
@@ -1577,10 +1590,11 @@ 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.31.0";
+	deps["@bensandee/tooling"] = "0.33.0";
 	if (config.formatter === "oxfmt") deps["oxfmt"] = {
 		"@changesets/cli": "2.30.0",
 		"@release-it/bumper": "7.0.5",
+		"@types/node": "24.12.0",
 		"commit-and-tag-version": "12.7.0",
 		"knip": "5.87.0",
 		"lefthook": "2.1.4",
@@ -1588,7 +1602,6 @@ function getAddedDevDepNames(config) {
 		"oxlint": "1.56.0",
 		"prettier": "3.8.1",
 		"release-it": "19.2.4",
-		"@types/node": "24.12.0",
 		"tsdown": "0.21.4",
 		"typescript": "5.9.3",
 		"vitest": "4.1.0",
@@ -1597,6 +1610,7 @@ function getAddedDevDepNames(config) {
 	if (config.formatter === "prettier") deps["prettier"] = {
 		"@changesets/cli": "2.30.0",
 		"@release-it/bumper": "7.0.5",
+		"@types/node": "24.12.0",
 		"commit-and-tag-version": "12.7.0",
 		"knip": "5.87.0",
 		"lefthook": "2.1.4",
@@ -1604,7 +1618,6 @@ function getAddedDevDepNames(config) {
 		"oxlint": "1.56.0",
 		"prettier": "3.8.1",
 		"release-it": "19.2.4",
-		"@types/node": "24.12.0",
 		"tsdown": "0.21.4",
 		"typescript": "5.9.3",
 		"vitest": "4.1.0",
@@ -1632,11 +1645,12 @@ 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.31.0";
+	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.33.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",
 		"@release-it/bumper": "7.0.5",
+		"@types/node": "24.12.0",
 		"commit-and-tag-version": "12.7.0",
 		"knip": "5.87.0",
 		"lefthook": "2.1.4",
@@ -1644,7 +1658,6 @@ async function generatePackageJson(ctx) {
 		"oxlint": "1.56.0",
 		"prettier": "3.8.1",
 		"release-it": "19.2.4",
-		"@types/node": "24.12.0",
 		"tsdown": "0.21.4",
 		"typescript": "5.9.3",
 		"vitest": "4.1.0",
@@ -1653,6 +1666,7 @@ async function generatePackageJson(ctx) {
 	if (ctx.config.formatter === "prettier") devDeps["prettier"] = {
 		"@changesets/cli": "2.30.0",
 		"@release-it/bumper": "7.0.5",
+		"@types/node": "24.12.0",
 		"commit-and-tag-version": "12.7.0",
 		"knip": "5.87.0",
 		"lefthook": "2.1.4",
@@ -1660,7 +1674,6 @@ async function generatePackageJson(ctx) {
 		"oxlint": "1.56.0",
 		"prettier": "3.8.1",
 		"release-it": "19.2.4",
-		"@types/node": "24.12.0",
 		"tsdown": "0.21.4",
 		"typescript": "5.9.3",
 		"vitest": "4.1.0",
@@ -1741,6 +1754,7 @@ async function generatePackageJson(ctx) {
 		packageManager: `pnpm@${{
 			"@changesets/cli": "2.30.0",
 			"@release-it/bumper": "7.0.5",
+			"@types/node": "24.12.0",
 			"commit-and-tag-version": "12.7.0",
 			"knip": "5.87.0",
 			"lefthook": "2.1.4",
@@ -1748,7 +1762,6 @@ async function generatePackageJson(ctx) {
 			"oxlint": "1.56.0",
 			"prettier": "3.8.1",
 			"release-it": "19.2.4",
-			"@types/node": "24.12.0",
 			"tsdown": "0.21.4",
 			"typescript": "5.9.3",
 			"vitest": "4.1.0",
@@ -2174,50 +2187,20 @@ const CI_CONCURRENCY = {
 	group: `ci-${actionsExpr("github.ref")}`,
 	"cancel-in-progress": actionsExpr("github.ref != 'refs/heads/main'")
 };
-function ciWorkflow(nodeVersionYaml, isForgejo, isChangesets) {
-	const emailNotifications = isForgejo ? "\nenable-email-notifications: true\n" : "";
-	const concurrencyBlock = isChangesets ? `
-concurrency:
-  group: ci-${actionsExpr("github.ref")}
-  cancel-in-progress: ${actionsExpr("github.ref != 'refs/heads/main'")}
-` : "";
-	return `${workflowSchemaComment(isForgejo ? "forgejo" : "github")}name: CI
-${emailNotifications}on:
-  push:
-    branches: [main]
-    tags-ignore:
-      - "**"
-  pull_request:
-${concurrencyBlock}
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v4
-      - uses: actions/setup-node@v4
-        with:
-          ${nodeVersionYaml}
-          cache: pnpm
-      - run: pnpm install --frozen-lockfile
-      - name: Run all checks
-        run: pnpm ci:check
-`;
-}
-function requiredCheckSteps(nodeVersionYaml) {
+function checkSteps(nodeVersionYaml) {
 	return [
 		{
 			match: { uses: "actions/checkout" },
-			step: { uses: "actions/checkout@v4" }
+			step: { uses: "actions/checkout@v6" }
 		},
 		{
 			match: { uses: "pnpm/action-setup" },
-			step: { uses: "pnpm/action-setup@v4" }
+			step: { uses: "pnpm/action-setup@v5" }
 		},
 		{
 			match: { uses: "actions/setup-node" },
 			step: {
-				uses: "actions/setup-node@v4",
+				uses: "actions/setup-node@v6",
 				with: {
 					...nodeVersionYaml.startsWith("node-version-file") ? { "node-version-file": "package.json" } : { "node-version": "24" },
 					cache: "pnpm"
@@ -2248,14 +2231,29 @@ async function generateCi(ctx) {
 		description: "CI workflow not requested"
 	};
 	const isGitHub = ctx.config.ci === "github";
+	const isForgejo = !isGitHub;
 	const isChangesets = ctx.config.releaseStrategy === "changesets";
-	const nodeVersionYaml = computeNodeVersionYaml(ctx);
+	const steps = checkSteps(computeNodeVersionYaml(ctx));
+	const content = buildWorkflowYaml({
+		ci: ctx.config.ci,
+		name: "CI",
+		on: {
+			push: {
+				branches: ["main"],
+				"tags-ignore": ["**"]
+			},
+			pull_request: null
+		},
+		enableEmailNotifications: isForgejo,
+		...isChangesets && { concurrency: CI_CONCURRENCY },
+		jobName: "check",
+		steps
+	});
 	const filePath = ciWorkflowPath(ctx.config.ci, ctx.config.releaseStrategy);
-	const content = ciWorkflow(nodeVersionYaml, !isGitHub, isChangesets);
 	if (ctx.exists(filePath)) {
 		const existing = ctx.read(filePath);
 		if (existing) {
-			let result = mergeWorkflowSteps(existing, "check", requiredCheckSteps(nodeVersionYaml));
+			let result = mergeWorkflowSteps(existing, "check", toRequiredSteps(steps));
 			const withTagsIgnore = ensureWorkflowTagsIgnore(result.content);
 			result = {
 				content: withTagsIgnore.content,
@@ -2760,83 +2758,119 @@ async function generateChangesets(ctx) {
 }
 //#endregion
 //#region src/generators/release-ci.ts
+/** Common setup steps shared by release-it and simple strategies. */
 function commonSteps(nodeVersionYaml, publishesNpm) {
-	return `      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - uses: pnpm/action-setup@v4
-      - uses: actions/setup-node@v4
-        with:
-          ${nodeVersionYaml}
-          cache: pnpm${publishesNpm ? `\n          registry-url: "https://registry.npmjs.org"` : ""}
-      - run: pnpm install --frozen-lockfile`;
-}
-function releaseItWorkflow(ci, nodeVersionYaml, publishesNpm) {
-	const isGitHub = ci === "github";
-	const permissions = isGitHub ? `
-permissions:
-  contents: write
-` : "";
-	const tokenEnv = isGitHub ? `GITHUB_TOKEN: \${{ github.token }}` : `RELEASE_TOKEN: \${{ secrets.RELEASE_TOKEN }}`;
-	const npmEnv = publishesNpm ? `\n          NODE_AUTH_TOKEN: \${{ secrets.NPM_TOKEN }}` : "";
-	return `${workflowSchemaComment(ci)}name: Release
-on:
-  workflow_dispatch:
-${permissions}
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    steps:
-${commonSteps(nodeVersionYaml, publishesNpm)}
-      - run: pnpm release-it --ci
-        env:
-          ${tokenEnv}${npmEnv}
-`;
+	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" }
+				}
+			}
+		},
+		{
+			match: { run: "pnpm install" },
+			step: { run: "pnpm install --frozen-lockfile" }
+		}
+	];
 }
-function dockerPublishStep() {
-	return `
-      - 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`;
-}
-function commitAndTagVersionWorkflow(ci, nodeVersionYaml, publishesNpm, hasDocker) {
-	const isGitHub = ci === "github";
-	const permissions = isGitHub ? `
-permissions:
-  contents: write
-` : "";
-	const gitConfigStep = `
-      - name: Configure git
-        run: |
-          git config user.name "${isGitHub ? "github-actions[bot]" : "forgejo-actions[bot]"}"
-          git config user.email "${isGitHub ? "github-actions[bot]@users.noreply.github.com" : "forgejo-actions[bot]@noreply.localhost"}"`;
-	const releaseStep = isGitHub ? `
-      - name: Release
-        env:
-          GITHUB_TOKEN: \${{ github.token }}
-        run: pnpm exec bst release:simple` : `
-      - name: Release
-        env:
-          FORGEJO_SERVER_URL: \${{ github.server_url }}
-          FORGEJO_REPOSITORY: \${{ github.repository }}
-          RELEASE_TOKEN: \${{ secrets.RELEASE_TOKEN }}
-        run: pnpm exec bst release:simple`;
-	const dockerStep = hasDocker ? dockerPublishStep() : "";
-	return `${workflowSchemaComment(ci)}name: Release
-on:
-  workflow_dispatch:
-${permissions}
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    steps:
-${commonSteps(nodeVersionYaml, publishesNpm)}${gitConfigStep}${releaseStep}${dockerStep}
-`;
+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
+			}
+		}
+	}];
+}
+/** Build the workflow_dispatch trigger with optional inputs for the simple strategy. */
+function simpleWorkflowDispatchTrigger() {
+	return { workflow_dispatch: { inputs: {
+		bump: {
+			description: "Version bump type (default: conventional-commits auto-detect)",
+			required: false,
+			type: "choice",
+			default: "auto",
+			options: [
+				"auto",
+				"major",
+				"minor",
+				"patch",
+				"first-release"
+			]
+		},
+		prerelease: {
+			description: "Create a prerelease with the given tag (e.g., beta, alpha)",
+			required: false,
+			type: "string"
+		}
+	} } };
+}
+/** Build the release:simple run command with conditional flags from workflow inputs. */
+function simpleReleaseCommand() {
+	return [
+		"FLAGS=",
+		`case "${actionsExpr("inputs.bump")}" in`,
+		"  major|minor|patch) FLAGS=\"$FLAGS --release-as " + actionsExpr("inputs.bump") + "\" ;;",
+		"  first-release) FLAGS=\"$FLAGS --first-release\" ;;",
+		"esac",
+		`if [ -n "${actionsExpr("inputs.prerelease")}" ]; then FLAGS="$FLAGS --prerelease ${actionsExpr("inputs.prerelease")}"; fi`,
+		"pnpm exec bst release:simple $FLAGS"
+	].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") } : {
+				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"
+		}
+	};
+	return [
+		...commonSteps(nodeVersionYaml, publishesNpm),
+		releaseStep,
+		...hasDocker ? [dockerStep] : []
+	];
 }
 /** Build the required release step for the check job (changesets). */
 function changesetsReleaseStep(ci, publishesNpm) {
@@ -2870,69 +2904,10 @@ function changesetsReleaseStep(ci, publishesNpm) {
 		}
 	};
 }
-function requiredReleaseSteps(strategy, nodeVersionYaml, publishesNpm, hasDocker) {
-	const isNodeVersionFile = nodeVersionYaml.startsWith("node-version-file");
-	const steps = [
-		{
-			match: { uses: "actions/checkout" },
-			step: {
-				uses: "actions/checkout@v4",
-				with: { "fetch-depth": 0 }
-			}
-		},
-		{
-			match: { uses: "pnpm/action-setup" },
-			step: { uses: "pnpm/action-setup@v4" }
-		},
-		{
-			match: { uses: "actions/setup-node" },
-			step: {
-				uses: "actions/setup-node@v4",
-				with: {
-					...isNodeVersionFile ? { "node-version-file": "package.json" } : { "node-version": "24" },
-					cache: "pnpm",
-					...publishesNpm && { "registry-url": "https://registry.npmjs.org" }
-				}
-			}
-		},
-		{
-			match: { run: "pnpm install" },
-			step: { run: "pnpm install --frozen-lockfile" }
-		}
-	];
+function buildSteps(strategy, ci, nodeVersionYaml, publishesNpm, hasDocker) {
 	switch (strategy) {
-		case "release-it":
-			steps.push({
-				match: { run: "release-it" },
-				step: { run: "pnpm release-it --ci" }
-			});
-			break;
-		case "simple":
-			steps.push({
-				match: { run: "release:simple" },
-				step: { run: "pnpm exec bst release:simple" }
-			});
-			if (hasDocker) steps.push({
-				match: { run: "docker:publish" },
-				step: {
-					name: "Publish Docker images",
-					run: "pnpm exec bst docker:publish"
-				}
-			});
-			break;
-		case "changesets":
-			steps.push({
-				match: { run: "changeset" },
-				step: { run: "pnpm exec bst release:changesets" }
-			});
-			break;
-	}
-	return steps;
-}
-function buildWorkflow(strategy, ci, nodeVersionYaml, publishesNpm, hasDocker) {
-	switch (strategy) {
-		case "release-it": return releaseItWorkflow(ci, nodeVersionYaml, publishesNpm);
-		case "simple": return commitAndTagVersionWorkflow(ci, nodeVersionYaml, publishesNpm, hasDocker);
+		case "release-it": return releaseItSteps(ci, nodeVersionYaml, publishesNpm);
+		case "simple": return simpleReleaseSteps(ci, nodeVersionYaml, publishesNpm, hasDocker);
 		default: return null;
 	}
 }
@@ -2983,12 +2958,21 @@ async function generateReleaseCi(ctx) {
 	const workflowPath = isGitHub ? ".github/workflows/release.yml" : ".forgejo/workflows/release.yml";
 	const nodeVersionYaml = computeNodeVersionYaml(ctx);
 	const hasDocker = hasDockerPackages(ctx);
-	const content = buildWorkflow(ctx.config.releaseStrategy, ctx.config.ci, nodeVersionYaml, publishesNpm, hasDocker);
-	if (!content) return {
+	const steps = buildSteps(ctx.config.releaseStrategy, ctx.config.ci, nodeVersionYaml, publishesNpm, hasDocker);
+	if (!steps) return {
 		filePath,
 		action: "skipped",
 		description: "Release CI workflow not applicable"
 	};
+	const on = ctx.config.releaseStrategy === "simple" ? simpleWorkflowDispatchTrigger() : { workflow_dispatch: null };
+	const content = buildWorkflowYaml({
+		ci: ctx.config.ci,
+		name: "Release",
+		on,
+		...isGitHub && { permissions: { contents: "write" } },
+		jobName: "release",
+		steps
+	});
 	if (ctx.exists(workflowPath)) {
 		const raw = ctx.read(workflowPath);
 		if (raw) {
@@ -3008,7 +2992,7 @@ async function generateReleaseCi(ctx) {
 					description: "Release workflow already up to date"
 				};
 			}
-			const merged = mergeWorkflowSteps(existing, "release", requiredReleaseSteps(ctx.config.releaseStrategy, nodeVersionYaml, publishesNpm, hasDocker));
+			const merged = mergeWorkflowSteps(existing, "release", toRequiredSteps(steps));
 			const withComment = ensureSchemaComment(merged.content, ctx.config.ci);
 			if (!merged.changed) {
 				if (withComment !== raw) {
@@ -3337,7 +3321,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.31.0 repo:sync\` on ${timestamp}_`);
+	sections.push(`_Generated by \`@bensandee/tooling@0.33.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("");
@@ -4345,33 +4329,53 @@ const releaseTriggerCommand = defineCommand({
 		name: "release:trigger",
 		description: "Trigger the release CI workflow"
 	},
-	args: { ref: {
-		type: "string",
-		description: "Git ref to trigger on (default: main)",
-		required: false
-	} },
+	args: {
+		ref: {
+			type: "string",
+			description: "Git ref to trigger on (default: main)",
+			required: false
+		},
+		bump: {
+			type: "string",
+			description: "Version bump type: auto, major, minor, patch, or first-release",
+			required: false
+		},
+		prerelease: {
+			type: "string",
+			description: "Create a prerelease with the given tag (e.g., beta, alpha)",
+			required: false
+		}
+	},
 	async run({ args }) {
 		const ref = args.ref ?? "main";
+		const inputs = {};
+		if (args.bump) inputs["bump"] = args.bump;
+		if (args.prerelease) inputs["prerelease"] = args.prerelease;
 		const resolved = resolveConnection(process.cwd());
-		if (resolved.type === "forgejo") await triggerForgejo(resolved.conn, ref);
-		else triggerGitHub(ref);
+		if (resolved.type === "forgejo") await triggerForgejo(resolved.conn, ref, inputs);
+		else triggerGitHub(ref, inputs);
 	}
 });
-async function triggerForgejo(conn, ref) {
+async function triggerForgejo(conn, ref, inputs) {
 	const url = `${conn.serverUrl}/api/v1/repos/${conn.repository}/actions/workflows/release.yml/dispatches`;
+	const body = { ref };
+	if (Object.keys(inputs).length > 0) body["inputs"] = inputs;
 	const res = await fetch(url, {
 		method: "POST",
 		headers: {
 			Authorization: `token ${conn.token}`,
 			"Content-Type": "application/json"
 		},
-		body: JSON.stringify({ ref })
+		body: JSON.stringify(body)
 	});
 	if (!res.ok) throw new FatalError(`Failed to trigger Forgejo workflow: ${res.status} ${res.statusText}`);
 	log$2.info(`Triggered release workflow on Forgejo (ref: ${ref})`);
 }
-function triggerGitHub(ref) {
-	const result = createRealExecutor().exec(`gh workflow run release.yml --ref ${ref}`, { cwd: process.cwd() });
+function triggerGitHub(ref, inputs) {
+	const executor = createRealExecutor();
+	const inputFlags = Object.entries(inputs).map(([k, v]) => `-f ${k}=${v}`).join(" ");
+	const cmd = `gh workflow run release.yml --ref ${ref}${inputFlags ? ` ${inputFlags}` : ""}`;
+	const result = executor.exec(cmd, { cwd: process.cwd() });
 	if (result.exitCode !== 0) throw new FatalError(`Failed to trigger GitHub workflow: ${result.stderr || result.stdout || "unknown error"}`);
 	log$2.info(`Triggered release workflow on GitHub (ref: ${ref})`);
 }
@@ -4473,8 +4477,18 @@ function readVersion(executor, cwd) {
 	if (!pkg?.version) throw new FatalError("No version field found in package.json");
 	return pkg.version;
 }
+/** Configure git identity for CI bot commits. */
+function configureGitIdentity(executor, config) {
+	const isGitHub = config.platform?.type === "github";
+	const name = isGitHub ? "github-actions[bot]" : "forgejo-actions[bot]";
+	const email = isGitHub ? "github-actions[bot]@users.noreply.github.com" : "forgejo-actions[bot]@noreply.localhost";
+	executor.exec(`git config user.name "${name}"`, { cwd: config.cwd });
+	executor.exec(`git config user.email "${email}"`, { cwd: config.cwd });
+	debug(config, `Configured git identity: ${name} <${email}>`);
+}
 /** Run the full commit-and-tag-version release flow. */
 async function runSimpleRelease(executor, config) {
+	configureGitIdentity(executor, config);
 	const command = buildCommand(config);
 	log$2.info(`Running: ${command}`);
 	const versionResult = executor.exec(command, { cwd: config.cwd });
@@ -5145,7 +5159,7 @@ const dockerCheckCommand = defineCommand({
 const main = defineCommand({
 	meta: {
 		name: "bst",
-		version: "0.31.0",
+		version: "0.33.0",
 		description: "Bootstrap and maintain standardized TypeScript project tooling"
 	},
 	subCommands: {
@@ -5161,7 +5175,7 @@ const main = defineCommand({
 		"docker:check": dockerCheckCommand
 	}
 });
-console.log(`@bensandee/tooling v0.31.0`);
+console.log(`@bensandee/tooling v0.33.0`);
 async function run() {
 	await runMain(main);
 	process.exit(process.exitCode ?? 0);

package/dist/{check-DMDdHanG.mjs → check-B2AAPCBO.mjs}

@@ -145,14 +145,19 @@ async function runDockerCheck(executor, config) {
 	const pollIntervalMs = config.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
 	const { compose } = config;
 	const cleanup = () => composeDown(executor, compose);
-	const disposeInt = executor.onSignal("SIGINT", () => {
-		cleanup();
-		process.exit(1);
-	});
-	const disposeTerm = executor.onSignal("SIGTERM", () => {
+	let cleaningUp = false;
+	const gracefulShutdown = () => {
+		if (cleaningUp) {
+			executor.log("Cleanup in progress, please wait...");
+			return;
+		}
+		cleaningUp = true;
+		executor.log("Interrupted — shutting down compose stack...");
 		cleanup();
 		process.exit(1);
-	});
+	};
+	const disposeInt = executor.onSignal("SIGINT", gracefulShutdown);
+	const disposeTerm = executor.onSignal("SIGTERM", gracefulShutdown);
 	try {
 		if (config.buildCommand) {
 			executor.log("Building images...");
@@ -162,6 +167,7 @@ async function runDockerCheck(executor, config) {
 		composeUp(executor, compose);
 		executor.log(`Waiting for stack to be healthy (max ${timeoutMs / 1e3}s)...`);
 		const startTime = executor.now();
+		let lastStatusLogTime = startTime;
 		const healthStatus = new Map(config.healthChecks.map((c) => [c.name, false]));
 		while (executor.now() - startTime < timeoutMs) {
 			const containers = composePs(executor, compose);
@@ -195,10 +201,12 @@ async function runDockerCheck(executor, config) {
 					elapsedMs: executor.now() - startTime
 				};
 			}
-			const elapsed = Math.floor((executor.now() - startTime) / 1e3);
-			if (elapsed > 0 && elapsed % 5 === 0) {
-				const statuses = [...healthStatus.entries()].map(([name, ok]) => `${name}=${ok ? "OK" : "Pending"}`).join(", ");
-				executor.log(`Waiting... (${elapsed}s elapsed). ${statuses}`);
+			const now = executor.now();
+			if (now - lastStatusLogTime >= 5e3) {
+				lastStatusLogTime = now;
+				const elapsed = Math.floor((now - startTime) / 1e3);
+				const parts = [compose.services.map((s) => `${s}=${getContainerHealth(containers, s)}`).join(", "), [...healthStatus.entries()].map(([name, ok]) => `${name}=${ok ? "OK" : "Pending"}`).join(", ")].filter(Boolean).join(" | ");
+				executor.log(`Waiting... (${elapsed}s elapsed). ${parts}`);
 			}
 			await executor.sleep(pollIntervalMs);
 		}

package/dist/docker-check/index.mjs

@@ -1,2 +1,2 @@
-import { a as composeDown, c as composeUp, i as composeCommand, l as createRealExecutor, n as checkHttpHealth, o as composeLogs, r as getContainerHealth, s as composePs, t as runDockerCheck } from "../check-DMDdHanG.mjs";
+import { a as composeDown, c as composeUp, i as composeCommand, l as createRealExecutor, n as checkHttpHealth, o as composeLogs, r as getContainerHealth, s as composePs, t as runDockerCheck } from "../check-B2AAPCBO.mjs";
 export { checkHttpHealth, composeCommand, composeDown, composeLogs, composePs, composeUp, createRealExecutor, getContainerHealth, runDockerCheck };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bensandee/tooling",
-  "version": "0.31.0",
+  "version": "0.33.0",
   "description": "CLI tool to bootstrap and maintain standardized TypeScript project tooling",
   "bin": {
     "bst": "./dist/bin.mjs"
@@ -40,23 +40,21 @@
     "@bensandee/common": "0.1.2"
   },
   "devDependencies": {
-    "@types/node": "24.12.0",
-    "@types/picomatch": "4.0.2",
-    "tsdown": "0.21.4",
-    "typescript": "5.9.3",
-    "vitest": "4.1.0",
-    "@bensandee/config": "0.9.1"
-  },
-  "optionalDependencies": {
     "@changesets/cli": "2.30.0",
     "@release-it/bumper": "7.0.5",
+    "@types/node": "24.12.0",
+    "@types/picomatch": "4.0.2",
     "commit-and-tag-version": "12.7.0",
     "knip": "5.87.0",
     "lefthook": "2.1.4",
     "oxfmt": "0.41.0",
     "oxlint": "1.56.0",
     "prettier": "3.8.1",
-    "release-it": "19.2.4"
+    "release-it": "19.2.4",
+    "tsdown": "0.21.4",
+    "typescript": "5.9.3",
+    "vitest": "4.1.0",
+    "@bensandee/config": "0.9.1"
   },
   "scripts": {
     "build": "tsdown",