@nkzw/codiff-core 1.11.1 → 1.13.0

package/dist/app/components/ReviewCodeView.d.ts

@@ -39,7 +39,7 @@ type HeaderReviewDiffBlock = {
     selected?: boolean;
 };
 export type ReviewDiffBlock = FileReviewDiffBlock | HeaderReviewDiffBlock;
-export declare function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedToggle, blocks, bottomInset, codeQualityFindings, collapsed, comments, commitMetadata, diffLineHeight, diffStyle, disableWorkerPool, expandedGenerated, files, focusCommentId, focusCommentRequest, forceExpandedPaths, gitIdentity, hunkNavigation, initialMarkdownPreviewSectionIds, isReadOnly, itemVersionByKey, keymap, loadingSectionIds, onActiveBlockChange, onAskCodex, onCommentDraftChange, onCreateComment, onDeleteComment, onFindDefinitions, onLoadImageContent, onLoadSection, onLoadSectionContents, onOpenDefinition, onOpenFile, onRefreshMarkdown, onResolveThread, onSaveCommentEdit, onSelectPathFromScroll, onSubmitComment, onToggleCollapsed, onToggleViewed, onUpdateComment, onUpdateSourceDescription, onUpdateSourceTitle, onUploadSourceDescriptionAsset, reviewIdentityByPath, scrollTarget, searchQuery, selectedPath, showSourceDescription, showWhitespace, source, sourceDescriptionActions, sourceDescriptionFooter, supportsReviewCommentActions, theme, viewed, walkthroughNotes, wordWrap, }: {
+export declare function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedToggle, blocks, bottomInset, codeQualityFindings, collapsed, comments, commitMetadata, diffLineHeight, diffStyle, disableWorkerPool, expandedReviewKeys, files, focusCommentId, focusCommentRequest, forceExpandedPaths, gitIdentity, hunkNavigation, initialMarkdownPreviewSectionIds, isReadOnly, itemVersionByKey, keymap, loadingSectionIds, onActiveBlockChange, onAskCodex, onCommentDraftChange, onCreateComment, onDeleteComment, onFindDefinitions, onLoadImageContent, onLoadSection, onLoadSectionContents, onOpenDefinition, onOpenFile, onRefreshMarkdown, onResolveThread, onSaveCommentEdit, onSelectPathFromScroll, onSubmitComment, onToggleCollapsed, onToggleViewed, onUpdateComment, onUpdateSourceDescription, onUpdateSourceTitle, onUploadSourceDescriptionAsset, reviewIdentityByPath, scrollTarget, searchQuery, selectedPath, showSourceDescription, showWhitespace, source, sourceDescriptionActions, sourceDescriptionFooter, supportsReviewCommentActions, theme, viewed, walkthroughNotes, wordWrap, }: {
     activeSearchMatch: DiffSearchMatch | null;
     agentId: 'codex' | 'claude' | 'opencode' | 'pi';
     agentLabel: string;
@@ -53,7 +53,7 @@ export declare function ReviewCodeView({ activeSearchMatch, agentId, agentLabel,
     diffLineHeight?: number;
     diffStyle: CodiffDiffStyle;
     disableWorkerPool?: boolean;
-    expandedGenerated?: ReadonlySet<string>;
+    expandedReviewKeys?: ReadonlySet<string>;
     files: ReadonlyArray<ChangedFile>;
     focusCommentId: string | null;
     focusCommentRequest: number;

package/dist/app/hooks/useReviewState.d.ts

@@ -7,11 +7,11 @@ type UseReviewFileStateOptions = {
 export declare function useReviewFileState({ initialSelectedPath, onViewedChange, }?: UseReviewFileStateOptions): {
     bumpItemVersion: (key: string) => void;
     collapsed: Set<string>;
-    expandedGenerated: Set<string>;
+    expandedReviewKeys: Set<string>;
     itemVersionByKey: Record<string, number>;
     selectedPath: string | null;
     setCollapsed: import("react").Dispatch<import("react").SetStateAction<Set<string>>>;
-    setExpandedGenerated: import("react").Dispatch<import("react").SetStateAction<Set<string>>>;
+    setExpandedReviewKeys: import("react").Dispatch<import("react").SetStateAction<Set<string>>>;
     setItemVersionByKey: import("react").Dispatch<import("react").SetStateAction<Record<string, number>>>;
     setSelectedPath: import("react").Dispatch<import("react").SetStateAction<string | null>>;
     setViewed: import("react").Dispatch<import("react").SetStateAction<Record<string, string>>>;

package/dist/lib/app-types.d.ts

@@ -52,6 +52,14 @@ export type ReviewScrollTarget = {
     request: number;
 };
 export type ReviewIdentity = {
+    coverage?: {
+        allHunkIds: ReadonlyArray<string>;
+        file: {
+            fingerprint: string;
+            key: string;
+        };
+        hunkIds: ReadonlyArray<string>;
+    };
     fingerprint: string;
     key: string;
 };
@@ -106,7 +114,7 @@ export type WalkthroughNote = {
 };
 export type SourceSession = {
     collapsed: Set<string>;
-    expandedGenerated: Set<string>;
+    expandedReviewKeys: Set<string>;
     /** Populated by a generated or pre-authored narrative walkthrough document. */
     narrativeWalkthrough?: NarrativeWalkthrough | null;
     reviewComments: ReadonlyArray<ReviewComment>;

package/dist/lib/narrative-walkthrough-diff.d.ts

@@ -26,6 +26,7 @@ declare const extractPatchHunks: (patch: string) => {
     added: number;
     deleted: number;
     header: string;
+    patch: string;
 }[];
 /** @param {ReadonlyArray<{added: number; deleted: number}>} hunks */
 declare const sumHunkLineCounts: (hunks: ReadonlyArray<{
@@ -95,6 +96,7 @@ declare const getSectionWalkthroughHunks: (file: {
     added: number;
     deleted: number;
     header: string;
+    patch: string;
     id: string;
     index: number;
     kind: string;

package/dist/lib/narrative-walkthrough-diff.mjs

@@ -102,6 +102,7 @@ const extractPatchHunks = (patch) => {
 			index += 1;
 			continue;
 		}
+		const hunkStart = index;
 		let additions = 0;
 		let deletions = 0;
 		index += 1;
@@ -115,7 +116,8 @@ const extractPatchHunks = (patch) => {
 			...parsed,
 			added: additions,
 			deleted: deletions,
-			header
+			header,
+			patch: lines.slice(hunkStart, index).join("\n")
 		});
 	}
 	return hunks;

package/dist/lib/narrative-walkthrough.d.ts

@@ -42,6 +42,7 @@ export declare const formatWalkthroughFileLineRows: (items: ReadonlyArray<{
     deleted: number;
     path: string;
 }>, maxVisibleFiles?: number) => ReadonlyArray<WalkthroughFileLineRow>;
+export declare const getUncoveredWalkthroughReviewIdentity: (file: ChangedFile, view: WalkthroughView, showWhitespace: boolean) => import("./app-types.ts").ReviewIdentity;
 export declare const getUncoveredWalkthroughFiles: (files: ReadonlyArray<ChangedFile>, view: WalkthroughView, showWhitespace: boolean) => ReadonlyArray<ChangedFile>;
 export declare const getUncoveredWalkthroughFileLineItems: (files: ReadonlyArray<ChangedFile>, view: WalkthroughView, showWhitespace: boolean) => ReadonlyArray<{
     added: number;

package/dist/lib/review-comments.d.ts

@@ -1,7 +1,7 @@
 import type { ChangedFile, PullRequestExistingReviewComment, PullRequestReviewComment, RepositoryState } from '../types.ts';
 import type { CodeViewInstance, ReviewComment } from './app-types.ts';
 export declare const isInteractiveReviewEvent: (event: PointerEvent) => boolean;
-export declare const hasActiveTextSelection: () => boolean;
+export declare const hasActiveTextSelection: (target?: Node | null) => boolean;
 export declare const isFileReviewComment: (comment: Pick<ReviewComment, 'anchor' | 'lineNumber' | 'side'>) => boolean;
 export declare const isLineReviewComment: (comment: ReviewComment) => comment is ReviewComment & {
     lineNumber: number;

package/dist/lib/review-identity.d.ts

@@ -1,6 +1,9 @@
 import type { ChangedFile } from '../types.ts';
 import type { ReviewIdentity } from './app-types.ts';
 export declare const getFileReviewIdentity: (file: ChangedFile) => ReviewIdentity;
+export declare const getWalkthroughReviewKeyPrefix: (path: string) => string;
+export declare const getSectionReviewHunkIds: (file: ChangedFile, section: ChangedFile['sections'][number]) => ReadonlyArray<string>;
+export declare const getWalkthroughReviewIdentity: (file: ChangedFile, hunkIds: ReadonlyArray<string>) => ReviewIdentity;
 export declare const getReviewIdentity: (file: ChangedFile, identityByPath?: ReadonlyMap<string, ReviewIdentity>) => ReviewIdentity;
 export declare const isReviewIdentityViewed: (viewed: Readonly<Record<string, string>>, identity: ReviewIdentity) => boolean;
 export declare const updateReviewIdentityViewed: (viewed: Readonly<Record<string, string>>, identity: ReviewIdentity, currentlyViewed: boolean) => Record<string, string>;

package/dist/react.mjs

@@ -44,7 +44,6 @@ 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", {
 	defaultVariants: {
@@ -2380,9 +2379,31 @@ function MergeRequestCommentsView({ canComment, commenting, draft, editDraft, ed
 //#endregion
 //#region lib/review-comments.ts
 const isInteractiveReviewEvent = (event) => event.composedPath().some((target) => target instanceof HTMLElement && (target.closest("button, textarea, input, select, a") || target.closest(".review-comment-thread")));
-const hasActiveTextSelection = () => {
+const rangeIntersectsTarget = (range, target) => {
+	const targetRoot = target.getRootNode();
+	if (range.startContainer.getRootNode() !== targetRoot || range.endContainer.getRootNode() !== targetRoot) return false;
+	const selectionRange = (target.ownerDocument ?? document).createRange();
+	selectionRange.setStart(range.startContainer, range.startOffset);
+	selectionRange.setEnd(range.endContainer, range.endOffset);
+	return selectionRange.intersectsNode(target);
+};
+const isExpandedSelection = (selection, target) => {
+	if (selection == null || selection.rangeCount === 0) return false;
+	const range = selection.getRangeAt(0);
+	return (!selection.isCollapsed || selection.toString().length > 0 || !range.collapsed) && (!target || rangeIntersectsTarget(range, target));
+};
+const isExpandedRange = (range, target) => range != null && !range.collapsed && (!target || rangeIntersectsTarget(range, target));
+const hasActiveTextSelection = (target) => {
 	const selection = window.getSelection();
-	return selection != null && selection.rangeCount > 0 && !selection.isCollapsed;
+	const root = target?.getRootNode();
+	const shadowRoot = root && "host" in root ? root : null;
+	if (shadowRoot) {
+		const composedRange = selection?.getComposedRanges?.({ shadowRoots: [shadowRoot] })[0];
+		if (isExpandedRange(composedRange, target)) return true;
+		const shadowSelection = shadowRoot.getSelection?.();
+		if (isExpandedSelection(shadowSelection, target)) return true;
+	}
+	return isExpandedSelection(selection, target);
 };
 const isFileReviewComment = (comment) => comment.anchor === "file" || comment.lineNumber == null || comment.side == null;
 const isLineReviewComment = (comment) => !isFileReviewComment(comment);
@@ -3924,18 +3945,46 @@ const getFileReviewIdentity = (file) => ({
 	fingerprint: file.fingerprint,
 	key: file.path
 });
+const getWalkthroughReviewKeyPrefix = (path) => `walkthrough:${JSON.stringify(path)}:`;
+const getHunkViewedKey = (path, hunkId) => `${getWalkthroughReviewKeyPrefix(path)}${JSON.stringify(hunkId)}`;
+const getSectionReviewHunkIds = (file, section) => {
+	const ids = getSectionWalkthroughHunks(file, section).map((hunk) => hunk.id);
+	return ids.length > 0 ? ids : [section.id];
+};
+const getWalkthroughReviewIdentity = (file, hunkIds) => ({
+	coverage: {
+		allHunkIds: file.sections.flatMap((section) => getSectionReviewHunkIds(file, section)),
+		file: getFileReviewIdentity(file),
+		hunkIds
+	},
+	fingerprint: file.fingerprint,
+	key: `${getWalkthroughReviewKeyPrefix(file.path)}${JSON.stringify(hunkIds)}`
+});
 const getReviewIdentity = (file, identityByPath) => identityByPath?.get(file.path) ?? getFileReviewIdentity(file);
-const isReviewIdentityViewed = (viewed, identity) => viewed[identity.key] === identity.fingerprint;
+const isReviewIdentityViewed = (viewed, identity) => {
+	const { coverage } = identity;
+	return coverage ? viewed[coverage.file.key] === coverage.file.fingerprint || coverage.hunkIds.length > 0 && coverage.hunkIds.every((id) => viewed[getHunkViewedKey(coverage.file.key, id)] === coverage.file.fingerprint) : viewed[identity.key] === identity.fingerprint;
+};
 const updateReviewIdentityViewed = (viewed, identity, currentlyViewed) => {
-	if (currentlyViewed) {
-		const next = { ...viewed };
-		delete next[identity.key];
+	const next = { ...viewed };
+	const { coverage } = identity;
+	if (coverage) {
+		const { allHunkIds, file, hunkIds } = coverage;
+		if (viewed[file.key] === file.fingerprint) for (const id of allHunkIds) next[getHunkViewedKey(file.key, id)] = file.fingerprint;
+		for (const id of hunkIds) {
+			const key = getHunkViewedKey(file.key, id);
+			if (currentlyViewed) delete next[key];
+			else next[key] = file.fingerprint;
+		}
+		if (allHunkIds.length > 0 && allHunkIds.every((id) => next[getHunkViewedKey(file.key, id)] === file.fingerprint)) next[file.key] = file.fingerprint;
+		else delete next[file.key];
 		return next;
 	}
-	return {
-		...viewed,
-		[identity.key]: identity.fingerprint
-	};
+	const prefix = getWalkthroughReviewKeyPrefix(identity.key);
+	for (const key of Object.keys(next)) if (key.startsWith(prefix)) delete next[key];
+	if (currentlyViewed) delete next[identity.key];
+	else next[identity.key] = identity.fingerprint;
+	return next;
 };
 const updateReviewIdentityCollapsed = (collapsed, identity, currentlyCollapsed) => {
 	const next = new Set(collapsed);
@@ -4287,6 +4336,7 @@ const getUncoveredWalkthroughSection = (file, section, coveredHunkIds, coveredSe
 	if (coveredSyntheticSectionIds.has(section.id)) return null;
 	const hunkIds = getSectionHunkIds(file, section);
 	if (hunkIds.length === 0) return coveredSectionIds.has(section.id) ? null : {
+		hunkIds: [section.id],
 		identity: section.id,
 		section
 	};
@@ -4294,11 +4344,13 @@ const getUncoveredWalkthroughSection = (file, section, coveredHunkIds, coveredSe
 	if (uncoveredHunkIds.length === 0) return null;
 	const identity = `${section.id}:${uncoveredHunkIds.join(",")}`;
 	if (uncoveredHunkIds.length === hunkIds.length) return {
+		hunkIds: uncoveredHunkIds,
 		identity,
 		section
 	};
 	const patch = filterPatchToHunkIds(section.patch, section.id, uncoveredHunkIds);
 	return patch ? {
+		hunkIds: uncoveredHunkIds,
 		identity,
 		section: {
 			...section,
@@ -4306,6 +4358,13 @@ const getUncoveredWalkthroughSection = (file, section, coveredHunkIds, coveredSe
 		}
 	} : null;
 };
+const getUncoveredWalkthroughReviewIdentity = (file, view, showWhitespace) => {
+	const coveredHunkIds = walkthroughCoveredHunkIds(view);
+	const coveredSectionIds = walkthroughCoveredSectionIds(view);
+	const coveredSyntheticSectionIds = walkthroughCoveredSyntheticSectionIds(view);
+	const hunkIds = getVisibleDiffSections(file, showWhitespace).flatMap(({ section }) => getUncoveredWalkthroughSection(file, section, coveredHunkIds, coveredSectionIds, coveredSyntheticSectionIds)?.hunkIds ?? []);
+	return getWalkthroughReviewIdentity(file, hunkIds);
+};
 const getUncoveredWalkthroughFiles = (files, view, showWhitespace) => {
 	const coveredHunkIds = walkthroughCoveredHunkIds(view);
 	const coveredSectionIds = walkthroughCoveredSectionIds(view);
@@ -4952,7 +5011,7 @@ function DiffLineCountBadge({ ariaLabelPrefix, className = "codiff-line-count",
 //#endregion
 //#region app/components/ReviewCodeView.tsx
 const emptyMarkdownPreviewSectionIds = /* @__PURE__ */ new Set();
-const emptyExpandedGenerated = /* @__PURE__ */ new Set();
+const emptyExpandedReviewKeys = /* @__PURE__ */ new Set();
 const markdownPreviewPlugins = [frontmatterPlugin(), imagePlugin({
 	disableImageResize: true,
 	disableImageSettingsButton: true
@@ -5957,8 +6016,9 @@ function ReviewCommentEditor({ agentId, agentLabel, comment, displayName, focusC
 		onSaveCommentEdit
 	]);
 	const handleBlur = useCallback(() => {
-		onCommentBlur(flushDraft(), draft);
+		onCommentBlur(comment, draft, flushDraft);
 	}, [
+		comment,
 		draft,
 		flushDraft,
 		onCommentBlur
@@ -6582,7 +6642,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, 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 }) {
+function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedToggle = false, blocks, bottomInset = codeViewLayout.paddingBottom, codeQualityFindings = [], collapsed, comments, commitMetadata, diffLineHeight = 20, diffStyle, disableWorkerPool = false, expandedReviewKeys = emptyExpandedReviewKeys, 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());
@@ -6590,6 +6650,10 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 	const handledScrollRequestRef = useRef(null);
 	const handledHunkNavRef = useRef(hunkNavigation?.request ?? null);
 	const emptyCommentDeleteTimersRef = useRef(/* @__PURE__ */ new Map());
+	const activePointerIdsRef = useRef(/* @__PURE__ */ new Set());
+	const pendingCommentBlursRef = useRef(/* @__PURE__ */ new Map());
+	const pendingCommentBlurTimerRef = useRef(null);
+	const focusedCommentEditorIdRef = useRef(null);
 	const definitionHighlightFrameRef = useRef(null);
 	const highlightFrameRef = useRef(null);
 	const ignoreNextLineSelectionEndRef = useRef(false);
@@ -6703,7 +6767,7 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 			const reviewIdentity = block.reviewIdentity ?? getReviewIdentity(file, reviewIdentityByPath);
 			const reviewKey = reviewIdentity.key;
 			const isViewed = isReviewIdentityViewed(viewed, reviewIdentity);
-			const isCollapsed = !forceExpandedPaths.has(file.path) && !expandedGenerated.has(reviewKey) && (collapsed.has(reviewKey) || isGeneratedWalkthroughFile(file));
+			const isCollapsed = !forceExpandedPaths.has(file.path) && !expandedReviewKeys.has(reviewKey) && (isViewed || collapsed.has(reviewKey) || isGeneratedWalkthroughFile(file));
 			const visibleSections = getVisibleDiffSections(file, showWhitespace);
 			const lineCount = getDiffLineCountFromVisibleSections(visibleSections);
 			const sections = isCollapsed ? visibleSections.slice(0, 1) : visibleSections;
@@ -6865,7 +6929,7 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 		commentsBySection,
 		diffLineHeight,
 		diffStyle,
-		expandedGenerated,
+		expandedReviewKeys,
 		forceExpandedPaths,
 		imagePreviewLayoutPassBySection,
 		isReadOnly,
@@ -6939,6 +7003,66 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 		}
 		emptyCommentDeleteTimersRef.current.clear();
 	}, []);
+	const flushPendingCommentBlurs = useCallback(() => {
+		if (activePointerIdsRef.current.size > 0) return;
+		const callbacks = [...pendingCommentBlursRef.current.values()];
+		pendingCommentBlursRef.current.clear();
+		for (const callback of callbacks) callback();
+	}, []);
+	const schedulePendingCommentBlurFlush = useCallback(() => {
+		if (activePointerIdsRef.current.size > 0 || pendingCommentBlursRef.current.size === 0 || pendingCommentBlurTimerRef.current != null) return;
+		const timer = window.setTimeout(() => {
+			deferredTimersRef.current.delete(timer);
+			pendingCommentBlurTimerRef.current = null;
+			flushPendingCommentBlurs();
+		}, 0);
+		pendingCommentBlurTimerRef.current = timer;
+		deferredTimersRef.current.add(timer);
+	}, [flushPendingCommentBlurs]);
+	useEffect(() => {
+		const activePointerIds = activePointerIdsRef.current;
+		const deferredTimers = deferredTimersRef.current;
+		const pendingCommentBlurs = pendingCommentBlursRef.current;
+		const handlePointerDown = (event) => {
+			const timer = pendingCommentBlurTimerRef.current;
+			if (timer != null) {
+				window.clearTimeout(timer);
+				deferredTimers.delete(timer);
+				pendingCommentBlurTimerRef.current = null;
+			}
+			activePointerIds.add(event.pointerId);
+		};
+		const handlePointerEnd = (event) => {
+			activePointerIds.delete(event.pointerId);
+			schedulePendingCommentBlurFlush();
+		};
+		const handleWindowBlur = () => {
+			activePointerIds.clear();
+			schedulePendingCommentBlurFlush();
+		};
+		window.addEventListener("pointerdown", handlePointerDown, true);
+		window.addEventListener("pointercancel", handlePointerEnd, true);
+		window.addEventListener("pointerup", handlePointerEnd, true);
+		window.addEventListener("blur", handleWindowBlur);
+		return () => {
+			window.removeEventListener("pointerdown", handlePointerDown, true);
+			window.removeEventListener("pointercancel", handlePointerEnd, true);
+			window.removeEventListener("pointerup", handlePointerEnd, true);
+			window.removeEventListener("blur", handleWindowBlur);
+			activePointerIds.clear();
+			pendingCommentBlurs.clear();
+			const timer = pendingCommentBlurTimerRef.current;
+			if (timer != null) {
+				window.clearTimeout(timer);
+				deferredTimers.delete(timer);
+				pendingCommentBlurTimerRef.current = null;
+			}
+		};
+	}, [schedulePendingCommentBlurFlush]);
+	const deferCommentBlurUntilPointerEnd = useCallback((commentId, callback) => {
+		if (activePointerIdsRef.current.size > 0 || pendingCommentBlurTimerRef.current != null) pendingCommentBlursRef.current.set(commentId, callback);
+		else callback();
+	}, []);
 	const scrollFileItemToTop = useCallback((itemId) => {
 		const handle = codeViewRef.current;
 		const viewer = handle?.getInstance();
@@ -7034,10 +7158,10 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 			createCommentForRange(range, context);
 		},
 		onLineClick: (line, context) => {
+			const lineElement = "lineElement" in line ? line.lineElement : null;
 			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;
@@ -7086,7 +7210,7 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 				onLoadSection(meta.file, meta.section);
 				return;
 			}
-			if (hasActiveTextSelection()) return;
+			if (hasActiveTextSelection(lineElement)) return;
 			const side = "annotationSide" in line ? line.annotationSide : null;
 			if (!side) return;
 			cancelPendingEmptyCommentDeletes();
@@ -7147,6 +7271,8 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 		wordWrap
 	]);
 	const focusComment = useCallback((comment) => {
+		focusedCommentEditorIdRef.current = comment.id;
+		pendingCommentBlursRef.current.delete(comment.id);
 		onCommentDraftChange?.({
 			body: comment.body,
 			id: comment.id
@@ -7157,25 +7283,32 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 		deferredTimersRef.current.delete(timer);
 		emptyCommentDeleteTimersRef.current.delete(comment.id);
 	}, [onCommentDraftChange]);
-	const blurComment = useCallback((comment, body) => {
-		onCommentDraftChange?.(null);
-		clearCommentLineHighlight();
-		if (!comment.isReadOnly && body.trim().length === 0) {
-			const existingTimer = emptyCommentDeleteTimersRef.current.get(comment.id);
-			if (existingTimer != null) {
-				window.clearTimeout(existingTimer);
-				deferredTimersRef.current.delete(existingTimer);
+	const blurComment = useCallback((comment, body, flushDraft) => {
+		deferCommentBlurUntilPointerEnd(comment.id, () => {
+			if (focusedCommentEditorIdRef.current === comment.id) {
+				focusedCommentEditorIdRef.current = null;
+				onCommentDraftChange?.(null);
 			}
-			const timer = window.setTimeout(() => {
-				deferredTimersRef.current.delete(timer);
-				emptyCommentDeleteTimersRef.current.delete(comment.id);
-				onDeleteComment(comment.id);
-			}, 120);
-			deferredTimersRef.current.add(timer);
-			emptyCommentDeleteTimersRef.current.set(comment.id, timer);
-		}
+			flushDraft();
+			clearCommentLineHighlight();
+			if (!comment.isReadOnly && body.trim().length === 0) {
+				const existingTimer = emptyCommentDeleteTimersRef.current.get(comment.id);
+				if (existingTimer != null) {
+					window.clearTimeout(existingTimer);
+					deferredTimersRef.current.delete(existingTimer);
+				}
+				const timer = window.setTimeout(() => {
+					deferredTimersRef.current.delete(timer);
+					emptyCommentDeleteTimersRef.current.delete(comment.id);
+					onDeleteComment(comment.id);
+				}, 120);
+				deferredTimersRef.current.add(timer);
+				emptyCommentDeleteTimersRef.current.set(comment.id, timer);
+			}
+		});
 	}, [
 		clearCommentLineHighlight,
+		deferCommentBlurUntilPointerEnd,
 		onCommentDraftChange,
 		onDeleteComment
 	]);
@@ -7883,6 +8016,12 @@ function resolveBackdrop(element) {
 	}
 	return "#00000000";
 }
+let ghosttyModule = null;
+const loadGhostty = async () => {
+	const ghostty = await (ghosttyModule ??= import("ghostty-web"));
+	await ghostty.init();
+	return ghostty;
+};
 /**
 * Read-only ghostty-web terminal that replays the streamed commit output, so
 * ANSI colors and cursor movement from pre-commit hooks render as they would
@@ -7897,7 +8036,7 @@ function CommitLogTerminal({ output }) {
 		if (!container) return;
 		let disposed = false;
 		let instance = null;
-		init().then(() => {
+		loadGhostty().then(({ Terminal }) => {
 			if (disposed) return;
 			const style = getComputedStyle(container);
 			instance = new Terminal({
@@ -8354,10 +8493,7 @@ const getFocusedRunDiffs = (item, files) => resolveWalkthroughHunkRuns(item, fil
 	return focused ? [{
 		file: focused,
 		note: getWalkthroughRunNote(item, run),
-		reviewIdentity: {
-			fingerprint: focused.fingerprint,
-			key: `walkthrough:${run.key}`
-		}
+		reviewIdentity: getWalkthroughReviewIdentity(run.resolved.file, run.hunks.flatMap((hunk) => hunk.kind === "synthetic" ? getSectionReviewHunkIds(run.resolved.file, run.resolved.section) : [hunk.id]))
 	}] : [];
 });
 const getWalkthroughNavigationKeyDirection = (event) => {
@@ -8471,10 +8607,7 @@ const createSupportBlocks = (files, selected, walkthroughView, showWhitespace) =
 			id: blockId,
 			itemIdPrefix: blockId,
 			note: "Not included in the generated walkthrough.",
-			reviewIdentity: {
-				fingerprint: file.fingerprint,
-				key: blockId
-			}
+			reviewIdentity: getUncoveredWalkthroughReviewIdentity(files.find((candidate) => candidate.path === file.path), walkthroughView, showWhitespace)
 		});
 	}
 	return blocks;
@@ -9391,7 +9524,7 @@ function useReviewCommentDrafts({ canCreateComment = true, comments, onCommentFi
 //#region app/hooks/useReviewState.ts
 function useReviewFileState({ initialSelectedPath = null, onViewedChange } = {}) {
 	const [collapsed, setCollapsed] = useState(() => /* @__PURE__ */ new Set());
-	const [expandedGenerated, setExpandedGenerated] = useState(() => /* @__PURE__ */ new Set());
+	const [expandedReviewKeys, setExpandedReviewKeys] = useState(() => /* @__PURE__ */ new Set());
 	const [itemVersionByKey, setItemVersionByKey] = useState({});
 	const [selectedPath, setSelectedPath] = useState(initialSelectedPath);
 	const [viewed, setViewed] = useState({});
@@ -9404,11 +9537,11 @@ function useReviewFileState({ initialSelectedPath = null, onViewedChange } = {})
 	return {
 		bumpItemVersion,
 		collapsed,
-		expandedGenerated,
+		expandedReviewKeys,
 		itemVersionByKey,
 		selectedPath,
 		setCollapsed,
-		setExpandedGenerated,
+		setExpandedReviewKeys,
 		setItemVersionByKey,
 		setSelectedPath,
 		setViewed,
@@ -9419,9 +9552,9 @@ function useReviewFileState({ initialSelectedPath = null, onViewedChange } = {})
 				else next.add(reviewKey);
 				return next;
 			});
-			setExpandedGenerated((current) => {
+			setExpandedReviewKeys((current) => {
 				const next = new Set(current);
-				if (isCollapsed && isGeneratedWalkthroughFile(file)) next.add(reviewKey);
+				if (isCollapsed) next.add(reviewKey);
 				else next.delete(reviewKey);
 				return next;
 			});
@@ -9433,12 +9566,20 @@ function useReviewFileState({ initialSelectedPath = null, onViewedChange } = {})
 				onViewedChange?.(next);
 				return next;
 			});
-			setCollapsed((current) => updateReviewIdentityCollapsed(current, reviewIdentity, isViewed));
-			if (!isViewed) setExpandedGenerated((current) => {
-				const next = new Set(current);
-				next.delete(reviewIdentity.key);
-				return next;
-			});
+			const fileKey = reviewIdentity.coverage?.file.key ?? file.path;
+			const prefix = getWalkthroughReviewKeyPrefix(fileKey);
+			const clearRelatedKeys = (current) => new Set([...current].filter((key) => key !== fileKey && (reviewIdentity.coverage ? key !== reviewIdentity.key : !key.startsWith(prefix))));
+			if (reviewIdentity.coverage || reviewIdentity.key === file.path) {
+				setCollapsed(clearRelatedKeys);
+				setExpandedReviewKeys(clearRelatedKeys);
+			} else {
+				setCollapsed((current) => updateReviewIdentityCollapsed(current, reviewIdentity, isViewed));
+				setExpandedReviewKeys((current) => {
+					const next = new Set(current);
+					next.delete(reviewIdentity.key);
+					return next;
+				});
+			}
 			bumpItemVersion(reviewIdentity.key);
 		}, [bumpItemVersion, onViewedChange]),
 		viewed
@@ -9471,13 +9612,13 @@ const defaultConfigTemplate = {
 	keymap: {
 		"askAgent": "Mod+Alt+Enter",
 		"closeSearch": "Escape",
-		"commandBar": "Mod+Shift+p",
+		"commandBar": "Mod+k",
 		"diffSearch": "Mod+f",
 		"discardComment": "Escape",
 		"fileFilter": "Mod+p",
 		"nextHunk": ["Ctrl+ArrowDown", "j"],
 		"nextSearchMatch": "Enter",
-		"openFile": "Mod+k",
+		"openFile": "Mod+Shift+o",
 		"prevHunk": ["Ctrl+ArrowUp", "k"],
 		"prevSearchMatch": "Shift+Enter",
 		"shortcutsHelp": "Shift+?",
@@ -9631,7 +9772,7 @@ function ReviewSurface({ commenting, externalUrl, gitIdentity = null, initialMod
 	}, [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 { bumpItemVersion, collapsed, expandedReviewKeys, itemVersionByKey, selectedPath, setSelectedPath, toggleCollapsed, toggleViewed, viewed } = useReviewFileState({ initialSelectedPath: snapshot.files[0]?.path ?? null });
 	const { resizeSidebar, sidebarWidth } = useResizableSidebar({
 		collapseThreshold: 80,
 		onCollapse: () => {
@@ -10006,7 +10147,7 @@ function ReviewSurface({ commenting, externalUrl, gitIdentity = null, initialMod
 		diffLineHeight,
 		diffStyle: snapshot.preferences.diffStyle,
 		disableWorkerPool: true,
-		expandedGenerated,
+		expandedReviewKeys,
 		focusCommentId,
 		focusCommentRequest,
 		gitIdentity,

package/dist/style.css

@@ -5797,6 +5797,10 @@ html[data-codiff-platform="darwin"] .sidebar {
   background: var(--sidebar-vibrancy-tint);
 }
 
+.app-shell.command-bar-open > :not(.command-bar-overlay) {
+  filter: blur(4px);
+}
+
 .merge-request-nav-button {
   color: var(--muted);
   cursor: pointer;
@@ -8601,7 +8605,6 @@ diffs-container .review-comment-thread {
 }
 
 .command-bar-overlay, .open-review-source-overlay {
-  backdrop-filter: blur(4px);
   background: #ffffff47;
   justify-content: center;
   align-items: flex-start;
@@ -8611,6 +8614,10 @@ diffs-container .review-comment-thread {
   inset: 0;
 }
 
+.open-review-source-overlay {
+  backdrop-filter: blur(4px);
+}
+
 .command-bar-overlay {
   z-index: 100;
 }
@@ -8638,6 +8645,7 @@ diffs-container .review-comment-thread {
   flex-direction: column;
   width: min(520px, 90vw);
   max-height: 400px;
+  padding-top: 6px;
   display: flex;
   overflow: hidden;
 }
@@ -8645,15 +8653,16 @@ diffs-container .review-comment-thread {
 .command-bar-input {
   color: var(--text);
   corner-shape: squircle;
-  font: 14px/1.35 var(--font-sans);
+  font: 13px/1.35 var(--font-sans);
   background: #7f7f7f1a;
   border: 0;
   border-radius: 16px;
   outline: none;
   width: calc(100% - 20px);
   height: 34px;
-  margin: 10px;
-  padding: 0 12px;
+  min-height: 34px;
+  margin: 4px 10px 8px;
+  padding: 0 10px;
 }
 
 .command-bar-input:focus {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nkzw/codiff-core",
-  "version": "1.11.1",
+  "version": "1.13.0",
   "description": "A fast diff viewer.",
   "license": "MIT",
   "author": {
@@ -51,7 +51,7 @@
     }
   },
   "dependencies": {
-    "@nkzw/mdx-editor": "^0.2.2",
+    "@nkzw/mdx-editor": "^1.0.1",
     "@nkzw/use-relative-time": "^1.2.3",
     "@phosphor-icons/react": "^2.1.10",
     "@pierre/diffs": "1.3.6",
@@ -59,7 +59,7 @@
     "@radix-ui/react-slot": "^1.3.3",
     "class-variance-authority": "^0.7.1",
     "ghostty-web": "^0.4.0",
-    "lucide-react": "^1.34.0",
+    "lucide-react": "^1.39.0",
     "valibot": "^1.4.2"
   },
   "peerDependencies": {