From 1ce2a03e39181b59ddda5eef23b156c0c14051e9 Mon Sep 17 00:00:00 2001
From: Kiet Ho <hoakiet98@gmail.com>
Date: Wed, 21 Jan 2026 09:45:16 -0800
Subject: [PATCH 1/4] Checkbox

---
 .../components/FileDiffHeader/FileDiffHeader.tsx                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ChangesContent/components/FileDiffSection/components/FileDiffHeader/FileDiffHeader.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ChangesContent/components/FileDiffSection/components/FileDiffHeader/FileDiffHeader.tsx
index 30b62b90d8b..f5d09819c03 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ChangesContent/components/FileDiffSection/components/FileDiffHeader/FileDiffHeader.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ChangesContent/components/FileDiffSection/components/FileDiffHeader/FileDiffHeader.tsx
@@ -138,7 +138,7 @@ export function FileDiffHeader({
 					id={`viewed-${fileKey}`}
 					checked={isViewed}
 					onCheckedChange={(checked) => onViewedChange(checked === true)}
-					className="size-3.5"
+					className="size-3.5 border-muted-foreground/50"
 				/>
 				<label
 					htmlFor={`viewed-${fileKey}`}

From 33cb1f78fcb8cdef26f7ab0da4524364352b243f Mon Sep 17 00:00:00 2001
From: Kiet Ho <hoakiet98@gmail.com>
Date: Wed, 21 Jan 2026 09:58:09 -0800
Subject: [PATCH 2/4] custom revert icon

---
 .../MonacoProvider/MonacoProvider.tsx         |   1 +
 .../providers/MonacoProvider/monaco.css       |  36 ++++
 .../components/DiffViewer/DiffViewer.tsx      | 178 +++++++++++++++++-
 3 files changed, 213 insertions(+), 2 deletions(-)
 create mode 100644 apps/desktop/src/renderer/providers/MonacoProvider/monaco.css

diff --git a/apps/desktop/src/renderer/providers/MonacoProvider/MonacoProvider.tsx b/apps/desktop/src/renderer/providers/MonacoProvider/MonacoProvider.tsx
index 04e3d1899bf..cce73c54c8a 100644
--- a/apps/desktop/src/renderer/providers/MonacoProvider/MonacoProvider.tsx
+++ b/apps/desktop/src/renderer/providers/MonacoProvider/MonacoProvider.tsx
@@ -1,5 +1,6 @@
 import { loader } from "@monaco-editor/react";
 import * as monaco from "monaco-editor";
+import "./monaco.css";
 import editorWorker from "monaco-editor/esm/vs/editor/editor.worker?worker";
 import cssWorker from "monaco-editor/esm/vs/language/css/css.worker?worker";
 import htmlWorker from "monaco-editor/esm/vs/language/html/html.worker?worker";
diff --git a/apps/desktop/src/renderer/providers/MonacoProvider/monaco.css b/apps/desktop/src/renderer/providers/MonacoProvider/monaco.css
new file mode 100644
index 00000000000..7096b47093f
--- /dev/null
+++ b/apps/desktop/src/renderer/providers/MonacoProvider/monaco.css
@@ -0,0 +1,36 @@
+/* Monaco diff editor revert gutter icon */
+.diff-revert-glyph {
+	cursor: pointer;
+	opacity: 0;
+	transition: opacity 0.15s ease-in-out;
+	display: flex !important;
+	align-items: center;
+	justify-content: center;
+	margin-left: 2px;
+}
+
+.diff-revert-glyph::before {
+	content: "";
+	width: 14px;
+	height: 14px;
+	background-color: var(--muted-foreground);
+	mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='m9 14-4-4 4-4'/%3E%3Cpath d='M5 10h11a4 4 0 1 1 0 8h-1'/%3E%3C/svg%3E");
+	mask-size: contain;
+	mask-repeat: no-repeat;
+	mask-position: center;
+	-webkit-mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='m9 14-4-4 4-4'/%3E%3Cpath d='M5 10h11a4 4 0 1 1 0 8h-1'/%3E%3C/svg%3E");
+	-webkit-mask-size: contain;
+	-webkit-mask-repeat: no-repeat;
+	-webkit-mask-position: center;
+}
+
+.diff-revert-glyph:hover::before {
+	background-color: var(--foreground);
+}
+
+/* Show glyph on line hover */
+.monaco-editor .view-overlays .current-line ~ .glyph-margin .diff-revert-glyph,
+.monaco-editor .margin:hover .diff-revert-glyph,
+.monaco-editor .margin-view-overlays:hover .diff-revert-glyph {
+	opacity: 1;
+}
diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ChangesContent/components/DiffViewer/DiffViewer.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ChangesContent/components/DiffViewer/DiffViewer.tsx
index 2394e6d6b5a..b3cc4bbb397 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ChangesContent/components/DiffViewer/DiffViewer.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ChangesContent/components/DiffViewer/DiffViewer.tsx
@@ -17,6 +17,8 @@ import {
 	useEditorActions,
 } from "../../../ContentView/components/EditorContextMenu";
 
+const REVERT_GLYPH_CLASS = "diff-revert-glyph";
+
 function scrollToFirstDiff(
 	editor: Monaco.editor.IStandaloneDiffEditor,
 	modifiedEditor: Monaco.editor.IStandaloneCodeEditor,
@@ -84,6 +86,11 @@ export function DiffViewer({
 	const containerRef = useRef<HTMLDivElement>(null);
 
 	const contentSizeListenersRef = useRef<Monaco.IDisposable[]>([]);
+	const glyphDecorationsRef = useRef<string[]>([]);
+	const mouseDownListenerRef = useRef<Monaco.IDisposable | null>(null);
+	const lineChangesMapRef = useRef<Map<number, Monaco.editor.ILineChange>>(
+		new Map(),
+	);
 
 	useEffect(() => {
 		if (!isMonacoReady) return;
@@ -110,6 +117,163 @@ export function DiffViewer({
 	const changeListenerRef = useRef<Monaco.IDisposable | null>(null);
 	const diffUpdateListenerRef = useRef<Monaco.IDisposable | null>(null);
 
+	const updateGlyphDecorations = useCallback(
+		(
+			editor: Monaco.editor.IStandaloneDiffEditor,
+			modifiedEditor: Monaco.editor.IStandaloneCodeEditor,
+		) => {
+			const lineChanges = editor.getLineChanges();
+			if (!lineChanges) return;
+
+			lineChangesMapRef.current.clear();
+
+			const decorations: Monaco.editor.IModelDeltaDecoration[] = [];
+
+			for (const change of lineChanges) {
+				const startLine =
+					change.modifiedStartLineNumber > 0
+						? change.modifiedStartLineNumber
+						: change.modifiedEndLineNumber;
+
+				if (startLine > 0) {
+					lineChangesMapRef.current.set(startLine, change);
+					decorations.push({
+						range: {
+							startLineNumber: startLine,
+							startColumn: 1,
+							endLineNumber: startLine,
+							endColumn: 1,
+						},
+						options: {
+							glyphMarginClassName: REVERT_GLYPH_CLASS,
+							glyphMarginHoverMessage: { value: "Revert this change" },
+						},
+					});
+				}
+			}
+
+			glyphDecorationsRef.current = modifiedEditor.deltaDecorations(
+				glyphDecorationsRef.current,
+				decorations,
+			);
+		},
+		[],
+	);
+
+	const handleGlyphClick = useCallback(
+		(
+			e: Monaco.editor.IEditorMouseEvent,
+			diffEditor: Monaco.editor.IStandaloneDiffEditor,
+		) => {
+			if (e.target.type !== 2) return; // 2 = GUTTER_GLYPH_MARGIN
+
+			const lineNumber = e.target.position?.lineNumber;
+			if (!lineNumber) return;
+
+			const lineChange = lineChangesMapRef.current.get(lineNumber);
+			if (!lineChange) return;
+
+			// Use Monaco's internal revert method if available
+			const editorAny = diffEditor as unknown as {
+				revert?: (diff: unknown) => void;
+			};
+			if (typeof editorAny.revert === "function") {
+				// Try to find the LineRangeMapping for this change
+				const diffState = (
+					diffEditor as unknown as {
+						_diffModel?: {
+							get?: () => {
+								diff?: {
+									get?: () => {
+										mappings?: Array<{ lineRangeMapping: unknown }>;
+									};
+								};
+							};
+						};
+					}
+				)._diffModel
+					?.get?.()
+					?.diff?.get?.();
+				if (diffState?.mappings) {
+					const mapping = diffState.mappings.find((m) => {
+						const modified = (
+							m.lineRangeMapping as { modified?: { startLineNumber?: number } }
+						).modified;
+						return (
+							modified?.startLineNumber ===
+								lineChange.modifiedStartLineNumber ||
+							(lineChange.modifiedStartLineNumber === 0 &&
+								modified?.startLineNumber ===
+									lineChange.modifiedEndLineNumber + 1)
+						);
+					});
+					if (mapping) {
+						editorAny.revert(mapping.lineRangeMapping);
+						return;
+					}
+				}
+			}
+
+			// Fallback: replicate Monaco's revert behavior using executeEdits with undo stops
+			const originalModel = diffEditor.getOriginalEditor().getModel();
+			const modifiedEditor = diffEditor.getModifiedEditor();
+			const modifiedModel = modifiedEditor.getModel();
+			if (!originalModel || !modifiedModel) return;
+
+			// Get the original content for this change
+			let originalContent = "";
+			if (
+				lineChange.originalStartLineNumber > 0 &&
+				lineChange.originalEndLineNumber >= lineChange.originalStartLineNumber
+			) {
+				originalContent = originalModel.getValueInRange({
+					startLineNumber: lineChange.originalStartLineNumber,
+					startColumn: 1,
+					endLineNumber: lineChange.originalEndLineNumber,
+					endColumn: originalModel.getLineMaxColumn(
+						lineChange.originalEndLineNumber,
+					),
+				});
+			}
+
+			// Determine the range to replace in the modified model
+			const modifiedStartLine = lineChange.modifiedStartLineNumber;
+			const modifiedEndLine = lineChange.modifiedEndLineNumber;
+
+			let replaceRange: Monaco.IRange;
+			if (modifiedStartLine === 0 || modifiedEndLine < modifiedStartLine) {
+				// This is a pure deletion in modified (content was added in original)
+				// Insert after the previous line
+				const insertLine = modifiedEndLine > 0 ? modifiedEndLine : 1;
+				const insertColumn = modifiedModel.getLineMaxColumn(insertLine);
+				replaceRange = {
+					startLineNumber: insertLine,
+					startColumn: insertColumn,
+					endLineNumber: insertLine,
+					endColumn: insertColumn,
+				};
+				// Prepend newline since we're inserting
+				originalContent = `\n${originalContent}`;
+			} else {
+				// Replace the modified range with original content
+				replaceRange = {
+					startLineNumber: modifiedStartLine,
+					startColumn: 1,
+					endLineNumber: modifiedEndLine,
+					endColumn: modifiedModel.getLineMaxColumn(modifiedEndLine),
+				};
+			}
+
+			// Apply the edit using Monaco's pattern: pushUndoStop, executeEdits, pushUndoStop
+			modifiedEditor.pushUndoStop();
+			modifiedEditor.executeEdits("diffEditor", [
+				{ range: replaceRange, text: originalContent },
+			]);
+			modifiedEditor.pushUndoStop();
+		},
+		[],
+	);
+
 	const handleMount: DiffOnMount = useCallback(
 		(editor) => {
 			diffEditorRef.current = editor;
@@ -120,12 +284,20 @@ export function DiffViewer({
 			registerCopyPathLineAction(originalEditor, filePath);
 			registerCopyPathLineAction(modifiedEditor, filePath);
 
+			// Set up glyph margin click handler for revert
+			mouseDownListenerRef.current?.dispose();
+			mouseDownListenerRef.current = modifiedEditor.onMouseDown((e) => {
+				handleGlyphClick(e, editor);
+			});
+
 			diffUpdateListenerRef.current?.dispose();
 			diffUpdateListenerRef.current = editor.onDidUpdateDiff(() => {
 				if (!hasScrolledToFirstDiffRef.current) {
 					scrollToFirstDiff(editor, modifiedEditor);
 					hasScrolledToFirstDiffRef.current = true;
 				}
+				// Update glyph decorations when diff changes
+				updateGlyphDecorations(editor, modifiedEditor);
 			});
 
 			if (fitContent) {
@@ -150,13 +322,15 @@ export function DiffViewer({
 
 			setIsEditorMounted(true);
 		},
-		[filePath, fitContent],
+		[filePath, fitContent, handleGlyphClick, updateGlyphDecorations],
 	);
 
 	useEffect(() => {
 		return () => {
 			diffUpdateListenerRef.current?.dispose();
 			diffUpdateListenerRef.current = null;
+			mouseDownListenerRef.current?.dispose();
+			mouseDownListenerRef.current = null;
 			contentSizeListenersRef.current.forEach((d) => {
 				d.dispose();
 			});
@@ -275,7 +449,7 @@ export function DiffViewer({
 				readOnly: !editable,
 				originalEditable: false,
 				renderOverviewRuler: !fitContent,
-				renderGutterMenu: false,
+				glyphMargin: true,
 				diffWordWrap: "on",
 				contextmenu: !contextMenuProps, // Disable Monaco's context menu if we have custom props
 				hideUnchangedRegions: {

From 5d976066683ce1adb603189ebaffd14c633f5de7 Mon Sep 17 00:00:00 2001
From: Kiet Ho <hoakiet98@gmail.com>
Date: Wed, 21 Jan 2026 10:17:20 -0800
Subject: [PATCH 3/4] Revert

---
 .../MonacoProvider/MonacoProvider.tsx         |   1 -
 .../providers/MonacoProvider/monaco.css       |  36 ----
 .../components/DiffViewer/DiffViewer.tsx      | 178 +-----------------
 3 files changed, 2 insertions(+), 213 deletions(-)
 delete mode 100644 apps/desktop/src/renderer/providers/MonacoProvider/monaco.css

diff --git a/apps/desktop/src/renderer/providers/MonacoProvider/MonacoProvider.tsx b/apps/desktop/src/renderer/providers/MonacoProvider/MonacoProvider.tsx
index cce73c54c8a..04e3d1899bf 100644
--- a/apps/desktop/src/renderer/providers/MonacoProvider/MonacoProvider.tsx
+++ b/apps/desktop/src/renderer/providers/MonacoProvider/MonacoProvider.tsx
@@ -1,6 +1,5 @@
 import { loader } from "@monaco-editor/react";
 import * as monaco from "monaco-editor";
-import "./monaco.css";
 import editorWorker from "monaco-editor/esm/vs/editor/editor.worker?worker";
 import cssWorker from "monaco-editor/esm/vs/language/css/css.worker?worker";
 import htmlWorker from "monaco-editor/esm/vs/language/html/html.worker?worker";
diff --git a/apps/desktop/src/renderer/providers/MonacoProvider/monaco.css b/apps/desktop/src/renderer/providers/MonacoProvider/monaco.css
deleted file mode 100644
index 7096b47093f..00000000000
--- a/apps/desktop/src/renderer/providers/MonacoProvider/monaco.css
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Monaco diff editor revert gutter icon */
-.diff-revert-glyph {
-	cursor: pointer;
-	opacity: 0;
-	transition: opacity 0.15s ease-in-out;
-	display: flex !important;
-	align-items: center;
-	justify-content: center;
-	margin-left: 2px;
-}
-
-.diff-revert-glyph::before {
-	content: "";
-	width: 14px;
-	height: 14px;
-	background-color: var(--muted-foreground);
-	mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='m9 14-4-4 4-4'/%3E%3Cpath d='M5 10h11a4 4 0 1 1 0 8h-1'/%3E%3C/svg%3E");
-	mask-size: contain;
-	mask-repeat: no-repeat;
-	mask-position: center;
-	-webkit-mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='m9 14-4-4 4-4'/%3E%3Cpath d='M5 10h11a4 4 0 1 1 0 8h-1'/%3E%3C/svg%3E");
-	-webkit-mask-size: contain;
-	-webkit-mask-repeat: no-repeat;
-	-webkit-mask-position: center;
-}
-
-.diff-revert-glyph:hover::before {
-	background-color: var(--foreground);
-}
-
-/* Show glyph on line hover */
-.monaco-editor .view-overlays .current-line ~ .glyph-margin .diff-revert-glyph,
-.monaco-editor .margin:hover .diff-revert-glyph,
-.monaco-editor .margin-view-overlays:hover .diff-revert-glyph {
-	opacity: 1;
-}
diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ChangesContent/components/DiffViewer/DiffViewer.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ChangesContent/components/DiffViewer/DiffViewer.tsx
index b3cc4bbb397..2394e6d6b5a 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ChangesContent/components/DiffViewer/DiffViewer.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ChangesContent/components/DiffViewer/DiffViewer.tsx
@@ -17,8 +17,6 @@ import {
 	useEditorActions,
 } from "../../../ContentView/components/EditorContextMenu";
 
-const REVERT_GLYPH_CLASS = "diff-revert-glyph";
-
 function scrollToFirstDiff(
 	editor: Monaco.editor.IStandaloneDiffEditor,
 	modifiedEditor: Monaco.editor.IStandaloneCodeEditor,
@@ -86,11 +84,6 @@ export function DiffViewer({
 	const containerRef = useRef<HTMLDivElement>(null);
 
 	const contentSizeListenersRef = useRef<Monaco.IDisposable[]>([]);
-	const glyphDecorationsRef = useRef<string[]>([]);
-	const mouseDownListenerRef = useRef<Monaco.IDisposable | null>(null);
-	const lineChangesMapRef = useRef<Map<number, Monaco.editor.ILineChange>>(
-		new Map(),
-	);
 
 	useEffect(() => {
 		if (!isMonacoReady) return;
@@ -117,163 +110,6 @@ export function DiffViewer({
 	const changeListenerRef = useRef<Monaco.IDisposable | null>(null);
 	const diffUpdateListenerRef = useRef<Monaco.IDisposable | null>(null);
 
-	const updateGlyphDecorations = useCallback(
-		(
-			editor: Monaco.editor.IStandaloneDiffEditor,
-			modifiedEditor: Monaco.editor.IStandaloneCodeEditor,
-		) => {
-			const lineChanges = editor.getLineChanges();
-			if (!lineChanges) return;
-
-			lineChangesMapRef.current.clear();
-
-			const decorations: Monaco.editor.IModelDeltaDecoration[] = [];
-
-			for (const change of lineChanges) {
-				const startLine =
-					change.modifiedStartLineNumber > 0
-						? change.modifiedStartLineNumber
-						: change.modifiedEndLineNumber;
-
-				if (startLine > 0) {
-					lineChangesMapRef.current.set(startLine, change);
-					decorations.push({
-						range: {
-							startLineNumber: startLine,
-							startColumn: 1,
-							endLineNumber: startLine,
-							endColumn: 1,
-						},
-						options: {
-							glyphMarginClassName: REVERT_GLYPH_CLASS,
-							glyphMarginHoverMessage: { value: "Revert this change" },
-						},
-					});
-				}
-			}
-
-			glyphDecorationsRef.current = modifiedEditor.deltaDecorations(
-				glyphDecorationsRef.current,
-				decorations,
-			);
-		},
-		[],
-	);
-
-	const handleGlyphClick = useCallback(
-		(
-			e: Monaco.editor.IEditorMouseEvent,
-			diffEditor: Monaco.editor.IStandaloneDiffEditor,
-		) => {
-			if (e.target.type !== 2) return; // 2 = GUTTER_GLYPH_MARGIN
-
-			const lineNumber = e.target.position?.lineNumber;
-			if (!lineNumber) return;
-
-			const lineChange = lineChangesMapRef.current.get(lineNumber);
-			if (!lineChange) return;
-
-			// Use Monaco's internal revert method if available
-			const editorAny = diffEditor as unknown as {
-				revert?: (diff: unknown) => void;
-			};
-			if (typeof editorAny.revert === "function") {
-				// Try to find the LineRangeMapping for this change
-				const diffState = (
-					diffEditor as unknown as {
-						_diffModel?: {
-							get?: () => {
-								diff?: {
-									get?: () => {
-										mappings?: Array<{ lineRangeMapping: unknown }>;
-									};
-								};
-							};
-						};
-					}
-				)._diffModel
-					?.get?.()
-					?.diff?.get?.();
-				if (diffState?.mappings) {
-					const mapping = diffState.mappings.find((m) => {
-						const modified = (
-							m.lineRangeMapping as { modified?: { startLineNumber?: number } }
-						).modified;
-						return (
-							modified?.startLineNumber ===
-								lineChange.modifiedStartLineNumber ||
-							(lineChange.modifiedStartLineNumber === 0 &&
-								modified?.startLineNumber ===
-									lineChange.modifiedEndLineNumber + 1)
-						);
-					});
-					if (mapping) {
-						editorAny.revert(mapping.lineRangeMapping);
-						return;
-					}
-				}
-			}
-
-			// Fallback: replicate Monaco's revert behavior using executeEdits with undo stops
-			const originalModel = diffEditor.getOriginalEditor().getModel();
-			const modifiedEditor = diffEditor.getModifiedEditor();
-			const modifiedModel = modifiedEditor.getModel();
-			if (!originalModel || !modifiedModel) return;
-
-			// Get the original content for this change
-			let originalContent = "";
-			if (
-				lineChange.originalStartLineNumber > 0 &&
-				lineChange.originalEndLineNumber >= lineChange.originalStartLineNumber
-			) {
-				originalContent = originalModel.getValueInRange({
-					startLineNumber: lineChange.originalStartLineNumber,
-					startColumn: 1,
-					endLineNumber: lineChange.originalEndLineNumber,
-					endColumn: originalModel.getLineMaxColumn(
-						lineChange.originalEndLineNumber,
-					),
-				});
-			}
-
-			// Determine the range to replace in the modified model
-			const modifiedStartLine = lineChange.modifiedStartLineNumber;
-			const modifiedEndLine = lineChange.modifiedEndLineNumber;
-
-			let replaceRange: Monaco.IRange;
-			if (modifiedStartLine === 0 || modifiedEndLine < modifiedStartLine) {
-				// This is a pure deletion in modified (content was added in original)
-				// Insert after the previous line
-				const insertLine = modifiedEndLine > 0 ? modifiedEndLine : 1;
-				const insertColumn = modifiedModel.getLineMaxColumn(insertLine);
-				replaceRange = {
-					startLineNumber: insertLine,
-					startColumn: insertColumn,
-					endLineNumber: insertLine,
-					endColumn: insertColumn,
-				};
-				// Prepend newline since we're inserting
-				originalContent = `\n${originalContent}`;
-			} else {
-				// Replace the modified range with original content
-				replaceRange = {
-					startLineNumber: modifiedStartLine,
-					startColumn: 1,
-					endLineNumber: modifiedEndLine,
-					endColumn: modifiedModel.getLineMaxColumn(modifiedEndLine),
-				};
-			}
-
-			// Apply the edit using Monaco's pattern: pushUndoStop, executeEdits, pushUndoStop
-			modifiedEditor.pushUndoStop();
-			modifiedEditor.executeEdits("diffEditor", [
-				{ range: replaceRange, text: originalContent },
-			]);
-			modifiedEditor.pushUndoStop();
-		},
-		[],
-	);
-
 	const handleMount: DiffOnMount = useCallback(
 		(editor) => {
 			diffEditorRef.current = editor;
@@ -284,20 +120,12 @@ export function DiffViewer({
 			registerCopyPathLineAction(originalEditor, filePath);
 			registerCopyPathLineAction(modifiedEditor, filePath);
 
-			// Set up glyph margin click handler for revert
-			mouseDownListenerRef.current?.dispose();
-			mouseDownListenerRef.current = modifiedEditor.onMouseDown((e) => {
-				handleGlyphClick(e, editor);
-			});
-
 			diffUpdateListenerRef.current?.dispose();
 			diffUpdateListenerRef.current = editor.onDidUpdateDiff(() => {
 				if (!hasScrolledToFirstDiffRef.current) {
 					scrollToFirstDiff(editor, modifiedEditor);
 					hasScrolledToFirstDiffRef.current = true;
 				}
-				// Update glyph decorations when diff changes
-				updateGlyphDecorations(editor, modifiedEditor);
 			});
 
 			if (fitContent) {
@@ -322,15 +150,13 @@ export function DiffViewer({
 
 			setIsEditorMounted(true);
 		},
-		[filePath, fitContent, handleGlyphClick, updateGlyphDecorations],
+		[filePath, fitContent],
 	);
 
 	useEffect(() => {
 		return () => {
 			diffUpdateListenerRef.current?.dispose();
 			diffUpdateListenerRef.current = null;
-			mouseDownListenerRef.current?.dispose();
-			mouseDownListenerRef.current = null;
 			contentSizeListenersRef.current.forEach((d) => {
 				d.dispose();
 			});
@@ -449,7 +275,7 @@ export function DiffViewer({
 				readOnly: !editable,
 				originalEditable: false,
 				renderOverviewRuler: !fitContent,
-				glyphMargin: true,
+				renderGutterMenu: false,
 				diffWordWrap: "on",
 				contextmenu: !contextMenuProps, // Disable Monaco's context menu if we have custom props
 				hideUnchangedRegions: {

From 6852910666756a2fffe0697e44e8db3964ac9ba3 Mon Sep 17 00:00:00 2001
From: Kiet Ho <hoakiet98@gmail.com>
Date: Wed, 21 Jan 2026 10:18:20 -0800
Subject: [PATCH 4/4] Add back glyph

---
 .../ChangesContent/components/DiffViewer/DiffViewer.tsx         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ChangesContent/components/DiffViewer/DiffViewer.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ChangesContent/components/DiffViewer/DiffViewer.tsx
index 2394e6d6b5a..9b7974525cd 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ChangesContent/components/DiffViewer/DiffViewer.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ChangesContent/components/DiffViewer/DiffViewer.tsx
@@ -275,7 +275,7 @@ export function DiffViewer({
 				readOnly: !editable,
 				originalEditable: false,
 				renderOverviewRuler: !fitContent,
-				renderGutterMenu: false,
+				glyphMargin: false,
 				diffWordWrap: "on",
 				contextmenu: !contextMenuProps, // Disable Monaco's context menu if we have custom props
 				hideUnchangedRegions: {