Restore the just-sent prompt on Esc before the model starts responding

Match Claude Code's "treat the query as not sent" behavior in the pre-
response window: while `user_turn_pending_start` is true (the user has
submitted but no `TurnStarted` notification has arrived yet) the Esc
handler now also pulls the last rendered user prompt back into the
composer in addition to issuing the interrupt. The user can immediately
edit and resubmit without losing the typed text.

The history cell for the original submission is left in place — removing
it would require an extra rewind-style round trip and the rendered
"User ›" line accurately reflects that the user did press Enter. Mention
bindings are not preserved because `UserMessageDisplay` doesn't carry
them; text, attachments, and text-element ranges round-trip cleanly.

Co-authored-by: Open Codex <hff582580@gmail.com>

Author: LEON-gittech

codex-rs/tui/src/chatwidget/input_restore.rs

@@ -236,6 +236,40 @@ impl ChatWidget {
         );
     }
 
+    /// Roll the most recently rendered user prompt back into the composer when
+    /// the user pressed Esc before the model started responding. Mirrors
+    /// Claude Code's "treat the query as not sent" behavior. Returns `true`
+    /// when there was a pending prompt to restore.
+    pub(super) fn rollback_pending_user_message_to_composer(&mut self) -> bool {
+        let Some(display) = self.last_rendered_user_message_display.take() else {
+            return false;
+        };
+        if display.message.trim().is_empty()
+            && display.local_images.is_empty()
+            && display.remote_image_urls.is_empty()
+        {
+            return false;
+        }
+        let local_images = display
+            .local_images
+            .into_iter()
+            .enumerate()
+            .map(|(idx, path)| crate::bottom_pane::LocalImageAttachment {
+                placeholder: codex_protocol::models::local_image_label_text(idx + 1),
+                path,
+            })
+            .collect();
+        let user_message = UserMessage {
+            text: display.message,
+            local_images,
+            remote_image_urls: display.remote_image_urls,
+            text_elements: display.text_elements,
+            mention_bindings: Vec::new(),
+        };
+        self.restore_user_message_to_composer(user_message);
+        true
+    }
+
     pub(crate) fn capture_thread_input_state(&self) -> Option<ThreadInputState> {
         let draft = self.bottom_pane.composer_draft_snapshot();
         let composer = ThreadComposerState {

codex-rs/tui/src/chatwidget/interaction.rs

@@ -125,6 +125,12 @@ impl ChatWidget {
             && self.bottom_pane.no_modal_or_popup_active()
             && !self.should_handle_vim_insert_escape(key_event)
         {
+            // Pre-response rollback: the user just submitted but the model
+            // has not started its turn yet. Treat the query as "not sent" —
+            // restore the prompt to the composer (Claude Code parity) before
+            // sending the interrupt, so the user can edit and resubmit
+            // without losing the typed text.
+            self.rollback_pending_user_message_to_composer();
             self.submit_op(AppCommand::interrupt());
             return;
         }