copy/functionality update

Author: iceweasel-oai

codex-rs/tui/src/app.rs

@@ -924,10 +924,10 @@ impl App {
                                 self.chat_widget.add_info_message(
                                     match mode {
                                         WindowsSandboxEnableMode::Elevated => {
-                                            "Enabled elevated Windows sandbox.".to_string()
+                                            "Enabled elevated agent sandbox.".to_string()
                                         }
                                         WindowsSandboxEnableMode::Legacy => {
-                                            "Enabled degraded Windows sandbox.".to_string()
+                                            "Enabled non-elevated agent sandbox.".to_string()
                                         }
                                     },
                                     None,

codex-rs/tui/src/app_event.rs

@@ -25,7 +25,6 @@ pub(crate) enum WindowsSandboxEnableMode {
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 #[cfg_attr(not(target_os = "windows"), allow(dead_code))]
 pub(crate) enum WindowsSandboxFallbackReason {
-    DeclinedElevation,
     ElevationFailed,
 }
 

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

@@ -20,6 +20,7 @@ use crate::render::RectExt as _;
 use crate::render::renderable::ColumnRenderable;
 use crate::render::renderable::Renderable;
 use crate::style::user_message_style;
+use super::selection_popup_common::wrap_styled_line;
 
 use super::CancellationEvent;
 use super::bottom_pane_view::BottomPaneView;
@@ -438,8 +439,10 @@ impl Renderable for ListSelectionView {
         if self.is_searchable {
             height = height.saturating_add(1);
         }
-        if self.footer_note.is_some() {
-            height = height.saturating_add(1);
+        if let Some(note) = &self.footer_note {
+            let note_width = width.saturating_sub(2);
+            let note_lines = wrap_styled_line(note, note_width);
+            height = height.saturating_add(note_lines.len() as u16);
         }
         if self.footer_hint.is_some() {
             height = height.saturating_add(1);
@@ -452,8 +455,13 @@ impl Renderable for ListSelectionView {
             return;
         }
 
-        let footer_rows =
-            u16::from(self.footer_note.is_some()) + u16::from(self.footer_hint.is_some());
+        let note_width = area.width.saturating_sub(2);
+        let note_lines = self
+            .footer_note
+            .as_ref()
+            .map(|note| wrap_styled_line(note, note_width));
+        let note_height = note_lines.as_ref().map_or(0, |lines| lines.len() as u16);
+        let footer_rows = note_height + u16::from(self.footer_hint.is_some());
         let [content_area, footer_area] =
             Layout::vertical([Constraint::Fill(1), Constraint::Length(footer_rows)]).areas(area);
 
@@ -525,19 +533,30 @@ impl Renderable for ListSelectionView {
 
         if footer_area.height > 0 {
             let [note_area, hint_area] = Layout::vertical([
-                Constraint::Length(if self.footer_note.is_some() { 1 } else { 0 }),
+                Constraint::Length(note_height),
                 Constraint::Length(if self.footer_hint.is_some() { 1 } else { 0 }),
             ])
             .areas(footer_area);
 
-            if let Some(note) = &self.footer_note {
+            if let Some(lines) = note_lines {
                 let note_area = Rect {
                     x: note_area.x + 2,
                     y: note_area.y,
                     width: note_area.width.saturating_sub(2),
                     height: note_area.height,
                 };
-                note.clone().render(note_area, buf);
+                for (idx, line) in lines.iter().enumerate() {
+                    if idx as u16 >= note_area.height {
+                        break;
+                    }
+                    let line_area = Rect {
+                        x: note_area.x,
+                        y: note_area.y + idx as u16,
+                        width: note_area.width,
+                        height: 1,
+                    };
+                    line.clone().render(line_area, buf);
+                }
             }
 
             if let Some(hint) = &self.footer_hint {

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

@@ -26,6 +26,17 @@ pub(crate) struct GenericDisplayRow {
     pub wrap_indent: Option<usize>,        // optional indent for wrapped lines
 }
 
+pub(crate) fn wrap_styled_line<'a>(line: &'a Line<'a>, width: u16) -> Vec<Line<'a>> {
+    use crate::wrapping::RtOptions;
+    use crate::wrapping::word_wrap_line;
+
+    let width = width.max(1) as usize;
+    let opts = RtOptions::new(width)
+        .initial_indent(Line::from(""))
+        .subsequent_indent(Line::from(""));
+    word_wrap_line(line, opts)
+}
+
 fn line_width(line: &Line<'_>) -> usize {
     line.iter()
         .map(|span| UnicodeWidthStr::width(span.content.as_ref()))

codex-rs/tui/src/chatwidget.rs

@@ -2816,7 +2816,7 @@ impl ChatWidget {
             let is_current =
                 Self::preset_matches_current(current_approval, current_sandbox, &preset);
             let name = if preset.id == "auto" && windows_degraded_sandbox_enabled {
-                "Agent (degraded)".to_string()
+                "Agent (non-elevated sandbox)".to_string()
             } else {
                 preset.label.to_string()
             };
@@ -2897,8 +2897,8 @@ impl ChatWidget {
 
         let footer_note = show_elevate_sandbox_hint.then(|| {
             vec![
-                "To upgrade to the elevated sandbox, run ".dim(),
-                "/elevate-sandbox".cyan(),
+                "The non-elevated sandbox protects your files and prevents network access under most circumstances. However, it carries greater risk if prompt injected. To upgrade to the elevated sandbox, run ".dim(),
+                "/setup-elevated-sandbox".cyan(),
                 ".".dim(),
             ]
             .into()
@@ -3230,40 +3230,59 @@ impl ChatWidget {
             return;
         }
 
+        let current_approval = self.config.approval_policy.value();
+        let current_sandbox = self.config.sandbox_policy.get();
+        let presets = builtin_approval_presets();
+        let stay_full_access = presets
+            .iter()
+            .find(|preset| preset.id == "full-access")
+            .is_some_and(|preset| {
+                Self::preset_matches_current(current_approval, current_sandbox, preset)
+            });
+        let stay_actions = if stay_full_access {
+            Vec::new()
+        } else {
+            presets
+                .iter()
+                .find(|preset| preset.id == "read-only")
+                .map(|preset| {
+                    Self::approval_preset_actions(preset.approval, preset.sandbox.clone())
+                })
+                .unwrap_or_default()
+        };
+        let stay_label = if stay_full_access {
+            "Stay in Agent Full Access".to_string()
+        } else {
+            "Stay in Read-Only".to_string()
+        };
+
         let mut header = ColumnRenderable::new();
         header.push(*Box::new(
             Paragraph::new(vec![
-                line!["Codex works best in Agent mode.".bold()],
-                line!["To use Agent mode on Windows, we need to configure the sandbox."],
-                line!["This setup requires elevation. Do you accept?"],
+                line!["Set Up Agent Sandbox".bold()],
+                line![""],
+                line!["Agent mode uses an experimental Windows sandbox that protects your files and prevents network access by default."],
                 line!["Learn more: https://developers.openai.com/codex/windows"],
             ])
             .wrap(Wrap { trim: false }),
         ));
 
-        let preset_accept = preset.clone();
-        let preset_decline = preset;
         let items = vec![
             SelectionItem {
-                name: "Yes, I accept".to_string(),
+                name: "Set up agent sandbox (requires elevation)".to_string(),
                 description: None,
                 actions: vec![Box::new(move |tx| {
                     tx.send(AppEvent::BeginWindowsSandboxElevatedSetup {
-                        preset: preset_accept.clone(),
+                        preset: preset.clone(),
                     });
                 })],
                 dismiss_on_select: true,
                 ..Default::default()
             },
             SelectionItem {
-                name: "No, I do not accept".to_string(),
+                name: stay_label,
                 description: None,
-                actions: vec![Box::new(move |tx| {
-                    tx.send(AppEvent::OpenWindowsSandboxFallbackPrompt {
-                        preset: preset_decline.clone(),
-                        reason: WindowsSandboxFallbackReason::DeclinedElevation,
-                    });
-                })],
+                actions: stay_actions,
                 dismiss_on_select: true,
                 ..Default::default()
             },
@@ -3289,53 +3308,75 @@ impl ChatWidget {
     ) {
         use ratatui_macros::line;
 
+        let _ = reason;
+
+        let current_approval = self.config.approval_policy.value();
+        let current_sandbox = self.config.sandbox_policy.get();
+        let presets = builtin_approval_presets();
+        let stay_full_access = presets
+            .iter()
+            .find(|preset| preset.id == "full-access")
+            .is_some_and(|preset| {
+                Self::preset_matches_current(current_approval, current_sandbox, preset)
+            });
+        let stay_actions = if stay_full_access {
+            Vec::new()
+        } else {
+            presets
+                .iter()
+                .find(|preset| preset.id == "read-only")
+                .map(|preset| {
+                    Self::approval_preset_actions(preset.approval, preset.sandbox.clone())
+                })
+                .unwrap_or_default()
+        };
+        let stay_label = if stay_full_access {
+            "Stay in Agent Full Access".to_string()
+        } else {
+            "Stay in Read-Only".to_string()
+        };
+
         let mut lines = Vec::new();
-        if reason == WindowsSandboxFallbackReason::ElevationFailed {
-            lines.push(line!["The elevated setup did not complete.".bold()]);
-        }
-        lines.push(line![
-            "You can still use a degraded sandbox without elevation."
-        ]);
-        lines.push(line!["It is less watertight, but still secure."]);
+        lines.push(line!["Use Non-Elevated Sandbox?".bold()]);
+        lines.push(line![""]);
         lines.push(line![
-            "Learn more: https://developers.openai.com/codex/windows"
+            "Elevation failed. You can also use a non-elevated sandbox, which protects your files and prevents network access under most circumstances. However, it carries greater risk if prompt injected."
         ]);
+        lines.push(line!["Learn more: https://developers.openai.com/codex/windows"]);
 
         let mut header = ColumnRenderable::new();
         header.push(*Box::new(Paragraph::new(lines).wrap(Wrap { trim: false })));
 
-        let preset_retry = preset.clone();
-        let preset_degraded = preset;
+        let elevated_preset = preset.clone();
+        let legacy_preset = preset.clone();
         let items = vec![
             SelectionItem {
-                name: "Try elevated setup again".to_string(),
+                name: "Try elevated agent sandbox setup again".to_string(),
                 description: None,
                 actions: vec![Box::new(move |tx| {
                     tx.send(AppEvent::BeginWindowsSandboxElevatedSetup {
-                        preset: preset_retry.clone(),
+                        preset: elevated_preset.clone(),
                     });
                 })],
                 dismiss_on_select: true,
                 ..Default::default()
             },
             SelectionItem {
-                name: "Use degraded sandbox".to_string(),
+                name: "Use non-elevated agent sandbox".to_string(),
                 description: None,
                 actions: vec![Box::new(move |tx| {
                     tx.send(AppEvent::EnableWindowsSandboxForAgentMode {
-                        preset: preset_degraded.clone(),
+                        preset: legacy_preset.clone(),
                         mode: WindowsSandboxEnableMode::Legacy,
                     });
                 })],
                 dismiss_on_select: true,
                 ..Default::default()
             },
             SelectionItem {
-                name: "Use no sandbox".to_string(),
+                name: stay_label,
                 description: None,
-                actions: vec![Box::new(|tx| {
-                    tx.send(AppEvent::OpenApprovalsPopup);
-                })],
+                actions: stay_actions,
                 dismiss_on_select: true,
                 ..Default::default()
             },
@@ -3384,8 +3425,7 @@ impl ChatWidget {
         self.bottom_pane.ensure_status_indicator();
         self.bottom_pane.set_interrupt_hint_visible(false);
         self.set_status_header(
-            "Setting up the elevated Windows sandbox (this may take a minute or more). You'll stay in your current mode until it's done."
-                .to_string(),
+            "Setting up agent sandbox. This can take a minute.".to_string(),
         );
         self.request_redraw();
     }

codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__approvals_selection_popup@windows_degraded.snap

@@ -11,5 +11,5 @@ expression: popup
                           commands with network access. Exercise caution when
                           using.
 
-  To upgrade to the elevated sandbox, run /elevate-sandbox.
+  To upgrade to the elevated sandbox, run /setup-elevated-sandbox.
   Press enter to confirm or esc to go back

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

@@ -2083,8 +2083,12 @@ async fn startup_prompts_for_windows_sandbox_when_agent_requested() {
         "expected startup prompt to explain elevation: {popup}"
     );
     assert!(
-        popup.contains("Yes, I accept"),
-        "expected startup prompt to offer accepting elevation: {popup}"
+        popup.contains("Set up agent sandbox"),
+        "expected startup prompt to offer agent sandbox setup: {popup}"
+    );
+    assert!(
+        popup.contains("Stay in"),
+        "expected startup prompt to offer staying in current mode: {popup}"
     );
 
     set_windows_sandbox_enabled(true);

codex-rs/tui/src/slash_command.rs

@@ -14,6 +14,7 @@ pub enum SlashCommand {
     // more frequently used commands should be listed first.
     Model,
     Approvals,
+    #[strum(serialize = "setup-elevated-sandbox")]
     ElevateSandbox,
     Experimental,
     Skills,
@@ -55,7 +56,7 @@ impl SlashCommand {
             SlashCommand::Ps => "list background terminals",
             SlashCommand::Model => "choose what model and reasoning effort to use",
             SlashCommand::Approvals => "choose what Codex can do without approval",
-            SlashCommand::ElevateSandbox => "upgrade to the elevated Windows sandbox",
+            SlashCommand::ElevateSandbox => "set up elevated agent sandbox",
             SlashCommand::Experimental => "toggle beta features",
             SlashCommand::Mcp => "list configured MCP tools",
             SlashCommand::Logout => "log out of Codex",

codex-rs/tui2/src/app.rs

@@ -1696,10 +1696,10 @@ impl App {
                                 self.chat_widget.add_info_message(
                                     match mode {
                                         WindowsSandboxEnableMode::Elevated => {
-                                            "Enabled elevated Windows sandbox.".to_string()
+                                            "Enabled elevated agent sandbox.".to_string()
                                         }
                                         WindowsSandboxEnableMode::Legacy => {
-                                            "Enabled degraded Windows sandbox.".to_string()
+                                            "Enabled non-elevated agent sandbox.".to_string()
                                         }
                                     },
                                     None,

codex-rs/tui2/src/app_event.rs

@@ -24,7 +24,6 @@ pub(crate) enum WindowsSandboxEnableMode {
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 #[cfg_attr(not(target_os = "windows"), allow(dead_code))]
 pub(crate) enum WindowsSandboxFallbackReason {
-    DeclinedElevation,
     ElevationFailed,
 }