inline hostname resolution for remote sandbox config

codex-rs/app-server/src/config_manager.rs

@@ -33,7 +33,6 @@ pub(crate) struct ConfigManager {
     cloud_requirements: Arc<RwLock<CloudRequirementsLoader>>,
     arg0_paths: Arg0DispatchPaths,
     thread_config_loader: Arc<RwLock<Arc<dyn ThreadConfigLoader>>>,
-    host_name: Option<String>,
 }
 
 impl ConfigManager {
@@ -44,27 +43,6 @@ impl ConfigManager {
         cloud_requirements: CloudRequirementsLoader,
         arg0_paths: Arg0DispatchPaths,
         thread_config_loader: Arc<dyn ThreadConfigLoader>,
-    ) -> Self {
-        Self::new_with_host_name(
-            codex_home,
-            cli_overrides,
-            loader_overrides,
-            cloud_requirements,
-            arg0_paths,
-            thread_config_loader,
-            codex_config::host_name(),
-        )
-    }
-
-    #[allow(clippy::too_many_arguments)]
-    fn new_with_host_name(
-        codex_home: PathBuf,
-        cli_overrides: Vec<(String, TomlValue)>,
-        loader_overrides: LoaderOverrides,
-        cloud_requirements: CloudRequirementsLoader,
-        arg0_paths: Arg0DispatchPaths,
-        thread_config_loader: Arc<dyn ThreadConfigLoader>,
-        host_name: Option<String>,
     ) -> Self {
         Self {
             codex_home,
@@ -74,7 +52,6 @@ impl ConfigManager {
             cloud_requirements: Arc::new(RwLock::new(cloud_requirements)),
             arg0_paths,
             thread_config_loader: Arc::new(RwLock::new(thread_config_loader)),
-            host_name,
         }
     }
 
@@ -229,7 +206,6 @@ impl ConfigManager {
             .fallback_cwd(fallback_cwd)
             .cloud_requirements(self.current_cloud_requirements())
             .thread_config_loader(self.current_thread_config_loader())
-            .host_name(self.host_name.clone())
             .build()
             .await?;
         self.apply_runtime_feature_enablement(&mut config);
@@ -257,7 +233,6 @@ impl ConfigManager {
             self.loader_overrides.clone(),
             self.current_cloud_requirements(),
             thread_config_loader.as_ref(),
-            self.host_name.as_deref(),
         )
         .await
     }
@@ -285,16 +260,14 @@ impl ConfigManager {
         cli_overrides: Vec<(String, TomlValue)>,
         loader_overrides: LoaderOverrides,
         cloud_requirements: CloudRequirementsLoader,
-        host_name: Option<String>,
     ) -> Self {
-        Self::new_with_host_name(
+        Self::new(
             codex_home,
             cli_overrides,
             loader_overrides,
             cloud_requirements,
             Arg0DispatchPaths::default(),
             Arc::new(codex_config::NoopThreadConfigLoader),
-            host_name,
         )
     }
 
@@ -305,7 +278,6 @@ impl ConfigManager {
             Vec::new(),
             LoaderOverrides::without_managed_config_for_tests(),
             CloudRequirementsLoader::default(),
-            /*host_name*/ None,
         )
     }
 }

codex-rs/app-server/src/config_manager_service_tests.rs

@@ -226,7 +226,6 @@ async fn read_includes_origins_and_layers() {
         vec![],
         LoaderOverrides::with_managed_config_path_for_tests(managed_path.clone()),
         CloudRequirementsLoader::default(),
-        /*host_name*/ None,
     );
 
     let response = service
@@ -305,7 +304,6 @@ writable_roots = ["~/code"]
         vec![],
         loader_overrides,
         CloudRequirementsLoader::default(),
-        /*host_name*/ None,
     );
 
     let response = service
@@ -346,7 +344,6 @@ async fn write_value_reports_override() {
         vec![],
         LoaderOverrides::with_managed_config_path_for_tests(managed_path.clone()),
         CloudRequirementsLoader::default(),
-        /*host_name*/ None,
     );
 
     let result = service
@@ -446,7 +443,6 @@ async fn invalid_user_value_rejected_even_if_overridden_by_managed() {
         vec![],
         LoaderOverrides::with_managed_config_path_for_tests(managed_path.clone()),
         CloudRequirementsLoader::default(),
-        /*host_name*/ None,
     );
 
     let error = service
@@ -514,7 +510,6 @@ async fn write_value_rejects_feature_requirement_conflict() {
                 ..Default::default()
             }))
         }),
-        /*host_name*/ None,
     );
 
     let error = service
@@ -561,7 +556,6 @@ async fn write_value_rejects_profile_feature_requirement_conflict() {
                 ..Default::default()
             }))
         }),
-        /*host_name*/ None,
     );
 
     let error = service
@@ -612,7 +606,6 @@ async fn read_reports_managed_overrides_user_and_session_flags() {
         cli_overrides,
         LoaderOverrides::with_managed_config_path_for_tests(managed_path.clone()),
         CloudRequirementsLoader::default(),
-        /*host_name*/ None,
     );
 
     let response = service
@@ -666,7 +659,6 @@ async fn write_value_reports_managed_override() {
         vec![],
         LoaderOverrides::with_managed_config_path_for_tests(managed_path.clone()),
         CloudRequirementsLoader::default(),
-        /*host_name*/ None,
     );
 
     let result = service

codex-rs/config/src/config_requirements.rs

@@ -842,10 +842,10 @@ pub enum ResidencyRequirement {
 
 impl ConfigRequirementsToml {
     pub fn apply_remote_sandbox_config(&mut self, hostname: Option<&str>) {
-        let Some(hostname) = hostname.and_then(normalize_hostname) else {
+        let Some(remote_sandbox_config) = self.remote_sandbox_config.as_ref() else {
             return;
         };
-        let Some(remote_sandbox_config) = self.remote_sandbox_config.as_ref() else {
+        let Some(hostname) = hostname.and_then(normalize_hostname) else {
             return;
         };
         let Some(matched_config) = remote_sandbox_config

codex-rs/config/src/loader/README.md

@@ -10,7 +10,7 @@ This module is the canonical place to **load and describe Codex configuration la
 
 Exported from `codex_config::loader`:
 
-- `load_config_layers_state(fs, codex_home, cwd_opt, cli_overrides, overrides, cloud_requirements, thread_config_loader, host_name) -> ConfigLayerStack`
+- `load_config_layers_state(fs, codex_home, cwd_opt, cli_overrides, overrides, cloud_requirements, thread_config_loader) -> ConfigLayerStack`
 - `ConfigLayerStack`
   - `effective_config() -> toml::Value`
   - `origins() -> HashMap<String, ConfigLayerMetadata>`
@@ -59,7 +59,6 @@ let layers = load_config_layers_state(
     LoaderOverrides::default(),
     CloudRequirementsLoader::default(),
     &NoopThreadConfigLoader,
-    /*host_name*/ None,
 ).await?;
 
 let effective = layers.effective_config();

codex-rs/config/src/loader/macos.rs

@@ -65,7 +65,6 @@ fn load_managed_admin_config() -> io::Result<Option<ManagedAdminConfigLayer>> {
 pub(crate) async fn load_managed_admin_requirements_toml(
     target: &mut ConfigRequirementsWithSources,
     override_base64: Option<&str>,
-    host_name: Option<&str>,
 ) -> io::Result<()> {
     if let Some(encoded) = override_base64 {
         let trimmed = encoded.trim();
@@ -77,7 +76,6 @@ pub(crate) async fn load_managed_admin_requirements_toml(
             target,
             managed_preferences_requirements_source(),
             parse_managed_requirements_base64(trimmed)?,
-            host_name,
         );
         return Ok(());
     }
@@ -89,7 +87,6 @@ pub(crate) async fn load_managed_admin_requirements_toml(
                     target,
                     managed_preferences_requirements_source(),
                     requirements,
-                    host_name,
                 );
             }
             Ok(())

codex-rs/config/src/loader/mod.rs

@@ -91,7 +91,6 @@ pub async fn load_config_layers_state(
     overrides: LoaderOverrides,
     cloud_requirements: CloudRequirementsLoader,
     thread_config_loader: &dyn ThreadConfigLoader,
-    host_name: Option<&str>,
 ) -> io::Result<ConfigLayerStack> {
     let ignore_user_config = overrides.ignore_user_config;
     let ignore_user_and_project_exec_policy_rules =
@@ -103,7 +102,6 @@ pub async fn load_config_layers_state(
             &mut config_requirements_toml,
             RequirementSource::CloudRequirements,
             requirements,
-            host_name,
         );
     }
 
@@ -113,19 +111,12 @@ pub async fn load_config_layers_state(
         overrides
             .macos_managed_config_requirements_base64
             .as_deref(),
-        host_name,
     )
     .await?;
 
     // Honor the system requirements.toml location.
     let requirements_toml_file = system_requirements_toml_file_with_overrides(&overrides)?;
-    load_requirements_toml(
-        fs,
-        &mut config_requirements_toml,
-        &requirements_toml_file,
-        host_name,
-    )
-    .await?;
+    load_requirements_toml(fs, &mut config_requirements_toml, &requirements_toml_file).await?;
 
     // Make a best-effort to support the legacy `managed_config.toml` as a
     // requirements specification.
@@ -134,7 +125,6 @@ pub async fn load_config_layers_state(
     load_requirements_from_legacy_scheme(
         &mut config_requirements_toml,
         loaded_config_layers.clone(),
-        host_name,
     )
     .await?;
 
@@ -388,7 +378,6 @@ pub async fn load_requirements_toml(
     fs: &dyn ExecutorFileSystem,
     config_requirements_toml: &mut ConfigRequirementsWithSources,
     requirements_toml_file: &AbsolutePathBuf,
-    host_name: Option<&str>,
 ) -> io::Result<()> {
     match fs
         .read_file_text(requirements_toml_file, /*sandbox*/ None)
@@ -421,7 +410,6 @@ pub async fn load_requirements_toml(
                     file: requirements_toml_file.clone(),
                 },
                 requirements_config,
-                host_name,
             );
         }
         Err(e) => {
@@ -554,7 +542,6 @@ fn windows_program_data_dir_from_known_folder() -> io::Result<PathBuf> {
 async fn load_requirements_from_legacy_scheme(
     config_requirements_toml: &mut ConfigRequirementsWithSources,
     loaded_config_layers: LoadedConfigLayers,
-    host_name: Option<&str>,
 ) -> io::Result<()> {
     // In this implementation, earlier layers cannot be overwritten by later
     // layers, so list managed_config_from_mdm first because it has the highest
@@ -591,7 +578,6 @@ async fn load_requirements_from_legacy_scheme(
             config_requirements_toml,
             source,
             ConfigRequirementsToml::from(legacy_config),
-            host_name,
         );
     }
 
@@ -602,9 +588,11 @@ pub(super) fn merge_requirements_with_remote_sandbox_config(
     target: &mut ConfigRequirementsWithSources,
     source: RequirementSource,
     mut requirements: ConfigRequirementsToml,
-    host_name: Option<&str>,
 ) {
-    requirements.apply_remote_sandbox_config(host_name);
+    if requirements.remote_sandbox_config.is_some() {
+        let host_name = crate::host_name();
+        requirements.apply_remote_sandbox_config(host_name.as_deref());
+    }
     target.merge_unset_fields(source, requirements);
 }