@hanzlaa/rcode 3.6.16 → 4.1.0

package/cli/uninstall.js

@@ -1,25 +1,25 @@
 /**
- * rihal-code uninstall — remove Rihal Code from the current project.
+ * rcode uninstall — remove rcode from the current project.
  *
  * Cleanly removes:
- *   - .claude/skills/rihal-*             (phrase-activated skills)
- *   - .claude/commands/rihal/             (slash commands)
- *   - .claude/agents/rihal-*.md           (v2 subagents: sadiq, waleed, yousef, zayd, etc.)
- *   - .cursor/rules/rihal-*.mdc           (cursor rules)
- *   - .windsurf/rules/rihal-*.mdc         (windsurf rules)
- *   - .antigravity/agents/rihal-*         (antigravity agents)
- *   - Rihal Code section in AGENTS.md     (appended section only — file preserved)
- *   - .rihal/                             (ONLY if user explicitly confirms — contains project state)
+ *   - .claude/skills/rcode-*             (phrase-activated skills)
+ *   - .claude/commands/rcode/             (slash commands)
+ *   - .claude/agents/rcode-*.md           (v2 subagents: sadiq, waleed, yousef, zayd, etc.)
+ *   - .cursor/rules/rcode-*.mdc           (cursor rules)
+ *   - .windsurf/rules/rcode-*.mdc         (windsurf rules)
+ *   - .antigravity/agents/rcode-*         (antigravity agents)
+ *   - rcode section in AGENTS.md     (appended section only — file preserved)
+ *   - .rcode/                             (ONLY if user explicitly confirms — contains project state)
  *
  * Default: interactive preview → confirmation → delete.
  *
  * Flags:
  *   --editor=claude|cursor|windsurf|antigravity|all   Limit scope
- *   --keep-state                                      Never touch .rihal/
- *   --delete-state                                    Also delete .rihal/ (skip prompt)
+ *   --keep-state                                      Never touch .rcode/
+ *   --delete-state                                    Also delete .rcode/ (skip prompt)
  *   --purge / --all                                   Wipe everything — editor files,
- *                                                       .rihal/, .planning/, gitignore block.
- *                                                       Use when you want /rihal-init to
+ *                                                       .rcode/, .planning/, gitignore block.
+ *                                                       Use when you want /rcode-init to
  *                                                       report "fresh" on next install.
  *   --yes / -y                                        Skip the main confirmation
  */
@@ -33,10 +33,10 @@ const { writeFileAtomic, safeRmSync } = require('./lib/fsutil.cjs');
 function parseArgs(args) {
   const opts = {
     editor: null,           // null = all
-    keepState: false,       // if true, never delete .rihal/
-    deleteState: false,     // if true, delete .rihal/ without prompting
+    keepState: false,       // if true, never delete .rcode/
+    deleteState: false,     // if true, delete .rcode/ without prompting
     yes: false,             // skip the main confirmation
-    purge: false,           // wipe everything: editor files + .rihal/ + .planning/ + gitignore block
+    purge: false,           // wipe everything: editor files + .rcode/ + .planning/ + gitignore block
   };
   for (const arg of args) {
     if (arg.startsWith('--editor=')) {
@@ -49,7 +49,7 @@ function parseArgs(args) {
       opts.yes = true;
     } else if (arg === '--purge' || arg === '--all') {
       // --purge implies --delete-state and removes .planning/ + gitignore block.
-      // Use this when you want a clean slate so /rihal-init reports "fresh" next time.
+      // Use this when you want a clean slate so /rcode-init reports "fresh" next time.
       opts.purge = true;
       opts.deleteState = true;
     }
@@ -78,15 +78,56 @@ function isLocalOverride(name) {
  * Both supported shapes require BOTH the opener AND the closer to match —
  * user comments starting with "# rcode" are safe.
  */
-function stripRihalGitignoreBlock(text) {
+function stripRcodeGitignoreBlock(text) {
   return text
     // Current shape (install.js BEGIN/END markers — exact match).
     .replace(/\n?# ===== rcode-managed gitignore block[\s\S]*?# ===== end rcode-managed gitignore block =====\n?/g, '\n')
     // Legacy >>> / <<< fenced shape.
-    .replace(/\n?# >>> rihal-code >>>[\s\S]*?# <<< rihal-code <<<\n?/g, '\n')
+    .replace(/\n?# >>> rcode >>>[\s\S]*?# <<< rcode <<<\n?/g, '\n')
     .replace(/\n{3,}/g, '\n\n');
 }
 
+/**
+ * Strip the rcode-managed block from .git/hooks/pre-commit.
+ * Removes the file entirely when only the shebang + rcode block remain.
+ * Returns 'removed' | 'stripped' | 'unchanged' | 'skipped'.
+ */
+function cleanRcodePreCommitHook(cwd) {
+  const hookPath = path.join(cwd, '.git', 'hooks', 'pre-commit');
+  if (!fs.existsSync(hookPath)) return 'skipped';
+
+  const BEGIN = '# ===== rcode-managed pre-commit block =====';
+  const END   = '# ===== end rcode pre-commit block =====';
+
+  let content;
+  try { content = fs.readFileSync(hookPath, 'utf8'); } catch { return 'skipped'; }
+
+  if (!content.includes(BEGIN)) return 'unchanged';
+
+  const startIdx = content.indexOf(BEGIN);
+  const endIdx = content.indexOf(END, startIdx);
+  if (endIdx < 0) return 'unchanged'; // malformed — leave it
+
+  // Trim the newline that precedes BEGIN and the newline that follows END
+  let lo = startIdx;
+  if (lo > 0 && content[lo - 1] === '\n') lo--;
+  let hi = endIdx + END.length;
+  if (hi < content.length && content[hi] === '\n') hi++;
+
+  const stripped = content.slice(0, lo) + content.slice(hi);
+
+  // If only a shebang (or blank) remains, remove the whole file
+  const remnant = stripped.trim();
+  if (remnant === '' || remnant === '#!/bin/sh' || remnant === '#!/bin/bash') {
+    try { fs.unlinkSync(hookPath); return 'removed'; } catch { return 'skipped'; }
+  }
+
+  try {
+    writeFileAtomic(hookPath, stripped, { mode: 0o755 });
+    return 'stripped';
+  } catch { return 'skipped'; }
+}
+
 /**
  * Walk a directory and remove all files/subdirs whose name matches a predicate.
  * Returns the number of entries removed. Always skips local overrides (#382).
@@ -133,7 +174,7 @@ function rmdirIfEmpty(dir) {
  * Order matters: pass innermost first so each parent has a chance to
  * become empty after its child is removed.
  *
- * Never touches `.rihal/` — that's managed separately by the state
+ * Never touches `.rcode/` — that's managed separately by the state
  * preservation flow.
  */
 function cleanupEmptyDirs(cwd, relPaths) {
@@ -148,7 +189,7 @@ function cleanupEmptyDirs(cwd, relPaths) {
  */
 function buildPlan(cwd, editors) {
   const plan = {
-    claude: { skills: [], commands: [], agents: [] },
+    claude: { skills: [], commands: [], agents: [], agentsRulesDir: false },
     cursor: [],
     windsurf: [],
     antigravity: [],
@@ -161,11 +202,11 @@ function buildPlan(cwd, editors) {
 
   // Issue #706: vscode and gemini are in SUPPORTED_IDES but uninstall.js had
   // no branches for them. vscode shares .claude/ for commands+agents+skills
-  // — fold into the claude branch. gemini has its own .gemini/rihal/ tree.
+  // — fold into the claude branch. gemini has its own .gemini/rcode/ tree.
   if (editors.includes('vscode')) {
     if (!editors.includes('claude')) editors.push('claude'); // share scan
-    const markerDir = path.join(cwd, '.vscode/rihal');
-    if (fs.existsSync(markerDir)) plan.vscode.push('.vscode/rihal');
+    const markerDir = path.join(cwd, '.vscode/rcode');
+    if (fs.existsSync(markerDir)) plan.vscode.push('.vscode/rcode');
   }
 
   if (editors.includes('claude')) {
@@ -173,26 +214,30 @@ function buildPlan(cwd, editors) {
     if (fs.existsSync(skillsDir)) {
       plan.claude.skills = fs
         .readdirSync(skillsDir)
-        .filter((name) => name.startsWith('rihal-') || isKnownSkillName(name));
+        .filter((name) => name.startsWith('rcode-') || isKnownSkillName(name));
     }
-    // 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');
+    // Collect commands from vscode-style subdir (.claude/commands/rcode/) and
+    // claude-style root-level files (.claude/commands/rcode-*.md).
+    const commandsSubdir = path.join(cwd, '.claude/commands/rcode');
     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')));
+        .filter(f => f.startsWith('rcode-') && (f.endsWith('.md') || f.endsWith('.mdc')));
       plan.claude.commands = [...plan.claude.commands, ...rootFiles];
     }
-    // v2 installs agents to .claude/agents/rihal-*.md — scan for them
+    // v2 installs agents to .claude/agents/rcode-*.md — scan for them
     const agentsDir = path.join(cwd, '.claude/agents');
     if (fs.existsSync(agentsDir)) {
       plan.claude.agents = fs
         .readdirSync(agentsDir)
-        .filter((name) => name.startsWith('rihal-') && name.endsWith('.md'));
+        .filter((name) => name.startsWith('rcode-') && name.endsWith('.md'));
+    }
+    // Installer copies rcode/agents/rules/ tree → .claude/agents/rules/ (#876)
+    if (fs.existsSync(path.join(cwd, '.claude/agents/rules'))) {
+      plan.claude.agentsRulesDir = true;
     }
   }
 
@@ -201,7 +246,8 @@ function buildPlan(cwd, editors) {
     if (fs.existsSync(cursorDir)) {
       plan.cursor = fs
         .readdirSync(cursorDir)
-        .filter((name) => name.startsWith('rihal-') || name === 'rihal-code.mdc' || name === 'rihal-method.mdc');
+        // 'rcode' matches the .cursor/rules/rcode/ subdir installed by the cursor IDE path (#876)
+        .filter((name) => name.startsWith('rcode-') || name === 'rcode.mdc' || name === 'rcode-method.mdc' || name === 'rcode');
     }
   }
 
@@ -210,7 +256,7 @@ function buildPlan(cwd, editors) {
     if (fs.existsSync(windsurfDir)) {
       plan.windsurf = fs
         .readdirSync(windsurfDir)
-        .filter((name) => name.startsWith('rihal-') || name === 'rihal-code.mdc' || name === 'rihal-method.mdc');
+        .filter((name) => name.startsWith('rcode-') || name === 'rcode.mdc' || name === 'rcode-method.mdc');
     }
   }
 
@@ -219,36 +265,36 @@ function buildPlan(cwd, editors) {
     if (fs.existsSync(agDir)) {
       plan.antigravity = fs
         .readdirSync(agDir)
-        .filter((name) => name.startsWith('rihal-'));
+        .filter((name) => name.startsWith('rcode-'));
     }
   }
 
   if (editors.includes('gemini')) {
-    // #706 — gemini installs to .gemini/rihal/{agents,commands}
+    // #706 — gemini installs to .gemini/rcode/{agents,commands}
     for (const sub of ['agents', 'commands']) {
-      const dir = path.join(cwd, '.gemini', 'rihal', sub);
+      const dir = path.join(cwd, '.gemini', 'rcode', sub);
       if (fs.existsSync(dir)) {
         for (const name of fs.readdirSync(dir)) {
-          if (name.startsWith('rihal-') || name.endsWith('.md')) {
-            plan.gemini.push(path.join('.gemini/rihal', sub, name));
+          if (name.startsWith('rcode-') || name.endsWith('.md')) {
+            plan.gemini.push(path.join('.gemini/rcode', sub, name));
           }
         }
       }
     }
   }
 
-  // Check AGENTS.md for Rihal section
+  // Check AGENTS.md for rcode section
   const agentsMdPath = path.join(cwd, 'AGENTS.md');
   if (fs.existsSync(agentsMdPath)) {
     const content = fs.readFileSync(agentsMdPath, 'utf8');
-    if (content.includes('## Rihal Code Agents (installed)') || content.includes('## Rihal Method Agents (installed)')) {
+    if (content.includes('## rcode Agents (installed)') || content.includes('## rcode Method Agents (installed)')) {
       plan.agentsMd = 'present';
     }
   }
 
-  // Check .rihal/ state directory
-  const rihalDir = path.join(cwd, '.rihal');
-  if (fs.existsSync(rihalDir)) {
+  // Check .rcode/ state directory
+  const rcodeDir = path.join(cwd, '.rcode');
+  if (fs.existsSync(rcodeDir)) {
     let fileCount = 0;
     function countFiles(dir) {
       for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
@@ -256,7 +302,7 @@ function buildPlan(cwd, editors) {
         else fileCount++;
       }
     }
-    try { countFiles(rihalDir); } catch {}
+    try { countFiles(rcodeDir); } catch {}
     plan.stateDir = { files: fileCount };
   }
 
@@ -267,7 +313,7 @@ function buildPlan(cwd, editors) {
  * Names of action-skill directories the installer places under .claude/skills/.
  *
  * Issue #693: this used to be a hardcoded array of 23 names that drifted from
- * the source the moment anyone added or removed a skill in `rihal/skills/`.
+ * the source the moment anyone added or removed a skill in `rcode/skills/`.
  * We now derive it from the package's own manifest (cli/lib/manifest.cjs)
  * with a static fallback for the rare case where the manifest module isn't
  * resolvable from the uninstall context.
@@ -282,8 +328,8 @@ function discoverKnownActionSkills() {
     }
   } catch { /* fall through to static list */ }
   // Static fallback — kept minimal, only the names that don't start with
-  // 'rihal-' would actually need this list since we already match
-  // 'rihal-*' via prefix. This is defensive only.
+  // 'rcode-' would actually need this list since we already match
+  // 'rcode-*' via prefix. This is defensive only.
   return [];
 }
 const KNOWN_ACTION_SKILLS = discoverKnownActionSkills();
@@ -299,7 +345,7 @@ function isKnownSkillName(name) {
  * @param {object} plan — uninstall plan
  * @param {string} cwd — project root
  * @param {object} [options]
- * @param {boolean} [options.purge=false] — when true, also include .rihal/
+ * @param {boolean} [options.purge=false] — when true, also include .rcode/
  *   and .planning/ in the backup so --purge users can recover state.json,
  *   decisions, and planning artifacts. Issue #683.
  */
@@ -310,27 +356,30 @@ function planToPathList(plan, cwd, options = {}) {
     paths.push(path.join('.claude/skills', name));
   }
   // Issue #704: claude IDE installs slash commands as flat
-  // .claude/commands/rihal-*.md files (post-#697 layout). The previous
-  // backup only added the legacy '.claude/commands/rihal' subdir, so on
+  // .claude/commands/rcode-*.md files (post-#697 layout). The previous
+  // backup only added the legacy '.claude/commands/rcode' subdir, so on
   // any modern claude install the tarball was missing every slash command.
   // Add each flat file individually if present, plus the legacy subdir.
   for (const name of plan.claude.commands) {
     // plan.claude.commands holds entries from BOTH layouts:
-    //   - 'rihal-foo.md' (claude flat)
+    //   - 'rcode-foo.md' (claude flat)
     //   - 'foo.md' (vscode subdir)
-    // Disambiguate by the rihal- prefix.
-    if (name.startsWith('rihal-') && name.endsWith('.md')) {
+    // Disambiguate by the rcode- prefix.
+    if (name.startsWith('rcode-') && name.endsWith('.md')) {
       paths.push(path.join('.claude/commands', name));
     }
   }
   // Legacy vscode-style subdir is added once if any subdir entries exist.
-  const hasSubdirCommand = plan.claude.commands.some(n => !n.startsWith('rihal-'));
+  const hasSubdirCommand = plan.claude.commands.some(n => !n.startsWith('rcode-'));
   if (hasSubdirCommand) {
-    paths.push('.claude/commands/rihal');
+    paths.push('.claude/commands/rcode');
   }
   for (const name of plan.claude.agents) {
     paths.push(path.join('.claude/agents', name));
   }
+  if (plan.claude.agentsRulesDir) {
+    paths.push('.claude/agents/rules');
+  }
   for (const name of plan.cursor) {
     paths.push(path.join('.cursor/rules', name));
   }
@@ -353,18 +402,18 @@ function planToPathList(plan, cwd, options = {}) {
     paths.push('AGENTS.md');
   }
 
-  // Issue #683: --purge wipes .rihal/ AND .planning/ but the backup never
+  // Issue #683: --purge wipes .rcode/ AND .planning/ but the backup never
   // included them. User loses state.json, decisions, planning artifacts with
-  // no recovery. Add them when purging — but EXCLUDE .rihal/backups/ itself
+  // no recovery. Add them when purging — but EXCLUDE .rcode/backups/ itself
   // (we'd be writing into the dir we're tar-ing).
   if (options.purge) {
-    const rihalDir = path.join(cwd, '.rihal');
-    if (fs.existsSync(rihalDir)) {
+    const rcodeDir = path.join(cwd, '.rcode');
+    if (fs.existsSync(rcodeDir)) {
       // Walk one level deep and add everything except backups/
       try {
-        for (const entry of fs.readdirSync(rihalDir)) {
+        for (const entry of fs.readdirSync(rcodeDir)) {
           if (entry === 'backups') continue;
-          paths.push(path.join('.rihal', entry));
+          paths.push(path.join('.rcode', entry));
         }
       } catch { /* fall through; ok=false from tar will warn */ }
     }
@@ -396,13 +445,13 @@ function createBackup(cwd, plan, options = {}) {
     return { ok: false, warning: 'tar not available on this system' };
   }
 
-  // Issue #683: when --purge wipes .rihal/, a backup written into
-  // .rihal/backups/ would be deleted moments later. Write to a sibling
-  // .rihal-backups/ at the project root instead so the backup survives.
-  // For non-purge runs, keep the historical .rihal/backups/ location.
+  // Issue #683: when --purge wipes .rcode/, a backup written into
+  // .rcode/backups/ would be deleted moments later. Write to a sibling
+  // .rcode-backups/ at the project root instead so the backup survives.
+  // For non-purge runs, keep the historical .rcode/backups/ location.
   const backupsDir = options.purge
-    ? path.join(cwd, '.rihal-backups')
-    : path.join(cwd, '.rihal/backups');
+    ? path.join(cwd, '.rcode-backups')
+    : path.join(cwd, '.rcode/backups');
   try {
     fs.mkdirSync(backupsDir, { recursive: true });
   } catch (err) {
@@ -436,22 +485,22 @@ function createBackup(cwd, plan, options = {}) {
 }
 
 /**
- * Remove the Rihal Code section from AGENTS.md without deleting the whole file.
- * The section starts with `## Rihal Code Agents (installed)` or the older
- * `## Rihal Method Agents (installed)` header and ends at either EOF or the
+ * Remove the rcode section from AGENTS.md without deleting the whole file.
+ * The section starts with `## rcode Agents (installed)` or the older
+ * `## rcode Method Agents (installed)` header and ends at either EOF or the
  * next `## ` top-level heading.
  */
-function stripRihalFromAgentsMd(agentsMdPath) {
+function stripRcodeFromAgentsMd(agentsMdPath) {
   if (!fs.existsSync(agentsMdPath)) return false;
   let content = fs.readFileSync(agentsMdPath, 'utf8');
   let changed = false;
 
-  // Match the Rihal section and everything until the next `## ` or EOF
+  // Match the rcode section and everything until the next `## ` or EOF
   const patterns = [
-    /\n*---\n+## Rihal Code Agents \(installed\)[\s\S]*?(?=\n## |\n*$)/,
-    /\n*---\n+## Rihal Method Agents \(installed\)[\s\S]*?(?=\n## |\n*$)/,
-    /\n*## Rihal Code Agents \(installed\)[\s\S]*?(?=\n## |\n*$)/,
-    /\n*## Rihal Method Agents \(installed\)[\s\S]*?(?=\n## |\n*$)/,
+    /\n*---\n+## rcode Agents \(installed\)[\s\S]*?(?=\n## |\n*$)/,
+    /\n*---\n+## rcode Method Agents \(installed\)[\s\S]*?(?=\n## |\n*$)/,
+    /\n*## rcode Agents \(installed\)[\s\S]*?(?=\n## |\n*$)/,
+    /\n*## rcode Method Agents \(installed\)[\s\S]*?(?=\n## |\n*$)/,
   ];
 
   for (const pattern of patterns) {
@@ -494,27 +543,27 @@ async function runUninstall(args) {
     ? (opts.editor === 'all' ? Array.from(SUPPORTED_IDES) : [opts.editor])
     : Array.from(SUPPORTED_IDES);
 
-  console.log(`\n🕌 Rihal Code — Uninstall\n`);
+  console.log(`\n🕌 rcode — Uninstall\n`);
   console.log(`   Project: ${cwd}`);
   console.log(`   Scope:   ${editors.join(', ')}`);
   console.log();
 
-  // Fast path: is Rihal Code installed here at all? Check our own marker
-  // (.rihal/config.yaml) + any editor install trace. If nothing, exit cleanly
+  // Fast path: is rcode installed here at all? Check our own marker
+  // (.rcode/config.yaml) + any editor install trace. If nothing, exit cleanly
   // with a clear message so users don't wonder "did it work?"
   // (Was checking config.json — a long-standing typo since the installer
   // writes config.yaml. The check still worked thanks to the editor-files
-  // fallback, but a project with .rihal/ and no editor files would falsely
+  // fallback, but a project with .rcode/ and no editor files would falsely
   // report "not installed".)
-  const hasConfig = fs.existsSync(path.join(cwd, '.rihal/config.yaml'))
-    || fs.existsSync(path.join(cwd, '.rihal/config.json'));
+  const hasConfig = fs.existsSync(path.join(cwd, '.rcode/config.yaml'))
+    || fs.existsSync(path.join(cwd, '.rcode/config.json'));
   const hasAnyEditorFiles =
     fs.existsSync(path.join(cwd, '.claude/skills')) ||
     fs.existsSync(path.join(cwd, '.cursor/rules')) ||
     fs.existsSync(path.join(cwd, '.windsurf/rules')) ||
     fs.existsSync(path.join(cwd, '.antigravity/agents'));
   if (!hasConfig && !hasAnyEditorFiles) {
-    console.log(`\n❌ Rihal Code is not installed in this directory.`);
+    console.log(`\n❌ rcode is not installed in this directory.`);
     console.log(`   Nothing to uninstall.`);
     console.log();
     console.log(`   To install: rcode install`);
@@ -534,9 +583,9 @@ async function runUninstall(args) {
   const totalItems = totalSkills + totalCommands + totalAgents + totalCursor + totalWindsurf + totalAG;
 
   // Edge case: install traces exist but no actual files match our patterns
-  // (e.g. user manually deleted Rihal files but left dirs). Exit clean.
+  // (e.g. user manually deleted rcode files but left dirs). Exit clean.
   if (totalItems === 0 && !plan.agentsMd && !plan.stateDir) {
-    console.log(`\n❌ No Rihal Code files found to remove.`);
+    console.log(`\n❌ No rcode files found to remove.`);
     console.log(`   The install markers are present but all files have already been deleted.`);
     console.log();
     return;
@@ -545,29 +594,29 @@ async function runUninstall(args) {
   console.log(`What will be removed:\n`);
   if (editors.includes('claude')) {
     console.log(`   Claude Code`);
-    console.log(`     .claude/skills/ (rihal-*):    ${totalSkills} skills`);
-    console.log(`     .claude/commands/rihal/:      ${totalCommands} slash commands`);
-    console.log(`     .claude/agents/rihal-*.md:    ${totalAgents} agents`);
+    console.log(`     .claude/skills/ (rcode-*):    ${totalSkills} skills`);
+    console.log(`     .claude/commands/rcode/:      ${totalCommands} slash commands`);
+    console.log(`     .claude/agents/rcode-*.md:    ${totalAgents} agents`);
   }
   if (editors.includes('cursor')) {
     console.log(`   Cursor`);
-    console.log(`     .cursor/rules/rihal-*.mdc:    ${totalCursor} rules`);
+    console.log(`     .cursor/rules/rcode-*.mdc:    ${totalCursor} rules`);
   }
   if (editors.includes('windsurf')) {
     console.log(`   Windsurf`);
-    console.log(`     .windsurf/rules/rihal-*.mdc:  ${totalWindsurf} rules`);
+    console.log(`     .windsurf/rules/rcode-*.mdc:  ${totalWindsurf} rules`);
   }
   if (editors.includes('antigravity')) {
     console.log(`   Antigravity`);
-    console.log(`     .antigravity/agents/rihal-*:  ${totalAG} agents`);
+    console.log(`     .antigravity/agents/rcode-*:  ${totalAG} agents`);
   }
   if (plan.agentsMd) {
     console.log(`   AGENTS.md`);
-    console.log(`     Rihal Code section will be stripped (file preserved)`);
+    console.log(`     rcode section will be stripped (file preserved)`);
   }
   if (plan.stateDir) {
     console.log();
-    console.log(`⚠️  .rihal/ state directory detected`);
+    console.log(`⚠️  .rcode/ state directory detected`);
     console.log(`   Contains ${plan.stateDir.files} files (phases, decisions, progress, artifacts)`);
     console.log(`   This is YOUR PROJECT DATA — not the skill files.`);
     if (opts.deleteState) {
@@ -594,14 +643,14 @@ async function runUninstall(args) {
 
   // Create a timestamped backup before doing anything destructive.
   // Non-fatal on failure — the user already confirmed, we just warn.
-  // Issue #683: --purge backs up .rihal/ and .planning/ too so users can
+  // Issue #683: --purge backs up .rcode/ and .planning/ too so users can
   // recover state.json, decisions log, and planning artifacts.
   console.log();
   const backup = createBackup(cwd, plan, { purge: opts.purge === true });
   if (backup.ok) {
     console.log(`   💾 backup created: ${backup.path}`);
     if (opts.purge) {
-      console.log('      includes .rihal/ and .planning/ (state, decisions, planning artifacts)');
+      console.log('      includes .rcode/ and .planning/ (state, decisions, planning artifacts)');
     }
   } else {
     console.log(`   ⚠ no backup created (${backup.warning}) — continuing anyway`);
@@ -613,24 +662,24 @@ async function runUninstall(args) {
 
   if (editors.includes('claude')) {
     const skillsDir = path.join(cwd, '.claude/skills');
-    const n = removeMatching(skillsDir, (name) => name.startsWith('rihal-') || isKnownSkillName(name));
+    const n = removeMatching(skillsDir, (name) => name.startsWith('rcode-') || isKnownSkillName(name));
     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');
+    // Remove vscode-style subdir .claude/commands/rcode/
+    const commandsDir = path.join(cwd, '.claude/commands/rcode');
     if (fs.existsSync(commandsDir)) {
       const r = safeRmSync(commandsDir, path.resolve(cwd));
       if (!r.ok && r.reason === 'outside-root') {
         console.log(`   ⚠ refused to remove ${commandsDir} — symlink resolves outside project root`);
       }
     }
-    // Remove claude-style root-level rihal-*.md files
+    // Remove claude-style root-level rcode-*.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'))) {
+        if (f.startsWith('rcode-') && (f.endsWith('.md') || f.endsWith('.mdc'))) {
           fs.unlinkSync(path.join(commandsRoot, f));
           commandsRemoved++;
         }
@@ -642,14 +691,25 @@ async function runUninstall(args) {
       console.log(`   ✓ removed ${totalCommandsRemoved} slash commands from .claude/commands/`);
     }
 
-    // v2: .claude/agents/rihal-*.md
+    // v2: .claude/agents/rcode-*.md
     const agentsDir = path.join(cwd, '.claude/agents');
     const nAgents = removeMatching(agentsDir, (name) =>
-      name.startsWith('rihal-') && name.endsWith('.md'),
+      name.startsWith('rcode-') && name.endsWith('.md'),
     );
     removed += nAgents;
     if (nAgents > 0) console.log(`   ✓ removed ${nAgents} Claude agents`);
 
+    // .claude/agents/rules/ — installed by the agent-rules sub-tree (#876)
+    if (plan.claude.agentsRulesDir) {
+      const rulesDir = path.join(cwd, '.claude/agents/rules');
+      const r = safeRmSync(rulesDir, path.resolve(cwd));
+      if (r.ok && r.reason !== 'missing') {
+        console.log(`   ✓ removed .claude/agents/rules/ (agent reference rules)`);
+      } else if (r.reason === 'outside-root') {
+        console.log(`   ⚠ refused to remove .claude/agents/rules/ — symlink resolves outside project root`);
+      }
+    }
+
     // Clean up now-empty .claude/commands and .claude/agents dirs
     try {
       if (fs.existsSync(path.join(cwd, '.claude/commands')) && fs.readdirSync(path.join(cwd, '.claude/commands')).length === 0) {
@@ -664,7 +724,7 @@ async function runUninstall(args) {
   if (editors.includes('cursor')) {
     const cursorDir = path.join(cwd, '.cursor/rules');
     const n = removeMatching(cursorDir, (name) =>
-      name.startsWith('rihal-') || name === 'rihal-code.mdc' || name === 'rihal-method.mdc',
+      name.startsWith('rcode-') || name === 'rcode.mdc' || name === 'rcode-method.mdc' || name === 'rcode',
     );
     removed += n;
     if (n > 0) console.log(`   ✓ removed ${n} Cursor rules`);
@@ -673,7 +733,7 @@ async function runUninstall(args) {
   if (editors.includes('windsurf')) {
     const windsurfDir = path.join(cwd, '.windsurf/rules');
     const n = removeMatching(windsurfDir, (name) =>
-      name.startsWith('rihal-') || name === 'rihal-code.mdc' || name === 'rihal-method.mdc',
+      name.startsWith('rcode-') || name === 'rcode.mdc' || name === 'rcode-method.mdc',
     );
     removed += n;
     if (n > 0) console.log(`   ✓ removed ${n} Windsurf rules`);
@@ -681,17 +741,17 @@ async function runUninstall(args) {
 
   if (editors.includes('antigravity')) {
     const agDir = path.join(cwd, '.antigravity/agents');
-    const n = removeMatching(agDir, (name) => name.startsWith('rihal-'));
+    const n = removeMatching(agDir, (name) => name.startsWith('rcode-'));
     removed += n;
     if (n > 0) console.log(`   ✓ removed ${n} Antigravity agents`);
   }
 
-  // #706 — gemini removal (.gemini/rihal/{agents,commands})
+  // #706 — gemini removal (.gemini/rcode/{agents,commands})
   if (editors.includes('gemini')) {
     let n = 0;
     for (const sub of ['agents', 'commands']) {
-      const dir = path.join(cwd, '.gemini', 'rihal', sub);
-      n += removeMatching(dir, (name) => name.startsWith('rihal-') || name.endsWith('.md'));
+      const dir = path.join(cwd, '.gemini', 'rcode', sub);
+      n += removeMatching(dir, (name) => name.startsWith('rcode-') || name.endsWith('.md'));
     }
     removed += n;
     if (n > 0) console.log(`   ✓ removed ${n} Gemini files`);
@@ -700,12 +760,12 @@ async function runUninstall(args) {
   // #706 — vscode marker dir cleanup. Commands+skills+agents share .claude/
   // and were already removed under the claude branch.
   if (editors.includes('vscode')) {
-    const markerDir = path.join(cwd, '.vscode/rihal');
+    const markerDir = path.join(cwd, '.vscode/rcode');
     if (fs.existsSync(markerDir)) {
       const r = safeRmSync(markerDir, path.resolve(cwd));
       if (r.ok) {
         removed += 1;
-        console.log(`   ✓ removed .vscode/rihal/ marker`);
+        console.log(`   ✓ removed .vscode/rcode/ marker`);
       }
     }
   }
@@ -713,17 +773,40 @@ async function runUninstall(args) {
   // Strip AGENTS.md section
   if (plan.agentsMd) {
     const agentsMdPath = path.join(cwd, 'AGENTS.md');
-    const stripped = stripRihalFromAgentsMd(agentsMdPath);
+    const stripped = stripRcodeFromAgentsMd(agentsMdPath);
     if (stripped) {
-      console.log(`   ✓ stripped Rihal Code section from AGENTS.md`);
+      console.log(`   ✓ stripped rcode section from AGENTS.md`);
     }
   }
 
-  // Cleanup empty editor directories left behind after removing rihal-*
+  // Strip the rcode block from .gitignore — always, not just on --purge (#876)
+  const gitignorePath = path.join(cwd, '.gitignore');
+  if (fs.existsSync(gitignorePath)) {
+    try {
+      const before = fs.readFileSync(gitignorePath, 'utf8');
+      const after = stripRcodeGitignoreBlock(before);
+      if (after !== before) {
+        fs.writeFileSync(gitignorePath, after);
+        console.log(`   ✓ stripped rcode block from .gitignore`);
+      }
+    } catch (err) {
+      console.log(`   ⚠ could not strip .gitignore block: ${err.message}`);
+    }
+  }
+
+  // Remove .git/hooks/pre-commit rcode block (or the whole file if rcode-only) (#876)
+  const hookResult = cleanRcodePreCommitHook(cwd);
+  if (hookResult === 'removed') {
+    console.log(`   ✓ removed .git/hooks/pre-commit (was rcode-only)`);
+  } else if (hookResult === 'stripped') {
+    console.log(`   ✓ stripped rcode block from .git/hooks/pre-commit`);
+  }
+
+  // Cleanup empty editor directories left behind after removing rcode-*
   // entries. Only removes dirs that are COMPLETELY empty — never touches
   // user content. Order matters: innermost first so each parent gets a
   // chance to become empty after its child is removed.
-  // Not touching .rihal/ — that's handled by the state preservation flow.
+  // Not touching .rcode/ — that's handled by the state preservation flow.
   cleanupEmptyDirs(cwd, [
     '.claude/skills',
     '.claude/commands',
@@ -736,57 +819,57 @@ async function runUninstall(args) {
     '.antigravity',
   ]);
 
-  // Always remove .rihal/brain/ — it's pulled rcode content (issue #202),
+  // Always remove .rcode/brain/ — it's pulled rcode content (issue #202),
   // not user data. Refreshed by `brain pull` on next install.
-  const brainDir = path.join(cwd, '.rihal', 'brain');
+  const brainDir = path.join(cwd, '.rcode', 'brain');
   if (fs.existsSync(brainDir)) {
     const r = safeRmSync(brainDir, path.resolve(cwd));
     if (r.ok) {
-      console.log(`   ✓ removed .rihal/brain/ (pulled content, will refresh on reinstall)`);
+      console.log(`   ✓ removed .rcode/brain/ (pulled content, will refresh on reinstall)`);
     } else if (r.reason === 'outside-root') {
-      console.log(`   ⚠ refused to remove .rihal/brain/ — symlink resolves outside project root`);
+      console.log(`   ⚠ refused to remove .rcode/brain/ — symlink resolves outside project root`);
     }
   }
 
-  // Handle .rihal/ state directory
+  // Handle .rcode/ state directory
   if (plan.stateDir) {
-    const rihalDir = path.join(cwd, '.rihal');
+    const rcodeDir = path.join(cwd, '.rcode');
     let shouldDeleteState = opts.deleteState;
 
     if (!opts.deleteState && !opts.keepState && !opts.yes) {
       console.log();
-      console.log(`⚠️  The .rihal/ state directory contains your project data:`);
-      console.log(`   - config.yaml, state.json, RIHLA.md`);
+      console.log(`⚠️  The .rcode/ state directory contains your project data:`);
+      console.log(`   - config.yaml, state.json, JOURNEY.md`);
       console.log(`   - phases, decisions, progress, artifacts, context`);
       console.log(`   - ${plan.stateDir.files} files total`);
       console.log();
-      console.log(`   If you keep it: /rihal-init will report "already configured"`);
+      console.log(`   If you keep it: /rcode-init will report "already configured"`);
       console.log(`     and reuse your existing config + history on next install.`);
       console.log(`   If you delete it: next install starts fresh — no carry-over.`);
       console.log();
       shouldDeleteState = await askConfirm(
-        `Also delete .rihal/ state? This is destructive and cannot be undone. [y/N] `,
+        `Also delete .rcode/ state? This is destructive and cannot be undone. [y/N] `,
         { default: 'n' },
       );
     }
 
     if (shouldDeleteState) {
-      const r = safeRmSync(rihalDir, path.resolve(cwd));
+      const r = safeRmSync(rcodeDir, path.resolve(cwd));
       if (r.ok) {
-        console.log(`   ✓ removed .rihal/ state directory`);
+        console.log(`   ✓ removed .rcode/ state directory`);
       } else if (r.reason === 'outside-root') {
-        console.log(`   ⚠ refused to remove .rihal/ — symlink resolves outside project root`);
+        console.log(`   ⚠ refused to remove .rcode/ — symlink resolves outside project root`);
       } else {
-        console.log(`   ⚠ could not remove .rihal/: ${r.reason}`);
+        console.log(`   ⚠ could not remove .rcode/: ${r.reason}`);
       }
     } else {
-      console.log(`   ℹ kept .rihal/ state directory (your project data is preserved)`);
+      console.log(`   ℹ kept .rcode/ state directory (your project data is preserved)`);
     }
   }
 
-  // --purge: also wipe .planning/ artifacts and the rcode .gitignore block.
+  // --purge: also wipe .planning/ artifacts (user project data beyond .rcode/).
   // Without this, "uninstall + reinstall" carries forward stale phases /
-  // sprints / SUMMARY files even after .rihal/ is gone.
+  // sprints / SUMMARY files even after .rcode/ is gone.
   if (opts.purge) {
     const planningDir = path.join(cwd, '.planning');
     if (fs.existsSync(planningDir)) {
@@ -799,36 +882,6 @@ async function runUninstall(args) {
         console.log(`   ⚠ could not remove .planning/: ${r.reason}`);
       }
     }
-
-    // Strip the rcode-managed block from .gitignore. The installer writes
-    // a fenced block; we remove it cleanly without touching user lines.
-    //
-    // Issue #684: previous regex `/\n?# rcode[\s\S]*?(?=\n\n|\n$|$)/g` was a
-    // footgun — it matched ANY user line starting with "# rcode" (e.g.
-    // "# rcode notes", "# rcode is great") and greedily consumed everything
-    // up to the next blank line, silently nuking user content.
-    //
-    // Three shapes have ever shipped:
-    //   1. Current (install.js:653-654): "# ===== rcode-managed gitignore block ... =====" ... "# ===== end rcode-managed gitignore block ====="
-    //   2. Old fenced markers: "# >>> rihal-code >>>" ... "# <<< rihal-code <<<"
-    //   3. Hypothetical legacy single-line "# rcode" — never actually
-    //      committed by any installer version we can find. Removed.
-    //
-    // Both kept patterns require BOTH sentinel markers to be present —
-    // user content with "# rcode" prefix is now safe.
-    const gitignorePath = path.join(cwd, '.gitignore');
-    if (fs.existsSync(gitignorePath)) {
-      try {
-        const before = fs.readFileSync(gitignorePath, 'utf8');
-        const stripped = stripRihalGitignoreBlock(before);
-        if (stripped !== before) {
-          fs.writeFileSync(gitignorePath, stripped);
-          console.log(`   ✓ stripped rcode block from .gitignore (--purge)`);
-        }
-      } catch (err) {
-        console.log(`   ⚠ could not strip .gitignore block: ${err.message}`);
-      }
-    }
   }
 
   console.log(`\n✅ Uninstall complete. Removed ${removed} files.`);
@@ -836,12 +889,20 @@ async function runUninstall(args) {
     console.log(`   Backup: ${backup.path} (restore with: tar -xzf ${backup.path})`);
   }
 
-  // Hint about the purge flag if the user kept state — closes the user's
-  // most common confusion: "I uninstalled but /rihal-init still says configured."
-  if (plan.stateDir && fs.existsSync(path.join(cwd, '.rihal'))) {
+  // Notice about what was intentionally preserved (#876 — never delete user data silently)
+  const rcodeStillExists = plan.stateDir && fs.existsSync(path.join(cwd, '.rcode'));
+  const planningStillExists = !opts.purge && fs.existsSync(path.join(cwd, '.planning'));
+  if (rcodeStillExists || planningStillExists) {
     console.log();
-    console.log(`ℹ  .rihal/ state was preserved. /rihal-init will detect this on reinstall.`);
-    console.log(`   For a fully clean slate next time, use: rcode uninstall --purge`);
+    console.log(`ℹ  Preserved (your project data — not removed by default):`);
+    if (rcodeStillExists) {
+      console.log(`      .rcode/     phases, decisions, progress, config`);
+      console.log(`                  /rcode-init will detect this on reinstall`);
+    }
+    if (planningStillExists) {
+      console.log(`      .planning/  planning scaffolds (ROADMAP, STATE, PROJECT)`);
+    }
+    console.log(`   To remove these on next uninstall: rcode uninstall --purge`);
   }
 
   // IDE cache reload hint — Claude Code caches the slash-command list in memory.
@@ -850,7 +911,7 @@ async function runUninstall(args) {
   console.log(`💡 IDE reload required:`);
   console.log(`   VS Code / Cursor: Cmd+Shift+P → "Developer: Reload Window"`);
   console.log(`   If commands still appear after reload, check ~/.claude/commands/ for`);
-  console.log(`   any globally-installed rihal-* items (rcode does not touch global installs).`);
+  console.log(`   any globally-installed rcode-* items (rcode does not touch global installs).`);
 
   // Hint about reinstalling
   console.log(`\nTo reinstall later:`);
@@ -863,7 +924,7 @@ async function runUninstall(args) {
 module.exports.isLocalOverride = isLocalOverride;
 module.exports.planToPathList = planToPathList;
 module.exports.discoverKnownActionSkills = discoverKnownActionSkills;
-module.exports.stripRihalGitignoreBlock = stripRihalGitignoreBlock;
+module.exports.stripRcodeGitignoreBlock = stripRcodeGitignoreBlock;
 
 // Direct invocation — allow `node cli/uninstall.js [flags]` to run end-to-end.
 // When called via cli/index.js, module.exports is invoked directly.