From 06789c7618611ba7059af026ae8efd0b14f7017b Mon Sep 17 00:00:00 2001 From: Owen Lin Date: Wed, 18 Nov 2026 00:16:29 +0000 Subject: [PATCH] Preserve web search provider ownership across thread resumes (#62144) ## Why Search MCP and native web search produce provider-specific references. Switching providers after a thread resumes can mix those references and break follow-up calls that use them. ## What changed Persist whether a thread has used Search MCP, native web search, or neither. Restore that state from response history, including compacted history, and use legacy attribution and fallback markers for older threads. When resumed history lacks a search state or legacy attribution checkpoint, withhold native fallback unless a legacy marker identifies native search. Require every Search MCP call to claim the thread's search provider before execution, including calls retained by Code Mode. ## Testing Cover resuming a thread with Search MCP references after discovery becomes unavailable, both with a saved search state and with imported history that lacks search checkpoints. GitOrigin-RevId: 100d21c92b0bdbf737ec36c3474f0bc020df8efc --- .../app-server-exports-stable.json.zst | Bin 172496 -> 172632 bytes .../tests/suite/v2/thread_inject_items.rs | 1 + codex-rs/core/src/mcp_tool_call.rs | 17 ++-- codex-rs/core/src/model_search.rs | 92 +++++++++++++---- codex-rs/core/src/session/inject_tests.rs | 1 + codex-rs/core/src/session/tests.rs | 1 + .../core/tests/suite/scenarios_web_search.rs | 94 +++++++++++++++++- ..._preserves_discovery_and_call_history.snap | 80 ++++++++++----- codex-rs/history/src/lib.rs | 16 +++ 9 files changed, 243 insertions(+), 59 deletions(-) diff --git a/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-stable.json.zst b/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-stable.json.zst index d7acc1828924976a0b520a7fddf6b58dfd9ae942..5a275c040c05b31f269795e32268f500ee45b56b 100644 GIT binary patch delta 24193 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 delta 24057 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 Result<() Some(serde_json::from_value(json!({ "history_sequence": 5, "sampled_through_sequence": 3, + "model_search_state": "unused", }))?) ); diff --git a/codex-rs/core/src/mcp_tool_call.rs b/codex-rs/core/src/mcp_tool_call.rs index c5a10b88df..83e519c2ce 100644 --- a/codex-rs/core/src/mcp_tool_call.rs +++ b/codex-rs/core/src/mcp_tool_call.rs @@ -508,15 +508,14 @@ async fn handle_approved_mcp_tool_call( } else { None }; - // Code Mode can retain this step past a later turn's first native call. - // A call rejected here never reaches the peer or acquires MCP attribution. - if matches!( - search.as_deref(), - Some(crate::model_search::ModelSearch::Hosted { .. }) - ) && !crate::model_search::SearchOwner::admit( - &sess.services.thread_extension_data, - codex_protocol::openai_models::WebSearchProvider::SearchMcp, - ) { + // Every Search MCP call can create provider-specific references. Claim Search MCP before the + // peer runs so a stale Code Mode call cannot mix them with native search references. + if is_search + && !crate::model_search::SearchOwner::admit( + &sess.services.thread_extension_data, + codex_protocol::openai_models::WebSearchProvider::SearchMcp, + ) + { let result = notify_mcp_tool_call_skip( sess, turn_context, diff --git a/codex-rs/core/src/model_search.rs b/codex-rs/core/src/model_search.rs index 54aef70137..c016e6725c 100644 --- a/codex-rs/core/src/model_search.rs +++ b/codex-rs/core/src/model_search.rs @@ -7,13 +7,14 @@ use std::sync::atomic::AtomicU8; use std::sync::atomic::Ordering; use codex_extension_api::ExtensionData; +use codex_history::CodexHarnessMetadata; use codex_history::InitialHistory; +use codex_history::ModelSearchState; use codex_history::ResponseItemEnvelope; use codex_history::RolloutItem; use codex_mcp::McpBinding; use codex_mcp::SearchDiscovery; use codex_protocol::config_types::WebSearchMode; -use codex_protocol::mcp::McpAttributionStatus; use codex_protocol::openai_models::WebSearchProvider; use codex_tools::ToolSpec; use serde_json::Map; @@ -145,26 +146,79 @@ impl SearchOwner { } pub(crate) fn restore(store: &ExtensionData, history: &InitialHistory) { - let used = |item: &ResponseItemEnvelope| { - item.metadata - .as_ref() - .is_some_and(|meta| meta.native_search_fallback_used) + let mut provider = None; + let mut legacy_native = false; + let mut legacy_search_mcp = false; + let mut has_checkpoint = false; + let mut inspect = |metadata: &CodexHarnessMetadata| { + match metadata.model_search_state { + Some(ModelSearchState::SearchMcp) => { + provider = Some(WebSearchProvider::SearchMcp); + } + Some(ModelSearchState::Standalone) + if provider != Some(WebSearchProvider::SearchMcp) => + { + provider = Some(WebSearchProvider::Standalone); + } + Some(ModelSearchState::Unused) | Some(ModelSearchState::Standalone) | None => {} + } + legacy_native |= metadata.native_search_fallback_used; + if let Some(attribution) = metadata.mcp_attribution.as_ref() { + legacy_search_mcp |= attribution.status + == codex_protocol::mcp::McpAttributionStatus::AttributionError + || attribution.sources.iter().any(|source| { + source.connector_id.as_deref() == Some(codex_mcp::SEARCH_CONNECTOR) + }); + } + has_checkpoint |= + metadata.model_search_state.is_some() || metadata.mcp_attribution.is_some(); }; - if history.scan_rollout_items(|item| match item { - RolloutItem::ResponseItem(item) => used(item), - RolloutItem::Compacted(item) => item.replacement_history.iter().flatten().any(used), - _ => false, - }) { - Self::admit(store, WebSearchProvider::Standalone); + for item in history.get_rollout_items() { + match item { + RolloutItem::ResponseItem(item) => { + if let Some(metadata) = item.metadata.as_ref() { + inspect(metadata); + } + } + RolloutItem::Compacted(item) => { + for metadata in item + .replacement_history + .iter() + .flatten() + .filter_map(|item| item.metadata.as_ref()) + { + inspect(metadata); + } + } + _ => {} + } + } + let provider = provider + .or_else(|| legacy_search_mcp.then_some(WebSearchProvider::SearchMcp)) + .or_else(|| legacy_native.then_some(WebSearchProvider::Standalone)) + .or_else(|| { + (!has_checkpoint + && !matches!(history, InitialHistory::New | InitialHistory::Cleared)) + .then_some(WebSearchProvider::SearchMcp) + }); + if let Some(provider) = provider { + Self::admit(store, provider); } } pub(crate) fn checkpoint(store: &ExtensionData, items: &mut [ResponseItemEnvelope]) { - if Self::current(store) == Some(WebSearchProvider::Standalone) { - for item in items { - item.metadata - .get_or_insert_default() - .native_search_fallback_used = true; + let provider = Self::current(store); + let state = match provider { + Some(WebSearchProvider::SearchMcp) => ModelSearchState::SearchMcp, + Some(WebSearchProvider::Standalone) => ModelSearchState::Standalone, + None => ModelSearchState::Unused, + }; + for item in items { + let metadata = item.metadata.get_or_insert_default(); + metadata.model_search_state = Some(state); + if provider == Some(WebSearchProvider::Standalone) { + // Keep older readers working while this field rolls out. + metadata.native_search_fallback_used = true; } } } @@ -418,15 +472,9 @@ pub(crate) async fn resolve( SearchDiscovery::Critical(reason) => *reason, SearchDiscovery::Unavailable => return finish(ModelSearch::Disabled, "unavailable"), }; - let attribution = services.executed_tool_calls.mcp_attribution_snapshot(); if let Some(mode) = native_mode && owner != Some(WebSearchProvider::SearchMcp) && usage.0.load(Ordering::Relaxed) & SearchTurnUsage::MCP == 0 - && attribution.status != McpAttributionStatus::AttributionError - && !attribution - .sources - .iter() - .any(|source| source.connector_id.as_deref() == Some(codex_mcp::SEARCH_CONNECTOR)) { finish( ModelSearch::Native { diff --git a/codex-rs/core/src/session/inject_tests.rs b/codex-rs/core/src/session/inject_tests.rs index af12838332..aa7305c2e8 100644 --- a/codex-rs/core/src/session/inject_tests.rs +++ b/codex-rs/core/src/session/inject_tests.rs @@ -36,6 +36,7 @@ async fn harness_authored_configuration_updates_preserve_metadata_and_resume() { let metadata = expected.metadata.as_mut().unwrap(); metadata.history_sequence = Some(1); metadata.sampled_through_sequence = Some(0); + metadata.model_search_state = Some(codex_history::ModelSearchState::Unused); metadata.mcp_attribution = Some( session .services diff --git a/codex-rs/core/src/session/tests.rs b/codex-rs/core/src/session/tests.rs index c1c61c21dc..14a1905d1c 100644 --- a/codex-rs/core/src/session/tests.rs +++ b/codex-rs/core/src/session/tests.rs @@ -2823,6 +2823,7 @@ async fn annotated_history_uses_explicit_model_without_a_step( metadata.history_sequence = Some(index as u64 + 1); metadata.sampled_through_sequence = Some(0); metadata.history_truncation_token_limit = Some(expected_budget); + metadata.model_search_state = Some(codex_history::ModelSearchState::Unused); let (ResponseItem::FunctionCallOutput { output, .. } | ResponseItem::CustomToolCallOutput { output, .. }) = &mut envelope.item else { diff --git a/codex-rs/core/tests/suite/scenarios_web_search.rs b/codex-rs/core/tests/suite/scenarios_web_search.rs index 1cdf428ec2..80f90df46a 100644 --- a/codex-rs/core/tests/suite/scenarios_web_search.rs +++ b/codex-rs/core/tests/suite/scenarios_web_search.rs @@ -2,6 +2,8 @@ use super::*; use anyhow::Context; +use codex_history::CodexHarnessMetadata; +use codex_history::RolloutItem; use codex_protocol::config_types::WebSearchMode; use codex_protocol::openai_models::WebSearchProvider; use core_test_support::apps_test_server::AppsTestServer; @@ -124,11 +126,11 @@ async fn mount_model_search( "inputSchema": {"type":"object","properties":{"system2_search_query":{"type":"array"},"open":{"type":"array"}}}, "_meta": {"connector_id": codex_mcp::SEARCH_CONNECTOR,"connector_name":"search_service"} }); - let apps = - AppsTestServer::mount_with_tools(server, Arc::new(Mutex::new(vec![tool.clone()]))).await?; tool["inputSchema"]["properties"]["literature_search_query"] = json!({"type":"array"}); let pin = literature_search_pin(); tool["_meta"]["_codex_apps"] = json!({"invocation_context":pin}); + let apps = + AppsTestServer::mount_with_tools(server, Arc::new(Mutex::new(vec![tool.clone()]))).await?; // Host-owned Apps catalogs can exceed the generic MCP limit of 2,048 tools. let mut catalog: Vec<_> = (0..2_048) .map(|n| json!({"name":format!("other_{n}"),"inputSchema":{"type":"object"}})) @@ -203,6 +205,25 @@ fn model_search_builder(apps: &AppsTestServer, tool_mode: ToolMode) -> TestCodex }) } +fn rewrite_rollout_response_metadata( + path: &std::path::Path, + mut rewrite: impl FnMut(&mut CodexHarnessMetadata), +) -> Result<()> { + let mut rollout = Vec::new(); + for original in std::fs::read_to_string(path)?.lines() { + let mut line = codex_rollout::parse_rollout_line(original)?; + if let RolloutItem::ResponseItem(item) = &mut line.item + && let Some(metadata) = item.metadata.as_mut() + { + rewrite(metadata); + } + rollout.push(serde_json::to_string(&line)?); + } + let rollout = rollout.join("\n"); + std::fs::write(path, format!("{rollout}\n"))?; + Ok(()) +} + #[tokio::test(flavor = "multi_thread", worker_threads = 2)] async fn model_selected_search_preserves_discovery_and_call_history() -> Result<()> { use codex_protocol::protocol::ThreadSettingsOverrides; @@ -304,10 +325,29 @@ async fn model_selected_search_preserves_discovery_and_call_history() -> Result< ], ) .await; - let test = model_search_builder(&apps, ToolMode::Direct) + let mut test = model_search_builder(&apps, ToolMode::Direct) + .with_model_info_override("hosted-paper", |model| { + model.web_search_provider = None; + }) .build_with_auto_env(&server) .await?; test.submit_turn("Find the FlashAttention-2 paper.").await?; + let rollout_path = test.codex.rollout_path().context("rollout path")?; + test.codex.shutdown_and_wait().await?; + let mut replaced_legacy_checkpoint = false; + rewrite_rollout_response_metadata(&rollout_path, |metadata| { + if let Some(attribution) = metadata.mcp_attribution.as_mut() { + *attribution = Default::default(); + replaced_legacy_checkpoint = true; + } + })?; + assert!( + replaced_legacy_checkpoint, + "first turn should persist legacy MCP attribution" + ); + test = model_search_builder(&apps, ToolMode::Direct) + .restart_with_auto_env(&server, &test) + .await?; discovery_available.store(false, Ordering::SeqCst); test.submit_turn("Open the paper and check its speedup.") .await?; @@ -353,6 +393,54 @@ async fn model_selected_search_preserves_discovery_and_call_history() -> Result< Ok(()) } +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn metadata_free_history_withholds_native_fallback() -> Result<()> { + skip_if_no_network!(Ok(())); + let server = start_mock_server().await; + let discovery_available = Arc::new(AtomicBool::new(true)); + let apps = mount_model_search(&server, &discovery_available).await?; + let responses = mount_sse_sequence( + &server, + vec![ + sse(vec![ + ev_assistant_message("imported", "Keep the imported reference [turn0search0]."), + ev_completed("imported"), + ]), + sse(vec![ + ev_assistant_message("outage", "Search is temporarily unavailable."), + ev_completed("outage"), + ]), + ], + ) + .await; + let mut test = model_search_builder(&apps, ToolMode::Direct) + .build_with_auto_env(&server) + .await?; + test.submit_turn("Remember this imported search result.") + .await?; + let rollout_path = test.codex.rollout_path().context("rollout path")?; + test.codex.shutdown_and_wait().await?; + let mut removed_checkpoint = false; + rewrite_rollout_response_metadata(&rollout_path, |metadata| { + removed_checkpoint |= metadata.model_search_state.take().is_some(); + metadata.mcp_attribution = None; + })?; + assert!( + removed_checkpoint, + "first turn should persist model search state" + ); + test = model_search_builder(&apps, ToolMode::Direct) + .restart_with_auto_env(&server, &test) + .await?; + discovery_available.store(false, Ordering::SeqCst); + test.submit_turn("Open the imported reference.").await?; + + let requests = responses.requests(); + assert_eq!(requests.len(), 2); + assert!(requests[1].tool_by_name("web", "run").is_none()); + Ok(()) +} + #[tokio::test(flavor = "multi_thread", worker_threads = 2)] async fn native_fallback_reference_survives_discovery_recovery_and_resume() -> Result<()> { skip_if_no_network!(Ok(())); diff --git a/codex-rs/core/tests/suite/snapshots/all__suite__scenarios__web_search__model_selected_search_preserves_discovery_and_call_history.snap b/codex-rs/core/tests/suite/snapshots/all__suite__scenarios__web_search__model_selected_search_preserves_discovery_and_call_history.snap index 56dfe8ca2d..23d4f44666 100644 --- a/codex-rs/core/tests/suite/snapshots/all__suite__scenarios__web_search__model_selected_search_preserves_discovery_and_call_history.snap +++ b/codex-rs/core/tests/suite/snapshots/all__suite__scenarios__web_search__model_selected_search_preserves_discovery_and_call_history.snap @@ -15,7 +15,7 @@ Settings: stream: true text: {"verbosity":"low"} tool_choice: "auto" - tools (9; hash=47fc21674da7fb11): + tools (10; hash=2b1f11b924b13f60): - function/exec_command: Runs a command in a PTY, returning output or a session ID for ongoing interaction.; args=[cmd, justification, login, max_output_tokens, prefix_rule, sandbox_permissions, shell, tty, workdir, yield_time_ms]; hash=24f4b6739dd5d940 - function/write_stdin: Writes characters to an existing unified exec session and returns recent output.; args=[chars, max_output_tokens, session_id, yield_time_ms]; hash=7fb62d8a3e2df4e2 - function/list_mcp_resources: Lists resources provided by MCP servers. Resources allow servers to share data that provides cont...; args=[cursor, server]; hash=6792edaff13561bd @@ -24,6 +24,8 @@ Settings: - function/request_user_input: Request user input for one to three short questions and wait for the response. This tool is only ...; args=[questions]; hash=64a729b25c424fc6 - custom/apply_patch: The `apply_patch` tool can be used to edit files. This is a FREEFORM tool, so do not wrap the pat...; hash=dea9f12b0111a4ba - function/view_image: View a local image file from the filesystem when visual inspection is needed. Use this for images...; args=[path]; hash=1908de9c0be7118a + - namespace/web: Tools in the web namespace.; hash=c60e4db83b9fd6b0 + - function/run - tool_search: # Tool discovery Searches over deferred tool metadata with BM25 and exposes matching tools for t...; args=[limit, query]; hash=b573ed69c0b0e6c7 -- request 1 (turn) -- 00:message/developer: @@ -47,36 +49,62 @@ Settings: 06:function_call/mcp__codex_apps__search_service._web_run:{"literature_search_query":[{"q":"FlashAttention-2"}]} 07:function_call_output:Wall time: seconds Output: | [turn0academia0] FlashAttention-2 by Tri Dao. + +## Window 2 (after request 3) +Settings: relative to window 1 + tools (9; hash=47fc21674da7fb11): + - removed namespace/web -- request 4 (turn) -- +00:message/developer: + +01:message/developer[3]: + [01] + [02] + [03] + Deferred tool namespaces: + - mcp__codex_apps__search_service: Tools for working with search_service. + - multi_agent_v1: Tools for spawning and managing sub-agents. + +02:message/user: + +03:message/user: + Find the FlashAttention-2 paper. +04:tool_search_call +05:tool_search_output +06:function_call/mcp__codex_apps__search_service._web_run:{"literature_search_query":[{"q":"FlashAttention-2"}]} +07:function_call_output:Wall time: seconds + Output: | [turn0academia0] FlashAttention-2 by Tri Dao. 08:message/assistant: The paper is by Tri Dao. -09:message/developer: +09:message/user: + +10:message/developer: Removed deferred tool namespaces: - mcp__codex_apps__search_service: Tools for working with search_service. -10:message/user: +11:message/user: Open the paper and check its speedup. -- request 5 (turn) -- -11:message/assistant: +12:message/assistant: Search is temporarily unavailable. -12:message/developer: +13:message/developer: Added deferred tool namespaces: - mcp__codex_apps__search_service: Tools for working with search_service. -13:message/user: +14:message/user: Try opening the same paper again. -- request 6 (turn) -- -14:tool_search_call -15:tool_search_output +15:tool_search_call +16:tool_search_output -- request 7 (turn) -- -16:function_call/mcp__codex_apps__search_service._web_run:{"open":[{"ref_id":"turn0academia0"}]} -17:function_call_output:Wall time: seconds +17:function_call/mcp__codex_apps__search_service._web_run:{"open":[{"ref_id":"turn0academia0"}]} +18:function_call_output:Wall time: seconds Output: | The paper reports a 2x speedup. -## Window 2 (after request 7) -Settings: relative to window 1 +## Window 3 (after request 7) +Settings: relative to window 2 model: "native-paper" tools (10; hash=52194b2cfc736bb5): + namespace/web: Tools in the web namespace.; hash=0037b1ed8d50fab5 @@ -103,35 +131,37 @@ Settings: relative to window 1 Output: | [turn0academia0] FlashAttention-2 by Tri Dao. 08:message/assistant: The paper is by Tri Dao. -09:message/developer: +09:message/user: + +10:message/developer: Removed deferred tool namespaces: - mcp__codex_apps__search_service: Tools for working with search_service. -10:message/user: +11:message/user: Open the paper and check its speedup. -11:message/assistant: +12:message/assistant: Search is temporarily unavailable. -12:message/developer: +13:message/developer: Added deferred tool namespaces: - mcp__codex_apps__search_service: Tools for working with search_service. -13:message/user: +14:message/user: Try opening the same paper again. -14:tool_search_call -15:tool_search_output -16:function_call/mcp__codex_apps__search_service._web_run:{"open":[{"ref_id":"turn0academia0"}]} -17:function_call_output:Wall time: seconds +15:tool_search_call +16:tool_search_output +17:function_call/mcp__codex_apps__search_service._web_run:{"open":[{"ref_id":"turn0academia0"}]} +18:function_call_output:Wall time: seconds Output: | The paper reports a 2x speedup. -18:message/assistant: +19:message/assistant: It reports a 2x speedup. -19:message/developer: - 20:message/developer: + +21:message/developer: Removed deferred tool namespaces: - mcp__codex_apps__search_service: Tools for working with search_service. -21:message/user: +22:message/user: Summarize the result. diff --git a/codex-rs/history/src/lib.rs b/codex-rs/history/src/lib.rs index 8a2ec57b37..769b2562b8 100644 --- a/codex-rs/history/src/lib.rs +++ b/codex-rs/history/src/lib.rs @@ -64,6 +64,18 @@ pub struct ResponseItemEnvelope { pub metadata: Option, } +/// Persisted search-provider state for a thread. +/// +/// A missing checkpoint means the history predates this field and may contain Search MCP +/// references. `Unused` means the writer knows that neither provider has run yet. +#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, JsonSchema)] +#[serde(rename_all = "snake_case")] +pub enum ModelSearchState { + Unused, + SearchMcp, + Standalone, +} + /// Metadata owned by the Codex harness and persisted with a response item. /// #[derive(Serialize, Deserialize, Debug, Clone, Default, PartialEq, Eq, JsonSchema)] @@ -174,6 +186,10 @@ pub struct CodexHarnessMetadata { )] pub mcp_attribution: Option, + /// Search provider already used by this thread, or confirmation that neither has run yet. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub model_search_state: Option, + /// Native search ran during automatic fallback, so its browsing references stay on native. #[serde(default, skip_serializing_if = "std::ops::Not::not")] pub native_search_fallback_used: bool,