mirror of
https://github.com/openai/codex.git
synced 2026-11-17 14:58:36 +00:00
1 parent
a124ddb854
commit
32b1ae7099
22 files changed
+12
-559
No files matched your search
@@ -1,4 +1,3 @@
|
||||
use codex_builtin_mcps::BuiltinMcpServer;
|
||||
use codex_config::McpServerConfig;
|
||||
use codex_config::McpServerTransportConfig;
|
||||
|
||||
@@ -6,10 +5,9 @@ use codex_config::McpServerTransportConfig;
|
||||
#[derive(Debug, Clone)]
|
||||
pub(crate) enum McpServerLaunch {
|
||||
Configured(Box<McpServerConfig>),
|
||||
Builtin(BuiltinMcpServer),
|
||||
}
|
||||
|
||||
/// MCP server after product-owned runtime additions have been applied.
|
||||
/// MCP server after runtime additions have been applied.
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct EffectiveMcpServer {
|
||||
launch: McpServerLaunch,
|
||||
@@ -22,12 +20,6 @@ impl EffectiveMcpServer {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn builtin(server: BuiltinMcpServer) -> Self {
|
||||
Self {
|
||||
launch: McpServerLaunch::Builtin(server),
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn launch(&self) -> &McpServerLaunch {
|
||||
&self.launch
|
||||
}
|
||||
@@ -35,21 +27,18 @@ impl EffectiveMcpServer {
|
||||
pub fn configured_config(&self) -> Option<&McpServerConfig> {
|
||||
match &self.launch {
|
||||
McpServerLaunch::Configured(config) => Some(config.as_ref()),
|
||||
McpServerLaunch::Builtin(_) => None,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn enabled(&self) -> bool {
|
||||
match &self.launch {
|
||||
McpServerLaunch::Configured(config) => config.enabled,
|
||||
McpServerLaunch::Builtin(_) => true,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn required(&self) -> bool {
|
||||
match &self.launch {
|
||||
McpServerLaunch::Configured(config) => config.required,
|
||||
McpServerLaunch::Builtin(_) => false,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -57,7 +46,6 @@ impl EffectiveMcpServer {
|
||||
/// Transport origin retained for metrics and diagnostics after server launch.
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
pub(crate) enum McpServerOrigin {
|
||||
InProcess,
|
||||
Stdio,
|
||||
StreamableHttp(String),
|
||||
}
|
||||
@@ -65,7 +53,6 @@ pub(crate) enum McpServerOrigin {
|
||||
impl McpServerOrigin {
|
||||
pub fn as_str(&self) -> &str {
|
||||
match self {
|
||||
Self::InProcess => "in_process",
|
||||
Self::Stdio => "stdio",
|
||||
Self::StreamableHttp(origin) => origin,
|
||||
}
|
||||
@@ -98,11 +85,6 @@ impl From<&EffectiveMcpServer> for McpServerMetadata {
|
||||
origin: McpServerOrigin::from_transport(&config.transport),
|
||||
supports_parallel_tool_calls: config.supports_parallel_tool_calls,
|
||||
},
|
||||
McpServerLaunch::Builtin(server) => Self {
|
||||
pollutes_memory: server.pollutes_memory(),
|
||||
origin: Some(McpServerOrigin::InProcess),
|
||||
supports_parallel_tool_calls: server.supports_parallel_tool_calls(),
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user