diffing 0.10.3 → 0.10.5

package/dist/{server-Bjzyb6NG.mjs → server-C9i4V36o.mjs}

@@ -1,8 +1,8 @@
 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-BVnzGFL7.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 { 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-CEjtGd41.mjs";
 import { execFileSync } from "node:child_process";
 import { createHash } from "node:crypto";
 import { fileURLToPath } from "node:url";
@@ -51,6 +51,8 @@ const DEFAULTS = {
 	outputMode: "auto",
 	host: "127.0.0.1",
 	noOpen: false,
+	reuseSession: false,
+	replaceSession: false,
 	help: false,
 	version: false,
 	includeUnstaged: true,
@@ -179,6 +181,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
@@ -226,6 +236,8 @@ 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      If a review is already running, open it instead of prompting
+  --replace-session    If a review is already running, stop it and start a new one
   --gh-pr <ref>        Open a GitHub PR review session (number, owner/repo#N, or URL)
                        Same as: diffing "gh pr <ref>"
 
@@ -488,6 +500,8 @@ 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.staged || values.cached) opts.staged = true;
 	if (values.merge) opts.merge = true;
@@ -3401,7 +3415,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-DNNsC5gx.mjs");
 			const result = applySuggestionToContent({
 				content,
 				lineNumber: comment.lineNumber,
@@ -3541,19 +3555,69 @@ function createApp(clientDir, diffOptsInput = DEFAULTS, commentStore, planStore,
 		}
 		return c.json(page);
 	});
+	/**
+	* Merge the GitHub-fetched existing comments into the *current* session's
+	* optimistic state. The reply endpoint optimistically appends a new reply to
+	* a thread before GitHub has propagated it through the REST comments API
+	* (a noticeable window during the periodic 30s / window-focus sync). A naive
+	* overwrite would make that reply flash out of the UI until the next sync
+	* catches up — which is what users reported as "comments disappear after
+	* submitting a reply" (especially visible on file-level threads because
+	* those bubbles live in their own section and a missing one is striking).
+	*
+	* Strategy: take fresh-from-GitHub replies as authoritative for ids GitHub
+	* already knows about, then re-append any optimistic local replies that
+	* haven't yet appeared on GitHub (tracked via {@link PrSession.pendingOptimisticReplyIds}).
+	* Replies GitHub no longer returns AND that aren't optimistic are dropped
+	* (a real delete). Optimistic ids that do show up are confirmed and pruned
+	* from the pending list.
+	*/
+	const mergeFreshWithLocalOptimistic = (fresh, current, pendingIds) => {
+		const pending = new Set(pendingIds);
+		const localById = /* @__PURE__ */ new Map();
+		for (const c of current ?? []) localById.set(c.id, c);
+		const remainingPending = [];
+		return {
+			existingComments: fresh.map((freshTop) => {
+				const local = localById.get(freshTop.id);
+				if (!local) return freshTop;
+				const freshReplyIds = new Set(freshTop.replies.map((r) => r.id));
+				for (const id of freshReplyIds) pending.delete(id);
+				const preserved = [];
+				if (pending.size > 0) for (const r of local.replies) {
+					if (freshReplyIds.has(r.id)) continue;
+					if (pending.has(r.id)) {
+						preserved.push(r);
+						remainingPending.push(r.id);
+					}
+				}
+				if (preserved.length === 0) return freshTop;
+				const replies = [...freshTop.replies, ...preserved];
+				return {
+					...freshTop,
+					replies
+				};
+			}),
+			remainingPending
+		};
+	};
 	const syncExistingPrReviewData = async (session) => {
 		const resolved = resolvedFromSession(session);
 		let existingReviews = await fetchExistingReviewsViaGh(resolved);
 		const optimisticReview = session.submittedReviewId == null ? void 0 : session.existingReviews?.find((review) => review.id === session.submittedReviewId);
 		if (optimisticReview && !existingReviews.some((review) => review.id === optimisticReview.id) && session.submittedAt != null && Date.now() - session.submittedAt < 12e4) existingReviews = [optimisticReview, ...existingReviews];
-		const existingComments = await fetchExistingCommentsViaGh(resolved, existingReviews);
-		const comments = session.submittedAt ? (session.comments ?? []).filter((comment) => comment.createdAt > session.submittedAt) : session.comments;
+		const freshExistingComments = await fetchExistingCommentsViaGh(resolved, existingReviews);
+		const current = await prStore.get() ?? session;
+		const { existingComments, remainingPending } = mergeFreshWithLocalOptimistic(freshExistingComments, current.existingComments, current.pendingOptimisticReplyIds ?? []);
+		const comments = current.submittedAt ? (current.comments ?? []).filter((comment) => comment.createdAt > current.submittedAt) : current.comments;
 		const next = {
-			...session,
+			...current,
 			comments,
 			existingComments,
 			existingReviews
 		};
+		if (remainingPending.length > 0) next.pendingOptimisticReplyIds = remainingPending;
+		else delete next.pendingOptimisticReplyIds;
 		await prStore.set(next);
 		return next;
 	};
@@ -3598,7 +3662,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-DKT0lJXv.mjs");
 			const checks = await fetchPrChecks(resolvedFromSession(session), session.headSha);
 			const summary = {
 				total: checks.length,
@@ -3630,7 +3694,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-DKT0lJXv.mjs");
 			const result = await replyToPrComment({
 				resolved: resolvedFromSession(session),
 				inReplyTo: id,
@@ -3639,13 +3703,15 @@ function createApp(clientDir, diffOptsInput = DEFAULTS, commentStore, planStore,
 			if (!result.ok) return c.json({ error: result.error ?? "Reply failed" }, 500);
 			const reply = result.reply;
 			if (reply) {
-				const existingComments = session.existingComments.map((comment) => comment.id === id ? {
+				const existingComments = session.existingComments.map((comment) => comment.id === id || comment.replies.some((r) => r.id === id) ? {
 					...comment,
 					replies: [...comment.replies, reply]
 				} : comment);
+				const pendingOptimisticReplyIds = [...session.pendingOptimisticReplyIds ?? [], ...typeof result.id === "number" ? [result.id] : []];
 				await prStore.set({
 					...session,
-					existingComments
+					existingComments,
+					pendingOptimisticReplyIds
 				});
 			}
 			return c.json({
@@ -3842,18 +3908,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-DKT0lJXv.mjs");
+			const { rewriteLocalAttachmentsInBodies } = await import("./github-attachments-Cf17YWp4.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({
@@ -3926,7 +4006,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-C8YO3TTE.mjs");
 			if (prMode) {
 				const prSession = await prStore.get();
 				if (prSession?.diff) diffFingerprints = fingerprintDiffFiles(prSession.diff);
@@ -3994,7 +4074,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-C8YO3TTE.mjs");
 		const delta = diffSinceLast(previous, fingerprintDiffFiles(currentPatch));
 		return c.json({
 			hasBaseline: true,

package/dist/{server-lock-uqSdDYeR.mjs → server-lock-Dd_ss_Il.mjs}

@@ -9,7 +9,7 @@ const STARTUP_LEASE_STALE_MS = 3e4;
 * mismatches between a user-started session and an MCP request.
 */
 function diffScopeKey(options) {
-	const { port: _port, host: _host, noOpen: _noOpen, help: _help, version: _version, outputMode: _outputMode, tui: _tui, gpu: _gpu, noExtDiff: _noExtDiff, ...scope } = options;
+	const { port: _port, host: _host, noOpen: _noOpen, reuseSession: _reuseSession, replaceSession: _replaceSession, help: _help, version: _version, outputMode: _outputMode, tui: _tui, gpu: _gpu, noExtDiff: _noExtDiff, ...scope } = options;
 	return JSON.stringify(scope);
 }
 function lockPath(repoRoot) {

package/dist/{settings-BVnzGFL7.mjs → settings-bwe7yQ8U.mjs}

@@ -430,7 +430,7 @@ const DEFAULTS = {
 	untracked: true,
 	diffStyle: "split",
 	defaultTabSize: 4,
-	theme: "nord",
+	theme: "rose-pine",
 	editorIDE: "default",
 	lineDiffType: "word",
 	lineWrap: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "diffing",
-  "version": "0.10.3",
+  "version": "0.10.5",
   "description": "local-first CLI for reviewing, navigating, and discussing git diffs with AI",
   "type": "module",
   "license": "MIT",

package/dist/client/assets/channel-CdyG8Wtt.js

@@ -1 +0,0 @@
-import{at as e,ot as t}from"./chunk-CSCIHK7Q-Dw4jsICo.js";var n=(n,r)=>t.lang.round(e.parse(n)[r]);export{n as t};

package/dist/client/assets/chunk-QZHKN3VN-DycW3jgO.js

@@ -1 +0,0 @@
-import{h as e}from"./src-UnI8qjTK.js";var t=class{constructor(e){this.init=e,this.records=this.init()}static{e(this,`ImperativeState`)}reset(){this.records=this.init()}};export{t};

package/dist/client/assets/chunk-WU5MYG2G-BXFsAzYU.js

@@ -1 +0,0 @@
-import{h as e,p as t}from"./src-UnI8qjTK.js";import{x as n}from"./chunk-CSCIHK7Q-Dw4jsICo.js";var r=e(e=>{let{securityLevel:r}=n(),i=t(`body`);return r===`sandbox`&&(i=t((t(`#i${e}`).node()?.contentDocument??document).body)),i.select(`#${e}`)},`selectSvgElement`);export{r as t};

package/dist/client/assets/classDiagram-4FO5ZUOK-BxVI8nIr.js

@@ -1 +0,0 @@
-import{h as e}from"./src-UnI8qjTK.js";import"./chunk-CSCIHK7Q-Dw4jsICo.js";import"./chunk-5ZQYHXKU-E1qBkOlk.js";import"./chunk-O5CBEL6O-CymJeKCI.js";import"./chunk-FMBD7UC4-hpHFrNoE.js";import"./chunk-BSJP7CBP-CoL841vB.js";import"./chunk-L5ZTLDWV-Brr6wA9I.js";import"./chunk-ND2GUHAM-Cj2MlAOf.js";import"./chunk-55IACEB6-o0ADQlnq.js";import"./chunk-2J33WTMH-LudE8z-b.js";import"./chunk-NZK2D7GU-CEyXOVMI.js";import"./chunk-3OPIFGDE-BxaQxo50.js";import"./chunk-KSCS5N6A-D67-Zs6D.js";import"./chunk-LZXEDZCA-e3dTHwrC.js";import{i as t,n,r,t as i}from"./chunk-727SXJPM-BitjzJ_b.js";var a={parser:n,get db(){return new i},renderer:r,styles:t,init:e(e=>{e.class||={},e.class.arrowMarkerAbsolute=e.arrowMarkerAbsolute},`init`)};export{a as diagram};

package/dist/client/assets/classDiagram-v2-Q7XG4LA2-DZHTBTt9.js

@@ -1 +0,0 @@
-import{h as e}from"./src-UnI8qjTK.js";import"./chunk-CSCIHK7Q-Dw4jsICo.js";import"./chunk-5ZQYHXKU-E1qBkOlk.js";import"./chunk-O5CBEL6O-CymJeKCI.js";import"./chunk-FMBD7UC4-hpHFrNoE.js";import"./chunk-BSJP7CBP-CoL841vB.js";import"./chunk-L5ZTLDWV-Brr6wA9I.js";import"./chunk-ND2GUHAM-Cj2MlAOf.js";import"./chunk-55IACEB6-o0ADQlnq.js";import"./chunk-2J33WTMH-LudE8z-b.js";import"./chunk-NZK2D7GU-CEyXOVMI.js";import"./chunk-3OPIFGDE-BxaQxo50.js";import"./chunk-KSCS5N6A-D67-Zs6D.js";import"./chunk-LZXEDZCA-e3dTHwrC.js";import{i as t,n,r,t as i}from"./chunk-727SXJPM-BitjzJ_b.js";var a={parser:n,get db(){return new i},renderer:r,styles:t,init:e(e=>{e.class||={},e.class.arrowMarkerAbsolute=e.arrowMarkerAbsolute},`init`)};export{a as diagram};

package/dist/client/assets/stateDiagram-v2-BHNVJYJU-CyVz0INc.js

@@ -1 +0,0 @@
-import{h as e}from"./src-UnI8qjTK.js";import"./chunk-CSCIHK7Q-Dw4jsICo.js";import"./chunk-5ZQYHXKU-E1qBkOlk.js";import"./chunk-O5CBEL6O-CymJeKCI.js";import"./chunk-BSJP7CBP-CoL841vB.js";import"./chunk-L5ZTLDWV-Brr6wA9I.js";import"./chunk-55IACEB6-o0ADQlnq.js";import"./chunk-2J33WTMH-LudE8z-b.js";import"./chunk-NZK2D7GU-CEyXOVMI.js";import"./chunk-3OPIFGDE-BxaQxo50.js";import"./chunk-KSCS5N6A-D67-Zs6D.js";import"./chunk-LZXEDZCA-e3dTHwrC.js";import{i as t,n,r,t as i}from"./chunk-AQP2D5EJ-B5pw4PfB.js";var a={parser:n,get db(){return new i(2)},renderer:r,styles:t,init:e(e=>{e.state||={},e.state.arrowMarkerAbsolute=e.arrowMarkerAbsolute},`init`)};export{a as diagram};

package/dist/github-DWgPIcKC.mjs

@@ -1,2 +0,0 @@
-import { C as replyToPrComment, d as fetchPrChecks, n as buildReviewPayload } from "./github-Cf5blBty.mjs";
-export { buildReviewPayload, fetchPrChecks, replyToPrComment };