Skip to content

armgit / codex

Public Imported from GitHub
0

Lightweight coding agent that runs in your terminal

Rust

Warn when saved model defaults are overridden (#42639)

Eric Traut68e9c4a31a4a
diff --git a/codex-rs/tui/src/app.rs b/codex-rs/tui/src/app.rs
index 1959d1f6a5..76944a3a4a 100644
--- a/codex-rs/tui/src/app.rs
+++ b/codex-rs/tui/src/app.rs
@@ -225,6 +225,7 @@ mod history_ui;
mod input;
mod loaded_threads;
mod misalignment_policy;
+mod model_defaults;
mod pending_interactive_replay;
mod permission_shortcuts;
mod pets;
diff --git a/codex-rs/tui/src/app/event_dispatch.rs b/codex-rs/tui/src/app/event_dispatch.rs
index 7b3aa66873..7bfc312b4a 100644
--- a/codex-rs/tui/src/app/event_dispatch.rs
+++ b/codex-rs/tui/src/app/event_dispatch.rs
@@ -1630,12 +1630,13 @@ impl App {
.await;
if let Some(default_effort) = default_effort.as_ref()
- && let Err(err) = crate::config_update::write_config_batch(
+ && let Err(err) = self.persist_model_defaults(
app_server.request_handle(),
crate::config_update::build_model_selection_edits(
model.as_str(),
Some(default_effort),
),
+ "default model and reasoning effort",
)
.await
{
@@ -2158,16 +2159,17 @@ impl App {
}
}
AppEvent::PersistModelSelection { model, effort } => {
- match crate::config_update::write_config_batch(
+ match self.persist_model_defaults(
app_server.request_handle(),
crate::config_update::build_model_selection_edits(
model.as_str(),
effort.as_ref(),
),
+ "default model and reasoning effort",
)
.await
{
- Ok(_) => {
+ Ok(()) => {
let effort_label = effort
.as_ref()
.map(std::string::ToString::to_string)
@@ -2260,10 +2262,10 @@ impl App {
let edits = crate::config_update::build_service_tier_selection_edits(
service_tier.as_deref(),
);
- match crate::config_update::write_config_batch(app_server.request_handle(), edits)
+ match self.persist_model_defaults(app_server.request_handle(), edits, "default service tier")
.await
{
- Ok(_) => {
+ Ok(()) => {
let message = if let Some(service_tier) = service_tier {
format!("Service tier set to {service_tier}")
} else {
@@ -2480,9 +2482,10 @@ impl App {
} else {
crate::config_update::clear_config_value(key_path)
};
- if let Err(err) = crate::config_update::write_config_batch(
+ if let Err(err) = self.persist_model_defaults(
app_server.request_handle(),
vec![edit],
+ "Plan mode reasoning effort",
)
.await
{
diff --git a/codex-rs/tui/src/app/model_defaults.rs b/codex-rs/tui/src/app/model_defaults.rs
new file mode 100644
index 0000000000..268c90344b
--- /dev/null
+++ b/codex-rs/tui/src/app/model_defaults.rs
@@ -0,0 +1,27 @@
+//! Saved model-default feedback, independent of active thread settings.
+//!
+//! A successful config write can still be overridden. Report that distinction without
+//! replacing the active task's explicit selection with launch-time configuration.
+
+use super::App;
+use codex_app_server_client::AppServerRequestHandle;
+use codex_app_server_protocol::ConfigEdit;
+use codex_app_server_protocol::WriteStatus;
+use color_eyre::eyre::Result;
+
+impl App {
+ pub(super) async fn persist_model_defaults(
+ &mut self,
+ request_handle: AppServerRequestHandle,
+ edits: Vec<ConfigEdit>,
+ setting: &str,
+ ) -> Result<()> {
+ let response = crate::config_update::write_config_batch(request_handle, edits).await?;
+ if response.status == WriteStatus::OkOverridden {
+ self.chat_widget.add_warning_message(format!(
+ "Saved {setting}, but a higher-priority configuration layer overrides the saved value."
+ ));
+ }
+ Ok(())
+ }
+}
diff --git a/codex-rs/tui/src/app/tests.rs b/codex-rs/tui/src/app/tests.rs
index 37efe5f453..bd29376141 100644
--- a/codex-rs/tui/src/app/tests.rs
+++ b/codex-rs/tui/src/app/tests.rs
@@ -27,6 +27,8 @@ mod mcp_startup;
#[path = "tests/misalignment_policy_tests.rs"]
mod misalignment_policy;
mod model_catalog;
+#[path = "tests/model_defaults_tests.rs"]
+mod model_defaults;
#[path = "tests/patch_approval_tests.rs"]
mod patch_approval_tests;
#[path = "tests/permission_shortcuts_tests.rs"]
diff --git a/codex-rs/tui/src/app/tests/model_defaults_tests.rs b/codex-rs/tui/src/app/tests/model_defaults_tests.rs
new file mode 100644
index 0000000000..b9eb4668a5
--- /dev/null
+++ b/codex-rs/tui/src/app/tests/model_defaults_tests.rs
@@ -0,0 +1,130 @@
+use super::*;
+use codex_app_server_client::AppServerClient;
+use codex_config::LoaderOverrides;
+use pretty_assertions::assert_eq;
+
+#[tokio::test]
+async fn model_default_saves_report_server_outcomes_and_target_server_profile() -> Result<()> {
+ for outcome in ["saved", "overridden", "rejected"] {
+ let (mut app, mut events, _ops) = make_test_app_with_channels().await;
+ app.config.model_reasoning_effort = Some(ReasoningEffortConfig::Medium);
+ let local_config_path = app.config.codex_home.join("config.toml");
+ let local_config_before = std::fs::read(&local_config_path).ok();
+ let server_home = tempfile::tempdir()?;
+ let base_path = server_home.path().join("config.toml");
+ let profile_path = server_home.path().join("work.config.toml");
+ std::fs::write(&base_path, "# Base configuration stays unchanged.\n")?;
+ std::fs::write(&profile_path, "")?;
+ let mut loader_overrides = LoaderOverrides::without_managed_config_for_tests();
+ loader_overrides.user_config_path =
+ Some(AbsolutePathBuf::from_absolute_path(&profile_path)?);
+ loader_overrides.user_config_profile = Some("work".parse()?);
+ let overrides = if outcome == "overridden" {
+ vec![
+ ("model".into(), toml::Value::String("gpt-5.2".into())),
+ (
+ "model_reasoning_effort".into(),
+ toml::Value::String("low".into()),
+ ),
+ (
+ "plan_mode_reasoning_effort".into(),
+ toml::Value::String("low".into()),
+ ),
+ ("service_tier".into(), toml::Value::String("flex".into())),
+ ]
+ } else {
+ Vec::new()
+ };
+ let config = ConfigBuilder::default()
+ .codex_home(server_home.path().to_path_buf())
+ .cli_overrides(overrides.clone())
+ .loader_overrides(loader_overrides.clone())
+ .harness_overrides(ConfigOverrides {
+ cwd: Some(server_home.path().to_path_buf()),
+ ..Default::default()
+ })
+ .build()
+ .await?;
+ let client = crate::start_embedded_app_server(
+ codex_arg0::Arg0DispatchPaths::default(),
+ config,
+ overrides,
+ loader_overrides,
+ /*strict_config*/ false,
+ codex_config::CloudConfigBundleLoader::default(),
+ codex_feedback::CodexFeedback::new(),
+ /*log_db*/ None,
+ /*state_db*/ None,
+ Arc::new(codex_exec_server::EnvironmentManager::default_for_tests()),
+ )
+ .await?;
+ let mut server = AppServerSession::new(
+ AppServerClient::InProcess(client),
+ crate::app_server_session::ThreadParamsMode::Remote,
+ );
+ if outcome == "rejected" {
+ std::fs::write(&profile_path, "[broken")?;
+ }
+ while events.try_recv().is_ok() {}
+ let mut tui = crate::tui::test_support::make_test_tui()?;
+ for event in [
+ AppEvent::PersistModelSelection {
+ model: "gpt-5.4".into(),
+ effort: Some(ReasoningEffortConfig::High),
+ },
+ AppEvent::PersistPlanModeReasoningEffort(Some(ReasoningEffortConfig::High)),
+ AppEvent::PersistServiceTierSelection {
+ service_tier: Some(ServiceTier::Fast.request_value().into()),
+ },
+ AppEvent::ApplyAdvancedReasoning {
+ model: "gpt-5.4".into(),
+ effort: ReasoningEffortConfig::Ultra,
+ },
+ ] {
+ Box::pin(app.handle_event(&mut tui, &mut server, event)).await?;
+ }
+ let messages = std::iter::from_fn(|| events.try_recv().ok())
+ .filter_map(|event| match event {
+ AppEvent::InsertHistoryCell(cell) => {
+ Some(lines_to_single_string(&cell.display_lines(/*width*/ 80)))
+ }
+ _ => None,
+ })
+ .collect::<Vec<_>>()
+ .join("\n");
+ assert_eq!(
+ messages.matches("higher-priority").count(),
+ if outcome == "overridden" { 4 } else { 0 }
+ );
+ assert_eq!(
+ messages.matches("Failed to save").count(),
+ if outcome == "rejected" { 4 } else { 0 }
+ );
+ if outcome == "overridden" {
+ insta::assert_snapshot!("overridden_model_defaults", messages);
+ }
+ let persisted = std::fs::read_to_string(&profile_path)?;
+ if outcome == "rejected" {
+ assert_eq!(persisted, "[broken");
+ assert!(!messages.contains("Model changed"));
+ assert!(!messages.contains("Service tier set"));
+ } else {
+ assert_eq!(
+ toml::from_str::<toml::Value>(&persisted)?,
+ toml::Value::Table(toml::toml! {
+ model = "gpt-5.4"
+ model_reasoning_effort = "medium"
+ plan_mode_reasoning_effort = "high"
+ service_tier = "fast"
+ })
+ );
+ }
+ assert_eq!(std::fs::read(&local_config_path).ok(), local_config_before);
+ assert_eq!(
+ std::fs::read_to_string(&base_path)?,
+ "# Base configuration stays unchanged.\n"
+ );
+ server.shutdown().await?;
+ }
+ Ok(())
+}
diff --git a/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__model_defaults__overridden_model_defaults.snap b/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__model_defaults__overridden_model_defaults.snap
new file mode 100644
index 0000000000..7a8d13ea16
--- /dev/null
+++ b/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__model_defaults__overridden_model_defaults.snap
@@ -0,0 +1,16 @@
+---
+source: tui/src/app/tests/model_defaults_tests.rs
+assertion_line: 91
+expression: messages
+---
+⚠ Saved default model and reasoning effort, but a higher-priority configuration
+ layer overrides the saved value.
+• Model changed to gpt-5.4 high
+⚠ Saved Plan mode reasoning effort, but a higher-priority configuration layer
+ overrides the saved value.
+⚠ Saved default service tier, but a higher-priority configuration layer
+ overrides the saved value.
+• Service tier set to priority
+⚠ Saved default model and reasoning effort, but a higher-priority configuration
+ layer overrides the saved value.
+• Model changed to gpt-5.4 ultra for this conversation