Fix config loader threading and formatting

codex-rs/core/src/config_loader/mod.rs

@@ -189,7 +189,15 @@ pub async fn load_config_layers_state(
     overrides: LoaderOverrides,
     cloud_requirements: Option<CloudRequirementsLoader>, // TODO(gt): Once exec and app-server are wired up, we can remove the option.
 ) -> io::Result<ConfigLayerStack> {
-    load_config_layers_state_with_env(codex_home, cwd, cli_overrides, overrides, &RealEnv).await
+    load_config_layers_state_with_env(
+        codex_home,
+        cwd,
+        cli_overrides,
+        overrides,
+        cloud_requirements,
+        &RealEnv,
+    )
+    .await
 }
 
 async fn load_config_layers_state_with_env(
@@ -197,6 +205,7 @@ async fn load_config_layers_state_with_env(
     cwd: Option<AbsolutePathBuf>,
     cli_overrides: &[(String, TomlValue)],
     overrides: LoaderOverrides,
+    cloud_requirements: Option<CloudRequirementsLoader>,
     env: &impl EnvProvider,
 ) -> io::Result<ConfigLayerStack> {
     let mut config_requirements_toml = ConfigRequirementsWithSources::default();
@@ -404,7 +413,7 @@ pub(crate) async fn load_config_layers_state_with_env_for_tests(
     overrides: LoaderOverrides,
     env: &impl EnvProvider,
 ) -> io::Result<ConfigLayerStack> {
-    load_config_layers_state_with_env(codex_home, cwd, cli_overrides, overrides, env).await
+    load_config_layers_state_with_env(codex_home, cwd, cli_overrides, overrides, None, env).await
 }
 
 /// Attempts to load a config.toml file from `config_toml`.

codex-rs/core/src/config_loader/tests.rs

@@ -11,8 +11,8 @@ use crate::config::ConfigOverrides;
 use crate::config::ConfigToml;
 use crate::config::ConstraintError;
 use crate::config::ProjectConfig;
-use crate::config_loader::ConfigExpansionWarningInfo;
 use crate::config_loader::CloudRequirementsLoader;
+use crate::config_loader::ConfigExpansionWarningInfo;
 use crate::config_loader::ConfigLayerEntry;
 use crate::config_loader::ConfigLayerSource;
 use crate::config_loader::ConfigLoadError;
@@ -1040,6 +1040,7 @@ async fn codex_home_within_project_tree_is_not_double_loaded() -> std::io::Resul
             config: child_config.clone(),
             version: version_for_toml(&child_config),
             disabled_reason: None,
+            expansion_warnings: Vec::new(),
         }],
         project_layers
     );