use llm::ToolDefinition;
use super::{
McpError, Result,
config::{McpServerConfig, ServerConfig},
connection::{ConnectParams, ConnectResult, McpServerConnection, ServerInstructions, Tool},
mcp_client::McpClient,
naming::{create_namespaced_tool_name, split_on_server_name},
oauth::{OAuthHandler, perform_oauth_flow},
tool_proxy::ToolProxy,
};
use rmcp::{
RoleClient,
model::{
CallToolRequestParams, ClientCapabilities, ClientInfo, CreateElicitationRequestParams, CreateElicitationResult,
ElicitationAction, FormElicitationCapability, Implementation, Root, UrlElicitationCapability,
},
service::RunningService,
transport::streamable_http_client::StreamableHttpClientTransportConfig,
};
use serde::{Deserialize, Serialize};
use serde_json::Value;
use std::collections::{HashMap, HashSet};
use std::sync::Arc;
use tokio::sync::{RwLock, mpsc, oneshot};
pub use crate::status::{McpServerStatus, McpServerStatusEntry};
#[derive(Debug)]
pub struct ElicitationRequest {
pub server_name: String,
pub request: CreateElicitationRequestParams,
pub response_sender: oneshot::Sender<CreateElicitationResult>,
}
#[derive(Debug, Clone)]
pub struct ElicitationResponse {
pub action: ElicitationAction,
pub content: Option<Value>,
}
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
pub struct UrlElicitationCompleteParams {
pub server_name: String,
pub elicitation_id: String,
}
#[derive(Debug)]
pub enum McpClientEvent {
Elicitation(ElicitationRequest),
UrlElicitationComplete(UrlElicitationCompleteParams),
}
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
enum Registration {
Direct,
Proxied,
}
pub struct McpManager {
servers: HashMap<String, McpServerConnection>,
tools: HashMap<String, Tool>,
tool_definitions: Vec<ToolDefinition>,
client_info: ClientInfo,
event_sender: mpsc::Sender<McpClientEvent>,
roots: Arc<RwLock<Vec<Root>>>,
oauth_handler: Option<Arc<dyn OAuthHandler>>,
server_statuses: Vec<McpServerStatusEntry>,
pending_configs: HashMap<String, StreamableHttpClientTransportConfig>,
proxy: Option<ToolProxy>,
}
impl McpManager {
pub fn new(event_sender: mpsc::Sender<McpClientEvent>, oauth_handler: Option<Arc<dyn OAuthHandler>>) -> Self {
let mut capabilities = ClientCapabilities::builder().enable_elicitation().enable_roots().build();
if let Some(elicitation) = capabilities.elicitation.as_mut() {
elicitation.form = Some(FormElicitationCapability::default());
elicitation.url = Some(UrlElicitationCapability::default());
}
Self {
servers: HashMap::new(),
tools: HashMap::new(),
tool_definitions: Vec::new(),
client_info: ClientInfo::new(capabilities, Implementation::new("aether", "0.1.0")),
event_sender,
roots: Arc::new(RwLock::new(Vec::new())),
oauth_handler,
server_statuses: Vec::new(),
pending_configs: HashMap::new(),
proxy: None,
}
}
fn create_mcp_client(&self, server_name: &str) -> McpClient {
McpClient::new(
self.client_info.clone(),
server_name.to_string(),
self.event_sender.clone(),
Arc::clone(&self.roots),
)
}
fn connect_params(&self, server_name: &str) -> ConnectParams {
ConnectParams { mcp_client: self.create_mcp_client(server_name), oauth_handler: self.oauth_handler.clone() }
}
fn set_status(&mut self, name: &str, status: McpServerStatus) {
if let Some(entry) = self.server_statuses.iter_mut().find(|s| s.name == name) {
entry.status = status;
} else {
self.server_statuses.push(McpServerStatusEntry { name: name.to_string(), status });
}
}
pub async fn add_mcps(&mut self, configs: Vec<McpServerConfig>) -> Result<()> {
for config in configs {
let name = config.name().to_string();
if let Err(e) = self.add_mcp(config).await {
tracing::warn!("Failed to connect to MCP server '{}': {}", name, e);
if !self.server_statuses.iter().any(|s| s.name == name) {
self.set_status(&name, McpServerStatus::Failed { error: e.to_string() });
}
}
}
Ok(())
}
pub async fn add_mcp_with_auth(&mut self, name: String, base_url: &str, auth_header: String) -> Result<()> {
let config = ServerConfig::Http {
name: name.clone(),
config: StreamableHttpClientTransportConfig::with_uri(base_url).auth_header(auth_header),
};
let params = self.connect_params(&name);
match McpServerConnection::connect(config, params).await {
ConnectResult::Connected(conn) => self.register_server(&name, conn, Registration::Direct).await,
ConnectResult::NeedsOAuth { error, .. } => Err(error),
ConnectResult::Failed(e) => Err(e),
}
}
pub async fn add_mcp(&mut self, config: McpServerConfig) -> Result<()> {
match config {
McpServerConfig::ToolProxy { name, servers } => self.connect_tool_proxy(name, servers).await,
McpServerConfig::Server(config) => {
let name = config.name().to_string();
let params = self.connect_params(&name);
match McpServerConnection::connect(config, params).await {
ConnectResult::Connected(conn) => self.register_server(&name, conn, Registration::Direct).await,
ConnectResult::NeedsOAuth { name, config, error } => {
self.pending_configs.insert(name.clone(), config);
self.set_status(&name, McpServerStatus::NeedsOAuth);
Err(error)
}
ConnectResult::Failed(e) => Err(e),
}
}
}
}
async fn connect_tool_proxy(&mut self, proxy_name: String, servers: Vec<ServerConfig>) -> Result<()> {
let tool_dir = ToolProxy::dir(&proxy_name)?;
ToolProxy::clean_dir(&tool_dir).await?;
let mut nested_names = HashSet::new();
let mut server_descriptions = Vec::new();
for config in servers {
let server_name = config.name().to_string();
let params = self.connect_params(&server_name);
let result = match McpServerConnection::connect(config, params).await {
ConnectResult::Connected(conn) => self.register_server(&server_name, conn, Registration::Proxied).await,
ConnectResult::NeedsOAuth { name, config, error } => {
self.pending_configs.insert(name.clone(), config);
self.set_status(&name, McpServerStatus::NeedsOAuth);
Err(error)
}
ConnectResult::Failed(e) => Err(e),
};
match result {
Ok(()) => {
if let Some(conn) = self.servers.get(&server_name) {
let client = conn.client.clone();
if let Err(e) = ToolProxy::write_tools_to_dir(&server_name, &client, &tool_dir).await {
tracing::warn!("Failed to write tool files for nested server '{server_name}': {e}");
}
let description = ToolProxy::extract_server_description(&client, &server_name);
server_descriptions.push((server_name.clone(), description));
}
nested_names.insert(server_name);
}
Err(e) => {
tracing::warn!("Failed to connect nested server '{server_name}': {e}");
if self.pending_configs.contains_key(&server_name) {
nested_names.insert(server_name);
}
}
}
}
let call_tool_def = ToolProxy::call_tool_definition(&proxy_name);
self.tools.insert(
call_tool_def.name.clone(),
Tool {
description: call_tool_def.description.clone(),
parameters: serde_json::from_str(&call_tool_def.parameters)
.unwrap_or(Value::Object(serde_json::Map::default())),
},
);
self.tool_definitions.push(call_tool_def);
self.proxy = Some(ToolProxy::new(proxy_name.clone(), nested_names, tool_dir, &server_descriptions));
self.set_status(&proxy_name, McpServerStatus::Connected { tool_count: 1 });
Ok(())
}
async fn oauth_and_reconnect(&mut self, name: String, config: StreamableHttpClientTransportConfig) -> Result<()> {
let handler = self
.oauth_handler
.as_ref()
.ok_or_else(|| McpError::ConnectionFailed(format!("No OAuth handler available for '{name}'")))?;
let auth_client = perform_oauth_flow(&name, &config.uri, handler.as_ref())
.await
.map_err(|e| McpError::ConnectionFailed(format!("OAuth failed for '{name}': {e}")))?;
let mcp_client = self.create_mcp_client(&name);
let conn = McpServerConnection::reconnect_with_auth(&name, config, auth_client, mcp_client).await?;
if let Some(proxy) = self.proxy.as_ref().filter(|p| p.contains_server(&name)) {
let tool_dir = proxy.tool_dir().to_path_buf();
self.register_server(&name, conn, Registration::Proxied).await?;
if let Some(conn) = self.servers.get(&name) {
let client = conn.client.clone();
if let Err(e) = ToolProxy::write_tools_to_dir(&name, &client, &tool_dir).await {
tracing::warn!("Failed to write tool files for '{name}' after OAuth: {e}");
}
}
Ok(())
} else {
self.register_server(&name, conn, Registration::Direct).await
}
}
async fn register_server(
&mut self,
name: &str,
conn: McpServerConnection,
registration: Registration,
) -> Result<()> {
let tools = conn
.list_tools()
.await
.map_err(|e| McpError::ToolDiscoveryFailed(format!("Failed to list tools for {name}: {e}")))?;
for rmcp_tool in &tools {
let tool_name = rmcp_tool.name.to_string();
let namespaced_tool_name = create_namespaced_tool_name(name, &tool_name);
let tool = Tool::from(rmcp_tool);
if registration == Registration::Direct {
self.tool_definitions.push(ToolDefinition {
name: namespaced_tool_name.clone(),
description: tool.description.clone(),
parameters: tool.parameters.to_string(),
server: Some(name.to_string()),
});
}
self.tools.insert(namespaced_tool_name, tool);
}
let tool_count = tools.len();
self.set_status(name, McpServerStatus::Connected { tool_count });
self.pending_configs.remove(name);
self.servers.insert(name.to_string(), conn);
Ok(())
}
pub fn get_client_for_tool(
&self,
namespaced_tool_name: &str,
arguments_json: &str,
) -> Result<(Arc<RunningService<RoleClient, McpClient>>, CallToolRequestParams)> {
if !self.tools.contains_key(namespaced_tool_name) {
return Err(McpError::ToolNotFound(namespaced_tool_name.to_string()));
}
let (server_name, tool_name) = split_on_server_name(namespaced_tool_name)
.ok_or_else(|| McpError::InvalidToolNameFormat(namespaced_tool_name.to_string()))?;
if let Some(proxy) = self.proxy.as_ref().filter(|p| p.name() == server_name) {
let call = proxy.resolve_call(arguments_json)?;
let conn = self
.servers
.get(&call.server)
.ok_or_else(|| McpError::ServerNotFound(format!("Nested server '{}' is not connected", call.server)))?;
let params = CallToolRequestParams::new(call.tool).with_arguments(call.arguments.unwrap_or_default());
return Ok((conn.client.clone(), params));
}
let client = self
.servers
.get(server_name)
.map(|server| server.client.clone())
.ok_or_else(|| McpError::ServerNotFound(server_name.to_string()))?;
let arguments = serde_json::from_str::<serde_json::Value>(arguments_json)?.as_object().cloned();
let mut params = CallToolRequestParams::new(tool_name.to_string());
if let Some(args) = arguments {
params = params.with_arguments(args);
}
Ok((client, params))
}
pub fn tool_definitions(&self) -> Vec<ToolDefinition> {
self.tool_definitions.clone()
}
pub fn server_instructions(&self) -> Vec<ServerInstructions> {
let mut instructions: Vec<ServerInstructions> = self
.servers
.iter()
.filter(|(name, _)| self.proxy.as_ref().is_none_or(|p| !p.contains_server(name)))
.filter_map(|(name, conn)| {
conn.instructions
.as_ref()
.map(|instr| ServerInstructions { server_name: name.clone(), instructions: instr.clone() })
})
.collect();
if let Some(proxy) = &self.proxy {
instructions.push(ServerInstructions {
server_name: proxy.name().to_string(),
instructions: proxy.instructions().to_string(),
});
}
instructions
}
pub fn server_statuses(&self) -> &[McpServerStatusEntry] {
&self.server_statuses
}
pub async fn authenticate_server(&mut self, name: &str) -> Result<()> {
let config = self
.pending_configs
.get(name)
.ok_or_else(|| McpError::ConnectionFailed(format!("no pending config for server '{name}'")))?
.clone();
self.oauth_and_reconnect(name.to_string(), config).await
}
pub async fn list_prompts(&self) -> Result<Vec<rmcp::model::Prompt>> {
use futures::future::join_all;
let futures: Vec<_> = self
.servers
.iter()
.filter(|(_, server_conn)| {
server_conn.client.peer_info().and_then(|info| info.capabilities.prompts.as_ref()).is_some()
})
.map(|(server_name, server_conn)| {
let server_name = server_name.clone();
let client = server_conn.client.clone();
async move {
let prompts_response = client.list_prompts(None).await.map_err(|e| {
McpError::PromptListFailed(format!("Failed to list prompts for {server_name}: {e}"))
})?;
let namespaced_prompts: Vec<rmcp::model::Prompt> = prompts_response
.prompts
.into_iter()
.map(|prompt| {
let namespaced_name = create_namespaced_tool_name(&server_name, &prompt.name);
rmcp::model::Prompt::new(namespaced_name, prompt.description, prompt.arguments)
})
.collect();
Ok::<_, McpError>(namespaced_prompts)
}
})
.collect();
let results = join_all(futures).await;
let mut all_prompts = Vec::new();
for result in results {
all_prompts.extend(result?);
}
Ok(all_prompts)
}
pub async fn get_prompt(
&self,
namespaced_prompt_name: &str,
arguments: Option<serde_json::Map<String, serde_json::Value>>,
) -> Result<rmcp::model::GetPromptResult> {
let (server_name, prompt_name) = split_on_server_name(namespaced_prompt_name)
.ok_or_else(|| McpError::InvalidToolNameFormat(namespaced_prompt_name.to_string()))?;
let server_conn =
self.servers.get(server_name).ok_or_else(|| McpError::ServerNotFound(server_name.to_string()))?;
let mut request = rmcp::model::GetPromptRequestParams::new(prompt_name);
if let Some(args) = arguments {
request = request.with_arguments(args);
}
server_conn.client.get_prompt(request).await.map_err(|e| {
McpError::PromptGetFailed(format!("Failed to get prompt '{prompt_name}' from {server_name}: {e}"))
})
}
pub async fn shutdown(&mut self) {
let servers: Vec<(String, McpServerConnection)> = self.servers.drain().collect();
for (server_name, server) in servers {
if let Some(handle) = server.server_task {
drop(server.client);
match tokio::time::timeout(std::time::Duration::from_secs(5), handle).await {
Ok(Ok(())) => {
tracing::info!("Server '{server_name}' shut down gracefully");
}
Ok(Err(e)) => {
tracing::warn!("Server '{server_name}' task panicked: {e:?}");
}
Err(_) => {
tracing::warn!("Server '{server_name}' shutdown timed out");
}
}
}
}
self.tools.clear();
self.tool_definitions.clear();
self.proxy = None;
}
pub async fn shutdown_server(&mut self, server_name: &str) -> Result<()> {
let server = self.servers.remove(server_name);
if let Some(server) = server {
if let Some(handle) = server.server_task {
drop(server.client);
match tokio::time::timeout(std::time::Duration::from_secs(5), handle).await {
Ok(Ok(())) => {
tracing::info!("Server '{server_name}' shut down gracefully");
}
Ok(Err(e)) => {
tracing::warn!("Server '{server_name}' task panicked: {e:?}");
}
Err(_) => {
tracing::warn!("Server '{server_name}' shutdown timed out");
}
}
}
self.tools.retain(|tool_name, _| !tool_name.starts_with(server_name));
self.tool_definitions.retain(|tool_def| !tool_def.name.starts_with(server_name));
}
Ok(())
}
pub async fn set_roots(&mut self, new_roots: Vec<Root>) -> Result<()> {
{
let mut roots = self.roots.write().await;
*roots = new_roots;
}
self.notify_roots_changed().await;
Ok(())
}
async fn notify_roots_changed(&self) {
for (server_name, server_conn) in &self.servers {
if let Err(e) = server_conn.client.notify_roots_list_changed().await {
tracing::debug!("Note: server '{server_name}' did not accept roots notification: {e}");
}
}
}
}
impl Drop for McpManager {
fn drop(&mut self) {
let servers: Vec<(String, McpServerConnection)> = self.servers.drain().collect();
for (server_name, server) in servers {
if let Some(handle) = server.server_task {
handle.abort();
tracing::warn!("Server '{server_name}' task aborted during cleanup");
}
}
}
}
#[cfg(test)]
mod tests {
use super::McpManager;
use crate::client::config::ServerConfig;
use rmcp::{
Json, RoleServer, ServerHandler,
handler::server::{router::tool::ToolRouter, wrapper::Parameters},
model::{Implementation, ServerCapabilities, ServerInfo},
service::DynService,
tool, tool_handler, tool_router,
};
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
use std::{
io,
sync::{Arc, Mutex},
};
use tokio::sync::mpsc;
#[derive(Clone)]
struct TestServer {
tool_router: ToolRouter<Self>,
}
#[tool_handler(router = self.tool_router)]
impl ServerHandler for TestServer {
fn get_info(&self) -> ServerInfo {
ServerInfo::new(ServerCapabilities::builder().enable_tools().build())
.with_server_info(Implementation::new("test-server", "0.1.0").with_description("Test MCP server"))
}
}
impl Default for TestServer {
fn default() -> Self {
Self { tool_router: Self::tool_router() }
}
}
#[derive(Debug, Deserialize, Serialize, JsonSchema)]
struct EchoRequest {
value: String,
}
#[derive(Debug, Deserialize, Serialize, JsonSchema)]
struct EchoResult {
value: String,
}
#[tool_router]
impl TestServer {
fn into_dyn(self) -> Box<dyn DynService<RoleServer>> {
Box::new(self)
}
#[tool(description = "Returns the provided value")]
async fn echo(&self, request: Parameters<EchoRequest>) -> Json<EchoResult> {
let Parameters(EchoRequest { value }) = request;
Json(EchoResult { value })
}
}
#[derive(Clone)]
struct SharedWriter(Arc<Mutex<Vec<u8>>>);
impl io::Write for SharedWriter {
fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
self.0.lock().unwrap().extend_from_slice(buf);
Ok(buf.len())
}
fn flush(&mut self) -> io::Result<()> {
Ok(())
}
}
#[tokio::test]
async fn drop_logs_cleanup_abort_with_tracing() {
let (event_sender, _event_receiver) = mpsc::channel(1);
let mut manager = McpManager::new(event_sender, None);
manager
.add_mcp(
ServerConfig::InMemory { name: "test".to_string(), server: TestServer::default().into_dyn() }.into(),
)
.await
.unwrap();
let output = Arc::new(Mutex::new(Vec::new()));
let subscriber = tracing_subscriber::fmt()
.with_ansi(false)
.without_time()
.with_writer({
let output = Arc::clone(&output);
move || SharedWriter(Arc::clone(&output))
})
.finish();
tracing::subscriber::with_default(subscriber, || {
drop(manager);
});
let logs = String::from_utf8(output.lock().unwrap().clone()).unwrap();
assert!(logs.contains("Server 'test' task aborted during cleanup"));
}
}