mirror of
https://github.com/openai/codex.git
synced 2026-10-22 17:58:46 +00:00
Abhinav
070a26a1f0
## Why Background refreshes previously warmed only the on-disk cache, so new sessions in the same process continued using the startup snapshot. ## What changed - Make `CloudConfigBundleLoader` retrieve the latest shared bundle on each configuration load. - Update the in-memory bundle after successful refreshes while preserving the last successful bundle when a refresh fails. - Stop refresh work when its loader is replaced or its final clone is dropped. ## Testing - Cover refreshed requirements and managed configuration in later sessions. - Cover concurrent initial loads, refresh failures and recovery, bundle clearing, and refresh-task cancellation. GitOrigin-RevId: ae3d79b575bad71a1eed370cee6dc66dc022ffa8
72 lines
2.3 KiB
Rust
72 lines
2.3 KiB
Rust
use anyhow::Result;
|
|
use codex_config::CloudConfigBundleLoader;
|
|
use codex_config::test_support::CloudConfigBundleFixture;
|
|
use codex_protocol::protocol::AskForApproval;
|
|
use core_test_support::responses::start_mock_server;
|
|
use core_test_support::test_codex::test_codex;
|
|
use pretty_assertions::assert_eq;
|
|
use std::sync::Arc;
|
|
use std::sync::RwLock;
|
|
use tempfile::TempDir;
|
|
|
|
#[tokio::test]
|
|
async fn refreshed_cloud_bundle_updates_later_sessions() -> Result<()> {
|
|
let server = start_mock_server().await;
|
|
let home = Arc::new(TempDir::new()?);
|
|
let initial_bundle = CloudConfigBundleFixture::enterprise_requirement(
|
|
r#"allowed_approval_policies = ["never"]"#,
|
|
)
|
|
.add_enterprise_config(r#"developer_instructions = "initial managed instructions""#)
|
|
.into_bundle();
|
|
let latest = Arc::new(RwLock::new(initial_bundle));
|
|
let getter_latest = Arc::clone(&latest);
|
|
let loader = CloudConfigBundleLoader::from_getter(move || {
|
|
let latest = Arc::clone(&getter_latest);
|
|
async move { Ok(Some(latest.read().expect("bundle state lock").clone())) }
|
|
});
|
|
|
|
let mut initial_builder = test_codex()
|
|
.with_home(Arc::clone(&home))
|
|
.with_cloud_config_bundle(loader.clone());
|
|
let initial = initial_builder.build_with_auto_env(&server).await?;
|
|
assert_eq!(
|
|
initial.session_configured.approval_policy,
|
|
AskForApproval::Never
|
|
);
|
|
assert_eq!(
|
|
initial
|
|
.codex
|
|
.config()
|
|
.await
|
|
.developer_instructions
|
|
.as_deref(),
|
|
Some("initial managed instructions")
|
|
);
|
|
|
|
*latest.write().expect("bundle state lock") = CloudConfigBundleFixture::enterprise_requirement(
|
|
r#"allowed_approval_policies = ["on-request"]"#,
|
|
)
|
|
.add_enterprise_config(r#"developer_instructions = "refreshed managed instructions""#)
|
|
.into_bundle();
|
|
|
|
let mut refreshed_builder = test_codex()
|
|
.with_home(home)
|
|
.with_cloud_config_bundle(loader);
|
|
let refreshed = refreshed_builder.build_with_auto_env(&server).await?;
|
|
assert_eq!(
|
|
refreshed.session_configured.approval_policy,
|
|
AskForApproval::OnRequest
|
|
);
|
|
assert_eq!(
|
|
refreshed
|
|
.codex
|
|
.config()
|
|
.await
|
|
.developer_instructions
|
|
.as_deref(),
|
|
Some("refreshed managed instructions")
|
|
);
|
|
|
|
Ok(())
|
|
}
|