Lightweight coding agent that runs in your terminal
Rust
Let the app server resolve implicit model settings for CLI forks (#43355)
Eric Traut0e9589ffae08
diff --git a/codex-rs/tui/src/app/startup.rs b/codex-rs/tui/src/app/startup.rsindex 4a81bbe819..24abd52e59 100644--- a/codex-rs/tui/src/app/startup.rs+++ b/codex-rs/tui/src/app/startup.rs@@ -218,6 +218,20 @@ impl App {"connected app-server platform");let bootstrap_ms = bootstrap.duration.as_millis();+ if matches!(&session_selection, SessionSelection::Fork(_)) {+ // The app server resolves omitted overrides from the fork destination's config.+ if harness_overrides.model.is_none()+ && !super::new_session::has_launch_setting(&config, &cli_kv_overrides, "model")+ && !super::new_session::has_launch_setting(+ &config,+ &cli_kv_overrides,+ "model_reasoning_effort",+ )+ {+ config.model = None;+ config.model_reasoning_effort = None;+ }+ }let server_defaults_read = if matches!(&session_selection,SessionSelection::StartFresh | SessionSelection::Exit@@ -258,15 +272,20 @@ impl App {if let Err(err) = startup_draft.flush_pending_events(tui).await {return shutdown_on_startup_error(app_server, err).await;}- let exit_info = handle_model_migration_prompt_if_needed(- tui,- &mut config,- &local_settings,- model.as_str(),- &app_event_tx,- &available_models,- )- .await?;+ let exit_info =+ if matches!(&session_selection, SessionSelection::Fork(_)) && config.model.is_none() {+ None+ } else {+ handle_model_migration_prompt_if_needed(+ tui,+ &mut config,+ &local_settings,+ model.as_str(),+ &app_event_tx,+ &available_models,+ )+ .await?+ };if let Some(exit_info) = exit_info {app_server.shutdown()@@ -606,6 +625,9 @@ impl App {{return shutdown_on_startup_error(app_server, err).await;}+ if config.model_reasoning_effort.is_none() {+ config.model_reasoning_effort = forked.session.reasoning_effort.clone();+ }let init = crate::chatwidget::ChatWidgetInit {local_settings: local_settings.clone(),config: config.clone(),diff --git a/codex-rs/tui/src/app/tests/startup_defaults_tests.rs b/codex-rs/tui/src/app/tests/startup_defaults_tests.rsindex d99e9da59c..2216690b49 100644--- a/codex-rs/tui/src/app/tests/startup_defaults_tests.rs+++ b/codex-rs/tui/src/app/tests/startup_defaults_tests.rs@@ -5,11 +5,12 @@ use crate::app::startup::prepare_fresh_startup_config;use crate::app::startup::startup_model;use pretty_assertions::assert_eq;-async fn run_fresh_startup_for_test(+async fn run_startup_for_test(tui: &mut crate::tui::Tui,server: AppServerSession,config: Config,bootstrap: AppServerBootstrap,+ selection: SessionSelection,) -> Result<AppExitInfo> {App::run(tui,@@ -22,7 +23,7 @@ async fn run_fresh_startup_for_test(CloudConfigBundleLoader::default(),/*initial_prompt*/ None,Vec::new(),- SessionSelection::StartFresh,+ selection,codex_feedback::CodexFeedback::new(),/*is_first_run*/ false,/*should_prompt_windows_sandbox_nux_at_startup*/ false,@@ -38,6 +39,103 @@ async fn run_fresh_startup_for_test(.await}+#[tokio::test]+async fn cli_fork_omits_implicit_model_and_effort() -> Result<()> {+ let home = tempdir()?;+ std::fs::write(+ home.path().join("config.toml"),+ "model = \"gpt-5.2\"\nmodel_reasoning_effort = \"low\"\nfeatures.fast_mode = true\n",+ )?;+ let config = ConfigBuilder::default()+ .codex_home(home.path().to_path_buf())+ .loader_overrides(LoaderOverrides::without_managed_config_for_tests())+ .build()+ .await?;+ let source = ThreadId::from_string(+ &app_test_support::create_fake_rollout(+ home.path(),+ "2026-01-01T00-00-00",+ "2026-01-01T00:00:00Z",+ "source prompt",+ Some(config.model_provider_id.as_str()),+ /*git_info*/ None,+ )+ .expect("create source rollout"),+ )?;+ let (mut server, requests, proxy) = start_recording_remote_app_server(&config).await?;+ let mut bootstrap = server.bootstrap(&config).await?;+ let mut target_preset = bootstrap+ .available_models+ .iter()+ .find(|preset| preset.show_in_picker)+ .expect("visible migration target")+ .clone();+ target_preset.id = "server-model".into();+ target_preset.model = "server-model".into();+ bootstrap.available_models.push(target_preset);+ let client_preset = bootstrap+ .available_models+ .iter_mut()+ .find(|preset| preset.model == "gpt-5.2")+ .expect("client model in catalog");+ client_preset.upgrade = Some(codex_protocol::openai_models::ModelUpgrade {+ id: "server-model".into(),+ migration_config_key: "test-fork-migration".into(),+ model_link: None,+ upgrade_copy: None,+ migration_markdown: None,+ retirement_at: None,+ });+ assert!(+ crate::app::startup_prompts::should_show_model_migration_prompt(+ "gpt-5.2",+ "server-model",+ &Default::default(),+ &bootstrap.available_models,+ )+ );+ std::fs::write(+ home.path().join("config.toml"),+ "model = \"server-model\"\nmodel_reasoning_effort = \"high\"\n",+ )?;+ let mut tui = crate::tui::test_support::make_test_tui()?;+ let mut run = Box::pin(run_startup_for_test(+ &mut tui,+ server,+ config,+ bootstrap,+ SessionSelection::Fork(crate::resume_picker::SessionTarget {+ path: None,+ thread_id: source,+ history_mode: None,+ }),+ ));+ tokio::time::timeout(Duration::from_secs(/*secs*/ 15), async {+ loop {+ if !recorded_params(&requests, "thread/fork").is_empty() {+ return Ok::<(), color_eyre::eyre::Report>(());+ }+ tokio::select! {+ result = &mut run => {+ result?;+ return Err(color_eyre::eyre::eyre!("startup exited before thread/fork"));+ }+ () = tokio::time::sleep(Duration::from_millis(/*millis*/ 20)) => {}+ }+ }+ })+ .await??;+ let fork = recorded_params(&requests, "thread/fork");+ assert_eq!(fork.len(), 1);+ assert_eq!(fork[0]["model"], serde_json::Value::Null);+ assert!(fork[0]["config"].get("model_reasoning_effort").is_none());+ assert_eq!(fork[0]["serviceTier"], serde_json::Value::Null);+ assert!(recorded_params(&requests, "config/read").is_empty());+ drop(run);+ proxy.abort();+ Ok(())+}+async fn run_until_thread_start(server: AppServerSession,config: Config,@@ -46,8 +144,12 @@ async fn run_until_thread_start() -> Result<()> {let mut tui = crate::tui::test_support::make_test_tui()?;tui.pause_events();- let mut run = Box::pin(run_fresh_startup_for_test(- &mut tui, server, config, bootstrap,+ let mut run = Box::pin(run_startup_for_test(+ &mut tui,+ server,+ config,+ bootstrap,+ SessionSelection::StartFresh,));tokio::time::timeout(Duration::from_secs(/*secs*/ 15), async {loop {@@ -408,7 +510,14 @@ async fn startup_read_failure_exits_before_thread_creation() -> Result<()> {.await?;let bootstrap = server.bootstrap(&config).await?;let mut tui = crate::tui::test_support::make_test_tui()?;- let result = run_fresh_startup_for_test(&mut tui, server, config, bootstrap).await;+ let result = run_startup_for_test(+ &mut tui,+ server,+ config,+ bootstrap,+ SessionSelection::StartFresh,+ )+ .await;insta::assert_snapshot!(result.expect_err("startup read must fail").to_string(), @"config/read failed in TUI");assert_eq!(recorded_params(&requests, "config/read").len(), 1);assert!(recorded_params(&requests, "thread/start").is_empty());diff --git a/codex-rs/tui/src/app_server_session.rs b/codex-rs/tui/src/app_server_session.rsindex 0ca5407cec..9583524099 100644--- a/codex-rs/tui/src/app_server_session.rs+++ b/codex-rs/tui/src/app_server_session.rs@@ -955,7 +955,12 @@ impl AppServerSession {.is_some_and(|thread| thread.history_mode == ThreadHistoryMode::Paginated)|| presentation == ForkPresentation::SideConversation);let request_id = self.next_request_id();- let session_config = self.session_config_with_effective_service_tier(&config);+ let session_config = if config.model.is_none() {+ // Avoid inferring a tier from the stale client default model.+ config.clone()+ } else {+ self.session_config_with_effective_service_tier(&config)+ };let mut params = ThreadForkParams {last_turn_id,before_turn_id,