@rtorcato/repo-tooling 3.8.6 → 3.8.7

package/dist/base/checks.js

@@ -1,5 +1,6 @@
 import path from 'node:path';
 import fs from 'fs-extra';
+import { BLOCK_START, hasStaleAgentBlock } from '../cli/generators/agent-rules.js';
 import { BADGE_START, hasPublicOnlyBadges } from '../cli/generators/badges.js';
 import { detectNestedLanguages } from '../cli/utils/detect-language.js';
 /**
@@ -335,19 +336,37 @@ export async function checkCoverageUpload(dir) {
     };
 }
 export async function checkAiSetup(dir) {
-    // Consider AI setup present if AGENTS.md carries the js-tooling block or the
-    // Claude skill is installed — the two primary markers `fix ai` writes.
-    const agentsPath = path.join(dir, 'AGENTS.md');
-    const hasAgentsBlock = (await fs.pathExists(agentsPath)) &&
-        (await fs.readFile(agentsPath, 'utf8')).includes('<!-- js-tooling:start -->');
+    // Consider AI setup present if one of the block-managed files carries the
+    // agent block or the Claude skill is installed — the markers `fix ai` writes.
+    let blockFile = null;
+    const stale = [];
+    for (const rel of ['AGENTS.md', 'CLAUDE.md', path.join('.github', 'copilot-instructions.md')]) {
+        const filepath = path.join(dir, rel);
+        if (!(await fs.pathExists(filepath)))
+            continue;
+        const content = await fs.readFile(filepath, 'utf8');
+        if (!content.includes(BLOCK_START))
+            continue;
+        blockFile ??= rel;
+        if (hasStaleAgentBlock(content))
+            stale.push(rel);
+    }
     const hasSkill = (await fs.pathExists(path.join(dir, '.claude', 'skills', 'repo-tooling.md'))) ||
         // Pre-rename name — still counts as present until `fix` migrates it.
         (await fs.pathExists(path.join(dir, '.claude', 'skills', 'js-tooling.md')));
-    if (hasAgentsBlock || hasSkill) {
+    if (stale.length > 0) {
+        return {
+            check: 'AI setup',
+            status: 'drift',
+            detail: `${stale.join(', ')} still point agents at the dead \`js-tooling\` package/bin`,
+            hint: 'Run `npx @rtorcato/repo-tooling fix ai` to refresh the agent instructions in place',
+        };
+    }
+    if (blockFile || hasSkill) {
         return {
             check: 'AI setup',
             status: 'ok',
-            detail: hasAgentsBlock ? 'AGENTS.md has the js-tooling block' : '.claude skill installed',
+            detail: blockFile ? `${blockFile} has the agent block` : '.claude skill installed',
         };
     }
     return {

package/dist/base/github-settings.js

@@ -352,6 +352,14 @@ const PROTECTION_BODY = JSON.stringify({
     // enforce_admins off so the App/RELEASE_TOKEN can bypass to push release commits.
     enforce_admins: false,
     // Required human review would deadlock solo Dependabot auto-merge.
+    //
+    // Note this is *applied*, not merely tolerated: checkBranchProtection reports
+    // any required_pull_request_reviews as drift, so `fix github-settings` PUTs it
+    // back to null. A repo that deliberately requires approvals will have that
+    // silently reverted by the next unrelated fix run, with nothing in the output
+    // naming the rule that was removed. Known downstream case: the ai-issue-loop
+    // pipeline works around it with approval labels precisely because of this.
+    // Loosen the standard here first if a repo ever genuinely needs review gating.
     required_pull_request_reviews: null,
     restrictions: null,
     allow_force_pushes: false,

package/dist/cli/generators/agent-rules.js

@@ -1,6 +1,7 @@
 import path from 'node:path';
 import fs from 'fs-extra';
 import { copyPreset, getPackageRoot } from '../utils/copy-preset.js';
+import { LEGACY_TOOL_NAME } from '../utils/lockfile.js';
 import { installSkillsInstallDocs } from './skills-install.js';
 /**
  * All agent rule files are generated from one source of truth — the shipped
@@ -8,8 +9,25 @@ import { installSkillsInstallDocs } from './skills-install.js';
  * location and the frontmatter differ per agent.
  */
 const SOURCE = 'tooling/claude/repo-tooling.md';
-const BLOCK_START = '<!-- js-tooling:start -->';
-const BLOCK_END = '<!-- js-tooling:end -->';
+// The markers keep the pre-rename text on purpose: changing them would orphan
+// every block already written and append a second one on the next fix.
+export const BLOCK_START = '<!-- js-tooling:start -->';
+export const BLOCK_END = '<!-- js-tooling:end -->';
+/**
+ * True when a managed block still names the pre-rename package or bin — a repo
+ * scaffolded before the rename tells agents to run `js-tooling fix ai`, which
+ * is not a runnable command (#393). Only the block *body* is inspected: the
+ * markers carry the legacy name by design, so matching on the whole file would
+ * report every repo as permanently stale.
+ */
+export function hasStaleAgentBlock(content) {
+    const start = content.indexOf(BLOCK_START);
+    if (start === -1)
+        return false;
+    const bodyStart = start + BLOCK_START.length;
+    const end = content.indexOf(BLOCK_END, bodyStart);
+    return content.slice(bodyStart, end === -1 ? undefined : end).includes(LEGACY_TOOL_NAME);
+}
 /** Read the shipped skill and split its frontmatter from the markdown body. */
 async function readSkill() {
     const raw = await fs.readFile(path.join(getPackageRoot(), SOURCE), 'utf8');

package/dist/cli/utils/lockfile.js

@@ -3,10 +3,14 @@ import fs from 'fs-extra';
 import packageJson from '../../../package.json' with { type: 'json' };
 import { validateProjectConfig } from '../commands/setup-presets.js';
 export const LOCKFILE_NAME = '.repo-tooling.json';
-// Name used before the js-tooling→repo-tooling rename (#272). Repos set up on an
-// older version still have it: readLockfile falls back to it, and writeLockfile
-// migrates to the new name (removing the old file) on the next write.
-export const LEGACY_LOCKFILE_NAME = '.js-tooling.json';
+// Package and bin name used before the js-tooling→repo-tooling rename (#272).
+// The bin no longer exists and the package is 404 on the registry, so any
+// generated file still naming it is stale (#393).
+export const LEGACY_TOOL_NAME = 'js-tooling';
+// Lockfile name from the same era. Repos set up on an older version still have
+// it: readLockfile falls back to it, and writeLockfile migrates to the new name
+// (removing the old file) on the next write.
+export const LEGACY_LOCKFILE_NAME = `.${LEGACY_TOOL_NAME}.json`;
 // v2 added ProjectConfig.language (multi-language seam, #140). v1 files are
 // migrated to v2 on read, defaulting language to 'js'.
 export const LOCKFILE_VERSION = 2;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@rtorcato/repo-tooling",
-	"version": "3.8.6",
+	"version": "3.8.7",
 	"description": "One CLI to scaffold, audit and fix your repo's whole toolchain — linting, tests, commits, releases & CI.",
 	"type": "module",
 	"keywords": [