@hanzlaa/rcode 3.1.0 → 3.2.1

package/cli/install.js

@@ -268,20 +268,26 @@ function printInstallHeader(targetVersion) {
  * Returns a set like { claude: true, cursor: false, gemini: false }.
  */
 function detectIdeSignals(target) {
-  const signals = { claude: false, cursor: false, gemini: false };
+  const signals = { claude: false, cursor: false, gemini: false, vscode: false, antigravity: 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;
   // 2. User-level config dirs
   const home = os.homedir();
   if (fs.existsSync(path.join(home, '.claude'))) signals.claude = true;
   if (fs.existsSync(path.join(home, '.cursor'))) signals.cursor = true;
   if (fs.existsSync(path.join(home, '.config', 'Cursor'))) signals.cursor = true;
   if (fs.existsSync(path.join(home, '.gemini'))) signals.gemini = true;
+  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;
   // 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;
   return signals;
 }
 
@@ -297,43 +303,32 @@ async function resolveIde(opts) {
   if (opts.yes || !process.stdin.isTTY) return opts.ide || 'claude';
 
   const signals = detectIdeSignals(opts.target);
-  const detected = ['claude', 'cursor', 'gemini'].filter(k => signals[k]);
-
-  // Build the menu — detected IDEs marked with a hint
-  const choices = [
-    { key: '1', value: 'claude', label: 'Claude Code',  hint: signals.claude ? dim('(detected)') : '' },
-    { key: '2', value: 'cursor', label: 'Cursor',       hint: signals.cursor ? dim('(detected)') : '' },
-    { key: '3', value: 'gemini', label: 'Gemini CLI',   hint: signals.gemini ? dim('(detected)') : dim('(beta — limited)') },
-  ];
+  const detected = ['claude', 'cursor', 'gemini', 'vscode'].filter(k => signals[k]);
 
   // Pick a default: prefer the single detected IDE; otherwise claude
   let defaultValue = 'claude';
   if (detected.length === 1) defaultValue = detected[0];
 
-  const readline = require('readline');
-  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-  const prompt = (q) => new Promise(r => rl.question(q, a => r(a)));
+  // Use @clack/prompts for arrow-key navigation. Closes #449 / #450.
+  const choice = await clack.select({
+    message: '🎯 Which editor will you use rcode with?',
+    initialValue: defaultValue,
+    options: [
+      { value: 'claude',     label: 'Claude Code',  hint: signals.claude ? '(detected)' : undefined },
+      { value: 'cursor',     label: 'Cursor',       hint: signals.cursor ? '(detected)' : undefined },
+      { value: 'gemini',     label: 'Gemini CLI',   hint: signals.gemini ? '(detected)' : '(beta — limited)' },
+      { value: 'vscode',     label: 'VS Code',      hint: signals.vscode ? '(detected)' : '(via Continue / Copilot extensions)' },
+      { value: 'antigravity', label: 'Antigravity', hint: '(experimental — installs to .antigravity/)' },
+    ],
+  });
 
-  console.log(pc.bold('🎯 Which editor will you use Rihal with?'));
-  console.log('');
-  for (const c of choices) {
-    const marker = c.value === defaultValue ? pc.green('●') : dim('○');
-    const label = c.value === defaultValue ? pc.bold(c.label) : c.label;
-    console.log(`   ${marker} ${pc.cyan('[' + c.key + ']')} ${label}  ${c.hint}`);
+  // Handle Ctrl-C cleanly
+  if (clack.isCancel(choice)) {
+    clack.cancel('Install cancelled.');
+    process.exit(0);
   }
-  console.log('');
-  const defaultKey = choices.find(c => c.value === defaultValue).key;
-  const answer = (await prompt(`   Pick an editor [${defaultKey}]: `)).trim().toLowerCase();
-  rl.close();
-
-  if (!answer) return defaultValue;
-  // Accept either the number key or the name
-  const byKey = choices.find(c => c.key === answer);
-  if (byKey) return byKey.value;
-  const byName = choices.find(c => c.value === answer || c.label.toLowerCase().startsWith(answer));
-  if (byName) return byName.value;
-  console.log(dim(`   Unrecognised choice "${answer}" — falling back to ${defaultValue}.`));
-  return defaultValue;
+
+  return choice;
 }
 
 /**
@@ -345,19 +340,21 @@ async function resolveCommitPlanning(opts) {
   if (opts.commitPlanning !== null) return opts.commitPlanning;
   if (opts.yes || !process.stdin.isTTY) return true; // non-interactive default
 
-  const readline = require('readline');
-  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-  const prompt = (q) => new Promise(r => rl.question(q, a => r(a)));
-  console.log('');
-  console.log('📋 .planning/ holds PRDs, roadmaps, sprints, SUMMARY files.');
-  console.log('   Commit them to git, or keep them local?');
-  console.log('');
-  console.log('   [Y] Commit — collaborators see the same plans  (default, recommended)');
-  console.log('   [n] Gitignore — planning stays local  (good for sensitive PRDs)');
-  console.log('');
-  const answer = (await prompt('   Commit planning artifacts? [Y/n]: ')).trim().toLowerCase();
-  rl.close();
-  return !(answer === 'n' || answer === 'no');
+  const choice = await clack.select({
+    message: '📋 .planning/ holds PRDs, roadmaps, sprints, SUMMARY files. How should they be tracked?',
+    initialValue: 'commit',
+    options: [
+      { value: 'commit',    label: 'Commit',    hint: 'collaborators see the same plans (recommended)' },
+      { value: 'gitignore', label: 'Gitignore', hint: 'planning stays local (good for sensitive PRDs)' },
+    ],
+  });
+
+  if (clack.isCancel(choice)) {
+    clack.cancel('Install cancelled.');
+    process.exit(0);
+  }
+
+  return choice === 'commit';
 }
 
 function printHelp() {
@@ -418,8 +415,33 @@ function getPathsForIde(ide, target) {
         referencesDir: path.join(target, '.rihal', 'references'),
         binDir: path.join(target, '.rihal', 'bin'),
       };
+    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.
+      return {
+        agentsDir: path.join(target, '.claude', 'agents'),
+        commandsDir: path.join(target, '.claude', 'commands', 'rihal'),
+        workflowsDir: path.join(target, '.rihal', 'workflows'),
+        referencesDir: path.join(target, '.rihal', 'references'),
+        binDir: path.join(target, '.rihal', 'bin'),
+        markerDir: path.join(target, '.vscode', 'rihal'),
+      };
+    case 'antigravity':
+      // Antigravity (Google's agentic IDE) — install to .antigravity/ mirroring
+      // the .gemini/ structure. Antigravity's plugin protocol is still firming
+      // up; the user can adjust paths via .rihal/config.yaml's `extra_install_paths`
+      // if Antigravity expects different routing.
+      return {
+        agentsDir: path.join(target, '.antigravity', 'rihal', 'agents'),
+        commandsDir: path.join(target, '.antigravity', '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`);
+      throw new Error(`Unknown IDE: ${ide}. Supported: claude, cursor, gemini, vscode, antigravity`);
   }
 }
 
@@ -1234,27 +1256,28 @@ async function install(opts) {
   }
 
   // Validate IDE — structured error for unsupported editors (#197).
-  if (!['claude', 'cursor', 'gemini'].includes(opts.ide)) {
+  if (!['claude', 'cursor', 'gemini', 'vscode', 'antigravity'].includes(opts.ide)) {
     console.error(`✖ --ide ${opts.ide} is not supported in v${readPackageVersion()}.`);
     console.error('');
     console.error('  Currently supported:');
-    console.error('    claude    — Claude Code native (recommended)');
-    console.error('    cursor    — Cursor IDE');
-    console.error('    gemini    — Gemini CLI');
+    console.error('    claude       — Claude Code native (recommended)');
+    console.error('    cursor       — Cursor IDE');
+    console.error('    gemini       — Gemini CLI');
+    console.error('    vscode       — VS Code (with Claude Code / Continue / Copilot extension)');
+    console.error('    antigravity  — Antigravity (experimental)');
     console.error('');
-    console.error('  Tracked for v3.0 (see issue #182):');
-    console.error('    vscode    — VS Code native extension');
-    console.error('    jetbrains — IntelliJ / PyCharm');
-    console.error('    zed       — Zed editor');
+    console.error('  Tracked for future:');
+    console.error('    jetbrains    — IntelliJ / PyCharm');
+    console.error('    zed          — Zed editor');
     console.error('');
-    if (/^(vscode|vs-code|code)$/i.test(opts.ide)) {
-      console.error('  Workaround: if you use VS Code WITH the Claude Code extension,');
-      console.error('  run `--ide claude` — the extension reads from .claude/ too.');
-      console.error('');
-    }
     return 1;
   }
 
+  // VS Code installs to .claude/ paths (extension reads from there). Inform the user.
+  if (opts.ide === 'vscode') {
+    console.log('  ' + dim('VS Code → installing to .claude/ paths (read by Claude Code / Continue / Copilot extensions).'));
+  }
+
   // Gemini IDE support deferred
   if (opts.ide === 'gemini') {
     console.log(`\n⚠️  Gemini CLI install not yet implemented\n`);
@@ -1264,6 +1287,12 @@ async function install(opts) {
     return 1;
   }
 
+  // Antigravity install is experimental — best-effort path, user may need to adjust
+  if (opts.ide === 'antigravity') {
+    console.log('  ' + warn('Antigravity install is experimental. Files land at .antigravity/rihal/{agents,commands}/.'));
+    console.log('  ' + dim('If Antigravity expects a different path, adjust .rihal/config.yaml and re-run.'));
+  }
+
   // Validate requested modules exist
   if (opts.modules.length > 0) {
     const available = listAvailableModules();
@@ -1342,6 +1371,7 @@ async function install(opts) {
   let preserved = 0;
   const preservedFiles = [];
   const preservedDiffs = [];  // { rel, insertions, deletions, patch } for #251
+  const conflictedFiles = []; // { rel, src, destPath, existingContent, sourceContent } for #451 / #453
   const spinner = createSpinner(dim(`Installing ${plan.length} files…`), { color: 'cyan' }).start();
 
   for (const entry of plan) {
@@ -1381,9 +1411,15 @@ async function install(opts) {
       const sourceHash = sha256(fs.readFileSync(entry.src));
       if (existingHash === sourceHash) { skipped++; continue; }
       if (!opts.yes && !opts.nonDestructive) {
-        spinner.stop();
-        console.warn('  ' + warn(`${entry.rel} differs from package version — use --force-overwrite to overwrite`));
-        spinner.start();
+        // Buffer the conflict instead of spamming a warning per file (#451).
+        // Surfaced as a categorised summary post-install + interactive offer (#453).
+        conflictedFiles.push({
+          rel: relForward,
+          src: entry.src,
+          destPath,
+          existingContent: fs.readFileSync(destPath, 'utf8'),
+          sourceContent: fs.readFileSync(entry.src, 'utf8'),
+        });
         skipped++;
         continue;
       }
@@ -1406,6 +1442,100 @@ async function install(opts) {
 
   spinner.success({ text: ok(`${copied} files installed`) });
 
+  // Categorised conflict summary (#451) + interactive resolution offer (#453).
+  // Replaces the per-file 'differs from package version' warning spam.
+  if (conflictedFiles.length > 0) {
+    const byCategory = { workflows: [], agents: [], commands: [], skills: [], references: [], other: [] };
+    for (const c of conflictedFiles) {
+      if (c.rel.includes('/workflows/')) byCategory.workflows.push(c);
+      else if (c.rel.includes('/agents/')) byCategory.agents.push(c);
+      else if (c.rel.includes('/commands/')) byCategory.commands.push(c);
+      else if (c.rel.includes('/skills/')) byCategory.skills.push(c);
+      else if (c.rel.includes('/references/')) byCategory.references.push(c);
+      else byCategory.other.push(c);
+    }
+    console.log('');
+    console.log('  ' + warn(`${conflictedFiles.length} file${conflictedFiles.length === 1 ? '' : 's'} have local edits AND v${readPackageVersion()} updates:`));
+    for (const [cat, list] of Object.entries(byCategory)) {
+      if (list.length === 0) continue;
+      console.log('    ' + dim(`${list.length} ${cat}`));
+    }
+    console.log('');
+
+    if (!opts.yes && process.stdin.isTTY) {
+      const action = await clack.select({
+        message: 'How should we handle these?',
+        initialValue: 'review',
+        options: [
+          { value: 'review', label: 'Review each one',                hint: 'see the diff, decide per file' },
+          { value: 'upstream', label: 'Take v' + readPackageVersion() + ' for all', hint: 'lose local edits, get all bug fixes' },
+          { value: 'keep',   label: 'Keep my local edits',            hint: 'skip v' + readPackageVersion() + ' updates for these files (current behaviour)' },
+        ],
+      });
+      if (clack.isCancel(action)) {
+        clack.note('Skipped — local edits preserved.');
+      } else if (action === 'upstream') {
+        let applied = 0;
+        for (const c of conflictedFiles) {
+          fs.writeFileSync(c.destPath, c.sourceContent, 'utf8');
+          applied++;
+        }
+        console.log('  ' + ok(`Applied v${readPackageVersion()} to ${applied} file${applied === 1 ? '' : 's'}.`));
+      } else if (action === 'review') {
+        let applied = 0, kept = 0;
+        for (const c of conflictedFiles) {
+          const patch = createTwoFilesPatch(c.rel, c.rel, c.existingContent, c.sourceContent, 'local', 'v' + readPackageVersion());
+          let ins = 0, del = 0;
+          for (const line of patch.split('\n')) {
+            if (line.startsWith('+') && !line.startsWith('+++')) ins++;
+            if (line.startsWith('-') && !line.startsWith('---')) del++;
+          }
+          console.log('');
+          console.log('  ' + pc.bold(c.rel) + dim('  ') + pc.green(`+${ins}`) + ' ' + pc.red(`-${del}`));
+          const decision = await clack.select({
+            message: 'Take upstream, keep local, or view diff?',
+            initialValue: 'view',
+            options: [
+              { value: 'upstream', label: 'Take v' + readPackageVersion() },
+              { value: 'keep',     label: 'Keep local' },
+              { value: 'view',     label: 'View diff first' },
+            ],
+          });
+          let finalAction = decision;
+          if (clack.isCancel(decision) || decision === 'view') {
+            for (const line of patch.split('\n').slice(4)) {
+              if (line.startsWith('+')) process.stdout.write(pc.green(line) + '\n');
+              else if (line.startsWith('-')) process.stdout.write(pc.red(line) + '\n');
+              else if (line.startsWith('@')) process.stdout.write(pc.cyan(line) + '\n');
+              else process.stdout.write(dim(line) + '\n');
+            }
+            const after = await clack.select({
+              message: 'Now: take upstream or keep local?',
+              initialValue: 'keep',
+              options: [
+                { value: 'upstream', label: 'Take v' + readPackageVersion() },
+                { value: 'keep',     label: 'Keep local' },
+              ],
+            });
+            finalAction = clack.isCancel(after) ? 'keep' : after;
+          }
+          if (finalAction === 'upstream') {
+            fs.writeFileSync(c.destPath, c.sourceContent, 'utf8');
+            applied++;
+          } else {
+            kept++;
+          }
+        }
+        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.`));
+      }
+    } else {
+      console.log('  ' + dim(`Re-run with --force-overwrite to apply v${readPackageVersion()} updates, or pipe through an interactive shell to resolve per-file.`));
+    }
+    console.log('');
+  }
+
   // Write .rihal/_config/manifest.yaml + agent-manifest.csv + files-manifest.csv
   const configDir = path.join(opts.target, '.rihal', '_config');
   ensureDir(configDir);
@@ -1569,16 +1699,19 @@ async function install(opts) {
     console.log('');
   }
 
-  // Count installed agents + commands dynamically (#190).
-  const agentsDir = path.join(opts.target, '.claude', 'agents');
-  const commandsDir = path.join(opts.target, '.claude', 'commands', 'rihal');
+  // Count installed agents + commands dynamically (#190). Reads from the
+  // IDE-specific install paths so cursor/gemini/vscode/antigravity don't
+  // false-fail the health check.
+  const idePaths = getPathsForIde(opts.ide, opts.target);
+  const agentsDir = idePaths.agentsDir;
+  const commandsDir = idePaths.commandsDir;
   let agentCount = 0, commandCount = 0;
   try {
     if (fs.existsSync(agentsDir)) {
-      agentCount = fs.readdirSync(agentsDir).filter(f => f.startsWith('rihal-') && f.endsWith('.md')).length;
+      agentCount = fs.readdirSync(agentsDir).filter(f => (f.startsWith('rihal-') || f.startsWith('rcode-')) && (f.endsWith('.md') || f.endsWith('.mdc'))).length;
     }
     if (fs.existsSync(commandsDir)) {
-      commandCount = fs.readdirSync(commandsDir).filter(f => f.endsWith('.md')).length;
+      commandCount = fs.readdirSync(commandsDir).filter(f => f.endsWith('.md') || f.endsWith('.mdc')).length;
     }
   } catch {}
 
@@ -1590,9 +1723,12 @@ async function install(opts) {
   console.log(`  ${bold('Mode:')}      ${opts.mode}  ${dim('(guided=confirm at gates, yolo=autonomous)')}`);
   console.log(`  ${bold('Planning:')}  ${opts.commitPlanning !== false ? 'committed' : 'gitignored'}  ${dim('(flip: rihal-tools gitignore refresh)')}`);
   console.log('');
-  console.log(`  ${bold('Agents:')}    ${pc.green(String(agentCount))} in .claude/agents/`);
-  console.log(`  ${bold('Commands:')}  ${pc.green(String(commandCount))} slash commands in .claude/commands/rihal/`);
-  if (skillsInstalled > 0) console.log(`  ${bold('Skills:')}    ${pc.green(String(skillsInstalled))} phrase-activated in .claude/skills/`);
+  // Show the actual install paths so cursor/gemini/antigravity output is accurate
+  const relAgents = path.relative(opts.target, idePaths.agentsDir) || idePaths.agentsDir;
+  const relCommands = path.relative(opts.target, idePaths.commandsDir) || idePaths.commandsDir;
+  console.log(`  ${bold('Agents:')}    ${pc.green(String(agentCount))} in ${relAgents}/`);
+  console.log(`  ${bold('Commands:')}  ${pc.green(String(commandCount))} slash commands in ${relCommands}/`);
+  if (skillsInstalled > 0) console.log(`  ${bold('Skills:')}    ${pc.green(String(skillsInstalled))} phrase-activated`);
   console.log('');
   if (starterSeeded) {
     console.log('  ' + ok('Starter planning scaffolded in .planning/ (ROADMAP, STATE, PROJECT)'));

package/dist/rcode.js

@@ -15952,69 +15952,65 @@ var require_install = __commonJS({
       console.log(lines.join("\n"));
     }
     function detectIdeSignals(target) {
-      const signals = { claude: false, cursor: false, gemini: false };
+      const signals = { claude: false, cursor: false, gemini: false, vscode: false, antigravity: false };
       if (fs2.existsSync(path2.join(target, ".claude"))) signals.claude = true;
       if (fs2.existsSync(path2.join(target, ".cursor"))) signals.cursor = true;
       if (fs2.existsSync(path2.join(target, ".gemini"))) signals.gemini = true;
+      if (fs2.existsSync(path2.join(target, ".vscode"))) signals.vscode = true;
+      if (fs2.existsSync(path2.join(target, ".antigravity"))) signals.antigravity = true;
       const home = os.homedir();
       if (fs2.existsSync(path2.join(home, ".claude"))) signals.claude = true;
       if (fs2.existsSync(path2.join(home, ".cursor"))) signals.cursor = true;
       if (fs2.existsSync(path2.join(home, ".config", "Cursor"))) signals.cursor = true;
       if (fs2.existsSync(path2.join(home, ".gemini"))) signals.gemini = true;
+      if (fs2.existsSync(path2.join(home, ".vscode"))) signals.vscode = true;
+      if (fs2.existsSync(path2.join(home, ".config", "Code"))) signals.vscode = true;
+      if (fs2.existsSync(path2.join(home, ".antigravity"))) signals.antigravity = true;
       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;
       return signals;
     }
     async function resolveIde(opts) {
       if (opts.ideProvided) return opts.ide;
       if (opts.yes || !process.stdin.isTTY) return opts.ide || "claude";
       const signals = detectIdeSignals(opts.target);
-      const detected = ["claude", "cursor", "gemini"].filter((k) => signals[k]);
-      const choices = [
-        { key: "1", value: "claude", label: "Claude Code", hint: signals.claude ? dim("(detected)") : "" },
-        { key: "2", value: "cursor", label: "Cursor", hint: signals.cursor ? dim("(detected)") : "" },
-        { key: "3", value: "gemini", label: "Gemini CLI", hint: signals.gemini ? dim("(detected)") : dim("(beta \u2014 limited)") }
-      ];
+      const detected = ["claude", "cursor", "gemini", "vscode"].filter((k) => signals[k]);
       let defaultValue = "claude";
       if (detected.length === 1) defaultValue = detected[0];
-      const readline = require("readline");
-      const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-      const prompt = (q) => new Promise((r) => rl.question(q, (a) => r(a)));
-      console.log(pc.bold("\u{1F3AF} Which editor will you use Rihal with?"));
-      console.log("");
-      for (const c of choices) {
-        const marker = c.value === defaultValue ? pc.green("\u25CF") : dim("\u25CB");
-        const label = c.value === defaultValue ? pc.bold(c.label) : c.label;
-        console.log(`   ${marker} ${pc.cyan("[" + c.key + "]")} ${label}  ${c.hint}`);
+      const choice = await clack.select({
+        message: "\u{1F3AF} Which editor will you use rcode with?",
+        initialValue: defaultValue,
+        options: [
+          { value: "claude", label: "Claude Code", hint: signals.claude ? "(detected)" : void 0 },
+          { value: "cursor", label: "Cursor", hint: signals.cursor ? "(detected)" : void 0 },
+          { value: "gemini", label: "Gemini CLI", hint: signals.gemini ? "(detected)" : "(beta \u2014 limited)" },
+          { value: "vscode", label: "VS Code", hint: signals.vscode ? "(detected)" : "(via Continue / Copilot extensions)" },
+          { value: "antigravity", label: "Antigravity", hint: "(experimental \u2014 installs to .antigravity/)" }
+        ]
+      });
+      if (clack.isCancel(choice)) {
+        clack.cancel("Install cancelled.");
+        process.exit(0);
       }
-      console.log("");
-      const defaultKey = choices.find((c) => c.value === defaultValue).key;
-      const answer = (await prompt(`   Pick an editor [${defaultKey}]: `)).trim().toLowerCase();
-      rl.close();
-      if (!answer) return defaultValue;
-      const byKey = choices.find((c) => c.key === answer);
-      if (byKey) return byKey.value;
-      const byName = choices.find((c) => c.value === answer || c.label.toLowerCase().startsWith(answer));
-      if (byName) return byName.value;
-      console.log(dim(`   Unrecognised choice "${answer}" \u2014 falling back to ${defaultValue}.`));
-      return defaultValue;
+      return choice;
     }
     async function resolveCommitPlanning(opts) {
       if (opts.commitPlanning !== null) return opts.commitPlanning;
       if (opts.yes || !process.stdin.isTTY) return true;
-      const readline = require("readline");
-      const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-      const prompt = (q) => new Promise((r) => rl.question(q, (a) => r(a)));
-      console.log("");
-      console.log("\u{1F4CB} .planning/ holds PRDs, roadmaps, sprints, SUMMARY files.");
-      console.log("   Commit them to git, or keep them local?");
-      console.log("");
-      console.log("   [Y] Commit \u2014 collaborators see the same plans  (default, recommended)");
-      console.log("   [n] Gitignore \u2014 planning stays local  (good for sensitive PRDs)");
-      console.log("");
-      const answer = (await prompt("   Commit planning artifacts? [Y/n]: ")).trim().toLowerCase();
-      rl.close();
-      return !(answer === "n" || answer === "no");
+      const choice = await clack.select({
+        message: "\u{1F4CB} .planning/ holds PRDs, roadmaps, sprints, SUMMARY files. How should they be tracked?",
+        initialValue: "commit",
+        options: [
+          { value: "commit", label: "Commit", hint: "collaborators see the same plans (recommended)" },
+          { value: "gitignore", label: "Gitignore", hint: "planning stays local (good for sensitive PRDs)" }
+        ]
+      });
+      if (clack.isCancel(choice)) {
+        clack.cancel("Install cancelled.");
+        process.exit(0);
+      }
+      return choice === "commit";
     }
     function printHelp2() {
       console.log(`
@@ -16069,8 +16065,25 @@ Installs (IDE-specific):
             referencesDir: path2.join(target, ".rihal", "references"),
             binDir: path2.join(target, ".rihal", "bin")
           };
+        case "vscode":
+          return {
+            agentsDir: path2.join(target, ".claude", "agents"),
+            commandsDir: path2.join(target, ".claude", "commands", "rihal"),
+            workflowsDir: path2.join(target, ".rihal", "workflows"),
+            referencesDir: path2.join(target, ".rihal", "references"),
+            binDir: path2.join(target, ".rihal", "bin"),
+            markerDir: path2.join(target, ".vscode", "rihal")
+          };
+        case "antigravity":
+          return {
+            agentsDir: path2.join(target, ".antigravity", "rihal", "agents"),
+            commandsDir: path2.join(target, ".antigravity", "rihal", "commands"),
+            workflowsDir: path2.join(target, ".rihal", "workflows"),
+            referencesDir: path2.join(target, ".rihal", "references"),
+            binDir: path2.join(target, ".rihal", "bin")
+          };
         default:
-          throw new Error(`Unknown IDE: ${ide}. Supported: claude, cursor, gemini`);
+          throw new Error(`Unknown IDE: ${ide}. Supported: claude, cursor, gemini, vscode, antigravity`);
       }
     }
     function walkFiles(dir, extraIgnore = []) {
@@ -16704,26 +16717,25 @@ Say "plan a sprint" or run \`/rihal:sprint-planning\` to break Phase 01 into sto
         console.error(`\u2716 Source tree not found at ${SOURCE_ROOT}. Running from wrong dir?`);
         return 1;
       }
-      if (!["claude", "cursor", "gemini"].includes(opts.ide)) {
+      if (!["claude", "cursor", "gemini", "vscode", "antigravity"].includes(opts.ide)) {
         console.error(`\u2716 --ide ${opts.ide} is not supported in v${readPackageVersion()}.`);
         console.error("");
         console.error("  Currently supported:");
-        console.error("    claude    \u2014 Claude Code native (recommended)");
-        console.error("    cursor    \u2014 Cursor IDE");
-        console.error("    gemini    \u2014 Gemini CLI");
+        console.error("    claude       \u2014 Claude Code native (recommended)");
+        console.error("    cursor       \u2014 Cursor IDE");
+        console.error("    gemini       \u2014 Gemini CLI");
+        console.error("    vscode       \u2014 VS Code (with Claude Code / Continue / Copilot extension)");
+        console.error("    antigravity  \u2014 Antigravity (experimental)");
         console.error("");
-        console.error("  Tracked for v3.0 (see issue #182):");
-        console.error("    vscode    \u2014 VS Code native extension");
-        console.error("    jetbrains \u2014 IntelliJ / PyCharm");
-        console.error("    zed       \u2014 Zed editor");
+        console.error("  Tracked for future:");
+        console.error("    jetbrains    \u2014 IntelliJ / PyCharm");
+        console.error("    zed          \u2014 Zed editor");
         console.error("");
-        if (/^(vscode|vs-code|code)$/i.test(opts.ide)) {
-          console.error("  Workaround: if you use VS Code WITH the Claude Code extension,");
-          console.error("  run `--ide claude` \u2014 the extension reads from .claude/ too.");
-          console.error("");
-        }
         return 1;
       }
+      if (opts.ide === "vscode") {
+        console.log("  " + dim("VS Code \u2192 installing to .claude/ paths (read by Claude Code / Continue / Copilot extensions)."));
+      }
       if (opts.ide === "gemini") {
         console.log(`
 \u26A0\uFE0F  Gemini CLI install not yet implemented
@@ -16735,6 +16747,10 @@ Say "plan a sprint" or run \`/rihal:sprint-planning\` to break Phase 01 into sto
 `);
         return 1;
       }
+      if (opts.ide === "antigravity") {
+        console.log("  " + warn("Antigravity install is experimental. Files land at .antigravity/rihal/{agents,commands}/."));
+        console.log("  " + dim("If Antigravity expects a different path, adjust .rihal/config.yaml and re-run."));
+      }
       if (opts.modules.length > 0) {
         const available = listAvailableModules();
         const unknownModules = opts.modules.filter((m) => !available.includes(m));
@@ -16791,6 +16807,7 @@ Say "plan a sprint" or run \`/rihal:sprint-planning\` to break Phase 01 into sto
       let preserved = 0;
       const preservedFiles = [];
       const preservedDiffs = [];
+      const conflictedFiles = [];
       const spinner = createSpinner(dim(`Installing ${plan.length} files\u2026`), { color: "cyan" }).start();
       for (const entry of plan) {
         const destPath = path2.join(opts.target, entry.rel);
@@ -16825,9 +16842,13 @@ Say "plan a sprint" or run \`/rihal:sprint-planning\` to break Phase 01 into sto
             continue;
           }
           if (!opts.yes && !opts.nonDestructive) {
-            spinner.stop();
-            console.warn("  " + warn(`${entry.rel} differs from package version \u2014 use --force-overwrite to overwrite`));
-            spinner.start();
+            conflictedFiles.push({
+              rel: relForward,
+              src: entry.src,
+              destPath,
+              existingContent: fs2.readFileSync(destPath, "utf8"),
+              sourceContent: fs2.readFileSync(entry.src, "utf8")
+            });
             skipped++;
             continue;
           }
@@ -16846,6 +16867,96 @@ Say "plan a sprint" or run \`/rihal:sprint-planning\` to break Phase 01 into sto
         copied++;
       }
       spinner.success({ text: ok(`${copied} files installed`) });
+      if (conflictedFiles.length > 0) {
+        const byCategory = { workflows: [], agents: [], commands: [], skills: [], references: [], other: [] };
+        for (const c of conflictedFiles) {
+          if (c.rel.includes("/workflows/")) byCategory.workflows.push(c);
+          else if (c.rel.includes("/agents/")) byCategory.agents.push(c);
+          else if (c.rel.includes("/commands/")) byCategory.commands.push(c);
+          else if (c.rel.includes("/skills/")) byCategory.skills.push(c);
+          else if (c.rel.includes("/references/")) byCategory.references.push(c);
+          else byCategory.other.push(c);
+        }
+        console.log("");
+        console.log("  " + warn(`${conflictedFiles.length} file${conflictedFiles.length === 1 ? "" : "s"} have local edits AND v${readPackageVersion()} updates:`));
+        for (const [cat, list] of Object.entries(byCategory)) {
+          if (list.length === 0) continue;
+          console.log("    " + dim(`${list.length} ${cat}`));
+        }
+        console.log("");
+        if (!opts.yes && process.stdin.isTTY) {
+          const action = await clack.select({
+            message: "How should we handle these?",
+            initialValue: "review",
+            options: [
+              { value: "review", label: "Review each one", hint: "see the diff, decide per file" },
+              { value: "upstream", label: "Take v" + readPackageVersion() + " for all", hint: "lose local edits, get all bug fixes" },
+              { value: "keep", label: "Keep my local edits", hint: "skip v" + readPackageVersion() + " updates for these files (current behaviour)" }
+            ]
+          });
+          if (clack.isCancel(action)) {
+            clack.note("Skipped \u2014 local edits preserved.");
+          } else if (action === "upstream") {
+            let applied = 0;
+            for (const c of conflictedFiles) {
+              fs2.writeFileSync(c.destPath, c.sourceContent, "utf8");
+              applied++;
+            }
+            console.log("  " + ok(`Applied v${readPackageVersion()} to ${applied} file${applied === 1 ? "" : "s"}.`));
+          } else if (action === "review") {
+            let applied = 0, kept = 0;
+            for (const c of conflictedFiles) {
+              const patch = createTwoFilesPatch(c.rel, c.rel, c.existingContent, c.sourceContent, "local", "v" + readPackageVersion());
+              let ins = 0, del = 0;
+              for (const line of patch.split("\n")) {
+                if (line.startsWith("+") && !line.startsWith("+++")) ins++;
+                if (line.startsWith("-") && !line.startsWith("---")) del++;
+              }
+              console.log("");
+              console.log("  " + pc.bold(c.rel) + dim("  ") + pc.green(`+${ins}`) + " " + pc.red(`-${del}`));
+              const decision = await clack.select({
+                message: "Take upstream, keep local, or view diff?",
+                initialValue: "view",
+                options: [
+                  { value: "upstream", label: "Take v" + readPackageVersion() },
+                  { value: "keep", label: "Keep local" },
+                  { value: "view", label: "View diff first" }
+                ]
+              });
+              let finalAction = decision;
+              if (clack.isCancel(decision) || decision === "view") {
+                for (const line of patch.split("\n").slice(4)) {
+                  if (line.startsWith("+")) process.stdout.write(pc.green(line) + "\n");
+                  else if (line.startsWith("-")) process.stdout.write(pc.red(line) + "\n");
+                  else if (line.startsWith("@")) process.stdout.write(pc.cyan(line) + "\n");
+                  else process.stdout.write(dim(line) + "\n");
+                }
+                const after = await clack.select({
+                  message: "Now: take upstream or keep local?",
+                  initialValue: "keep",
+                  options: [
+                    { value: "upstream", label: "Take v" + readPackageVersion() },
+                    { value: "keep", label: "Keep local" }
+                  ]
+                });
+                finalAction = clack.isCancel(after) ? "keep" : after;
+              }
+              if (finalAction === "upstream") {
+                fs2.writeFileSync(c.destPath, c.sourceContent, "utf8");
+                applied++;
+              } else {
+                kept++;
+              }
+            }
+            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.`));
+          }
+        } else {
+          console.log("  " + dim(`Re-run with --force-overwrite to apply v${readPackageVersion()} updates, or pipe through an interactive shell to resolve per-file.`));
+        }
+        console.log("");
+      }
       const configDir = path2.join(opts.target, ".rihal", "_config");
       ensureDir(configDir);
       fs2.writeFileSync(path2.join(configDir, "manifest.yaml"), generateInstallManifest(opts));
@@ -16968,15 +17079,16 @@ Say "plan a sprint" or run \`/rihal:sprint-planning\` to break Phase 01 into sto
         console.log(dim("  To overwrite: re-run with --force-overwrite  |  To see full diffs: --show-diff"));
         console.log("");
       }
-      const agentsDir = path2.join(opts.target, ".claude", "agents");
-      const commandsDir = path2.join(opts.target, ".claude", "commands", "rihal");
+      const idePaths = getPathsForIde(opts.ide, opts.target);
+      const agentsDir = idePaths.agentsDir;
+      const commandsDir = idePaths.commandsDir;
       let agentCount = 0, commandCount = 0;
       try {
         if (fs2.existsSync(agentsDir)) {
-          agentCount = fs2.readdirSync(agentsDir).filter((f) => f.startsWith("rihal-") && f.endsWith(".md")).length;
+          agentCount = fs2.readdirSync(agentsDir).filter((f) => (f.startsWith("rihal-") || f.startsWith("rcode-")) && (f.endsWith(".md") || f.endsWith(".mdc"))).length;
         }
         if (fs2.existsSync(commandsDir)) {
-          commandCount = fs2.readdirSync(commandsDir).filter((f) => f.endsWith(".md")).length;
+          commandCount = fs2.readdirSync(commandsDir).filter((f) => f.endsWith(".md") || f.endsWith(".mdc")).length;
         }
       } catch {
       }
@@ -16988,9 +17100,11 @@ Say "plan a sprint" or run \`/rihal:sprint-planning\` to break Phase 01 into sto
       console.log(`  ${bold("Mode:")}      ${opts.mode}  ${dim("(guided=confirm at gates, yolo=autonomous)")}`);
       console.log(`  ${bold("Planning:")}  ${opts.commitPlanning !== false ? "committed" : "gitignored"}  ${dim("(flip: rihal-tools gitignore refresh)")}`);
       console.log("");
-      console.log(`  ${bold("Agents:")}    ${pc.green(String(agentCount))} in .claude/agents/`);
-      console.log(`  ${bold("Commands:")}  ${pc.green(String(commandCount))} slash commands in .claude/commands/rihal/`);
-      if (skillsInstalled > 0) console.log(`  ${bold("Skills:")}    ${pc.green(String(skillsInstalled))} phrase-activated in .claude/skills/`);
+      const relAgents = path2.relative(opts.target, idePaths.agentsDir) || idePaths.agentsDir;
+      const relCommands = path2.relative(opts.target, idePaths.commandsDir) || idePaths.commandsDir;
+      console.log(`  ${bold("Agents:")}    ${pc.green(String(agentCount))} in ${relAgents}/`);
+      console.log(`  ${bold("Commands:")}  ${pc.green(String(commandCount))} slash commands in ${relCommands}/`);
+      if (skillsInstalled > 0) console.log(`  ${bold("Skills:")}    ${pc.green(String(skillsInstalled))} phrase-activated`);
       console.log("");
       if (starterSeeded) {
         console.log("  " + ok("Starter planning scaffolded in .planning/ (ROADMAP, STATE, PROJECT)"));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hanzlaa/rcode",
-  "version": "3.1.0",
-  "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, and Gemini.",
+  "version": "3.2.1",
+  "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": {
     "rcode": "dist/rcode.js",