tui/core: persist transcript-form user messages in rollout for resume; keep rollout unredacted; avoid leaking prompt text in logs; show verbatim /prompt in transcript

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

Author: agenticbuddy

codex-rs/core/src/codex.rs

@@ -93,6 +93,7 @@ use crate::protocol::ExecCommandBeginEvent;
 use crate::protocol::ExecCommandEndEvent;
 use crate::protocol::FileChange;
 use crate::protocol::InputItem;
+use crate::protocol::InputMessageKind;
 use crate::protocol::ListCustomPromptsResponseEvent;
 use crate::protocol::Op;
 use crate::protocol::PatchApplyBeginEvent;
@@ -107,6 +108,7 @@ use crate::protocol::TaskCompleteEvent;
 use crate::protocol::TokenUsage;
 use crate::protocol::TokenUsageInfo;
 use crate::protocol::TurnDiffEvent;
+use crate::protocol::UserMessageEvent;
 use crate::protocol::WebSearchBeginEvent;
 use crate::rollout::RolloutRecorder;
 use crate::rollout::RolloutRecorderParams;
@@ -1184,7 +1186,8 @@ async fn submission_loop(
     let mut turn_context = Arc::new(turn_context);
     // To break out of this loop, send Op::Shutdown.
     while let Ok(sub) = rx_sub.recv().await {
-        debug!(?sub, "Submission");
+        // Avoid logging full submission payloads to prevent leaking prompt or template text.
+        debug!("Submission received: id={}", sub.id);
         match sub.op {
             Op::Interrupt => {
                 sess.interrupt_task();
@@ -1370,12 +1373,23 @@ async fn submission_loop(
             Op::AddToHistory { text } => {
                 let id = sess.conversation_id;
                 let config = config.clone();
+                let text_for_history = text.clone();
                 tokio::spawn(async move {
-                    if let Err(e) = crate::message_history::append_entry(&text, &id, &config).await
+                    if let Err(e) =
+                        crate::message_history::append_entry(&text_for_history, &id, &config).await
                     {
                         warn!("failed to append to message history: {e}");
                     }
                 });
+
+                // Persist a transcript-only user message in rollout so resume displays
+                // exactly what the user saw in the transcript. Do not send to UI to avoid duplicates.
+                let rollout_item = RolloutItem::EventMsg(EventMsg::UserMessage(UserMessageEvent {
+                    message: text,
+                    kind: Some(InputMessageKind::Plain),
+                    images: None,
+                }));
+                sess.persist_rollout_items(&[rollout_item]).await;
             }
 
             Op::GetHistoryEntryRequest { offset, log_id } => {

codex-rs/core/src/config.rs

@@ -1622,6 +1622,7 @@ model_verbosity = "high"
                 include_view_image_tool: true,
                 active_profile: Some("o3".to_string()),
                 disable_paste_burst: false,
+                redact_saved_prompt_body: true,
             },
             o3_profile_config
         );

codex-rs/core/src/rollout/recorder.rs

@@ -293,6 +293,8 @@ impl RolloutRecorder {
     }
 }
 
+// Note: rollout files are used for resume; do not redact or truncate persisted items here.
+
 struct LogFileInfo {
     /// Opened file handle to the rollout file.
     file: File,

codex-rs/exec/src/lib.rs

@@ -162,6 +162,7 @@ pub async fn run_main(cli: Cli, codex_linux_sandbox_exe: Option<PathBuf>) -> any
         include_view_image_tool: None,
         show_raw_agent_reasoning: oss.then_some(true),
         tools_web_search_request: None,
+        redact_saved_prompt_body: None,
     };
     // Parse `-c` overrides.
     let cli_kv_overrides = match config_overrides.parse_overrides() {

codex-rs/mcp-server/src/codex_message_processor.rs

@@ -1270,6 +1270,7 @@ fn derive_config_from_params(
         include_view_image_tool: None,
         show_raw_agent_reasoning: None,
         tools_web_search_request: None,
+        redact_saved_prompt_body: None,
     };
 
     let cli_overrides = cli_overrides

codex-rs/mcp-server/src/codex_tool_config.rs

@@ -165,6 +165,7 @@ impl CodexToolCallParam {
             include_view_image_tool: None,
             show_raw_agent_reasoning: None,
             tools_web_search_request: None,
+            redact_saved_prompt_body: None,
         };
 
         let cli_overrides = cli_overrides

codex-rs/tui/src/chatwidget.rs

@@ -1039,22 +1039,24 @@ impl ChatWidget {
                 tracing::error!("failed to send message: {e}");
             });
 
-        // Persist the text to cross-session message history.
-        if !text.is_empty() {
-            self.codex_op_tx
-                .send(Op::AddToHistory { text: text.clone() })
-                .unwrap_or_else(|e| {
-                    tracing::error!("failed to send AddHistory op: {e}");
-                });
-        }
-
-        // Only show the text portion in conversation history.
         if !text.is_empty() {
+            // Compute what we show to the user in transcript.
             let shown = if self.config.redact_saved_prompt_body {
                 display_text.unwrap_or_else(|| text.clone())
             } else {
                 pretty_unredacted.unwrap_or_else(|| text.clone())
             };
+
+            // Persist the display text to cross-session message history (and rollout via core)
+            self.codex_op_tx
+                .send(Op::AddToHistory {
+                    text: shown.clone(),
+                })
+                .unwrap_or_else(|e| {
+                    tracing::error!("failed to send AddHistory op: {e}");
+                });
+
+            // Show in conversation history now.
             self.add_to_history(history_cell::new_user_prompt(shown));
         }
     }