@hanzlaa/rcode 4.1.2 → 4.3.0

package/cli/uninstall.js

@@ -25,6 +25,7 @@
  */
 
 const fs = require('fs');
+const os = require('os');
 const path = require('path');
 const { spawnSync } = require('child_process');
 const { askConfirm, PromptAbortError } = require('./lib/prompts.cjs');
@@ -128,6 +129,35 @@ function cleanRcodePreCommitHook(cwd) {
   } catch { return 'skipped'; }
 }
 
+/**
+ * Remove the rcode slash-router hook entry from a CLI hooks JSON file
+ * (codex: ~/.codex/hooks.json UserPromptSubmit, antigravity:
+ * ~/.gemini/antigravity/settings.json UserPrompt) while preserving every
+ * other entry (herdr's, the user's). Matches the router by command substring.
+ * Idempotent + guarded: missing/unparseable files are no-ops.
+ * Returns 'removed' | 'unchanged' | 'skipped'.
+ */
+function removeSlashRouterHook(jsonPath, eventKey) {
+  if (!fs.existsSync(jsonPath)) return 'skipped';
+  let root;
+  try { root = JSON.parse(fs.readFileSync(jsonPath, 'utf8')); } catch { return 'skipped'; }
+  if (!root || typeof root !== 'object' || !root.hooks || !Array.isArray(root.hooks[eventKey])) {
+    return 'unchanged';
+  }
+  const before = root.hooks[eventKey].length;
+  root.hooks[eventKey] = root.hooks[eventKey].filter(group =>
+    !(Array.isArray(group?.hooks) &&
+      group.hooks.some(h => typeof h?.command === 'string' && h.command.includes('rcode-slash-router.cjs'))),
+  );
+  if (root.hooks[eventKey].length === before) return 'unchanged';
+  // Drop the event key entirely if it is now empty, to leave a tidy file.
+  if (root.hooks[eventKey].length === 0) delete root.hooks[eventKey];
+  try {
+    writeFileAtomic(jsonPath, JSON.stringify(root, null, 2) + '\n');
+    return 'removed';
+  } 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).
@@ -433,7 +463,11 @@ function planToPathList(plan, cwd, options = {}) {
  * still proceed since the user already confirmed the destructive action.
  */
 function createBackup(cwd, plan, options = {}) {
-  const paths = planToPathList(plan, cwd, { purge: options.purge === true });
+  // Tar entry names are always '/'-separated; on Windows planToPathList
+  // produces '\'-joined paths that bsdtar may store verbatim. Normalize so
+  // the archive (and any `tar -tzf` consumer) sees portable paths.
+  const paths = planToPathList(plan, cwd, { purge: options.purge === true })
+    .map((p) => p.split(path.sep).join('/'));
   if (paths.length === 0) {
     return { ok: false, warning: 'nothing to back up' };
   }
@@ -746,6 +780,29 @@ async function runUninstall(args) {
     if (n > 0) console.log(`   ✓ removed ${n} Antigravity agents`);
   }
 
+  // Slash-router hooks (home-dir, CLI-native). Installed only via `--global`
+  // for codex/antigravity; remove the rcode UserPromptSubmit/UserPrompt entry
+  // from each CLI's hooks JSON, leaving herdr + other hooks intact.
+  if (editors.includes('codex')) {
+    const r = removeSlashRouterHook(path.join(os.homedir(), '.codex', 'hooks.json'), 'UserPromptSubmit');
+    if (r === 'removed') console.log(`   ✓ removed rcode slash-router hook from ~/.codex/hooks.json`);
+  }
+  if (editors.includes('antigravity')) {
+    const r = removeSlashRouterHook(path.join(os.homedir(), '.gemini', 'antigravity', 'settings.json'), 'UserPrompt');
+    if (r === 'removed') console.log(`   ✓ removed rcode slash-router hook from ~/.gemini/antigravity/settings.json`);
+  }
+  // The router script + command-body copies are shared by both CLIs; remove
+  // them once if either is in scope.
+  if (editors.includes('codex') || editors.includes('antigravity')) {
+    const home = os.homedir();
+    for (const dir of [path.join(home, '.rcode', 'slash-commands'), path.join(home, '.rcode', 'bin')]) {
+      if (fs.existsSync(dir)) {
+        const rr = safeRmSync(dir, home);
+        if (rr.ok) console.log(`   ✓ removed ${dir}`);
+      }
+    }
+  }
+
   // #706 — gemini removal (.gemini/rcode/{agents,commands})
   if (editors.includes('gemini')) {
     let n = 0;
@@ -925,6 +982,7 @@ module.exports.isLocalOverride = isLocalOverride;
 module.exports.planToPathList = planToPathList;
 module.exports.discoverKnownActionSkills = discoverKnownActionSkills;
 module.exports.stripRcodeGitignoreBlock = stripRcodeGitignoreBlock;
+module.exports.removeSlashRouterHook = removeSlashRouterHook;
 
 // Direct invocation — allow `node cli/uninstall.js [flags]` to run end-to-end.
 // When called via cli/index.js, module.exports is invoked directly.

package/cli/update.js

@@ -34,6 +34,8 @@ const { spawnSync } = require('child_process');
 const clack = require('@clack/prompts');
 const { PromptAbortError } = require('./lib/prompts.cjs');
 const { writeFileAtomic } = require('./lib/fsutil.cjs');
+// HOME-aware home resolution (#889): os.homedir() ignores HOME on Windows.
+const { homedir } = require('./lib/homedir.cjs');
 const { verifyInstall, formatReport } = require('./lib/manifest.cjs');
 const install = require('./install');
 
@@ -46,7 +48,9 @@ const install = require('./install');
 function readConfigYaml(configPath) {
   const text = fs.readFileSync(configPath, 'utf8');
   const obj = {};
-  for (const raw of text.split('\n')) {
+  // CRLF tolerance (#889): split on \r?\n — a stray \r otherwise defeats the
+  // `#.*$` comment strip ($ won't cross the \r) and leaks comments into values.
+  for (const raw of text.split(/\r?\n/)) {
     const line = raw.replace(/#.*$/, '').trimEnd();
     if (!line) continue;
     if (line.startsWith(' ')) continue; // ignore nested keys (rare; preserved on disk via raw text path)
@@ -68,14 +72,16 @@ function readConfigYaml(configPath) {
  * If the key doesn't exist, append it.
  */
 function setYamlKey(rawText, key, value) {
-  const re = new RegExp(`^${key}:\\s*.*$`, 'm');
+  // CRLF tolerance (#889): [^\S\n]/[^\r\n] keep the match on one line even
+  // when the file uses \r\n (plain \s would walk across the line break).
+  const re = new RegExp(`^${key}:[^\\S\\n]*[^\\r\\n]*$`, 'm');
   const replacement = typeof value === 'string'
     ? `${key}: "${value.replace(/"/g, '\\"')}"`
     : `${key}: ${value}`;
   if (re.test(rawText)) {
     return rawText.replace(re, replacement);
   }
-  return rawText.replace(/\n*$/, '') + `\n${replacement}\n`;
+  return rawText.replace(/(?:\r?\n)*$/, '') + `\n${replacement}\n`;
 }
 
 function parseArgs(args) {
@@ -98,8 +104,7 @@ function detectInstalledEditors(cwd) {
   // .rcode/config.yaml as the canonical signal — if config exists, the
   // project ran rcode install at least once for claude. The presence of
   // any commands/agents/skills then becomes secondary evidence.
-  const os = require('os');
-  const homeSkills = path.join(os.homedir(), '.claude/skills');
+  const homeSkills = path.join(homedir(), '.claude/skills');
   const projectClaude = (
     (fs.existsSync(path.join(cwd, '.claude/skills')) &&
       fs.readdirSync(path.join(cwd, '.claude/skills')).some(n => n.startsWith('rcode-'))) ||