@react-grab/cli 0.1.36 → 0.1.38

package/dist/cli.js

@@ -1,17 +1,17 @@
 #!/usr/bin/env node
 import { Command } from "commander";
 import pc from "picocolors";
-import fs, { accessSync, constants, existsSync, readFileSync, readdirSync, writeFileSync } from "node:fs";
+import fs, { accessSync, constants, existsSync, readFileSync, readdirSync, rmSync, writeFileSync } from "node:fs";
 import path, { basename, dirname, join, relative, resolve } from "node:path";
 import { detect } from "package-manager-detector/detect";
 import ignore from "ignore";
-import os from "node:os";
-import process$1 from "node:process";
-import * as jsonc from "jsonc-parser";
-import * as TOML from "smol-toml";
+import { fileURLToPath } from "node:url";
+import { add, detectInstalledSkillAgents, getCanonicalSkillsDir, getSkillAgentConfig, getSkillAgentDir, isUniversalSkillAgent } from "agent-install/skill";
 import basePrompts from "prompts";
 import ora from "ora";
 import { x } from "tinyexec";
+import { spawnSync } from "node:child_process";
+import { createHash } from "node:crypto";
 //#region src/utils/is-non-interactive.ts
 const AGENT_ENVIRONMENT_VARIABLES = [
 	"CI",
@@ -40,24 +40,61 @@ const detectPackageManager = async (projectRoot) => {
 	}
 	return "npm";
 };
-const detectFramework = (projectRoot) => {
+const CONFIG_EXTENSIONS = [
+	"ts",
+	"mts",
+	"cts",
+	"js",
+	"mjs",
+	"cjs"
+];
+const hasConfigFile = (projectRoot, configBaseName) => CONFIG_EXTENSIONS.some((extension) => existsSync(join(projectRoot, `${configBaseName}.${extension}`)));
+const readMergedDependencies = (projectRoot) => {
 	const packageJsonPath = join(projectRoot, "package.json");
-	if (!existsSync(packageJsonPath)) return "unknown";
+	if (!existsSync(packageJsonPath)) return null;
 	try {
 		const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
-		const allDependencies = {
+		return {
 			...packageJson.dependencies,
 			...packageJson.devDependencies
 		};
-		if (allDependencies["next"]) return "next";
-		if (allDependencies["@tanstack/react-start"]) return "tanstack";
-		if (allDependencies["vite"]) return "vite";
-		if (allDependencies["webpack"]) return "webpack";
-		return "unknown";
 	} catch {
-		return "unknown";
+		return null;
 	}
 };
+const detectFrameworkFromDependencies = (dependencies) => {
+	if (!dependencies) return "unknown";
+	if (dependencies["next"]) return "next";
+	if (dependencies["@tanstack/react-start"]) return "tanstack";
+	if (dependencies["vite"]) return "vite";
+	if (dependencies["webpack"]) return "webpack";
+	return "unknown";
+};
+const detectFrameworkFromConfigFiles = (projectRoot) => {
+	if (hasConfigFile(projectRoot, "next.config")) return "next";
+	if (hasConfigFile(projectRoot, "app.config")) return "tanstack";
+	if (hasConfigFile(projectRoot, "vite.config")) return "vite";
+	if (hasConfigFile(projectRoot, "webpack.config")) return "webpack";
+	return "unknown";
+};
+const findEnclosingMonorepoRoot = (projectRoot) => {
+	let currentDirectory = dirname(projectRoot);
+	while (currentDirectory !== dirname(currentDirectory)) {
+		if (detectMonorepo(currentDirectory)) return currentDirectory;
+		currentDirectory = dirname(currentDirectory);
+	}
+	return null;
+};
+const detectFramework = (projectRoot) => {
+	const localFramework = detectFrameworkFromDependencies(readMergedDependencies(projectRoot));
+	if (localFramework !== "unknown") return localFramework;
+	return detectFrameworkFromConfigFiles(projectRoot);
+};
+const detectFrameworkFromMonorepoRoot = (projectRoot) => {
+	const monorepoRoot = findEnclosingMonorepoRoot(projectRoot);
+	if (!monorepoRoot) return "unknown";
+	return detectFrameworkFromDependencies(readMergedDependencies(monorepoRoot));
+};
 const detectNextRouterType = (projectRoot) => {
 	const hasAppDir = existsSync(join(projectRoot, "app"));
 	const hasSrcAppDir = existsSync(join(projectRoot, "src", "app"));
@@ -130,18 +167,9 @@ const expandWorkspacePattern = (projectRoot, pattern) => {
 	return results;
 };
 const hasReactDependency = (projectPath) => {
-	const packageJsonPath = join(projectPath, "package.json");
-	if (!existsSync(packageJsonPath)) return false;
-	try {
-		const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
-		const allDeps = {
-			...packageJson.dependencies,
-			...packageJson.devDependencies
-		};
-		return Boolean(allDeps["react"] || allDeps["react-dom"]);
-	} catch {
-		return false;
-	}
+	const dependencies = readMergedDependencies(projectPath);
+	if (!dependencies) return false;
+	return Boolean(dependencies["react"] || dependencies["react-dom"]);
 };
 const buildReactProject = (projectPath) => {
 	const framework = detectFramework(projectPath);
@@ -243,14 +271,7 @@ const hasReactGrabInFile = (filePath) => {
 	}
 };
 const detectReactGrab = (projectRoot) => {
-	const packageJsonPath = join(projectRoot, "package.json");
-	if (existsSync(packageJsonPath)) try {
-		const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
-		if ({
-			...packageJson.dependencies,
-			...packageJson.devDependencies
-		}["react-grab"]) return true;
-	} catch {}
+	if (readMergedDependencies(projectRoot)?.["react-grab"]) return true;
 	return [
 		join(projectRoot, "app", "layout.tsx"),
 		join(projectRoot, "app", "layout.jsx"),
@@ -275,22 +296,13 @@ const detectReactGrab = (projectRoot) => {
 	].some(hasReactGrabInFile);
 };
 const detectUnsupportedFramework = (projectRoot) => {
-	const packageJsonPath = join(projectRoot, "package.json");
-	if (!existsSync(packageJsonPath)) return null;
-	try {
-		const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
-		const allDependencies = {
-			...packageJson.dependencies,
-			...packageJson.devDependencies
-		};
-		if (allDependencies["@remix-run/react"] || allDependencies["remix"]) return "remix";
-		if (allDependencies["astro"]) return "astro";
-		if (allDependencies["@sveltejs/kit"]) return "sveltekit";
-		if (allDependencies["gatsby"]) return "gatsby";
-		return null;
-	} catch {
-		return null;
-	}
+	const dependencies = readMergedDependencies(projectRoot);
+	if (!dependencies) return null;
+	if (dependencies["@remix-run/react"] || dependencies["remix"]) return "remix";
+	if (dependencies["astro"]) return "astro";
+	if (dependencies["@sveltejs/kit"]) return "sveltekit";
+	if (dependencies["gatsby"]) return "gatsby";
+	return null;
 };
 const detectReactGrabVersion = (projectRoot) => {
 	const installedPackageJsonPath = join(projectRoot, "node_modules", "react-grab", "package.json");
@@ -300,7 +312,8 @@ const detectReactGrabVersion = (projectRoot) => {
 	return null;
 };
 const detectProject = async (projectRoot = process.cwd()) => {
-	const framework = detectFramework(projectRoot);
+	const localFramework = detectFramework(projectRoot);
+	const framework = localFramework === "unknown" ? detectFrameworkFromMonorepoRoot(projectRoot) : localFramework;
 	return {
 		packageManager: await detectPackageManager(projectRoot),
 		framework,
@@ -366,204 +379,60 @@ const prompts = (questions) => {
 //#region src/utils/spinner.ts
 const spinner = (text) => ora({ text });
 //#endregion
-//#region src/utils/install-mcp.ts
-const SERVER_NAME = "react-grab-mcp";
-const PACKAGE_NAME = "@react-grab/mcp";
-const getXdgConfigHome = () => process$1.env.XDG_CONFIG_HOME || path.join(os.homedir(), ".config");
-const getBaseDir = () => {
-	const homeDir = os.homedir();
-	if (process$1.platform === "win32") return process$1.env.APPDATA || path.join(homeDir, "AppData", "Roaming");
-	if (process$1.platform === "darwin") return path.join(homeDir, "Library", "Application Support");
-	return getXdgConfigHome();
-};
-const getZedConfigPath = () => {
-	if (process$1.platform === "win32") return path.join(getBaseDir(), "Zed", "settings.json");
-	return path.join(os.homedir(), ".config", "zed", "settings.json");
-};
-const getOpenCodeConfigPath = () => {
-	const configDir = path.join(getXdgConfigHome(), "opencode");
-	const jsoncPath = path.join(configDir, "opencode.jsonc");
-	const jsonPath = path.join(configDir, "opencode.json");
-	if (fs.existsSync(jsoncPath)) return jsoncPath;
-	if (fs.existsSync(jsonPath)) return jsonPath;
-	return jsoncPath;
-};
-const getClients = () => {
-	const homeDir = os.homedir();
-	const baseDir = getBaseDir();
-	const stdioConfig = {
-		command: "npx",
-		args: [
-			"-y",
-			PACKAGE_NAME,
-			"--stdio"
-		]
-	};
-	return [
-		{
-			name: "Claude Code",
-			configPath: path.join(homeDir, ".claude.json"),
-			configKey: "mcpServers",
-			format: "json",
-			serverConfig: stdioConfig
-		},
-		{
-			name: "Codex",
-			configPath: path.join(process$1.env.CODEX_HOME || path.join(homeDir, ".codex"), "config.toml"),
-			configKey: "mcp_servers",
-			format: "toml",
-			serverConfig: stdioConfig
-		},
-		{
-			name: "Cursor",
-			configPath: path.join(homeDir, ".cursor", "mcp.json"),
-			configKey: "mcpServers",
-			format: "json",
-			serverConfig: stdioConfig
-		},
-		{
-			name: "OpenCode",
-			configPath: getOpenCodeConfigPath(),
-			configKey: "mcp",
-			format: "json",
-			serverConfig: {
-				type: "local",
-				command: [
-					"npx",
-					"-y",
-					PACKAGE_NAME,
-					"--stdio"
-				]
-			}
-		},
-		{
-			name: "VS Code",
-			configPath: path.join(baseDir, "Code", "User", "mcp.json"),
-			configKey: "servers",
-			format: "json",
-			serverConfig: {
-				type: "stdio",
-				...stdioConfig
-			}
-		},
-		{
-			name: "Amp",
-			configPath: path.join(homeDir, ".config", "amp", "settings.json"),
-			configKey: "amp.mcpServers",
-			format: "json",
-			serverConfig: stdioConfig
-		},
-		{
-			name: "Droid",
-			configPath: path.join(homeDir, ".factory", "mcp.json"),
-			configKey: "mcpServers",
-			format: "json",
-			serverConfig: {
-				type: "stdio",
-				...stdioConfig
-			}
-		},
-		{
-			name: "Windsurf",
-			configPath: path.join(homeDir, ".codeium", "windsurf", "mcp_config.json"),
-			configKey: "mcpServers",
-			format: "json",
-			serverConfig: stdioConfig
-		},
-		{
-			name: "Zed",
-			configPath: getZedConfigPath(),
-			configKey: "context_servers",
-			format: "json",
-			serverConfig: {
-				source: "custom",
-				...stdioConfig,
-				env: {}
-			}
-		}
-	];
-};
-const ensureDirectory = (filePath) => {
-	const directory = path.dirname(filePath);
-	if (!fs.existsSync(directory)) fs.mkdirSync(directory, { recursive: true });
-};
-const JSONC_FORMAT_OPTIONS = {
-	tabSize: 2,
-	insertSpaces: true
-};
-const upsertIntoJsonc = (filePath, content, configKey, serverName, serverConfig) => {
-	const edits = jsonc.modify(content, [configKey, serverName], serverConfig, { formattingOptions: JSONC_FORMAT_OPTIONS });
-	fs.writeFileSync(filePath, jsonc.applyEdits(content, edits));
-};
-const installJsonClient = (client) => {
-	ensureDirectory(client.configPath);
-	const content = fs.existsSync(client.configPath) ? fs.readFileSync(client.configPath, "utf8") : "{}";
-	upsertIntoJsonc(client.configPath, content, client.configKey, SERVER_NAME, client.serverConfig);
-};
-const installTomlClient = (client) => {
-	ensureDirectory(client.configPath);
-	const existingConfig = fs.existsSync(client.configPath) ? TOML.parse(fs.readFileSync(client.configPath, "utf8")) : {};
-	const serverSection = existingConfig[client.configKey] ?? {};
-	serverSection[SERVER_NAME] = client.serverConfig;
-	existingConfig[client.configKey] = serverSection;
-	fs.writeFileSync(client.configPath, TOML.stringify(existingConfig));
-};
-const getMcpClientNames = () => getClients().map((client) => client.name);
-const installMcpServers = (selectedClients) => {
-	const allClients = getClients();
-	const clients = selectedClients ? allClients.filter((client) => selectedClients.includes(client.name)) : allClients;
-	const results = [];
-	const installSpinner = spinner("Installing MCP server.").start();
-	for (const client of clients) try {
-		if (client.format === "toml") installTomlClient(client);
-		else installJsonClient(client);
-		results.push({
-			client: client.name,
-			configPath: client.configPath,
-			success: true
-		});
-	} catch (error) {
-		const message = error instanceof Error ? error.message : String(error);
-		results.push({
-			client: client.name,
-			configPath: client.configPath,
-			success: false,
-			error: message
+//#region src/utils/install-skill.ts
+const SKILL_NAME = "react-grab";
+const SKILL_SOURCE = fileURLToPath(new URL("../skills/react-grab", import.meta.url));
+const agentLabel = (agent) => getSkillAgentConfig(agent).displayName;
+const installedSkillDir = (agent) => join(isUniversalSkillAgent(agent) ? getCanonicalSkillsDir(true) : getSkillAgentDir(agent, { global: true }), SKILL_NAME);
+const promptSkillInstall = async ({ yes = false } = {}) => {
+	const agents = await detectInstalledSkillAgents();
+	if (agents.length === 0) {
+		logger.warn("No supported agents detected.");
+		return false;
+	}
+	if (!yes) {
+		const { confirmed } = await prompts({
+			type: "confirm",
+			name: "confirmed",
+			message: `Install the React Grab skill for ${highlighter.info(agents.map(agentLabel).join(", "))}?`,
+			initial: true
 		});
+		if (!confirmed) return false;
 	}
-	const successCount = results.filter((result) => result.success).length;
-	if (successCount < results.length) installSpinner.warn(`Installed to ${successCount}/${results.length} agents.`);
-	else installSpinner.succeed(`Installed to ${successCount} agents.`);
-	for (const result of results) if (result.success) logger.log(`  ${highlighter.success("✓")} ${result.client} ${highlighter.dim("→")} ${highlighter.dim(result.configPath)}`);
-	else logger.log(`  ${highlighter.error("✗")} ${result.client} ${highlighter.dim("→")} ${result.error}`);
-	return results;
+	const installSpinner = spinner("Installing React Grab skill.").start();
+	const { installed, failed } = await add({
+		source: SKILL_SOURCE,
+		agents,
+		global: true,
+		mode: "copy"
+	});
+	if (installed.length === 0) {
+		installSpinner.fail("Failed to install React Grab skill.");
+		return false;
+	}
+	installSpinner.succeed(`Installed React Grab skill for ${installed.map((record) => agentLabel(record.agent)).join(", ")}.`);
+	for (const record of failed) logger.log(`  ${highlighter.error("✗")} ${agentLabel(record.agent)} ${record.error}`);
+	return true;
 };
-const promptMcpInstall = async () => {
-	const { selectedAgents } = await prompts({
-		type: "multiselect",
-		name: "selectedAgents",
-		message: "Select agents to install MCP server for:",
-		choices: getMcpClientNames().map((name) => ({
-			title: name,
-			value: name,
-			selected: true
-		}))
+const removeSkill = async () => {
+	const agentsWithSkill = (await detectInstalledSkillAgents()).filter((agent) => existsSync(installedSkillDir(agent)));
+	for (const skillDir of new Set(agentsWithSkill.map(installedSkillDir))) rmSync(skillDir, {
+		recursive: true,
+		force: true
 	});
-	if (selectedAgents === void 0 || selectedAgents.length === 0) return false;
-	logger.break();
-	return installMcpServers(selectedAgents).some((result) => result.success);
+	for (const agent of agentsWithSkill) logger.log(`  ${highlighter.success("✓")} ${agentLabel(agent)}`);
+	return agentsWithSkill.length;
 };
 //#endregion
 //#region src/commands/add.ts
-const VERSION$5 = "0.1.36";
-const add = new Command().name("add").alias("install").description("connect React Grab to your agent via MCP").argument("[agent]", "agent to connect (mcp)").option("-y, --yes", "skip confirmation prompts", false).option("-c, --cwd <cwd>", "working directory (defaults to current directory)", process.cwd()).action(async (agentArg, opts) => {
+const VERSION$5 = "0.1.38";
+const add$1 = new Command().name("add").alias("install").description("install the React Grab skill for your agent").option("-y, --yes", "skip confirmation prompts", false).option("-c, --cwd <cwd>", "working directory (defaults to current directory)", process.cwd()).action(async (opts) => {
 	console.log(`${pc.magenta("✿")} ${pc.bold("React Grab")} ${pc.gray(VERSION$5)}`);
 	console.log();
 	try {
-		const cwd = opts.cwd;
 		const isNonInteractive = detectNonInteractive(opts.yes);
 		const preflightSpinner = spinner("Preflight checks.").start();
-		if (!(await detectProject(cwd)).hasReactGrab) {
+		if (!(await detectProject(opts.cwd)).hasReactGrab) {
 			preflightSpinner.fail("React Grab is not installed.");
 			logger.break();
 			logger.error(`Run ${highlighter.info("react-grab init")} first to install React Grab.`);
@@ -571,39 +440,12 @@ const add = new Command().name("add").alias("install").description("connect Reac
 			process.exit(1);
 		}
 		preflightSpinner.succeed();
-		if (agentArg && agentArg !== "mcp") {
-			logger.break();
-			logger.warn(`Legacy agent packages are deprecated. Use ${highlighter.info("mcp")} instead.`);
-			logger.log(`Run ${highlighter.info("grab add mcp")} to install the MCP server.`);
+		logger.break();
+		if (!await promptSkillInstall({ yes: isNonInteractive }) && isNonInteractive) {
 			logger.break();
 			process.exit(1);
 		}
-		if (agentArg === "mcp" || isNonInteractive) {
-			if (isNonInteractive) {
-				if (!installMcpServers().some((result) => result.success)) {
-					logger.break();
-					logger.error("Failed to install MCP server.");
-					logger.break();
-					process.exit(1);
-				}
-			} else if (!await promptMcpInstall()) {
-				logger.break();
-				process.exit(0);
-			}
-			logger.break();
-			logger.log(`${highlighter.success("Success!")} MCP server has been configured.`);
-			logger.log("Restart your agents to activate.");
-			logger.break();
-		} else {
-			if (!await promptMcpInstall()) {
-				logger.break();
-				process.exit(0);
-			}
-			logger.break();
-			logger.log(`${highlighter.success("Success!")} MCP server has been configured.`);
-			logger.log("Restart your agents to activate.");
-			logger.break();
-		}
+		logger.break();
 	} catch (error) {
 		handleError(error);
 	}
@@ -1185,7 +1027,7 @@ const formatActivationKeyDisplay = (activationKey) => {
 };
 //#endregion
 //#region src/commands/configure.ts
-const VERSION$4 = "0.1.36";
+const VERSION$4 = "0.1.38";
 const isMac = process.platform === "darwin";
 const META_LABEL = isMac ? "Cmd" : "Win";
 const ALT_LABEL = isMac ? "Option" : "Alt";
@@ -1804,7 +1646,7 @@ const installPackagesWithFeedback = async (packages, packageManager, projectRoot
 };
 //#endregion
 //#region src/commands/init.ts
-const VERSION$3 = "0.1.36";
+const VERSION$3 = "0.1.38";
 const REPORT_URL = "https://react-grab.com/api/report-cli";
 const DOCS_URL = "https://github.com/aidenybai/react-grab";
 const reportToCli = (type, config, error) => {
@@ -2020,25 +1862,7 @@ const init = new Command().name("init").alias("setup").description("initialize R
 				}
 			}
 			logger.break();
-			const { wantAddMcp } = await prompts({
-				type: "confirm",
-				name: "wantAddMcp",
-				message: `Would you like to ${highlighter.info("connect it to your agent via MCP")}?`,
-				initial: false
-			});
-			if (wantAddMcp === void 0) {
-				logger.break();
-				process.exit(1);
-			}
-			if (wantAddMcp) {
-				if (!await promptMcpInstall()) {
-					logger.break();
-					process.exit(0);
-				}
-				logger.break();
-				logger.success("MCP server has been configured.");
-				logger.log("Restart your agents to activate.");
-			}
+			await promptSkillInstall({ yes: isNonInteractive });
 			logger.break();
 			process.exit(0);
 		}
@@ -2090,7 +1914,16 @@ const init = new Command().name("init").alias("setup").description("initialize R
 				process.chdir(selectedProject);
 				const newProjectInfo = await detectProject(selectedProject);
 				Object.assign(projectInfo, newProjectInfo);
-				spinner("Verifying framework.").start().succeed(`Verifying framework. Found ${highlighter.info(FRAMEWORK_NAMES[newProjectInfo.framework])}.`);
+				const newFrameworkSpinner = spinner("Verifying framework.").start();
+				if (newProjectInfo.framework === "unknown") {
+					newFrameworkSpinner.fail("Could not detect a supported framework in this project.");
+					logger.break();
+					logger.log("React Grab supports Next.js, Vite, TanStack Start, and Webpack projects.");
+					logger.log(`Visit ${highlighter.info(DOCS_URL)} for manual setup.`);
+					logger.break();
+					process.exit(1);
+				}
+				newFrameworkSpinner.succeed(`Verifying framework. Found ${highlighter.info(FRAMEWORK_NAMES[newProjectInfo.framework])}.`);
 			} else {
 				frameworkSpinner.fail("Could not detect a supported framework.");
 				logger.break();
@@ -2105,30 +1938,10 @@ const init = new Command().name("init").alias("setup").description("initialize R
 		const finalFramework = projectInfo.framework;
 		const finalPackageManager = projectInfo.packageManager;
 		const finalNextRouterType = projectInfo.nextRouterType;
-		let didInstallMcp = false;
+		let didInstallSkill = false;
 		if (!isNonInteractive) {
 			logger.break();
-			const { wantAddMcp } = await prompts({
-				type: "confirm",
-				name: "wantAddMcp",
-				message: `Would you like to ${highlighter.info("connect it to your agent via MCP")}?`,
-				initial: false
-			});
-			if (wantAddMcp === void 0) {
-				logger.break();
-				process.exit(1);
-			}
-			if (wantAddMcp) {
-				didInstallMcp = Boolean(await promptMcpInstall());
-				if (!didInstallMcp) {
-					logger.break();
-					process.exit(0);
-				}
-				logger.break();
-				logger.success("MCP server has been configured.");
-				logger.log("Continuing with React Grab installation...");
-				logger.break();
-			}
+			didInstallSkill = await promptSkillInstall({ yes: isNonInteractive });
 		}
 		const result = previewTransform(projectInfo.projectRoot, finalFramework, finalNextRouterType, false, opts.force);
 		if (!result.success) {
@@ -2172,7 +1985,7 @@ const init = new Command().name("init").alias("setup").description("initialize R
 			framework: finalFramework,
 			packageManager: finalPackageManager,
 			router: finalNextRouterType,
-			agent: didInstallMcp ? "mcp" : void 0,
+			agent: didInstallSkill ? "skill" : void 0,
 			isMonorepo: projectInfo.isMonorepo
 		});
 	} catch (error) {
@@ -2182,29 +1995,16 @@ const init = new Command().name("init").alias("setup").description("initialize R
 });
 //#endregion
 //#region src/commands/remove.ts
-const VERSION$2 = "0.1.36";
-const remove = new Command().name("remove").description("disconnect React Grab from your agent").argument("[agent]", "agent to disconnect (mcp)").option("-y, --yes", "skip confirmation prompts", false).option("-c, --cwd <cwd>", "working directory (defaults to current directory)", process.cwd()).action(async (agentArg, opts) => {
+const VERSION$2 = "0.1.38";
+const remove = new Command().name("remove").description("uninstall the React Grab skill from your agent").action(async () => {
 	console.log(`${pc.magenta("✿")} ${pc.bold("React Grab")} ${pc.gray(VERSION$2)}`);
 	console.log();
 	try {
-		const cwd = opts.cwd;
-		const preflightSpinner = spinner("Preflight checks.").start();
-		if (!(await detectProject(cwd)).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);
-		}
-		preflightSpinner.succeed();
-		if (agentArg && agentArg !== "mcp") {
-			logger.break();
-			logger.warn(`Legacy agent packages are deprecated. Uninstall ${highlighter.info(`@react-grab/${agentArg}`)} manually with your package manager.`);
-			logger.break();
-			process.exit(0);
-		}
 		logger.break();
-		logger.warn("To remove the MCP server, delete the react-grab-mcp entry from your agent's MCP config file.");
+		const removedCount = await removeSkill();
+		logger.break();
+		if (removedCount === 0) logger.log("React Grab skill is not installed in any detected agent.");
+		else logger.log(`${highlighter.success("Removed")} the React Grab skill from ${removedCount} agent${removedCount === 1 ? "" : "s"}.`);
 		logger.break();
 	} catch (error) {
 		handleError(error);
@@ -2212,7 +2012,7 @@ const remove = new Command().name("remove").description("disconnect React Grab f
 });
 //#endregion
 //#region src/commands/upgrade.ts
-const VERSION$1 = "0.1.36";
+const VERSION$1 = "0.1.38";
 const NPM_REGISTRY_URL = "https://registry.npmjs.org/react-grab/latest";
 const fetchLatestVersion = async () => {
 	try {
@@ -2286,8 +2086,368 @@ const upgrade = new Command().name("upgrade").alias("update").description("upgra
 	}
 });
 //#endregion
+//#region src/utils/clipboard.ts
+const READ_TIMEOUT_MS = 2500;
+const MAX_CLIPBOARD_BYTES = 64 * 1024 * 1024;
+const ID_RADIX = 36;
+const HASH_LENGTH = 12;
+const PICKLE_HEADER_BYTES = 4;
+const PICKLE_ALIGN_BYTES = 4;
+const SIGNATURE_SCAN_CHARS = 32 * 1024;
+const GRAB_MIME = "application/x-react-grab";
+const CHROMIUM_CUSTOM_FORMAT = "chromium/x-web-custom-data";
+const GRAB_TEXT_SIGNATURE = /\bin\s+\S+\s+\(at\s+[^\n]{1,400}?:\d+:\d+\)/;
+const sleep = (durationMs) => new Promise((resolve) => setTimeout(resolve, durationMs));
+const shortHash = (text) => createHash("sha1").update(text).digest("hex").slice(0, HASH_LENGTH);
+const alignUp = (value) => value + PICKLE_ALIGN_BYTES - 1 & ~(PICKLE_ALIGN_BYTES - 1);
+const parseChromiumPickle = (buffer) => {
+	const formats = {};
+	if (!buffer || buffer.length < PICKLE_HEADER_BYTES + 4) return formats;
+	let offset = PICKLE_HEADER_BYTES;
+	const pairCount = buffer.readUInt32LE(offset);
+	offset += 4;
+	for (let pairIndex = 0; pairIndex < pairCount; pairIndex += 1) {
+		if (offset + 4 > buffer.length) break;
+		const formatCodeUnits = buffer.readUInt32LE(offset);
+		offset += 4;
+		if (offset + formatCodeUnits * 2 > buffer.length) break;
+		const format = buffer.toString("utf16le", offset, offset + formatCodeUnits * 2);
+		offset = alignUp(offset + formatCodeUnits * 2);
+		if (offset + 4 > buffer.length) break;
+		const dataCodeUnits = buffer.readUInt32LE(offset);
+		offset += 4;
+		if (offset + dataCodeUnits * 2 > buffer.length) break;
+		const value = buffer.toString("utf16le", offset, offset + dataCodeUnits * 2);
+		offset = alignUp(offset + dataCodeUnits * 2);
+		formats[format] = value;
+	}
+	return formats;
+};
+const extractGrab = (raw) => {
+	if (raw.grab) return raw.grab;
+	if (raw.pickleBase64) return parseChromiumPickle(Buffer.from(raw.pickleBase64, "base64"))[GRAB_MIME];
+};
+const isGrabText = (text) => GRAB_TEXT_SIGNATURE.test(text.length > SIGNATURE_SCAN_CHARS ? text.slice(0, SIGNATURE_SCAN_CHARS) : text);
+const extractPrompt = (record) => {
+	const comments = (Array.isArray(record.entries) ? record.entries : []).map((entry) => entry?.commentText?.trim?.()).filter(Boolean);
+	if (comments.length > 0) return comments.join("\n");
+	const lines = (typeof record.content === "string" ? record.content : "").split("\n");
+	const firstReferenceLine = lines.findIndex((line) => line.startsWith("["));
+	if (firstReferenceLine <= 0) return void 0;
+	return lines.slice(0, firstReferenceLine).join("\n").trim() || void 0;
+};
+const hasCommand = (name) => {
+	return spawnSync(process.platform === "win32" ? "where" : "which", [name], { stdio: "ignore" }).status === 0;
+};
+const runText = (command, args) => {
+	const output = spawnSync(command, args, {
+		encoding: "utf8",
+		maxBuffer: MAX_CLIPBOARD_BYTES,
+		timeout: READ_TIMEOUT_MS
+	});
+	return output.status === 0 ? output.stdout : null;
+};
+const runBuffer = (command, args) => {
+	const output = spawnSync(command, args, {
+		maxBuffer: MAX_CLIPBOARD_BYTES,
+		timeout: READ_TIMEOUT_MS
+	});
+	return output.status === 0 && output.stdout?.length ? output.stdout : null;
+};
+const runJson = (command, args) => {
+	const output = spawnSync(command, args, {
+		encoding: "utf8",
+		maxBuffer: MAX_CLIPBOARD_BYTES,
+		timeout: READ_TIMEOUT_MS
+	});
+	if (output.status !== 0 || !output.stdout) return null;
+	try {
+		return JSON.parse(output.stdout);
+	} catch {
+		return null;
+	}
+};
+const compileSwiftReader = (readersDir, workDir) => {
+	if (!hasCommand("swiftc")) return null;
+	const source = path.join(readersDir, "read-clipboard.swift");
+	if (!fs.existsSync(source)) return null;
+	const binary = path.join(workDir, "pbread");
+	if ((!fs.existsSync(binary) || fs.statSync(source).mtimeMs > fs.statSync(binary).mtimeMs) && spawnSync("swiftc", [
+		"-O",
+		source,
+		"-o",
+		binary
+	]).status !== 0) return null;
+	return binary;
+};
+const createDarwinReader = (options) => {
+	const binary = options.textOnly ? null : compileSwiftReader(options.readersDir, options.workDir);
+	if (binary) return {
+		mode: "darwin-native",
+		read: () => {
+			const raw = runJson(binary, []);
+			if (!raw) return null;
+			return {
+				changeCount: raw.changeCount ?? null,
+				text: raw.text,
+				grab: extractGrab(raw)
+			};
+		}
+	};
+	if (!hasCommand("pbpaste")) return null;
+	return {
+		mode: "darwin-text",
+		read: () => {
+			const text = runText("pbpaste", []);
+			return text == null ? null : {
+				changeCount: null,
+				text,
+				grab: void 0
+			};
+		}
+	};
+};
+const detectLinuxTool = () => {
+	if (Boolean(process.env.WAYLAND_DISPLAY) && hasCommand("wl-paste") || hasCommand("wl-paste") && !hasCommand("xclip")) return {
+		name: "wl-paste",
+		readText: () => runText("wl-paste", [
+			"-n",
+			"-t",
+			"text/plain"
+		]) ?? runText("wl-paste", ["-n"]),
+		readCustom: () => runBuffer("wl-paste", [
+			"-n",
+			"-t",
+			CHROMIUM_CUSTOM_FORMAT
+		])
+	};
+	if (hasCommand("xclip")) return {
+		name: "xclip",
+		readText: () => runText("xclip", [
+			"-selection",
+			"clipboard",
+			"-o"
+		]),
+		readCustom: () => runBuffer("xclip", [
+			"-selection",
+			"clipboard",
+			"-t",
+			CHROMIUM_CUSTOM_FORMAT,
+			"-o"
+		])
+	};
+	if (hasCommand("xsel")) return {
+		name: "xsel",
+		readText: () => runText("xsel", ["--clipboard", "--output"]),
+		readCustom: null
+	};
+	return null;
+};
+const createLinuxReader = (options) => {
+	const tool = detectLinuxTool();
+	if (!tool) return null;
+	const useCustom = !options.textOnly && Boolean(tool.readCustom);
+	return {
+		mode: useCustom ? `linux-${tool.name}` : `linux-${tool.name}-text`,
+		read: () => {
+			const text = tool.readText();
+			if (text == null) return null;
+			return {
+				changeCount: null,
+				text,
+				grab: useCustom && tool.readCustom ? parseChromiumPickle(tool.readCustom())[GRAB_MIME] : void 0
+			};
+		}
+	};
+};
+const detectPowershell = () => hasCommand("pwsh") ? "pwsh" : hasCommand("powershell") ? "powershell" : null;
+const createWindowsReader = (options) => {
+	const shell = detectPowershell();
+	if (!shell) return null;
+	const scriptPath = path.join(options.readersDir, "read-clipboard.ps1");
+	if (options.textOnly || !fs.existsSync(scriptPath)) return {
+		mode: "win-text",
+		read: () => {
+			const text = runText(shell, [
+				"-NoProfile",
+				"-Command",
+				"Get-Clipboard -Raw"
+			]);
+			return text == null ? null : {
+				changeCount: null,
+				text,
+				grab: void 0
+			};
+		}
+	};
+	const args = [
+		"-NoProfile",
+		"-ExecutionPolicy",
+		"Bypass",
+		"-File",
+		scriptPath
+	];
+	spawnSync(shell, args, {
+		stdio: "ignore",
+		maxBuffer: MAX_CLIPBOARD_BYTES
+	});
+	return {
+		mode: "win-native",
+		read: () => {
+			const raw = runJson(shell, args);
+			if (!raw) return null;
+			return {
+				changeCount: raw.changeCount ?? null,
+				text: raw.text ?? void 0,
+				grab: extractGrab(raw)
+			};
+		}
+	};
+};
+const createReader = (options) => {
+	if (process.platform === "darwin") return createDarwinReader(options);
+	if (process.platform === "linux") return createLinuxReader(options);
+	if (process.platform === "win32") return createWindowsReader(options);
+	return null;
+};
+const ensureSafeDir = (dir) => {
+	let stats;
+	try {
+		stats = fs.lstatSync(dir);
+	} catch {
+		return;
+	}
+	if (stats.isSymbolicLink()) throw new Error(`Refusing to use ${dir}: it is a symlink.`);
+	if (process.getuid && stats.uid !== process.getuid()) throw new Error(`Refusing to use ${dir}: owned by another user.`);
+};
+const prepareWorkDir = (dir) => {
+	ensureSafeDir(dir);
+	fs.mkdirSync(dir, {
+		recursive: true,
+		mode: 448
+	});
+	const gitignore = path.join(dir, ".gitignore");
+	if (!fs.existsSync(gitignore)) fs.writeFileSync(gitignore, "*\n");
+};
+const watchForNextGrab = async (options) => {
+	const { reader, dir, intervalMs, replayLast, onWarn, signal } = options;
+	const logPath = path.join(dir, "history.jsonl");
+	const { read } = reader;
+	let lastChangeCount = null;
+	let lastTimestamp = 0;
+	let lastTextHash = "";
+	let lastErrorMessage = "";
+	let sequence = 0;
+	const initial = read();
+	if (initial && !replayLast) {
+		lastChangeCount = initial.changeCount;
+		if (initial.text) lastTextHash = shortHash(initial.text);
+		if (initial.grab) try {
+			lastTimestamp = JSON.parse(initial.grab).timestamp ?? 0;
+		} catch {}
+	}
+	while (!signal?.aborted) {
+		await sleep(intervalMs);
+		if (signal?.aborted) return null;
+		try {
+			const snapshot = read();
+			if (!snapshot) continue;
+			if (snapshot.changeCount !== null && snapshot.changeCount === lastChangeCount) continue;
+			const textHash = snapshot.text ? shortHash(snapshot.text) : "";
+			const didTextChange = textHash !== lastTextHash;
+			let record = null;
+			let nextTimestamp = lastTimestamp;
+			if (snapshot.grab) {
+				let parsed = null;
+				try {
+					parsed = JSON.parse(snapshot.grab);
+				} catch {}
+				if (parsed && typeof parsed.timestamp === "number" && parsed.timestamp > lastTimestamp) {
+					nextTimestamp = parsed.timestamp;
+					record = {
+						source: "custom",
+						timestamp: parsed.timestamp,
+						version: typeof parsed.version === "string" ? parsed.version : void 0,
+						content: typeof parsed.content === "string" ? parsed.content : "",
+						entries: Array.isArray(parsed.entries) ? parsed.entries : []
+					};
+				}
+			} else if (didTextChange && snapshot.text && isGrabText(snapshot.text)) record = {
+				source: "text",
+				timestamp: Date.now(),
+				content: snapshot.text,
+				entries: []
+			};
+			if (!record) {
+				lastChangeCount = snapshot.changeCount;
+				lastTextHash = textHash;
+				continue;
+			}
+			const prompt = extractPrompt(record);
+			if (prompt) record.prompt = prompt;
+			const captured = {
+				id: `${record.timestamp}-${(sequence += 1).toString(ID_RADIX)}`,
+				receivedAt: Date.now(),
+				...record
+			};
+			fs.appendFileSync(logPath, `${JSON.stringify(captured)}\n`);
+			lastChangeCount = snapshot.changeCount;
+			lastTextHash = textHash;
+			lastTimestamp = nextTimestamp;
+			return captured;
+		} catch (error) {
+			const message = String(error?.message ?? error);
+			if (message !== lastErrorMessage) {
+				lastErrorMessage = message;
+				onWarn?.(message);
+			}
+		}
+	}
+	return null;
+};
+//#endregion
+//#region src/commands/watch.ts
+const DEFAULT_INTERVAL_MS = 800;
+const DEFAULT_DIR = ".react-grab";
+const readersDir = () => path.dirname(fileURLToPath(import.meta.url));
+const watch = new Command().name("watch").description("watch the clipboard for the next React Grab selection, print it, then exit").option("-d, --dir <dir>", "work dir for history.jsonl + cursor.txt", DEFAULT_DIR).option("-i, --interval <ms>", "clipboard poll interval in ms", String(DEFAULT_INTERVAL_MS)).option("--text-only", "skip the native reader and use the plain-text fallback").option("--replay-last", "also capture the grab already on the clipboard at startup").action((options) => {
+	const dir = path.resolve(options.dir);
+	const intervalMs = Number(options.interval);
+	const textOnly = Boolean(options.textOnly);
+	try {
+		prepareWorkDir(dir);
+	} catch (error) {
+		process.stderr.write(`react-grab watch: ${String(error?.message ?? error)}\n`);
+		process.exit(1);
+	}
+	const reader = createReader({
+		textOnly,
+		readersDir: readersDir(),
+		workDir: dir
+	});
+	if (!reader) {
+		process.stderr.write("react-grab watch: no clipboard reader available. Linux: install xclip or wl-clipboard. macOS: install Xcode CLI tools (swiftc) or rely on pbpaste. Windows: ensure PowerShell is on PATH.\n");
+		process.exit(1);
+	}
+	process.stderr.write(`react-grab watch: watching clipboard via ${reader.mode}; history → ${path.join(dir, "history.jsonl")} (Ctrl+C to stop)\n`);
+	watchForNextGrab({
+		reader,
+		dir,
+		intervalMs: Number.isFinite(intervalMs) && intervalMs > 0 ? intervalMs : DEFAULT_INTERVAL_MS,
+		replayLast: Boolean(options.replayLast),
+		onWarn: (message) => process.stderr.write(`react-grab watch: ${message}\n`)
+	}).then((grab) => {
+		if (!grab) process.exit(0);
+		process.stdout.write(`${JSON.stringify(grab)}\n`);
+		process.exit(0);
+	}).catch((error) => {
+		process.stderr.write(`react-grab watch: ${String(error?.message ?? error)}\n`);
+		process.exit(1);
+	});
+});
+//#endregion
 //#region src/cli.ts
-const VERSION = "0.1.36";
+const VERSION = "0.1.38";
 const VERSION_API_URL = "https://www.react-grab.com/api/version";
 process.on("SIGINT", () => process.exit(0));
 process.on("SIGTERM", () => process.exit(0));
@@ -2296,10 +2456,11 @@ try {
 } catch {}
 const program = new Command().name("grab").description("add React Grab to your project").version(VERSION, "-v, --version", "display the version number");
 program.addCommand(init);
-program.addCommand(add);
+program.addCommand(add$1);
 program.addCommand(remove);
 program.addCommand(configure);
 program.addCommand(upgrade);
+program.addCommand(watch);
 const main = async () => {
 	await program.parseAsync();
 };