@bensandee/tooling 0.35.0 → 0.37.0

package/README.md

@@ -58,6 +58,26 @@ tooling checks:run --add e2e
 
 The generated `ci:check` script defaults to `pnpm check --skip 'docker:*'` since CI environments typically lack Docker support.
 
+### Custom blocks in workflows
+
+Generated workflow files are regenerated on each `repo:sync` run. To preserve custom additions (extra steps, environment variables, etc.), wrap them in custom block markers:
+
+```yaml
+- name: Run checks
+  run: pnpm ci:check
+# @tooling:custom
+- name: Upload coverage
+  uses: actions/upload-artifact@v4
+  with:
+    name: coverage
+    path: coverage/
+# @tooling:endcustom
+```
+
+Custom blocks are anchored to the nearest preceding non-blank line. When `repo:sync` regenerates the workflow, it extracts custom blocks from the existing file, generates fresh content, then re-inserts each block after its anchor line. If the anchor line is no longer present (e.g. a step was renamed), the block is appended at the end of the file.
+
+To skip a workflow file entirely, add `# @bensandee/tooling:ignore` as the first line — `repo:sync` will leave the file untouched.
+
 ### Release management
 
 | Command                          | Description                                                                                                                                   |

package/dist/bin.mjs

@@ -956,7 +956,76 @@ function runDockerPublish(executor, config) {
 //#endregion
 //#region src/utils/yaml-merge.ts
 const IGNORE_PATTERN = "@bensandee/tooling:ignore";
+const CUSTOM_START = "# @tooling:custom";
+const CUSTOM_END = "# @tooling:endcustom";
 const FORGEJO_SCHEMA_COMMENT = "# yaml-language-server: $schema=../../.vscode/forgejo-workflow.schema.json\n";
+/** Extract custom blocks from a workflow file, recording their anchor lines. */
+function extractCustomBlocks(content) {
+	const lines = content.split("\n");
+	const blocks = [];
+	let i = 0;
+	while (i < lines.length) if (lines[i].trim() === CUSTOM_START) {
+		let anchor = "";
+		for (let j = i - 1; j >= 0; j--) if (lines[j].trim() !== "") {
+			anchor = lines[j].trim();
+			break;
+		}
+		const blockLines = [lines[i]];
+		i++;
+		while (i < lines.length && lines[i].trim() !== CUSTOM_END) {
+			blockLines.push(lines[i]);
+			i++;
+		}
+		if (i < lines.length) {
+			blockLines.push(lines[i]);
+			i++;
+		}
+		blocks.push({
+			anchor,
+			lines: blockLines
+		});
+	} else i++;
+	return blocks;
+}
+/** Remove custom blocks (markers + content) from a workflow string. */
+function stripCustomBlocks(content) {
+	const lines = content.split("\n");
+	const result = [];
+	let inCustom = false;
+	for (const line of lines) {
+		if (line.trim() === CUSTOM_START) {
+			inCustom = true;
+			continue;
+		}
+		if (inCustom && line.trim() === CUSTOM_END) {
+			inCustom = false;
+			continue;
+		}
+		if (!inCustom) result.push(line);
+	}
+	return result.join("\n");
+}
+/** Insert previously extracted custom blocks into freshly generated content, anchored by preceding line. */
+function insertCustomBlocks(generated, blocks) {
+	if (blocks.length === 0) return generated;
+	const lines = generated.split("\n");
+	const insertions = [];
+	for (const block of blocks) {
+		let insertAfter = -1;
+		for (let i = 0; i < lines.length; i++) if (lines[i].trim() === block.anchor) {
+			insertAfter = i;
+			break;
+		}
+		if (insertAfter < 0) insertAfter = lines.length - 1;
+		insertions.push({
+			afterIndex: insertAfter,
+			block
+		});
+	}
+	insertions.sort((a, b) => b.afterIndex - a.afterIndex);
+	for (const { afterIndex, block } of insertions) lines.splice(afterIndex + 1, 0, ...block.lines);
+	return lines.join("\n");
+}
 /** Prepend the Forgejo schema comment if it's not already present. No-op for GitHub. */
 function ensureSchemaComment(content, ci) {
 	if (ci !== "forgejo") return content;
@@ -1014,7 +1083,7 @@ function mergeLefthookCommands(existing, requiredCommands) {
 * don't cause unnecessary overwrites.
 */
 function normalizeWorkflow(content) {
-	const doc = parseDocument(content.replaceAll(/node\s+packages\/tooling-cli\/dist\/bin\.mjs/g, "pnpm exec bst"));
+	const doc = parseDocument(stripCustomBlocks(content).replaceAll(/node\s+packages\/tooling-cli\/dist\/bin\.mjs/g, "pnpm exec bst"));
 	doc.comment = null;
 	doc.commentBefore = null;
 	visit(doc, {
@@ -1156,7 +1225,9 @@ async function generateDeployCi(ctx) {
 			description: "Publish workflow already up to date"
 		};
 	}
-	ctx.write(workflowPath, preserveDevBinaryPath(content, existing));
+	const withDevPath = preserveDevBinaryPath(content, existing);
+	const final = existing ? insertCustomBlocks(withDevPath, extractCustomBlocks(existing)) : withDevPath;
+	ctx.write(workflowPath, final);
 	return {
 		filePath: workflowPath,
 		action: alreadyExists ? "updated" : "created",
@@ -1345,8 +1416,6 @@ function isWorkspacePackage(ctx, packageName) {
 	} catch (_error) {}
 	return false;
 }
-/** Deps that should not be blindly bumped to latest (version-sensitive). */
-const UPDATE_EXCLUDE = new Set(["@types/node"]);
 /** Add release-strategy-specific devDeps to a deps record. */
 function addReleaseDeps(deps, config) {
 	switch (config.releaseStrategy) {
@@ -1422,47 +1491,6 @@ function addReleaseDeps(deps, config) {
 			break;
 	}
 }
-/** Returns the list of pinned devDependency names that the tool would add for a given config. */
-function getAddedDevDepNames(config) {
-	const deps = { ...ROOT_DEV_DEPS };
-	if (config.structure !== "monorepo") Object.assign(deps, PER_PACKAGE_DEV_DEPS);
-	deps["@bensandee/config"] = "0.9.1";
-	deps["@bensandee/tooling"] = "0.35.0";
-	if (config.formatter === "oxfmt") deps["oxfmt"] = {
-		"@changesets/cli": "2.30.0",
-		"@release-it/bumper": "7.0.5",
-		"@types/node": "24.12.0",
-		"commit-and-tag-version": "12.7.0",
-		"knip": "5.87.0",
-		"lefthook": "2.1.4",
-		"oxfmt": "0.41.0",
-		"oxlint": "1.56.0",
-		"prettier": "3.8.1",
-		"release-it": "19.2.4",
-		"tsdown": "0.21.4",
-		"typescript": "5.9.3",
-		"vitest": "4.1.0",
-		"pnpm": "10.32.1"
-	}["oxfmt"];
-	if (config.formatter === "prettier") deps["prettier"] = {
-		"@changesets/cli": "2.30.0",
-		"@release-it/bumper": "7.0.5",
-		"@types/node": "24.12.0",
-		"commit-and-tag-version": "12.7.0",
-		"knip": "5.87.0",
-		"lefthook": "2.1.4",
-		"oxfmt": "0.41.0",
-		"oxlint": "1.56.0",
-		"prettier": "3.8.1",
-		"release-it": "19.2.4",
-		"tsdown": "0.21.4",
-		"typescript": "5.9.3",
-		"vitest": "4.1.0",
-		"pnpm": "10.32.1"
-	}["prettier"];
-	addReleaseDeps(deps, config);
-	return Object.keys(deps).filter((name) => !UPDATE_EXCLUDE.has(name));
-}
 async function generatePackageJson(ctx) {
 	const filePath = "package.json";
 	const existing = ctx.read(filePath);
@@ -1482,7 +1510,7 @@ async function generatePackageJson(ctx) {
 	const devDeps = { ...ROOT_DEV_DEPS };
 	if (!isMonorepo) Object.assign(devDeps, PER_PACKAGE_DEV_DEPS);
 	devDeps["@bensandee/config"] = isWorkspacePackage(ctx, "@bensandee/config") ? "workspace:*" : "0.9.1";
-	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.35.0";
+	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.37.0";
 	if (ctx.config.useEslintPlugin) devDeps["@bensandee/eslint-plugin"] = isWorkspacePackage(ctx, "@bensandee/eslint-plugin") ? "workspace:*" : "0.9.2";
 	if (ctx.config.formatter === "oxfmt") devDeps["oxfmt"] = {
 		"@changesets/cli": "2.30.0",
@@ -2116,7 +2144,9 @@ async function generateCi(ctx) {
 			description: "CI workflow already up to date"
 		};
 	}
-	ctx.write(filePath, preserveDevBinaryPath(content, existing));
+	const withDevPath = preserveDevBinaryPath(content, existing);
+	const final = existing ? insertCustomBlocks(withDevPath, extractCustomBlocks(existing)) : withDevPath;
+	ctx.write(filePath, final);
 	return {
 		filePath,
 		action: alreadyExists ? "updated" : "created",
@@ -2332,6 +2362,7 @@ function buildSettings(ctx) {
 		`Bash(${pm} knip)`,
 		`Bash(${pm} knip *)`,
 		`Bash(${pm} check)`,
+		`Bash(${pm} ci:check)`,
 		`Bash(${pm} exec oxlint *)`,
 		`Bash(${pm} exec knip *)`,
 		"Bash(git status *)",
@@ -2505,7 +2536,7 @@ async function generateClaudeSettings(ctx) {
 }
 //#endregion
 //#region src/generators/release-it.ts
-function buildConfig$2(ci, isMonorepo) {
+function buildConfig$3(ci, isMonorepo) {
 	const config = {
 		$schema: "https://unpkg.com/release-it/schema/release-it.json",
 		git: {
@@ -2533,7 +2564,7 @@ async function generateReleaseIt(ctx) {
 		action: "skipped",
 		description: "release-it not requested"
 	};
-	const content = JSON.stringify(buildConfig$2(ctx.config.ci, ctx.config.structure === "monorepo"), null, 2) + "\n";
+	const content = JSON.stringify(buildConfig$3(ctx.config.ci, ctx.config.structure === "monorepo"), null, 2) + "\n";
 	const existing = ctx.read(filePath);
 	if (existing) {
 		if (contentEqual(filePath, existing, content)) return {
@@ -2556,7 +2587,7 @@ async function generateReleaseIt(ctx) {
 }
 //#endregion
 //#region src/generators/changesets.ts
-function buildConfig$1() {
+function buildConfig$2() {
 	return {
 		$schema: "https://unpkg.com/@changesets/config@3.1.1/schema.json",
 		changelog: "@changesets/cli/changelog",
@@ -2576,7 +2607,7 @@ async function generateChangesets(ctx) {
 		action: "skipped",
 		description: "Changesets not requested"
 	};
-	const content = JSON.stringify(buildConfig$1(), null, 2) + "\n";
+	const content = JSON.stringify(buildConfig$2(), null, 2) + "\n";
 	const existing = ctx.read(filePath);
 	if (existing) return {
 		filePath,
@@ -2743,7 +2774,9 @@ async function generateReleaseCi(ctx) {
 			description: "Release workflow already up to date"
 		};
 	}
-	ctx.write(workflowPath, preserveDevBinaryPath(content, existing));
+	const withDevPath = preserveDevBinaryPath(content, existing);
+	const final = existing ? insertCustomBlocks(withDevPath, extractCustomBlocks(existing)) : withDevPath;
+	ctx.write(workflowPath, final);
 	return {
 		filePath: workflowPath,
 		action: alreadyExists ? "updated" : "created",
@@ -2761,7 +2794,7 @@ function requiredCommands(formatter) {
 		}
 	};
 }
-function buildConfig(formatter) {
+function buildConfig$1(formatter) {
 	return [
 		"pre-commit:",
 		"  commands:",
@@ -2865,7 +2898,7 @@ function cleanPackageJson(ctx, results) {
 }
 async function generateLefthook(ctx) {
 	const filePath = "lefthook.yml";
-	const content = buildConfig(ctx.config.formatter);
+	const content = buildConfig$1(ctx.config.formatter);
 	const results = [];
 	archiveHuskyHooks(ctx, results);
 	archiveLintStagedConfigs(ctx, results);
@@ -3006,6 +3039,72 @@ async function generateVscodeSettings(ctx) {
 	return results;
 }
 //#endregion
+//#region src/generators/versionrc.ts
+function buildConfig() {
+	return {
+		header: "# Changelog\n\nAll notable changes to this project will be documented in this file.\n",
+		types: [
+			{
+				type: "feat",
+				section: "Features"
+			},
+			{
+				type: "fix",
+				section: "Bug Fixes"
+			},
+			{
+				type: "chore",
+				section: "Chores"
+			},
+			{
+				type: "refactor",
+				section: "Refactoring"
+			},
+			{
+				type: "perf",
+				section: "Performance"
+			},
+			{
+				type: "docs",
+				hidden: true
+			},
+			{
+				type: "style",
+				hidden: true
+			},
+			{
+				type: "test",
+				hidden: true
+			},
+			{
+				type: "ci",
+				hidden: true
+			}
+		],
+		tagPrefix: "v"
+	};
+}
+async function generateVersionrc(ctx) {
+	const filePath = ".versionrc.json";
+	if (ctx.config.releaseStrategy !== "simple") return {
+		filePath,
+		action: "skipped",
+		description: "simple release not requested"
+	};
+	if (ctx.exists(filePath)) return {
+		filePath,
+		action: "skipped",
+		description: "Existing versionrc config preserved"
+	};
+	const content = JSON.stringify(buildConfig(), null, 2) + "\n";
+	ctx.write(filePath, content);
+	return {
+		filePath,
+		action: "created",
+		description: "Generated .versionrc.json"
+	};
+}
+//#endregion
 //#region src/generators/pipeline.ts
 /** Run all generators sequentially and return their results. */
 async function runGenerators(ctx) {
@@ -3023,6 +3122,7 @@ async function runGenerators(ctx) {
 	results.push(await generateCi(ctx));
 	results.push(...await generateClaudeSettings(ctx));
 	results.push(await generateReleaseIt(ctx));
+	results.push(await generateVersionrc(ctx));
 	results.push(await generateChangesets(ctx));
 	results.push(await generateReleaseCi(ctx));
 	results.push(await generateDeployCi(ctx));
@@ -3035,51 +3135,30 @@ async function runGenerators(ctx) {
 //#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.
+* Piped into Claude Code via `cat .tooling-migrate.md | claude`.
 */
 function generateMigratePrompt(results, config, detected) {
 	const sections = [];
 	const timestamp = (/* @__PURE__ */ new Date()).toISOString();
 	sections.push("# Migration Prompt");
 	sections.push("");
-	sections.push(`_Generated by \`@bensandee/tooling@0.35.0 repo:sync\` on ${timestamp}_`);
-	sections.push("");
-	sections.push("The following prompt was generated by `@bensandee/tooling repo:sync`. Paste it into Claude Code or another AI assistant to finish migrating this repository.");
-	sections.push("");
-	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(`_Generated by \`@bensandee/tooling@0.37.0 repo:sync\` on ${timestamp}_`);
 	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}`);
+	const changed = results.filter((r) => r.action === "created" || r.action === "updated" || r.action === "archived");
+	if (changed.length > 0) {
+		sections.push("## Files changed");
 		sections.push("");
-	}
-	if (skipped.length > 0) {
-		sections.push("**Skipped (review these):**");
-		for (const r of skipped) sections.push(`- \`${r.filePath}\` — ${r.description}`);
+		for (const r of changed) {
+			const label = r.action === "archived" ? "archived" : r.action;
+			sections.push(`- \`${r.filePath}\` (${label}) — ${r.description}`);
+		}
 		sections.push("");
 	}
-	sections.push("## Migration tasks");
-	sections.push("");
+	const tasks = [];
 	const legacyToRemove = detected.legacyConfigs.filter((legacy) => !(legacy.tool === "prettier" && config.formatter === "prettier"));
 	if (legacyToRemove.length > 0) {
-		sections.push("### Remove legacy tooling");
-		sections.push("");
+		tasks.push("### Remove legacy tooling");
+		tasks.push("");
 		for (const legacy of legacyToRemove) {
 			const replacement = {
 				eslint: "oxlint",
@@ -3088,118 +3167,83 @@ function generateMigratePrompt(results, config, detected) {
 				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)");
+			tasks.push(`- Remove ${legacy.tool} config files (${legacy.files.map((f) => `\`${f}\``).join(", ")}). This project now uses **${replacement}**.`);
+			tasks.push(`  - Uninstall ${legacy.tool}-related packages from devDependencies`);
+			if (legacy.tool === "eslint") tasks.push("  - Migrate any custom ESLint rules that don't have oxlint equivalents");
+			if (legacy.tool === "jest") tasks.push("  - Migrate jest-specific test utilities (jest.mock, jest.fn) to vitest equivalents (vi.mock, vi.fn)");
 		}
-		sections.push("");
+		tasks.push("");
 	}
+	const archived = results.filter((r) => r.action === "archived");
 	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("");
+		tasks.push("### Review archived files");
+		tasks.push("");
+		tasks.push("The originals have been saved to `.tooling-archived/`. For each, diff the old version against the new one and port any capabilities the new file lacks:");
+		tasks.push("");
+		for (const r of archived) tasks.push(`- \`${r.filePath}\` → \`.tooling-archived/${r.filePath}\``);
+		tasks.push("");
+		tasks.push("If the project previously used `husky` and `lint-staged`, remove them from `devDependencies`. Delete `.tooling-archived/` when done.");
+		tasks.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("");
+		tasks.push("### Migrate .oxlintrc.json to oxlint.config.ts");
+		tasks.push("");
+		tasks.push("Compare `.oxlintrc.json` rules against `@bensandee/config/oxlint/recommended`. Port any custom rules/overrides into `oxlint.config.ts`, then delete `.oxlintrc.json`.");
+		tasks.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("");
+		tasks.push("### Verify oxlint.config.ts extends recommended rules");
+		tasks.push("");
+		tasks.push("Ensure `oxlint.config.ts` imports and extends `@bensandee/config/oxlint/recommended`:");
+		tasks.push("");
+		tasks.push("```ts");
+		tasks.push("import recommended from \"@bensandee/config/oxlint/recommended\";");
+		tasks.push("import { defineConfig } from \"oxlint\";");
+		tasks.push("");
+		tasks.push("export default defineConfig({ extends: [recommended] });");
+		tasks.push("```");
+		tasks.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("");
+		tasks.push("### Migrate to monorepo structure");
+		tasks.push("");
+		tasks.push("This project was converted to a monorepo. Complete the migration:");
+		tasks.push("");
+		tasks.push("1. Move existing source into `packages/<name>/`");
+		tasks.push("2. Split root `package.json` into workspace manifest + package-level `package.json`");
+		tasks.push("3. Move `tsconfig.json` into the package, add project references to root");
+		tasks.push("4. Create a package-level `tsdown.config.ts`");
+		tasks.push("5. Update import paths and build scripts");
+		tasks.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:");
+	if (results.some((r) => r.filePath === "test/example.test.ts" && r.action === "created")) {
+		tasks.push("### Generate tests");
+		tasks.push("");
+		tasks.push("A starter test was created at `test/example.test.ts`. Review `src/` and create additional tests covering exported functions and edge cases.");
+		tasks.push("");
+	}
+	if (tasks.length > 0) {
+		sections.push("## Migration tasks");
 		sections.push("");
-		for (const r of skippedConfigs) sections.push(`- \`${r.filePath}\` — ${r.description}`);
+		sections.push(...tasks);
+		sections.push("## Ground rules");
 		sections.push("");
-	}
-	if (results.some((r) => r.filePath === "test/example.test.ts" && r.action === "created")) {
-		sections.push("### Generate tests");
+		sections.push("Prefer fixing root causes over suppressing issues:");
 		sections.push("");
-		sections.push("A starter test was created at `test/example.test.ts`. Now:");
+		sections.push("- **Lint errors**: fix the code, not disable comments");
+		sections.push("- **Type errors**: add proper types, not `any` or `@ts-expect-error`");
+		sections.push("- **Test failures**: fix the test or bug, don't skip/delete");
+		sections.push("- **Knip findings**: remove unused code, don't add ignores");
 		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("It is OK to add new packages (e.g. `zod`, `@bensandee/common`) to resolve errors. Only suppress an issue with a comment explaining why the fix is not feasible.");
 		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("## Verify");
 	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("Run `pnpm check` and fix any errors. This runs the full pipeline:");
+	sections.push("build → typecheck → lint → test → format → knip");
 	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("When everything passes, run `/init` to generate a `CLAUDE.md` for this repository.");
 	sections.push("");
 	return sections.join("\n");
 }
@@ -3226,11 +3270,11 @@ function contextAsDockerReader(ctx) {
 function logDetectionSummary(ctx) {
 	if (ctx.config.publishDocker) {
 		const dockerPackages = detectDockerPackages(contextAsDockerReader(ctx), ctx.targetDir, ctx.config.name);
-		if (dockerPackages.length > 0) log.info(`Docker images: ${dockerPackages.map((pkg) => pkg.imageName).join(", ")}`);
+		if (dockerPackages.length > 0) log.info(`Docker images to build and publish: ${dockerPackages.map((pkg) => pkg.imageName).join(", ")}`);
 	}
 	if (ctx.config.publishNpm) {
 		const publishable = getPublishablePackages(ctx.targetDir, ctx.config.structure, ctx.packageJson);
-		if (publishable.length > 0) log.info(`npm packages: ${publishable.map((pkg) => pkg.name).join(", ")}`);
+		if (publishable.length > 0) log.info(`npm packages to publish: ${publishable.map((pkg) => pkg.name).join(", ")}`);
 	}
 }
 async function runInit(config, options = {}) {
@@ -3278,22 +3322,19 @@ 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(", ")}`);
 	note(summaryLines.join("\n"), "Summary");
-	if (!options.noPrompt) {
-		log.info(`Migration prompt written to ${promptPath}`);
-		log.info("In Claude Code, run: \"Execute the steps in .tooling-migrate.md\"");
-	}
-	const bensandeeDeps = getAddedDevDepNames(config).filter((name) => name.startsWith("@bensandee/"));
+	if (!options.noPrompt) log.info(`Migration prompt written to ${promptPath}`);
+	const packageJsonChanged = results.some((r) => r.filePath === "package.json" && (r.action === "created" || r.action === "updated"));
 	const hasLockfile = ctx.exists("pnpm-lock.yaml");
-	if (bensandeeDeps.length > 0 && hasLockfile) {
-		log.info("Updating @bensandee/* packages...");
+	if (packageJsonChanged && hasLockfile) {
+		log.info("package.json changed — running pnpm install...");
 		try {
-			execSync(`pnpm update --latest ${bensandeeDeps.join(" ")}`, {
+			execSync("pnpm install", {
 				cwd: config.targetDir,
 				stdio: "inherit",
-				timeout: 6e4
+				timeout: 12e4
 			});
 		} catch (_error) {
-			log.warn("Could not update @bensandee/* packages — run pnpm install manually");
+			log.warn("pnpm install failed — run it manually");
 		}
 	}
 	if (hasChanges && ctx.exists("package.json")) try {
@@ -3304,10 +3345,10 @@ async function runInit(config, options = {}) {
 		});
 	} catch (_error) {}
 	note([
-		"1. Run: pnpm install",
-		"2. Run: pnpm check",
-		...options.noPrompt ? [] : ["3. In Claude Code, run: \"Execute the steps in .tooling-migrate.md\""]
-	].join("\n"), "Next steps");
+		...packageJsonChanged && !hasLockfile ? ["Run: pnpm install"] : [],
+		"Run: pnpm check",
+		...!options.noPrompt ? ["Run: claude \"Execute the migration steps in .tooling-migrate.md\""] : []
+	].map((step, i) => `${i + 1}. ${step}`).join("\n"), "Next steps");
 	return results;
 }
 //#endregion
@@ -4915,7 +4956,7 @@ const dockerCheckCommand = defineCommand({
 const main = defineCommand({
 	meta: {
 		name: "bst",
-		version: "0.35.0",
+		version: "0.37.0",
 		description: "Bootstrap and maintain standardized TypeScript project tooling"
 	},
 	subCommands: {
@@ -4931,7 +4972,7 @@ const main = defineCommand({
 		"docker:check": dockerCheckCommand
 	}
 });
-console.log(`@bensandee/tooling v0.35.0`);
+console.log(`@bensandee/tooling v0.37.0`);
 async function run() {
 	await runMain(main);
 	process.exit(process.exitCode ?? 0);

package/package.json

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