diffing 0.10.4 → 0.11.0

package/dist/{server-CZeMCHEa.mjs → server-j0PnTVX1.mjs}

@@ -1,8 +1,9 @@
 import { C as isSafePath, S as revertHunk, _ as getUntrackedFilePathsAsync, a as getCustomGitDiffAsync, b as listRepoFiles, c as getGitDiffAsync, d as getProjectStorageDir, f as getRepoName, g as getTabSizeForFiles, h as getShowDiff, i as getCommitSeriesSummary, l as getHunkHistory, o as getFileContent, p as getRepoRoot, r as getBranchName, u as getMergeStatus, v as gitAddFile, w as toSafeRelativePath, y as isGitRepo } from "./git-Czo96ymM.mjs";
-import { a as searchContent, c as trackSelection, i as searchAll, n as saveSettings, o as searchFiles, r as getSearchStatus, s as searchSymbols, t as loadSettings } from "./settings-bwe7yQ8U.mjs";
-import { t as formatComments } from "./comment-format-B5AcGcR-.mjs";
-import { n as formatPlanReview, r as sectionTitleForLine, t as extractPlanLines } from "./plan-format-BQyx--mp.mjs";
-import { D as updatePrReviewComment, E as submitReview, S as refreshPrSession, T as setPrReviewThreadResolved, a as detectCwdRepo, b as parsePrRef, f as fetchPrFileContentViaGh, i as deletePrReviewComment, l as fetchExistingCommentsViaGh, t as buildPrSession, u as fetchExistingReviewsViaGh, w as resolvedFromSession } from "./github-Cf5blBty.mjs";
+import { a as searchFiles, i as searchContent, o as searchSymbols, r as searchAll, s as trackSelection, t as getSearchStatus } from "./search-BMPY_ZW8.mjs";
+import { n as saveSettings, t as loadSettings } from "./settings-yK0GYpbn.mjs";
+import { t as formatComments } from "./comment-format-B85NHZnG.mjs";
+import { n as formatPlanReview, r as sectionTitleForLine, t as extractPlanLines } from "./plan-format-BwJh5JSE.mjs";
+import { D as updatePrReviewComment, E as submitReview, S as refreshPrSession, T as setPrReviewThreadResolved, a as detectCwdRepo, b as parsePrRef, f as fetchPrFileContentViaGh, i as deletePrReviewComment, l as fetchExistingCommentsViaGh, t as buildPrSession, u as fetchExistingReviewsViaGh, w as resolvedFromSession } from "./github-DBsZ0h_l.mjs";
 import { execFileSync } from "node:child_process";
 import { createHash } from "node:crypto";
 import { fileURLToPath } from "node:url";
@@ -34,6 +35,7 @@ const DEFAULTS = {
 	pickaxeAll: false,
 	exitCode: false,
 	quiet: false,
+	suppressPatch: false,
 	noPrefix: false,
 	binary: false,
 	fullIndex: false,
@@ -51,11 +53,14 @@ const DEFAULTS = {
 	outputMode: "auto",
 	host: "127.0.0.1",
 	noOpen: false,
+	reuseSession: false,
+	replaceSession: false,
 	help: false,
 	version: false,
 	includeUnstaged: true,
 	includeUntracked: true,
 	tui: false,
+	viewOnly: false,
 	gpu: false,
 	showMode: false,
 	showRevspecs: []
@@ -179,6 +184,14 @@ const DIFFING_OPTIONS = {
 		type: "boolean",
 		default: false
 	},
+	"reuse-session": {
+		type: "boolean",
+		default: false
+	},
+	"replace-session": {
+		type: "boolean",
+		default: false
+	},
 	web: {
 		type: "boolean",
 		default: false
@@ -191,6 +204,10 @@ const DIFFING_OPTIONS = {
 		type: "boolean",
 		default: false
 	},
+	view: {
+		type: "boolean",
+		default: false
+	},
 	gpu: {
 		type: "boolean",
 		default: false
@@ -216,6 +233,7 @@ function printHelp() {
 
 Usage: diffing [<git diff options>] [<revision>...] [-- <path>...]
        diffing --web [<git diff options>] [<revision>...] [-- <path>...]
+       diffing view [<git diff options>] [<revision>...] [-- <path>...]
        diffing [server options]
 
 Git Diff Options (drop-in replacement for git diff):`);
@@ -226,21 +244,26 @@ Diffing Server Options:
   --host <host>        Host address to bind to (default: 127.0.0.1). Pass
                        0.0.0.0 to expose the server to the local network.
   --no-open            Don't open the browser automatically
+  --reuse-session      Open the active review instead of starting another
+  --replace-session    Stop the active review and start a replacement
   --gh-pr <ref>        Open a GitHub PR review session (number, owner/repo#N, or URL)
                        Same as: diffing "gh pr <ref>"
 
 Output Modes:
   By default diffing auto-selects the best output mode:
   - Terminal mode: when output is a pipe, redirect, or non-TTY
-  - Web mode:     when output is a TTY (interactive terminal)
+  - Web or TUI:   saved preference for an interactive terminal (web by default)
 
-  Force a mode with --web, --terminal, or --tui flags.
+  Force a mode with --web, --terminal, --tui, or --view flags.
+  Change the interactive default with: diffing mode <web|tui>
+  --view opens a focused, read-only diff browser with fff-powered search.
   --tui is experimental and opt-in. It opens a native-Rust terminal
   interface that mirrors the web dashboard. Falls back to git diff
   output if the environment cannot support a TUI (piped stdin, CI,
   missing binary).
 
 Subcommands:
+  view [diff options]    Browse diffs in the focused read-only native TUI
   show <revspec>...    Drop-in for 'git show'. Renders commit metadata
                        above the diff. Accepts commits, ranges, tags.
   await-review         Block until human clicks Send to agent; print XML
@@ -250,11 +273,13 @@ Subcommands:
   comment edit|delete <id>
   progress --message … Live agent progress toast
   url                  Print the active review base URL
+  sessions             List, select, open, and stop running review sessions
   plan <submit|await|list|show|versions|reply|resolve>
   gh <status|overview|threads|reviews|pr-fetch|pr-list-comments|pr-review>
   mcp [--repo PATH]    Stdio MCP server for agents
   inspect <summary|files|hunks|slice|search>
                        Bounded reads from a running web, TUI, or PR session
+  mode [web|tui]       Get or set the default interactive review mode
   doctor               Environment self-check
   completion <bash|zsh|fish>
   update               Check for a newer npm release
@@ -263,7 +288,7 @@ Custom ranges (e.g. main..feature) and 'gh pr' sessions also display a
 "what is this diff" banner in the web UI summarising the diff source.
 
 Examples:
-  diffing                        Review uncommitted changes (web UI)
+  diffing                        Review uncommitted changes (preferred UI)
   diffing --staged               Review staged changes
   diffing HEAD~3                 Review last 3 commits
   diffing main..feature          Compare branches
@@ -276,7 +301,11 @@ Examples:
   diffing --word-diff=color      Word-level diff in color
   diffing -b -w                  Ignore whitespace changes
   diffing --host 0.0.0.0         Allow other machines on the LAN to review
+  diffing view                   Browse the working-tree diff in the TUI
+  diffing view --staged          Browse staged changes
+  diffing --view main..feature   Browse a branch comparison
   diffing --tui                  Open the experimental TUI (native Rust)
+  diffing mode tui               Use the TUI by default in interactive terminals
   diffing await-review           Agent: wait for human handoff
   diffing plan submit PLAN.md    Agent: submit a plan for approval
   diffing mcp --repo /abs/path   MCP server bound to one repository
@@ -467,7 +496,7 @@ function preprocessOptionalValueArgs(rawArgs) {
 * 3. Parse known flags via node:util.parseArgs
 * 4. Anything unknown / positional becomes a revision or pathspec
 */
-function parseDiffOptions(rawArgs) {
+function parseDiffOptions(rawArgs, defaultInteractiveMode = "web") {
 	const { values, positionals } = parseArgs({
 		options: {
 			...GIT_DIFF_OPTIONS,
@@ -488,7 +517,10 @@ function parseDiffOptions(rawArgs) {
 	if (values.port) opts.port = parseInt(values.port, 10);
 	if (values.host) opts.host = values.host;
 	if (values["no-open"]) opts.noOpen = true;
+	if (values["reuse-session"]) opts.reuseSession = true;
+	if (values["replace-session"]) opts.replaceSession = true;
 	if (values["gh-pr"]) opts.ghPr = String(values["gh-pr"]);
+	if (values.view) opts.viewOnly = true;
 	if (values.staged || values.cached) opts.staged = true;
 	if (values.merge) opts.merge = true;
 	const algo = values["diff-algorithm"];
@@ -572,8 +604,14 @@ function parseDiffOptions(rawArgs) {
 	if (values.dirstat) opts.dirstat = values.dirstat;
 	if (values["dirstat-by-file"]) opts.dirstatByFile = values["dirstat-by-file"];
 	if (values.cumulative) opts.cumulative = true;
-	if (values["no-patch"]) opts.outputFormat = void 0;
-	if (values.check) opts.outputFormat = void 0;
+	if (values["no-patch"]) {
+		opts.outputFormat = void 0;
+		opts.suppressPatch = true;
+	}
+	if (values.check) {
+		opts.outputFormat = void 0;
+		opts.check = true;
+	}
 	if (values["diff-filter"]) opts.diffFilter = values["diff-filter"];
 	if (values.S) opts.pickaxeString = values.S;
 	if (values.G) opts.pickaxeRegex = values.G;
@@ -622,12 +660,13 @@ function parseDiffOptions(rawArgs) {
 		}
 		for (let i = dashDashIdx + 1; i < rawArgs.length; i++) opts.pathspecs.push(rawArgs[i]);
 	} else for (const p of positionals) opts.revisions.push(p);
-	if (values.tui) opts.outputMode = "tui";
+	if (values.view) opts.outputMode = "tui";
+	else if (values.tui) opts.outputMode = "tui";
 	else if (values.web) opts.outputMode = "web";
 	else if (values.terminal) opts.outputMode = "terminal";
-	if (process.stdout.isTTY && opts.outputMode === "auto") opts.outputMode = "web";
+	if (process.stdout.isTTY && opts.outputMode === "auto") opts.outputMode = values["gh-pr"] ? "web" : defaultInteractiveMode;
 	else if (!process.stdout.isTTY && opts.outputMode === "auto") opts.outputMode = "terminal";
-	if (opts.outputFormat || opts.patchWithRaw || opts.patchWithStat || opts.exitCode || opts.quiet || opts.outputFile) opts.outputMode = "terminal";
+	if (opts.outputFormat || opts.patchWithRaw || opts.patchWithStat || opts.compactSummary || opts.dirstat || opts.dirstatByFile || opts.cumulative || opts.suppressPatch || opts.check || opts.exitCode || opts.quiet || opts.outputFile || opts.colorMoved || opts.colorMovedWs || opts.srcPrefix || opts.dstPrefix || opts.noPrefix || opts.linePrefix || opts.submodule !== void 0 && opts.submodule !== "diff" || opts.extDiff) opts.outputMode = "terminal";
 	return opts;
 }
 /**
@@ -679,6 +718,7 @@ function buildGitDiffArgs(opts) {
 	if (opts.dirstatByFile) args.push(`--dirstat-by-file=${opts.dirstatByFile}`);
 	if (opts.cumulative) args.push("--cumulative");
 	if (opts.check) args.push("--check");
+	if (opts.suppressPatch) args.push("--no-patch");
 	if (opts.diffFilter) args.push(`--diff-filter=${opts.diffFilter}`);
 	if (opts.pickaxeString) args.push(`-S${opts.pickaxeString}`);
 	if (opts.pickaxeRegex) args.push(`-G${opts.pickaxeRegex}`);
@@ -709,6 +749,23 @@ function buildGitDiffArgs(opts) {
 	return args;
 }
 /**
+* Build the machine-stable patch arguments consumed by the native index.
+* Presentation-only word/color modes are implemented by the renderer and
+* must not rewrite the unified patch stream that Rust parses.
+*/
+function buildTuiGitDiffArgs(opts) {
+	return buildGitDiffArgs({
+		...opts,
+		revisions: opts.showMode ? [...opts.showRevspecs] : [...opts.revisions],
+		pathspecs: [...opts.pathspecs],
+		wordDiff: void 0,
+		wordDiffRegex: void 0,
+		colorWords: void 0,
+		colorMoved: void 0,
+		colorMovedWs: void 0
+	});
+}
+/**
 * Transform a `parseDiffOptions(...)` result into a "show mode" variant:
 * moves any parsed revisions into `showRevspecs`, clears `revisions` (so the
 * existing diff-engine path does not try to `git diff` them), and sets the
@@ -1141,6 +1198,7 @@ function validateEnvironment() {
 var FileCommentStore = class {
 	dirPath;
 	filePath;
+	mutationQueue = Promise.resolve();
 	/**
 	* @param storageDir Absolute directory to persist `comments.json` in.
 	*   Defaults to the per-repo storage dir under `~/.diffing` — comments are
@@ -1172,74 +1230,100 @@ var FileCommentStore = class {
 			console.error("Failed to save comments to file:", err);
 		}
 	}
+	/** Serialize each read-modify-write cycle so concurrent API calls cannot overwrite one another. */
+	enqueueMutation(operation) {
+		const result = this.mutationQueue.then(operation, operation);
+		this.mutationQueue = result.then(() => void 0, () => void 0);
+		return result;
+	}
 	async add(comment) {
-		const comments = await this.getAll();
-		comments.push(comment);
-		await this.save(comments);
-		return comment;
+		return this.enqueueMutation(async () => {
+			const comments = await this.getAll();
+			comments.push(comment);
+			await this.save(comments);
+			return comment;
+		});
 	}
 	async update(id, fields) {
-		const comments = await this.getAll();
-		const index = comments.findIndex((c) => c.id === id);
-		if (index === -1) return null;
-		const comment = comments[index];
-		if (fields.body !== void 0) comment.body = fields.body;
-		if (fields.status !== void 0) comment.status = fields.status;
-		await this.save(comments);
-		return comment;
+		return this.enqueueMutation(async () => {
+			const comments = await this.getAll();
+			const index = comments.findIndex((c) => c.id === id);
+			if (index === -1) return null;
+			const comment = comments[index];
+			if (fields.body !== void 0) comment.body = fields.body;
+			if (fields.status !== void 0) comment.status = fields.status;
+			await this.save(comments);
+			return comment;
+		});
 	}
 	async resolveAllOpen() {
-		const comments = await this.getAll();
-		let n = 0;
-		for (const c of comments) if (c.status === "open") {
-			c.status = "resolved";
-			n++;
-		}
-		if (n > 0) await this.save(comments);
-		return n;
+		return this.enqueueMutation(async () => {
+			const comments = await this.getAll();
+			let n = 0;
+			for (const c of comments) if (c.status === "open") {
+				c.status = "resolved";
+				n++;
+			}
+			if (n > 0) await this.save(comments);
+			return n;
+		});
 	}
 	async remove(id) {
-		const comments = await this.getAll();
-		const index = comments.findIndex((c) => c.id === id);
-		if (index === -1) return false;
-		comments.splice(index, 1);
-		await this.save(comments);
-		return true;
+		return this.enqueueMutation(async () => {
+			const comments = await this.getAll();
+			const index = comments.findIndex((c) => c.id === id);
+			if (index === -1) return false;
+			comments.splice(index, 1);
+			await this.save(comments);
+			return true;
+		});
 	}
 	async addReply(commentId, reply) {
-		const comments = await this.getAll();
-		const index = comments.findIndex((c) => c.id === commentId);
-		if (index === -1) return null;
-		const comment = comments[index];
-		if (!comment.replies) comment.replies = [];
-		comment.replies.push(reply);
-		await this.save(comments);
-		return comment;
+		return this.enqueueMutation(async () => {
+			const comments = await this.getAll();
+			const index = comments.findIndex((c) => c.id === commentId);
+			if (index === -1) return null;
+			const comment = comments[index];
+			if (!comment.replies) comment.replies = [];
+			comment.replies.push(reply);
+			await this.save(comments);
+			return comment;
+		});
 	}
 	async removeReply(commentId, replyId) {
-		const comments = await this.getAll();
-		const index = comments.findIndex((c) => c.id === commentId);
-		if (index === -1) return null;
-		const comment = comments[index];
-		const replyIndex = comment.replies.findIndex((r) => r.id === replyId);
-		if (replyIndex === -1) return null;
-		comment.replies.splice(replyIndex, 1);
-		await this.save(comments);
-		return comment;
+		return this.enqueueMutation(async () => {
+			const comments = await this.getAll();
+			const index = comments.findIndex((c) => c.id === commentId);
+			if (index === -1) return null;
+			const comment = comments[index];
+			const replyIndex = comment.replies.findIndex((r) => r.id === replyId);
+			if (replyIndex === -1) return null;
+			comment.replies.splice(replyIndex, 1);
+			await this.save(comments);
+			return comment;
+		});
 	}
 	async updateReply(commentId, replyId, body) {
-		const comments = await this.getAll();
-		const index = comments.findIndex((c) => c.id === commentId);
-		if (index === -1) return null;
-		const comment = comments[index];
-		const reply = comment.replies.find((r) => r.id === replyId);
-		if (!reply) return null;
-		reply.body = body;
-		await this.save(comments);
-		return comment;
+		return this.enqueueMutation(async () => {
+			const comments = await this.getAll();
+			const index = comments.findIndex((c) => c.id === commentId);
+			if (index === -1) return null;
+			const comment = comments[index];
+			const reply = comment.replies.find((r) => r.id === replyId);
+			if (!reply) return null;
+			reply.body = body;
+			await this.save(comments);
+			return comment;
+		});
 	}
 };
 //#endregion
+//#region src/lib/types.ts
+/** Runtime guard for comment data crossing HTTP or persisted-storage boundaries. */
+function isReviewCommentSide(value) {
+	return value === "deletions" || value === "additions";
+}
+//#endregion
 //#region src/lib/plans.ts
 /** Absolute path of the persisted markdown mirror for a plan id. */
 function planSourceFilePath(storageDir, planId) {
@@ -3333,6 +3417,7 @@ function createApp(clientDir, diffOptsInput = DEFAULTS, commentStore, planStore,
 	});
 	app.post("/api/comments", async (c) => {
 		const body = await c.req.json();
+		if (!isReviewCommentSide(body.side)) return c.json({ error: "side must be additions or deletions" }, 400);
 		const severityRaw = body.severity;
 		const severity = severityRaw === "blocking" || severityRaw === "nit" || severityRaw === "question" || severityRaw === "praise" || severityRaw === "none" ? severityRaw : void 0;
 		const comment = {
@@ -3401,7 +3486,7 @@ function createApp(clientDir, diffOptsInput = DEFAULTS, commentStore, planStore,
 			if (!relPath) return c.json({ error: "Forbidden file path" }, 403);
 			const absolutePath = resolve(root, relPath);
 			const content = await readFile(absolutePath, "utf-8");
-			const { applySuggestionToContent } = await import("./apply-suggestion-BAuyCYk6.mjs");
+			const { applySuggestionToContent } = await import("./apply-suggestion-CHYnw68I.mjs");
 			const result = applySuggestionToContent({
 				content,
 				lineNumber: comment.lineNumber,
@@ -3648,7 +3733,7 @@ function createApp(clientDir, diffOptsInput = DEFAULTS, commentStore, planStore,
 		const session = await prStore.get();
 		if (!session) return notInPrMode(c);
 		try {
-			const { fetchPrChecks } = await import("./github-DWgPIcKC.mjs");
+			const { fetchPrChecks } = await import("./github-CErBub2y.mjs");
 			const checks = await fetchPrChecks(resolvedFromSession(session), session.headSha);
 			const summary = {
 				total: checks.length,
@@ -3680,7 +3765,7 @@ function createApp(clientDir, diffOptsInput = DEFAULTS, commentStore, planStore,
 		const text = typeof body.body === "string" ? body.body.trim() : "";
 		if (!text) return c.json({ error: "body is required" }, 400);
 		try {
-			const { replyToPrComment } = await import("./github-DWgPIcKC.mjs");
+			const { replyToPrComment } = await import("./github-CErBub2y.mjs");
 			const result = await replyToPrComment({
 				resolved: resolvedFromSession(session),
 				inReplyTo: id,
@@ -3894,18 +3979,32 @@ function createApp(clientDir, diffOptsInput = DEFAULTS, commentStore, planStore,
 		if (decision !== "approve" && decision !== "comment" && decision !== "request-changes" && decision !== "draft") return c.json({ error: "decision must be one of: approve, comment, request-changes, draft" }, 400);
 		const generalBody = typeof body.body === "string" ? body.body : "";
 		if (body.dryRun === true) {
-			const { buildReviewPayload } = await import("./github-DWgPIcKC.mjs");
+			const { buildReviewPayload, resolvedFromSession } = await import("./github-CErBub2y.mjs");
+			const { rewriteLocalAttachmentsInBodies } = await import("./github-attachments-plDeB0iE.mjs");
+			const resolved = resolvedFromSession(session);
+			const comments = session.comments ?? [];
+			const rewritten = await rewriteLocalAttachmentsInBodies(resolved, [generalBody, ...comments.map((c) => c.body ?? "")], { dryRun: true });
+			if (rewritten.error) return c.json({
+				ok: false,
+				dryRun: true,
+				error: rewritten.error
+			}, 400);
+			const [body, ...commentBodies] = rewritten.bodies;
 			const payload = buildReviewPayload({
 				decision,
-				body: generalBody,
-				comments: session.comments ?? []
+				body: body ?? generalBody,
+				comments: comments.map((c, i) => ({
+					...c,
+					body: commentBodies[i] ?? c.body
+				}))
 			});
 			return c.json({
 				ok: true,
 				dryRun: true,
 				authSource: session.authSource ?? "none",
 				failedComments: 0,
-				payload
+				payload,
+				attachmentRewrites: rewritten.urlMap
 			});
 		}
 		const result = await submitReview({
@@ -3978,7 +4077,7 @@ function createApp(clientDir, diffOptsInput = DEFAULTS, commentStore, planStore,
 		const openCount = all.filter((x) => x.status === "open").length;
 		let diffFingerprints;
 		try {
-			const { fingerprintDiffFiles } = await import("./diff-fingerprint-CWa-soYD.mjs");
+			const { fingerprintDiffFiles } = await import("./diff-fingerprint-BgR0tu1o.mjs");
 			if (prMode) {
 				const prSession = await prStore.get();
 				if (prSession?.diff) diffFingerprints = fingerprintDiffFiles(prSession.diff);
@@ -4046,7 +4145,7 @@ function createApp(clientDir, diffOptsInput = DEFAULTS, commentStore, planStore,
 		} catch (err) {
 			return c.json({ error: err?.message ?? "Failed to compute current diff" }, 500);
 		}
-		const { fingerprintDiffFiles, diffSinceLast, filesToReviewSinceLast } = await import("./diff-fingerprint-CWa-soYD.mjs");
+		const { fingerprintDiffFiles, diffSinceLast, filesToReviewSinceLast } = await import("./diff-fingerprint-BgR0tu1o.mjs");
 		const delta = diffSinceLast(previous, fingerprintDiffFiles(currentPatch));
 		return c.json({
 			hasBaseline: true,
@@ -4380,4 +4479,4 @@ async function startServer(options) {
 	});
 }
 //#endregion
-export { intoShowMode as a, buildGitDiffArgs as i, runTerminalDiff as n, parseDiffOptions as o, validateEnvironment as r, printHelp as s, startServer as t };
+export { buildTuiGitDiffArgs as a, printHelp as c, buildGitDiffArgs as i, runTerminalDiff as n, intoShowMode as o, validateEnvironment as r, parseDiffOptions as s, startServer as t };