@hanzlaa/rcode 3.4.33 → 3.6.0

package/cli/doctor.js

@@ -17,6 +17,11 @@ const path = require('path');
 const { spawnSync } = require('child_process');
 const { verifyInstall, formatReport } = require('./lib/manifest.cjs');
 const { checkStaleness } = require('./lib/memory-bank.cjs');
+const {
+  parseFrontmatter,
+  validateSkillFrontmatter,
+  validateAgentFrontmatter,
+} = require('./lib/schemas.cjs');
 
 // ---------- Shared helpers ----------
 
@@ -34,6 +39,19 @@ function findSkillFiles(dir) {
   return results;
 }
 
+/**
+ * One-level scan of `rihal/agents/` for `.md` files. There is no existing
+ * agent-file iterator (findSkillFiles matches only files named SKILL.md),
+ * so the schema-validation pass needs its own shallow glob.
+ */
+function findAgentFiles(dir) {
+  if (!fs.existsSync(dir)) return [];
+  return fs
+    .readdirSync(dir, { withFileTypes: true })
+    .filter((e) => e.isFile() && e.name.endsWith('.md'))
+    .map((e) => path.join(dir, e.name));
+}
+
 function checkCompliance(filePath) {
   const content = fs.readFileSync(filePath, 'utf8');
   const missing = [];
@@ -259,6 +277,70 @@ function runCompliance(packageRoot) {
   return failing;
 }
 
+// ---------- Schema validation ----------
+
+/**
+ * Validate SKILL.md and agent frontmatter against the zod schemas in
+ * cli/lib/schemas.cjs (issue #747). Hard failures (missing name, too few
+ * trigger phrases, missing negative boundary, missing tools) count toward
+ * the non-zero exit path; advisory warnings (e.g. >12 trigger phrases) just
+ * print a ⚠.
+ *
+ * @returns {number} count of artifacts with hard failures
+ */
+function runSchemaValidation(packageRoot) {
+  const skillDirs = [
+    path.join(packageRoot, 'rihal/skills/agents'),
+    path.join(packageRoot, 'rihal/skills/actions'),
+  ];
+
+  let totalSkills = 0;
+  let totalAgents = 0;
+  let failing = 0;
+  let warned = 0;
+
+  for (const dir of skillDirs) {
+    for (const file of findSkillFiles(dir)) {
+      totalSkills++;
+      const { frontmatter, body } = parseFrontmatter(fs.readFileSync(file, 'utf8'));
+      const result = validateSkillFrontmatter(frontmatter, body);
+      const rel = path.relative(packageRoot, file);
+      if (!result.ok) {
+        failing++;
+        console.log(`   ✗ ${rel}`);
+        for (const err of result.errors) console.log(`       ${err}`);
+      }
+      if (result.warnings && result.warnings.length > 0) {
+        warned++;
+        for (const w of result.warnings) console.log(`   ⚠ ${rel}: ${w}`);
+      }
+    }
+  }
+
+  for (const file of findAgentFiles(path.join(packageRoot, 'rihal/agents'))) {
+    totalAgents++;
+    const { frontmatter } = parseFrontmatter(fs.readFileSync(file, 'utf8'));
+    const result = validateAgentFrontmatter(frontmatter);
+    if (!result.ok) {
+      failing++;
+      const rel = path.relative(packageRoot, file);
+      console.log(`   ✗ ${rel}`);
+      for (const err of result.errors) console.log(`       ${err}`);
+    }
+  }
+
+  if (failing === 0) {
+    console.log(
+      `   ✓ ${totalSkills} skill + ${totalAgents} agent frontmatter blocks pass schema validation` +
+        (warned > 0 ? ` (${warned} with advisory warnings)` : ''),
+    );
+  } else {
+    console.log(`   ✗ ${failing} artifact(s) failed schema validation`);
+  }
+
+  return failing;
+}
+
 // ---------- Duplicate-installation check ----------
 
 /**
@@ -348,7 +430,11 @@ module.exports = function doctor(args, { packageRoot }) {
   console.log(`\nPackage compliance:`);
   const complianceFailures = runCompliance(packageRoot);
 
-  const totalFailures = preflightFailures + complianceFailures + duplicateFailures;
+  console.log(`\nArtifact schema validation:`);
+  const schemaFailures = runSchemaValidation(packageRoot);
+
+  const totalFailures =
+    preflightFailures + complianceFailures + duplicateFailures + schemaFailures;
   console.log();
   if (totalFailures === 0) {
     console.log(`✅ All checks passed.`);

package/cli/install.js

@@ -89,7 +89,7 @@ const SOURCE_ROOT = path.join(PACKAGE_ROOT, 'rihal');
  * detectIdeSignals, plus a row to runInstallWizard's multiselect — three
  * sites instead of ten.
  */
-const SUPPORTED_IDES = Object.freeze(['claude', 'cursor', 'gemini', 'vscode', 'antigravity']);
+const SUPPORTED_IDES = Object.freeze(['claude', 'cursor', 'gemini', 'vscode', 'antigravity', 'windsurf']);
 
 // Zod schema for .rihal/config.yaml validation (#250).
 const ConfigSchema = z.object({
@@ -305,13 +305,14 @@ function printInstallHeader(targetVersion) {
  * Returns a set like { claude: true, cursor: false, gemini: false }.
  */
 function detectIdeSignals(target) {
-  const signals = { claude: false, cursor: false, gemini: false, vscode: false, antigravity: false };
+  const signals = { claude: false, cursor: false, gemini: false, vscode: false, antigravity: false, windsurf: false };
   // 1. Project-local install dirs (strongest signal — they already use one)
   if (fs.existsSync(path.join(target, '.claude'))) signals.claude = true;
   if (fs.existsSync(path.join(target, '.cursor'))) signals.cursor = true;
   if (fs.existsSync(path.join(target, '.gemini'))) signals.gemini = true;
   if (fs.existsSync(path.join(target, '.vscode'))) signals.vscode = true;
   if (fs.existsSync(path.join(target, '.antigravity'))) signals.antigravity = true;
+  if (fs.existsSync(path.join(target, '.windsurf'))) signals.windsurf = true;
   // 2. User-level config dirs
   const home = os.homedir();
   if (fs.existsSync(path.join(home, '.claude'))) signals.claude = true;
@@ -321,10 +322,13 @@ function detectIdeSignals(target) {
   if (fs.existsSync(path.join(home, '.vscode'))) signals.vscode = true;
   if (fs.existsSync(path.join(home, '.config', 'Code'))) signals.vscode = true;
   if (fs.existsSync(path.join(home, '.antigravity'))) signals.antigravity = true;
+  if (fs.existsSync(path.join(home, '.windsurf'))) signals.windsurf = true;
+  if (fs.existsSync(path.join(home, '.codeium', 'windsurf'))) signals.windsurf = true;
   // 3. Env vars commonly set by editor terminals
   if (process.env.CURSOR_TRACE_ID || /cursor/i.test(process.env.TERM_PROGRAM || '')) signals.cursor = true;
   if (process.env.CLAUDECODE === '1' || process.env.CLAUDE_CODE_ENTRYPOINT) signals.claude = true;
   if (process.env.VSCODE_PID || /vscode/i.test(process.env.TERM_PROGRAM || '')) signals.vscode = true;
+  if (/windsurf/i.test(process.env.TERM_PROGRAM || '')) signals.windsurf = true;
   return signals;
 }
 
@@ -496,11 +500,12 @@ function getPathsForIde(ide, target) {
     case 'vscode':
       // VS Code's Claude Code / Continue / Copilot extensions all read from
       // .claude/ (Claude Code's canonical paths). We install there directly
-      // and additionally write a .vscode/rihal/ marker so VS Code workspace
-      // settings can pin behaviour.
+      // using the SAME layout as the claude case (prefixed-root form) so
+      // multi-IDE installs don't double up — see #723 / #635-#643 / #646.
+      // The .vscode/rihal/ marker is preserved for workspace settings.
       return {
         agentsDir: path.join(target, '.claude', 'agents'),
-        commandsDir: path.join(target, '.claude', 'commands', 'rihal'),
+        commandsDir: path.join(target, '.claude', 'commands'),
         workflowsDir: path.join(target, '.rihal', 'workflows'),
         referencesDir: path.join(target, '.rihal', 'references'),
         binDir: path.join(target, '.rihal', 'bin'),
@@ -518,8 +523,19 @@ function getPathsForIde(ide, target) {
         referencesDir: path.join(target, '.rihal', 'references'),
         binDir: path.join(target, '.rihal', 'bin'),
       };
+    case 'windsurf':
+      // Windsurf (Codeium's agentic IDE) — uses .windsurf/rules/ for .mdc rule
+      // files, parallel to cursor's .cursor/rules/. cli/lib/manifest.cjs already
+      // handles the rules-install verify path (#723 closes the install-side gap).
+      return {
+        agentsDir: path.join(target, '.windsurf', 'rules', 'rihal', 'agents'),
+        commandsDir: path.join(target, '.windsurf', 'rules', 'rihal', 'commands'),
+        workflowsDir: path.join(target, '.rihal', 'workflows'),
+        referencesDir: path.join(target, '.rihal', 'references'),
+        binDir: path.join(target, '.rihal', 'bin'),
+      };
     default:
-      throw new Error(`Unknown IDE: ${ide}. Supported: claude, cursor, gemini, vscode, antigravity`);
+      throw new Error(`Unknown IDE: ${ide}. Supported: ${SUPPORTED_IDES.join(', ')}`);
   }
 }
 
@@ -1044,6 +1060,51 @@ function parseFrontmatter(text) {
  *
  * For cursor IDE, converts command files from .md to .mdc format.
  */
+/**
+ * Migrate legacy vscode-layout commands (.claude/commands/rihal/{name}.md)
+ * to the unified prefixed-root form (.claude/commands/rihal-{name}.md).
+ *
+ * Idempotent. Safe to run on every install/update — no-op when no legacy
+ * dir exists. After move, removes the now-empty rihal/ subdir.
+ *
+ * Returns { moved, removed_dir } so callers can log the migration count.
+ * Designed by Waleed for #723; closes the dual-layout cause of #635, #637,
+ * #638, #639, #640, #641, #642, #643, #646.
+ */
+function migrateVscodeCommandsLayout(target) {
+  const legacyDir = path.join(target, '.claude', 'commands', 'rihal');
+  const newRoot = path.join(target, '.claude', 'commands');
+  if (!fs.existsSync(legacyDir) || !fs.statSync(legacyDir).isDirectory()) {
+    return { moved: 0, removed_dir: false };
+  }
+  let moved = 0;
+  for (const entry of fs.readdirSync(legacyDir)) {
+    const src = path.join(legacyDir, entry);
+    if (!fs.statSync(src).isFile() || !entry.endsWith('.md')) continue;
+    const baseName = path.basename(entry, '.md');
+    // Don't double-prefix if someone already had rihal-foo.md inside rihal/.
+    const targetName = baseName.startsWith('rihal-') ? entry : `rihal-${entry}`;
+    const dst = path.join(newRoot, targetName);
+    if (fs.existsSync(dst)) {
+      // Already migrated by an earlier pass — remove the duplicate at source.
+      fs.unlinkSync(src);
+      continue;
+    }
+    fs.renameSync(src, dst);
+    moved++;
+  }
+  // Remove the now-empty legacy dir. fs.rmdir fails if non-empty — that's
+  // a signal worth surfacing (manual user files in the dir we shouldn't touch).
+  let removedDir = false;
+  try {
+    fs.rmdirSync(legacyDir);
+    removedDir = true;
+  } catch (_) {
+    // Non-empty (user files we don't manage) — leave it alone.
+  }
+  return { moved, removed_dir: removedDir };
+}
+
 function buildInstallPlan(ide = 'claude', target = process.cwd()) {
   // Support array of IDEs — merge plans with deduplication (#449/#450 multi-IDE).
   if (Array.isArray(ide)) {
@@ -1058,26 +1119,12 @@ function buildInstallPlan(ide = 'claude', target = process.cwd()) {
         }
       }
     }
-    // When both claude and vscode are in the IDE list, vscode writes commands to
-    // .claude/commands/rihal/{name}.md (subdirectory) while claude writes them to
-    // .claude/commands/rihal-{name}.md (root). Claude Code reads the full tree
-    // recursively, so both sets appear as slash commands — duplicates in the UI.
-    // Drop the vscode-style subdir entries when claude entries already cover them.
-    if (ide.includes('claude') && ide.includes('vscode')) {
-      const claudeCommandRels = new Set(
-        merged
-          .filter(e => e.ide === 'claude' && e.rel.split(path.sep).join('/').startsWith('.claude/commands/'))
-          .map(e => path.basename(e.rel, '.md').replace(/^rihal-/, ''))
-      );
-      return merged.filter(e => {
-        const rel = e.rel.split(path.sep).join('/');
-        if (e.ide === 'vscode' && rel.startsWith('.claude/commands/rihal/')) {
-          const baseName = path.basename(e.rel, path.extname(e.rel));
-          return !claudeCommandRels.has(baseName);
-        }
-        return true;
-      });
-    }
+    // Note: pre-#723 we had a dual-layout workaround here that filtered
+    // vscode subdir entries when claude+vscode were both selected. After
+    // Waleed's unification (vscode now writes the same rihal-{name}.md root
+    // form as claude), the seen-by-rel dedup above already covers it — both
+    // IDEs emit identical `rel` values and only one wins. Layout drift will
+    // resurface this filter; it's intentionally deleted, not commented out.
     return merged;
   }
 
@@ -1126,13 +1173,14 @@ function buildInstallPlan(ide = 'claude', target = process.cwd()) {
   }
 
   // Commands — IDE-specific
-  // Claude: output as .claude/commands/rihal-{name}.md (hyphen namespace → /rihal-name)
-  // Cursor/Gemini: keep original flat name inside their rihal/ subdirectory
+  // Claude AND VSCode: output as .claude/commands/rihal-{name}.md (prefixed root).
+  // Both target the same commands dir (#723 / Waleed unification) so multi-IDE
+  // installs never duplicate. Cursor/Gemini keep the bare-name-in-rihal/-subdir form.
   for (const f of walkFiles(path.join(SOURCE_ROOT, 'commands'))) {
     const rel = path.relative(path.join(SOURCE_ROOT, 'commands'), f);
     const ext = ide === 'cursor' ? '.mdc' : '.md';
     const baseName = path.basename(f, '.md');
-    const outName = ide === 'claude'
+    const outName = (ide === 'claude' || ide === 'vscode')
       ? `rihal-${baseName}${ext}`
       : baseName + ext;
     plan.push({ src: f, rel: path.join(relCommands, path.dirname(rel), outName), ide, cursor: ide === 'cursor' });
@@ -1730,6 +1778,15 @@ async function installInner(opts) {
     }
   }
 
+  // #723 Waleed — migrate legacy vscode subdir layout BEFORE building the plan
+  // so the plan never has to reason about both forms. Idempotent + safe.
+  if (Array.isArray(opts.ides) && opts.ides.includes('vscode') || (opts.ide === 'vscode')) {
+    const migrated = migrateVscodeCommandsLayout(opts.target);
+    if (migrated.moved > 0) {
+      console.log(`  ↻ Migrated ${migrated.moved} legacy vscode-layout command(s) to .claude/commands/rihal-{name}.md`);
+    }
+  }
+
   const fullPlan = buildInstallPlan(opts.ides, opts.target);
   const plan = filterPlanByModules(fullPlan, opts.modules);
   if (plan.length === 0) {
@@ -1795,6 +1852,10 @@ async function installInner(opts) {
   let copied = 0;
   let skipped = 0;
   let preserved = 0;
+  // #667 — track files the user explicitly chose to update via the conflict
+  // resolver. Without this, accepting "Take vN" for 10 files still printed
+  // "0 files installed" because `copied` only counts pre-conflict writes.
+  let updated = 0;
   const preservedFiles = [];
   const preservedDiffs = [];  // { rel, insertions, deletions, patch } for #251
   const conflictedFiles = []; // { rel, src, destPath, existingContent, sourceContent } for #451 / #453
@@ -1867,6 +1928,10 @@ async function installInner(opts) {
   }
 
   spinner.success({ text: ok(`${copied} files installed`) });
+  // #667 — placeholder; the real count is logged AFTER the conflict resolver
+  // runs below. We re-emit a corrected summary line if the user updated files
+  // via the resolver so they don't walk away thinking "0 files installed"
+  // when they just accepted 10 vN updates.
 
   // Categorised conflict summary (#451) + interactive resolution offer (#453).
   // Replaces the per-file 'differs from package version' warning spam.
@@ -1906,6 +1971,7 @@ async function installInner(opts) {
           fs.writeFileSync(c.destPath, c.sourceContent, 'utf8');
           applied++;
         }
+        updated += applied; // #667 — surface in final summary
         console.log('  ' + ok(`Applied v${readPackageVersion()} to ${applied} file${applied === 1 ? '' : 's'}.`));
       } else if (action === 'review') {
         let applied = 0, kept = 0;
@@ -1952,6 +2018,7 @@ async function installInner(opts) {
             kept++;
           }
         }
+        updated += applied; // #667 — surface in final summary
         console.log('  ' + ok(`Review complete: ${applied} applied, ${kept} kept local.`));
       } else {
         console.log('  ' + dim(`${conflictedFiles.length} file${conflictedFiles.length === 1 ? '' : 's'} kept local. Re-run with --force-overwrite or 'rcode update' anytime.`));
@@ -1962,6 +2029,13 @@ async function installInner(opts) {
     console.log('');
   }
 
+  // #667 — corrected post-resolver summary. Only re-emit when the conflict
+  // resolver actually updated files; preserves the original line otherwise.
+  if (updated > 0) {
+    console.log('  ' + ok(`Total this run: ${copied} installed · ${updated} updated · ${preserved + skipped} unchanged.`));
+    console.log('');
+  }
+
   // In global install mode (~/.claude/), skip per-project artifacts — those are
   // created by `rcode install` inside each project directory at project-init time.
   // Global install only ships the read-only tooling: commands, skills, workflows, bin.
@@ -2355,11 +2429,17 @@ async function installInner(opts) {
       const homeCommands = path.join(os.homedir(), '.claude/commands');
       const homeSkills = path.join(os.homedir(), '.claude/skills');
       if (agentCount === 0 && fs.existsSync(homeAgents)) {
-        const n = fs.readdirSync(homeAgents).filter(f => f.startsWith('rihal-') && f.endsWith('.md')).length;
+        // #669 — count both rihal-* and rcode-* prefixes; missing rcode-
+        // branch produced "Agents: 0" alongside "Skills: 120".
+        const n = fs.readdirSync(homeAgents)
+          .filter(f => (f.startsWith('rihal-') || f.startsWith('rcode-')) && f.endsWith('.md'))
+          .length;
         if (n > 0) { agentCount = n; agentsFromGlobal = true; }
       }
       if (commandCount === 0 && fs.existsSync(homeCommands)) {
-        const n = fs.readdirSync(homeCommands).filter(f => f.startsWith('rihal-') && f.endsWith('.md')).length;
+        const n = fs.readdirSync(homeCommands)
+          .filter(f => (f.startsWith('rihal-') || f.startsWith('rcode-')) && f.endsWith('.md'))
+          .length;
         if (n > 0) { commandCount = n; commandsFromGlobal = true; }
       }
       if (skillsInstalled < 20 && fs.existsSync(homeSkills)) {
@@ -2398,6 +2478,15 @@ async function installInner(opts) {
   console.log('    /rihal-do           # interactive command picker');
   console.log('    /rihal-council <q>  # multi-agent strategic answer');
   console.log('');
+  // #665 — when the install came in via npm -g (--global --no-prompt), the
+  // interactive IDE/planning prompts were skipped. Tell the user how to
+  // configure them per-project so they aren't stranded with defaults.
+  if (opts.global || opts.noPrompt) {
+    console.log(`  ${dim('Configure interactively (one-time, per project):')}`);
+    console.log(`    ${dim('rcode install         # pick IDE + planning policy for THIS project')}`);
+    console.log(`    ${dim('rcode config          # adjust defaults later')}`);
+    console.log('');
+  }
   console.log(dim('  Refresh anytime:'));
   console.log(dim('    npx @hanzlaa/rcode@latest install   # pull the latest rcode + brain'));
   console.log(dim(`    /rihal-update v${version}              # pin rcode to a specific version`));
@@ -2699,3 +2788,5 @@ module.exports.parseArgs = parseArgs;
 module.exports.buildInstallPlan = buildInstallPlan;
 module.exports.install = install;
 module.exports.SUPPORTED_IDES = SUPPORTED_IDES;
+module.exports.migrateVscodeCommandsLayout = migrateVscodeCommandsLayout;
+module.exports.getPathsForIde = getPathsForIde;