mirror of
https://github.com/openai/codex.git
synced 2026-06-01 19:02:59 +00:00
## Why The standalone `/v1/alpha/search` request now requires a `model`, but the `web.run` extension currently omits it. Adds `model` to extension `ToolCall` invocation. Follow-up to #23823. ## What changed - Make `SearchRequest.model` required. - Expose the effective per-turn model on extension tool calls and pass it in standalone web-search requests. - Assert the model is forwarded in the app-server round-trip test. ## Testing - `just test -p codex-api -p codex-tools -p codex-web-search-extension -p codex-memories-extension -p codex-goal-extension` - `just test -p codex-core -E 'test(passes_turn_fields_and_scoped_turn_item_emitter_to_extension_call)'` - `just test -p codex-app-server -E 'test(standalone_web_search_round_trips_encrypted_output)'`
313 lines
9.9 KiB
Rust
313 lines
9.9 KiB
Rust
use std::path::Path;
|
|
use std::time::Duration;
|
|
|
|
use anyhow::Context;
|
|
use anyhow::Result;
|
|
use app_test_support::ChatGptAuthFixture;
|
|
use app_test_support::McpProcess;
|
|
use app_test_support::to_response;
|
|
use app_test_support::write_chatgpt_auth;
|
|
use codex_app_server_protocol::ItemCompletedNotification;
|
|
use codex_app_server_protocol::ItemStartedNotification;
|
|
use codex_app_server_protocol::JSONRPCResponse;
|
|
use codex_app_server_protocol::RequestId;
|
|
use codex_app_server_protocol::ThreadItem;
|
|
use codex_app_server_protocol::ThreadReadParams;
|
|
use codex_app_server_protocol::ThreadReadResponse;
|
|
use codex_app_server_protocol::ThreadStartParams;
|
|
use codex_app_server_protocol::ThreadStartResponse;
|
|
use codex_app_server_protocol::TurnStartParams;
|
|
use codex_app_server_protocol::TurnStartResponse;
|
|
use codex_app_server_protocol::UserInput as V2UserInput;
|
|
use codex_app_server_protocol::WebSearchAction;
|
|
use codex_config::types::AuthCredentialsStoreMode;
|
|
use core_test_support::responses;
|
|
use pretty_assertions::assert_eq;
|
|
use serde_json::Value;
|
|
use serde_json::json;
|
|
use tempfile::TempDir;
|
|
use tokio::time::timeout;
|
|
use wiremock::Mock;
|
|
use wiremock::MockServer;
|
|
use wiremock::ResponseTemplate;
|
|
use wiremock::matchers::method;
|
|
use wiremock::matchers::path;
|
|
|
|
// macOS and Windows Bazel CI can spend tens of seconds starting app-server
|
|
// subprocesses or processing test RPCs under load.
|
|
#[cfg(any(target_os = "macos", windows))]
|
|
const DEFAULT_READ_TIMEOUT: Duration = Duration::from_secs(60);
|
|
#[cfg(not(any(target_os = "macos", windows)))]
|
|
const DEFAULT_READ_TIMEOUT: Duration = Duration::from_secs(10);
|
|
|
|
#[tokio::test]
|
|
async fn standalone_web_search_round_trips_encrypted_output() -> Result<()> {
|
|
let call_id = "web-run-1";
|
|
let server = responses::start_mock_server().await;
|
|
mount_search_response(&server).await;
|
|
|
|
let response_mock = responses::mount_sse_sequence(
|
|
&server,
|
|
vec![
|
|
responses::sse(vec![
|
|
responses::ev_response_created("resp-1"),
|
|
responses::ev_function_call_with_namespace(
|
|
call_id,
|
|
"web",
|
|
"run",
|
|
&json!({
|
|
"search_query": [{"q": "standalone web search"}],
|
|
})
|
|
.to_string(),
|
|
),
|
|
responses::ev_completed("resp-1"),
|
|
]),
|
|
responses::sse(vec![
|
|
responses::ev_assistant_message("msg-1", "Done"),
|
|
responses::ev_completed("resp-2"),
|
|
]),
|
|
],
|
|
)
|
|
.await;
|
|
|
|
let codex_home = TempDir::new()?;
|
|
create_config_toml(codex_home.path(), &server.uri())?;
|
|
write_chatgpt_auth(
|
|
codex_home.path(),
|
|
ChatGptAuthFixture::new("access-chatgpt"),
|
|
AuthCredentialsStoreMode::File,
|
|
)?;
|
|
|
|
let mut mcp = McpProcess::new_with_env(codex_home.path(), &[("OPENAI_API_KEY", None)]).await?;
|
|
timeout(DEFAULT_READ_TIMEOUT, mcp.initialize()).await??;
|
|
|
|
let thread_req = mcp
|
|
.send_thread_start_request(ThreadStartParams::default())
|
|
.await?;
|
|
let thread_resp: JSONRPCResponse = timeout(
|
|
DEFAULT_READ_TIMEOUT,
|
|
mcp.read_stream_until_response_message(RequestId::Integer(thread_req)),
|
|
)
|
|
.await??;
|
|
let ThreadStartResponse { thread, .. } = to_response::<ThreadStartResponse>(thread_resp)?;
|
|
let thread_id = thread.id.clone();
|
|
|
|
let turn_req = mcp
|
|
.send_turn_start_request(TurnStartParams {
|
|
thread_id: thread_id.clone(),
|
|
client_user_message_id: None,
|
|
input: vec![V2UserInput::Text {
|
|
text: "Search the web".to_string(),
|
|
text_elements: Vec::new(),
|
|
}],
|
|
..Default::default()
|
|
})
|
|
.await?;
|
|
let turn_resp: JSONRPCResponse = timeout(
|
|
DEFAULT_READ_TIMEOUT,
|
|
mcp.read_stream_until_response_message(RequestId::Integer(turn_req)),
|
|
)
|
|
.await??;
|
|
let _turn: TurnStartResponse = to_response::<TurnStartResponse>(turn_resp)?;
|
|
|
|
let started = timeout(DEFAULT_READ_TIMEOUT, wait_for_web_search_started(&mut mcp)).await??;
|
|
let completed = timeout(
|
|
DEFAULT_READ_TIMEOUT,
|
|
wait_for_web_search_completed(&mut mcp),
|
|
)
|
|
.await??;
|
|
|
|
timeout(
|
|
DEFAULT_READ_TIMEOUT,
|
|
mcp.read_stream_until_notification_message("turn/completed"),
|
|
)
|
|
.await??;
|
|
|
|
let requests = response_mock.requests();
|
|
assert_eq!(requests.len(), 2);
|
|
|
|
let first_response = requests[0].body_json();
|
|
let web_run = requests[0]
|
|
.tool_by_name("web", "run")
|
|
.context("web.run should be sent to the model")?;
|
|
assert_eq!(
|
|
web_run.pointer("/parameters/properties/time/description"),
|
|
Some(&json!("Get time for the given UTC offsets."))
|
|
);
|
|
assert!(
|
|
!has_hosted_web_search(&first_response),
|
|
"standalone web search should replace hosted web search"
|
|
);
|
|
|
|
let search_body = search_request_body(&server).await?;
|
|
assert_eq!(search_body["model"], json!("mock-model"));
|
|
assert_eq!(
|
|
search_body["commands"],
|
|
json!({
|
|
"search_query": [{"q": "standalone web search"}],
|
|
})
|
|
);
|
|
assert_eq!(
|
|
search_body["settings"]["allowed_callers"],
|
|
json!(["direct"])
|
|
);
|
|
assert_eq!(
|
|
search_body["input"]
|
|
.as_array()
|
|
.context("search input should be an array")?
|
|
.last(),
|
|
Some(&json!({
|
|
"type": "message",
|
|
"role": "user",
|
|
"content": [{"type": "input_text", "text": "Search the web"}],
|
|
}))
|
|
);
|
|
|
|
assert_eq!(
|
|
requests[1].function_call_output(call_id),
|
|
json!({
|
|
"type": "function_call_output",
|
|
"call_id": call_id,
|
|
"output": [{
|
|
"type": "encrypted_content",
|
|
"encrypted_content": "ciphertext",
|
|
}],
|
|
})
|
|
);
|
|
assert_eq!(
|
|
started.item,
|
|
ThreadItem::WebSearch {
|
|
id: call_id.to_string(),
|
|
query: String::new(),
|
|
action: Some(WebSearchAction::Other),
|
|
}
|
|
);
|
|
let expected_completed_item = ThreadItem::WebSearch {
|
|
id: call_id.to_string(),
|
|
query: "standalone web search".to_string(),
|
|
action: Some(WebSearchAction::Search {
|
|
query: Some("standalone web search".to_string()),
|
|
queries: None,
|
|
}),
|
|
};
|
|
assert_eq!(completed.item, expected_completed_item);
|
|
|
|
drop(mcp);
|
|
let mut reloaded_mcp =
|
|
McpProcess::new_with_env(codex_home.path(), &[("OPENAI_API_KEY", None)]).await?;
|
|
timeout(DEFAULT_READ_TIMEOUT, reloaded_mcp.initialize()).await??;
|
|
let read_req = reloaded_mcp
|
|
.send_thread_read_request(ThreadReadParams {
|
|
thread_id,
|
|
include_turns: true,
|
|
})
|
|
.await?;
|
|
let read_resp: JSONRPCResponse = timeout(
|
|
DEFAULT_READ_TIMEOUT,
|
|
reloaded_mcp.read_stream_until_response_message(RequestId::Integer(read_req)),
|
|
)
|
|
.await??;
|
|
let ThreadReadResponse { thread, .. } = to_response::<ThreadReadResponse>(read_resp)?;
|
|
let persisted_web_searches: Vec<&ThreadItem> = thread
|
|
.turns
|
|
.iter()
|
|
.flat_map(|turn| &turn.items)
|
|
.filter(|item| matches!(item, ThreadItem::WebSearch { .. }))
|
|
.collect();
|
|
assert_eq!(persisted_web_searches, vec![&expected_completed_item]);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
async fn wait_for_web_search_started(mcp: &mut McpProcess) -> Result<ItemStartedNotification> {
|
|
loop {
|
|
let notification = mcp
|
|
.read_stream_until_notification_message("item/started")
|
|
.await?;
|
|
let started: ItemStartedNotification = serde_json::from_value(
|
|
notification
|
|
.params
|
|
.context("item/started notification should include params")?,
|
|
)?;
|
|
if matches!(&started.item, ThreadItem::WebSearch { .. }) {
|
|
return Ok(started);
|
|
}
|
|
}
|
|
}
|
|
|
|
async fn wait_for_web_search_completed(mcp: &mut McpProcess) -> Result<ItemCompletedNotification> {
|
|
loop {
|
|
let notification = mcp
|
|
.read_stream_until_notification_message("item/completed")
|
|
.await?;
|
|
let completed: ItemCompletedNotification = serde_json::from_value(
|
|
notification
|
|
.params
|
|
.context("item/completed notification should include params")?,
|
|
)?;
|
|
if matches!(&completed.item, ThreadItem::WebSearch { .. }) {
|
|
return Ok(completed);
|
|
}
|
|
}
|
|
}
|
|
|
|
async fn mount_search_response(server: &MockServer) {
|
|
Mock::given(method("POST"))
|
|
.and(path("/api/codex/alpha/search"))
|
|
.respond_with(ResponseTemplate::new(200).set_body_json(json!({
|
|
"encrypted_output": "ciphertext",
|
|
})))
|
|
.expect(1)
|
|
.mount(server)
|
|
.await;
|
|
}
|
|
|
|
fn has_hosted_web_search(body: &Value) -> bool {
|
|
body.get("tools")
|
|
.and_then(Value::as_array)
|
|
.is_some_and(|tools| {
|
|
tools
|
|
.iter()
|
|
.any(|tool| tool.get("type").and_then(Value::as_str) == Some("web_search"))
|
|
})
|
|
}
|
|
|
|
async fn search_request_body(server: &MockServer) -> Result<Value> {
|
|
server
|
|
.received_requests()
|
|
.await
|
|
.context("failed to fetch received requests")?
|
|
.into_iter()
|
|
.find(|request| request.url.path() == "/api/codex/alpha/search")
|
|
.context("expected standalone search request")?
|
|
.body_json()
|
|
.context("search request body should be JSON")
|
|
}
|
|
|
|
fn create_config_toml(codex_home: &Path, server_uri: &str) -> std::io::Result<()> {
|
|
std::fs::write(
|
|
codex_home.join("config.toml"),
|
|
format!(
|
|
r#"
|
|
model = "mock-model"
|
|
approval_policy = "never"
|
|
sandbox_mode = "read-only"
|
|
model_provider = "openai-custom"
|
|
chatgpt_base_url = "{server_uri}"
|
|
|
|
[features]
|
|
standalone_web_search = true
|
|
|
|
[model_providers.openai-custom]
|
|
name = "OpenAI"
|
|
base_url = "{server_uri}/api/codex"
|
|
wire_api = "responses"
|
|
request_max_retries = 0
|
|
stream_max_retries = 0
|
|
supports_websockets = false
|
|
requires_openai_auth = true
|
|
"#
|
|
),
|
|
)
|
|
}
|