mirror of
https://github.com/openai/codex.git
synced 2026-11-17 22:10:37 +00:00
Refresh MCP compatibility on client changes
This commit is contained in:
@@ -129,6 +129,12 @@ impl McpConnectionManager {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn set_elicitation_compatibility(&self, compatibility: McpElicitationCompatibility) {
|
||||
if let Ok(mut manager_compatibility) = self.elicitation_requests.compatibility.lock() {
|
||||
*manager_compatibility = compatibility;
|
||||
}
|
||||
}
|
||||
|
||||
#[allow(clippy::new_ret_no_self, clippy::too_many_arguments)]
|
||||
pub async fn new(
|
||||
mcp_servers: &HashMap<String, McpServerConfig>,
|
||||
|
||||
@@ -268,13 +268,14 @@ async fn disabled_permissions_do_not_auto_accept_elicitation_with_requested_fiel
|
||||
|
||||
#[tokio::test]
|
||||
async fn codex_apps_only_custom_server_elicitation_is_declined_without_event() {
|
||||
let manager = ElicitationRequestManager::new_with_compatibility(
|
||||
AskForApproval::OnRequest,
|
||||
PermissionProfile::default(),
|
||||
McpElicitationCompatibility::CodexAppsOnly,
|
||||
);
|
||||
let approval_policy = Constrained::allow_any(AskForApproval::OnRequest);
|
||||
let permission_profile = Constrained::allow_any(PermissionProfile::default());
|
||||
let manager = McpConnectionManager::new_uninitialized(&approval_policy, &permission_profile);
|
||||
manager.set_elicitation_compatibility(McpElicitationCompatibility::CodexAppsOnly);
|
||||
let (tx_event, rx_event) = async_channel::bounded(1);
|
||||
let sender = manager.make_sender("custom_mcp".to_string(), tx_event);
|
||||
let sender = manager
|
||||
.elicitation_requests
|
||||
.make_sender("custom_mcp".to_string(), tx_event);
|
||||
|
||||
let response = sender(
|
||||
NumberOrString::Number(1),
|
||||
|
||||
@@ -37,7 +37,7 @@ pub(crate) struct ElicitationRequestManager {
|
||||
requests: Arc<Mutex<ResponderMap>>,
|
||||
pub(crate) approval_policy: Arc<StdMutex<AskForApproval>>,
|
||||
pub(crate) permission_profile: Arc<StdMutex<PermissionProfile>>,
|
||||
pub(crate) compatibility: McpElicitationCompatibility,
|
||||
pub(crate) compatibility: Arc<StdMutex<McpElicitationCompatibility>>,
|
||||
}
|
||||
|
||||
impl ElicitationRequestManager {
|
||||
@@ -61,7 +61,7 @@ impl ElicitationRequestManager {
|
||||
requests: Arc::new(Mutex::new(HashMap::new())),
|
||||
approval_policy: Arc::new(StdMutex::new(approval_policy)),
|
||||
permission_profile: Arc::new(StdMutex::new(permission_profile)),
|
||||
compatibility,
|
||||
compatibility: Arc::new(StdMutex::new(compatibility)),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -88,14 +88,19 @@ impl ElicitationRequestManager {
|
||||
let elicitation_requests = self.requests.clone();
|
||||
let approval_policy = self.approval_policy.clone();
|
||||
let permission_profile = self.permission_profile.clone();
|
||||
let compatibility = self.compatibility;
|
||||
let compatibility = self.compatibility.clone();
|
||||
Box::new(move |id, elicitation| {
|
||||
let elicitation_requests = elicitation_requests.clone();
|
||||
let tx_event = tx_event.clone();
|
||||
let server_name = server_name.clone();
|
||||
let approval_policy = approval_policy.clone();
|
||||
let permission_profile = permission_profile.clone();
|
||||
let compatibility = compatibility.clone();
|
||||
async move {
|
||||
let compatibility = compatibility
|
||||
.lock()
|
||||
.map(|compatibility| *compatibility)
|
||||
.unwrap_or_default();
|
||||
if !compatibility.allows_server_elicitation(&server_name) {
|
||||
return Ok(ElicitationResponse {
|
||||
action: ElicitationAction::Decline,
|
||||
|
||||
@@ -466,8 +466,12 @@ async fn start_server_task(
|
||||
elicitation_requests,
|
||||
codex_apps_tools_cache_context,
|
||||
} = params;
|
||||
let elicitation =
|
||||
elicitation_capability_for_server(&server_name, elicitation_requests.compatibility);
|
||||
let compatibility = elicitation_requests
|
||||
.compatibility
|
||||
.lock()
|
||||
.map(|compatibility| *compatibility)
|
||||
.unwrap_or_default();
|
||||
let elicitation = elicitation_capability_for_server(&server_name, compatibility);
|
||||
let params = InitializeRequestParams {
|
||||
meta: None,
|
||||
capabilities: ClientCapabilities {
|
||||
|
||||
@@ -752,12 +752,17 @@ impl Codex {
|
||||
app_server_client_version: Option<String>,
|
||||
client_compatibility_flags: ClientCompatibilityFlags,
|
||||
) {
|
||||
let mut state = self.session.state.lock().await;
|
||||
state.session_configuration.app_server_client_name = app_server_client_name;
|
||||
state.session_configuration.app_server_client_version = app_server_client_version;
|
||||
let mut config = (*state.session_configuration.original_config_do_not_use).clone();
|
||||
config.client_compatibility_flags = client_compatibility_flags;
|
||||
state.session_configuration.original_config_do_not_use = Arc::new(config);
|
||||
{
|
||||
let mut state = self.session.state.lock().await;
|
||||
state.session_configuration.app_server_client_name = app_server_client_name;
|
||||
state.session_configuration.app_server_client_version = app_server_client_version;
|
||||
let mut config = (*state.session_configuration.original_config_do_not_use).clone();
|
||||
config.client_compatibility_flags = client_compatibility_flags;
|
||||
state.session_configuration.original_config_do_not_use = Arc::new(config);
|
||||
}
|
||||
let mcp_connection_manager = self.session.services.mcp_connection_manager.read().await;
|
||||
mcp_connection_manager
|
||||
.set_elicitation_compatibility(client_compatibility_flags.mcp_elicitation);
|
||||
}
|
||||
|
||||
pub(crate) async fn agent_status(&self) -> AgentStatus {
|
||||
|
||||
Reference in New Issue
Block a user