@nkzw/codiff-core 1.14.0 → 1.16.0

package/dist/react.mjs

@@ -1,7 +1,7 @@
-import { filterPatchToHunkIds, getSectionWalkthroughHunks, isGeneratedWalkthroughFile, isSyntheticWalkthroughHunk } from "./lib/narrative-walkthrough-diff.mjs";
+import { filterPatchToHunkIds, getHunkOrdinal, getSectionWalkthroughHunks, isGeneratedWalkthroughFile, isSyntheticWalkthroughHunk } from "./lib/narrative-walkthrough-diff.mjs";
 import { Slot } from "@radix-ui/react-slot";
 import { cva } from "class-variance-authority";
-import { Fragment, Suspense, forwardRef, lazy, useCallback, useEffect, useId, useImperativeHandle, useLayoutEffect, useMemo, useOptimistic, useRef, useState, useTransition } from "react";
+import { Fragment, Suspense, forwardRef, lazy, useCallback, useEffect, useId, useImperativeHandle, useLayoutEffect, useMemo, useOptimistic, useRef, useState, useSyncExternalStore, useTransition } from "react";
 import { createPortal, useFormStatus } from "react-dom";
 import { Fragment as Fragment$1, jsx, jsxs } from "react/jsx-runtime";
 import { MarkdownEditor } from "@nkzw/mdx-editor";
@@ -14,7 +14,7 @@ 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 { cloneFileDiffMetadata, getFiletypeFromFileName, getHighlighterOptions, hydratePartialDiff, parseDiffFromFile, parsePatchFiles, preloadHighlighter, registerCustomTheme, setCustomExtension } from "@pierre/diffs";
 import useRelativeTime from "@nkzw/use-relative-time";
 import { CaretDownIcon } from "@phosphor-icons/react/CaretDown";
 import "@phosphor-icons/react/CaretUp";
@@ -26,8 +26,9 @@ import { WarningOctagonIcon } from "@phosphor-icons/react/WarningOctagon";
 import { XIcon } from "@phosphor-icons/react/X";
 import { ColumnsIcon } from "@phosphor-icons/react/Columns";
 import { ImageBrokenIcon } from "@phosphor-icons/react/ImageBroken";
+import { PencilSimpleIcon } from "@phosphor-icons/react/PencilSimple";
 import { SquareSplitVerticalIcon } from "@phosphor-icons/react/SquareSplitVertical";
-import { CodeView, WorkerPoolContextProvider } from "@pierre/diffs/react";
+import { CodeView, EditProvider, WorkerPoolContextProvider } from "@pierre/diffs/react";
 import { CrosshairSimpleIcon } from "@phosphor-icons/react/CrosshairSimple";
 import { ProhibitIcon } from "@phosphor-icons/react/Prohibit";
 import { PersistentMarkdownEditor } from "@nkzw/mdx-editor/persistence";
@@ -3574,14 +3575,6 @@ registerCustomTheme("Licht", async () => licht_default);
 registerCustomTheme("Dunkel", async () => dunkel_default);
 setCustomExtension("cts", "typescript");
 setCustomExtension("mts", "typescript");
-const statusLabel = {
-	added: "Added",
-	conflicted: "Conflicted",
-	deleted: "Deleted",
-	modified: "Modified",
-	renamed: "Renamed",
-	untracked: "Untracked"
-};
 const sectionLabel = {
 	commit: "Commit",
 	"pull-request": "PR",
@@ -3601,7 +3594,7 @@ const workerHighlighterOptions = {
 		light: "Licht"
 	},
 	tokenizeMaxLineLength: 2e4,
-	useTokenTransformer: false
+	useTokenTransformer: true
 };
 const codeViewUnsafeCSS = `
   :host {
@@ -3934,7 +3927,7 @@ const getItemVersion = (value) => {
 //#region lib/keyboard.ts
 const isNativeInputTarget = (target) => {
 	const candidate = target;
-	return candidate?.closest?.("input, select, textarea") != null || candidate?.isContentEditable === true;
+	return candidate?.closest?.("input, select, textarea, [contenteditable=\"true\"]") != null || candidate?.isContentEditable === true || candidate?.shadowRoot?.activeElement != null && isNativeInputTarget(candidate.shadowRoot.activeElement);
 };
 const isMacPlatform = (platform = navigator.platform) => platform.toLowerCase().includes("mac");
 const isPrimaryModifier = (event, platform = navigator.platform) => isMacPlatform(platform) ? event.metaKey && !event.ctrlKey : event.ctrlKey && !event.metaKey;
@@ -4052,6 +4045,479 @@ 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 config/defaults.ts
+const defaultConfigTemplate = {
+	settings: {
+		"agentBackend": "codex",
+		"checkForUpdates": true,
+		"claudeModel": "claude-sonnet-4-6",
+		"codeFontFamily": "",
+		"codeFontSize": 13,
+		"copyCommentsOnClose": false,
+		"diffStyle": "split",
+		"editorCommand": "",
+		"expandUnchanged": false,
+		"lastRepositoryPath": "",
+		"openAIModel": "gpt-5.6-terra",
+		"openAIReasoningEffort": "",
+		"opencodeModel": "opencode-default",
+		"piModel": "pi-default",
+		"reviewCommentsPrefix": "# Address these Review Comments",
+		"sidebarPosition": "left",
+		"showOutdated": false,
+		"showWhitespace": false,
+		"theme": "system",
+		"walkthroughPrompt": "",
+		"wordWrap": false
+	},
+	keymap: {
+		"askAgent": "Mod+Alt+Enter",
+		"closeSearch": "Escape",
+		"commandBar": "Mod+k",
+		"diffSearch": "Mod+f",
+		"discardComment": "Escape",
+		"doneEditing": "Mod+s",
+		"editFile": "Mod+e",
+		"fileFilter": "Mod+p",
+		"nextHunk": ["Ctrl+ArrowDown", "j"],
+		"nextSearchMatch": "Enter",
+		"openFile": "Mod+Shift+o",
+		"prevHunk": ["Ctrl+ArrowUp", "k"],
+		"prevSearchMatch": "Shift+Enter",
+		"shortcutsHelp": "Shift+?",
+		"submitComment": "Mod+Enter",
+		"toggleSidebar": "Mod+Shift+b",
+		"toggleWordWrap": "Alt+z"
+	}
+};
+const createDefaultConfig = () => ({
+	keymap: { ...defaultConfigTemplate.keymap },
+	settings: { ...defaultConfigTemplate.settings }
+});
+const defaultKeymap = Object.freeze({ ...defaultConfigTemplate.keymap });
+Object.freeze({ ...defaultConfigTemplate.settings });
+const createFileEditingStore = (onChange) => {
+	const sessionRef = { current: null };
+	const draftRef = { current: "" };
+	let timer;
+	let pendingWrite = null;
+	const clearTimer = () => {
+		clearTimeout(timer);
+		timer = void 0;
+	};
+	const setSession = (session) => {
+		sessionRef.current = session ? {
+			...session,
+			dirty: draftRef.current !== session.document.content,
+			hasChanges: session.finishing === "revert" ? session.hasChanges : draftRef.current !== session.originalContent
+		} : null;
+		if (!session) clearTimer();
+		onChange();
+	};
+	const scheduleSave = () => {
+		clearTimer();
+		timer = setTimeout(() => void flush(), 300);
+	};
+	const flush = () => {
+		clearTimer();
+		if (pendingWrite) return pendingWrite.then((saved) => saved ? flush() : false);
+		const current = sessionRef.current;
+		if (!current || draftRef.current === current.document.content) return Promise.resolve(true);
+		const content = draftRef.current;
+		setSession({
+			...current,
+			saveError: void 0,
+			saving: true
+		});
+		pendingWrite = Promise.resolve().then(() => window.codiff.saveRepositoryFile({
+			...current.document,
+			baseVersion: current.document.version,
+			content
+		})).then((result) => {
+			if (result.status === "conflict") throw new Error("The file changed on disk. Your edits are kept; copy them before refreshing.");
+			const latest = sessionRef.current;
+			if (latest) setSession({
+				...latest,
+				document: result.document,
+				saving: false
+			});
+			return true;
+		}).catch((error) => {
+			const latest = sessionRef.current;
+			if (latest) setSession({
+				...latest,
+				saveError: error instanceof Error ? error.message : String(error),
+				saving: false
+			});
+			return false;
+		}).finally(() => {
+			pendingWrite = null;
+			const latest = sessionRef.current;
+			if (latest && !latest.finishing && !latest.saveError && draftRef.current !== latest.document.content) scheduleSave();
+		});
+		return pendingWrite;
+	};
+	const finish = async (revert, beforeClose) => {
+		const current = sessionRef.current;
+		if (!current || current.finishing) return false;
+		clearTimer();
+		setSession({
+			...current,
+			finishing: revert ? "revert" : "done"
+		});
+		let previousDraft;
+		try {
+			if (pendingWrite && !await pendingWrite) return false;
+			if (revert) {
+				previousDraft = draftRef.current;
+				draftRef.current = current.originalContent;
+			}
+			do {
+				do
+					if (!await flush()) {
+						if (previousDraft !== void 0) draftRef.current = previousDraft;
+						return false;
+					}
+				while (!revert && draftRef.current !== sessionRef.current?.document.content);
+				await beforeClose?.();
+			} while (!revert && draftRef.current !== sessionRef.current?.document.content);
+			setSession(null);
+			return true;
+		} catch (error) {
+			if (previousDraft !== void 0) draftRef.current = previousDraft;
+			throw error;
+		} finally {
+			const latest = sessionRef.current;
+			if (latest) setSession({
+				...latest,
+				finishing: void 0
+			});
+		}
+	};
+	return {
+		draftRef,
+		finish,
+		flush,
+		getSnapshot: () => sessionRef.current,
+		setDraft: (content) => {
+			const current = sessionRef.current;
+			if (!current || current.finishing === "revert" || content === draftRef.current) return;
+			const wasDirty = draftRef.current !== current.document.content;
+			draftRef.current = content;
+			const isDirty = content !== current.document.content;
+			if (isDirty && !current.finishing && !current.saveError) scheduleSave();
+			else clearTimer();
+			if (wasDirty !== isDirty || current.hasChanges !== (content !== current.originalContent)) setSession({ ...current });
+		},
+		setSession
+	};
+};
+const getCodeEditKey = (sourceKey, itemId) => JSON.stringify([sourceKey, itemId]);
+const createCodeEditingStore = () => {
+	const entries = /* @__PURE__ */ new Map();
+	const listeners = /* @__PURE__ */ new Set();
+	let snapshot = /* @__PURE__ */ new Map();
+	const hasFile = (path) => [...snapshot.values()].some((session) => session.document.path === path);
+	return {
+		clear: () => {
+			for (const entry of entries.values()) entry.setSession(null);
+		},
+		flush: (sourceKey) => Promise.all([...entries.values()].filter((entry) => entry.getSnapshot()?.sourceKey === sourceKey).map((entry) => entry.flush())),
+		get: (sourceKey, itemId) => entries.get(getCodeEditKey(sourceKey, itemId)),
+		getForItem: (item) => item.type === "diff" ? [...entries.values()].find((entry) => {
+			const session = entry.getSnapshot();
+			return session?.item.id === item.id && session.item.fileDiff === item.fileDiff;
+		}) : void 0,
+		getSnapshot: () => snapshot,
+		hasFile,
+		hasUnsavedEdits: () => [...entries.values()].some((entry) => {
+			const session = entry.getSnapshot();
+			return session && (session.saving || entry.draftRef.current !== session.document.content);
+		}),
+		start: (session) => {
+			if (hasFile(session.document.path)) return null;
+			const key = getCodeEditKey(session.sourceKey, session.item.id);
+			const entry = createFileEditingStore(() => {
+				const next = new Map(snapshot);
+				const current = entry.getSnapshot();
+				if (current) next.set(key, current);
+				else {
+					next.delete(key);
+					entries.delete(key);
+				}
+				snapshot = next;
+				for (const listener of listeners) listener();
+			});
+			entries.set(key, entry);
+			entry.draftRef.current = session.document.content;
+			entry.setSession(session);
+			return entry;
+		},
+		subscribe: (listener) => {
+			listeners.add(listener);
+			return () => {
+				listeners.delete(listener);
+			};
+		}
+	};
+};
+//#endregion
+//#region app/hooks/useCodeEditing.ts
+let editorModule = null;
+let editorModulePromise = null;
+const loadEditor = () => editorModulePromise ??= import("@pierre/diffs/edit").then((module) => {
+	editorModule = module;
+	return module;
+}).catch((error) => {
+	editorModulePromise = null;
+	throw error;
+});
+const prepareEditor = (fileDiff) => {
+	const lang = fileDiff.lang ?? getFiletypeFromFileName(fileDiff.name);
+	return Promise.all([loadEditor(), preloadHighlighter(getHighlighterOptions(lang, workerHighlighterOptions))]);
+};
+const createCodeEditor = (type, options, key) => {
+	if (!editorModule) throw new Error("The code editor has not loaded.");
+	return new editorModule.Editor(type, options, key);
+};
+function useUnsavedCodeEditsGuard(store) {
+	useEffect(() => {
+		const beforeUnload = (event) => {
+			if (store.hasUnsavedEdits()) {
+				event.preventDefault();
+				event.returnValue = "";
+			}
+		};
+		window.addEventListener("beforeunload", beforeUnload);
+		return () => window.removeEventListener("beforeunload", beforeUnload);
+	}, [store]);
+}
+const errorMessage = (error) => error instanceof Error ? error.message : String(error);
+const getFirstVisibleChangedLine = (root, viewport) => {
+	const viewportRect = viewport.getBoundingClientRect();
+	const header = root.querySelector("[data-diffs-header][data-sticky]");
+	const top = Math.max(viewportRect.top, header?.getBoundingClientRect().bottom ?? viewportRect.top) + 11;
+	for (const row of root.querySelectorAll("[data-content] > [data-line-type=\"change-addition\"]")) {
+		const rect = row.getBoundingClientRect();
+		if (rect.height > 0 && rect.top >= top && rect.top < viewportRect.bottom) {
+			const line = Number(row.dataset.line);
+			if (Number.isInteger(line) && line > 0) return line;
+		}
+	}
+};
+function useCodeEditing({ codeViewRef, items, keymap = defaultKeymap, onLoadSectionContents, onRefresh, selectedItemId, sourceKey, store: sharedStore }) {
+	const [localStore] = useState(createCodeEditingStore);
+	const store = sharedStore ?? localStore;
+	const sessions = useSyncExternalStore(store.subscribe, store.getSnapshot, store.getSnapshot);
+	useUnsavedCodeEditsGuard(store);
+	const busyRef = useRef(/* @__PURE__ */ new Set());
+	const [busyItemKeys, setBusyItemKeys] = useState(() => /* @__PURE__ */ new Set());
+	const [errors, setErrors] = useState(() => /* @__PURE__ */ new Map());
+	const setBusy = useCallback((key, busy) => {
+		if (busy) busyRef.current.add(key);
+		else busyRef.current.delete(key);
+		setBusyItemKeys(new Set(busyRef.current));
+	}, []);
+	const setError = useCallback((key, message) => {
+		setErrors((current) => {
+			const next = new Map(current);
+			if (message) next.set(key, message);
+			else next.delete(key);
+			return next;
+		});
+	}, []);
+	const currentSessions = useMemo(() => new Map([...sessions.values()].filter((session) => session.sourceKey === sourceKey).map((session) => [session.item.id, session])), [sessions, sourceKey]);
+	const editorOptions = useMemo(() => {
+		const focusedEditors = /* @__PURE__ */ new WeakSet();
+		return { onAttach: (editor, fileInstance) => {
+			if (!focusedEditors.has(editor)) {
+				focusedEditors.add(editor);
+				const viewer = codeViewRef.current?.getInstance();
+				const root = viewer?.getRenderedItems().find(({ instance }) => instance === fileInstance)?.element.shadowRoot;
+				const viewport = viewer?.getContainerElement();
+				editor.focus({
+					character: 0,
+					lineNumber: (root && viewport ? getFirstVisibleChangedLine(root, viewport) : void 0) ?? "first-visible",
+					offset: 11,
+					preventScroll: true
+				});
+				const position = editor.getViewState().selections?.[0]?.start;
+				const indentation = (position && editor.getEditState()?.document.getLineText(position.line))?.match(/^\s*/)?.[0].length ?? 0;
+				if (position && indentation > 0) editor.focus({
+					character: indentation,
+					lineNumber: position.line + 1,
+					preventScroll: true
+				});
+			}
+		} };
+	}, [codeViewRef]);
+	const loadEditContents = useCallback((item, metadata) => {
+		if (!item.fileDiff.isPartial) return Promise.resolve({
+			newFile: {
+				contents: item.fileDiff.additionLines.join(""),
+				name: item.fileDiff.name
+			},
+			oldFile: null
+		});
+		return loadSectionContents(metadata.file, metadata.section, onLoadSectionContents);
+	}, [onLoadSectionContents]);
+	const prepareEdit = useCallback(async (item, metadata) => {
+		if (item.type === "diff" && onLoadSectionContents) {
+			const [, loaded] = await Promise.all([prepareEditor(item.fileDiff), loadEditContents(item, metadata)]);
+			const rendered = codeViewRef.current?.getInstance()?.getRenderedItems().find(({ id }) => id === item.id);
+			if (rendered?.type === "diff") {
+				const fileDiff = item.fileDiff.isPartial ? hydratePartialDiff("clone", item.fileDiff, loaded) : item.fileDiff;
+				await rendered.instance.primeHighlightCache(fileDiff);
+			}
+		}
+	}, [
+		codeViewRef,
+		loadEditContents,
+		onLoadSectionContents
+	]);
+	const startEdit = useCallback(async (item, metadata) => {
+		const itemKey = getCodeEditKey(sourceKey, item.id);
+		if (item.type !== "diff" || !onLoadSectionContents || store.hasFile(metadata.file.path) || busyRef.current.has(itemKey)) return;
+		setBusy(itemKey, true);
+		setError(itemKey);
+		try {
+			const [, loaded, document] = await Promise.all([
+				prepareEditor(item.fileDiff),
+				loadEditContents(item, metadata),
+				window.codiff.getRepositoryFile(metadata.file.path)
+			]);
+			if (!loaded.newFile || loaded.newFile.contents !== document.content) throw new Error("The file changed on disk. Refresh the diff before editing.");
+			const key = crypto.randomUUID();
+			const fileDiff = item.fileDiff.isPartial ? hydratePartialDiff("clone", item.fileDiff, loaded) : cloneFileDiffMetadata(item.fileDiff);
+			fileDiff.cacheKey ??= `code-edit:${key}`;
+			const rendered = codeViewRef.current?.getInstance()?.getRenderedItems().find(({ id }) => id === item.id);
+			if (rendered?.type === "diff") await rendered.instance.primeHighlightCache(fileDiff);
+			const nextSession = {
+				dirty: false,
+				document,
+				hasChanges: false,
+				item: {
+					...item,
+					collapsed: false,
+					edit: true,
+					fileDiff,
+					version: getItemVersion(`code-edit:${key}`)
+				},
+				metadata,
+				originalContent: document.content,
+				sourceKey
+			};
+			if (store.start(nextSession)) codeViewRef.current?.clearSelectedLines();
+		} catch (error) {
+			setError(itemKey, errorMessage(error));
+		} finally {
+			setBusy(itemKey, false);
+		}
+	}, [
+		codeViewRef,
+		loadEditContents,
+		onLoadSectionContents,
+		setBusy,
+		setError,
+		sourceKey,
+		store
+	]);
+	const finishEdit = useCallback(async (itemId, revert) => {
+		const itemKey = getCodeEditKey(sourceKey, itemId);
+		const entry = store.get(sourceKey, itemId);
+		const current = entry?.getSnapshot();
+		if (!entry || !current || busyRef.current.has(itemKey)) return;
+		setBusy(itemKey, true);
+		setError(itemKey);
+		const needsRefresh = current.hasChanges || current.document.content !== current.originalContent || current.saving;
+		try {
+			await entry.finish(revert, async () => {
+				const latest = entry.getSnapshot();
+				if ((needsRefresh || latest?.hasChanges) && onRefresh && !await onRefresh(current.metadata.file, current.metadata.section)) throw new Error("File saved. Refresh the review to see the updated diff.");
+			});
+		} catch (error) {
+			setError(itemKey, errorMessage(error));
+		} finally {
+			setBusy(itemKey, false);
+		}
+	}, [
+		onRefresh,
+		setBusy,
+		setError,
+		sourceKey,
+		store
+	]);
+	const doneEdit = useCallback((itemId) => finishEdit(itemId, false), [finishEdit]);
+	const revertEdit = useCallback((itemId) => finishEdit(itemId, true), [finishEdit]);
+	const onItemEditChange = useCallback((event, item) => {
+		store.getForItem(item)?.setDraft(event.file.contents);
+	}, [store]);
+	const onItemEditComplete = useCallback((_event, item, nextItem) => {
+		const entry = store.getForItem(item);
+		const current = entry?.getSnapshot();
+		if (!entry || !current || nextItem.type !== "diff") return "reject";
+		nextItem.fileDiff.cacheKey = `code-edit:${crypto.randomUUID()}`;
+		entry.setSession({
+			...current,
+			item: {
+				...nextItem,
+				edit: true
+			}
+		});
+		return "accept";
+	}, [store]);
+	const editedItems = useMemo(() => {
+		if (currentSessions.size === 0) return items;
+		const found = /* @__PURE__ */ new Set();
+		const next = items.map((item) => {
+			const session = currentSessions.get(item.id);
+			if (!session) return item;
+			found.add(item.id);
+			return {
+				...session.item,
+				collapsed: item.collapsed
+			};
+		});
+		for (const session of currentSessions.values()) if (!found.has(session.item.id)) next.push(session.item);
+		return next;
+	}, [currentSessions, items]);
+	useEffect(() => {
+		if (currentSessions.size === 0) return;
+		const keyDown = (event) => {
+			if (event.defaultPrevented || event.repeat || event.isComposing || !matchesShortcut(event, keymap, "doneEditing")) return;
+			const path = event.composedPath();
+			if (isNativeInputTarget(event.target) && !path.some((node) => node.matches?.("[data-content][contenteditable=\"true\"]"))) return;
+			const itemId = codeViewRef.current?.getInstance()?.getRenderedItems().find(({ element, id }) => currentSessions.has(id) && path.includes(element))?.id ?? selectedItemId ?? (currentSessions.size === 1 ? currentSessions.keys().next().value : void 0);
+			if (itemId == null || !currentSessions.has(itemId)) return;
+			event.preventDefault();
+			event.stopPropagation();
+			doneEdit(itemId);
+		};
+		window.addEventListener("keydown", keyDown, true);
+		return () => window.removeEventListener("keydown", keyDown, true);
+	}, [
+		codeViewRef,
+		currentSessions,
+		doneEdit,
+		keymap,
+		selectedItemId
+	]);
+	return {
+		canStartEdit: (itemId, path) => !busyItemKeys.has(getCodeEditKey(sourceKey, itemId)) && ![...sessions.values()].some((session) => session.document.path === path),
+		doneEdit,
+		editorOptions,
+		getError: (itemId) => currentSessions.get(itemId)?.saveError ?? errors.get(getCodeEditKey(sourceKey, itemId)),
+		isBusy: (itemId) => busyItemKeys.has(getCodeEditKey(sourceKey, itemId)) || currentSessions.get(itemId)?.finishing != null,
+		items: editedItems,
+		onItemEditChange,
+		onItemEditComplete,
+		prepareEdit,
+		revertEdit,
+		sessions: currentSessions,
+		startEdit
+	};
+}
+//#endregion
 //#region app/hooks/useCodeViewAnnotations.ts
 function useCodeViewAnnotations() {
 	const [getAnnotations] = useState(() => {
@@ -4484,14 +4950,17 @@ const resolveWalkthroughHunkFile = (hunk, files) => {
 	};
 };
 const walkthroughHunkRunKey = (item, hunks) => `${item.id}:${hunks.map((hunk) => hunk.id).join(",")}`;
-/** Resolve item hunks in authored order, coalescing adjacent hunks from the same file section. */
+/** Resolve authored hunk order, coalescing only forward runs within each file section. */
 const resolveWalkthroughHunkRuns = (item, files) => {
 	const runs = [];
 	for (const hunk of item.hunks) {
 		const resolved = resolveWalkthroughHunkFile(hunk, files);
 		if (!resolved) continue;
 		const previous = runs.at(-1);
-		if (previous && previous.resolved.file.path === resolved.file.path && previous.resolved.section.id === resolved.section.id) {
+		const previousHunk = previous?.hunks.at(-1);
+		const previousOrdinal = previousHunk ? getHunkOrdinal(resolved.section.id, previousHunk.id) : null;
+		const ordinal = getHunkOrdinal(resolved.section.id, hunk.id);
+		if (previous && previous.resolved.file.path === resolved.file.path && previous.resolved.section.id === resolved.section.id && previousOrdinal != null && ordinal != null && previousOrdinal < ordinal) {
 			const hunks = [...previous.hunks, hunk];
 			runs[runs.length - 1] = {
 				...previous,
@@ -5095,124 +5564,165 @@ function CopyFilePathButton({ path }) {
 		})
 	});
 }
-function CodeViewHeader({ allowViewedToggle, canCreateFileComment, isSectionLoading, meta, onCreateFileComment, onLoadSection, onOpenFile, onToggleCollapsed, onToggleMarkdownPreview, onToggleViewed, readOnly }) {
+function CodeEditButton({ disabled, isBusy, item, meta, onEdit, onPrepare }) {
+	useEffect(() => {
+		onPrepare(item, meta).catch(() => {});
+	}, [
+		item,
+		meta,
+		onPrepare
+	]);
+	return /* @__PURE__ */ jsxs(Button, {
+		"aria-label": `Edit ${meta.file.path}`,
+		disabled: disabled || isBusy,
+		onClick: onEdit,
+		title: "Edit working-tree file",
+		type: "button",
+		children: [/* @__PURE__ */ jsx(PencilSimpleIcon, {
+			"aria-hidden": true,
+			size: 14,
+			weight: "bold"
+		}), "Edit"]
+	});
+}
+function CodeViewHeader({ allowViewedToggle, canCreateFileComment, editActions, isEditing = false, isSectionLoading, meta, onCreateFileComment, onLoadSection, onOpenFile, onToggleCollapsed, onToggleMarkdownPreview, onToggleViewed, readOnly }) {
 	const { canRenderMarkdown, file, isCollapsed, isMarkdownPreview, isSelected, isViewed, lineCount, reviewIdentity, section, sectionCount, walkthroughNote } = meta;
 	const canOpenFile = file.status !== "deleted";
 	const canLoadSection = shouldLoadDiffSectionContents(section);
+	const directoryEnd = file.path.lastIndexOf("/") + 1;
 	return /* @__PURE__ */ jsxs("div", {
 		className: `codiff-file-header${walkthroughNote ? " with-note" : ""}${isCollapsed ? " collapsed" : ""}${isSelected ? " selected" : ""}${isViewed ? " viewed" : ""}`,
-		children: [
-			/* @__PURE__ */ jsxs("div", {
-				"aria-expanded": !isCollapsed,
-				"aria-label": isCollapsed ? "Expand file" : "Collapse file",
-				className: "codiff-header-toggle",
-				onClick: () => onToggleCollapsed(file, isCollapsed, reviewIdentity.key),
-				onKeyDown: (event) => {
-					if (event.key === "Enter" || event.key === " ") {
-						event.preventDefault();
-						onToggleCollapsed(file, isCollapsed, reviewIdentity.key);
-					}
-				},
-				role: "button",
-				tabIndex: 0,
-				title: isCollapsed ? "Expand" : "Collapse",
+		children: [/* @__PURE__ */ jsxs("div", {
+			"aria-expanded": !isCollapsed,
+			"aria-label": isCollapsed ? "Expand file" : "Collapse file",
+			className: "codiff-header-toggle",
+			onClick: () => onToggleCollapsed(file, isCollapsed, reviewIdentity.key),
+			onKeyDown: (event) => {
+				if (event.key === "Enter" || event.key === " ") {
+					event.preventDefault();
+					onToggleCollapsed(file, isCollapsed, reviewIdentity.key);
+				}
+			},
+			role: "button",
+			tabIndex: 0,
+			title: isCollapsed ? "Expand" : "Collapse",
+			children: [/* @__PURE__ */ jsx("span", {
+				className: "codiff-chevron-box",
+				children: /* @__PURE__ */ jsx(CaretDownIcon, {
+					"aria-hidden": true,
+					className: isCollapsed ? "codiff-chevron collapsed" : "codiff-chevron",
+					size: 16,
+					weight: "bold"
+				})
+			}), /* @__PURE__ */ jsxs("span", {
+				className: "codiff-file-heading",
 				children: [
-					/* @__PURE__ */ jsx("span", {
-						className: "codiff-chevron-box",
-						children: /* @__PURE__ */ jsx(CaretDownIcon, {
-							"aria-hidden": true,
-							className: isCollapsed ? "codiff-chevron collapsed" : "codiff-chevron",
-							size: 16,
-							weight: "bold"
-						})
-					}),
 					/* @__PURE__ */ jsxs("span", {
-						className: "codiff-file-heading",
+						className: "codiff-file-path-row",
 						children: [
 							/* @__PURE__ */ jsxs("span", {
-								className: "codiff-file-path-row",
-								children: [/* @__PURE__ */ jsx("span", {
-									className: "codiff-file-path",
-									children: file.path
-								}), /* @__PURE__ */ jsx(CopyFilePathButton, { path: file.path })]
+								className: "codiff-file-path",
+								title: file.path,
+								children: [directoryEnd > 0 ? /* @__PURE__ */ jsx("span", {
+									className: "codiff-file-directory",
+									children: file.path.slice(0, directoryEnd)
+								}) : null, /* @__PURE__ */ jsx("span", {
+									className: "codiff-file-name",
+									children: file.path.slice(directoryEnd)
+								})]
 							}),
-							file.oldPath ? /* @__PURE__ */ jsx("span", {
-								className: "codiff-file-old-path",
-								children: file.oldPath
-							}) : null,
-							walkthroughNote ? /* @__PURE__ */ jsx("span", {
-								className: "codiff-file-note",
-								children: walkthroughNote.reason
+							/* @__PURE__ */ jsx(CopyFilePathButton, { path: file.path }),
+							!readOnly && onOpenFile ? /* @__PURE__ */ jsx("button", {
+								"aria-label": `Open ${file.path} in editor`,
+								className: "codiff-open-file-button",
+								disabled: !canOpenFile,
+								onClick: (event) => {
+									event.stopPropagation();
+									onOpenFile(file);
+								},
+								onKeyDown: (event) => {
+									if (event.key === "Enter" || event.key === " ") event.stopPropagation();
+								},
+								title: canOpenFile ? "Open file in editor" : "Deleted files cannot be opened",
+								type: "button",
+								children: /* @__PURE__ */ jsx(ArrowSquareOutIcon, {
+									"aria-hidden": true,
+									size: 16,
+									weight: "bold"
+								})
 							}) : null
 						]
 					}),
-					sectionCount > 1 ? /* @__PURE__ */ jsx("span", {
-						className: `codiff-section-badge ${section.kind}`,
-						children: sectionLabel[section.kind]
+					file.oldPath ? /* @__PURE__ */ jsx("span", {
+						className: "codiff-file-old-path",
+						children: file.oldPath
 					}) : null,
-					isGeneratedWalkthroughFile(file) ? /* @__PURE__ */ jsx("span", {
-						className: "codiff-generated-badge",
-						title: "Generated file",
-						children: "Generated"
+					walkthroughNote ? /* @__PURE__ */ jsx("span", {
+						className: "codiff-file-note",
+						children: walkthroughNote.reason
 					}) : null
 				]
-			}),
-			/* @__PURE__ */ jsx(DiffLineCountBadge, { lineCount }),
-			/* @__PURE__ */ jsx("div", {
-				className: `codiff-status-badge ${file.status}`,
-				children: statusLabel[file.status]
-			}),
-			canCreateFileComment ? /* @__PURE__ */ jsxs(Button, {
-				className: "codiff-file-comment-button",
-				onClick: onCreateFileComment,
-				title: "Comment on file",
-				type: "button",
-				children: [/* @__PURE__ */ jsx(ChatCircleIcon, {
-					"aria-hidden": true,
-					className: "codiff-file-comment-icon",
-					size: 14,
-					weight: "bold"
-				}), "Comment"]
-			}) : null,
-			canRenderMarkdown ? /* @__PURE__ */ jsx(Button, {
-				"aria-pressed": isMarkdownPreview,
-				className: `codiff-markdown-button${isMarkdownPreview ? " active" : ""}`,
-				onClick: () => onToggleMarkdownPreview(file, section),
-				title: isMarkdownPreview ? "View as Diff" : "View as Markdown",
-				type: "button",
-				children: isMarkdownPreview ? "View as Diff" : "View as Markdown"
-			}) : null,
-			canLoadSection && !readOnly ? /* @__PURE__ */ jsx("button", {
-				className: "codiff-load-button",
-				disabled: isSectionLoading,
-				onClick: () => onLoadSection(file, section),
-				title: isSectionLoading ? "Loading file contents" : "Load file contents",
-				type: "button",
-				children: isSectionLoading ? "Loading..." : "Load"
-			}) : null,
-			!readOnly && onOpenFile ? /* @__PURE__ */ jsx(Button, {
-				disabled: !canOpenFile,
-				onClick: () => onOpenFile(file),
-				title: canOpenFile ? "Open file in editor" : "Deleted files cannot be opened",
-				type: "button",
-				children: "Open"
-			}) : null,
-			!readOnly || allowViewedToggle ? /* @__PURE__ */ jsxs("button", {
-				"aria-pressed": isViewed,
-				className: `codiff-viewed-button${isViewed ? " active" : ""}`,
-				onClick: () => onToggleViewed(file, isViewed, reviewIdentity),
-				type: "button",
-				children: [/* @__PURE__ */ jsx("span", {
-					"aria-hidden": true,
-					className: "codiff-viewed-checkbox",
-					children: isViewed ? /* @__PURE__ */ jsx(CheckIcon, {
-						className: "codiff-viewed-check",
-						size: 10,
+			})]
+		}), /* @__PURE__ */ jsxs("div", {
+			className: "codiff-file-details",
+			children: [
+				/* @__PURE__ */ jsx(DiffLineCountBadge, { lineCount }),
+				sectionCount > 1 ? /* @__PURE__ */ jsx("span", {
+					className: `codiff-section-badge ${section.kind}`,
+					children: sectionLabel[section.kind]
+				}) : null,
+				isGeneratedWalkthroughFile(file) ? /* @__PURE__ */ jsx("span", {
+					className: "codiff-generated-badge",
+					title: "Generated file",
+					children: "Generated"
+				}) : null,
+				canCreateFileComment ? /* @__PURE__ */ jsxs(Button, {
+					className: "codiff-file-comment-button",
+					onClick: onCreateFileComment,
+					title: "Comment on file",
+					type: "button",
+					children: [/* @__PURE__ */ jsx(ChatCircleIcon, {
+						"aria-hidden": true,
+						className: "codiff-file-comment-icon",
+						size: 14,
 						weight: "bold"
-					}) : null
-				}), "Viewed"]
-			}) : null
-		]
+					}), "Comment"]
+				}) : null,
+				canRenderMarkdown ? /* @__PURE__ */ jsx(Button, {
+					"aria-pressed": isMarkdownPreview,
+					className: `codiff-markdown-button${isMarkdownPreview ? " active" : ""}`,
+					disabled: isEditing,
+					onClick: () => onToggleMarkdownPreview(file, section),
+					title: isMarkdownPreview ? "View as Diff" : "View as Markdown",
+					type: "button",
+					children: isMarkdownPreview ? "View as Diff" : "View as Markdown"
+				}) : null,
+				editActions,
+				canLoadSection && !readOnly ? /* @__PURE__ */ jsx("button", {
+					className: "codiff-load-button",
+					disabled: isSectionLoading,
+					onClick: () => onLoadSection(file, section),
+					title: isSectionLoading ? "Loading file contents" : "Load file contents",
+					type: "button",
+					children: isSectionLoading ? "Loading..." : "Load"
+				}) : null,
+				!readOnly || allowViewedToggle ? /* @__PURE__ */ jsxs("button", {
+					"aria-pressed": isViewed,
+					className: `codiff-viewed-button${isViewed ? " active" : ""}`,
+					onClick: () => onToggleViewed(file, isViewed, reviewIdentity),
+					type: "button",
+					children: [/* @__PURE__ */ jsx("span", {
+						"aria-hidden": true,
+						className: "codiff-viewed-checkbox",
+						children: isViewed ? /* @__PURE__ */ jsx(CheckIcon, {
+							className: "codiff-viewed-check",
+							size: 10,
+							weight: "bold"
+						}) : null
+					}), "Viewed"]
+				}) : null
+			]
+		})]
 	});
 }
 const getReviewAuthorDisplayName = (author) => author.name || author.login || "Git user";
@@ -6701,8 +7211,27 @@ 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, 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 }) {
+function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedToggle = false, blocks, bottomInset = codeViewLayout.paddingBottom, codeEditingStore, codeQualityFindings = [], collapsed, comments, commitMetadata, diffLineHeight = 20, diffStyle, disableWorkerPool = false, expandedReviewKeys = emptyExpandedReviewKeys, expandUnchanged = false, 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 [codeViewElement, setCodeViewElement] = useState(null);
+	const [compactHeaders, setCompactHeaders] = useState(false);
+	useLayoutEffect(() => {
+		if (!codeViewElement) return;
+		const measure = () => {
+			const width = codeViewElement.getBoundingClientRect().width;
+			if (width > 0) setCompactHeaders(width <= 760);
+		};
+		measure();
+		const observer = new ResizeObserver(measure);
+		observer.observe(codeViewElement);
+		return () => observer.disconnect();
+	}, [codeViewElement]);
+	const headerHeight = compactHeaders ? 90 : codeViewItemMetrics.diffHeaderHeight;
+	const itemMetrics = useMemo(() => ({
+		...codeViewItemMetrics,
+		diffHeaderHeight: headerHeight
+	}), [headerHeight]);
+	const codeViewStyle = { "--codiff-file-header-height": `${headerHeight}px` };
 	const getPlaceholderFile = useCodeViewPlaceholderFile();
 	const getAnnotations = useCodeViewAnnotations();
 	const [markdownPreviewHeights] = useState(() => /* @__PURE__ */ new Map());
@@ -6718,6 +7247,7 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 	const focusedCommentEditorIdRef = useRef(null);
 	const definitionHighlightFrameRef = useRef(null);
 	const highlightFrameRef = useRef(null);
+	const lastScrolledSearchMatchRef = useRef(null);
 	const ignoreNextLineSelectionEndRef = useRef(false);
 	const navigatedSelectionRef = useRef(null);
 	const initialMarkdownFiles = files.length > 0 ? files : blocks?.map((block) => block.file).filter((file) => file != null) ?? [];
@@ -7013,6 +7543,91 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 		shouldShowCommitMessage,
 		sourceDescriptionItemId
 	]);
+	const highlightedCodeItems = codeViewItems.filter((item) => itemMetadata.get(item.id)?.isSelected);
+	const selectedCodeItemId = highlightedCodeItems.find((item) => item.id === selectedLines?.id && itemMetadata.get(item.id)?.section.kind === "unstaged")?.id ?? highlightedCodeItems.find((item) => itemMetadata.get(item.id)?.section.kind === "unstaged")?.id ?? highlightedCodeItems[0]?.id;
+	const codeEditing = useCodeEditing({
+		codeViewRef,
+		items: codeViewItems,
+		keymap,
+		onLoadSectionContents,
+		onRefresh: onRefreshMarkdown,
+		selectedItemId: selectedCodeItemId,
+		sourceKey,
+		store: codeEditingStore
+	});
+	const canEditCodeItem = useCallback((item, meta) => meta != null && item.type === "diff" && !isReadOnly && !meta.section.binary && (meta.section.loadState == null || meta.section.loadState === "ready" || meta.section.loadState === "deferred") && !meta.isMarkdownPreview && meta.section.kind === "unstaged" && isEditableWorkingTreeSection(source.type, meta.file, meta.section) && onLoadSectionContents != null && window.codiff?.getRepositoryFile != null, [
+		isReadOnly,
+		onLoadSectionContents,
+		source.type
+	]);
+	const startCodeEdit = useCallback((item, meta) => {
+		if (meta.isCollapsed) onToggleCollapsed(meta.file, true, meta.reviewIdentity.key);
+		codeEditing.startEdit(item, meta);
+	}, [codeEditing, onToggleCollapsed]);
+	const editAfterExpandRef = useRef(null);
+	useEffect(() => {
+		const pending = editAfterExpandRef.current;
+		if (!pending) return;
+		if (pending.sourceKey !== sourceKey || !highlightedCodeItems.some((item) => itemMetadata.get(item.id)?.file.path === pending.path)) {
+			editAfterExpandRef.current = null;
+			return;
+		}
+		const item = highlightedCodeItems.find((candidate) => {
+			const meta = itemMetadata.get(candidate.id);
+			return meta?.file.path === pending.path && canEditCodeItem(candidate, meta);
+		});
+		const meta = item && itemMetadata.get(item.id);
+		if (item && meta) {
+			editAfterExpandRef.current = null;
+			startCodeEdit(item, meta);
+		}
+	}, [
+		canEditCodeItem,
+		highlightedCodeItems,
+		itemMetadata,
+		sourceKey,
+		startCodeEdit
+	]);
+	useEffect(() => {
+		const handleKeyDown = (event) => {
+			if (event.defaultPrevented || event.repeat || event.isComposing || isNativeInputTarget(event.target) || !matchesShortcut(event, keymap, "editFile")) return;
+			const item = codeViewItems.find((candidate) => candidate.id === selectedCodeItemId);
+			const meta = item && itemMetadata.get(item.id);
+			if (!item || !meta || !codeEditing.canStartEdit(item.id, meta.file.path)) return;
+			if (!canEditCodeItem(item, meta)) {
+				if (!meta.isCollapsed || !getVisibleDiffSections(meta.file, showWhitespace).some(({ fileDiff, section }) => canEditCodeItem({
+					fileDiff,
+					id: item.id,
+					type: "diff"
+				}, {
+					...meta,
+					section
+				}))) return;
+				event.preventDefault();
+				editAfterExpandRef.current = {
+					path: meta.file.path,
+					sourceKey
+				};
+				onToggleCollapsed(meta.file, true, meta.reviewIdentity.key);
+				return;
+			}
+			event.preventDefault();
+			startCodeEdit(item, meta);
+		};
+		window.addEventListener("keydown", handleKeyDown);
+		return () => window.removeEventListener("keydown", handleKeyDown);
+	}, [
+		canEditCodeItem,
+		codeEditing,
+		codeViewItems,
+		itemMetadata,
+		keymap,
+		onToggleCollapsed,
+		selectedCodeItemId,
+		showWhitespace,
+		sourceKey,
+		startCodeEdit
+	]);
 	const clearCommentLineHighlight = useCallback(() => {
 		codeViewRef.current?.clearSelectedLines();
 		navigatedSelectionRef.current = null;
@@ -7192,10 +7807,10 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 		diffStyle,
 		enableGutterUtility: !isReadOnly,
 		enableLineSelection: !isReadOnly,
-		expandUnchanged: false,
+		expandUnchanged: expandUnchanged && loadDiffFiles != null,
 		expansionLineCount: 100,
 		hunkSeparators: "line-info-basic",
-		itemMetrics: codeViewItemMetrics,
+		itemMetrics,
 		layout: {
 			...codeViewLayout,
 			paddingBottom: bottomInset
@@ -7203,11 +7818,12 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 		lineHoverHighlight: "both",
 		loadDiffFiles,
 		onGutterUtilityClick: (range, context) => {
-			if (isReadOnly) return;
+			if (isReadOnly || context.item.edit) return;
 			ignoreNextLineSelectionEndRef.current = context.item.type === "diff";
 			createCommentForRange(range, context);
 		},
 		onLineClick: (line, context) => {
+			if (context.item.edit) return;
 			const lineElement = "lineElement" in line ? line.lineElement : null;
 			if (isPrimaryModifier(line.event) && onFindDefinitions) {
 				line.event.preventDefault();
@@ -7272,7 +7888,7 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 			});
 		},
 		onLineSelectionEnd: (range, context) => {
-			if (isReadOnly) return;
+			if (isReadOnly || context.item.edit) return;
 			if (ignoreNextLineSelectionEndRef.current) {
 				ignoreNextLineSelectionEndRef.current = false;
 				return;
@@ -7287,10 +7903,10 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 			node.classList.toggle("codiff-selected-item", metadata?.isSelected === true || selectedHeaderItemIds.has(context.item.id));
 			node.classList.toggle("codiff-markdown-preview-item", metadata?.isMarkdownPreview === true);
 			node.classList.toggle("codiff-image-preview-item", context.item.type === "file" && Boolean(metadata && canRenderImagePreview(metadata.file.path, metadata.section)));
-			node.classList.toggle("codiff-loadable-summary-item", metadata != null && shouldLoadDiffSectionContents(metadata.section));
+			node.classList.toggle("codiff-loadable-summary-item", !context.item.edit && metadata != null && shouldLoadDiffSectionContents(metadata.section));
 			node.classList.toggle("codiff-loading-summary-item", Boolean(metadata && loadingSectionIds.has(metadata.section.id)));
 			if (definitionModifierActiveRef.current) window.requestAnimationFrame(() => {
-				if (definitionModifierActiveRef.current && node.isConnected) applyIdentifierNavigationState([{ element: node }], true);
+				if (definitionModifierActiveRef.current && node.isConnected && !codeViewRef.current?.getItem(context.item.id)?.edit) applyIdentifierNavigationState([{ element: node }], true);
 			});
 		},
 		overflow: wordWrap ? "wrap" : "scroll",
@@ -7301,14 +7917,17 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 		},
 		themeType: theme,
 		tokenizeMaxLength: 1e5,
-		unsafeCSS: codeViewUnsafeCSS
+		unsafeCSS: codeViewUnsafeCSS,
+		useTokenTransformer: workerHighlighterOptions.useTokenTransformer
 	}), [
 		bottomInset,
 		cancelPendingEmptyCommentDeletes,
 		createCommentForRange,
 		diffStyle,
+		expandUnchanged,
 		isReadOnly,
 		itemMetadata,
+		itemMetrics,
 		loadDiffFiles,
 		loadingSectionIds,
 		onCreateComment,
@@ -7478,7 +8097,6 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 		const viewer = handle?.getInstance();
 		if (!handle || !viewer) return;
 		handledHunkNavRef.current = hunkNavigation.request;
-		const headerHeight = codeViewItemMetrics.diffHeaderHeight;
 		const anchors = [];
 		const seen = /* @__PURE__ */ new Set();
 		const lineScrollTarget = (id, lineNumber, side) => ({
@@ -7597,6 +8215,7 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 		clearCommentLineHighlight,
 		diffLineHeight,
 		diffStyle,
+		headerHeight,
 		hunkNavigation,
 		itemMetadata,
 		items
@@ -7625,7 +8244,7 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 		if (highlightFrameRef.current != null) window.cancelAnimationFrame(highlightFrameRef.current);
 		highlightFrameRef.current = window.requestAnimationFrame(() => {
 			highlightFrameRef.current = null;
-			applySearchHighlights(viewer.getRenderedItems(), searchQuery, resolvedActiveSearchMatch);
+			applySearchHighlights(viewer.getRenderedItems().filter(({ item }) => !item.edit), searchQuery, resolvedActiveSearchMatch);
 		});
 	}, [resolvedActiveSearchMatch, searchQuery]);
 	const updateRenderedIdentifierNavigation = useCallback((active, viewer) => {
@@ -7636,12 +8255,12 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 			definitionHighlightFrameRef.current = null;
 		}
 		if (!active) {
-			applyIdentifierNavigationState(nextViewer.getRenderedItems(), false);
+			applyIdentifierNavigationState(nextViewer.getRenderedItems().filter(({ item }) => !item.edit), false);
 			return;
 		}
 		definitionHighlightFrameRef.current = window.requestAnimationFrame(() => {
 			definitionHighlightFrameRef.current = null;
-			applyIdentifierNavigationState(nextViewer.getRenderedItems(), true);
+			applyIdentifierNavigationState(nextViewer.getRenderedItems().filter(({ item }) => !item.edit), true);
 		});
 	}, []);
 	const scheduleStickyHeaderStateUpdate = useCallback((viewer) => {
@@ -7716,9 +8335,22 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 	}, []);
 	useEffect(() => invalidateDefinitionLookup, [invalidateDefinitionLookup]);
 	useEffect(() => {
+		if (!activeSearchMatch) {
+			lastScrolledSearchMatchRef.current = null;
+			return;
+		}
 		const handle = codeViewRef.current;
 		const viewer = handle?.getInstance();
 		if (!handle || !viewer || !resolvedActiveSearchMatch) return;
+		const lastScrolledSearchMatch = lastScrolledSearchMatchRef.current;
+		if (lastScrolledSearchMatch?.match === activeSearchMatch && lastScrolledSearchMatch.itemId === resolvedActiveSearchMatch.itemId) {
+			scheduleSearchHighlights();
+			return;
+		}
+		lastScrolledSearchMatchRef.current = {
+			itemId: resolvedActiveSearchMatch.itemId,
+			match: activeSearchMatch
+		};
 		if (resolvedActiveSearchMatch.lineNumber == null) handle.scrollTo({
 			align: "center",
 			behavior: "smooth-auto",
@@ -7735,7 +8367,11 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 			type: "line"
 		});
 		scheduleSearchHighlights();
-	}, [resolvedActiveSearchMatch, scheduleSearchHighlights]);
+	}, [
+		activeSearchMatch,
+		resolvedActiveSearchMatch,
+		scheduleSearchHighlights
+	]);
 	const renderCodeViewHeader = useCallback(() => /* @__PURE__ */ jsxs("div", {
 		className: "codiff-source-description-panel codiff-code-view-source-description",
 		children: [/* @__PURE__ */ jsx(SourceDescriptionHeader, {
@@ -7783,10 +8419,47 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 		toggleSourceDescriptionCollapsed
 	]);
 	const renderCustomHeader = useCallback((item) => {
-		const meta = itemMetadata.get(item.id);
-		return meta ? /* @__PURE__ */ jsx(CodeViewHeader, {
+		const editSession = codeEditing.sessions.get(item.id);
+		const isEditing = editSession != null;
+		const meta = editSession?.metadata ?? itemMetadata.get(item.id);
+		const isBusy = codeEditing.isBusy(item.id);
+		const isAutosaving = editSession?.saving && !isBusy;
+		const canEdit = canEditCodeItem(item, meta);
+		const editError = codeEditing.getError(item.id);
+		return meta ? /* @__PURE__ */ jsxs(Fragment$1, { children: [/* @__PURE__ */ jsx(CodeViewHeader, {
 			allowViewedToggle,
 			canCreateFileComment: canCreateFileComments,
+			editActions: isEditing ? /* @__PURE__ */ jsxs(Fragment$1, { children: [/* @__PURE__ */ jsx(Button, {
+				"aria-label": `${editSession?.hasChanges ? "Revert edits to" : "Cancel editing"} ${meta.file.path}`,
+				className: "codiff-edit-revert-button",
+				"data-autosaving": isAutosaving ? "" : void 0,
+				disabled: isBusy || editSession.saving,
+				onClick: () => void codeEditing.revertEdit(item.id),
+				title: editSession?.hasChanges ? "Restore the file to when editing started" : "Cancel editing",
+				type: "button",
+				variant: editSession?.hasChanges ? "destructive" : "default",
+				children: editSession?.hasChanges ? "Revert" : "Cancel"
+			}), /* @__PURE__ */ jsxs(Button, {
+				"aria-label": `Done editing ${meta.file.path}`,
+				"data-autosaving": isAutosaving ? "" : void 0,
+				disabled: isBusy || editSession.saving,
+				onClick: () => void codeEditing.doneEdit(item.id),
+				title: "Finish editing; changes are saved automatically",
+				type: "button",
+				children: [/* @__PURE__ */ jsx(CheckIcon, {
+					"aria-hidden": true,
+					size: 14,
+					weight: "bold"
+				}), "Done"]
+			})] }) : canEdit ? /* @__PURE__ */ jsx(CodeEditButton, {
+				disabled: !codeEditing.canStartEdit(item.id, meta.file.path),
+				isBusy,
+				item,
+				meta,
+				onEdit: () => startCodeEdit(item, meta),
+				onPrepare: codeEditing.prepareEdit
+			}) : null,
+			isEditing,
 			isSectionLoading: loadingSectionIds.has(meta.section.id),
 			meta,
 			onCreateFileComment: () => createFileComment(meta, item.id),
@@ -7796,11 +8469,17 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 			onToggleMarkdownPreview: toggleMarkdownPreview,
 			onToggleViewed,
 			readOnly: isReadOnly
-		}) : null;
+		}), editError ? /* @__PURE__ */ jsx("div", {
+			className: "codiff-code-edit-error",
+			role: "alert",
+			children: editError
+		}) : null] }) : null;
 	}, [
 		allowViewedToggle,
 		canCreateFileComments,
+		canEditCodeItem,
 		createFileComment,
+		codeEditing,
 		itemMetadata,
 		isReadOnly,
 		loadingSectionIds,
@@ -7808,6 +8487,7 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 		onOpenFile,
 		onToggleCollapsed,
 		onToggleViewed,
+		startCodeEdit,
 		toggleMarkdownPreview
 	]);
 	const renderAnnotation = useCallback((annotation, item) => {
@@ -7909,10 +8589,14 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 		scheduleStickyHeaderStateUpdate,
 		updateRenderedIdentifierNavigation
 	]);
-	return /* @__PURE__ */ jsxs(Fragment$1, { children: [disableWorkerPool ? /* @__PURE__ */ jsx(CodeView, {
-		className: "code-view",
+	const codeView = /* @__PURE__ */ jsx(CodeView, {
+		className: `code-view${compactHeaders ? " compact-file-headers" : ""}`,
+		containerRef: setCodeViewElement,
 		disableWorkerPool,
-		items: codeViewItems,
+		editorOptions: codeEditing.editorOptions,
+		items: codeEditing.items,
+		onItemEditChange: codeEditing.onItemEditChange,
+		onItemEditComplete: codeEditing.onItemEditComplete,
 		onScroll: handleScroll,
 		onSelectedLinesChange: setCodeViewSelectedLines,
 		options: codeViewOptions,
@@ -7920,14 +8604,20 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 		renderAnnotation,
 		renderCodeViewHeader: sourceDescriptionItemId ? renderCodeViewHeader : void 0,
 		renderCustomHeader,
-		selectedLines: isReadOnly ? null : selectedLines
-	}) : /* @__PURE__ */ jsx(WorkerPoolContextProvider, {
+		selectedLines: isReadOnly ? null : selectedLines,
+		style: codeViewStyle
+	});
+	const renderedCodeView = disableWorkerPool ? codeView : /* @__PURE__ */ jsx(WorkerPoolContextProvider, {
 		highlighterOptions: workerHighlighterOptions,
 		poolOptions: workerPoolOptions,
 		children: /* @__PURE__ */ jsx(CodeView, {
-			className: "code-view",
+			className: `code-view${compactHeaders ? " compact-file-headers" : ""}`,
+			containerRef: setCodeViewElement,
 			disableWorkerPool: false,
-			items: codeViewItems,
+			editorOptions: codeEditing.editorOptions,
+			items: codeEditing.items,
+			onItemEditChange: codeEditing.onItemEditChange,
+			onItemEditComplete: codeEditing.onItemEditComplete,
 			onScroll: handleScroll,
 			onSelectedLinesChange: setCodeViewSelectedLines,
 			options: codeViewOptions,
@@ -7935,8 +8625,13 @@ function ReviewCodeView({ activeSearchMatch, agentId, agentLabel, allowViewedTog
 			renderAnnotation,
 			renderCodeViewHeader: sourceDescriptionItemId ? renderCodeViewHeader : void 0,
 			renderCustomHeader,
-			selectedLines: isReadOnly ? null : selectedLines
+			selectedLines: isReadOnly ? null : selectedLines,
+			style: codeViewStyle
 		})
+	});
+	return /* @__PURE__ */ jsxs(Fragment$1, { children: [/* @__PURE__ */ jsx(EditProvider, {
+		createEditor: createCodeEditor,
+		children: renderedCodeView
 	}), definitionLookup?.sourceKey === sourceKey && onOpenDefinition ? /* @__PURE__ */ jsx(DefinitionPopover, {
 		anchor: definitionLookup.anchor,
 		getDestination: (candidate) => getDefinitionDiffTarget(candidate) ? "diff" : candidate.canOpenInEditor ? "editor" : "unavailable",
@@ -9653,54 +10348,6 @@ function useReviewFileState({ initialSelectedPath = null, onViewedChange } = {})
 	};
 }
 //#endregion
-//#region config/defaults.ts
-const defaultConfigTemplate = {
-	settings: {
-		"agentBackend": "codex",
-		"checkForUpdates": true,
-		"claudeModel": "claude-sonnet-4-6",
-		"codeFontFamily": "",
-		"codeFontSize": 13,
-		"copyCommentsOnClose": false,
-		"diffStyle": "split",
-		"editorCommand": "",
-		"lastRepositoryPath": "",
-		"openAIModel": "gpt-5.6-terra",
-		"opencodeModel": "opencode-default",
-		"piModel": "pi-default",
-		"reviewCommentsPrefix": "# Address these Review Comments",
-		"sidebarPosition": "left",
-		"showOutdated": false,
-		"showWhitespace": false,
-		"theme": "system",
-		"walkthroughPrompt": "",
-		"wordWrap": false
-	},
-	keymap: {
-		"askAgent": "Mod+Alt+Enter",
-		"closeSearch": "Escape",
-		"commandBar": "Mod+k",
-		"diffSearch": "Mod+f",
-		"discardComment": "Escape",
-		"fileFilter": "Mod+p",
-		"nextHunk": ["Ctrl+ArrowDown", "j"],
-		"nextSearchMatch": "Enter",
-		"openFile": "Mod+Shift+o",
-		"prevHunk": ["Ctrl+ArrowUp", "k"],
-		"prevSearchMatch": "Shift+Enter",
-		"shortcutsHelp": "Shift+?",
-		"submitComment": "Mod+Enter",
-		"toggleSidebar": "Mod+Shift+b",
-		"toggleWordWrap": "Alt+z"
-	}
-};
-const createDefaultConfig = () => ({
-	keymap: { ...defaultConfigTemplate.keymap },
-	settings: { ...defaultConfigTemplate.settings }
-});
-Object.freeze({ ...defaultConfigTemplate.keymap });
-Object.freeze({ ...defaultConfigTemplate.settings });
-//#endregion
 //#region lib/app-constants.ts
 const AGENT_LABELS = {
 	claude: "Claude Code",