feat: implement enhanced context editing features for issue #7285

- Added 'Delete and Restore' button to deletion dialog that removes messages and restores file state to checkpoint
- Enabled Edit button for user messages in ChatRow component
- Added withRestore field to message interfaces for dual-action deletion
- Implemented removeMessagesAndRestoreFileState function to synchronize message deletion with checkpoint restoration
- Updated MessageModificationConfirmationDialog to support both delete-only and delete-with-restore actions
- Fixed all related test cases to include withRestore field

This partially addresses issue #7285 by implementing features 1 and 3 from the requested enhancements.

IMPLEMENTATION_NOTES.md

@@ -0,0 +1,80 @@
+# Enhanced Context Editing Implementation
+
+## Completed Features
+
+### 1. Enhanced User Message Deletion Dialog ✅
+
+- Added "Delete and Restore" button to the deletion confirmation dialog
+- Implemented backend logic to restore file state to the first checkpoint after the deleted message
+- Modified `webviewMessageHandler.ts` to handle synchronized deletion and restoration
+
+### 2. User Message Edit Functionality ✅
+
+- Enabled the Edit button for user messages (was previously hidden)
+- Edit functionality was already implemented in the codebase
+
+## Remaining Features (Simplified Implementation Approach)
+
+### 3. API Request Message Action Buttons
+
+**Implementation approach:**
+
+- Add View Diff and Restore buttons to API request messages in `ChatRow.tsx`
+- For View Diff: Trigger checkpoint diff view for the nearest checkpoint
+- For Restore: Similar to delete with restore, but only restore files without deleting messages
+
+**Code locations to modify:**
+
+- `webview-ui/src/components/chat/ChatRow.tsx` - Add buttons in the api_req_started case
+- `src/core/webview/webviewMessageHandler.ts` - Add handlers for new message types
+
+### 4. Diff View After attempt_completion
+
+**Implementation approach:**
+
+- Auto-create checkpoint when `attempt_completion` is called
+- Add a "View full diff" button to completion messages
+- Use existing checkpoint diff functionality
+
+**Code locations to modify:**
+
+- `src/core/task/Task.ts` - Add checkpoint creation in attempt_completion handler
+- `webview-ui/src/components/chat/ChatRow.tsx` - Add diff button for completion_result messages
+
+### 5. User Message Fork Functionality
+
+**Implementation approach:**
+
+- Add Fork button to user messages
+- Create a new task branch from the specified message node
+- Copy task state and related checkpoints
+
+**Code locations to modify:**
+
+- `webview-ui/src/components/chat/ChatRow.tsx` - Add Fork button next to Edit/Delete
+- `src/core/webview/webviewMessageHandler.ts` - Add fork handler
+- `src/core/webview/ClineProvider.ts` - Implement task forking logic
+
+## Technical Considerations
+
+1. **Checkpoint System Integration**: All features rely heavily on the existing checkpoint system
+2. **State Management**: Need to carefully manage task state when forking or restoring
+3. **UI/UX**: Keep the interface clean despite adding multiple action buttons
+4. **Performance**: Checkpoint operations can be expensive, consider adding loading states
+
+## Testing Requirements
+
+1. Test deletion with restore functionality
+2. Verify edit functionality works correctly
+3. Test checkpoint creation and diff viewing
+4. Ensure file state restoration works properly
+5. Test edge cases (no checkpoints, multiple checkpoints, etc.)
+
+## Next Steps
+
+Due to time constraints and complexity, the remaining features (3-5) would require significant additional development time. The current implementation provides:
+
+- Enhanced deletion with file restoration
+- Visible edit functionality for user messages
+
+These two features address the core user needs for context editing and rollback capabilities.

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

@@ -1216,6 +1216,7 @@ describe("ClineProvider", () => {
 			expect(mockPostMessage).toHaveBeenCalledWith({
 				type: "showDeleteMessageDialog",
 				messageTs: 4000,
+				withRestore: false,
 			})
 
 			// Simulate user confirming deletion through the dialog
@@ -3441,6 +3442,7 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 				expect(mockPostMessage).toHaveBeenCalledWith({
 					type: "showDeleteMessageDialog",
 					messageTs: 5000,
+					withRestore: false,
 				})
 
 				// Simulate user confirming the delete
@@ -3531,6 +3533,7 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 				expect(mockPostMessage).toHaveBeenCalledWith({
 					type: "showDeleteMessageDialog",
 					messageTs: 2000,
+					withRestore: false,
 				})
 
 				// Simulate user confirming the delete
@@ -3626,6 +3629,7 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 				expect(mockPostMessage).toHaveBeenCalledWith({
 					type: "showDeleteMessageDialog",
 					messageTs: 3000,
+					withRestore: false,
 				})
 
 				// Simulate user confirming the delete
@@ -3664,6 +3668,7 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 				expect(mockPostMessage).toHaveBeenCalledWith({
 					type: "showDeleteMessageDialog",
 					messageTs: 2000,
+					withRestore: false,
 				})
 
 				// Simulate user confirming the delete
@@ -3737,6 +3742,7 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 				expect(mockPostMessage).toHaveBeenCalledWith({
 					type: "showDeleteMessageDialog",
 					messageTs: 1000,
+					withRestore: false,
 				})
 
 				// Simulate user confirming the delete

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

@@ -554,6 +554,7 @@ describe("webviewMessageHandler - message dialog preferences", () => {
 			expect(mockClineProvider.postMessageToWebview).toHaveBeenCalledWith({
 				type: "showDeleteMessageDialog",
 				messageTs: 123456789,
+				withRestore: false,
 			})
 		})
 	})