@bensandee/tooling 0.7.2 → 0.8.0

package/dist/bin.mjs

@@ -160,6 +160,32 @@ function detectProjectType(targetDir) {
 	if (pkg.exports || pkg.main || pkg.types || pkg.typings) return "library";
 	return "default";
 }
+const WEB_UI_DEPS = new Set([
+	"react",
+	"react-dom",
+	"vue",
+	"svelte",
+	"solid-js",
+	"next",
+	"nuxt",
+	"@angular/core",
+	"preact"
+]);
+/** Check whether a package.json depends on a web UI framework. */
+function packageHasWebUIDeps(pkg) {
+	const deps = {
+		...pkg.dependencies,
+		...pkg.devDependencies
+	};
+	for (const dep of WEB_UI_DEPS) if (dep in deps) return true;
+	return false;
+}
+/** Check whether a package.json in the given directory depends on a web UI framework. */
+function hasWebUIDeps(targetDir) {
+	const pkg = readPackageJson(targetDir);
+	if (!pkg) return false;
+	return packageHasWebUIDeps(pkg);
+}
 /** List packages in a monorepo's packages/ directory. */
 function getMonorepoPackages(targetDir) {
 	const packagesDir = path.join(targetDir, "packages");
@@ -772,6 +798,8 @@ function generateMigratePrompt(results, config, detected) {
 	}
 	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");
@@ -803,13 +831,12 @@ function generateMigratePrompt(results, config, detected) {
 async function generateTsconfig(ctx) {
 	const filePath = "tsconfig.json";
 	const existing = ctx.read(filePath);
-	if (ctx.config.structure === "monorepo") return [generateMonorepoRootTsconfig(ctx, existing), ...ctx.config.detectPackageTypes ? generateMonorepoPackageTsconfigs(ctx) : []];
+	if (ctx.config.structure === "monorepo") return [generateMonorepoRootTsconfig(ctx), ...ctx.config.detectPackageTypes ? generateMonorepoPackageTsconfigs(ctx) : []];
 	const extendsValue = `@bensandee/config/tsconfig/${ctx.config.projectType}`;
 	if (!existing) {
 		const config = {
 			extends: extendsValue,
-			include: ["src"],
-			exclude: ["node_modules", "dist"]
+			...ctx.exists("src") ? { include: ["src"] } : {}
 		};
 		ctx.write(filePath, JSON.stringify(config, null, 2) + "\n");
 		return [{
@@ -863,12 +890,14 @@ function mergeSingleTsconfig(ctx, filePath, extendsValue) {
 		parsed.extends = extendsValue;
 		changes.push(`added extends: ${extendsValue}`);
 	}
-	const existingInclude = parsed.include ?? [];
-	if (!existingInclude.includes("src")) {
-		existingInclude.push("src");
-		changes.push("added \"src\" to include");
+	if (!parsed.include) {
+		const tsconfigDir = path.dirname(filePath);
+		const srcDir = tsconfigDir === "." ? "src" : path.join(tsconfigDir, "src");
+		if (ctx.exists(srcDir)) {
+			parsed.include = ["src"];
+			changes.push("added include: [\"src\"]");
+		}
 	}
-	parsed.include = existingInclude;
 	if (changes.length === 0) return {
 		filePath,
 		action: "skipped",
@@ -881,31 +910,18 @@ function mergeSingleTsconfig(ctx, filePath, extendsValue) {
 		description: changes.join(", ")
 	};
 }
-function generateMonorepoRootTsconfig(ctx, existing) {
+function generateMonorepoRootTsconfig(ctx) {
 	const filePath = "tsconfig.json";
-	if (existing) {
-		const parsed = parseTsconfig(existing);
-		if (!parsed.references) {
-			parsed.files = [];
-			parsed.references = [];
-			ctx.write(filePath, JSON.stringify(parsed, null, 2) + "\n");
-			return {
-				filePath,
-				action: "updated",
-				description: "Added project references structure for monorepo"
-			};
-		}
-		return {
-			filePath,
-			action: "skipped",
-			description: "Already has project references"
-		};
-	}
-	return {
+	if (!ctx.read(filePath)) return {
 		filePath,
 		action: "skipped",
 		description: "No tsconfig.json found"
 	};
+	return {
+		filePath,
+		action: "skipped",
+		description: "Root tsconfig left as-is"
+	};
 }
 function generateMonorepoPackageTsconfigs(ctx) {
 	const packages = getMonorepoPackages(ctx.targetDir);
@@ -944,12 +960,10 @@ function generateMonorepoPackageTsconfigs(ctx) {
 				parsed.extends = extendsValue;
 				changes.push(prev ? `changed extends: ${String(prev)} → ${extendsValue}` : `added extends: ${extendsValue}`);
 			}
-			const existingInclude = parsed.include ?? [];
-			if (!existingInclude.includes("src")) {
-				existingInclude.push("src");
-				changes.push("added \"src\" to include");
+			if (!parsed.include && ctx.exists(path.join(relDir, "src"))) {
+				parsed.include = ["src"];
+				changes.push("added include: [\"src\"]");
 			}
-			parsed.include = existingInclude;
 			if (changes.length === 0) {
 				results.push({
 					filePath,
@@ -967,8 +981,7 @@ function generateMonorepoPackageTsconfigs(ctx) {
 		} else {
 			const config = {
 				extends: extendsValue,
-				include: ["src"],
-				exclude: ["node_modules", "dist"]
+				...ctx.exists(path.join(relDir, "src")) ? { include: ["src"] } : {}
 			};
 			ctx.write(filePath, JSON.stringify(config, null, 2) + "\n");
 			results.push({
@@ -1107,23 +1120,15 @@ async function generateFormatter(ctx) {
 }
 async function generateOxfmt(ctx) {
 	const filePath = ".oxfmtrc.json";
-	const existing = ctx.read(filePath);
-	if (existing) {
-		if (existing === OXFMT_CONFIG) return {
-			filePath,
-			action: "skipped",
-			description: "Already configured"
-		};
-		if (await ctx.confirmOverwrite(filePath) === "skip") return {
-			filePath,
-			action: "skipped",
-			description: "Existing oxfmt config preserved"
-		};
-	}
+	if (ctx.exists(filePath)) return {
+		filePath,
+		action: "skipped",
+		description: "Existing oxfmt config preserved"
+	};
 	ctx.write(filePath, OXFMT_CONFIG);
 	return {
 		filePath,
-		action: existing ? "updated" : "created",
+		action: "created",
 		description: "Generated .oxfmtrc.json"
 	};
 }
@@ -1267,6 +1272,24 @@ jobs:
       - run: pnpm exec tooling repo:check
 `;
 }
+/**
+* Insert a step at the end of the `check` job's steps, even if other jobs
+* follow. Returns null if we can't find the right insertion point.
+*/
+function insertStepIntoCheckJob(yaml, step) {
+	const lines = yaml.split("\n");
+	const checkJobIdx = lines.findIndex((l) => /^ {2}check:\s*$/.test(l));
+	if (checkJobIdx === -1) return null;
+	let lastStepIdx = -1;
+	for (const [i, line] of lines.entries()) {
+		if (i <= checkJobIdx) continue;
+		if (/^ {2}\S/.test(line)) break;
+		if (/^ {6}/.test(line)) lastStepIdx = i;
+	}
+	if (lastStepIdx === -1) return null;
+	lines.splice(lastStepIdx + 1, 0, step.trimEnd());
+	return lines.join("\n");
+}
 async function generateCi(ctx) {
 	if (ctx.config.ci === "none") return {
 		filePath: "ci",
@@ -1281,13 +1304,15 @@ async function generateCi(ctx) {
 	if (ctx.exists(filePath)) {
 		const existing = ctx.read(filePath);
 		if (existing && !existing.includes("repo:check")) {
-			const patched = existing.trimEnd() + "\n      - run: pnpm exec tooling repo:check\n";
-			ctx.write(filePath, patched);
-			return {
-				filePath,
-				action: "updated",
-				description: "Added `pnpm exec tooling repo:check` step to CI workflow"
-			};
+			const patched = insertStepIntoCheckJob(existing, "      - run: pnpm exec tooling repo:check\n");
+			if (patched) {
+				ctx.write(filePath, patched);
+				return {
+					filePath,
+					action: "updated",
+					description: "Added `pnpm exec tooling repo:check` step to CI workflow"
+				};
+			}
 		}
 		return {
 			filePath,
@@ -1458,7 +1483,9 @@ const ClaudeSettingsSchema = z.object({
 		allow: [],
 		deny: []
 	}),
-	instructions: z.array(z.string()).default([])
+	instructions: z.array(z.string()).default([]),
+	enabledPlugins: z.record(z.string(), z.boolean()).default({}),
+	extraKnownMarketplaces: z.record(z.string(), z.record(z.string(), z.unknown())).default({})
 });
 function parseClaudeSettings(raw) {
 	try {
@@ -1522,11 +1549,21 @@ function buildSettings(ctx) {
 		"Bash(test *)",
 		"Bash([ *)",
 		"Bash(find *)",
+		"Bash(grep *)",
 		"Bash(which *)",
 		"Bash(node -e *)",
 		"Bash(node -p *)"
 	];
 	if (ctx.config.structure === "monorepo") allow.push(`Bash(${pm} --filter *)`, `Bash(${pm} -r *)`);
+	const enabledPlugins = { "code-simplifier@claude-plugins-official": true };
+	const extraKnownMarketplaces = {};
+	if (ctx.config.structure === "monorepo" ? getMonorepoPackages(ctx.targetDir).some((p) => hasWebUIDeps(p.dir)) : ctx.packageJson ? packageHasWebUIDeps(ctx.packageJson) : false) {
+		enabledPlugins["example-skills@anthropic-agent-skills"] = true;
+		extraKnownMarketplaces["anthropic-agent-skills"] = { source: {
+			source: "github",
+			repo: "anthropics/skills"
+		} };
+	}
 	return {
 		permissions: {
 			allow,
@@ -1534,17 +1571,68 @@ function buildSettings(ctx) {
 				"Bash(npx *)",
 				"Bash(git push *)",
 				"Bash(git push)",
-				"Bash(git reset --hard *)",
-				"Bash(rm -rf *)"
+				"Bash(git add *)",
+				"Bash(git add)",
+				"Bash(git commit *)",
+				"Bash(git commit)",
+				"Bash(git reset *)",
+				"Bash(git merge *)",
+				"Bash(git rebase *)",
+				"Bash(git cherry-pick *)",
+				"Bash(git checkout *)",
+				"Bash(git switch *)",
+				"Bash(git stash *)",
+				"Bash(git tag *)",
+				"Bash(git revert *)",
+				"Bash(git clean *)",
+				"Bash(git rm *)",
+				"Bash(git mv *)",
+				"Bash(rm -rf *)",
+				"Bash(cat *.env)",
+				"Bash(cat *.env.*)",
+				"Bash(cat .env)",
+				"Bash(cat .env.*)",
+				"Bash(head *.env)",
+				"Bash(head *.env.*)",
+				"Bash(head .env)",
+				"Bash(head .env.*)",
+				"Bash(tail *.env)",
+				"Bash(tail *.env.*)",
+				"Bash(tail .env)",
+				"Bash(tail .env.*)",
+				"Bash(less *.env)",
+				"Bash(less *.env.*)",
+				"Bash(less .env)",
+				"Bash(less .env.*)",
+				"Bash(more *.env)",
+				"Bash(more *.env.*)",
+				"Bash(more .env)",
+				"Bash(more .env.*)",
+				"Bash(grep * .env)",
+				"Bash(grep * .env.*)",
+				"Read(.env)",
+				"Read(.env.*)",
+				"Read(*.env)",
+				"Read(*.env.*)"
 			]
 		},
 		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."
-		]
+		],
+		enabledPlugins,
+		extraKnownMarketplaces
 	};
 }
+/** Remove enabledPlugins/extraKnownMarketplaces when empty to keep the file clean. */
+function serializeSettings(settings) {
+	const { enabledPlugins, extraKnownMarketplaces, ...rest } = settings;
+	const out = { ...rest };
+	if (Object.keys(enabledPlugins).length > 0) out["enabledPlugins"] = enabledPlugins;
+	if (Object.keys(extraKnownMarketplaces).length > 0) out["extraKnownMarketplaces"] = extraKnownMarketplaces;
+	return JSON.stringify(out, null, 2) + "\n";
+}
 async function generateClaudeSettings(ctx) {
 	const filePath = ".claude/settings.json";
 	const existing = ctx.read(filePath);
@@ -1559,7 +1647,10 @@ async function generateClaudeSettings(ctx) {
 		const missingAllow = generated.permissions.allow.filter((rule) => !parsed.permissions.allow.includes(rule));
 		const missingDeny = generated.permissions.deny.filter((rule) => !parsed.permissions.deny.includes(rule));
 		const missingInstructions = generated.instructions.filter((inst) => !parsed.instructions.includes(inst));
-		if (missingAllow.length === 0 && missingDeny.length === 0 && missingInstructions.length === 0) return {
+		const missingPlugins = Object.entries(generated.enabledPlugins).filter(([key]) => !(key in parsed.enabledPlugins));
+		const missingMarketplaces = Object.entries(generated.extraKnownMarketplaces).filter(([key]) => !(key in parsed.extraKnownMarketplaces));
+		const added = missingAllow.length + missingDeny.length + missingInstructions.length + missingPlugins.length + missingMarketplaces.length;
+		if (added === 0) return {
 			filePath,
 			action: "skipped",
 			description: "Already has all rules and instructions"
@@ -1567,15 +1658,16 @@ async function generateClaudeSettings(ctx) {
 		parsed.permissions.allow = [...parsed.permissions.allow, ...missingAllow];
 		parsed.permissions.deny = [...parsed.permissions.deny, ...missingDeny];
 		parsed.instructions = [...parsed.instructions, ...missingInstructions];
-		const added = missingAllow.length + missingDeny.length + missingInstructions.length;
-		ctx.write(filePath, JSON.stringify(parsed, null, 2) + "\n");
+		for (const [key, value] of missingPlugins) parsed.enabledPlugins[key] = value;
+		for (const [key, value] of missingMarketplaces) parsed.extraKnownMarketplaces[key] = value;
+		ctx.write(filePath, serializeSettings(parsed));
 		return {
 			filePath,
 			action: "updated",
 			description: `Added ${String(added)} rules/instructions`
 		};
 	}
-	ctx.write(filePath, JSON.stringify(generated, null, 2) + "\n");
+	ctx.write(filePath, serializeSettings(generated));
 	return {
 		filePath,
 		action: "created",
@@ -2971,7 +3063,7 @@ function mergeGitHub(dryRun) {
 const main = defineCommand({
 	meta: {
 		name: "tooling",
-		version: "0.7.2",
+		version: "0.8.0",
 		description: "Bootstrap and maintain standardized TypeScript project tooling"
 	},
 	subCommands: {
@@ -2984,7 +3076,7 @@ const main = defineCommand({
 		"release:merge": releaseMergeCommand
 	}
 });
-console.log(`@bensandee/tooling v0.7.2`);
+console.log(`@bensandee/tooling v0.8.0`);
 runMain(main);
 
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bensandee/tooling",
-  "version": "0.7.2",
+  "version": "0.8.0",
   "description": "CLI tool to bootstrap and maintain standardized TypeScript project tooling",
   "bin": {
     "tooling": "./dist/bin.mjs"
@@ -33,7 +33,7 @@
     "tsdown": "0.20.3",
     "typescript": "5.9.3",
     "vitest": "4.0.18",
-    "@bensandee/config": "0.6.3"
+    "@bensandee/config": "0.6.5"
   },
   "scripts": {
     "build": "tsdown",