From 63c7c7c2307d6d297a98e7f32eacf5d4aa5994fc Mon Sep 17 00:00:00 2001
From: Will Li <willeli2002@gmail.com>
Date: Fri, 11 Jul 2025 15:56:33 -0700
Subject: [PATCH] some merge fixes

---
 src/core/webview/__tests__/webviewMessageHandler.spec.ts | 2 ++
 src/core/webview/webviewMessageHandler.ts                | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/core/webview/__tests__/webviewMessageHandler.spec.ts b/src/core/webview/__tests__/webviewMessageHandler.spec.ts
index 284ee98944..776ee2647b 100644
--- a/src/core/webview/__tests__/webviewMessageHandler.spec.ts
+++ b/src/core/webview/__tests__/webviewMessageHandler.spec.ts
@@ -530,6 +530,8 @@ describe("webviewMessageHandler - message dialog preferences", () => {
 				type: "showEditMessageDialog",
 				messageTs: 123456789,
 				text: "edited content",
+				hasCheckpoint: false,
+				images: undefined,
 			})
 		})
 	})
diff --git a/src/core/webview/webviewMessageHandler.ts b/src/core/webview/webviewMessageHandler.ts
index 8459321b3d..62e5e27fc8 100644
--- a/src/core/webview/webviewMessageHandler.ts
+++ b/src/core/webview/webviewMessageHandler.ts
@@ -189,7 +189,7 @@ export const webviewMessageHandler = async (
 	/**
 	 * Handles message editing operations with user confirmation
 	 */
-	const handleEditOperation = async (messageTs: number, editedContent: string): Promise<void> => {
+	const handleEditOperation = async (messageTs: number, editedContent: string, images?: string[]): Promise<void> => {
 		// Always check if the message has a checkpoint first
 		const currentCline = provider.getCurrentCline()
 		let hasCheckpoint = false
@@ -232,6 +232,7 @@ export const webviewMessageHandler = async (
 				messageTs,
 				text: editedContent,
 				hasCheckpoint,
+				images,
 			})
 		} else {
 			// Send message to webview to show edit confirmation dialog
@@ -240,6 +241,7 @@ export const webviewMessageHandler = async (
 				messageTs,
 				text: editedContent,
 				hasCheckpoint,
+				images,
 			})
 		}
 	}