mirror of
https://github.com/openai/codex.git
synced 2026-10-28 18:58:46 +00:00
Charlie Marsh
5e3496e0ad
## What changed Extend `mcp_connection_sharing` to pool compatible local stdio connections that negotiate MCP `2026-07-28`. Keep legacy servers and servers that request input during startup private. Preserve each chat's tool catalog and route input requests to the calling chat. Release connections independently for each chat, shutting down the shared server after the final release, and retire pooled connections on forced refresh without interrupting other chats. ## Testing Add pool, runtime, app-server, and core scenario tests covering protocol gating, startup cancellation, refresh, final-release shutdown, and separate tool visibility and simultaneous input responses across chats sharing one process. GitOrigin-RevId: 896b107267a20ec1bffccdefca6c40fe2945a022
144 lines
5.5 KiB
Rust
144 lines
5.5 KiB
Rust
pub use binding::McpBinding;
|
|
pub use binding::PreparedMcpCall;
|
|
pub use client_capabilities::client_mcp_extensions;
|
|
pub use client_tool_catalog::CodexAppsToolSnapshot;
|
|
pub use codex_rmcp_client::McpProtocolMode;
|
|
pub use connection_manager::NetworkPolicyMetadata;
|
|
pub use connection_manager::NetworkPolicyMetadataProvider;
|
|
pub use connection_manager::tool_is_model_visible;
|
|
pub use connection_pool::McpConnectionPool;
|
|
pub use elicitation::ElicitationLifecycle;
|
|
pub use elicitation::ElicitationReviewRequest;
|
|
pub use elicitation::ElicitationReviewer;
|
|
pub use elicitation::ElicitationReviewerHandle;
|
|
pub use ema_auth::ema_auth_scope;
|
|
pub use event_stream::McpEventStreamOpener;
|
|
pub use resource_client::CodexAppsResourceListParams;
|
|
pub use resource_client::McpEventCatalogSnapshot;
|
|
pub use resource_client::McpEventDefinition;
|
|
pub use resource_client::McpEventNotification;
|
|
pub use resource_client::McpEventStream;
|
|
pub use resource_client::McpResourceClient;
|
|
pub use resource_client::McpResourceClientAuthKey;
|
|
pub use resource_client::McpResourceClientCacheKey;
|
|
pub use resource_client::McpResourcePage;
|
|
pub use resource_client::McpResourceReadResult;
|
|
pub use resource_client::McpResourceServerCacheKey;
|
|
pub use rmcp::model::ReadResourceRequestParams;
|
|
pub use rmcp_client::MCP_NETWORK_POLICY_META_CAPABILITY;
|
|
pub use runtime::McpRuntime;
|
|
pub use runtime::McpRuntimeContext;
|
|
pub use runtime::McpRuntimeInput;
|
|
pub use runtime::McpStartupPolicy;
|
|
pub use runtime::McpToolCallResult;
|
|
pub use runtime::apply_http_headers_helper;
|
|
pub use sandbox_metadata::MCP_SANDBOX_LAUNCHER_META_KEY;
|
|
pub use sandbox_metadata::MCP_SANDBOX_STATE_CAPABILITY;
|
|
pub use sandbox_metadata::MCP_SANDBOX_STATE_META_CAPABILITY;
|
|
pub use sandbox_metadata::SandboxState;
|
|
pub use tool_catalog_cache::McpToolCatalogCache;
|
|
pub use tools::ToolInfo;
|
|
pub use trusted_access::TrustedAccessContext;
|
|
|
|
/// Backward-compatible name for the shared Codex Apps tools runtime.
|
|
pub type CodexAppsToolsCache = codex_connectors::ConnectorRuntimeManager<ToolInfo>;
|
|
/// Backward-compatible name for the Codex Apps runtime context key.
|
|
pub type CodexAppsToolsCacheKey = codex_connectors::ConnectorRuntimeContextKey;
|
|
|
|
pub use catalog::McpCatalogBuilder;
|
|
pub use catalog::McpEnvironmentAuthority;
|
|
pub use catalog::McpPluginAttribution;
|
|
pub use catalog::McpServerConflict;
|
|
pub use catalog::McpServerConflictAction;
|
|
pub use catalog::McpServerRegistration;
|
|
pub use catalog::McpServerSource;
|
|
pub use catalog::ResolvedMcpCatalog;
|
|
pub use catalog::ResolvedMcpServer;
|
|
|
|
pub use mcp::CODEX_APPS_MCP_SERVER_NAME;
|
|
pub use mcp::DEFAULT_OPTIONAL_MCP_STARTUP_GRACE;
|
|
pub use mcp::McpConfig;
|
|
pub use mcp::ToolPluginContext;
|
|
pub use server::EffectiveMcpServer;
|
|
|
|
pub use auth_elicitation::CodexAppsAuthElicitation;
|
|
pub use auth_elicitation::CodexAppsAuthElicitationPlan;
|
|
pub use auth_elicitation::CodexAppsConnectorAuthFailure;
|
|
pub use auth_elicitation::MCP_TOOL_CODEX_APPS_META_KEY;
|
|
pub use auth_elicitation::auth_elicitation_completed_result;
|
|
pub use auth_elicitation::auth_elicitation_id;
|
|
pub use auth_elicitation::build_auth_elicitation;
|
|
pub use auth_elicitation::build_auth_elicitation_plan;
|
|
pub use auth_elicitation::connector_auth_failure_from_tool_result;
|
|
pub use auth_elicitation::is_connector_auth_failure_from_tool_result;
|
|
/// Backward-compatible name for the Codex Apps runtime context key builder.
|
|
pub use codex_connectors::connector_runtime_context_key as codex_apps_tools_cache_key;
|
|
pub use mcp::codex_apps_mcp_server_config;
|
|
pub use mcp::configured_mcp_servers;
|
|
pub use mcp::effective_mcp_servers;
|
|
pub use mcp::effective_mcp_servers_from_configured;
|
|
pub use mcp::host_owned_codex_apps_enabled;
|
|
pub use mcp::hosted_plugin_runtime_mcp_server_config;
|
|
pub use mcp::tool_plugin_context;
|
|
pub use plugin_config::PluginMcpConfigParseOutcome;
|
|
pub use plugin_config::PluginMcpServerParseError;
|
|
pub use plugin_config::normalize_executor_plugin_mcp_declarations;
|
|
pub use plugin_config::parse_agent_plugin_mcp_config;
|
|
pub use plugin_config::parse_executor_plugin_mcp_config;
|
|
pub use plugin_config::parse_plugin_mcp_config;
|
|
pub use plugin_config::parse_plugin_mcp_declarations;
|
|
|
|
pub use mcp::McpServerStatusSnapshot;
|
|
pub use mcp::McpSnapshotDetail;
|
|
pub use mcp::collect_mcp_server_status_snapshot_with_detail;
|
|
pub use mcp::read_mcp_resource;
|
|
|
|
pub use mcp::McpAuthStatusEntry;
|
|
pub use mcp::McpOAuthLoginConfig;
|
|
pub use mcp::McpOAuthLoginSupport;
|
|
pub use mcp::McpOAuthScopesSource;
|
|
pub use mcp::ResolvedMcpOAuthScopes;
|
|
pub use mcp::compute_auth_statuses;
|
|
pub use mcp::discover_supported_scopes;
|
|
pub use mcp::oauth_login_support;
|
|
pub use mcp::resolve_oauth_callback;
|
|
pub use mcp::resolve_oauth_scopes;
|
|
pub use mcp::should_retry_without_scopes;
|
|
|
|
pub use codex_apps::declared_openai_file_input_param_names;
|
|
pub use mcp::McpPermissionPromptAutoApproveContext;
|
|
pub use mcp::mcp_permission_prompt_is_auto_approved;
|
|
pub use mcp::qualified_mcp_tool_name_prefix;
|
|
|
|
mod auth_changes;
|
|
pub(crate) mod auth_elicitation;
|
|
mod binding;
|
|
pub(crate) mod binding_clients;
|
|
mod catalog;
|
|
mod client_capabilities;
|
|
mod client_tool_catalog;
|
|
pub(crate) mod codex_apps;
|
|
pub(crate) mod connection_manager;
|
|
mod connection_pool;
|
|
pub(crate) mod elicitation;
|
|
mod ema_account;
|
|
mod ema_auth;
|
|
mod ema_token_source;
|
|
pub use ema_account::EmaState;
|
|
mod event_stream;
|
|
mod executor_environment_http_client;
|
|
pub(crate) mod mcp;
|
|
mod openai_docs_source_attribution;
|
|
mod pagination;
|
|
mod plugin_config;
|
|
mod resource_client;
|
|
mod resource_origin;
|
|
pub(crate) mod rmcp_client;
|
|
pub(crate) mod runtime;
|
|
mod sandbox_executable;
|
|
mod sandbox_metadata;
|
|
pub(crate) mod server;
|
|
mod tool_catalog_cache;
|
|
pub(crate) mod tools;
|
|
mod trusted_access;
|