@bensandee/tooling 0.87.2 → 0.88.0

package/README.md

@@ -332,7 +332,7 @@ The feature has two halves: a **CI history** that captures one record per commit
 
 #### How it works
 
-`repo:sync` enables coverage tracking automatically when a `vitest.config.ts` is present. The generated `vitest.config.ts` includes the `json-summary` reporter so each `pnpm test:coverage` writes `coverage/coverage-summary.json` alongside the human-readable HTML report. A generated `coverage.yml` workflow runs on push to the default branch and pipes:
+`repo:sync` enables coverage tracking automatically when a `vitest.config.ts` is present. The generated `vitest.config.ts` includes the `json-summary` reporter so each `pnpm test:coverage` writes `coverage/coverage-summary.json` alongside the human-readable HTML report. The generated CI workflow (`ci.yml`, or `check.yml` for a non-changesets strategy) runs the coverage steps on push to the default branch and pipes:
 
 ```text
 pnpm test:coverage  ->  coverage:summary  ->  coverage:record  ->  coverage:status

package/dist/bin.mjs

@@ -269,7 +269,7 @@ function loadEnvFileForBin(rawArgs, bin, io = processIo) {
 */
 const envFileLoad = loadEnvFileForBin(process.argv.slice(2), {
 	name: "bst",
-	version: "0.87.2"
+	version: "0.88.0"
 });
 //#endregion
 //#region ../cli-kit/src/logger.ts
@@ -7029,8 +7029,6 @@ const MANAGED_SCRIPTS = {
 function matchesManagedScript(scriptValue, expectedFragment) {
 	return scriptValue.includes(expectedFragment);
 }
-/** Deprecated scripts to remove during migration. */
-const DEPRECATED_SCRIPTS = ["tooling:init", "tooling:update"];
 /**
 * DevDeps for each project/package (single repo) or per-package (monorepo),
 * filtered by what the stack actually uses. `typescript` is dropped (not just
@@ -7360,10 +7358,6 @@ function mergeManagedScripts(pkg, allScripts, changes) {
 			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;
 }
 /**
@@ -7593,9 +7587,9 @@ function buildManagedDevDeps(ctx) {
 	const isMonorepo = ctx.config.structure === "monorepo";
 	const devDeps = { ...rootDevDeps(ctx.config) };
 	if (!isMonorepo) Object.assign(devDeps, perPackageDevDeps(ctx.config));
-	if (ctx.config.stack !== "none" || ctx.config.ci === "forgejo") devDeps["@bensandee/config"] = isWorkspacePackage(ctx, "@bensandee/config") ? "workspace:*" : "0.14.5";
-	if (!isWorkspacePackage(ctx, "@bensandee/tooling")) devDeps["@bensandee/tooling"] = "0.87.2";
-	if (ctx.config.useEslintPlugin && ctx.config.stack !== "none") devDeps["@bensandee/eslint-plugin"] = isWorkspacePackage(ctx, "@bensandee/eslint-plugin") ? "workspace:*" : "0.16.0";
+	if (ctx.config.stack !== "none" || ctx.config.ci === "forgejo") devDeps["@bensandee/config"] = isWorkspacePackage(ctx, "@bensandee/config") ? "workspace:*" : "0.15.0";
+	if (!isWorkspacePackage(ctx, "@bensandee/tooling")) devDeps["@bensandee/tooling"] = "0.88.0";
+	if (ctx.config.useEslintPlugin && ctx.config.stack !== "none") devDeps["@bensandee/eslint-plugin"] = isWorkspacePackage(ctx, "@bensandee/eslint-plugin") ? "workspace:*" : "0.17.0";
 	if (ctx.config.formatter === "oxfmt") devDeps["oxfmt"] = {
 		"@changesets/cli": "3.0.3",
 		"@release-it/bumper": "8.0.1",
@@ -10579,41 +10573,6 @@ export default {${ignoreBinariesField(ignoreBinaries)}
 } satisfies KnipConfig;
 `;
 }
-/**
-* What earlier versions of this generator wrote. A repo that still carries one verbatim
-* is carrying our redundant ignores, and its `knip` step still reports the two config
-* hints -- so we rewrite it to the current template. Only a byte-identical match (modulo
-* the repo's formatter) qualifies: a config the user has edited is theirs, hints or not.
-*/
-function buildLegacyKnipConfigSingle(ignoreBinaries) {
-	return `import type { KnipConfig } from "knip";
-
-export default {
-  entry: ["src/index.ts"],
-  project: ["src/**/*.ts"],
-  ignore: ["dist/**", ".claude/hooks/**"],${ignoreBinariesField(ignoreBinaries)}
-} satisfies KnipConfig;
-`;
-}
-function buildLegacyKnipConfigMonorepo(ignoreBinaries) {
-	return `import type { KnipConfig } from "knip";
-
-export default {
-  ignore: [".claude/hooks/**"],${ignoreBinariesField(ignoreBinaries)}
-  workspaces: {
-    ".": {
-      entry: [],
-      project: [],
-    },
-    "packages/*": {
-      entry: ["src/index.ts", "src/bin.ts"],
-      project: ["src/**/*.ts"],
-      ignore: ["dist/**"],
-    },
-  },
-} satisfies KnipConfig;
-`;
-}
 const REQUIRED_IGNORE = ".claude/hooks/**";
 /** The file bst deploys into the consumer's repo, and the only thing REQUIRED_IGNORE defends. */
 const HOOK_FILE = ".claude/hooks/bst-hook.mjs";
@@ -10774,14 +10733,6 @@ async function generateKnip(ctx) {
 	const buildConfig = isMonorepo ? buildKnipConfigMonorepo : buildKnipConfigSingle;
 	const existingPath = KNIP_CONFIG_PATHS.find((p) => ctx.exists(p));
 	if (existingPath) {
-		if (existingPath === filePath && isLegacyTemplate(ctx, filePath, isMonorepo, ignoreBinaries)) {
-			ctx.write(filePath, formattedTemplate(ctx, filePath, buildConfig(ignoreBinaries)));
-			return {
-				filePath,
-				action: "updated",
-				description: "Dropped ignore patterns that are already outside knip's project scope"
-			};
-		}
 		const content = ctx.read(existingPath);
 		if (content === void 0) return {
 			filePath: existingPath,
@@ -10819,21 +10770,9 @@ async function generateKnip(ctx) {
 		description: createdDescription(filePath)
 	};
 }
-/**
-* Whether the config on disk is one this generator wrote before the redundant ignores were
-* dropped. Both the currently-detected `ignoreBinaries` and the empty form are candidates:
-* a repo that gained a `composer.json` after its last sync carries the older, binary-less
-* variant, and it deserves the same cleanup.
-*/
-function isLegacyTemplate(ctx, filePath, isMonorepo, ignoreBinaries) {
-	const build = isMonorepo ? buildLegacyKnipConfigMonorepo : buildLegacyKnipConfigSingle;
-	return (ignoreBinaries.length > 0 ? [build(ignoreBinaries), build([])] : [build([])]).some((legacy) => isGeneratedTemplate(ctx, filePath, legacy));
-}
 //#endregion
 //#region src/generators/renovate.ts
 const SHARED_PRESET = "local>bensandee/tooling";
-/** Deprecated npm-based preset to migrate away from. */
-const LEGACY_PRESET = "@bensandee/config";
 /** All known renovate config file locations, in priority order. */
 const RENOVATE_CONFIG_PATHS = [
 	"renovate.json",
@@ -10856,17 +10795,6 @@ async function generateRenovate(ctx) {
 		if (existing) {
 			const parsed = parseRenovateJson(existing);
 			const existingExtends = parsed.extends ?? [];
-			const legacyIndex = existingExtends.indexOf(LEGACY_PRESET);
-			if (legacyIndex !== -1) {
-				existingExtends[legacyIndex] = SHARED_PRESET;
-				parsed.extends = existingExtends;
-				ctx.write(existingPath, JSON.stringify(parsed, null, 2) + "\n");
-				return {
-					filePath: existingPath,
-					action: "updated",
-					description: `Migrated extends: ${LEGACY_PRESET} -> ${SHARED_PRESET}`
-				};
-			}
 			if (!existingExtends.includes(SHARED_PRESET)) {
 				existingExtends.unshift(SHARED_PRESET);
 				parsed.extends = existingExtends;
@@ -11088,22 +11016,6 @@ function parseClaudeSettings(raw) {
 		return;
 	}
 }
-/**
-* Instructions previously emitted to `.claude/settings.json#instructions`.
-* Migrated to a managed block in CLAUDE.md (see `claude-md.ts`); on sync we
-* strip any existing entry that matches (by either-direction prefix, mirroring
-* the upgrade-in-place semantics the merge logic used to apply on add).
-*/
-const MIGRATED_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. For no-empty-function: add a `{ /* no-op */ }` comment body instead of a disable comment.",
-	"Prefer extensionless imports; if an extension is required, use .ts over .js.",
-	"The bst-hook manages Bash/file permissions. See .claude/hooks/bst-hook-guide.md for auto-approved, denied, and passthrough commands."
-];
-function isMigratedInstruction(s) {
-	return MIGRATED_INSTRUCTIONS.some((c) => s.startsWith(c) || c.startsWith(s));
-}
 function buildSettings(ctx) {
 	const allow = [];
 	const enabledPlugins = { "code-simplifier@claude-plugins-official": true };
@@ -11127,15 +11039,6 @@ function buildSettings(ctx) {
 	};
 }
 const BST_HOOK_MARKER = "bst-hook.mjs";
-/** Remove old per-tool bst-hook entries that are now covered by a consolidated matcher. */
-function removeObsoleteBstHookEntries(matchers, consolidatedMatcher) {
-	const consolidatedTools = new Set(consolidatedMatcher.split("|"));
-	return matchers.filter((m) => {
-		if (m.matcher === void 0 || !consolidatedTools.has(m.matcher)) return true;
-		if (!m.hooks.some((h) => h.command?.includes(BST_HOOK_MARKER) === true)) return true;
-		return false;
-	});
-}
 /**
 * Merge a single generated matcher into `mergedHooks` for the given event,
 * returning the number of changes made (for change tracking).
@@ -11156,15 +11059,8 @@ function mergeGeneratedMatcher(mergedHooks, existingMatchers, event, gm) {
 		}
 		return 0;
 	}
-	let changes = 0;
-	if (gm.matcher !== void 0 && gm.matcher.includes("|")) {
-		const before = (mergedHooks[event] ?? []).length;
-		mergedHooks[event] = removeObsoleteBstHookEntries(mergedHooks[event] ?? [], gm.matcher);
-		changes += before - (mergedHooks[event] ?? []).length;
-	}
 	mergedHooks[event] = [...mergedHooks[event] ?? [], gm];
-	changes++;
-	return changes;
+	return 1;
 }
 /** Remove empty optional fields to keep the file clean. */
 function serializeSettings$1(settings) {
@@ -11188,9 +11084,6 @@ function writeOrMergeSettings(ctx, filePath, generated) {
 		const { settings, rawJson } = parsed;
 		const missingAllow = generated.permissions.allow.filter((rule) => !settings.permissions.allow.includes(rule));
 		const missingDeny = generated.permissions.deny.filter((rule) => !settings.permissions.deny.includes(rule));
-		const filteredInstructions = settings.instructions.filter((s) => !isMigratedInstruction(s));
-		const instructionChanges = settings.instructions.length - filteredInstructions.length;
-		const mergedInstructions = filteredInstructions;
 		let hookChanges = 0;
 		const mergedHooks = { ...settings.hooks };
 		for (const [event, generatedMatchers] of Object.entries(generated.hooks)) {
@@ -11199,11 +11092,11 @@ function writeOrMergeSettings(ctx, filePath, generated) {
 		}
 		const missingPlugins = Object.entries(generated.enabledPlugins).filter(([key]) => !(key in settings.enabledPlugins));
 		const missingMarketplaces = Object.entries(generated.extraKnownMarketplaces).filter(([key]) => !(key in settings.extraKnownMarketplaces));
-		const changed = missingAllow.length + missingDeny.length + hookChanges + instructionChanges + missingPlugins.length + missingMarketplaces.length;
+		const changed = missingAllow.length + missingDeny.length + hookChanges + missingPlugins.length + missingMarketplaces.length;
 		if (changed === 0) return {
 			filePath,
 			action: "skipped",
-			description: "Already has all rules and instructions"
+			description: "Already has all rules and hooks"
 		};
 		rawJson["permissions"] = {
 			...settings.permissions,
@@ -11211,7 +11104,7 @@ function writeOrMergeSettings(ctx, filePath, generated) {
 			deny: [...settings.permissions.deny, ...missingDeny]
 		};
 		if (Object.keys(mergedHooks).length > 0) rawJson["hooks"] = mergedHooks;
-		if (mergedInstructions.length > 0) rawJson["instructions"] = mergedInstructions;
+		if (settings.instructions.length > 0) rawJson["instructions"] = settings.instructions;
 		else delete rawJson["instructions"];
 		const updatedPlugins = { ...settings.enabledPlugins };
 		for (const [key, value] of missingPlugins) updatedPlugins[key] = value;
@@ -11225,7 +11118,7 @@ function writeOrMergeSettings(ctx, filePath, generated) {
 		return {
 			filePath,
 			action: "updated",
-			description: `Updated ${String(changed)} rules/instructions`
+			description: `Updated ${String(changed)} rules/hooks`
 		};
 	}
 	ctx.write(filePath, serializeSettings$1(generated));
@@ -11628,46 +11521,6 @@ async function generateVscodeSettings(ctx) {
 	return results;
 }
 //#endregion
-//#region src/generators/coverage-ci.ts
-/**
-* Cleanup-only generator: coverage steps now run inline in the CI workflow (see generateCi), so
-* any legacy `coverage.yml` left over from an older sync is removed.
-*
-* The result is `removed`, not `archived`: `repo:sync --check` counts only the former as drift,
-* and the agent's workflow sync sweep acts only on drift the check reports. An `archived` result
-* let a plain `repo:sync` delete a file while `--check` called the repo up to date.
-*
-* The ignore comment is the only opt-out here, and there is deliberately no managed-header guard:
-* this file predates the header, so no legacy `coverage.yml` in a synced repo carries one. Requiring
-* it would leave every file this generator exists to remove exactly where it is.
-*/
-async function generateCoverageCi(ctx) {
-	const filePath = "coverage-ci";
-	if (ctx.config.ci === "none") return {
-		filePath,
-		action: "skipped",
-		description: "CI workflow not requested"
-	};
-	const workflowPath = ctx.config.ci === "github" ? ".github/workflows/coverage.yml" : ".forgejo/workflows/coverage.yml";
-	const existing = ctx.read(workflowPath);
-	if (existing === void 0) return {
-		filePath,
-		action: "skipped",
-		description: "Coverage runs inline in ci.yml"
-	};
-	if (isToolingIgnored(existing)) return {
-		filePath: workflowPath,
-		action: "skipped",
-		description: "coverage.yml has ignore comment"
-	};
-	ctx.remove(workflowPath);
-	return {
-		filePath: workflowPath,
-		action: "removed",
-		description: `Moved to ${ARCHIVE_DIR$1}/${workflowPath} (coverage now runs inline in ci.yml)`
-	};
-}
-//#endregion
 //#region src/docs-check/blocks.ts
 /**
 * A line that opens something other than a labelled-line continuation: a `Key:`-style
@@ -12396,6 +12249,7 @@ const COMMENTS_GUIDE_BODY = [
 	"- Default to none. A comment earns its place by carrying what the code cannot -- a rejected alternative, the bug that forced this shape, an invariant enforced elsewhere -- and earns it one decision at a time, in a sentence or two each: what was rejected, and what it cost. Five decisions is five sentences, not five paragraphs. Recoverable from the code? Leave it unwritten.",
 	"- Present tense, about what is. No `now`, `previously`, `changed to`: diff narration is stale on the next edit, and the commit message carries it. No running ledgers or changelogs: when adjusting a threshold, constant, or baseline, state the active invariant and prune past deltas.",
 	"- Never cite a lifecycle-managed doc, PR, or issue from code: no PR or issue numbers (`PR #123`, `closes #456`), no path under `docs/superpowers/` or `docs/design/`, none carrying a `retired/` or `completed/` segment, no `docs/plan-*.md`, and no bare decision or task ID (`D3`, `T2`). They move, retire, and renumber, nothing checks the reference, and the reader has no way to tell a dead one from a live one. State the constraint itself, or cite a maintained reference doc instead. A `docs/` path that is a glob or an elided example rather than a reference (`docs/*.md`) is vocabulary, not a citation, and is fine.",
+	"- Code that exists only to accept an older shape -- a file, field, flag, environment variable, label or comment format -- carries `// @compat <id> until <expiry>: <reason>` on the line above it. The expiry is a date (`YYYY-MM-DD`) when the old shape lives with consumers who upgrade on their own schedule; a version of the code's own package (`v1.4.0`) when its consumer upgrades with each release; or `forge-clean` for old data on the forge, which has neither. Remove the code and every test that carries the same id together.",
 	"- **The code is the fact.** When a comment disagrees with it, fix it in one line or delete it -- never grow one to argue the code is right."
 ].join("\n");
 /**
@@ -12424,7 +12278,10 @@ const TESTING_GUIDE_BODY = [
 	"- Never assert that a constant equals its own literal (a default, threshold, model name, label). Test the logic that reads it.",
 	"- Never pin prose with `toContain`/`toBe`. Snapshot it, or assert a property: ordering, absence, output that changes with an input, a character set or length.",
 	"- One case per branch. A new literal down a path already tested, or the same call through a one-line wrapper, is a duplicate.",
-	"- Never assert what the test set up: a mock's stub, a type the compiler guarantees, a call count no caller relies on."
+	"- Never assert what the test set up: a mock's stub, a type the compiler guarantees, a call count no caller relies on.",
+	"- A test that exists only for a compatibility path carries the same `@compat` marker as the code.",
+	"- Test a branch in the module that owns it. A wrapper gets one test that it is wired to that module, not a re-run of the module's own cases.",
+	"- A fixture used in three or more cases goes into a builder, in the test file or in a shared test helper, not written out again in each case."
 ].join("\n");
 /**
 * Worktrees, issue linking, commit subjects, and merging the default branch in. The issue-linking
@@ -13260,7 +13117,6 @@ async function runGenerators(ctx) {
 	results.push(await generateReleaseCi(ctx));
 	results.push(...await generateStaleCiWorkflows(ctx));
 	results.push(await generateDeployCi(ctx));
-	results.push(await generateCoverageCi(ctx));
 	results.push(...await generateClaudeMd(ctx));
 	results.push(...await generateVitest(ctx));
 	results.push(...await generateVscodeSettings(ctx));
@@ -13291,7 +13147,7 @@ function reportFailures(failed, command) {
 function generateMigratePrompt(results, config, detected) {
 	const sections = [];
 	const timestamp = (/* @__PURE__ */ new Date()).toISOString();
-	sections.push(`# Migration Prompt\n\n_Generated by \`@bensandee/tooling@0.87.2 repo:sync\` on ${timestamp}_\n`);
+	sections.push(`# Migration Prompt\n\n_Generated by \`@bensandee/tooling@0.88.0 repo:sync\` on ${timestamp}_\n`);
 	const changed = results.filter((r) => r.action === "created" || r.action === "updated" || r.action === "archived");
 	if (changed.length > 0) {
 		const items = changed.map((r) => {
@@ -33418,7 +33274,7 @@ setForgejoLogger(log$1);
 * `local <sha>[-dirty]` otherwise -- so an artifact built from the working tree
 * can't pass itself off as the published release whose version it carries.
 */
-const displayVersion = "0.87.2";
+const displayVersion = "0.88.0";
 /**
 * The registered `bst` subcommand map, exported so both the JSON entry path below (resolving a
 * command name before citty parses anything) and the coverage test (enumerating every

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bensandee/tooling",
-  "version": "0.87.2",
+  "version": "0.88.0",
   "description": "CLI tool to bootstrap and maintain standardized TypeScript project tooling",
   "license": "MIT",
   "repository": {