@react-grab/cli 0.1.39 → 0.1.41

package/dist/cli.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 import { Command } from "commander";
+import path, { basename, delimiter, dirname, join, relative, resolve } from "node:path";
 import pc from "picocolors";
 import fs, { accessSync, constants, existsSync, readFileSync, readdirSync, rmSync, statSync, writeFileSync } from "node:fs";
-import path, { basename, delimiter, dirname, join, relative, resolve } from "node:path";
 import { detect } from "package-manager-detector/detect";
 import ignore from "ignore";
 import { fileURLToPath } from "node:url";
@@ -10,7 +10,7 @@ import { add, detectInstalledSkillAgents, getCanonicalSkillsDir, getSkillAgentCo
 import basePrompts from "prompts";
 import ora from "ora";
 import { x } from "tinyexec";
-import { spawnSync } from "node:child_process";
+import { spawn, spawnSync } from "node:child_process";
 import { createHash } from "node:crypto";
 //#region src/utils/is-non-interactive.ts
 const AGENT_ENVIRONMENT_VARIABLES = [
@@ -422,8 +422,11 @@ const spinner = (text) => ora({ text });
 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 installedSkillDir = (agent, global, cwd) => join(isUniversalSkillAgent(agent) ? getCanonicalSkillsDir(global, cwd) : getSkillAgentDir(agent, {
+	global,
+	cwd
+}), SKILL_NAME);
+const promptSkillInstall = async ({ yes = false, global = false, cwd = process.cwd() } = {}) => {
 	const detectedAgents = await detectAvailableAgents();
 	if (detectedAgents.length === 0) {
 		logger.warn("No supported agents detected.");
@@ -434,7 +437,7 @@ const promptSkillInstall = async ({ yes = false } = {}) => {
 		const { agents } = await prompts({
 			type: "multiselect",
 			name: "agents",
-			message: "Install the React Grab skill for:",
+			message: `Install the React Grab skill (${global ? "global" : "this project"}) for:`,
 			choices: detectedAgents.map((agent) => ({
 				title: agentLabel(agent),
 				value: agent,
@@ -450,7 +453,8 @@ const promptSkillInstall = async ({ yes = false } = {}) => {
 	const { installed, failed } = await add({
 		source: SKILL_SOURCE,
 		agents: selectedAgents,
-		global: true,
+		global,
+		cwd,
 		mode: "copy"
 	});
 	if (installed.length === 0) {
@@ -461,19 +465,27 @@ const promptSkillInstall = async ({ yes = false } = {}) => {
 	for (const record of failed) logger.log(`  ${highlighter.error("✗")} ${agentLabel(record.agent)} ${record.error}`);
 	return true;
 };
-const removeSkill = async () => {
-	const agentsWithSkill = (await detectAvailableAgents()).filter((agent) => existsSync(installedSkillDir(agent)));
-	for (const skillDir of new Set(agentsWithSkill.map(installedSkillDir))) rmSync(skillDir, {
+const removeSkill = async (cwd = process.cwd()) => {
+	const agents = await detectAvailableAgents();
+	const removedAgents = [];
+	const dirsToRemove = /* @__PURE__ */ new Set();
+	for (const agent of agents) {
+		const present = [installedSkillDir(agent, false, cwd), installedSkillDir(agent, true, cwd)].filter((dir) => existsSync(dir));
+		if (present.length === 0) continue;
+		removedAgents.push(agent);
+		for (const dir of present) dirsToRemove.add(dir);
+	}
+	for (const skillDir of dirsToRemove) rmSync(skillDir, {
 		recursive: true,
 		force: true
 	});
-	for (const agent of agentsWithSkill) logger.log(`  ${highlighter.success("✓")} ${agentLabel(agent)}`);
-	return agentsWithSkill.length;
+	for (const agent of removedAgents) logger.log(`  ${highlighter.success("✓")} ${agentLabel(agent)}`);
+	return removedAgents.length;
 };
 //#endregion
 //#region src/commands/add.ts
-const VERSION$5 = "0.1.39";
-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) => {
+const VERSION$5 = "0.1.41";
+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()).option("-g, --global", "install the skill globally instead of in the project", false).action(async (opts) => {
 	console.log(`${pc.magenta("✿")} ${pc.bold("React Grab")} ${pc.gray(VERSION$5)}`);
 	console.log();
 	try {
@@ -488,7 +500,11 @@ const add$1 = new Command().name("add").alias("install").description("install th
 		}
 		preflightSpinner.succeed();
 		logger.break();
-		if (!await promptSkillInstall({ yes: isNonInteractive }) && isNonInteractive) {
+		if (!await promptSkillInstall({
+			yes: isNonInteractive,
+			global: opts.global,
+			cwd: resolve(opts.cwd)
+		}) && isNonInteractive) {
 			logger.break();
 			process.exit(1);
 		}
@@ -1066,6 +1082,8 @@ const previewCdnTransform = (projectRoot, framework, nextRouterType, targetCdnDo
 //#endregion
 //#region src/utils/constants.ts
 const MAX_KEY_HOLD_DURATION_MS = 2e3;
+const DEFAULT_WATCH_DIR = ".react-grab";
+const MAX_GRAB_AGE_MS = 300 * 1e3;
 //#endregion
 //#region src/utils/format-activation-key.ts
 const formatActivationKeyDisplay = (activationKey) => {
@@ -1083,7 +1101,7 @@ const formatActivationKeyDisplay = (activationKey) => {
 };
 //#endregion
 //#region src/commands/configure.ts
-const VERSION$4 = "0.1.39";
+const VERSION$4 = "0.1.41";
 const isMac = process.platform === "darwin";
 const META_LABEL = isMac ? "Cmd" : "Win";
 const ALT_LABEL = isMac ? "Option" : "Alt";
@@ -1702,7 +1720,7 @@ const installPackagesWithFeedback = async (packages, packageManager, projectRoot
 };
 //#endregion
 //#region src/commands/init.ts
-const VERSION$3 = "0.1.39";
+const VERSION$3 = "0.1.41";
 const REPORT_URL = "https://react-grab.com/api/report-cli";
 const DOCS_URL = "https://github.com/aidenybai/react-grab";
 const reportToCli = (type, config, error) => {
@@ -1769,7 +1787,7 @@ const failWithManualSetup = (failingSpinner, message, { listSupportedFrameworks
 	logger.break();
 	process.exit(1);
 };
-const init = new Command().name("init").alias("setup").description("initialize React Grab in your project").option("-y, --yes", "skip confirmation prompts", false).option("-f, --force", "force overwrite existing config", false).option("-k, --key <key>", "activation key (e.g., Meta+K, Ctrl+Shift+G, Space)").option("--skip-install", "skip package installation", false).option("--pkg <pkg>", "custom package URL for CLI (e.g., grab)").option("-c, --cwd <cwd>", "working directory (defaults to current directory)", process.cwd()).action(async (opts) => {
+const init = new Command().name("init").alias("setup").description("initialize React Grab in your project").option("-y, --yes", "skip confirmation prompts", false).option("-f, --force", "force overwrite existing config", false).option("-k, --key <key>", "activation key (e.g., Meta+K, Ctrl+Shift+G, Space)").option("--skip-install", "skip package installation", false).option("--pkg <pkg>", "custom package URL for CLI (e.g., grab)").option("-c, --cwd <cwd>", "working directory (defaults to current directory)", process.cwd()).option("-g, --global", "install the skill globally instead of in the project", false).action(async (opts) => {
 	console.log(`${pc.magenta("✿")} ${pc.bold("React Grab")} ${pc.gray(VERSION$3)}`);
 	console.log();
 	try {
@@ -1927,7 +1945,11 @@ const init = new Command().name("init").alias("setup").description("initialize R
 				}
 			}
 			logger.break();
-			await promptSkillInstall({ yes: isNonInteractive });
+			await promptSkillInstall({
+				yes: isNonInteractive,
+				global: opts.global,
+				cwd
+			});
 			logger.break();
 			process.exit(0);
 		}
@@ -1993,7 +2015,11 @@ const init = new Command().name("init").alias("setup").description("initialize R
 		let didInstallSkill = false;
 		if (!isNonInteractive) {
 			logger.break();
-			didInstallSkill = await promptSkillInstall({ yes: isNonInteractive });
+			didInstallSkill = await promptSkillInstall({
+				yes: isNonInteractive,
+				global: opts.global,
+				cwd
+			});
 		}
 		const result = previewTransform(projectInfo.projectRoot, finalFramework, finalNextRouterType, false, opts.force);
 		if (!result.success) {
@@ -2046,99 +2072,11 @@ const init = new Command().name("init").alias("setup").description("initialize R
 	}
 });
 //#endregion
-//#region src/commands/remove.ts
-const VERSION$2 = "0.1.39";
-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 {
-		logger.break();
-		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);
-	}
-});
-//#endregion
-//#region src/commands/upgrade.ts
-const VERSION$1 = "0.1.39";
-const NPM_REGISTRY_URL = "https://registry.npmjs.org/react-grab/latest";
-const fetchLatestVersion = async () => {
-	try {
-		return (await (await fetch(NPM_REGISTRY_URL)).json()).version ?? null;
-	} catch {
-		return null;
-	}
-};
-const isDevDependency = (projectRoot) => {
-	const packageJsonPath = join(projectRoot, "package.json");
-	if (!existsSync(packageJsonPath)) return true;
-	try {
-		const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
-		if (packageJson.devDependencies?.["react-grab"]) return true;
-		if (packageJson.dependencies?.["react-grab"]) return false;
-	} catch {}
-	return true;
-};
-const upgrade = new Command().name("upgrade").alias("update").description("upgrade react-grab to the latest version").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$1)}`);
-	console.log();
-	try {
-		const cwd = resolve(opts.cwd);
-		const detectSpinner = spinner("Detecting project.").start();
-		const projectInfo = await detectProject(cwd);
-		if (!projectInfo.hasReactGrab) {
-			detectSpinner.fail("React Grab is not installed.");
-			logger.break();
-			logger.error(`Run ${highlighter.info("npx grab@latest init")} first to install React Grab.`);
-			logger.break();
-			process.exit(1);
-		}
-		detectSpinner.succeed();
-		const versionSpinner = spinner("Checking for updates.").start();
-		const latestVersion = await fetchLatestVersion();
-		if (!latestVersion) {
-			versionSpinner.fail("Could not check for updates.");
-			logger.break();
-			logger.error("Failed to reach the npm registry. Check your network connection.");
-			logger.break();
-			process.exit(1);
-		}
-		const installedVersion = projectInfo.reactGrabVersion;
-		if (installedVersion && installedVersion === latestVersion) {
-			versionSpinner.succeed(`Already on the latest version ${highlighter.info(`v${latestVersion}`)}.`);
-			logger.break();
-			process.exit(0);
-		}
-		const fromLabel = installedVersion ? `v${installedVersion}` : "unknown";
-		versionSpinner.succeed(`Update available: ${highlighter.dim(fromLabel)} → ${highlighter.info(`v${latestVersion}`)}.`);
-		const upgradeSpinner = spinner("Upgrading react-grab.").start();
-		try {
-			await installPackages(["react-grab@latest"], {
-				packageManager: projectInfo.packageManager,
-				cwd: projectInfo.projectRoot,
-				isDev: isDevDependency(projectInfo.projectRoot)
-			});
-			upgradeSpinner.succeed();
-		} catch {
-			upgradeSpinner.fail();
-			logger.break();
-			logger.error("Failed to upgrade. Check your network connection and try again.");
-			logger.break();
-			process.exit(1);
-		}
-		logger.break();
-		logger.log(`${highlighter.success("Success!")} React Grab has been upgraded to ${highlighter.info(`v${latestVersion}`)}.`);
-		logger.break();
-	} catch (error) {
-		handleError(error);
-	}
-});
+//#region src/utils/sleep.ts
+const sleep = (durationMs) => new Promise((resolve) => setTimeout(resolve, durationMs));
 //#endregion
 //#region src/utils/clipboard.ts
+const HISTORY_FILE_NAME = "history.jsonl";
 const READ_TIMEOUT_MS = 2500;
 const MAX_CLIPBOARD_BYTES = 64 * 1024 * 1024;
 const ID_RADIX = 36;
@@ -2149,7 +2087,6 @@ 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) => {
@@ -2381,9 +2318,9 @@ const prepareWorkDir = (dir) => {
 	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 runWatchLoop = async (options) => {
+	const { reader, dir, intervalMs, replayLast, onWarn } = options;
+	const logPath = path.join(dir, HISTORY_FILE_NAME);
 	const { read } = reader;
 	let lastChangeCount = null;
 	let lastTimestamp = 0;
@@ -2398,9 +2335,8 @@ const watchForNextGrab = async (options) => {
 			lastTimestamp = JSON.parse(initial.grab).timestamp ?? 0;
 		} catch {}
 	}
-	while (!signal?.aborted) {
+	while (true) {
 		await sleep(intervalMs);
-		if (signal?.aborted) return null;
 		try {
 			const snapshot = read();
 			if (!snapshot) continue;
@@ -2446,7 +2382,6 @@ const watchForNextGrab = async (options) => {
 			lastChangeCount = snapshot.changeCount;
 			lastTextHash = textHash;
 			lastTimestamp = nextTimestamp;
-			return captured;
 		} catch (error) {
 			const message = String(error?.message ?? error);
 			if (message !== lastErrorMessage) {
@@ -2455,51 +2390,346 @@ const watchForNextGrab = async (options) => {
 			}
 		}
 	}
-	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) => {
+//#region src/utils/grab-log.ts
+const CURSOR_FILE_NAME = "cursor.txt";
+const cursorFilePath = (dir) => path.join(dir, CURSOR_FILE_NAME);
+const readCompleteGrabLines = (dir) => {
+	let raw;
+	try {
+		raw = fs.readFileSync(path.join(dir, HISTORY_FILE_NAME), "utf8");
+	} catch {
+		return [];
+	}
+	const lastNewline = raw.lastIndexOf("\n");
+	if (lastNewline < 0) return [];
+	return raw.slice(0, lastNewline).split("\n").filter(Boolean);
+};
+const readGrabCursor = (dir) => {
+	try {
+		const value = Number.parseInt(fs.readFileSync(cursorFilePath(dir), "utf8").trim(), 10);
+		return Number.isInteger(value) && value >= 0 ? value : 0;
+	} catch {
+		return 0;
+	}
+};
+const grabReceivedAt = (line) => {
+	try {
+		const value = JSON.parse(line).receivedAt;
+		return typeof value === "number" ? value : null;
+	} catch {
+		return null;
+	}
+};
+const consumeGrabs = (dir, options) => {
+	const lines = readCompleteGrabLines(dir);
+	if (options.all) return lines;
+	const maxAgeMs = options.maxAgeMs ?? 0;
+	const cursor = readGrabCursor(dir);
+	const total = lines.length;
+	const now = Date.now();
+	const fresh = [];
+	let index = Math.min(cursor, total);
+	while (index < total && (options.limit <= 0 || fresh.length < options.limit)) {
+		const line = lines[index];
+		index += 1;
+		if (maxAgeMs > 0) {
+			const receivedAt = grabReceivedAt(line);
+			if (receivedAt !== null && now - receivedAt > maxAgeMs) continue;
+		}
+		fresh.push(line);
+	}
+	if (index !== cursor) fs.writeFileSync(cursorFilePath(dir), String(index));
+	return fresh;
+};
+//#endregion
+//#region src/commands/read.ts
+const parseWaitMs = (raw) => {
+	if (!raw) return 0;
+	if (/^(inf|infinite|forever)$/i.test(raw.trim())) return Number.POSITIVE_INFINITY;
+	const ms = Number(raw);
+	return Number.isFinite(ms) && ms > 0 ? ms : 0;
+};
+const parseNonNegativeInt = (raw, fallback) => {
+	const value = Number(raw);
+	return Number.isInteger(value) && value >= 0 ? value : fallback;
+};
+const read = new Command().name("read").description("print React Grab selections captured since the last read, then advance the cursor").option("-d, --dir <dir>", "work dir holding history.jsonl + cursor.txt", DEFAULT_WATCH_DIR).option("-w, --wait <ms>", "block up to <ms> (or 'infinite') for a new grab (default: no wait)").option("-n, --limit <count>", "max grabs to print per call (0 = no limit); the cursor only advances past what is printed", String(50)).option("--max-age <ms>", "skip grabs captured longer ago than <ms> (0 = never evict)", String(MAX_GRAB_AGE_MS)).option("--all", "print the entire history without advancing the cursor").action(async (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.stderr.write(`react-grab read: ${String(error?.message ?? error)}\n`);
 		process.exit(1);
 	}
+	unrefStdin();
+	const limit = parseNonNegativeInt(options.limit, 50);
+	const maxAgeMs = parseNonNegativeInt(options.maxAge, MAX_GRAB_AGE_MS);
+	const all = Boolean(options.all);
+	const drain = () => {
+		const fresh = consumeGrabs(dir, {
+			limit,
+			all,
+			maxAgeMs
+		});
+		if (fresh.length > 0) process.stdout.write(`${fresh.join("\n")}\n`);
+		return fresh.length;
+	};
+	const waitMs = parseWaitMs(options.wait);
+	const deadline = waitMs === Number.POSITIVE_INFINITY ? Number.POSITIVE_INFINITY : Date.now() + waitMs;
+	if (drain() > 0) process.exit(0);
+	while (Date.now() < deadline) {
+		await sleep(200);
+		if (drain() > 0) break;
+	}
+	process.exit(0);
+});
+//#endregion
+//#region src/commands/remove.ts
+const VERSION$2 = "0.1.41";
+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 {
+		logger.break();
+		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);
+	}
+});
+//#endregion
+//#region src/commands/upgrade.ts
+const VERSION$1 = "0.1.41";
+const NPM_REGISTRY_URL = "https://registry.npmjs.org/react-grab/latest";
+const fetchLatestVersion = async () => {
+	try {
+		return (await (await fetch(NPM_REGISTRY_URL)).json()).version ?? null;
+	} catch {
+		return null;
+	}
+};
+const isDevDependency = (projectRoot) => {
+	const packageJsonPath = join(projectRoot, "package.json");
+	if (!existsSync(packageJsonPath)) return true;
+	try {
+		const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
+		if (packageJson.devDependencies?.["react-grab"]) return true;
+		if (packageJson.dependencies?.["react-grab"]) return false;
+	} catch {}
+	return true;
+};
+const upgrade = new Command().name("upgrade").alias("update").description("upgrade react-grab to the latest version").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$1)}`);
+	console.log();
+	try {
+		const cwd = resolve(opts.cwd);
+		const detectSpinner = spinner("Detecting project.").start();
+		const projectInfo = await detectProject(cwd);
+		if (!projectInfo.hasReactGrab) {
+			detectSpinner.fail("React Grab is not installed.");
+			logger.break();
+			logger.error(`Run ${highlighter.info("npx grab@latest init")} first to install React Grab.`);
+			logger.break();
+			process.exit(1);
+		}
+		detectSpinner.succeed();
+		const versionSpinner = spinner("Checking for updates.").start();
+		const latestVersion = await fetchLatestVersion();
+		if (!latestVersion) {
+			versionSpinner.fail("Could not check for updates.");
+			logger.break();
+			logger.error("Failed to reach the npm registry. Check your network connection.");
+			logger.break();
+			process.exit(1);
+		}
+		const installedVersion = projectInfo.reactGrabVersion;
+		if (installedVersion && installedVersion === latestVersion) {
+			versionSpinner.succeed(`Already on the latest version ${highlighter.info(`v${latestVersion}`)}.`);
+			logger.break();
+			process.exit(0);
+		}
+		const fromLabel = installedVersion ? `v${installedVersion}` : "unknown";
+		versionSpinner.succeed(`Update available: ${highlighter.dim(fromLabel)} → ${highlighter.info(`v${latestVersion}`)}.`);
+		const upgradeSpinner = spinner("Upgrading react-grab.").start();
+		try {
+			await installPackages(["react-grab@latest"], {
+				packageManager: projectInfo.packageManager,
+				cwd: projectInfo.projectRoot,
+				isDev: isDevDependency(projectInfo.projectRoot)
+			});
+			upgradeSpinner.succeed();
+		} catch {
+			upgradeSpinner.fail();
+			logger.break();
+			logger.error("Failed to upgrade. Check your network connection and try again.");
+			logger.break();
+			process.exit(1);
+		}
+		logger.break();
+		logger.log(`${highlighter.success("Success!")} React Grab has been upgraded to ${highlighter.info(`v${latestVersion}`)}.`);
+		logger.break();
+	} catch (error) {
+		handleError(error);
+	}
+});
+//#endregion
+//#region src/utils/daemon.ts
+const PID_FILE_NAME = "watch.pid";
+const pidFilePath = (dir) => path.join(dir, PID_FILE_NAME);
+const cliEntryPath = () => process.argv[1] ?? fileURLToPath(import.meta.url);
+const isProcessAlive = (pid) => {
+	if (!Number.isInteger(pid) || pid <= 0) return false;
+	try {
+		process.kill(pid, 0);
+		return true;
+	} catch (error) {
+		return error.code === "EPERM";
+	}
+};
+const readDaemonPid = (dir) => {
+	try {
+		const pid = Number.parseInt(fs.readFileSync(pidFilePath(dir), "utf8").trim(), 10);
+		return Number.isInteger(pid) && pid > 0 ? pid : null;
+	} catch {
+		return null;
+	}
+};
+const isDaemonRunning = (dir) => {
+	const pid = readDaemonPid(dir);
+	return pid !== null && isProcessAlive(pid);
+};
+const claimDaemon = (dir) => {
+	const file = pidFilePath(dir);
+	for (let attempt = 0; attempt < 50; attempt += 1) try {
+		const handle = fs.openSync(file, "wx");
+		fs.writeFileSync(handle, String(process.pid));
+		fs.closeSync(handle);
+		return readDaemonPid(dir) === process.pid;
+	} catch (error) {
+		if (error.code !== "EEXIST") throw error;
+		if (isDaemonRunning(dir)) return false;
+		try {
+			fs.rmSync(file, { force: true });
+		} catch {}
+	}
+	return false;
+};
+const releaseDaemon = (dir) => {
+	if (readDaemonPid(dir) === process.pid) try {
+		fs.rmSync(pidFilePath(dir), { force: true });
+	} catch {}
+};
+const stopDaemon = (dir) => {
+	const pid = readDaemonPid(dir);
+	if (pid === null) return null;
+	const wasAlive = isProcessAlive(pid);
+	if (wasAlive) try {
+		process.kill(pid, "SIGTERM");
+	} catch {}
+	if (readDaemonPid(dir) === pid) try {
+		fs.rmSync(pidFilePath(dir), { force: true });
+	} catch {}
+	return wasAlive ? pid : null;
+};
+const spawnDaemon = (options) => {
+	const args = [
+		cliEntryPath(),
+		"watch",
+		"--foreground",
+		"--dir",
+		options.dir,
+		"--interval",
+		String(options.intervalMs)
+	];
+	if (options.textOnly) args.push("--text-only");
+	if (options.replayLast) args.push("--replay-last");
+	spawn(process.execPath, args, {
+		detached: true,
+		stdio: "ignore",
+		windowsHide: true
+	}).unref();
+};
+//#endregion
+//#region src/commands/watch.ts
+const readersDir = () => path.dirname(fileURLToPath(import.meta.url));
+const NO_READER_MESSAGE = "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.";
+const writeStatus = (message) => {
+	process.stderr.write(`react-grab watch: ${message}\n`);
+};
+const runForeground = (dir, intervalMs, textOnly, replayLast) => {
+	if (!claimDaemon(dir)) process.exit(0);
+	process.on("exit", () => releaseDaemon(dir));
 	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");
+		writeStatus(NO_READER_MESSAGE);
 		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({
+	writeStatus(`watching clipboard via ${reader.mode}; history → ${path.join(dir, HISTORY_FILE_NAME)}`);
+	runWatchLoop({
 		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);
+		intervalMs,
+		replayLast,
+		onWarn: writeStatus
 	}).catch((error) => {
-		process.stderr.write(`react-grab watch: ${String(error?.message ?? error)}\n`);
+		writeStatus(String(error?.message ?? error));
 		process.exit(1);
 	});
+};
+const watch = new Command().name("watch").description("start a background daemon that captures React Grab selections to history.jsonl").option("-d, --dir <dir>", "work dir for history.jsonl + watch.pid", DEFAULT_WATCH_DIR).option("-i, --interval <ms>", "clipboard poll interval in ms", String(800)).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").option("--foreground", "run the capture loop in this process instead of detaching a daemon").option("--stop", "stop the daemon watching this dir").action((options) => {
+	const dir = path.resolve(options.dir);
+	const intervalRaw = Number(options.interval);
+	const intervalMs = Number.isFinite(intervalRaw) && intervalRaw > 0 ? intervalRaw : 800;
+	const textOnly = Boolean(options.textOnly);
+	const replayLast = Boolean(options.replayLast);
+	try {
+		prepareWorkDir(dir);
+	} catch (error) {
+		writeStatus(String(error?.message ?? error));
+		process.exit(1);
+	}
+	if (options.stop) {
+		const stoppedPid = stopDaemon(dir);
+		writeStatus(stoppedPid ? `stopped daemon (pid ${stoppedPid})` : `no daemon running for ${dir}`);
+		process.exit(0);
+	}
+	if (options.foreground) {
+		runForeground(dir, intervalMs, textOnly, replayLast);
+		return;
+	}
+	if (isDaemonRunning(dir)) {
+		writeStatus(`already watching ${dir} (pid ${readDaemonPid(dir)})`);
+		process.exit(0);
+	}
+	if (!createReader({
+		textOnly,
+		readersDir: readersDir(),
+		workDir: dir
+	})) {
+		writeStatus(NO_READER_MESSAGE);
+		process.exit(1);
+	}
+	spawnDaemon({
+		dir,
+		intervalMs,
+		textOnly,
+		replayLast
+	});
+	writeStatus(`started; capturing grabs → ${path.join(dir, HISTORY_FILE_NAME)} (run \`grab read\` to consume, \`grab watch --stop\` to stop)`);
+	process.exit(0);
 });
 //#endregion
 //#region src/cli.ts
-const VERSION = "0.1.39";
+const VERSION = "0.1.41";
 const VERSION_API_URL = "https://www.react-grab.com/api/version";
 process.on("SIGINT", () => process.exit(0));
 process.on("SIGTERM", () => process.exit(0));
@@ -2513,6 +2743,7 @@ program.addCommand(remove);
 program.addCommand(configure);
 program.addCommand(upgrade);
 program.addCommand(watch);
+program.addCommand(read);
 const main = async () => {
 	await program.parseAsync();
 };