@rtorcato/repo-tooling 3.18.0 → 3.19.0

package/dist/base/checks.js

@@ -469,11 +469,16 @@ export async function checkAiSetup(dir) {
  * is not a defect in this repo, and either of those statuses would fail its CI
  * over a file CI has never seen. `optional-missing` is the honest verdict — an
  * opt-in workflow tool that isn't configured — and it leaves the exit code alone.
+ *
+ * `skillsDir` is doctor's `--skills-dir`. Without it this reported against
+ * `~/.claude/skills` whatever directory the repo actually installs into, so a
+ * consumer who passes the flag to `fix` saw a permanent false `optional-missing`
+ * for a skill they have (#485).
  */
-export async function checkClaudeSkills() {
+export async function checkClaudeSkills(skillsDir) {
     const check = 'Claude skills';
     const hint = `Run \`npx @rtorcato/repo-tooling fix claude-skills\` to install the ${SHIPPED_SKILL} skill (writes outside the repo; opt-in, so \`fix\` alone skips it)`;
-    const status = await claudeSkillStatus();
+    const status = await claudeSkillStatus(SHIPPED_SKILL, skillsDir);
     if (!status.installed) {
         return {
             check,

package/dist/cli/commands/doctor.js

@@ -179,12 +179,12 @@ async function runBaseChecks(dir, lock, opts) {
     results.push(await checkBrand(dir));
     results.push(await checkAiSetup(dir));
     // User-global, not repo state — see checkClaudeSkills on why it never returns drift.
-    results.push(await checkClaudeSkills());
+    results.push(await checkClaudeSkills(opts.skillsDir));
     results.push(await checkReadmeBadges(dir, opts.badges.audience, opts.badges.fixTarget));
     results.push(await checkCoverageUpload(dir));
     return results;
 }
-export async function runDoctor(dir) {
+export async function runDoctor(dir, skillsDir) {
     const targetDir = path.resolve(dir);
     const lock = await readLockfile(targetDir);
     // Per-module dispatch (#285): the base checks (repo hygiene, CI, security,
@@ -212,6 +212,7 @@ export async function runDoctor(dir) {
                 presetWorkflow: null,
                 language,
                 codeqlLanguages: languageModule.codeqlLanguages,
+                skillsDir,
             })),
         ];
         return demoteDeclined(results, lock);
@@ -234,6 +235,7 @@ export async function runDoctor(dir) {
                 presetWorkflow: renderSwiftWorkflow(await readSwiftPackage(targetDir)),
                 language,
                 codeqlLanguages: languageModule.codeqlLanguages,
+                skillsDir,
             })),
             ...(await runSwiftChecks(targetDir)),
         ];
@@ -257,6 +259,7 @@ export async function runDoctor(dir) {
                 presetWorkflow: renderPythonWorkflow(await readPyproject(targetDir)),
                 language,
                 codeqlLanguages: languageModule.codeqlLanguages,
+                skillsDir,
             })),
             ...(await runPythonChecks(targetDir)),
         ];
@@ -282,6 +285,7 @@ export async function runDoctor(dir) {
                 presetWorkflow: renderPerlWorkflow(await readPerlProject(targetDir)),
                 language,
                 codeqlLanguages: languageModule.codeqlLanguages,
+                skillsDir,
             })),
             ...(await runPerlChecks(targetDir)),
         ];
@@ -342,6 +346,7 @@ export async function runDoctor(dir) {
         presetWorkflow: renderGitHubWorkflow(githubJobs(inferProjectConfig(pkg), { scripts: scriptsOf(pkg) })),
         language,
         codeqlLanguages: languageModule.codeqlLanguages,
+        skillsDir,
     })));
     return demoteDeclined(results, lock);
 }
@@ -397,7 +402,7 @@ export function summarize(results) {
 }
 export async function doctorCommand(options = {}) {
     const dir = options.directory ?? process.cwd();
-    const results = await runDoctor(dir);
+    const results = await runDoctor(dir, options.skillsDir);
     if (options.json) {
         console.log(JSON.stringify({ directory: path.resolve(dir), results }, null, 2));
     }

package/dist/cli/commands/fix.js

@@ -333,7 +333,9 @@ export async function fixCommand(target, options = {}) {
     const pkg = await readPackageJson(targetDir);
     const lock = await readLockfile(targetDir);
     const fixers = fixersForLanguage(await detectLanguage(targetDir));
-    const results = await runDoctor(targetDir);
+    // Same --skills-dir the claude-skills fixer writes to, so the diagnosis fix
+    // acts on and the install it performs agree on one directory (#485).
+    const results = await runDoctor(targetDir, options.skillsDir);
     const actions = [];
     const noteLockConflict = (check) => {
         if (!lock)

package/dist/cli/index.js

@@ -317,6 +317,9 @@ program
     .description('🩺 Diagnose project alignment with @rtorcato/repo-tooling presets')
     .option('-d, --directory <path>', 'Target directory to diagnose', process.cwd())
     .option('--json', 'Emit machine-readable JSON output')
+    // The read side of `fix --skills-dir` (#485). No --yes/--json requirement
+    // here: doctor never writes, so an unresolved directory is just reported.
+    .option('--skills-dir <path>', 'Where `fix claude-skills` installs user-global agent skills (default: ~/.claude/skills). Pass the same path `fix` was given, or the skill reports as not installed')
     .action(doctorCommand);
 program
     .command('fix [target]')

package/package.json

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