@bensandee/tooling 0.32.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";
@@ -1590,7 +1590,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.32.0";
+	deps["@bensandee/tooling"] = "0.33.0";
 	if (config.formatter === "oxfmt") deps["oxfmt"] = {
 		"@changesets/cli": "2.30.0",
 		"@release-it/bumper": "7.0.5",
@@ -1645,7 +1645,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.32.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",
@@ -2804,6 +2804,41 @@ function releaseItSteps(ci, nodeVersionYaml, publishesNpm) {
 		}
 	}];
 }
+/** 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" },
@@ -2814,7 +2849,7 @@ function simpleReleaseSteps(ci, nodeVersionYaml, publishesNpm, hasDocker) {
 				FORGEJO_REPOSITORY: actionsExpr("github.repository"),
 				RELEASE_TOKEN: actionsExpr("secrets.RELEASE_TOKEN")
 			},
-			run: "pnpm exec bst release:simple"
+			run: simpleReleaseCommand()
 		}
 	};
 	const dockerStep = {
@@ -2929,10 +2964,11 @@ async function generateReleaseCi(ctx) {
 		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: { workflow_dispatch: null },
+		on,
 		...isGitHub && { permissions: { contents: "write" } },
 		jobName: "release",
 		steps
@@ -3285,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.32.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("");
@@ -4293,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})`);
 }
@@ -5103,7 +5159,7 @@ const dockerCheckCommand = defineCommand({
 const main = defineCommand({
 	meta: {
 		name: "bst",
-		version: "0.32.0",
+		version: "0.33.0",
 		description: "Bootstrap and maintain standardized TypeScript project tooling"
 	},
 	subCommands: {
@@ -5119,7 +5175,7 @@ const main = defineCommand({
 		"docker:check": dockerCheckCommand
 	}
 });
-console.log(`@bensandee/tooling v0.32.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.32.0",
+  "version": "0.33.0",
   "description": "CLI tool to bootstrap and maintain standardized TypeScript project tooling",
   "bin": {
     "bst": "./dist/bin.mjs"