mirror of
https://github.com/openai/codex.git
synced 2026-09-11 20:36:49 +00:00
## Why Refreshing installed Apps without a thread should update the tools available to existing threads on their next turn. ## What changed - Publish live tool catalogs to clients with matching transport, auth, protocol, and listing settings within the same account and home directory. Ignore the thread attribution header when matching scopes. - Adopt updated tools before catalog reads and new calls, preserving running calls and rejecting calls prepared against an outdated catalog revision. - Keep the newest successful fetch per scope so older refreshes cannot overwrite newer tools, and exclude disk snapshots from live updates. ## Testing Add regression coverage for refresh propagation to an existing thread without another tools listing, scope and account isolation, out-of-order refreshes, late client startup, and running versus stale prepared calls. GitOrigin-RevId: 7a5ee34e23742ce374c6647dc8928b76ea622448
402 lines
12 KiB
Rust
402 lines
12 KiB
Rust
use std::collections::HashMap;
|
|
use std::io;
|
|
use std::sync::Arc;
|
|
use std::sync::atomic::AtomicBool;
|
|
use std::sync::atomic::Ordering;
|
|
|
|
use codex_config::AppToolApproval;
|
|
use codex_config::Constrained;
|
|
use codex_config::types::ApprovalsReviewer;
|
|
use codex_protocol::mcp::McpServerInfo;
|
|
use codex_protocol::models::PermissionProfile;
|
|
use codex_protocol::protocol::AskForApproval;
|
|
use codex_rmcp_client::InProcessTransportFactory;
|
|
use codex_rmcp_client::RmcpClient;
|
|
use futures::FutureExt;
|
|
use pretty_assertions::assert_eq;
|
|
use rmcp::model::JsonObject;
|
|
use rmcp::model::Tool;
|
|
use tokio::io::DuplexStream;
|
|
use tokio::sync::Notify;
|
|
|
|
use super::McpBinding;
|
|
use super::PreparedMcpCall;
|
|
use crate::binding_clients::McpBindingClients;
|
|
use crate::client_tool_catalog::ClientToolCatalog;
|
|
use crate::connection_manager::McpConnectionSet;
|
|
use crate::rmcp_client::ManagedClient;
|
|
use crate::server::McpServerMetadata;
|
|
use crate::server::McpServerOrigin;
|
|
use crate::tools::ToolInfo;
|
|
|
|
const SERVER_NAME: &str = "docs";
|
|
const TOOL_NAME: &str = "search";
|
|
|
|
struct TestInProcessTransportFactory;
|
|
|
|
impl InProcessTransportFactory for TestInProcessTransportFactory {
|
|
fn open(&self) -> futures::future::BoxFuture<'static, io::Result<DuplexStream>> {
|
|
async {
|
|
let (client_stream, _server_stream) = tokio::io::duplex(1);
|
|
Ok(client_stream)
|
|
}
|
|
.boxed()
|
|
}
|
|
}
|
|
|
|
struct TestStep {
|
|
step: Arc<McpBinding>,
|
|
client: Arc<RmcpClient>,
|
|
tool_catalog: Arc<ClientToolCatalog>,
|
|
}
|
|
|
|
async fn test_step(
|
|
label: &str,
|
|
approval_mode: AppToolApproval,
|
|
supports_sandbox_state_meta: bool,
|
|
) -> TestStep {
|
|
let tool = ToolInfo {
|
|
server_name: SERVER_NAME.to_string(),
|
|
supports_parallel_tool_calls: false,
|
|
server_origin: None,
|
|
callable_name: TOOL_NAME.to_string(),
|
|
callable_namespace: SERVER_NAME.to_string(),
|
|
namespace_description: None,
|
|
tool: Tool::new(
|
|
TOOL_NAME.to_string(),
|
|
format!("{label} catalog"),
|
|
Arc::new(JsonObject::default()),
|
|
),
|
|
openai_file_input_optional_fields: Default::default(),
|
|
connector_id: None,
|
|
connector_name: None,
|
|
plugin_display_names: Vec::new(),
|
|
};
|
|
let client = Arc::new(
|
|
RmcpClient::new_in_process_client(Arc::new(TestInProcessTransportFactory))
|
|
.await
|
|
.expect("create in-process MCP client"),
|
|
);
|
|
let tool_catalog = Arc::new(ClientToolCatalog::new(
|
|
vec![tool.clone()],
|
|
/*updates*/ None,
|
|
));
|
|
let managed_client = Arc::new(ManagedClient {
|
|
_auth_change_notifications: None,
|
|
client: Arc::clone(&client),
|
|
server_info: McpServerInfo {
|
|
name: label.to_string(),
|
|
title: Some(format!("{label} server")),
|
|
version: "1.0.0".to_string(),
|
|
description: None,
|
|
icons: None,
|
|
website_url: None,
|
|
},
|
|
tool_catalog: Arc::clone(&tool_catalog),
|
|
tool_timeout: None,
|
|
server_instructions: None,
|
|
server_supports_sandbox_state_meta_capability: supports_sandbox_state_meta,
|
|
codex_apps_tools_cache_context: None,
|
|
});
|
|
let clients = Arc::new(McpBindingClients::new(HashMap::from([(
|
|
SERVER_NAME.to_string(),
|
|
Arc::clone(&managed_client),
|
|
)])));
|
|
let connections = Arc::new(McpConnectionSet::empty(/*prefix_mcp_tool_names*/ true));
|
|
let mut config = crate::mcp::tests::test_mcp_config(std::env::temp_dir());
|
|
if label == "old" {
|
|
config.approval_policy = Constrained::allow_any(AskForApproval::Never);
|
|
config.permission_profile = PermissionProfile::Disabled;
|
|
} else {
|
|
config.approvals_reviewer = ApprovalsReviewer::AutoReview;
|
|
}
|
|
config
|
|
.server_permission_profiles
|
|
.insert(SERVER_NAME.to_string(), config.permission_profile.clone());
|
|
let config = Arc::new(config);
|
|
let prepared = PreparedMcpCall::new(
|
|
Arc::clone(&connections),
|
|
managed_client,
|
|
Arc::clone(&config),
|
|
/*catalog_revision*/ 0,
|
|
tool.clone(),
|
|
McpServerMetadata {
|
|
environment_id: format!("{label}-environment"),
|
|
pollutes_memory: label == "old",
|
|
origin: Some(McpServerOrigin::StreamableHttp(format!(
|
|
"https://{label}.example"
|
|
))),
|
|
supports_parallel_tool_calls: false,
|
|
default_tools_approval_mode: Some(approval_mode),
|
|
tool_approval_modes: HashMap::new(),
|
|
},
|
|
Some(format!("{label}-plugin")),
|
|
label == "old",
|
|
)
|
|
.expect("test call should retain its thread-owned permission profile");
|
|
let calls = HashMap::from([((SERVER_NAME.to_string(), TOOL_NAME.to_string()), prepared)]);
|
|
|
|
TestStep {
|
|
step: Arc::new(McpBinding::new(
|
|
connections,
|
|
clients,
|
|
config,
|
|
/*plugins_available*/ false,
|
|
vec![tool],
|
|
calls,
|
|
)),
|
|
client,
|
|
tool_catalog,
|
|
}
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn prepared_call_keeps_captured_connection_and_authority_after_refresh() -> anyhow::Result<()>
|
|
{
|
|
let old = test_step(
|
|
"old",
|
|
AppToolApproval::Prompt,
|
|
/*supports_sandbox_state_meta*/ true,
|
|
)
|
|
.await;
|
|
let old_call = old
|
|
.step
|
|
.prepare_call(SERVER_NAME, TOOL_NAME)
|
|
.expect("old step should prepare the advertised tool");
|
|
let old_connections = Arc::downgrade(&old.step.connections);
|
|
|
|
let new = test_step(
|
|
"new",
|
|
AppToolApproval::Approve,
|
|
/*supports_sandbox_state_meta*/ false,
|
|
)
|
|
.await;
|
|
let new_call = new
|
|
.step
|
|
.prepare_call(SERVER_NAME, TOOL_NAME)
|
|
.expect("new step should prepare the advertised tool");
|
|
|
|
assert_eq!(
|
|
(
|
|
old.step.tools()[0].tool.description.as_deref(),
|
|
old_call.tool_info().tool.description.as_deref(),
|
|
old_call.server_origin(),
|
|
old_call.server_environment_id(),
|
|
old_call.server_pollutes_memory(),
|
|
old_call.tool_approval_mode(),
|
|
old_call.plugin_id(),
|
|
old_call.is_selected_plugin_server(),
|
|
old_call
|
|
.server_supports_sandbox_state_meta_capability()
|
|
.await?,
|
|
),
|
|
(
|
|
Some("old catalog"),
|
|
Some("old catalog"),
|
|
Some("https://old.example"),
|
|
"old-environment",
|
|
true,
|
|
AppToolApproval::Prompt,
|
|
Some("old-plugin"),
|
|
true,
|
|
true,
|
|
)
|
|
);
|
|
assert_eq!(
|
|
(
|
|
new.step.tools()[0].tool.description.as_deref(),
|
|
new_call.tool_info().tool.description.as_deref(),
|
|
new_call.server_environment_id(),
|
|
new_call.tool_approval_mode(),
|
|
),
|
|
(
|
|
Some("new catalog"),
|
|
Some("new catalog"),
|
|
"new-environment",
|
|
AppToolApproval::Approve,
|
|
)
|
|
);
|
|
assert!(Arc::ptr_eq(&old_call.client.client, &old.client));
|
|
assert!(!Arc::ptr_eq(&old.client, &new.client));
|
|
assert_eq!(
|
|
(
|
|
old_call.config().approval_policy.value(),
|
|
old_call.permission_profile(),
|
|
old_call.config().approvals_reviewer,
|
|
),
|
|
(
|
|
AskForApproval::Never,
|
|
&PermissionProfile::Disabled,
|
|
ApprovalsReviewer::User,
|
|
)
|
|
);
|
|
assert_eq!(
|
|
(
|
|
new_call.config().approval_policy.value(),
|
|
new_call.config().approvals_reviewer,
|
|
),
|
|
(AskForApproval::OnRequest, ApprovalsReviewer::AutoReview)
|
|
);
|
|
|
|
drop(old.step);
|
|
assert!(
|
|
old_connections.upgrade().is_some(),
|
|
"the prepared call should keep its captured connection set alive"
|
|
);
|
|
drop(old_call);
|
|
assert!(
|
|
old_connections.upgrade().is_none(),
|
|
"the captured connection set should be released with the prepared call"
|
|
);
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn prepared_call_does_not_reroute_after_captured_connection_closes() {
|
|
let old = test_step(
|
|
"old",
|
|
AppToolApproval::Prompt,
|
|
/*supports_sandbox_state_meta*/ true,
|
|
)
|
|
.await;
|
|
let old_call = old
|
|
.step
|
|
.prepare_call(SERVER_NAME, TOOL_NAME)
|
|
.expect("old step should prepare the advertised tool");
|
|
let new = test_step(
|
|
"new",
|
|
AppToolApproval::Approve,
|
|
/*supports_sandbox_state_meta*/ false,
|
|
)
|
|
.await;
|
|
assert!(!Arc::ptr_eq(&old.client, &new.client));
|
|
|
|
old.client.shutdown().await;
|
|
|
|
let error = old_call
|
|
.call(
|
|
Some(serde_json::json!({"query": "codex"})),
|
|
/*meta*/ None,
|
|
/*timeout*/ None,
|
|
)
|
|
.await
|
|
.expect_err("a call bound to a closed connection must fail");
|
|
assert!(
|
|
format!("{error:#}").contains("MCP client is shut down"),
|
|
"the prepared call should fail on its captured client: {error:#}"
|
|
);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn prepared_call_is_rejected_after_catalog_refresh() {
|
|
let step = test_step(
|
|
"old",
|
|
AppToolApproval::Prompt,
|
|
/*supports_sandbox_state_meta*/ true,
|
|
)
|
|
.await;
|
|
let prepared = step
|
|
.step
|
|
.prepare_call(SERVER_NAME, TOOL_NAME)
|
|
.expect("step should prepare the advertised tool");
|
|
|
|
step.tool_catalog
|
|
.refresh(
|
|
|| async { Ok((step.step.tools().to_vec(), ())) },
|
|
|_, ()| {},
|
|
)
|
|
.await
|
|
.expect("refresh tool catalog");
|
|
|
|
let error = prepared
|
|
.call(
|
|
Some(serde_json::json!({"query": "codex"})),
|
|
/*meta*/ None,
|
|
/*timeout*/ None,
|
|
)
|
|
.await
|
|
.expect_err("a call from an older catalog must be rejected");
|
|
assert!(
|
|
format!("{error:#}").contains("catalog changed"),
|
|
"unexpected error: {error:#}"
|
|
);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn stale_prepared_call_does_not_run_preparation() {
|
|
let step = test_step(
|
|
"old",
|
|
AppToolApproval::Prompt,
|
|
/*supports_sandbox_state_meta*/ true,
|
|
)
|
|
.await;
|
|
let prepared = step
|
|
.step
|
|
.prepare_call(SERVER_NAME, TOOL_NAME)
|
|
.expect("step should prepare the advertised tool");
|
|
step.tool_catalog
|
|
.refresh(
|
|
|| async { Ok((step.step.tools().to_vec(), ())) },
|
|
|_, ()| {},
|
|
)
|
|
.await
|
|
.expect("refresh tool catalog");
|
|
let prepared_side_effect_ran = Arc::new(AtomicBool::new(false));
|
|
let marker = Arc::clone(&prepared_side_effect_ran);
|
|
|
|
prepared
|
|
.call_with_preparation(/*requested_timeout*/ None, || async move {
|
|
marker.store(true, Ordering::SeqCst);
|
|
Ok((None, None))
|
|
})
|
|
.await
|
|
.expect_err("a call from an older catalog must be rejected");
|
|
|
|
assert!(!prepared_side_effect_ran.load(Ordering::SeqCst));
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn preparation_holds_catalog_authority_until_it_finishes() {
|
|
let step = test_step(
|
|
"old",
|
|
AppToolApproval::Prompt,
|
|
/*supports_sandbox_state_meta*/ true,
|
|
)
|
|
.await;
|
|
let prepared = step
|
|
.step
|
|
.prepare_call(SERVER_NAME, TOOL_NAME)
|
|
.expect("step should prepare the advertised tool");
|
|
let preparation_started = Arc::new(Notify::new());
|
|
let finish_preparation = Arc::new(Notify::new());
|
|
let started = Arc::clone(&preparation_started);
|
|
let finish = Arc::clone(&finish_preparation);
|
|
let call = tokio::spawn(async move {
|
|
prepared
|
|
.call_with_preparation(/*requested_timeout*/ None, || async move {
|
|
started.notify_one();
|
|
finish.notified().await;
|
|
Err(anyhow::anyhow!("stop after preparation"))
|
|
})
|
|
.await
|
|
});
|
|
|
|
preparation_started.notified().await;
|
|
let refresh = step.tool_catalog.refresh(
|
|
|| async { Ok((step.step.tools().to_vec(), ())) },
|
|
|_, ()| {},
|
|
);
|
|
tokio::pin!(refresh);
|
|
assert!(
|
|
futures::poll!(&mut refresh).is_pending(),
|
|
"catalog replacement must wait for irreversible call preparation"
|
|
);
|
|
finish_preparation.notify_one();
|
|
call.await
|
|
.expect("call task should finish")
|
|
.expect_err("the test preparation should stop the call");
|
|
refresh
|
|
.await
|
|
.expect("catalog refresh should finish after preparation");
|
|
}
|