tui: saved-prompt UX — queue shows typed input; on execute: redaction ON shows “/name …”, redaction OFF shows “Custom instruction:” then “Saved prompt:”; agent still gets Directive (CustomInstruction > SavedPrompt)

Signed-off-by: Roman Aleynikov <[email protected]>

Author: agenticbuddy

codex-rs/tui/src/bottom_pane/chat_composer.rs

@@ -56,9 +56,13 @@ const LARGE_PASTE_CHAR_THRESHOLD: usize = 1000;
 pub enum InputResult {
     Submitted(String),
     // Submit actual text to the agent but override what is shown in the
-    // transcript UI with `display`. Used for saved prompts so users see the
-    // original command they typed (e.g., "/saved-prompt").
-    SubmittedWithDisplay { text: String, display: String },
+    // transcript UI with `display`. Optionally include `pretty_unredacted`
+    // for an unredacted transcript (e.g., custom instruction first, then saved prompt).
+    SubmittedWithDisplay {
+        text: String,
+        display: String,
+        pretty_unredacted: Option<String>,
+    },
     Command(SlashCommand),
     None,
 }
@@ -475,19 +479,26 @@ impl ChatComposer {
 <Rule>If information is missing, make reasonable assumptions and proceed.</Rule>\
 </Rules>\
 <CustomInstruction><![CDATA[\
-{}\
+{custom_instruction}\
 ]]></CustomInstruction>\
 <SavedPrompt><![CDATA[\
-{}\
+{contents}\
 ]]></SavedPrompt>\
-</Directive>",
-                                            custom_instruction, contents
+</Directive>"
                                         )
                                     };
+                                    let pretty = if custom_instruction.is_empty() {
+                                        None
+                                    } else {
+                                        Some(format!(
+                                            "Custom instruction:\n{custom_instruction}\n\nSaved prompt:\n{contents}"
+                                        ))
+                                    };
                                     return (
                                         InputResult::SubmittedWithDisplay {
                                             text: agent_text,
                                             display,
+                                            pretty_unredacted: pretty,
                                         },
                                         true,
                                     );
@@ -2452,7 +2463,7 @@ mod tests {
             composer.handle_key_event(KeyEvent::new(KeyCode::Enter, KeyModifiers::NONE));
 
         match result {
-            InputResult::SubmittedWithDisplay { text, display } => {
+            InputResult::SubmittedWithDisplay { text, display, .. } => {
                 assert!(
                     display.starts_with("/my do this"),
                     "display should show typed command+instruction: {display}"

codex-rs/tui/src/chatwidget.rs

@@ -144,6 +144,9 @@ struct UserMessage {
     // instead of `text`. This allows showing "/saved-prompt" while sending expanded
     // prompt contents to the agent.
     display_text: Option<String>,
+    // Optional pretty version for unredacted transcript (e.g., custom
+    // instruction followed by saved prompt) when redaction is disabled.
+    pretty_unredacted: Option<String>,
     image_paths: Vec<PathBuf>,
 }
 
@@ -152,6 +155,7 @@ impl From<String> for UserMessage {
         Self {
             text,
             display_text: None,
+            pretty_unredacted: None,
             image_paths: Vec::new(),
         }
     }
@@ -164,6 +168,7 @@ fn create_initial_user_message(text: String, image_paths: Vec<PathBuf>) -> Optio
         Some(UserMessage {
             text,
             display_text: None,
+            pretty_unredacted: None,
             image_paths,
         })
     }
@@ -810,6 +815,7 @@ impl ChatWidget {
                         let user_message = UserMessage {
                             text,
                             display_text: None,
+                            pretty_unredacted: None,
                             image_paths: self.bottom_pane.take_recent_submission_images(),
                         };
                         if self.bottom_pane.is_task_running() {
@@ -819,10 +825,15 @@ impl ChatWidget {
                             self.submit_user_message(user_message);
                         }
                     }
-                    InputResult::SubmittedWithDisplay { text, display } => {
+                    InputResult::SubmittedWithDisplay {
+                        text,
+                        display,
+                        pretty_unredacted,
+                    } => {
                         let user_message = UserMessage {
                             text,
                             display_text: Some(display),
+                            pretty_unredacted,
                             image_paths: self.bottom_pane.take_recent_submission_images(),
                         };
                         if self.bottom_pane.is_task_running() {
@@ -1005,6 +1016,7 @@ impl ChatWidget {
         let UserMessage {
             text,
             display_text,
+            pretty_unredacted,
             image_paths,
         } = user_message;
         let mut items: Vec<InputItem> = Vec::new();
@@ -1041,7 +1053,7 @@ impl ChatWidget {
             let shown = if self.config.redact_saved_prompt_body {
                 display_text.unwrap_or_else(|| text.clone())
             } else {
-                text.clone()
+                pretty_unredacted.unwrap_or_else(|| text.clone())
             };
             self.add_to_history(history_cell::new_user_prompt(shown));
         }
@@ -1195,13 +1207,7 @@ impl ChatWidget {
         let messages: Vec<String> = self
             .queued_user_messages
             .iter()
-            .map(|m| {
-                if self.config.redact_saved_prompt_body {
-                    m.display_text.clone().unwrap_or_else(|| m.text.clone())
-                } else {
-                    m.text.clone()
-                }
-            })
+            .map(|m| m.display_text.clone().unwrap_or_else(|| m.text.clone()))
             .collect();
         self.bottom_pane.set_queued_user_messages(messages);
     }