diff --git a/codex-rs/tui/src/bottom_pane/mod.rs b/codex-rs/tui/src/bottom_pane/mod.rs index 384d8bf4..949283f6 100644 --- a/codex-rs/tui/src/bottom_pane/mod.rs +++ b/codex-rs/tui/src/bottom_pane/mod.rs @@ -530,7 +530,7 @@ mod tests { // Push an approval modal (e.g., command approval) which should hide the status view. pane.push_approval_request(exec_request()); - // Simulate pressing 'n' (deny) on the modal. + // Simulate pressing 'n' (No) on the modal. use crossterm::event::KeyCode; use crossterm::event::KeyEvent; use crossterm::event::KeyModifiers; diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__approval_modal_exec.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__approval_modal_exec.snap index 9173b726..e3289220 100644 --- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__approval_modal_exec.snap +++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__approval_modal_exec.snap @@ -8,6 +8,6 @@ expression: terminal.backend() "Model wants to run a command " " " "▌Allow command? " -"▌ Yes Always No No, provide feedback " +"▌ Yes Always No, provide feedback " "▌ Approve and run the command " " " diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__approval_modal_patch.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__approval_modal_patch.snap index e449f0c5..b4373640 100644 --- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__approval_modal_patch.snap +++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__approval_modal_patch.snap @@ -8,6 +8,6 @@ expression: terminal.backend() "This will grant write access to /tmp for the remainder of this session. " " " "▌Apply changes? " -"▌ Yes No No, provide feedback " +"▌ Yes No, provide feedback " "▌ Approve and apply the changes " " " diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__status_widget_and_approval_modal.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__status_widget_and_approval_modal.snap index 3abc8c7b..dc7619c6 100644 --- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__status_widget_and_approval_modal.snap +++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__status_widget_and_approval_modal.snap @@ -8,6 +8,6 @@ expression: terminal.backend() "Codex wants to run a command " " " "▌Allow command? " -"▌ Yes Always No No, provide feedback " +"▌ Yes Always No, provide feedback " "▌ Approve and run the command " " " diff --git a/codex-rs/tui/src/user_approval_widget.rs b/codex-rs/tui/src/user_approval_widget.rs index 39c9af08..e323574c 100644 --- a/codex-rs/tui/src/user_approval_widget.rs +++ b/codex-rs/tui/src/user_approval_widget.rs @@ -69,20 +69,9 @@ static COMMAND_SELECT_OPTIONS: LazyLock> = LazyLock::new(|| { decision: ReviewDecision::ApprovedForSession, }, SelectOption { - label: Line::from(vec!["N".underlined(), "o".into()]), - description: "Do not run the command", - key: KeyCode::Char('n'), - decision: ReviewDecision::Denied, - }, - SelectOption { - label: Line::from(vec![ - "No, ".into(), - "provide ".into(), - "f".underlined(), - "eedback".into(), - ]), + label: Line::from(vec!["N".underlined(), "o, provide feedback".into()]), description: "Do not run the command; provide feedback", - key: KeyCode::Char('f'), + key: KeyCode::Char('n'), decision: ReviewDecision::Abort, }, ] @@ -97,20 +86,9 @@ static PATCH_SELECT_OPTIONS: LazyLock> = LazyLock::new(|| { decision: ReviewDecision::Approved, }, SelectOption { - label: Line::from(vec!["N".underlined(), "o".into()]), - description: "Do not apply the changes", - key: KeyCode::Char('n'), - decision: ReviewDecision::Denied, - }, - SelectOption { - label: Line::from(vec![ - "No, ".into(), - "provide ".into(), - "f".underlined(), - "eedback".into(), - ]), + label: Line::from(vec!["N".underlined(), "o, provide feedback".into()]), description: "Do not apply the changes; provide feedback", - key: KeyCode::Char('f'), + key: KeyCode::Char('n'), decision: ReviewDecision::Abort, }, ]