@react-grab/cli 0.0.90 → 0.0.92

package/dist/cli.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 import { Command } from 'commander';
 import pc from 'picocolors';
-import prompts2 from 'prompts';
+import prompts3 from 'prompts';
 import { spawn, execSync } from 'child_process';
-import { existsSync, readFileSync, writeFileSync, accessSync, constants, readdirSync } from 'fs';
+import { readFileSync, existsSync, writeFileSync, accessSync, constants, readdirSync } from 'fs';
 import { join, basename } from 'path';
 import { detect } from '@antfu/ni';
 import ora from 'ora';
@@ -459,6 +459,12 @@ var INSTALL_COMMANDS = {
   pnpm: "pnpm add",
   bun: "bun add"
 };
+var UNINSTALL_COMMANDS = {
+  npm: "npm uninstall",
+  yarn: "yarn remove",
+  pnpm: "pnpm remove",
+  bun: "bun remove"
+};
 var installPackages = (packages, packageManager, projectRoot, isDev = true) => {
   if (packages.length === 0) {
     return;
@@ -483,6 +489,22 @@ var getPackagesToInstall = (agent, includeReactGrab = true) => {
   }
   return packages;
 };
+var uninstallPackages = (packages, packageManager, projectRoot) => {
+  if (packages.length === 0) {
+    return;
+  }
+  const command = UNINSTALL_COMMANDS[packageManager];
+  const fullCommand = `${command} ${packages.join(" ")}`;
+  console.log(`Running: ${fullCommand}
+`);
+  execSync(fullCommand, {
+    cwd: projectRoot,
+    stdio: "inherit"
+  });
+};
+var getPackagesToUninstall = (agent) => {
+  return [`@react-grab/${agent}`];
+};
 var spinner = (text, options) => ora({ text, isSilent: options?.silent, stream: process.stdout });
 
 // src/utils/templates.ts
@@ -668,18 +690,20 @@ var addAgentToExistingNextApp = (originalContent, agent, filePath) => {
       noChanges: true
     };
   }
-  const agentScript = `<Script
-              src="//unpkg.com/${agentPackage}/dist/client.global.js"
-              strategy="lazyOnload"
-            />`;
-  const reactGrabScriptMatch = originalContent.match(
-    /<(?:Script|script|NextScript)[^>]*react-grab[^>]*\/?>/is
+  const agentScript = `{process.env.NODE_ENV === "development" && (
+          <Script
+            src="//unpkg.com/${agentPackage}/dist/client.global.js"
+            strategy="lazyOnload"
+          />
+        )}`;
+  const reactGrabBlockMatch = originalContent.match(
+    /\{process\.env\.NODE_ENV\s*===\s*["']development["']\s*&&\s*\(\s*<Script[^>]*react-grab[^>]*\/>\s*\)\}/is
   );
-  if (reactGrabScriptMatch) {
+  if (reactGrabBlockMatch) {
     const newContent = originalContent.replace(
-      reactGrabScriptMatch[0],
-      `${reactGrabScriptMatch[0]}
-            ${agentScript}`
+      reactGrabBlockMatch[0],
+      `${reactGrabBlockMatch[0]}
+        ${agentScript}`
     );
     return {
       success: true,
@@ -1029,20 +1053,49 @@ var applyTransform = (result) => {
   }
   return { success: true };
 };
-var AGENT_PREFIXES = {
-  "claude-code": "npx @react-grab/claude-code@latest &&",
-  cursor: "npx @react-grab/cursor@latest &&",
-  opencode: "npx @react-grab/opencode@latest &&",
-  codex: "npx @react-grab/codex@latest &&",
-  gemini: "npx @react-grab/gemini@latest &&",
-  amp: "npx @react-grab/amp@latest &&"
+var getPackageExecutor = (packageManager) => {
+  switch (packageManager) {
+    case "bun":
+      return "bunx";
+    case "pnpm":
+      return "pnpm dlx";
+    case "yarn":
+      return "npx";
+    case "npm":
+    default:
+      return "npx";
+  }
+};
+var AGENT_PACKAGES2 = {
+  "claude-code": "@react-grab/claude-code@latest",
+  cursor: "@react-grab/cursor@latest",
+  opencode: "@react-grab/opencode@latest",
+  codex: "@react-grab/codex@latest",
+  gemini: "@react-grab/gemini@latest",
+  amp: "@react-grab/amp@latest"
+};
+var getAgentPrefix = (agent, packageManager) => {
+  const agentPackage = AGENT_PACKAGES2[agent];
+  if (!agentPackage) return null;
+  const executor = getPackageExecutor(packageManager);
+  return `${executor} ${agentPackage} &&`;
+};
+var getAllAgentPrefixVariants = (agent) => {
+  const agentPackage = AGENT_PACKAGES2[agent];
+  if (!agentPackage) return [];
+  return [
+    `npx ${agentPackage} &&`,
+    `bunx ${agentPackage} &&`,
+    `pnpm dlx ${agentPackage} &&`,
+    `yarn dlx ${agentPackage} &&`
+  ];
 };
-var previewPackageJsonTransform = (projectRoot, agent, installedAgents) => {
-  if (agent === "none" || agent === "ami" || agent === "visual-edit") {
+var previewPackageJsonTransform = (projectRoot, agent, installedAgents, packageManager = "npm") => {
+  if (agent === "none" || agent === "visual-edit") {
     return {
       success: true,
       filePath: "",
-      message: agent === "ami" || agent === "visual-edit" ? `${agent === "ami" ? "Ami" : "Visual Edit"} does not require package.json modification` : "No agent selected, skipping package.json modification",
+      message: agent === "visual-edit" ? "Visual Edit does not require package.json modification" : "No agent selected, skipping package.json modification",
       noChanges: true
     };
   }
@@ -1055,7 +1108,7 @@ var previewPackageJsonTransform = (projectRoot, agent, installedAgents) => {
     };
   }
   const originalContent = readFileSync(packageJsonPath, "utf-8");
-  const agentPrefix = AGENT_PREFIXES[agent];
+  const agentPrefix = getAgentPrefix(agent, packageManager);
   if (!agentPrefix) {
     return {
       success: false,
@@ -1063,7 +1116,11 @@ var previewPackageJsonTransform = (projectRoot, agent, installedAgents) => {
       message: `Unknown agent: ${agent}`
     };
   }
-  if (originalContent.includes(agentPrefix)) {
+  const allPrefixVariants = getAllAgentPrefixVariants(agent);
+  const hasExistingPrefix = allPrefixVariants.some(
+    (prefix) => originalContent.includes(prefix)
+  );
+  if (hasExistingPrefix) {
     return {
       success: true,
       filePath: packageJsonPath,
@@ -1086,14 +1143,19 @@ var previewPackageJsonTransform = (projectRoot, agent, installedAgents) => {
           filePath: packageJsonPath,
           message: "No dev script found in package.json",
           noChanges: true,
-          warning: `No dev script found. Run: ${agentPrefix} <your dev command>`
+          warning: `Could not inject agent into package.json (no dev script found).
+Run this command manually before starting your dev server:
+  ${agentPrefix} <your dev command>`
         };
       }
     }
     const currentDevScript = packageJson.scripts[targetScriptKey];
     for (const installedAgent of installedAgents) {
-      const existingPrefix = AGENT_PREFIXES[installedAgent];
-      if (existingPrefix && currentDevScript.includes(existingPrefix)) {
+      const installedPrefixVariants = getAllAgentPrefixVariants(installedAgent);
+      const hasInstalledAgentPrefix = installedPrefixVariants.some(
+        (prefix) => currentDevScript.includes(prefix)
+      );
+      if (hasInstalledAgentPrefix) {
         return {
           success: true,
           filePath: packageJsonPath,
@@ -1337,9 +1399,192 @@ var previewOptionsTransform = (projectRoot, framework, nextRouterType, options)
 var applyOptionsTransform = (result) => {
   return applyTransform(result);
 };
+var removeAgentFromNextApp = (originalContent, agent, filePath) => {
+  const agentPackage = `@react-grab/${agent}`;
+  if (!originalContent.includes(agentPackage)) {
+    return {
+      success: true,
+      filePath,
+      message: `Agent ${agent} is not configured in this file`,
+      noChanges: true
+    };
+  }
+  const agentScriptPattern = new RegExp(
+    `\\s*\\{process\\.env\\.NODE_ENV === "development" && \\(\\s*<Script[^>]*${agentPackage.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}[^>]*\\/>\\s*\\)\\}`,
+    "gs"
+  );
+  const simpleScriptPattern = new RegExp(
+    `\\s*<Script[^>]*${agentPackage.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}[^>]*\\/>`,
+    "gi"
+  );
+  let newContent = originalContent.replace(agentScriptPattern, "");
+  if (newContent === originalContent) {
+    newContent = originalContent.replace(simpleScriptPattern, "");
+  }
+  if (newContent === originalContent) {
+    return {
+      success: false,
+      filePath,
+      message: `Could not find agent ${agent} script to remove`
+    };
+  }
+  return {
+    success: true,
+    filePath,
+    message: `Remove ${agent} agent`,
+    originalContent,
+    newContent
+  };
+};
+var removeAgentFromVite = (originalContent, agent, filePath) => {
+  const agentPackage = `@react-grab/${agent}`;
+  if (!originalContent.includes(agentPackage)) {
+    return {
+      success: true,
+      filePath,
+      message: `Agent ${agent} is not configured in this file`,
+      noChanges: true
+    };
+  }
+  const agentImportPattern = new RegExp(
+    `\\s*import\\s*\\(\\s*["']${agentPackage.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}/client["']\\s*\\);?`,
+    "g"
+  );
+  const newContent = originalContent.replace(agentImportPattern, "");
+  if (newContent === originalContent) {
+    return {
+      success: false,
+      filePath,
+      message: `Could not find agent ${agent} import to remove`
+    };
+  }
+  return {
+    success: true,
+    filePath,
+    message: `Remove ${agent} agent`,
+    originalContent,
+    newContent
+  };
+};
+var removeAgentFromWebpack = (originalContent, agent, filePath) => {
+  const agentPackage = `@react-grab/${agent}`;
+  if (!originalContent.includes(agentPackage)) {
+    return {
+      success: true,
+      filePath,
+      message: `Agent ${agent} is not configured in this file`,
+      noChanges: true
+    };
+  }
+  const agentImportPattern = new RegExp(
+    `\\s*import\\s*\\(\\s*["']${agentPackage.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}/client["']\\s*\\);?`,
+    "g"
+  );
+  const newContent = originalContent.replace(agentImportPattern, "");
+  if (newContent === originalContent) {
+    return {
+      success: false,
+      filePath,
+      message: `Could not find agent ${agent} import to remove`
+    };
+  }
+  return {
+    success: true,
+    filePath,
+    message: `Remove ${agent} agent`,
+    originalContent,
+    newContent
+  };
+};
+var previewAgentRemoval = (projectRoot, framework, nextRouterType, agent) => {
+  const filePath = findReactGrabFile(projectRoot, framework, nextRouterType);
+  if (!filePath) {
+    return {
+      success: true,
+      filePath: "",
+      message: "Could not find file containing React Grab configuration",
+      noChanges: true
+    };
+  }
+  const originalContent = readFileSync(filePath, "utf-8");
+  switch (framework) {
+    case "next":
+      return removeAgentFromNextApp(originalContent, agent, filePath);
+    case "vite":
+      return removeAgentFromVite(originalContent, agent, filePath);
+    case "webpack":
+      return removeAgentFromWebpack(originalContent, agent, filePath);
+    default:
+      return {
+        success: false,
+        filePath,
+        message: `Unknown framework: ${framework}`
+      };
+  }
+};
+var previewPackageJsonAgentRemoval = (projectRoot, agent) => {
+  const packageJsonPath = join(projectRoot, "package.json");
+  if (!existsSync(packageJsonPath)) {
+    return {
+      success: true,
+      filePath: "",
+      message: "Could not find package.json",
+      noChanges: true
+    };
+  }
+  const originalContent = readFileSync(packageJsonPath, "utf-8");
+  const allPrefixVariants = getAllAgentPrefixVariants(agent);
+  if (allPrefixVariants.length === 0) {
+    return {
+      success: true,
+      filePath: packageJsonPath,
+      message: `Unknown agent: ${agent}`,
+      noChanges: true
+    };
+  }
+  const hasAnyPrefix = allPrefixVariants.some(
+    (prefix) => originalContent.includes(prefix)
+  );
+  if (!hasAnyPrefix) {
+    return {
+      success: true,
+      filePath: packageJsonPath,
+      message: `Agent ${agent} dev script is not configured`,
+      noChanges: true
+    };
+  }
+  try {
+    const packageJson = JSON.parse(originalContent);
+    for (const scriptKey of Object.keys(packageJson.scripts || {})) {
+      let scriptValue = packageJson.scripts[scriptKey];
+      if (typeof scriptValue === "string") {
+        for (const prefix of allPrefixVariants) {
+          if (scriptValue.includes(prefix)) {
+            scriptValue = scriptValue.replace(prefix + " ", "").replace(prefix, "");
+          }
+        }
+        packageJson.scripts[scriptKey] = scriptValue;
+      }
+    }
+    const newContent = JSON.stringify(packageJson, null, 2) + "\n";
+    return {
+      success: true,
+      filePath: packageJsonPath,
+      message: `Remove ${agent} server from dev script`,
+      originalContent,
+      newContent
+    };
+  } catch {
+    return {
+      success: false,
+      filePath: packageJsonPath,
+      message: "Failed to parse package.json"
+    };
+  }
+};
 
 // src/commands/add.ts
-var VERSION = "0.0.90";
+var VERSION = "0.0.92";
 var AGENT_NAMES = {
   "claude-code": "Claude Code",
   cursor: "Cursor",
@@ -1376,7 +1621,7 @@ var add = new Command().name("add").description("add an agent integration").argu
       process.exit(1);
     }
     preflightSpinner.succeed();
-    const availableAgents = [
+    const allAgents = [
       "claude-code",
       "cursor",
       "opencode",
@@ -1384,7 +1629,10 @@ var add = new Command().name("add").description("add an agent integration").argu
       "gemini",
       "amp",
       "visual-edit"
-    ].filter((agent) => !projectInfo.installedAgents.includes(agent));
+    ];
+    const availableAgents = allAgents.filter(
+      (agent) => !projectInfo.installedAgents.includes(agent)
+    );
     if (availableAgents.length === 0) {
       logger.break();
       logger.success("All agent integrations are already installed.");
@@ -1392,16 +1640,9 @@ var add = new Command().name("add").description("add an agent integration").argu
       process.exit(0);
     }
     let agentIntegration;
+    let agentsToRemove = [];
     if (agentArg) {
-      if (![
-        "claude-code",
-        "cursor",
-        "opencode",
-        "codex",
-        "gemini",
-        "amp",
-        "visual-edit"
-      ].includes(agentArg)) {
+      if (!allAgents.includes(agentArg)) {
         logger.break();
         logger.error(`Invalid agent: ${agentArg}`);
         logger.error(
@@ -1417,9 +1658,44 @@ var add = new Command().name("add").description("add an agent integration").argu
         process.exit(0);
       }
       agentIntegration = agentArg;
+      if (projectInfo.installedAgents.length > 0 && !isNonInteractive) {
+        const installedNames = projectInfo.installedAgents.map((innerAgent) => AGENT_NAMES[innerAgent] || innerAgent).join(", ");
+        logger.break();
+        logger.warn(`${installedNames} is already installed.`);
+        const { action } = await prompts3({
+          type: "select",
+          name: "action",
+          message: "How would you like to proceed?",
+          choices: [
+            {
+              title: `Replace with ${AGENT_NAMES[agentIntegration]}`,
+              value: "replace"
+            },
+            {
+              title: `Add ${AGENT_NAMES[agentIntegration]} alongside existing`,
+              value: "add"
+            },
+            { title: "Cancel", value: "cancel" }
+          ]
+        });
+        if (!action || action === "cancel") {
+          logger.break();
+          logger.log("Changes cancelled.");
+          logger.break();
+          process.exit(0);
+        }
+        if (action === "replace") {
+          agentsToRemove = [...projectInfo.installedAgents];
+        }
+      }
     } else if (!isNonInteractive) {
       logger.break();
-      const { agent } = await prompts2({
+      if (projectInfo.installedAgents.length > 0) {
+        const installedNames = projectInfo.installedAgents.map((innerAgent) => AGENT_NAMES[innerAgent] || innerAgent).join(", ");
+        logger.warn(`Currently installed: ${installedNames}`);
+        logger.break();
+      }
+      const { agent } = await prompts3({
         type: "select",
         name: "agent",
         message: `Which ${highlighter.info("agent integration")} would you like to add?`,
@@ -1433,6 +1709,34 @@ var add = new Command().name("add").description("add an agent integration").argu
         process.exit(1);
       }
       agentIntegration = agent;
+      if (projectInfo.installedAgents.length > 0) {
+        const installedNames = projectInfo.installedAgents.map((innerAgent) => AGENT_NAMES[innerAgent] || innerAgent).join(", ");
+        const { action } = await prompts3({
+          type: "select",
+          name: "action",
+          message: "How would you like to proceed?",
+          choices: [
+            {
+              title: `Replace ${installedNames} with ${AGENT_NAMES[agentIntegration]}`,
+              value: "replace"
+            },
+            {
+              title: `Add ${AGENT_NAMES[agentIntegration]} alongside existing`,
+              value: "add"
+            },
+            { title: "Cancel", value: "cancel" }
+          ]
+        });
+        if (!action || action === "cancel") {
+          logger.break();
+          logger.log("Changes cancelled.");
+          logger.break();
+          process.exit(0);
+        }
+        if (action === "replace") {
+          agentsToRemove = [...projectInfo.installedAgents];
+        }
+      }
     } else {
       logger.break();
       logger.error("Please specify an agent to add.");
@@ -1440,6 +1744,72 @@ var add = new Command().name("add").description("add an agent integration").argu
       logger.break();
       process.exit(1);
     }
+    if (agentsToRemove.length > 0) {
+      for (const agentToRemove of agentsToRemove) {
+        const removalResult = previewAgentRemoval(
+          projectInfo.projectRoot,
+          projectInfo.framework,
+          projectInfo.nextRouterType,
+          agentToRemove
+        );
+        const removalPackageJsonResult = previewPackageJsonAgentRemoval(
+          projectInfo.projectRoot,
+          agentToRemove
+        );
+        const packagesToRemove = getPackagesToUninstall(agentToRemove);
+        if (packagesToRemove.length > 0) {
+          const uninstallSpinner = spinner(
+            `Removing ${packagesToRemove.join(", ")}.`
+          ).start();
+          try {
+            uninstallPackages(
+              packagesToRemove,
+              projectInfo.packageManager,
+              projectInfo.projectRoot
+            );
+            uninstallSpinner.succeed();
+          } catch (error) {
+            uninstallSpinner.fail();
+            handleError(error);
+          }
+        }
+        if (removalResult.success && !removalResult.noChanges && removalResult.newContent) {
+          const removeWriteSpinner = spinner(
+            `Removing ${AGENT_NAMES[agentToRemove] || agentToRemove} from ${removalResult.filePath}.`
+          ).start();
+          const writeResult = applyTransform(removalResult);
+          if (!writeResult.success) {
+            removeWriteSpinner.fail();
+            logger.break();
+            logger.error(writeResult.error || "Failed to write file.");
+            logger.break();
+            process.exit(1);
+          }
+          removeWriteSpinner.succeed();
+        }
+        if (removalPackageJsonResult.success && !removalPackageJsonResult.noChanges && removalPackageJsonResult.newContent) {
+          const removePackageJsonSpinner = spinner(
+            `Removing ${AGENT_NAMES[agentToRemove] || agentToRemove} from ${removalPackageJsonResult.filePath}.`
+          ).start();
+          const packageJsonWriteResult = applyPackageJsonTransform(
+            removalPackageJsonResult
+          );
+          if (!packageJsonWriteResult.success) {
+            removePackageJsonSpinner.fail();
+            logger.break();
+            logger.error(
+              packageJsonWriteResult.error || "Failed to write file."
+            );
+            logger.break();
+            process.exit(1);
+          }
+          removePackageJsonSpinner.succeed();
+        }
+      }
+      projectInfo.installedAgents = projectInfo.installedAgents.filter(
+        (innerAgent) => !agentsToRemove.includes(innerAgent)
+      );
+    }
     const addingSpinner = spinner(
       `Adding ${AGENT_NAMES[agentIntegration]}.`
     ).start();
@@ -1454,7 +1824,8 @@ var add = new Command().name("add").description("add an agent integration").argu
     const packageJsonResult = previewPackageJsonTransform(
       projectInfo.projectRoot,
       agentIntegration,
-      projectInfo.installedAgents
+      projectInfo.installedAgents,
+      projectInfo.packageManager
     );
     if (!result.success) {
       logger.break();
@@ -1483,9 +1854,9 @@ var add = new Command().name("add").description("add an agent integration").argu
           packageJsonResult.newContent
         );
       }
-      if (!isNonInteractive) {
+      if (!isNonInteractive && agentsToRemove.length === 0) {
         logger.break();
-        const { proceed } = await prompts2({
+        const { proceed } = await prompts3({
           type: "confirm",
           name: "proceed",
           message: "Apply these changes?",
@@ -1558,7 +1929,7 @@ var add = new Command().name("add").description("add an agent integration").argu
     handleError(error);
   }
 });
-var VERSION2 = "0.0.90";
+var VERSION2 = "0.0.92";
 var MODIFIER_KEY_NAMES = {
   metaKey: process.platform === "darwin" ? "\u2318 Command" : "\u229E Windows",
   ctrlKey: "Ctrl",
@@ -1612,7 +1983,7 @@ var configure = new Command().name("configure").alias("config").description("con
     logger.log(`Configure ${highlighter.info("React Grab")} options:`);
     logger.break();
     const collectedOptions = {};
-    const { wantActivationKey } = await prompts2({
+    const { wantActivationKey } = await prompts3({
       type: "confirm",
       name: "wantActivationKey",
       message: `Configure ${highlighter.info("activation key")}?`,
@@ -1623,7 +1994,7 @@ var configure = new Command().name("configure").alias("config").description("con
       process.exit(1);
     }
     if (wantActivationKey) {
-      const { key } = await prompts2({
+      const { key } = await prompts3({
         type: "text",
         name: "key",
         message: "Enter the activation key (e.g., g, k, space):",
@@ -1633,7 +2004,7 @@ var configure = new Command().name("configure").alias("config").description("con
         logger.break();
         process.exit(1);
       }
-      const { modifiers } = await prompts2({
+      const { modifiers } = await prompts3({
         type: "multiselect",
         name: "modifiers",
         message: "Select modifier keys (space to select, enter to confirm):",
@@ -1664,7 +2035,7 @@ var configure = new Command().name("configure").alias("config").description("con
         `  Activation key: ${highlighter.info(formatActivationKey(collectedOptions.activationKey))}`
       );
     }
-    const { activationMode } = await prompts2({
+    const { activationMode } = await prompts3({
       type: "select",
       name: "activationMode",
       message: `Select ${highlighter.info("activation mode")}:`,
@@ -1680,7 +2051,7 @@ var configure = new Command().name("configure").alias("config").description("con
     }
     collectedOptions.activationMode = activationMode;
     if (activationMode === "hold") {
-      const { keyHoldDuration } = await prompts2({
+      const { keyHoldDuration } = await prompts3({
         type: "number",
         name: "keyHoldDuration",
         message: `Enter ${highlighter.info("key hold duration")} in milliseconds:`,
@@ -1694,7 +2065,7 @@ var configure = new Command().name("configure").alias("config").description("con
       }
       collectedOptions.keyHoldDuration = keyHoldDuration;
     }
-    const { allowActivationInsideInput } = await prompts2({
+    const { allowActivationInsideInput } = await prompts3({
       type: "confirm",
       name: "allowActivationInsideInput",
       message: `Allow activation ${highlighter.info("inside input fields")}?`,
@@ -1705,7 +2076,7 @@ var configure = new Command().name("configure").alias("config").description("con
       process.exit(1);
     }
     collectedOptions.allowActivationInsideInput = allowActivationInsideInput;
-    const { maxContextLines } = await prompts2({
+    const { maxContextLines } = await prompts3({
       type: "number",
       name: "maxContextLines",
       message: `Enter ${highlighter.info("max context lines")} to include:`,
@@ -1735,7 +2106,7 @@ var configure = new Command().name("configure").alias("config").description("con
       logger.break();
       printDiff(result.filePath, result.originalContent, result.newContent);
       logger.break();
-      const { proceed } = await prompts2({
+      const { proceed } = await prompts3({
         type: "confirm",
         name: "proceed",
         message: "Apply these changes?",
@@ -1772,7 +2143,7 @@ var configure = new Command().name("configure").alias("config").description("con
     handleError(error);
   }
 });
-var VERSION3 = "0.0.90";
+var VERSION3 = "0.0.92";
 var REPORT_URL = "https://react-grab.com/api/report-cli";
 var DOCS_URL = "https://github.com/aidenybai/react-grab";
 var reportToCli = async (type, config, error) => {
@@ -1810,6 +2181,34 @@ var UNSUPPORTED_FRAMEWORK_NAMES = {
   sveltekit: "SvelteKit",
   gatsby: "Gatsby"
 };
+var AGENT_NAMES2 = {
+  "claude-code": "Claude Code",
+  cursor: "Cursor",
+  opencode: "OpenCode",
+  codex: "Codex",
+  gemini: "Gemini",
+  amp: "Amp",
+  ami: "Ami",
+  "visual-edit": "Visual Edit"
+};
+var MODIFIER_KEY_NAMES2 = {
+  metaKey: process.platform === "darwin" ? "\u2318 Command" : "\u229E Windows",
+  ctrlKey: "Ctrl",
+  shiftKey: "Shift",
+  altKey: process.platform === "darwin" ? "\u2325 Option" : "Alt"
+};
+var formatActivationKey2 = (activationKey) => {
+  if (!activationKey) return "Default (Option/Alt)";
+  const parts = [];
+  if (activationKey.metaKey)
+    parts.push(process.platform === "darwin" ? "\u2318" : "Win");
+  if (activationKey.ctrlKey) parts.push("Ctrl");
+  if (activationKey.shiftKey) parts.push("Shift");
+  if (activationKey.altKey)
+    parts.push(process.platform === "darwin" ? "\u2325" : "Alt");
+  if (activationKey.key) parts.push(activationKey.key.toUpperCase());
+  return parts.length > 0 ? parts.join(" + ") : "Default (Option/Alt)";
+};
 var init = new Command().name("init").description("initialize React Grab in your project").option("-y, --yes", "skip confirmation prompts", false).option("-f, --force", "force overwrite existing config", false).option(
   "-a, --agent <agent>",
   "agent integration (claude-code, cursor, opencode, codex, gemini, amp, visual-edit)"
@@ -1829,11 +2228,514 @@ var init = new Command().name("init").description("initialize React Grab in your
     const projectInfo = await detectProject(cwd);
     if (projectInfo.hasReactGrab && !opts.force) {
       preflightSpinner.succeed();
+      if (isNonInteractive) {
+        logger.break();
+        logger.warn("React Grab is already installed.");
+        logger.log(
+          `Use ${highlighter.info("--force")} to reconfigure, or remove ${highlighter.info("--yes")} for interactive mode.`
+        );
+        logger.break();
+        process.exit(0);
+      }
       logger.break();
-      logger.warn("React Grab is already installed.");
-      logger.log(
-        `Use ${highlighter.info("--force")} to reconfigure, or ${highlighter.info("npx grab@latest add")} to add an agent.`
+      logger.success("React Grab is already installed.");
+      logger.break();
+      const allAgents = [
+        "claude-code",
+        "cursor",
+        "opencode",
+        "codex",
+        "gemini",
+        "amp",
+        "visual-edit"
+      ];
+      const availableAgents = allAgents.filter(
+        (agent) => !projectInfo.installedAgents.includes(agent)
       );
+      if (projectInfo.installedAgents.length > 0) {
+        const installedNames = projectInfo.installedAgents.map((innerAgent) => AGENT_NAMES2[innerAgent] || innerAgent).join(", ");
+        logger.log(
+          `Currently installed agents: ${highlighter.info(installedNames)}`
+        );
+        logger.break();
+      }
+      let didAddAgent = false;
+      if (availableAgents.length > 0) {
+        const { wantAddAgent } = await prompts3({
+          type: "confirm",
+          name: "wantAddAgent",
+          message: `Would you like to add an ${highlighter.info("agent integration")}?`,
+          initial: true
+        });
+        if (wantAddAgent === void 0) {
+          logger.break();
+          process.exit(1);
+        }
+        if (wantAddAgent) {
+          const { agent } = await prompts3({
+            type: "select",
+            name: "agent",
+            message: `Which ${highlighter.info("agent integration")} would you like to add?`,
+            choices: availableAgents.map((innerAgent) => ({
+              title: AGENT_NAMES2[innerAgent],
+              value: innerAgent
+            }))
+          });
+          if (agent === void 0) {
+            logger.break();
+            process.exit(1);
+          }
+          const agentIntegration2 = agent;
+          let agentsToRemove2 = [];
+          if (projectInfo.installedAgents.length > 0) {
+            const installedNames = projectInfo.installedAgents.map((innerAgent) => AGENT_NAMES2[innerAgent] || innerAgent).join(", ");
+            const { action } = await prompts3({
+              type: "select",
+              name: "action",
+              message: "How would you like to proceed?",
+              choices: [
+                {
+                  title: `Replace ${installedNames} with ${AGENT_NAMES2[agentIntegration2]}`,
+                  value: "replace"
+                },
+                {
+                  title: `Add ${AGENT_NAMES2[agentIntegration2]} alongside existing`,
+                  value: "add"
+                },
+                { title: "Cancel", value: "cancel" }
+              ]
+            });
+            if (!action || action === "cancel") {
+              logger.break();
+              logger.log("Agent addition cancelled.");
+            } else {
+              if (action === "replace") {
+                agentsToRemove2 = [...projectInfo.installedAgents];
+              }
+              if (agentsToRemove2.length > 0) {
+                for (const agentToRemove of agentsToRemove2) {
+                  const removalResult = previewAgentRemoval(
+                    projectInfo.projectRoot,
+                    projectInfo.framework,
+                    projectInfo.nextRouterType,
+                    agentToRemove
+                  );
+                  const removalPackageJsonResult = previewPackageJsonAgentRemoval(
+                    projectInfo.projectRoot,
+                    agentToRemove
+                  );
+                  const packagesToRemove = getPackagesToUninstall(agentToRemove);
+                  if (packagesToRemove.length > 0) {
+                    const uninstallSpinner = spinner(
+                      `Removing ${packagesToRemove.join(", ")}.`
+                    ).start();
+                    try {
+                      uninstallPackages(
+                        packagesToRemove,
+                        projectInfo.packageManager,
+                        projectInfo.projectRoot
+                      );
+                      uninstallSpinner.succeed();
+                    } catch (error) {
+                      uninstallSpinner.fail();
+                      handleError(error);
+                    }
+                  }
+                  if (removalResult.success && !removalResult.noChanges && removalResult.newContent) {
+                    const removeWriteSpinner = spinner(
+                      `Removing ${AGENT_NAMES2[agentToRemove] || agentToRemove} from ${removalResult.filePath}.`
+                    ).start();
+                    const writeResult = applyTransform(removalResult);
+                    if (!writeResult.success) {
+                      removeWriteSpinner.fail();
+                      logger.break();
+                      logger.error(
+                        writeResult.error || "Failed to write file."
+                      );
+                      logger.break();
+                      process.exit(1);
+                    }
+                    removeWriteSpinner.succeed();
+                  }
+                  if (removalPackageJsonResult.success && !removalPackageJsonResult.noChanges && removalPackageJsonResult.newContent) {
+                    const removePackageJsonSpinner = spinner(
+                      `Removing ${AGENT_NAMES2[agentToRemove] || agentToRemove} from ${removalPackageJsonResult.filePath}.`
+                    ).start();
+                    const packageJsonWriteResult = applyPackageJsonTransform(
+                      removalPackageJsonResult
+                    );
+                    if (!packageJsonWriteResult.success) {
+                      removePackageJsonSpinner.fail();
+                      logger.break();
+                      logger.error(
+                        packageJsonWriteResult.error || "Failed to write file."
+                      );
+                      logger.break();
+                      process.exit(1);
+                    }
+                    removePackageJsonSpinner.succeed();
+                  }
+                }
+                projectInfo.installedAgents = projectInfo.installedAgents.filter(
+                  (innerAgent) => !agentsToRemove2.includes(innerAgent)
+                );
+              }
+              const result2 = previewTransform(
+                projectInfo.projectRoot,
+                projectInfo.framework,
+                projectInfo.nextRouterType,
+                agentIntegration2,
+                true
+              );
+              const packageJsonResult2 = previewPackageJsonTransform(
+                projectInfo.projectRoot,
+                agentIntegration2,
+                projectInfo.installedAgents,
+                projectInfo.packageManager
+              );
+              if (!result2.success) {
+                logger.break();
+                logger.error(result2.message);
+                logger.break();
+                process.exit(1);
+              }
+              const hasLayoutChanges2 = !result2.noChanges && result2.originalContent && result2.newContent;
+              const hasPackageJsonChanges2 = packageJsonResult2.success && !packageJsonResult2.noChanges && packageJsonResult2.originalContent && packageJsonResult2.newContent;
+              if (hasLayoutChanges2 || hasPackageJsonChanges2) {
+                logger.break();
+                if (hasLayoutChanges2) {
+                  printDiff(
+                    result2.filePath,
+                    result2.originalContent,
+                    result2.newContent
+                  );
+                }
+                if (hasPackageJsonChanges2) {
+                  if (hasLayoutChanges2) {
+                    logger.break();
+                  }
+                  printDiff(
+                    packageJsonResult2.filePath,
+                    packageJsonResult2.originalContent,
+                    packageJsonResult2.newContent
+                  );
+                }
+                if (agentsToRemove2.length === 0) {
+                  logger.break();
+                  const { proceed } = await prompts3({
+                    type: "confirm",
+                    name: "proceed",
+                    message: "Apply these changes?",
+                    initial: true
+                  });
+                  if (!proceed) {
+                    logger.break();
+                    logger.log("Agent addition cancelled.");
+                  } else {
+                    const packages = getPackagesToInstall(
+                      agentIntegration2,
+                      false
+                    );
+                    if (packages.length > 0) {
+                      const installSpinner = spinner(
+                        `Installing ${packages.join(", ")}.`
+                      ).start();
+                      try {
+                        installPackages(
+                          packages,
+                          projectInfo.packageManager,
+                          projectInfo.projectRoot
+                        );
+                        installSpinner.succeed();
+                      } catch (error) {
+                        installSpinner.fail();
+                        handleError(error);
+                      }
+                    }
+                    if (hasLayoutChanges2) {
+                      const writeSpinner = spinner(
+                        `Applying changes to ${result2.filePath}.`
+                      ).start();
+                      const writeResult = applyTransform(result2);
+                      if (!writeResult.success) {
+                        writeSpinner.fail();
+                        logger.break();
+                        logger.error(
+                          writeResult.error || "Failed to write file."
+                        );
+                        logger.break();
+                        process.exit(1);
+                      }
+                      writeSpinner.succeed();
+                    }
+                    if (hasPackageJsonChanges2) {
+                      const packageJsonSpinner = spinner(
+                        `Applying changes to ${packageJsonResult2.filePath}.`
+                      ).start();
+                      const packageJsonWriteResult = applyPackageJsonTransform(packageJsonResult2);
+                      if (!packageJsonWriteResult.success) {
+                        packageJsonSpinner.fail();
+                        logger.break();
+                        logger.error(
+                          packageJsonWriteResult.error || "Failed to write file."
+                        );
+                        logger.break();
+                        process.exit(1);
+                      }
+                      packageJsonSpinner.succeed();
+                    }
+                    didAddAgent = true;
+                    logger.break();
+                    logger.success(
+                      `${AGENT_NAMES2[agentIntegration2]} has been added.`
+                    );
+                  }
+                } else {
+                  const packages = getPackagesToInstall(
+                    agentIntegration2,
+                    false
+                  );
+                  if (packages.length > 0) {
+                    const installSpinner = spinner(
+                      `Installing ${packages.join(", ")}.`
+                    ).start();
+                    try {
+                      installPackages(
+                        packages,
+                        projectInfo.packageManager,
+                        projectInfo.projectRoot
+                      );
+                      installSpinner.succeed();
+                    } catch (error) {
+                      installSpinner.fail();
+                      handleError(error);
+                    }
+                  }
+                  if (hasLayoutChanges2) {
+                    const writeSpinner = spinner(
+                      `Applying changes to ${result2.filePath}.`
+                    ).start();
+                    const writeResult = applyTransform(result2);
+                    if (!writeResult.success) {
+                      writeSpinner.fail();
+                      logger.break();
+                      logger.error(
+                        writeResult.error || "Failed to write file."
+                      );
+                      logger.break();
+                      process.exit(1);
+                    }
+                    writeSpinner.succeed();
+                  }
+                  if (hasPackageJsonChanges2) {
+                    const packageJsonSpinner = spinner(
+                      `Applying changes to ${packageJsonResult2.filePath}.`
+                    ).start();
+                    const packageJsonWriteResult = applyPackageJsonTransform(packageJsonResult2);
+                    if (!packageJsonWriteResult.success) {
+                      packageJsonSpinner.fail();
+                      logger.break();
+                      logger.error(
+                        packageJsonWriteResult.error || "Failed to write file."
+                      );
+                      logger.break();
+                      process.exit(1);
+                    }
+                    packageJsonSpinner.succeed();
+                  }
+                  didAddAgent = true;
+                  logger.break();
+                  logger.success(
+                    `${AGENT_NAMES2[agentIntegration2]} has been added.`
+                  );
+                }
+              }
+            }
+          }
+        }
+      } else {
+        logger.log("All agent integrations are already installed.");
+      }
+      logger.break();
+      const { wantCustomizeOptions } = await prompts3({
+        type: "confirm",
+        name: "wantCustomizeOptions",
+        message: `Would you like to customize ${highlighter.info("options")}?`,
+        initial: false
+      });
+      if (wantCustomizeOptions === void 0) {
+        logger.break();
+        process.exit(1);
+      }
+      if (wantCustomizeOptions) {
+        logger.break();
+        logger.log(`Configure ${highlighter.info("React Grab")} options:`);
+        logger.break();
+        const collectedOptions = {};
+        const { wantActivationKey } = await prompts3({
+          type: "confirm",
+          name: "wantActivationKey",
+          message: `Configure ${highlighter.info("activation key")}?`,
+          initial: false
+        });
+        if (wantActivationKey === void 0) {
+          logger.break();
+          process.exit(1);
+        }
+        if (wantActivationKey) {
+          const { key } = await prompts3({
+            type: "text",
+            name: "key",
+            message: "Enter the activation key (e.g., g, k, space):",
+            initial: ""
+          });
+          if (key === void 0) {
+            logger.break();
+            process.exit(1);
+          }
+          const { modifiers } = await prompts3({
+            type: "multiselect",
+            name: "modifiers",
+            message: "Select modifier keys (space to select, enter to confirm):",
+            choices: [
+              { title: MODIFIER_KEY_NAMES2.metaKey, value: "metaKey" },
+              { title: MODIFIER_KEY_NAMES2.ctrlKey, value: "ctrlKey" },
+              { title: MODIFIER_KEY_NAMES2.shiftKey, value: "shiftKey" },
+              {
+                title: MODIFIER_KEY_NAMES2.altKey,
+                value: "altKey",
+                selected: true
+              }
+            ],
+            hint: "- Space to select, Enter to confirm"
+          });
+          if (modifiers === void 0) {
+            logger.break();
+            process.exit(1);
+          }
+          collectedOptions.activationKey = {
+            ...key && { key: key.toLowerCase() },
+            ...modifiers.includes("metaKey") && { metaKey: true },
+            ...modifiers.includes("ctrlKey") && { ctrlKey: true },
+            ...modifiers.includes("shiftKey") && { shiftKey: true },
+            ...modifiers.includes("altKey") && { altKey: true }
+          };
+          logger.log(
+            `  Activation key: ${highlighter.info(formatActivationKey2(collectedOptions.activationKey))}`
+          );
+        }
+        const { activationMode } = await prompts3({
+          type: "select",
+          name: "activationMode",
+          message: `Select ${highlighter.info("activation mode")}:`,
+          choices: [
+            {
+              title: "Toggle (press to activate/deactivate)",
+              value: "toggle"
+            },
+            { title: "Hold (hold key to keep active)", value: "hold" }
+          ],
+          initial: 0
+        });
+        if (activationMode === void 0) {
+          logger.break();
+          process.exit(1);
+        }
+        collectedOptions.activationMode = activationMode;
+        if (activationMode === "hold") {
+          const { keyHoldDuration } = await prompts3({
+            type: "number",
+            name: "keyHoldDuration",
+            message: `Enter ${highlighter.info("key hold duration")} in milliseconds:`,
+            initial: 150,
+            min: 0,
+            max: 2e3
+          });
+          if (keyHoldDuration === void 0) {
+            logger.break();
+            process.exit(1);
+          }
+          collectedOptions.keyHoldDuration = keyHoldDuration;
+        }
+        const { allowActivationInsideInput } = await prompts3({
+          type: "confirm",
+          name: "allowActivationInsideInput",
+          message: `Allow activation ${highlighter.info("inside input fields")}?`,
+          initial: true
+        });
+        if (allowActivationInsideInput === void 0) {
+          logger.break();
+          process.exit(1);
+        }
+        collectedOptions.allowActivationInsideInput = allowActivationInsideInput;
+        const { maxContextLines } = await prompts3({
+          type: "number",
+          name: "maxContextLines",
+          message: `Enter ${highlighter.info("max context lines")} to include:`,
+          initial: 3,
+          min: 0,
+          max: 50
+        });
+        if (maxContextLines === void 0) {
+          logger.break();
+          process.exit(1);
+        }
+        collectedOptions.maxContextLines = maxContextLines;
+        const optionsResult = previewOptionsTransform(
+          projectInfo.projectRoot,
+          projectInfo.framework,
+          projectInfo.nextRouterType,
+          collectedOptions
+        );
+        if (!optionsResult.success) {
+          logger.break();
+          logger.error(optionsResult.message);
+          logger.break();
+          process.exit(1);
+        }
+        const hasOptionsChanges = !optionsResult.noChanges && optionsResult.originalContent && optionsResult.newContent;
+        if (hasOptionsChanges) {
+          logger.break();
+          printDiff(
+            optionsResult.filePath,
+            optionsResult.originalContent,
+            optionsResult.newContent
+          );
+          logger.break();
+          const { proceed } = await prompts3({
+            type: "confirm",
+            name: "proceed",
+            message: "Apply these changes?",
+            initial: true
+          });
+          if (!proceed) {
+            logger.break();
+            logger.log("Options configuration cancelled.");
+          } else {
+            const writeSpinner = spinner(
+              `Applying changes to ${optionsResult.filePath}.`
+            ).start();
+            const writeResult = applyOptionsTransform(optionsResult);
+            if (!writeResult.success) {
+              writeSpinner.fail();
+              logger.break();
+              logger.error(writeResult.error || "Failed to write file.");
+              logger.break();
+              process.exit(1);
+            }
+            writeSpinner.succeed();
+            logger.break();
+            logger.success("React Grab options have been configured.");
+          }
+        } else {
+          logger.break();
+          logger.log("No option changes needed.");
+        }
+      }
+      if (!didAddAgent && !wantCustomizeOptions) {
+        logger.break();
+        logger.log("No changes made.");
+      }
       logger.break();
       process.exit(0);
     }
@@ -1868,7 +2770,7 @@ var init = new Command().name("init").description("initialize React Grab in your
               return 0;
             }
           );
-          const { selectedProject } = await prompts2({
+          const { selectedProject } = await prompts3({
             type: "select",
             name: "selectedProject",
             message: "Select a project to install React Grab:",
@@ -1929,9 +2831,15 @@ var init = new Command().name("init").description("initialize React Grab in your
     let finalPackageManager = projectInfo.packageManager;
     let finalNextRouterType = projectInfo.nextRouterType;
     let agentIntegration = opts.agent || "none";
+    let agentsToRemove = [];
     if (!isNonInteractive && !opts.agent) {
       logger.break();
-      const { agent } = await prompts2({
+      if (opts.force && projectInfo.installedAgents.length > 0) {
+        const installedNames = projectInfo.installedAgents.map((innerAgent) => AGENT_NAMES2[innerAgent] || innerAgent).join(", ");
+        logger.warn(`Currently installed: ${installedNames}`);
+        logger.break();
+      }
+      const { agent } = await prompts3({
         type: "select",
         name: "agent",
         message: `Would you like to add an ${highlighter.info("agent integration")}?`,
@@ -1951,6 +2859,63 @@ var init = new Command().name("init").description("initialize React Grab in your
         process.exit(1);
       }
       agentIntegration = agent;
+      if (opts.force && projectInfo.installedAgents.length > 0 && agentIntegration !== "none" && !projectInfo.installedAgents.includes(agentIntegration)) {
+        const installedNames = projectInfo.installedAgents.map((innerAgent) => AGENT_NAMES2[innerAgent] || innerAgent).join(", ");
+        const { action } = await prompts3({
+          type: "select",
+          name: "action",
+          message: "How would you like to proceed?",
+          choices: [
+            {
+              title: `Replace ${installedNames} with ${AGENT_NAMES2[agentIntegration]}`,
+              value: "replace"
+            },
+            {
+              title: `Add ${AGENT_NAMES2[agentIntegration]} alongside existing`,
+              value: "add"
+            },
+            { title: "Cancel", value: "cancel" }
+          ]
+        });
+        if (!action || action === "cancel") {
+          logger.break();
+          logger.log("Changes cancelled.");
+          logger.break();
+          process.exit(0);
+        }
+        if (action === "replace") {
+          agentsToRemove = [...projectInfo.installedAgents];
+        }
+      }
+    } else if (opts.agent && opts.force && projectInfo.installedAgents.length > 0 && !projectInfo.installedAgents.includes(opts.agent) && !isNonInteractive) {
+      const installedNames = projectInfo.installedAgents.map((innerAgent) => AGENT_NAMES2[innerAgent] || innerAgent).join(", ");
+      logger.break();
+      logger.warn(`Currently installed: ${installedNames}`);
+      const { action } = await prompts3({
+        type: "select",
+        name: "action",
+        message: "How would you like to proceed?",
+        choices: [
+          {
+            title: `Replace ${installedNames} with ${AGENT_NAMES2[agentIntegration]}`,
+            value: "replace"
+          },
+          {
+            title: `Add ${AGENT_NAMES2[agentIntegration]} alongside existing`,
+            value: "add"
+          },
+          { title: "Cancel", value: "cancel" }
+        ]
+      });
+      if (!action || action === "cancel") {
+        logger.break();
+        logger.log("Changes cancelled.");
+        logger.break();
+        process.exit(0);
+      }
+      if (action === "replace") {
+        agentsToRemove = [...projectInfo.installedAgents];
+      }
     }
     const result = previewTransform(
       projectInfo.projectRoot,
@@ -1962,7 +2927,8 @@ var init = new Command().name("init").description("initialize React Grab in your
     const packageJsonResult = previewPackageJsonTransform(
       projectInfo.projectRoot,
       agentIntegration,
-      projectInfo.installedAgents
+      projectInfo.installedAgents,
+      finalPackageManager
     );
     if (!result.success) {
       logger.break();
@@ -1997,7 +2963,7 @@ var init = new Command().name("init").description("initialize React Grab in your
       logger.warn("Please verify the changes before committing.");
       if (!isNonInteractive) {
         logger.break();
-        const { proceed } = await prompts2({
+        const { proceed } = await prompts3({
           type: "confirm",
           name: "proceed",
           message: "Apply these changes?",
@@ -2011,6 +2977,72 @@ var init = new Command().name("init").description("initialize React Grab in your
         }
       }
     }
+    if (agentsToRemove.length > 0) {
+      for (const agentToRemove of agentsToRemove) {
+        const removalResult = previewAgentRemoval(
+          projectInfo.projectRoot,
+          projectInfo.framework,
+          projectInfo.nextRouterType,
+          agentToRemove
+        );
+        const removalPackageJsonResult = previewPackageJsonAgentRemoval(
+          projectInfo.projectRoot,
+          agentToRemove
+        );
+        const packagesToRemove = getPackagesToUninstall(agentToRemove);
+        if (packagesToRemove.length > 0 && !opts.skipInstall) {
+          const uninstallSpinner = spinner(
+            `Removing ${packagesToRemove.join(", ")}.`
+          ).start();
+          try {
+            uninstallPackages(
+              packagesToRemove,
+              finalPackageManager,
+              projectInfo.projectRoot
+            );
+            uninstallSpinner.succeed();
+          } catch (error) {
+            uninstallSpinner.fail();
+            handleError(error);
+          }
+        }
+        if (removalResult.success && !removalResult.noChanges && removalResult.newContent) {
+          const removeWriteSpinner = spinner(
+            `Removing ${AGENT_NAMES2[agentToRemove] || agentToRemove} from ${removalResult.filePath}.`
+          ).start();
+          const writeResult = applyTransform(removalResult);
+          if (!writeResult.success) {
+            removeWriteSpinner.fail();
+            logger.break();
+            logger.error(writeResult.error || "Failed to write file.");
+            logger.break();
+            process.exit(1);
+          }
+          removeWriteSpinner.succeed();
+        }
+        if (removalPackageJsonResult.success && !removalPackageJsonResult.noChanges && removalPackageJsonResult.newContent) {
+          const removePackageJsonSpinner = spinner(
+            `Removing ${AGENT_NAMES2[agentToRemove] || agentToRemove} from ${removalPackageJsonResult.filePath}.`
+          ).start();
+          const packageJsonWriteResult = applyPackageJsonTransform(
+            removalPackageJsonResult
+          );
+          if (!packageJsonWriteResult.success) {
+            removePackageJsonSpinner.fail();
+            logger.break();
+            logger.error(
+              packageJsonWriteResult.error || "Failed to write file."
+            );
+            logger.break();
+            process.exit(1);
+          }
+          removePackageJsonSpinner.succeed();
+        }
+      }
+      projectInfo.installedAgents = projectInfo.installedAgents.filter(
+        (innerAgent) => !agentsToRemove.includes(innerAgent)
+      );
+    }
     const shouldInstallReactGrab = !projectInfo.hasReactGrab;
     const shouldInstallAgent = agentIntegration !== "none" && !projectInfo.installedAgents.includes(agentIntegration);
     if (!opts.skipInstall && (shouldInstallReactGrab || shouldInstallAgent)) {
@@ -2068,7 +3100,9 @@ var init = new Command().name("init").description("initialize React Grab in your
       `${highlighter.success("Success!")} React Grab has been installed.`
     );
     if (packageJsonResult.warning) {
+      logger.break();
       logger.warn(packageJsonResult.warning);
+      logger.break();
     } else {
       logger.log("You may now start your development server.");
     }
@@ -2085,7 +3119,194 @@ var init = new Command().name("init").description("initialize React Grab in your
     await reportToCli("error", void 0, error);
   }
 });
-var VERSION4 = "0.0.90";
+var VERSION4 = "0.0.92";
+var AGENT_NAMES3 = {
+  "claude-code": "Claude Code",
+  cursor: "Cursor",
+  opencode: "OpenCode",
+  codex: "Codex",
+  gemini: "Gemini",
+  amp: "Amp",
+  ami: "Ami",
+  "visual-edit": "Visual Edit"
+};
+var remove = new Command().name("remove").description("remove an agent integration").argument(
+  "[agent]",
+  "agent to remove (claude-code, cursor, opencode, codex, gemini, amp, ami, visual-edit)"
+).option("-y, --yes", "skip confirmation prompts", false).option(
+  "-c, --cwd <cwd>",
+  "working directory (defaults to current directory)",
+  process.cwd()
+).action(async (agentArg, opts) => {
+  console.log(
+    `${pc.magenta("\u273F")} ${pc.bold("React Grab")} ${pc.gray(VERSION4)}`
+  );
+  console.log();
+  try {
+    const cwd = opts.cwd;
+    const isNonInteractive = opts.yes;
+    const preflightSpinner = spinner("Preflight checks.").start();
+    const projectInfo = await detectProject(cwd);
+    if (!projectInfo.hasReactGrab) {
+      preflightSpinner.fail("React Grab is not installed.");
+      logger.break();
+      logger.error(
+        `Run ${highlighter.info("react-grab init")} first to install React Grab.`
+      );
+      logger.break();
+      process.exit(1);
+    }
+    if (projectInfo.installedAgents.length === 0) {
+      preflightSpinner.succeed();
+      logger.break();
+      logger.warn("No agent integrations are installed.");
+      logger.break();
+      process.exit(0);
+    }
+    preflightSpinner.succeed();
+    let agentToRemove;
+    if (agentArg) {
+      if (!projectInfo.installedAgents.includes(agentArg)) {
+        logger.break();
+        logger.error(`Agent ${highlighter.info(agentArg)} is not installed.`);
+        logger.log(
+          `Installed agents: ${projectInfo.installedAgents.map((innerAgent) => AGENT_NAMES3[innerAgent] || innerAgent).join(", ")}`
+        );
+        logger.break();
+        process.exit(1);
+      }
+      agentToRemove = agentArg;
+    } else if (!isNonInteractive) {
+      logger.break();
+      const { agent } = await prompts3({
+        type: "select",
+        name: "agent",
+        message: `Which ${highlighter.info("agent integration")} would you like to remove?`,
+        choices: projectInfo.installedAgents.map((innerAgent) => ({
+          title: AGENT_NAMES3[innerAgent] || innerAgent,
+          value: innerAgent
+        }))
+      });
+      if (!agent) {
+        logger.break();
+        process.exit(1);
+      }
+      agentToRemove = agent;
+    } else {
+      logger.break();
+      logger.error("Please specify an agent to remove.");
+      logger.error(
+        "Installed agents: " + projectInfo.installedAgents.join(", ")
+      );
+      logger.break();
+      process.exit(1);
+    }
+    const removingSpinner = spinner(
+      `Preparing to remove ${AGENT_NAMES3[agentToRemove] || agentToRemove}.`
+    ).start();
+    removingSpinner.succeed();
+    const result = previewAgentRemoval(
+      projectInfo.projectRoot,
+      projectInfo.framework,
+      projectInfo.nextRouterType,
+      agentToRemove
+    );
+    const packageJsonResult = previewPackageJsonAgentRemoval(
+      projectInfo.projectRoot,
+      agentToRemove
+    );
+    const hasLayoutChanges = result.success && !result.noChanges && result.originalContent && result.newContent;
+    const hasPackageJsonChanges = packageJsonResult.success && !packageJsonResult.noChanges && packageJsonResult.originalContent && packageJsonResult.newContent;
+    if (hasLayoutChanges || hasPackageJsonChanges) {
+      logger.break();
+      if (hasLayoutChanges) {
+        printDiff(
+          result.filePath,
+          result.originalContent,
+          result.newContent
+        );
+      }
+      if (hasPackageJsonChanges) {
+        if (hasLayoutChanges) {
+          logger.break();
+        }
+        printDiff(
+          packageJsonResult.filePath,
+          packageJsonResult.originalContent,
+          packageJsonResult.newContent
+        );
+      }
+      if (!isNonInteractive) {
+        logger.break();
+        const { proceed } = await prompts3({
+          type: "confirm",
+          name: "proceed",
+          message: "Apply these changes?",
+          initial: true
+        });
+        if (!proceed) {
+          logger.break();
+          logger.log("Changes cancelled.");
+          logger.break();
+          process.exit(0);
+        }
+      }
+    }
+    const packages = getPackagesToUninstall(agentToRemove);
+    if (packages.length > 0) {
+      const uninstallSpinner = spinner(
+        `Removing ${packages.join(", ")}.`
+      ).start();
+      try {
+        uninstallPackages(
+          packages,
+          projectInfo.packageManager,
+          projectInfo.projectRoot
+        );
+        uninstallSpinner.succeed();
+      } catch (error) {
+        uninstallSpinner.fail();
+        handleError(error);
+      }
+    }
+    if (hasLayoutChanges) {
+      const writeSpinner = spinner(
+        `Applying changes to ${result.filePath}.`
+      ).start();
+      const writeResult = applyTransform(result);
+      if (!writeResult.success) {
+        writeSpinner.fail();
+        logger.break();
+        logger.error(writeResult.error || "Failed to write file.");
+        logger.break();
+        process.exit(1);
+      }
+      writeSpinner.succeed();
+    }
+    if (hasPackageJsonChanges) {
+      const packageJsonSpinner = spinner(
+        `Applying changes to ${packageJsonResult.filePath}.`
+      ).start();
+      const packageJsonWriteResult = applyPackageJsonTransform(packageJsonResult);
+      if (!packageJsonWriteResult.success) {
+        packageJsonSpinner.fail();
+        logger.break();
+        logger.error(packageJsonWriteResult.error || "Failed to write file.");
+        logger.break();
+        process.exit(1);
+      }
+      packageJsonSpinner.succeed();
+    }
+    logger.break();
+    logger.log(
+      `${highlighter.success("Success!")} ${AGENT_NAMES3[agentToRemove] || agentToRemove} has been removed.`
+    );
+    logger.break();
+  } catch (error) {
+    handleError(error);
+  }
+});
+var VERSION5 = "0.0.92";
 var DEFAULT_PROXY_PORT = 2e3;
 var REACT_GRAB_SCRIPT = '<script src="https://unpkg.com/react-grab/dist/index.global.js"></script>';
 var buildProviderScript = (provider) => `<script src="https://unpkg.com/${provider}/dist/client.global.js"></script>`;
@@ -2130,13 +3351,13 @@ var start = new Command().name("start").alias("proxy").description("start a prox
   "provider package to run via npx (e.g., @react-grab/cursor)"
 ).action(async (urlArg, opts) => {
   console.log(
-    `${pc.magenta("\u273F")} ${pc.bold("React Grab")} ${pc.gray(VERSION4)}`
+    `${pc.magenta("\u273F")} ${pc.bold("React Grab")} ${pc.gray(VERSION5)}`
   );
   console.log();
   let url = urlArg;
   let provider = opts.provider;
   if (!url) {
-    const { targetUrl: promptedUrl } = await prompts2({
+    const { targetUrl: promptedUrl } = await prompts3({
       type: "text",
       name: "targetUrl",
       message: "Enter the target URL to proxy:",
@@ -2148,7 +3369,7 @@ var start = new Command().name("start").alias("proxy").description("start a prox
     }
     url = promptedUrl;
     if (!provider) {
-      const { selectedProvider } = await prompts2({
+      const { selectedProvider } = await prompts3({
         type: "select",
         name: "selectedProvider",
         message: `Select a ${highlighter.info("provider")} to use:`,
@@ -2315,7 +3536,7 @@ var start = new Command().name("start").alias("proxy").description("start a prox
 
 // src/cli.ts
 process.noDeprecation = true;
-var VERSION5 = "0.0.90";
+var VERSION6 = "0.0.92";
 var VERSION_API_URL = "https://www.react-grab.com/api/version";
 process.on("SIGINT", () => process.exit(0));
 process.on("SIGTERM", () => process.exit(0));
@@ -2324,9 +3545,10 @@ try {
   });
 } catch {
 }
-var program = new Command().name("react-grab").description("add React Grab to your project").version(VERSION5, "-v, --version", "display the version number");
+var program = new Command().name("react-grab").description("add React Grab to your project").version(VERSION6, "-v, --version", "display the version number");
 program.addCommand(init);
 program.addCommand(add);
+program.addCommand(remove);
 program.addCommand(configure);
 program.addCommand(start);
 program.parse();