@react-grab/cli 0.1.40 → 0.1.42

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";
@@ -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(), global = false } = {}) => {
+	const agents = await detectAvailableAgents();
+	const removedAgents = [];
+	const dirsToRemove = /* @__PURE__ */ new Set();
+	for (const agent of agents) {
+		const skillDir = installedSkillDir(agent, global, cwd);
+		if (!existsSync(skillDir)) continue;
+		removedAgents.push(agent);
+		dirsToRemove.add(skillDir);
+	}
+	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.40";
-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.42";
+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);
 		}
@@ -1067,6 +1083,9 @@ const previewCdnTransform = (projectRoot, framework, nextRouterType, targetCdnDo
 //#region src/utils/constants.ts
 const MAX_KEY_HOLD_DURATION_MS = 2e3;
 const DEFAULT_WATCH_DIR = ".react-grab";
+const DEFAULT_GRAB_AGE_MS = 300 * 1e3;
+const MAX_READ_HISTORY_BYTES = 128 * 1024 * 1024;
+const MIGRATION_SCAN_CHUNK_BYTES = 1024 * 1024;
 //#endregion
 //#region src/utils/format-activation-key.ts
 const formatActivationKeyDisplay = (activationKey) => {
@@ -1084,7 +1103,7 @@ const formatActivationKeyDisplay = (activationKey) => {
 };
 //#endregion
 //#region src/commands/configure.ts
-const VERSION$4 = "0.1.40";
+const VERSION$4 = "0.1.42";
 const isMac = process.platform === "darwin";
 const META_LABEL = isMac ? "Cmd" : "Win";
 const ALT_LABEL = isMac ? "Option" : "Alt";
@@ -1703,7 +1722,7 @@ const installPackagesWithFeedback = async (packages, packageManager, projectRoot
 };
 //#endregion
 //#region src/commands/init.ts
-const VERSION$3 = "0.1.40";
+const VERSION$3 = "0.1.42";
 const REPORT_URL = "https://react-grab.com/api/report-cli";
 const DOCS_URL = "https://github.com/aidenybai/react-grab";
 const reportToCli = (type, config, error) => {
@@ -1770,7 +1789,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 {
@@ -1928,7 +1947,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);
 		}
@@ -1994,7 +2017,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) {
@@ -2052,6 +2079,8 @@ const sleep = (durationMs) => new Promise((resolve) => setTimeout(resolve, durat
 //#endregion
 //#region src/utils/clipboard.ts
 const HISTORY_FILE_NAME = "history.jsonl";
+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 READERS_DIR = path.dirname(fileURLToPath(import.meta.url));
 const READ_TIMEOUT_MS = 2500;
 const MAX_CLIPBOARD_BYTES = 64 * 1024 * 1024;
 const ID_RADIX = 36;
@@ -2145,7 +2174,7 @@ const compileSwiftReader = (readersDir, workDir) => {
 	return binary;
 };
 const createDarwinReader = (options) => {
-	const binary = options.textOnly ? null : compileSwiftReader(options.readersDir, options.workDir);
+	const binary = options.textOnly ? null : compileSwiftReader(READERS_DIR, options.workDir);
 	if (binary) return {
 		mode: "darwin-native",
 		read: () => {
@@ -2228,7 +2257,7 @@ const detectPowershell = () => hasCommand("pwsh") ? "pwsh" : hasCommand("powersh
 const createWindowsReader = (options) => {
 	const shell = detectPowershell();
 	if (!shell) return null;
-	const scriptPath = path.join(options.readersDir, "read-clipboard.ps1");
+	const scriptPath = path.join(READERS_DIR, "read-clipboard.ps1");
 	if (options.textOnly || !fs.existsSync(scriptPath)) return {
 		mode: "win-text",
 		read: () => {
@@ -2367,77 +2396,291 @@ const runWatchLoop = async (options) => {
 	}
 };
 //#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",
+		"--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();
+};
+const ensureDaemon = (options) => {
+	if (isDaemonRunning(options.dir)) return "already-running";
+	if (!createReader({
+		textOnly: options.textOnly,
+		workDir: options.dir
+	})) return "no-reader";
+	spawnDaemon(options);
+	return "started";
+};
+//#endregion
 //#region src/utils/grab-log.ts
 const CURSOR_FILE_NAME = "cursor.txt";
+const NEWLINE_BYTE = 10;
 const cursorFilePath = (dir) => path.join(dir, CURSOR_FILE_NAME);
-const readCompleteGrabLines = (dir) => {
-	let raw;
+const historyFilePath = (dir) => path.join(dir, HISTORY_FILE_NAME);
+const fileSize = (filePath) => {
 	try {
-		raw = fs.readFileSync(path.join(dir, HISTORY_FILE_NAME), "utf8");
+		return fs.statSync(filePath).size;
 	} catch {
-		return [];
+		return 0;
 	}
-	const lastNewline = raw.lastIndexOf("\n");
-	if (lastNewline < 0) return [];
-	return raw.slice(0, lastNewline).split("\n").filter(Boolean);
+};
+const readHistoryRange = (dir, start, length) => {
+	if (length <= 0) return "";
+	const fd = fs.openSync(historyFilePath(dir), "r");
+	try {
+		const buffer = Buffer.allocUnsafe(length);
+		const bytesRead = fs.readSync(fd, buffer, 0, length, start);
+		return buffer.toString("utf8", 0, bytesRead);
+	} finally {
+		fs.closeSync(fd);
+	}
+};
+const writeGrabCursor = (dir, offset) => {
+	const target = cursorFilePath(dir);
+	const tempPath = `${target}.${process.pid}.tmp`;
+	fs.writeFileSync(tempPath, JSON.stringify({ offset }));
+	fs.renameSync(tempPath, target);
+};
+const byteOffsetAfterLines = (dir, lineCount) => {
+	const filePath = historyFilePath(dir);
+	const size = fileSize(filePath);
+	if (lineCount <= 0 || size === 0) return 0;
+	const fd = fs.openSync(filePath, "r");
+	try {
+		const buffer = Buffer.allocUnsafe(MIGRATION_SCAN_CHUNK_BYTES);
+		let position = 0;
+		let seen = 0;
+		while (position < size) {
+			const bytesRead = fs.readSync(fd, buffer, 0, MIGRATION_SCAN_CHUNK_BYTES, position);
+			if (bytesRead <= 0) break;
+			for (let index = 0; index < bytesRead; index += 1) {
+				if (buffer[index] !== NEWLINE_BYTE) continue;
+				seen += 1;
+				if (seen === lineCount) return position + index + 1;
+			}
+			position += bytesRead;
+		}
+	} finally {
+		fs.closeSync(fd);
+	}
+	return size;
 };
 const readGrabCursor = (dir) => {
+	let raw;
+	try {
+		raw = fs.readFileSync(cursorFilePath(dir), "utf8").trim();
+	} catch {
+		return 0;
+	}
+	if (raw === "") return 0;
+	let parsed;
 	try {
-		const value = Number.parseInt(fs.readFileSync(cursorFilePath(dir), "utf8").trim(), 10);
-		return Number.isInteger(value) && value >= 0 ? value : 0;
+		parsed = JSON.parse(raw);
 	} catch {
 		return 0;
 	}
+	if (typeof parsed === "number") {
+		if (!Number.isInteger(parsed) || parsed < 0) return 0;
+		const offset = byteOffsetAfterLines(dir, parsed);
+		writeGrabCursor(dir, offset);
+		return offset;
+	}
+	return typeof parsed.offset === "number" && Number.isInteger(parsed.offset) && parsed.offset >= 0 ? parsed.offset : 0;
+};
+const readCompleteGrabLines = (dir) => {
+	const size = fileSize(historyFilePath(dir));
+	if (size === 0) return [];
+	const raw = readHistoryRange(dir, 0, size);
+	const lastNewline = raw.lastIndexOf("\n");
+	if (lastNewline < 0) return [];
+	return raw.slice(0, lastNewline).split("\n").filter(Boolean);
 };
 const consumeGrabs = (dir, options) => {
-	const lines = readCompleteGrabLines(dir);
-	if (options.all) return lines;
+	if (options.all) return readCompleteGrabLines(dir);
+	const size = fileSize(historyFilePath(dir));
 	const cursor = readGrabCursor(dir);
-	const start = Math.min(cursor, lines.length);
-	const end = options.limit > 0 ? Math.min(start + options.limit, lines.length) : lines.length;
-	if (end !== cursor) fs.writeFileSync(cursorFilePath(dir), String(end));
-	return lines.slice(start, end);
+	const start = cursor > size ? 0 : cursor;
+	if (start >= size) {
+		if (start !== cursor) writeGrabCursor(dir, start);
+		return [];
+	}
+	const chunk = readHistoryRange(dir, start, Math.min(size - start, MAX_READ_HISTORY_BYTES));
+	const lastNewline = chunk.lastIndexOf("\n");
+	if (lastNewline < 0) return [];
+	const now = Date.now();
+	const fresh = [];
+	let consumedBytes = 0;
+	let lineStart = 0;
+	while (lineStart <= lastNewline && (options.limit <= 0 || fresh.length < options.limit)) {
+		const newlineIndex = chunk.indexOf("\n", lineStart);
+		const line = chunk.slice(lineStart, newlineIndex);
+		consumedBytes += Buffer.byteLength(chunk.slice(lineStart, newlineIndex + 1), "utf8");
+		lineStart = newlineIndex + 1;
+		if (line.length === 0) continue;
+		let parsed;
+		try {
+			parsed = JSON.parse(line);
+		} catch {
+			continue;
+		}
+		if (options.maxAgeMs > 0 && typeof parsed.receivedAt === "number") {
+			if (now - parsed.receivedAt > options.maxAgeMs) continue;
+		}
+		fresh.push(line);
+	}
+	const nextCursor = start + consumedBytes;
+	if (nextCursor !== cursor) writeGrabCursor(dir, nextCursor);
+	return fresh;
 };
 //#endregion
-//#region src/commands/read.ts
-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> for at least one 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("--all", "print the entire history without advancing the cursor").action(async (options) => {
+//#region src/utils/read-args.ts
+const parseWaitMs = (raw) => {
+	if (raw === void 0) return 0;
+	const trimmed = raw.trim();
+	if (trimmed === "") return 0;
+	if (/^(inf|infinite|infinity|forever)$/i.test(trimmed)) return Number.POSITIVE_INFINITY;
+	const ms = Number(trimmed);
+	return Number.isFinite(ms) && ms >= 0 ? ms : null;
+};
+const parseNonNegativeInt = (raw) => {
+	if (raw === void 0) return null;
+	const trimmed = raw.trim();
+	if (trimmed === "") return null;
+	const value = Number(trimmed);
+	return Number.isInteger(value) && value >= 0 ? value : null;
+};
+//#endregion
+//#region src/commands/pull.ts
+const fail = (message) => {
+	process.stderr.write(`react-grab pull: ${message}\n`);
+	process.exit(1);
+};
+const emitAndExit = (lines) => {
+	process.stdout.write(`${lines.join("\n")}\n`, () => process.exit(0));
+};
+const pull = new Command().name("pull").description("start the watcher if needed, then wait for and print the next React Grab grab(s)").option("-d, --dir <dir>", "work dir for history.jsonl + watch.pid", DEFAULT_WATCH_DIR).option("-w, --wait <ms>", "how long to wait for a grab: ms, 'infinite', or 0 for none", "infinite").option("-n, --limit <count>", "max grabs to print per call (0 = no limit)", String(50)).option("--max-age <ms>", "skip grabs captured longer ago than <ms> (0 = never)", String(DEFAULT_GRAB_AGE_MS)).option("--text-only", "watcher uses the plain-text clipboard reader (ignored if already running)").option("--all", "print the whole history without advancing the cursor").action(async (options) => {
 	const dir = path.resolve(options.dir);
 	try {
 		prepareWorkDir(dir);
 	} catch (error) {
-		process.stderr.write(`react-grab read: ${String(error?.message ?? error)}\n`);
-		process.exit(1);
-	}
-	unrefStdin();
-	const limitRaw = Number(options.limit);
-	const limit = Number.isInteger(limitRaw) && limitRaw >= 0 ? limitRaw : 50;
+		fail(String(error?.message ?? error));
+	}
+	const waitMs = parseWaitMs(options.wait);
+	if (waitMs === null) fail(`invalid --wait "${options.wait}" (use milliseconds or "infinite")`);
+	const limit = parseNonNegativeInt(options.limit);
+	if (limit === null) fail(`invalid --limit "${options.limit}" (use a non-negative integer)`);
+	const maxAgeMs = parseNonNegativeInt(options.maxAge);
+	if (maxAgeMs === null) fail(`invalid --max-age "${options.maxAge}" (use milliseconds, 0 to disable)`);
 	const all = Boolean(options.all);
-	const drain = () => {
-		const fresh = consumeGrabs(dir, {
-			limit,
-			all
-		});
-		if (fresh.length > 0) process.stdout.write(`${fresh.join("\n")}\n`);
-		return fresh.length;
-	};
-	const waitRaw = options.wait ? Number(options.wait) : 0;
-	const deadline = Date.now() + (Number.isFinite(waitRaw) && waitRaw > 0 ? waitRaw : 0);
-	if (drain() > 0) process.exit(0);
+	if (ensureDaemon({
+		dir,
+		intervalMs: 800,
+		textOnly: Boolean(options.textOnly),
+		replayLast: false
+	}) === "no-reader") fail(NO_READER_MESSAGE);
+	unrefStdin();
+	const consume = () => consumeGrabs(dir, {
+		limit,
+		all,
+		maxAgeMs
+	});
+	const first = consume();
+	if (first.length > 0) {
+		emitAndExit(first);
+		return;
+	}
+	const deadline = Date.now() + waitMs;
 	while (Date.now() < deadline) {
 		await sleep(200);
-		if (drain() > 0) break;
+		const batch = consume();
+		if (batch.length > 0) {
+			emitAndExit(batch);
+			return;
+		}
 	}
 	process.exit(0);
 });
 //#endregion
 //#region src/commands/remove.ts
-const VERSION$2 = "0.1.40";
-const remove = new Command().name("remove").description("uninstall the React Grab skill from your agent").action(async () => {
+const VERSION$2 = "0.1.42";
+const remove = new Command().name("remove").description("uninstall the React Grab skill from your agent").option("-c, --cwd <cwd>", "working directory (defaults to current directory)", process.cwd()).option("-g, --global", "remove the globally-installed skill instead of the project's", false).action(async (opts) => {
 	console.log(`${pc.magenta("✿")} ${pc.bold("React Grab")} ${pc.gray(VERSION$2)}`);
 	console.log();
 	try {
 		logger.break();
-		const removedCount = await removeSkill();
+		const removedCount = await removeSkill({
+			cwd: resolve(opts.cwd),
+			global: opts.global
+		});
 		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"}.`);
@@ -2447,8 +2690,16 @@ const remove = new Command().name("remove").description("uninstall the React Gra
 	}
 });
 //#endregion
+//#region src/commands/stop.ts
+const stop = new Command().name("stop").description("stop the React Grab watcher for this dir").option("-d, --dir <dir>", "work dir holding watch.pid", DEFAULT_WATCH_DIR).action((options) => {
+	const dir = path.resolve(options.dir);
+	const stoppedPid = stopDaemon(dir);
+	process.stderr.write(stoppedPid ? `react-grab stop: stopped watcher (pid ${stoppedPid})\n` : `react-grab stop: no watcher running for ${dir}\n`);
+	process.exit(0);
+});
+//#endregion
 //#region src/commands/upgrade.ts
-const VERSION$1 = "0.1.40";
+const VERSION$1 = "0.1.42";
 const NPM_REGISTRY_URL = "https://registry.npmjs.org/react-grab/latest";
 const fetchLatestVersion = async () => {
 	try {
@@ -2522,95 +2773,24 @@ const upgrade = new Command().name("upgrade").alias("update").description("upgra
 	}
 });
 //#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) => {
+const watch = new Command().name("watch").description("run the React Grab capture daemon in the foreground (used internally by `pull`)").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").action((options) => {
+	const dir = path.resolve(options.dir);
+	const intervalRaw = Number(options.interval);
+	const intervalMs = Number.isFinite(intervalRaw) && intervalRaw > 0 ? intervalRaw : 800;
+	try {
+		prepareWorkDir(dir);
+	} catch (error) {
+		writeStatus(String(error?.message ?? error));
+		process.exit(1);
+	}
 	if (!claimDaemon(dir)) process.exit(0);
 	process.on("exit", () => releaseDaemon(dir));
 	const reader = createReader({
-		textOnly,
-		readersDir: readersDir(),
+		textOnly: Boolean(options.textOnly),
 		workDir: dir
 	});
 	if (!reader) {
@@ -2622,58 +2802,16 @@ const runForeground = (dir, intervalMs, textOnly, replayLast) => {
 		reader,
 		dir,
 		intervalMs,
-		replayLast,
+		replayLast: Boolean(options.replayLast),
 		onWarn: writeStatus
 	}).catch((error) => {
 		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.40";
+const VERSION = "0.1.42";
 const VERSION_API_URL = "https://www.react-grab.com/api/version";
 process.on("SIGINT", () => process.exit(0));
 process.on("SIGTERM", () => process.exit(0));
@@ -2686,8 +2824,9 @@ program.addCommand(add$1);
 program.addCommand(remove);
 program.addCommand(configure);
 program.addCommand(upgrade);
-program.addCommand(watch);
-program.addCommand(read);
+program.addCommand(pull);
+program.addCommand(stop);
+program.addCommand(watch, { hidden: true });
 const main = async () => {
 	await program.parseAsync();
 };