@hanzlaa/rcode 3.4.15 → 3.4.16

package/cli/install.js

@@ -945,6 +945,26 @@ 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;
+      });
+    }
     return merged;
   }
 
@@ -1731,12 +1751,18 @@ async function install(opts) {
   const globalClaudeCommands = path.join(os.homedir(), '.claude', 'commands');
   const projectClaudeCommands = path.join(opts.target, '.claude', 'commands');
   const isProjectInstall = opts.target !== os.homedir();
-  if (isProjectInstall && !opts.force && !opts.forceOverwrite) {
+  // Run dedup even when force:true — only forceOverwrite skips it.
+  if (isProjectInstall && !opts.forceOverwrite) {
     try {
-      const globalHasRihal = fs.existsSync(globalClaudeCommands) &&
-        fs.readdirSync(globalClaudeCommands).some(f => f.startsWith('rihal-') && f.endsWith('.md'));
-      const projectHasRihal = fs.existsSync(projectClaudeCommands) &&
-        fs.readdirSync(projectClaudeCommands).some(f => f.startsWith('rihal-') && f.endsWith('.md'));
+      // Check both root-level rihal-*.md AND the rihal/ subdirectory (vscode-style).
+      const globalHasRihal = fs.existsSync(globalClaudeCommands) && (
+        fs.readdirSync(globalClaudeCommands).some(f => f.startsWith('rihal-') && f.endsWith('.md')) ||
+        fs.existsSync(path.join(globalClaudeCommands, 'rihal'))
+      );
+      const projectHasRihal = fs.existsSync(projectClaudeCommands) && (
+        fs.readdirSync(projectClaudeCommands).some(f => f.startsWith('rihal-') && f.endsWith('.md')) ||
+        fs.existsSync(path.join(projectClaudeCommands, 'rihal'))
+      );
       if (globalHasRihal && !projectHasRihal) {
         // Global commands exist, project has none yet — filter them out of the plan
         // so we don't create duplicates. Project gets .rihal/ state only.
@@ -1754,11 +1780,17 @@ async function install(opts) {
       } else if (globalHasRihal && projectHasRihal) {
         // Both exist — project commands are duplicates. Remove project-level ones.
         try {
+          // Remove root-level rihal-*.md files
           const projectCommandFiles = fs.readdirSync(projectClaudeCommands)
             .filter(f => f.startsWith('rihal-') && f.endsWith('.md'));
           for (const f of projectCommandFiles) {
             fs.unlinkSync(path.join(projectClaudeCommands, f));
           }
+          // Remove rihal/ subdirectory (vscode-style commands)
+          const rihalSubdir = path.join(projectClaudeCommands, 'rihal');
+          if (fs.existsSync(rihalSubdir)) {
+            fs.rmSync(rihalSubdir, { recursive: true, force: true });
+          }
           const projectAgentsDir = path.join(opts.target, '.claude', 'agents');
           if (fs.existsSync(projectAgentsDir)) {
             const agentFiles = fs.readdirSync(projectAgentsDir)

package/cli/uninstall.js

@@ -138,9 +138,17 @@ function buildPlan(cwd, editors) {
         .readdirSync(skillsDir)
         .filter((name) => name.startsWith('rihal-') || isKnownSkillName(name));
     }
-    const commandsDir = path.join(cwd, '.claude/commands/rihal');
-    if (fs.existsSync(commandsDir)) {
-      plan.claude.commands = fs.readdirSync(commandsDir);
+    // Collect commands from vscode-style subdir (.claude/commands/rihal/) and
+    // claude-style root-level files (.claude/commands/rihal-*.md).
+    const commandsSubdir = path.join(cwd, '.claude/commands/rihal');
+    if (fs.existsSync(commandsSubdir)) {
+      plan.claude.commands = fs.readdirSync(commandsSubdir);
+    }
+    const commandsRoot = path.join(cwd, '.claude/commands');
+    if (fs.existsSync(commandsRoot)) {
+      const rootFiles = fs.readdirSync(commandsRoot)
+        .filter(f => f.startsWith('rihal-') && (f.endsWith('.md') || f.endsWith('.mdc')));
+      plan.claude.commands = [...plan.claude.commands, ...rootFiles];
     }
     // v2 installs agents to .claude/agents/rihal-*.md — scan for them
     const agentsDir = path.join(cwd, '.claude/agents');
@@ -499,11 +507,26 @@ async function runUninstall(args) {
     removed += n;
     if (n > 0) console.log(`   ✓ removed ${n} Claude skills`);
 
+    // Remove vscode-style subdir .claude/commands/rihal/
     const commandsDir = path.join(cwd, '.claude/commands/rihal');
     if (fs.existsSync(commandsDir)) {
       fs.rmSync(commandsDir, { recursive: true, force: true });
-      removed += plan.claude.commands.length;
-      console.log(`   ✓ removed .claude/commands/rihal/ (${plan.claude.commands.length} slash commands)`);
+    }
+    // Remove claude-style root-level rihal-*.md files
+    const commandsRoot = path.join(cwd, '.claude/commands');
+    let commandsRemoved = 0;
+    if (fs.existsSync(commandsRoot)) {
+      for (const f of fs.readdirSync(commandsRoot)) {
+        if (f.startsWith('rihal-') && (f.endsWith('.md') || f.endsWith('.mdc'))) {
+          fs.unlinkSync(path.join(commandsRoot, f));
+          commandsRemoved++;
+        }
+      }
+    }
+    const totalCommandsRemoved = plan.claude.commands.length;
+    removed += totalCommandsRemoved;
+    if (totalCommandsRemoved > 0) {
+      console.log(`   ✓ removed ${totalCommandsRemoved} slash commands from .claude/commands/`);
     }
 
     // v2: .claude/agents/rihal-*.md

package/cli/update.js

@@ -142,9 +142,19 @@ function removeOldSkillFiles(cwd, editors) {
         }
       }
     }
-    const commandsDir = path.join(cwd, '.claude/commands/rihal');
-    if (fs.existsSync(commandsDir)) {
-      fs.rmSync(commandsDir, { recursive: true, force: true });
+    // Remove vscode-style subdir .claude/commands/rihal/
+    const commandsSubdir = path.join(cwd, '.claude/commands/rihal');
+    if (fs.existsSync(commandsSubdir)) {
+      fs.rmSync(commandsSubdir, { recursive: true, force: true });
+    }
+    // Remove claude-style root-level .claude/commands/rihal-*.md files
+    const commandsRoot = path.join(cwd, '.claude/commands');
+    if (fs.existsSync(commandsRoot)) {
+      for (const f of fs.readdirSync(commandsRoot)) {
+        if (f.startsWith('rihal-') && (f.endsWith('.md') || f.endsWith('.mdc'))) {
+          fs.unlinkSync(path.join(commandsRoot, f));
+        }
+      }
     }
   }
 
@@ -322,10 +332,15 @@ async function runUpdate(args, { packageRoot, packageJson }) {
   // ------ Re-run unified installer ------
   // Delegates to cli/install.js which handles all IDE-specific file shipping
   // (agents, commands, skills, workflows, references, bin). install.js is
-  // the single source of truth — update.js reuses it with --force.
+  // the single source of truth — call once with the full IDE array so that
+  // buildInstallPlan can deduplicate across IDEs (e.g. claude+vscode).
   console.log();
-  for (const ide of editors) {
-    if (!['claude', 'cursor', 'gemini'].includes(ide)) continue;
+  const supportedIdes = editors.filter(ide => ['claude', 'cursor', 'gemini'].includes(ide));
+  if (supportedIdes.length > 0) {
+    if (editors.some(ide => !['claude', 'cursor', 'gemini'].includes(ide))) {
+      const unsupported = editors.filter(ide => !['claude', 'cursor', 'gemini'].includes(ide));
+      console.log(`   ⚠ ${unsupported.join(', ')} refresh not yet supported by installer — skipping`);
+    }
     install.install({
       target: cwd,
       force: true,
@@ -334,11 +349,11 @@ async function runUpdate(args, { packageRoot, packageJson }) {
       projectName: config.project_name || require('path').basename(cwd),
       language: config.language || 'English',
       mode: config.mode || 'guided',
-      ide,
+      ides: supportedIdes,
       modules: [],
       help: false,
     });
-    console.log(`   ✓ ${ide} → refreshed via install.js`);
+    console.log(`   ✓ [${supportedIdes.join(', ')}] → refreshed via install.js`);
   }
 
   // ------ Update installed_version in config.json (atomic) ------

package/dist/rcode.js

@@ -15650,6 +15650,19 @@ ${BLOCK}`);
             }
           }
         }
+        if (ide.includes("claude") && ide.includes("vscode")) {
+          const claudeCommandRels = new Set(
+            merged.filter((e) => e.ide === "claude" && e.rel.split(path2.sep).join("/").startsWith(".claude/commands/")).map((e) => path2.basename(e.rel, ".md").replace(/^rihal-/, ""))
+          );
+          return merged.filter((e) => {
+            const rel = e.rel.split(path2.sep).join("/");
+            if (e.ide === "vscode" && rel.startsWith(".claude/commands/rihal/")) {
+              const baseName = path2.basename(e.rel, path2.extname(e.rel));
+              return !claudeCommandRels.has(baseName);
+            }
+            return true;
+          });
+        }
         return merged;
       }
       const plan = [];
@@ -16272,10 +16285,10 @@ ${BLOCK}`);
       const globalClaudeCommands = path2.join(os.homedir(), ".claude", "commands");
       const projectClaudeCommands = path2.join(opts.target, ".claude", "commands");
       const isProjectInstall = opts.target !== os.homedir();
-      if (isProjectInstall && !opts.force && !opts.forceOverwrite) {
+      if (isProjectInstall && !opts.forceOverwrite) {
         try {
-          const globalHasRihal = fs2.existsSync(globalClaudeCommands) && fs2.readdirSync(globalClaudeCommands).some((f) => f.startsWith("rihal-") && f.endsWith(".md"));
-          const projectHasRihal = fs2.existsSync(projectClaudeCommands) && fs2.readdirSync(projectClaudeCommands).some((f) => f.startsWith("rihal-") && f.endsWith(".md"));
+          const globalHasRihal = fs2.existsSync(globalClaudeCommands) && (fs2.readdirSync(globalClaudeCommands).some((f) => f.startsWith("rihal-") && f.endsWith(".md")) || fs2.existsSync(path2.join(globalClaudeCommands, "rihal")));
+          const projectHasRihal = fs2.existsSync(projectClaudeCommands) && (fs2.readdirSync(projectClaudeCommands).some((f) => f.startsWith("rihal-") && f.endsWith(".md")) || fs2.existsSync(path2.join(projectClaudeCommands, "rihal")));
           if (globalHasRihal && !projectHasRihal) {
             const before = plan.length;
             const filtered = plan.filter((e) => {
@@ -16294,6 +16307,10 @@ ${BLOCK}`);
               for (const f of projectCommandFiles) {
                 fs2.unlinkSync(path2.join(projectClaudeCommands, f));
               }
+              const rihalSubdir = path2.join(projectClaudeCommands, "rihal");
+              if (fs2.existsSync(rihalSubdir)) {
+                fs2.rmSync(rihalSubdir, { recursive: true, force: true });
+              }
               const projectAgentsDir = path2.join(opts.target, ".claude", "agents");
               if (fs2.existsSync(projectAgentsDir)) {
                 const agentFiles = fs2.readdirSync(projectAgentsDir).filter((f) => f.startsWith("rihal-") && f.endsWith(".md"));
@@ -17222,9 +17239,17 @@ var require_update = __commonJS({
             }
           }
         }
-        const commandsDir = path2.join(cwd, ".claude/commands/rihal");
-        if (fs2.existsSync(commandsDir)) {
-          fs2.rmSync(commandsDir, { recursive: true, force: true });
+        const commandsSubdir = path2.join(cwd, ".claude/commands/rihal");
+        if (fs2.existsSync(commandsSubdir)) {
+          fs2.rmSync(commandsSubdir, { recursive: true, force: true });
+        }
+        const commandsRoot = path2.join(cwd, ".claude/commands");
+        if (fs2.existsSync(commandsRoot)) {
+          for (const f of fs2.readdirSync(commandsRoot)) {
+            if (f.startsWith("rihal-") && (f.endsWith(".md") || f.endsWith(".mdc"))) {
+              fs2.unlinkSync(path2.join(commandsRoot, f));
+            }
+          }
         }
       }
       if (editors.includes("cursor")) {
@@ -17380,8 +17405,12 @@ var require_update = __commonJS({
       console.log(`   \u{1F9F9} cleaned ${totalRemoved} old skill files`);
       stripAgentsMdSection(cwd);
       console.log();
-      for (const ide of editors) {
-        if (!["claude", "cursor", "gemini"].includes(ide)) continue;
+      const supportedIdes = editors.filter((ide) => ["claude", "cursor", "gemini"].includes(ide));
+      if (supportedIdes.length > 0) {
+        if (editors.some((ide) => !["claude", "cursor", "gemini"].includes(ide))) {
+          const unsupported = editors.filter((ide) => !["claude", "cursor", "gemini"].includes(ide));
+          console.log(`   \u26A0 ${unsupported.join(", ")} refresh not yet supported by installer \u2014 skipping`);
+        }
         install.install({
           target: cwd,
           force: true,
@@ -17390,11 +17419,11 @@ var require_update = __commonJS({
           projectName: config.project_name || require("path").basename(cwd),
           language: config.language || "English",
           mode: config.mode || "guided",
-          ide,
+          ides: supportedIdes,
           modules: [],
           help: false
         });
-        console.log(`   \u2713 ${ide} \u2192 refreshed via install.js`);
+        console.log(`   \u2713 [${supportedIdes.join(", ")}] \u2192 refreshed via install.js`);
       }
       config.installed_version = packageVersion;
       writeJsonAtomic(configPath, config);
@@ -17507,9 +17536,14 @@ var require_uninstall = __commonJS({
         if (fs2.existsSync(skillsDir)) {
           plan.claude.skills = fs2.readdirSync(skillsDir).filter((name) => name.startsWith("rihal-") || isKnownSkillName(name));
         }
-        const commandsDir = path2.join(cwd, ".claude/commands/rihal");
-        if (fs2.existsSync(commandsDir)) {
-          plan.claude.commands = fs2.readdirSync(commandsDir);
+        const commandsSubdir = path2.join(cwd, ".claude/commands/rihal");
+        if (fs2.existsSync(commandsSubdir)) {
+          plan.claude.commands = fs2.readdirSync(commandsSubdir);
+        }
+        const commandsRoot = path2.join(cwd, ".claude/commands");
+        if (fs2.existsSync(commandsRoot)) {
+          const rootFiles = fs2.readdirSync(commandsRoot).filter((f) => f.startsWith("rihal-") && (f.endsWith(".md") || f.endsWith(".mdc")));
+          plan.claude.commands = [...plan.claude.commands, ...rootFiles];
         }
         const agentsDir = path2.join(cwd, ".claude/agents");
         if (fs2.existsSync(agentsDir)) {
@@ -17782,8 +17816,21 @@ var require_uninstall = __commonJS({
         const commandsDir = path2.join(cwd, ".claude/commands/rihal");
         if (fs2.existsSync(commandsDir)) {
           fs2.rmSync(commandsDir, { recursive: true, force: true });
-          removed += plan.claude.commands.length;
-          console.log(`   \u2713 removed .claude/commands/rihal/ (${plan.claude.commands.length} slash commands)`);
+        }
+        const commandsRoot = path2.join(cwd, ".claude/commands");
+        let commandsRemoved = 0;
+        if (fs2.existsSync(commandsRoot)) {
+          for (const f of fs2.readdirSync(commandsRoot)) {
+            if (f.startsWith("rihal-") && (f.endsWith(".md") || f.endsWith(".mdc"))) {
+              fs2.unlinkSync(path2.join(commandsRoot, f));
+              commandsRemoved++;
+            }
+          }
+        }
+        const totalCommandsRemoved = plan.claude.commands.length;
+        removed += totalCommandsRemoved;
+        if (totalCommandsRemoved > 0) {
+          console.log(`   \u2713 removed ${totalCommandsRemoved} slash commands from .claude/commands/`);
         }
         const agentsDir = path2.join(cwd, ".claude/agents");
         const nAgents = removeMatching(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hanzlaa/rcode",
-  "version": "3.4.15",
+  "version": "3.4.16",
   "description": "rcode — the memory bank for AI-driven SaaS teams. Persistent project context, distinctive engineering personas, and phase-based workflows. Built by Rihal. Works in Claude Code, Cursor, Gemini, VS Code, and Antigravity.",
   "main": "cli/index.js",
   "bin": {