mirror of
https://github.com/openai/codex.git
synced 2026-11-17 22:10:37 +00:00
update
This commit is contained in:
@@ -77,6 +77,8 @@ use codex_login::CodexAuth;
|
||||
use codex_login::auth_env_telemetry::collect_auth_env_telemetry;
|
||||
use codex_login::default_client::originator;
|
||||
use codex_mcp::McpConnectionManager;
|
||||
use codex_mcp::McpToolCatalogSnapshot;
|
||||
use codex_mcp::McpToolCatalogUpdate;
|
||||
use codex_mcp::SandboxState;
|
||||
use codex_mcp::ToolInfo;
|
||||
use codex_mcp::codex_apps_tools_cache_key;
|
||||
@@ -277,8 +279,6 @@ use crate::injection::tool_kind_for_path;
|
||||
use crate::instructions::UserInstructions;
|
||||
use crate::mcp::McpManager;
|
||||
use crate::mcp_skill_dependencies::maybe_prompt_and_install_mcp_dependencies;
|
||||
use crate::mcp_tool_catalog::McpToolCatalogSnapshot;
|
||||
use crate::mcp_tool_catalog::McpToolCatalogUpdate;
|
||||
use crate::memories;
|
||||
use crate::mentions::build_connector_slug_counts;
|
||||
use crate::mentions::build_skill_name_counts;
|
||||
|
||||
@@ -10,8 +10,6 @@ use crate::config_loader::RequirementSource;
|
||||
use crate::config_loader::Sourced;
|
||||
use crate::exec::ExecCapturePolicy;
|
||||
use crate::function_tool::FunctionCallError;
|
||||
use crate::mcp_tool_catalog::McpToolCatalog;
|
||||
use crate::mcp_tool_catalog::McpToolCatalogUpdate;
|
||||
use crate::mcp_tool_exposure::DIRECT_MCP_TOOL_EXPOSURE_THRESHOLD;
|
||||
use crate::mcp_tool_exposure::build_mcp_tool_exposure;
|
||||
use crate::shell::default_user_shell;
|
||||
@@ -20,6 +18,8 @@ use crate::tools::format_exec_output_str;
|
||||
use codex_features::Features;
|
||||
use codex_login::CodexAuth;
|
||||
use codex_mcp::CODEX_APPS_MCP_SERVER_NAME;
|
||||
use codex_mcp::McpToolCatalog;
|
||||
use codex_mcp::McpToolCatalogUpdate;
|
||||
use codex_mcp::ToolInfo;
|
||||
use codex_model_provider_info::ModelProviderInfo;
|
||||
use codex_models_manager::bundled_models_response;
|
||||
|
||||
@@ -46,7 +46,6 @@ pub use landlock::spawn_command_under_linux_sandbox;
|
||||
pub(crate) mod mcp;
|
||||
mod mcp_skill_dependencies;
|
||||
mod mcp_tool_approval_templates;
|
||||
mod mcp_tool_catalog;
|
||||
mod mcp_tool_exposure;
|
||||
mod network_policy_decision;
|
||||
pub(crate) mod network_proxy_loader;
|
||||
|
||||
@@ -1,247 +0,0 @@
|
||||
use std::collections::HashMap;
|
||||
|
||||
use codex_mcp::ToolInfo;
|
||||
use codex_protocol::protocol::AdvertisedMcpToolCatalog;
|
||||
use codex_protocol::protocol::AdvertisedMcpToolInfo;
|
||||
use tracing::warn;
|
||||
|
||||
#[derive(Debug, Default)]
|
||||
pub(crate) struct McpToolCatalog {
|
||||
has_servers: bool,
|
||||
tools: HashMap<String, ToolInfo>,
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub(crate) struct McpToolCatalogUpdate {
|
||||
pub(crate) has_servers: bool,
|
||||
pub(crate) tools: HashMap<String, ToolInfo>,
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub(crate) struct McpToolCatalogSnapshot {
|
||||
pub(crate) has_servers: bool,
|
||||
pub(crate) tools: HashMap<String, ToolInfo>,
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub(crate) struct McpToolCatalogMerge {
|
||||
pub(crate) snapshot: McpToolCatalogSnapshot,
|
||||
pub(crate) changed: bool,
|
||||
}
|
||||
|
||||
impl McpToolCatalog {
|
||||
pub(crate) fn merge(&mut self, update: McpToolCatalogUpdate) -> McpToolCatalogMerge {
|
||||
let McpToolCatalogUpdate { has_servers, tools } = update;
|
||||
let mut changed = false;
|
||||
if has_servers && !self.has_servers {
|
||||
self.has_servers = true;
|
||||
changed = true;
|
||||
}
|
||||
for (name, tool) in tools {
|
||||
if let std::collections::hash_map::Entry::Vacant(entry) = self.tools.entry(name) {
|
||||
entry.insert(tool);
|
||||
changed = true;
|
||||
}
|
||||
}
|
||||
McpToolCatalogMerge {
|
||||
snapshot: self.snapshot(),
|
||||
changed,
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn snapshot(&self) -> McpToolCatalogSnapshot {
|
||||
McpToolCatalogSnapshot {
|
||||
has_servers: self.has_servers,
|
||||
tools: self.tools.clone(),
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn resolve(&self, name: &str, namespace: Option<&str>) -> Option<ToolInfo> {
|
||||
let qualified_name = qualified_mcp_tool_name(name, namespace);
|
||||
self.tools.get(&qualified_name).cloned()
|
||||
}
|
||||
}
|
||||
|
||||
impl McpToolCatalogUpdate {
|
||||
pub(crate) fn from_advertised(catalog: AdvertisedMcpToolCatalog) -> Self {
|
||||
let tools = catalog
|
||||
.tools
|
||||
.into_iter()
|
||||
.filter_map(
|
||||
|(name, tool)| match advertised_tool_info_into_tool_info(tool) {
|
||||
Ok(tool) => Some((name, tool)),
|
||||
Err(err) => {
|
||||
warn!("failed to hydrate advertised MCP tool {name} from rollout: {err}");
|
||||
None
|
||||
}
|
||||
},
|
||||
)
|
||||
.collect();
|
||||
Self {
|
||||
has_servers: catalog.has_servers,
|
||||
tools,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl McpToolCatalogSnapshot {
|
||||
pub(crate) fn to_advertised(&self) -> Option<AdvertisedMcpToolCatalog> {
|
||||
if !self.has_servers && self.tools.is_empty() {
|
||||
return None;
|
||||
}
|
||||
|
||||
let tools = self
|
||||
.tools
|
||||
.iter()
|
||||
.filter_map(
|
||||
|(name, tool)| match advertised_tool_info_from_tool_info(tool) {
|
||||
Ok(tool) => Some((name.clone(), tool)),
|
||||
Err(err) => {
|
||||
warn!("failed to persist advertised MCP tool {name}: {err}");
|
||||
None
|
||||
}
|
||||
},
|
||||
)
|
||||
.collect();
|
||||
|
||||
Some(AdvertisedMcpToolCatalog {
|
||||
has_servers: self.has_servers,
|
||||
tools,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
fn advertised_tool_info_from_tool_info(
|
||||
tool: &ToolInfo,
|
||||
) -> serde_json::Result<AdvertisedMcpToolInfo> {
|
||||
Ok(AdvertisedMcpToolInfo {
|
||||
server_name: tool.server_name.clone(),
|
||||
callable_name: tool.callable_name.clone(),
|
||||
callable_namespace: tool.callable_namespace.clone(),
|
||||
server_instructions: tool.server_instructions.clone(),
|
||||
tool: serde_json::to_value(&tool.tool)?,
|
||||
connector_id: tool.connector_id.clone(),
|
||||
connector_name: tool.connector_name.clone(),
|
||||
plugin_display_names: tool.plugin_display_names.clone(),
|
||||
connector_description: tool.connector_description.clone(),
|
||||
})
|
||||
}
|
||||
|
||||
fn advertised_tool_info_into_tool_info(
|
||||
tool: AdvertisedMcpToolInfo,
|
||||
) -> serde_json::Result<ToolInfo> {
|
||||
Ok(ToolInfo {
|
||||
server_name: tool.server_name,
|
||||
callable_name: tool.callable_name,
|
||||
callable_namespace: tool.callable_namespace,
|
||||
server_instructions: tool.server_instructions,
|
||||
tool: serde_json::from_value(tool.tool)?,
|
||||
connector_id: tool.connector_id,
|
||||
connector_name: tool.connector_name,
|
||||
plugin_display_names: tool.plugin_display_names,
|
||||
connector_description: tool.connector_description,
|
||||
})
|
||||
}
|
||||
|
||||
fn qualified_mcp_tool_name(name: &str, namespace: Option<&str>) -> String {
|
||||
match namespace {
|
||||
Some(namespace) if name.starts_with(namespace) => name.to_string(),
|
||||
Some(namespace) => format!("{namespace}{name}"),
|
||||
None => name.to_string(),
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use std::sync::Arc;
|
||||
|
||||
use rmcp::model::Tool;
|
||||
use serde_json::Map as JsonObject;
|
||||
|
||||
use super::*;
|
||||
|
||||
fn tool_info(server_name: &str, callable_name: &str) -> ToolInfo {
|
||||
ToolInfo {
|
||||
server_name: server_name.to_string(),
|
||||
callable_name: callable_name.to_string(),
|
||||
callable_namespace: format!("mcp__{server_name}__"),
|
||||
server_instructions: None,
|
||||
tool: Tool {
|
||||
name: callable_name.to_string().into(),
|
||||
title: None,
|
||||
description: Some(format!("Test tool: {callable_name}").into()),
|
||||
input_schema: Arc::new(JsonObject::default()),
|
||||
output_schema: None,
|
||||
annotations: None,
|
||||
execution: None,
|
||||
icons: None,
|
||||
meta: None,
|
||||
},
|
||||
connector_id: None,
|
||||
connector_name: None,
|
||||
plugin_display_names: Vec::new(),
|
||||
connector_description: None,
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn merge_preserves_first_seen_tool_definition() {
|
||||
let mut catalog = McpToolCatalog::default();
|
||||
catalog.merge(McpToolCatalogUpdate {
|
||||
has_servers: true,
|
||||
tools: HashMap::from([(
|
||||
"mcp__observability__get_dashboard".to_string(),
|
||||
tool_info("observability", "get_dashboard"),
|
||||
)]),
|
||||
});
|
||||
catalog.merge(McpToolCatalogUpdate {
|
||||
has_servers: true,
|
||||
tools: HashMap::from([(
|
||||
"mcp__observability__get_dashboard".to_string(),
|
||||
tool_info("other", "replacement"),
|
||||
)]),
|
||||
});
|
||||
|
||||
let resolved = catalog
|
||||
.resolve("mcp__observability__get_dashboard", None)
|
||||
.expect("tool should resolve");
|
||||
assert_eq!(resolved.server_name, "observability");
|
||||
assert_eq!(resolved.tool.name.as_ref(), "get_dashboard");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn resolve_matches_namespaced_tool_calls() {
|
||||
let mut catalog = McpToolCatalog::default();
|
||||
catalog.merge(McpToolCatalogUpdate {
|
||||
has_servers: true,
|
||||
tools: HashMap::from([(
|
||||
"mcp__observability__get_dashboard".to_string(),
|
||||
tool_info("observability", "get_dashboard"),
|
||||
)]),
|
||||
});
|
||||
|
||||
let resolved = catalog
|
||||
.resolve("get_dashboard", Some("mcp__observability__"))
|
||||
.expect("tool should resolve");
|
||||
assert_eq!(resolved.server_name, "observability");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn merge_preserves_advertised_server_presence() {
|
||||
let mut catalog = McpToolCatalog::default();
|
||||
let merged = catalog.merge(McpToolCatalogUpdate {
|
||||
has_servers: true,
|
||||
tools: HashMap::new(),
|
||||
});
|
||||
assert!(merged.changed);
|
||||
assert!(merged.snapshot.has_servers);
|
||||
|
||||
let merged = catalog.merge(McpToolCatalogUpdate {
|
||||
has_servers: false,
|
||||
tools: HashMap::new(),
|
||||
});
|
||||
assert!(!merged.changed);
|
||||
assert!(merged.snapshot.has_servers);
|
||||
assert!(merged.snapshot.tools.is_empty());
|
||||
}
|
||||
}
|
||||
@@ -9,10 +9,10 @@ use std::collections::HashSet;
|
||||
use crate::codex::PreviousTurnSettings;
|
||||
use crate::codex::SessionConfiguration;
|
||||
use crate::context_manager::ContextManager;
|
||||
use crate::mcp_tool_catalog::McpToolCatalog;
|
||||
use crate::mcp_tool_catalog::McpToolCatalogMerge;
|
||||
use crate::mcp_tool_catalog::McpToolCatalogUpdate;
|
||||
use crate::session_startup_prewarm::SessionStartupPrewarmHandle;
|
||||
use codex_mcp::McpToolCatalog;
|
||||
use codex_mcp::McpToolCatalogMerge;
|
||||
use codex_mcp::McpToolCatalogUpdate;
|
||||
use codex_mcp::ToolInfo;
|
||||
use codex_protocol::protocol::RateLimitSnapshot;
|
||||
use codex_protocol::protocol::TokenUsage;
|
||||
|
||||
Reference in New Issue
Block a user