@rtorcato/repo-tooling 3.35.0 → 3.37.0

package/AGENTS.md

@@ -26,7 +26,7 @@ Every command supports `--json` and a non-interactive mode. Combine with `--yes`
 | `fix --dry-run` | ✅ | ✅ | Print what each fixer would write without writing. Combine with `--json`. |
 | `list --json` | ✅ | ✅ | Enumerate the library's surface area. Each entry has `{ name, description, exports, fixTarget }`. |
 | `copy <name>` | ✅ | text only | Copy a single preset (`biome`, `tsconfig`) into the current directory. |
-| `loop guard --root <path>` | ✅ | ✅ | Guard an `ai-issue-loop` tick: repair a wrongly-bare main checkout, gate the `node_modules` rebuild (`--removed`). Exit `0` continue, `1` repair failed, `2` root is not a repairable checkout — both non-zero halt the tick. |
+| `loop guard --root <path>` | ✅ | ✅ | Guard an `ai-issue-loop` tick: repair a wrongly-bare main checkout, gate the `node_modules` rebuild (`--removed`), and assert `gh` authenticates as the declared `rules.aiLoop.agentUser`. Exit `0` continue, `1` repair failed, `2` root is not a repairable checkout or the agent identity is wrong — both non-zero halt the tick. |
 
 ## Recommended workflows
 
@@ -94,11 +94,11 @@ npx @rtorcato/repo-tooling fix claude-skills --yes --json
 
 ## Drift policy (important)
 
-`fix` defaults the confirm prompt to **No** for drift cases (existing file that doesn't extend our preset). The `--yes` flag is required to overwrite drift. Safe-merge fixers (`engines`, `husky`, `package-json`) never overwrite — they add/merge — and use friendlier prompt wording. `fix --json` implies `--yes` (prompts would corrupt JSON output).
+`fix` defaults the confirm prompt to **No** for drift cases (existing file that doesn't extend our preset). The `--yes` flag is required to overwrite drift. Safe-merge fixers (`biome`, `engines`, `husky`, `package-json`) never overwrite — they add/merge — and use friendlier prompt wording. `fix --json` implies `--yes` (prompts would corrupt JSON output).
 
 Fixers marked `explicitOnly` are exempt from `fix` all *and* from `fix --yes` — they only run when named as the target. Today that is `claude-skills`, the one fixer whose blast radius is outside the repo.
 
-A fixer may also **refuse** — the target file holds something the generator cannot reproduce, so overwriting would destroy it. Today that is `dependabot` against a config with repo-local `ignore:` rules (#422). A targeted `fix dependabot` then exits 1 with `error: dependabot-ignore-rules`; a bulk `fix --yes` records it `skipped` and carries on with the rest. Neither `--yes` nor `--json` overrides it — resolve the named rules by hand and re-run.
+A fixer may also **refuse** — the target file holds something the generator cannot reproduce, so overwriting would destroy it. Today that is `dependabot` against a config with repo-local `ignore:` rules (#422), and `biome` against a `biome.json` that does not parse, whose settings cannot be merged (#587). A targeted `fix dependabot` then exits 1 with `error: dependabot-ignore-rules`; a bulk `fix --yes` records it `skipped` and carries on with the rest. Neither `--yes` nor `--json` overrides it — resolve the named rules by hand and re-run.
 
 ## Source-of-truth files in the repo
 

package/README.md

@@ -67,9 +67,10 @@ Tailwind v4, exclude your stylesheet in `biome.json`:
 ```jsonc
 {
   "extends": ["@rtorcato/repo-tooling/biome"],
-  // `includes` replaces the preset's list rather than extending it — restate
-  // the exclusions you still want alongside the CSS one.
-  "files": { "includes": ["**", "!**/node_modules", "!**/dist", "!**/*.css"] }
+  // List only the extra negations — Biome merges them into the preset's
+  // `includes`. Do NOT repeat the leading `"**"`: that is a lint error,
+  // `lint/suspicious/noBiomeFirstException`.
+  "files": { "includes": ["!**/*.css"] }
 }
 ```
 
@@ -91,7 +92,7 @@ See the [Getting Started guide](https://rtorcato.github.io/repo-tooling/guides/g
 | `copy <config>` | Copy a single config file into the current project. | `npx @rtorcato/repo-tooling copy biome` |
 | `doctor` | Diagnose an existing project for missing or drifted tooling. | `npx @rtorcato/repo-tooling doctor` |
 | `fix [target]` | Apply scaffolders for what `doctor` flagged (`--yes`, `--dry-run`, `--diff`). | `npx @rtorcato/repo-tooling fix` |
-| `loop guard` | Repair a main checkout that has gone `core.bare = true`, and gate the `node_modules` rebuild after a worktree removal. Exits `1` if the repair failed and `2` if the root is not a repairable checkout — see `--help`. | `npx @rtorcato/repo-tooling loop guard --root .` |
+| `loop guard` | Repair a main checkout that has gone `core.bare = true`, gate the `node_modules` rebuild after a worktree removal, and halt when `gh` is not authenticated as the `rules.aiLoop.agentUser` the repo declares. Exits `1` if the repair failed and `2` if the root is not a repairable checkout or the identity is wrong — see `--help`. | `npx @rtorcato/repo-tooling loop guard --root .` |
 
 Prefer to run the audit in CI? `doctor` also ships as a GitHub Action:
 

package/dist/cli/commands/doctor.js

@@ -22,7 +22,7 @@ import { LOCKFILE_VERSION, readLockfile } from '../utils/lockfile.js';
 import { compareRulesWithReference } from '../utils/reference-rules.js';
 import { declinedInLock, getFixTargetForCheck } from './fix-targets.js';
 import { checkAiSetup, checkBrand, checkCodeowners, checkClaudeSkills, checkCodeQL, checkCommunityHealth, checkCoverageUpload, checkDependabot, checkEditorConfig, checkFile, checkGitHooks, checkGitHubActions, checkGitLabCI, checkNestedLanguages, checkPrePushHook, checkReadmeBadges, checkRecommendedMcp, checkRequiredSkills, COMMITLINT_FILE_CHECK, } from '../../base/checks.js';
-import { allDeps, checkAreTheTypesWrong, checkBiome, checkClaudeWorktreeSettings, checkConfigSchemaVersions, checkDocsSite, checkEnginesNode, checkExportsBuildable, checkGitDependencies, checkKnip, checkLintStaged, checkNodeVersionConsistency, checkNodeVersionPin, checkPackageJson, checkPackageManager, checkPublint, checkSemanticRelease, checkSizeLimit, checkTailwind, checkBuildApprovals, checkPnpmWorkspace, checkTreeshakeSetup, checkTurborepo, checkTypedoc, checkVerifyScript, checkVscodeExtensions, evaluateNodeVersion, FILE_CHECKS, findDocsAppDir, jsBadgeAudience, jsGitHooksProfile, readPackageJson, } from '../../languages/js/checks.js';
+import { allDeps, checkAreTheTypesWrong, checkBiome, checkClaudeWorktreeSettings, checkConfigSchemaVersions, checkDocsSite, checkEnginesNode, checkExportsBuildable, checkGitDependencies, checkKnip, checkLintStaged, checkNodeVersionConsistency, checkNodeVersionPin, checkPackageJson, checkPackageManager, checkPeerVersions, checkPublint, checkSemanticRelease, checkSizeLimit, checkTailwind, checkBuildApprovals, checkPnpmWorkspace, checkTreeshakeSetup, checkTurborepo, checkTypedoc, checkVerifyScript, checkVscodeExtensions, evaluateNodeVersion, FILE_CHECKS, findDocsAppDir, jsBadgeAudience, jsGitHooksProfile, readPackageJson, } from '../../languages/js/checks.js';
 export { evaluateNodeVersion };
 const PACKAGE = '@rtorcato/repo-tooling';
 // Detects the broken-release-on-protected-main footgun: a workflow that runs
@@ -366,6 +366,7 @@ export async function runDoctor(dir, skillsDir) {
     results.push(await checkPackageManager(targetDir, pkg));
     results.push(await checkConfigSchemaVersions(targetDir, pkg));
     results.push(checkGitDependencies(pkg));
+    results.push(await checkPeerVersions(targetDir, pkg));
     results.push(await checkVscodeExtensions(targetDir));
     results.push(await checkNodeVersionPin(targetDir));
     results.push(await checkNodeVersionConsistency(targetDir, pkg));

package/dist/cli/commands/loop-guard.js

@@ -3,6 +3,7 @@ import path from 'node:path';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 import { realGitExec } from '../../base/git-identity.js';
+import { realGhExec } from '../../base/github-settings.js';
 /**
  * The invariant table from the skill, verified on git 2.55.0:
  *
@@ -34,6 +35,45 @@ export function classifyRoot(insideWorkTree, gitEntry) {
         return 'linked-worktree';
     return 'genuinely-bare';
 }
+const LOCKFILE = '.repo-tooling.json';
+/**
+ * `rules.aiLoop.agentUser`, with the flat pre-v4 fallback — the same pair the
+ * skill's `jq` reads. Read raw rather than through `readLockfile`, whose parser
+ * requires a `record.config`: a hand-written rules-only lockfile is exactly the
+ * file this has to see.
+ */
+export async function configuredAgentUser(root) {
+    const raw = await fs.readJson(path.join(root, LOCKFILE)).catch(() => null);
+    const user = raw?.rules?.aiLoop?.agentUser ?? raw?.aiLoop?.agentUser;
+    return typeof user === 'string' && user.trim() !== '' ? user.trim() : undefined;
+}
+/**
+ * Declared intent that is not met is a misconfiguration, not a degraded mode —
+ * so this halts, unlike the assignability check in `base/agent-user.ts`, which
+ * warns and carries on. That check can never catch this: `agentUser` is
+ * assignable regardless of who is calling.
+ */
+export async function checkAgentIdentity(configured, gh) {
+    if (!configured) {
+        return {
+            verdict: 'not-configured',
+            message: `no aiLoop.agentUser in ${LOCKFILE} — identity check skipped`,
+        };
+    }
+    const r = await gh(['api', 'user', '--jq', '.login']);
+    const effective = r.ok ? r.stdout.trim() : '';
+    // GitHub logins are case-insensitive, so a case difference is one account.
+    if (effective !== '' && effective.toLowerCase() === configured.toLowerCase()) {
+        return {
+            verdict: 'match',
+            message: `gh is authenticated as ${effective} — the configured agent account`,
+        };
+    }
+    return {
+        verdict: 'mismatch',
+        message: `⚠ agentUser is ${configured} but gh authenticates as ${effective || '(gh could not say — unauthenticated or missing)'} — the tick would commit, push and review as the wrong account`,
+    };
+}
 /**
  * `--frozen-lockfile` forbids re-resolution, so neither `pnpm-lock.yaml` nor a
  * `pnpm-workspace.yaml` carve-out moves as a side effect of a cleanup.
@@ -99,6 +139,7 @@ export async function runLoopGuard(options = {}) {
         ? path.resolve(options.worktreeRoot)
         : defaultWorktreeRoot(root);
     const git = options.git ?? ((args) => realGitExec(args, root));
+    const gh = options.gh ?? ((args, stdin) => realGhExec(args, stdin, root));
     const install = options.install ?? realInstall;
     const messages = [];
     const state = classifyRoot(await git(['rev-parse', '--is-inside-work-tree']), await gitEntryKind(root));
@@ -127,6 +168,11 @@ export async function runLoopGuard(options = {}) {
     else {
         messages.push('main checkout is a work tree');
     }
+    const { verdict: identity, message: identityMessage } = await checkAgentIdentity(await configuredAgentUser(root), gh);
+    messages.push(identityMessage);
+    // A failed repair (1) is the more specific verdict, so it keeps the code.
+    if (identity === 'mismatch' && exitCode === 0)
+        exitCode = 2;
     const live = await findLive([worktreeRoot, path.join(root, '.claude', 'worktrees')]);
     const rebuild = await decideRebuild({ root, removed: options.removed === true, exitCode, live });
     let outcome = rebuild;
@@ -146,7 +192,7 @@ export async function runLoopGuard(options = {}) {
             messages.push('node_modules rebuilt');
         }
     }
-    return { root, worktreeRoot, state, bare, rebuild: outcome, live, exitCode, messages };
+    return { root, worktreeRoot, state, bare, identity, rebuild: outcome, live, exitCode, messages };
 }
 /**
  * The three load-bearing conditions, kept separate from the run so a test can

package/dist/cli/commands/setup-presets.js

@@ -92,7 +92,10 @@ export function buildPresetConfig(name, projectName) {
                 ...BASE,
                 projectName,
                 projectType: 'react-app',
-                typescript: { enabled: true, config: 'react' },
+                // vite-app, not react: this preset ships a Vite bundler, so
+                // `import.meta.env` has to typecheck, and typecheck is the app's CI
+                // gate rather than a build, so its tests are checked too (#592).
+                typescript: { enabled: true, config: 'vite-app' },
                 testing: { framework: 'vitest', environment: 'browser' },
                 bundler: 'vite',
             };
@@ -164,7 +167,7 @@ export const CONFIG_SCHEMA = {
             required: ['enabled', 'config'],
             properties: {
                 enabled: { type: 'boolean' },
-                config: { type: 'string', enum: ['base', 'react', 'next', 'node', 'express'] },
+                config: { type: 'string', enum: ['base', 'react', 'vite-app', 'next', 'node', 'express'] },
             },
         },
         linting: {

package/dist/cli/commands/setup.js

@@ -322,7 +322,13 @@ async function promptForConfig(targetDir, seed) {
                     return [{ name: '⚡ Next.js', value: 'next' }, ...baseChoices];
                 }
                 if (answers.projectType === 'react-app' || answers.projectType === 'web-app') {
-                    return [{ name: '⚛️  React', value: 'react' }, ...baseChoices];
+                    return [
+                        // First, so it's the default: most React projects are apps, and the
+                        // react preset is library-shaped — no vite/client, tests excluded.
+                        { name: '⚛️  React + Vite app', value: 'vite-app' },
+                        { name: '📦 React library', value: 'react' },
+                        ...baseChoices,
+                    ];
                 }
                 if (answers.projectType === 'node-api') {
                     return [

package/dist/cli/generators/linting.js

@@ -1,5 +1,6 @@
 import fs from 'fs-extra';
 import path from 'node:path';
+import { parseJsonc } from '../utils/jsonc.js';
 export async function generateLintingConfigs(config, targetDir) {
     // Generate Biome config
     if (config.linting.tool === 'biome' || config.linting.tool === 'both') {
@@ -46,22 +47,58 @@ export const BIOME_LEGACY_CONFIG = 'biome.jsonc';
  * for autocomplete and validation, which is the only reason the key is there.
  */
 const BIOME_SCHEMA_URL = 'https://biomejs.dev/schemas/latest/schema.json';
+/** The preset pointer this generator guarantees, and what already counts as it. */
+const BIOME_PRESET = '@rtorcato/repo-tooling/biome';
+/** Kept in step with doctor's matcher — the old js-tooling path still counts. */
+const BIOME_PRESET_REF = /@rtorcato\/(?:js|repo)-tooling\/biome/;
 /**
  * The thin pointer config — the same shape this repo dogfoods. `fix biome` used
  * to copy the whole preset inline instead, which meant the scaffolded file
  * carried no `@rtorcato/repo-tooling/biome` reference for doctor's Biome check
  * to match, and preset improvements never reached consumers.
+ *
+ * A merge, not a rewrite (#587): only `$schema`, `extends` and a
+ * `linter.enabled: false` kill switch are this generator's to own, so every
+ * other key an existing biome.json carries — `files.includes`, a css parser
+ * flag, rule overrides — survives. Returns null and writes nothing when the
+ * existing file doesn't parse, since there is no way to merge into it and
+ * overwriting would destroy settings we cannot even read.
  */
 export async function generateBiomeConfig(targetDir) {
+    const file = path.join(targetDir, BIOME_CONFIG);
+    let existing = {};
+    if (await fs.pathExists(file)) {
+        const parsed = parseJsonc(await fs.readFile(file, 'utf-8'));
+        if (!parsed)
+            return null;
+        existing = parsed;
+    }
     // Biome 2.x schema + shape. The base preset (extends) already defines the
     // file globs via `files.includes`; emitting the old 1.x `include`/`ignore`
     // keys here forced consumers to run `biome migrate` before `biome check`
     // would run at all.
+    const { $schema: _schema, extends: prevExtends, linter, ...rest } = existing;
+    const prev = Array.isArray(prevExtends)
+        ? prevExtends
+        : typeof prevExtends === 'string'
+            ? [prevExtends]
+            : [];
+    const extendsList = prev.some((e) => typeof e === 'string' && BIOME_PRESET_REF.test(e))
+        ? prev
+        : [BIOME_PRESET, ...prev];
+    // The one consumer key that isn't kept: `linter.enabled: false` is precisely
+    // the drift doctor flags, so preserving it would leave the repo red after a
+    // run that reported success. Rule overrides under `linter.rules` stay.
+    const nextLinter = linter && typeof linter === 'object' ? { ...linter } : undefined;
+    if (nextLinter?.enabled === false)
+        delete nextLinter.enabled;
     const biomeConfig = {
         $schema: BIOME_SCHEMA_URL,
-        extends: ['@rtorcato/repo-tooling/biome'],
+        extends: extendsList,
+        ...(nextLinter && Object.keys(nextLinter).length > 0 ? { linter: nextLinter } : {}),
+        ...rest,
     };
-    await fs.writeJson(path.join(targetDir, BIOME_CONFIG), biomeConfig, { spaces: 2 });
+    await fs.writeJson(file, biomeConfig, { spaces: 2 });
     await fs.remove(path.join(targetDir, BIOME_LEGACY_CONFIG));
     return BIOME_CONFIG;
 }

package/dist/cli/generators/pnpm-workspace.js

@@ -66,13 +66,13 @@ function section(yaml, key) {
  * the release-age exemption is scope-derived, and a repo with no scope to
  * derive doesn't get that setting at all.
  */
-function settingsFor(glob) {
-    return glob ? [...BASE_SETTINGS, releaseAgeSetting(glob)] : BASE_SETTINGS;
+function settingsFor(glob, yaml, needsEsbuild) {
+    const builds = allowBuildsSetting(yaml, needsEsbuild);
+    return [...BASE_SETTINGS, ...(builds ? [builds] : []), ...(glob ? [releaseAgeSetting(glob)] : [])];
 }
 function releaseAgeSetting(glob) {
     return {
         label: `minimumReleaseAgeExclude: ${glob}`,
-        applies: () => true,
         satisfied: (yaml) => (section(yaml, 'minimumReleaseAgeExclude') ?? []).some((l) => l.includes(glob)),
         key: 'minimumReleaseAgeExclude',
         block: `# Exempt this package's own scope from pnpm's minimumReleaseAge cutoff, so a
@@ -86,7 +86,6 @@ minimumReleaseAgeExclude:
 const BASE_SETTINGS = [
     {
         label: 'verifyDepsBeforeRun: false',
-        applies: () => true,
         // Any explicit value counts — a repo that deliberately opted into
         // verification shouldn't be nagged back to the family default.
         satisfied: (yaml) => /^verifyDepsBeforeRun:/m.test(yaml),
@@ -97,23 +96,57 @@ verifyDepsBeforeRun: false
 `,
         item: '',
     },
-    {
-        label: 'allowBuilds: esbuild',
-        applies: (needsEsbuild) => needsEsbuild,
-        satisfied: (yaml) => (section(yaml, 'allowBuilds') ?? []).some((l) => /^\s*esbuild:/.test(l)),
+];
+/** A YAML scalar used as a map key: quoted unless it is plainly safe bare. */
+function asKey(name) {
+    return /^[a-z0-9][a-z0-9._-]*$/i.test(name) ? name : `'${name}'`;
+}
+/** Package names listed under `onlyBuiltDependencies:`, quotes stripped. */
+function onlyBuiltDependencies(yaml) {
+    return (section(yaml, 'onlyBuiltDependencies') ?? [])
+        .map((line) => /^\s+-\s*['"]?([^'"\s#]+)/.exec(line)?.[1])
+        .filter((name) => Boolean(name));
+}
+/** True when `name` already carries a decision under `allowBuilds:`. */
+function approved(yaml, name) {
+    const key = name.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    return (section(yaml, 'allowBuilds') ?? []).some((l) => new RegExp(`^\\s*['"]?${key}['"]?\\s*:`).test(l));
+}
+/**
+ * pnpm 11 reads build approvals from `allowBuilds` and ignores the older
+ * `onlyBuiltDependencies` list, so that list is *mirrored* into the map rather
+ * than replaced by a fixed baseline: writing only `esbuild: true` over a file
+ * that already approved more packages would narrow the allowlist and break the
+ * install on the very pnpm version the map exists for (#588). Null when there
+ * is nothing to approve.
+ */
+function allowBuildsSetting(yaml, needsEsbuild) {
+    const packages = [
+        ...new Set([...(needsEsbuild ? ['esbuild'] : []), ...onlyBuiltDependencies(yaml)]),
+    ];
+    if (packages.length === 0)
+        return null;
+    const entry = (name) => `  ${asKey(name)}: true`;
+    return {
+        label: `allowBuilds: ${packages.join(', ')}`,
+        satisfied: (y) => packages.every((name) => approved(y, name)),
         key: 'allowBuilds',
         block: `# pnpm 11 reads build-script approvals from this map, not the older
 # onlyBuiltDependencies list, and fails the install outright without them.
 allowBuilds:
-  esbuild: true
+${packages.map(entry).join('\n')}
 `,
-        item: '  esbuild: true',
-    },
-];
+        // Only the undecided ones — a hand-vetted `false` is a decision and stays.
+        item: packages
+            .filter((name) => !approved(yaml, name))
+            .map(entry)
+            .join('\n'),
+    };
+}
 /** Managed settings absent from `yaml`, named as doctor reports them. */
 export function missingPnpmSettings(yaml, needsEsbuild, glob) {
-    return settingsFor(glob)
-        .filter((s) => s.applies(needsEsbuild) && !s.satisfied(yaml))
+    return settingsFor(glob, yaml, needsEsbuild)
+        .filter((s) => !s.satisfied(yaml))
         .map((s) => s.label);
 }
 /** Insert `item` directly under an existing `key:` line, keeping the rest untouched. */
@@ -126,8 +159,8 @@ function insertUnder(yaml, key, item) {
 /** Merge every missing managed setting into `yaml` and return the new contents. */
 export function upsertPnpmSettings(yaml, needsEsbuild, glob) {
     let next = yaml;
-    for (const setting of settingsFor(glob)) {
-        if (!setting.applies(needsEsbuild) || setting.satisfied(next))
+    for (const setting of settingsFor(glob, yaml, needsEsbuild)) {
+        if (setting.satisfied(next))
             continue;
         if (setting.item && section(next, setting.key)) {
             next = insertUnder(next, setting.key, setting.item);

package/dist/cli/utils/jsonc.js

@@ -0,0 +1,18 @@
+/**
+ * JSONC → object, or null when it genuinely won't parse. Biome and friends
+ * accept comments and trailing commas, so a bare `JSON.parse` would reject
+ * configs the tools themselves read fine.
+ *
+ * The first alternative consumes whole string literals, so a `//` or a comment
+ * opener inside one (a `$schema` URL, most obviously) is never mistaken for a
+ * comment.
+ */
+export function parseJsonc(text) {
+    const withoutComments = text.replace(/("(?:\\.|[^"\\])*")|\/\/[^\n]*|\/\*[\s\S]*?\*\//g, (_, str) => str ?? '');
+    try {
+        return JSON.parse(withoutComments.replace(/,(\s*[}\]])/g, '$1'));
+    }
+    catch {
+        return null;
+    }
+}

package/dist/languages/js/checks.js

@@ -4,6 +4,7 @@ import { checkFile, hookHasUncommented } from '../../base/checks.js';
 import { realGitExec } from '../../base/git-identity.js';
 import { CLAUDE_SETTINGS_FILE, readClaudeSettings, workspaceSymlinkDirs, worktreeSymlinkDirs, } from '../../cli/generators/agent-rules.js';
 import { WORKSPACE_FILE, dependsOnEsbuild, familyGlob, missingPnpmSettings, } from '../../cli/generators/pnpm-workspace.js';
+import { parseJsonc } from '../../cli/utils/jsonc.js';
 const PACKAGE = '@rtorcato/repo-tooling';
 const NODE_MIN_MAJOR = 22;
 const NODE_LTS_REQUIREMENTS = {
@@ -44,23 +45,6 @@ export function evaluateNodeVersion(version) {
         detail: display,
     };
 }
-/**
- * JSONC → object, or null when it genuinely won't parse. `biome.jsonc` is a
- * declared candidate and the format allows comments and trailing commas, so
- * bare `JSON.parse` would reject configs Biome itself accepts.
- *
- * The first alternative consumes whole string literals, so a `//` or `/*`
- * inside one (a `$schema` URL, most obviously) is never mistaken for a comment.
- */
-function parseJsonc(text) {
-    const withoutComments = text.replace(/("(?:\\.|[^"\\])*")|\/\/[^\n]*|\/\*[\s\S]*?\*\//g, (_, str) => str ?? '');
-    try {
-        return JSON.parse(withoutComments.replace(/,(\s*[}\]])/g, '$1'));
-    }
-    catch {
-        return null;
-    }
-}
 const BIOME_PRESET_REF = /@rtorcato\/(?:js|repo)-tooling\/biome/;
 /**
  * Both shapes of a `biome.json` this package produces (#378): the thin
@@ -1549,6 +1533,10 @@ export function rangeFloor(range) {
 function compareFloor(a, b) {
     return a[0] - b[0] || a[1] - b[1];
 }
+/** Full major.minor.patch ordering, for comparing an installed version. */
+function compareVersion(a, b) {
+    return a[0] - b[0] || a[1] - b[1] || a[2] - b[2];
+}
 /**
  * Config files whose `$schema` URL carries the tool version the config is
  * written for, and the package that reads them. One entry per tool; adding
@@ -1639,6 +1627,61 @@ export async function checkConfigSchemaVersions(dir, pkg) {
         hint: 'Raise the dependency floor to the version the config targets, or rewrite the config for the oldest version supported. Anyone resolving below the schema version gets a config-parse error that never mentions the version range.',
     };
 }
+/**
+ * Installed peer versions against the ranges this package declares (#591).
+ *
+ * `checkConfigSchemaVersions` compares *declared* ranges; this compares what is
+ * actually on disk. A consumer scaffolded by an older generator can sit on
+ * `@biomejs/biome` 2.4.5 while the shipped preset uses `linter.rules.preset`,
+ * a 2.5 key — and the only symptom is a parse error pointing inside a file the
+ * consumer never wrote. The peer warning that would have said so scrolled past
+ * at install time.
+ *
+ * ponytail: only the floor is compared. Ranges like `^20.0.0 || ^21.0.0` or
+ * `>=5.0.0` have no single ceiling worth enforcing, and flagging a newer major
+ * would fire on every repo that upgrades ahead of the range. Add a real semver
+ * satisfies() if a peer ever ships a breaking major we must keep out.
+ */
+export async function checkPeerVersions(dir, pkg) {
+    const check = 'Peer versions';
+    const modules = path.join(dir, 'node_modules');
+    // Running against a consumer, the contract lives in the installed copy;
+    // running against this repo itself, it is the repo's own package.json.
+    const self = pkg?.name === PACKAGE ? pkg : await readPackageJson(path.join(modules, PACKAGE));
+    const peers = self?.peerDependencies ?? {};
+    const stale = [];
+    let checked = 0;
+    for (const [name, range] of Object.entries(peers)) {
+        const floor = rangeFloor(range);
+        if (!floor)
+            continue;
+        // Absent means the peer is simply unused — every one of ours is optional.
+        const installed = (await readPackageJson(path.join(modules, name)))?.version;
+        const version = typeof installed === 'string' ? rangeFloor(installed) : null;
+        if (!version)
+            continue;
+        checked++;
+        if (compareVersion(version, floor) < 0) {
+            stale.push(`${name} ${installed} installed, ${PACKAGE} requires ${range}`);
+        }
+    }
+    if (checked === 0) {
+        return { check, status: 'ok', detail: 'no installed peers to compare' };
+    }
+    if (stale.length === 0) {
+        return {
+            check,
+            status: 'ok',
+            detail: `${checked} installed peer${checked === 1 ? '' : 's'} satisfy the declared ranges`,
+        };
+    }
+    return {
+        check,
+        status: 'drift',
+        detail: `${stale.length} peer${stale.length === 1 ? '' : 's'} installed below the declared range: ${stale.join('; ')}`,
+        hint: 'Upgrade the named packages — a preset written for a newer version fails inside a file you cannot edit, with an error that never mentions the version.',
+    };
+}
 /** npm git specifiers, including the bare `owner/repo` GitHub shorthand. */
 const GIT_PROTOCOL = /^(?:github|gitlab|bitbucket|gist):|^git\+|^git:\/\//;
 const GITHUB_SHORTHAND = /^[A-Za-z0-9][\w.-]*\/[A-Za-z0-9][\w.-]*(?:#.*)?$/;

package/dist/languages/js/fixers.js

@@ -76,6 +76,9 @@ import { generateTypedocConfig, generateTypedocWorkflow } from '../../cli/genera
 import { copyPreset } from '../../cli/utils/copy-preset.js';
 import { identifiablePresetHashes } from '../../cli/utils/copied-assets.js';
 import { LOCKFILE_NAME, writeLockfile } from '../../cli/utils/lockfile.js';
+// The fixer contract moved to src/base/fixers.ts when Swift became the second
+// module (#286) — import it from there.
+import { FixerAbort } from '../../base/fixers.js';
 /** Exported so doctor can render the preset ci.yml it compares against (#349). */
 export function inferProjectConfig(pkg) {
     const deps = {
@@ -173,14 +176,21 @@ const GH_WORKFLOW_FIXERS = GH_WORKFLOWS.map((name) => ({
 export const FIXERS = [
     {
         target: 'biome',
-        description: `Scaffold ${BIOME_CONFIG} extending the @rtorcato/repo-tooling preset, plus the scripts that run it`,
+        description: `Point ${BIOME_CONFIG} at the @rtorcato/repo-tooling preset (merged into any existing config), plus the scripts that run it`,
         appliesTo: ['Biome'],
         outputs: [BIOME_CONFIG, 'package.json (scripts)'],
+        // safe-merge: only $schema/extends are rewritten, other keys are kept.
+        riskLevel: 'safe-merge',
         canFixDrift: true,
         async run({ targetDir }) {
             // Shares generateBiomeConfig with the setup/resync path — the two used to
             // scaffold different filenames with different contents (#365).
             const written = await generateBiomeConfig(targetDir);
+            // null means an existing config that won't parse. Refuse rather than
+            // replace it: its settings are unreadable, so they're unrecoverable (#587).
+            if (!written) {
+                throw new FixerAbort('biome-unparseable', `refusing to overwrite ${BIOME_CONFIG} — it does not parse as JSON/JSONC, so its settings cannot be merged`, `fix the syntax error in ${BIOME_CONFIG} (or delete it) and re-run \`fix biome\``);
+            }
             const filesWritten = [written];
             // A config with no way to run it left `pnpm check` undefined, which the
             // generated CI called and `fix verify` needed to compose a chain (#364).

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@rtorcato/repo-tooling",
-	"version": "3.35.0",
+	"version": "3.37.0",
 	"description": "One CLI to scaffold, audit and fix your repo's whole toolchain — linting, tests, commits, releases & CI.",
 	"type": "module",
 	"keywords": [
@@ -158,6 +158,7 @@
 		"./typescript/node": "./tooling/typescript/tsconfig.node.json",
 		"./typescript/bun": "./tooling/typescript/tsconfig.bun.json",
 		"./typescript/react": "./tooling/typescript/tsconfig.react.json",
+		"./typescript/vite-app": "./tooling/typescript/tsconfig.vite-app.json",
 		"./typescript/test": "./tooling/typescript/tsconfig.test.json",
 		"./typescript/reset": "./tooling/typescript/reset.d.ts",
 		"./typescript/base@1": "./tooling/typescript/v1/tsconfig.base.json",
@@ -264,7 +265,7 @@
 		"cz-conventional-changelog": "^3.3.0",
 		"esbuild": "^0.28.2",
 		"esbuild-node-externals": "^2.0.0",
-		"eslint": "10.8.1",
+		"eslint": "10.9.1",
 		"eslint-plugin-import": "^2.32.0",
 		"eslint-plugin-jest": "29.16.1",
 		"husky": "^9.1.7",

package/skills/ai-issue-loop/SKILL.md

@@ -232,6 +232,23 @@ AGENT_USER="${AI_LOOP_AGENT:-$(jq -r '.rules.aiLoop.agentUser // .aiLoop.agentUs
   AGENT_USER=""; }; }
 ```
 
+**Then prove `gh` is *authenticating as* that account — this one halts the
+tick.** Assignability passes no matter who is calling, so on a machine where the
+agent identity was never configured both checks above are green while `gh` is
+the owner: worktrees, commits, PRs and reviews all land under the owner's
+account, and the split only shows up in `git log` afterwards (#601).
+
+```bash
+# Exit 0 continue, non-zero halt — also covers the bare-checkout repair. The
+# identity check is skipped entirely when no agentUser is declared.
+npx @rtorcato/repo-tooling loop guard --root "$ROOT" || exit 1
+```
+
+Configured intent that is not met is a misconfiguration, not a degraded mode —
+which is why this halts where the assignability check merely warns. Fix it by
+pointing `gh` at the agent account on this machine, or by removing
+`rules.aiLoop.agentUser`.
+
 **It lives in the repo, not a shell profile.** The agent account is a
 collaborator on *this* repo, so a machine-wide env var is both the wrong
 granularity and invisible — forgotten on a new laptop, with the only symptom
@@ -1483,13 +1500,31 @@ do the linking here:
 
 ```bash
 DIRS=$(jq -r '.worktree.symlinkDirectories[]? // empty' "$ROOT/.claude/settings.json" 2>/dev/null)
-for d in $DIRS; do
+printf '%s\n' "$DIRS" | while IFS= read -r d; do
+  [ -n "$d" ] || continue
   [ -d "$ROOT/$d" ] || continue          # an entry pointing at nothing links nothing
   mkdir -p "$(dirname "$WT_ROOT/$SLUG/$d")"
   ln -s "$ROOT/$d" "$WT_ROOT/$SLUG/$d"
 done
+
+# assert it happened — an unlinked worktree must never reach an implementer
+MISSING=$(printf '%s\n' "$DIRS" | while IFS= read -r d; do
+  [ -n "$d" ] && [ -d "$ROOT/$d" ] && [ ! -L "$WT_ROOT/$SLUG/$d" ] && printf '%s ' "$d"
+done)
+[ -z "$MISSING" ] || echo "FATAL: $SLUG has no symlink for: $MISSING"
 ```
 
+**Iterate line by line — never `for d in $DIRS`.** Your shell may be zsh, which
+does not word-split an unquoted expansion: `$DIRS` arrives as *one* word with
+embedded newlines, `[ -d ]` fails against that nonsense path, and the loop links
+**nothing** (#585). Same class as the Pass 2 glob hazard below, and just as
+silent — the `pnpm install` fallback is gated on `$DIRS` being *empty*, which it
+is not, so the worktree gets neither links nor an install, and the implementer
+meets `Cannot find module` on its first test run, reading as the issue's fault
+rather than the harness's. That is what the `MISSING` assertion is for: if it
+prints, do **not** spawn an implementer — run `pnpm install` in the worktree, or
+return the issue to `ai-ready`, drop `ai-wip`, and move on.
+
 **Read the setting, do not rely on it.** `worktree.symlinkDirectories` is a
 **Claude Code** setting, honoured by `EnterWorktree` — which this pipeline
 forbids outright (see below) and replaces with a raw `git worktree add`. So the

package/tooling/biome/preset.json

@@ -54,6 +54,12 @@
       "semicolons": "asNeeded"
     }
   },
+  "css": {
+    "parser": {
+      "tailwindDirectives": true,
+      "cssModules": true
+    }
+  },
   "json": {
     "formatter": {
       "indentStyle": "space",

package/tooling/claude/repo-tooling.md

@@ -63,7 +63,7 @@ npx @rtorcato/repo-tooling setup --config project.json -d ./my-lib --skip-instal
 
 ## Drift policy (don't surprise the user)
 
-- Safe-merge fixers (`engines`, `husky`, `package-json`) never overwrite — they add/merge.
+- Safe-merge fixers (`biome`, `engines`, `husky`, `package-json`) never overwrite — they add/merge.
 - Drift on a config file (`biome`, `tsconfig`, …) is only overwritten with `--yes`.
   Before overwriting drift the user wrote by hand, show `fix <target> --diff` first.
 - `optional-missing` ≠ broken. Don't install opt-in tools (typedoc, size-limit,

package/tooling/typescript/tsconfig.vite-app.json

@@ -0,0 +1,16 @@
+{
+  "extends": "./tsconfig.react.json",
+  "compilerOptions": {
+    // `vite/client` is what makes `import.meta.env` and the `?url` / `?raw`
+    // import suffixes typecheck. It lives here rather than in the react preset
+    // because every `types` entry must resolve: adding it there would fail with
+    // TS2688 on any React project that doesn't install Vite — the same trap that
+    // got "tailwindcss" dropped from the react preset.
+    "types": ["react", "react-dom", "vitest", "vite/client"]
+  },
+  // An app's `typecheck` is a CI gate, not a build, so the tests are checked
+  // too — they're the code most likely to drift after a signature change. The
+  // react preset excludes them because a library's tsc run emits dist/.
+  "include": ["src", "index.d.ts", "types", "tests"],
+  "exclude": ["node_modules", "dist", "build", "out"]
+}