@bensandee/tooling 0.19.0 → 0.22.0

package/dist/bin.mjs

@@ -7,7 +7,7 @@ import { existsSync, mkdirSync, readFileSync, readdirSync, rmSync, unlinkSync, w
 import JSON5 from "json5";
 import { parse } from "jsonc-parser";
 import { z } from "zod";
-import { isMap, isSeq, parse as parse$1, parseDocument, stringify } from "yaml";
+import { isMap, isScalar, isSeq, parse as parse$1, parseDocument, stringify } from "yaml";
 import { execSync } from "node:child_process";
 import { FatalError, TransientError, UnexpectedError } from "@bensandee/common";
 import { tmpdir } from "node:os";
@@ -206,6 +206,32 @@ function computeDefaults(targetDir) {
 		detectPackageTypes: true
 	};
 }
+/**
+* List packages that would be published to npm (non-private, have a name).
+* For monorepos, scans packages/ subdirectories. For single repos, checks root package.json.
+* An optional pre-parsed root package.json can be passed to avoid re-reading from disk.
+*/
+function getPublishablePackages(targetDir, structure, rootPackageJson) {
+	if (structure === "monorepo") {
+		const packages = getMonorepoPackages(targetDir);
+		const results = [];
+		for (const pkg of packages) {
+			const pkgJson = readPackageJson(pkg.dir);
+			if (!pkgJson || pkgJson.private || !pkgJson.name) continue;
+			results.push({
+				name: pkgJson.name,
+				dir: pkg.dir
+			});
+		}
+		return results;
+	}
+	const pkg = rootPackageJson ?? readPackageJson(targetDir);
+	if (!pkg || pkg.private || !pkg.name) return [];
+	return [{
+		name: pkg.name,
+		dir: targetDir
+	}];
+}
 /** List packages in a monorepo's packages/ directory. */
 function getMonorepoPackages(targetDir) {
 	const packagesDir = path.join(targetDir, "packages");
@@ -569,6 +595,306 @@ function mergeWithSavedConfig(detected, saved) {
 	};
 }
 //#endregion
+//#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;
+	if (content.includes("yaml-language-server")) return content;
+	return FORGEJO_SCHEMA_COMMENT + content;
+}
+/** 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));
+}
+/**
+* Ensure required commands exist under `pre-commit.commands` in a lefthook config.
+* Only adds missing commands — never modifies existing ones.
+* Returns unchanged content if the file has an opt-out comment or can't be parsed.
+*/
+function mergeLefthookCommands(existing, requiredCommands) {
+	if (isToolingIgnored(existing)) return {
+		content: existing,
+		changed: false
+	};
+	try {
+		const doc = parseDocument(existing);
+		let changed = false;
+		if (!doc.hasIn(["pre-commit", "commands"])) {
+			doc.setIn(["pre-commit", "commands"], requiredCommands);
+			return {
+				content: doc.toString(),
+				changed: true
+			};
+		}
+		const commands = doc.getIn(["pre-commit", "commands"]);
+		if (!isMap(commands)) return {
+			content: existing,
+			changed: false
+		};
+		for (const [name, config] of Object.entries(requiredCommands)) if (!commands.has(name)) {
+			commands.set(name, config);
+			changed = true;
+		}
+		return {
+			content: changed ? doc.toString() : existing,
+			changed
+		};
+	} catch {
+		return {
+			content: existing,
+			changed: false
+		};
+	}
+}
+/**
+* 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.
+*/
+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
+		};
+	}
+}
+//#endregion
+//#region src/generators/deploy-ci.ts
+/** Build a GitHub Actions expression like `${{ expr }}` without triggering no-template-curly-in-string. */
+function actionsExpr$2(expr) {
+	return `\${{ ${expr} }}`;
+}
+function hasEnginesNode$2(ctx) {
+	return typeof ctx.packageJson?.["engines"]?.["node"] === "string";
+}
+function deployWorkflow(ci, nodeVersionYaml) {
+	return `${workflowSchemaComment(ci)}name: Deploy
+on:
+  push:
+    tags:
+      - "v[0-9]+.[0-9]+.[0-9]+"
+
+jobs:
+  deploy:
+    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$2("vars.DOCKER_REGISTRY_HOST")}
+          DOCKER_REGISTRY_NAMESPACE: ${actionsExpr$2("vars.DOCKER_REGISTRY_NAMESPACE")}
+          DOCKER_USERNAME: ${actionsExpr$2("secrets.DOCKER_USERNAME")}
+          DOCKER_PASSWORD: ${actionsExpr$2("secrets.DOCKER_PASSWORD")}
+        run: pnpm exec tooling docker:publish
+`;
+}
+function requiredDeploySteps() {
+	return [
+		{
+			match: { uses: "actions/checkout" },
+			step: { uses: "actions/checkout@v4" }
+		},
+		{
+			match: { uses: "pnpm/action-setup" },
+			step: { uses: "pnpm/action-setup@v4" }
+		},
+		{
+			match: { uses: "actions/setup-node" },
+			step: { uses: "actions/setup-node@v4" }
+		},
+		{
+			match: { run: "pnpm install" },
+			step: { run: "pnpm install --frozen-lockfile" }
+		},
+		{
+			match: { run: "docker:publish" },
+			step: { run: "pnpm exec tooling docker:publish" }
+		}
+	];
+}
+/** Convention paths to check for Dockerfiles. */
+const CONVENTION_DOCKERFILE_PATHS$1 = ["Dockerfile", "docker/Dockerfile"];
+const DockerMapSchema = z.object({ docker: z.record(z.string(), z.unknown()).optional() });
+/** Get names of packages that have Docker builds (by convention or .tooling.json config). */
+function getDockerPackageNames(ctx) {
+	const names = [];
+	const configRaw = ctx.read(".tooling.json");
+	if (configRaw) {
+		const result = DockerMapSchema.safeParse(JSON.parse(configRaw));
+		if (result.success && result.data.docker) names.push(...Object.keys(result.data.docker));
+	}
+	if (ctx.config.structure === "monorepo") {
+		const packages = getMonorepoPackages(ctx.targetDir);
+		for (const pkg of packages) {
+			const dirName = pkg.name.split("/").pop() ?? pkg.name;
+			if (names.includes(dirName)) continue;
+			for (const rel of CONVENTION_DOCKERFILE_PATHS$1) if (ctx.exists(`packages/${dirName}/${rel}`)) {
+				names.push(dirName);
+				break;
+			}
+		}
+	} else for (const rel of CONVENTION_DOCKERFILE_PATHS$1) if (ctx.exists(rel)) {
+		if (!names.includes(ctx.config.name)) names.push(ctx.config.name);
+		break;
+	}
+	return names;
+}
+/** Check whether any Docker packages exist by convention or .tooling.json config. */
+function hasDockerPackages(ctx) {
+	return getDockerPackageNames(ctx).length > 0;
+}
+async function generateDeployCi(ctx) {
+	const filePath = "deploy-ci";
+	if (!hasDockerPackages(ctx) || ctx.config.ci === "none") return {
+		filePath,
+		action: "skipped",
+		description: "Deploy CI workflow not applicable"
+	};
+	const isGitHub = ctx.config.ci === "github";
+	const workflowPath = isGitHub ? ".github/workflows/publish.yml" : ".forgejo/workflows/publish.yml";
+	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 withComment = ensureSchemaComment(merged.content, ctx.config.ci);
+			if (withComment === content) {
+				ctx.write(workflowPath, content);
+				return {
+					filePath: workflowPath,
+					action: "updated",
+					description: "Added missing steps to deploy workflow"
+				};
+			}
+			if (await ctx.confirmOverwrite(workflowPath) === "skip") {
+				if (merged.changed || withComment !== merged.content) {
+					ctx.write(workflowPath, withComment);
+					return {
+						filePath: workflowPath,
+						action: "updated",
+						description: "Added missing steps to deploy workflow"
+					};
+				}
+				return {
+					filePath: workflowPath,
+					action: "skipped",
+					description: "Existing deploy workflow preserved"
+				};
+			}
+			ctx.write(workflowPath, content);
+			return {
+				filePath: workflowPath,
+				action: "updated",
+				description: "Replaced deploy workflow with updated template"
+			};
+		}
+		return {
+			filePath: workflowPath,
+			action: "skipped",
+			description: "Deploy workflow already up to date"
+		};
+	}
+	ctx.write(workflowPath, content);
+	return {
+		filePath: workflowPath,
+		action: "created",
+		description: `Generated ${isGitHub ? "GitHub" : "Forgejo"} Actions deploy workflow`
+	};
+}
+//#endregion
 //#region src/generators/package-json.ts
 const STANDARD_SCRIPTS_SINGLE = {
 	build: "tsdown",
@@ -598,7 +924,9 @@ const MANAGED_SCRIPTS = {
 	check: "checks:run",
 	"ci:check": "pnpm check",
 	"tooling:check": "repo:sync --check",
-	"tooling:sync": "repo:sync"
+	"tooling:sync": "repo:sync",
+	"docker:build": "docker:build",
+	"docker:check": "docker:check"
 };
 /** Deprecated scripts to remove during migration. */
 const DEPRECATED_SCRIPTS = ["tooling:init", "tooling:update"];
@@ -644,9 +972,7 @@ function addReleaseDeps(deps, config) {
 			deps["release-it"] = "18.1.2";
 			if (config.structure === "monorepo") deps["@release-it/bumper"] = "7.0.2";
 			break;
-		case "simple":
-			deps["commit-and-tag-version"] = "12.5.0";
-			break;
+		case "simple": break;
 		case "changesets":
 			deps["@changesets/cli"] = "2.29.4";
 			break;
@@ -657,7 +983,7 @@ function getAddedDevDepNames(config) {
 	const deps = { ...ROOT_DEV_DEPS };
 	if (config.structure !== "monorepo") Object.assign(deps, PER_PACKAGE_DEV_DEPS);
 	deps["@bensandee/config"] = "0.8.2";
-	deps["@bensandee/tooling"] = "0.19.0";
+	deps["@bensandee/tooling"] = "0.22.0";
 	if (config.formatter === "oxfmt") deps["oxfmt"] = "0.35.0";
 	if (config.formatter === "prettier") deps["prettier"] = "3.8.1";
 	addReleaseDeps(deps, config);
@@ -675,10 +1001,14 @@ async function generatePackageJson(ctx) {
 	};
 	if (ctx.config.releaseStrategy === "changesets") allScripts["changeset"] = "changeset";
 	if (ctx.config.releaseStrategy !== "none" && ctx.config.releaseStrategy !== "changesets") allScripts["trigger-release"] = "pnpm exec tooling release:trigger";
+	if (hasDockerPackages(ctx)) {
+		allScripts["docker:build"] = "pnpm exec tooling docker:build";
+		allScripts["docker:check"] = "pnpm exec tooling docker:check";
+	}
 	const devDeps = { ...ROOT_DEV_DEPS };
 	if (!isMonorepo) Object.assign(devDeps, PER_PACKAGE_DEV_DEPS);
 	devDeps["@bensandee/config"] = isWorkspacePackage(ctx, "@bensandee/config") ? "workspace:*" : "0.8.2";
-	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.19.0";
+	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.22.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";
@@ -1111,229 +1441,62 @@ const REQUIRED_ENTRIES = [
 	"dist/",
 	"*.tsbuildinfo",
 	".env",
-	".env.*",
-	"!.env.example"
-];
-/** Tooling-specific entries added during init/update but not required for repo:sync --check. */
-const OPTIONAL_ENTRIES = [".tooling-migrate.md", ".tooling-archived/"];
-const ALL_ENTRIES = [...REQUIRED_ENTRIES, ...OPTIONAL_ENTRIES];
-/** Normalize a gitignore entry for comparison: strip leading `/` and trailing `/`. */
-function normalizeEntry(entry) {
-	let s = entry.trim();
-	if (s.startsWith("/")) s = s.slice(1);
-	if (s.endsWith("/")) s = s.slice(0, -1);
-	return s;
-}
-async function generateGitignore(ctx) {
-	const filePath = ".gitignore";
-	const existing = ctx.read(filePath);
-	if (existing) {
-		const existingNormalized = new Set(existing.split("\n").map(normalizeEntry).filter((line) => line.length > 0));
-		const missing = ALL_ENTRIES.filter((entry) => !existingNormalized.has(normalizeEntry(entry)));
-		if (missing.length === 0) return {
-			filePath,
-			action: "skipped",
-			description: "Already has all standard entries"
-		};
-		const missingRequired = REQUIRED_ENTRIES.filter((entry) => !existingNormalized.has(normalizeEntry(entry)));
-		const updated = existing.trimEnd() + "\n\n# Added by @bensandee/tooling\n" + missing.join("\n") + "\n";
-		ctx.write(filePath, updated);
-		if (missingRequired.length === 0) return {
-			filePath,
-			action: "skipped",
-			description: "Only optional entries missing"
-		};
-		return {
-			filePath,
-			action: "updated",
-			description: `Appended ${String(missing.length)} missing entries`
-		};
-	}
-	ctx.write(filePath, ALL_ENTRIES.join("\n") + "\n");
-	return {
-		filePath,
-		action: "created",
-		description: "Generated .gitignore"
-	};
-}
-//#endregion
-//#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;
-	if (content.includes("yaml-language-server")) return content;
-	return FORGEJO_SCHEMA_COMMENT + content;
-}
-/** 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));
-}
-/**
-* Ensure required commands exist under `pre-commit.commands` in a lefthook config.
-* Only adds missing commands — never modifies existing ones.
-* Returns unchanged content if the file has an opt-out comment or can't be parsed.
-*/
-function mergeLefthookCommands(existing, requiredCommands) {
-	if (isToolingIgnored(existing)) return {
-		content: existing,
-		changed: false
-	};
-	try {
-		const doc = parseDocument(existing);
-		let changed = false;
-		if (!doc.hasIn(["pre-commit", "commands"])) {
-			doc.setIn(["pre-commit", "commands"], requiredCommands);
-			return {
-				content: doc.toString(),
-				changed: true
-			};
-		}
-		const commands = doc.getIn(["pre-commit", "commands"]);
-		if (!isMap(commands)) return {
-			content: existing,
-			changed: false
-		};
-		for (const [name, config] of Object.entries(requiredCommands)) if (!commands.has(name)) {
-			commands.set(name, config);
-			changed = true;
-		}
-		return {
-			content: changed ? doc.toString() : existing,
-			changed
-		};
-	} catch {
-		return {
-			content: existing,
-			changed: false
-		};
-	}
-}
-/**
-* 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.
-*/
-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", doc.createNode(concurrency));
-		return {
-			content: doc.toString(),
-			changed: true
-		};
-	} catch {
-		return {
-			content: existing,
-			changed: false
-		};
-	}
+	".env.*",
+	"!.env.example"
+];
+/** Tooling-specific entries added during init/update but not required for repo:sync --check. */
+const OPTIONAL_ENTRIES = [".tooling-migrate.md", ".tooling-archived/"];
+const ALL_ENTRIES = [...REQUIRED_ENTRIES, ...OPTIONAL_ENTRIES];
+/** Normalize a gitignore entry for comparison: strip leading `/` and trailing `/`. */
+function normalizeEntry(entry) {
+	let s = entry.trim();
+	if (s.startsWith("/")) s = s.slice(1);
+	if (s.endsWith("/")) s = s.slice(0, -1);
+	return s;
 }
-function addWorkflowJob(existing, jobName, jobConfig) {
-	if (isToolingIgnored(existing)) return {
-		content: existing,
-		changed: false
-	};
-	try {
-		const doc = parseDocument(existing);
-		const jobs = doc.getIn(["jobs"]);
-		if (!isMap(jobs)) return {
-			content: existing,
-			changed: false
-		};
-		if (jobs.has(jobName)) return {
-			content: existing,
-			changed: false
+async function generateGitignore(ctx) {
+	const filePath = ".gitignore";
+	const existing = ctx.read(filePath);
+	if (existing) {
+		const existingNormalized = new Set(existing.split("\n").map(normalizeEntry).filter((line) => line.length > 0));
+		const missing = ALL_ENTRIES.filter((entry) => !existingNormalized.has(normalizeEntry(entry)));
+		if (missing.length === 0) return {
+			filePath,
+			action: "skipped",
+			description: "Already has all standard entries"
 		};
-		jobs.set(jobName, doc.createNode(jobConfig));
-		return {
-			content: doc.toString(),
-			changed: true
+		const missingRequired = REQUIRED_ENTRIES.filter((entry) => !existingNormalized.has(normalizeEntry(entry)));
+		const updated = existing.trimEnd() + "\n\n# Added by @bensandee/tooling\n" + missing.join("\n") + "\n";
+		ctx.write(filePath, updated);
+		if (missingRequired.length === 0) return {
+			filePath,
+			action: "skipped",
+			description: "Only optional entries missing"
 		};
-	} catch {
 		return {
-			content: existing,
-			changed: false
+			filePath,
+			action: "updated",
+			description: `Appended ${String(missing.length)} missing entries`
 		};
 	}
+	ctx.write(filePath, ALL_ENTRIES.join("\n") + "\n");
+	return {
+		filePath,
+		action: "created",
+		description: "Generated .gitignore"
+	};
 }
 //#endregion
 //#region src/generators/ci.ts
 /** Build a GitHub Actions expression like `${{ expr }}` without triggering no-template-curly-in-string. */
-function actionsExpr$2(expr) {
+function actionsExpr$1(expr) {
 	return `\${{ ${expr} }}`;
 }
 const CI_CONCURRENCY = {
-	group: `ci-${actionsExpr$2("github.ref")}`,
-	"cancel-in-progress": actionsExpr$2("github.ref != 'refs/heads/main'")
+	group: `ci-${actionsExpr$1("github.ref")}`,
+	"cancel-in-progress": true
 };
-function hasEnginesNode$2(ctx) {
+function hasEnginesNode$1(ctx) {
 	const raw = ctx.read("package.json");
 	if (!raw) return false;
 	return typeof parsePackageJson(raw)?.engines?.["node"] === "string";
@@ -1347,8 +1510,8 @@ ${emailNotifications}on:
   pull_request:
 
 concurrency:
-  group: ci-${actionsExpr$2("github.ref")}
-  cancel-in-progress: ${actionsExpr$2("github.ref != 'refs/heads/main'")}
+  group: ci-${actionsExpr$1("github.ref")}
+  cancel-in-progress: true
 
 jobs:
   check:
@@ -1405,8 +1568,8 @@ async function generateCi(ctx) {
 		description: "CI workflow not requested"
 	};
 	const isGitHub = ctx.config.ci === "github";
-	const nodeVersionYaml = hasEnginesNode$2(ctx) ? "node-version-file: package.json" : "node-version: \"24\"";
-	const filePath = isGitHub ? ".github/workflows/check.yml" : ".forgejo/workflows/check.yml";
+	const nodeVersionYaml = hasEnginesNode$1(ctx) ? "node-version-file: package.json" : "node-version: \"24\"";
+	const filePath = isGitHub ? ".github/workflows/ci.yml" : ".forgejo/workflows/ci.yml";
 	const content = ciWorkflow(nodeVersionYaml, !isGitHub);
 	if (ctx.exists(filePath)) {
 		const existing = ctx.read(filePath);
@@ -1883,13 +2046,13 @@ async function generateChangesets(ctx) {
 //#endregion
 //#region src/generators/release-ci.ts
 /** Build a GitHub Actions expression like `${{ expr }}` without triggering no-template-curly-in-string. */
-function actionsExpr$1(expr) {
+function actionsExpr(expr) {
 	return `\${{ ${expr} }}`;
 }
-function hasEnginesNode$1(ctx) {
+function hasEnginesNode(ctx) {
 	return typeof ctx.packageJson?.["engines"]?.["node"] === "string";
 }
-function commonSteps(nodeVersionYaml) {
+function commonSteps(nodeVersionYaml, publishesNpm) {
 	return `      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
@@ -1897,18 +2060,18 @@ function commonSteps(nodeVersionYaml) {
       - uses: actions/setup-node@v4
         with:
           ${nodeVersionYaml}
-          cache: pnpm
-          registry-url: "https://registry.npmjs.org"
+          cache: pnpm${publishesNpm ? `\n          registry-url: "https://registry.npmjs.org"` : ""}
       - run: pnpm install --frozen-lockfile
       - run: pnpm build`;
 }
-function releaseItWorkflow(ci, nodeVersionYaml) {
+function releaseItWorkflow(ci, nodeVersionYaml, publishesNpm) {
 	const isGitHub = ci === "github";
 	const permissions = isGitHub ? `
 permissions:
   contents: write
 ` : "";
 	const tokenEnv = isGitHub ? `GITHUB_TOKEN: \${{ github.token }}` : `FORGEJO_TOKEN: \${{ secrets.FORGEJO_TOKEN }}`;
+	const npmEnv = publishesNpm ? `\n          NODE_AUTH_TOKEN: \${{ secrets.NPM_TOKEN }}` : "";
 	return `${workflowSchemaComment(ci)}name: Release
 on:
   workflow_dispatch:
@@ -1917,14 +2080,13 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-${commonSteps(nodeVersionYaml)}
+${commonSteps(nodeVersionYaml, publishesNpm)}
       - run: pnpm release-it --ci
         env:
-          ${tokenEnv}
-          NODE_AUTH_TOKEN: \${{ secrets.NPM_TOKEN }}
+          ${tokenEnv}${npmEnv}
 `;
 }
-function commitAndTagVersionWorkflow(ci, nodeVersionYaml) {
+function commitAndTagVersionWorkflow(ci, nodeVersionYaml, publishesNpm) {
 	const isGitHub = ci === "github";
 	const permissions = isGitHub ? `
 permissions:
@@ -1954,83 +2116,42 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-${commonSteps(nodeVersionYaml)}${gitConfigStep}${releaseStep}
+${commonSteps(nodeVersionYaml, publishesNpm)}${gitConfigStep}${releaseStep}
 `;
 }
-function changesetsReleaseJobConfig(ci, nodeVersionYaml) {
-	const isGitHub = ci === "github";
-	const nodeWith = {
-		...nodeVersionYaml.startsWith("node-version-file") ? { "node-version-file": "package.json" } : { "node-version": "24" },
-		cache: "pnpm",
-		"registry-url": "https://registry.npmjs.org"
-	};
-	if (isGitHub) return {
-		needs: "check",
-		if: "github.ref == 'refs/heads/main'",
-		"runs-on": "ubuntu-latest",
-		permissions: {
-			contents: "write",
-			"pull-requests": "write"
-		},
-		steps: [
-			{
-				uses: "actions/checkout@v4",
-				with: { "fetch-depth": 0 }
+/** 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"
 			},
-			{ uses: "pnpm/action-setup@v4" },
-			{
-				uses: "actions/setup-node@v4",
-				with: nodeWith
-			},
-			{ run: "pnpm install --frozen-lockfile" },
-			{ run: "pnpm build" },
-			{
-				uses: "changesets/action@v1",
-				with: {
-					publish: "pnpm changeset publish",
-					version: "pnpm changeset version"
-				},
-				env: {
-					GITHUB_TOKEN: actionsExpr$1("github.token"),
-					NPM_TOKEN: actionsExpr$1("secrets.NPM_TOKEN")
-				}
+			env: {
+				GITHUB_TOKEN: actionsExpr("github.token"),
+				...publishesNpm && { NPM_TOKEN: actionsExpr("secrets.NPM_TOKEN") }
 			}
-		]
+		}
 	};
 	return {
-		needs: "check",
-		if: "github.ref == 'refs/heads/main'",
-		"runs-on": "ubuntu-latest",
-		steps: [
-			{
-				uses: "actions/checkout@v4",
-				with: { "fetch-depth": 0 }
+		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"),
+				FORGEJO_TOKEN: actionsExpr("secrets.FORGEJO_TOKEN"),
+				...publishesNpm && { NODE_AUTH_TOKEN: actionsExpr("secrets.NPM_TOKEN") }
 			},
-			{ uses: "pnpm/action-setup@v4" },
-			{
-				uses: "actions/setup-node@v4",
-				with: nodeWith
-			},
-			{ run: "pnpm install --frozen-lockfile" },
-			{ run: "pnpm build" },
-			{
-				name: "Configure git",
-				run: "git config user.name \"forgejo-actions[bot]\"\ngit config user.email \"forgejo-actions[bot]@noreply.localhost\"\n"
-			},
-			{
-				name: "Release",
-				env: {
-					FORGEJO_SERVER_URL: actionsExpr$1("github.server_url"),
-					FORGEJO_REPOSITORY: actionsExpr$1("github.repository"),
-					FORGEJO_TOKEN: actionsExpr$1("secrets.FORGEJO_TOKEN"),
-					NODE_AUTH_TOKEN: actionsExpr$1("secrets.NPM_TOKEN")
-				},
-				run: "pnpm exec tooling release:changesets"
-			}
-		]
+			run: "pnpm exec tooling release:changesets"
+		}
 	};
 }
-function requiredReleaseSteps(strategy, nodeVersionYaml) {
+function requiredReleaseSteps(strategy, nodeVersionYaml, publishesNpm) {
 	const isNodeVersionFile = nodeVersionYaml.startsWith("node-version-file");
 	const steps = [
 		{
@@ -2051,7 +2172,7 @@ function requiredReleaseSteps(strategy, nodeVersionYaml) {
 				with: {
 					...isNodeVersionFile ? { "node-version-file": "package.json" } : { "node-version": "24" },
 					cache: "pnpm",
-					"registry-url": "https://registry.npmjs.org"
+					...publishesNpm && { "registry-url": "https://registry.npmjs.org" }
 				}
 			}
 		},
@@ -2086,44 +2207,33 @@ function requiredReleaseSteps(strategy, nodeVersionYaml) {
 	}
 	return steps;
 }
-function buildWorkflow(strategy, ci, nodeVersionYaml) {
+function buildWorkflow(strategy, ci, nodeVersionYaml, publishesNpm) {
 	switch (strategy) {
-		case "release-it": return releaseItWorkflow(ci, nodeVersionYaml);
-		case "simple": return commitAndTagVersionWorkflow(ci, nodeVersionYaml);
+		case "release-it": return releaseItWorkflow(ci, nodeVersionYaml, publishesNpm);
+		case "simple": return commitAndTagVersionWorkflow(ci, nodeVersionYaml, publishesNpm);
 		default: return null;
 	}
 }
-function generateChangesetsReleaseCi(ctx) {
-	const checkPath = ctx.config.ci === "github" ? ".github/workflows/check.yml" : ".forgejo/workflows/check.yml";
-	const nodeVersionYaml = hasEnginesNode$1(ctx) ? "node-version-file: package.json" : "node-version: \"24\"";
-	const existing = ctx.read(checkPath);
+function generateChangesetsReleaseCi(ctx, publishesNpm) {
+	const ciPath = ctx.config.ci === "github" ? ".github/workflows/ci.yml" : ".forgejo/workflows/ci.yml";
+	const existing = ctx.read(ciPath);
 	if (!existing) return {
-		filePath: checkPath,
+		filePath: ciPath,
 		action: "skipped",
 		description: "CI workflow not found — run check generator first"
 	};
-	const addResult = addWorkflowJob(existing, "release", changesetsReleaseJobConfig(ctx.config.ci, nodeVersionYaml));
-	if (addResult.changed) {
-		const withComment = ensureSchemaComment(addResult.content, ctx.config.ci);
-		ctx.write(checkPath, withComment);
-		return {
-			filePath: checkPath,
-			action: "updated",
-			description: "Added release job to CI workflow"
-		};
-	}
-	const merged = mergeWorkflowSteps(existing, "release", requiredReleaseSteps("changesets", nodeVersionYaml));
+	const merged = mergeWorkflowSteps(existing, "check", [changesetsReleaseStep(ctx.config.ci, publishesNpm)]);
 	if (!merged.changed) return {
-		filePath: checkPath,
+		filePath: ciPath,
 		action: "skipped",
-		description: "Release job in CI workflow already up to date"
+		description: "Release step in CI workflow already up to date"
 	};
 	const withComment = ensureSchemaComment(merged.content, ctx.config.ci);
-	ctx.write(checkPath, withComment);
+	ctx.write(ciPath, withComment);
 	return {
-		filePath: checkPath,
+		filePath: ciPath,
 		action: "updated",
-		description: "Added missing steps to release job in CI workflow"
+		description: "Added release step to CI workflow"
 	};
 }
 async function generateReleaseCi(ctx) {
@@ -2133,11 +2243,12 @@ async function generateReleaseCi(ctx) {
 		action: "skipped",
 		description: "Release CI workflow not applicable"
 	};
-	if (ctx.config.releaseStrategy === "changesets") return generateChangesetsReleaseCi(ctx);
+	const publishesNpm = getPublishablePackages(ctx.targetDir, ctx.config.structure, ctx.packageJson).length > 0;
+	if (ctx.config.releaseStrategy === "changesets") return generateChangesetsReleaseCi(ctx, publishesNpm);
 	const isGitHub = ctx.config.ci === "github";
 	const workflowPath = isGitHub ? ".github/workflows/release.yml" : ".forgejo/workflows/release.yml";
-	const nodeVersionYaml = hasEnginesNode$1(ctx) ? "node-version-file: package.json" : "node-version: \"24\"";
-	const content = buildWorkflow(ctx.config.releaseStrategy, ctx.config.ci, nodeVersionYaml);
+	const nodeVersionYaml = hasEnginesNode(ctx) ? "node-version-file: package.json" : "node-version: \"24\"";
+	const content = buildWorkflow(ctx.config.releaseStrategy, ctx.config.ci, nodeVersionYaml, publishesNpm);
 	if (!content) return {
 		filePath,
 		action: "skipped",
@@ -2151,7 +2262,7 @@ async function generateReleaseCi(ctx) {
 				action: "skipped",
 				description: "Release workflow already up to date"
 			};
-			const merged = mergeWorkflowSteps(existing, "release", requiredReleaseSteps(ctx.config.releaseStrategy, nodeVersionYaml));
+			const merged = mergeWorkflowSteps(existing, "release", requiredReleaseSteps(ctx.config.releaseStrategy, nodeVersionYaml, publishesNpm));
 			const withComment = ensureSchemaComment(merged.content, ctx.config.ci);
 			if (withComment === content) {
 				ctx.write(workflowPath, content);
@@ -2452,148 +2563,6 @@ async function generateVscodeSettings(ctx) {
 	return results;
 }
 //#endregion
-//#region src/generators/deploy-ci.ts
-/** Build a GitHub Actions expression like `${{ expr }}` without triggering no-template-curly-in-string. */
-function actionsExpr(expr) {
-	return `\${{ ${expr} }}`;
-}
-function hasEnginesNode(ctx) {
-	return typeof ctx.packageJson?.["engines"]?.["node"] === "string";
-}
-function deployWorkflow(ci, nodeVersionYaml) {
-	return `${workflowSchemaComment(ci)}name: Deploy
-on:
-  push:
-    tags:
-      - "v[0-9]+.[0-9]+.[0-9]+"
-
-jobs:
-  deploy:
-    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 tooling docker:publish
-`;
-}
-function requiredDeploySteps() {
-	return [
-		{
-			match: { uses: "actions/checkout" },
-			step: { uses: "actions/checkout@v4" }
-		},
-		{
-			match: { uses: "pnpm/action-setup" },
-			step: { uses: "pnpm/action-setup@v4" }
-		},
-		{
-			match: { uses: "actions/setup-node" },
-			step: { uses: "actions/setup-node@v4" }
-		},
-		{
-			match: { run: "pnpm install" },
-			step: { run: "pnpm install --frozen-lockfile" }
-		},
-		{
-			match: { run: "docker:publish" },
-			step: { run: "pnpm exec tooling docker:publish" }
-		}
-	];
-}
-/** Convention paths to check for Dockerfiles. */
-const CONVENTION_DOCKERFILE_PATHS$1 = ["Dockerfile", "docker/Dockerfile"];
-const DockerMapSchema = z.object({ docker: z.record(z.string(), z.unknown()).optional() });
-/** Check whether any Docker packages exist by convention or .tooling.json config. */
-function hasDockerPackages(ctx) {
-	const configRaw = ctx.read(".tooling.json");
-	if (configRaw) {
-		const result = DockerMapSchema.safeParse(JSON.parse(configRaw));
-		if (result.success && result.data.docker && Object.keys(result.data.docker).length > 0) return true;
-	}
-	if (ctx.config.structure === "monorepo") {
-		const packages = getMonorepoPackages(ctx.targetDir);
-		for (const pkg of packages) {
-			const dirName = pkg.name.split("/").pop() ?? pkg.name;
-			for (const rel of CONVENTION_DOCKERFILE_PATHS$1) if (ctx.exists(`packages/${dirName}/${rel}`)) return true;
-		}
-	} else for (const rel of CONVENTION_DOCKERFILE_PATHS$1) if (ctx.exists(rel)) return true;
-	return false;
-}
-async function generateDeployCi(ctx) {
-	const filePath = "deploy-ci";
-	if (!hasDockerPackages(ctx) || ctx.config.ci === "none") return {
-		filePath,
-		action: "skipped",
-		description: "Deploy CI workflow not applicable"
-	};
-	const isGitHub = ctx.config.ci === "github";
-	const workflowPath = isGitHub ? ".github/workflows/publish.yml" : ".forgejo/workflows/publish.yml";
-	const nodeVersionYaml = hasEnginesNode(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 withComment = ensureSchemaComment(merged.content, ctx.config.ci);
-			if (withComment === content) {
-				ctx.write(workflowPath, content);
-				return {
-					filePath: workflowPath,
-					action: "updated",
-					description: "Added missing steps to deploy workflow"
-				};
-			}
-			if (await ctx.confirmOverwrite(workflowPath) === "skip") {
-				if (merged.changed || withComment !== merged.content) {
-					ctx.write(workflowPath, withComment);
-					return {
-						filePath: workflowPath,
-						action: "updated",
-						description: "Added missing steps to deploy workflow"
-					};
-				}
-				return {
-					filePath: workflowPath,
-					action: "skipped",
-					description: "Existing deploy workflow preserved"
-				};
-			}
-			ctx.write(workflowPath, content);
-			return {
-				filePath: workflowPath,
-				action: "updated",
-				description: "Replaced deploy workflow with updated template"
-			};
-		}
-		return {
-			filePath: workflowPath,
-			action: "skipped",
-			description: "Deploy workflow already up to date"
-		};
-	}
-	ctx.write(workflowPath, content);
-	return {
-		filePath: workflowPath,
-		action: "created",
-		description: `Generated ${isGitHub ? "GitHub" : "Forgejo"} Actions deploy workflow`
-	};
-}
-//#endregion
 //#region src/generators/pipeline.ts
 /** Run all generators sequentially and return their results. */
 async function runGenerators(ctx) {
@@ -2790,6 +2759,16 @@ function generateMigratePrompt(results, config, detected) {
 }
 //#endregion
 //#region src/commands/repo-init.ts
+/** Log what was detected so the user understands generator decisions. */
+function logDetectionSummary(ctx) {
+	const dockerNames = getDockerPackageNames(ctx);
+	if (dockerNames.length > 0) p.log.info(`Detected Docker packages: ${dockerNames.join(", ")}`);
+	if (ctx.config.releaseStrategy !== "none") {
+		const publishable = getPublishablePackages(ctx.targetDir, ctx.config.structure, ctx.packageJson);
+		if (publishable.length > 0) p.log.info(`Will publish npm packages: ${publishable.map((pkg) => pkg.name).join(", ")}`);
+		else p.log.info("No publishable npm packages — npm registry setup will be skipped");
+	}
+}
 async function runInit(config, options = {}) {
 	const detected = detectProject(config.targetDir);
 	const s = p.spinner();
@@ -2809,6 +2788,7 @@ async function runInit(config, options = {}) {
 		if (p.isCancel(result)) return "skip";
 		return result;
 	}));
+	logDetectionSummary(ctx);
 	s.start("Generating configuration files...");
 	const results = await runGenerators(ctx);
 	const alreadyArchived = new Set(results.filter((r) => r.action === "archived").map((r) => r.filePath));
@@ -2819,8 +2799,7 @@ async function runInit(config, options = {}) {
 	});
 	const created = results.filter((r) => r.action === "created");
 	const updated = results.filter((r) => r.action === "updated");
-	const archived = results.filter((r) => r.action === "archived");
-	if (!(created.length > 0 || updated.length > 0 || archived.length > 0) && options.noPrompt) {
+	if (!(created.length > 0 || updated.length > 0 || archivedFiles.length > 0) && options.noPrompt) {
 		s.stop("Repository is up to date.");
 		return results;
 	}
@@ -2834,7 +2813,6 @@ async function runInit(config, options = {}) {
 	const summaryLines = [];
 	if (created.length > 0) summaryLines.push(`Created: ${created.map((r) => r.filePath).join(", ")}`);
 	if (updated.length > 0) summaryLines.push(`Updated: ${updated.map((r) => r.filePath).join(", ")}`);
-	if (archived.length > 0) summaryLines.push(`Archived: ${archived.map((r) => r.filePath).join(", ")}`);
 	p.note(summaryLines.join("\n"), "Summary");
 	if (!options.noPrompt) {
 		const prompt = generateMigratePrompt(results, config, detected);
@@ -2929,6 +2907,7 @@ async function runCheck(targetDir) {
 	const saved = loadToolingConfig(targetDir);
 	const detected = buildDefaultConfig(targetDir, {});
 	const { ctx, pendingWrites } = createDryRunContext(saved ? mergeWithSavedConfig(detected, saved) : detected);
+	logDetectionSummary(ctx);
 	const actionable = (await runGenerators(ctx)).filter((r) => {
 		if (r.action !== "created" && r.action !== "updated") return false;
 		const newContent = pendingWrites.get(r.filePath);
@@ -3543,8 +3522,21 @@ function buildReleaseConfig(flags) {
 		verbose: flags.verbose ?? false
 	};
 }
+/** Resolve the current branch from CI env vars or git. */
+function getCurrentBranch(executor, cwd) {
+	const ref = process.env["GITHUB_REF"];
+	if (ref?.startsWith("refs/heads/")) return ref.slice(11);
+	return executor.exec("git rev-parse --abbrev-ref HEAD", { cwd }).stdout.trim();
+}
 /** Core release logic — testable with a mock executor. */
 async function runRelease(config, executor) {
+	const branch = getCurrentBranch(executor, config.cwd);
+	if (branch !== "main") {
+		debug$1(config, `Skipping release on non-main branch: ${branch}`);
+		return { mode: "none" };
+	}
+	executor.exec("git config user.name \"forgejo-actions[bot]\"", { cwd: config.cwd });
+	executor.exec("git config user.email \"forgejo-actions[bot]@noreply.localhost\"", { cwd: config.cwd });
 	const changesetFiles = executor.listChangesetFiles(config.cwd);
 	debug$1(config, `Changeset files found: ${changesetFiles.length > 0 ? changesetFiles.join(", ") : "(none)"}`);
 	if (changesetFiles.length > 0) {
@@ -3845,7 +3837,7 @@ const CHECKS = [
 	},
 	{ name: "knip" },
 	{ name: "tooling:check" },
-	{ name: "image:check" }
+	{ name: "docker:check" }
 ];
 function defaultGetScripts(targetDir) {
 	try {
@@ -3912,7 +3904,7 @@ function runRunChecks(targetDir, options = {}) {
 const runChecksCommand = defineCommand({
 	meta: {
 		name: "checks:run",
-		description: "Run all standard checks (build, typecheck, lint, test, format, knip, tooling:check, image:check)"
+		description: "Run all standard checks (build, typecheck, lint, test, format, knip, tooling:check, docker:check)"
 	},
 	args: {
 		dir: {
@@ -3922,7 +3914,7 @@ const runChecksCommand = defineCommand({
 		},
 		skip: {
 			type: "string",
-			description: "Comma-separated list of checks to skip (build, typecheck, lint, test, format, knip, tooling:check, image:check)",
+			description: "Comma-separated list of checks to skip (build, typecheck, lint, test, format, knip, tooling:check, docker:check)",
 			required: false
 		},
 		add: {
@@ -4313,6 +4305,7 @@ const ComposePortSchema = z.union([z.string(), z.object({
 	target: z.union([z.string(), z.number()]).optional()
 }).loose()]);
 const ComposeServiceSchema = z.object({
+	image: z.string().optional(),
 	ports: z.array(ComposePortSchema).optional(),
 	healthcheck: z.unknown().optional()
 }).loose();
@@ -4387,6 +4380,7 @@ function parseComposeServices(cwd, composeFiles) {
 			}
 			serviceMap.set(name, {
 				name,
+				image: existing?.image ?? service.image,
 				hostPort,
 				hasHealthcheck: existing?.hasHealthcheck ?? service.healthcheck !== void 0
 			});
@@ -4394,6 +4388,15 @@ function parseComposeServices(cwd, composeFiles) {
 	}
 	return [...serviceMap.values()];
 }
+/** Extract deduplicated bare image names (without tags) from parsed services. */
+function extractComposeImageNames(services) {
+	const names = /* @__PURE__ */ new Set();
+	for (const service of services) if (service.image) {
+		const bare = service.image.split(":")[0];
+		if (bare) names.add(bare);
+	}
+	return [...names];
+}
 /** Generate health checks from parsed services: services with exposed ports get HTTP checks, unless they define a compose-level healthcheck. */
 function deriveHealthChecks(services) {
 	return services.filter((s) => s.hostPort !== void 0 && !s.hasHealthcheck).map((s) => ({
@@ -4454,6 +4457,26 @@ function computeCheckDefaults(cwd) {
 		healthChecks: healthChecks.length > 0 ? healthChecks : void 0
 	};
 }
+/** Create a DockerFileReader backed by the real filesystem. */
+function createFileReader() {
+	return {
+		listPackageDirs(cwd) {
+			const packagesDir = path.join(cwd, "packages");
+			try {
+				return readdirSync(packagesDir, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => entry.name);
+			} catch {
+				return [];
+			}
+		},
+		readFile(filePath) {
+			try {
+				return readFileSync(filePath, "utf-8");
+			} catch {
+				return null;
+			}
+		}
+	};
+}
 //#endregion
 //#region src/commands/docker-check.ts
 /** Convert declarative health checks to functional ones. */
@@ -4509,7 +4532,18 @@ const dockerCheckCommand = defineCommand({
 		}
 		if (!defaults.services || defaults.services.length === 0) throw new FatalError("No services found in compose files.");
 		const composeCwd = defaults.composeCwd ?? cwd;
-		const tempOverlayPath = writeTempOverlay(generateCheckOverlay(parseComposeServices(composeCwd, defaults.composeFiles)));
+		const services = parseComposeServices(composeCwd, defaults.composeFiles);
+		const fileReader = createFileReader();
+		const rootPkgRaw = fileReader.readFile(path.join(cwd, "package.json"));
+		if (rootPkgRaw) {
+			const rootPkg = parsePackageJson(rootPkgRaw);
+			if (rootPkg?.name) {
+				const dockerPackages = detectDockerPackages(fileReader, cwd, rootPkg.name);
+				const composeImages = extractComposeImageNames(services);
+				for (const pkg of dockerPackages) if (!composeImages.some((img) => img === pkg.imageName || img.endsWith(`/${pkg.imageName}`))) warn(`Docker package "${pkg.dir}" (image: ${pkg.imageName}) is not referenced in any compose service.`);
+			}
+		}
+		const tempOverlayPath = writeTempOverlay(generateCheckOverlay(services));
 		const composeFiles = [
 			...defaults.composeFiles,
 			tempOverlayPath,
@@ -4543,7 +4577,7 @@ const dockerCheckCommand = defineCommand({
 const main = defineCommand({
 	meta: {
 		name: "tooling",
-		version: "0.19.0",
+		version: "0.22.0",
 		description: "Bootstrap and maintain standardized TypeScript project tooling"
 	},
 	subCommands: {
@@ -4559,7 +4593,7 @@ const main = defineCommand({
 		"docker:check": dockerCheckCommand
 	}
 });
-console.log(`@bensandee/tooling v0.19.0`);
+console.log(`@bensandee/tooling v0.22.0`);
 runMain(main);
 //#endregion
 export {};

package/package.json

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