clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-06-01 19:02:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: change ConfigState so it no longer depends on a single config.toml file for reloading (#11262)

Browse Source 
If anything, it should depend on `ConfigLayerStack`.

---
[//]: # (BEGIN SAPLING FOOTER)
Stack created with [Sapling](https://sapling-scm.com). Best reviewed
with [ReviewStack](https://reviewstack.dev/openai/codex/pull/11262).
* #11207
* __->__ #11262
This commit is contained in:
Michael Bolin
2026-02-09 19:26:39 -08:00
committed by GitHub
parent d1df3bd63b
commit 862ab63071
3 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
codex-rs/core/src/network_proxy_loader.rs
View File

@@ -47,7 +47,6 @@ async fn build_config_state_with_mtimes() -> Result<(ConfigState, Vec<LayerMtime
.await
.context("failed to load Codex config")?;
let cfg_path = codex_home.join(CONFIG_TOML_FILE);
let merged_toml = config_layer_stack.effective_config();
let config: NetworkProxyConfig = merged_toml
.try_into()
@@ -55,7 +54,7 @@ async fn build_config_state_with_mtimes() -> Result<(ConfigState, Vec<LayerMtime
let constraints = enforce_trusted_constraints(&config_layer_stack, &config)?;
let layer_mtimes = collect_layer_mtimes(&config_layer_stack);
let state = build_config_state(config, constraints, cfg_path)?;
let state = build_config_state(config, constraints)?;
Ok((state, layer_mtimes))
}
@@ -194,6 +193,10 @@ impl MtimeConfigReloader {
#[async_trait]
impl ConfigReloader for MtimeConfigReloader {
fn source_label(&self) -> String {
"config layers".to_string()
}
async fn maybe_reload(&self) -> Result<Option<ConfigState>> {
if !self.needs_reload().await {
return Ok(None);