diff --git a/codex-rs/tui/src/chatwidget.rs b/codex-rs/tui/src/chatwidget.rs index 6945e323d..5ca6b13e8 100644 --- a/codex-rs/tui/src/chatwidget.rs +++ b/codex-rs/tui/src/chatwidget.rs @@ -4646,8 +4646,8 @@ impl ChatWidget { } fn open_rate_limit_switch_prompt(&mut self, preset: ModelPreset) { - let switch_model = preset.model.to_string(); - let display_name = preset.display_name.to_string(); + let switch_model = preset.model; + let switch_model_for_events = switch_model.clone(); let default_effort: ReasoningEffortConfig = preset.default_reasoning_effort; let switch_actions: Vec = vec![Box::new(move |tx| { @@ -4656,13 +4656,13 @@ impl ChatWidget { approval_policy: None, sandbox_policy: None, windows_sandbox_level: None, - model: Some(switch_model.clone()), + model: Some(switch_model_for_events.clone()), effort: Some(Some(default_effort)), summary: None, collaboration_mode: None, personality: None, })); - tx.send(AppEvent::UpdateModel(switch_model.clone())); + tx.send(AppEvent::UpdateModel(switch_model_for_events.clone())); tx.send(AppEvent::UpdateReasoningEffort(Some(default_effort))); })]; @@ -4679,7 +4679,7 @@ impl ChatWidget { let items = vec![ SelectionItem { - name: format!("Switch to {display_name}"), + name: format!("Switch to {switch_model}"), description, selected_description: None, is_current: false, @@ -4711,7 +4711,7 @@ impl ChatWidget { self.bottom_pane.show_selection_view(SelectionViewParams { title: Some("Approaching rate limits".to_string()), - subtitle: Some(format!("Switch to {display_name} for lower credit usage?")), + subtitle: Some(format!("Switch to {switch_model} for lower credit usage?")), footer_hint: Some(standard_popup_hint_line()), items, ..Default::default() @@ -4858,7 +4858,7 @@ impl ChatWidget { let current_label = presets .iter() .find(|preset| preset.model.as_str() == current_model) - .map(|preset| preset.display_name.to_string()) + .map(|preset| preset.model.to_string()) .unwrap_or_else(|| self.model_display_name().to_string()); let (mut auto_presets, other_presets): (Vec, Vec) = presets @@ -4883,7 +4883,7 @@ impl ChatWidget { Some(preset.default_reasoning_effort), ); SelectionItem { - name: preset.display_name.clone(), + name: model.clone(), description, is_current: model.as_str() == current_model, is_default: preset.is_default, @@ -4965,7 +4965,7 @@ impl ChatWidget { }); })]; items.push(SelectionItem { - name: preset.display_name.clone(), + name: preset.model.clone(), description, is_current, is_default: preset.is_default,