diff --git a/codex-rs/tui/src/bottom_pane/feedback_view.rs b/codex-rs/tui/src/bottom_pane/feedback_view.rs index 98667f8f18..7635c77956 100644 --- a/codex-rs/tui/src/bottom_pane/feedback_view.rs +++ b/codex-rs/tui/src/bottom_pane/feedback_view.rs @@ -1,7 +1,6 @@ use std::cell::RefCell; use std::path::PathBuf; -use codex_feedback::feedback_diagnostics::FEEDBACK_DIAGNOSTICS_ATTACHMENT_FILENAME; use codex_feedback::feedback_diagnostics::FeedbackDiagnostics; use crossterm::event::KeyCode; use crossterm::event::KeyEvent; @@ -501,7 +500,7 @@ fn make_feedback_item( pub(crate) fn feedback_upload_consent_params( app_event_tx: AppEventSender, category: FeedbackCategory, - rollout_path: Option, + _rollout_path: Option, feedback_diagnostics: &FeedbackDiagnostics, ) -> super::SelectionViewParams { use super::popup_consts::standard_popup_hint_line; @@ -527,26 +526,17 @@ pub(crate) fn feedback_upload_consent_params( } }); - // Build header listing files that would be sent if user consents. + // Build header asking for consent before uploading feedback artifacts. let mut header_lines: Vec> = vec![ - Line::from("Upload logs?".bold()).into(), + Line::from("Upload logs and rollout?".bold()).into(), Line::from("").into(), - Line::from("The following files will be sent:".dim()).into(), - Line::from(vec![" • ".into(), "codex-logs.log".into()]).into(), + Line::from( + "Is it OK to upload the log and rollout for the main agent and all sub-agents?".dim(), + ) + .into(), ]; - if let Some(path) = rollout_path.as_deref() - && let Some(name) = path.file_name().map(|s| s.to_string_lossy().to_string()) - { - header_lines.push(Line::from(vec![" • ".into(), name.into()]).into()); - } if !feedback_diagnostics.is_empty() { - header_lines.push( - Line::from(vec![ - " • ".into(), - FEEDBACK_DIAGNOSTICS_ATTACHMENT_FILENAME.into(), - ]) - .into(), - ); + header_lines.push(Line::from("").into()); } if should_show_feedback_connectivity_details(category, feedback_diagnostics) { header_lines.push(Line::from("").into()); @@ -566,7 +556,7 @@ pub(crate) fn feedback_upload_consent_params( super::SelectionItem { name: "Yes".to_string(), description: Some( - "Share the current Codex session logs with the team for troubleshooting." + "Share the current Codex session log and rollout with the team for troubleshooting." .to_string(), ), actions: vec![yes_action], diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__feedback_good_result_consent_popup.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__feedback_good_result_consent_popup.snap index 4529d6d478..2b7cfba52d 100644 --- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__feedback_good_result_consent_popup.snap +++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__feedback_good_result_consent_popup.snap @@ -2,13 +2,12 @@ source: tui/src/chatwidget/tests.rs expression: popup --- - Upload logs? + Upload logs and rollout? - The following files will be sent: - • codex-logs.log - • codex-connectivity-diagnostics.txt + Is it OK to upload the log and rollout for the main agent and all sub-agents -› 1. Yes Share the current Codex session logs with the team for + +› 1. Yes Share the current Codex session log and rollout with the team for troubleshooting. 2. No diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__feedback_upload_consent_popup.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__feedback_upload_consent_popup.snap index 5eb149ca1e..3b956fd5dd 100644 --- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__feedback_upload_consent_popup.snap +++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__feedback_upload_consent_popup.snap @@ -2,17 +2,16 @@ source: tui/src/chatwidget/tests.rs expression: popup --- - Upload logs? + Upload logs and rollout? + + Is it OK to upload the log and rollout for the main agent and all sub-agents - The following files will be sent: - • codex-logs.log - • codex-connectivity-diagnostics.txt Connectivity diagnostics - OPENAI_BASE_URL is set and may affect connectivity. - OPENAI_BASE_URL = hello -› 1. Yes Share the current Codex session logs with the team for +› 1. Yes Share the current Codex session log and rollout with the team for troubleshooting. 2. No diff --git a/codex-rs/tui_app_server/src/bottom_pane/feedback_view.rs b/codex-rs/tui_app_server/src/bottom_pane/feedback_view.rs index 98667f8f18..7635c77956 100644 --- a/codex-rs/tui_app_server/src/bottom_pane/feedback_view.rs +++ b/codex-rs/tui_app_server/src/bottom_pane/feedback_view.rs @@ -1,7 +1,6 @@ use std::cell::RefCell; use std::path::PathBuf; -use codex_feedback::feedback_diagnostics::FEEDBACK_DIAGNOSTICS_ATTACHMENT_FILENAME; use codex_feedback::feedback_diagnostics::FeedbackDiagnostics; use crossterm::event::KeyCode; use crossterm::event::KeyEvent; @@ -501,7 +500,7 @@ fn make_feedback_item( pub(crate) fn feedback_upload_consent_params( app_event_tx: AppEventSender, category: FeedbackCategory, - rollout_path: Option, + _rollout_path: Option, feedback_diagnostics: &FeedbackDiagnostics, ) -> super::SelectionViewParams { use super::popup_consts::standard_popup_hint_line; @@ -527,26 +526,17 @@ pub(crate) fn feedback_upload_consent_params( } }); - // Build header listing files that would be sent if user consents. + // Build header asking for consent before uploading feedback artifacts. let mut header_lines: Vec> = vec![ - Line::from("Upload logs?".bold()).into(), + Line::from("Upload logs and rollout?".bold()).into(), Line::from("").into(), - Line::from("The following files will be sent:".dim()).into(), - Line::from(vec![" • ".into(), "codex-logs.log".into()]).into(), + Line::from( + "Is it OK to upload the log and rollout for the main agent and all sub-agents?".dim(), + ) + .into(), ]; - if let Some(path) = rollout_path.as_deref() - && let Some(name) = path.file_name().map(|s| s.to_string_lossy().to_string()) - { - header_lines.push(Line::from(vec![" • ".into(), name.into()]).into()); - } if !feedback_diagnostics.is_empty() { - header_lines.push( - Line::from(vec![ - " • ".into(), - FEEDBACK_DIAGNOSTICS_ATTACHMENT_FILENAME.into(), - ]) - .into(), - ); + header_lines.push(Line::from("").into()); } if should_show_feedback_connectivity_details(category, feedback_diagnostics) { header_lines.push(Line::from("").into()); @@ -566,7 +556,7 @@ pub(crate) fn feedback_upload_consent_params( super::SelectionItem { name: "Yes".to_string(), description: Some( - "Share the current Codex session logs with the team for troubleshooting." + "Share the current Codex session log and rollout with the team for troubleshooting." .to_string(), ), actions: vec![yes_action], diff --git a/codex-rs/tui_app_server/src/chatwidget/snapshots/codex_tui__chatwidget__tests__feedback_good_result_consent_popup.snap b/codex-rs/tui_app_server/src/chatwidget/snapshots/codex_tui__chatwidget__tests__feedback_good_result_consent_popup.snap index 4529d6d478..2b7cfba52d 100644 --- a/codex-rs/tui_app_server/src/chatwidget/snapshots/codex_tui__chatwidget__tests__feedback_good_result_consent_popup.snap +++ b/codex-rs/tui_app_server/src/chatwidget/snapshots/codex_tui__chatwidget__tests__feedback_good_result_consent_popup.snap @@ -2,13 +2,12 @@ source: tui/src/chatwidget/tests.rs expression: popup --- - Upload logs? + Upload logs and rollout? - The following files will be sent: - • codex-logs.log - • codex-connectivity-diagnostics.txt + Is it OK to upload the log and rollout for the main agent and all sub-agents -› 1. Yes Share the current Codex session logs with the team for + +› 1. Yes Share the current Codex session log and rollout with the team for troubleshooting. 2. No diff --git a/codex-rs/tui_app_server/src/chatwidget/snapshots/codex_tui__chatwidget__tests__feedback_upload_consent_popup.snap b/codex-rs/tui_app_server/src/chatwidget/snapshots/codex_tui__chatwidget__tests__feedback_upload_consent_popup.snap index 5eb149ca1e..3b956fd5dd 100644 --- a/codex-rs/tui_app_server/src/chatwidget/snapshots/codex_tui__chatwidget__tests__feedback_upload_consent_popup.snap +++ b/codex-rs/tui_app_server/src/chatwidget/snapshots/codex_tui__chatwidget__tests__feedback_upload_consent_popup.snap @@ -2,17 +2,16 @@ source: tui/src/chatwidget/tests.rs expression: popup --- - Upload logs? + Upload logs and rollout? + + Is it OK to upload the log and rollout for the main agent and all sub-agents - The following files will be sent: - • codex-logs.log - • codex-connectivity-diagnostics.txt Connectivity diagnostics - OPENAI_BASE_URL is set and may affect connectivity. - OPENAI_BASE_URL = hello -› 1. Yes Share the current Codex session logs with the team for +› 1. Yes Share the current Codex session log and rollout with the team for troubleshooting. 2. No diff --git a/codex-rs/tui_app_server/src/chatwidget/snapshots/codex_tui_app_server__chatwidget__tests__feedback_good_result_consent_popup.snap b/codex-rs/tui_app_server/src/chatwidget/snapshots/codex_tui_app_server__chatwidget__tests__feedback_good_result_consent_popup.snap index 656eeb15b9..6a307f429a 100644 --- a/codex-rs/tui_app_server/src/chatwidget/snapshots/codex_tui_app_server__chatwidget__tests__feedback_good_result_consent_popup.snap +++ b/codex-rs/tui_app_server/src/chatwidget/snapshots/codex_tui_app_server__chatwidget__tests__feedback_good_result_consent_popup.snap @@ -2,13 +2,12 @@ source: tui_app_server/src/chatwidget/tests.rs expression: popup --- - Upload logs? + Upload logs and rollout? - The following files will be sent: - • codex-logs.log - • codex-connectivity-diagnostics.txt + Is it OK to upload the log and rollout for the main agent and all sub-agents -› 1. Yes Share the current Codex session logs with the team for + +› 1. Yes Share the current Codex session log and rollout with the team for troubleshooting. 2. No diff --git a/codex-rs/tui_app_server/src/chatwidget/snapshots/codex_tui_app_server__chatwidget__tests__feedback_upload_consent_popup.snap b/codex-rs/tui_app_server/src/chatwidget/snapshots/codex_tui_app_server__chatwidget__tests__feedback_upload_consent_popup.snap index 19f9b7122b..e132b8089d 100644 --- a/codex-rs/tui_app_server/src/chatwidget/snapshots/codex_tui_app_server__chatwidget__tests__feedback_upload_consent_popup.snap +++ b/codex-rs/tui_app_server/src/chatwidget/snapshots/codex_tui_app_server__chatwidget__tests__feedback_upload_consent_popup.snap @@ -2,17 +2,16 @@ source: tui_app_server/src/chatwidget/tests.rs expression: popup --- - Upload logs? + Upload logs and rollout? + + Is it OK to upload the log and rollout for the main agent and all sub-agents - The following files will be sent: - • codex-logs.log - • codex-connectivity-diagnostics.txt Connectivity diagnostics - OPENAI_BASE_URL is set and may affect connectivity. - OPENAI_BASE_URL = hello -› 1. Yes Share the current Codex session logs with the team for +› 1. Yes Share the current Codex session log and rollout with the team for troubleshooting. 2. No