@bensandee/tooling 0.15.0 → 0.17.0

package/dist/bin.mjs

@@ -2,17 +2,15 @@
 import { t as isExecSyncError } from "./exec-CC49vrkM.mjs";
 import { defineCommand, runMain } from "citty";
 import * as p from "@clack/prompts";
-import { execSync } from "node:child_process";
 import path from "node:path";
 import { existsSync, mkdirSync, readFileSync, readdirSync, rmSync, writeFileSync } from "node:fs";
 import JSON5 from "json5";
 import { parse } from "jsonc-parser";
 import { z } from "zod";
 import { isMap, isSeq, parseDocument } from "yaml";
+import { execSync } from "node:child_process";
 import { FatalError, TransientError, UnexpectedError } from "@bensandee/common";
 //#region src/types.ts
-/** Default CI platform when not explicitly chosen. */
-const DEFAULT_CI = "forgejo";
 const LEGACY_TOOLS = [
 	"eslint",
 	"prettier",
@@ -141,10 +139,6 @@ function readPackageJson(targetDir) {
 		return;
 	}
 }
-/** Detect whether the project is a monorepo. */
-function detectMonorepo(targetDir) {
-	return existsSync(path.join(targetDir, "pnpm-workspace.yaml"));
-}
 /** Detect project type from package.json signals. */
 function detectProjectType(targetDir) {
 	const pkg = readPackageJson(targetDir);
@@ -185,6 +179,32 @@ function hasWebUIDeps(targetDir) {
 	if (!pkg) return false;
 	return packageHasWebUIDeps(pkg);
 }
+/** Detect CI platform from existing workflow directories. */
+function detectCiPlatform(targetDir) {
+	if (existsSync(path.join(targetDir, ".forgejo", "workflows"))) return "forgejo";
+	if (existsSync(path.join(targetDir, ".github", "workflows"))) return "github";
+	return "none";
+}
+/**
+* Compute convention-based defaults for a project directory.
+* These are the values the tool would use when .tooling.json says nothing.
+*/
+function computeDefaults(targetDir) {
+	const detected = detectProject(targetDir);
+	const isMonorepo = detected.hasPnpmWorkspace;
+	const hasPrettier = detected.legacyConfigs.some((l) => l.tool === "prettier");
+	return {
+		structure: isMonorepo ? "monorepo" : "single",
+		useEslintPlugin: true,
+		formatter: hasPrettier ? "prettier" : "oxfmt",
+		setupVitest: !isMonorepo && !detected.hasVitestConfig,
+		ci: detectCiPlatform(targetDir),
+		setupRenovate: true,
+		releaseStrategy: isMonorepo ? "changesets" : "simple",
+		projectType: isMonorepo ? "default" : detectProjectType(targetDir),
+		detectPackageTypes: true
+	};
+}
 /** List packages in a monorepo's packages/ directory. */
 function getMonorepoPackages(targetDir) {
 	const packagesDir = path.join(targetDir, "packages");
@@ -210,175 +230,99 @@ function isCancelled(value) {
 	return p.isCancel(value);
 }
 async function runInitPrompts(targetDir, saved) {
-	p.intro("@bensandee/tooling repo:init");
+	p.intro("@bensandee/tooling repo:sync");
 	const existingPkg = readPackageJson(targetDir);
 	const detected = detectProject(targetDir);
+	const defaults = computeDefaults(targetDir);
 	const isExisting = detected.hasPackageJson;
+	const isFirstInit = !saved;
 	const name = existingPkg?.name ?? path.basename(targetDir);
-	const detectedMonorepo = detectMonorepo(targetDir);
-	const structure = await p.select({
-		message: "Project structure",
-		initialValue: saved?.structure ?? (detectedMonorepo ? "monorepo" : "single"),
-		options: [{
-			value: "single",
-			label: "Single repo"
-		}, {
-			value: "monorepo",
-			label: "Monorepo (pnpm workspaces)"
-		}]
-	});
-	if (isCancelled(structure)) {
-		p.cancel("Cancelled.");
-		process.exit(0);
-	}
-	const useEslintPlugin = await p.confirm({
-		message: "Include @bensandee/eslint-plugin?",
-		initialValue: saved?.useEslintPlugin ?? true
-	});
-	if (isCancelled(useEslintPlugin)) {
-		p.cancel("Cancelled.");
-		process.exit(0);
-	}
-	const hasExistingPrettier = detected.legacyConfigs.some((l) => l.tool === "prettier");
-	const formatter = await p.select({
-		message: "Formatter",
-		initialValue: saved?.formatter ?? (hasExistingPrettier ? "prettier" : "oxfmt"),
-		options: [{
-			value: "oxfmt",
-			label: "oxfmt",
-			hint: "fast, Rust-based"
-		}, {
-			value: "prettier",
-			label: "Prettier"
-		}]
-	});
-	if (isCancelled(formatter)) {
-		p.cancel("Cancelled.");
-		process.exit(0);
-	}
-	const setupVitest = await p.confirm({
-		message: "Set up vitest with a starter test?",
-		initialValue: saved?.setupVitest ?? !isExisting
-	});
-	if (isCancelled(setupVitest)) {
-		p.cancel("Cancelled.");
-		process.exit(0);
-	}
-	const ci = await p.select({
-		message: "CI workflow",
-		initialValue: saved?.ci,
-		options: [
-			{
-				value: "forgejo",
-				label: "Forgejo Actions"
-			},
-			{
-				value: "github",
-				label: "GitHub Actions"
-			},
-			{
-				value: "none",
-				label: "None"
-			}
-		]
-	});
-	if (isCancelled(ci)) {
-		p.cancel("Cancelled.");
-		process.exit(0);
-	}
-	let setupRenovate = true;
-	if (ci === "github") {
-		const renovateAnswer = await p.confirm({
-			message: "Set up Renovate for automated dependency updates?",
-			initialValue: saved?.setupRenovate ?? true
+	const structure = saved?.structure ?? defaults.structure;
+	const useEslintPlugin = saved?.useEslintPlugin ?? defaults.useEslintPlugin;
+	let formatter = saved?.formatter ?? defaults.formatter;
+	const setupVitest = saved?.setupVitest ?? defaults.setupVitest;
+	let ci = saved?.ci ?? defaults.ci;
+	const setupRenovate = saved?.setupRenovate ?? defaults.setupRenovate;
+	let releaseStrategy = saved?.releaseStrategy ?? defaults.releaseStrategy;
+	const projectType = saved?.projectType ?? defaults.projectType;
+	const detectPackageTypes = saved?.detectPackageTypes ?? defaults.detectPackageTypes;
+	if (detected.legacyConfigs.some((l) => l.tool === "prettier") && isFirstInit) {
+		const formatterAnswer = await p.select({
+			message: "Existing Prettier config found. Keep Prettier or migrate to oxfmt?",
+			initialValue: "prettier",
+			options: [{
+				value: "prettier",
+				label: "Keep Prettier"
+			}, {
+				value: "oxfmt",
+				label: "Migrate to oxfmt",
+				hint: "fast, Rust-based"
+			}]
 		});
-		if (isCancelled(renovateAnswer)) {
+		if (isCancelled(formatterAnswer)) {
 			p.cancel("Cancelled.");
 			process.exit(0);
 		}
-		setupRenovate = renovateAnswer;
-	}
-	const releaseStrategy = await p.select({
-		message: "Release management",
-		initialValue: saved?.releaseStrategy ?? "none",
-		options: [
-			{
-				value: "none",
-				label: "None"
-			},
-			{
-				value: "release-it",
-				label: "release-it",
-				hint: "interactive, conventional commits"
-			},
-			{
-				value: "changesets",
-				label: "Changesets",
-				hint: "PR-based versioning"
-			},
-			{
-				value: "simple",
-				label: "Simple",
-				hint: "uses commit-and-tag-version internally"
-			}
-		]
-	});
-	if (isCancelled(releaseStrategy)) {
-		p.cancel("Cancelled.");
-		process.exit(0);
+		formatter = formatterAnswer;
 	}
-	let projectType = "default";
-	let detectPackageTypes = false;
-	if (structure === "monorepo") {
-		const packages = getMonorepoPackages(targetDir);
-		if (packages.length > 0) {
-			const detections = packages.map((pkg) => {
-				const type = detectProjectType(pkg.dir);
-				return `  ${pkg.name} → ${type}`;
-			});
-			p.note(detections.join("\n"), "Detected package types");
-			const applyDetected = await p.confirm({
-				message: "Apply detected tsconfig bases to packages?",
-				initialValue: saved?.detectPackageTypes ?? true
-			});
-			if (isCancelled(applyDetected)) {
-				p.cancel("Cancelled.");
-				process.exit(0);
-			}
-			detectPackageTypes = applyDetected;
+	const detectedCi = detectCiPlatform(targetDir);
+	if (isFirstInit && detectedCi === "none") {
+		const ciAnswer = await p.select({
+			message: "CI workflow",
+			initialValue: "forgejo",
+			options: [
+				{
+					value: "forgejo",
+					label: "Forgejo Actions"
+				},
+				{
+					value: "github",
+					label: "GitHub Actions"
+				},
+				{
+					value: "none",
+					label: "None"
+				}
+			]
+		});
+		if (isCancelled(ciAnswer)) {
+			p.cancel("Cancelled.");
+			process.exit(0);
 		}
-	} else {
-		const projectTypeAnswer = await p.select({
-			message: "Project type",
-			initialValue: saved?.projectType ?? "default",
+		ci = ciAnswer;
+	}
+	const hasExistingRelease = detected.hasReleaseItConfig || detected.hasSimpleReleaseConfig || detected.hasChangesetsConfig;
+	if (isFirstInit && !hasExistingRelease) {
+		const releaseAnswer = await p.select({
+			message: "Release management",
+			initialValue: defaults.releaseStrategy,
 			options: [
 				{
-					value: "default",
-					label: "Default",
-					hint: "strictest base, no runtime assumptions"
+					value: "none",
+					label: "None"
 				},
 				{
-					value: "node",
-					label: "Node.js",
-					hint: "adds types: [\"node\"]"
+					value: "release-it",
+					label: "release-it",
+					hint: "interactive, conventional commits"
 				},
 				{
-					value: "react",
-					label: "React",
-					hint: "browser app with JSX + DOM types"
+					value: "changesets",
+					label: "Changesets",
+					hint: "PR-based versioning"
 				},
 				{
-					value: "library",
-					label: "Library",
-					hint: "publishable package (ES2022 target)"
+					value: "simple",
+					label: "Simple",
+					hint: "uses commit-and-tag-version internally"
 				}
 			]
 		});
-		if (isCancelled(projectTypeAnswer)) {
+		if (isCancelled(releaseAnswer)) {
 			p.cancel("Cancelled.");
 			process.exit(0);
 		}
-		projectType = projectTypeAnswer;
+		releaseStrategy = releaseAnswer;
 	}
 	p.outro("Configuration complete!");
 	return {
@@ -393,7 +337,6 @@ async function runInitPrompts(targetDir, saved) {
 		releaseStrategy,
 		projectType,
 		detectPackageTypes,
-		setupDocker: saved?.setupDocker ?? false,
 		targetDir
 	};
 }
@@ -401,19 +344,13 @@ async function runInitPrompts(targetDir, saved) {
 function buildDefaultConfig(targetDir, flags) {
 	const existingPkg = readPackageJson(targetDir);
 	const detected = detectProject(targetDir);
+	const defaults = computeDefaults(targetDir);
 	return {
 		name: existingPkg?.name ?? path.basename(targetDir),
 		isNew: !detected.hasPackageJson,
-		structure: detected.hasPnpmWorkspace ? "monorepo" : "single",
-		useEslintPlugin: flags.eslintPlugin ?? true,
-		formatter: detected.legacyConfigs.some((l) => l.tool === "prettier") ? "prettier" : "oxfmt",
-		setupVitest: !detected.hasVitestConfig,
-		ci: flags.noCi ? "none" : DEFAULT_CI,
-		setupRenovate: true,
-		releaseStrategy: detected.hasReleaseItConfig ? "release-it" : detected.hasSimpleReleaseConfig ? "simple" : detected.hasChangesetsConfig ? "changesets" : "none",
-		projectType: "default",
-		detectPackageTypes: true,
-		setupDocker: false,
+		...defaults,
+		...flags.eslintPlugin !== void 0 && { useEslintPlugin: flags.eslintPlugin },
+		...flags.noCi && { ci: "none" },
 		targetDir
 	};
 }
@@ -512,6 +449,125 @@ function createDryRunContext(config) {
 	};
 }
 //#endregion
+//#region src/utils/tooling-config.ts
+const CONFIG_FILE = ".tooling.json";
+const DeclarativeHealthCheckSchema = z.object({
+	name: z.string(),
+	url: z.string(),
+	status: z.number().int().optional()
+});
+const DockerVerifyConfigSchema = z.object({
+	composeFiles: z.array(z.string()).optional(),
+	envFile: z.string().optional(),
+	services: z.array(z.string()).optional(),
+	healthChecks: z.array(DeclarativeHealthCheckSchema).optional(),
+	buildCommand: z.string().optional(),
+	buildCwd: z.string().optional(),
+	timeoutMs: z.number().int().positive().optional(),
+	pollIntervalMs: z.number().int().positive().optional()
+});
+const ToolingConfigSchema = z.object({
+	structure: z.enum(["single", "monorepo"]).optional(),
+	useEslintPlugin: z.boolean().optional(),
+	formatter: z.enum(["oxfmt", "prettier"]).optional(),
+	setupVitest: z.boolean().optional(),
+	ci: z.enum([
+		"github",
+		"forgejo",
+		"none"
+	]).optional(),
+	setupRenovate: z.boolean().optional(),
+	releaseStrategy: z.enum([
+		"release-it",
+		"simple",
+		"changesets",
+		"none"
+	]).optional(),
+	projectType: z.enum([
+		"default",
+		"node",
+		"react",
+		"library"
+	]).optional(),
+	detectPackageTypes: z.boolean().optional(),
+	setupDocker: z.boolean().optional(),
+	docker: z.record(z.string(), z.object({
+		dockerfile: z.string(),
+		context: z.string().default(".")
+	})).optional(),
+	dockerVerify: DockerVerifyConfigSchema.optional()
+});
+/** Load saved tooling config from the target directory. Returns undefined if missing or invalid. */
+function loadToolingConfig(targetDir) {
+	const fullPath = path.join(targetDir, CONFIG_FILE);
+	if (!existsSync(fullPath)) return void 0;
+	try {
+		const raw = readFileSync(fullPath, "utf-8");
+		const result = ToolingConfigSchema.safeParse(JSON.parse(raw));
+		return result.success ? result.data : void 0;
+	} catch {
+		return;
+	}
+}
+/** Config fields that can be overridden in .tooling.json. */
+const OVERRIDE_KEYS = [
+	"structure",
+	"useEslintPlugin",
+	"formatter",
+	"setupVitest",
+	"ci",
+	"setupRenovate",
+	"releaseStrategy",
+	"projectType",
+	"detectPackageTypes"
+];
+/** Keys that have no effect for monorepos (generators ignore them). */
+const MONOREPO_IGNORED_KEYS = new Set(["setupVitest", "projectType"]);
+/**
+* Save only the fields that differ from detected defaults to .tooling.json.
+* A fully conventional project produces `{}` (or a minimal set of overrides).
+* Keys that have no effect for the current structure are omitted.
+*/
+function saveToolingConfig(ctx, config) {
+	const defaults = computeDefaults(config.targetDir);
+	const isMonorepo = config.structure === "monorepo";
+	const overrides = {};
+	for (const key of OVERRIDE_KEYS) {
+		if (isMonorepo && MONOREPO_IGNORED_KEYS.has(key)) continue;
+		if (config[key] !== defaults[key]) overrides[key] = config[key];
+	}
+	const content = JSON.stringify(overrides, null, 2) + "\n";
+	const existing = ctx.exists(CONFIG_FILE) ? ctx.read(CONFIG_FILE) : void 0;
+	if (existing !== void 0 && contentEqual(CONFIG_FILE, existing, content)) return {
+		filePath: CONFIG_FILE,
+		action: "skipped",
+		description: "Already up to date"
+	};
+	ctx.write(CONFIG_FILE, content);
+	return {
+		filePath: CONFIG_FILE,
+		action: existing ? "updated" : "created",
+		description: "Saved tooling configuration"
+	};
+}
+/** Merge saved config over detected defaults. Saved values win when present. */
+function mergeWithSavedConfig(detected, saved) {
+	return {
+		name: detected.name,
+		isNew: detected.isNew,
+		targetDir: detected.targetDir,
+		structure: saved.structure ?? detected.structure,
+		useEslintPlugin: saved.useEslintPlugin ?? detected.useEslintPlugin,
+		formatter: saved.formatter ?? detected.formatter,
+		setupVitest: saved.setupVitest ?? detected.setupVitest,
+		ci: saved.ci ?? detected.ci,
+		setupRenovate: saved.setupRenovate ?? detected.setupRenovate,
+		releaseStrategy: saved.releaseStrategy ?? detected.releaseStrategy,
+		projectType: saved.projectType ?? detected.projectType,
+		detectPackageTypes: saved.detectPackageTypes ?? detected.detectPackageTypes
+	};
+}
+//#endregion
 //#region src/generators/package-json.ts
 const STANDARD_SCRIPTS_SINGLE = {
 	build: "tsdown",
@@ -522,8 +578,8 @@ const STANDARD_SCRIPTS_SINGLE = {
 	knip: "knip",
 	check: "pnpm exec tooling checks:run",
 	"ci:check": "pnpm check",
-	"tooling:check": "pnpm exec tooling repo:check",
-	"tooling:update": "pnpm exec tooling repo:update"
+	"tooling:check": "pnpm exec tooling repo:sync --check",
+	"tooling:sync": "pnpm exec tooling repo:sync"
 };
 const STANDARD_SCRIPTS_MONOREPO = {
 	build: "pnpm -r build",
@@ -533,16 +589,18 @@ const STANDARD_SCRIPTS_MONOREPO = {
 	knip: "knip",
 	check: "pnpm exec tooling checks:run",
 	"ci:check": "pnpm check",
-	"tooling:check": "pnpm exec tooling repo:check",
-	"tooling:update": "pnpm exec tooling repo:update"
+	"tooling:check": "pnpm exec tooling repo:sync --check",
+	"tooling:sync": "pnpm exec tooling repo:sync"
 };
 /** Scripts that tooling owns — map from script name to keyword that must appear in the value. */
 const MANAGED_SCRIPTS = {
 	check: "checks:run",
 	"ci:check": "pnpm check",
-	"tooling:check": "repo:check",
-	"tooling:update": "repo:update"
+	"tooling:check": "repo:sync --check",
+	"tooling:sync": "repo:sync"
 };
+/** Deprecated scripts to remove during migration. */
+const DEPRECATED_SCRIPTS = ["tooling:init", "tooling:update"];
 /** DevDeps that belong in every project (single repo) or per-package (monorepo). */
 const PER_PACKAGE_DEV_DEPS = {
 	"@types/node": "25.3.2",
@@ -597,8 +655,8 @@ function addReleaseDeps(deps, config) {
 function getAddedDevDepNames(config) {
 	const deps = { ...ROOT_DEV_DEPS };
 	if (config.structure !== "monorepo") Object.assign(deps, PER_PACKAGE_DEV_DEPS);
-	deps["@bensandee/config"] = "0.8.1";
-	deps["@bensandee/tooling"] = "0.15.0";
+	deps["@bensandee/config"] = "0.8.2";
+	deps["@bensandee/tooling"] = "0.17.0";
 	if (config.formatter === "oxfmt") deps["oxfmt"] = "0.35.0";
 	if (config.formatter === "prettier") deps["prettier"] = "3.8.1";
 	addReleaseDeps(deps, config);
@@ -618,8 +676,8 @@ async function generatePackageJson(ctx) {
 	if (ctx.config.releaseStrategy !== "none" && ctx.config.releaseStrategy !== "changesets") allScripts["trigger-release"] = "pnpm exec tooling release:trigger";
 	const devDeps = { ...ROOT_DEV_DEPS };
 	if (!isMonorepo) Object.assign(devDeps, PER_PACKAGE_DEV_DEPS);
-	devDeps["@bensandee/config"] = isWorkspacePackage(ctx, "@bensandee/config") ? "workspace:*" : "0.8.1";
-	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.15.0";
+	devDeps["@bensandee/config"] = isWorkspacePackage(ctx, "@bensandee/config") ? "workspace:*" : "0.8.2";
+	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.17.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";
@@ -644,6 +702,10 @@ async function generatePackageJson(ctx) {
 			existingScripts[key] = value;
 			changes.push(`updated script: ${key}`);
 		}
+		for (const key of DEPRECATED_SCRIPTS) if (key in existingScripts) {
+			delete existingScripts[key];
+			changes.push(`removed deprecated script: ${key}`);
+		}
 		pkg.scripts = existingScripts;
 		const existingDevDeps = pkg.devDependencies ?? {};
 		for (const [key, value] of Object.entries(devDeps)) if (!(key in existingDevDeps)) {
@@ -688,175 +750,6 @@ async function generatePackageJson(ctx) {
 	};
 }
 //#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:init`. 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("");
-	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",
-				rollup: "tsdown"
-			}[legacy.tool];
-			sections.push(`- Remove ${legacy.tool} config files (${legacy.files.map((f) => `\`${f}\``).join(", ")}). This project now uses **${replacement}**.`);
-			sections.push(`  - Uninstall ${legacy.tool}-related packages from devDependencies`);
-			if (legacy.tool === "eslint") sections.push("  - Migrate any custom ESLint rules that don't have oxlint equivalents");
-			if (legacy.tool === "jest") sections.push("  - Migrate any jest-specific test utilities (jest.mock, jest.fn) to vitest equivalents (vi.mock, vi.fn)");
-		}
-		sections.push("");
-	}
-	if (archived.length > 0) {
-		sections.push("### Review archived files");
-		sections.push("");
-		sections.push("The following files were modified or replaced. The originals have been saved to `.tooling-archived/`:");
-		sections.push("");
-		for (const r of archived) sections.push(`- \`${r.filePath}\` → \`.tooling-archived/${r.filePath}\``);
-		sections.push("");
-		sections.push("For each archived file, **diff the old version against the new one** and look for features, categories, or modules that were enabled in the original but are missing from the replacement. Focus on broad capability gaps rather than individual rule strictness (in general, being stricter is fine). Examples of what to look for:");
-		sections.push("");
-		sections.push("- **Lint configs**: enabled plugin categories (e.g. `jsx-a11y`, `import`, `react`, `nextjs`), custom `plugins` or `overrides`, file-scoped rule blocks");
-		sections.push("- **TypeScript configs**: compiler features like `jsx`, `paths`, `baseUrl`, or `references` that affect build behavior");
-		sections.push("- **Other configs**: feature flags, custom presets, or integrations that go beyond the default template");
-		sections.push("");
-		sections.push("If the old config had capabilities the new one lacks, port them into the new file. Then:");
-		sections.push("");
-		sections.push("1. If the project previously used `husky` and `lint-staged`, remove them from `devDependencies`");
-		sections.push("2. Delete the `.tooling-archived/` directory when migration is complete");
-		sections.push("");
-	}
-	const oxlintWasSkipped = results.find((r) => r.filePath === "oxlint.config.ts")?.action === "skipped";
-	if (detected.hasLegacyOxlintJson) {
-		sections.push("### Migrate .oxlintrc.json to oxlint.config.ts");
-		sections.push("");
-		sections.push("A new `oxlint.config.ts` has been generated using `defineConfig` from the `oxlint` package. The existing `.oxlintrc.json` needs to be migrated:");
-		sections.push("");
-		sections.push("1. Read `.oxlintrc.json` and compare its `rules` against the rules provided by `@bensandee/config/oxlint/recommended` (check `node_modules/@bensandee/config`). Most standard rules are already included in the recommended config.");
-		sections.push("2. If there are any custom rules, overrides, settings, or `jsPlugins` not covered by the recommended config, add them to `oxlint.config.ts` alongside the `extends`.");
-		sections.push("3. Delete `.oxlintrc.json`.");
-		sections.push("4. Run `pnpm lint` to verify the new config works correctly.");
-		sections.push("");
-	} else if (oxlintWasSkipped && detected.hasOxlintConfig) {
-		sections.push("### Verify oxlint.config.ts includes recommended rules");
-		sections.push("");
-		sections.push("The existing `oxlint.config.ts` was kept as-is. Verify that it extends the recommended config from `@bensandee/config/oxlint`:");
-		sections.push("");
-		sections.push("1. Open `oxlint.config.ts` and check that it imports and extends `@bensandee/config/oxlint/recommended`.");
-		sections.push("2. The expected pattern is:");
-		sections.push("   ```ts");
-		sections.push("   import recommended from \"@bensandee/config/oxlint/recommended\";");
-		sections.push("   import { defineConfig } from \"oxlint\";");
-		sections.push("");
-		sections.push("   export default defineConfig({ extends: [recommended] });");
-		sections.push("   ```");
-		sections.push("3. If it uses a different pattern, update it to extend the recommended config while preserving any project-specific customizations.");
-		sections.push("4. Run `pnpm lint` to verify the config works correctly.");
-		sections.push("");
-	}
-	if (config.structure === "monorepo" && !detected.hasPnpmWorkspace) {
-		sections.push("### Migrate to monorepo structure");
-		sections.push("");
-		sections.push("This project was converted from a single repo to a monorepo. Complete the migration:");
-		sections.push("");
-		sections.push("1. Move existing source into `packages/<name>/` (using the existing package name)");
-		sections.push("2. Split the root `package.json` into a root workspace manifest + package-level `package.json`");
-		sections.push("3. Move the existing `tsconfig.json` into the package and update the root tsconfig with project references");
-		sections.push("4. Create a package-level `tsdown.config.ts` in the new package");
-		sections.push("5. Update any import paths or build scripts affected by the move");
-		sections.push("");
-	}
-	const skippedConfigs = skipped.filter((r) => r.filePath !== "ci" && r.description !== "Not a monorepo");
-	if (skippedConfigs.length > 0) {
-		sections.push("### Review skipped files");
-		sections.push("");
-		sections.push("The following files were left unchanged. Review them for compatibility:");
-		sections.push("");
-		for (const r of skippedConfigs) sections.push(`- \`${r.filePath}\` — ${r.description}`);
-		sections.push("");
-	}
-	if (results.some((r) => r.filePath === "test/example.test.ts" && r.action === "created")) {
-		sections.push("### Generate tests");
-		sections.push("");
-		sections.push("A starter test was created at `test/example.test.ts`. Now:");
-		sections.push("");
-		sections.push("1. Review the existing source code in `src/`");
-		sections.push("2. Create additional test files following the starter test's patterns (import style, describe/it structure)");
-		sections.push("3. Focus on edge cases and core business logic");
-		sections.push("4. Aim for meaningful coverage of exported functions and key code paths");
-		sections.push("");
-	}
-	sections.push("## Ground rules");
-	sections.push("");
-	sections.push("It is OK to add new packages (e.g. `zod`, `@bensandee/common`) if they are needed to resolve errors.");
-	sections.push("");
-	sections.push("When resolving errors from the checklist below, prefer fixing the root cause over suppressing the issue. For example:");
-	sections.push("");
-	sections.push("- **Lint errors**: fix the code rather than adding disable comments or rule exceptions");
-	sections.push("- **Test failures**: update the test or fix the underlying bug rather than skipping or deleting the test");
-	sections.push("- **Knip findings**: remove genuinely unused code/exports/dependencies rather than adding ignores to `knip.config.ts`");
-	sections.push("- **Type errors**: add proper types rather than using `any` or `@ts-expect-error`");
-	sections.push("");
-	sections.push("Only suppress an issue if there is a clear, documented reason why the fix is not feasible (e.g. a third-party type mismatch). Leave a comment explaining why.");
-	sections.push("");
-	sections.push("## Verification checklist");
-	sections.push("");
-	sections.push("Run each of these commands and fix any errors before moving on:");
-	sections.push("");
-	sections.push("1. `pnpm install`");
-	const updateCmd = `pnpm update --latest ${getAddedDevDepNames(config).join(" ")}`;
-	sections.push(`2. \`${updateCmd}\` — bump added dependencies to their latest versions`);
-	sections.push("3. `pnpm typecheck` — fix any type errors");
-	sections.push("4. `pnpm build` — fix any build errors");
-	sections.push("5. `pnpm test` — fix any test failures");
-	sections.push("6. `pnpm lint` — fix the code to satisfy lint rules");
-	sections.push("7. `pnpm knip` — remove unused exports, dependencies, and dead code");
-	sections.push("8. `pnpm format` — fix any formatting issues");
-	sections.push("");
-	return sections.join("\n");
-}
-//#endregion
 //#region src/generators/tsconfig.ts
 async function generateTsconfig(ctx) {
 	const filePath = "tsconfig.json";
@@ -1210,7 +1103,7 @@ async function generateTsdown(ctx) {
 }
 //#endregion
 //#region src/generators/gitignore.ts
-/** Entries that every project should have — repo:check flags these as missing. */
+/** Entries that every project should have — repo:sync --check flags these as missing. */
 const REQUIRED_ENTRIES = [
 	"node_modules/",
 	".pnpm-store/",
@@ -1220,7 +1113,7 @@ const REQUIRED_ENTRIES = [
 	".env.*",
 	"!.env.example"
 ];
-/** Tooling-specific entries added during init/update but not required for repo:check. */
+/** 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 `/`. */
@@ -2575,15 +2468,34 @@ function requiredDeploySteps() {
 		}
 	];
 }
+/** 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 (!ctx.config.setupDocker || ctx.config.ci === "none") return {
+	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/deploy.yml" : ".forgejo/workflows/deploy.yml";
+	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)) {
@@ -2662,142 +2574,180 @@ async function runGenerators(ctx) {
 	results.push(await generateDeployCi(ctx));
 	results.push(...await generateVitest(ctx));
 	results.push(...await generateVscodeSettings(ctx));
+	results.push(saveToolingConfig(ctx, ctx.config));
 	return results;
 }
 //#endregion
-//#region src/utils/tooling-config.ts
-const CONFIG_FILE = ".tooling.json";
-const ToolingConfigSchema = z.object({
-	structure: z.enum(["single", "monorepo"]).optional(),
-	useEslintPlugin: z.boolean().optional(),
-	formatter: z.enum(["oxfmt", "prettier"]).optional(),
-	setupVitest: z.boolean().optional(),
-	ci: z.enum([
-		"github",
-		"forgejo",
-		"none"
-	]).optional(),
-	setupRenovate: z.boolean().optional(),
-	releaseStrategy: z.enum([
-		"release-it",
-		"simple",
-		"changesets",
-		"none"
-	]).optional(),
-	projectType: z.enum([
-		"default",
-		"node",
-		"react",
-		"library"
-	]).optional(),
-	detectPackageTypes: z.boolean().optional(),
-	setupDocker: z.boolean().optional(),
-	docker: z.record(z.string(), z.object({
-		dockerfile: z.string(),
-		context: z.string().default(".")
-	})).optional()
-});
-/** Load saved tooling config from the target directory. Returns undefined if missing or invalid. */
-function loadToolingConfig(targetDir) {
-	const fullPath = path.join(targetDir, CONFIG_FILE);
-	if (!existsSync(fullPath)) return void 0;
-	try {
-		const raw = readFileSync(fullPath, "utf-8");
-		const result = ToolingConfigSchema.safeParse(JSON.parse(raw));
-		return result.success ? result.data : void 0;
-	} catch {
-		return;
+//#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("");
+	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",
+				rollup: "tsdown"
+			}[legacy.tool];
+			sections.push(`- Remove ${legacy.tool} config files (${legacy.files.map((f) => `\`${f}\``).join(", ")}). This project now uses **${replacement}**.`);
+			sections.push(`  - Uninstall ${legacy.tool}-related packages from devDependencies`);
+			if (legacy.tool === "eslint") sections.push("  - Migrate any custom ESLint rules that don't have oxlint equivalents");
+			if (legacy.tool === "jest") sections.push("  - Migrate any jest-specific test utilities (jest.mock, jest.fn) to vitest equivalents (vi.mock, vi.fn)");
+		}
+		sections.push("");
 	}
-}
-/** Save the user's config choices to .tooling.json via the generator context. */
-function saveToolingConfig(ctx, config) {
-	const saved = {
-		structure: config.structure,
-		useEslintPlugin: config.useEslintPlugin,
-		formatter: config.formatter,
-		setupVitest: config.setupVitest,
-		ci: config.ci,
-		setupRenovate: config.setupRenovate,
-		releaseStrategy: config.releaseStrategy,
-		projectType: config.projectType,
-		detectPackageTypes: config.detectPackageTypes,
-		setupDocker: config.setupDocker
-	};
-	const content = JSON.stringify(saved, null, 2) + "\n";
-	const existing = ctx.exists(CONFIG_FILE) ? ctx.read(CONFIG_FILE) : void 0;
-	if (existing !== void 0 && contentEqual(CONFIG_FILE, existing, content)) return {
-		filePath: CONFIG_FILE,
-		action: "skipped",
-		description: "Already up to date"
-	};
-	ctx.write(CONFIG_FILE, content);
-	return {
-		filePath: CONFIG_FILE,
-		action: existing ? "updated" : "created",
-		description: "Saved tooling configuration"
-	};
-}
-/** Merge saved config over detected defaults. Saved values win when present. */
-function mergeWithSavedConfig(detected, saved) {
-	return {
-		name: detected.name,
-		isNew: detected.isNew,
-		targetDir: detected.targetDir,
-		structure: saved.structure ?? detected.structure,
-		useEslintPlugin: saved.useEslintPlugin ?? detected.useEslintPlugin,
-		formatter: saved.formatter ?? detected.formatter,
-		setupVitest: saved.setupVitest ?? detected.setupVitest,
-		ci: saved.ci ?? detected.ci,
-		setupRenovate: saved.setupRenovate ?? detected.setupRenovate,
-		releaseStrategy: saved.releaseStrategy ?? detected.releaseStrategy,
-		projectType: saved.projectType ?? detected.projectType,
-		detectPackageTypes: saved.detectPackageTypes ?? detected.detectPackageTypes,
-		setupDocker: saved.setupDocker ?? detected.setupDocker
-	};
+	if (archived.length > 0) {
+		sections.push("### Review archived files");
+		sections.push("");
+		sections.push("The following files were modified or replaced. The originals have been saved to `.tooling-archived/`:");
+		sections.push("");
+		for (const r of archived) sections.push(`- \`${r.filePath}\` → \`.tooling-archived/${r.filePath}\``);
+		sections.push("");
+		sections.push("For each archived file, **diff the old version against the new one** and look for features, categories, or modules that were enabled in the original but are missing from the replacement. Focus on broad capability gaps rather than individual rule strictness (in general, being stricter is fine). Examples of what to look for:");
+		sections.push("");
+		sections.push("- **Lint configs**: enabled plugin categories (e.g. `jsx-a11y`, `import`, `react`, `nextjs`), custom `plugins` or `overrides`, file-scoped rule blocks");
+		sections.push("- **TypeScript configs**: compiler features like `jsx`, `paths`, `baseUrl`, or `references` that affect build behavior");
+		sections.push("- **Other configs**: feature flags, custom presets, or integrations that go beyond the default template");
+		sections.push("");
+		sections.push("If the old config had capabilities the new one lacks, port them into the new file. Then:");
+		sections.push("");
+		sections.push("1. If the project previously used `husky` and `lint-staged`, remove them from `devDependencies`");
+		sections.push("2. Delete the `.tooling-archived/` directory when migration is complete");
+		sections.push("");
+	}
+	const oxlintWasSkipped = results.find((r) => r.filePath === "oxlint.config.ts")?.action === "skipped";
+	if (detected.hasLegacyOxlintJson) {
+		sections.push("### Migrate .oxlintrc.json to oxlint.config.ts");
+		sections.push("");
+		sections.push("A new `oxlint.config.ts` has been generated using `defineConfig` from the `oxlint` package. The existing `.oxlintrc.json` needs to be migrated:");
+		sections.push("");
+		sections.push("1. Read `.oxlintrc.json` and compare its `rules` against the rules provided by `@bensandee/config/oxlint/recommended` (check `node_modules/@bensandee/config`). Most standard rules are already included in the recommended config.");
+		sections.push("2. If there are any custom rules, overrides, settings, or `jsPlugins` not covered by the recommended config, add them to `oxlint.config.ts` alongside the `extends`.");
+		sections.push("3. Delete `.oxlintrc.json`.");
+		sections.push("4. Run `pnpm lint` to verify the new config works correctly.");
+		sections.push("");
+	} else if (oxlintWasSkipped && detected.hasOxlintConfig) {
+		sections.push("### Verify oxlint.config.ts includes recommended rules");
+		sections.push("");
+		sections.push("The existing `oxlint.config.ts` was kept as-is. Verify that it extends the recommended config from `@bensandee/config/oxlint`:");
+		sections.push("");
+		sections.push("1. Open `oxlint.config.ts` and check that it imports and extends `@bensandee/config/oxlint/recommended`.");
+		sections.push("2. The expected pattern is:");
+		sections.push("   ```ts");
+		sections.push("   import recommended from \"@bensandee/config/oxlint/recommended\";");
+		sections.push("   import { defineConfig } from \"oxlint\";");
+		sections.push("");
+		sections.push("   export default defineConfig({ extends: [recommended] });");
+		sections.push("   ```");
+		sections.push("3. If it uses a different pattern, update it to extend the recommended config while preserving any project-specific customizations.");
+		sections.push("4. Run `pnpm lint` to verify the config works correctly.");
+		sections.push("");
+	}
+	if (config.structure === "monorepo" && !detected.hasPnpmWorkspace) {
+		sections.push("### Migrate to monorepo structure");
+		sections.push("");
+		sections.push("This project was converted from a single repo to a monorepo. Complete the migration:");
+		sections.push("");
+		sections.push("1. Move existing source into `packages/<name>/` (using the existing package name)");
+		sections.push("2. Split the root `package.json` into a root workspace manifest + package-level `package.json`");
+		sections.push("3. Move the existing `tsconfig.json` into the package and update the root tsconfig with project references");
+		sections.push("4. Create a package-level `tsdown.config.ts` in the new package");
+		sections.push("5. Update any import paths or build scripts affected by the move");
+		sections.push("");
+	}
+	const skippedConfigs = skipped.filter((r) => r.filePath !== "ci" && r.description !== "Not a monorepo");
+	if (skippedConfigs.length > 0) {
+		sections.push("### Review skipped files");
+		sections.push("");
+		sections.push("The following files were left unchanged. Review them for compatibility:");
+		sections.push("");
+		for (const r of skippedConfigs) sections.push(`- \`${r.filePath}\` — ${r.description}`);
+		sections.push("");
+	}
+	if (results.some((r) => r.filePath === "test/example.test.ts" && r.action === "created")) {
+		sections.push("### Generate tests");
+		sections.push("");
+		sections.push("A starter test was created at `test/example.test.ts`. Now:");
+		sections.push("");
+		sections.push("1. Review the existing source code in `src/`");
+		sections.push("2. Create additional test files following the starter test's patterns (import style, describe/it structure)");
+		sections.push("3. Focus on edge cases and core business logic");
+		sections.push("4. Aim for meaningful coverage of exported functions and key code paths");
+		sections.push("");
+	}
+	sections.push("## Ground rules");
+	sections.push("");
+	sections.push("It is OK to add new packages (e.g. `zod`, `@bensandee/common`) if they are needed to resolve errors.");
+	sections.push("");
+	sections.push("When resolving errors from the checklist below, prefer fixing the root cause over suppressing the issue. For example:");
+	sections.push("");
+	sections.push("- **Lint errors**: fix the code rather than adding disable comments or rule exceptions");
+	sections.push("- **Test failures**: update the test or fix the underlying bug rather than skipping or deleting the test");
+	sections.push("- **Knip findings**: remove genuinely unused code/exports/dependencies rather than adding ignores to `knip.config.ts`");
+	sections.push("- **Type errors**: add proper types rather than using `any` or `@ts-expect-error`");
+	sections.push("");
+	sections.push("Only suppress an issue if there is a clear, documented reason why the fix is not feasible (e.g. a third-party type mismatch). Leave a comment explaining why.");
+	sections.push("");
+	sections.push("## Verification checklist");
+	sections.push("");
+	sections.push("Run each of these commands and fix any errors before moving on:");
+	sections.push("");
+	sections.push("1. `pnpm install`");
+	const updateCmd = `pnpm update --latest ${getAddedDevDepNames(config).join(" ")}`;
+	sections.push(`2. \`${updateCmd}\` — bump added dependencies to their latest versions`);
+	sections.push("3. `pnpm typecheck` — fix any type errors");
+	sections.push("4. `pnpm build` — fix any build errors");
+	sections.push("5. `pnpm test` — fix any test failures");
+	sections.push("6. `pnpm lint` — fix the code to satisfy lint rules");
+	sections.push("7. `pnpm knip` — remove unused exports, dependencies, and dead code");
+	sections.push("8. `pnpm format` — fix any formatting issues");
+	sections.push("");
+	return sections.join("\n");
 }
 //#endregion
 //#region src/commands/repo-init.ts
-const initCommand = defineCommand({
-	meta: {
-		name: "repo:init",
-		description: "Interactive setup wizard"
-	},
-	args: {
-		dir: {
-			type: "positional",
-			description: "Target directory (default: current directory)",
-			required: false
-		},
-		yes: {
-			type: "boolean",
-			alias: "y",
-			description: "Accept all defaults (non-interactive)"
-		},
-		"eslint-plugin": {
-			type: "boolean",
-			description: "Include @bensandee/eslint-plugin (default: true)"
-		},
-		"no-ci": {
-			type: "boolean",
-			description: "Skip CI workflow generation"
-		},
-		"no-prompt": {
-			type: "boolean",
-			description: "Skip migration prompt generation"
-		}
-	},
-	async run({ args }) {
-		const targetDir = path.resolve(args.dir ?? ".");
-		const saved = loadToolingConfig(targetDir);
-		await runInit(args.yes ? (() => {
-			const detected = buildDefaultConfig(targetDir, {
-				eslintPlugin: args["eslint-plugin"] === true ? true : void 0,
-				noCi: args["no-ci"] === true ? true : void 0
-			});
-			return saved ? mergeWithSavedConfig(detected, saved) : detected;
-		})() : await runInitPrompts(targetDir, saved), args["no-prompt"] === true ? { noPrompt: true } : {});
-	}
-});
 async function runInit(config, options = {}) {
 	const detected = detectProject(config.targetDir);
 	const s = p.spinner();
@@ -2819,7 +2769,6 @@ async function runInit(config, options = {}) {
 	}));
 	s.start("Generating configuration files...");
 	const results = await runGenerators(ctx);
-	results.push(saveToolingConfig(ctx, config));
 	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,
@@ -2828,7 +2777,6 @@ async function runInit(config, options = {}) {
 	});
 	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 || updated.length > 0 || archived.length > 0) && options.noPrompt) {
 		s.stop("Repository is up to date.");
@@ -2845,7 +2793,6 @@ async function runInit(config, options = {}) {
 	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(", ")}`);
-	if (skipped.length > 0) summaryLines.push(`Skipped: ${skipped.map((r) => r.filePath).join(", ")}`);
 	p.note(summaryLines.join("\n"), "Summary");
 	if (!options.noPrompt) {
 		const prompt = generateMigratePrompt(results, config, detected);
@@ -2878,57 +2825,68 @@ async function runInit(config, options = {}) {
 	return results;
 }
 //#endregion
-//#region src/commands/repo-update.ts
-const updateCommand = defineCommand({
+//#region src/commands/repo-sync.ts
+const syncCommand = defineCommand({
 	meta: {
-		name: "repo:update",
-		description: "Update managed config and add missing files"
+		name: "repo:sync",
+		description: "Detect, generate, and sync project tooling (idempotent)"
 	},
-	args: { dir: {
-		type: "positional",
-		description: "Target directory (default: current directory)",
-		required: false
-	} },
-	async run({ args }) {
-		await runUpdate(path.resolve(args.dir ?? "."));
-	}
-});
-async function runUpdate(targetDir) {
-	const saved = loadToolingConfig(targetDir);
-	if (!saved) {
-		p.log.error("No .tooling.json found. Run `tooling repo:init` first to initialize the project.");
-		process.exitCode = 1;
-		return [];
-	}
-	return runInit(mergeWithSavedConfig(buildDefaultConfig(targetDir, {}), saved), {
-		noPrompt: true,
-		confirmOverwrite: async () => "overwrite"
-	});
-}
-//#endregion
-//#region src/commands/repo-check.ts
-const checkCommand = defineCommand({
-	meta: {
-		name: "repo:check",
-		description: "Check repo for tooling drift (dry-run, CI-friendly)"
+	args: {
+		dir: {
+			type: "positional",
+			description: "Target directory (default: current directory)",
+			required: false
+		},
+		check: {
+			type: "boolean",
+			description: "Dry-run mode: report drift without writing files"
+		},
+		yes: {
+			type: "boolean",
+			alias: "y",
+			description: "Accept all defaults (non-interactive)"
+		},
+		"eslint-plugin": {
+			type: "boolean",
+			description: "Include @bensandee/eslint-plugin (default: true)"
+		},
+		"no-ci": {
+			type: "boolean",
+			description: "Skip CI workflow generation"
+		},
+		"no-prompt": {
+			type: "boolean",
+			description: "Skip migration prompt generation"
+		}
 	},
-	args: { dir: {
-		type: "positional",
-		description: "Target directory (default: current directory)",
-		required: false
-	} },
 	async run({ args }) {
-		const exitCode = await runCheck(path.resolve(args.dir ?? "."));
-		process.exitCode = exitCode;
+		const targetDir = path.resolve(args.dir ?? ".");
+		if (args.check) {
+			const exitCode = await runCheck(targetDir);
+			process.exitCode = exitCode;
+			return;
+		}
+		const saved = loadToolingConfig(targetDir);
+		const isFirstRun = !saved;
+		let config;
+		if (args.yes || !isFirstRun) {
+			const detected = buildDefaultConfig(targetDir, {
+				eslintPlugin: args["eslint-plugin"] === true ? true : void 0,
+				noCi: args["no-ci"] === true ? true : void 0
+			});
+			config = saved ? mergeWithSavedConfig(detected, saved) : detected;
+		} else config = await runInitPrompts(targetDir, saved);
+		await runInit(config, {
+			noPrompt: args["no-prompt"] === true || !isFirstRun,
+			...!isFirstRun && { confirmOverwrite: async () => "overwrite" }
+		});
 	}
 });
+/** Run sync in check mode: dry-run drift detection. */
 async function runCheck(targetDir) {
 	const saved = loadToolingConfig(targetDir);
-	if (!saved) {
-		p.log.error("No .tooling.json found. Run `tooling repo:init` first to initialize the project.");
-		return 1;
-	}
-	const { ctx, pendingWrites } = createDryRunContext(mergeWithSavedConfig(buildDefaultConfig(targetDir, {}), saved));
+	const detected = buildDefaultConfig(targetDir, {});
+	const { ctx, pendingWrites } = createDryRunContext(saved ? mergeWithSavedConfig(detected, saved) : detected);
 	const actionable = (await runGenerators(ctx)).filter((r) => {
 		if (r.action !== "created" && r.action !== "updated") return false;
 		const newContent = pendingWrites.get(r.filePath);
@@ -2943,7 +2901,7 @@ async function runCheck(targetDir) {
 		p.log.success("Repository is up to date.");
 		return 0;
 	}
-	p.log.warn(`${actionable.length} file(s) would be changed by repo:update`);
+	p.log.warn(`${actionable.length} file(s) would be changed by repo:sync`);
 	for (const r of actionable) {
 		p.log.info(`  ${r.action}: ${r.filePath} — ${r.description}`);
 		const newContent = pendingWrites.get(r.filePath);
@@ -2955,13 +2913,12 @@ async function runCheck(targetDir) {
 			p.log.info(`    + ${lineCount} new lines`);
 		} else {
 			const diff = lineDiff(existing, newContent);
-			if (diff.length > 0) for (const line of diff) p.log.info(`    ${line}`);
+			for (const line of diff) p.log.info(`    ${line}`);
 		}
 	}
 	return 1;
 }
 const normalize = (line) => line.trimEnd();
-/** Produce a compact line-level diff summary, ignoring whitespace-only differences. */
 function lineDiff(oldText, newText) {
 	const oldLines = oldText.split("\n").map(normalize);
 	const newLines = newText.split("\n").map(normalize);
@@ -3038,6 +2995,14 @@ function createRealExecutor() {
 			} catch (_error) {}
 			return packages;
 		},
+		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");
@@ -3986,34 +3951,95 @@ function readPackageInfo(executor, packageJsonPath) {
 		};
 	}
 }
+/** 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: "."
+		};
+	}
+}
 /**
-* Read docker config from .tooling.json and resolve packages.
-* Each entry in the docker map is keyed by package directory name.
+* 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 dockerMap = loadDockerMap(executor, cwd);
+	const overrides = loadDockerMap(executor, cwd);
+	const packageDirs = executor.listPackageDirs(cwd);
 	const packages = [];
-	for (const [dir, docker] of Object.entries(dockerMap)) {
-		const { name, version } = readPackageInfo(executor, path.join(cwd, "packages", dir, "package.json"));
-		packages.push({
-			dir,
-			imageName: `${repoName}-${name ?? dir}`,
-			version,
-			docker
-		});
+	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 from .tooling.json.
-* Used by the per-package image:build script.
+* 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 docker = loadDockerMap(executor, cwd)[dir];
-	if (!docker) throw new FatalError(`No docker config found for package "${dir}" in .tooling.json`);
+	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,
@@ -4235,13 +4261,11 @@ const dockerBuildCommand = defineCommand({
 const main = defineCommand({
 	meta: {
 		name: "tooling",
-		version: "0.15.0",
+		version: "0.17.0",
 		description: "Bootstrap and maintain standardized TypeScript project tooling"
 	},
 	subCommands: {
-		"repo:init": initCommand,
-		"repo:update": updateCommand,
-		"repo:check": checkCommand,
+		"repo:sync": syncCommand,
 		"checks:run": runChecksCommand,
 		"release:changesets": releaseForgejoCommand,
 		"release:trigger": releaseTriggerCommand,
@@ -4252,7 +4276,7 @@ const main = defineCommand({
 		"docker:build": dockerBuildCommand
 	}
 });
-console.log(`@bensandee/tooling v0.15.0`);
+console.log(`@bensandee/tooling v0.17.0`);
 runMain(main);
 //#endregion
 export {};