@bensandee/tooling 0.23.0 → 0.25.0

package/dist/bin.mjs

@@ -22,7 +22,7 @@ const LEGACY_TOOLS = [
 //#endregion
 //#region src/utils/json.ts
 const StringRecord = z.record(z.string(), z.string());
-const PackageJsonSchema = z.object({
+const PackageJsonSchema = z.looseObject({
 	name: z.string().optional(),
 	version: z.string().optional(),
 	private: z.boolean().optional(),
@@ -35,20 +35,21 @@ const PackageJsonSchema = z.object({
 	main: z.string().optional(),
 	types: z.string().optional(),
 	typings: z.string().optional(),
-	engines: StringRecord.optional()
-}).loose();
-const TsconfigSchema = z.object({
+	engines: StringRecord.optional(),
+	repository: z.union([z.string(), z.looseObject({ url: z.string() })]).optional()
+});
+const TsconfigSchema = z.looseObject({
 	extends: z.union([z.string(), z.array(z.string())]).optional(),
 	include: z.array(z.string()).optional(),
 	exclude: z.array(z.string()).optional(),
 	files: z.array(z.string()).optional(),
-	references: z.array(z.object({ path: z.string() }).loose()).optional(),
+	references: z.array(z.looseObject({ path: z.string() })).optional(),
 	compilerOptions: z.record(z.string(), z.unknown()).optional()
-}).loose();
-const RenovateSchema = z.object({
+});
+const RenovateSchema = z.looseObject({
 	$schema: z.string().optional(),
 	extends: z.array(z.string()).optional()
-}).loose();
+});
 /** Parse a JSONC string as a tsconfig.json. Returns a typed object with `{}` fallback on failure. */
 function parseTsconfig(raw) {
 	const result = TsconfigSchema.safeParse(parse(raw));
@@ -63,7 +64,7 @@ function parseRenovateJson(raw) {
 		return {};
 	}
 }
-const ChangesetConfigSchema = z.object({ commit: z.union([z.boolean(), z.string()]).optional() }).loose();
+const ChangesetConfigSchema = z.looseObject({ commit: z.union([z.boolean(), z.string()]).optional() });
 /** Parse a JSON string as a .changeset/config.json. Returns `undefined` on failure. */
 function parseChangesetConfig(raw) {
 	try {
@@ -108,6 +109,7 @@ function detectProject(targetDir) {
 		hasReleaseItConfig: exists(".release-it.json") || exists(".release-it.yaml") || exists(".release-it.toml"),
 		hasSimpleReleaseConfig: exists(".versionrc") || exists(".versionrc.json") || exists(".versionrc.js"),
 		hasChangesetsConfig: exists(".changeset/config.json"),
+		hasRepositoryField: !!readPackageJson(targetDir)?.repository,
 		legacyConfigs: detectLegacyConfigs(targetDir)
 	};
 }
@@ -981,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.23.0";
+	deps["@bensandee/tooling"] = "0.25.0";
 	if (config.formatter === "oxfmt") deps["oxfmt"] = "0.35.0";
 	if (config.formatter === "prettier") deps["prettier"] = "3.8.1";
 	addReleaseDeps(deps, config);
@@ -1006,7 +1008,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.8.2";
-	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.23.0";
+	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.25.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";
@@ -1894,7 +1896,8 @@ function buildSettings(ctx) {
 		instructions: [
 			"Use pnpm, not npm/yarn/npx. Run binaries with `pnpm exec`.",
 			"No typecasts (as/any). Use zod schemas, type guards, or narrowing instead.",
-			"Fix lint violations instead of suppressing them. Only add disable comments when suppression is genuinely the best option."
+			"Fix lint violations instead of suppressing them. Only add disable comments when suppression is genuinely the best option.",
+			"Prefer extensionless imports; if an extension is required, use .ts over .js."
 		],
 		enabledPlugins,
 		extraKnownMarketplaces
@@ -2475,7 +2478,7 @@ const SCHEMA_NPM_PATH = "@bensandee/config/schemas/forgejo-workflow.schema.json"
 const SCHEMA_LOCAL_PATH = ".vscode/forgejo-workflow.schema.json";
 const SETTINGS_PATH = ".vscode/settings.json";
 const SCHEMA_GLOB = ".forgejo/workflows/*.{yml,yaml}";
-const VscodeSettingsSchema = z.object({ "yaml.schemas": z.record(z.string(), z.unknown()).default({}) }).loose();
+const VscodeSettingsSchema = z.looseObject({ "yaml.schemas": z.record(z.string(), z.unknown()).default({}) });
 function readSchemaFromNodeModules(targetDir) {
 	const candidate = path.join(targetDir, "node_modules", SCHEMA_NPM_PATH);
 	if (!existsSync(candidate)) return void 0;
@@ -2599,54 +2602,349 @@ async function runGenerators(ctx) {
 	return results;
 }
 //#endregion
-//#region src/generators/migrate-prompt.ts
+//#region src/release/docker.ts
+const ToolingDockerMapSchema = z.record(z.string(), z.object({
+	dockerfile: z.string(),
+	context: z.string().default(".")
+}));
+const ToolingConfigDockerSchema = z.object({ docker: ToolingDockerMapSchema.optional() });
+const PackageInfoSchema = z.object({
+	name: z.string().optional(),
+	version: z.string().optional()
+});
+/** Read the docker map from .tooling.json. Returns empty record if missing or invalid. */
+function loadDockerMap(executor, cwd) {
+	const configPath = path.join(cwd, ".tooling.json");
+	const raw = executor.readFile(configPath);
+	if (!raw) return {};
+	try {
+		const result = ToolingConfigDockerSchema.safeParse(JSON.parse(raw));
+		if (!result.success || !result.data.docker) return {};
+		return result.data.docker;
+	} catch (_error) {
+		return {};
+	}
+}
+/** Read name and version from a package's package.json. */
+function readPackageInfo(executor, packageJsonPath) {
+	const raw = executor.readFile(packageJsonPath);
+	if (!raw) return {
+		name: void 0,
+		version: void 0
+	};
+	try {
+		const result = PackageInfoSchema.safeParse(JSON.parse(raw));
+		if (!result.success) return {
+			name: void 0,
+			version: void 0
+		};
+		return {
+			name: result.data.name,
+			version: result.data.version
+		};
+	} catch (_error) {
+		return {
+			name: void 0,
+			version: void 0
+		};
+	}
+}
+/** Convention paths to check for Dockerfiles in a package directory. */
+const CONVENTION_DOCKERFILE_PATHS = ["Dockerfile", "docker/Dockerfile"];
 /**
-* Generate a context-aware AI migration prompt based on what the CLI did.
-* This prompt can be pasted into Claude Code (or similar) to finish the migration.
+* Find a Dockerfile at convention paths for a monorepo package.
+* Checks packages/{dir}/Dockerfile and packages/{dir}/docker/Dockerfile.
 */
-function generateMigratePrompt(results, config, detected) {
-	const sections = [];
-	sections.push("# Migration Prompt");
-	sections.push("");
-	sections.push("The following prompt was generated by `@bensandee/tooling repo:sync`. Paste it into Claude Code or another AI assistant to finish migrating this repository.");
-	sections.push("");
-	sections.push("> **Tip:** Before starting, run `/init` in Claude Code to generate a `CLAUDE.md` that gives the AI a complete picture of your repository's structure, conventions, and build commands.");
-	sections.push("");
-	sections.push("## What was changed");
-	sections.push("");
-	const created = results.filter((r) => r.action === "created");
-	const updated = results.filter((r) => r.action === "updated");
-	const skipped = results.filter((r) => r.action === "skipped");
-	const archived = results.filter((r) => r.action === "archived");
-	if (created.length > 0) {
-		sections.push("**Created:**");
-		for (const r of created) sections.push(`- \`${r.filePath}\` — ${r.description}`);
-		sections.push("");
+function findConventionDockerfile(executor, cwd, dir) {
+	for (const rel of CONVENTION_DOCKERFILE_PATHS) {
+		const dockerfilePath = `packages/${dir}/${rel}`;
+		if (executor.readFile(path.join(cwd, dockerfilePath)) !== null) return {
+			dockerfile: dockerfilePath,
+			context: "."
+		};
 	}
-	if (updated.length > 0) {
-		sections.push("**Updated:**");
-		for (const r of updated) sections.push(`- \`${r.filePath}\` — ${r.description}`);
-		sections.push("");
+}
+/**
+* Find a Dockerfile at convention paths for a single-package repo.
+* Checks Dockerfile and docker/Dockerfile at the project root.
+*/
+function findRootDockerfile(executor, cwd) {
+	for (const rel of CONVENTION_DOCKERFILE_PATHS) if (executor.readFile(path.join(cwd, rel)) !== null) return {
+		dockerfile: rel,
+		context: "."
+	};
+}
+/**
+* Discover Docker packages by convention and merge with .tooling.json overrides.
+*
+* Convention: any package with a Dockerfile or docker/Dockerfile is a Docker package.
+* For monorepos, scans packages/{name}/. For single-package repos, scans the root.
+* The docker map in .tooling.json overrides convention-discovered config and can add
+* packages at non-standard locations.
+*
+* Image names are derived from {root-name}-{package-name} using each package's package.json name.
+* Versions are read from each package's own package.json.
+*/
+function detectDockerPackages(executor, cwd, repoName) {
+	const overrides = loadDockerMap(executor, cwd);
+	const packageDirs = executor.listPackageDirs(cwd);
+	const packages = [];
+	const seen = /* @__PURE__ */ new Set();
+	if (packageDirs.length > 0) {
+		for (const dir of packageDirs) {
+			const convention = findConventionDockerfile(executor, cwd, dir);
+			const docker = overrides[dir] ?? convention;
+			if (docker) {
+				const { name, version } = readPackageInfo(executor, path.join(cwd, "packages", dir, "package.json"));
+				packages.push({
+					dir,
+					imageName: `${repoName}-${name ?? dir}`,
+					version,
+					docker
+				});
+				seen.add(dir);
+			}
+		}
+		for (const [dir, docker] of Object.entries(overrides)) if (!seen.has(dir)) {
+			const { name, version } = readPackageInfo(executor, path.join(cwd, "packages", dir, "package.json"));
+			packages.push({
+				dir,
+				imageName: `${repoName}-${name ?? dir}`,
+				version,
+				docker
+			});
+		}
+	} else {
+		const convention = findRootDockerfile(executor, cwd);
+		const docker = overrides["."] ?? convention;
+		if (docker) {
+			const { name, version } = readPackageInfo(executor, path.join(cwd, "package.json"));
+			packages.push({
+				dir: ".",
+				imageName: name ?? repoName,
+				version,
+				docker
+			});
+		}
 	}
-	if (archived.length > 0) {
-		sections.push("**Archived:**");
-		for (const r of archived) sections.push(`- \`${r.filePath}\` — ${r.description}`);
-		sections.push("");
+	return packages;
+}
+/**
+* Read docker config for a single package, checking convention paths first,
+* then .tooling.json overrides. Used by the per-package image:build script.
+*/
+function readSinglePackageDocker(executor, cwd, packageDir, repoName) {
+	const dir = path.basename(path.resolve(cwd, packageDir));
+	const convention = findConventionDockerfile(executor, cwd, dir);
+	const docker = loadDockerMap(executor, cwd)[dir] ?? convention;
+	if (!docker) throw new FatalError(`No Dockerfile found for package "${dir}" (checked convention paths and .tooling.json)`);
+	const { name, version } = readPackageInfo(executor, path.join(cwd, "packages", dir, "package.json"));
+	return {
+		dir,
+		imageName: `${repoName}-${name ?? dir}`,
+		version,
+		docker
+	};
+}
+/** Parse semver version string into major, minor, patch components. */
+function parseSemver(version) {
+	const clean = version.replace(/^v/, "");
+	const match = /^(\d+)\.(\d+)\.(\d+)/.exec(clean);
+	if (!match?.[1] || !match[2] || !match[3]) throw new FatalError(`Invalid semver version: ${version}`);
+	return {
+		major: Number(match[1]),
+		minor: Number(match[2]),
+		patch: Number(match[3])
+	};
+}
+/** Generate semver tag variants: latest, vX.Y.Z, vX.Y, vX */
+function generateTags(version) {
+	const { major, minor, patch } = parseSemver(version);
+	return [
+		"latest",
+		`v${major}.${minor}.${patch}`,
+		`v${major}.${minor}`,
+		`v${major}`
+	];
+}
+/** Build the full image reference: namespace/imageName:tag */
+function imageRef(namespace, imageName, tag) {
+	return `${namespace}/${imageName}:${tag}`;
+}
+function log$1(message) {
+	console.log(message);
+}
+function debug$1(verbose, message) {
+	if (verbose) console.log(`[debug] ${message}`);
+}
+/** Read the repo name from root package.json. */
+function readRepoName(executor, cwd) {
+	const rootPkgRaw = executor.readFile(path.join(cwd, "package.json"));
+	if (!rootPkgRaw) throw new FatalError("No package.json found in project root");
+	const repoName = parsePackageJson(rootPkgRaw)?.name;
+	if (!repoName) throw new FatalError("Root package.json must have a name field");
+	return repoName;
+}
+/** Build a single docker image from its config. Paths are resolved relative to cwd. */
+function buildImage(executor, pkg, cwd, verbose, extraArgs) {
+	const dockerfilePath = path.resolve(cwd, pkg.docker.dockerfile);
+	const contextPath = path.resolve(cwd, pkg.docker.context);
+	const command = [
+		"docker build",
+		`-f ${dockerfilePath}`,
+		`-t ${pkg.imageName}:latest`,
+		...extraArgs,
+		contextPath
+	].join(" ");
+	debug$1(verbose, `Running: ${command}`);
+	const buildResult = executor.exec(command);
+	debug$1(verbose, `Build stdout: ${buildResult.stdout}`);
+	if (buildResult.exitCode !== 0) throw new FatalError(`docker build failed for ${pkg.dir} (exit ${buildResult.exitCode}): ${buildResult.stderr}`);
+}
+/**
+* Detect packages with docker config in .tooling.json and build each one.
+* Runs `docker build -f <dockerfile> -t <image-name>:latest <context>` for each package.
+* Dockerfile and context paths are resolved relative to the project root.
+*
+* When `packageDir` is set, builds only that single package (for use as an image:build script).
+*/
+function runDockerBuild(executor, config) {
+	const repoName = readRepoName(executor, config.cwd);
+	if (config.packageDir) {
+		const pkg = readSinglePackageDocker(executor, config.cwd, config.packageDir, repoName);
+		log$1(`Building image for ${pkg.dir} (${pkg.imageName}:latest)...`);
+		buildImage(executor, pkg, config.cwd, config.verbose, config.extraArgs);
+		log$1(`Built ${pkg.imageName}:latest`);
+		return { packages: [pkg] };
 	}
-	if (skipped.length > 0) {
-		sections.push("**Skipped (review these):**");
-		for (const r of skipped) sections.push(`- \`${r.filePath}\` — ${r.description}`);
-		sections.push("");
+	const packages = detectDockerPackages(executor, config.cwd, repoName);
+	if (packages.length === 0) {
+		log$1("No packages with docker config found");
+		return { packages: [] };
 	}
-	sections.push("## Migration tasks");
-	sections.push("");
-	const legacyToRemove = detected.legacyConfigs.filter((legacy) => !(legacy.tool === "prettier" && config.formatter === "prettier"));
-	if (legacyToRemove.length > 0) {
-		sections.push("### Remove legacy tooling");
-		sections.push("");
-		for (const legacy of legacyToRemove) {
-			const replacement = {
-				eslint: "oxlint",
+	log$1(`Found ${packages.length} Docker package(s): ${packages.map((p) => p.dir).join(", ")}`);
+	for (const pkg of packages) {
+		log$1(`Building image for ${pkg.dir} (${pkg.imageName}:latest)...`);
+		buildImage(executor, pkg, config.cwd, config.verbose, config.extraArgs);
+	}
+	log$1(`Built ${packages.length} image(s)`);
+	return { packages };
+}
+/**
+* Run the full Docker publish pipeline:
+* 1. Build all images via runDockerBuild
+* 2. Login to registry
+* 3. Tag each image with semver variants from its own package.json version
+* 4. Push all tags
+* 5. Logout from registry
+*/
+function runDockerPublish(executor, config) {
+	const { packages } = runDockerBuild(executor, {
+		cwd: config.cwd,
+		packageDir: void 0,
+		verbose: config.verbose,
+		extraArgs: []
+	});
+	if (packages.length === 0) return {
+		packages: [],
+		tags: []
+	};
+	for (const pkg of packages) if (!pkg.version) throw new FatalError(`Package ${pkg.dir} has docker config but no version in package.json`);
+	if (!config.dryRun) {
+		log$1(`Logging in to ${config.registryHost}...`);
+		const loginResult = executor.exec(`echo "${config.password}" | docker login ${config.registryHost} -u ${config.username} --password-stdin`);
+		if (loginResult.exitCode !== 0) throw new FatalError(`Docker login failed: ${loginResult.stderr}`);
+	} else log$1("[dry-run] Skipping docker login");
+	const allTags = [];
+	try {
+		for (const pkg of packages) {
+			const tags = generateTags(pkg.version ?? "");
+			log$1(`${pkg.dir} v${pkg.version} → tags: ${tags.join(", ")}`);
+			for (const tag of tags) {
+				const ref = imageRef(config.registryNamespace, pkg.imageName, tag);
+				allTags.push(ref);
+				log$1(`Tagging ${pkg.imageName} → ${ref}`);
+				const tagResult = executor.exec(`docker tag ${pkg.imageName} ${ref}`);
+				if (tagResult.exitCode !== 0) throw new FatalError(`docker tag failed: ${tagResult.stderr}`);
+				if (!config.dryRun) {
+					log$1(`Pushing ${ref}...`);
+					const pushResult = executor.exec(`docker push ${ref}`);
+					if (pushResult.exitCode !== 0) throw new FatalError(`docker push failed: ${pushResult.stderr}`);
+				} else log$1(`[dry-run] Skipping push for ${ref}`);
+			}
+		}
+	} finally {
+		if (!config.dryRun) {
+			log$1(`Logging out from ${config.registryHost}...`);
+			executor.exec(`docker logout ${config.registryHost}`);
+		}
+	}
+	log$1(`Published ${allTags.length} image tag(s)`);
+	return {
+		packages,
+		tags: allTags
+	};
+}
+//#endregion
+//#region src/generators/migrate-prompt.ts
+/**
+* Generate a context-aware AI migration prompt based on what the CLI did.
+* This prompt can be pasted into Claude Code (or similar) to finish the migration.
+*/
+function generateMigratePrompt(results, config, detected) {
+	const sections = [];
+	sections.push("# Migration Prompt");
+	sections.push("");
+	sections.push("The following prompt was generated by `@bensandee/tooling repo:sync`. Paste it into Claude Code or another AI assistant to finish migrating this repository.");
+	sections.push("");
+	sections.push("> **Tip:** Before starting, run `/init` in Claude Code to generate a `CLAUDE.md` that gives the AI a complete picture of your repository's structure, conventions, and build commands.");
+	sections.push("");
+	sections.push("## What was changed");
+	sections.push("");
+	const created = results.filter((r) => r.action === "created");
+	const updated = results.filter((r) => r.action === "updated");
+	const skipped = results.filter((r) => r.action === "skipped");
+	const archived = results.filter((r) => r.action === "archived");
+	if (created.length > 0) {
+		sections.push("**Created:**");
+		for (const r of created) sections.push(`- \`${r.filePath}\` — ${r.description}`);
+		sections.push("");
+	}
+	if (updated.length > 0) {
+		sections.push("**Updated:**");
+		for (const r of updated) sections.push(`- \`${r.filePath}\` — ${r.description}`);
+		sections.push("");
+	}
+	if (archived.length > 0) {
+		sections.push("**Archived:**");
+		for (const r of archived) sections.push(`- \`${r.filePath}\` — ${r.description}`);
+		sections.push("");
+	}
+	if (skipped.length > 0) {
+		sections.push("**Skipped (review these):**");
+		for (const r of skipped) sections.push(`- \`${r.filePath}\` — ${r.description}`);
+		sections.push("");
+	}
+	sections.push("## Migration tasks");
+	sections.push("");
+	if (config.releaseStrategy !== "none" && !detected.hasRepositoryField) {
+		sections.push("### Add repository field to package.json");
+		sections.push("");
+		sections.push(`The release strategy \`${config.releaseStrategy}\` requires a \`repository\` field in \`package.json\` so that \`release:trigger\` can determine the correct hosting platform (Forgejo vs GitHub).`);
+		sections.push("");
+		sections.push("Add the appropriate repository URL to `package.json`:");
+		sections.push("");
+		sections.push("- For Forgejo: `\"repository\": \"https://your-forgejo-instance.com/owner/repo\"`");
+		sections.push("- For GitHub: `\"repository\": \"https://github.com/owner/repo\"`");
+		sections.push("");
+	}
+	const legacyToRemove = detected.legacyConfigs.filter((legacy) => !(legacy.tool === "prettier" && config.formatter === "prettier"));
+	if (legacyToRemove.length > 0) {
+		sections.push("### Remove legacy tooling");
+		sections.push("");
+		for (const legacy of legacyToRemove) {
+			const replacement = {
+				eslint: "oxlint",
 				prettier: "oxfmt",
 				jest: "vitest",
 				webpack: "tsdown",
@@ -2769,15 +3067,29 @@ function generateMigratePrompt(results, config, detected) {
 }
 //#endregion
 //#region src/commands/repo-init.ts
+/** Adapt a GeneratorContext to the DockerFileReader interface used by detectDockerPackages. */
+function contextAsDockerReader(ctx) {
+	return {
+		listPackageDirs(cwd) {
+			const packagesDir = path.join(cwd, "packages");
+			try {
+				return readdirSync(packagesDir, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name);
+			} catch (_error) {
+				return [];
+			}
+		},
+		readFile(filePath) {
+			const rel = path.relative(ctx.targetDir, filePath);
+			return ctx.read(rel) ?? null;
+		}
+	};
+}
 /** 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");
-	}
+	const dockerPackages = detectDockerPackages(contextAsDockerReader(ctx), ctx.targetDir, ctx.config.name);
+	if (dockerPackages.length > 0) p.log.info(`Docker images: ${dockerPackages.map((pkg) => pkg.imageName).join(", ")}`);
+	const publishable = getPublishablePackages(ctx.targetDir, ctx.config.structure, ctx.packageJson);
+	if (publishable.length > 0) p.log.info(`npm packages: ${publishable.map((pkg) => pkg.name).join(", ")}`);
 }
 async function runInit(config, options = {}) {
 	const detected = detectProject(config.targetDir);
@@ -2798,9 +3110,16 @@ async function runInit(config, options = {}) {
 		if (p.isCancel(result)) return "skip";
 		return result;
 	}));
+	if (config.releaseStrategy !== "none" && !ctx.packageJson?.repository) p.log.warn(`package.json is missing a "repository" field — required for release strategy "${config.releaseStrategy}"`);
 	logDetectionSummary(ctx);
 	s.start("Generating configuration files...");
-	const results = await runGenerators(ctx);
+	let results;
+	try {
+		results = await runGenerators(ctx);
+	} catch (error) {
+		s.stop("Generation failed!");
+		throw error;
+	}
 	const alreadyArchived = new Set(results.filter((r) => r.action === "archived").map((r) => r.filePath));
 	for (const rel of archivedFiles) if (!alreadyArchived.has(rel)) results.push({
 		filePath: rel,
@@ -2817,7 +3136,8 @@ async function runInit(config, options = {}) {
 	if (results.some((r) => r.action === "archived" && r.filePath.startsWith(".husky/"))) try {
 		execSync("git config --unset core.hooksPath", {
 			cwd: config.targetDir,
-			stdio: "ignore"
+			stdio: "ignore",
+			timeout: 5e3
 		});
 	} catch (_error) {}
 	const summaryLines = [];
@@ -2838,7 +3158,8 @@ async function runInit(config, options = {}) {
 		try {
 			execSync(`pnpm update --latest ${bensandeeDeps.join(" ")}`, {
 				cwd: config.targetDir,
-				stdio: "ignore"
+				stdio: "ignore",
+				timeout: 6e4
 			});
 			s.stop("Updated @bensandee/* packages");
 		} catch (_error) {
@@ -2847,10 +3168,8 @@ async function runInit(config, options = {}) {
 	}
 	p.note([
 		"1. Run: pnpm install",
-		"2. Run: pnpm typecheck",
-		"3. Run: pnpm build",
-		"4. Run: pnpm test",
-		...options.noPrompt ? [] : ["5. In Claude Code, run: \"Execute the steps in .tooling-migrate.md\""]
+		"2. Run: pnpm check",
+		...options.noPrompt ? [] : ["3. In Claude Code, run: \"Execute the steps in .tooling-migrate.md\""]
 	].join("\n"), "Next steps");
 	return results;
 }
@@ -3180,7 +3499,7 @@ async function createRelease(executor, conn, tag) {
 //#endregion
 //#region src/release/log.ts
 /** Log a debug message when verbose mode is enabled. */
-function debug$1(config, message) {
+function debug(config, message) {
 	if (config.verbose) p.log.info(`[debug] ${message}`);
 }
 /** Log the result of an exec call when verbose mode is enabled. */
@@ -3263,7 +3582,7 @@ function buildPrContent(executor, cwd, packagesBefore) {
 async function runVersionMode(executor, config) {
 	p.log.info("Changesets detected — versioning packages");
 	const packagesBefore = executor.listWorkspacePackages(config.cwd);
-	debug$1(config, `Packages before versioning: ${packagesBefore.map((pkg) => `${pkg.name}@${pkg.version}`).join(", ") || "(none)"}`);
+	debug(config, `Packages before versioning: ${packagesBefore.map((pkg) => `${pkg.name}@${pkg.version}`).join(", ") || "(none)"}`);
 	const changesetConfigPath = path.join(config.cwd, ".changeset", "config.json");
 	const originalConfig = executor.readFile(changesetConfigPath);
 	if (originalConfig) {
@@ -3274,7 +3593,7 @@ async function runVersionMode(executor, config) {
 				commit: false
 			};
 			executor.writeFile(changesetConfigPath, JSON.stringify(patched, null, 2) + "\n");
-			debug$1(config, "Temporarily disabled changeset commit:true");
+			debug(config, "Temporarily disabled changeset commit:true");
 		}
 	}
 	const versionResult = executor.exec("pnpm changeset version", { cwd: config.cwd });
@@ -3283,11 +3602,12 @@ async function runVersionMode(executor, config) {
 	if (versionResult.exitCode !== 0) throw new FatalError(`pnpm changeset version failed (exit code ${String(versionResult.exitCode)}):\n${versionResult.stderr}`);
 	debugExec(config, "pnpm install --no-frozen-lockfile", executor.exec("pnpm install --no-frozen-lockfile", { cwd: config.cwd }));
 	const { title, body } = buildPrContent(executor, config.cwd, packagesBefore);
-	debug$1(config, `PR title: ${title}`);
-	executor.exec("git add -A", { cwd: config.cwd });
+	debug(config, `PR title: ${title}`);
+	const addResult = executor.exec("git add -A", { cwd: config.cwd });
+	if (addResult.exitCode !== 0) throw new FatalError(`git add failed: ${addResult.stderr || addResult.stdout}`);
 	const remainingChangesets = executor.listChangesetFiles(config.cwd);
 	if (remainingChangesets.length > 0) p.log.warn(`Changeset files still present after versioning: ${remainingChangesets.join(", ")}`);
-	debug$1(config, `Changeset files after versioning: ${remainingChangesets.length > 0 ? remainingChangesets.join(", ") : "(none — all consumed)"}`);
+	debug(config, `Changeset files after versioning: ${remainingChangesets.length > 0 ? remainingChangesets.join(", ") : "(none — all consumed)"}`);
 	const commitResult = executor.exec("git commit -m \"chore: version packages\"", { cwd: config.cwd });
 	debugExec(config, "git commit", commitResult);
 	if (commitResult.exitCode !== 0) {
@@ -3304,14 +3624,16 @@ async function runVersionMode(executor, config) {
 			pr: "none"
 		};
 	}
-	debugExec(config, "git push", executor.exec(`git push origin "HEAD:refs/heads/${BRANCH}" --force`, { cwd: config.cwd }));
+	const pushResult = executor.exec(`git push origin "HEAD:refs/heads/${BRANCH}" --force`, { cwd: config.cwd });
+	debugExec(config, "git push", pushResult);
+	if (pushResult.exitCode !== 0) throw new FatalError(`git push failed (exit code ${String(pushResult.exitCode)}):\n${pushResult.stderr || pushResult.stdout}`);
 	const conn = {
 		serverUrl: config.serverUrl,
 		repository: config.repository,
 		token: config.token
 	};
 	const existingPr = await findOpenPr(executor, conn, BRANCH);
-	debug$1(config, `Existing open PR for ${BRANCH}: ${existingPr === null ? "(none)" : `#${String(existingPr)}`}`);
+	debug(config, `Existing open PR for ${BRANCH}: ${existingPr === null ? "(none)" : `#${String(existingPr)}`}`);
 	if (existingPr === null) {
 		await createPr(executor, conn, {
 			title,
@@ -3359,14 +3681,14 @@ async function runPublishMode(executor, config) {
 	debugExec(config, "pnpm changeset publish", publishResult);
 	if (publishResult.exitCode !== 0) throw new FatalError(`pnpm changeset publish failed (exit code ${String(publishResult.exitCode)}):\n${publishResult.stderr}`);
 	const stdoutTags = parseNewTags(publishResult.stdout + "\n" + publishResult.stderr);
-	debug$1(config, `Tags from publish stdout: ${stdoutTags.length > 0 ? stdoutTags.join(", ") : "(none)"}`);
+	debug(config, `Tags from publish stdout: ${stdoutTags.length > 0 ? stdoutTags.join(", ") : "(none)"}`);
 	const expectedTags = computeExpectedTags(executor.listWorkspacePackages(config.cwd));
-	debug$1(config, `Expected tags from workspace packages: ${expectedTags.length > 0 ? expectedTags.join(", ") : "(none)"}`);
+	debug(config, `Expected tags from workspace packages: ${expectedTags.length > 0 ? expectedTags.join(", ") : "(none)"}`);
 	const remoteTags = parseRemoteTags(executor.exec("git ls-remote --tags origin", { cwd: config.cwd }).stdout);
-	debug$1(config, `Remote tags: ${remoteTags.length > 0 ? remoteTags.join(", ") : "(none)"}`);
+	debug(config, `Remote tags: ${remoteTags.length > 0 ? remoteTags.join(", ") : "(none)"}`);
 	const remoteSet = new Set(remoteTags);
 	const tagsToPush = reconcileTags(expectedTags, remoteTags, stdoutTags);
-	debug$1(config, `Reconciled tags to push: ${tagsToPush.length > 0 ? tagsToPush.join(", ") : "(none)"}`);
+	debug(config, `Reconciled tags to push: ${tagsToPush.length > 0 ? tagsToPush.join(", ") : "(none)"}`);
 	if (config.dryRun) {
 		if (tagsToPush.length === 0) {
 			p.log.info("No packages were published");
@@ -3396,8 +3718,12 @@ async function runPublishMode(executor, config) {
 	const errors = [];
 	for (const tag of allTags) try {
 		if (!remoteSet.has(tag)) {
-			if (executor.exec(`git tag -l ${JSON.stringify(tag)}`, { cwd: config.cwd }).stdout.trim() === "") executor.exec(`git tag ${JSON.stringify(tag)}`, { cwd: config.cwd });
-			executor.exec(`git push origin refs/tags/${tag}`, { cwd: config.cwd });
+			if (executor.exec(`git tag -l ${JSON.stringify(tag)}`, { cwd: config.cwd }).stdout.trim() === "") {
+				const tagResult = executor.exec(`git tag ${JSON.stringify(tag)}`, { cwd: config.cwd });
+				if (tagResult.exitCode !== 0) throw new FatalError(`Failed to create tag ${tag}: ${tagResult.stderr || tagResult.stdout}`);
+			}
+			const pushTagResult = executor.exec(`git push origin refs/tags/${tag}`, { cwd: config.cwd });
+			if (pushTagResult.exitCode !== 0) throw new FatalError(`Failed to push tag ${tag}: ${pushTagResult.stderr || pushTagResult.stdout}`);
 		}
 		if (await findRelease(executor, conn, tag)) p.log.warn(`Release for ${tag} already exists — skipping`);
 		else {
@@ -3542,18 +3868,18 @@ function getCurrentBranch(executor, cwd) {
 async function runRelease(config, executor) {
 	const branch = getCurrentBranch(executor, config.cwd);
 	if (branch !== "main") {
-		debug$1(config, `Skipping release on non-main branch: ${branch}`);
+		debug(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)"}`);
+	debug(config, `Changeset files found: ${changesetFiles.length > 0 ? changesetFiles.join(", ") : "(none)"}`);
 	if (changesetFiles.length > 0) {
-		debug$1(config, "Entering version mode");
+		debug(config, "Entering version mode");
 		return runVersionMode(executor, config);
 	}
-	debug$1(config, "Entering publish mode");
+	debug(config, "Entering publish mode");
 	return runPublishMode(executor, config);
 }
 //#endregion
@@ -3589,7 +3915,8 @@ async function triggerForgejo(conn, ref) {
 	p.log.info(`Triggered release workflow on Forgejo (ref: ${ref})`);
 }
 function triggerGitHub(ref) {
-	createRealExecutor().exec(`gh workflow run release.yml --ref ${ref}`, { cwd: process.cwd() });
+	const result = createRealExecutor().exec(`gh workflow run release.yml --ref ${ref}`, { cwd: process.cwd() });
+	if (result.exitCode !== 0) throw new FatalError(`Failed to trigger GitHub workflow: ${result.stderr || result.stdout || "unknown error"}`);
 	p.log.info(`Triggered release workflow on GitHub (ref: ${ref})`);
 }
 //#endregion
@@ -3658,7 +3985,8 @@ function mergeGitHub(dryRun) {
 		p.log.info(`[dry-run] Would merge PR #${prNum} and delete branch ${HEAD_BRANCH}`);
 		return;
 	}
-	executor.exec(`gh pr merge ${HEAD_BRANCH} --merge --delete-branch`, { cwd: process.cwd() });
+	const result = executor.exec(`gh pr merge ${HEAD_BRANCH} --merge --delete-branch`, { cwd: process.cwd() });
+	if (result.exitCode !== 0) throw new FatalError(`Failed to merge PR: ${result.stderr || result.stdout || "unknown error"}`);
 	p.log.info(`Merged changesets PR and deleted branch ${HEAD_BRANCH}`);
 }
 //#endregion
@@ -3697,7 +4025,7 @@ async function runSimpleRelease(executor, config) {
 	debugExec(config, "commit-and-tag-version", versionResult);
 	if (versionResult.exitCode !== 0) throw new FatalError(`commit-and-tag-version failed (exit code ${String(versionResult.exitCode)}):\n${versionResult.stderr || versionResult.stdout}`);
 	const version = readVersion(executor, config.cwd);
-	debug$1(config, `New version: ${version}`);
+	debug(config, `New version: ${version}`);
 	const tagResult = executor.exec("git describe --tags --abbrev=0", { cwd: config.cwd });
 	debugExec(config, "git describe", tagResult);
 	const tag = tagResult.stdout.trim();
@@ -3719,7 +4047,7 @@ async function runSimpleRelease(executor, config) {
 	let pushed = false;
 	if (!config.noPush) {
 		const branch = executor.exec("git rev-parse --abbrev-ref HEAD", { cwd: config.cwd }).stdout.trim() || "main";
-		debug$1(config, `Pushing to origin/${branch}`);
+		debug(config, `Pushing to origin/${branch}`);
 		const pushResult = executor.exec(`git push --follow-tags origin ${branch}`, { cwd: config.cwd });
 		debugExec(config, "git push", pushResult);
 		if (pushResult.exitCode !== 0) throw new FatalError(`git push failed (exit code ${String(pushResult.exitCode)}):\n${pushResult.stderr || pushResult.stdout}`);
@@ -3729,7 +4057,10 @@ async function runSimpleRelease(executor, config) {
 	let slidingTags = [];
 	if (!config.noSlidingTags && pushed) {
 		slidingTags = computeSlidingTags(version);
-		for (const slidingTag of slidingTags) executor.exec(`git tag -f ${slidingTag}`, { cwd: config.cwd });
+		for (const slidingTag of slidingTags) {
+			const slidingTagResult = executor.exec(`git tag -f ${slidingTag}`, { cwd: config.cwd });
+			if (slidingTagResult.exitCode !== 0) throw new FatalError(`Failed to create sliding tag ${slidingTag}: ${slidingTagResult.stderr || slidingTagResult.stdout}`);
+		}
 		const forcePushResult = executor.exec(`git push origin ${slidingTags.join(" ")} --force`, { cwd: config.cwd });
 		debugExec(config, "force-push sliding tags", forcePushResult);
 		if (forcePushResult.exitCode !== 0) p.log.warn(`Warning: Failed to push sliding tags: ${forcePushResult.stderr || forcePushResult.stdout}`);
@@ -3749,7 +4080,7 @@ async function createPlatformRelease(executor, config, tag) {
 	if (!config.platform) return false;
 	if (config.platform.type === "forgejo") {
 		if (await findRelease(executor, config.platform.conn, tag)) {
-			debug$1(config, `Release for ${tag} already exists, skipping`);
+			debug(config, `Release for ${tag} already exists, skipping`);
 			return false;
 		}
 		await createRelease(executor, config.platform.conn, tag);
@@ -3948,290 +4279,6 @@ const runChecksCommand = defineCommand({
 	}
 });
 //#endregion
-//#region src/release/docker.ts
-const ToolingDockerMapSchema = z.record(z.string(), z.object({
-	dockerfile: z.string(),
-	context: z.string().default(".")
-}));
-const ToolingConfigDockerSchema = z.object({ docker: ToolingDockerMapSchema.optional() });
-const PackageInfoSchema = z.object({
-	name: z.string().optional(),
-	version: z.string().optional()
-});
-/** Read the docker map from .tooling.json. Returns empty record if missing or invalid. */
-function loadDockerMap(executor, cwd) {
-	const configPath = path.join(cwd, ".tooling.json");
-	const raw = executor.readFile(configPath);
-	if (!raw) return {};
-	try {
-		const result = ToolingConfigDockerSchema.safeParse(JSON.parse(raw));
-		if (!result.success || !result.data.docker) return {};
-		return result.data.docker;
-	} catch (_error) {
-		return {};
-	}
-}
-/** Read name and version from a package's package.json. */
-function readPackageInfo(executor, packageJsonPath) {
-	const raw = executor.readFile(packageJsonPath);
-	if (!raw) return {
-		name: void 0,
-		version: void 0
-	};
-	try {
-		const result = PackageInfoSchema.safeParse(JSON.parse(raw));
-		if (!result.success) return {
-			name: void 0,
-			version: void 0
-		};
-		return {
-			name: result.data.name,
-			version: result.data.version
-		};
-	} catch (_error) {
-		return {
-			name: void 0,
-			version: void 0
-		};
-	}
-}
-/** Convention paths to check for Dockerfiles in a package directory. */
-const CONVENTION_DOCKERFILE_PATHS = ["Dockerfile", "docker/Dockerfile"];
-/**
-* Find a Dockerfile at convention paths for a monorepo package.
-* Checks packages/{dir}/Dockerfile and packages/{dir}/docker/Dockerfile.
-*/
-function findConventionDockerfile(executor, cwd, dir) {
-	for (const rel of CONVENTION_DOCKERFILE_PATHS) {
-		const dockerfilePath = `packages/${dir}/${rel}`;
-		if (executor.readFile(path.join(cwd, dockerfilePath)) !== null) return {
-			dockerfile: dockerfilePath,
-			context: "."
-		};
-	}
-}
-/**
-* Find a Dockerfile at convention paths for a single-package repo.
-* Checks Dockerfile and docker/Dockerfile at the project root.
-*/
-function findRootDockerfile(executor, cwd) {
-	for (const rel of CONVENTION_DOCKERFILE_PATHS) if (executor.readFile(path.join(cwd, rel)) !== null) return {
-		dockerfile: rel,
-		context: "."
-	};
-}
-/**
-* Discover Docker packages by convention and merge with .tooling.json overrides.
-*
-* Convention: any package with a Dockerfile or docker/Dockerfile is a Docker package.
-* For monorepos, scans packages/{name}/. For single-package repos, scans the root.
-* The docker map in .tooling.json overrides convention-discovered config and can add
-* packages at non-standard locations.
-*
-* Image names are derived from {root-name}-{package-name} using each package's package.json name.
-* Versions are read from each package's own package.json.
-*/
-function detectDockerPackages(executor, cwd, repoName) {
-	const overrides = loadDockerMap(executor, cwd);
-	const packageDirs = executor.listPackageDirs(cwd);
-	const packages = [];
-	const seen = /* @__PURE__ */ new Set();
-	if (packageDirs.length > 0) {
-		for (const dir of packageDirs) {
-			const convention = findConventionDockerfile(executor, cwd, dir);
-			const docker = overrides[dir] ?? convention;
-			if (docker) {
-				const { name, version } = readPackageInfo(executor, path.join(cwd, "packages", dir, "package.json"));
-				packages.push({
-					dir,
-					imageName: `${repoName}-${name ?? dir}`,
-					version,
-					docker
-				});
-				seen.add(dir);
-			}
-		}
-		for (const [dir, docker] of Object.entries(overrides)) if (!seen.has(dir)) {
-			const { name, version } = readPackageInfo(executor, path.join(cwd, "packages", dir, "package.json"));
-			packages.push({
-				dir,
-				imageName: `${repoName}-${name ?? dir}`,
-				version,
-				docker
-			});
-		}
-	} else {
-		const convention = findRootDockerfile(executor, cwd);
-		const docker = overrides["."] ?? convention;
-		if (docker) {
-			const { name, version } = readPackageInfo(executor, path.join(cwd, "package.json"));
-			packages.push({
-				dir: ".",
-				imageName: name ?? repoName,
-				version,
-				docker
-			});
-		}
-	}
-	return packages;
-}
-/**
-* Read docker config for a single package, checking convention paths first,
-* then .tooling.json overrides. Used by the per-package image:build script.
-*/
-function readSinglePackageDocker(executor, cwd, packageDir, repoName) {
-	const dir = path.basename(path.resolve(cwd, packageDir));
-	const convention = findConventionDockerfile(executor, cwd, dir);
-	const docker = loadDockerMap(executor, cwd)[dir] ?? convention;
-	if (!docker) throw new FatalError(`No Dockerfile found for package "${dir}" (checked convention paths and .tooling.json)`);
-	const { name, version } = readPackageInfo(executor, path.join(cwd, "packages", dir, "package.json"));
-	return {
-		dir,
-		imageName: `${repoName}-${name ?? dir}`,
-		version,
-		docker
-	};
-}
-/** Parse semver version string into major, minor, patch components. */
-function parseSemver(version) {
-	const clean = version.replace(/^v/, "");
-	const match = /^(\d+)\.(\d+)\.(\d+)/.exec(clean);
-	if (!match?.[1] || !match[2] || !match[3]) throw new FatalError(`Invalid semver version: ${version}`);
-	return {
-		major: Number(match[1]),
-		minor: Number(match[2]),
-		patch: Number(match[3])
-	};
-}
-/** Generate semver tag variants: latest, vX.Y.Z, vX.Y, vX */
-function generateTags(version) {
-	const { major, minor, patch } = parseSemver(version);
-	return [
-		"latest",
-		`v${major}.${minor}.${patch}`,
-		`v${major}.${minor}`,
-		`v${major}`
-	];
-}
-/** Build the full image reference: namespace/imageName:tag */
-function imageRef(namespace, imageName, tag) {
-	return `${namespace}/${imageName}:${tag}`;
-}
-function log$1(message) {
-	console.log(message);
-}
-function debug(verbose, message) {
-	if (verbose) console.log(`[debug] ${message}`);
-}
-/** Read the repo name from root package.json. */
-function readRepoName(executor, cwd) {
-	const rootPkgRaw = executor.readFile(path.join(cwd, "package.json"));
-	if (!rootPkgRaw) throw new FatalError("No package.json found in project root");
-	const repoName = parsePackageJson(rootPkgRaw)?.name;
-	if (!repoName) throw new FatalError("Root package.json must have a name field");
-	return repoName;
-}
-/** Build a single docker image from its config. Paths are resolved relative to cwd. */
-function buildImage(executor, pkg, cwd, verbose, extraArgs) {
-	const dockerfilePath = path.resolve(cwd, pkg.docker.dockerfile);
-	const contextPath = path.resolve(cwd, pkg.docker.context);
-	const command = [
-		"docker build",
-		`-f ${dockerfilePath}`,
-		`-t ${pkg.imageName}:latest`,
-		...extraArgs,
-		contextPath
-	].join(" ");
-	debug(verbose, `Running: ${command}`);
-	const buildResult = executor.exec(command);
-	debug(verbose, `Build stdout: ${buildResult.stdout}`);
-	if (buildResult.exitCode !== 0) throw new FatalError(`docker build failed for ${pkg.dir} (exit ${buildResult.exitCode}): ${buildResult.stderr}`);
-}
-/**
-* Detect packages with docker config in .tooling.json and build each one.
-* Runs `docker build -f <dockerfile> -t <image-name>:latest <context>` for each package.
-* Dockerfile and context paths are resolved relative to the project root.
-*
-* When `packageDir` is set, builds only that single package (for use as an image:build script).
-*/
-function runDockerBuild(executor, config) {
-	const repoName = readRepoName(executor, config.cwd);
-	if (config.packageDir) {
-		const pkg = readSinglePackageDocker(executor, config.cwd, config.packageDir, repoName);
-		log$1(`Building image for ${pkg.dir} (${pkg.imageName}:latest)...`);
-		buildImage(executor, pkg, config.cwd, config.verbose, config.extraArgs);
-		log$1(`Built ${pkg.imageName}:latest`);
-		return { packages: [pkg] };
-	}
-	const packages = detectDockerPackages(executor, config.cwd, repoName);
-	if (packages.length === 0) {
-		log$1("No packages with docker config found");
-		return { packages: [] };
-	}
-	log$1(`Found ${packages.length} Docker package(s): ${packages.map((p) => p.dir).join(", ")}`);
-	for (const pkg of packages) {
-		log$1(`Building image for ${pkg.dir} (${pkg.imageName}:latest)...`);
-		buildImage(executor, pkg, config.cwd, config.verbose, config.extraArgs);
-	}
-	log$1(`Built ${packages.length} image(s)`);
-	return { packages };
-}
-/**
-* Run the full Docker publish pipeline:
-* 1. Build all images via runDockerBuild
-* 2. Login to registry
-* 3. Tag each image with semver variants from its own package.json version
-* 4. Push all tags
-* 5. Logout from registry
-*/
-function runDockerPublish(executor, config) {
-	const { packages } = runDockerBuild(executor, {
-		cwd: config.cwd,
-		packageDir: void 0,
-		verbose: config.verbose,
-		extraArgs: []
-	});
-	if (packages.length === 0) return {
-		packages: [],
-		tags: []
-	};
-	for (const pkg of packages) if (!pkg.version) throw new FatalError(`Package ${pkg.dir} has docker config but no version in package.json`);
-	if (!config.dryRun) {
-		log$1(`Logging in to ${config.registryHost}...`);
-		const loginResult = executor.exec(`echo "${config.password}" | docker login ${config.registryHost} -u ${config.username} --password-stdin`);
-		if (loginResult.exitCode !== 0) throw new FatalError(`Docker login failed: ${loginResult.stderr}`);
-	} else log$1("[dry-run] Skipping docker login");
-	const allTags = [];
-	try {
-		for (const pkg of packages) {
-			const tags = generateTags(pkg.version ?? "");
-			log$1(`${pkg.dir} v${pkg.version} → tags: ${tags.join(", ")}`);
-			for (const tag of tags) {
-				const ref = imageRef(config.registryNamespace, pkg.imageName, tag);
-				allTags.push(ref);
-				log$1(`Tagging ${pkg.imageName} → ${ref}`);
-				const tagResult = executor.exec(`docker tag ${pkg.imageName} ${ref}`);
-				if (tagResult.exitCode !== 0) throw new FatalError(`docker tag failed: ${tagResult.stderr}`);
-				if (!config.dryRun) {
-					log$1(`Pushing ${ref}...`);
-					const pushResult = executor.exec(`docker push ${ref}`);
-					if (pushResult.exitCode !== 0) throw new FatalError(`docker push failed: ${pushResult.stderr}`);
-				} else log$1(`[dry-run] Skipping push for ${ref}`);
-			}
-		}
-	} finally {
-		if (!config.dryRun) {
-			log$1(`Logging out from ${config.registryHost}...`);
-			executor.exec(`docker logout ${config.registryHost}`);
-		}
-	}
-	log$1(`Published ${allTags.length} image tag(s)`);
-	return {
-		packages,
-		tags: allTags
-	};
-}
-//#endregion
 //#region src/commands/publish-docker.ts
 function requireEnv(name) {
 	const value = process.env[name];
@@ -4268,6 +4315,22 @@ const publishDockerCommand = defineCommand({
 });
 //#endregion
 //#region src/commands/docker-build.ts
+/**
+* Detect if cwd is inside a packages/ subdirectory.
+* If so, return the project root and the relative package dir.
+* Otherwise return cwd as-is with no packageDir.
+*/
+function detectSubpackage(cwd) {
+	const parent = path.dirname(cwd);
+	if (path.basename(parent) === "packages" && existsSync(path.join(parent, "..", "package.json"))) return {
+		root: path.dirname(parent),
+		packageDir: `packages/${path.basename(cwd)}`
+	};
+	return {
+		root: cwd,
+		packageDir: void 0
+	};
+}
 const dockerBuildCommand = defineCommand({
 	meta: {
 		name: "docker:build",
@@ -4292,9 +4355,16 @@ const dockerBuildCommand = defineCommand({
 		const executor = createRealExecutor();
 		const rawExtra = args._ ?? [];
 		const extraArgs = Array.isArray(rawExtra) ? rawExtra.map(String) : [String(rawExtra)];
+		let cwd = process.cwd();
+		let packageDir = args.package;
+		if (!packageDir) {
+			const detected = detectSubpackage(cwd);
+			cwd = detected.root;
+			packageDir = detected.packageDir;
+		}
 		runDockerBuild(executor, {
-			cwd: process.cwd(),
-			packageDir: args.package,
+			cwd,
+			packageDir,
 			verbose: args.verbose === true,
 			extraArgs: extraArgs.filter((a) => a.length > 0)
 		});
@@ -4310,16 +4380,16 @@ const COMPOSE_FILE_CANDIDATES = [
 	"compose.yml"
 ];
 /** Zod schema for the subset of compose YAML we care about. */
-const ComposePortSchema = z.union([z.string(), z.object({
+const ComposePortSchema = z.union([z.string(), z.looseObject({
 	published: z.union([z.string(), z.number()]),
 	target: z.union([z.string(), z.number()]).optional()
-}).loose()]);
-const ComposeServiceSchema = z.object({
+})]);
+const ComposeServiceSchema = z.looseObject({
 	image: z.string().optional(),
 	ports: z.array(ComposePortSchema).optional(),
 	healthcheck: z.unknown().optional()
-}).loose();
-const ComposeFileSchema = z.object({ services: z.record(z.string(), ComposeServiceSchema).optional() }).loose();
+});
+const ComposeFileSchema = z.looseObject({ services: z.record(z.string(), ComposeServiceSchema).optional() });
 /** Directories to scan for compose files, in priority order. */
 const COMPOSE_DIR_CANDIDATES = [".", "docker"];
 /** Detect which compose files exist at conventional paths.
@@ -4398,11 +4468,20 @@ function parseComposeServices(cwd, composeFiles) {
 	}
 	return [...serviceMap.values()];
 }
+/**
+* Strip Docker Compose variable substitutions from an image string.
+* Handles `${VAR:-default}`, `${VAR-default}`, `${VAR:+alt}`, `${VAR+alt}`,
+* `${VAR:?err}`, `${VAR?err}`, and plain `${VAR}`.
+* Nested braces are not supported.
+*/
+function stripComposeVariables(image) {
+	return image.replace(/\$\{[^}]*\}/g, "");
+}
 /** 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];
+		const bare = stripComposeVariables(service.image).split(":")[0];
 		if (bare) names.add(bare);
 	}
 	return [...names];
@@ -4587,7 +4666,7 @@ const dockerCheckCommand = defineCommand({
 const main = defineCommand({
 	meta: {
 		name: "tooling",
-		version: "0.23.0",
+		version: "0.25.0",
 		description: "Bootstrap and maintain standardized TypeScript project tooling"
 	},
 	subCommands: {
@@ -4603,7 +4682,11 @@ const main = defineCommand({
 		"docker:check": dockerCheckCommand
 	}
 });
-console.log(`@bensandee/tooling v0.23.0`);
-runMain(main);
+console.log(`@bensandee/tooling v0.25.0`);
+async function run() {
+	await runMain(main);
+	process.exit(process.exitCode ?? 0);
+}
+run();
 //#endregion
 export {};

package/dist/index.d.mts

@@ -15,6 +15,9 @@ declare const PackageJsonSchema: z.ZodObject<{
   types: z.ZodOptional<z.ZodString>;
   typings: z.ZodOptional<z.ZodString>;
   engines: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+  repository: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodObject<{
+    url: z.ZodString;
+  }, z.core.$loose>]>>;
 }, z.core.$loose>;
 type PackageJson = z.infer<typeof PackageJsonSchema>;
 //#endregion
@@ -91,6 +94,8 @@ interface DetectedProjectState {
   hasReleaseItConfig: boolean;
   hasSimpleReleaseConfig: boolean;
   hasChangesetsConfig: boolean;
+  /** Whether package.json has a repository field (needed for release workflows) */
+  hasRepositoryField: boolean;
   /** Legacy tooling configs found */
   legacyConfigs: LegacyConfig[];
 }

package/package.json

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