Merge a36b32376e into sapling-pr-archive-bolinfest

codex-rs/app-server/tests/suite/v2/config_rpc.rs

@@ -572,6 +572,7 @@ model = "gpt-old"
 }
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+#[cfg_attr(windows, ignore = "temporary CI isolation for #19606 Windows hang")]
 async fn config_read_after_pipelined_write_sees_written_value() -> Result<()> {
     let temp_dir = TempDir::new()?;
     let codex_home = temp_dir.path().canonicalize()?;

codex-rs/app-server/tests/suite/v2/mcp_tool.rs

@@ -133,6 +133,7 @@ url = "{mcp_server_url}/mcp"
 }
 
 #[tokio::test]
+#[cfg_attr(windows, ignore = "temporary CI isolation for #19606 Windows hang")]
 async fn mcp_server_tool_call_returns_error_for_unknown_thread() -> Result<()> {
     let codex_home = TempDir::new()?;
     let mut mcp = McpProcess::new(codex_home.path()).await?;