Skip to content

armgit / codex

Public Imported from GitHub
0

Lightweight coding agent that runs in your terminal

Rust

Allow reasoning shortcuts to reach Max (#48116)

Eric Trautbf832f4678e1
diff --git a/codex-rs/tui/src/chatwidget/reasoning_shortcuts.rs b/codex-rs/tui/src/chatwidget/reasoning_shortcuts.rs
index 7ef88ac73f..c55eb1fc23 100644
--- a/codex-rs/tui/src/chatwidget/reasoning_shortcuts.rs
+++ b/codex-rs/tui/src/chatwidget/reasoning_shortcuts.rs
@@ -10,8 +10,8 @@
//! current model preset's default, and it walks only efforts advertised by the
//! active model. Unsupported efforts anchor to the model default, or the first
//! advertised effort when the default is absent, before stepping through the
-//! advertised order. Raising never silently crosses into Max or Ultra; those
-//! efforts require the explicit advanced-reasoning picker.
+//! advertised order. Raising into Ultra requires the explicit
+//! advanced-reasoning picker.
use codex_protocol::config_types::ModeKind;
use codex_protocol::openai_models::ModelPreset;
@@ -117,28 +117,15 @@ impl ChatWidget {
};
if direction == ReasoningShortcutDirection::Raise
- && Self::is_advanced_reasoning_effort(&next_effort)
+ && next_effort == ReasoningEffortConfig::Ultra
{
- let advanced_label = choices
- .iter()
- .filter(|effort| Self::is_advanced_reasoning_effort(effort))
- .map(Self::reasoning_effort_label)
- .collect::<Vec<_>>()
- .join(" and ");
- let verb = if advanced_label.contains(" and ") {
- "are"
- } else {
- "is"
- };
let model_path = if current_model.starts_with("codex-auto-") {
current_model
} else {
format!("All models → {current_model}")
};
self.add_info_message(
- format!(
- "{advanced_label} {verb} available under /model → {model_path} → More reasoning…"
- ),
+ format!("Ultra is available under /model → {model_path} → More reasoning…"),
/*hint*/ None,
);
return true;
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__reasoning_shortcut_max_footer.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__reasoning_shortcut_max_footer.snap
new file mode 100644
index 0000000000..34012bf8b1
--- /dev/null
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__reasoning_shortcut_max_footer.snap
@@ -0,0 +1,9 @@
+---
+source: tui/src/chatwidget/tests/popups_and_settings.rs
+expression: snapshot
+---
+" "
+" "
+"› Ask Codex to do anything "
+" "
+" GPT-5.5 max "
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__reasoning_shortcut_max_plan_footer.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__reasoning_shortcut_max_plan_footer.snap
new file mode 100644
index 0000000000..fc0d74f23b
--- /dev/null
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__reasoning_shortcut_max_plan_footer.snap
@@ -0,0 +1,9 @@
+---
+source: tui/src/chatwidget/tests/popups_and_settings.rs
+expression: snapshot
+---
+" "
+" "
+"› Ask Codex to do anything "
+" "
+" GPT-5.5 max Plan mode (shift+tab to cycle) "
diff --git a/codex-rs/tui/src/chatwidget/tests/popups_and_settings.rs b/codex-rs/tui/src/chatwidget/tests/popups_and_settings.rs
index 209c6127cf..6b1a40176a 100644
--- a/codex-rs/tui/src/chatwidget/tests/popups_and_settings.rs
+++ b/codex-rs/tui/src/chatwidget/tests/popups_and_settings.rs
@@ -3978,7 +3978,86 @@ async fn reasoning_shortcut_is_ignored_with_model_popup_open() {
}
#[tokio::test]
-async fn reasoning_up_shortcut_does_not_silently_enter_advanced_effort() {
+async fn reasoning_up_shortcuts_reach_max_in_default_and_plan_modes() {
+ for plan_mode in [false, true] {
+ for key in [
+ KeyEvent::new(KeyCode::Char('.'), KeyModifiers::ALT),
+ KeyEvent::new(KeyCode::Up, KeyModifiers::SHIFT),
+ ] {
+ let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(Some("gpt-5.5")).await;
+ chat.thread_id = Some(ThreadId::new());
+ chat.show_welcome_banner = false;
+ chat.local_settings.tui.status_line = Some(vec!["model-with-reasoning".to_string()]);
+ let mut preset = get_available_model(&chat, "gpt-5.5");
+ preset
+ .supported_reasoning_efforts
+ .push(ReasoningEffortPreset {
+ effort: ReasoningEffortConfig::Max,
+ description: "Maximum reasoning".to_string(),
+ });
+ if plan_mode {
+ chat.set_feature_enabled(Feature::CollaborationModes, /*enabled*/ true);
+ let plan_mask = collaboration_modes::plan_mask(chat.model_catalog.as_ref())
+ .expect("expected plan collaboration mode");
+ chat.set_collaboration_mask(plan_mask);
+ }
+ chat.model_catalog = std::sync::Arc::new(ModelCatalog::new(vec![preset]));
+ if plan_mode {
+ chat.set_plan_mode_reasoning_effort(Some(ReasoningEffortConfig::XHigh));
+ } else {
+ chat.set_reasoning_effort(Some(ReasoningEffortConfig::XHigh));
+ }
+
+ chat.handle_key_event(key);
+
+ let events = std::iter::from_fn(|| rx.try_recv().ok()).collect::<Vec<_>>();
+ let update = events
+ .into_iter()
+ .find(|event| {
+ matches!(
+ (plan_mode, event),
+ (
+ false,
+ AppEvent::UpdateReasoningEffort(Some(ReasoningEffortConfig::Max))
+ ) | (
+ true,
+ AppEvent::UpdatePlanModeReasoningEffort(Some(
+ ReasoningEffortConfig::Max
+ ))
+ )
+ )
+ })
+ .expect("expected max reasoning update");
+ match update {
+ AppEvent::UpdateReasoningEffort(effort) => chat.set_reasoning_effort(effort),
+ AppEvent::UpdatePlanModeReasoningEffort(effort) => {
+ chat.set_plan_mode_reasoning_effort(effort)
+ }
+ _ => unreachable!(),
+ }
+
+ if key.code == KeyCode::Char('.') {
+ let width = 80;
+ let height = chat.desired_height(width);
+ let mut terminal =
+ ratatui::Terminal::new(ratatui::backend::TestBackend::new(width, height))
+ .expect("create terminal");
+ terminal
+ .draw(|frame| chat.render(frame.area(), frame.buffer_mut()))
+ .expect("draw footer");
+ let snapshot = normalized_backend_snapshot(terminal.backend());
+ if plan_mode {
+ assert_chatwidget_snapshot!("reasoning_shortcut_max_plan_footer", snapshot);
+ } else {
+ assert_chatwidget_snapshot!("reasoning_shortcut_max_footer", snapshot);
+ }
+ }
+ }
+ }
+}
+
+#[tokio::test]
+async fn reasoning_up_shortcut_does_not_silently_enter_ultra() {
for (model, model_path) in [
("gpt-5.5", "All models → gpt-5.5"),
("codex-auto-test", "codex-auto-test"),
@@ -4002,29 +4081,27 @@ async fn reasoning_up_shortcut_does_not_silently_enter_advanced_effort() {
chat.model_catalog = std::sync::Arc::new(ModelCatalog::new(vec![preset]));
chat.set_model(model);
- for effort in [ReasoningEffortConfig::XHigh, ReasoningEffortConfig::Max] {
- chat.set_reasoning_effort(Some(effort));
- chat.handle_key_event(KeyEvent::new(KeyCode::Char('.'), KeyModifiers::ALT));
+ chat.set_reasoning_effort(Some(ReasoningEffortConfig::Max));
+ chat.handle_key_event(KeyEvent::new(KeyCode::Char('.'), KeyModifiers::ALT));
- let events = std::iter::from_fn(|| rx.try_recv().ok()).collect::<Vec<_>>();
- assert!(events.iter().all(|event| !matches!(
- event,
- AppEvent::UpdateReasoningEffort(_) | AppEvent::ApplyAdvancedReasoning { .. }
- )));
- let messages = events
- .into_iter()
- .filter_map(|event| match event {
- AppEvent::InsertHistoryCell(cell) => {
- Some(lines_to_single_string(&cell.display_lines(/*width*/ 140)))
- }
- _ => None,
- })
- .collect::<Vec<_>>();
- assert_eq!(
- messages,
- vec![format!(
- "• Max and Ultra are available under /model → {model_path} → More reasoning…\n"
- )]
+ let events = std::iter::from_fn(|| rx.try_recv().ok()).collect::<Vec<_>>();
+ assert!(events.iter().all(|event| !matches!(
+ event,
+ AppEvent::UpdateReasoningEffort(_) | AppEvent::ApplyAdvancedReasoning { .. }
+ )));
+ let messages = events
+ .into_iter()
+ .filter_map(|event| match event {
+ AppEvent::InsertHistoryCell(cell) => {
+ Some(lines_to_single_string(&cell.display_lines(/*width*/ 140)))
+ }
+ _ => None,
+ })
+ .collect::<Vec<_>>();
+ insta::allow_duplicates! {
+ insta::assert_snapshot!(
+ messages.join("").replace(model_path, "<model path>"),
+ @"• Ultra is available under /model → <model path> → More reasoning…"
);
}
}