@nkzw/codiff-core 1.12.0 → 1.14.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/useCodeViewAnnotations.d.ts

@@ -0,0 +1,3 @@
+import type { LineAnnotation } from '@pierre/diffs';
+import type { ReviewAnnotationMetadata } from '../../lib/app-types.ts';
+export declare function useCodeViewAnnotations(): (id: string, key: string, annotations: Array<LineAnnotation<ReviewAnnotationMetadata>>) => LineAnnotation<ReviewAnnotationMetadata>[];

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

@@ -0,0 +1,2 @@
+import type { FileContents } from '@pierre/diffs';
+export declare function useCodeViewPlaceholderFile(): (name: string, contents?: '' | ' ') => FileContents;

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

@@ -31,7 +31,7 @@ type WalkthroughHeaderAnnotationMetadata = {
     type: 'walkthrough-header';
 };
 export type ReviewAnnotationMetadata = CodeQualityAnnotationMetadata | ImagePreviewAnnotationMetadata | MarkdownPreviewAnnotationMetadata | ReviewCommentAnnotationMetadata | WalkthroughHeaderAnnotationMetadata;
-export type CodeViewInstance = NonNullable<ReturnType<CodeViewHandle<ReviewAnnotationMetadata>['getInstance']>>;
+export type CodeViewInstance = NonNullable<ReturnType<CodeViewHandle<ReviewAnnotationMetadata, undefined>['getInstance']>>;
 export type DiffSearchMatch = {
     filePath: string;
     itemId: string;
@@ -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/identifier-navigation.d.ts

@@ -3,6 +3,7 @@ export type IdentifierAtOffset = {
     start: number;
 };
 export declare const isNavigableIdentifierToken: (text: string) => boolean;
+export declare const clearIdentifierNavigationWrappers: (root: ParentNode) => void;
 export declare const applyIdentifierNavigationState: (renderedItems: ReadonlyArray<{
     element: HTMLElement;
 }>, active: boolean) => void;

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

@@ -29,5 +29,6 @@ export declare const getCommentKey: (comment: Pick<ReviewComment, 'anchor' | 'li
 export declare const getReviewCommentsDigest: (comments: ReadonlyArray<ReviewComment>) => string;
 export declare const buildReviewCommentsMarkdown: (files: ReadonlyArray<ChangedFile>, comments: ReadonlyArray<ReviewComment>, showWhitespace: boolean, prefix?: string) => string;
 export declare const getReviewCommentsFromState: (state: RepositoryState) => ReadonlyArray<ReviewComment>;
+export declare const getRefreshedReviewComments: (state: RepositoryState, currentComments: ReadonlyArray<ReviewComment>) => ReadonlyArray<ReviewComment>;
 export declare const getVisibleReviewComments: (comments: ReadonlyArray<ReviewComment>, showOutdated: boolean) => ReadonlyArray<ReviewComment>;
 export declare const shouldDiscardReviewCommentOnEscape: (body: string, confirmDiscard?: (message: string) => boolean) => boolean;

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

@@ -1505,7 +1505,7 @@ const parseSectionDiffWithOptions = (file, section, showWhitespace) => {
 	}
 	else if (section.patch.trim().length === 0) fileDiff = createEmptyFileDiff(file, section);
 	else {
-		const parsedFileDiff = parsePatchFiles(section.patch)[0]?.files[0];
+		const parsedFileDiff = parsePatchFiles(section.patch, cacheKey)[0]?.files[0];
 		if (parsedFileDiff) {
 			const loaded = parsedFileDiff.isPartial ? getLoadedSectionContents(file, section) : void 0;
 			let hydrated = null;
@@ -3887,11 +3887,10 @@ const wrapIdentifierNavigationText = (root) => {
 };
 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 enabled = active && !hasActiveTextSelection(root);
+		element.toggleAttribute(definitionModifierAttribute, enabled);
+		if (root && enabled) wrapIdentifierNavigationText(root);
 	}
 };
 const getIdentifierAtOffset = (text, offset) => {
@@ -3945,18 +3944,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);
@@ -4011,6 +4038,7 @@ const highlightTextContainer = (container, normalizedQuery, activeMatch) => {
 const applySearchHighlights = (renderedItems, query, activeMatch) => {
 	const normalizedQuery = query.trim().toLowerCase();
 	for (const { element, id } of renderedItems) for (const root of getSearchableRoots(element)) {
+		if (normalizedQuery) clearIdentifierNavigationWrappers(root);
 		clearSearchHighlights(root);
 		if (!normalizedQuery) continue;
 		const matchForItem = activeMatch && activeMatch.itemId === id ? activeMatch : null;
@@ -4024,6 +4052,45 @@ const getSourceKey = (source) => source.type === "commit" ? `commit:${source.ref
 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/hooks/useCodeViewAnnotations.ts
+function useCodeViewAnnotations() {
+	const [getAnnotations] = useState(() => {
+		const cache = /* @__PURE__ */ new Map();
+		return (id, key, annotations) => {
+			const previous = cache.get(id);
+			if (previous?.key === key) return previous.annotations;
+			cache.set(id, {
+				annotations,
+				key
+			});
+			return annotations;
+		};
+	});
+	return getAnnotations;
+}
+//#endregion
+//#region app/hooks/useCodeViewPlaceholderFile.ts
+function useCodeViewPlaceholderFile() {
+	const [getPlaceholderFile] = useState(() => {
+		const files = /* @__PURE__ */ new Map();
+		return (name, contents = " ") => {
+			const cacheKey = `placeholder:${contents.length}:${name}`;
+			let file = files.get(cacheKey);
+			if (!file) {
+				file = {
+					cacheKey,
+					contents,
+					lang: "text",
+					name
+				};
+				files.set(cacheKey, file);
+			}
+			return file;
+		};
+	});
+	return getPlaceholderFile;
+}
+//#endregion
 //#region app/components/DefinitionPopover.tsx
 function DefinitionPopover({ anchor, getDestination, identifier, onClose, onOpen, result }) {
 	const popoverRef = useRef(null);
@@ -4308,6 +4375,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
 	};
@@ -4315,11 +4383,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,
@@ -4327,6 +4397,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);
@@ -4973,7 +5050,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
@@ -5185,28 +5262,48 @@ const formatBytes = (size) => {
 	}
 	return `${size} B`;
 };
-function MarkdownPreview({ contents, editable, layoutKey, onEditorRef, onLayoutReady, path, sectionId }) {
-	useLayoutEffect(() => {
-		onLayoutReady(sectionId);
+function MarkdownPreview({ cacheKey, contents, editable, heightCache, onEditorRef, onLayoutReady, path, sectionId }) {
+	const contentRef = useRef(null);
+	const [ready, setReady] = useState(false);
+	const measure = useCallback((reportedHeight) => {
+		const content = contentRef.current;
+		if (!content?.isConnected || content.querySelector(".codiff-markdown-editor-message:not(.error), .codiff-readonly-markdown-loading")) return;
+		const height = content.getBoundingClientRect().height || reportedHeight;
+		if (height == null || height <= 0) return;
+		setReady(true);
+		if (heightCache.get(cacheKey) !== height) {
+			heightCache.set(cacheKey, height);
+			onLayoutReady(sectionId);
+		}
 	}, [
-		layoutKey,
+		cacheKey,
+		heightCache,
 		onLayoutReady,
 		sectionId
 	]);
-	return editable ? /* @__PURE__ */ jsx("div", {
-		className: "codiff-markdown-preview editable",
-		children: /* @__PURE__ */ jsx(RepositoryMarkdownEditor, {
-			onHeightChange: () => onLayoutReady(sectionId),
-			path,
-			ref: (editor) => onEditorRef(sectionId, editor)
-		})
-	}) : /* @__PURE__ */ jsx("div", {
-		className: "codiff-markdown-preview",
-		children: /* @__PURE__ */ jsx(ReadOnlyMarkdown, {
-			ariaLabel: `Preview ${path}`,
-			className: "codiff-markdown-preview-editor",
-			onHeightChange: () => onLayoutReady(sectionId),
-			value: contents
+	useLayoutEffect(() => {
+		const content = contentRef.current;
+		if (!content) return;
+		const observer = new ResizeObserver(() => measure());
+		observer.observe(content);
+		measure();
+		return () => observer.disconnect();
+	}, [measure]);
+	return /* @__PURE__ */ jsx("div", {
+		style: { minHeight: ready ? void 0 : heightCache.get(cacheKey) },
+		children: /* @__PURE__ */ jsx("div", {
+			className: `codiff-markdown-preview${editable ? " editable" : ""}`,
+			ref: contentRef,
+			children: editable ? /* @__PURE__ */ jsx(RepositoryMarkdownEditor, {
+				onHeightChange: measure,
+				path,
+				ref: (editor) => onEditorRef(sectionId, editor)
+			}) : /* @__PURE__ */ jsx(ReadOnlyMarkdown, {
+				ariaLabel: `Preview ${path}`,
+				className: "codiff-markdown-preview-editor",
+				onHeightChange: measure,
+				value: contents
+			})
 		})
 	});
 }
@@ -6604,8 +6701,11 @@ 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 getPlaceholderFile = useCodeViewPlaceholderFile();
+	const getAnnotations = useCodeViewAnnotations();
+	const [markdownPreviewHeights] = useState(() => /* @__PURE__ */ new Map());
 	const markdownEditorRefs = useRef(/* @__PURE__ */ new Map());
 	const refreshingMarkdownSectionsRef = useRef(/* @__PURE__ */ new Set());
 	const deferredTimersRef = useRef(/* @__PURE__ */ new Set());
@@ -6713,12 +6813,7 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 						}
 					}],
 					collapsed: false,
-					file: {
-						cacheKey: `walkthrough-header:${block.id}`,
-						contents: " ",
-						lang: "text",
-						name: headerId
-					},
+					file: getPlaceholderFile(headerId),
 					id: headerId,
 					type: "file",
 					version: getItemVersion(`${block.id}:walkthrough-header`)
@@ -6729,7 +6824,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;
@@ -6823,12 +6918,7 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 							}
 						}],
 						collapsed: isCollapsed,
-						file: {
-							cacheKey: `image-preview:${file.fingerprint}:${section.id}`,
-							contents: " ",
-							lang: "text",
-							name: file.path
-						},
+						file: getPlaceholderFile(file.path),
 						id,
 						type: "file",
 						version: getItemVersion(`${reviewVersionPrefix}:image:${sectionStateVersionKey}:${imagePreviewLayoutPassBySection[section.id] ?? 0}`)
@@ -6839,7 +6929,12 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 					const markdownPreviewAddedLinesDigest = getAddedLinesDigest(markdownPreview.addedLines);
 					const markdownPreviewLayoutKey = `${section.id}:${markdownPreview.contents.length}:${markdownPreviewAddedLinesDigest}`;
 					nextItems.push({
-						annotations: [...fileCommentAnnotations, {
+						annotations: getAnnotations(id, JSON.stringify([
+							markdownPreview.contents,
+							markdownPreviewAddedLinesDigest,
+							canEditMarkdown,
+							fileCommentAnnotations
+						]), [...fileCommentAnnotations, {
 							lineNumber: 1,
 							metadata: {
 								addedLines: markdownPreview.addedLines,
@@ -6850,14 +6945,9 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 								sectionId: section.id,
 								type: "markdown-preview"
 							}
-						}],
+						}]),
 						collapsed: isCollapsed,
-						file: {
-							cacheKey: `markdown-preview:${section.newFile?.cacheKey ?? file.fingerprint}:${markdownPreview.contents.length}:${markdownPreviewAddedLinesDigest}`,
-							contents: " ",
-							lang: "text",
-							name: file.path
-						},
+						file: getPlaceholderFile(file.path),
 						id,
 						type: "file",
 						version: getItemVersion(`${reviewVersionPrefix}:markdown:${sectionStateVersionKey}:${markdownPreviewLayoutKey}:${markdownPreviewLayoutPassBySection[section.id] ?? 0}`)
@@ -6891,8 +6981,10 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 		commentsBySection,
 		diffLineHeight,
 		diffStyle,
-		expandedGenerated,
+		expandedReviewKeys,
 		forceExpandedPaths,
+		getAnnotations,
+		getPlaceholderFile,
 		imagePreviewLayoutPassBySection,
 		isReadOnly,
 		itemVersionByKey,
@@ -6911,16 +7003,12 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 		if (items.length > 0 || !sourceDescriptionItemId) return items;
 		return [{
 			collapsed: true,
-			file: {
-				cacheKey: sourceDescriptionItemId,
-				contents: "",
-				lang: "text",
-				name: shouldShowCommitMessage ? "commit-message.md" : "source-description.md"
-			},
+			file: getPlaceholderFile(shouldShowCommitMessage ? "commit-message.md" : "source-description.md", ""),
 			id: sourceDescriptionItemId,
 			type: "file"
 		}];
 	}, [
+		getPlaceholderFile,
 		items,
 		shouldShowCommitMessage,
 		sourceDescriptionItemId
@@ -7583,30 +7671,44 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 	]);
 	useEffect(() => {
 		if (!onFindDefinitions) return;
+		let pointerDown = false;
 		const updateDefinitionModifierState = (active) => {
 			if (definitionModifierActiveRef.current === active) return;
 			definitionModifierActiveRef.current = active;
 			updateRenderedIdentifierNavigation(active);
 		};
 		const handleModifierChange = (event) => {
-			updateDefinitionModifierState(isPrimaryModifier(event));
+			updateDefinitionModifierState(isPrimaryModifier(event) && !pointerDown);
 		};
 		const handleModifierPointer = (event) => {
-			updateDefinitionModifierState(isPrimaryModifier(event));
+			pointerDown = (event.buttons & 1) !== 0;
+			updateDefinitionModifierState(isPrimaryModifier(event) && !pointerDown);
+		};
+		const handleSelectionChange = () => {
+			updateRenderedIdentifierNavigation(definitionModifierActiveRef.current);
+		};
+		const clearDefinitionModifierState = () => {
+			pointerDown = false;
+			updateDefinitionModifierState(false);
 		};
-		const clearDefinitionModifierState = () => updateDefinitionModifierState(false);
 		window.addEventListener("keydown", handleModifierChange);
 		window.addEventListener("keyup", handleModifierChange);
 		window.addEventListener("pointerdown", handleModifierPointer);
 		window.addEventListener("pointermove", handleModifierPointer);
+		window.addEventListener("pointerup", handleModifierPointer);
+		window.addEventListener("pointercancel", clearDefinitionModifierState);
 		window.addEventListener("blur", clearDefinitionModifierState);
+		document.addEventListener("selectionchange", handleSelectionChange);
 		return () => {
 			clearDefinitionModifierState();
 			window.removeEventListener("keydown", handleModifierChange);
 			window.removeEventListener("keyup", handleModifierChange);
 			window.removeEventListener("pointerdown", handleModifierPointer);
 			window.removeEventListener("pointermove", handleModifierPointer);
+			window.removeEventListener("pointerup", handleModifierPointer);
+			window.removeEventListener("pointercancel", clearDefinitionModifierState);
 			window.removeEventListener("blur", clearDefinitionModifierState);
+			document.removeEventListener("selectionchange", handleSelectionChange);
 		};
 	}, [onFindDefinitions, updateRenderedIdentifierNavigation]);
 	const invalidateDefinitionLookup = useCallback(() => {
@@ -7720,9 +7822,10 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 			}) : null;
 		}
 		if (annotation.metadata.type === "markdown-preview") return /* @__PURE__ */ jsx(MarkdownPreview, {
+			cacheKey: `${sourceKey}:${item.id}`,
 			contents: annotation.metadata.contents,
 			editable: annotation.metadata.editable,
-			layoutKey: annotation.metadata.layoutKey,
+			heightCache: markdownPreviewHeights,
 			onEditorRef: setMarkdownEditorRef,
 			onLayoutReady: markMarkdownPreviewLayoutReady,
 			path: annotation.metadata.path,
@@ -7764,6 +7867,7 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 		itemMetadata,
 		keymap,
 		markMarkdownPreviewLayoutReady,
+		markdownPreviewHeights,
 		markImagePreviewLayoutReady,
 		markCommentLayoutChanged,
 		onAskCodex,
@@ -7777,6 +7881,7 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 		replyToThread,
 		setMarkdownEditorRef,
 		source,
+		sourceKey,
 		supportsReviewCommentActions
 	]);
 	const handleScroll = useCallback((_scrollTop, viewer) => {
@@ -8455,10 +8560,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) => {
@@ -8572,10 +8674,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;
@@ -9492,7 +9591,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({});
@@ -9505,11 +9604,11 @@ function useReviewFileState({ initialSelectedPath = null, onViewedChange } = {})
 	return {
 		bumpItemVersion,
 		collapsed,
-		expandedGenerated,
+		expandedReviewKeys,
 		itemVersionByKey,
 		selectedPath,
 		setCollapsed,
-		setExpandedGenerated,
+		setExpandedReviewKeys,
 		setItemVersionByKey,
 		setSelectedPath,
 		setViewed,
@@ -9520,9 +9619,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;
 			});
@@ -9534,12 +9633,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
@@ -9572,13 +9679,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+?",
@@ -9732,7 +9839,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: () => {
@@ -10107,7 +10214,7 @@ function ReviewSurface({ commenting, externalUrl, gitIdentity = null, initialMod
 		diffLineHeight,
 		diffStyle: snapshot.preferences.diffStyle,
 		disableWorkerPool: true,
-		expandedGenerated,
+		expandedReviewKeys,
 		focusCommentId,
 		focusCommentRequest,
 		gitIdentity,

package/dist/style.css

@@ -2807,6 +2807,10 @@ form._multiFieldForm_sre1d_1628 {
   padding-left: 20px;
 }
 
+.mdx-editor .mdx-editor-content li > ul, .mdx-editor .mdx-editor-content li > ol {
+  margin-block: 0;
+}
+
 .mdx-editor-content li {
   margin: 0;
   padding-left: 2px;
@@ -5797,6 +5801,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 +8609,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 +8618,10 @@ diffs-container .review-comment-thread {
   inset: 0;
 }
 
+.open-review-source-overlay {
+  backdrop-filter: blur(4px);
+}
+
 .command-bar-overlay {
   z-index: 100;
 }
@@ -8638,6 +8649,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 +8657,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.12.0",
+  "version": "1.14.0",
   "description": "A fast diff viewer.",
   "license": "MIT",
   "author": {
@@ -51,16 +51,16 @@
     }
   },
   "dependencies": {
-    "@nkzw/mdx-editor": "^1.0.1",
+    "@nkzw/mdx-editor": "^1.0.3",
     "@nkzw/use-relative-time": "^1.2.3",
     "@phosphor-icons/react": "^2.1.10",
-    "@pierre/diffs": "1.3.6",
+    "@pierre/diffs": "1.4.2",
     "@pierre/trees": "1.0.0-beta.6",
     "@radix-ui/react-slot": "^1.3.3",
     "class-variance-authority": "^0.7.1",
     "ghostty-web": "^0.4.0",
-    "lucide-react": "^1.39.0",
-    "valibot": "^1.4.2"
+    "lucide-react": "^1.46.0",
+    "valibot": "^1.5.0"
   },
   "peerDependencies": {
     "react": "^19.2.0",