@nkzw/codiff-core 1.10.0 → 1.11.0

package/dist/react.mjs

@@ -2,12 +2,13 @@ import { filterPatchToHunkIds, getSectionWalkthroughHunks, isGeneratedWalkthroug
 import { Slot } from "@radix-ui/react-slot";
 import { cva } from "class-variance-authority";
 import { Fragment, Suspense, forwardRef, lazy, useCallback, useEffect, useId, useImperativeHandle, useLayoutEffect, useMemo, useOptimistic, useRef, useState, useTransition } from "react";
-import { useFormStatus } from "react-dom";
+import { createPortal, useFormStatus } from "react-dom";
 import { Fragment as Fragment$1, jsx, jsxs } from "react/jsx-runtime";
 import { MarkdownEditor } from "@nkzw/mdx-editor";
 import { frontmatterPlugin, imagePlugin } from "@nkzw/mdx-editor/core";
 import { DownloadSimpleIcon } from "@phosphor-icons/react/DownloadSimple";
 import { Copy, Trash2, X } from "lucide-react";
+import { CheckIcon } from "@phosphor-icons/react/Check";
 import { ArrowSquareOutIcon } from "@phosphor-icons/react/ArrowSquareOut";
 import { ChatCircleIcon } from "@phosphor-icons/react/ChatCircle";
 import { PathIcon } from "@phosphor-icons/react/Path";
@@ -17,7 +18,6 @@ import { hydratePartialDiff, parseDiffFromFile, parsePatchFiles, registerCustomT
 import useRelativeTime from "@nkzw/use-relative-time";
 import { CaretDownIcon } from "@phosphor-icons/react/CaretDown";
 import "@phosphor-icons/react/CaretUp";
-import { CheckIcon } from "@phosphor-icons/react/Check";
 import { CheckCircleIcon } from "@phosphor-icons/react/CheckCircle";
 import "@phosphor-icons/react/CircleNotch";
 import { PowerIcon } from "@phosphor-icons/react/Power";
@@ -28,6 +28,8 @@ import { ColumnsIcon } from "@phosphor-icons/react/Columns";
 import { ImageBrokenIcon } from "@phosphor-icons/react/ImageBroken";
 import { SquareSplitVerticalIcon } from "@phosphor-icons/react/SquareSplitVertical";
 import { CodeView, WorkerPoolContextProvider } from "@pierre/diffs/react";
+import { CrosshairSimpleIcon } from "@phosphor-icons/react/CrosshairSimple";
+import { ProhibitIcon } from "@phosphor-icons/react/Prohibit";
 import { PersistentMarkdownEditor } from "@nkzw/mdx-editor/persistence";
 import { GitBranchIcon } from "@phosphor-icons/react/GitBranch";
 import { ShareNetworkIcon } from "@phosphor-icons/react/ShareNetwork";
@@ -294,13 +296,40 @@ const renderInlineMarkdown = (text) => {
 	return nodes.length > 0 ? nodes : text;
 };
 //#endregion
+//#region app/components/useCopiedState.ts
+function useCopiedState(timeoutMs) {
+	const [copied, setCopied] = useState(false);
+	const copiedTimerRef = useRef(null);
+	useEffect(() => () => {
+		if (copiedTimerRef.current != null) window.clearTimeout(copiedTimerRef.current);
+	}, []);
+	return [copied, useCallback(() => {
+		setCopied(true);
+		if (copiedTimerRef.current != null) window.clearTimeout(copiedTimerRef.current);
+		copiedTimerRef.current = window.setTimeout(() => {
+			setCopied(false);
+			copiedTimerRef.current = null;
+		}, timeoutMs);
+	}, [timeoutMs])];
+}
+//#endregion
 //#region app/components/ReadOnlyMarkdownView.tsx
-const detailsBlockPattern = /<details\b([^>]*)>\s*<summary\b[^>]*>([\s\S]*?)<\/summary>([\s\S]*?)<\/details>/gi;
 const htmlCommentPattern$1 = /<!--[\s\S]*?-->/g;
+const detailsOpenPattern = /<details\b([^>]*)>/gi;
+const detailsTagPattern = /<\/?details\b[^>]*>/gi;
+const summaryOpenPattern = /^\s*<summary\b[^>]*>/i;
+const summaryClosePattern = /<\/summary>/gi;
 const hasOpenAttribute = (attributes) => /(?:^|\s)open(?:\s*=\s*(?:"[^"]*"|'[^']*'|[^\s>]+))?(?:\s|$)/i.test(attributes);
 const stripHtmlComments$1 = (value) => value.replaceAll(htmlCommentPattern$1, "");
-const getFenceMarker = (line) => {
-	return /^(?: {0,3})(`{3,}|~{3,})/.exec(line)?.[1] ?? null;
+const getOpeningFenceMarker = (line) => {
+	const match = /^(?: {0,3})(`{3,}|~{3,})/.exec(line);
+	const marker = match?.[1] ?? null;
+	if (!marker || marker[0] === "`" && line.slice(match[0].length).includes("`")) return null;
+	return marker;
+};
+const isClosingFence = (marker, line) => {
+	const candidate = /^(?: {0,3})(`{3,}|~{3,})[ \t]*$/.exec(line)?.[1] ?? null;
+	return candidate != null && candidate[0] === marker[0] && candidate.length >= marker.length;
 };
 const normalizeReadOnlyMarkdownValue = (value) => {
 	const normalizedLineEndings = value.replaceAll("\r\n", "\n").replaceAll("\r", "\n");
@@ -310,10 +339,9 @@ const normalizeReadOnlyMarkdownValue = (value) => {
 	let pendingBlankLine = false;
 	let fenceMarker = null;
 	for (const line of lines) {
-		const currentFenceMarker = getFenceMarker(line);
 		if (fenceMarker) {
 			normalizedLines.push(line);
-			if (currentFenceMarker?.startsWith(fenceMarker[0]) && currentFenceMarker.length >= fenceMarker.length) fenceMarker = null;
+			if (isClosingFence(fenceMarker, line)) fenceMarker = null;
 			continue;
 		}
 		if (!line.trim()) {
@@ -323,27 +351,83 @@ const normalizeReadOnlyMarkdownValue = (value) => {
 		if (pendingBlankLine && normalizedLines.length > 0) normalizedLines.push("");
 		pendingBlankLine = false;
 		normalizedLines.push(line);
-		if (currentFenceMarker) fenceMarker = currentFenceMarker;
+		const openingFenceMarker = getOpeningFenceMarker(line);
+		if (openingFenceMarker) fenceMarker = openingFenceMarker;
 	}
 	const normalizedValue = normalizedLines.join("\n");
 	return preserveSingleTrailingNewline && normalizedValue ? `${normalizedValue}\n` : normalizedValue;
 };
+const extractFencedCodeBlocks = (value) => {
+	const blocks = [];
+	let fenceMarker = null;
+	let currentBlock = [];
+	for (const line of value.replaceAll("\r\n", "\n").replaceAll("\r", "\n").split("\n")) {
+		if (fenceMarker) {
+			if (isClosingFence(fenceMarker, line)) {
+				blocks.push(currentBlock.join("\n"));
+				currentBlock = [];
+				fenceMarker = null;
+				continue;
+			}
+			currentBlock.push(line);
+			continue;
+		}
+		const openingFenceMarker = getOpeningFenceMarker(line);
+		if (openingFenceMarker) fenceMarker = openingFenceMarker;
+	}
+	while (fenceMarker && currentBlock.at(-1) === "") currentBlock.pop();
+	if (fenceMarker && currentBlock.length > 0) blocks.push(currentBlock.join("\n"));
+	return blocks.filter((block) => block.trim().length > 0);
+};
 const parseMarkdownDetails = (value) => {
 	const parts = [];
 	let lastIndex = 0;
-	let match;
-	while (match = detailsBlockPattern.exec(value)) {
-		if (match.index > lastIndex) parts.push({
+	let searchIndex = 0;
+	while (searchIndex < value.length) {
+		detailsOpenPattern.lastIndex = searchIndex;
+		const detailsOpen = detailsOpenPattern.exec(value);
+		if (!detailsOpen) break;
+		const detailsBodyStart = detailsOpenPattern.lastIndex;
+		const summaryOpen = summaryOpenPattern.exec(value.slice(detailsBodyStart));
+		if (!summaryOpen) {
+			searchIndex = detailsBodyStart;
+			continue;
+		}
+		const summaryStart = detailsBodyStart + summaryOpen[0].length;
+		summaryClosePattern.lastIndex = summaryStart;
+		const summaryClose = summaryClosePattern.exec(value);
+		if (!summaryClose) {
+			searchIndex = detailsBodyStart;
+			continue;
+		}
+		const bodyStart = summaryClosePattern.lastIndex;
+		detailsTagPattern.lastIndex = bodyStart;
+		let depth = 1;
+		let detailsClose = null;
+		while (depth > 0) {
+			const tag = detailsTagPattern.exec(value);
+			if (!tag) break;
+			if (/^<\/details\b/i.test(tag[0])) {
+				depth -= 1;
+				if (depth === 0) detailsClose = tag;
+			} else depth += 1;
+		}
+		if (!detailsClose) {
+			searchIndex = detailsBodyStart;
+			continue;
+		}
+		if (detailsOpen.index > lastIndex) parts.push({
 			type: "markdown",
-			value: value.slice(lastIndex, match.index)
+			value: value.slice(lastIndex, detailsOpen.index)
 		});
 		parts.push({
-			body: match[3] ?? "",
-			open: hasOpenAttribute(match[1] ?? ""),
-			summary: stripHtmlComments$1(match[2] ?? "").trim(),
+			body: value.slice(bodyStart, detailsClose.index),
+			open: hasOpenAttribute(detailsOpen[1] ?? ""),
+			summary: stripHtmlComments$1(value.slice(summaryStart, summaryClose.index)).trim(),
 			type: "details"
 		});
-		lastIndex = detailsBlockPattern.lastIndex;
+		lastIndex = detailsTagPattern.lastIndex;
+		searchIndex = lastIndex;
 	}
 	if (lastIndex < value.length) parts.push({
 		type: "markdown",
@@ -352,6 +436,42 @@ const parseMarkdownDetails = (value) => {
 	return parts;
 };
 const hasDetailsBlock = (parts) => parts.some((part) => part.type === "details");
+const getOwnFencedCode = (parts) => parts.filter((part) => part.type === "markdown").flatMap((part) => extractFencedCodeBlocks(part.value)).join("\n\n");
+function CopyCodeButton({ code }) {
+	const [copied, markCopied] = useCopiedState(1600);
+	const handleClick = useCallback(async (event) => {
+		event.preventDefault();
+		event.stopPropagation();
+		try {
+			await navigator.clipboard.writeText(code);
+		} catch {
+			return;
+		}
+		markCopied();
+	}, [code, markCopied]);
+	const label = copied ? "Code copied" : "Copy code";
+	return /* @__PURE__ */ jsx("button", {
+		"aria-label": label,
+		className: `codiff-copy-path-button codiff-copy-code-button${copied ? " copied" : ""}`,
+		onClick: (event) => void handleClick(event),
+		onKeyDown: (event) => {
+			if (event.key === "Enter" || event.key === " ") event.stopPropagation();
+		},
+		title: label,
+		type: "button",
+		children: copied ? /* @__PURE__ */ jsx(CheckIcon, {
+			"aria-hidden": true,
+			className: "codiff-copy-path-icon check",
+			size: 16,
+			weight: "bold"
+		}) : /* @__PURE__ */ jsx(Copy, {
+			"aria-hidden": true,
+			className: "codiff-copy-path-icon",
+			size: 16,
+			strokeWidth: 2.25
+		})
+	});
+}
 function MarkdownSegment({ additionalPlugins, ariaLabel, contentClassName, editorClassName, onHeightChange, value }) {
 	const normalizedValue = normalizeReadOnlyMarkdownValue(value);
 	if (!normalizedValue.trim()) return null;
@@ -383,17 +503,22 @@ function MarkdownParts({ additionalPlugins, ariaLabel, contentClassName, editorC
 			onHeightChange,
 			value: part.value
 		}, `markdown:${index}`);
+		const bodyParts = parseMarkdownDetails(part.body);
+		const code = getOwnFencedCode(bodyParts);
 		return /* @__PURE__ */ jsxs("details", {
 			className: "codiff-markdown-details",
 			onToggle: (event) => onHeightChange?.(event.currentTarget.getBoundingClientRect().height),
 			open: part.open,
-			children: [/* @__PURE__ */ jsx("summary", { children: renderInlineMarkdown(part.summary || "Details") }), /* @__PURE__ */ jsx(MarkdownParts, {
+			children: [/* @__PURE__ */ jsxs("summary", { children: [/* @__PURE__ */ jsx("span", {
+				className: "codiff-markdown-details-summary-label",
+				children: renderInlineMarkdown(part.summary || "Details")
+			}), code ? /* @__PURE__ */ jsx(CopyCodeButton, { code }) : null] }), /* @__PURE__ */ jsx(MarkdownParts, {
 				additionalPlugins,
 				ariaLabel: `${ariaLabel} details`,
 				contentClassName,
 				editorClassName,
 				onHeightChange,
-				parts: parseMarkdownDetails(part.body)
+				parts: bodyParts
 			})]
 		}, `details:${index}`);
 	});
@@ -497,8 +622,7 @@ const getPlanCommentTargetLabel = (anchor) => {
 	const entity = anchor.kind === "text" ? "Selection" : planCommentEntityLabels[anchor.block.type] ?? "Block";
 	const targetText = (anchor.kind === "text" ? anchor.quote?.exact : anchor.block.text)?.replaceAll(/\s+/g, " ").trim();
 	if (!targetText) return entity;
-	const maximumLength = 48;
-	return `${entity} · ${targetText.length > maximumLength ? `${targetText.slice(0, maximumLength - 1).trimEnd()}…` : targetText}`;
+	return `${entity} · ${targetText.length > 48 ? `${targetText.slice(0, 47).trimEnd()}…` : targetText}`;
 };
 const escapeInlineMarkdown = (value) => value.replaceAll("\\", String.raw`\\`).replaceAll(/([`*_[\]<>])/g, String.raw`\$1`);
 const getPlanCommentAuthorLabel = (author) => {
@@ -1420,6 +1544,7 @@ const getFirstVisibleSection = (file, showWhitespace) => getVisibleDiffSections(
 //#region lib/files.ts
 const statusForTree = {
 	added: "added",
+	conflicted: "modified",
 	deleted: "deleted",
 	modified: "modified",
 	renamed: "renamed",
@@ -1558,22 +1683,23 @@ function ReviewFileTree({ files, onActivatePath, reloadDeltaPaths = emptyPaths$2
 		scrollSelectedPathIntoView,
 		selectedPath
 	]);
+	const handleTreeClick = useCallback((event) => {
+		for (const target of event.nativeEvent.composedPath()) {
+			if (!("getAttribute" in target) || typeof target.getAttribute !== "function") continue;
+			const path = target.getAttribute("data-item-path");
+			if (path && filePathSet.has(path)) {
+				onActivatePath(path);
+				return;
+			}
+		}
+	}, [filePathSet, onActivatePath]);
 	return /* @__PURE__ */ jsx("div", {
 		className: "file-tree-shell",
 		ref: treeHostRef,
 		children: /* @__PURE__ */ jsx(FileTree, {
 			className: "file-tree",
 			model,
-			onClick: useCallback((event) => {
-				for (const target of event.nativeEvent.composedPath()) {
-					if (!("getAttribute" in target) || typeof target.getAttribute !== "function") continue;
-					const path = target.getAttribute("data-item-path");
-					if (path && filePathSet.has(path)) {
-						onActivatePath(path);
-						return;
-					}
-				}
-			}, [filePathSet, onActivatePath])
+			onClick: handleTreeClick
 		})
 	});
 }
@@ -1727,6 +1853,66 @@ const matchesCombo = (event, combo, matchesKey) => {
 const matchesBinding = (event, binding, matchesKey) => getBindingCombos(binding).some((combo) => matchesCombo(event, combo, matchesKey));
 const canFallBackToPhysicalKey = (event, keymap) => event.altKey && isMac() && isDeadOrCharacterKey(event.key) && !Object.values(keymap).some((binding) => matchesBinding(event, binding, matchesTypedKey));
 const matchesShortcut = (event, keymap, action) => matchesBinding(event, keymap[action], matchesTypedKey) || canFallBackToPhysicalKey(event, keymap) && matchesBinding(event, keymap[action], matchesPhysicalKey);
+const getShortcutLabel = (keymap, action) => {
+	const combo = getBindingCombos(keymap[action])[0] ?? "";
+	const mac = isMac();
+	return combo.split("+").map((part) => {
+		const lower = part.trim().toLowerCase();
+		if (lower === "mod") return mac ? "⌘" : "Ctrl";
+		if (lower === "shift") return mac ? "⇧" : "Shift";
+		if (lower === "alt") return mac ? "⌥" : "Alt";
+		if (lower === "ctrl") return mac ? "⌃" : "Ctrl";
+		if (lower === "meta") return mac ? "⌘" : "Win";
+		if (lower === "enter") return mac ? "↩" : "Enter";
+		if (lower === "escape") return "Esc";
+		if (lower === "arrowup") return "↑";
+		if (lower === "arrowdown") return "↓";
+		if (lower === "arrowleft") return "←";
+		if (lower === "arrowright") return "→";
+		return part.trim().toUpperCase();
+	}).join("+");
+};
+//#endregion
+//#region app/components/ResolvedThreadDisclosure.tsx
+function ResolvedThreadDisclosure({ children, commentCount, focused = false, focusRequest = 0, initialExpanded = focused, saving = false }) {
+	const [expansion, setExpansion] = useState({
+		expanded: initialExpanded,
+		focusRequest
+	});
+	const expanded = focused && expansion.focusRequest !== focusRequest ? true : expansion.expanded;
+	const countLabel = `${commentCount} ${commentCount === 1 ? "comment" : "comments"}`;
+	return /* @__PURE__ */ jsxs("div", {
+		className: `resolved-thread-disclosure${expanded ? " expanded" : ""}`,
+		children: [/* @__PURE__ */ jsxs("button", {
+			"aria-expanded": expanded,
+			className: "resolved-thread-toggle",
+			onClick: () => setExpansion({
+				expanded: !expanded,
+				focusRequest
+			}),
+			type: "button",
+			children: [
+				/* @__PURE__ */ jsx("span", {
+					className: "resolved-thread-label",
+					children: saving ? "Saving resolved conversation" : "Resolved conversation"
+				}),
+				/* @__PURE__ */ jsx("span", {
+					className: "resolved-thread-count",
+					children: countLabel
+				}),
+				/* @__PURE__ */ jsx(CaretDownIcon, {
+					"aria-hidden": true,
+					className: "resolved-thread-caret",
+					size: 14,
+					weight: "bold"
+				})
+			]
+		}), expanded ? /* @__PURE__ */ jsx("div", {
+			className: "resolved-thread-content",
+			children
+		}) : null]
+	});
+}
 //#endregion
 //#region app/components/merge-request/GeneralComments.tsx
 const getAuthorDisplayName = (author) => author.name || author.login;
@@ -1770,13 +1956,14 @@ function SubmittedAtTime({ submittedAt }) {
 }
 function ReadOnlyGeneralCommentCard({ className = "", comment, focused = false }) {
 	const displayName = getAuthorDisplayName(comment.author);
+	const classes = [
+		"review-comment",
+		"general-comment-card",
+		focused ? "focused" : "",
+		className
+	].filter(Boolean).join(" ");
 	return /* @__PURE__ */ jsxs("article", {
-		className: [
-			"review-comment",
-			"general-comment-card",
-			focused ? "focused" : "",
-			className
-		].filter(Boolean).join(" "),
+		className: classes,
 		id: getGeneralCommentElementId(comment.id),
 		children: [/* @__PURE__ */ jsx(Avatar, {
 			name: displayName,
@@ -1913,13 +2100,16 @@ function GeneralCommentCard({ comment, editDraft, editError, editing, editSubmit
 		})]
 	});
 }
-function GeneralCommentThreadCard({ canComment, editDraft, editError, editingCommentId, editSubmitting, focusedCommentId, keymap, onCancelEdit, onChangeEditDraft, onDelete, onReply, onResolve, onSaveEdit, onStartEdit, thread }) {
+function GeneralCommentThreadCard({ canComment, editDraft, editError, editingCommentId, editSubmitting, focusedCommentId, focusedCommentRequest, keymap, onCancelEdit, onChangeEditDraft, onDelete, onReply, onResolve, onSaveEdit, onStartEdit, thread }) {
 	const [replyDraft, setReplyDraft] = useState("");
 	const [replyError, setReplyError] = useState(null);
 	const [replying, setReplying] = useState(false);
 	const [showReply, setShowReply] = useState(false);
 	const [resolving, setResolving] = useState(false);
 	const resolved = thread.isResolved === true;
+	const hasFocusedComment = focusedCommentId != null && thread.comments.some((comment) => comment.id === focusedCommentId);
+	const [resolutionOverride, setResolutionOverride] = useState(null);
+	const effectiveResolved = resolutionOverride?.base === resolved ? resolutionOverride.value : resolved;
 	const submitReply = useCallback(() => {
 		const body = replyDraft.trim();
 		if (!body || replying) return;
@@ -1939,62 +2129,79 @@ function GeneralCommentThreadCard({ canComment, editDraft, editError, editingCom
 	]);
 	const toggleResolved = useCallback(() => {
 		if (resolving) return;
+		const nextResolved = !effectiveResolved;
+		setResolutionOverride({
+			base: resolved,
+			value: nextResolved
+		});
 		setResolving(true);
-		onResolve(thread.id, !resolved).catch((error) => {
+		onResolve(thread.id, nextResolved).catch((error) => {
+			setResolutionOverride(null);
 			window.alert(error instanceof Error ? error.message : String(error));
 		}).finally(() => setResolving(false));
 	}, [
+		effectiveResolved,
 		onResolve,
 		resolved,
 		resolving,
 		thread.id
 	]);
-	return /* @__PURE__ */ jsxs("section", {
+	const threadContent = /* @__PURE__ */ jsxs(Fragment$1, { children: [
+		thread.comments.map((comment) => /* @__PURE__ */ jsx(GeneralCommentCard, {
+			comment,
+			editDraft,
+			editError: editingCommentId === comment.id ? editError : null,
+			editing: editingCommentId === comment.id,
+			editSubmitting: editSubmitting && editingCommentId === comment.id,
+			focused: comment.id === focusedCommentId,
+			keymap,
+			onCancelEdit,
+			onChangeEditDraft,
+			onDelete,
+			onSaveEdit,
+			onStartEdit
+		}, comment.id)),
+		thread.canReply && canComment && !effectiveResolved && !resolving ? showReply ? /* @__PURE__ */ jsx(GeneralCommentComposer, {
+			disabled: false,
+			draft: replyDraft,
+			error: replyError,
+			gitIdentity: null,
+			keymap,
+			onChangeDraft: setReplyDraft,
+			onSubmit: submitReply,
+			submitting: replying
+		}) : /* @__PURE__ */ jsx("div", {
+			className: "review-comment-thread-footer",
+			children: /* @__PURE__ */ jsx("button", {
+				className: "review-comment-action",
+				onClick: () => setShowReply(true),
+				type: "button",
+				children: "Reply"
+			})
+		}) : null,
+		thread.canResolve ? /* @__PURE__ */ jsx("div", {
+			className: "review-comment-thread-footer",
+			children: /* @__PURE__ */ jsx("button", {
+				className: "review-comment-action",
+				disabled: resolving,
+				onClick: toggleResolved,
+				type: "button",
+				children: resolving ? "Saving" : effectiveResolved ? "Reopen" : "Resolve"
+			})
+		}) : null
+	] });
+	return effectiveResolved ? /* @__PURE__ */ jsx("section", {
 		className: "general-comment-thread",
-		children: [
-			thread.comments.map((comment) => /* @__PURE__ */ jsx(GeneralCommentCard, {
-				comment,
-				editDraft,
-				editError: editingCommentId === comment.id ? editError : null,
-				editing: editingCommentId === comment.id,
-				editSubmitting: editSubmitting && editingCommentId === comment.id,
-				focused: comment.id === focusedCommentId,
-				keymap,
-				onCancelEdit,
-				onChangeEditDraft,
-				onDelete,
-				onSaveEdit,
-				onStartEdit
-			}, comment.id)),
-			thread.canReply && canComment && !resolved ? showReply ? /* @__PURE__ */ jsx(GeneralCommentComposer, {
-				disabled: false,
-				draft: replyDraft,
-				error: replyError,
-				gitIdentity: null,
-				keymap,
-				onChangeDraft: setReplyDraft,
-				onSubmit: submitReply,
-				submitting: replying
-			}) : /* @__PURE__ */ jsx("div", {
-				className: "review-comment-thread-footer",
-				children: /* @__PURE__ */ jsx("button", {
-					className: "review-comment-action",
-					onClick: () => setShowReply(true),
-					type: "button",
-					children: "Reply"
-				})
-			}) : null,
-			thread.canResolve ? /* @__PURE__ */ jsx("div", {
-				className: "review-comment-thread-footer",
-				children: /* @__PURE__ */ jsx("button", {
-					className: "review-comment-action",
-					disabled: resolving,
-					onClick: toggleResolved,
-					type: "button",
-					children: resolving ? "Saving" : resolved ? "Reopen" : "Resolve"
-				})
-			}) : null
-		]
+		children: /* @__PURE__ */ jsx(ResolvedThreadDisclosure, {
+			commentCount: thread.comments.length,
+			focused: hasFocusedComment,
+			focusRequest: focusedCommentRequest,
+			saving: resolving,
+			children: threadContent
+		})
+	}) : /* @__PURE__ */ jsx("section", {
+		className: "general-comment-thread",
+		children: threadContent
 	});
 }
 function SidebarGeneralCommentList({ comments, focusedCommentId, onActivateComment }) {
@@ -2102,7 +2309,7 @@ function GeneralCommentComposer({ disabled, draft, error, gitIdentity, keymap, o
 		})
 	});
 }
-function MergeRequestCommentsView({ canComment, commenting, draft, editDraft, editError, editingCommentId, editSubmitting, error, focusedCommentId, focusedCommentRequest, gitIdentity, keymap, onCancelEdit, onChangeDraft, onChangeEditDraft, onSaveEdit, onStartEdit, onSubmit, signInLabel, sourceDescription, submitting, threads }) {
+function MergeRequestCommentsView({ canComment, commenting, draft, editDraft, editError, editingCommentId, editSubmitting, error, focusedCommentId, focusedCommentRequest, gitIdentity, keymap, onCancelEdit, onChangeDraft, onChangeEditDraft, onResolveDiscussion, onSaveEdit, onStartEdit, onSubmit, signInLabel, sourceDescription, submitting, threads }) {
 	const commentsRef = useRef(null);
 	useEffect(() => {
 		if (focusedCommentId == null) return;
@@ -2128,6 +2335,7 @@ function MergeRequestCommentsView({ canComment, commenting, draft, editDraft, ed
 					editingCommentId,
 					editSubmitting,
 					focusedCommentId,
+					focusedCommentRequest,
 					keymap,
 					onCancelEdit,
 					onChangeEditDraft,
@@ -2137,7 +2345,7 @@ function MergeRequestCommentsView({ canComment, commenting, draft, editDraft, ed
 						});
 					},
 					onReply: (threadId, body) => commenting?.onReplyGeneralComment(threadId, body) ?? Promise.reject(/* @__PURE__ */ new Error("Replying is unavailable.")),
-					onResolve: (threadId, resolved) => commenting?.onResolveDiscussion(threadId, resolved) ?? Promise.reject(/* @__PURE__ */ new Error("Resolving is unavailable.")),
+					onResolve: (threadId, resolved) => onResolveDiscussion?.(threadId, resolved) ?? commenting?.onResolveDiscussion(threadId, resolved) ?? Promise.reject(/* @__PURE__ */ new Error("Resolving is unavailable.")),
 					onSaveEdit,
 					onStartEdit,
 					thread
@@ -2283,23 +2491,6 @@ const getReviewCommentsFromState = (state) => (state.reviewComments ?? []).flatM
 });
 const shouldDiscardReviewCommentOnEscape = (body, confirmDiscard = window.confirm) => body.trim().length === 0 || confirmDiscard("Discard this review comment?");
 //#endregion
-//#region app/components/useCopiedState.ts
-function useCopiedState(timeoutMs) {
-	const [copied, setCopied] = useState(false);
-	const copiedTimerRef = useRef(null);
-	useEffect(() => () => {
-		if (copiedTimerRef.current != null) window.clearTimeout(copiedTimerRef.current);
-	}, []);
-	return [copied, useCallback(() => {
-		setCopied(true);
-		if (copiedTimerRef.current != null) window.clearTimeout(copiedTimerRef.current);
-		copiedTimerRef.current = window.setTimeout(() => {
-			setCopied(false);
-			copiedTimerRef.current = null;
-		}, timeoutMs);
-	}, [timeoutMs])];
-}
-//#endregion
 //#region app/components/Panels.tsx
 const getPullRequestReviewActionStatus = (reviewStatus, event) => event === "APPROVE" ? reviewStatus?.approve : event === "COMMENT" ? reviewStatus?.comment : reviewStatus?.requestChanges;
 const isPullRequestReviewActionDisabled = (reviewStatus, event) => getPullRequestReviewActionStatus(reviewStatus, event)?.disabled === true;
@@ -3347,6 +3538,7 @@ setCustomExtension("cts", "typescript");
 setCustomExtension("mts", "typescript");
 const statusLabel = {
 	added: "Added",
+	conflicted: "Conflicted",
 	deleted: "Deleted",
 	modified: "Modified",
 	renamed: "Renamed",
@@ -3479,6 +3671,20 @@ const codeViewUnsafeCSS = `
     cursor: progress;
   }
 
+  :host([data-codiff-definition-mode]) [data-codiff-identifier] {
+    cursor: pointer;
+    text-decoration-color: color-mix(in srgb, currentColor 38%, transparent);
+    text-decoration-line: underline;
+    text-decoration-style: dotted;
+    text-decoration-thickness: 1px;
+    text-underline-offset: 3px;
+  }
+
+  :host([data-codiff-definition-mode]) [data-codiff-identifier]:hover {
+    text-decoration-color: currentColor;
+    text-decoration-style: solid;
+  }
+
   .codiff-search-mark {
     background: var(--diffs-find-highlight-bg, rgb(255 216 92 / 0.65));
     border-radius: 3px;
@@ -3505,8 +3711,179 @@ const codeViewUnsafeCSS = `
   [data-selected-line] [data-gutter-utility-slot] {
     display: none;
   }
+
+  /* The imperative API wraps annotations in a node that resets white-space, but
+     the React API slots them in bare, so they inherit "pre" from the shadow
+     <pre> and prose never wraps. */
+  [data-annotation-content] slot::slotted(*) {
+    white-space: normal;
+  }
 `;
 //#endregion
+//#region lib/identifier-navigation.ts
+const identifierPattern = /[$_\p{ID_Start}][$\u200C\u200D\p{ID_Continue}]*/gu;
+const exactIdentifierPattern = /^[$_\p{ID_Start}][$\u200C\u200D\p{ID_Continue}]*$/u;
+const identifierContainedPattern = /[$_\p{ID_Start}][$\u200C\u200D\p{ID_Continue}]*/u;
+const commonKeywords = /* @__PURE__ */ new Set([
+	"abstract",
+	"as",
+	"async",
+	"await",
+	"break",
+	"case",
+	"catch",
+	"class",
+	"const",
+	"continue",
+	"def",
+	"default",
+	"defer",
+	"do",
+	"else",
+	"enum",
+	"export",
+	"extends",
+	"false",
+	"finally",
+	"fn",
+	"for",
+	"from",
+	"func",
+	"function",
+	"if",
+	"implements",
+	"import",
+	"in",
+	"interface",
+	"let",
+	"match",
+	"mod",
+	"namespace",
+	"new",
+	"nil",
+	"none",
+	"null",
+	"package",
+	"pass",
+	"private",
+	"protected",
+	"pub",
+	"public",
+	"return",
+	"self",
+	"static",
+	"struct",
+	"super",
+	"switch",
+	"this",
+	"throw",
+	"throws",
+	"trait",
+	"true",
+	"try",
+	"type",
+	"typeof",
+	"undefined",
+	"use",
+	"var",
+	"void",
+	"while",
+	"with",
+	"yield"
+]);
+const identifierNavigationAttribute = "data-codiff-identifier";
+const definitionModifierAttribute = "data-codiff-definition-mode";
+const nonCodeScopePattern = /(^|\s)(comment|string)([.\s]|$)/;
+const nonCodeTokenColors = new Set([dunkel_default, licht_default].flatMap((theme) => theme.tokenColors.flatMap((token) => {
+	const scopes = Array.isArray(token.scope) ? token.scope : [token.scope];
+	const foreground = token.settings.foreground?.toLowerCase();
+	return foreground && scopes.some((scope) => typeof scope === "string" && nonCodeScopePattern.test(scope)) ? [foreground] : [];
+})));
+const isNavigableIdentifierToken = (text) => {
+	return exactIdentifierPattern.test(text) && !commonKeywords.has(text.toLowerCase());
+};
+const isNonCodeSyntaxToken = (element) => {
+	const style = element?.getAttribute("style")?.toLowerCase() ?? "";
+	return [...nonCodeTokenColors].some((color) => style.includes(color));
+};
+const clearIdentifierNavigationWrappers = (root) => {
+	for (const wrapper of Array.from(root.querySelectorAll(`[${identifierNavigationAttribute}]`))) {
+		const parent = wrapper.parentElement;
+		wrapper.replaceWith(document.createTextNode(wrapper.textContent ?? ""));
+		parent?.normalize();
+	}
+};
+const wrapIdentifierNavigationText = (root) => {
+	const textNodes = [];
+	for (const line of Array.from(root.querySelectorAll("[data-line]"))) {
+		const walker = document.createTreeWalker(line, NodeFilter.SHOW_TEXT, { acceptNode: (node) => {
+			const parent = node.parentElement;
+			return node.textContent && identifierContainedPattern.test(node.textContent) && !parent?.closest(`[${identifierNavigationAttribute}], mark.codiff-search-mark`) && !isNonCodeSyntaxToken(parent) ? NodeFilter.FILTER_ACCEPT : NodeFilter.FILTER_REJECT;
+		} });
+		let node = walker.nextNode();
+		while (node) {
+			textNodes.push(node);
+			node = walker.nextNode();
+		}
+	}
+	for (const textNode of textNodes) {
+		const text = textNode.textContent ?? "";
+		const fragment = document.createDocumentFragment();
+		let offset = 0;
+		let wrapped = false;
+		for (const match of text.matchAll(identifierPattern)) {
+			const identifier = match[0];
+			if (!isNavigableIdentifierToken(identifier)) continue;
+			if (match.index > offset) fragment.append(document.createTextNode(text.slice(offset, match.index)));
+			const wrapper = document.createElement("span");
+			wrapper.setAttribute(identifierNavigationAttribute, "");
+			wrapper.textContent = identifier;
+			fragment.append(wrapper);
+			offset = match.index + identifier.length;
+			wrapped = true;
+		}
+		if (!wrapped) continue;
+		if (offset < text.length) fragment.append(document.createTextNode(text.slice(offset)));
+		textNode.replaceWith(fragment);
+	}
+};
+const applyIdentifierNavigationState = (renderedItems, active) => {
+	for (const { element } of renderedItems) {
+		element.toggleAttribute(definitionModifierAttribute, active);
+		const root = element.shadowRoot;
+		if (!root) continue;
+		clearIdentifierNavigationWrappers(root);
+		if (active) wrapIdentifierNavigationText(root);
+	}
+};
+const getIdentifierAtOffset = (text, offset) => {
+	for (const match of text.matchAll(identifierPattern)) {
+		const start = match.index;
+		const end = start + match[0].length;
+		if (offset >= start && offset < end) return {
+			identifier: match[0],
+			start
+		};
+	}
+	return null;
+};
+const getIdentifierFromPointerEvent = (event, lineElement) => {
+	const caretRange = document.caretRangeFromPoint?.(event.clientX, event.clientY);
+	if (caretRange && lineElement.contains(caretRange.startContainer)) {
+		const prefix = document.createRange();
+		prefix.selectNodeContents(lineElement);
+		prefix.setEnd(caretRange.startContainer, caretRange.startOffset);
+		const match = getIdentifierAtOffset(lineElement.textContent || "", prefix.toString().length);
+		if (match) return match.identifier;
+	}
+	const target = event.target;
+	if (target && lineElement.contains(target)) {
+		const matches = [...(target.textContent || "").matchAll(identifierPattern)];
+		if (matches.length === 1) return matches[0][0];
+	}
+	return null;
+};
+//#endregion
 //#region lib/item-version.ts
 const getItemVersion = (value) => {
 	let hash = 0;
@@ -3522,6 +3899,8 @@ const isNativeInputTarget = (target) => {
 	const candidate = target;
 	return candidate?.closest?.("input, select, textarea") != null || candidate?.isContentEditable === true;
 };
+const isMacPlatform = (platform = navigator.platform) => platform.toLowerCase().includes("mac");
+const isPrimaryModifier = (event, platform = navigator.platform) => isMacPlatform(platform) ? event.metaKey && !event.ctrlKey : event.ctrlKey && !event.metaKey;
 //#endregion
 //#region lib/review-identity.ts
 const getFileReviewIdentity = (file) => ({
@@ -3601,6 +3980,101 @@ const applySearchHighlights = (renderedItems, query, activeMatch) => {
 	}
 };
 //#endregion
+//#region lib/source.ts
+const rangeLabel = (source) => `${source.base}${source.symmetric ? "..." : ".."}${source.head}`;
+const getSourceKey = (source) => source.type === "commit" ? `commit:${source.ref}` : source.type === "branch-diff" ? `branch-diff:${source.ref}:${source.baseRef}:${source.headRef}` : source.type === "branch-working-tree" ? `branch-working-tree:${source.ref}:${source.baseRef}:${source.headRef}` : source.type === "branch" ? `branch:${source.ref}` : source.type === "range" ? `range:${rangeLabel(source)}` : source.type === "pull-request" ? `pull-request:${source.provider ?? ""}:${source.host ?? ""}:${source.projectPath ?? `${source.owner ?? ""}/${source.repo ?? ""}`}#${source.number ?? source.url}` : "working-tree";
+const getShortRef = (ref) => ref.slice(0, 7);
+const getSourceLabel = (source) => source.type === "commit" ? getShortRef(source.ref) : source.type === "branch" || source.type === "branch-diff" ? `Branch vs ${source.ref}` : source.type === "branch-working-tree" ? `Local + branch vs ${source.ref}` : source.type === "range" ? rangeLabel(source) : source.type === "pull-request" ? source.number ? `${source.provider === "gitlab" ? "MR" : "PR"} #${source.number}` : source.provider === "gitlab" ? "Merge request" : "Pull request" : "Uncommitted";
+//#endregion
+//#region app/components/DefinitionPopover.tsx
+function DefinitionPopover({ anchor, getDestination, identifier, onClose, onOpen, result }) {
+	const popoverRef = useRef(null);
+	useEffect(() => {
+		const closeOnEscape = (event) => {
+			if (event.key === "Escape") onClose();
+		};
+		const closeOutside = (event) => {
+			const target = event.target;
+			if (target && !popoverRef.current?.contains(target)) onClose();
+		};
+		document.addEventListener("keydown", closeOnEscape);
+		document.addEventListener("pointerdown", closeOutside);
+		return () => {
+			document.removeEventListener("keydown", closeOnEscape);
+			document.removeEventListener("pointerdown", closeOutside);
+		};
+	}, [onClose]);
+	const left = Math.min(anchor.x, Math.max(12, window.innerWidth - 432));
+	const top = Math.min(anchor.y + 10, Math.max(12, window.innerHeight - 320));
+	return createPortal(/* @__PURE__ */ jsxs("div", {
+		"aria-label": `Definitions for ${identifier}`,
+		className: "definition-popover",
+		ref: popoverRef,
+		role: "dialog",
+		style: {
+			left,
+			top
+		},
+		children: [/* @__PURE__ */ jsxs("div", {
+			className: "definition-popover-header",
+			children: [/* @__PURE__ */ jsxs("span", { children: ["Definition of ", /* @__PURE__ */ jsx("code", { children: identifier })] }), /* @__PURE__ */ jsx("button", {
+				"aria-label": "Close definition results",
+				onClick: onClose,
+				type: "button",
+				children: /* @__PURE__ */ jsx(XIcon, { size: 14 })
+			})]
+		}), !result ? /* @__PURE__ */ jsx("div", {
+			className: "definition-popover-message",
+			children: "Searching…"
+		}) : result.status === "unavailable" ? /* @__PURE__ */ jsx("div", {
+			className: "definition-popover-message",
+			children: result.reason
+		}) : result.candidates.length === 0 ? /* @__PURE__ */ jsx("div", {
+			className: "definition-popover-message",
+			children: "No likely definitions found."
+		}) : /* @__PURE__ */ jsx("div", {
+			className: "definition-popover-results",
+			children: result.candidates.map((candidate) => {
+				const destination = getDestination(candidate);
+				const destinationLabel = destination === "diff" ? "Jump within diff" : destination === "editor" ? "Open in editor" : "Unavailable outside this historical diff";
+				return /* @__PURE__ */ jsxs("button", {
+					className: "definition-popover-result",
+					disabled: destination === "unavailable",
+					onClick: () => onOpen(candidate),
+					type: "button",
+					children: [/* @__PURE__ */ jsxs("span", {
+						className: "definition-popover-location",
+						children: [
+							candidate.path,
+							":",
+							candidate.lineNumber,
+							/* @__PURE__ */ jsxs("span", {
+								className: "definition-popover-meta",
+								children: [/* @__PURE__ */ jsx("span", { children: candidate.kind }), /* @__PURE__ */ jsx("span", {
+									"aria-label": destinationLabel,
+									className: "definition-popover-destination",
+									role: "img",
+									title: destinationLabel,
+									children: destination === "diff" ? /* @__PURE__ */ jsx(CrosshairSimpleIcon, {
+										"aria-hidden": "true",
+										size: 13
+									}) : destination === "editor" ? /* @__PURE__ */ jsx(ArrowSquareOutIcon, {
+										"aria-hidden": "true",
+										size: 13
+									}) : /* @__PURE__ */ jsx(ProhibitIcon, {
+										"aria-hidden": "true",
+										size: 13
+									})
+								})]
+							})
+						]
+					}), /* @__PURE__ */ jsx("code", { children: candidate.line })]
+				}, `${candidate.path}:${candidate.lineNumber}`);
+			})
+		})]
+	}), document.body);
+}
+//#endregion
 //#region app/components/MarkdownDocumentEditor.tsx
 const persistenceAdapter = { save: ({ content, document }) => window.codiff.saveMarkdownDocument({
 	baseVersion: document.version,
@@ -3717,12 +4191,6 @@ const RepositoryMarkdownEditor = forwardRef(function RepositoryMarkdownEditor({
 	});
 });
 //#endregion
-//#region lib/source.ts
-const rangeLabel = (source) => `${source.base}${source.symmetric ? "..." : ".."}${source.head}`;
-const getSourceKey = (source) => source.type === "commit" ? `commit:${source.ref}` : source.type === "branch-diff" ? `branch-diff:${source.ref}:${source.baseRef}:${source.headRef}` : source.type === "branch-working-tree" ? `branch-working-tree:${source.ref}:${source.baseRef}:${source.headRef}` : source.type === "branch" ? `branch:${source.ref}` : source.type === "range" ? `range:${rangeLabel(source)}` : source.type === "pull-request" ? `pull-request:${source.provider ?? ""}:${source.host ?? ""}:${source.projectPath ?? `${source.owner ?? ""}/${source.repo ?? ""}`}#${source.number ?? source.url}` : "working-tree";
-const getShortRef = (ref) => ref.slice(0, 7);
-const getSourceLabel = (source) => source.type === "commit" ? getShortRef(source.ref) : source.type === "branch" || source.type === "branch-diff" ? `Branch vs ${source.ref}` : source.type === "branch-working-tree" ? `Local + branch vs ${source.ref}` : source.type === "range" ? rangeLabel(source) : source.type === "pull-request" ? source.number ? `${source.provider === "gitlab" ? "MR" : "PR"} #${source.number}` : source.provider === "gitlab" ? "Merge request" : "Pull request" : "Uncommitted";
-//#endregion
 //#region lib/narrative-walkthrough.ts
 const walkthroughFileName = (path) => path.split("/").pop() ?? path;
 const uniquePaths = (paths) => {
@@ -4145,7 +4613,8 @@ const chapterIcons = {
 	wrench: WrenchIcon
 };
 function ChapterIcon({ icon, size = 13 }) {
-	return /* @__PURE__ */ jsx(chapterIcons[icon] ?? chapterIcons.path, { size });
+	const Icon = chapterIcons[icon] ?? chapterIcons.path;
+	return /* @__PURE__ */ jsx(Icon, { size });
 }
 function ImportancePill({ importance }) {
 	return /* @__PURE__ */ jsx("span", {
@@ -4430,13 +4899,14 @@ function WalkthroughProgress({ phase, responseLabelIndex, stageRevision }) {
 	}, [stageRevision]);
 	const elapsedSeconds = timerState.stageRevision === stageRevision ? timerState.elapsedSeconds : 0;
 	const showTimer = elapsedSeconds >= TIMER_THRESHOLD_SECONDS;
+	const label = phase === "agent-generation" ? "Analyzing changes…" : phase === "response-received" ? walkthroughResponseLabels[Math.abs(responseLabelIndex) % walkthroughResponseLabels.length] : "Generating walkthrough…";
 	return /* @__PURE__ */ jsxs("span", {
 		"aria-live": "polite",
 		className: "walkthrough-progress",
 		role: "status",
 		children: [/* @__PURE__ */ jsx("span", {
 			className: "walkthrough-progress-label",
-			children: phase === "agent-generation" ? "Analyzing changes…" : phase === "response-received" ? walkthroughResponseLabels[Math.abs(responseLabelIndex) % walkthroughResponseLabels.length] : "Generating walkthrough…"
+			children: label
 		}), /* @__PURE__ */ jsx("span", {
 			"aria-hidden": !showTimer,
 			className: `walkthrough-progress-timer${showTimer ? " visible" : ""}`,
@@ -5476,6 +5946,9 @@ function ReviewCommentEditor({ agentId, agentLabel, comment, displayName, focusC
 		flushDraft,
 		onCommentBlur
 	]);
+	const handleAddComment = useCallback(() => {
+		document.activeElement?.blur();
+	}, []);
 	const handleFocus = useCallback(() => {
 		onCommentFocus(draftComment);
 	}, [draftComment, onCommentFocus]);
@@ -5491,13 +5964,21 @@ function ReviewCommentEditor({ agentId, agentLabel, comment, displayName, focusC
 	]);
 	const handleKeyDown = useCallback((event) => {
 		if (matchesShortcut(event, keymap, "submitComment")) {
-			if (supportsReviewCommentActions && commentCanSubmit) {
-				event.preventDefault();
-				event.stopPropagation();
-				handleSubmitComment();
+			if (supportsReviewCommentActions) {
+				if (commentCanSubmit) {
+					event.preventDefault();
+					event.stopPropagation();
+					handleSubmitComment();
+				}
 				return;
 			}
-			if (!supportsReviewCommentActions && canAskCodex) {
+			event.preventDefault();
+			event.stopPropagation();
+			handleAddComment();
+			return;
+		}
+		if (matchesShortcut(event, keymap, "askAgent")) {
+			if (canAskCodex) {
 				event.preventDefault();
 				event.stopPropagation();
 				handleAskCodex();
@@ -5515,6 +5996,7 @@ function ReviewCommentEditor({ agentId, agentLabel, comment, displayName, focusC
 		comment.id,
 		comment.isReadOnly,
 		draft,
+		handleAddComment,
 		handleAskCodex,
 		handleSubmitComment,
 		keymap,
@@ -5570,7 +6052,7 @@ function ReviewCommentEditor({ agentId, agentLabel, comment, displayName, focusC
 							className: "review-comment-action",
 							disabled: !canAskCodex,
 							onClick: handleAskCodex,
-							title: canAskCodex ? `Ask ${agentLabel}` : `Write a note before asking ${agentLabel}`,
+							title: canAskCodex ? `Ask ${agentLabel} (${getShortcutLabel(keymap, "askAgent")})` : `Write a note before asking ${agentLabel}`,
 							type: "button",
 							children: [/* @__PURE__ */ jsx("img", {
 								alt: "",
@@ -5732,7 +6214,7 @@ const groupReviewCommentsByThread = (comments) => {
 };
 const noopResolveThread = () => {};
 const noopLayoutReady = () => {};
-function ReviewCommentThreadGroup({ agentId, agentLabel, comments, focusCommentId, focusEditorRef, identity, keymap, onAskCodex, onCommentBlur, onCommentDraftChange, onCommentFocus, onDeleteComment, onReplyToThread, onResolveThread = noopResolveThread, onSaveCommentEdit, onSubmitComment, onUpdateComment, supportsReviewCommentActions }) {
+function ReviewCommentThreadGroup({ agentId, agentLabel, comments, focusCommentId, focusCommentRequest, focusEditorRef, identity, keymap, onAskCodex, onCommentBlur, onCommentDraftChange, onCommentFocus, onDeleteComment, onReplyToThread, onResolveThread = noopResolveThread, onSaveCommentEdit, onSubmitComment, onUpdateComment, supportsReviewCommentActions }) {
 	const [resolveState, setResolveState] = useState({
 		error: null,
 		submitting: false,
@@ -5741,10 +6223,13 @@ function ReviewCommentThreadGroup({ agentId, agentLabel, comments, focusCommentI
 	const lastComment = comments.at(-1);
 	const threadId = lastComment?.threadId;
 	const threadResolved = comments.some((comment) => comment.isThreadResolved === true);
+	const hasFocusedComment = focusCommentId != null && comments.some((comment) => comment.id === focusCommentId);
+	const [resolutionOverride, setResolutionOverride] = useState(null);
+	const effectiveThreadResolved = resolutionOverride?.base === threadResolved ? resolutionOverride.value : threadResolved;
+	const resolving = resolveState.threadId === threadId && resolveState.submitting;
 	const canResolveThread = supportsReviewCommentActions && threadId != null && comments.some((comment) => comment.canResolveThread === true);
-	const canReplyToThread = supportsReviewCommentActions && threadId != null && comments.some((comment) => comment.isReadOnly) && !comments.some((comment) => !comment.isReadOnly) && !comments.some((comment) => comment.canReplyThread === false) && !threadResolved;
+	const canReplyToThread = supportsReviewCommentActions && threadId != null && comments.some((comment) => comment.isReadOnly) && !comments.some((comment) => !comment.isReadOnly) && !comments.some((comment) => comment.canReplyThread === false) && !effectiveThreadResolved && !resolving;
 	const hasThreadActions = canReplyToThread || canResolveThread;
-	const resolving = resolveState.threadId === threadId && resolveState.submitting;
 	const resolveError = resolveState.threadId === threadId ? resolveState.error : null;
 	const handleReply = useCallback(() => {
 		if (!threadId || !lastComment) return;
@@ -5756,16 +6241,22 @@ function ReviewCommentThreadGroup({ agentId, agentLabel, comments, focusCommentI
 	]);
 	const handleResolve = useCallback(() => {
 		if (!threadId || resolving) return;
+		const nextResolved = !effectiveThreadResolved;
+		setResolutionOverride({
+			base: threadResolved,
+			value: nextResolved
+		});
 		setResolveState({
 			error: null,
 			submitting: true,
 			threadId
 		});
-		Promise.resolve(onResolveThread(threadId, !threadResolved)).then(() => setResolveState({
+		Promise.resolve(onResolveThread(threadId, nextResolved)).then(() => setResolveState({
 			error: null,
 			submitting: false,
 			threadId
 		})).catch((error) => {
+			setResolutionOverride(null);
 			setResolveState({
 				error: error instanceof Error ? error.message : String(error),
 				submitting: false,
@@ -5773,54 +6264,64 @@ function ReviewCommentThreadGroup({ agentId, agentLabel, comments, focusCommentI
 			});
 		});
 	}, [
+		effectiveThreadResolved,
 		onResolveThread,
 		resolving,
 		threadId,
 		threadResolved
 	]);
-	return /* @__PURE__ */ jsxs("div", {
+	const threadContent = /* @__PURE__ */ jsxs(Fragment$1, { children: [comments.map((comment) => {
+		const displayName = comment.author ? getReviewAuthorDisplayName(comment.author) : getGitIdentityDisplayName(identity);
+		return /* @__PURE__ */ jsx(ReviewCommentEditor, {
+			agentId,
+			agentLabel,
+			comment,
+			displayName,
+			focusCommentId,
+			focusEditorRef,
+			identity,
+			keymap,
+			onAskCodex,
+			onCommentBlur,
+			onCommentDraftChange,
+			onCommentFocus,
+			onDeleteComment,
+			onSaveCommentEdit,
+			onSubmitComment,
+			onUpdateComment,
+			supportsReviewCommentActions
+		}, comment.id);
+	}), hasThreadActions ? /* @__PURE__ */ jsxs("div", {
+		className: "review-comment-thread-footer",
+		children: [resolveError ? /* @__PURE__ */ jsx("span", {
+			className: "review-comment-thread-error",
+			children: resolveError
+		}) : null, /* @__PURE__ */ jsxs("div", {
+			className: "review-comment-thread-actions",
+			children: [canReplyToThread ? /* @__PURE__ */ jsx("button", {
+				className: "review-comment-action",
+				onClick: handleReply,
+				type: "button",
+				children: "Reply"
+			}) : null, canResolveThread ? /* @__PURE__ */ jsx("button", {
+				className: "review-comment-action",
+				disabled: resolving,
+				onClick: handleResolve,
+				type: "button",
+				children: resolving ? "Saving" : effectiveThreadResolved ? "Reopen" : "Resolve"
+			}) : null]
+		})]
+	}) : null] });
+	return effectiveThreadResolved ? /* @__PURE__ */ jsx(ResolvedThreadDisclosure, {
+		commentCount: comments.length,
+		focused: hasFocusedComment,
+		focusRequest: focusCommentRequest,
+		initialExpanded: Boolean(resolveError),
+		saving: resolving,
+		children: threadContent
+	}) : /* @__PURE__ */ jsx("div", {
 		className: "review-comment-thread-group",
-		children: [comments.map((comment) => {
-			return /* @__PURE__ */ jsx(ReviewCommentEditor, {
-				agentId,
-				agentLabel,
-				comment,
-				displayName: comment.author ? getReviewAuthorDisplayName(comment.author) : getGitIdentityDisplayName(identity),
-				focusCommentId,
-				focusEditorRef,
-				identity,
-				keymap,
-				onAskCodex,
-				onCommentBlur,
-				onCommentDraftChange,
-				onCommentFocus,
-				onDeleteComment,
-				onSaveCommentEdit,
-				onSubmitComment,
-				onUpdateComment,
-				supportsReviewCommentActions
-			}, comment.id);
-		}), hasThreadActions ? /* @__PURE__ */ jsxs("div", {
-			className: "review-comment-thread-footer",
-			children: [resolveError ? /* @__PURE__ */ jsx("span", {
-				className: "review-comment-thread-error",
-				children: resolveError
-			}) : null, /* @__PURE__ */ jsxs("div", {
-				className: "review-comment-thread-actions",
-				children: [canReplyToThread ? /* @__PURE__ */ jsx("button", {
-					className: "review-comment-action",
-					onClick: handleReply,
-					type: "button",
-					children: "Reply"
-				}) : null, canResolveThread ? /* @__PURE__ */ jsx("button", {
-					className: "review-comment-action",
-					disabled: resolving,
-					onClick: handleResolve,
-					type: "button",
-					children: resolving ? "Saving" : threadResolved ? "Reopen" : "Resolve"
-				}) : null]
-			})]
-		}) : null]
+		children: threadContent
 	});
 }
 function ReviewAnnotation({ agentId, agentLabel, annotation, comments, focusCommentId, focusCommentRequest, identity, keymap, onAskCodex, onCommentBlur, onCommentDraftChange, onCommentFocus, onDeleteComment, onHeightChange, onReplyToThread, onResolveThread = noopResolveThread, onSaveCommentEdit, onSubmitComment, onUpdateComment, supportsReviewCommentActions }) {
@@ -5853,14 +6354,16 @@ function ReviewAnnotation({ agentId, agentLabel, annotation, comments, focusComm
 		return () => observer.disconnect();
 	}, [annotationComments.length, onHeightChange]);
 	if (annotationComments.length === 0) return null;
+	const commentGroups = groupReviewCommentsByThread(annotationComments);
 	return /* @__PURE__ */ jsx("div", {
 		className: "review-comment-thread",
 		ref: threadRef,
-		children: groupReviewCommentsByThread(annotationComments).map((group) => /* @__PURE__ */ jsx(ReviewCommentThreadGroup, {
+		children: commentGroups.map((group) => /* @__PURE__ */ jsx(ReviewCommentThreadGroup, {
 			agentId,
 			agentLabel,
 			comments: group.comments,
 			focusCommentId,
+			focusCommentRequest,
 			focusEditorRef: setFocusEditorRef,
 			identity,
 			keymap,
@@ -6062,7 +6565,7 @@ const getHunkSelectionRange = (hunk) => {
 	} : null;
 };
 const isSameSelection = (a, b) => a.start === b.start && a.end === b.end && a.side === b.side;
-function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedToggle = false, blocks, bottomInset = codeViewLayout.paddingBottom, codeQualityFindings = [], collapsed, comments, commitMetadata, diffLineHeight = 20, diffStyle, disableWorkerPool = false, expandedGenerated = emptyExpandedGenerated, files, focusCommentId, focusCommentRequest, forceExpandedPaths, gitIdentity, hunkNavigation, initialMarkdownPreviewSectionIds = emptyMarkdownPreviewSectionIds, isReadOnly = false, itemVersionByKey, keymap, loadingSectionIds, onActiveBlockChange, onAskCodex, onCommentDraftChange, onCreateComment, onDeleteComment, onLoadImageContent, onLoadSection, onLoadSectionContents, onOpenFile, onRefreshMarkdown, onResolveThread = noopResolveThread, onSaveCommentEdit, onSelectPathFromScroll, onSubmitComment, onToggleCollapsed, onToggleViewed, onUpdateComment, onUpdateSourceDescription, onUpdateSourceTitle, onUploadSourceDescriptionAsset, reviewIdentityByPath, scrollTarget, searchQuery, selectedPath, showSourceDescription = true, showWhitespace, source, sourceDescriptionActions, sourceDescriptionFooter, supportsReviewCommentActions, theme = "system", viewed, walkthroughNotes, wordWrap }) {
+function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedToggle = false, blocks, bottomInset = codeViewLayout.paddingBottom, codeQualityFindings = [], collapsed, comments, commitMetadata, diffLineHeight = 20, diffStyle, disableWorkerPool = false, expandedGenerated = emptyExpandedGenerated, files, focusCommentId, focusCommentRequest, forceExpandedPaths, gitIdentity, hunkNavigation, initialMarkdownPreviewSectionIds = emptyMarkdownPreviewSectionIds, isReadOnly = false, itemVersionByKey, keymap, loadingSectionIds, onActiveBlockChange, onAskCodex, onCommentDraftChange, onCreateComment, onDeleteComment, onFindDefinitions, onLoadImageContent, onLoadSection, onLoadSectionContents, onOpenDefinition, onOpenFile, onRefreshMarkdown, onResolveThread = noopResolveThread, onSaveCommentEdit, onSelectPathFromScroll, onSubmitComment, onToggleCollapsed, onToggleViewed, onUpdateComment, onUpdateSourceDescription, onUpdateSourceTitle, onUploadSourceDescriptionAsset, reviewIdentityByPath, scrollTarget, searchQuery, selectedPath, showSourceDescription = true, showWhitespace, source, sourceDescriptionActions, sourceDescriptionFooter, supportsReviewCommentActions, theme = "system", viewed, walkthroughNotes, wordWrap }) {
 	const codeViewRef = useRef(null);
 	const markdownEditorRefs = useRef(/* @__PURE__ */ new Map());
 	const refreshingMarkdownSectionsRef = useRef(/* @__PURE__ */ new Set());
@@ -6070,6 +6573,7 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 	const handledScrollRequestRef = useRef(null);
 	const handledHunkNavRef = useRef(hunkNavigation?.request ?? null);
 	const emptyCommentDeleteTimersRef = useRef(/* @__PURE__ */ new Map());
+	const definitionHighlightFrameRef = useRef(null);
 	const highlightFrameRef = useRef(null);
 	const ignoreNextLineSelectionEndRef = useRef(false);
 	const navigatedSelectionRef = useRef(null);
@@ -6083,6 +6587,15 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 	const [imagePreviewLayoutPassBySection, setImagePreviewLayoutPassBySection] = useState({});
 	const [commentLayoutPassByItem, setCommentLayoutPassByItem] = useState({});
 	const [selectedLines, setSelectedLines] = useState(null);
+	const [definitionLookup, setDefinitionLookup] = useState(null);
+	const definitionLookupRequestRef = useRef(0);
+	const definitionModifierActiveRef = useRef(false);
+	const sourceKey = getSourceKey(source);
+	const [definitionLookupSourceKey, setDefinitionLookupSourceKey] = useState(sourceKey);
+	if (definitionLookupSourceKey !== sourceKey) {
+		setDefinitionLookupSourceKey(sourceKey);
+		setDefinitionLookup(null);
+	}
 	const selectedLinesRef = useRef(null);
 	const commitMessageMetadata = source.type === "commit" ? commitMetadata : null;
 	const shouldShowCommitMessage = commitMessageMetadata != null;
@@ -6132,19 +6645,22 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 			[itemId]: (current[itemId] ?? 0) + 1
 		}));
 	}, []);
-	const { firstItemByBlockId, firstItemByPath, itemBlockId, itemMetadata, items, searchTargetsByBaseItemId } = useMemo(() => {
+	const { commentTargetById, firstItemByBlockId, firstItemByPath, itemBlockId, itemMetadata, items, searchTargetsByBaseItemId, selectedHeaderItemIds } = useMemo(() => {
 		const nextItems = [];
+		const nextCommentTargetById = /* @__PURE__ */ new Map();
 		const nextFirstItemByBlockId = /* @__PURE__ */ new Map();
 		const nextFirstItemByPath = /* @__PURE__ */ new Map();
 		const nextItemBlockId = /* @__PURE__ */ new Map();
 		const nextItemMetadata = /* @__PURE__ */ new Map();
 		const nextSearchTargetsByBaseItemId = /* @__PURE__ */ new Map();
+		const nextSelectedHeaderItemIds = /* @__PURE__ */ new Set();
 		const fontLayoutKey = `line-height:${diffLineHeight}`;
 		for (const block of reviewBlocks) {
 			if (block.header) {
 				const headerId = getBlockHeaderItemId(block);
 				nextFirstItemByBlockId.set(block.id, nextFirstItemByBlockId.get(block.id) ?? headerId);
 				nextItemBlockId.set(headerId, block.id);
+				if ((block.headerSelected ?? block.selected) === true) nextSelectedHeaderItemIds.add(headerId);
 				nextItems.push({
 					annotations: [{
 						lineNumber: 1,
@@ -6162,7 +6678,7 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 					},
 					id: headerId,
 					type: "file",
-					version: getItemVersion(`${block.id}:walkthrough-header:${(block.headerSelected ?? block.selected) === true ? "selected" : "idle"}`)
+					version: getItemVersion(`${block.id}:walkthrough-header`)
 				});
 			}
 			if (!block.file) continue;
@@ -6200,6 +6716,11 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 				const blockSectionComments = blockCommentsBySection.get(section.id) ?? [];
 				const sectionComments = dedupeReviewComments([...visibleGlobalComments, ...blockSectionComments]);
 				for (const comment of sectionComments) {
+					if (!nextCommentTargetById.has(comment.id)) nextCommentTargetById.set(comment.id, isLineReviewComment(comment) ? {
+						id,
+						lineNumber: comment.lineNumber,
+						side: comment.side
+					} : { id });
 					const key = getCommentKey(comment);
 					const existing = annotationMap.get(key);
 					if (existing && existing.metadata.type === "review-comment") annotationMap.set(key, {
@@ -6311,12 +6832,14 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 			}
 		}
 		return {
+			commentTargetById: nextCommentTargetById,
 			firstItemByBlockId: nextFirstItemByBlockId,
 			firstItemByPath: nextFirstItemByPath,
 			itemBlockId: nextItemBlockId,
 			itemMetadata: nextItemMetadata,
 			items: nextItems,
-			searchTargetsByBaseItemId: nextSearchTargetsByBaseItemId
+			searchTargetsByBaseItemId: nextSearchTargetsByBaseItemId,
+			selectedHeaderItemIds: nextSelectedHeaderItemIds
 		};
 	}, [
 		collapsed,
@@ -6369,6 +6892,18 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 		itemMetadata,
 		searchTargetsByBaseItemId
 	]);
+	const getDefinitionDiffTarget = useCallback((candidate) => {
+		for (const item of items) {
+			if (item.type !== "diff") continue;
+			const metadata = itemMetadata.get(item.id);
+			const path = candidate.side === "deletions" ? metadata?.file.oldPath ?? metadata?.file.path : metadata?.file.path;
+			if (metadata && path === candidate.path && lineIsVisibleInFileDiff(item.fileDiff, candidate.side, candidate.lineNumber)) return {
+				item,
+				metadata
+			};
+		}
+		return null;
+	}, [itemMetadata, items]);
 	const setCodeViewSelectedLines = useCallback((selection) => {
 		if (selection == null || navigatedSelectionRef.current == null || selection.id !== navigatedSelectionRef.current.id || !isSameSelection(selection.range, navigatedSelectionRef.current.range)) navigatedSelectionRef.current = null;
 		setSelectedLines(selection);
@@ -6482,6 +7017,50 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 			createCommentForRange(range, context);
 		},
 		onLineClick: (line, context) => {
+			if (isPrimaryModifier(line.event) && onFindDefinitions) {
+				line.event.preventDefault();
+				line.event.stopPropagation();
+				const lineElement = "lineElement" in line ? line.lineElement : null;
+				const identifier = lineElement ? getIdentifierFromPointerEvent(line.event, lineElement) : null;
+				const meta = itemMetadata.get(context.item.id);
+				const side = "annotationSide" in line ? line.annotationSide : null;
+				if (!identifier || !meta || !side) {
+					setDefinitionLookup(null);
+					return;
+				}
+				const requestId = ++definitionLookupRequestRef.current;
+				setDefinitionLookup({
+					anchor: {
+						x: line.event.clientX,
+						y: line.event.clientY
+					},
+					identifier,
+					result: null,
+					sourceKey
+				});
+				onFindDefinitions({
+					identifier,
+					kind: meta.section.kind,
+					lineNumber: line.lineNumber,
+					path: side === "deletions" ? meta.file.oldPath ?? meta.file.path : meta.file.path,
+					side,
+					source
+				}).then((result) => {
+					if (definitionLookupRequestRef.current === requestId) setDefinitionLookup((current) => current?.identifier === identifier && current.sourceKey === sourceKey ? {
+						...current,
+						result
+					} : current);
+				}).catch(() => {
+					if (definitionLookupRequestRef.current === requestId) setDefinitionLookup((current) => current?.identifier === identifier && current.sourceKey === sourceKey ? {
+						...current,
+						result: {
+							reason: "Definition search is unavailable for this repository.",
+							status: "unavailable"
+						}
+					} : current);
+				});
+				return;
+			}
 			if (isReadOnly) return;
 			if (isInteractiveReviewEvent(line.event)) return;
 			const meta = itemMetadata.get(context.item.id);
@@ -6514,11 +7093,14 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 			const metadata = itemMetadata.get(context.item.id);
 			const isWalkthroughHeaderItem = context.item.id.endsWith(":walkthrough-header");
 			node.classList.toggle("codiff-walkthrough-header-item", isWalkthroughHeaderItem);
-			node.classList.toggle("codiff-selected-item", metadata?.isSelected === true);
+			node.classList.toggle("codiff-selected-item", metadata?.isSelected === true || selectedHeaderItemIds.has(context.item.id));
 			node.classList.toggle("codiff-markdown-preview-item", metadata?.isMarkdownPreview === true);
 			node.classList.toggle("codiff-image-preview-item", context.item.type === "file" && Boolean(metadata && canRenderImagePreview(metadata.file.path, metadata.section)));
 			node.classList.toggle("codiff-loadable-summary-item", metadata != null && shouldLoadDiffSectionContents(metadata.section));
 			node.classList.toggle("codiff-loading-summary-item", Boolean(metadata && loadingSectionIds.has(metadata.section.id)));
+			if (definitionModifierActiveRef.current) window.requestAnimationFrame(() => {
+				if (definitionModifierActiveRef.current && node.isConnected) applyIdentifierNavigationState([{ element: node }], true);
+			});
 		},
 		overflow: wordWrap ? "wrap" : "scroll",
 		stickyHeaders: true,
@@ -6539,7 +7121,11 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 		loadDiffFiles,
 		loadingSectionIds,
 		onCreateComment,
+		onFindDefinitions,
 		onLoadSection,
+		selectedHeaderItemIds,
+		source,
+		sourceKey,
 		theme,
 		wordWrap
 	]);
@@ -6631,11 +7217,19 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 		poolSize: Math.min(3, Math.max(1, navigator.hardwareConcurrency || 3)),
 		workerFactory: () => new Worker(new URL("@pierre/diffs/worker/worker.js", import.meta.url), { type: "module" })
 	}), []);
-	const requestScrollItemHeaderIntoView = useCallback((itemId, behavior = "instant") => {
+	const requestScrollTargetIntoView = useCallback((itemId, behavior = "instant", commentTarget) => {
 		const handle = codeViewRef.current;
 		const viewer = handle?.getInstance();
 		if (!handle || !viewer || viewer.getTopForItem(itemId) == null) return false;
-		handle.scrollTo({
+		handle.scrollTo(commentTarget?.lineNumber != null && commentTarget.side ? {
+			align: "center",
+			behavior: getEffectiveScrollBehavior(behavior),
+			id: itemId,
+			lineNumber: commentTarget.lineNumber,
+			offset: 11,
+			side: commentTarget.side,
+			type: "line"
+		} : {
 			behavior: getEffectiveScrollBehavior(behavior),
 			id: itemId,
 			offset: 11,
@@ -6646,14 +7240,15 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 	useLayoutEffect(() => {
 		if (!scrollTarget || handledScrollRequestRef.current === scrollTarget.request) return;
 		const behavior = scrollTarget.behavior ?? "instant";
-		const itemId = scrollTarget.blockId ? firstItemByBlockId.get(scrollTarget.blockId) : scrollTarget.path ? firstItemByPath.get(scrollTarget.path) : null;
+		const commentTarget = scrollTarget.commentId ? commentTargetById.get(scrollTarget.commentId) : void 0;
+		const itemId = commentTarget?.id ?? (scrollTarget.blockId ? firstItemByBlockId.get(scrollTarget.blockId) : scrollTarget.path ? firstItemByPath.get(scrollTarget.path) : null);
 		if (!itemId) return;
 		let frame = null;
 		let attempts = 0;
 		let canceled = false;
 		const tryScroll = () => {
 			if (canceled || handledScrollRequestRef.current === scrollTarget.request) return;
-			if (requestScrollItemHeaderIntoView(itemId, behavior)) {
+			if (requestScrollTargetIntoView(itemId, behavior, commentTarget)) {
 				handledScrollRequestRef.current = scrollTarget.request;
 				return;
 			}
@@ -6668,9 +7263,10 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 			if (frame != null) window.cancelAnimationFrame(frame);
 		};
 	}, [
+		commentTargetById,
 		firstItemByBlockId,
 		firstItemByPath,
-		requestScrollItemHeaderIntoView,
+		requestScrollTargetIntoView,
 		scrollTarget
 	]);
 	useEffect(() => {
@@ -6832,6 +7428,22 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 			applySearchHighlights(viewer.getRenderedItems(), searchQuery, resolvedActiveSearchMatch);
 		});
 	}, [resolvedActiveSearchMatch, searchQuery]);
+	const updateRenderedIdentifierNavigation = useCallback((active, viewer) => {
+		const nextViewer = viewer ?? codeViewRef.current?.getInstance();
+		if (!nextViewer) return;
+		if (definitionHighlightFrameRef.current != null) {
+			window.cancelAnimationFrame(definitionHighlightFrameRef.current);
+			definitionHighlightFrameRef.current = null;
+		}
+		if (!active) {
+			applyIdentifierNavigationState(nextViewer.getRenderedItems(), false);
+			return;
+		}
+		definitionHighlightFrameRef.current = window.requestAnimationFrame(() => {
+			definitionHighlightFrameRef.current = null;
+			applyIdentifierNavigationState(nextViewer.getRenderedItems(), true);
+		});
+	}, []);
 	const scheduleStickyHeaderStateUpdate = useCallback((viewer) => {
 		const nextViewer = viewer ?? codeViewRef.current?.getInstance();
 		if (!nextViewer) return;
@@ -6845,6 +7457,7 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 		for (const timer of deferredTimersRef.current) window.clearTimeout(timer);
 		deferredTimersRef.current.clear();
 		emptyCommentDeleteTimersRef.current.clear();
+		if (definitionHighlightFrameRef.current != null) window.cancelAnimationFrame(definitionHighlightFrameRef.current);
 		if (highlightFrameRef.current != null) window.cancelAnimationFrame(highlightFrameRef.current);
 		if (stickyHeaderFrameRef.current != null) window.cancelAnimationFrame(stickyHeaderFrameRef.current);
 	}, []);
@@ -6856,6 +7469,38 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 		scheduleSearchHighlights,
 		scheduleStickyHeaderStateUpdate
 	]);
+	useEffect(() => {
+		if (!onFindDefinitions) return;
+		const updateDefinitionModifierState = (active) => {
+			if (definitionModifierActiveRef.current === active) return;
+			definitionModifierActiveRef.current = active;
+			updateRenderedIdentifierNavigation(active);
+		};
+		const handleModifierChange = (event) => {
+			updateDefinitionModifierState(isPrimaryModifier(event));
+		};
+		const handleModifierPointer = (event) => {
+			updateDefinitionModifierState(isPrimaryModifier(event));
+		};
+		const clearDefinitionModifierState = () => updateDefinitionModifierState(false);
+		window.addEventListener("keydown", handleModifierChange);
+		window.addEventListener("keyup", handleModifierChange);
+		window.addEventListener("pointerdown", handleModifierPointer);
+		window.addEventListener("pointermove", handleModifierPointer);
+		window.addEventListener("blur", clearDefinitionModifierState);
+		return () => {
+			clearDefinitionModifierState();
+			window.removeEventListener("keydown", handleModifierChange);
+			window.removeEventListener("keyup", handleModifierChange);
+			window.removeEventListener("pointerdown", handleModifierPointer);
+			window.removeEventListener("pointermove", handleModifierPointer);
+			window.removeEventListener("blur", clearDefinitionModifierState);
+		};
+	}, [onFindDefinitions, updateRenderedIdentifierNavigation]);
+	const invalidateDefinitionLookup = useCallback(() => {
+		definitionLookupRequestRef.current++;
+	}, []);
+	useEffect(() => invalidateDefinitionLookup, [invalidateDefinitionLookup]);
 	useEffect(() => {
 		const handle = codeViewRef.current;
 		const viewer = handle?.getInstance();
@@ -7037,15 +7682,17 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 		}
 		scheduleSearchHighlights();
 		scheduleStickyHeaderStateUpdate(viewer);
+		if (definitionModifierActiveRef.current) updateRenderedIdentifierNavigation(true, viewer);
 	}, [
 		itemBlockId,
 		items,
 		onActiveBlockChange,
 		onSelectPathFromScroll,
 		scheduleSearchHighlights,
-		scheduleStickyHeaderStateUpdate
+		scheduleStickyHeaderStateUpdate,
+		updateRenderedIdentifierNavigation
 	]);
-	return disableWorkerPool ? /* @__PURE__ */ jsx(CodeView, {
+	return /* @__PURE__ */ jsxs(Fragment$1, { children: [disableWorkerPool ? /* @__PURE__ */ jsx(CodeView, {
 		className: "code-view",
 		disableWorkerPool,
 		items: codeViewItems,
@@ -7073,11 +7720,77 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 			renderCustomHeader,
 			selectedLines: isReadOnly ? null : selectedLines
 		})
+	}), definitionLookup?.sourceKey === sourceKey && onOpenDefinition ? /* @__PURE__ */ jsx(DefinitionPopover, {
+		anchor: definitionLookup.anchor,
+		getDestination: (candidate) => getDefinitionDiffTarget(candidate) ? "diff" : candidate.canOpenInEditor ? "editor" : "unavailable",
+		identifier: definitionLookup.identifier,
+		onClose: () => {
+			invalidateDefinitionLookup();
+			setDefinitionLookup(null);
+		},
+		onOpen: (candidate) => {
+			const target = getDefinitionDiffTarget(candidate);
+			if (target) {
+				if (target.metadata.isCollapsed) onToggleCollapsed(target.metadata.file, true, target.metadata.reviewIdentity.key);
+				const scrollToDefinition = () => codeViewRef.current?.scrollTo({
+					align: "center",
+					behavior: "smooth-auto",
+					id: target.item.id,
+					lineNumber: candidate.lineNumber,
+					offset: 11,
+					side: candidate.side,
+					type: "line"
+				});
+				if (target.metadata.isCollapsed) window.requestAnimationFrame(() => window.requestAnimationFrame(scrollToDefinition));
+				else scrollToDefinition();
+			} else if (candidate.canOpenInEditor) onOpenDefinition(candidate);
+			invalidateDefinitionLookup();
+			setDefinitionLookup(null);
+		},
+		result: definitionLookup.result
+	}) : null] });
+}
+//#endregion
+//#region app/components/ReviewModeControl.tsx
+function ReviewModeControl({ mode, modes, onModeChange }) {
+	return /* @__PURE__ */ jsx("div", {
+		"aria-label": "Review mode",
+		className: "review-mode-control",
+		role: "tablist",
+		children: modes.map((item) => /* @__PURE__ */ jsxs("button", {
+			"aria-label": item.ariaLabel,
+			"aria-selected": mode === item.value,
+			onClick: () => onModeChange(item.value),
+			role: "tab",
+			title: item.title,
+			type: "button",
+			children: [
+				item.icon,
+				/* @__PURE__ */ jsx("span", {
+					className: "review-mode-label",
+					children: item.label
+				}),
+				item.indicator
+			]
+		}, item.value))
 	});
 }
 //#endregion
 //#region app/components/ReviewTopBar.tsx
-function ReviewTopBar({ actions, context, leading, mode, modes, onModeChange, onToggleSidebar, repository, repositoryTooltip, sidebarCollapsed, sourceMenu, toggleTitle }) {
+function ReviewTopBar({ actions, center, context, leading, mode, modes, onModeChange, onToggleSidebar, repository, repositoryTooltip, sidebarCollapsed, sidebarPosition = "left", sourceMenu, toggleTitle }) {
+	const sidebarToggle = /* @__PURE__ */ jsx("button", {
+		"aria-label": sidebarCollapsed ? "Expand sidebar" : "Collapse sidebar",
+		className: "review-top-bar-icon-button sidebar-toggle-button",
+		onClick: onToggleSidebar,
+		title: toggleTitle,
+		type: "button",
+		children: /* @__PURE__ */ jsx(SidebarSimpleIcon, {
+			"aria-hidden": true,
+			mirrored: sidebarPosition === "right",
+			size: 18,
+			weight: "bold"
+		})
+	});
 	return /* @__PURE__ */ jsxs("header", {
 		className: "review-top-bar workspace-top-bar",
 		children: [
@@ -7085,18 +7798,7 @@ function ReviewTopBar({ actions, context, leading, mode, modes, onModeChange, on
 				className: "review-top-bar-left",
 				children: [
 					leading,
-					/* @__PURE__ */ jsx("button", {
-						"aria-label": sidebarCollapsed ? "Expand sidebar" : "Collapse sidebar",
-						className: "review-top-bar-icon-button sidebar-toggle-button",
-						onClick: onToggleSidebar,
-						title: toggleTitle,
-						type: "button",
-						children: /* @__PURE__ */ jsx(SidebarSimpleIcon, {
-							"aria-hidden": true,
-							size: 18,
-							weight: "bold"
-						})
-					}),
+					sidebarPosition === "left" ? sidebarToggle : null,
 					sourceMenu,
 					/* @__PURE__ */ jsx("div", {
 						className: "review-top-bar-repository-slot",
@@ -7105,36 +7807,27 @@ function ReviewTopBar({ actions, context, leading, mode, modes, onModeChange, on
 					})
 				]
 			}),
-			/* @__PURE__ */ jsx("div", {
-				"aria-label": "Review mode",
-				className: "review-mode-control",
-				role: "tablist",
-				children: modes.map((item) => /* @__PURE__ */ jsxs("button", {
-					"aria-label": item.ariaLabel,
-					"aria-selected": mode === item.value,
-					onClick: () => onModeChange(item.value),
-					role: "tab",
-					title: item.title,
-					type: "button",
-					children: [
-						item.icon,
-						/* @__PURE__ */ jsx("span", {
-							className: "review-mode-label",
-							children: item.label
-						}),
-						item.indicator
-					]
-				}, item.value))
+			modes ? /* @__PURE__ */ jsx(ReviewModeControl, {
+				mode,
+				modes,
+				onModeChange
+			}) : /* @__PURE__ */ jsx("div", {
+				className: "review-top-bar-center",
+				children: center
 			}),
 			/* @__PURE__ */ jsxs("div", {
 				className: "review-top-bar-right",
-				children: [context ? /* @__PURE__ */ jsx("div", {
-					className: "review-top-bar-context",
-					children: context
-				}) : null, actions ? /* @__PURE__ */ jsx("div", {
-					className: "review-top-bar-actions",
-					children: actions
-				}) : null]
+				children: [
+					context ? /* @__PURE__ */ jsx("div", {
+						className: "review-top-bar-context",
+						children: context
+					}) : null,
+					actions ? /* @__PURE__ */ jsx("div", {
+						className: "review-top-bar-actions",
+						children: actions
+					}) : null,
+					sidebarPosition === "right" ? sidebarToggle : null
+				]
 			})
 		]
 	});
@@ -7286,6 +7979,7 @@ function StageFileRow({ file, on, onToggle }) {
 function StageGroupRow({ group, onToggleFile, onToggleGroup, selected }) {
 	const paths = group.files.map((file) => file.path);
 	const onCount = paths.filter((path) => selected.has(path)).length;
+	const state = onCount === 0 ? "off" : onCount === paths.length ? "on" : "partial";
 	return /* @__PURE__ */ jsxs("div", {
 		className: "wt-stage-group",
 		children: [/* @__PURE__ */ jsxs("button", {
@@ -7293,7 +7987,7 @@ function StageGroupRow({ group, onToggleFile, onToggleGroup, selected }) {
 			onClick: () => onToggleGroup(paths),
 			type: "button",
 			children: [
-				/* @__PURE__ */ jsx(CommitCheck, { state: onCount === 0 ? "off" : onCount === paths.length ? "on" : "partial" }),
+				/* @__PURE__ */ jsx(CommitCheck, { state }),
 				/* @__PURE__ */ jsx("span", {
 					className: "wt-stage-group-icon",
 					children: /* @__PURE__ */ jsx(ChapterIcon, {
@@ -7629,14 +8323,14 @@ function CommitView({ branch, draft, model, onCommit, onCommitOutput, onUpdateMe
 }
 //#endregion
 //#region app/components/walkthrough/NarrativeWalkthroughView.tsx
-const getWalkthroughBlockScrollTarget = ({ activeBlockId, firstSupportBlockId, mode, stopScrollRequest, supportScrollRequest }) => mode === "support" && firstSupportBlockId ? {
+const getWalkthroughBlockScrollTarget = ({ activeBlockId, firstSupportBlockId, scrollTarget }) => scrollTarget.kind === "support" && firstSupportBlockId ? {
 	behavior: "smooth",
 	blockId: firstSupportBlockId,
-	request: supportScrollRequest
-} : mode === "stop" && activeBlockId && stopScrollRequest > 0 ? {
+	request: scrollTarget.nonce
+} : scrollTarget.kind === "stop" && activeBlockId && scrollTarget.nonce > 0 ? {
 	behavior: "smooth",
 	blockId: activeBlockId,
-	request: stopScrollRequest
+	request: scrollTarget.nonce
 } : null;
 const getFocusedRunDiffs = (item, files) => resolveWalkthroughHunkRuns(item, files).flatMap((run) => {
 	const focused = focusChangedFileForHunks(run.resolved.file, run.resolved.section, run.hunks);
@@ -7659,14 +8353,15 @@ const getWalkthroughNavigationKeyDirection = (event) => {
 	if (isCtrlOnly && event.key === "ArrowUp") return -1;
 	return 0;
 };
+const getWalkthroughKeyboardForwardIndex = ({ index, scrollRequest }) => index === 0 && scrollRequest === 0 ? 0 : index + 1;
 const emptyWalkthroughBlockSet = {
 	blocks: [],
 	firstBlockIdByStop: [],
 	stopIndexByBlockId: /* @__PURE__ */ new Map()
 };
-function StopHeader({ current, stop }) {
+function StopHeader({ stop }) {
 	return /* @__PURE__ */ jsxs("div", {
-		className: `wt-stop-block wt-stop-block-header${current ? " current" : ""}`,
+		className: "wt-stop-block wt-stop-block-header",
 		children: [/* @__PURE__ */ jsxs("div", {
 			className: "wt-stage-title-row",
 			children: [/* @__PURE__ */ jsx("h2", {
@@ -7676,9 +8371,9 @@ function StopHeader({ current, stop }) {
 		}), /* @__PURE__ */ jsx(Narration, { prose: stop.prose })]
 	});
 }
-function SupportHeader({ current }) {
+function SupportHeader() {
 	return /* @__PURE__ */ jsxs("div", {
-		className: `wt-stop-block wt-stop-block-header${current ? " current" : ""}`,
+		className: "wt-stop-block wt-stop-block-header",
 		children: [/* @__PURE__ */ jsxs("div", {
 			className: "wt-stage-title-row",
 			children: [/* @__PURE__ */ jsx("h2", {
@@ -7699,10 +8394,7 @@ const createWalkthroughBlocks = (files, walkthroughView, currentIndex) => {
 			firstBlockIdByStop[stop.index] = blockId;
 			stopIndexByBlockId.set(blockId, stop.index);
 			blocks.push({
-				header: /* @__PURE__ */ jsx(StopHeader, {
-					current: stop.index === currentIndex,
-					stop
-				}),
+				header: /* @__PURE__ */ jsx(StopHeader, { stop }),
 				headerSelected: stop.index === currentIndex,
 				id: blockId
 			});
@@ -7714,10 +8406,7 @@ const createWalkthroughBlocks = (files, walkthroughView, currentIndex) => {
 			stopIndexByBlockId.set(blockId, stop.index);
 			blocks.push({
 				file,
-				header: runIndex === 0 ? /* @__PURE__ */ jsx(StopHeader, {
-					current: stop.index === currentIndex,
-					stop
-				}) : null,
+				header: runIndex === 0 ? /* @__PURE__ */ jsx(StopHeader, { stop }) : null,
 				headerSelected: stop.index === currentIndex,
 				id: blockId,
 				itemIdPrefix: blockId,
@@ -7746,7 +8435,7 @@ const createSupportBlocks = (files, selected, walkthroughView, showWhitespace) =
 		const isFirstBlock = blocks.length === 0;
 		blocks.push({
 			file,
-			header: isFirstBlock ? /* @__PURE__ */ jsx(SupportHeader, { current: selected }) : null,
+			header: isFirstBlock ? /* @__PURE__ */ jsx(SupportHeader, {}) : null,
 			headerSelected: selected,
 			id: blockId,
 			itemIdPrefix: blockId,
@@ -7760,7 +8449,7 @@ const createSupportBlocks = (files, selected, walkthroughView, showWhitespace) =
 		const isFirstBlock = blocks.length === 0;
 		blocks.push({
 			file,
-			header: isFirstBlock ? /* @__PURE__ */ jsx(SupportHeader, { current: selected }) : null,
+			header: isFirstBlock ? /* @__PURE__ */ jsx(SupportHeader, {}) : null,
 			headerSelected: selected,
 			id: blockId,
 			itemIdPrefix: blockId,
@@ -7795,8 +8484,10 @@ function Arc({ committable, navigation, onShareWalkthrough, shareWalkthroughDisa
 	const goArcPrev = useCallback(() => {
 		if (navigation.mode === "stop") navigation.goPrev();
 		else if (navigation.mode === "support") navigation.goStop(walkthroughView.sequence.length - 1);
-		else if (navigation.mode === "commit") if (supportAvailable) navigation.openSupport();
-		else navigation.goStop(walkthroughView.sequence.length - 1);
+		else if (navigation.mode === "commit") {
+			if (supportAvailable) navigation.openSupport();
+			else navigation.goStop(walkthroughView.sequence.length - 1);
+		}
 	}, [
 		navigation,
 		supportAvailable,
@@ -7955,9 +8646,7 @@ function NarrativeWalkthroughView({ allowCommit = true, files, navigation, onAct
 	const reviewBlockScrollTarget = getWalkthroughBlockScrollTarget({
 		activeBlockId,
 		firstSupportBlockId,
-		mode: navigation.mode,
-		stopScrollRequest: navigation.scrollTarget.nonce,
-		supportScrollRequest: navigation.supportScrollRequest
+		scrollTarget: navigation.scrollTarget
 	});
 	const handleActiveBlockChange = useCallback((blockId) => {
 		onActiveReviewTargetChange(getBlockReviewTarget(reviewBlocks, blockId));
@@ -7993,7 +8682,11 @@ function NarrativeWalkthroughView({ allowCommit = true, files, navigation, onAct
 		if (direction === 1) {
 			event.preventDefault();
 			if (navigation.mode === "stop") {
-				if (navigation.index < walkthroughView.sequence.length - 1) navigation.goNext();
+				const targetIndex = getWalkthroughKeyboardForwardIndex({
+					index: navigation.index,
+					scrollRequest: navigation.scrollTarget.nonce
+				});
+				if (targetIndex < walkthroughView.sequence.length) navigation.goStop(targetIndex);
 				else if (supportAvailable) navigation.openSupport();
 				else if (committable) navigation.enterCommit();
 			} else if (navigation.mode === "support" && committable) navigation.enterCommit();
@@ -8001,8 +8694,10 @@ function NarrativeWalkthroughView({ allowCommit = true, files, navigation, onAct
 			event.preventDefault();
 			if (navigation.mode === "stop") navigation.goPrev();
 			else if (navigation.mode === "support") navigation.goStop(navigation.index);
-			else if (navigation.mode === "commit") if (supportAvailable) navigation.openSupport();
-			else navigation.goStop(navigation.index);
+			else if (navigation.mode === "commit") {
+				if (supportAvailable) navigation.openSupport();
+				else navigation.goStop(navigation.index);
+			}
 		}
 	}, [
 		committable,
@@ -8235,9 +8930,9 @@ const useNarrativeNavigation = (walkthrough, files, resetKey = "") => {
 	const [index, setIndex] = useState(0);
 	const [scrollTarget, setScrollTarget] = useState({
 		index: 0,
+		kind: "stop",
 		nonce: 0
 	});
-	const [supportScrollRequest, setSupportScrollRequest] = useState(0);
 	const [supportVisited, setSupportVisited] = useState(false);
 	const [visited, setVisited] = useState(() => {
 		const stopId = firstStopId(walkthrough);
@@ -8268,9 +8963,9 @@ const useNarrativeNavigation = (walkthrough, files, resetKey = "") => {
 			setIndex(0);
 			setScrollTarget({
 				index: 0,
+				kind: "stop",
 				nonce: 0
 			});
-			setSupportScrollRequest(0);
 			setSupportVisited(false);
 			const stopId = firstStopId(walkthrough);
 			setVisited(new Set(stopId ? [stopId] : []));
@@ -8332,6 +9027,7 @@ const useNarrativeNavigation = (walkthrough, files, resetKey = "") => {
 		pendingSupportScrollRef.current = null;
 		setScrollTarget((current) => ({
 			index: clamped,
+			kind: "stop",
 			nonce: current.nonce + 1
 		}));
 	}, [
@@ -8376,7 +9072,11 @@ const useNarrativeNavigation = (walkthrough, files, resetKey = "") => {
 		if (walkthroughView?.sequence.length) setIndex(walkthroughView.sequence.length - 1);
 		setMode("support");
 		pendingSupportScrollRef.current = { walkthrough };
-		setSupportScrollRequest((current) => current + 1);
+		setScrollTarget((current) => ({
+			...current,
+			kind: "support",
+			nonce: current.nonce + 1
+		}));
 		setSupportVisited(true);
 	}, [
 		walkthrough,
@@ -8384,11 +9084,15 @@ const useNarrativeNavigation = (walkthrough, files, resetKey = "") => {
 		leaveStopMode
 	]);
 	const syncSupportFromScroll = useCallback(() => {
+		const pendingStop = pendingStopScrollRef.current;
+		if (pendingStop) {
+			if (pendingStop.walkthrough === walkthrough) return;
+			pendingStopScrollRef.current = null;
+		}
 		pendingSupportScrollRef.current = null;
-		pendingStopScrollRef.current = null;
 		setMode("support");
 		setSupportVisited(true);
-	}, []);
+	}, [walkthrough]);
 	return {
 		commitBody,
 		commitSelected,
@@ -8407,7 +9111,6 @@ const useNarrativeNavigation = (walkthrough, files, resetKey = "") => {
 		scrollTarget,
 		setCommitBody,
 		setCommitSubject,
-		supportScrollRequest,
 		supportVisited,
 		syncIndexFromScroll,
 		syncSupportFromScroll,
@@ -8506,7 +9209,7 @@ const writeSidebarWidth = (width, storage = localStorage) => {
 };
 //#endregion
 //#region app/hooks/useResizableSidebar.ts
-function useResizableSidebar({ collapseThreshold, onCollapse, onWidthCommit, readWidth }) {
+function useResizableSidebar({ collapseThreshold, onCollapse, onWidthCommit, position, readWidth }) {
 	const [sidebarWidth, setSidebarWidth] = useState(readWidth);
 	return {
 		resizeSidebar: useCallback((event) => {
@@ -8515,7 +9218,7 @@ function useResizableSidebar({ collapseThreshold, onCollapse, onWidthCommit, rea
 			const handle = event.currentTarget;
 			const shell = handle.parentElement;
 			if (!shell) return;
-			const shellLeft = shell.getBoundingClientRect().left;
+			const shellRect = shell.getBoundingClientRect();
 			handle.setPointerCapture(event.pointerId);
 			handle.classList.add("dragging");
 			document.body.style.cursor = "col-resize";
@@ -8529,7 +9232,7 @@ function useResizableSidebar({ collapseThreshold, onCollapse, onWidthCommit, rea
 				document.body.style.cursor = "";
 			};
 			const handleMove = (moveEvent) => {
-				const rawWidth = moveEvent.clientX - shellLeft;
+				const rawWidth = position === "right" ? shellRect.right - moveEvent.clientX : moveEvent.clientX - shellRect.left;
 				if (collapseThreshold != null && rawWidth < collapseThreshold) {
 					collapsed = true;
 					onCollapse?.();
@@ -8551,7 +9254,8 @@ function useResizableSidebar({ collapseThreshold, onCollapse, onWidthCommit, rea
 		}, [
 			collapseThreshold,
 			onCollapse,
-			onWidthCommit
+			onWidthCommit,
+			position
 		]),
 		sidebarWidth
 	};
@@ -8657,6 +9361,7 @@ function useReviewCommentDrafts({ canCreateComment = true, comments, onCommentFi
 			setComments,
 			updateActiveReviewCommentDraft
 		]),
+		focusComment,
 		focusCommentId,
 		focusCommentRequest,
 		resetCommentFocus,
@@ -8739,6 +9444,7 @@ const defaultConfigTemplate = {
 		"opencodeModel": "opencode-default",
 		"piModel": "pi-default",
 		"reviewCommentsPrefix": "# Address these Review Comments",
+		"sidebarPosition": "left",
 		"showOutdated": false,
 		"showWhitespace": false,
 		"theme": "system",
@@ -8746,6 +9452,7 @@ const defaultConfigTemplate = {
 		"wordWrap": false
 	},
 	keymap: {
+		"askAgent": "Mod+Alt+Enter",
 		"closeSearch": "Escape",
 		"commandBar": "Mod+Shift+p",
 		"diffSearch": "Mod+f",
@@ -8803,10 +9510,35 @@ const emptyReviewComments = [];
 const emptyGeneralCommentThreads = [];
 const emptyPaths = /* @__PURE__ */ new Set();
 const emptyWalkthroughNotes = /* @__PURE__ */ new Map();
+const reviewSurfacePreferencesKey = "codiff:web-review-surface-preferences:v1";
+const getLocationHashTarget = () => {
+	const hash = window.location.hash.slice(1);
+	if (!hash) return null;
+	try {
+		return decodeURIComponent(hash);
+	} catch {
+		return hash;
+	}
+};
+const commentMatchesHashTarget = (comment, target) => comment.id === target || comment.threadId === target || comment.url?.slice(comment.url.lastIndexOf("#") + 1) === target;
 const readSharedSidebarWidth = () => typeof localStorage === "undefined" ? 292 : readSidebarWidth();
 const writeSharedSidebarWidth = (width) => {
 	if (typeof localStorage !== "undefined") writeSidebarWidth(width);
 };
+const readStoredSidebarCollapsed = () => {
+	if (typeof localStorage === "undefined") return null;
+	try {
+		const stored = JSON.parse(localStorage.getItem(reviewSurfacePreferencesKey) ?? "{}");
+		if (stored && typeof stored === "object" && "sidebarCollapsed" in stored && typeof stored.sidebarCollapsed === "boolean") return stored.sidebarCollapsed;
+	} catch {}
+	return null;
+};
+const writeStoredSidebarCollapsed = (sidebarCollapsed) => {
+	if (typeof localStorage === "undefined") return;
+	try {
+		localStorage.setItem(reviewSurfacePreferencesKey, JSON.stringify({ sidebarCollapsed }));
+	} catch {}
+};
 const getSnapshotReviewComments = (snapshot) => {
 	if (!snapshot.reviewComments?.length) return emptyReviewComments;
 	return getReviewCommentsFromState({
@@ -8828,7 +9560,9 @@ const disabledCommitMessage = async () => ({
 	reason: "Shared walkthroughs are read-only.",
 	status: "unavailable"
 });
-function ReviewSurface({ commenting, externalUrl, gitIdentity = null, initialMode, interactive, onDeleteShare, onModeChange, providerLabel = "provider", repositoryUrl, settingsBar, signInLabel = "Sign in to comment", snapshot, sourceDescriptionFooterAside, title }) {
+const mobileSidebarMediaQuery = "(max-width: 720px)";
+const shouldCollapseSidebarInitially = () => readStoredSidebarCollapsed() ?? (typeof window !== "undefined" && window.matchMedia(mobileSidebarMediaQuery).matches);
+function ReviewSurface({ commenting, externalUrl, gitIdentity = null, initialMode, interactive, onDeleteShare, onModeChange, providerLabel = "provider", repositoryUrl, settingsBar, sidebarPosition = "left", signInLabel = "Sign in to comment", snapshot, sourceDescriptionFooterAside, title }) {
 	const canComment = commenting?.canComment ?? Boolean(interactive);
 	const deleteShare = useCallback(async () => {
 		if (!onDeleteShare || !window.confirm("Delete this shared walkthrough? This cannot be undone.")) return;
@@ -8851,23 +9585,44 @@ function ReviewSurface({ commenting, externalUrl, gitIdentity = null, initialMod
 	const keymap = useMemo(() => createDefaultConfig().keymap, []);
 	const [fileSearchQuery, setFileSearchQuery] = useState("");
 	const [uncontrolledSidebarMode, setUncontrolledSidebarMode] = useState(() => initialMode ?? (interactive ? "tree" : "walkthrough"));
-	const [sidebarCollapsed, setSidebarCollapsed] = useState(false);
+	const [sidebarCollapsed, setSidebarCollapsed] = useState(null);
+	const sidebarCollapsedRef = useRef(null);
+	const sidebarInteractedRef = useRef(false);
+	const updateSidebarCollapsed = useCallback((value, persist) => {
+		sidebarCollapsedRef.current = value;
+		setSidebarCollapsed(value);
+		if (persist) writeStoredSidebarCollapsed(value);
+	}, []);
+	const toggleSidebar = useCallback(() => {
+		sidebarInteractedRef.current = true;
+		updateSidebarCollapsed(!(sidebarCollapsedRef.current ?? shouldCollapseSidebarInitially()), true);
+	}, [updateSidebarCollapsed]);
+	useEffect(() => {
+		const timeout = window.setTimeout(() => {
+			if (!sidebarInteractedRef.current) updateSidebarCollapsed(shouldCollapseSidebarInitially(), false);
+		}, 0);
+		return () => window.clearTimeout(timeout);
+	}, [updateSidebarCollapsed]);
 	useEffect(() => {
 		const handleKeyDown = (event) => {
 			if (event.repeat || !matchesShortcut(event, keymap, "toggleSidebar")) return;
 			event.preventDefault();
-			setSidebarCollapsed((current) => !current);
+			toggleSidebar();
 		};
 		window.addEventListener("keydown", handleKeyDown);
 		return () => window.removeEventListener("keydown", handleKeyDown);
-	}, [keymap]);
+	}, [keymap, toggleSidebar]);
 	const sidebarMode = Boolean(initialMode && onModeChange) && initialMode ? initialMode : uncontrolledSidebarMode;
 	const [treeScrollTarget, setTreeScrollTarget] = useState(null);
 	const { bumpItemVersion, collapsed, expandedGenerated, itemVersionByKey, selectedPath, setSelectedPath, toggleCollapsed, toggleViewed, viewed } = useReviewFileState({ initialSelectedPath: snapshot.files[0]?.path ?? null });
 	const { resizeSidebar, sidebarWidth } = useResizableSidebar({
 		collapseThreshold: 80,
-		onCollapse: () => setSidebarCollapsed(true),
+		onCollapse: () => {
+			sidebarInteractedRef.current = true;
+			updateSidebarCollapsed(true, true);
+		},
 		onWidthCommit: writeSharedSidebarWidth,
+		position: sidebarPosition,
 		readWidth: readSharedSidebarWidth
 	});
 	const snapshotReviewComments = useMemo(() => getSnapshotReviewComments(snapshot), [snapshot]);
@@ -8878,7 +9633,7 @@ function ReviewSurface({ commenting, externalUrl, gitIdentity = null, initialMod
 	} : comment), [editedReviewCommentBodies, snapshotReviewComments]);
 	const [localReviewComments, setLocalReviewComments] = useState(emptyReviewComments);
 	const reviewComments = useMemo(() => mergeReviewComments(visibleSnapshotReviewComments, localReviewComments), [localReviewComments, visibleSnapshotReviewComments]);
-	const { activeReviewCommentDraftRef, activeReviewCommentDraftState, clearCommentFocus, createComment, deleteComment: deleteLocalComment, focusCommentId, focusCommentRequest, reviewCommentsRef, updateActiveReviewCommentDraft, updateComment } = useReviewCommentDrafts({
+	const { activeReviewCommentDraftRef, activeReviewCommentDraftState, clearCommentFocus, createComment, deleteComment: deleteLocalComment, focusComment, focusCommentId, focusCommentRequest, reviewCommentsRef, updateActiveReviewCommentDraft, updateComment } = useReviewCommentDrafts({
 		canCreateComment: canComment,
 		comments: reviewComments,
 		onCommentFileChange: bumpItemVersion,
@@ -8904,6 +9659,7 @@ function ReviewSurface({ commenting, externalUrl, gitIdentity = null, initialMod
 	const walkthroughRequestPendingRef = useRef(false);
 	const [walkthroughRequestId, setWalkthroughRequestId] = useState(0);
 	const interactiveRef = useRef(interactive);
+	const handledHashTargetRef = useRef(null);
 	const visibleFiles = useMemo(() => sortFiles(snapshot.files).filter((file) => fuzzyMatches(file.path, fileSearchQuery) && fileHasVisibleDiff(file, snapshot.preferences.showWhitespace)), [
 		fileSearchQuery,
 		snapshot.files,
@@ -9150,6 +9906,56 @@ function ReviewSurface({ commenting, externalUrl, gitIdentity = null, initialMod
 			request: (current?.request ?? 0) + 1
 		}));
 	}, [setSelectedPath]);
+	const activateReviewComment = useCallback((comment) => {
+		changeSidebarMode("tree");
+		setSelectedPath(comment.filePath);
+		focusComment(comment.id);
+		setTreeScrollTarget((current) => ({
+			behavior: "smooth",
+			commentId: comment.id,
+			path: comment.filePath,
+			request: (current?.request ?? 0) + 1
+		}));
+	}, [
+		changeSidebarMode,
+		focusComment,
+		setSelectedPath
+	]);
+	const activateHashTarget = useCallback(() => {
+		const target = getLocationHashTarget();
+		if (!target || handledHashTargetRef.current === target) return;
+		const reviewComment = reviewComments.find((comment) => commentMatchesHashTarget(comment, target));
+		if (reviewComment) {
+			handledHashTargetRef.current = target;
+			activateReviewComment(reviewComment);
+			return;
+		}
+		for (const thread of generalCommentThreads) {
+			const generalComment = thread.comments.find((comment) => commentMatchesHashTarget(comment, target)) ?? (thread.id === target ? thread.comments[0] : void 0);
+			if (generalComment) {
+				handledHashTargetRef.current = target;
+				activateGeneralComment(generalComment.id);
+				return;
+			}
+		}
+	}, [
+		activateGeneralComment,
+		activateReviewComment,
+		generalCommentThreads,
+		reviewComments
+	]);
+	useEffect(() => {
+		const timeout = window.setTimeout(activateHashTarget, 0);
+		return () => window.clearTimeout(timeout);
+	}, [activateHashTarget]);
+	useEffect(() => {
+		const handleHashChange = () => {
+			handledHashTargetRef.current = null;
+			activateHashTarget();
+		};
+		window.addEventListener("hashchange", handleHashChange);
+		return () => window.removeEventListener("hashchange", handleHashChange);
+	}, [activateHashTarget]);
 	const updateSelectedPathFromScroll = useCallback((viewer) => {
 		const nextPath = getSelectedPathFromScroll(viewer, visibleFiles, snapshot.preferences.showWhitespace);
 		if (nextPath) setSelectedPath((current) => current === nextPath ? current : nextPath);
@@ -9328,9 +10134,10 @@ function ReviewSurface({ commenting, externalUrl, gitIdentity = null, initialMod
 		children: settingsBar
 	}) : null] }) : void 0;
 	return /* @__PURE__ */ jsxs("div", {
-		className: `app-shell share-shell${interactive ? " merge-request-shell" : ""}${sidebarCollapsed ? " sidebar-collapsed" : ""}`,
+		className: `app-shell share-shell${interactive ? " merge-request-shell" : ""}${sidebarCollapsed === null ? " sidebar-auto" : sidebarCollapsed ? " sidebar-collapsed" : ""}`,
+		"data-sidebar-position": sidebarPosition,
 		"data-theme": shellTheme,
-		style: sidebarCollapsed ? void 0 : { gridTemplateColumns: `${sidebarWidth}px 0 minmax(0, 1fr)` },
+		style: sidebarCollapsed !== false ? void 0 : { gridTemplateColumns: sidebarPosition === "right" ? `minmax(0, 1fr) 0 ${sidebarWidth}px` : `${sidebarWidth}px 0 minmax(0, 1fr)` },
 		children: [
 			/* @__PURE__ */ jsx(ReviewTopBar, {
 				actions: topBarActions,
@@ -9371,7 +10178,7 @@ function ReviewSurface({ commenting, externalUrl, gitIdentity = null, initialMod
 				mode: sidebarMode,
 				modes: reviewModes,
 				onModeChange: changeSidebarMode,
-				onToggleSidebar: () => setSidebarCollapsed((current) => !current),
+				onToggleSidebar: toggleSidebar,
 				repository: repositoryLinkUrl ? /* @__PURE__ */ jsx("a", {
 					className: "review-top-bar-repository",
 					href: repositoryLinkUrl,
@@ -9383,7 +10190,8 @@ function ReviewSurface({ commenting, externalUrl, gitIdentity = null, initialMod
 					children: rootLabel
 				}),
 				repositoryTooltip: snapshot.repository.root,
-				sidebarCollapsed,
+				sidebarCollapsed: sidebarCollapsed ?? false,
+				sidebarPosition,
 				toggleTitle: `${sidebarCollapsed ? "Expand" : "Collapse"} sidebar`
 			}),
 			/* @__PURE__ */ jsxs("aside", {
@@ -9461,6 +10269,7 @@ function ReviewSurface({ commenting, externalUrl, gitIdentity = null, initialMod
 					onCancelEdit: cancelEditGeneralComment,
 					onChangeDraft: setGeneralCommentDraft,
 					onChangeEditDraft: setGeneralCommentEditDraft,
+					onResolveDiscussion: resolveDiscussion,
 					onSaveEdit: saveGeneralCommentEdit,
 					onStartEdit: startEditGeneralComment,
 					onSubmit: submitGeneralComment,