@nkzw/codiff-core 1.8.1 → 1.9.1

package/dist/react.mjs

@@ -7,11 +7,14 @@ 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, ExternalLink, X } from "lucide-react";
+import { Copy, Trash2, X } from "lucide-react";
+import { ArrowSquareOutIcon } from "@phosphor-icons/react/ArrowSquareOut";
+import { ChatCircleIcon } from "@phosphor-icons/react/ChatCircle";
+import { PathIcon } from "@phosphor-icons/react/Path";
+import { TreeStructureIcon } from "@phosphor-icons/react/TreeStructure";
 import { FileTree, useFileTree } from "@pierre/trees/react";
 import { hydratePartialDiff, parseDiffFromFile, parsePatchFiles, registerCustomTheme, setCustomExtension } from "@pierre/diffs";
 import useRelativeTime from "@nkzw/use-relative-time";
-import { ChatCircleIcon } from "@phosphor-icons/react/ChatCircle";
 import { CaretDownIcon } from "@phosphor-icons/react/CaretDown";
 import "@phosphor-icons/react/CaretUp";
 import { CheckIcon } from "@phosphor-icons/react/Check";
@@ -25,19 +28,19 @@ import { ImageBrokenIcon } from "@phosphor-icons/react/ImageBroken";
 import { SquareSplitVerticalIcon } from "@phosphor-icons/react/SquareSplitVertical";
 import { CodeView, WorkerPoolContextProvider } from "@pierre/diffs/react";
 import { PersistentMarkdownEditor } from "@nkzw/mdx-editor/persistence";
-import { ArrowsClockwiseIcon } from "@phosphor-icons/react/ArrowsClockwise";
 import { GitBranchIcon } from "@phosphor-icons/react/GitBranch";
-import { PathIcon } from "@phosphor-icons/react/Path";
 import { ShareNetworkIcon } from "@phosphor-icons/react/ShareNetwork";
 import { BugIcon } from "@phosphor-icons/react/Bug";
 import { FlaskIcon } from "@phosphor-icons/react/Flask";
 import { GearIcon } from "@phosphor-icons/react/Gear";
 import { ReadCvLogoIcon } from "@phosphor-icons/react/ReadCvLogo";
 import { WrenchIcon } from "@phosphor-icons/react/Wrench";
+import { SidebarSimpleIcon } from "@phosphor-icons/react/SidebarSimple";
 import { ArrowLeftIcon } from "@phosphor-icons/react/ArrowLeft";
 import { ArrowRightIcon } from "@phosphor-icons/react/ArrowRight";
 import { CaretLeftIcon } from "@phosphor-icons/react/CaretLeft";
 import { CaretRightIcon } from "@phosphor-icons/react/CaretRight";
+import { ArrowsClockwiseIcon } from "@phosphor-icons/react/ArrowsClockwise";
 import { Terminal, init } from "ghostty-web";
 //#region app/components/Button.tsx
 const buttonVariants = cva("codiff-button", {
@@ -92,6 +95,15 @@ function Button({ action, asChild = false, children, className, disabled, onClic
 	});
 }
 //#endregion
+//#region app/components/Thinking.tsx
+function Thinking() {
+	return /* @__PURE__ */ jsx("div", {
+		className: "review-source-loading loading pulse italic",
+		role: "status",
+		children: "Thinking…"
+	});
+}
+//#endregion
 //#region app/components/Avatar.tsx
 const graphemeSegmenter = new Intl.Segmenter(void 0, { granularity: "grapheme" });
 const getNameParts = (name) => {
@@ -951,7 +963,7 @@ function SharedPlanCommentRail({ activeThreadId, commenting, layoutPass, layouts
 		})
 	});
 }
-function PlanReviewSurface({ commenting, signInLabel = "Sign in to comment", snapshot }) {
+function PlanReviewSurface({ commenting, onDeleteShare, signInLabel = "Sign in to comment", snapshot }) {
 	const editorRef = useRef(null);
 	const [activeThreadId, setActiveThreadId] = useState(null);
 	const [commentTarget, setCommentTarget] = useState(null);
@@ -1046,11 +1058,19 @@ function PlanReviewSurface({ commenting, signInLabel = "Sign in to comment", sna
 		link.remove();
 		URL.revokeObjectURL(url);
 	}, [snapshot]);
+	const deleteShare = useCallback(async () => {
+		if (!onDeleteShare || !window.confirm("Delete this shared plan? This cannot be undone.")) return;
+		try {
+			await onDeleteShare();
+		} catch (error) {
+			window.alert(error instanceof Error ? error.message : String(error));
+		}
+	}, [onDeleteShare]);
 	return /* @__PURE__ */ jsxs("main", {
 		className: "plan-shell shared-plan-shell",
 		"data-theme": snapshot.preferences.theme === "system" ? void 0 : snapshot.preferences.theme,
 		children: [/* @__PURE__ */ jsx("header", {
-			className: "plan-header",
+			className: "plan-header workspace-top-bar",
 			children: /* @__PURE__ */ jsx("div", {
 				className: "plan-title",
 				title: snapshot.document.title,
@@ -1085,18 +1105,33 @@ function PlanReviewSurface({ commenting, signInLabel = "Sign in to comment", sna
 											})
 										})
 									})
-								}), /* @__PURE__ */ jsx(Button, {
-									"aria-label": "Download plan",
-									className: "plan-download-button",
-									onClick: downloadPlan,
-									size: "icon",
-									title: "Download plan",
-									type: "button",
-									children: /* @__PURE__ */ jsx(DownloadSimpleIcon, {
-										"aria-hidden": true,
-										size: 16,
-										weight: "bold"
-									})
+								}), /* @__PURE__ */ jsxs("div", {
+									className: "plan-file-actions",
+									children: [onDeleteShare ? /* @__PURE__ */ jsx(Button, {
+										action: deleteShare,
+										"aria-label": "Delete shared plan",
+										pendingPlaceholder: "…",
+										size: "icon",
+										title: "Delete shared plan",
+										type: "button",
+										variant: "destructive",
+										children: /* @__PURE__ */ jsx(Trash2, {
+											"aria-hidden": true,
+											size: 16
+										})
+									}) : null, /* @__PURE__ */ jsx(Button, {
+										"aria-label": "Download plan",
+										className: "plan-download-button",
+										onClick: downloadPlan,
+										size: "icon",
+										title: "Download plan",
+										type: "button",
+										children: /* @__PURE__ */ jsx(DownloadSimpleIcon, {
+											"aria-hidden": true,
+											size: 16,
+											weight: "bold"
+										})
+									})]
 								})]
 							}), /* @__PURE__ */ jsx(MarkdownEditor, {
 								activeAnnotationId: pendingTarget ? pendingPlanCommentId : activeThreadId,
@@ -2098,14 +2133,41 @@ const getReviewCommentRangeProps = (comment) => {
 		...startSide !== comment.side ? { startSide } : {}
 	} : {};
 };
-const toPullRequestReviewComment = (comment) => ({
+const toPullRequestReviewComment = (comment, { includeSectionId = false } = {}) => ({
 	body: comment.body,
 	filePath: comment.filePath,
 	...comment.lineNumber != null ? { lineNumber: comment.lineNumber } : {},
+	...includeSectionId ? { sectionId: comment.sectionId } : {},
 	...comment.side ? { side: comment.side } : {},
 	...getReviewCommentRangeProps(comment),
 	...comment.threadId ? { threadId: comment.threadId } : {}
 });
+const toSubmittedReviewComment = (comment, draft) => ({
+	...comment.anchor ? { anchor: comment.anchor } : {},
+	author: comment.author,
+	body: comment.body,
+	...comment.canDelete ? { canDelete: true } : {},
+	...comment.canEdit ? { canEdit: true } : {},
+	...comment.canReplyThread === false ? { canReplyThread: false } : {},
+	...comment.canResolveThread ? { canResolveThread: true } : {},
+	filePath: comment.filePath,
+	id: comment.id,
+	...comment.isOutdated ? { isOutdated: true } : {},
+	isReadOnly: true,
+	...comment.isThreadResolved ? { isThreadResolved: true } : {},
+	...comment.lineNumber != null ? { lineNumber: comment.lineNumber } : {},
+	sectionId: comment.sectionId ?? draft.sectionId,
+	...comment.side ? { side: comment.side } : {},
+	...comment.startLineNumber != null ? { startLineNumber: comment.startLineNumber } : {},
+	...comment.startSide ? { startSide: comment.startSide } : {},
+	...comment.submittedAt ? { submittedAt: comment.submittedAt } : {},
+	...comment.threadId ? { threadId: comment.threadId } : {},
+	...comment.url ? { url: comment.url } : {}
+});
+const mergeReviewComments = (snapshotComments, localComments) => {
+	const snapshotIds = new Set(snapshotComments.map((comment) => comment.id));
+	return [...snapshotComments, ...localComments.filter((comment) => !snapshotIds.has(comment.id))];
+};
 const isPendingPullRequestReviewComment = (comment) => !comment.isReadOnly && !comment.threadId && comment.remoteSubmit?.status !== "submitting" && comment.body.trim().length > 0;
 const getPendingPullRequestReviewComments = (comments, activeDraft = null) => {
 	return comments.flatMap((comment) => {
@@ -2120,8 +2182,9 @@ const findReusableReviewCommentDraft = (comments, activeDraft = null) => comment
 const getCommentKey = (comment) => isFileReviewComment(comment) ? `${comment.sectionId}:file` : `${comment.sectionId}:${comment.side}:${comment.lineNumber}:${comment.startLineNumber ?? comment.lineNumber}:${comment.startSide ?? comment.side}`;
 const getCommentTextDigest = (value) => value ? `${value.length},${value.split("\n").length}` : "0,0";
 const getReviewCommentsDigest = (comments) => comments.map((comment) => `${comment.id}:${comment.sectionId}:${comment.side}:${comment.lineNumber}:${comment.startLineNumber ?? ""}:${comment.startSide ?? ""}:${comment.anchor ?? ""}:${getCommentTextDigest(comment.body)}:${comment.codexReply?.status ?? ""}:${getCommentTextDigest(comment.codexReply?.body)}:${getCommentTextDigest(comment.codexReply?.error)}:${comment.remoteSubmit?.status ?? ""}:${comment.remoteSubmit?.error ?? ""}:${comment.threadId ?? ""}:${comment.canResolveThread === true ? "1" : "0"}:${comment.isThreadResolved === true ? "1" : "0"}`).join("\0");
-const getReviewCommentsFromState = (state) => state.source.type === "pull-request" ? (state.reviewComments ?? []).flatMap((comment) => {
-	const section = state.files.find((candidate) => candidate.path === comment.filePath)?.sections[0];
+const getReviewCommentsFromState = (state) => (state.reviewComments ?? []).flatMap((comment) => {
+	const file = state.files.find((candidate) => candidate.path === comment.filePath);
+	const section = file?.sections.find((candidate) => candidate.id === comment.sectionId) ?? file?.sections[0];
 	return section ? [{
 		author: comment.author,
 		body: comment.body,
@@ -2143,7 +2206,7 @@ const getReviewCommentsFromState = (state) => state.source.type === "pull-reques
 		...comment.threadId ? { threadId: comment.threadId } : {},
 		url: comment.url
 	}] : [];
-}) : [];
+});
 const shouldDiscardReviewCommentOnEscape = (body, confirmDiscard = window.confirm) => body.trim().length === 0 || confirmDiscard("Discard this review comment?");
 //#endregion
 //#region app/components/useCopiedState.ts
@@ -4097,8 +4160,8 @@ function TocStop({ current, onSelect, stop, visited }) {
 		})]
 	});
 }
-function SupportingFilesStop({ changedPaths, files, navigation, showWhitespace, walkthroughView }) {
-	const uncoveredFiles = getUncoveredWalkthroughFileLineItems(files, walkthroughView, showWhitespace).filter((file) => !changedPaths?.has(file.path));
+function SupportingFilesStop({ files, navigation, showWhitespace, walkthroughView }) {
+	const uncoveredFiles = getUncoveredWalkthroughFileLineItems(files, walkthroughView, showWhitespace);
 	if (walkthroughView.support.length === 0 && uncoveredFiles.length === 0) return null;
 	const current = navigation.mode === "support";
 	const isDone = navigation.supportVisited && !current;
@@ -4141,40 +4204,7 @@ function SupportingFilesStop({ changedPaths, files, navigation, showWhitespace,
 		})]
 	});
 }
-function ChangedFilesStop({ changedPaths, files, navigation, showWhitespace, walkthroughView }) {
-	const changedFiles = getUncoveredWalkthroughFileLineItems(files, walkthroughView, showWhitespace).filter((file) => changedPaths?.has(file.path));
-	if (changedFiles.length === 0) return null;
-	const fileRows = formatWalkthroughFileLineRows(changedFiles);
-	return /* @__PURE__ */ jsxs("div", {
-		className: "wt-toc-chapter",
-		children: [/* @__PURE__ */ jsxs("div", {
-			className: "wt-toc-chapter-head",
-			children: [/* @__PURE__ */ jsx("span", {
-				className: "wt-toc-chapter-icon",
-				children: /* @__PURE__ */ jsx(ArrowsClockwiseIcon, { size: 15 })
-			}), /* @__PURE__ */ jsx("span", {
-				className: "wt-toc-chapter-title",
-				children: "Changed"
-			})]
-		}), /* @__PURE__ */ jsx("div", {
-			className: "wt-toc-stops",
-			children: /* @__PURE__ */ jsxs("button", {
-				className: "wt-toc-stop",
-				onClick: navigation.openSupport,
-				title: "Changed after the walkthrough was generated",
-				type: "button",
-				children: [/* @__PURE__ */ jsx("span", {
-					className: "wt-toc-rail",
-					children: /* @__PURE__ */ jsx("span", { className: "wt-toc-node" })
-				}), /* @__PURE__ */ jsx("span", {
-					className: "wt-toc-main",
-					children: /* @__PURE__ */ jsx(TocFileRows, { files: fileRows })
-				})]
-			})
-		})]
-	});
-}
-function NarrativeSidebar({ allowCommit = true, changedPaths, files, navigation, onShareWalkthrough, shareWalkthroughDisabled = false, showWhitespace, walkthrough }) {
+function NarrativeSidebar({ allowCommit = true, files, navigation, onShareWalkthrough, shareWalkthroughDisabled = false, showWhitespace, walkthrough }) {
 	const { walkthroughView } = navigation;
 	if (!walkthroughView) return /* @__PURE__ */ jsx("div", {
 		className: "wt-empty",
@@ -4220,14 +4250,6 @@ function NarrativeSidebar({ allowCommit = true, changedPaths, files, navigation,
 					})]
 				}, chapter.id)),
 				/* @__PURE__ */ jsx(SupportingFilesStop, {
-					changedPaths,
-					files,
-					navigation,
-					showWhitespace,
-					walkthroughView
-				}),
-				/* @__PURE__ */ jsx(ChangedFilesStop, {
-					changedPaths,
 					files,
 					navigation,
 					showWhitespace,
@@ -5171,7 +5193,7 @@ function ImageDiffPreview({ file, loadImageContent, onLayoutReady, section, sour
 		})]
 	});
 }
-function ReviewCommentEditor({ agentId, agentLabel, comment, displayName, focusCommentId, focusEditorRef, identity, isPullRequest, keymap, onAskCodex, onCommentBlur, onCommentDraftChange, onCommentFocus, onDeleteComment, onSaveCommentEdit, onSubmitComment, onUpdateComment }) {
+function ReviewCommentEditor({ agentId, agentLabel, comment, displayName, focusCommentId, focusEditorRef, identity, keymap, onAskCodex, onCommentBlur, onCommentDraftChange, onCommentFocus, onDeleteComment, onSaveCommentEdit, onSubmitComment, onUpdateComment, supportsReviewCommentActions }) {
 	const [editState, setEditState] = useState(() => ({
 		commentId: comment.id,
 		draft: comment.body,
@@ -5213,7 +5235,7 @@ function ReviewCommentEditor({ agentId, agentLabel, comment, displayName, focusC
 	const draftComment = withCommentBody(comment, draft);
 	const canAskCodex = onAskCodex != null && canAskCodexForComment(draftComment);
 	const commentCanSubmit = canSubmitComment(draftComment);
-	const canEditExistingComment = isPullRequest && comment.isReadOnly && comment.canEdit === true;
+	const canEditExistingComment = supportsReviewCommentActions && comment.isReadOnly && comment.canEdit === true;
 	const canSaveEdit = canEditExistingComment && !editSubmitting && Boolean(editDraft.trim()) && editDraft.trim() !== displayedBody.trim();
 	const editEditorRef = useRef(null);
 	const setEditEditorRef = useCallback((editor) => {
@@ -5395,13 +5417,13 @@ function ReviewCommentEditor({ agentId, agentLabel, comment, displayName, focusC
 	]);
 	const handleKeyDown = useCallback((event) => {
 		if (matchesShortcut(event, keymap, "submitComment")) {
-			if (isPullRequest && commentCanSubmit) {
+			if (supportsReviewCommentActions && commentCanSubmit) {
 				event.preventDefault();
 				event.stopPropagation();
 				handleSubmitComment();
 				return;
 			}
-			if (!isPullRequest && canAskCodex) {
+			if (!supportsReviewCommentActions && canAskCodex) {
 				event.preventDefault();
 				event.stopPropagation();
 				handleAskCodex();
@@ -5421,9 +5443,9 @@ function ReviewCommentEditor({ agentId, agentLabel, comment, displayName, focusC
 		draft,
 		handleAskCodex,
 		handleSubmitComment,
-		isPullRequest,
 		keymap,
-		onDeleteComment
+		onDeleteComment,
+		supportsReviewCommentActions
 	]);
 	return /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsxs("div", {
 		className: "review-comment",
@@ -5431,7 +5453,7 @@ function ReviewCommentEditor({ agentId, agentLabel, comment, displayName, focusC
 			className: "review-comment-body",
 			children: [
 				/* @__PURE__ */ jsxs("div", {
-					className: `review-comment-header${isPullRequest && !comment.isReadOnly || canEditExistingComment || comment.canDelete || editingExistingComment ? " with-comment-action" : ""}${comment.isReadOnly ? " read-only" : ""}`,
+					className: `review-comment-header${supportsReviewCommentActions && !comment.isReadOnly || canEditExistingComment || comment.canDelete || editingExistingComment ? " with-comment-action" : ""}${comment.isReadOnly ? " read-only" : ""}`,
 					children: [
 						/* @__PURE__ */ jsx("strong", { children: displayName }),
 						editingExistingComment ? /* @__PURE__ */ jsxs("span", {
@@ -5484,7 +5506,7 @@ function ReviewCommentEditor({ agentId, agentLabel, comment, displayName, focusC
 								src: agentIconUrl(agentId)
 							}), "Ask"]
 						}) : null,
-						isPullRequest && !comment.isReadOnly ? /* @__PURE__ */ jsxs("button", {
+						supportsReviewCommentActions && !comment.isReadOnly ? /* @__PURE__ */ jsxs("button", {
 							className: "review-comment-action",
 							disabled: !commentCanSubmit,
 							onClick: handleSubmitComment,
@@ -5636,7 +5658,7 @@ const groupReviewCommentsByThread = (comments) => {
 };
 const noopResolveThread = () => {};
 const noopLayoutReady = () => {};
-function ReviewCommentThreadGroup({ agentId, agentLabel, comments, focusCommentId, focusEditorRef, identity, isPullRequest, keymap, onAskCodex, onCommentBlur, onCommentDraftChange, onCommentFocus, onDeleteComment, onReplyToThread, onResolveThread = noopResolveThread, onSaveCommentEdit, onSubmitComment, onUpdateComment }) {
+function ReviewCommentThreadGroup({ agentId, agentLabel, comments, focusCommentId, focusEditorRef, identity, keymap, onAskCodex, onCommentBlur, onCommentDraftChange, onCommentFocus, onDeleteComment, onReplyToThread, onResolveThread = noopResolveThread, onSaveCommentEdit, onSubmitComment, onUpdateComment, supportsReviewCommentActions }) {
 	const [resolveState, setResolveState] = useState({
 		error: null,
 		submitting: false,
@@ -5645,8 +5667,8 @@ function ReviewCommentThreadGroup({ agentId, agentLabel, comments, focusCommentI
 	const lastComment = comments.at(-1);
 	const threadId = lastComment?.threadId;
 	const threadResolved = comments.some((comment) => comment.isThreadResolved === true);
-	const canResolveThread = isPullRequest && threadId != null && comments.some((comment) => comment.canResolveThread === true);
-	const canReplyToThread = isPullRequest && threadId != null && comments.some((comment) => comment.isReadOnly) && !comments.some((comment) => !comment.isReadOnly) && !comments.some((comment) => comment.canReplyThread === false) && !threadResolved;
+	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 hasThreadActions = canReplyToThread || canResolveThread;
 	const resolving = resolveState.threadId === threadId && resolveState.submitting;
 	const resolveError = resolveState.threadId === threadId ? resolveState.error : null;
@@ -5693,7 +5715,6 @@ function ReviewCommentThreadGroup({ agentId, agentLabel, comments, focusCommentI
 				focusCommentId,
 				focusEditorRef,
 				identity,
-				isPullRequest,
 				keymap,
 				onAskCodex,
 				onCommentBlur,
@@ -5702,7 +5723,8 @@ function ReviewCommentThreadGroup({ agentId, agentLabel, comments, focusCommentI
 				onDeleteComment,
 				onSaveCommentEdit,
 				onSubmitComment,
-				onUpdateComment
+				onUpdateComment,
+				supportsReviewCommentActions
 			}, comment.id);
 		}), hasThreadActions ? /* @__PURE__ */ jsxs("div", {
 			className: "review-comment-thread-footer",
@@ -5727,7 +5749,7 @@ function ReviewCommentThreadGroup({ agentId, agentLabel, comments, focusCommentI
 		}) : null]
 	});
 }
-function ReviewAnnotation({ agentId, agentLabel, annotation, comments, focusCommentId, focusCommentRequest, identity, isPullRequest, keymap, onAskCodex, onCommentBlur, onCommentDraftChange, onCommentFocus, onDeleteComment, onHeightChange, onReplyToThread, onResolveThread = noopResolveThread, onSaveCommentEdit, onSubmitComment, onUpdateComment }) {
+function ReviewAnnotation({ agentId, agentLabel, annotation, comments, focusCommentId, focusCommentRequest, identity, keymap, onAskCodex, onCommentBlur, onCommentDraftChange, onCommentFocus, onDeleteComment, onHeightChange, onReplyToThread, onResolveThread = noopResolveThread, onSaveCommentEdit, onSubmitComment, onUpdateComment, supportsReviewCommentActions }) {
 	const focusEditorRef = useRef(null);
 	const threadRef = useRef(null);
 	const setFocusEditorRef = useCallback((node) => {
@@ -5767,7 +5789,6 @@ function ReviewAnnotation({ agentId, agentLabel, annotation, comments, focusComm
 			focusCommentId,
 			focusEditorRef: setFocusEditorRef,
 			identity,
-			isPullRequest,
 			keymap,
 			onAskCodex,
 			onCommentBlur,
@@ -5778,7 +5799,8 @@ function ReviewAnnotation({ agentId, agentLabel, annotation, comments, focusComm
 			onResolveThread,
 			onSaveCommentEdit,
 			onSubmitComment,
-			onUpdateComment
+			onUpdateComment,
+			supportsReviewCommentActions
 		}, group.key))
 	});
 }
@@ -5966,7 +5988,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, isPullRequest, 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, 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, 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 }) {
 	const codeViewRef = useRef(null);
 	const markdownEditorRefs = useRef(/* @__PURE__ */ new Map());
 	const refreshingMarkdownSectionsRef = useRef(/* @__PURE__ */ new Set());
@@ -6885,7 +6907,6 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 			focusCommentId,
 			focusCommentRequest,
 			identity: gitIdentity,
-			isPullRequest,
 			keymap,
 			onAskCodex,
 			onCommentBlur: blurComment,
@@ -6897,7 +6918,8 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 			onResolveThread,
 			onSaveCommentEdit,
 			onSubmitComment,
-			onUpdateComment
+			onUpdateComment,
+			supportsReviewCommentActions
 		});
 	}, [
 		agentId,
@@ -6908,7 +6930,6 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 		focusCommentRequest,
 		focusComment,
 		gitIdentity,
-		isPullRequest,
 		itemMetadata,
 		keymap,
 		markMarkdownPreviewLayoutReady,
@@ -6924,7 +6945,8 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 		renderComments,
 		replyToThread,
 		setMarkdownEditorRef,
-		source
+		source,
+		supportsReviewCommentActions
 	]);
 	const handleScroll = useCallback((_scrollTop, viewer) => {
 		onSelectPathFromScroll(viewer);
@@ -6980,6 +7002,69 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 	});
 }
 //#endregion
+//#region app/components/ReviewTopBar.tsx
+function ReviewTopBar({ actions, context, leading, mode, modes, onModeChange, onToggleSidebar, repository, repositoryTooltip, sidebarCollapsed, toggleTitle }) {
+	return /* @__PURE__ */ jsxs("header", {
+		className: "review-top-bar workspace-top-bar",
+		children: [
+			/* @__PURE__ */ jsxs("div", {
+				className: "review-top-bar-left",
+				children: [
+					leading,
+					/* @__PURE__ */ jsx("button", {
+						"aria-label": sidebarCollapsed ? "Expand sidebar" : "Collapse sidebar",
+						className: "sidebar-toggle-button",
+						onClick: onToggleSidebar,
+						title: toggleTitle,
+						type: "button",
+						children: /* @__PURE__ */ jsx(SidebarSimpleIcon, {
+							"aria-hidden": true,
+							size: 18,
+							weight: "bold"
+						})
+					}),
+					/* @__PURE__ */ jsx("div", {
+						className: "review-top-bar-repository-slot",
+						title: repositoryTooltip,
+						children: repository
+					})
+				]
+			}),
+			/* @__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))
+			}),
+			/* @__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]
+			})
+		]
+	});
+}
+//#endregion
 //#region app/components/walkthrough/CommitView.tsx
 const TERMINAL_COLS = 80;
 const TERMINAL_ROWS = 12;
@@ -7528,27 +7613,6 @@ function SupportHeader({ current }) {
 		}), /* @__PURE__ */ jsx(Narration, { prose: "Supporting changes grouped outside the main sequence." })]
 	});
 }
-function ChangedHeader({ current, onRegenerate, regenerateDisabled = false }) {
-	return /* @__PURE__ */ jsxs("div", {
-		className: `wt-stop-block wt-stop-block-header${current ? " current" : ""}`,
-		children: [/* @__PURE__ */ jsxs("div", {
-			className: "wt-stage-title-row",
-			children: [/* @__PURE__ */ jsx("h2", {
-				className: "wt-stage-title",
-				children: "Changed"
-			}), onRegenerate ? /* @__PURE__ */ jsxs("button", {
-				className: "wt-regenerate",
-				disabled: regenerateDisabled,
-				onClick: onRegenerate,
-				type: "button",
-				children: [/* @__PURE__ */ jsx(ArrowsClockwiseIcon, {
-					size: 13,
-					weight: "bold"
-				}), regenerateDisabled ? "Regenerating…" : "Regenerate walkthrough"]
-			}) : null]
-		}), /* @__PURE__ */ jsx(Narration, { prose: "These changes arrived after the walkthrough was generated and are not part of its narrative yet." })]
-	});
-}
 const createWalkthroughBlocks = (files, walkthroughView, currentIndex) => {
 	const blocks = [];
 	const firstBlockIdByStop = [];
@@ -7600,7 +7664,7 @@ const getBlockReviewTarget = (blocks, blockId) => {
 		reviewIdentity: block.reviewIdentity
 	} : null;
 };
-const createSupportBlocks = (files, selected, walkthroughView, showWhitespace, changedPaths, onRegenerateWalkthrough, regenerateDisabled) => {
+const createSupportBlocks = (files, selected, walkthroughView, showWhitespace) => {
 	const blocks = [];
 	for (const group of walkthroughView.supportByReason) for (const item of group.files) getFocusedRunDiffs(item, files).forEach(({ file, note, reviewIdentity }, runIndex) => {
 		const blockId = `walkthrough:support:${item.id}:${runIndex}`;
@@ -7616,9 +7680,7 @@ const createSupportBlocks = (files, selected, walkthroughView, showWhitespace, c
 		});
 	});
 	const uncoveredFiles = getUncoveredWalkthroughFiles(files, walkthroughView, showWhitespace);
-	const changedFiles = uncoveredFiles.filter((file) => changedPaths?.has(file.path));
-	const uncoveredSupportFiles = uncoveredFiles.filter((file) => !changedPaths?.has(file.path));
-	for (const file of uncoveredSupportFiles) {
+	for (const file of uncoveredFiles) {
 		const blockId = `walkthrough:uncovered:${file.path}`;
 		const isFirstBlock = blocks.length === 0;
 		blocks.push({
@@ -7634,25 +7696,6 @@ const createSupportBlocks = (files, selected, walkthroughView, showWhitespace, c
 			}
 		});
 	}
-	changedFiles.forEach((file, fileIndex) => {
-		const blockId = `walkthrough:changed:${file.path}`;
-		blocks.push({
-			file,
-			header: fileIndex === 0 ? /* @__PURE__ */ jsx(ChangedHeader, {
-				current: selected,
-				onRegenerate: onRegenerateWalkthrough,
-				regenerateDisabled
-			}) : null,
-			headerSelected: selected,
-			id: blockId,
-			itemIdPrefix: blockId,
-			note: "Changed after the walkthrough was generated.",
-			reviewIdentity: {
-				fingerprint: file.fingerprint,
-				key: blockId
-			}
-		});
-	});
 	return blocks;
 };
 function Arc({ committable, navigation, onShareWalkthrough, shareWalkthroughDisabled = false, supportAvailable, walkthroughView }) {
@@ -7815,7 +7858,7 @@ function Arc({ committable, navigation, onShareWalkthrough, shareWalkthroughDisa
 		]
 	});
 }
-function NarrativeWalkthroughView({ allowCommit = true, changedPaths, files, navigation, onActiveReviewTargetChange, onCommit, onCommitOutput, onRegenerateWalkthrough, onShareWalkthrough, onUpdateCommitMessage, regenerateDisabled, renderDiffBlocks, shareWalkthroughDisabled, showWhitespace, walkthrough }) {
+function NarrativeWalkthroughView({ allowCommit = true, files, navigation, onActiveReviewTargetChange, onCommit, onCommitOutput, onShareWalkthrough, onUpdateCommitMessage, renderDiffBlocks, shareWalkthroughDisabled, showWhitespace, walkthrough }) {
 	const { walkthroughView } = navigation;
 	const committable = allowCommit && isWalkthroughCommittable(walkthrough);
 	const walkthroughBlocks = useMemo(() => walkthroughView ? createWalkthroughBlocks(files, walkthroughView, navigation.index) : emptyWalkthroughBlockSet, [
@@ -7823,12 +7866,9 @@ function NarrativeWalkthroughView({ allowCommit = true, changedPaths, files, nav
 		navigation.index,
 		walkthroughView
 	]);
-	const supportBlocks = useMemo(() => walkthroughView ? createSupportBlocks(files, navigation.mode === "support", walkthroughView, showWhitespace, changedPaths, onRegenerateWalkthrough, regenerateDisabled) : [], [
-		changedPaths,
+	const supportBlocks = useMemo(() => walkthroughView ? createSupportBlocks(files, navigation.mode === "support", walkthroughView, showWhitespace) : [], [
 		files,
 		navigation.mode,
-		onRegenerateWalkthrough,
-		regenerateDisabled,
 		showWhitespace,
 		walkthroughView
 	]);
@@ -8712,8 +8752,16 @@ const disabledCommitMessage = async () => ({
 	reason: "Shared walkthroughs are read-only.",
 	status: "unavailable"
 });
-function ReviewSurface({ commenting, externalUrl, gitIdentity = null, initialMode, interactive, onModeChange, providerLabel = "provider", settingsBar, signInLabel = "Sign in to comment", snapshot, sourceDescriptionFooterAside, title }) {
+function ReviewSurface({ commenting, externalUrl, gitIdentity = null, initialMode, interactive, onDeleteShare, onModeChange, providerLabel = "provider", repositoryUrl, settingsBar, 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;
+		try {
+			await onDeleteShare();
+		} catch (error) {
+			window.alert(error instanceof Error ? error.message : String(error));
+		}
+	}, [onDeleteShare]);
 	const submitReviewComment = commenting?.onSubmitComment ?? interactive?.onSubmitComment;
 	const submitGeneralDiscussion = commenting?.onSubmitGeneralComment ?? interactive?.onSubmitGeneralComment;
 	const updateReviewComment = commenting?.onUpdateComment ?? interactive?.onUpdateComment;
@@ -8727,10 +8775,22 @@ 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 sidebarMode = Boolean(initialMode && onModeChange) ? initialMode : uncontrolledSidebarMode;
+	const [sidebarCollapsed, setSidebarCollapsed] = useState(false);
+	useEffect(() => {
+		const handleKeyDown = (event) => {
+			if (event.repeat || !matchesShortcut(event, keymap, "toggleSidebar")) return;
+			event.preventDefault();
+			setSidebarCollapsed((current) => !current);
+		};
+		window.addEventListener("keydown", handleKeyDown);
+		return () => window.removeEventListener("keydown", handleKeyDown);
+	}, [keymap]);
+	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),
 		onWidthCommit: writeSharedSidebarWidth,
 		readWidth: readSharedSidebarWidth
 	});
@@ -8741,7 +8801,7 @@ function ReviewSurface({ commenting, externalUrl, gitIdentity = null, initialMod
 		body: editedReviewCommentBodies[comment.id]
 	} : comment), [editedReviewCommentBodies, snapshotReviewComments]);
 	const [localReviewComments, setLocalReviewComments] = useState(emptyReviewComments);
-	const reviewComments = useMemo(() => [...visibleSnapshotReviewComments, ...localReviewComments], [localReviewComments, visibleSnapshotReviewComments]);
+	const reviewComments = useMemo(() => mergeReviewComments(visibleSnapshotReviewComments, localReviewComments), [localReviewComments, visibleSnapshotReviewComments]);
 	const { activeReviewCommentDraftRef, activeReviewCommentDraftState, clearCommentFocus, createComment, deleteComment: deleteLocalComment, focusCommentId, focusCommentRequest, reviewCommentsRef, updateActiveReviewCommentDraft, updateComment } = useReviewCommentDrafts({
 		canCreateComment: canComment,
 		comments: reviewComments,
@@ -8751,6 +8811,7 @@ function ReviewSurface({ commenting, externalUrl, gitIdentity = null, initialMod
 	const generalCommentThreads = snapshot.repository.generalComments ?? emptyGeneralCommentThreads;
 	const generalComments = useMemo(() => (snapshot.repository.generalComments ?? emptyGeneralCommentThreads).flatMap((thread) => thread.comments), [snapshot.repository.generalComments]);
 	const generalCommentCount = generalComments.length;
+	const showCommentsTab = Boolean(commenting || interactive || generalCommentCount > 0);
 	const [generalCommentDraft, setGeneralCommentDraft] = useState("");
 	const [generalCommentEditDraft, setGeneralCommentEditDraft] = useState("");
 	const [editingGeneralCommentId, setEditingGeneralCommentId] = useState(null);
@@ -8823,6 +8884,7 @@ function ReviewSurface({ commenting, externalUrl, gitIdentity = null, initialMod
 		const comment = reviewCommentsRef.current.find((candidate) => candidate.id === commentId);
 		if (comment?.isReadOnly && comment.canDelete && commenting?.onDeleteComment) {
 			updateActiveReviewCommentDraft(null);
+			setLocalReviewComments((current) => current.filter((candidate) => candidate.id !== commentId));
 			commenting.onDeleteComment(commentId).catch((error) => {
 				window.alert(error instanceof Error ? error.message : String(error));
 			});
@@ -8843,9 +8905,12 @@ function ReviewSurface({ commenting, externalUrl, gitIdentity = null, initialMod
 			...candidate,
 			remoteSubmit: { status: "submitting" }
 		} : candidate));
-		submitReviewComment(toPullRequestReviewComment(comment)).then(() => {
+		submitReviewComment(toPullRequestReviewComment(comment, { includeSectionId: commenting != null })).then((submittedComment) => {
 			clearCommentFocus(commentId);
-			setLocalReviewComments((current) => current.filter((candidate) => candidate.id !== commentId));
+			setLocalReviewComments((current) => current.flatMap((candidate) => {
+				if (candidate.id !== commentId) return [candidate];
+				return [toSubmittedReviewComment(submittedComment, candidate)];
+			}));
 			bumpItemVersion(comment.filePath);
 		}).catch((error) => {
 			setLocalReviewComments((current) => current.map((candidate) => candidate.id === commentId ? {
@@ -8860,6 +8925,7 @@ function ReviewSurface({ commenting, externalUrl, gitIdentity = null, initialMod
 	}, [
 		bumpItemVersion,
 		clearCommentFocus,
+		commenting,
 		reviewCommentsRef,
 		submitReviewComment,
 		updateActiveReviewCommentDraft
@@ -8871,7 +8937,7 @@ function ReviewSurface({ commenting, externalUrl, gitIdentity = null, initialMod
 		if (event === "COMMENT" && pendingComments.length === 0 && !body?.trim()) return;
 		const pendingIds = new Set(pendingComments.map((comment) => comment.id));
 		setPullRequestReviewSubmitting(event);
-		const formattedComments = pendingComments.map(toPullRequestReviewComment);
+		const formattedComments = pendingComments.map((comment) => toPullRequestReviewComment(comment));
 		return (body ? interactive.onSubmitReview(event, formattedComments, body) : interactive.onSubmitReview(event, formattedComments)).then(() => {
 			updateActiveReviewCommentDraft(null);
 			setLocalReviewComments((current) => current.filter((comment) => !pendingIds.has(comment.id)));
@@ -9034,7 +9100,6 @@ function ReviewSurface({ commenting, externalUrl, gitIdentity = null, initialMod
 		gitIdentity,
 		hunkNavigation: null,
 		initialMarkdownPreviewSectionIds,
-		isPullRequest: snapshot.repository.source.type === "pull-request",
 		isReadOnly: !canComment,
 		itemVersionByKey,
 		keymap,
@@ -9056,6 +9121,7 @@ function ReviewSurface({ commenting, externalUrl, gitIdentity = null, initialMod
 		searchQuery: "",
 		showWhitespace: snapshot.preferences.showWhitespace,
 		source: snapshot.repository.source,
+		supportsReviewCommentActions: submitReviewComment != null,
 		theme: snapshot.preferences.theme,
 		viewed,
 		wordWrap: snapshot.preferences.wordWrap
@@ -9114,8 +9180,10 @@ function ReviewSurface({ commenting, externalUrl, gitIdentity = null, initialMod
 			sourceDescriptionFooter
 		});
 	};
-	const sourceLabel = snapshot.repository.source.type === "working-tree" ? "" : ` · ${getSourceLabel(snapshot.repository.source)}`;
-	const rootLabel = `${compactPath(snapshot.repository.root)}${snapshot.branch ? ` (${snapshot.branch})` : ""}`;
+	const sourceLabel = snapshot.repository.source.type === "working-tree" ? null : getSourceLabel(snapshot.repository.source);
+	const rootLabel = repositoryUrl ? snapshot.repository.root : compactPath(snapshot.repository.root);
+	const sourceExternalUrl = snapshot.repository.source.type === "pull-request" ? externalUrl ?? snapshot.repository.source.url : null;
+	const repositoryLinkUrl = repositoryUrl ?? sourceExternalUrl;
 	const walkthroughStatus = walkthroughRequestPending && interactive?.walkthroughStatus !== "ready" ? "generating" : interactive?.walkthroughStatus;
 	const [walkthroughProgressRevision, setWalkthroughProgressRevision] = useState(0);
 	const previousWalkthroughStatusRef = useRef(walkthroughStatus);
@@ -9131,57 +9199,120 @@ function ReviewSurface({ commenting, externalUrl, gitIdentity = null, initialMod
 	const requestWalkthrough = () => {
 		startWalkthroughGeneration();
 	};
+	const reviewModes = [
+		{
+			icon: /* @__PURE__ */ jsx(PathIcon, {
+				"aria-hidden": true,
+				size: 14,
+				weight: "bold"
+			}),
+			label: "Walkthrough",
+			value: "walkthrough"
+		},
+		{
+			icon: /* @__PURE__ */ jsx(TreeStructureIcon, {
+				"aria-hidden": true,
+				size: 14,
+				weight: "bold"
+			}),
+			label: "Tree",
+			value: "tree"
+		},
+		...showCommentsTab ? [{
+			ariaLabel: generalCommentCount > 0 ? `Comments (${generalCommentCount})` : "Comments",
+			icon: /* @__PURE__ */ jsx(ChatCircleIcon, {
+				"aria-hidden": true,
+				size: 14,
+				weight: "bold"
+			}),
+			indicator: generalCommentCount > 0 ? /* @__PURE__ */ jsx("span", {
+				"aria-hidden": true,
+				className: "review-mode-count",
+				children: generalCommentCount
+			}) : void 0,
+			label: "Comments",
+			title: generalCommentCount > 0 ? `${generalCommentCount} ${generalCommentCount === 1 ? "comment" : "comments"}` : "Comments",
+			value: "comments"
+		}] : []
+	];
+	const topBarActions = onDeleteShare || settingsBar ? /* @__PURE__ */ jsxs(Fragment$1, { children: [onDeleteShare ? /* @__PURE__ */ jsx(Button, {
+		action: deleteShare,
+		"aria-label": "Delete shared walkthrough",
+		pendingPlaceholder: "…",
+		size: "icon",
+		title: "Delete shared walkthrough",
+		type: "button",
+		variant: "destructive",
+		children: /* @__PURE__ */ jsx(Trash2, {
+			"aria-hidden": true,
+			size: 16
+		})
+	}) : null, settingsBar ? /* @__PURE__ */ jsx("div", {
+		className: "review-top-bar-settings",
+		children: settingsBar
+	}) : null] }) : void 0;
 	return /* @__PURE__ */ jsxs("div", {
-		className: `app-shell share-shell${interactive ? " merge-request-shell" : ""}`,
+		className: `app-shell share-shell${interactive ? " merge-request-shell" : ""}${sidebarCollapsed ? " sidebar-collapsed" : ""}`,
 		"data-theme": shellTheme,
-		style: { gridTemplateColumns: `${sidebarWidth}px 0 minmax(0, 1fr)` },
+		style: sidebarCollapsed ? void 0 : { gridTemplateColumns: `${sidebarWidth}px 0 minmax(0, 1fr)` },
 		children: [
+			/* @__PURE__ */ jsx(ReviewTopBar, {
+				actions: topBarActions,
+				context: /* @__PURE__ */ jsxs(Fragment$1, { children: [snapshot.branch ? /* @__PURE__ */ jsx("span", {
+					className: "review-top-bar-branch",
+					title: snapshot.branch,
+					children: snapshot.branch
+				}) : null, sourceLabel ? sourceExternalUrl ? /* @__PURE__ */ jsxs("a", {
+					"aria-label": `Open ${sourceLabel} in ${providerLabel}`,
+					className: "review-top-bar-source",
+					href: sourceExternalUrl,
+					rel: "noreferrer",
+					target: "_blank",
+					title: `Open ${sourceLabel} in ${providerLabel}`,
+					children: [/* @__PURE__ */ jsx("span", { children: sourceLabel }), /* @__PURE__ */ jsx(ArrowSquareOutIcon, {
+						"aria-hidden": true,
+						size: 14,
+						weight: "bold"
+					})]
+				}) : /* @__PURE__ */ jsx("span", {
+					className: "review-top-bar-source",
+					children: sourceLabel
+				}) : null] }),
+				leading: interactive ? /* @__PURE__ */ jsx("button", {
+					"aria-label": "Back to Codiff",
+					className: "merge-request-nav-button merge-request-home-button",
+					onClick: interactive.onHome,
+					title: "Back to Codiff",
+					type: "button",
+					children: /* @__PURE__ */ jsx("img", {
+						alt: "",
+						"aria-hidden": true,
+						className: "merge-request-nav-icon",
+						draggable: false,
+						src: "/icon.png"
+					})
+				}) : void 0,
+				mode: sidebarMode,
+				modes: reviewModes,
+				onModeChange: changeSidebarMode,
+				onToggleSidebar: () => setSidebarCollapsed((current) => !current),
+				repository: repositoryLinkUrl ? /* @__PURE__ */ jsx("a", {
+					className: "review-top-bar-repository",
+					href: repositoryLinkUrl,
+					rel: "noreferrer",
+					target: repositoryUrl ? void 0 : "_blank",
+					children: rootLabel
+				}) : /* @__PURE__ */ jsx("span", {
+					className: "review-top-bar-repository",
+					children: rootLabel
+				}),
+				repositoryTooltip: snapshot.repository.root,
+				sidebarCollapsed,
+				toggleTitle: `${sidebarCollapsed ? "Expand" : "Collapse"} sidebar`
+			}),
 			/* @__PURE__ */ jsxs("aside", {
 				className: "squircle sidebar",
 				children: [
-					/* @__PURE__ */ jsx("div", {
-						className: "sidebar-header",
-						children: /* @__PURE__ */ jsxs("div", {
-							className: "sidebar-path-row",
-							children: [
-								interactive ? /* @__PURE__ */ jsx("button", {
-									"aria-label": "Back to Codiff",
-									className: "merge-request-nav-button merge-request-home-button",
-									onClick: interactive.onHome,
-									title: "Back to Codiff",
-									type: "button",
-									children: /* @__PURE__ */ jsx("img", {
-										alt: "",
-										"aria-hidden": true,
-										className: "merge-request-nav-icon",
-										draggable: false,
-										src: "/icon.png"
-									})
-								}) : null,
-								/* @__PURE__ */ jsxs("div", {
-									className: "sidebar-path",
-									title: title ?? snapshot.repository.root,
-									children: [
-										title ? `${title} · ` : null,
-										rootLabel,
-										sourceLabel
-									]
-								}),
-								externalUrl ? /* @__PURE__ */ jsx("a", {
-									"aria-label": `Open merge request in ${providerLabel}`,
-									className: "merge-request-nav-button",
-									href: externalUrl,
-									rel: "noreferrer",
-									target: "_blank",
-									title: `Open merge request in ${providerLabel}`,
-									children: /* @__PURE__ */ jsx(ExternalLink, {
-										"aria-hidden": true,
-										size: 16
-									})
-								}) : null
-							]
-						})
-					}),
 					/* @__PURE__ */ jsx("div", {
 						className: "sidebar-search-row",
 						children: /* @__PURE__ */ jsx("input", {
@@ -9194,40 +9325,6 @@ function ReviewSurface({ commenting, externalUrl, gitIdentity = null, initialMod
 							value: fileSearchQuery
 						})
 					}),
-					/* @__PURE__ */ jsxs("div", {
-						"aria-label": "Review order",
-						className: "sidebar-mode-toggle",
-						role: "tablist",
-						children: [
-							/* @__PURE__ */ jsx("button", {
-								"aria-selected": sidebarMode === "tree",
-								onClick: () => changeSidebarMode("tree"),
-								role: "tab",
-								type: "button",
-								children: "Tree"
-							}),
-							/* @__PURE__ */ jsx("button", {
-								"aria-selected": sidebarMode === "walkthrough",
-								onClick: () => changeSidebarMode("walkthrough"),
-								role: "tab",
-								type: "button",
-								children: "Walkthrough"
-							}),
-							commenting || interactive || generalCommentCount > 0 ? /* @__PURE__ */ jsxs("button", {
-								"aria-label": generalCommentCount > 0 ? `Comments (${generalCommentCount})` : "Comments",
-								"aria-selected": sidebarMode === "comments",
-								onClick: () => changeSidebarMode("comments"),
-								role: "tab",
-								title: generalCommentCount > 0 ? `${generalCommentCount} ${generalCommentCount === 1 ? "comment" : "comments"}` : "Comments",
-								type: "button",
-								children: [/* @__PURE__ */ jsx("span", { children: "Comments" }), generalCommentCount > 0 ? /* @__PURE__ */ jsx("span", {
-									"aria-hidden": true,
-									className: "sidebar-tab-count",
-									children: generalCommentCount
-								}) : null]
-							}) : null
-						]
-					}),
 					sidebarMode === "tree" ? /* @__PURE__ */ jsx(ReviewFileTree, {
 						files: visibleFiles,
 						onActivatePath: activateTreePath,
@@ -9255,13 +9352,13 @@ function ReviewSurface({ commenting, externalUrl, gitIdentity = null, initialMod
 							}), walkthroughStatusDescription ? /* @__PURE__ */ jsx("span", { children: walkthroughStatusDescription }) : null]
 						})
 					}),
-					settingsBar || showTotalLineCount ? /* @__PURE__ */ jsxs("div", {
+					showTotalLineCount ? /* @__PURE__ */ jsx("div", {
 						className: "sidebar-settings-bar",
-						children: [settingsBar, showTotalLineCount ? /* @__PURE__ */ jsx(DiffLineCountBadge, {
+						children: /* @__PURE__ */ jsx(DiffLineCountBadge, {
 							ariaLabelPrefix: "Total change",
 							className: "sidebar-total-line-count sidebar-settings-line-count",
 							lineCount: totalLineCount
-						}) : null]
+						})
 					}) : null
 				]
 			}),
@@ -9340,7 +9437,7 @@ function ReviewSurface({ commenting, externalUrl, gitIdentity = null, initialMod
 						]
 					})
 				}) : /* @__PURE__ */ jsx("div", {
-					className: "loading codex italic",
+					className: "loading codex",
 					children: /* @__PURE__ */ jsx(WalkthroughProgress, {
 						phase: null,
 						responseLabelIndex: 0,
@@ -9352,4 +9449,4 @@ function ReviewSurface({ commenting, externalUrl, gitIdentity = null, initialMod
 	});
 }
 //#endregion
-export { Button, PlanReviewSurface, ReadOnlyGeneralCommentCard, ReviewSurface, buttonVariants, getPlanCommentAffordancePosition, getPlanCommentColorIndex, getPlanCommentIdentityColorIndex, getSharedPlanDownloadContent };
+export { Button, PlanReviewSurface, ReadOnlyGeneralCommentCard, ReviewSurface, Thinking, buttonVariants, getPlanCommentAffordancePosition, getPlanCommentColorIndex, getPlanCommentIdentityColorIndex, getSharedPlanDownloadContent };