Simplify edit panel (#5488)

fix

Author: liwilliam2021

src/core/webview/__tests__/ClineProvider.spec.ts

@@ -145,6 +145,7 @@ vi.mock("vscode", () => ({
 	},
 	window: {
 		showInformationMessage: vi.fn(),
+		showWarningMessage: vi.fn(),
 		showErrorMessage: vi.fn(),
 	},
 	workspace: {
@@ -1289,14 +1290,14 @@ describe("ClineProvider", () => {
 
 	describe("editMessage", () => {
 		beforeEach(async () => {
-			// Mock window.showInformationMessage
-			;(vscode.window.showInformationMessage as any) = vi.fn()
+			// Mock window.showWarningMessage
+			;(vscode.window.showWarningMessage as any) = vi.fn()
 			await provider.resolveWebviewView(mockWebviewView)
 		})
 
-		test('handles "No, just edit this one" edit correctly', async () => {
-			// Mock user selecting "No, just edit this one"
-			;(vscode.window.showInformationMessage as any).mockResolvedValue("confirmation.edit_just_this_message")
+		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")
 
 			// Setup mock messages
 			const mockMessages = [
@@ -1345,20 +1346,13 @@ describe("ClineProvider", () => {
 				editedMessageContent: "Edited message content",
 			})
 
-			// Verify correct messages were kept
-			expect(mockCline.overwriteClineMessages).toHaveBeenCalledWith([
-				mockMessages[0],
-				mockMessages[1],
-				mockMessages[4],
-				mockMessages[5],
-			])
+			// Verify correct messages were kept (only messages before the edited one)
+			expect(mockCline.overwriteClineMessages).toHaveBeenCalledWith([mockMessages[0], mockMessages[1]])
 
-			// Verify correct API messages were kept
+			// Verify correct API messages were kept (only messages before the edited one)
 			expect(mockCline.overwriteApiConversationHistory).toHaveBeenCalledWith([
 				mockApiHistory[0],
 				mockApiHistory[1],
-				mockApiHistory[4],
-				mockApiHistory[5],
 			])
 
 			// Verify handleWebviewAskResponse was called with the edited content
@@ -1368,103 +1362,6 @@ describe("ClineProvider", () => {
 				undefined,
 			)
 		})
-
-		test('handles "Yes" (edit and delete subsequent) correctly', async () => {
-			// Mock user selecting "Yes"
-			;(vscode.window.showInformationMessage as any).mockResolvedValue(
-				"confirmation.edit_this_and_delete_subsequent",
-			)
-
-			// 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" },
-				{ 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
-
-			// Explicitly mock the overwrite methods since they're not being called in the tests
-			mockCline.overwriteClineMessages = vi.fn()
-			mockCline.overwriteApiConversationHistory = vi.fn()
-			mockCline.handleWebviewAskResponse = vi.fn()
-
-			await provider.addClineToStack(mockCline)
-
-			// Mock getTaskWithId
-			;(provider as any).getTaskWithId = vi.fn().mockResolvedValue({
-				historyItem: { id: "test-task-id" },
-			})
-
-			// Trigger message edit
-			// Get the message handler function that was registered with the webview
-			const messageHandler = (mockWebviewView.webview.onDidReceiveMessage as any).mock.calls[0][0]
-
-			// Call the message handler with a submitEditedMessage message
-			await messageHandler({
-				type: "submitEditedMessage",
-				value: 3000,
-				editedMessageContent: "Edited message content",
-			})
-
-			// Verify only messages before the edited message were kept
-			expect(mockCline.overwriteClineMessages).toHaveBeenCalledWith([mockMessages[0]])
-
-			// Verify only API messages before the edited message were kept
-			expect(mockCline.overwriteApiConversationHistory).toHaveBeenCalledWith([mockApiHistory[0]])
-
-			// Verify handleWebviewAskResponse was called with the edited content
-			expect(mockCline.handleWebviewAskResponse).toHaveBeenCalledWith(
-				"messageResponse",
-				"Edited message content",
-				undefined,
-			)
-		})
-
-		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
-			})[]
-
-			// Explicitly mock the overwrite methods since they're not being called in the tests
-			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: 2000,
-				editedMessageContent: "Edited message content",
-			})
-
-			// Verify no messages were edited or deleted
-			expect(mockCline.overwriteClineMessages).not.toHaveBeenCalled()
-			expect(mockCline.overwriteApiConversationHistory).not.toHaveBeenCalled()
-			expect(mockCline.handleWebviewAskResponse).not.toHaveBeenCalled()
-		})
 	})
 
 	describe("getSystemPrompt", () => {
@@ -2813,7 +2710,7 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 		})
 
 		test("handles editing messages containing images", async () => {
-			;(vscode.window.showInformationMessage as any).mockResolvedValue("confirmation.edit_just_this_message")
+			;(vscode.window.showWarningMessage as any).mockResolvedValue("confirmation.proceed")
 
 			const mockMessages = [
 				{ ts: 1000, type: "say", say: "user_feedback", text: "Original message" },
@@ -2858,7 +2755,7 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 		})
 
 		test("handles editing messages with file attachments", async () => {
-			;(vscode.window.showInformationMessage as any).mockResolvedValue("confirmation.edit_just_this_message")
+			;(vscode.window.showWarningMessage as any).mockResolvedValue("confirmation.proceed")
 
 			const mockMessages = [
 				{ ts: 1000, type: "say", say: "user_feedback", text: "Original message" },
@@ -2908,7 +2805,7 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 		})
 
 		test("handles network timeout during edit submission", async () => {
-			;(vscode.window.showInformationMessage as any).mockResolvedValue("confirmation.edit_just_this_message")
+			;(vscode.window.showInformationMessage as any).mockResolvedValue("confirmation.proceed")
 
 			const mockCline = new Task(defaultTaskOptions)
 			mockCline.clineMessages = [
@@ -2940,7 +2837,7 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 		})
 
 		test("handles connection drops during edit operation", async () => {
-			;(vscode.window.showInformationMessage as any).mockResolvedValue("confirmation.edit_just_this_message")
+			;(vscode.window.showWarningMessage as any).mockResolvedValue("confirmation.proceed")
 
 			const mockCline = new Task(defaultTaskOptions)
 			mockCline.clineMessages = [
@@ -2979,7 +2876,7 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 		})
 
 		test("handles race conditions with simultaneous edits", async () => {
-			;(vscode.window.showInformationMessage as any).mockResolvedValue("confirmation.edit_just_this_message")
+			;(vscode.window.showWarningMessage as any).mockResolvedValue("confirmation.proceed")
 
 			const mockCline = new Task(defaultTaskOptions)
 			mockCline.clineMessages = [
@@ -3043,7 +2940,7 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 		})
 
 		test("handles authorization failures during edit", async () => {
-			;(vscode.window.showInformationMessage as any).mockResolvedValue("confirmation.edit_just_this_message")
+			;(vscode.window.showWarningMessage as any).mockResolvedValue("confirmation.proceed")
 
 			const mockCline = new Task(defaultTaskOptions)
 			mockCline.clineMessages = [
@@ -3161,7 +3058,7 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 			})
 
 			test("handles edit operations on deleted messages", async () => {
-				;(vscode.window.showInformationMessage as any).mockResolvedValue("confirmation.edit_just_this_message")
+				;(vscode.window.showWarningMessage as any).mockResolvedValue("confirmation.proceed")
 
 				const mockCline = new Task(defaultTaskOptions)
 				mockCline.clineMessages = [
@@ -3187,7 +3084,7 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 				})
 
 				// Should show confirmation dialog but not perform any operations
-				expect(vscode.window.showInformationMessage).toHaveBeenCalled()
+				expect(vscode.window.showWarningMessage).toHaveBeenCalled()
 				expect(mockCline.overwriteClineMessages).not.toHaveBeenCalled()
 				expect(mockCline.handleWebviewAskResponse).not.toHaveBeenCalled()
 			})
@@ -3231,7 +3128,7 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 			})
 
 			test("validates proper cleanup during failed edit operations", async () => {
-				;(vscode.window.showInformationMessage as any).mockResolvedValue("confirmation.edit_just_this_message")
+				;(vscode.window.showWarningMessage as any).mockResolvedValue("confirmation.proceed")
 
 				const mockCline = new Task(defaultTaskOptions)
 				mockCline.clineMessages = [
@@ -3311,7 +3208,7 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 			})
 
 			test("handles editing messages with large text content", async () => {
-				;(vscode.window.showInformationMessage as any).mockResolvedValue("confirmation.edit_just_this_message")
+				;(vscode.window.showWarningMessage as any).mockResolvedValue("confirmation.proceed")
 
 				// Create a large message (10KB of text)
 				const largeText = "A".repeat(10000)
@@ -3419,7 +3316,7 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 
 			test("handles user cancellation gracefully", async () => {
 				// Mock user canceling the operation
-				;(vscode.window.showInformationMessage as any).mockResolvedValue(undefined)
+				;(vscode.window.showWarningMessage as any).mockResolvedValue(undefined)
 
 				const mockCline = new Task(defaultTaskOptions)
 				mockCline.clineMessages = [
@@ -3485,7 +3382,7 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 			})
 
 			test("handles messages with future timestamps", async () => {
-				;(vscode.window.showInformationMessage as any).mockResolvedValue("confirmation.edit_just_this_message")
+				;(vscode.window.showWarningMessage as any).mockResolvedValue("confirmation.proceed")
 
 				const futureTimestamp = Date.now() + 100000 // Future timestamp
 				const mockCline = new Task(defaultTaskOptions)

src/core/webview/webviewMessageHandler.ts

@@ -193,32 +193,23 @@ export const webviewMessageHandler = async (
 	 * Handles message editing operations with user confirmation
 	 */
 	const handleEditOperation = async (messageTs: number, editedContent: string): Promise<void> => {
-		const options = [
-			t("common:confirmation.edit_this_and_delete_subsequent"),
-			t("common:confirmation.edit_just_this_message"),
-		]
-
-		const answer = await vscode.window.showInformationMessage(
-			t("common:confirmation.edit_message"),
+		const answer = await vscode.window.showWarningMessage(
+			t("common:confirmation.edit_warning"),
 			{ modal: true },
-			...options,
+			t("common:confirmation.proceed"),
 		)
 
-		// Only proceed if user selected one of the options and we have a current cline
-		if (answer && options.includes(answer) && provider.getCurrentCline()) {
+		// Only proceed if user selected "Proceed" and we have a current cline
+		if (answer === t("common:confirmation.proceed") && provider.getCurrentCline()) {
 			const currentCline = provider.getCurrentCline()!
+
+			// Use findMessageIndices to find messages based on timestamp
 			const { messageIndex, apiConversationHistoryIndex } = findMessageIndices(messageTs, currentCline)
 
 			if (messageIndex !== -1) {
 				try {
-					// Check which option the user selected
-					if (answer === options[0]) {
-						// Edit this message and delete subsequent
-						await removeMessagesThisAndSubsequent(currentCline, messageIndex, apiConversationHistoryIndex)
-					} else if (answer === options[1]) {
-						// Edit just this message
-						await removeMessagesJustThis(currentCline, messageIndex, apiConversationHistoryIndex)
-					}
+					// Edit this message and delete subsequent
+					await removeMessagesThisAndSubsequent(currentCline, messageIndex, apiConversationHistoryIndex)
 
 					// Process the edited message as a regular user message
 					// This will add it to the conversation and trigger an AI response

src/i18n/locales/ca/common.json

@@ -23,11 +23,10 @@
 		"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_message": "Eliminar tots els missatges després d'aquest?",
+		"edit_warning": "Editar aquest missatge eliminarà tots els missatges posteriors de la conversa. Vols continuar?",
 		"delete_just_this_message": "Només aquest missatge",
-		"edit_just_this_message": "No, només editar aquest",
 		"delete_this_and_subsequent": "Aquest i tots els missatges posteriors",
-		"edit_this_and_delete_subsequent": "Sí"
+		"proceed": "Continuar"
 	},
 	"errors": {
 		"invalid_data_uri": "Format d'URI de dades no vàlid",
@@ -111,13 +110,11 @@
 	"answers": {
 		"yes": "Sí",
 		"no": "No",
-		"cancel": "Cancel·lar",
 		"remove": "Eliminar",
 		"keep": "Mantenir"
 	},
 	"buttons": {
 		"save": "Desar",
-		"cancel": "Cancel·lar",
 		"edit": "Editar"
 	},
 	"tasks": {
@@ -171,7 +168,6 @@
 			"title": "Suprimeix el mode personalitzat",
 			"description": "Esteu segur que voleu suprimir aquest mode {{scope}}? Això també suprimirà la carpeta de regles associada a: {{rulesFolderPath}}",
 			"descriptionNoRules": "Esteu segur que voleu suprimir aquest mode personalitzat?",
-			"cancel": "Cancel·la",
 			"confirm": "Suprimeix"
 		}
 	}

src/i18n/locales/de/common.json

@@ -19,11 +19,10 @@
 		"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_message": "Alle Nachrichten nach dieser 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",
-		"edit_just_this_message": "Nein, nur diese bearbeiten",
 		"delete_this_and_subsequent": "Diese und alle nachfolgenden Nachrichten",
-		"edit_this_and_delete_subsequent": "Ja"
+		"proceed": "Fortfahren"
 	},
 	"errors": {
 		"invalid_data_uri": "Ungültiges Daten-URI-Format",
@@ -107,13 +106,11 @@
 	"answers": {
 		"yes": "Ja",
 		"no": "Nein",
-		"cancel": "Abbrechen",
 		"remove": "Entfernen",
 		"keep": "Behalten"
 	},
 	"buttons": {
 		"save": "Speichern",
-		"cancel": "Abbrechen",
 		"edit": "Bearbeiten"
 	},
 	"tasks": {
@@ -171,7 +168,6 @@
 			"title": "Benutzerdefinierten Modus löschen",
 			"description": "Bist du sicher, dass du diesen {{scope}}-Modus löschen möchtest? Dadurch wird auch der zugehörige Regelordner unter {{rulesFolderPath}} gelöscht",
 			"descriptionNoRules": "Bist du sicher, dass du diesen benutzerdefinierten Modus löschen möchtest?",
-			"cancel": "Abbrechen",
 			"confirm": "Löschen"
 		}
 	}