From ff8c188d3af703c1a23c8755b7e3e2dbda6156df Mon Sep 17 00:00:00 2001
From: Will Li <willeli2002@gmail.com>
Date: Wed, 9 Jul 2025 09:00:43 -0700
Subject: [PATCH 01/14] improved chat row first pass

---
 webview-ui/src/components/chat/ChatRow.tsx | 47 +++++++++++++++++-----
 webview-ui/src/i18n/locales/en/chat.json   |  3 ++
 2 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/webview-ui/src/components/chat/ChatRow.tsx b/webview-ui/src/components/chat/ChatRow.tsx
index 4fd7977fc2..d43db0c794 100644
--- a/webview-ui/src/components/chat/ChatRow.tsx
+++ b/webview-ui/src/components/chat/ChatRow.tsx
@@ -6,6 +6,7 @@ import deepEqual from "fast-deep-equal"
 import { VSCodeBadge, VSCodeButton } from "@vscode/webview-ui-toolkit/react"
 
 import type { ClineMessage } from "@roo-code/types"
+import { Mode } from "@roo/modes"
 
 import { ClineApiReqInfo, ClineAskUseMcpServer, ClineSayTool } from "@roo/ExtensionMessage"
 import { COMMAND_OUTPUT_STRING } from "@roo/combineCommandSequences"
@@ -20,6 +21,8 @@ import { removeLeadingNonAlphanumeric } from "@src/utils/removeLeadingNonAlphanu
 import { getLanguageFromPath } from "@src/utils/getLanguageFromPath"
 import { Button } from "@src/components/ui"
 
+import ChatTextArea from "./ChatTextArea"
+
 import { ToolUseBlock, ToolUseBlockHeader } from "../common/ToolUseBlock"
 import UpdateTodoListToolBlock from "./UpdateTodoListToolBlock"
 import CodeAccordian from "../common/CodeAccordian"
@@ -109,12 +112,14 @@ export const ChatRowContent = ({
 	editable,
 }: ChatRowContentProps) => {
 	const { t } = useTranslation()
-	const { mcpServers, alwaysAllowMcp, currentCheckpoint } = useExtensionState()
+	const { mcpServers, alwaysAllowMcp, currentCheckpoint, mode } = useExtensionState()
 	const [reasoningCollapsed, setReasoningCollapsed] = useState(true)
 	const [isDiffErrorExpanded, setIsDiffErrorExpanded] = useState(false)
 	const [showCopySuccess, setShowCopySuccess] = useState(false)
 	const [isEditing, setIsEditing] = useState(false)
 	const [editedContent, setEditedContent] = useState("")
+	const [editMode, setEditMode] = useState<Mode>(mode || "code")
+	const [editImages, setEditImages] = useState<string[]>([])
 	const { copyWithFeedback } = useCopyToClipboard()
 
 	// Memoized callback to prevent re-renders caused by inline arrow functions
@@ -126,15 +131,19 @@ export const ChatRowContent = ({
 	const handleEditClick = useCallback(() => {
 		setIsEditing(true)
 		setEditedContent(message.text || "")
+		setEditImages(message.images || [])
+		setEditMode(mode || "code")
 		// Edit mode is now handled entirely in the frontend
 		// No need to notify the backend
-	}, [message.text])
+	}, [message.text, message.images, mode])
 
 	// Handle cancel edit
 	const handleCancelEdit = useCallback(() => {
 		setIsEditing(false)
 		setEditedContent(message.text || "")
-	}, [message.text])
+		setEditImages(message.images || [])
+		setEditMode(mode || "code")
+	}, [message.text, message.images, mode])
 
 	// Handle save edit
 	const handleSaveEdit = useCallback(() => {
@@ -147,6 +156,16 @@ export const ChatRowContent = ({
 		})
 	}, [message.ts, editedContent])
 
+	// Handle sending edited message (when Enter is pressed in ChatTextArea)
+	const handleSendEdit = useCallback(() => {
+		handleSaveEdit()
+	}, [handleSaveEdit])
+
+	// Handle image selection for editing
+	const handleSelectImages = useCallback(() => {
+		vscode.postMessage({ type: "selectImages" })
+	}, [])
+
 	const [cost, apiReqCancelReason, apiReqStreamingFailedMessage] = useMemo(() => {
 		if (message.text !== null && message.text !== undefined && message.say === "api_req_started") {
 			const info = safeJsonParse<ClineApiReqInfo>(message.text)
@@ -1032,12 +1051,20 @@ export const ChatRowContent = ({
 						<div className="bg-vscode-editor-background border rounded-xs p-1 overflow-hidden whitespace-pre-wrap">
 							{isEditing ? (
 								<div className="flex flex-col gap-2 p-2">
-									<textarea
-										className="w-full p-2 bg-vscode-input-background text-vscode-input-foreground border border-vscode-input-border rounded-xs"
-										value={editedContent}
-										onChange={(e) => setEditedContent(e.target.value)}
-										rows={5}
-										autoFocus
+									<ChatTextArea
+										inputValue={editedContent}
+										setInputValue={setEditedContent}
+										sendingDisabled={false}
+										selectApiConfigDisabled={true}
+										placeholderText={t("chat:editMessage.placeholder")}
+										selectedImages={editImages}
+										setSelectedImages={setEditImages}
+										onSend={handleSendEdit}
+										onSelectImages={handleSelectImages}
+										shouldDisableImages={false}
+										mode={editMode}
+										setMode={setEditMode}
+										modeShortcutText=""
 									/>
 									<div className="flex justify-end gap-2">
 										<Button variant="secondary" size="sm" onClick={handleCancelEdit}>
@@ -1057,7 +1084,7 @@ export const ChatRowContent = ({
 										<Button
 											variant="ghost"
 											size="icon"
-											className="shrink-0 hidden"
+											className="shrink-0"
 											disabled={isStreaming}
 											onClick={(e) => {
 												e.stopPropagation()
diff --git a/webview-ui/src/i18n/locales/en/chat.json b/webview-ui/src/i18n/locales/en/chat.json
index 0c49fbaac7..0c4a430576 100644
--- a/webview-ui/src/i18n/locales/en/chat.json
+++ b/webview-ui/src/i18n/locales/en/chat.json
@@ -87,6 +87,9 @@
 		"title": "Cancel",
 		"tooltip": "Cancel the current operation"
 	},
+	"editMessage": {
+		"placeholder": "Edit your message..."
+	},
 	"scrollToBottom": "Scroll to bottom of chat",
 	"about": "Generate, refactor, and debug code with AI assistance. Check out our <DocsLink>documentation</DocsLink> to learn more.",
 	"onboarding": "Your task list in this workspace is empty.",

From d926a771bc7648b8677391762f19af5508f760dc Mon Sep 17 00:00:00 2001
From: Will Li <willeli2002@gmail.com>
Date: Wed, 9 Jul 2025 13:02:18 -0700
Subject: [PATCH 02/14] big UI improvements

---
 webview-ui/src/components/chat/ChatRow.tsx    |  17 +-
 .../src/components/chat/ChatTextArea.tsx      |  45 +++-
 .../chat/__tests__/ChatTextArea.spec.tsx      | 206 ++++++++++++++++++
 3 files changed, 245 insertions(+), 23 deletions(-)

diff --git a/webview-ui/src/components/chat/ChatRow.tsx b/webview-ui/src/components/chat/ChatRow.tsx
index d43db0c794..60786945df 100644
--- a/webview-ui/src/components/chat/ChatRow.tsx
+++ b/webview-ui/src/components/chat/ChatRow.tsx
@@ -156,11 +156,6 @@ export const ChatRowContent = ({
 		})
 	}, [message.ts, editedContent])
 
-	// Handle sending edited message (when Enter is pressed in ChatTextArea)
-	const handleSendEdit = useCallback(() => {
-		handleSaveEdit()
-	}, [handleSaveEdit])
-
 	// Handle image selection for editing
 	const handleSelectImages = useCallback(() => {
 		vscode.postMessage({ type: "selectImages" })
@@ -1059,21 +1054,15 @@ export const ChatRowContent = ({
 										placeholderText={t("chat:editMessage.placeholder")}
 										selectedImages={editImages}
 										setSelectedImages={setEditImages}
-										onSend={handleSendEdit}
+										onSend={handleSaveEdit}
 										onSelectImages={handleSelectImages}
 										shouldDisableImages={false}
 										mode={editMode}
 										setMode={setEditMode}
 										modeShortcutText=""
+										isEditMode={true}
+										onCancel={handleCancelEdit}
 									/>
-									<div className="flex justify-end gap-2">
-										<Button variant="secondary" size="sm" onClick={handleCancelEdit}>
-											{t("chat:cancel.title")}
-										</Button>
-										<Button variant="default" size="sm" onClick={handleSaveEdit}>
-											{t("chat:save.title")}
-										</Button>
-									</div>
 								</div>
 							) : (
 								<div className="flex justify-between">
diff --git a/webview-ui/src/components/chat/ChatTextArea.tsx b/webview-ui/src/components/chat/ChatTextArea.tsx
index b522b43ecc..b12e9b1961 100644
--- a/webview-ui/src/components/chat/ChatTextArea.tsx
+++ b/webview-ui/src/components/chat/ChatTextArea.tsx
@@ -46,6 +46,9 @@ interface ChatTextAreaProps {
 	mode: Mode
 	setMode: (value: Mode) => void
 	modeShortcutText: string
+	// Edit mode props
+	isEditMode?: boolean
+	onCancel?: () => void
 }
 
 const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
@@ -65,6 +68,8 @@ const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
 			mode,
 			setMode,
 			modeShortcutText,
+			isEditMode = false,
+			onCancel,
 		},
 		ref,
 	) => {
@@ -972,15 +977,27 @@ const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
 								/>
 							</div>
 
-							<div className="absolute bottom-1 right-1 z-30">
-								<IconButton
-									iconClass="codicon-send"
-									title={t("chat:sendMessage")}
-									disabled={sendingDisabled}
-									onClick={onSend}
-									className="opacity-60 hover:opacity-100 text-vscode-descriptionForeground hover:text-vscode-foreground"
-								/>
-							</div>
+							{isEditMode ? (
+								<div className="absolute bottom-1 right-1 z-30">
+									<IconButton
+										iconClass="codicon-edit"
+										title={t("chat:save")}
+										disabled={sendingDisabled}
+										onClick={onSend}
+										className="opacity-60 hover:opacity-100 text-vscode-descriptionForeground hover:text-vscode-foreground"
+									/>
+								</div>
+							) : (
+								<div className="absolute bottom-1 right-1 z-30">
+									<IconButton
+										iconClass="codicon-send"
+										title={t("chat:sendMessage")}
+										disabled={sendingDisabled}
+										onClick={onSend}
+										className="opacity-60 hover:opacity-100 text-vscode-descriptionForeground hover:text-vscode-foreground"
+									/>
+								</div>
+							)}
 
 							{!inputValue && (
 								<div
@@ -1145,6 +1162,16 @@ const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
 					</div>
 
 					<div className={cn("flex", "items-center", "gap-0.5", "shrink-0")}>
+						{isEditMode && (
+							<Button
+								variant="secondary"
+								size="sm"
+								onClick={onCancel}
+								disabled={sendingDisabled}
+								className="mr-2 text-xs">
+								Cancel
+							</Button>
+						)}
 						<IndexingStatusDot />
 						<IconButton
 							iconClass="codicon-device-camera"
diff --git a/webview-ui/src/components/chat/__tests__/ChatTextArea.spec.tsx b/webview-ui/src/components/chat/__tests__/ChatTextArea.spec.tsx
index 86e200f0a3..d4069c30fe 100644
--- a/webview-ui/src/components/chat/__tests__/ChatTextArea.spec.tsx
+++ b/webview-ui/src/components/chat/__tests__/ChatTextArea.spec.tsx
@@ -856,4 +856,210 @@ describe("ChatTextArea", () => {
 			expect(apiConfigDropdown).toHaveAttribute("disabled")
 		})
 	})
+	describe("edit mode functionality", () => {
+		it("should show edit button instead of send button when isEditMode is true", () => {
+			;(useExtensionState as ReturnType<typeof vi.fn>).mockReturnValue({
+				filePaths: [],
+				openedTabs: [],
+				taskHistory: [],
+				cwd: "/test/workspace",
+			})
+
+			render(<ChatTextArea {...defaultProps} isEditMode={true} />)
+
+			// Should show edit button (codicon-edit)
+			const editButton = screen.getByRole("button", {
+				name: (_, element) => {
+					return element.querySelector(".codicon-edit") !== null
+				},
+			})
+			expect(editButton).toBeInTheDocument()
+
+			// Should not show send button (codicon-send)
+			const sendButton = screen.queryByRole("button", {
+				name: (_, element) => {
+					return element.querySelector(".codicon-send") !== null
+				},
+			})
+			expect(sendButton).not.toBeInTheDocument()
+		})
+
+		it("should show send button when isEditMode is false", () => {
+			;(useExtensionState as ReturnType<typeof vi.fn>).mockReturnValue({
+				filePaths: [],
+				openedTabs: [],
+				taskHistory: [],
+				cwd: "/test/workspace",
+			})
+
+			render(<ChatTextArea {...defaultProps} isEditMode={false} />)
+
+			// Should show send button (codicon-send)
+			const sendButton = screen.getByRole("button", {
+				name: (_, element) => {
+					return element.querySelector(".codicon-send") !== null
+				},
+			})
+			expect(sendButton).toBeInTheDocument()
+
+			// Should not show edit button (codicon-edit)
+			const editButton = screen.queryByRole("button", {
+				name: (_, element) => {
+					return element.querySelector(".codicon-edit") !== null
+				},
+			})
+			expect(editButton).not.toBeInTheDocument()
+		})
+
+		it("should show cancel button in edit mode", () => {
+			;(useExtensionState as ReturnType<typeof vi.fn>).mockReturnValue({
+				filePaths: [],
+				openedTabs: [],
+				taskHistory: [],
+				cwd: "/test/workspace",
+			})
+
+			render(<ChatTextArea {...defaultProps} isEditMode={true} />)
+
+			// Should show cancel button with text "Cancel"
+			const cancelButton = screen.getByRole("button", { name: /cancel/i })
+			expect(cancelButton).toBeInTheDocument()
+			expect(cancelButton).toHaveTextContent("Cancel")
+		})
+
+		it("should not show cancel button when not in edit mode", () => {
+			;(useExtensionState as ReturnType<typeof vi.fn>).mockReturnValue({
+				filePaths: [],
+				openedTabs: [],
+				taskHistory: [],
+				cwd: "/test/workspace",
+			})
+
+			render(<ChatTextArea {...defaultProps} isEditMode={false} />)
+
+			// Should not show cancel button
+			const cancelButton = screen.queryByRole("button", { name: /cancel/i })
+			expect(cancelButton).not.toBeInTheDocument()
+		})
+
+		it("should call onSend when edit button is clicked", () => {
+			const onSend = vi.fn()
+			;(useExtensionState as ReturnType<typeof vi.fn>).mockReturnValue({
+				filePaths: [],
+				openedTabs: [],
+				taskHistory: [],
+				cwd: "/test/workspace",
+			})
+
+			render(<ChatTextArea {...defaultProps} isEditMode={true} onSend={onSend} />)
+
+			const editButton = screen.getByRole("button", {
+				name: (_, element) => {
+					return element.querySelector(".codicon-edit") !== null
+				},
+			})
+
+			fireEvent.click(editButton)
+			expect(onSend).toHaveBeenCalledTimes(1)
+		})
+
+		it("should call onCancel when cancel button is clicked", () => {
+			const onCancel = vi.fn()
+			;(useExtensionState as ReturnType<typeof vi.fn>).mockReturnValue({
+				filePaths: [],
+				openedTabs: [],
+				taskHistory: [],
+				cwd: "/test/workspace",
+			})
+
+			render(<ChatTextArea {...defaultProps} isEditMode={true} onCancel={onCancel} />)
+
+			const cancelButton = screen.getByRole("button", { name: /cancel/i })
+
+			fireEvent.click(cancelButton)
+			expect(onCancel).toHaveBeenCalledTimes(1)
+		})
+
+		it("should disable edit button when sendingDisabled is true", () => {
+			;(useExtensionState as ReturnType<typeof vi.fn>).mockReturnValue({
+				filePaths: [],
+				openedTabs: [],
+				taskHistory: [],
+				cwd: "/test/workspace",
+			})
+
+			render(<ChatTextArea {...defaultProps} isEditMode={true} sendingDisabled={true} />)
+
+			const editButton = screen.getByRole("button", {
+				name: (_, element) => {
+					return element.querySelector(".codicon-edit") !== null
+				},
+			})
+
+			expect(editButton).toBeDisabled()
+		})
+
+		it("should disable cancel button when sendingDisabled is true", () => {
+			;(useExtensionState as ReturnType<typeof vi.fn>).mockReturnValue({
+				filePaths: [],
+				openedTabs: [],
+				taskHistory: [],
+				cwd: "/test/workspace",
+			})
+
+			render(<ChatTextArea {...defaultProps} isEditMode={true} sendingDisabled={true} />)
+
+			const cancelButton = screen.getByRole("button", { name: /cancel/i })
+			expect(cancelButton).toBeDisabled()
+		})
+
+		it("should have correct tooltip for edit button", () => {
+			;(useExtensionState as ReturnType<typeof vi.fn>).mockReturnValue({
+				filePaths: [],
+				openedTabs: [],
+				taskHistory: [],
+				cwd: "/test/workspace",
+			})
+
+			render(<ChatTextArea {...defaultProps} isEditMode={true} />)
+
+			const editButton = screen.getByRole("button", {
+				name: (_, element) => {
+					return element.querySelector(".codicon-edit") !== null
+				},
+			})
+
+			// Check that the button has the correct aria-label (which is used for tooltip)
+			expect(editButton).toHaveAttribute("aria-label", expect.stringMatching(/save/i))
+		})
+
+		it("should position cancel button correctly relative to camera button", () => {
+			;(useExtensionState as ReturnType<typeof vi.fn>).mockReturnValue({
+				filePaths: [],
+				openedTabs: [],
+				taskHistory: [],
+				cwd: "/test/workspace",
+			})
+
+			const { container } = render(<ChatTextArea {...defaultProps} isEditMode={true} />)
+
+			const cancelButton = screen.getByRole("button", { name: /cancel/i })
+			const cameraButton = screen.getByRole("button", {
+				name: (_, element) => {
+					return element.querySelector(".codicon-device-camera") !== null
+				},
+			})
+
+			// Both buttons should be in the same container (bottom toolbar)
+			const bottomToolbar = container.querySelector(".flex.items-center.gap-0\\.5.shrink-0")
+			expect(bottomToolbar).toContainElement(cancelButton)
+			expect(bottomToolbar).toContainElement(cameraButton)
+
+			// Cancel button should come before camera button in DOM order
+			const buttons = bottomToolbar?.querySelectorAll("button")
+			const cancelIndex = Array.from(buttons || []).indexOf(cancelButton as HTMLButtonElement)
+			const cameraIndex = Array.from(buttons || []).indexOf(cameraButton as HTMLButtonElement)
+			expect(cancelIndex).toBeLessThan(cameraIndex)
+		})
+	})
 })

From 24a8c10048bffed290c5cd836c4feaa17603e8ff Mon Sep 17 00:00:00 2001
From: Will Li <willeli2002@gmail.com>
Date: Wed, 9 Jul 2025 15:32:50 -0700
Subject: [PATCH 03/14] working functionality

---
 packages/types/src/global-settings.ts         |   4 +
 .../__tests__/webviewMessageHandler.spec.ts   | 152 ++++++++++++++++++
 src/core/webview/webviewMessageHandler.ts     | 137 +++++++---------
 src/i18n/locales/en/common.json               |   7 +-
 src/shared/ExtensionMessage.ts                |   5 +
 src/shared/WebviewMessage.ts                  |   5 +
 webview-ui/src/App.tsx                        |  91 ++++++++++-
 .../src/components/chat/ChatTextArea.tsx      |   2 +-
 .../MessageModificationConfirmationDialog.tsx |  88 ++++++++++
 .../src/context/ExtensionStateContext.tsx     |  14 ++
 webview-ui/src/i18n/locales/en/common.json    |   8 +
 11 files changed, 429 insertions(+), 84 deletions(-)
 create mode 100644 webview-ui/src/components/chat/MessageModificationConfirmationDialog.tsx

diff --git a/packages/types/src/global-settings.ts b/packages/types/src/global-settings.ts
index 79a09ff017..2bff4cfb9a 100644
--- a/packages/types/src/global-settings.ts
+++ b/packages/types/src/global-settings.ts
@@ -110,6 +110,10 @@ export const globalSettingsSchema = z.object({
 	hasOpenedModeSelector: z.boolean().optional(),
 	lastModeExportPath: z.string().optional(),
 	lastModeImportPath: z.string().optional(),
+
+	// Message modification confirmation preferences
+	skipEditMessageConfirmation: z.boolean().optional(),
+	skipDeleteMessageConfirmation: z.boolean().optional(),
 })
 
 export type GlobalSettings = z.infer<typeof globalSettingsSchema>
diff --git a/src/core/webview/__tests__/webviewMessageHandler.spec.ts b/src/core/webview/__tests__/webviewMessageHandler.spec.ts
index 2f356aef55..ed23e4c80e 100644
--- a/src/core/webview/__tests__/webviewMessageHandler.spec.ts
+++ b/src/core/webview/__tests__/webviewMessageHandler.spec.ts
@@ -28,9 +28,13 @@ const mockClineProvider = {
 			globalStorageUri: { fsPath: "/mock/global/storage" },
 		},
 		setValue: vi.fn(),
+		getValue: vi.fn(),
 	},
 	log: vi.fn(),
 	postStateToWebview: vi.fn(),
+	getCurrentCline: vi.fn(),
+	getTaskWithId: vi.fn(),
+	initClineWithHistoryItem: vi.fn(),
 } as unknown as ClineProvider
 
 import { t } from "../../../i18n"
@@ -482,3 +486,151 @@ describe("webviewMessageHandler - deleteCustomMode", () => {
 		expect(mockClineProvider.postMessageToWebview).not.toHaveBeenCalled()
 	})
 })
+
+describe("webviewMessageHandler - message dialog preferences", () => {
+	beforeEach(() => {
+		vi.clearAllMocks()
+		// Mock a current Cline instance
+		vi.mocked(mockClineProvider.getCurrentCline).mockReturnValue({
+			taskId: "test-task-id",
+			apiConversationHistory: [],
+			clineMessages: [],
+		} as any)
+		// Reset getValue mock
+		vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(false)
+	})
+
+	describe("skipEditMessageConfirmation", () => {
+		it("should save edit message confirmation preference when set to true", async () => {
+			await webviewMessageHandler(mockClineProvider, {
+				type: "skipEditMessageConfirmation",
+				bool: true,
+			})
+
+			expect(mockClineProvider.contextProxy.setValue).toHaveBeenCalledWith("skipEditMessageConfirmation", true)
+			expect(mockClineProvider.postStateToWebview).toHaveBeenCalled()
+		})
+
+		it("should save edit message confirmation preference when set to false", async () => {
+			await webviewMessageHandler(mockClineProvider, {
+				type: "skipEditMessageConfirmation",
+				bool: false,
+			})
+
+			expect(mockClineProvider.contextProxy.setValue).toHaveBeenCalledWith("skipEditMessageConfirmation", false)
+			expect(mockClineProvider.postStateToWebview).toHaveBeenCalled()
+		})
+
+		it("should default to false when bool is not provided", async () => {
+			await webviewMessageHandler(mockClineProvider, {
+				type: "skipEditMessageConfirmation",
+			})
+
+			expect(mockClineProvider.contextProxy.setValue).toHaveBeenCalledWith("skipEditMessageConfirmation", false)
+			expect(mockClineProvider.postStateToWebview).toHaveBeenCalled()
+		})
+	})
+
+	describe("skipDeleteMessageConfirmation", () => {
+		it("should save delete message confirmation preference when set to true", async () => {
+			await webviewMessageHandler(mockClineProvider, {
+				type: "skipDeleteMessageConfirmation",
+				bool: true,
+			})
+
+			expect(mockClineProvider.contextProxy.setValue).toHaveBeenCalledWith("skipDeleteMessageConfirmation", true)
+			expect(mockClineProvider.postStateToWebview).toHaveBeenCalled()
+		})
+
+		it("should save delete message confirmation preference when set to false", async () => {
+			await webviewMessageHandler(mockClineProvider, {
+				type: "skipDeleteMessageConfirmation",
+				bool: false,
+			})
+
+			expect(mockClineProvider.contextProxy.setValue).toHaveBeenCalledWith("skipDeleteMessageConfirmation", false)
+			expect(mockClineProvider.postStateToWebview).toHaveBeenCalled()
+		})
+
+		it("should default to false when bool is not provided", async () => {
+			await webviewMessageHandler(mockClineProvider, {
+				type: "skipDeleteMessageConfirmation",
+			})
+
+			expect(mockClineProvider.contextProxy.setValue).toHaveBeenCalledWith("skipDeleteMessageConfirmation", false)
+			expect(mockClineProvider.postStateToWebview).toHaveBeenCalled()
+		})
+	})
+
+	describe("deleteMessage", () => {
+		it("should show dialog when skipDeleteMessageConfirmation is false", async () => {
+			vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(false)
+
+			await webviewMessageHandler(mockClineProvider, {
+				type: "deleteMessage",
+				messageTs: 123456789,
+			})
+
+			expect(mockClineProvider.postMessageToWebview).toHaveBeenCalledWith({
+				type: "showDeleteMessageDialog",
+				messageTs: 123456789,
+			})
+		})
+
+		it("should skip dialog and directly delete when skipDeleteMessageConfirmation is true", async () => {
+			vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(true)
+
+			// Mock the necessary functions for deletion
+			vi.mocked(mockClineProvider.getTaskWithId).mockResolvedValue({
+				historyItem: { id: "test-history-id" },
+			} as any)
+
+			await webviewMessageHandler(mockClineProvider, {
+				type: "deleteMessage",
+				messageTs: 123456789,
+			})
+
+			// Should not show dialog
+			expect(mockClineProvider.postMessageToWebview).not.toHaveBeenCalledWith(
+				expect.objectContaining({
+					type: "showDeleteMessageDialog",
+				}),
+			)
+		})
+	})
+
+	describe("submitEditedMessage", () => {
+		it("should show dialog when skipEditMessageConfirmation is false", async () => {
+			vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(false)
+
+			await webviewMessageHandler(mockClineProvider, {
+				type: "submitEditedMessage",
+				messageTs: 123456789,
+				text: "edited content",
+			})
+
+			expect(mockClineProvider.postMessageToWebview).toHaveBeenCalledWith({
+				type: "showEditMessageDialog",
+				messageTs: 123456789,
+				text: "edited content",
+			})
+		})
+
+		it("should skip dialog and directly edit when skipEditMessageConfirmation is true", async () => {
+			vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(true)
+
+			await webviewMessageHandler(mockClineProvider, {
+				type: "submitEditedMessage",
+				messageTs: 123456789,
+				text: "edited content",
+			})
+
+			// Should not show dialog
+			expect(mockClineProvider.postMessageToWebview).not.toHaveBeenCalledWith(
+				expect.objectContaining({
+					type: "showEditMessageDialog",
+				}),
+			)
+		})
+	})
+})
diff --git a/src/core/webview/webviewMessageHandler.ts b/src/core/webview/webviewMessageHandler.ts
index a6577fb2fb..b19951e154 100644
--- a/src/core/webview/webviewMessageHandler.ts
+++ b/src/core/webview/webviewMessageHandler.ts
@@ -77,55 +77,6 @@ export const webviewMessageHandler = async (
 		return { messageIndex, apiConversationHistoryIndex }
 	}
 
-	/**
-	 * Removes just the target message, preserving messages after the next user message
-	 */
-	const removeMessagesJustThis = async (
-		currentCline: any,
-		messageIndex: number,
-		apiConversationHistoryIndex: number,
-	) => {
-		// Find the next user message first
-		const nextUserMessage = currentCline.clineMessages
-			.slice(messageIndex + 1)
-			.find((msg: ClineMessage) => msg.type === "say" && msg.say === "user_feedback")
-
-		// Handle UI messages
-		if (nextUserMessage) {
-			// Find absolute index of next user message
-			const nextUserMessageIndex = currentCline.clineMessages.findIndex(
-				(msg: ClineMessage) => msg === nextUserMessage,
-			)
-
-			// Keep messages before current message and after next user message
-			await currentCline.overwriteClineMessages([
-				...currentCline.clineMessages.slice(0, messageIndex),
-				...currentCline.clineMessages.slice(nextUserMessageIndex),
-			])
-		} else {
-			// If no next user message, keep only messages before current message
-			await currentCline.overwriteClineMessages(currentCline.clineMessages.slice(0, messageIndex))
-		}
-
-		// Handle API messages
-		if (apiConversationHistoryIndex !== -1) {
-			if (nextUserMessage && nextUserMessage.ts) {
-				// Keep messages before current API message and after next user message
-				await currentCline.overwriteApiConversationHistory([
-					...currentCline.apiConversationHistory.slice(0, apiConversationHistoryIndex),
-					...currentCline.apiConversationHistory.filter(
-						(msg: ApiMessage) => msg.ts && msg.ts >= nextUserMessage.ts,
-					),
-				])
-			} else {
-				// If no next user message, keep only messages before current API message
-				await currentCline.overwriteApiConversationHistory(
-					currentCline.apiConversationHistory.slice(0, apiConversationHistoryIndex),
-				)
-			}
-		}
-	}
-
 	/**
 	 * Removes the target message and all subsequent messages
 	 */
@@ -148,19 +99,27 @@ export const webviewMessageHandler = async (
 	 * Handles message deletion operations with user confirmation
 	 */
 	const handleDeleteOperation = async (messageTs: number): Promise<void> => {
-		const options = [
-			t("common:confirmation.delete_just_this_message"),
-			t("common:confirmation.delete_this_and_subsequent"),
-		]
-
-		const answer = await vscode.window.showInformationMessage(
-			t("common:confirmation.delete_message"),
-			{ modal: true },
-			...options,
-		)
+		// Check if user has opted to skip the confirmation
+		const skipDeleteMessageConfirmation = getGlobalState("skipDeleteMessageConfirmation")
 
-		// Only proceed if user selected one of the options and we have a current cline
-		if (answer && options.includes(answer) && provider.getCurrentCline()) {
+		if (skipDeleteMessageConfirmation) {
+			// Directly handle the deletion without showing dialog
+			await handleDeleteMessageConfirm(messageTs)
+		} else {
+			// Send message to webview to show delete confirmation dialog
+			await provider.postMessageToWebview({
+				type: "showDeleteMessageDialog",
+				messageTs,
+			})
+		}
+	}
+
+	/**
+	 * Handles confirmed message deletion from webview dialog
+	 */
+	const handleDeleteMessageConfirm = async (messageTs: number): Promise<void> => {
+		// Only proceed if we have a current cline
+		if (provider.getCurrentCline()) {
 			const currentCline = provider.getCurrentCline()!
 			const { messageIndex, apiConversationHistoryIndex } = findMessageIndices(messageTs, currentCline)
 
@@ -168,14 +127,8 @@ export const webviewMessageHandler = async (
 				try {
 					const { historyItem } = await provider.getTaskWithId(currentCline.taskId)
 
-					// Check which option the user selected
-					if (answer === options[0]) {
-						// Delete just this message
-						await removeMessagesJustThis(currentCline, messageIndex, apiConversationHistoryIndex)
-					} else if (answer === options[1]) {
-						// Delete this message and all subsequent
-						await removeMessagesThisAndSubsequent(currentCline, messageIndex, apiConversationHistoryIndex)
-					}
+					// Delete this message and all subsequent messages
+					await removeMessagesThisAndSubsequent(currentCline, messageIndex, apiConversationHistoryIndex)
 
 					// Initialize with history item after deletion
 					await provider.initClineWithHistoryItem(historyItem)
@@ -193,14 +146,28 @@ export const webviewMessageHandler = async (
 	 * Handles message editing operations with user confirmation
 	 */
 	const handleEditOperation = async (messageTs: number, editedContent: string): Promise<void> => {
-		const answer = await vscode.window.showWarningMessage(
-			t("common:confirmation.edit_warning"),
-			{ modal: true },
-			t("common:confirmation.proceed"),
-		)
+		// Check if user has opted to skip the confirmation
+		const skipEditMessageConfirmation = getGlobalState("skipEditMessageConfirmation")
+
+		if (skipEditMessageConfirmation) {
+			// Directly handle the edit without showing dialog
+			await handleEditMessageConfirm(messageTs, editedContent)
+		} else {
+			// Send message to webview to show edit confirmation dialog
+			await provider.postMessageToWebview({
+				type: "showEditMessageDialog",
+				messageTs,
+				text: editedContent,
+			})
+		}
+	}
 
-		// Only proceed if user selected "Proceed" and we have a current cline
-		if (answer === t("common:confirmation.proceed") && provider.getCurrentCline()) {
+	/**
+	 * Handles confirmed message editing from webview dialog
+	 */
+	const handleEditMessageConfirm = async (messageTs: number, editedContent: string): Promise<void> => {
+		// Only proceed if we have a current cline
+		if (provider.getCurrentCline()) {
 			const currentCline = provider.getCurrentCline()!
 
 			// Use findMessageIndices to find messages based on timestamp
@@ -1249,6 +1216,14 @@ export const webviewMessageHandler = async (
 			await updateGlobalState("historyPreviewCollapsed", message.bool ?? false)
 			// No need to call postStateToWebview here as the UI already updated optimistically
 			break
+		case "skipEditMessageConfirmation":
+			await updateGlobalState("skipEditMessageConfirmation", message.bool ?? false)
+			await provider.postStateToWebview()
+			break
+		case "skipDeleteMessageConfirmation":
+			await updateGlobalState("skipDeleteMessageConfirmation", message.bool ?? false)
+			await provider.postStateToWebview()
+			break
 		case "toggleApiConfigPin":
 			if (message.text) {
 				const currentPinned = getGlobalState("pinnedApiConfigs") ?? {}
@@ -1526,6 +1501,16 @@ export const webviewMessageHandler = async (
 				}
 			}
 			break
+		case "deleteMessageConfirm":
+			if (message.messageTs) {
+				await handleDeleteMessageConfirm(message.messageTs)
+			}
+			break
+		case "editMessageConfirm":
+			if (message.messageTs && message.text) {
+				await handleEditMessageConfirm(message.messageTs, message.text)
+			}
+			break
 		case "getListApiConfiguration":
 			try {
 				const listApiConfig = await provider.providerSettingsManager.listConfig()
diff --git a/src/i18n/locales/en/common.json b/src/i18n/locales/en/common.json
index f907a5745b..ebf1448363 100644
--- a/src/i18n/locales/en/common.json
+++ b/src/i18n/locales/en/common.json
@@ -17,12 +17,7 @@
 	"confirmation": {
 		"reset_state": "Are you sure you want to reset all state and secret storage in the extension? This cannot be undone.",
 		"delete_config_profile": "Are you sure you want to delete this configuration profile?",
-		"delete_custom_mode_with_rules": "Are you sure you want to delete this {scope} mode?\n\nThis will also delete the associated rules folder at:\n{rulesFolderPath}",
-		"delete_message": "What would you like to delete?",
-		"edit_warning": "Editing this message will delete all subsequent messages in the conversation. Do you want to proceed?",
-		"delete_just_this_message": "Just this message",
-		"delete_this_and_subsequent": "This and all subsequent messages",
-		"proceed": "Proceed"
+		"delete_custom_mode_with_rules": "Are you sure you want to delete this {scope} mode?\n\nThis will also delete the associated rules folder at:\n{rulesFolderPath}"
 	},
 	"errors": {
 		"invalid_data_uri": "Invalid data URI format",
diff --git a/src/shared/ExtensionMessage.ts b/src/shared/ExtensionMessage.ts
index 953c0c1070..e19d2368d7 100644
--- a/src/shared/ExtensionMessage.ts
+++ b/src/shared/ExtensionMessage.ts
@@ -105,6 +105,8 @@ export interface ExtensionMessage {
 		| "shareTaskSuccess"
 		| "codeIndexSettingsSaved"
 		| "codeIndexSecretStatus"
+		| "showDeleteMessageDialog"
+		| "showEditMessageDialog"
 	text?: string
 	payload?: any // Add a generic payload for now, can refine later
 	action?:
@@ -157,6 +159,7 @@ export interface ExtensionMessage {
 	visibility?: ShareVisibility
 	rulesFolderPath?: string
 	settings?: any
+	messageTs?: number
 }
 
 export type ExtensionState = Pick<
@@ -182,6 +185,8 @@ export type ExtensionState = Pick<
 	| "alwaysAllowSubtasks"
 	| "alwaysAllowExecute"
 	| "alwaysAllowUpdateTodoList"
+	| "skipEditMessageConfirmation"
+	| "skipDeleteMessageConfirmation"
 	| "allowedCommands"
 	| "allowedMaxRequests"
 	| "browserToolEnabled"
diff --git a/src/shared/WebviewMessage.ts b/src/shared/WebviewMessage.ts
index fa9fb67310..30fae8bd7b 100644
--- a/src/shared/WebviewMessage.ts
+++ b/src/shared/WebviewMessage.ts
@@ -80,6 +80,8 @@ export interface WebviewMessage {
 		| "allowedMaxRequests"
 		| "alwaysAllowSubtasks"
 		| "alwaysAllowUpdateTodoList"
+		| "skipEditMessageConfirmation"
+		| "skipDeleteMessageConfirmation"
 		| "autoCondenseContext"
 		| "autoCondenseContextPercent"
 		| "condensingApiConfigId"
@@ -110,7 +112,9 @@ export interface WebviewMessage {
 		| "enhancedPrompt"
 		| "draggedImages"
 		| "deleteMessage"
+		| "deleteMessageConfirm"
 		| "submitEditedMessage"
+		| "editMessageConfirm"
 		| "terminalOutputLineLimit"
 		| "terminalShellIntegrationTimeout"
 		| "terminalShellIntegrationDisabled"
@@ -225,6 +229,7 @@ export interface WebviewMessage {
 	ids?: string[]
 	hasSystemPromptOverride?: boolean
 	terminalOperation?: "continue" | "abort"
+	messageTs?: number
 	historyPreviewCollapsed?: boolean
 	filters?: { type?: string; search?: string; tags?: string[] }
 	url?: string // For openExternal
diff --git a/webview-ui/src/App.tsx b/webview-ui/src/App.tsx
index 332ef18511..4e6d0a4694 100644
--- a/webview-ui/src/App.tsx
+++ b/webview-ui/src/App.tsx
@@ -18,6 +18,7 @@ import McpView from "./components/mcp/McpView"
 import { MarketplaceView } from "./components/marketplace/MarketplaceView"
 import ModesView from "./components/modes/ModesView"
 import { HumanRelayDialog } from "./components/human-relay/HumanRelayDialog"
+import { DeleteMessageDialog, EditMessageDialog } from "./components/chat/MessageModificationConfirmationDialog"
 import { AccountView } from "./components/account/AccountView"
 import { useAddNonInteractiveClickListener } from "./components/ui/hooks/useNonInteractiveClick"
 import { TooltipProvider } from "./components/ui/tooltip"
@@ -48,6 +49,10 @@ const App = () => {
 		cloudApiUrl,
 		renderContext,
 		mdmCompliant,
+		skipEditMessageConfirmation,
+		setSkipEditMessageConfirmation,
+		skipDeleteMessageConfirmation,
+		setSkipDeleteMessageConfirmation,
 	} = useExtensionState()
 
 	// Create a persistent state manager
@@ -66,6 +71,24 @@ const App = () => {
 		promptText: "",
 	})
 
+	const [deleteMessageDialogState, setDeleteMessageDialogState] = useState<{
+		isOpen: boolean
+		messageTs: number
+	}>({
+		isOpen: false,
+		messageTs: 0,
+	})
+
+	const [editMessageDialogState, setEditMessageDialogState] = useState<{
+		isOpen: boolean
+		messageTs: number
+		text: string
+	}>({
+		isOpen: false,
+		messageTs: 0,
+		text: "",
+	})
+
 	const settingsRef = useRef<SettingsViewRef>(null)
 	const chatViewRef = useRef<ChatViewRef>(null)
 
@@ -121,11 +144,38 @@ const App = () => {
 				setHumanRelayDialogState({ isOpen: true, requestId, promptText })
 			}
 
+			if (message.type === "showDeleteMessageDialog" && message.messageTs) {
+				// Check if user has opted to skip the confirmation
+				if (skipDeleteMessageConfirmation) {
+					// Directly send the confirmation without showing dialog
+					vscode.postMessage({
+						type: "deleteMessageConfirm",
+						messageTs: message.messageTs,
+					})
+				} else {
+					setDeleteMessageDialogState({ isOpen: true, messageTs: message.messageTs })
+				}
+			}
+
+			if (message.type === "showEditMessageDialog" && message.messageTs && message.text) {
+				// Check if user has opted to skip the confirmation
+				if (skipEditMessageConfirmation) {
+					// Directly send the confirmation without showing dialog
+					vscode.postMessage({
+						type: "editMessageConfirm",
+						messageTs: message.messageTs,
+						text: message.text,
+					})
+				} else {
+					setEditMessageDialogState({ isOpen: true, messageTs: message.messageTs, text: message.text })
+				}
+			}
+
 			if (message.type === "acceptInput") {
 				chatViewRef.current?.acceptInput()
 			}
 		},
-		[switchTab],
+		[switchTab, skipDeleteMessageConfirmation, skipEditMessageConfirmation],
 	)
 
 	useEvent("message", onMessage)
@@ -207,6 +257,45 @@ const App = () => {
 				onSubmit={(requestId, text) => vscode.postMessage({ type: "humanRelayResponse", requestId, text })}
 				onCancel={(requestId) => vscode.postMessage({ type: "humanRelayCancel", requestId })}
 			/>
+			<DeleteMessageDialog
+				open={deleteMessageDialogState.isOpen}
+				onOpenChange={(open) => setDeleteMessageDialogState((prev) => ({ ...prev, isOpen: open }))}
+				onConfirm={(dontShowAgain) => {
+					// Save the preference if checkbox was checked
+					if (dontShowAgain) {
+						setSkipDeleteMessageConfirmation(true)
+						vscode.postMessage({
+							type: "skipDeleteMessageConfirmation",
+							bool: true,
+						})
+					}
+					vscode.postMessage({
+						type: "deleteMessageConfirm",
+						messageTs: deleteMessageDialogState.messageTs,
+					})
+					setDeleteMessageDialogState((prev) => ({ ...prev, isOpen: false }))
+				}}
+			/>
+			<EditMessageDialog
+				open={editMessageDialogState.isOpen}
+				onOpenChange={(open) => setEditMessageDialogState((prev) => ({ ...prev, isOpen: open }))}
+				onConfirm={(dontShowAgain) => {
+					// Save the preference if checkbox was checked
+					if (dontShowAgain) {
+						setSkipEditMessageConfirmation(true)
+						vscode.postMessage({
+							type: "skipEditMessageConfirmation",
+							bool: true,
+						})
+					}
+					vscode.postMessage({
+						type: "editMessageConfirm",
+						messageTs: editMessageDialogState.messageTs,
+						text: editMessageDialogState.text,
+					})
+					setEditMessageDialogState((prev) => ({ ...prev, isOpen: false }))
+				}}
+			/>
 		</>
 	)
 }
diff --git a/webview-ui/src/components/chat/ChatTextArea.tsx b/webview-ui/src/components/chat/ChatTextArea.tsx
index b12e9b1961..b7da0a6ce1 100644
--- a/webview-ui/src/components/chat/ChatTextArea.tsx
+++ b/webview-ui/src/components/chat/ChatTextArea.tsx
@@ -981,7 +981,7 @@ const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
 								<div className="absolute bottom-1 right-1 z-30">
 									<IconButton
 										iconClass="codicon-edit"
-										title={t("chat:save")}
+										title={t("chat:save.tooltip")}
 										disabled={sendingDisabled}
 										onClick={onSend}
 										className="opacity-60 hover:opacity-100 text-vscode-descriptionForeground hover:text-vscode-foreground"
diff --git a/webview-ui/src/components/chat/MessageModificationConfirmationDialog.tsx b/webview-ui/src/components/chat/MessageModificationConfirmationDialog.tsx
new file mode 100644
index 0000000000..3e93e522ac
--- /dev/null
+++ b/webview-ui/src/components/chat/MessageModificationConfirmationDialog.tsx
@@ -0,0 +1,88 @@
+import React, { useState } from "react"
+import { useAppTranslation } from "@src/i18n/TranslationContext"
+import {
+	AlertDialog,
+	AlertDialogAction,
+	AlertDialogCancel,
+	AlertDialogContent,
+	AlertDialogDescription,
+	AlertDialogFooter,
+	AlertDialogHeader,
+	AlertDialogTitle,
+	Checkbox,
+} from "@src/components/ui"
+
+interface MessageModificationConfirmationDialogProps {
+	open: boolean
+	onOpenChange: (open: boolean) => void
+	onConfirm: (dontShowAgain: boolean) => void
+	type: "edit" | "delete"
+}
+
+export const MessageModificationConfirmationDialog: React.FC<MessageModificationConfirmationDialogProps> = ({
+	open,
+	onOpenChange,
+	onConfirm,
+	type,
+}) => {
+	const { t } = useAppTranslation()
+	const [dontShowAgain, setDontShowAgain] = useState(false)
+
+	const isEdit = type === "edit"
+	const title = isEdit ? t("common:confirmation.edit_message") : t("common:confirmation.delete_message")
+	const description = isEdit ? t("common:confirmation.edit_warning") : t("common:confirmation.delete_warning")
+
+	const handleConfirm = () => {
+		onConfirm(dontShowAgain)
+		setDontShowAgain(false) // Reset for next time
+	}
+
+	const handleOpenChange = (open: boolean) => {
+		if (!open) {
+			setDontShowAgain(false) // Reset when dialog closes
+		}
+		onOpenChange(open)
+	}
+
+	return (
+		<AlertDialog open={open} onOpenChange={handleOpenChange}>
+			<AlertDialogContent>
+				<AlertDialogHeader>
+					<AlertDialogTitle className="text-lg">{title}</AlertDialogTitle>
+					<AlertDialogDescription className="text-base">{description}</AlertDialogDescription>
+				</AlertDialogHeader>
+				<div className="flex items-center space-x-2 px-6 py-1">
+					<Checkbox
+						id="dont-show-again"
+						checked={dontShowAgain}
+						onCheckedChange={(checked) => setDontShowAgain(checked as boolean)}
+					/>
+					<label
+						htmlFor="dont-show-again"
+						className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70 cursor-pointer">
+						{t("common:confirmation.dont_show_again")}
+					</label>
+				</div>
+				<AlertDialogFooter className="flex-col gap-2">
+					<AlertDialogCancel className="bg-vscode-button-secondaryBackground hover:bg-vscode-button-secondaryHoverBackground text-vscode-button-secondaryForeground border-vscode-button-border">
+						{t("common:answers.cancel")}
+					</AlertDialogCancel>
+					<AlertDialogAction
+						onClick={handleConfirm}
+						className="bg-vscode-button-background hover:bg-vscode-button-hoverBackground text-vscode-button-foreground border-vscode-button-border">
+						{t("common:confirmation.proceed")}
+					</AlertDialogAction>
+				</AlertDialogFooter>
+			</AlertDialogContent>
+		</AlertDialog>
+	)
+}
+
+// Export convenience components for backward compatibility
+export const EditMessageDialog: React.FC<Omit<MessageModificationConfirmationDialogProps, "type">> = (props) => (
+	<MessageModificationConfirmationDialog {...props} type="edit" />
+)
+
+export const DeleteMessageDialog: React.FC<Omit<MessageModificationConfirmationDialogProps, "type">> = (props) => (
+	<MessageModificationConfirmationDialog {...props} type="delete" />
+)
diff --git a/webview-ui/src/context/ExtensionStateContext.tsx b/webview-ui/src/context/ExtensionStateContext.tsx
index bf927211c2..f85faab530 100644
--- a/webview-ui/src/context/ExtensionStateContext.tsx
+++ b/webview-ui/src/context/ExtensionStateContext.tsx
@@ -131,6 +131,10 @@ export interface ExtensionStateContextType extends ExtensionState {
 	routerModels?: RouterModels
 	alwaysAllowUpdateTodoList?: boolean
 	setAlwaysAllowUpdateTodoList: (value: boolean) => void
+	skipEditMessageConfirmation?: boolean
+	setSkipEditMessageConfirmation: (value: boolean) => void
+	skipDeleteMessageConfirmation?: boolean
+	setSkipDeleteMessageConfirmation: (value: boolean) => void
 }
 
 export const ExtensionStateContext = createContext<ExtensionStateContextType | undefined>(undefined)
@@ -224,6 +228,8 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode
 		},
 		codebaseIndexModels: { ollama: {}, openai: {} },
 		alwaysAllowUpdateTodoList: true,
+		skipEditMessageConfirmation: false,
+		skipDeleteMessageConfirmation: false,
 	})
 
 	const [didHydrateState, setDidHydrateState] = useState(false)
@@ -466,6 +472,14 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode
 		setAlwaysAllowUpdateTodoList: (value) => {
 			setState((prevState) => ({ ...prevState, alwaysAllowUpdateTodoList: value }))
 		},
+		skipEditMessageConfirmation: state.skipEditMessageConfirmation,
+		setSkipEditMessageConfirmation: (value) => {
+			setState((prevState) => ({ ...prevState, skipEditMessageConfirmation: value }))
+		},
+		skipDeleteMessageConfirmation: state.skipDeleteMessageConfirmation,
+		setSkipDeleteMessageConfirmation: (value) => {
+			setState((prevState) => ({ ...prevState, skipDeleteMessageConfirmation: value }))
+		},
 	}
 
 	return <ExtensionStateContext.Provider value={contextValue}>{children}</ExtensionStateContext.Provider>
diff --git a/webview-ui/src/i18n/locales/en/common.json b/webview-ui/src/i18n/locales/en/common.json
index 1488f00f46..d73ad3ad2e 100644
--- a/webview-ui/src/i18n/locales/en/common.json
+++ b/webview-ui/src/i18n/locales/en/common.json
@@ -51,5 +51,13 @@
 		"success": {
 			"imageDataUriCopied": "Image data URI copied to clipboard"
 		}
+	},
+	"confirmation": {
+		"delete_message": "Delete Message",
+		"delete_warning": "Deleting this message will delete all subsequent messages in the conversation. Do you want to proceed?",
+		"edit_message": "Edit Message",
+		"edit_warning": "Editing this message will delete all subsequent messages in the conversation. Do you want to proceed?",
+		"proceed": "Proceed",
+		"dont_show_again": "Don't show this again"
 	}
 }

From 303a9c8c1f319f4adbe1c0578106f81919028d15 Mon Sep 17 00:00:00 2001
From: Will Li <willeli2002@gmail.com>
Date: Wed, 9 Jul 2025 16:33:04 -0700
Subject: [PATCH 04/14] tests working

---
 .../webview/__tests__/ClineProvider.spec.ts   | 398 +++++++++++++-----
 1 file changed, 300 insertions(+), 98 deletions(-)

diff --git a/src/core/webview/__tests__/ClineProvider.spec.ts b/src/core/webview/__tests__/ClineProvider.spec.ts
index 19c9a7c9fc..fb3c8372e0 100644
--- a/src/core/webview/__tests__/ClineProvider.spec.ts
+++ b/src/core/webview/__tests__/ClineProvider.spec.ts
@@ -1163,15 +1163,15 @@ describe("ClineProvider", () => {
 
 	describe("deleteMessage", () => {
 		beforeEach(async () => {
-			// Mock window.showInformationMessage
-			;(vscode.window.showInformationMessage as any) = vi.fn()
 			await provider.resolveWebviewView(mockWebviewView)
+			// Mock that skipDeleteMessageConfirmation is false by default
+			;(mockContext.globalState.get as any).mockImplementation((key: string) => {
+				if (key === "skipDeleteMessageConfirmation") return false
+				return undefined
+			})
 		})
 
-		test('handles "Just this message" deletion correctly', async () => {
-			// Mock user selecting "Just this message"
-			;(vscode.window.showInformationMessage as any).mockResolvedValue("confirmation.delete_just_this_message")
-
+		test("handles deletion with confirmation dialog", async () => {
 			// Setup mock messages
 			const mockMessages = [
 				{ ts: 1000, type: "say", say: "user_feedback" }, // User message 1
@@ -1202,30 +1202,43 @@ describe("ClineProvider", () => {
 				historyItem: { id: "test-task-id" },
 			})
 
+			// Mock initClineWithHistoryItem
+			;(provider as any).initClineWithHistoryItem = vi.fn()
+
 			// Trigger message deletion
 			const messageHandler = (mockWebviewView.webview.onDidReceiveMessage as any).mock.calls[0][0]
 			await messageHandler({ type: "deleteMessage", value: 4000 })
 
-			// Verify correct messages were kept
-			expect(mockCline.overwriteClineMessages).toHaveBeenCalledWith([
-				mockMessages[0],
-				mockMessages[1],
-				mockMessages[4],
-				mockMessages[5],
-			])
+			// Verify that the dialog message was sent to webview
+			expect(mockPostMessage).toHaveBeenCalledWith({
+				type: "showDeleteMessageDialog",
+				messageTs: 4000,
+			})
+
+			// Simulate user confirming deletion through the dialog
+			await messageHandler({ type: "deleteMessageConfirm", messageTs: 4000 })
+
+			// Verify only messages before the deleted message were kept
+			expect(mockCline.overwriteClineMessages).toHaveBeenCalledWith([mockMessages[0], mockMessages[1]])
 
-			// Verify correct API messages were kept
+			// Verify only API messages before the deleted message were kept
 			expect(mockCline.overwriteApiConversationHistory).toHaveBeenCalledWith([
 				mockApiHistory[0],
 				mockApiHistory[1],
-				mockApiHistory[4],
-				mockApiHistory[5],
 			])
+
+			// Verify initClineWithHistoryItem was called
+			expect((provider as any).initClineWithHistoryItem).toHaveBeenCalledWith({ id: "test-task-id" })
 		})
 
-		test('handles "This and all subsequent messages" deletion correctly', async () => {
-			// Mock user selecting "This and all subsequent messages"
-			;(vscode.window.showInformationMessage as any).mockResolvedValue("confirmation.delete_this_and_subsequent")
+		test("handles deletion with skipDeleteMessageConfirmation enabled", async () => {
+			// Mock that skipDeleteMessageConfirmation is true
+			const contextProxy = (provider as any).contextProxy
+			const getValueSpy = vi.spyOn(contextProxy, "getValue")
+			getValueSpy.mockImplementation((key: any) => {
+				if (key === "skipDeleteMessageConfirmation") return true
+				return undefined
+			})
 
 			// Setup mock messages
 			const mockMessages = [
@@ -1255,10 +1268,19 @@ describe("ClineProvider", () => {
 				historyItem: { id: "test-task-id" },
 			})
 
+			// Mock initClineWithHistoryItem
+			;(provider as any).initClineWithHistoryItem = vi.fn()
+
 			// Trigger message deletion
 			const messageHandler = (mockWebviewView.webview.onDidReceiveMessage as any).mock.calls[0][0]
 			await messageHandler({ type: "deleteMessage", value: 3000 })
 
+			// Verify that NO dialog message was sent to webview (skipped)
+			expect(mockPostMessage).not.toHaveBeenCalledWith({
+				type: "showDeleteMessageDialog",
+				messageTs: 3000,
+			})
+
 			// Verify only messages before the deleted message were kept
 			expect(mockCline.overwriteClineMessages).toHaveBeenCalledWith([mockMessages[0]])
 
@@ -1266,39 +1288,34 @@ describe("ClineProvider", () => {
 			expect(mockCline.overwriteApiConversationHistory).toHaveBeenCalledWith([mockApiHistory[0]])
 		})
 
-		test("handles Cancel correctly", async () => {
-			// Mock user selecting "Cancel"
-			;(vscode.window.showInformationMessage as any).mockResolvedValue("Cancel")
-
-			// Setup Cline instance with auto-mock from the top of the file
-			const mockCline = new Task(defaultTaskOptions) // Create a new mocked instance
-			mockCline.clineMessages = [{ ts: 1000 }, { ts: 2000 }] as ClineMessage[]
-			mockCline.apiConversationHistory = [{ ts: 1000 }, { ts: 2000 }] as (Anthropic.MessageParam & {
-				ts?: number
-			})[]
-			await provider.addClineToStack(mockCline)
+		test("handles case when no current task exists", async () => {
+			// Clear the cline stack
+			;(provider as any).clineStack = []
 
 			// Trigger message deletion
 			const messageHandler = (mockWebviewView.webview.onDidReceiveMessage as any).mock.calls[0][0]
 			await messageHandler({ type: "deleteMessage", value: 2000 })
 
-			// Verify no messages were deleted
-			expect(mockCline.overwriteClineMessages).not.toHaveBeenCalled()
-			expect(mockCline.overwriteApiConversationHistory).not.toHaveBeenCalled()
+			// Verify no dialog was shown since there's no current cline
+			expect(mockPostMessage).not.toHaveBeenCalledWith(
+				expect.objectContaining({
+					type: "showDeleteMessageDialog",
+				}),
+			)
 		})
 	})
 
 	describe("editMessage", () => {
 		beforeEach(async () => {
-			// Mock window.showWarningMessage
-			;(vscode.window.showWarningMessage as any) = vi.fn()
 			await provider.resolveWebviewView(mockWebviewView)
+			// Mock that skipEditMessageConfirmation is false by default
+			;(mockContext.globalState.get as any).mockImplementation((key: string) => {
+				if (key === "skipEditMessageConfirmation") return false
+				return undefined
+			})
 		})
 
-		test('handles "Proceed" edit correctly', async () => {
-			// Mock user selecting "Proceed" - need to use the localized string key
-			;(vscode.window.showWarningMessage as any).mockResolvedValue("confirmation.proceed")
-
+		test("handles edit with confirmation dialog", async () => {
 			// Setup mock messages
 			const mockMessages = [
 				{ ts: 1000, type: "say", say: "user_feedback" }, // User message 1
@@ -1346,6 +1363,20 @@ describe("ClineProvider", () => {
 				editedMessageContent: "Edited message content",
 			})
 
+			// Verify that the dialog message was sent to webview
+			expect(mockPostMessage).toHaveBeenCalledWith({
+				type: "showEditMessageDialog",
+				messageTs: 4000,
+				text: "Edited message content",
+			})
+
+			// Simulate user confirming edit through the dialog
+			await messageHandler({
+				type: "editMessageConfirm",
+				messageTs: 4000,
+				text: "Edited message content",
+			})
+
 			// Verify correct messages were kept (only messages before the edited one)
 			expect(mockCline.overwriteClineMessages).toHaveBeenCalledWith([mockMessages[0], mockMessages[1]])
 
@@ -1355,12 +1386,59 @@ describe("ClineProvider", () => {
 				mockApiHistory[1],
 			])
 
-			// Verify handleWebviewAskResponse was called with the edited content
-			expect(mockCline.handleWebviewAskResponse).toHaveBeenCalledWith(
-				"messageResponse",
-				"Edited message content",
-				undefined,
-			)
+			// The new flow calls webviewMessageHandler recursively with askResponse
+			// We need to verify the recursive call happened by checking if the handler was called again
+			expect((mockWebviewView.webview.onDidReceiveMessage as any).mock.calls.length).toBeGreaterThanOrEqual(1)
+		})
+
+		test("handles edit with skipEditMessageConfirmation enabled", async () => {
+			// Mock that skipEditMessageConfirmation is true
+			const contextProxy = (provider as any).contextProxy
+			const getValueSpy = vi.spyOn(contextProxy, "getValue")
+			getValueSpy.mockImplementation((key: any) => {
+				if (key === "skipEditMessageConfirmation") return true
+				return undefined
+			})
+
+			// Setup mock messages
+			const mockMessages = [
+				{ ts: 1000, type: "say", say: "user_feedback" },
+				{ ts: 2000, type: "say", say: "text", value: 3000 }, // Message to edit
+				{ ts: 3000, type: "say", say: "user_feedback" },
+			] as ClineMessage[]
+
+			const mockApiHistory = [{ ts: 1000 }, { ts: 2000 }, { ts: 3000 }] as (Anthropic.MessageParam & {
+				ts?: number
+			})[]
+
+			// Setup Task instance
+			const mockCline = new Task(defaultTaskOptions)
+			mockCline.clineMessages = mockMessages
+			mockCline.apiConversationHistory = mockApiHistory
+			mockCline.overwriteClineMessages = vi.fn()
+			mockCline.overwriteApiConversationHistory = vi.fn()
+			mockCline.handleWebviewAskResponse = vi.fn()
+
+			await provider.addClineToStack(mockCline)
+
+			// Trigger message edit
+			const messageHandler = (mockWebviewView.webview.onDidReceiveMessage as any).mock.calls[0][0]
+			await messageHandler({
+				type: "submitEditedMessage",
+				value: 3000,
+				editedMessageContent: "Edited message content",
+			})
+
+			// Verify that NO dialog message was sent to webview (skipped)
+			expect(mockPostMessage).not.toHaveBeenCalledWith({
+				type: "showEditMessageDialog",
+				messageTs: 3000,
+				text: "Edited message content",
+			})
+
+			// Verify messages were edited directly
+			expect(mockCline.overwriteClineMessages).toHaveBeenCalledWith([mockMessages[0]])
+			expect(mockCline.overwriteApiConversationHistory).toHaveBeenCalledWith([mockApiHistory[0]])
 		})
 	})
 
@@ -2705,13 +2783,16 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 
 	describe("Edit Messages with Images and Attachments", () => {
 		beforeEach(async () => {
-			;(vscode.window.showInformationMessage as any) = vi.fn()
 			await provider.resolveWebviewView(mockWebviewView)
+			// Mock that skip confirmations are false by default
+			;(mockContext.globalState.get as any).mockImplementation((key: string) => {
+				if (key === "skipEditMessageConfirmation") return false
+				if (key === "skipDeleteMessageConfirmation") return false
+				return undefined
+			})
 		})
 
 		test("handles editing messages containing images", async () => {
-			;(vscode.window.showWarningMessage as any).mockResolvedValue("confirmation.proceed")
-
 			const mockMessages = [
 				{ ts: 1000, type: "say", say: "user_feedback", text: "Original message" },
 				{
@@ -2746,17 +2827,26 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 				editedMessageContent: "Edited message with preserved images",
 			})
 
-			expect(mockCline.overwriteClineMessages).toHaveBeenCalled()
-			expect(mockCline.handleWebviewAskResponse).toHaveBeenCalledWith(
-				"messageResponse",
-				"Edited message with preserved images",
-				undefined,
-			)
+			// Verify dialog was shown
+			expect(mockPostMessage).toHaveBeenCalledWith({
+				type: "showEditMessageDialog",
+				messageTs: 3000,
+				text: "Edited message with preserved images",
+			})
+
+			// Simulate confirmation
+			await messageHandler({
+				type: "editMessageConfirm",
+				messageTs: 3000,
+				text: "Edited message with preserved images",
+			})
+
+			// Verify messages were edited correctly - only the first message should remain
+			expect(mockCline.overwriteClineMessages).toHaveBeenCalledWith([mockMessages[0]])
+			expect(mockCline.overwriteApiConversationHistory).toHaveBeenCalledWith([{ ts: 1000 }])
 		})
 
 		test("handles editing messages with file attachments", async () => {
-			;(vscode.window.showWarningMessage as any).mockResolvedValue("confirmation.proceed")
-
 			const mockMessages = [
 				{ ts: 1000, type: "say", say: "user_feedback", text: "Original message" },
 				{
@@ -2789,6 +2879,20 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 				editedMessageContent: "Edited message with file attachment",
 			})
 
+			// Verify dialog was shown
+			expect(mockPostMessage).toHaveBeenCalledWith({
+				type: "showEditMessageDialog",
+				messageTs: 3000,
+				text: "Edited message with file attachment",
+			})
+
+			// Simulate user confirming the edit
+			await messageHandler({
+				type: "editMessageConfirm",
+				messageTs: 3000,
+				text: "Edited message with file attachment",
+			})
+
 			expect(mockCline.overwriteClineMessages).toHaveBeenCalled()
 			expect(mockCline.handleWebviewAskResponse).toHaveBeenCalledWith(
 				"messageResponse",
@@ -2805,8 +2909,6 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 		})
 
 		test("handles network timeout during edit submission", async () => {
-			;(vscode.window.showInformationMessage as any).mockResolvedValue("confirmation.proceed")
-
 			const mockCline = new Task(defaultTaskOptions)
 			mockCline.clineMessages = [
 				{ ts: 1000, type: "say", say: "user_feedback", text: "Original message", value: 2000 },
@@ -2833,12 +2935,20 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 				}),
 			).resolves.toBeUndefined()
 
+			// Verify dialog was shown
+			expect(mockPostMessage).toHaveBeenCalledWith({
+				type: "showEditMessageDialog",
+				messageTs: 2000,
+				text: "Edited message",
+			})
+
+			// Simulate user confirming the edit
+			await messageHandler({ type: "editMessageConfirm", messageTs: 2000, text: "Edited message" })
+
 			expect(mockCline.overwriteClineMessages).toHaveBeenCalled()
 		})
 
 		test("handles connection drops during edit operation", async () => {
-			;(vscode.window.showWarningMessage as any).mockResolvedValue("confirmation.proceed")
-
 			const mockCline = new Task(defaultTaskOptions)
 			mockCline.clineMessages = [
 				{ ts: 1000, type: "say", say: "user_feedback", text: "Original message", value: 2000 },
@@ -2865,6 +2975,17 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 				}),
 			).resolves.toBeUndefined()
 
+			// Verify dialog was shown
+			expect(mockPostMessage).toHaveBeenCalledWith({
+				type: "showEditMessageDialog",
+				messageTs: 2000,
+				text: "Edited message",
+			})
+
+			// Simulate user confirming the edit
+			await messageHandler({ type: "editMessageConfirm", messageTs: 2000, text: "Edited message" })
+
+			// The error should be caught and shown
 			expect(vscode.window.showErrorMessage).toHaveBeenCalledWith("Error editing message: Connection lost")
 		})
 	})
@@ -2876,8 +2997,6 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 		})
 
 		test("handles race conditions with simultaneous edits", async () => {
-			;(vscode.window.showWarningMessage as any).mockResolvedValue("confirmation.proceed")
-
 			const mockCline = new Task(defaultTaskOptions)
 			mockCline.clineMessages = [
 				{ ts: 1000, type: "say", say: "user_feedback", text: "Message 1", value: 2000 },
@@ -2912,6 +3031,22 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 
 			await Promise.all([edit1Promise, edit2Promise])
 
+			// Verify dialogs were shown for both edits
+			expect(mockPostMessage).toHaveBeenCalledWith({
+				type: "showEditMessageDialog",
+				messageTs: 2000,
+				text: "Edited message 1",
+			})
+			expect(mockPostMessage).toHaveBeenCalledWith({
+				type: "showEditMessageDialog",
+				messageTs: 4000,
+				text: "Edited message 2",
+			})
+
+			// Simulate user confirming both edits
+			await messageHandler({ type: "editMessageConfirm", messageTs: 2000, text: "Edited message 1" })
+			await messageHandler({ type: "editMessageConfirm", messageTs: 4000, text: "Edited message 2" })
+
 			// Both operations should complete without throwing
 			expect(mockCline.overwriteClineMessages).toHaveBeenCalled()
 		})
@@ -2940,8 +3075,6 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 		})
 
 		test("handles authorization failures during edit", async () => {
-			;(vscode.window.showWarningMessage as any).mockResolvedValue("confirmation.proceed")
-
 			const mockCline = new Task(defaultTaskOptions)
 			mockCline.clineMessages = [
 				{ ts: 1000, type: "say", say: "user_feedback", text: "Original message", value: 2000 },
@@ -2965,6 +3098,13 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 				editedMessageContent: "Edited message",
 			})
 
+			// Simulate confirmation
+			await messageHandler({
+				type: "editMessageConfirm",
+				messageTs: 2000,
+				text: "Edited message",
+			})
+
 			expect(vscode.window.showErrorMessage).toHaveBeenCalledWith("Error editing message: Unauthorized")
 		})
 
@@ -3058,8 +3198,6 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 			})
 
 			test("handles edit operations on deleted messages", async () => {
-				;(vscode.window.showWarningMessage as any).mockResolvedValue("confirmation.proceed")
-
 				const mockCline = new Task(defaultTaskOptions)
 				mockCline.clineMessages = [
 					{ ts: 1000, type: "say", say: "user_feedback", text: "Existing message" },
@@ -3083,17 +3221,26 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 					editedMessageContent: "Edited non-existent message",
 				})
 
-				// Should show confirmation dialog but not perform any operations
-				expect(vscode.window.showWarningMessage).toHaveBeenCalled()
+				// Should show edit dialog
+				expect(mockPostMessage).toHaveBeenCalledWith({
+					type: "showEditMessageDialog",
+					messageTs: 5000,
+					text: "Edited non-existent message",
+				})
+
+				// Simulate user confirming the edit
+				await messageHandler({
+					type: "editMessageConfirm",
+					messageTs: 5000,
+					text: "Edited non-existent message",
+				})
+
+				// Should not perform any operations since message doesn't exist
 				expect(mockCline.overwriteClineMessages).not.toHaveBeenCalled()
 				expect(mockCline.handleWebviewAskResponse).not.toHaveBeenCalled()
 			})
 
 			test("handles delete operations on non-existent messages", async () => {
-				;(vscode.window.showInformationMessage as any).mockResolvedValue(
-					"confirmation.delete_just_this_message",
-				)
-
 				const mockCline = new Task(defaultTaskOptions)
 				mockCline.clineMessages = [
 					{ ts: 1000, type: "say", say: "user_feedback", text: "Existing message" },
@@ -3115,8 +3262,16 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 					value: 5000,
 				})
 
-				// Should show confirmation dialog but not perform any operations
-				expect(vscode.window.showInformationMessage).toHaveBeenCalled()
+				// Should show delete dialog
+				expect(mockPostMessage).toHaveBeenCalledWith({
+					type: "showDeleteMessageDialog",
+					messageTs: 5000,
+				})
+
+				// Simulate user confirming the delete
+				await messageHandler({ type: "deleteMessageConfirm", messageTs: 5000 })
+
+				// Should not perform any operations since message doesn't exist
 				expect(mockCline.overwriteClineMessages).not.toHaveBeenCalled()
 			})
 		})
@@ -3128,8 +3283,6 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 			})
 
 			test("validates proper cleanup during failed edit operations", async () => {
-				;(vscode.window.showWarningMessage as any).mockResolvedValue("confirmation.proceed")
-
 				const mockCline = new Task(defaultTaskOptions)
 				mockCline.clineMessages = [
 					{ ts: 1000, type: "say", say: "user_feedback", text: "Original message", value: 2000 },
@@ -3159,16 +3312,22 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 					editedMessageContent: "Edited message",
 				})
 
+				// Should show edit dialog
+				expect(mockPostMessage).toHaveBeenCalledWith({
+					type: "showEditMessageDialog",
+					messageTs: 2000,
+					text: "Edited message",
+				})
+
+				// Simulate user confirming the edit
+				await messageHandler({ type: "editMessageConfirm", messageTs: 2000, text: "Edited message" })
+
 				// Verify cleanup was attempted before failure
 				expect(cleanupSpy).toHaveBeenCalled()
 				expect(vscode.window.showErrorMessage).toHaveBeenCalledWith("Error editing message: Operation failed")
 			})
 
 			test("validates proper cleanup during failed delete operations", async () => {
-				;(vscode.window.showInformationMessage as any).mockResolvedValue(
-					"confirmation.delete_just_this_message",
-				)
-
 				const mockCline = new Task(defaultTaskOptions)
 				mockCline.clineMessages = [
 					{ ts: 1000, type: "say", say: "user_feedback", text: "Message to delete" },
@@ -3193,6 +3352,15 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 
 				await messageHandler({ type: "deleteMessage", value: 2000 })
 
+				// Should show delete dialog
+				expect(mockPostMessage).toHaveBeenCalledWith({
+					type: "showDeleteMessageDialog",
+					messageTs: 2000,
+				})
+
+				// Simulate user confirming the delete
+				await messageHandler({ type: "deleteMessageConfirm", messageTs: 2000 })
+
 				// Verify cleanup was attempted before failure
 				expect(cleanupSpy).toHaveBeenCalled()
 				expect(vscode.window.showErrorMessage).toHaveBeenCalledWith(
@@ -3208,8 +3376,6 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 			})
 
 			test("handles editing messages with large text content", async () => {
-				;(vscode.window.showWarningMessage as any).mockResolvedValue("confirmation.proceed")
-
 				// Create a large message (10KB of text)
 				const largeText = "A".repeat(10000)
 				const mockMessages = [
@@ -3238,6 +3404,16 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 					editedMessageContent: largeEditedContent,
 				})
 
+				// Should show edit dialog
+				expect(mockPostMessage).toHaveBeenCalledWith({
+					type: "showEditMessageDialog",
+					messageTs: 2000,
+					text: largeEditedContent,
+				})
+
+				// Simulate user confirming the edit
+				await messageHandler({ type: "editMessageConfirm", messageTs: 2000, text: largeEditedContent })
+
 				expect(mockCline.overwriteClineMessages).toHaveBeenCalled()
 				expect(mockCline.handleWebviewAskResponse).toHaveBeenCalledWith(
 					"messageResponse",
@@ -3247,10 +3423,6 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 			})
 
 			test("handles deleting messages with large payloads", async () => {
-				;(vscode.window.showInformationMessage as any).mockResolvedValue(
-					"confirmation.delete_this_and_subsequent",
-				)
-
 				// Create messages with large payloads
 				const largeText = "X".repeat(50000)
 				const mockMessages = [
@@ -3275,6 +3447,15 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 
 				await messageHandler({ type: "deleteMessage", value: 3000 })
 
+				// Should show delete dialog
+				expect(mockPostMessage).toHaveBeenCalledWith({
+					type: "showDeleteMessageDialog",
+					messageTs: 3000,
+				})
+
+				// Simulate user confirming the delete
+				await messageHandler({ type: "deleteMessageConfirm", messageTs: 3000 })
+
 				// Should handle large payloads without issues
 				expect(mockCline.overwriteClineMessages).toHaveBeenCalledWith([mockMessages[0]])
 				expect(mockCline.overwriteApiConversationHistory).toHaveBeenCalledWith([{ ts: 1000 }])
@@ -3285,10 +3466,6 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 			// Note: Error messaging test removed as the implementation may not have proper error handling in place
 
 			test("provides user feedback for successful operations", async () => {
-				;(vscode.window.showInformationMessage as any).mockResolvedValue(
-					"confirmation.delete_just_this_message",
-				)
-
 				const mockCline = new Task(defaultTaskOptions)
 				mockCline.clineMessages = [
 					{ ts: 1000, type: "say", say: "user_feedback", text: "Message to delete" },
@@ -3308,6 +3485,15 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 
 				await messageHandler({ type: "deleteMessage", value: 2000 })
 
+				// Should show delete dialog
+				expect(mockPostMessage).toHaveBeenCalledWith({
+					type: "showDeleteMessageDialog",
+					messageTs: 2000,
+				})
+
+				// Simulate user confirming the delete
+				await messageHandler({ type: "deleteMessageConfirm", messageTs: 2000 })
+
 				// Verify successful operation completed
 				expect(mockCline.overwriteClineMessages).toHaveBeenCalled()
 				expect(provider.initClineWithHistoryItem).toHaveBeenCalled()
@@ -3315,8 +3501,7 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 			})
 
 			test("handles user cancellation gracefully", async () => {
-				// Mock user canceling the operation
-				;(vscode.window.showWarningMessage as any).mockResolvedValue(undefined)
+				// Test cancellation by not sending confirmation
 
 				const mockCline = new Task(defaultTaskOptions)
 				mockCline.clineMessages = [
@@ -3353,10 +3538,6 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 			})
 
 			test("handles messages with identical timestamps", async () => {
-				;(vscode.window.showInformationMessage as any).mockResolvedValue(
-					"confirmation.delete_just_this_message",
-				)
-
 				const mockCline = new Task(defaultTaskOptions)
 				mockCline.clineMessages = [
 					{ ts: 1000, type: "say", say: "user_feedback", text: "Message 1" },
@@ -3377,13 +3558,20 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 
 				await messageHandler({ type: "deleteMessage", value: 1000 })
 
+				// Should show delete dialog
+				expect(mockPostMessage).toHaveBeenCalledWith({
+					type: "showDeleteMessageDialog",
+					messageTs: 1000,
+				})
+
+				// Simulate user confirming the delete
+				await messageHandler({ type: "deleteMessageConfirm", messageTs: 1000 })
+
 				// Should handle identical timestamps gracefully
 				expect(mockCline.overwriteClineMessages).toHaveBeenCalled()
 			})
 
 			test("handles messages with future timestamps", async () => {
-				;(vscode.window.showWarningMessage as any).mockResolvedValue("confirmation.proceed")
-
 				const futureTimestamp = Date.now() + 100000 // Future timestamp
 				const mockCline = new Task(defaultTaskOptions)
 				mockCline.clineMessages = [
@@ -3419,6 +3607,20 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 					editedMessageContent: "Edited future message",
 				})
 
+				// Should show edit dialog
+				expect(mockPostMessage).toHaveBeenCalledWith({
+					type: "showEditMessageDialog",
+					messageTs: futureTimestamp + 1000,
+					text: "Edited future message",
+				})
+
+				// Simulate user confirming the edit
+				await messageHandler({
+					type: "editMessageConfirm",
+					messageTs: futureTimestamp + 1000,
+					text: "Edited future message",
+				})
+
 				// Should handle future timestamps correctly
 				expect(mockCline.overwriteClineMessages).toHaveBeenCalled()
 				expect(mockCline.handleWebviewAskResponse).toHaveBeenCalled()

From ed4a2a7b19918c1116cc197d3bda1f1d2ef30a62 Mon Sep 17 00:00:00 2001
From: Will Li <willeli2002@gmail.com>
Date: Wed, 9 Jul 2025 16:48:11 -0700
Subject: [PATCH 05/14] ok finally tests working for real!

---
 .../__tests__/webviewMessageHandler.spec.ts   | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/core/webview/__tests__/webviewMessageHandler.spec.ts b/src/core/webview/__tests__/webviewMessageHandler.spec.ts
index ed23e4c80e..d03ffc9365 100644
--- a/src/core/webview/__tests__/webviewMessageHandler.spec.ts
+++ b/src/core/webview/__tests__/webviewMessageHandler.spec.ts
@@ -565,10 +565,11 @@ describe("webviewMessageHandler - message dialog preferences", () => {
 	describe("deleteMessage", () => {
 		it("should show dialog when skipDeleteMessageConfirmation is false", async () => {
 			vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(false)
+			vi.mocked(mockClineProvider.getCurrentCline).mockReturnValue({} as any) // Mock current cline exists
 
 			await webviewMessageHandler(mockClineProvider, {
 				type: "deleteMessage",
-				messageTs: 123456789,
+				value: 123456789, // Changed from messageTs to value
 			})
 
 			expect(mockClineProvider.postMessageToWebview).toHaveBeenCalledWith({
@@ -579,6 +580,10 @@ describe("webviewMessageHandler - message dialog preferences", () => {
 
 		it("should skip dialog and directly delete when skipDeleteMessageConfirmation is true", async () => {
 			vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(true)
+			vi.mocked(mockClineProvider.getCurrentCline).mockReturnValue({
+				clineMessages: [{ ts: 123456789, text: "test message" }],
+				apiConversationHistory: [{ ts: 123456789, text: "test message" }],
+			} as any) // Mock current cline with required properties
 
 			// Mock the necessary functions for deletion
 			vi.mocked(mockClineProvider.getTaskWithId).mockResolvedValue({
@@ -587,7 +592,7 @@ describe("webviewMessageHandler - message dialog preferences", () => {
 
 			await webviewMessageHandler(mockClineProvider, {
 				type: "deleteMessage",
-				messageTs: 123456789,
+				value: 123456789, // Changed from messageTs to value
 			})
 
 			// Should not show dialog
@@ -602,11 +607,12 @@ describe("webviewMessageHandler - message dialog preferences", () => {
 	describe("submitEditedMessage", () => {
 		it("should show dialog when skipEditMessageConfirmation is false", async () => {
 			vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(false)
+			vi.mocked(mockClineProvider.getCurrentCline).mockReturnValue({} as any) // Mock current cline exists
 
 			await webviewMessageHandler(mockClineProvider, {
 				type: "submitEditedMessage",
-				messageTs: 123456789,
-				text: "edited content",
+				value: 123456789, // messageTs as number
+				editedMessageContent: "edited content", // text content in editedMessageContent field
 			})
 
 			expect(mockClineProvider.postMessageToWebview).toHaveBeenCalledWith({
@@ -618,11 +624,15 @@ describe("webviewMessageHandler - message dialog preferences", () => {
 
 		it("should skip dialog and directly edit when skipEditMessageConfirmation is true", async () => {
 			vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(true)
+			vi.mocked(mockClineProvider.getCurrentCline).mockReturnValue({
+				clineMessages: [{ ts: 123456789, text: "test message" }],
+				apiConversationHistory: [{ ts: 123456789, text: "test message" }],
+			} as any) // Mock current cline with required properties
 
 			await webviewMessageHandler(mockClineProvider, {
 				type: "submitEditedMessage",
-				messageTs: 123456789,
-				text: "edited content",
+				value: 123456789, // messageTs as number
+				editedMessageContent: "edited content", // text content in editedMessageContent field
 			})
 
 			// Should not show dialog

From a17bf98ad686089342550c5c9d8e954468b28885 Mon Sep 17 00:00:00 2001
From: Will Li <willeli2002@gmail.com>
Date: Wed, 9 Jul 2025 17:06:43 -0700
Subject: [PATCH 06/14] translations

---
 src/i18n/locales/ca/common.json               | 7 +------
 src/i18n/locales/de/common.json               | 7 +------
 src/i18n/locales/es/common.json               | 7 +------
 src/i18n/locales/fr/common.json               | 7 +------
 src/i18n/locales/hi/common.json               | 7 +------
 src/i18n/locales/id/common.json               | 7 +------
 src/i18n/locales/it/common.json               | 7 +------
 src/i18n/locales/ja/common.json               | 7 +------
 src/i18n/locales/ko/common.json               | 7 +------
 src/i18n/locales/nl/common.json               | 7 +------
 src/i18n/locales/pl/common.json               | 7 +------
 src/i18n/locales/pt-BR/common.json            | 7 +------
 src/i18n/locales/ru/common.json               | 7 +------
 src/i18n/locales/tr/common.json               | 7 +------
 src/i18n/locales/vi/common.json               | 7 +------
 src/i18n/locales/zh-CN/common.json            | 7 +------
 src/i18n/locales/zh-TW/common.json            | 7 +------
 webview-ui/src/i18n/locales/ca/chat.json      | 3 +++
 webview-ui/src/i18n/locales/ca/common.json    | 8 ++++++++
 webview-ui/src/i18n/locales/de/chat.json      | 3 +++
 webview-ui/src/i18n/locales/de/common.json    | 8 ++++++++
 webview-ui/src/i18n/locales/es/chat.json      | 3 +++
 webview-ui/src/i18n/locales/es/common.json    | 8 ++++++++
 webview-ui/src/i18n/locales/fr/chat.json      | 3 +++
 webview-ui/src/i18n/locales/fr/common.json    | 8 ++++++++
 webview-ui/src/i18n/locales/hi/chat.json      | 3 +++
 webview-ui/src/i18n/locales/hi/common.json    | 8 ++++++++
 webview-ui/src/i18n/locales/id/chat.json      | 3 +++
 webview-ui/src/i18n/locales/id/common.json    | 8 ++++++++
 webview-ui/src/i18n/locales/it/chat.json      | 3 +++
 webview-ui/src/i18n/locales/it/common.json    | 8 ++++++++
 webview-ui/src/i18n/locales/ja/chat.json      | 3 +++
 webview-ui/src/i18n/locales/ja/common.json    | 8 ++++++++
 webview-ui/src/i18n/locales/ko/chat.json      | 3 +++
 webview-ui/src/i18n/locales/ko/common.json    | 8 ++++++++
 webview-ui/src/i18n/locales/nl/chat.json      | 3 +++
 webview-ui/src/i18n/locales/nl/common.json    | 8 ++++++++
 webview-ui/src/i18n/locales/pl/chat.json      | 3 +++
 webview-ui/src/i18n/locales/pl/common.json    | 8 ++++++++
 webview-ui/src/i18n/locales/pt-BR/chat.json   | 3 +++
 webview-ui/src/i18n/locales/pt-BR/common.json | 8 ++++++++
 webview-ui/src/i18n/locales/ru/chat.json      | 3 +++
 webview-ui/src/i18n/locales/ru/common.json    | 8 ++++++++
 webview-ui/src/i18n/locales/tr/chat.json      | 3 +++
 webview-ui/src/i18n/locales/tr/common.json    | 8 ++++++++
 webview-ui/src/i18n/locales/vi/chat.json      | 3 +++
 webview-ui/src/i18n/locales/vi/common.json    | 8 ++++++++
 webview-ui/src/i18n/locales/zh-CN/chat.json   | 3 +++
 webview-ui/src/i18n/locales/zh-CN/common.json | 8 ++++++++
 webview-ui/src/i18n/locales/zh-TW/chat.json   | 3 +++
 webview-ui/src/i18n/locales/zh-TW/common.json | 8 ++++++++
 51 files changed, 204 insertions(+), 102 deletions(-)

diff --git a/src/i18n/locales/ca/common.json b/src/i18n/locales/ca/common.json
index 04938e3625..6185db6f78 100644
--- a/src/i18n/locales/ca/common.json
+++ b/src/i18n/locales/ca/common.json
@@ -21,12 +21,7 @@
 	"confirmation": {
 		"reset_state": "Estàs segur que vols restablir tots els estats i emmagatzematge secret a l'extensió? Això no es pot desfer.",
 		"delete_config_profile": "Estàs segur que vols eliminar aquest perfil de configuració?",
-		"delete_custom_mode_with_rules": "Esteu segur que voleu suprimir aquest mode {scope}?\n\nAixò també suprimirà la carpeta de regles associada a:\n{rulesFolderPath}",
-		"delete_message": "Què vols eliminar?",
-		"edit_warning": "Editar aquest missatge eliminarà tots els missatges posteriors de la conversa. Vols continuar?",
-		"delete_just_this_message": "Només aquest missatge",
-		"delete_this_and_subsequent": "Aquest i tots els missatges posteriors",
-		"proceed": "Continuar"
+		"delete_custom_mode_with_rules": "Esteu segur que voleu suprimir aquest mode {scope}?\n\nAixò també suprimirà la carpeta de regles associada a:\n{rulesFolderPath}"
 	},
 	"errors": {
 		"invalid_data_uri": "Format d'URI de dades no vàlid",
diff --git a/src/i18n/locales/de/common.json b/src/i18n/locales/de/common.json
index 9fa27c89c6..3e2b7df4ab 100644
--- a/src/i18n/locales/de/common.json
+++ b/src/i18n/locales/de/common.json
@@ -17,12 +17,7 @@
 	"confirmation": {
 		"reset_state": "Möchtest du wirklich alle Zustände und geheimen Speicher in der Erweiterung zurücksetzen? Dies kann nicht rückgängig gemacht werden.",
 		"delete_config_profile": "Möchtest du dieses Konfigurationsprofil wirklich löschen?",
-		"delete_custom_mode_with_rules": "Bist du sicher, dass du diesen {scope}-Modus löschen möchtest?\n\nDadurch wird auch der zugehörige Regelordner unter folgender Adresse gelöscht:\n{rulesFolderPath}",
-		"delete_message": "Was möchtest du löschen?",
-		"edit_warning": "Das Bearbeiten dieser Nachricht wird alle nachfolgenden Nachrichten in der Unterhaltung löschen. Möchtest du fortfahren?",
-		"delete_just_this_message": "Nur diese Nachricht",
-		"delete_this_and_subsequent": "Diese und alle nachfolgenden Nachrichten",
-		"proceed": "Fortfahren"
+		"delete_custom_mode_with_rules": "Bist du sicher, dass du diesen {scope}-Modus löschen möchtest?\n\nDadurch wird auch der zugehörige Regelordner unter folgender Adresse gelöscht:\n{rulesFolderPath}"
 	},
 	"errors": {
 		"invalid_data_uri": "Ungültiges Daten-URI-Format",
diff --git a/src/i18n/locales/es/common.json b/src/i18n/locales/es/common.json
index 68750e888f..8cfc5dab68 100644
--- a/src/i18n/locales/es/common.json
+++ b/src/i18n/locales/es/common.json
@@ -17,12 +17,7 @@
 	"confirmation": {
 		"reset_state": "¿Estás seguro de que deseas restablecer todo el estado y el almacenamiento secreto en la extensión? Esta acción no se puede deshacer.",
 		"delete_config_profile": "¿Estás seguro de que deseas eliminar este perfil de configuración?",
-		"delete_custom_mode_with_rules": "¿Estás seguro de que quieres eliminar este modo {scope}?\n\nEsto también eliminará la carpeta de reglas asociada en:\n{rulesFolderPath}",
-		"delete_message": "¿Qué deseas eliminar?",
-		"edit_warning": "Editar este mensaje eliminará todos los mensajes posteriores en la conversación. ¿Deseas continuar?",
-		"delete_just_this_message": "Solo este mensaje",
-		"delete_this_and_subsequent": "Este y todos los mensajes posteriores",
-		"proceed": "Continuar"
+		"delete_custom_mode_with_rules": "¿Estás seguro de que quieres eliminar este modo {scope}?\n\nEsto también eliminará la carpeta de reglas asociada en:\n{rulesFolderPath}"
 	},
 	"errors": {
 		"invalid_data_uri": "Formato de URI de datos no válido",
diff --git a/src/i18n/locales/fr/common.json b/src/i18n/locales/fr/common.json
index e985fe9468..1ef2dd59c7 100644
--- a/src/i18n/locales/fr/common.json
+++ b/src/i18n/locales/fr/common.json
@@ -17,12 +17,7 @@
 	"confirmation": {
 		"reset_state": "Êtes-vous sûr de vouloir réinitialiser le global state et le stockage de secrets de l'extension ? Cette action est irréversible.",
 		"delete_config_profile": "Êtes-vous sûr de vouloir supprimer ce profil de configuration ?",
-		"delete_custom_mode_with_rules": "Êtes-vous sûr de vouloir supprimer ce mode {scope} ?\n\nCela supprimera également le dossier de règles associé à l'adresse :\n{rulesFolderPath}",
-		"delete_message": "Que souhaitez-vous supprimer ?",
-		"edit_warning": "Modifier ce message supprimera tous les messages suivants dans la conversation. Voulez-vous continuer ?",
-		"delete_just_this_message": "Uniquement ce message",
-		"delete_this_and_subsequent": "Ce message et tous les messages suivants",
-		"proceed": "Continuer"
+		"delete_custom_mode_with_rules": "Êtes-vous sûr de vouloir supprimer ce mode {scope} ?\n\nCela supprimera également le dossier de règles associé à l'adresse :\n{rulesFolderPath}"
 	},
 	"errors": {
 		"invalid_data_uri": "Format d'URI de données invalide",
diff --git a/src/i18n/locales/hi/common.json b/src/i18n/locales/hi/common.json
index a16a22ece5..d1e27c0701 100644
--- a/src/i18n/locales/hi/common.json
+++ b/src/i18n/locales/hi/common.json
@@ -17,12 +17,7 @@
 	"confirmation": {
 		"reset_state": "क्या आप वाकई एक्सटेंशन में सभी स्टेट और गुप्त स्टोरेज रीसेट करना चाहते हैं? इसे पूर्ववत नहीं किया जा सकता है।",
 		"delete_config_profile": "क्या आप वाकई इस कॉन्फ़िगरेशन प्रोफ़ाइल को हटाना चाहते हैं?",
-		"delete_custom_mode_with_rules": "क्या आप वाकई इस {scope} मोड को हटाना चाहते हैं?\n\nयह संबंधित नियम फ़ोल्डर को भी यहाँ हटा देगा:\n{rulesFolderPath}",
-		"delete_message": "आप क्या हटाना चाहते हैं?",
-		"edit_warning": "इस संदेश को संपादित करने से बातचीत के सभी बाद के संदेश हट जाएंगे। क्या आप जारी रखना चाहते हैं?",
-		"delete_just_this_message": "सिर्फ यह संदेश",
-		"delete_this_and_subsequent": "यह और सभी बाद के संदेश",
-		"proceed": "जारी रखें"
+		"delete_custom_mode_with_rules": "क्या आप वाकई इस {scope} मोड को हटाना चाहते हैं?\n\nयह संबंधित नियम फ़ोल्डर को भी यहाँ हटा देगा:\n{rulesFolderPath}"
 	},
 	"errors": {
 		"invalid_data_uri": "अमान्य डेटा URI फॉर्मेट",
diff --git a/src/i18n/locales/id/common.json b/src/i18n/locales/id/common.json
index d40bce9186..364094416f 100644
--- a/src/i18n/locales/id/common.json
+++ b/src/i18n/locales/id/common.json
@@ -17,12 +17,7 @@
 	"confirmation": {
 		"reset_state": "Apakah kamu yakin ingin mereset semua state dan secret storage di ekstensi? Ini tidak dapat dibatalkan.",
 		"delete_config_profile": "Apakah kamu yakin ingin menghapus profil konfigurasi ini?",
-		"delete_custom_mode_with_rules": "Anda yakin ingin menghapus mode {scope} ini?\n\nIni juga akan menghapus folder aturan terkait di:\n{rulesFolderPath}",
-		"delete_message": "Apa yang ingin kamu hapus?",
-		"edit_warning": "Mengedit pesan ini akan menghapus semua pesan selanjutnya dalam percakapan. Apakah kamu ingin melanjutkan?",
-		"delete_just_this_message": "Hanya pesan ini",
-		"delete_this_and_subsequent": "Ini dan semua pesan selanjutnya",
-		"proceed": "Lanjutkan"
+		"delete_custom_mode_with_rules": "Anda yakin ingin menghapus mode {scope} ini?\n\nIni juga akan menghapus folder aturan terkait di:\n{rulesFolderPath}"
 	},
 	"errors": {
 		"invalid_data_uri": "Format data URI tidak valid",
diff --git a/src/i18n/locales/it/common.json b/src/i18n/locales/it/common.json
index a6782267ce..d53616b784 100644
--- a/src/i18n/locales/it/common.json
+++ b/src/i18n/locales/it/common.json
@@ -17,12 +17,7 @@
 	"confirmation": {
 		"reset_state": "Sei sicuro di voler reimpostare tutti gli stati e l'archiviazione segreta nell'estensione? Questa azione non può essere annullata.",
 		"delete_config_profile": "Sei sicuro di voler eliminare questo profilo di configurazione?",
-		"delete_custom_mode_with_rules": "Sei sicuro di voler eliminare questa modalità {scope}?\n\nQuesto eliminerà anche la cartella delle regole associata in:\n{rulesFolderPath}",
-		"delete_message": "Cosa desideri eliminare?",
-		"edit_warning": "Modificare questo messaggio eliminerà tutti i messaggi successivi nella conversazione. Vuoi continuare?",
-		"delete_just_this_message": "Solo questo messaggio",
-		"delete_this_and_subsequent": "Questo e tutti i messaggi successivi",
-		"proceed": "Continua"
+		"delete_custom_mode_with_rules": "Sei sicuro di voler eliminare questa modalità {scope}?\n\nQuesto eliminerà anche la cartella delle regole associata in:\n{rulesFolderPath}"
 	},
 	"errors": {
 		"invalid_data_uri": "Formato URI dati non valido",
diff --git a/src/i18n/locales/ja/common.json b/src/i18n/locales/ja/common.json
index 9722281d0c..4cce517700 100644
--- a/src/i18n/locales/ja/common.json
+++ b/src/i18n/locales/ja/common.json
@@ -17,12 +17,7 @@
 	"confirmation": {
 		"reset_state": "拡張機能のすべての状態とシークレットストレージをリセットしてもよろしいですか？この操作は元に戻せません。",
 		"delete_config_profile": "この設定プロファイルを削除してもよろしいですか？",
-		"delete_custom_mode_with_rules": "この{scope}モードを削除してもよろしいですか？\n\nこれにより、関連するルールフォルダも次の場所で削除されます:\n{rulesFolderPath}",
-		"delete_message": "何を削除しますか？",
-		"edit_warning": "このメッセージを編集すると、会話内のすべての後続メッセージが削除されます。続行しますか？",
-		"delete_just_this_message": "このメッセージのみ",
-		"delete_this_and_subsequent": "これ以降のすべてのメッセージ",
-		"proceed": "続行"
+		"delete_custom_mode_with_rules": "この{scope}モードを削除してもよろしいですか？\n\nこれにより、関連するルールフォルダも次の場所で削除されます:\n{rulesFolderPath}"
 	},
 	"errors": {
 		"invalid_data_uri": "データURIフォーマットが無効です",
diff --git a/src/i18n/locales/ko/common.json b/src/i18n/locales/ko/common.json
index 81c80154d0..81a31aeb98 100644
--- a/src/i18n/locales/ko/common.json
+++ b/src/i18n/locales/ko/common.json
@@ -17,12 +17,7 @@
 	"confirmation": {
 		"reset_state": "확장 프로그램의 모든 상태와 보안 저장소를 재설정하시겠습니까? 이 작업은 취소할 수 없습니다.",
 		"delete_config_profile": "이 구성 프로필을 삭제하시겠습니까?",
-		"delete_custom_mode_with_rules": "이 {scope} 모드를 삭제하시겠습니까?\n\n이렇게 하면 연결된 규칙 폴더도 다음 위치에서 삭제됩니다:\n{rulesFolderPath}",
-		"delete_message": "무엇을 삭제하시겠습니까?",
-		"edit_warning": "이 메시지를 편집하면 대화의 모든 후속 메시지가 삭제됩니다. 계속하시겠습니까?",
-		"delete_just_this_message": "이 메시지만",
-		"delete_this_and_subsequent": "이 메시지와 모든 후속 메시지",
-		"proceed": "계속"
+		"delete_custom_mode_with_rules": "이 {scope} 모드를 삭제하시겠습니까?\n\n이렇게 하면 연결된 규칙 폴더도 다음 위치에서 삭제됩니다:\n{rulesFolderPath}"
 	},
 	"errors": {
 		"invalid_data_uri": "잘못된 데이터 URI 형식",
diff --git a/src/i18n/locales/nl/common.json b/src/i18n/locales/nl/common.json
index 68ad31e728..49d08158a5 100644
--- a/src/i18n/locales/nl/common.json
+++ b/src/i18n/locales/nl/common.json
@@ -17,12 +17,7 @@
 	"confirmation": {
 		"reset_state": "Weet je zeker dat je alle status en geheime opslag in de extensie wilt resetten? Dit kan niet ongedaan worden gemaakt.",
 		"delete_config_profile": "Weet je zeker dat je dit configuratieprofiel wilt verwijderen?",
-		"delete_custom_mode_with_rules": "Weet je zeker dat je deze {scope}-modus wilt verwijderen?\n\nDit verwijdert ook de bijbehorende regelsmap op:\n{rulesFolderPath}",
-		"delete_message": "Wat wil je verwijderen?",
-		"delete_just_this_message": "Alleen dit bericht",
-		"delete_this_and_subsequent": "Dit en alle volgende berichten",
-		"edit_warning": "Het bewerken van dit bericht zal alle volgende berichten in het gesprek verwijderen. Wil je doorgaan?",
-		"proceed": "Doorgaan"
+		"delete_custom_mode_with_rules": "Weet je zeker dat je deze {scope}-modus wilt verwijderen?\n\nDit verwijdert ook de bijbehorende regelsmap op:\n{rulesFolderPath}"
 	},
 	"errors": {
 		"invalid_data_uri": "Ongeldig data-URI-formaat",
diff --git a/src/i18n/locales/pl/common.json b/src/i18n/locales/pl/common.json
index 7dc510e71c..801297debb 100644
--- a/src/i18n/locales/pl/common.json
+++ b/src/i18n/locales/pl/common.json
@@ -17,12 +17,7 @@
 	"confirmation": {
 		"reset_state": "Czy na pewno chcesz zresetować wszystkie stany i tajne magazyny w rozszerzeniu? Tej operacji nie można cofnąć.",
 		"delete_config_profile": "Czy na pewno chcesz usunąć ten profil konfiguracyjny?",
-		"delete_custom_mode_with_rules": "Czy na pewno chcesz usunąć ten tryb {scope}?\n\nSpowoduje to również usunięcie powiązanego folderu reguł pod adresem:\n{rulesFolderPath}",
-		"delete_message": "Co chcesz usunąć?",
-		"delete_just_this_message": "Tylko tę wiadomość",
-		"delete_this_and_subsequent": "Tę i wszystkie kolejne wiadomości",
-		"edit_warning": "Edytowanie tej wiadomości usunie wszystkie kolejne wiadomości w rozmowie. Czy chcesz kontynuować?",
-		"proceed": "Kontynuuj"
+		"delete_custom_mode_with_rules": "Czy na pewno chcesz usunąć ten tryb {scope}?\n\nSpowoduje to również usunięcie powiązanego folderu reguł pod adresem:\n{rulesFolderPath}"
 	},
 	"errors": {
 		"invalid_data_uri": "Nieprawidłowy format URI danych",
diff --git a/src/i18n/locales/pt-BR/common.json b/src/i18n/locales/pt-BR/common.json
index 7ee3b8a658..c1ff408c9d 100644
--- a/src/i18n/locales/pt-BR/common.json
+++ b/src/i18n/locales/pt-BR/common.json
@@ -21,12 +21,7 @@
 	"confirmation": {
 		"reset_state": "Tem certeza de que deseja redefinir todo o estado e armazenamento secreto na extensão? Isso não pode ser desfeito.",
 		"delete_config_profile": "Tem certeza de que deseja excluir este perfil de configuração?",
-		"delete_custom_mode_with_rules": "Tem certeza de que deseja excluir este modo {scope}?\n\nIsso também excluirá a pasta de regras associada em:\n{rulesFolderPath}",
-		"delete_message": "O que você gostaria de excluir?",
-		"delete_just_this_message": "Apenas esta mensagem",
-		"delete_this_and_subsequent": "Esta e todas as mensagens subsequentes",
-		"edit_warning": "Editar esta mensagem excluirá todas as mensagens subsequentes na conversa. Deseja continuar?",
-		"proceed": "Continuar"
+		"delete_custom_mode_with_rules": "Tem certeza de que deseja excluir este modo {scope}?\n\nIsso também excluirá a pasta de regras associada em:\n{rulesFolderPath}"
 	},
 	"errors": {
 		"invalid_data_uri": "Formato de URI de dados inválido",
diff --git a/src/i18n/locales/ru/common.json b/src/i18n/locales/ru/common.json
index 8e100bff9a..7a683e12d7 100644
--- a/src/i18n/locales/ru/common.json
+++ b/src/i18n/locales/ru/common.json
@@ -17,12 +17,7 @@
 	"confirmation": {
 		"reset_state": "Вы уверены, что хотите сбросить все состояние и секретное хранилище в расширении? Это действие нельзя отменить.",
 		"delete_config_profile": "Вы уверены, что хотите удалить этот профиль конфигурации?",
-		"delete_custom_mode_with_rules": "Вы уверены, что хотите удалить этот режим {scope}?\n\nЭто также приведет к удалению соответствующей папки правил по адресу:\n{rulesFolderPath}",
-		"delete_message": "Что вы хотите удалить?",
-		"delete_just_this_message": "Только это сообщение",
-		"delete_this_and_subsequent": "Это и все последующие сообщения",
-		"edit_warning": "Редактирование этого сообщения удалит все последующие сообщения в разговоре. Хотите продолжить?",
-		"proceed": "Продолжить"
+		"delete_custom_mode_with_rules": "Вы уверены, что хотите удалить этот режим {scope}?\n\nЭто также приведет к удалению соответствующей папки правил по адресу:\n{rulesFolderPath}"
 	},
 	"errors": {
 		"invalid_data_uri": "Неверный формат URI данных",
diff --git a/src/i18n/locales/tr/common.json b/src/i18n/locales/tr/common.json
index df8212cf3c..039c731247 100644
--- a/src/i18n/locales/tr/common.json
+++ b/src/i18n/locales/tr/common.json
@@ -17,12 +17,7 @@
 	"confirmation": {
 		"reset_state": "Uzantıdaki tüm durumları ve gizli depolamayı sıfırlamak istediğinizden emin misiniz? Bu işlem geri alınamaz.",
 		"delete_config_profile": "Bu yapılandırma profilini silmek istediğinizden emin misiniz?",
-		"delete_custom_mode_with_rules": "Bu {scope} modunu silmek istediğinizden emin misiniz?\n\nBu işlem, ilişkili kurallar klasörünü de şu konumdan silecektir:\n{rulesFolderPath}",
-		"delete_message": "Neyi silmek istersiniz?",
-		"delete_just_this_message": "Sadece bu mesajı",
-		"delete_this_and_subsequent": "Bu ve sonraki tüm mesajları",
-		"edit_warning": "Bu mesajı düzenlemek konuşmadaki tüm sonraki mesajları silecektir. Devam etmek istiyor musunuz?",
-		"proceed": "Devam et"
+		"delete_custom_mode_with_rules": "Bu {scope} modunu silmek istediğinizden emin misiniz?\n\nBu işlem, ilişkili kurallar klasörünü de şu konumdan silecektir:\n{rulesFolderPath}"
 	},
 	"errors": {
 		"invalid_data_uri": "Geçersiz veri URI formatı",
diff --git a/src/i18n/locales/vi/common.json b/src/i18n/locales/vi/common.json
index 6710cd136d..7ef096f095 100644
--- a/src/i18n/locales/vi/common.json
+++ b/src/i18n/locales/vi/common.json
@@ -17,12 +17,7 @@
 	"confirmation": {
 		"reset_state": "Bạn có chắc chắn muốn đặt lại tất cả trạng thái và lưu trữ bí mật trong tiện ích mở rộng không? Hành động này không thể hoàn tác.",
 		"delete_config_profile": "Bạn có chắc chắn muốn xóa hồ sơ cấu hình này không?",
-		"delete_custom_mode_with_rules": "Bạn có chắc chắn muốn xóa chế độ {scope} này không?\n\nThao tác này cũng sẽ xóa thư mục quy tắc liên quan tại:\n{rulesFolderPath}",
-		"delete_message": "Bạn muốn xóa gì?",
-		"delete_just_this_message": "Chỉ tin nhắn này",
-		"delete_this_and_subsequent": "Tin nhắn này và tất cả tin nhắn tiếp theo",
-		"edit_warning": "Chỉnh sửa tin nhắn này sẽ xóa tất cả tin nhắn tiếp theo trong cuộc trò chuyện. Bạn có muốn tiếp tục không?",
-		"proceed": "Tiếp tục"
+		"delete_custom_mode_with_rules": "Bạn có chắc chắn muốn xóa chế độ {scope} này không?\n\nThao tác này cũng sẽ xóa thư mục quy tắc liên quan tại:\n{rulesFolderPath}"
 	},
 	"errors": {
 		"invalid_data_uri": "Định dạng URI dữ liệu không hợp lệ",
diff --git a/src/i18n/locales/zh-CN/common.json b/src/i18n/locales/zh-CN/common.json
index 5a8fc51ef1..55027a634b 100644
--- a/src/i18n/locales/zh-CN/common.json
+++ b/src/i18n/locales/zh-CN/common.json
@@ -17,12 +17,7 @@
 	"confirmation": {
 		"reset_state": "您确定要重置扩展中的所有状态和密钥存储吗？此操作无法撤消。",
 		"delete_config_profile": "您确定要删除此配置文件吗？",
-		"delete_custom_mode_with_rules": "您确定要删除此 {scope} 模式吗？\n\n这也将删除位于以下位置的关联规则文件夹：\n{rulesFolderPath}",
-		"delete_message": "您想删除什么？",
-		"edit_warning": "编辑此消息将删除对话中的所有后续消息。您要继续吗？",
-		"delete_just_this_message": "仅此消息",
-		"delete_this_and_subsequent": "此消息及所有后续消息",
-		"proceed": "继续"
+		"delete_custom_mode_with_rules": "您确定要删除此 {scope} 模式吗？\n\n这也将删除位于以下位置的关联规则文件夹：\n{rulesFolderPath}"
 	},
 	"errors": {
 		"invalid_mcp_config": "项目MCP配置格式无效",
diff --git a/src/i18n/locales/zh-TW/common.json b/src/i18n/locales/zh-TW/common.json
index 2bfad5e00f..e1001842e4 100644
--- a/src/i18n/locales/zh-TW/common.json
+++ b/src/i18n/locales/zh-TW/common.json
@@ -17,12 +17,7 @@
 	"confirmation": {
 		"reset_state": "您確定要重設擴充套件中的所有狀態和金鑰儲存嗎？此操作無法復原。",
 		"delete_config_profile": "您確定要刪除此設定檔案嗎？",
-		"delete_custom_mode_with_rules": "您確定要刪除此 {scope} 模式嗎？\n\n這也將刪除位於以下位置的關聯規則資料夾：\n{rulesFolderPath}",
-		"delete_message": "您想刪除哪些內容？",
-		"edit_warning": "編輯此訊息將刪除對話中的所有後續訊息。您要繼續嗎？",
-		"delete_just_this_message": "僅這則訊息",
-		"delete_this_and_subsequent": "這則訊息及所有後續訊息",
-		"proceed": "繼續"
+		"delete_custom_mode_with_rules": "您確定要刪除此 {scope} 模式嗎？\n\n這也將刪除位於以下位置的關聯規則資料夾：\n{rulesFolderPath}"
 	},
 	"errors": {
 		"invalid_data_uri": "資料 URI 格式無效",
diff --git a/webview-ui/src/i18n/locales/ca/chat.json b/webview-ui/src/i18n/locales/ca/chat.json
index 848306a1cf..29989cefb5 100644
--- a/webview-ui/src/i18n/locales/ca/chat.json
+++ b/webview-ui/src/i18n/locales/ca/chat.json
@@ -316,5 +316,8 @@
 	},
 	"versionIndicator": {
 		"ariaLabel": "Versió {{version}} - Feu clic per veure les notes de llançament"
+	},
+	"editMessage": {
+		"placeholder": "Edita el teu missatge..."
 	}
 }
diff --git a/webview-ui/src/i18n/locales/ca/common.json b/webview-ui/src/i18n/locales/ca/common.json
index 267e0a62d7..c377fb973c 100644
--- a/webview-ui/src/i18n/locales/ca/common.json
+++ b/webview-ui/src/i18n/locales/ca/common.json
@@ -51,5 +51,13 @@
 		"success": {
 			"imageDataUriCopied": "URI de dades de la imatge copiada al porta-retalls"
 		}
+	},
+	"confirmation": {
+		"delete_message": "Eliminar missatge",
+		"delete_warning": "Eliminar aquest missatge eliminarà tots els missatges posteriors de la conversa. Vols continuar?",
+		"edit_message": "Editar missatge",
+		"edit_warning": "Editar aquest missatge eliminarà tots els missatges posteriors de la conversa. Vols continuar?",
+		"proceed": "Continuar",
+		"dont_show_again": "No tornis a mostrar això"
 	}
 }
diff --git a/webview-ui/src/i18n/locales/de/chat.json b/webview-ui/src/i18n/locales/de/chat.json
index f28448ce54..fa9b7e02ae 100644
--- a/webview-ui/src/i18n/locales/de/chat.json
+++ b/webview-ui/src/i18n/locales/de/chat.json
@@ -316,5 +316,8 @@
 	},
 	"versionIndicator": {
 		"ariaLabel": "Version {{version}} - Klicken Sie, um die Versionshinweise anzuzeigen"
+	},
+	"editMessage": {
+		"placeholder": "Bearbeite deine Nachricht..."
 	}
 }
diff --git a/webview-ui/src/i18n/locales/de/common.json b/webview-ui/src/i18n/locales/de/common.json
index 76b9064bc3..d1b864e2e3 100644
--- a/webview-ui/src/i18n/locales/de/common.json
+++ b/webview-ui/src/i18n/locales/de/common.json
@@ -51,5 +51,13 @@
 		"success": {
 			"imageDataUriCopied": "Bild-Daten-URI in die Zwischenablage kopiert"
 		}
+	},
+	"confirmation": {
+		"delete_message": "Nachricht löschen",
+		"delete_warning": "Das Löschen dieser Nachricht wird alle nachfolgenden Nachrichten in der Unterhaltung löschen. Möchtest du fortfahren?",
+		"edit_message": "Nachricht bearbeiten",
+		"edit_warning": "Das Bearbeiten dieser Nachricht wird alle nachfolgenden Nachrichten in der Unterhaltung löschen. Möchtest du fortfahren?",
+		"proceed": "Fortfahren",
+		"dont_show_again": "Nicht mehr anzeigen"
 	}
 }
diff --git a/webview-ui/src/i18n/locales/es/chat.json b/webview-ui/src/i18n/locales/es/chat.json
index 71a26f6c10..864d074c3b 100644
--- a/webview-ui/src/i18n/locales/es/chat.json
+++ b/webview-ui/src/i18n/locales/es/chat.json
@@ -316,5 +316,8 @@
 	},
 	"versionIndicator": {
 		"ariaLabel": "Versión {{version}} - Haz clic para ver las notas de la versión"
+	},
+	"editMessage": {
+		"placeholder": "Edita tu mensaje..."
 	}
 }
diff --git a/webview-ui/src/i18n/locales/es/common.json b/webview-ui/src/i18n/locales/es/common.json
index 5fe624372f..47122163a6 100644
--- a/webview-ui/src/i18n/locales/es/common.json
+++ b/webview-ui/src/i18n/locales/es/common.json
@@ -51,5 +51,13 @@
 		"success": {
 			"imageDataUriCopied": "URI de datos de imagen copiada al portapapeles"
 		}
+	},
+	"confirmation": {
+		"delete_message": "Eliminar mensaje",
+		"delete_warning": "Eliminar este mensaje eliminará todos los mensajes posteriores en la conversación. ¿Deseas continuar?",
+		"edit_message": "Editar mensaje",
+		"edit_warning": "Editar este mensaje eliminará todos los mensajes posteriores en la conversación. ¿Deseas continuar?",
+		"proceed": "Continuar",
+		"dont_show_again": "No mostrar esto de nuevo"
 	}
 }
diff --git a/webview-ui/src/i18n/locales/fr/chat.json b/webview-ui/src/i18n/locales/fr/chat.json
index 19531f2554..9c0805c737 100644
--- a/webview-ui/src/i18n/locales/fr/chat.json
+++ b/webview-ui/src/i18n/locales/fr/chat.json
@@ -316,5 +316,8 @@
 	},
 	"versionIndicator": {
 		"ariaLabel": "Version {{version}} - Cliquez pour voir les notes de version"
+	},
+	"editMessage": {
+		"placeholder": "Modifiez votre message..."
 	}
 }
diff --git a/webview-ui/src/i18n/locales/fr/common.json b/webview-ui/src/i18n/locales/fr/common.json
index 677116ff2a..4e640f1fa2 100644
--- a/webview-ui/src/i18n/locales/fr/common.json
+++ b/webview-ui/src/i18n/locales/fr/common.json
@@ -51,5 +51,13 @@
 		"success": {
 			"imageDataUriCopied": "URI de données d'image copiée dans le presse-papiers"
 		}
+	},
+	"confirmation": {
+		"delete_message": "Supprimer le message",
+		"delete_warning": "Supprimer ce message supprimera tous les messages suivants dans la conversation. Voulez-vous continuer ?",
+		"edit_message": "Modifier le message",
+		"edit_warning": "Modifier ce message supprimera tous les messages suivants dans la conversation. Voulez-vous continuer ?",
+		"proceed": "Continuer",
+		"dont_show_again": "Ne plus afficher ceci"
 	}
 }
diff --git a/webview-ui/src/i18n/locales/hi/chat.json b/webview-ui/src/i18n/locales/hi/chat.json
index a45317d2da..54f18ae6df 100644
--- a/webview-ui/src/i18n/locales/hi/chat.json
+++ b/webview-ui/src/i18n/locales/hi/chat.json
@@ -316,5 +316,8 @@
 	},
 	"versionIndicator": {
 		"ariaLabel": "संस्करण {{version}} - रिलीज़ नोट्स देखने के लिए क्लिक करें"
+	},
+	"editMessage": {
+		"placeholder": "अपना संदेश संपादित करें..."
 	}
 }
diff --git a/webview-ui/src/i18n/locales/hi/common.json b/webview-ui/src/i18n/locales/hi/common.json
index 77876eb274..21b3127eec 100644
--- a/webview-ui/src/i18n/locales/hi/common.json
+++ b/webview-ui/src/i18n/locales/hi/common.json
@@ -51,5 +51,13 @@
 		"success": {
 			"imageDataUriCopied": "इमेज डेटा URI क्लिपबोर्ड में कॉपी हो गया"
 		}
+	},
+	"confirmation": {
+		"delete_message": "संदेश हटाएं",
+		"delete_warning": "इस संदेश को हटाने से बातचीत के सभी बाद के संदेश हट जाएंगे। क्या आप जारी रखना चाहते हैं?",
+		"edit_message": "संदेश संपादित करें",
+		"edit_warning": "इस संदेश को संपादित करने से बातचीत के सभी बाद के संदेश हट जाएंगे। क्या आप जारी रखना चाहते हैं?",
+		"proceed": "जारी रखें",
+		"dont_show_again": "यह फिर से न दिखाएं"
 	}
 }
diff --git a/webview-ui/src/i18n/locales/id/chat.json b/webview-ui/src/i18n/locales/id/chat.json
index 7df325b7f9..8401a5777c 100644
--- a/webview-ui/src/i18n/locales/id/chat.json
+++ b/webview-ui/src/i18n/locales/id/chat.json
@@ -322,5 +322,8 @@
 	},
 	"versionIndicator": {
 		"ariaLabel": "Versi {{version}} - Klik untuk melihat catatan rilis"
+	},
+	"editMessage": {
+		"placeholder": "Edit pesan Anda..."
 	}
 }
diff --git a/webview-ui/src/i18n/locales/id/common.json b/webview-ui/src/i18n/locales/id/common.json
index d50246ced2..06d2455cd6 100644
--- a/webview-ui/src/i18n/locales/id/common.json
+++ b/webview-ui/src/i18n/locales/id/common.json
@@ -51,5 +51,13 @@
 		"success": {
 			"imageDataUriCopied": "Data URI gambar disalin ke clipboard"
 		}
+	},
+	"confirmation": {
+		"delete_message": "Hapus Pesan",
+		"delete_warning": "Menghapus pesan ini akan menghapus semua pesan selanjutnya dalam percakapan. Apakah kamu ingin melanjutkan?",
+		"edit_message": "Edit Pesan",
+		"edit_warning": "Mengedit pesan ini akan menghapus semua pesan selanjutnya dalam percakapan. Apakah kamu ingin melanjutkan?",
+		"proceed": "Lanjutkan",
+		"dont_show_again": "Jangan tampilkan lagi"
 	}
 }
diff --git a/webview-ui/src/i18n/locales/it/chat.json b/webview-ui/src/i18n/locales/it/chat.json
index 4b368f214f..259e4ef2b3 100644
--- a/webview-ui/src/i18n/locales/it/chat.json
+++ b/webview-ui/src/i18n/locales/it/chat.json
@@ -316,5 +316,8 @@
 	},
 	"versionIndicator": {
 		"ariaLabel": "Versione {{version}} - Clicca per visualizzare le note di rilascio"
+	},
+	"editMessage": {
+		"placeholder": "Modifica il tuo messaggio..."
 	}
 }
diff --git a/webview-ui/src/i18n/locales/it/common.json b/webview-ui/src/i18n/locales/it/common.json
index 9d5426aa0e..75c458f993 100644
--- a/webview-ui/src/i18n/locales/it/common.json
+++ b/webview-ui/src/i18n/locales/it/common.json
@@ -51,5 +51,13 @@
 		"success": {
 			"imageDataUriCopied": "URI dati immagine copiato negli appunti"
 		}
+	},
+	"confirmation": {
+		"delete_message": "Elimina Messaggio",
+		"delete_warning": "Eliminando questo messaggio verranno eliminati tutti i messaggi successivi nella conversazione. Vuoi procedere?",
+		"edit_message": "Modifica Messaggio",
+		"edit_warning": "Modificando questo messaggio verranno eliminati tutti i messaggi successivi nella conversazione. Vuoi procedere?",
+		"proceed": "Procedi",
+		"dont_show_again": "Non mostrare più"
 	}
 }
diff --git a/webview-ui/src/i18n/locales/ja/chat.json b/webview-ui/src/i18n/locales/ja/chat.json
index 5a19b64945..20aad74477 100644
--- a/webview-ui/src/i18n/locales/ja/chat.json
+++ b/webview-ui/src/i18n/locales/ja/chat.json
@@ -316,5 +316,8 @@
 	},
 	"versionIndicator": {
 		"ariaLabel": "バージョン {{version}} - クリックしてリリースノートを表示"
+	},
+	"editMessage": {
+		"placeholder": "メッセージを編集..."
 	}
 }
diff --git a/webview-ui/src/i18n/locales/ja/common.json b/webview-ui/src/i18n/locales/ja/common.json
index 975ea67834..2144a54f50 100644
--- a/webview-ui/src/i18n/locales/ja/common.json
+++ b/webview-ui/src/i18n/locales/ja/common.json
@@ -51,5 +51,13 @@
 		"success": {
 			"imageDataUriCopied": "画像データURIをクリップボードにコピーしました"
 		}
+	},
+	"confirmation": {
+		"delete_message": "メッセージを削除",
+		"delete_warning": "このメッセージを削除すると、会話内の後続のメッセージもすべて削除されます。続行しますか？",
+		"edit_message": "メッセージを編集",
+		"edit_warning": "このメッセージを編集すると、会話内の後続のメッセージもすべて削除されます。続行しますか？",
+		"proceed": "続行",
+		"dont_show_again": "今後表示しない"
 	}
 }
diff --git a/webview-ui/src/i18n/locales/ko/chat.json b/webview-ui/src/i18n/locales/ko/chat.json
index f3ed7699ca..4134d7e8f6 100644
--- a/webview-ui/src/i18n/locales/ko/chat.json
+++ b/webview-ui/src/i18n/locales/ko/chat.json
@@ -316,5 +316,8 @@
 	},
 	"versionIndicator": {
 		"ariaLabel": "버전 {{version}} - 릴리스 노트를 보려면 클릭하세요"
+	},
+	"editMessage": {
+		"placeholder": "메시지 편집..."
 	}
 }
diff --git a/webview-ui/src/i18n/locales/ko/common.json b/webview-ui/src/i18n/locales/ko/common.json
index 276f2cb20b..f5a9da65b2 100644
--- a/webview-ui/src/i18n/locales/ko/common.json
+++ b/webview-ui/src/i18n/locales/ko/common.json
@@ -51,5 +51,13 @@
 		"success": {
 			"imageDataUriCopied": "이미지 데이터 URI가 클립보드에 복사됨"
 		}
+	},
+	"confirmation": {
+		"delete_message": "메시지 삭제",
+		"delete_warning": "이 메시지를 삭제하면 대화의 모든 후속 메시지가 삭제됩니다. 계속하시겠습니까?",
+		"edit_message": "메시지 편집",
+		"edit_warning": "이 메시지를 편집하면 대화의 모든 후속 메시지가 삭제됩니다. 계속하시겠습니까?",
+		"proceed": "계속",
+		"dont_show_again": "다시 표시하지 않음"
 	}
 }
diff --git a/webview-ui/src/i18n/locales/nl/chat.json b/webview-ui/src/i18n/locales/nl/chat.json
index 874fb74bc7..3d77a767fe 100644
--- a/webview-ui/src/i18n/locales/nl/chat.json
+++ b/webview-ui/src/i18n/locales/nl/chat.json
@@ -316,5 +316,8 @@
 	},
 	"versionIndicator": {
 		"ariaLabel": "Versie {{version}} - Klik om release notes te bekijken"
+	},
+	"editMessage": {
+		"placeholder": "Bewerk je bericht..."
 	}
 }
diff --git a/webview-ui/src/i18n/locales/nl/common.json b/webview-ui/src/i18n/locales/nl/common.json
index 012808e51a..2ee3dc5e9a 100644
--- a/webview-ui/src/i18n/locales/nl/common.json
+++ b/webview-ui/src/i18n/locales/nl/common.json
@@ -51,5 +51,13 @@
 		"success": {
 			"imageDataUriCopied": "Afbeelding data-URI gekopieerd naar klembord"
 		}
+	},
+	"confirmation": {
+		"delete_message": "Bericht Verwijderen",
+		"delete_warning": "Het verwijderen van dit bericht zal alle volgende berichten in het gesprek verwijderen. Wil je doorgaan?",
+		"edit_message": "Bericht Bewerken",
+		"edit_warning": "Het bewerken van dit bericht zal alle volgende berichten in het gesprek verwijderen. Wil je doorgaan?",
+		"proceed": "Doorgaan",
+		"dont_show_again": "Niet meer tonen"
 	}
 }
diff --git a/webview-ui/src/i18n/locales/pl/chat.json b/webview-ui/src/i18n/locales/pl/chat.json
index 254f18c9ba..eed1749b9b 100644
--- a/webview-ui/src/i18n/locales/pl/chat.json
+++ b/webview-ui/src/i18n/locales/pl/chat.json
@@ -316,5 +316,8 @@
 	},
 	"versionIndicator": {
 		"ariaLabel": "Wersja {{version}} - Kliknij, aby wyświetlić informacje o wydaniu"
+	},
+	"editMessage": {
+		"placeholder": "Edytuj swoją wiadomość..."
 	}
 }
diff --git a/webview-ui/src/i18n/locales/pl/common.json b/webview-ui/src/i18n/locales/pl/common.json
index c72b046c42..af8053e21e 100644
--- a/webview-ui/src/i18n/locales/pl/common.json
+++ b/webview-ui/src/i18n/locales/pl/common.json
@@ -51,5 +51,13 @@
 		"success": {
 			"imageDataUriCopied": "URI danych obrazu skopiowane do schowka"
 		}
+	},
+	"confirmation": {
+		"delete_message": "Usuń Wiadomość",
+		"delete_warning": "Usunięcie tej wiadomości spowoduje usunięcie wszystkich kolejnych wiadomości w rozmowie. Czy chcesz kontynuować?",
+		"edit_message": "Edytuj Wiadomość",
+		"edit_warning": "Edycja tej wiadomości spowoduje usunięcie wszystkich kolejnych wiadomości w rozmowie. Czy chcesz kontynuować?",
+		"proceed": "Kontynuuj",
+		"dont_show_again": "Nie pokazuj ponownie"
 	}
 }
diff --git a/webview-ui/src/i18n/locales/pt-BR/chat.json b/webview-ui/src/i18n/locales/pt-BR/chat.json
index bebfe0c722..03dfa468fc 100644
--- a/webview-ui/src/i18n/locales/pt-BR/chat.json
+++ b/webview-ui/src/i18n/locales/pt-BR/chat.json
@@ -316,5 +316,8 @@
 	},
 	"versionIndicator": {
 		"ariaLabel": "Versão {{version}} - Clique para ver as notas de lançamento"
+	},
+	"editMessage": {
+		"placeholder": "Edite sua mensagem..."
 	}
 }
diff --git a/webview-ui/src/i18n/locales/pt-BR/common.json b/webview-ui/src/i18n/locales/pt-BR/common.json
index a911b2366f..4515eeeb9e 100644
--- a/webview-ui/src/i18n/locales/pt-BR/common.json
+++ b/webview-ui/src/i18n/locales/pt-BR/common.json
@@ -51,5 +51,13 @@
 		"success": {
 			"imageDataUriCopied": "URI de dados da imagem copiada para a área de transferência"
 		}
+	},
+	"confirmation": {
+		"delete_message": "Excluir Mensagem",
+		"delete_warning": "Excluir esta mensagem irá excluir todas as mensagens subsequentes na conversa. Deseja prosseguir?",
+		"edit_message": "Editar Mensagem",
+		"edit_warning": "Editar esta mensagem irá excluir todas as mensagens subsequentes na conversa. Deseja prosseguir?",
+		"proceed": "Prosseguir",
+		"dont_show_again": "Não mostrar novamente"
 	}
 }
diff --git a/webview-ui/src/i18n/locales/ru/chat.json b/webview-ui/src/i18n/locales/ru/chat.json
index 4ac8f4854a..6d31e3ed10 100644
--- a/webview-ui/src/i18n/locales/ru/chat.json
+++ b/webview-ui/src/i18n/locales/ru/chat.json
@@ -316,5 +316,8 @@
 	},
 	"versionIndicator": {
 		"ariaLabel": "Версия {{version}} - Нажмите, чтобы просмотреть примечания к выпуску"
+	},
+	"editMessage": {
+		"placeholder": "Редактировать сообщение..."
 	}
 }
diff --git a/webview-ui/src/i18n/locales/ru/common.json b/webview-ui/src/i18n/locales/ru/common.json
index e68899a2db..1e623475b2 100644
--- a/webview-ui/src/i18n/locales/ru/common.json
+++ b/webview-ui/src/i18n/locales/ru/common.json
@@ -51,5 +51,13 @@
 		"success": {
 			"imageDataUriCopied": "URI данных изображения скопирован в буфер обмена"
 		}
+	},
+	"confirmation": {
+		"delete_message": "Удалить Сообщение",
+		"delete_warning": "Удаление этого сообщения приведет к удалению всех последующих сообщений в разговоре. Хотите продолжить?",
+		"edit_message": "Редактировать Сообщение",
+		"edit_warning": "Редактирование этого сообщения приведет к удалению всех последующих сообщений в разговоре. Хотите продолжить?",
+		"proceed": "Продолжить",
+		"dont_show_again": "Больше не показывать"
 	}
 }
diff --git a/webview-ui/src/i18n/locales/tr/chat.json b/webview-ui/src/i18n/locales/tr/chat.json
index 56a9f54cb7..6aca7b9a80 100644
--- a/webview-ui/src/i18n/locales/tr/chat.json
+++ b/webview-ui/src/i18n/locales/tr/chat.json
@@ -316,5 +316,8 @@
 	},
 	"versionIndicator": {
 		"ariaLabel": "Sürüm {{version}} - Sürüm notlarını görüntülemek için tıklayın"
+	},
+	"editMessage": {
+		"placeholder": "Mesajını düzenle..."
 	}
 }
diff --git a/webview-ui/src/i18n/locales/tr/common.json b/webview-ui/src/i18n/locales/tr/common.json
index 23344ca966..a1695eab37 100644
--- a/webview-ui/src/i18n/locales/tr/common.json
+++ b/webview-ui/src/i18n/locales/tr/common.json
@@ -51,5 +51,13 @@
 		"success": {
 			"imageDataUriCopied": "Görsel veri URI'si panoya kopyalandı"
 		}
+	},
+	"confirmation": {
+		"delete_message": "Mesajı Sil",
+		"delete_warning": "Bu mesajı silmek, konuşmadaki sonraki tüm mesajları da silecektir. Devam etmek istiyor musun?",
+		"edit_message": "Mesajı Düzenle",
+		"edit_warning": "Bu mesajı düzenlemek, konuşmadaki sonraki tüm mesajları da silecektir. Devam etmek istiyor musun?",
+		"proceed": "Devam Et",
+		"dont_show_again": "Tekrar gösterme"
 	}
 }
diff --git a/webview-ui/src/i18n/locales/vi/chat.json b/webview-ui/src/i18n/locales/vi/chat.json
index 574df08da1..4522cd7917 100644
--- a/webview-ui/src/i18n/locales/vi/chat.json
+++ b/webview-ui/src/i18n/locales/vi/chat.json
@@ -316,5 +316,8 @@
 	},
 	"versionIndicator": {
 		"ariaLabel": "Phiên bản {{version}} - Nhấp để xem ghi chú phát hành"
+	},
+	"editMessage": {
+		"placeholder": "Chỉnh sửa tin nhắn của bạn..."
 	}
 }
diff --git a/webview-ui/src/i18n/locales/vi/common.json b/webview-ui/src/i18n/locales/vi/common.json
index 16952117ef..0f3a4d551f 100644
--- a/webview-ui/src/i18n/locales/vi/common.json
+++ b/webview-ui/src/i18n/locales/vi/common.json
@@ -51,5 +51,13 @@
 		"success": {
 			"imageDataUriCopied": "URI dữ liệu hình ảnh đã được sao chép vào clipboard"
 		}
+	},
+	"confirmation": {
+		"delete_message": "Xóa Tin Nhắn",
+		"delete_warning": "Xóa tin nhắn này sẽ xóa tất cả các tin nhắn tiếp theo trong cuộc trò chuyện. Bạn có muốn tiếp tục không?",
+		"edit_message": "Chỉnh Sửa Tin Nhắn",
+		"edit_warning": "Chỉnh sửa tin nhắn này sẽ xóa tất cả các tin nhắn tiếp theo trong cuộc trò chuyện. Bạn có muốn tiếp tục không?",
+		"proceed": "Tiếp Tục",
+		"dont_show_again": "Không hiển thị lại"
 	}
 }
diff --git a/webview-ui/src/i18n/locales/zh-CN/chat.json b/webview-ui/src/i18n/locales/zh-CN/chat.json
index f6e51cfa49..3f5d5ba48a 100644
--- a/webview-ui/src/i18n/locales/zh-CN/chat.json
+++ b/webview-ui/src/i18n/locales/zh-CN/chat.json
@@ -316,5 +316,8 @@
 	},
 	"versionIndicator": {
 		"ariaLabel": "版本 {{version}} - 点击查看发布说明"
+	},
+	"editMessage": {
+		"placeholder": "编辑消息..."
 	}
 }
diff --git a/webview-ui/src/i18n/locales/zh-CN/common.json b/webview-ui/src/i18n/locales/zh-CN/common.json
index 29f11c7f2f..587f5961c4 100644
--- a/webview-ui/src/i18n/locales/zh-CN/common.json
+++ b/webview-ui/src/i18n/locales/zh-CN/common.json
@@ -51,5 +51,13 @@
 		"success": {
 			"imageDataUriCopied": "图片数据 URI 已复制到剪贴板"
 		}
+	},
+	"confirmation": {
+		"delete_message": "删除消息",
+		"delete_warning": "删除此消息将删除对话中的所有后续消息。是否继续？",
+		"edit_message": "编辑消息",
+		"edit_warning": "编辑此消息将删除对话中的所有后续消息。是否继续？",
+		"proceed": "继续",
+		"dont_show_again": "不再显示"
 	}
 }
diff --git a/webview-ui/src/i18n/locales/zh-TW/chat.json b/webview-ui/src/i18n/locales/zh-TW/chat.json
index 54aeacf15c..1dc3b19f7a 100644
--- a/webview-ui/src/i18n/locales/zh-TW/chat.json
+++ b/webview-ui/src/i18n/locales/zh-TW/chat.json
@@ -316,5 +316,8 @@
 	},
 	"versionIndicator": {
 		"ariaLabel": "版本 {{version}} - 點擊查看發布說明"
+	},
+	"editMessage": {
+		"placeholder": "編輯訊息..."
 	}
 }
diff --git a/webview-ui/src/i18n/locales/zh-TW/common.json b/webview-ui/src/i18n/locales/zh-TW/common.json
index b8ec7f998e..210f83a4fd 100644
--- a/webview-ui/src/i18n/locales/zh-TW/common.json
+++ b/webview-ui/src/i18n/locales/zh-TW/common.json
@@ -51,5 +51,13 @@
 		"success": {
 			"imageDataUriCopied": "圖片資料 URI 已複製到剪貼簿"
 		}
+	},
+	"confirmation": {
+		"delete_message": "刪除訊息",
+		"delete_warning": "刪除此訊息將刪除對話中的所有後續訊息。是否繼續？",
+		"edit_message": "編輯訊息",
+		"edit_warning": "編輯此訊息將刪除對話中的所有後續訊息。是否繼續？",
+		"proceed": "繼續",
+		"dont_show_again": "不再顯示"
 	}
 }

From 67fd5a78ad930af8dbb17cde8813349d31bf1215 Mon Sep 17 00:00:00 2001
From: Will Li <willeli2002@gmail.com>
Date: Wed, 9 Jul 2025 17:08:10 -0700
Subject: [PATCH 07/14] add back hidden flag

---
 webview-ui/src/components/chat/ChatRow.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webview-ui/src/components/chat/ChatRow.tsx b/webview-ui/src/components/chat/ChatRow.tsx
index 60786945df..d467424ec9 100644
--- a/webview-ui/src/components/chat/ChatRow.tsx
+++ b/webview-ui/src/components/chat/ChatRow.tsx
@@ -1073,7 +1073,7 @@ export const ChatRowContent = ({
 										<Button
 											variant="ghost"
 											size="icon"
-											className="shrink-0"
+											className="shrink-0 hidden"
 											disabled={isStreaming}
 											onClick={(e) => {
 												e.stopPropagation()

From f89d76810102f337c469a797ad97e7dab72a09c0 Mon Sep 17 00:00:00 2001
From: Will Li <willeli2002@gmail.com>
Date: Thu, 10 Jul 2025 17:26:36 -0700
Subject: [PATCH 08/14] remove option to skip notif

---
 packages/types/src/global-settings.ts         |   4 -
 .../webview/__tests__/ClineProvider.spec.ts   | 123 ------------------
 .../__tests__/webviewMessageHandler.spec.ts   | 114 +---------------
 src/core/webview/webviewMessageHandler.ts     |  46 ++-----
 src/shared/ExtensionMessage.ts                |   2 -
 src/shared/WebviewMessage.ts                  |   2 -
 webview-ui/src/App.tsx                        |  49 +------
 .../MessageModificationConfirmationDialog.tsx |  34 +----
 .../src/context/ExtensionStateContext.tsx     |  14 --
 9 files changed, 22 insertions(+), 366 deletions(-)

diff --git a/packages/types/src/global-settings.ts b/packages/types/src/global-settings.ts
index 2bff4cfb9a..79a09ff017 100644
--- a/packages/types/src/global-settings.ts
+++ b/packages/types/src/global-settings.ts
@@ -110,10 +110,6 @@ export const globalSettingsSchema = z.object({
 	hasOpenedModeSelector: z.boolean().optional(),
 	lastModeExportPath: z.string().optional(),
 	lastModeImportPath: z.string().optional(),
-
-	// Message modification confirmation preferences
-	skipEditMessageConfirmation: z.boolean().optional(),
-	skipDeleteMessageConfirmation: z.boolean().optional(),
 })
 
 export type GlobalSettings = z.infer<typeof globalSettingsSchema>
diff --git a/src/core/webview/__tests__/ClineProvider.spec.ts b/src/core/webview/__tests__/ClineProvider.spec.ts
index fb3c8372e0..dd9ee12bfc 100644
--- a/src/core/webview/__tests__/ClineProvider.spec.ts
+++ b/src/core/webview/__tests__/ClineProvider.spec.ts
@@ -1164,11 +1164,6 @@ describe("ClineProvider", () => {
 	describe("deleteMessage", () => {
 		beforeEach(async () => {
 			await provider.resolveWebviewView(mockWebviewView)
-			// Mock that skipDeleteMessageConfirmation is false by default
-			;(mockContext.globalState.get as any).mockImplementation((key: string) => {
-				if (key === "skipDeleteMessageConfirmation") return false
-				return undefined
-			})
 		})
 
 		test("handles deletion with confirmation dialog", async () => {
@@ -1231,63 +1226,6 @@ describe("ClineProvider", () => {
 			expect((provider as any).initClineWithHistoryItem).toHaveBeenCalledWith({ id: "test-task-id" })
 		})
 
-		test("handles deletion with skipDeleteMessageConfirmation enabled", async () => {
-			// Mock that skipDeleteMessageConfirmation is true
-			const contextProxy = (provider as any).contextProxy
-			const getValueSpy = vi.spyOn(contextProxy, "getValue")
-			getValueSpy.mockImplementation((key: any) => {
-				if (key === "skipDeleteMessageConfirmation") return true
-				return undefined
-			})
-
-			// Setup mock messages
-			const mockMessages = [
-				{ ts: 1000, type: "say", say: "user_feedback" },
-				{ ts: 2000, type: "say", say: "text", value: 3000 }, // Message to delete
-				{ ts: 3000, type: "say", say: "user_feedback" },
-				{ ts: 4000, type: "say", say: "user_feedback" },
-			] as ClineMessage[]
-
-			const mockApiHistory = [
-				{ ts: 1000 },
-				{ ts: 2000 },
-				{ ts: 3000 },
-				{ ts: 4000 },
-			] as (Anthropic.MessageParam & {
-				ts?: number
-			})[]
-
-			// Setup Cline instance with auto-mock from the top of the file
-			const mockCline = new Task(defaultTaskOptions) // Create a new mocked instance
-			mockCline.clineMessages = mockMessages
-			mockCline.apiConversationHistory = mockApiHistory
-			await provider.addClineToStack(mockCline)
-
-			// Mock getTaskWithId
-			;(provider as any).getTaskWithId = vi.fn().mockResolvedValue({
-				historyItem: { id: "test-task-id" },
-			})
-
-			// Mock initClineWithHistoryItem
-			;(provider as any).initClineWithHistoryItem = vi.fn()
-
-			// Trigger message deletion
-			const messageHandler = (mockWebviewView.webview.onDidReceiveMessage as any).mock.calls[0][0]
-			await messageHandler({ type: "deleteMessage", value: 3000 })
-
-			// Verify that NO dialog message was sent to webview (skipped)
-			expect(mockPostMessage).not.toHaveBeenCalledWith({
-				type: "showDeleteMessageDialog",
-				messageTs: 3000,
-			})
-
-			// Verify only messages before the deleted message were kept
-			expect(mockCline.overwriteClineMessages).toHaveBeenCalledWith([mockMessages[0]])
-
-			// Verify only API messages before the deleted message were kept
-			expect(mockCline.overwriteApiConversationHistory).toHaveBeenCalledWith([mockApiHistory[0]])
-		})
-
 		test("handles case when no current task exists", async () => {
 			// Clear the cline stack
 			;(provider as any).clineStack = []
@@ -1308,11 +1246,6 @@ describe("ClineProvider", () => {
 	describe("editMessage", () => {
 		beforeEach(async () => {
 			await provider.resolveWebviewView(mockWebviewView)
-			// Mock that skipEditMessageConfirmation is false by default
-			;(mockContext.globalState.get as any).mockImplementation((key: string) => {
-				if (key === "skipEditMessageConfirmation") return false
-				return undefined
-			})
 		})
 
 		test("handles edit with confirmation dialog", async () => {
@@ -1390,56 +1323,6 @@ describe("ClineProvider", () => {
 			// We need to verify the recursive call happened by checking if the handler was called again
 			expect((mockWebviewView.webview.onDidReceiveMessage as any).mock.calls.length).toBeGreaterThanOrEqual(1)
 		})
-
-		test("handles edit with skipEditMessageConfirmation enabled", async () => {
-			// Mock that skipEditMessageConfirmation is true
-			const contextProxy = (provider as any).contextProxy
-			const getValueSpy = vi.spyOn(contextProxy, "getValue")
-			getValueSpy.mockImplementation((key: any) => {
-				if (key === "skipEditMessageConfirmation") return true
-				return undefined
-			})
-
-			// Setup mock messages
-			const mockMessages = [
-				{ ts: 1000, type: "say", say: "user_feedback" },
-				{ ts: 2000, type: "say", say: "text", value: 3000 }, // Message to edit
-				{ ts: 3000, type: "say", say: "user_feedback" },
-			] as ClineMessage[]
-
-			const mockApiHistory = [{ ts: 1000 }, { ts: 2000 }, { ts: 3000 }] as (Anthropic.MessageParam & {
-				ts?: number
-			})[]
-
-			// Setup Task instance
-			const mockCline = new Task(defaultTaskOptions)
-			mockCline.clineMessages = mockMessages
-			mockCline.apiConversationHistory = mockApiHistory
-			mockCline.overwriteClineMessages = vi.fn()
-			mockCline.overwriteApiConversationHistory = vi.fn()
-			mockCline.handleWebviewAskResponse = vi.fn()
-
-			await provider.addClineToStack(mockCline)
-
-			// Trigger message edit
-			const messageHandler = (mockWebviewView.webview.onDidReceiveMessage as any).mock.calls[0][0]
-			await messageHandler({
-				type: "submitEditedMessage",
-				value: 3000,
-				editedMessageContent: "Edited message content",
-			})
-
-			// Verify that NO dialog message was sent to webview (skipped)
-			expect(mockPostMessage).not.toHaveBeenCalledWith({
-				type: "showEditMessageDialog",
-				messageTs: 3000,
-				text: "Edited message content",
-			})
-
-			// Verify messages were edited directly
-			expect(mockCline.overwriteClineMessages).toHaveBeenCalledWith([mockMessages[0]])
-			expect(mockCline.overwriteApiConversationHistory).toHaveBeenCalledWith([mockApiHistory[0]])
-		})
 	})
 
 	describe("getSystemPrompt", () => {
@@ -2784,12 +2667,6 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 	describe("Edit Messages with Images and Attachments", () => {
 		beforeEach(async () => {
 			await provider.resolveWebviewView(mockWebviewView)
-			// Mock that skip confirmations are false by default
-			;(mockContext.globalState.get as any).mockImplementation((key: string) => {
-				if (key === "skipEditMessageConfirmation") return false
-				if (key === "skipDeleteMessageConfirmation") return false
-				return undefined
-			})
 		})
 
 		test("handles editing messages containing images", async () => {
diff --git a/src/core/webview/__tests__/webviewMessageHandler.spec.ts b/src/core/webview/__tests__/webviewMessageHandler.spec.ts
index d03ffc9365..284ee98944 100644
--- a/src/core/webview/__tests__/webviewMessageHandler.spec.ts
+++ b/src/core/webview/__tests__/webviewMessageHandler.spec.ts
@@ -500,71 +500,8 @@ describe("webviewMessageHandler - message dialog preferences", () => {
 		vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(false)
 	})
 
-	describe("skipEditMessageConfirmation", () => {
-		it("should save edit message confirmation preference when set to true", async () => {
-			await webviewMessageHandler(mockClineProvider, {
-				type: "skipEditMessageConfirmation",
-				bool: true,
-			})
-
-			expect(mockClineProvider.contextProxy.setValue).toHaveBeenCalledWith("skipEditMessageConfirmation", true)
-			expect(mockClineProvider.postStateToWebview).toHaveBeenCalled()
-		})
-
-		it("should save edit message confirmation preference when set to false", async () => {
-			await webviewMessageHandler(mockClineProvider, {
-				type: "skipEditMessageConfirmation",
-				bool: false,
-			})
-
-			expect(mockClineProvider.contextProxy.setValue).toHaveBeenCalledWith("skipEditMessageConfirmation", false)
-			expect(mockClineProvider.postStateToWebview).toHaveBeenCalled()
-		})
-
-		it("should default to false when bool is not provided", async () => {
-			await webviewMessageHandler(mockClineProvider, {
-				type: "skipEditMessageConfirmation",
-			})
-
-			expect(mockClineProvider.contextProxy.setValue).toHaveBeenCalledWith("skipEditMessageConfirmation", false)
-			expect(mockClineProvider.postStateToWebview).toHaveBeenCalled()
-		})
-	})
-
-	describe("skipDeleteMessageConfirmation", () => {
-		it("should save delete message confirmation preference when set to true", async () => {
-			await webviewMessageHandler(mockClineProvider, {
-				type: "skipDeleteMessageConfirmation",
-				bool: true,
-			})
-
-			expect(mockClineProvider.contextProxy.setValue).toHaveBeenCalledWith("skipDeleteMessageConfirmation", true)
-			expect(mockClineProvider.postStateToWebview).toHaveBeenCalled()
-		})
-
-		it("should save delete message confirmation preference when set to false", async () => {
-			await webviewMessageHandler(mockClineProvider, {
-				type: "skipDeleteMessageConfirmation",
-				bool: false,
-			})
-
-			expect(mockClineProvider.contextProxy.setValue).toHaveBeenCalledWith("skipDeleteMessageConfirmation", false)
-			expect(mockClineProvider.postStateToWebview).toHaveBeenCalled()
-		})
-
-		it("should default to false when bool is not provided", async () => {
-			await webviewMessageHandler(mockClineProvider, {
-				type: "skipDeleteMessageConfirmation",
-			})
-
-			expect(mockClineProvider.contextProxy.setValue).toHaveBeenCalledWith("skipDeleteMessageConfirmation", false)
-			expect(mockClineProvider.postStateToWebview).toHaveBeenCalled()
-		})
-	})
-
 	describe("deleteMessage", () => {
-		it("should show dialog when skipDeleteMessageConfirmation is false", async () => {
-			vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(false)
+		it("should always show dialog for delete confirmation", async () => {
 			vi.mocked(mockClineProvider.getCurrentCline).mockReturnValue({} as any) // Mock current cline exists
 
 			await webviewMessageHandler(mockClineProvider, {
@@ -577,36 +514,10 @@ describe("webviewMessageHandler - message dialog preferences", () => {
 				messageTs: 123456789,
 			})
 		})
-
-		it("should skip dialog and directly delete when skipDeleteMessageConfirmation is true", async () => {
-			vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(true)
-			vi.mocked(mockClineProvider.getCurrentCline).mockReturnValue({
-				clineMessages: [{ ts: 123456789, text: "test message" }],
-				apiConversationHistory: [{ ts: 123456789, text: "test message" }],
-			} as any) // Mock current cline with required properties
-
-			// Mock the necessary functions for deletion
-			vi.mocked(mockClineProvider.getTaskWithId).mockResolvedValue({
-				historyItem: { id: "test-history-id" },
-			} as any)
-
-			await webviewMessageHandler(mockClineProvider, {
-				type: "deleteMessage",
-				value: 123456789, // Changed from messageTs to value
-			})
-
-			// Should not show dialog
-			expect(mockClineProvider.postMessageToWebview).not.toHaveBeenCalledWith(
-				expect.objectContaining({
-					type: "showDeleteMessageDialog",
-				}),
-			)
-		})
 	})
 
 	describe("submitEditedMessage", () => {
-		it("should show dialog when skipEditMessageConfirmation is false", async () => {
-			vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(false)
+		it("should always show dialog for edit confirmation", async () => {
 			vi.mocked(mockClineProvider.getCurrentCline).mockReturnValue({} as any) // Mock current cline exists
 
 			await webviewMessageHandler(mockClineProvider, {
@@ -621,26 +532,5 @@ describe("webviewMessageHandler - message dialog preferences", () => {
 				text: "edited content",
 			})
 		})
-
-		it("should skip dialog and directly edit when skipEditMessageConfirmation is true", async () => {
-			vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(true)
-			vi.mocked(mockClineProvider.getCurrentCline).mockReturnValue({
-				clineMessages: [{ ts: 123456789, text: "test message" }],
-				apiConversationHistory: [{ ts: 123456789, text: "test message" }],
-			} as any) // Mock current cline with required properties
-
-			await webviewMessageHandler(mockClineProvider, {
-				type: "submitEditedMessage",
-				value: 123456789, // messageTs as number
-				editedMessageContent: "edited content", // text content in editedMessageContent field
-			})
-
-			// Should not show dialog
-			expect(mockClineProvider.postMessageToWebview).not.toHaveBeenCalledWith(
-				expect.objectContaining({
-					type: "showEditMessageDialog",
-				}),
-			)
-		})
 	})
 })
diff --git a/src/core/webview/webviewMessageHandler.ts b/src/core/webview/webviewMessageHandler.ts
index b19951e154..3290adfa2d 100644
--- a/src/core/webview/webviewMessageHandler.ts
+++ b/src/core/webview/webviewMessageHandler.ts
@@ -99,19 +99,11 @@ export const webviewMessageHandler = async (
 	 * Handles message deletion operations with user confirmation
 	 */
 	const handleDeleteOperation = async (messageTs: number): Promise<void> => {
-		// Check if user has opted to skip the confirmation
-		const skipDeleteMessageConfirmation = getGlobalState("skipDeleteMessageConfirmation")
-
-		if (skipDeleteMessageConfirmation) {
-			// Directly handle the deletion without showing dialog
-			await handleDeleteMessageConfirm(messageTs)
-		} else {
-			// Send message to webview to show delete confirmation dialog
-			await provider.postMessageToWebview({
-				type: "showDeleteMessageDialog",
-				messageTs,
-			})
-		}
+		// Send message to webview to show delete confirmation dialog
+		await provider.postMessageToWebview({
+			type: "showDeleteMessageDialog",
+			messageTs,
+		})
 	}
 
 	/**
@@ -146,20 +138,12 @@ export const webviewMessageHandler = async (
 	 * Handles message editing operations with user confirmation
 	 */
 	const handleEditOperation = async (messageTs: number, editedContent: string): Promise<void> => {
-		// Check if user has opted to skip the confirmation
-		const skipEditMessageConfirmation = getGlobalState("skipEditMessageConfirmation")
-
-		if (skipEditMessageConfirmation) {
-			// Directly handle the edit without showing dialog
-			await handleEditMessageConfirm(messageTs, editedContent)
-		} else {
-			// Send message to webview to show edit confirmation dialog
-			await provider.postMessageToWebview({
-				type: "showEditMessageDialog",
-				messageTs,
-				text: editedContent,
-			})
-		}
+		// Send message to webview to show edit confirmation dialog
+		await provider.postMessageToWebview({
+			type: "showEditMessageDialog",
+			messageTs,
+			text: editedContent,
+		})
 	}
 
 	/**
@@ -1216,14 +1200,6 @@ export const webviewMessageHandler = async (
 			await updateGlobalState("historyPreviewCollapsed", message.bool ?? false)
 			// No need to call postStateToWebview here as the UI already updated optimistically
 			break
-		case "skipEditMessageConfirmation":
-			await updateGlobalState("skipEditMessageConfirmation", message.bool ?? false)
-			await provider.postStateToWebview()
-			break
-		case "skipDeleteMessageConfirmation":
-			await updateGlobalState("skipDeleteMessageConfirmation", message.bool ?? false)
-			await provider.postStateToWebview()
-			break
 		case "toggleApiConfigPin":
 			if (message.text) {
 				const currentPinned = getGlobalState("pinnedApiConfigs") ?? {}
diff --git a/src/shared/ExtensionMessage.ts b/src/shared/ExtensionMessage.ts
index e19d2368d7..41e2b2ab83 100644
--- a/src/shared/ExtensionMessage.ts
+++ b/src/shared/ExtensionMessage.ts
@@ -185,8 +185,6 @@ export type ExtensionState = Pick<
 	| "alwaysAllowSubtasks"
 	| "alwaysAllowExecute"
 	| "alwaysAllowUpdateTodoList"
-	| "skipEditMessageConfirmation"
-	| "skipDeleteMessageConfirmation"
 	| "allowedCommands"
 	| "allowedMaxRequests"
 	| "browserToolEnabled"
diff --git a/src/shared/WebviewMessage.ts b/src/shared/WebviewMessage.ts
index 30fae8bd7b..b0139f82de 100644
--- a/src/shared/WebviewMessage.ts
+++ b/src/shared/WebviewMessage.ts
@@ -80,8 +80,6 @@ export interface WebviewMessage {
 		| "allowedMaxRequests"
 		| "alwaysAllowSubtasks"
 		| "alwaysAllowUpdateTodoList"
-		| "skipEditMessageConfirmation"
-		| "skipDeleteMessageConfirmation"
 		| "autoCondenseContext"
 		| "autoCondenseContextPercent"
 		| "condensingApiConfigId"
diff --git a/webview-ui/src/App.tsx b/webview-ui/src/App.tsx
index 4e6d0a4694..d33237a8b3 100644
--- a/webview-ui/src/App.tsx
+++ b/webview-ui/src/App.tsx
@@ -49,10 +49,6 @@ const App = () => {
 		cloudApiUrl,
 		renderContext,
 		mdmCompliant,
-		skipEditMessageConfirmation,
-		setSkipEditMessageConfirmation,
-		skipDeleteMessageConfirmation,
-		setSkipDeleteMessageConfirmation,
 	} = useExtensionState()
 
 	// Create a persistent state manager
@@ -145,37 +141,18 @@ const App = () => {
 			}
 
 			if (message.type === "showDeleteMessageDialog" && message.messageTs) {
-				// Check if user has opted to skip the confirmation
-				if (skipDeleteMessageConfirmation) {
-					// Directly send the confirmation without showing dialog
-					vscode.postMessage({
-						type: "deleteMessageConfirm",
-						messageTs: message.messageTs,
-					})
-				} else {
-					setDeleteMessageDialogState({ isOpen: true, messageTs: message.messageTs })
-				}
+				setDeleteMessageDialogState({ isOpen: true, messageTs: message.messageTs })
 			}
 
 			if (message.type === "showEditMessageDialog" && message.messageTs && message.text) {
-				// Check if user has opted to skip the confirmation
-				if (skipEditMessageConfirmation) {
-					// Directly send the confirmation without showing dialog
-					vscode.postMessage({
-						type: "editMessageConfirm",
-						messageTs: message.messageTs,
-						text: message.text,
-					})
-				} else {
-					setEditMessageDialogState({ isOpen: true, messageTs: message.messageTs, text: message.text })
-				}
+				setEditMessageDialogState({ isOpen: true, messageTs: message.messageTs, text: message.text })
 			}
 
 			if (message.type === "acceptInput") {
 				chatViewRef.current?.acceptInput()
 			}
 		},
-		[switchTab, skipDeleteMessageConfirmation, skipEditMessageConfirmation],
+		[switchTab],
 	)
 
 	useEvent("message", onMessage)
@@ -260,15 +237,7 @@ const App = () => {
 			<DeleteMessageDialog
 				open={deleteMessageDialogState.isOpen}
 				onOpenChange={(open) => setDeleteMessageDialogState((prev) => ({ ...prev, isOpen: open }))}
-				onConfirm={(dontShowAgain) => {
-					// Save the preference if checkbox was checked
-					if (dontShowAgain) {
-						setSkipDeleteMessageConfirmation(true)
-						vscode.postMessage({
-							type: "skipDeleteMessageConfirmation",
-							bool: true,
-						})
-					}
+				onConfirm={() => {
 					vscode.postMessage({
 						type: "deleteMessageConfirm",
 						messageTs: deleteMessageDialogState.messageTs,
@@ -279,15 +248,7 @@ const App = () => {
 			<EditMessageDialog
 				open={editMessageDialogState.isOpen}
 				onOpenChange={(open) => setEditMessageDialogState((prev) => ({ ...prev, isOpen: open }))}
-				onConfirm={(dontShowAgain) => {
-					// Save the preference if checkbox was checked
-					if (dontShowAgain) {
-						setSkipEditMessageConfirmation(true)
-						vscode.postMessage({
-							type: "skipEditMessageConfirmation",
-							bool: true,
-						})
-					}
+				onConfirm={() => {
 					vscode.postMessage({
 						type: "editMessageConfirm",
 						messageTs: editMessageDialogState.messageTs,
diff --git a/webview-ui/src/components/chat/MessageModificationConfirmationDialog.tsx b/webview-ui/src/components/chat/MessageModificationConfirmationDialog.tsx
index 3e93e522ac..81c6bbf007 100644
--- a/webview-ui/src/components/chat/MessageModificationConfirmationDialog.tsx
+++ b/webview-ui/src/components/chat/MessageModificationConfirmationDialog.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from "react"
+import React from "react"
 import { useAppTranslation } from "@src/i18n/TranslationContext"
 import {
 	AlertDialog,
@@ -9,13 +9,12 @@ import {
 	AlertDialogFooter,
 	AlertDialogHeader,
 	AlertDialogTitle,
-	Checkbox,
 } from "@src/components/ui"
 
 interface MessageModificationConfirmationDialogProps {
 	open: boolean
 	onOpenChange: (open: boolean) => void
-	onConfirm: (dontShowAgain: boolean) => void
+	onConfirm: () => void
 	type: "edit" | "delete"
 }
 
@@ -26,49 +25,24 @@ export const MessageModificationConfirmationDialog: React.FC<MessageModification
 	type,
 }) => {
 	const { t } = useAppTranslation()
-	const [dontShowAgain, setDontShowAgain] = useState(false)
 
 	const isEdit = type === "edit"
 	const title = isEdit ? t("common:confirmation.edit_message") : t("common:confirmation.delete_message")
 	const description = isEdit ? t("common:confirmation.edit_warning") : t("common:confirmation.delete_warning")
 
-	const handleConfirm = () => {
-		onConfirm(dontShowAgain)
-		setDontShowAgain(false) // Reset for next time
-	}
-
-	const handleOpenChange = (open: boolean) => {
-		if (!open) {
-			setDontShowAgain(false) // Reset when dialog closes
-		}
-		onOpenChange(open)
-	}
-
 	return (
-		<AlertDialog open={open} onOpenChange={handleOpenChange}>
+		<AlertDialog open={open} onOpenChange={onOpenChange}>
 			<AlertDialogContent>
 				<AlertDialogHeader>
 					<AlertDialogTitle className="text-lg">{title}</AlertDialogTitle>
 					<AlertDialogDescription className="text-base">{description}</AlertDialogDescription>
 				</AlertDialogHeader>
-				<div className="flex items-center space-x-2 px-6 py-1">
-					<Checkbox
-						id="dont-show-again"
-						checked={dontShowAgain}
-						onCheckedChange={(checked) => setDontShowAgain(checked as boolean)}
-					/>
-					<label
-						htmlFor="dont-show-again"
-						className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70 cursor-pointer">
-						{t("common:confirmation.dont_show_again")}
-					</label>
-				</div>
 				<AlertDialogFooter className="flex-col gap-2">
 					<AlertDialogCancel className="bg-vscode-button-secondaryBackground hover:bg-vscode-button-secondaryHoverBackground text-vscode-button-secondaryForeground border-vscode-button-border">
 						{t("common:answers.cancel")}
 					</AlertDialogCancel>
 					<AlertDialogAction
-						onClick={handleConfirm}
+						onClick={onConfirm}
 						className="bg-vscode-button-background hover:bg-vscode-button-hoverBackground text-vscode-button-foreground border-vscode-button-border">
 						{t("common:confirmation.proceed")}
 					</AlertDialogAction>
diff --git a/webview-ui/src/context/ExtensionStateContext.tsx b/webview-ui/src/context/ExtensionStateContext.tsx
index f85faab530..bf927211c2 100644
--- a/webview-ui/src/context/ExtensionStateContext.tsx
+++ b/webview-ui/src/context/ExtensionStateContext.tsx
@@ -131,10 +131,6 @@ export interface ExtensionStateContextType extends ExtensionState {
 	routerModels?: RouterModels
 	alwaysAllowUpdateTodoList?: boolean
 	setAlwaysAllowUpdateTodoList: (value: boolean) => void
-	skipEditMessageConfirmation?: boolean
-	setSkipEditMessageConfirmation: (value: boolean) => void
-	skipDeleteMessageConfirmation?: boolean
-	setSkipDeleteMessageConfirmation: (value: boolean) => void
 }
 
 export const ExtensionStateContext = createContext<ExtensionStateContextType | undefined>(undefined)
@@ -228,8 +224,6 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode
 		},
 		codebaseIndexModels: { ollama: {}, openai: {} },
 		alwaysAllowUpdateTodoList: true,
-		skipEditMessageConfirmation: false,
-		skipDeleteMessageConfirmation: false,
 	})
 
 	const [didHydrateState, setDidHydrateState] = useState(false)
@@ -472,14 +466,6 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode
 		setAlwaysAllowUpdateTodoList: (value) => {
 			setState((prevState) => ({ ...prevState, alwaysAllowUpdateTodoList: value }))
 		},
-		skipEditMessageConfirmation: state.skipEditMessageConfirmation,
-		setSkipEditMessageConfirmation: (value) => {
-			setState((prevState) => ({ ...prevState, skipEditMessageConfirmation: value }))
-		},
-		skipDeleteMessageConfirmation: state.skipDeleteMessageConfirmation,
-		setSkipDeleteMessageConfirmation: (value) => {
-			setState((prevState) => ({ ...prevState, skipDeleteMessageConfirmation: value }))
-		},
 	}
 
 	return <ExtensionStateContext.Provider value={contextValue}>{children}</ExtensionStateContext.Provider>

From 5edab528840ca91628f8b0211de87b8766c7b46c Mon Sep 17 00:00:00 2001
From: Will Li <willeli2002@gmail.com>
Date: Thu, 10 Jul 2025 18:47:21 -0700
Subject: [PATCH 09/14] fixed image issue

---
 src/core/webview/webviewMessageHandler.ts   | 29 ++++++++++++++++-----
 src/shared/ExtensionMessage.ts              |  1 +
 src/shared/WebviewMessage.ts                |  1 +
 webview-ui/src/App.tsx                      | 10 ++++++-
 webview-ui/src/components/chat/ChatRow.tsx  | 24 ++++++++++++++---
 webview-ui/src/components/chat/ChatView.tsx |  8 +++---
 webview-ui/src/utils/imageUtils.ts          | 17 ++++++++++++
 7 files changed, 76 insertions(+), 14 deletions(-)
 create mode 100644 webview-ui/src/utils/imageUtils.ts

diff --git a/src/core/webview/webviewMessageHandler.ts b/src/core/webview/webviewMessageHandler.ts
index 3290adfa2d..53e3b3890f 100644
--- a/src/core/webview/webviewMessageHandler.ts
+++ b/src/core/webview/webviewMessageHandler.ts
@@ -137,19 +137,24 @@ 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> => {
 		// Send message to webview to show edit confirmation dialog
 		await provider.postMessageToWebview({
 			type: "showEditMessageDialog",
 			messageTs,
 			text: editedContent,
+			images,
 		})
 	}
 
 	/**
 	 * Handles confirmed message editing from webview dialog
 	 */
-	const handleEditMessageConfirm = async (messageTs: number, editedContent: string): Promise<void> => {
+	const handleEditMessageConfirm = async (
+		messageTs: number,
+		editedContent: string,
+		images?: string[],
+	): Promise<void> => {
 		// Only proceed if we have a current cline
 		if (provider.getCurrentCline()) {
 			const currentCline = provider.getCurrentCline()!
@@ -168,6 +173,7 @@ export const webviewMessageHandler = async (
 						type: "askResponse",
 						askResponse: "messageResponse",
 						text: editedContent,
+						images,
 					})
 
 					// Don't initialize with history item for edit operations
@@ -193,11 +199,12 @@ export const webviewMessageHandler = async (
 		messageTs: number,
 		operation: "delete" | "edit",
 		editedContent?: string,
+		images?: string[],
 	): Promise<void> => {
 		if (operation === "delete") {
 			await handleDeleteOperation(messageTs)
 		} else if (operation === "edit" && editedContent) {
-			await handleEditOperation(messageTs, editedContent)
+			await handleEditOperation(messageTs, editedContent, images)
 		}
 	}
 
@@ -367,7 +374,12 @@ export const webviewMessageHandler = async (
 			break
 		case "selectImages":
 			const images = await selectImages()
-			await provider.postMessageToWebview({ type: "selectedImages", images })
+			await provider.postMessageToWebview({
+				type: "selectedImages",
+				images,
+				context: message.context,
+				messageTs: message.messageTs,
+			})
 			break
 		case "exportCurrentTask":
 			const currentTaskId = provider.getCurrentCline()?.taskId
@@ -1144,7 +1156,12 @@ export const webviewMessageHandler = async (
 				message.value &&
 				message.editedMessageContent
 			) {
-				await handleMessageModificationsOperation(message.value, "edit", message.editedMessageContent)
+				await handleMessageModificationsOperation(
+					message.value,
+					"edit",
+					message.editedMessageContent,
+					message.images,
+				)
 			}
 			break
 		}
@@ -1484,7 +1501,7 @@ export const webviewMessageHandler = async (
 			break
 		case "editMessageConfirm":
 			if (message.messageTs && message.text) {
-				await handleEditMessageConfirm(message.messageTs, message.text)
+				await handleEditMessageConfirm(message.messageTs, message.text, message.images)
 			}
 			break
 		case "getListApiConfiguration":
diff --git a/src/shared/ExtensionMessage.ts b/src/shared/ExtensionMessage.ts
index 41e2b2ab83..6991762f09 100644
--- a/src/shared/ExtensionMessage.ts
+++ b/src/shared/ExtensionMessage.ts
@@ -160,6 +160,7 @@ export interface ExtensionMessage {
 	rulesFolderPath?: string
 	settings?: any
 	messageTs?: number
+	context?: string
 }
 
 export type ExtensionState = Pick<
diff --git a/src/shared/WebviewMessage.ts b/src/shared/WebviewMessage.ts
index b0139f82de..3b3f2abdc7 100644
--- a/src/shared/WebviewMessage.ts
+++ b/src/shared/WebviewMessage.ts
@@ -199,6 +199,7 @@ export interface WebviewMessage {
 	editedMessageContent?: string
 	tab?: "settings" | "history" | "mcp" | "modes" | "chat" | "marketplace" | "account"
 	disabled?: boolean
+	context?: string
 	dataUri?: string
 	askResponse?: ClineAskResponse
 	apiConfiguration?: ProviderSettings
diff --git a/webview-ui/src/App.tsx b/webview-ui/src/App.tsx
index d33237a8b3..3e149f28ed 100644
--- a/webview-ui/src/App.tsx
+++ b/webview-ui/src/App.tsx
@@ -79,10 +79,12 @@ const App = () => {
 		isOpen: boolean
 		messageTs: number
 		text: string
+		images?: string[]
 	}>({
 		isOpen: false,
 		messageTs: 0,
 		text: "",
+		images: [],
 	})
 
 	const settingsRef = useRef<SettingsViewRef>(null)
@@ -145,7 +147,12 @@ const App = () => {
 			}
 
 			if (message.type === "showEditMessageDialog" && message.messageTs && message.text) {
-				setEditMessageDialogState({ isOpen: true, messageTs: message.messageTs, text: message.text })
+				setEditMessageDialogState({
+					isOpen: true,
+					messageTs: message.messageTs,
+					text: message.text,
+					images: message.images || [],
+				})
 			}
 
 			if (message.type === "acceptInput") {
@@ -253,6 +260,7 @@ const App = () => {
 						type: "editMessageConfirm",
 						messageTs: editMessageDialogState.messageTs,
 						text: editMessageDialogState.text,
+						images: editMessageDialogState.images,
 					})
 					setEditMessageDialogState((prev) => ({ ...prev, isOpen: false }))
 				}}
diff --git a/webview-ui/src/components/chat/ChatRow.tsx b/webview-ui/src/components/chat/ChatRow.tsx
index d467424ec9..31fb762faa 100644
--- a/webview-ui/src/components/chat/ChatRow.tsx
+++ b/webview-ui/src/components/chat/ChatRow.tsx
@@ -1,4 +1,5 @@
 import React, { memo, useCallback, useEffect, useMemo, useRef, useState } from "react"
+import { appendImages } from "@src/utils/imageUtils"
 import { McpExecution } from "./McpExecution"
 import { useSize } from "react-use"
 import { useTranslation, Trans } from "react-i18next"
@@ -22,6 +23,7 @@ import { getLanguageFromPath } from "@src/utils/getLanguageFromPath"
 import { Button } from "@src/components/ui"
 
 import ChatTextArea from "./ChatTextArea"
+import { MAX_IMAGES_PER_MESSAGE } from "./ChatView"
 
 import { ToolUseBlock, ToolUseBlockHeader } from "../common/ToolUseBlock"
 import UpdateTodoListToolBlock from "./UpdateTodoListToolBlock"
@@ -122,6 +124,19 @@ export const ChatRowContent = ({
 	const [editImages, setEditImages] = useState<string[]>([])
 	const { copyWithFeedback } = useCopyToClipboard()
 
+	// Handle message events for image selection during edit mode
+	useEffect(() => {
+		const handleMessage = (event: MessageEvent) => {
+			const msg = event.data
+			if (msg.type === "selectedImages" && msg.context === "edit" && msg.messageTs === message.ts && isEditing) {
+				setEditImages((prevImages) => appendImages(prevImages, msg.images, MAX_IMAGES_PER_MESSAGE))
+			}
+		}
+
+		window.addEventListener("message", handleMessage)
+		return () => window.removeEventListener("message", handleMessage)
+	}, [isEditing, message.ts])
+
 	// Memoized callback to prevent re-renders caused by inline arrow functions
 	const handleToggleExpand = useCallback(() => {
 		onToggleExpand(message.ts)
@@ -153,13 +168,14 @@ export const ChatRowContent = ({
 			type: "submitEditedMessage",
 			value: message.ts,
 			editedMessageContent: editedContent,
+			images: editImages,
 		})
-	}, [message.ts, editedContent])
+	}, [message.ts, editedContent, editImages])
 
 	// Handle image selection for editing
 	const handleSelectImages = useCallback(() => {
-		vscode.postMessage({ type: "selectImages" })
-	}, [])
+		vscode.postMessage({ type: "selectImages", context: "edit", messageTs: message.ts })
+	}, [message.ts])
 
 	const [cost, apiReqCancelReason, apiReqStreamingFailedMessage] = useMemo(() => {
 		if (message.text !== null && message.text !== undefined && message.say === "api_req_started") {
@@ -1073,7 +1089,7 @@ export const ChatRowContent = ({
 										<Button
 											variant="ghost"
 											size="icon"
-											className="shrink-0 hidden"
+											className="shrink-0"
 											disabled={isStreaming}
 											onClick={(e) => {
 												e.stopPropagation()
diff --git a/webview-ui/src/components/chat/ChatView.tsx b/webview-ui/src/components/chat/ChatView.tsx
index 38b8997faf..e83ec977cb 100644
--- a/webview-ui/src/components/chat/ChatView.tsx
+++ b/webview-ui/src/components/chat/ChatView.tsx
@@ -9,6 +9,7 @@ import useSound from "use-sound"
 import { LRUCache } from "lru-cache"
 
 import { useDebounceEffect } from "@src/utils/useDebounceEffect"
+import { appendImages } from "@src/utils/imageUtils"
 
 import type { ClineAsk, ClineMessage } from "@roo-code/types"
 
@@ -712,10 +713,11 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 					}
 					break
 				case "selectedImages":
-					const newImages = message.images ?? []
-					if (newImages.length > 0) {
+					// Only handle selectedImages if it's not for editing context
+					// When context is "edit", ChatRow will handle the images
+					if (message.context !== "edit") {
 						setSelectedImages((prevImages) =>
-							[...prevImages, ...newImages].slice(0, MAX_IMAGES_PER_MESSAGE),
+							appendImages(prevImages, message.images, MAX_IMAGES_PER_MESSAGE),
 						)
 					}
 					break
diff --git a/webview-ui/src/utils/imageUtils.ts b/webview-ui/src/utils/imageUtils.ts
new file mode 100644
index 0000000000..91081bc4cb
--- /dev/null
+++ b/webview-ui/src/utils/imageUtils.ts
@@ -0,0 +1,17 @@
+/**
+ * Utility function to append new images to existing images array
+ * while respecting the maximum image limit
+ *
+ * @param currentImages - The current array of images
+ * @param newImages - The new images to append
+ * @param maxImages - The maximum number of images allowed
+ * @returns The updated images array
+ */
+export function appendImages(currentImages: string[], newImages: string[] | undefined, maxImages: number): string[] {
+	const imagesToAdd = newImages ?? []
+	if (imagesToAdd.length === 0) {
+		return currentImages
+	}
+
+	return [...currentImages, ...imagesToAdd].slice(0, maxImages)
+}

From 4604211ffad67f53f6aae145e92faec52a189acc Mon Sep 17 00:00:00 2001
From: Will Li <willeli2002@gmail.com>
Date: Thu, 10 Jul 2025 20:26:35 -0700
Subject: [PATCH 10/14] ui fix

---
 .../src/components/chat/ChatTextArea.tsx      | 674 ++++++++++--------
 webview-ui/src/i18n/locales/ca/chat.json      |   2 +-
 webview-ui/src/i18n/locales/de/chat.json      |   2 +-
 webview-ui/src/i18n/locales/en/chat.json      |   2 +-
 webview-ui/src/i18n/locales/es/chat.json      |   2 +-
 webview-ui/src/i18n/locales/fr/chat.json      |   2 +-
 webview-ui/src/i18n/locales/hi/chat.json      |   2 +-
 webview-ui/src/i18n/locales/id/chat.json      |   2 +-
 webview-ui/src/i18n/locales/it/chat.json      |   2 +-
 webview-ui/src/i18n/locales/ja/chat.json      |   2 +-
 webview-ui/src/i18n/locales/ko/chat.json      |   2 +-
 webview-ui/src/i18n/locales/nl/chat.json      |   2 +-
 webview-ui/src/i18n/locales/pl/chat.json      |   2 +-
 webview-ui/src/i18n/locales/pt-BR/chat.json   |   2 +-
 webview-ui/src/i18n/locales/ru/chat.json      |   2 +-
 webview-ui/src/i18n/locales/tr/chat.json      |   2 +-
 webview-ui/src/i18n/locales/vi/chat.json      |   2 +-
 webview-ui/src/i18n/locales/zh-CN/chat.json   |   2 +-
 webview-ui/src/i18n/locales/zh-TW/chat.json   |   2 +-
 19 files changed, 385 insertions(+), 325 deletions(-)

diff --git a/webview-ui/src/components/chat/ChatTextArea.tsx b/webview-ui/src/components/chat/ChatTextArea.tsx
index b7da0a6ce1..66c42e20b3 100644
--- a/webview-ui/src/components/chat/ChatTextArea.tsx
+++ b/webview-ui/src/components/chat/ChatTextArea.tsx
@@ -785,6 +785,369 @@ const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
 
 		const placeholderBottomText = `\n(${t("chat:addContext")}${shouldDisableImages ? `, ${t("chat:dragFiles")}` : `, ${t("chat:dragFilesImages")}`})`
 
+		// Common mode selector handler
+		const handleModeChange = useCallback(
+			(value: Mode) => {
+				setMode(value)
+				vscode.postMessage({ type: "mode", text: value })
+			},
+			[setMode],
+		)
+
+		// Helper function to render mode selector
+		const renderModeSelector = () => (
+			<ModeSelector
+				value={mode}
+				title={t("chat:selectMode")}
+				onChange={handleModeChange}
+				triggerClassName="w-full"
+				modeShortcutText={modeShortcutText}
+				customModes={customModes}
+				customModePrompts={customModePrompts}
+			/>
+		)
+
+		// Helper function to render edit mode controls
+		const renderEditModeControls = () => (
+			<div
+				className={cn(
+					"flex",
+					"items-center",
+					"justify-between",
+					"absolute",
+					"bottom-2",
+					"left-2",
+					"right-2",
+					"z-30",
+				)}>
+				<div className={cn("flex", "items-center", "gap-1", "flex-1", "min-w-0")}>
+					<div className="shrink-0">{renderModeSelector()}</div>
+				</div>
+				<div className={cn("flex", "items-center", "gap-0.5", "shrink-0", "ml-2")}>
+					<Button
+						variant="secondary"
+						size="sm"
+						onClick={onCancel}
+						disabled={sendingDisabled}
+						className="text-xs bg-vscode-toolbar-hoverBackground hover:bg-vscode-button-secondaryBackground text-vscode-button-secondaryForeground">
+						Cancel
+					</Button>
+					<IconButton
+						iconClass="codicon-device-camera"
+						title={t("chat:addImages")}
+						disabled={shouldDisableImages}
+						onClick={onSelectImages}
+						className="opacity-60 hover:opacity-100 text-vscode-descriptionForeground hover:text-vscode-foreground"
+					/>
+					<IconButton
+						iconClass="codicon-edit"
+						title={t("chat:save.tooltip")}
+						disabled={sendingDisabled}
+						onClick={onSend}
+						className="opacity-60 hover:opacity-100 text-vscode-descriptionForeground hover:text-vscode-foreground"
+					/>
+				</div>
+			</div>
+		)
+
+		// Helper function to get API config dropdown options
+		const getApiConfigOptions = useMemo(() => {
+			const pinnedConfigs = (listApiConfigMeta || [])
+				.filter((config) => pinnedApiConfigs && pinnedApiConfigs[config.id])
+				.map((config) => ({
+					value: config.id,
+					label: config.name,
+					name: config.name,
+					type: DropdownOptionType.ITEM,
+					pinned: true,
+				}))
+				.sort((a, b) => a.label.localeCompare(b.label))
+
+			const unpinnedConfigs = (listApiConfigMeta || [])
+				.filter((config) => !pinnedApiConfigs || !pinnedApiConfigs[config.id])
+				.map((config) => ({
+					value: config.id,
+					label: config.name,
+					name: config.name,
+					type: DropdownOptionType.ITEM,
+					pinned: false,
+				}))
+				.sort((a, b) => a.label.localeCompare(b.label))
+
+			const hasPinnedAndUnpinned = pinnedConfigs.length > 0 && unpinnedConfigs.length > 0
+
+			return [
+				...pinnedConfigs,
+				...(hasPinnedAndUnpinned
+					? [
+							{
+								value: "sep-pinned",
+								label: t("chat:separator"),
+								type: DropdownOptionType.SEPARATOR,
+							},
+						]
+					: []),
+				...unpinnedConfigs,
+				{
+					value: "sep-2",
+					label: t("chat:separator"),
+					type: DropdownOptionType.SEPARATOR,
+				},
+				{
+					value: "settingsButtonClicked",
+					label: t("chat:edit"),
+					type: DropdownOptionType.ACTION,
+				},
+			]
+		}, [listApiConfigMeta, pinnedApiConfigs, t])
+
+		// Helper function to handle API config change
+		const handleApiConfigChange = useCallback((value: string) => {
+			if (value === "settingsButtonClicked") {
+				vscode.postMessage({
+					type: "loadApiConfiguration",
+					text: value,
+					values: { section: "providers" },
+				})
+			} else {
+				vscode.postMessage({ type: "loadApiConfigurationById", text: value })
+			}
+		}, [])
+
+		// Helper function to render API config item
+		const renderApiConfigItem = useCallback(
+			({ type, value, label, pinned }: any) => {
+				if (type !== DropdownOptionType.ITEM) {
+					return label
+				}
+
+				const config = listApiConfigMeta?.find((c) => c.id === value)
+				const isCurrentConfig = config?.name === currentApiConfigName
+
+				return (
+					<div className="flex justify-between gap-2 w-full h-5">
+						<div
+							className={cn("truncate min-w-0 overflow-hidden", {
+								"font-medium": isCurrentConfig,
+							})}>
+							{label}
+						</div>
+						<div className="flex justify-end w-10 flex-shrink-0">
+							<div
+								className={cn("size-5 p-1", {
+									"block group-hover:hidden": !pinned,
+									hidden: !isCurrentConfig,
+								})}>
+								<Check className="size-3" />
+							</div>
+							<StandardTooltip content={pinned ? t("chat:unpin") : t("chat:pin")}>
+								<Button
+									variant="ghost"
+									size="icon"
+									onClick={(e) => {
+										e.stopPropagation()
+										togglePinnedApiConfig(value)
+										vscode.postMessage({
+											type: "toggleApiConfigPin",
+											text: value,
+										})
+									}}
+									className={cn("size-5", {
+										"hidden group-hover:flex": !pinned,
+										"bg-accent": pinned,
+									})}>
+									<Pin className="size-3 p-0.5 opacity-50" />
+								</Button>
+							</StandardTooltip>
+						</div>
+					</div>
+				)
+			},
+			[listApiConfigMeta, currentApiConfigName, t, togglePinnedApiConfig],
+		)
+
+		// Helper function to render non-edit mode controls
+		const renderNonEditModeControls = () => (
+			<div className={cn("flex", "justify-between", "items-center", "mt-auto")}>
+				<div className={cn("flex", "items-center", "gap-1", "min-w-0")}>
+					<div className="shrink-0">{renderModeSelector()}</div>
+
+					<div className={cn("flex-1", "min-w-0", "overflow-hidden")}>
+						<SelectDropdown
+							value={currentConfigId}
+							disabled={selectApiConfigDisabled}
+							title={t("chat:selectApiConfig")}
+							disableSearch={false}
+							placeholder={displayName}
+							options={getApiConfigOptions}
+							onChange={handleApiConfigChange}
+							triggerClassName="w-full text-ellipsis overflow-hidden"
+							itemClassName="group"
+							renderItem={renderApiConfigItem}
+						/>
+					</div>
+				</div>
+
+				<div className={cn("flex", "items-center", "gap-0.5", "shrink-0")}>
+					<IndexingStatusDot />
+					<IconButton
+						iconClass="codicon-device-camera"
+						title={t("chat:addImages")}
+						disabled={shouldDisableImages}
+						onClick={onSelectImages}
+						className="mr-1"
+					/>
+				</div>
+			</div>
+		)
+
+		// Helper function to render the text area section
+		const renderTextAreaSection = () => (
+			<div
+				className={cn(
+					"relative",
+					"flex-1",
+					"flex",
+					"flex-col-reverse",
+					"min-h-0",
+					"overflow-hidden",
+					"rounded",
+				)}>
+				<div
+					ref={highlightLayerRef}
+					className={cn(
+						"absolute",
+						"inset-0",
+						"pointer-events-none",
+						"whitespace-pre-wrap",
+						"break-words",
+						"text-transparent",
+						"overflow-hidden",
+						"font-vscode-font-family",
+						"text-vscode-editor-font-size",
+						"leading-vscode-editor-line-height",
+						"py-2",
+						"px-[9px]",
+						"z-10",
+						"forced-color-adjust-none",
+					)}
+					style={{
+						color: "transparent",
+					}}
+				/>
+				<DynamicTextArea
+					ref={(el) => {
+						if (typeof ref === "function") {
+							ref(el)
+						} else if (ref) {
+							ref.current = el
+						}
+						textAreaRef.current = el
+					}}
+					value={inputValue}
+					onChange={(e) => {
+						handleInputChange(e)
+						updateHighlights()
+					}}
+					onFocus={() => setIsFocused(true)}
+					onKeyDown={handleKeyDown}
+					onKeyUp={handleKeyUp}
+					onBlur={handleBlur}
+					onPaste={handlePaste}
+					onSelect={updateCursorPosition}
+					onMouseUp={updateCursorPosition}
+					onHeightChange={(height) => {
+						if (textAreaBaseHeight === undefined || height < textAreaBaseHeight) {
+							setTextAreaBaseHeight(height)
+						}
+
+						onHeightChange?.(height)
+					}}
+					placeholder={placeholderText}
+					minRows={3}
+					maxRows={15}
+					autoFocus={true}
+					className={cn(
+						"w-full",
+						"text-vscode-input-foreground",
+						"font-vscode-font-family",
+						"text-vscode-editor-font-size",
+						"leading-vscode-editor-line-height",
+						"cursor-text",
+						isEditMode ? "pt-1.5 pb-10 px-2" : "py-1.5 px-2",
+						isFocused
+							? "border border-vscode-focusBorder outline outline-vscode-focusBorder"
+							: isDraggingOver
+								? "border-2 border-dashed border-vscode-focusBorder"
+								: "border border-transparent",
+						isDraggingOver
+							? "bg-[color-mix(in_srgb,var(--vscode-input-background)_95%,var(--vscode-focusBorder))]"
+							: "bg-vscode-input-background",
+						"transition-background-color duration-150 ease-in-out",
+						"will-change-background-color",
+						"min-h-[90px]",
+						"box-border",
+						"rounded",
+						"resize-none",
+						"overflow-x-hidden",
+						"overflow-y-auto",
+						"pr-9",
+						"flex-none flex-grow",
+						"z-[2]",
+						"scrollbar-none",
+						"scrollbar-hide",
+					)}
+					onScroll={() => updateHighlights()}
+				/>
+
+				{isTtsPlaying && (
+					<Button
+						variant="ghost"
+						size="icon"
+						className="absolute top-0 right-0 opacity-25 hover:opacity-100 z-10"
+						onClick={() => vscode.postMessage({ type: "stopTts" })}>
+						<VolumeX className="size-4" />
+					</Button>
+				)}
+
+				<div className="absolute top-1 right-1 z-30">
+					<IconButton
+						iconClass={isEnhancingPrompt ? "codicon-loading" : "codicon-sparkle"}
+						title={t("chat:enhancePrompt")}
+						disabled={sendingDisabled}
+						isLoading={isEnhancingPrompt}
+						onClick={handleEnhancePrompt}
+						className="opacity-60 hover:opacity-100 text-vscode-descriptionForeground hover:text-vscode-foreground"
+					/>
+				</div>
+
+				{!isEditMode && (
+					<div className="absolute bottom-1 right-1 z-30">
+						<IconButton
+							iconClass="codicon-send"
+							title={t("chat:sendMessage")}
+							disabled={sendingDisabled}
+							onClick={onSend}
+							className="opacity-60 hover:opacity-100 text-vscode-descriptionForeground hover:text-vscode-foreground"
+						/>
+					</div>
+				)}
+
+				{!inputValue && !isEditMode && (
+					<div
+						className="absolute left-2 z-30 pr-9 flex items-center h-8"
+						style={{
+							bottom: "0.25rem",
+							color: "var(--vscode-tab-inactiveForeground)",
+							userSelect: "none",
+							pointerEvents: "none",
+						}}>
+						{placeholderBottomText}
+					</div>
+				)}
+			</div>
+		)
+
 		return (
 			<div
 				className={cn(
@@ -859,160 +1222,11 @@ const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
 								/>
 							</div>
 						)}
-						<div
-							className={cn(
-								"relative",
-								"flex-1",
-								"flex",
-								"flex-col-reverse",
-								"min-h-0",
-								"overflow-hidden",
-								"rounded",
-							)}>
-							<div
-								ref={highlightLayerRef}
-								className={cn(
-									"absolute",
-									"inset-0",
-									"pointer-events-none",
-									"whitespace-pre-wrap",
-									"break-words",
-									"text-transparent",
-									"overflow-hidden",
-									"font-vscode-font-family",
-									"text-vscode-editor-font-size",
-									"leading-vscode-editor-line-height",
-									"py-2",
-									"px-[9px]",
-									"z-10",
-									"forced-color-adjust-none",
-								)}
-								style={{
-									color: "transparent",
-								}}
-							/>
-							<DynamicTextArea
-								ref={(el) => {
-									if (typeof ref === "function") {
-										ref(el)
-									} else if (ref) {
-										ref.current = el
-									}
-									textAreaRef.current = el
-								}}
-								value={inputValue}
-								onChange={(e) => {
-									handleInputChange(e)
-									updateHighlights()
-								}}
-								onFocus={() => setIsFocused(true)}
-								onKeyDown={handleKeyDown}
-								onKeyUp={handleKeyUp}
-								onBlur={handleBlur}
-								onPaste={handlePaste}
-								onSelect={updateCursorPosition}
-								onMouseUp={updateCursorPosition}
-								onHeightChange={(height) => {
-									if (textAreaBaseHeight === undefined || height < textAreaBaseHeight) {
-										setTextAreaBaseHeight(height)
-									}
 
-									onHeightChange?.(height)
-								}}
-								placeholder={placeholderText}
-								minRows={3}
-								maxRows={15}
-								autoFocus={true}
-								className={cn(
-									"w-full",
-									"text-vscode-input-foreground",
-									"font-vscode-font-family",
-									"text-vscode-editor-font-size",
-									"leading-vscode-editor-line-height",
-									"cursor-text",
-									"py-1.5 px-2",
-									isFocused
-										? "border border-vscode-focusBorder outline outline-vscode-focusBorder"
-										: isDraggingOver
-											? "border-2 border-dashed border-vscode-focusBorder"
-											: "border border-transparent",
-									isDraggingOver
-										? "bg-[color-mix(in_srgb,var(--vscode-input-background)_95%,var(--vscode-focusBorder))]"
-										: "bg-vscode-input-background",
-									"transition-background-color duration-150 ease-in-out",
-									"will-change-background-color",
-									"min-h-[90px]",
-									"box-border",
-									"rounded",
-									"resize-none",
-									"overflow-x-hidden",
-									"overflow-y-auto",
-									"pr-9",
-									"flex-none flex-grow",
-									"z-[2]",
-									"scrollbar-none",
-									"scrollbar-hide",
-								)}
-								onScroll={() => updateHighlights()}
-							/>
-
-							{isTtsPlaying && (
-								<Button
-									variant="ghost"
-									size="icon"
-									className="absolute top-0 right-0 opacity-25 hover:opacity-100 z-10"
-									onClick={() => vscode.postMessage({ type: "stopTts" })}>
-									<VolumeX className="size-4" />
-								</Button>
-							)}
-
-							<div className="absolute top-1 right-1 z-30">
-								<IconButton
-									iconClass={isEnhancingPrompt ? "codicon-loading" : "codicon-sparkle"}
-									title={t("chat:enhancePrompt")}
-									disabled={sendingDisabled}
-									isLoading={isEnhancingPrompt}
-									onClick={handleEnhancePrompt}
-									className="opacity-60 hover:opacity-100 text-vscode-descriptionForeground hover:text-vscode-foreground"
-								/>
-							</div>
-
-							{isEditMode ? (
-								<div className="absolute bottom-1 right-1 z-30">
-									<IconButton
-										iconClass="codicon-edit"
-										title={t("chat:save.tooltip")}
-										disabled={sendingDisabled}
-										onClick={onSend}
-										className="opacity-60 hover:opacity-100 text-vscode-descriptionForeground hover:text-vscode-foreground"
-									/>
-								</div>
-							) : (
-								<div className="absolute bottom-1 right-1 z-30">
-									<IconButton
-										iconClass="codicon-send"
-										title={t("chat:sendMessage")}
-										disabled={sendingDisabled}
-										onClick={onSend}
-										className="opacity-60 hover:opacity-100 text-vscode-descriptionForeground hover:text-vscode-foreground"
-									/>
-								</div>
-							)}
-
-							{!inputValue && (
-								<div
-									className="absolute left-2 z-30 pr-9 flex items-center h-8"
-									style={{
-										bottom: "0.25rem",
-										color: "var(--vscode-tab-inactiveForeground)",
-										userSelect: "none",
-										pointerEvents: "none",
-									}}>
-									{placeholderBottomText}
-								</div>
-							)}
-						</div>
+						{renderTextAreaSection()}
 					</div>
+
+					{isEditMode && renderEditModeControls()}
 				</div>
 
 				{selectedImages.length > 0 && (
@@ -1027,161 +1241,7 @@ const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
 					/>
 				)}
 
-				<div className={cn("flex", "justify-between", "items-center", "mt-auto")}>
-					<div className={cn("flex", "items-center", "gap-1", "min-w-0")}>
-						<div className="shrink-0">
-							<ModeSelector
-								value={mode}
-								title={t("chat:selectMode")}
-								onChange={(value) => {
-									setMode(value)
-									vscode.postMessage({ type: "mode", text: value })
-								}}
-								triggerClassName="w-full"
-								modeShortcutText={modeShortcutText}
-								customModes={customModes}
-								customModePrompts={customModePrompts}
-							/>
-						</div>
-
-						<div className={cn("flex-1", "min-w-0", "overflow-hidden")}>
-							<SelectDropdown
-								value={currentConfigId}
-								disabled={selectApiConfigDisabled}
-								title={t("chat:selectApiConfig")}
-								disableSearch={false}
-								placeholder={displayName}
-								options={[
-									// Pinned items first.
-									...(listApiConfigMeta || [])
-										.filter((config) => pinnedApiConfigs && pinnedApiConfigs[config.id])
-										.map((config) => ({
-											value: config.id,
-											label: config.name,
-											name: config.name, // Keep name for comparison with currentApiConfigName.
-											type: DropdownOptionType.ITEM,
-											pinned: true,
-										}))
-										.sort((a, b) => a.label.localeCompare(b.label)),
-									// If we have pinned items and unpinned items, add a separator.
-									...(pinnedApiConfigs &&
-									Object.keys(pinnedApiConfigs).length > 0 &&
-									(listApiConfigMeta || []).some((config) => !pinnedApiConfigs[config.id])
-										? [
-												{
-													value: "sep-pinned",
-													label: t("chat:separator"),
-													type: DropdownOptionType.SEPARATOR,
-												},
-											]
-										: []),
-									// Unpinned items sorted alphabetically.
-									...(listApiConfigMeta || [])
-										.filter((config) => !pinnedApiConfigs || !pinnedApiConfigs[config.id])
-										.map((config) => ({
-											value: config.id,
-											label: config.name,
-											name: config.name, // Keep name for comparison with currentApiConfigName.
-											type: DropdownOptionType.ITEM,
-											pinned: false,
-										}))
-										.sort((a, b) => a.label.localeCompare(b.label)),
-									{
-										value: "sep-2",
-										label: t("chat:separator"),
-										type: DropdownOptionType.SEPARATOR,
-									},
-									{
-										value: "settingsButtonClicked",
-										label: t("chat:edit"),
-										type: DropdownOptionType.ACTION,
-									},
-								]}
-								onChange={(value) => {
-									if (value === "settingsButtonClicked") {
-										vscode.postMessage({
-											type: "loadApiConfiguration",
-											text: value,
-											values: { section: "providers" },
-										})
-									} else {
-										vscode.postMessage({ type: "loadApiConfigurationById", text: value })
-									}
-								}}
-								triggerClassName="w-full text-ellipsis overflow-hidden"
-								itemClassName="group"
-								renderItem={({ type, value, label, pinned }) => {
-									if (type !== DropdownOptionType.ITEM) {
-										return label
-									}
-
-									const config = listApiConfigMeta?.find((c) => c.id === value)
-									const isCurrentConfig = config?.name === currentApiConfigName
-
-									return (
-										<div className="flex justify-between gap-2 w-full h-5">
-											<div
-												className={cn("truncate min-w-0 overflow-hidden", {
-													"font-medium": isCurrentConfig,
-												})}>
-												{label}
-											</div>
-											<div className="flex justify-end w-10 flex-shrink-0">
-												<div
-													className={cn("size-5 p-1", {
-														"block group-hover:hidden": !pinned,
-														hidden: !isCurrentConfig,
-													})}>
-													<Check className="size-3" />
-												</div>
-												<StandardTooltip content={pinned ? t("chat:unpin") : t("chat:pin")}>
-													<Button
-														variant="ghost"
-														size="icon"
-														onClick={(e) => {
-															e.stopPropagation()
-															togglePinnedApiConfig(value)
-															vscode.postMessage({
-																type: "toggleApiConfigPin",
-																text: value,
-															})
-														}}
-														className={cn("size-5", {
-															"hidden group-hover:flex": !pinned,
-															"bg-accent": pinned,
-														})}>
-														<Pin className="size-3 p-0.5 opacity-50" />
-													</Button>
-												</StandardTooltip>
-											</div>
-										</div>
-									)
-								}}
-							/>
-						</div>
-					</div>
-
-					<div className={cn("flex", "items-center", "gap-0.5", "shrink-0")}>
-						{isEditMode && (
-							<Button
-								variant="secondary"
-								size="sm"
-								onClick={onCancel}
-								disabled={sendingDisabled}
-								className="mr-2 text-xs">
-								Cancel
-							</Button>
-						)}
-						<IndexingStatusDot />
-						<IconButton
-							iconClass="codicon-device-camera"
-							title={t("chat:addImages")}
-							disabled={shouldDisableImages}
-							onClick={onSelectImages}
-							className="mr-1"
-						/>
-					</div>
-				</div>
+				{!isEditMode && renderNonEditModeControls()}
 			</div>
 		)
 	},
diff --git a/webview-ui/src/i18n/locales/ca/chat.json b/webview-ui/src/i18n/locales/ca/chat.json
index 29989cefb5..ccc83c4387 100644
--- a/webview-ui/src/i18n/locales/ca/chat.json
+++ b/webview-ui/src/i18n/locales/ca/chat.json
@@ -44,7 +44,7 @@
 	},
 	"save": {
 		"title": "Desar",
-		"tooltip": "Desa els canvis del fitxer"
+		"tooltip": "Desa els canvis del missatge"
 	},
 	"reject": {
 		"title": "Rebutjar",
diff --git a/webview-ui/src/i18n/locales/de/chat.json b/webview-ui/src/i18n/locales/de/chat.json
index fa9b7e02ae..ee8054beda 100644
--- a/webview-ui/src/i18n/locales/de/chat.json
+++ b/webview-ui/src/i18n/locales/de/chat.json
@@ -44,7 +44,7 @@
 	},
 	"save": {
 		"title": "Speichern",
-		"tooltip": "Dateiänderungen speichern"
+		"tooltip": "Nachrichtenänderungen speichern"
 	},
 	"reject": {
 		"title": "Ablehnen",
diff --git a/webview-ui/src/i18n/locales/en/chat.json b/webview-ui/src/i18n/locales/en/chat.json
index 0c4a430576..fd30f776eb 100644
--- a/webview-ui/src/i18n/locales/en/chat.json
+++ b/webview-ui/src/i18n/locales/en/chat.json
@@ -39,7 +39,7 @@
 	},
 	"save": {
 		"title": "Save",
-		"tooltip": "Save the file changes"
+		"tooltip": "Save the message changes"
 	},
 	"tokenProgress": {
 		"availableSpace": "Available space: {{amount}} tokens",
diff --git a/webview-ui/src/i18n/locales/es/chat.json b/webview-ui/src/i18n/locales/es/chat.json
index 864d074c3b..044409fe15 100644
--- a/webview-ui/src/i18n/locales/es/chat.json
+++ b/webview-ui/src/i18n/locales/es/chat.json
@@ -39,7 +39,7 @@
 	},
 	"save": {
 		"title": "Guardar",
-		"tooltip": "Guardar los cambios del archivo"
+		"tooltip": "Guardar los cambios del mensaje"
 	},
 	"tokenProgress": {
 		"availableSpace": "Espacio disponible: {{amount}} tokens",
diff --git a/webview-ui/src/i18n/locales/fr/chat.json b/webview-ui/src/i18n/locales/fr/chat.json
index 9c0805c737..4a69fd91a1 100644
--- a/webview-ui/src/i18n/locales/fr/chat.json
+++ b/webview-ui/src/i18n/locales/fr/chat.json
@@ -44,7 +44,7 @@
 	},
 	"save": {
 		"title": "Enregistrer",
-		"tooltip": "Sauvegarder les modifications du fichier"
+		"tooltip": "Enregistrer les modifications du message"
 	},
 	"reject": {
 		"title": "Rejeter",
diff --git a/webview-ui/src/i18n/locales/hi/chat.json b/webview-ui/src/i18n/locales/hi/chat.json
index 54f18ae6df..c717b4fadf 100644
--- a/webview-ui/src/i18n/locales/hi/chat.json
+++ b/webview-ui/src/i18n/locales/hi/chat.json
@@ -44,7 +44,7 @@
 	},
 	"save": {
 		"title": "सहेजें",
-		"tooltip": "फ़ाइल परिवर्तन सहेजें"
+		"tooltip": "संदेश के बदलाव सहेजें"
 	},
 	"reject": {
 		"title": "अस्वीकार करें",
diff --git a/webview-ui/src/i18n/locales/id/chat.json b/webview-ui/src/i18n/locales/id/chat.json
index 8401a5777c..95b18d5431 100644
--- a/webview-ui/src/i18n/locales/id/chat.json
+++ b/webview-ui/src/i18n/locales/id/chat.json
@@ -45,7 +45,7 @@
 	},
 	"save": {
 		"title": "Simpan",
-		"tooltip": "Simpan perubahan file"
+		"tooltip": "Simpan perubahan pesan"
 	},
 	"tokenProgress": {
 		"availableSpace": "Ruang tersedia: {{amount}} token",
diff --git a/webview-ui/src/i18n/locales/it/chat.json b/webview-ui/src/i18n/locales/it/chat.json
index 259e4ef2b3..7fecf646db 100644
--- a/webview-ui/src/i18n/locales/it/chat.json
+++ b/webview-ui/src/i18n/locales/it/chat.json
@@ -44,7 +44,7 @@
 	},
 	"save": {
 		"title": "Salva",
-		"tooltip": "Salva le modifiche al file"
+		"tooltip": "Salva le modifiche del messaggio"
 	},
 	"reject": {
 		"title": "Rifiuta",
diff --git a/webview-ui/src/i18n/locales/ja/chat.json b/webview-ui/src/i18n/locales/ja/chat.json
index 20aad74477..303aefc83a 100644
--- a/webview-ui/src/i18n/locales/ja/chat.json
+++ b/webview-ui/src/i18n/locales/ja/chat.json
@@ -44,7 +44,7 @@
 	},
 	"save": {
 		"title": "保存",
-		"tooltip": "ファイル変更を保存"
+		"tooltip": "メッセージの変更を保存"
 	},
 	"reject": {
 		"title": "拒否",
diff --git a/webview-ui/src/i18n/locales/ko/chat.json b/webview-ui/src/i18n/locales/ko/chat.json
index 4134d7e8f6..c7327d475c 100644
--- a/webview-ui/src/i18n/locales/ko/chat.json
+++ b/webview-ui/src/i18n/locales/ko/chat.json
@@ -44,7 +44,7 @@
 	},
 	"save": {
 		"title": "저장",
-		"tooltip": "파일 변경사항 저장"
+		"tooltip": "메시지 변경사항 저장"
 	},
 	"reject": {
 		"title": "거부",
diff --git a/webview-ui/src/i18n/locales/nl/chat.json b/webview-ui/src/i18n/locales/nl/chat.json
index 3d77a767fe..e34b9f0521 100644
--- a/webview-ui/src/i18n/locales/nl/chat.json
+++ b/webview-ui/src/i18n/locales/nl/chat.json
@@ -39,7 +39,7 @@
 	},
 	"save": {
 		"title": "Opslaan",
-		"tooltip": "Bestandswijzigingen opslaan"
+		"tooltip": "Berichtwijzigingen opslaan"
 	},
 	"tokenProgress": {
 		"availableSpace": "Beschikbare ruimte: {{amount}} tokens",
diff --git a/webview-ui/src/i18n/locales/pl/chat.json b/webview-ui/src/i18n/locales/pl/chat.json
index eed1749b9b..3c01cba1a0 100644
--- a/webview-ui/src/i18n/locales/pl/chat.json
+++ b/webview-ui/src/i18n/locales/pl/chat.json
@@ -44,7 +44,7 @@
 	},
 	"save": {
 		"title": "Zapisz",
-		"tooltip": "Zapisz zmiany w pliku"
+		"tooltip": "Zapisz zmiany wiadomości"
 	},
 	"reject": {
 		"title": "Odrzuć",
diff --git a/webview-ui/src/i18n/locales/pt-BR/chat.json b/webview-ui/src/i18n/locales/pt-BR/chat.json
index 03dfa468fc..85a28e8a7c 100644
--- a/webview-ui/src/i18n/locales/pt-BR/chat.json
+++ b/webview-ui/src/i18n/locales/pt-BR/chat.json
@@ -44,7 +44,7 @@
 	},
 	"save": {
 		"title": "Salvar",
-		"tooltip": "Salvar as alterações do arquivo"
+		"tooltip": "Salvar as alterações da mensagem"
 	},
 	"reject": {
 		"title": "Rejeitar",
diff --git a/webview-ui/src/i18n/locales/ru/chat.json b/webview-ui/src/i18n/locales/ru/chat.json
index 6d31e3ed10..b33db4159f 100644
--- a/webview-ui/src/i18n/locales/ru/chat.json
+++ b/webview-ui/src/i18n/locales/ru/chat.json
@@ -39,7 +39,7 @@
 	},
 	"save": {
 		"title": "Сохранить",
-		"tooltip": "Сохранить изменения в файле"
+		"tooltip": "Сохранить изменения сообщения"
 	},
 	"tokenProgress": {
 		"availableSpace": "Доступно места: {{amount}} токенов",
diff --git a/webview-ui/src/i18n/locales/tr/chat.json b/webview-ui/src/i18n/locales/tr/chat.json
index 6aca7b9a80..815bf5bae8 100644
--- a/webview-ui/src/i18n/locales/tr/chat.json
+++ b/webview-ui/src/i18n/locales/tr/chat.json
@@ -44,7 +44,7 @@
 	},
 	"save": {
 		"title": "Kaydet",
-		"tooltip": "Dosya değişikliklerini kaydet"
+		"tooltip": "Mesaj değişikliklerini kaydet"
 	},
 	"reject": {
 		"title": "Reddet",
diff --git a/webview-ui/src/i18n/locales/vi/chat.json b/webview-ui/src/i18n/locales/vi/chat.json
index 4522cd7917..952e5721d4 100644
--- a/webview-ui/src/i18n/locales/vi/chat.json
+++ b/webview-ui/src/i18n/locales/vi/chat.json
@@ -44,7 +44,7 @@
 	},
 	"save": {
 		"title": "Lưu",
-		"tooltip": "Lưu các thay đổi tệp"
+		"tooltip": "Lưu các thay đổi tin nhắn"
 	},
 	"reject": {
 		"title": "Từ chối",
diff --git a/webview-ui/src/i18n/locales/zh-CN/chat.json b/webview-ui/src/i18n/locales/zh-CN/chat.json
index 3f5d5ba48a..ff67e6aaa6 100644
--- a/webview-ui/src/i18n/locales/zh-CN/chat.json
+++ b/webview-ui/src/i18n/locales/zh-CN/chat.json
@@ -44,7 +44,7 @@
 	},
 	"save": {
 		"title": "保存",
-		"tooltip": "保存文件更改"
+		"tooltip": "保存消息更改"
 	},
 	"reject": {
 		"title": "拒绝",
diff --git a/webview-ui/src/i18n/locales/zh-TW/chat.json b/webview-ui/src/i18n/locales/zh-TW/chat.json
index 1dc3b19f7a..e9cc813ad4 100644
--- a/webview-ui/src/i18n/locales/zh-TW/chat.json
+++ b/webview-ui/src/i18n/locales/zh-TW/chat.json
@@ -44,7 +44,7 @@
 	},
 	"save": {
 		"title": "儲存",
-		"tooltip": "儲存檔案變更"
+		"tooltip": "儲存訊息變更"
 	},
 	"reject": {
 		"title": "拒絕",

From 6fc741c492da910603cbc0c5cf178edebc7dd69c Mon Sep 17 00:00:00 2001
From: Will Li <willeli2002@gmail.com>
Date: Fri, 11 Jul 2025 09:51:32 -0700
Subject: [PATCH 11/14] put back edit flag

---
 webview-ui/src/components/chat/ChatRow.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webview-ui/src/components/chat/ChatRow.tsx b/webview-ui/src/components/chat/ChatRow.tsx
index 12eac7373f..926bd400f0 100644
--- a/webview-ui/src/components/chat/ChatRow.tsx
+++ b/webview-ui/src/components/chat/ChatRow.tsx
@@ -1089,7 +1089,7 @@ export const ChatRowContent = ({
 										<Button
 											variant="ghost"
 											size="icon"
-											className="shrink-0"
+											className="shrink-0 hidden"
 											disabled={isStreaming}
 											onClick={(e) => {
 												e.stopPropagation()

From 23e185b4784b0b0d492095d7382b492280d319f2 Mon Sep 17 00:00:00 2001
From: Will Li <willeli2002@gmail.com>
Date: Mon, 14 Jul 2025 14:55:09 -0700
Subject: [PATCH 12/14] oops test fix

---
 .../chat/__tests__/ChatTextArea.spec.tsx      | 80 ++++++++-----------
 1 file changed, 33 insertions(+), 47 deletions(-)

diff --git a/webview-ui/src/components/chat/__tests__/ChatTextArea.spec.tsx b/webview-ui/src/components/chat/__tests__/ChatTextArea.spec.tsx
index b85e0bc99c..93d01ea9f4 100644
--- a/webview-ui/src/components/chat/__tests__/ChatTextArea.spec.tsx
+++ b/webview-ui/src/components/chat/__tests__/ChatTextArea.spec.tsx
@@ -868,19 +868,15 @@ describe("ChatTextArea", () => {
 
 			render(<ChatTextArea {...defaultProps} isEditMode={true} />)
 
-			// Should show edit button (codicon-edit)
-			const editButton = screen.getByRole("button", {
-				name: (_, element) => {
-					return element.querySelector(".codicon-edit") !== null
-				},
+			// Should show save button in edit mode
+			const saveButton = screen.getByRole("button", {
+				name: /save/i,
 			})
-			expect(editButton).toBeInTheDocument()
+			expect(saveButton).toBeInTheDocument()
 
-			// Should not show send button (codicon-send)
+			// Should not show send button in edit mode
 			const sendButton = screen.queryByRole("button", {
-				name: (_, element) => {
-					return element.querySelector(".codicon-send") !== null
-				},
+				name: /send/i,
 			})
 			expect(sendButton).not.toBeInTheDocument()
 		})
@@ -895,21 +891,17 @@ describe("ChatTextArea", () => {
 
 			render(<ChatTextArea {...defaultProps} isEditMode={false} />)
 
-			// Should show send button (codicon-send)
+			// Should show send button when not in edit mode
 			const sendButton = screen.getByRole("button", {
-				name: (_, element) => {
-					return element.querySelector(".codicon-send") !== null
-				},
+				name: /send/i,
 			})
 			expect(sendButton).toBeInTheDocument()
 
-			// Should not show edit button (codicon-edit)
-			const editButton = screen.queryByRole("button", {
-				name: (_, element) => {
-					return element.querySelector(".codicon-edit") !== null
-				},
+			// Should not show save button when not in edit mode
+			const saveButton = screen.queryByRole("button", {
+				name: /save/i,
 			})
-			expect(editButton).not.toBeInTheDocument()
+			expect(saveButton).not.toBeInTheDocument()
 		})
 
 		it("should show cancel button in edit mode", () => {
@@ -943,7 +935,7 @@ describe("ChatTextArea", () => {
 			expect(cancelButton).not.toBeInTheDocument()
 		})
 
-		it("should call onSend when edit button is clicked", () => {
+		it("should call onSend when save button is clicked", () => {
 			const onSend = vi.fn()
 			;(useExtensionState as ReturnType<typeof vi.fn>).mockReturnValue({
 				filePaths: [],
@@ -954,13 +946,11 @@ describe("ChatTextArea", () => {
 
 			render(<ChatTextArea {...defaultProps} isEditMode={true} onSend={onSend} />)
 
-			const editButton = screen.getByRole("button", {
-				name: (_, element) => {
-					return element.querySelector(".codicon-edit") !== null
-				},
+			const saveButton = screen.getByRole("button", {
+				name: /save/i,
 			})
 
-			fireEvent.click(editButton)
+			fireEvent.click(saveButton)
 			expect(onSend).toHaveBeenCalledTimes(1)
 		})
 
@@ -981,7 +971,7 @@ describe("ChatTextArea", () => {
 			expect(onCancel).toHaveBeenCalledTimes(1)
 		})
 
-		it("should disable edit button when sendingDisabled is true", () => {
+		it("should disable save button when sendingDisabled is true", () => {
 			;(useExtensionState as ReturnType<typeof vi.fn>).mockReturnValue({
 				filePaths: [],
 				openedTabs: [],
@@ -991,13 +981,11 @@ describe("ChatTextArea", () => {
 
 			render(<ChatTextArea {...defaultProps} isEditMode={true} sendingDisabled={true} />)
 
-			const editButton = screen.getByRole("button", {
-				name: (_, element) => {
-					return element.querySelector(".codicon-edit") !== null
-				},
+			const saveButton = screen.getByRole("button", {
+				name: /save/i,
 			})
 
-			expect(editButton).toBeDisabled()
+			expect(saveButton).toBeDisabled()
 		})
 
 		it("should disable cancel button when sendingDisabled is true", () => {
@@ -1014,7 +1002,7 @@ describe("ChatTextArea", () => {
 			expect(cancelButton).toBeDisabled()
 		})
 
-		it("should have correct tooltip for edit button", () => {
+		it("should have correct tooltip for save button", () => {
 			;(useExtensionState as ReturnType<typeof vi.fn>).mockReturnValue({
 				filePaths: [],
 				openedTabs: [],
@@ -1024,17 +1012,16 @@ describe("ChatTextArea", () => {
 
 			render(<ChatTextArea {...defaultProps} isEditMode={true} />)
 
-			const editButton = screen.getByRole("button", {
-				name: (_, element) => {
-					return element.querySelector(".codicon-edit") !== null
-				},
+			// Look for the save button by its aria-label
+			const saveButton = screen.getByRole("button", {
+				name: /save/i,
 			})
 
 			// Check that the button has the correct aria-label (which is used for tooltip)
-			expect(editButton).toHaveAttribute("aria-label", expect.stringMatching(/save/i))
+			expect(saveButton).toHaveAttribute("aria-label", expect.stringMatching(/save/i))
 		})
 
-		it("should position cancel button correctly relative to camera button", () => {
+		it("should position cancel button correctly relative to image button", () => {
 			;(useExtensionState as ReturnType<typeof vi.fn>).mockReturnValue({
 				filePaths: [],
 				openedTabs: [],
@@ -1045,22 +1032,21 @@ describe("ChatTextArea", () => {
 			const { container } = render(<ChatTextArea {...defaultProps} isEditMode={true} />)
 
 			const cancelButton = screen.getByRole("button", { name: /cancel/i })
-			const cameraButton = screen.getByRole("button", {
-				name: (_, element) => {
-					return element.querySelector(".codicon-device-camera") !== null
-				},
+			// Look for the image button by its aria-label
+			const imageButton = screen.getByRole("button", {
+				name: /add.*images/i,
 			})
 
 			// Both buttons should be in the same container (bottom toolbar)
 			const bottomToolbar = container.querySelector(".flex.items-center.gap-0\\.5.shrink-0")
 			expect(bottomToolbar).toContainElement(cancelButton)
-			expect(bottomToolbar).toContainElement(cameraButton)
+			expect(bottomToolbar).toContainElement(imageButton)
 
-			// Cancel button should come before camera button in DOM order
+			// Cancel button should come before image button in DOM order
 			const buttons = bottomToolbar?.querySelectorAll("button")
 			const cancelIndex = Array.from(buttons || []).indexOf(cancelButton as HTMLButtonElement)
-			const cameraIndex = Array.from(buttons || []).indexOf(cameraButton as HTMLButtonElement)
-			expect(cancelIndex).toBeLessThan(cameraIndex)
+			const imageIndex = Array.from(buttons || []).indexOf(imageButton as HTMLButtonElement)
+			expect(cancelIndex).toBeLessThan(imageIndex)
 		})
 	})
 })

From a23e4042c1ff2b5da808419f69d014e99449c67b Mon Sep 17 00:00:00 2001
From: Will Li <willeli2002@gmail.com>
Date: Tue, 15 Jul 2025 09:24:14 -0700
Subject: [PATCH 13/14] reduce margins

---
 webview-ui/src/components/chat/ChatTextArea.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webview-ui/src/components/chat/ChatTextArea.tsx b/webview-ui/src/components/chat/ChatTextArea.tsx
index 81d6931ab5..c25c13b651 100644
--- a/webview-ui/src/components/chat/ChatTextArea.tsx
+++ b/webview-ui/src/components/chat/ChatTextArea.tsx
@@ -1235,12 +1235,12 @@ const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
 					"flex-col",
 					"gap-1",
 					"bg-editor-background",
-					"px-1.5",
+					isEditMode ? "px-0" : "px-1.5",
 					"pb-1",
 					"outline-none",
 					"border",
 					"border-none",
-					"w-[calc(100%-16px)]",
+					isEditMode ? "w-full" : "w-[calc(100%-16px)]",
 					"ml-auto",
 					"mr-auto",
 					"box-border",

From cf53be74ab5ccba81429b300b8464886cd1f96cb Mon Sep 17 00:00:00 2001
From: Will Li <willeli2002@gmail.com>
Date: Tue, 15 Jul 2025 12:22:50 -0700
Subject: [PATCH 14/14] code review

---
 webview-ui/src/App.tsx                        |  49 +++--
 .../src/components/chat/ChatTextArea.tsx      |  87 ++-------
 .../src/components/chat/EditModeControls.tsx  | 115 +++++++++++
 .../MessageModificationConfirmationDialog.tsx |   4 +-
 .../chat/__tests__/ChatTextArea.spec.tsx      | 180 ++----------------
 .../chat/__tests__/EditModeControls.spec.tsx  | 138 ++++++++++++++
 webview-ui/src/i18n/locales/ca/common.json    |  11 +-
 webview-ui/src/i18n/locales/de/common.json    |  11 +-
 webview-ui/src/i18n/locales/en/common.json    |  11 +-
 webview-ui/src/i18n/locales/es/common.json    |  11 +-
 webview-ui/src/i18n/locales/fr/common.json    |  11 +-
 webview-ui/src/i18n/locales/hi/common.json    |  11 +-
 webview-ui/src/i18n/locales/id/common.json    |  11 +-
 webview-ui/src/i18n/locales/it/common.json    |  11 +-
 webview-ui/src/i18n/locales/ja/common.json    |  11 +-
 webview-ui/src/i18n/locales/ko/common.json    |  11 +-
 webview-ui/src/i18n/locales/nl/common.json    |  11 +-
 webview-ui/src/i18n/locales/pl/common.json    |  11 +-
 webview-ui/src/i18n/locales/pt-BR/common.json |  11 +-
 webview-ui/src/i18n/locales/ru/common.json    |  11 +-
 webview-ui/src/i18n/locales/tr/common.json    |  11 +-
 webview-ui/src/i18n/locales/vi/common.json    |  11 +-
 webview-ui/src/i18n/locales/zh-CN/common.json |  11 +-
 webview-ui/src/i18n/locales/zh-TW/common.json |  11 +-
 24 files changed, 409 insertions(+), 362 deletions(-)
 create mode 100644 webview-ui/src/components/chat/EditModeControls.tsx
 create mode 100644 webview-ui/src/components/chat/__tests__/EditModeControls.spec.tsx

diff --git a/webview-ui/src/App.tsx b/webview-ui/src/App.tsx
index 3e149f28ed..3c4c14f5df 100644
--- a/webview-ui/src/App.tsx
+++ b/webview-ui/src/App.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useRef, useState, useMemo } from "react"
+import React, { useCallback, useEffect, useRef, useState, useMemo } from "react"
 import { useEvent } from "react-use"
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query"
 
@@ -26,6 +26,29 @@ import { STANDARD_TOOLTIP_DELAY } from "./components/ui/standard-tooltip"
 
 type Tab = "settings" | "history" | "mcp" | "modes" | "chat" | "marketplace" | "account"
 
+interface HumanRelayDialogState {
+	isOpen: boolean
+	requestId: string
+	promptText: string
+}
+
+interface DeleteMessageDialogState {
+	isOpen: boolean
+	messageTs: number
+}
+
+interface EditMessageDialogState {
+	isOpen: boolean
+	messageTs: number
+	text: string
+	images?: string[]
+}
+
+// Memoize dialog components to prevent unnecessary re-renders
+const MemoizedDeleteMessageDialog = React.memo(DeleteMessageDialog)
+const MemoizedEditMessageDialog = React.memo(EditMessageDialog)
+const MemoizedHumanRelayDialog = React.memo(HumanRelayDialog)
+
 const tabsByMessageAction: Partial<Record<NonNullable<ExtensionMessage["action"]>, Tab>> = {
 	chatButtonClicked: "chat",
 	settingsButtonClicked: "settings",
@@ -57,30 +80,18 @@ const App = () => {
 	const [showAnnouncement, setShowAnnouncement] = useState(false)
 	const [tab, setTab] = useState<Tab>("chat")
 
-	const [humanRelayDialogState, setHumanRelayDialogState] = useState<{
-		isOpen: boolean
-		requestId: string
-		promptText: string
-	}>({
+	const [humanRelayDialogState, setHumanRelayDialogState] = useState<HumanRelayDialogState>({
 		isOpen: false,
 		requestId: "",
 		promptText: "",
 	})
 
-	const [deleteMessageDialogState, setDeleteMessageDialogState] = useState<{
-		isOpen: boolean
-		messageTs: number
-	}>({
+	const [deleteMessageDialogState, setDeleteMessageDialogState] = useState<DeleteMessageDialogState>({
 		isOpen: false,
 		messageTs: 0,
 	})
 
-	const [editMessageDialogState, setEditMessageDialogState] = useState<{
-		isOpen: boolean
-		messageTs: number
-		text: string
-		images?: string[]
-	}>({
+	const [editMessageDialogState, setEditMessageDialogState] = useState<EditMessageDialogState>({
 		isOpen: false,
 		messageTs: 0,
 		text: "",
@@ -233,7 +244,7 @@ const App = () => {
 				showAnnouncement={showAnnouncement}
 				hideAnnouncement={() => setShowAnnouncement(false)}
 			/>
-			<HumanRelayDialog
+			<MemoizedHumanRelayDialog
 				isOpen={humanRelayDialogState.isOpen}
 				requestId={humanRelayDialogState.requestId}
 				promptText={humanRelayDialogState.promptText}
@@ -241,7 +252,7 @@ const App = () => {
 				onSubmit={(requestId, text) => vscode.postMessage({ type: "humanRelayResponse", requestId, text })}
 				onCancel={(requestId) => vscode.postMessage({ type: "humanRelayCancel", requestId })}
 			/>
-			<DeleteMessageDialog
+			<MemoizedDeleteMessageDialog
 				open={deleteMessageDialogState.isOpen}
 				onOpenChange={(open) => setDeleteMessageDialogState((prev) => ({ ...prev, isOpen: open }))}
 				onConfirm={() => {
@@ -252,7 +263,7 @@ const App = () => {
 					setDeleteMessageDialogState((prev) => ({ ...prev, isOpen: false }))
 				}}
 			/>
-			<EditMessageDialog
+			<MemoizedEditMessageDialog
 				open={editMessageDialogState.isOpen}
 				onOpenChange={(open) => setEditMessageDialogState((prev) => ({ ...prev, isOpen: open }))}
 				onConfirm={() => {
diff --git a/webview-ui/src/components/chat/ChatTextArea.tsx b/webview-ui/src/components/chat/ChatTextArea.tsx
index c25c13b651..894b8c2de5 100644
--- a/webview-ui/src/components/chat/ChatTextArea.tsx
+++ b/webview-ui/src/components/chat/ChatTextArea.tsx
@@ -29,6 +29,7 @@ import { VolumeX, Pin, Check, Image, WandSparkles, SendHorizontal } from "lucide
 import { IndexingStatusBadge } from "./IndexingStatusBadge"
 import { cn } from "@/lib/utils"
 import { usePromptHistory } from "./hooks/usePromptHistory"
+import { EditModeControls } from "./EditModeControls"
 
 interface ChatTextAreaProps {
 	inputValue: string
@@ -806,77 +807,6 @@ const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
 			/>
 		)
 
-		// Helper function to render edit mode controls
-		const renderEditModeControls = () => (
-			<div
-				className={cn(
-					"flex",
-					"items-center",
-					"justify-between",
-					"absolute",
-					"bottom-2",
-					"left-2",
-					"right-2",
-					"z-30",
-				)}>
-				<div className={cn("flex", "items-center", "gap-1", "flex-1", "min-w-0")}>
-					<div className="shrink-0">{renderModeSelector()}</div>
-				</div>
-				<div className={cn("flex", "items-center", "gap-0.5", "shrink-0", "ml-2")}>
-					<Button
-						variant="secondary"
-						size="sm"
-						onClick={onCancel}
-						disabled={sendingDisabled}
-						className="text-xs bg-vscode-toolbar-hoverBackground hover:bg-vscode-button-secondaryBackground text-vscode-button-secondaryForeground">
-						Cancel
-					</Button>
-					<StandardTooltip content={t("chat:addImages")}>
-						<button
-							aria-label={t("chat:addImages")}
-							disabled={shouldDisableImages}
-							onClick={!shouldDisableImages ? onSelectImages : undefined}
-							className={cn(
-								"relative inline-flex items-center justify-center",
-								"bg-transparent border-none p-1.5",
-								"rounded-md min-w-[28px] min-h-[28px]",
-								"opacity-60 hover:opacity-100 text-vscode-descriptionForeground hover:text-vscode-foreground",
-								"transition-all duration-150",
-								"hover:bg-[rgba(255,255,255,0.03)] hover:border-[rgba(255,255,255,0.15)]",
-								"focus:outline-none focus-visible:ring-1 focus-visible:ring-vscode-focusBorder",
-								"active:bg-[rgba(255,255,255,0.1)]",
-								!shouldDisableImages && "cursor-pointer",
-								shouldDisableImages &&
-									"opacity-40 cursor-not-allowed grayscale-[30%] hover:bg-transparent hover:border-[rgba(255,255,255,0.08)] active:bg-transparent",
-							)}>
-							<Image className="w-4 h-4" />
-						</button>
-					</StandardTooltip>
-					<StandardTooltip content={t("chat:save.tooltip")}>
-						<button
-							aria-label={t("chat:save.tooltip")}
-							disabled={sendingDisabled}
-							onClick={!sendingDisabled ? onSend : undefined}
-							className={cn(
-								"relative inline-flex items-center justify-center",
-								"bg-transparent border-none p-1.5",
-								"rounded-md min-w-[28px] min-h-[28px]",
-								"opacity-60 hover:opacity-100 text-vscode-descriptionForeground hover:text-vscode-foreground",
-								"transition-all duration-150",
-								"hover:bg-[rgba(255,255,255,0.03)] hover:border-[rgba(255,255,255,0.15)]",
-								"focus:outline-none focus-visible:ring-1 focus-visible:ring-vscode-focusBorder",
-								"active:bg-[rgba(255,255,255,0.1)]",
-								!sendingDisabled && "cursor-pointer",
-								sendingDisabled &&
-									"opacity-40 cursor-not-allowed grayscale-[30%] hover:bg-transparent hover:border-[rgba(255,255,255,0.08)] active:bg-transparent",
-							)}>
-							<SendHorizontal className="w-4 h-4" />
-						</button>
-					</StandardTooltip>
-				</div>
-			</div>
-		)
-
 		// Helper function to get API config dropdown options
 		const getApiConfigOptions = useMemo(() => {
 			const pinnedConfigs = (listApiConfigMeta || [])
@@ -1305,7 +1235,20 @@ const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
 						{renderTextAreaSection()}
 					</div>
 
-					{isEditMode && renderEditModeControls()}
+					{isEditMode && (
+						<EditModeControls
+							mode={mode}
+							onModeChange={handleModeChange}
+							modeShortcutText={modeShortcutText}
+							customModes={customModes}
+							customModePrompts={customModePrompts}
+							onCancel={onCancel}
+							onSend={onSend}
+							onSelectImages={onSelectImages}
+							sendingDisabled={sendingDisabled}
+							shouldDisableImages={shouldDisableImages}
+						/>
+					)}
 				</div>
 
 				{selectedImages.length > 0 && (
diff --git a/webview-ui/src/components/chat/EditModeControls.tsx b/webview-ui/src/components/chat/EditModeControls.tsx
new file mode 100644
index 0000000000..82906bf1a3
--- /dev/null
+++ b/webview-ui/src/components/chat/EditModeControls.tsx
@@ -0,0 +1,115 @@
+import React from "react"
+import { Mode } from "@roo/modes"
+import { Button, StandardTooltip } from "@/components/ui"
+import { Image, SendHorizontal } from "lucide-react"
+import { cn } from "@/lib/utils"
+import ModeSelector from "./ModeSelector"
+import { useAppTranslation } from "@/i18n/TranslationContext"
+
+interface EditModeControlsProps {
+	mode: Mode
+	onModeChange: (value: Mode) => void
+	modeShortcutText: string
+	customModes: any
+	customModePrompts: any
+	onCancel?: () => void
+	onSend: () => void
+	onSelectImages: () => void
+	sendingDisabled: boolean
+	shouldDisableImages: boolean
+}
+
+export const EditModeControls: React.FC<EditModeControlsProps> = ({
+	mode,
+	onModeChange,
+	modeShortcutText,
+	customModes,
+	customModePrompts,
+	onCancel,
+	onSend,
+	onSelectImages,
+	sendingDisabled,
+	shouldDisableImages,
+}) => {
+	const { t } = useAppTranslation()
+
+	return (
+		<div
+			className={cn(
+				"flex",
+				"items-center",
+				"justify-between",
+				"absolute",
+				"bottom-2",
+				"left-2",
+				"right-2",
+				"z-30",
+			)}>
+			<div className={cn("flex", "items-center", "gap-1", "flex-1", "min-w-0")}>
+				<div className="shrink-0">
+					<ModeSelector
+						value={mode}
+						title={t("chat:selectMode")}
+						onChange={onModeChange}
+						triggerClassName="w-full"
+						modeShortcutText={modeShortcutText}
+						customModes={customModes}
+						customModePrompts={customModePrompts}
+					/>
+				</div>
+			</div>
+			<div className={cn("flex", "items-center", "gap-0.5", "shrink-0", "ml-2")}>
+				<Button
+					variant="secondary"
+					size="sm"
+					onClick={onCancel}
+					disabled={sendingDisabled}
+					className="text-xs bg-vscode-toolbar-hoverBackground hover:bg-vscode-button-secondaryBackground text-vscode-button-secondaryForeground">
+					Cancel
+				</Button>
+				<StandardTooltip content={t("chat:addImages")}>
+					<button
+						aria-label={t("chat:addImages")}
+						disabled={shouldDisableImages}
+						onClick={!shouldDisableImages ? onSelectImages : undefined}
+						className={cn(
+							"relative inline-flex items-center justify-center",
+							"bg-transparent border-none p-1.5",
+							"rounded-md min-w-[28px] min-h-[28px]",
+							"opacity-60 hover:opacity-100 text-vscode-descriptionForeground hover:text-vscode-foreground",
+							"transition-all duration-150",
+							"hover:bg-[rgba(255,255,255,0.03)] hover:border-[rgba(255,255,255,0.15)]",
+							"focus:outline-none focus-visible:ring-1 focus-visible:ring-vscode-focusBorder",
+							"active:bg-[rgba(255,255,255,0.1)]",
+							!shouldDisableImages && "cursor-pointer",
+							shouldDisableImages &&
+								"opacity-40 cursor-not-allowed grayscale-[30%] hover:bg-transparent hover:border-[rgba(255,255,255,0.08)] active:bg-transparent",
+						)}>
+						<Image className="w-4 h-4" />
+					</button>
+				</StandardTooltip>
+				<StandardTooltip content={t("chat:save.tooltip")}>
+					<button
+						aria-label={t("chat:save.tooltip")}
+						disabled={sendingDisabled}
+						onClick={!sendingDisabled ? onSend : undefined}
+						className={cn(
+							"relative inline-flex items-center justify-center",
+							"bg-transparent border-none p-1.5",
+							"rounded-md min-w-[28px] min-h-[28px]",
+							"opacity-60 hover:opacity-100 text-vscode-descriptionForeground hover:text-vscode-foreground",
+							"transition-all duration-150",
+							"hover:bg-[rgba(255,255,255,0.03)] hover:border-[rgba(255,255,255,0.15)]",
+							"focus:outline-none focus-visible:ring-1 focus-visible:ring-vscode-focusBorder",
+							"active:bg-[rgba(255,255,255,0.1)]",
+							!sendingDisabled && "cursor-pointer",
+							sendingDisabled &&
+								"opacity-40 cursor-not-allowed grayscale-[30%] hover:bg-transparent hover:border-[rgba(255,255,255,0.08)] active:bg-transparent",
+						)}>
+						<SendHorizontal className="w-4 h-4" />
+					</button>
+				</StandardTooltip>
+			</div>
+		</div>
+	)
+}
diff --git a/webview-ui/src/components/chat/MessageModificationConfirmationDialog.tsx b/webview-ui/src/components/chat/MessageModificationConfirmationDialog.tsx
index 81c6bbf007..883a34f3f3 100644
--- a/webview-ui/src/components/chat/MessageModificationConfirmationDialog.tsx
+++ b/webview-ui/src/components/chat/MessageModificationConfirmationDialog.tsx
@@ -27,8 +27,8 @@ export const MessageModificationConfirmationDialog: React.FC<MessageModification
 	const { t } = useAppTranslation()
 
 	const isEdit = type === "edit"
-	const title = isEdit ? t("common:confirmation.edit_message") : t("common:confirmation.delete_message")
-	const description = isEdit ? t("common:confirmation.edit_warning") : t("common:confirmation.delete_warning")
+	const title = isEdit ? t("common:confirmation.editMessage") : t("common:confirmation.deleteMessage")
+	const description = isEdit ? t("common:confirmation.editWarning") : t("common:confirmation.deleteWarning")
 
 	return (
 		<AlertDialog open={open} onOpenChange={onOpenChange}>
diff --git a/webview-ui/src/components/chat/__tests__/ChatTextArea.spec.tsx b/webview-ui/src/components/chat/__tests__/ChatTextArea.spec.tsx
index 93d01ea9f4..80b903dce7 100644
--- a/webview-ui/src/components/chat/__tests__/ChatTextArea.spec.tsx
+++ b/webview-ui/src/components/chat/__tests__/ChatTextArea.spec.tsx
@@ -857,31 +857,34 @@ describe("ChatTextArea", () => {
 			expect(apiConfigDropdown).toHaveAttribute("disabled")
 		})
 	})
-	describe("edit mode functionality", () => {
-		it("should show edit button instead of send button when isEditMode is true", () => {
+	describe("edit mode integration", () => {
+		it("should render edit mode UI when isEditMode is true", () => {
 			;(useExtensionState as ReturnType<typeof vi.fn>).mockReturnValue({
 				filePaths: [],
 				openedTabs: [],
 				taskHistory: [],
 				cwd: "/test/workspace",
+				customModes: [],
+				customModePrompts: {},
 			})
 
 			render(<ChatTextArea {...defaultProps} isEditMode={true} />)
 
-			// Should show save button in edit mode
-			const saveButton = screen.getByRole("button", {
-				name: /save/i,
-			})
+			// The edit mode UI should be rendered
+			// We can verify this by checking for the presence of elements that are unique to edit mode
+			const cancelButton = screen.getByRole("button", { name: /cancel/i })
+			expect(cancelButton).toBeInTheDocument()
+
+			// Should show save button instead of send button
+			const saveButton = screen.getByRole("button", { name: /save/i })
 			expect(saveButton).toBeInTheDocument()
 
 			// Should not show send button in edit mode
-			const sendButton = screen.queryByRole("button", {
-				name: /send/i,
-			})
+			const sendButton = screen.queryByRole("button", { name: /send.*message/i })
 			expect(sendButton).not.toBeInTheDocument()
 		})
 
-		it("should show send button when isEditMode is false", () => {
+		it("should not render edit mode UI when isEditMode is false", () => {
 			;(useExtensionState as ReturnType<typeof vi.fn>).mockReturnValue({
 				filePaths: [],
 				openedTabs: [],
@@ -891,162 +894,17 @@ describe("ChatTextArea", () => {
 
 			render(<ChatTextArea {...defaultProps} isEditMode={false} />)
 
+			// The edit mode UI should not be rendered
+			const cancelButton = screen.queryByRole("button", { name: /cancel/i })
+			expect(cancelButton).not.toBeInTheDocument()
+
 			// Should show send button when not in edit mode
-			const sendButton = screen.getByRole("button", {
-				name: /send/i,
-			})
+			const sendButton = screen.getByRole("button", { name: /send.*message/i })
 			expect(sendButton).toBeInTheDocument()
 
 			// Should not show save button when not in edit mode
-			const saveButton = screen.queryByRole("button", {
-				name: /save/i,
-			})
+			const saveButton = screen.queryByRole("button", { name: /save/i })
 			expect(saveButton).not.toBeInTheDocument()
 		})
-
-		it("should show cancel button in edit mode", () => {
-			;(useExtensionState as ReturnType<typeof vi.fn>).mockReturnValue({
-				filePaths: [],
-				openedTabs: [],
-				taskHistory: [],
-				cwd: "/test/workspace",
-			})
-
-			render(<ChatTextArea {...defaultProps} isEditMode={true} />)
-
-			// Should show cancel button with text "Cancel"
-			const cancelButton = screen.getByRole("button", { name: /cancel/i })
-			expect(cancelButton).toBeInTheDocument()
-			expect(cancelButton).toHaveTextContent("Cancel")
-		})
-
-		it("should not show cancel button when not in edit mode", () => {
-			;(useExtensionState as ReturnType<typeof vi.fn>).mockReturnValue({
-				filePaths: [],
-				openedTabs: [],
-				taskHistory: [],
-				cwd: "/test/workspace",
-			})
-
-			render(<ChatTextArea {...defaultProps} isEditMode={false} />)
-
-			// Should not show cancel button
-			const cancelButton = screen.queryByRole("button", { name: /cancel/i })
-			expect(cancelButton).not.toBeInTheDocument()
-		})
-
-		it("should call onSend when save button is clicked", () => {
-			const onSend = vi.fn()
-			;(useExtensionState as ReturnType<typeof vi.fn>).mockReturnValue({
-				filePaths: [],
-				openedTabs: [],
-				taskHistory: [],
-				cwd: "/test/workspace",
-			})
-
-			render(<ChatTextArea {...defaultProps} isEditMode={true} onSend={onSend} />)
-
-			const saveButton = screen.getByRole("button", {
-				name: /save/i,
-			})
-
-			fireEvent.click(saveButton)
-			expect(onSend).toHaveBeenCalledTimes(1)
-		})
-
-		it("should call onCancel when cancel button is clicked", () => {
-			const onCancel = vi.fn()
-			;(useExtensionState as ReturnType<typeof vi.fn>).mockReturnValue({
-				filePaths: [],
-				openedTabs: [],
-				taskHistory: [],
-				cwd: "/test/workspace",
-			})
-
-			render(<ChatTextArea {...defaultProps} isEditMode={true} onCancel={onCancel} />)
-
-			const cancelButton = screen.getByRole("button", { name: /cancel/i })
-
-			fireEvent.click(cancelButton)
-			expect(onCancel).toHaveBeenCalledTimes(1)
-		})
-
-		it("should disable save button when sendingDisabled is true", () => {
-			;(useExtensionState as ReturnType<typeof vi.fn>).mockReturnValue({
-				filePaths: [],
-				openedTabs: [],
-				taskHistory: [],
-				cwd: "/test/workspace",
-			})
-
-			render(<ChatTextArea {...defaultProps} isEditMode={true} sendingDisabled={true} />)
-
-			const saveButton = screen.getByRole("button", {
-				name: /save/i,
-			})
-
-			expect(saveButton).toBeDisabled()
-		})
-
-		it("should disable cancel button when sendingDisabled is true", () => {
-			;(useExtensionState as ReturnType<typeof vi.fn>).mockReturnValue({
-				filePaths: [],
-				openedTabs: [],
-				taskHistory: [],
-				cwd: "/test/workspace",
-			})
-
-			render(<ChatTextArea {...defaultProps} isEditMode={true} sendingDisabled={true} />)
-
-			const cancelButton = screen.getByRole("button", { name: /cancel/i })
-			expect(cancelButton).toBeDisabled()
-		})
-
-		it("should have correct tooltip for save button", () => {
-			;(useExtensionState as ReturnType<typeof vi.fn>).mockReturnValue({
-				filePaths: [],
-				openedTabs: [],
-				taskHistory: [],
-				cwd: "/test/workspace",
-			})
-
-			render(<ChatTextArea {...defaultProps} isEditMode={true} />)
-
-			// Look for the save button by its aria-label
-			const saveButton = screen.getByRole("button", {
-				name: /save/i,
-			})
-
-			// Check that the button has the correct aria-label (which is used for tooltip)
-			expect(saveButton).toHaveAttribute("aria-label", expect.stringMatching(/save/i))
-		})
-
-		it("should position cancel button correctly relative to image button", () => {
-			;(useExtensionState as ReturnType<typeof vi.fn>).mockReturnValue({
-				filePaths: [],
-				openedTabs: [],
-				taskHistory: [],
-				cwd: "/test/workspace",
-			})
-
-			const { container } = render(<ChatTextArea {...defaultProps} isEditMode={true} />)
-
-			const cancelButton = screen.getByRole("button", { name: /cancel/i })
-			// Look for the image button by its aria-label
-			const imageButton = screen.getByRole("button", {
-				name: /add.*images/i,
-			})
-
-			// Both buttons should be in the same container (bottom toolbar)
-			const bottomToolbar = container.querySelector(".flex.items-center.gap-0\\.5.shrink-0")
-			expect(bottomToolbar).toContainElement(cancelButton)
-			expect(bottomToolbar).toContainElement(imageButton)
-
-			// Cancel button should come before image button in DOM order
-			const buttons = bottomToolbar?.querySelectorAll("button")
-			const cancelIndex = Array.from(buttons || []).indexOf(cancelButton as HTMLButtonElement)
-			const imageIndex = Array.from(buttons || []).indexOf(imageButton as HTMLButtonElement)
-			expect(cancelIndex).toBeLessThan(imageIndex)
-		})
 	})
 })
diff --git a/webview-ui/src/components/chat/__tests__/EditModeControls.spec.tsx b/webview-ui/src/components/chat/__tests__/EditModeControls.spec.tsx
new file mode 100644
index 0000000000..2b72202b32
--- /dev/null
+++ b/webview-ui/src/components/chat/__tests__/EditModeControls.spec.tsx
@@ -0,0 +1,138 @@
+import React from "react"
+import { render, screen, fireEvent } from "@testing-library/react"
+import { describe, it, expect, vi, beforeEach } from "vitest"
+import { EditModeControls } from "../EditModeControls"
+import { Mode } from "@roo/modes"
+
+// Mock the translation hook
+vi.mock("@/i18n/TranslationContext", () => ({
+	useAppTranslation: () => ({
+		t: (key: string) => key,
+	}),
+}))
+
+// Mock the UI components
+vi.mock("@/components/ui", () => ({
+	Button: ({ children, onClick, disabled, ...props }: any) => (
+		<button onClick={onClick} disabled={disabled} {...props}>
+			{children}
+		</button>
+	),
+	StandardTooltip: ({ children, content }: any) => <div title={content}>{children}</div>,
+}))
+
+// Mock ModeSelector
+vi.mock("../ModeSelector", () => ({
+	default: ({ value, onChange, title }: any) => (
+		<select value={value} onChange={(e) => onChange(e.target.value)} title={title}>
+			<option value="code">Code</option>
+			<option value="architect">Architect</option>
+		</select>
+	),
+}))
+
+describe("EditModeControls", () => {
+	const defaultProps = {
+		mode: "code" as Mode,
+		onModeChange: vi.fn(),
+		modeShortcutText: "Ctrl+M",
+		customModes: [],
+		customModePrompts: {},
+		onCancel: vi.fn(),
+		onSend: vi.fn(),
+		onSelectImages: vi.fn(),
+		sendingDisabled: false,
+		shouldDisableImages: false,
+	}
+
+	beforeEach(() => {
+		vi.clearAllMocks()
+	})
+
+	it("renders all controls correctly", () => {
+		render(<EditModeControls {...defaultProps} />)
+
+		// Check for mode selector
+		expect(screen.getByTitle("chat:selectMode")).toBeInTheDocument()
+
+		// Check for Cancel button
+		expect(screen.getByText("Cancel")).toBeInTheDocument()
+
+		// Check for image button
+		expect(screen.getByTitle("chat:addImages")).toBeInTheDocument()
+
+		// Check for send button
+		expect(screen.getByTitle("chat:save.tooltip")).toBeInTheDocument()
+	})
+
+	it("calls onCancel when Cancel button is clicked", () => {
+		render(<EditModeControls {...defaultProps} />)
+
+		const cancelButton = screen.getByText("Cancel")
+		fireEvent.click(cancelButton)
+
+		expect(defaultProps.onCancel).toHaveBeenCalledTimes(1)
+	})
+
+	it("calls onSend when send button is clicked", () => {
+		render(<EditModeControls {...defaultProps} />)
+
+		const sendButton = screen.getByLabelText("chat:save.tooltip")
+		fireEvent.click(sendButton)
+
+		expect(defaultProps.onSend).toHaveBeenCalledTimes(1)
+	})
+
+	it("calls onSelectImages when image button is clicked", () => {
+		render(<EditModeControls {...defaultProps} />)
+
+		const imageButton = screen.getByLabelText("chat:addImages")
+		fireEvent.click(imageButton)
+
+		expect(defaultProps.onSelectImages).toHaveBeenCalledTimes(1)
+	})
+
+	it("disables buttons when sendingDisabled is true", () => {
+		render(<EditModeControls {...defaultProps} sendingDisabled={true} />)
+
+		const cancelButton = screen.getByText("Cancel")
+		const sendButton = screen.getByLabelText("chat:save.tooltip")
+
+		expect(cancelButton).toBeDisabled()
+		expect(sendButton).toBeDisabled()
+	})
+
+	it("disables image button when shouldDisableImages is true", () => {
+		render(<EditModeControls {...defaultProps} shouldDisableImages={true} />)
+
+		const imageButton = screen.getByLabelText("chat:addImages")
+		expect(imageButton).toBeDisabled()
+	})
+
+	it("does not call onSelectImages when image button is disabled", () => {
+		render(<EditModeControls {...defaultProps} shouldDisableImages={true} />)
+
+		const imageButton = screen.getByLabelText("chat:addImages")
+		fireEvent.click(imageButton)
+
+		expect(defaultProps.onSelectImages).not.toHaveBeenCalled()
+	})
+
+	it("does not call onSend when send button is disabled", () => {
+		render(<EditModeControls {...defaultProps} sendingDisabled={true} />)
+
+		const sendButton = screen.getByLabelText("chat:save.tooltip")
+		fireEvent.click(sendButton)
+
+		expect(defaultProps.onSend).not.toHaveBeenCalled()
+	})
+
+	it("calls onModeChange when mode is changed", () => {
+		render(<EditModeControls {...defaultProps} />)
+
+		const modeSelector = screen.getByTitle("chat:selectMode")
+		fireEvent.change(modeSelector, { target: { value: "architect" } })
+
+		expect(defaultProps.onModeChange).toHaveBeenCalledWith("architect")
+	})
+})
diff --git a/webview-ui/src/i18n/locales/ca/common.json b/webview-ui/src/i18n/locales/ca/common.json
index c377fb973c..311d1ec5d0 100644
--- a/webview-ui/src/i18n/locales/ca/common.json
+++ b/webview-ui/src/i18n/locales/ca/common.json
@@ -53,11 +53,10 @@
 		}
 	},
 	"confirmation": {
-		"delete_message": "Eliminar missatge",
-		"delete_warning": "Eliminar aquest missatge eliminarà tots els missatges posteriors de la conversa. Vols continuar?",
-		"edit_message": "Editar missatge",
-		"edit_warning": "Editar aquest missatge eliminarà tots els missatges posteriors de la conversa. Vols continuar?",
-		"proceed": "Continuar",
-		"dont_show_again": "No tornis a mostrar això"
+		"deleteMessage": "Eliminar missatge",
+		"deleteWarning": "Eliminar aquest missatge eliminarà tots els missatges posteriors de la conversa. Vols continuar?",
+		"editMessage": "Editar missatge",
+		"editWarning": "Editar aquest missatge eliminarà tots els missatges posteriors de la conversa. Vols continuar?",
+		"proceed": "Continuar"
 	}
 }
diff --git a/webview-ui/src/i18n/locales/de/common.json b/webview-ui/src/i18n/locales/de/common.json
index d1b864e2e3..2c2827a3ec 100644
--- a/webview-ui/src/i18n/locales/de/common.json
+++ b/webview-ui/src/i18n/locales/de/common.json
@@ -53,11 +53,10 @@
 		}
 	},
 	"confirmation": {
-		"delete_message": "Nachricht löschen",
-		"delete_warning": "Das Löschen dieser Nachricht wird alle nachfolgenden Nachrichten in der Unterhaltung löschen. Möchtest du fortfahren?",
-		"edit_message": "Nachricht bearbeiten",
-		"edit_warning": "Das Bearbeiten dieser Nachricht wird alle nachfolgenden Nachrichten in der Unterhaltung löschen. Möchtest du fortfahren?",
-		"proceed": "Fortfahren",
-		"dont_show_again": "Nicht mehr anzeigen"
+		"deleteMessage": "Nachricht löschen",
+		"deleteWarning": "Das Löschen dieser Nachricht wird alle nachfolgenden Nachrichten in der Unterhaltung löschen. Möchtest du fortfahren?",
+		"editMessage": "Nachricht bearbeiten",
+		"editWarning": "Das Bearbeiten dieser Nachricht wird alle nachfolgenden Nachrichten in der Unterhaltung löschen. Möchtest du fortfahren?",
+		"proceed": "Fortfahren"
 	}
 }
diff --git a/webview-ui/src/i18n/locales/en/common.json b/webview-ui/src/i18n/locales/en/common.json
index d73ad3ad2e..74cd708605 100644
--- a/webview-ui/src/i18n/locales/en/common.json
+++ b/webview-ui/src/i18n/locales/en/common.json
@@ -53,11 +53,10 @@
 		}
 	},
 	"confirmation": {
-		"delete_message": "Delete Message",
-		"delete_warning": "Deleting this message will delete all subsequent messages in the conversation. Do you want to proceed?",
-		"edit_message": "Edit Message",
-		"edit_warning": "Editing this message will delete all subsequent messages in the conversation. Do you want to proceed?",
-		"proceed": "Proceed",
-		"dont_show_again": "Don't show this again"
+		"deleteMessage": "Delete Message",
+		"deleteWarning": "Deleting this message will delete all subsequent messages in the conversation. Do you want to proceed?",
+		"editMessage": "Edit Message",
+		"editWarning": "Editing this message will delete all subsequent messages in the conversation. Do you want to proceed?",
+		"proceed": "Proceed"
 	}
 }
diff --git a/webview-ui/src/i18n/locales/es/common.json b/webview-ui/src/i18n/locales/es/common.json
index 47122163a6..d840039b65 100644
--- a/webview-ui/src/i18n/locales/es/common.json
+++ b/webview-ui/src/i18n/locales/es/common.json
@@ -53,11 +53,10 @@
 		}
 	},
 	"confirmation": {
-		"delete_message": "Eliminar mensaje",
-		"delete_warning": "Eliminar este mensaje eliminará todos los mensajes posteriores en la conversación. ¿Deseas continuar?",
-		"edit_message": "Editar mensaje",
-		"edit_warning": "Editar este mensaje eliminará todos los mensajes posteriores en la conversación. ¿Deseas continuar?",
-		"proceed": "Continuar",
-		"dont_show_again": "No mostrar esto de nuevo"
+		"deleteMessage": "Eliminar mensaje",
+		"deleteWarning": "Eliminar este mensaje eliminará todos los mensajes posteriores en la conversación. ¿Deseas continuar?",
+		"editMessage": "Editar mensaje",
+		"editWarning": "Editar este mensaje eliminará todos los mensajes posteriores en la conversación. ¿Deseas continuar?",
+		"proceed": "Continuar"
 	}
 }
diff --git a/webview-ui/src/i18n/locales/fr/common.json b/webview-ui/src/i18n/locales/fr/common.json
index 4e640f1fa2..0353e174db 100644
--- a/webview-ui/src/i18n/locales/fr/common.json
+++ b/webview-ui/src/i18n/locales/fr/common.json
@@ -53,11 +53,10 @@
 		}
 	},
 	"confirmation": {
-		"delete_message": "Supprimer le message",
-		"delete_warning": "Supprimer ce message supprimera tous les messages suivants dans la conversation. Voulez-vous continuer ?",
-		"edit_message": "Modifier le message",
-		"edit_warning": "Modifier ce message supprimera tous les messages suivants dans la conversation. Voulez-vous continuer ?",
-		"proceed": "Continuer",
-		"dont_show_again": "Ne plus afficher ceci"
+		"deleteMessage": "Supprimer le message",
+		"deleteWarning": "Supprimer ce message supprimera tous les messages suivants dans la conversation. Voulez-vous continuer ?",
+		"editMessage": "Modifier le message",
+		"editWarning": "Modifier ce message supprimera tous les messages suivants dans la conversation. Voulez-vous continuer ?",
+		"proceed": "Continuer"
 	}
 }
diff --git a/webview-ui/src/i18n/locales/hi/common.json b/webview-ui/src/i18n/locales/hi/common.json
index 21b3127eec..ddac712e83 100644
--- a/webview-ui/src/i18n/locales/hi/common.json
+++ b/webview-ui/src/i18n/locales/hi/common.json
@@ -53,11 +53,10 @@
 		}
 	},
 	"confirmation": {
-		"delete_message": "संदेश हटाएं",
-		"delete_warning": "इस संदेश को हटाने से बातचीत के सभी बाद के संदेश हट जाएंगे। क्या आप जारी रखना चाहते हैं?",
-		"edit_message": "संदेश संपादित करें",
-		"edit_warning": "इस संदेश को संपादित करने से बातचीत के सभी बाद के संदेश हट जाएंगे। क्या आप जारी रखना चाहते हैं?",
-		"proceed": "जारी रखें",
-		"dont_show_again": "यह फिर से न दिखाएं"
+		"deleteMessage": "संदेश हटाएं",
+		"deleteWarning": "इस संदेश को हटाने से बातचीत के सभी बाद के संदेश हट जाएंगे। क्या आप जारी रखना चाहते हैं?",
+		"editMessage": "संदेश संपादित करें",
+		"editWarning": "इस संदेश को संपादित करने से बातचीत के सभी बाद के संदेश हट जाएंगे। क्या आप जारी रखना चाहते हैं?",
+		"proceed": "जारी रखें"
 	}
 }
diff --git a/webview-ui/src/i18n/locales/id/common.json b/webview-ui/src/i18n/locales/id/common.json
index 06d2455cd6..bc7d8f6ed6 100644
--- a/webview-ui/src/i18n/locales/id/common.json
+++ b/webview-ui/src/i18n/locales/id/common.json
@@ -53,11 +53,10 @@
 		}
 	},
 	"confirmation": {
-		"delete_message": "Hapus Pesan",
-		"delete_warning": "Menghapus pesan ini akan menghapus semua pesan selanjutnya dalam percakapan. Apakah kamu ingin melanjutkan?",
-		"edit_message": "Edit Pesan",
-		"edit_warning": "Mengedit pesan ini akan menghapus semua pesan selanjutnya dalam percakapan. Apakah kamu ingin melanjutkan?",
-		"proceed": "Lanjutkan",
-		"dont_show_again": "Jangan tampilkan lagi"
+		"deleteMessage": "Hapus Pesan",
+		"deleteWarning": "Menghapus pesan ini akan menghapus semua pesan selanjutnya dalam percakapan. Apakah kamu ingin melanjutkan?",
+		"editMessage": "Edit Pesan",
+		"editWarning": "Mengedit pesan ini akan menghapus semua pesan selanjutnya dalam percakapan. Apakah kamu ingin melanjutkan?",
+		"proceed": "Lanjutkan"
 	}
 }
diff --git a/webview-ui/src/i18n/locales/it/common.json b/webview-ui/src/i18n/locales/it/common.json
index 75c458f993..fa7aefcab7 100644
--- a/webview-ui/src/i18n/locales/it/common.json
+++ b/webview-ui/src/i18n/locales/it/common.json
@@ -53,11 +53,10 @@
 		}
 	},
 	"confirmation": {
-		"delete_message": "Elimina Messaggio",
-		"delete_warning": "Eliminando questo messaggio verranno eliminati tutti i messaggi successivi nella conversazione. Vuoi procedere?",
-		"edit_message": "Modifica Messaggio",
-		"edit_warning": "Modificando questo messaggio verranno eliminati tutti i messaggi successivi nella conversazione. Vuoi procedere?",
-		"proceed": "Procedi",
-		"dont_show_again": "Non mostrare più"
+		"deleteMessage": "Elimina Messaggio",
+		"deleteWarning": "Eliminando questo messaggio verranno eliminati tutti i messaggi successivi nella conversazione. Vuoi procedere?",
+		"editMessage": "Modifica Messaggio",
+		"editWarning": "Modificando questo messaggio verranno eliminati tutti i messaggi successivi nella conversazione. Vuoi procedere?",
+		"proceed": "Procedi"
 	}
 }
diff --git a/webview-ui/src/i18n/locales/ja/common.json b/webview-ui/src/i18n/locales/ja/common.json
index 2144a54f50..ee546a811f 100644
--- a/webview-ui/src/i18n/locales/ja/common.json
+++ b/webview-ui/src/i18n/locales/ja/common.json
@@ -53,11 +53,10 @@
 		}
 	},
 	"confirmation": {
-		"delete_message": "メッセージを削除",
-		"delete_warning": "このメッセージを削除すると、会話内の後続のメッセージもすべて削除されます。続行しますか？",
-		"edit_message": "メッセージを編集",
-		"edit_warning": "このメッセージを編集すると、会話内の後続のメッセージもすべて削除されます。続行しますか？",
-		"proceed": "続行",
-		"dont_show_again": "今後表示しない"
+		"deleteMessage": "メッセージを削除",
+		"deleteWarning": "このメッセージを削除すると、会話内の後続のメッセージもすべて削除されます。続行しますか？",
+		"editMessage": "メッセージを編集",
+		"editWarning": "このメッセージを編集すると、会話内の後続のメッセージもすべて削除されます。続行しますか？",
+		"proceed": "続行"
 	}
 }
diff --git a/webview-ui/src/i18n/locales/ko/common.json b/webview-ui/src/i18n/locales/ko/common.json
index f5a9da65b2..7f7d81d70c 100644
--- a/webview-ui/src/i18n/locales/ko/common.json
+++ b/webview-ui/src/i18n/locales/ko/common.json
@@ -53,11 +53,10 @@
 		}
 	},
 	"confirmation": {
-		"delete_message": "메시지 삭제",
-		"delete_warning": "이 메시지를 삭제하면 대화의 모든 후속 메시지가 삭제됩니다. 계속하시겠습니까?",
-		"edit_message": "메시지 편집",
-		"edit_warning": "이 메시지를 편집하면 대화의 모든 후속 메시지가 삭제됩니다. 계속하시겠습니까?",
-		"proceed": "계속",
-		"dont_show_again": "다시 표시하지 않음"
+		"deleteMessage": "메시지 삭제",
+		"deleteWarning": "이 메시지를 삭제하면 대화의 모든 후속 메시지가 삭제됩니다. 계속하시겠습니까?",
+		"editMessage": "메시지 편집",
+		"editWarning": "이 메시지를 편집하면 대화의 모든 후속 메시지가 삭제됩니다. 계속하시겠습니까?",
+		"proceed": "계속"
 	}
 }
diff --git a/webview-ui/src/i18n/locales/nl/common.json b/webview-ui/src/i18n/locales/nl/common.json
index 2ee3dc5e9a..b5cab98b57 100644
--- a/webview-ui/src/i18n/locales/nl/common.json
+++ b/webview-ui/src/i18n/locales/nl/common.json
@@ -53,11 +53,10 @@
 		}
 	},
 	"confirmation": {
-		"delete_message": "Bericht Verwijderen",
-		"delete_warning": "Het verwijderen van dit bericht zal alle volgende berichten in het gesprek verwijderen. Wil je doorgaan?",
-		"edit_message": "Bericht Bewerken",
-		"edit_warning": "Het bewerken van dit bericht zal alle volgende berichten in het gesprek verwijderen. Wil je doorgaan?",
-		"proceed": "Doorgaan",
-		"dont_show_again": "Niet meer tonen"
+		"deleteMessage": "Bericht Verwijderen",
+		"deleteWarning": "Het verwijderen van dit bericht zal alle volgende berichten in het gesprek verwijderen. Wil je doorgaan?",
+		"editMessage": "Bericht Bewerken",
+		"editWarning": "Het bewerken van dit bericht zal alle volgende berichten in het gesprek verwijderen. Wil je doorgaan?",
+		"proceed": "Doorgaan"
 	}
 }
diff --git a/webview-ui/src/i18n/locales/pl/common.json b/webview-ui/src/i18n/locales/pl/common.json
index af8053e21e..93cbc0148f 100644
--- a/webview-ui/src/i18n/locales/pl/common.json
+++ b/webview-ui/src/i18n/locales/pl/common.json
@@ -53,11 +53,10 @@
 		}
 	},
 	"confirmation": {
-		"delete_message": "Usuń Wiadomość",
-		"delete_warning": "Usunięcie tej wiadomości spowoduje usunięcie wszystkich kolejnych wiadomości w rozmowie. Czy chcesz kontynuować?",
-		"edit_message": "Edytuj Wiadomość",
-		"edit_warning": "Edycja tej wiadomości spowoduje usunięcie wszystkich kolejnych wiadomości w rozmowie. Czy chcesz kontynuować?",
-		"proceed": "Kontynuuj",
-		"dont_show_again": "Nie pokazuj ponownie"
+		"deleteMessage": "Usuń Wiadomość",
+		"deleteWarning": "Usunięcie tej wiadomości spowoduje usunięcie wszystkich kolejnych wiadomości w rozmowie. Czy chcesz kontynuować?",
+		"editMessage": "Edytuj Wiadomość",
+		"editWarning": "Edycja tej wiadomości spowoduje usunięcie wszystkich kolejnych wiadomości w rozmowie. Czy chcesz kontynuować?",
+		"proceed": "Kontynuuj"
 	}
 }
diff --git a/webview-ui/src/i18n/locales/pt-BR/common.json b/webview-ui/src/i18n/locales/pt-BR/common.json
index 4515eeeb9e..7270453c71 100644
--- a/webview-ui/src/i18n/locales/pt-BR/common.json
+++ b/webview-ui/src/i18n/locales/pt-BR/common.json
@@ -53,11 +53,10 @@
 		}
 	},
 	"confirmation": {
-		"delete_message": "Excluir Mensagem",
-		"delete_warning": "Excluir esta mensagem irá excluir todas as mensagens subsequentes na conversa. Deseja prosseguir?",
-		"edit_message": "Editar Mensagem",
-		"edit_warning": "Editar esta mensagem irá excluir todas as mensagens subsequentes na conversa. Deseja prosseguir?",
-		"proceed": "Prosseguir",
-		"dont_show_again": "Não mostrar novamente"
+		"deleteMessage": "Excluir Mensagem",
+		"deleteWarning": "Excluir esta mensagem irá excluir todas as mensagens subsequentes na conversa. Deseja prosseguir?",
+		"editMessage": "Editar Mensagem",
+		"editWarning": "Editar esta mensagem irá excluir todas as mensagens subsequentes na conversa. Deseja prosseguir?",
+		"proceed": "Prosseguir"
 	}
 }
diff --git a/webview-ui/src/i18n/locales/ru/common.json b/webview-ui/src/i18n/locales/ru/common.json
index 1e623475b2..31ee063605 100644
--- a/webview-ui/src/i18n/locales/ru/common.json
+++ b/webview-ui/src/i18n/locales/ru/common.json
@@ -53,11 +53,10 @@
 		}
 	},
 	"confirmation": {
-		"delete_message": "Удалить Сообщение",
-		"delete_warning": "Удаление этого сообщения приведет к удалению всех последующих сообщений в разговоре. Хотите продолжить?",
-		"edit_message": "Редактировать Сообщение",
-		"edit_warning": "Редактирование этого сообщения приведет к удалению всех последующих сообщений в разговоре. Хотите продолжить?",
-		"proceed": "Продолжить",
-		"dont_show_again": "Больше не показывать"
+		"deleteMessage": "Удалить Сообщение",
+		"deleteWarning": "Удаление этого сообщения приведет к удалению всех последующих сообщений в разговоре. Хотите продолжить?",
+		"editMessage": "Редактировать Сообщение",
+		"editWarning": "Редактирование этого сообщения приведет к удалению всех последующих сообщений в разговоре. Хотите продолжить?",
+		"proceed": "Продолжить"
 	}
 }
diff --git a/webview-ui/src/i18n/locales/tr/common.json b/webview-ui/src/i18n/locales/tr/common.json
index a1695eab37..747088cda5 100644
--- a/webview-ui/src/i18n/locales/tr/common.json
+++ b/webview-ui/src/i18n/locales/tr/common.json
@@ -53,11 +53,10 @@
 		}
 	},
 	"confirmation": {
-		"delete_message": "Mesajı Sil",
-		"delete_warning": "Bu mesajı silmek, konuşmadaki sonraki tüm mesajları da silecektir. Devam etmek istiyor musun?",
-		"edit_message": "Mesajı Düzenle",
-		"edit_warning": "Bu mesajı düzenlemek, konuşmadaki sonraki tüm mesajları da silecektir. Devam etmek istiyor musun?",
-		"proceed": "Devam Et",
-		"dont_show_again": "Tekrar gösterme"
+		"deleteMessage": "Mesajı Sil",
+		"deleteWarning": "Bu mesajı silmek, konuşmadaki sonraki tüm mesajları da silecektir. Devam etmek istiyor musun?",
+		"editMessage": "Mesajı Düzenle",
+		"editWarning": "Bu mesajı düzenlemek, konuşmadaki sonraki tüm mesajları da silecektir. Devam etmek istiyor musun?",
+		"proceed": "Devam Et"
 	}
 }
diff --git a/webview-ui/src/i18n/locales/vi/common.json b/webview-ui/src/i18n/locales/vi/common.json
index 0f3a4d551f..1cdd292fb8 100644
--- a/webview-ui/src/i18n/locales/vi/common.json
+++ b/webview-ui/src/i18n/locales/vi/common.json
@@ -53,11 +53,10 @@
 		}
 	},
 	"confirmation": {
-		"delete_message": "Xóa Tin Nhắn",
-		"delete_warning": "Xóa tin nhắn này sẽ xóa tất cả các tin nhắn tiếp theo trong cuộc trò chuyện. Bạn có muốn tiếp tục không?",
-		"edit_message": "Chỉnh Sửa Tin Nhắn",
-		"edit_warning": "Chỉnh sửa tin nhắn này sẽ xóa tất cả các tin nhắn tiếp theo trong cuộc trò chuyện. Bạn có muốn tiếp tục không?",
-		"proceed": "Tiếp Tục",
-		"dont_show_again": "Không hiển thị lại"
+		"deleteMessage": "Xóa Tin Nhắn",
+		"deleteWarning": "Xóa tin nhắn này sẽ xóa tất cả các tin nhắn tiếp theo trong cuộc trò chuyện. Bạn có muốn tiếp tục không?",
+		"editMessage": "Chỉnh Sửa Tin Nhắn",
+		"editWarning": "Chỉnh sửa tin nhắn này sẽ xóa tất cả các tin nhắn tiếp theo trong cuộc trò chuyện. Bạn có muốn tiếp tục không?",
+		"proceed": "Tiếp Tục"
 	}
 }
diff --git a/webview-ui/src/i18n/locales/zh-CN/common.json b/webview-ui/src/i18n/locales/zh-CN/common.json
index 587f5961c4..e9b778d137 100644
--- a/webview-ui/src/i18n/locales/zh-CN/common.json
+++ b/webview-ui/src/i18n/locales/zh-CN/common.json
@@ -53,11 +53,10 @@
 		}
 	},
 	"confirmation": {
-		"delete_message": "删除消息",
-		"delete_warning": "删除此消息将删除对话中的所有后续消息。是否继续？",
-		"edit_message": "编辑消息",
-		"edit_warning": "编辑此消息将删除对话中的所有后续消息。是否继续？",
-		"proceed": "继续",
-		"dont_show_again": "不再显示"
+		"deleteMessage": "删除消息",
+		"deleteWarning": "删除此消息将删除对话中的所有后续消息。是否继续？",
+		"editMessage": "编辑消息",
+		"editWarning": "编辑此消息将删除对话中的所有后续消息。是否继续？",
+		"proceed": "继续"
 	}
 }
diff --git a/webview-ui/src/i18n/locales/zh-TW/common.json b/webview-ui/src/i18n/locales/zh-TW/common.json
index 210f83a4fd..6486a5708a 100644
--- a/webview-ui/src/i18n/locales/zh-TW/common.json
+++ b/webview-ui/src/i18n/locales/zh-TW/common.json
@@ -53,11 +53,10 @@
 		}
 	},
 	"confirmation": {
-		"delete_message": "刪除訊息",
-		"delete_warning": "刪除此訊息將刪除對話中的所有後續訊息。是否繼續？",
-		"edit_message": "編輯訊息",
-		"edit_warning": "編輯此訊息將刪除對話中的所有後續訊息。是否繼續？",
-		"proceed": "繼續",
-		"dont_show_again": "不再顯示"
+		"deleteMessage": "刪除訊息",
+		"deleteWarning": "刪除此訊息將刪除對話中的所有後續訊息。是否繼續？",
+		"editMessage": "編輯訊息",
+		"editWarning": "編輯此訊息將刪除對話中的所有後續訊息。是否繼續？",
+		"proceed": "繼續"
 	}
 }