fix: restore previous input and images when canceling edit

When entering edit mode, save current input text and image attachments.
On cancel, restore both instead of leaving the edited message content.

Author: ammar-agent

src/browser/components/ChatInput/index.tsx

@@ -148,6 +148,10 @@ export const ChatInput: React.FC<ChatInputProps> = (props) => {
   }, []);
   const inputRef = useRef<HTMLTextAreaElement>(null);
   const modelSelectorRef = useRef<ModelSelectorRef>(null);
+  const preEditStateRef = useRef<{ input: string; images: ImageAttachment[] }>({
+    input: "",
+    images: [],
+  });
   const [mode, setMode] = useMode();
   const { recentModels, addModel, defaultModel, setDefaultModel } = useModelLRU();
   const commandListId = useId();
@@ -346,10 +350,12 @@ export const ChatInput: React.FC<ChatInputProps> = (props) => {
     };
   }, [focusMessageInput]);
 
-  // When entering editing mode, populate input with message content
+  // When entering editing mode, save current input/images and populate with message content
   useEffect(() => {
     if (editingMessage) {
+      preEditStateRef.current = { input, images: imageAttachments };
       setInput(editingMessage.content);
+      setImageAttachments([]); // Clear images when editing (edited message may have different images)
       // Auto-resize textarea and focus
       setTimeout(() => {
         if (inputRef.current) {
@@ -360,6 +366,7 @@ export const ChatInput: React.FC<ChatInputProps> = (props) => {
         }
       }, 0);
     }
+    // eslint-disable-next-line react-hooks/exhaustive-deps -- only run when editingMessage changes, not input/images
   }, [editingMessage, setInput]);
 
   // Watch input for slash commands
@@ -829,6 +836,8 @@ export const ChatInput: React.FC<ChatInputProps> = (props) => {
   // Handler for Escape in vim normal mode - cancels edit if editing
   const handleEscapeInNormalMode = () => {
     if (variant === "workspace" && editingMessage && props.onCancelEdit) {
+      setInput(preEditStateRef.current.input);
+      setImageAttachments(preEditStateRef.current.images);
       props.onCancelEdit();
       inputRef.current?.blur();
     }
@@ -884,6 +893,8 @@ export const ChatInput: React.FC<ChatInputProps> = (props) => {
     if (matchesKeybind(e, KEYBINDS.CANCEL_EDIT)) {
       if (variant === "workspace" && editingMessage && props.onCancelEdit && !vimEnabled) {
         e.preventDefault();
+        setInput(preEditStateRef.current.input);
+        setImageAttachments(preEditStateRef.current.images);
         props.onCancelEdit();
         const isFocused = document.activeElement === inputRef.current;
         if (isFocused) {