diffing 0.10.5 → 0.11.0

package/dist/cli.mjs

@@ -1,17 +1,17 @@
 #!/usr/bin/env node
-import { a as intoShowMode, n as runTerminalDiff, o as parseDiffOptions, r as validateEnvironment, s as printHelp, t as startServer } from "./server-C9i4V36o.mjs";
-import { p as getRepoRoot } from "./git-Czo96ymM.mjs";
-import { t as loadSettings } from "./settings-bwe7yQ8U.mjs";
-import { a as removeServerLock, i as readServerLock, n as diffScopeKey, o as removeServerLockIfOwned, r as isLockAlive, s as writeServerLock, t as acquireServerStartupLease } from "./server-lock-Dd_ss_Il.mjs";
-import { t as findTuiBinary$1 } from "./find-tui-binary-CRpbYXLC.mjs";
-import { spawn } from "node:child_process";
+import { a as buildTuiGitDiffArgs, c as printHelp, n as runTerminalDiff, o as intoShowMode, r as validateEnvironment, s as parseDiffOptions, t as startServer } from "./server-j0PnTVX1.mjs";
+import { p as getRepoRoot, r as getBranchName } from "./git-Czo96ymM.mjs";
+import { t as loadSettings } from "./settings-yK0GYpbn.mjs";
+import { c as removeServerLockIfOwned, p as writeServerLock, r as diffScopeKey, t as acquireServerStartupLease, u as resolveActiveServerLock } from "./server-lock-CY0_1mcS.mjs";
+import { n as openExistingSession, r as stopLockOwner } from "./session-conflict-C6V9ZKo7.mjs";
+import { n as findTuiBinary$1, t as findTuiBinaries } from "./find-tui-binary-B71xiwWu.mjs";
+import { execFileSync, spawn } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import { fileURLToPath } from "node:url";
 import { dirname, isAbsolute, resolve } from "node:path";
 import { existsSync, readFileSync } from "node:fs";
 import getPort from "get-port";
 import { stdout } from "node:process";
-import { createInterface } from "node:readline";
 //#region src/lib/startup-display.ts
 const R = "\x1B[0m";
 const B = "\x1B[1m";
@@ -395,163 +395,61 @@ function playStartupDisplay() {
 	})();
 }
 //#endregion
-//#region src/lib/session-conflict.ts
-function sleepMs(ms) {
-	return new Promise((resolve) => setTimeout(resolve, ms));
-}
-/** Loopback-safe review URL for web / gh-pr locks; null for TUI or invalid ports. */
-function existingSessionUrl(lock) {
-	const mode = lock.mode ?? "web";
-	if (mode === "tui" || !(lock.port > 0)) return null;
-	const host = lock.host === "0.0.0.0" ? "127.0.0.1" : lock.host;
-	const path = mode === "gh-pr" ? "/gh/pr" : "";
-	return `http://${host}:${lock.port}${path}`;
-}
-function formatExistingSession(lock) {
-	const mode = lock.mode ?? "web";
-	const url = existingSessionUrl(lock);
-	return [
-		"A diffing review is already running for this repository",
-		url ? `  url:  ${url}` : "  url:  (TUI session — no browser URL)",
-		`  mode: ${mode}`,
-		`  pid:  ${lock.pid}`
-	].join("\n");
-}
-function conflictFailMessage(lock) {
-	return `A diffing review is already running for this repository at ${existingSessionUrl(lock) ?? (lock.mode === "tui" || lock.port <= 0 ? "a TUI session" : `http://${lock.host}:${lock.port}`)}. End it before starting another scope.`;
-}
-/**
-* Resolve how to handle a live session conflict.
-* Flags win over the prompt; non-interactive callers get `cancel`.
-*/
-async function resolveSessionConflictAction(options) {
-	if (options.reuseSession && options.replaceSession) throw new Error("Cannot combine --reuse-session and --replace-session.");
-	if (options.reuseSession) return "open";
-	if (options.replaceSession) return "replace";
-	if (!options.canPrompt) return "cancel";
-	return (options.prompt ?? promptSessionConflict)(options.lock);
-}
+//#region src/lib/tui-diff-context.ts
 /**
-* Interactive o/r/c prompt. Empty input defaults to open. Ctrl+C → cancel.
+* Build the compact "what is this diff?" label consumed by the native TUI.
+*
+* This deliberately uses the options the CLI already parsed instead of
+* executing the diff a second time just to reproduce the web overview.
+* File and line counts are added by the TUI from its live sparse index.
 */
-async function promptSessionConflict(lock) {
-	const rl = createInterface({
-		input: process.stdin,
-		output: process.stderr
-	});
-	try {
-		console.error(formatExistingSession(lock));
-		console.error("");
-		console.error("What do you want to do?");
-		console.error("  [o] Open the existing session (default)");
-		console.error(`  [r] Replace it (stop pid ${lock.pid}, start a new review)`);
-		console.error("  [c] Cancel");
-		console.error("");
-		while (true) {
-			const choice = (await new Promise((resolve, reject) => {
-				const onSigInt = () => {
-					cleanup();
-					reject(/* @__PURE__ */ new Error("cancelled"));
-				};
-				const cleanup = () => {
-					process.off("SIGINT", onSigInt);
-				};
-				process.on("SIGINT", onSigInt);
-				rl.question("Choice [o/r/c]: ", (raw) => {
-					cleanup();
-					resolve(raw);
-				});
-			})).trim().toLowerCase();
-			if (choice === "" || choice === "o" || choice === "open") return "open";
-			if (choice === "r" || choice === "replace") return "replace";
-			if (choice === "c" || choice === "cancel" || choice === "q" || choice === "quit") return "cancel";
-			console.error("Please enter o, r, or c.");
-		}
-	} catch {
-		return "cancel";
-	} finally {
-		rl.close();
-	}
+function buildTuiDiffContext(opts, branch) {
+	const onBranch = branch ? ` on ${branch}` : "";
+	const detail = pathspecDetail(opts.pathspecs);
+	if (opts.showMode) {
+		const label = opts.showRevspecs.join(" ");
+		return {
+			kind: "commit",
+			headline: label ? `Showing ${label}` : "Commit changes",
+			...detail ? { detail } : {}
+		};
+	}
+	if (opts.revisions.length > 0) {
+		const current = branch ? ` (current: ${branch})` : "";
+		return {
+			kind: "range",
+			headline: `Comparing ${opts.revisions.join(" ")}${current}`,
+			...detail ? { detail } : {}
+		};
+	}
+	if (opts.staged) return {
+		kind: "staged-only",
+		headline: `Staged changes${onBranch}`,
+		...detail ? { detail } : {}
+	};
+	return {
+		kind: "working-tree",
+		headline: `Working-tree changes${onBranch}`,
+		...detail ? { detail } : {}
+	};
 }
-function defaultClearLock(lock) {
-	const current = readServerLock(lock.repoRoot);
-	if (current && current.pid === lock.pid) removeServerLock(lock.repoRoot);
-}
-function pidAlive(pid, kill) {
-	try {
-		kill(pid, 0);
-		return true;
-	} catch {
-		return false;
-	}
+function pathspecDetail(pathspecs) {
+	if (pathspecs.length === 0) return void 0;
+	if (pathspecs.length === 1) return `Path: ${pathspecs[0]}`;
+	return `${pathspecs.length} path filters`;
 }
+//#endregion
+//#region src/lib/tui-child-lifecycle.ts
 /**
-* Gracefully stop the process that owns `lock`, then clear a matching lockfile.
-* SIGTERM → wait → SIGKILL → wait → throw.
+* Release optional TUI-side resources without leaving the CLI's launch
+* promise pending. Cleanup failures must not replace the native process's
+* exit code.
 */
-async function stopLockOwner(lock, options = {}) {
-	const timeoutMs = options.timeoutMs ?? 5e3;
-	const killDeadlineMs = options.killDeadlineMs ?? 2e3;
-	const pollMs = options.pollMs ?? 100;
-	const kill = options.kill ?? ((pid, signal) => process.kill(pid, signal));
-	const sleep = options.sleep ?? sleepMs;
-	const now = options.now ?? Date.now;
-	const isAlive = options.isAlive ?? ((candidate) => pidAlive(candidate.pid, kill));
-	const clearLock = options.clearLock ?? defaultClearLock;
-	if (!isAlive(lock)) {
-		clearLock(lock);
-		return;
-	}
+async function finishTuiChild(resource, settle) {
 	try {
-		kill(lock.pid, "SIGTERM");
-	} catch {}
-	const termDeadline = now() + timeoutMs;
-	while (now() < termDeadline) {
-		if (!isAlive(lock)) {
-			clearLock(lock);
-			return;
-		}
-		await sleep(pollMs);
-	}
-	try {
-		kill(lock.pid, "SIGKILL");
-	} catch {}
-	const killDeadline = now() + killDeadlineMs;
-	while (now() < killDeadline) {
-		if (!isAlive(lock)) {
-			clearLock(lock);
-			return;
-		}
-		await sleep(pollMs);
-	}
-	throw new Error(`Timed out waiting for diffing pid ${lock.pid} to exit after SIGTERM/SIGKILL. End that process manually and try again.`);
-}
-/** Print and optionally open the existing web/gh-pr session; message-only for TUI. */
-async function openExistingSession(lock, options) {
-	if ((lock.mode ?? "web") === "tui") {
-		console.log(`A diffing TUI session is already open for this repository (pid ${lock.pid}). Use that terminal, or replace it with --replace-session.`);
-		return;
-	}
-	const url = existingSessionUrl(lock);
-	if (!url) {
-		console.log(`A diffing review is already running for this repository (pid ${lock.pid}).`);
-		return;
-	}
-	console.log(`Opening existing diffing session at ${url}`);
-	if (options.noOpen) return;
-	if (options.openUrl) {
-		await options.openUrl(url);
-		return;
-	}
-	try {
-		const settings = loadSettings();
-		const openModule = await import("open");
-		let appName;
-		if (settings.browser) appName = openModule.apps[settings.browser] || settings.browser;
-		const openOptions = appName ? { app: { name: appName } } : {};
-		await openModule.default(url, openOptions);
-	} catch (err) {
-		console.error("Failed to open browser:", err instanceof Error ? err.message : err);
+		await resource?.close();
+	} catch {} finally {
+		settle();
 	}
 }
 //#endregion
@@ -585,7 +483,9 @@ if (new Set([
 	"doctor",
 	"completion",
 	"progress",
-	"inspect"
+	"inspect",
+	"mode",
+	"sessions"
 ]).has(args[0])) {
 	if (args[0] === "mcp") {
 		const mcpArgs = args.slice(1);
@@ -636,19 +536,27 @@ See docs/cli.md §5 (MCP) for the full tool table.`);
 			console.error("diffing mcp: --repo must be an absolute path");
 			process.exit(5);
 		}
-		const { startMcpServer } = await import("./mcp-Dq7J5QOP.mjs");
+		const { startMcpServer } = await import("./mcp-DtVrMR2S.mjs");
 		await startMcpServer({ repoPath });
 		await new Promise(() => {});
 	}
-	const { runSubcommand } = await import("./cli-agent-BJiATn11.mjs");
+	const { runSubcommand } = await import("./cli-agent-DkwGxuy2.mjs");
 	process.exit(await runSubcommand(args[0], args.slice(1)));
 }
+if (args[0] === "view") {
+	args.shift();
+	args.unshift("--view");
+}
 let showSubcommand = false;
 if (args[0] === "show") {
 	showSubcommand = true;
 	args.shift();
 }
-const opts = parseDiffOptions(args);
+const opts = parseDiffOptions(args, prRef ? "web" : loadSettings().defaultMode);
+if (opts.reuseSession && opts.replaceSession) {
+	console.error("Cannot combine --reuse-session and --replace-session.");
+	process.exit(5);
+}
 if (!prRef && opts.ghPr) prRef = opts.ghPr;
 if (showSubcommand) {
 	if (opts.revisions.length === 0 && !opts.help && !opts.version) {
@@ -673,7 +581,7 @@ if (envErr) {
 	process.exit(1);
 }
 if (opts.outputMode === "tui") {
-	const tuiResult = await launchTui(args);
+	const tuiResult = await launchTui(args, opts);
 	process.exit(tuiResult);
 }
 if (opts.outputMode === "terminal") {
@@ -684,7 +592,7 @@ const __pkgDir = dirname(fileURLToPath(import.meta.url));
 const currentVersion = JSON.parse(readFileSync(resolve(__pkgDir, "..", "package.json"), "utf-8")).version;
 const updateCheckPromise = (async () => {
 	try {
-		const { checkForUpdates } = await import("./update-check-DUuHmPeZ.mjs");
+		const { checkForUpdates } = await import("./update-check-Copcz9eb.mjs");
 		return await checkForUpdates(currentVersion);
 	} catch {
 		return null;
@@ -707,51 +615,21 @@ if (!startupLease) {
 	console.error("Another diffing process is starting a review for this repository. Retry in a moment.");
 	process.exit(3);
 }
-const existingLock = readServerLock(repoRoot);
-if (existingLock && isLockAlive(existingLock, repoRoot)) {
+const activeSession = opts.reuseSession || opts.replaceSession ? resolveActiveServerLock(repoRoot) : null;
+if (activeSession && opts.reuseSession) {
 	startupLease.release();
 	startupLease = null;
-	if (opts.reuseSession && opts.replaceSession) {
-		console.error("Cannot combine --reuse-session and --replace-session.");
-		process.exit(5);
-	}
-	let action;
-	try {
-		action = await resolveSessionConflictAction({
-			lock: existingLock,
-			reuseSession: opts.reuseSession,
-			replaceSession: opts.replaceSession,
-			canPrompt: Boolean(process.stdin.isTTY && process.stdout.isTTY)
-		});
-	} catch (error) {
-		const detail = error instanceof Error ? error.message : String(error);
-		console.error(detail);
-		process.exit(5);
-	}
-	if (action === "cancel") {
-		console.error(conflictFailMessage(existingLock));
-		process.exit(3);
-	}
-	if (action === "open") {
-		const live = readServerLock(repoRoot);
-		await openExistingSession(live && isLockAlive(live, repoRoot) ? live : existingLock, { noOpen: opts.noOpen });
-		process.exit(0);
-	}
-	startupLease = acquireServerStartupLease(repoRoot, sessionOwnerId);
-	if (!startupLease) {
-		console.error("Another diffing process is starting a review for this repository. Retry in a moment.");
-		process.exit(3);
-	}
-	const afterLease = readServerLock(repoRoot);
-	if (afterLease && isLockAlive(afterLease, repoRoot)) try {
-		console.error(`Stopping existing diffing session (pid ${afterLease.pid})…`);
-		await stopLockOwner(afterLease);
-	} catch (error) {
-		startupLease.release();
-		const detail = error instanceof Error ? error.message : String(error);
-		console.error(detail);
-		process.exit(1);
-	}
+	await openExistingSession(activeSession, { noOpen: opts.noOpen });
+	process.exit(0);
+}
+if (activeSession && opts.replaceSession) try {
+	console.error(`Stopping active diffing session (pid ${activeSession.pid})…`);
+	await stopLockOwner(activeSession);
+} catch (error) {
+	startupLease.release();
+	const detail = error instanceof Error ? error.message : String(error);
+	console.error(detail);
+	process.exit(1);
 }
 let actualPort;
 let prMode;
@@ -775,7 +653,8 @@ try {
 		mode: prMode ? "gh-pr" : "web",
 		prRef: prMode ? prRef ?? void 0 : void 0,
 		scope: diffScopeKey(opts),
-		ownerId: sessionOwnerId
+		ownerId: sessionOwnerId,
+		sessionId: sessionOwnerId
 	});
 } catch (error) {
 	startupLease?.release();
@@ -802,7 +681,7 @@ playStartupDisplay();
 try {
 	const updateInfo = await updateCheckPromise;
 	if (updateInfo?.hasUpdate) {
-		const { printUpdateDisclaimer } = await import("./update-check-DUuHmPeZ.mjs");
+		const { printUpdateDisclaimer } = await import("./update-check-Copcz9eb.mjs");
 		printUpdateDisclaimer(currentVersion, updateInfo.latestVersion);
 	}
 } catch {}
@@ -818,8 +697,23 @@ process.on("SIGTERM", shutdown);
 * so the search paths anchor to the bundled CLI's directory. The real
 * implementation lives in `lib/find-tui-binary.ts` and is unit-tested there.
 */
-function findTuiBinary() {
-	return findTuiBinary$1(import.meta.url);
+function findTuiBinary(requireViewer = false) {
+	if (!requireViewer) return findTuiBinary$1(import.meta.url);
+	return findTuiBinaries(import.meta.url).find((candidate) => {
+		try {
+			return execFileSync(candidate, ["--help"], {
+				encoding: "utf-8",
+				stdio: [
+					"ignore",
+					"pipe",
+					"ignore"
+				],
+				timeout: 5e3
+			}).includes("--view-only");
+		} catch {
+			return false;
+		}
+	}) ?? null;
 }
 /**
 * Fall back to default `git diff` output when the TUI cannot run.
@@ -827,9 +721,10 @@ function findTuiBinary() {
 * in a non-TTY context.
 */
 function runTerminalFallback(args) {
-	const terminalOpts = parseDiffOptions(args.filter((a) => a !== "--tui"));
+	const terminalOpts = parseDiffOptions(args.filter((a) => a !== "--tui" && a !== "--view"));
 	terminalOpts.outputMode = "terminal";
 	terminalOpts.tui = false;
+	terminalOpts.viewOnly = false;
 	return runTerminalDiff(terminalOpts);
 }
 /**
@@ -837,38 +732,72 @@ function runTerminalFallback(args) {
 * exit code. If the TUI cannot start (no TTY, missing binary), prints a
 * single stderr line and falls back to the default `git diff` output.
 */
-async function launchTui(args) {
+async function launchTui(args, opts) {
+	const viewOnly = args.includes("--view");
+	const requestedMode = viewOnly ? "diffing view" : "diffing --tui";
 	if (!process.stdout.isTTY || !process.stdin.isTTY) {
-		console.error("diffing --tui requires a TTY; falling back to git diff");
+		console.error(`${requestedMode} requires a TTY; falling back to git diff`);
 		return runTerminalFallback(args);
 	}
-	const bin = findTuiBinary();
+	const bin = findTuiBinary(viewOnly);
 	if (!bin) {
-		console.error("diffing-tui binary not found; build it with `pnpm build:tui`; falling back to git diff");
+		console.error(`${viewOnly ? "compatible " : ""}diffing-tui binary not found; reinstall with \`npm i -g diffing@latest\` or build it with \`pnpm build:tui\`; falling back to git diff`);
 		return runTerminalFallback(args);
 	}
-	const forwarded = args.filter((a) => a !== "--tui");
+	const forwarded = buildTuiGitDiffArgs(opts);
 	let repoRoot;
 	try {
 		repoRoot = getRepoRoot();
 	} catch {
 		repoRoot = process.cwd();
 	}
-	console.log(`diffing TUI starting (binary: ${bin})`);
-	await playStartupDisplay();
+	const activeSession = opts.reuseSession || opts.replaceSession ? resolveActiveServerLock(repoRoot) : null;
+	if (activeSession && opts.reuseSession) {
+		await openExistingSession(activeSession, { noOpen: opts.noOpen });
+		return 0;
+	}
+	if (activeSession && opts.replaceSession) try {
+		console.error(`Stopping active diffing session (pid ${activeSession.pid})…`);
+		await stopLockOwner(activeSession);
+	} catch (error) {
+		console.error(error instanceof Error ? error.message : String(error));
+		return 1;
+	}
+	let searchBridge = null;
+	try {
+		const { startTuiSearchBridge } = await import("./tui-search-bridge-Bfb2ktdA.mjs");
+		searchBridge = await startTuiSearchBridge();
+	} catch (error) {
+		console.error(`diffing: fff search unavailable in TUI: ${error?.message ?? error}`);
+	}
+	const diffContext = buildTuiDiffContext(opts, getBranchName());
+	const sessionId = randomUUID();
 	return new Promise((resolveP) => {
 		const child = spawn(bin, [
 			"--repo",
 			repoRoot,
+			...viewOnly ? ["--view-only"] : [],
 			...forwarded
 		], {
 			stdio: "inherit",
-			env: process.env
+			env: {
+				...process.env,
+				DIFFING_TUI_DIFF_CONTEXT: JSON.stringify(diffContext),
+				DIFFING_TUI_SESSION_ID: sessionId,
+				DIFFING_TUI_SESSION_SCOPE: diffScopeKey(opts),
+				DIFFING_TUI_SESSION_ARGS: JSON.stringify(forwarded),
+				...searchBridge ? {
+					DIFFING_TUI_SEARCH_ENDPOINT: searchBridge.endpoint,
+					DIFFING_TUI_SEARCH_CAPABILITY: searchBridge.capability
+				} : {}
+			}
+		});
+		child.on("exit", (code) => {
+			finishTuiChild(searchBridge, () => resolveP(code ?? 0));
 		});
-		child.on("exit", (code) => resolveP(code ?? 0));
 		child.on("error", (err) => {
 			console.error(`diffing-tui failed to start: ${err.message}; falling back to git diff`);
-			resolveP(runTerminalFallback(args));
+			finishTuiChild(searchBridge, () => resolveP(runTerminalFallback(args)));
 		});
 	});
 }