From 69f7140559180269e2eb8f5be6e0c20eb37b0c85 Mon Sep 17 00:00:00 2001 From: jif Date: Mon, 28 Sep 2026 14:35:16 +0000 Subject: [PATCH] Isolate the memory startup metadata test from Git enrichment (#49000) ## Why Best-effort workspace enrichment can time out independently of the detached request metadata checked by the memory startup test. ## What changed Keep the phase-one service-tier and detached-metadata test fixture outside Git and assert that `workspaces` is absent. Update the header assertion message to refer to turn metadata. GitOrigin-RevId: 9541668fc62a28d1ff3131d7f71b351149b6e152 --- codex-rs/memories/write/src/startup_tests.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/codex-rs/memories/write/src/startup_tests.rs b/codex-rs/memories/write/src/startup_tests.rs index d7a9a7ad6b..f1fb63b88c 100644 --- a/codex-rs/memories/write/src/startup_tests.rs +++ b/codex-rs/memories/write/src/startup_tests.rs @@ -623,9 +623,10 @@ async fn memories_startup_phase1_uses_live_thread_service_tier_and_detached_meta -> anyhow::Result<()> { let server = start_mock_server().await; let home = Arc::new(TempDir::new()?); + // Keep the fixture outside Git: workspace enrichment is best effort and can + // time out independently of the detached request metadata checked here. let test = build_test_codex(&server, home).await?; assert_eq!(test.config.service_tier, None); - reset_git_repository(&test.config.cwd).await?; core_test_support::submit_thread_settings( &test.codex, @@ -683,7 +684,7 @@ async fn memories_startup_phase1_uses_live_thread_service_tier_and_detached_meta let request = wait_for_single_request(&stage_one).await; let metadata_header = request .header("x-codex-turn-metadata") - .expect("detached memory request should include workspace metadata"); + .expect("detached memory request should include turn metadata"); let metadata: serde_json::Value = serde_json::from_str(&metadata_header).expect("turn metadata json"); let client_metadata: serde_json::Value = serde_json::from_str( @@ -718,7 +719,7 @@ async fn memories_startup_phase1_uses_live_thread_service_tier_and_detached_meta metadata["root_turn_id"] ); assert!(metadata.get("window_id").is_none()); - assert!(metadata.get("workspaces").is_some()); + assert!(metadata.get("workspaces").is_none()); shutdown_test_codex(&test).await?; Ok(())