File size: 17,425 Bytes
d90101d | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 | use std::collections::HashMap;
use std::sync::Arc;
use anyhow::Context;
use forge_app::domain::{
McpConfig, McpServerConfig, McpServers, ServerName, ToolCallFull, ToolDefinition, ToolName,
ToolOutput,
};
use forge_app::{
EnvironmentInfra, KVStore, McpClientInfra, McpConfigManager, McpServerInfra, McpService,
};
use tokio::sync::{Mutex, RwLock};
use crate::mcp::tool::McpExecutor;
fn generate_mcp_tool_name(server_name: &ServerName, tool_name: &ToolName) -> ToolName {
let sanitized_server_name = ToolName::sanitized(server_name.to_string().as_str());
let sanitized_tool_name = tool_name.clone().into_sanitized();
ToolName::new(format!(
"mcp_{sanitized_server_name}_tool_{sanitized_tool_name}"
))
}
#[derive(Clone)]
pub struct ForgeMcpService<M, I, C> {
tools: Arc<RwLock<HashMap<ToolName, ToolHolder<McpExecutor<C>>>>>,
failed_servers: Arc<RwLock<HashMap<ServerName, String>>>,
previous_config_hash: Arc<Mutex<u64>>,
init_lock: Arc<Mutex<()>>,
manager: Arc<M>,
infra: Arc<I>,
}
#[derive(Clone)]
struct ToolHolder<T> {
definition: ToolDefinition,
executable: T,
server_name: String,
}
impl<M, I, C> ForgeMcpService<M, I, C>
where
M: McpConfigManager,
I: McpServerInfra + KVStore + EnvironmentInfra,
C: McpClientInfra + Clone,
C: From<<I as McpServerInfra>::Client>,
{
pub fn new(manager: Arc<M>, infra: Arc<I>) -> Self {
Self {
tools: Default::default(),
failed_servers: Default::default(),
previous_config_hash: Arc::new(Mutex::new(Default::default())),
init_lock: Arc::new(Mutex::new(())),
manager,
infra,
}
}
async fn is_config_modified(&self, config: &McpConfig) -> bool {
*self.previous_config_hash.lock().await != config.cache_key()
}
async fn insert_clients(&self, server_name: &ServerName, client: Arc<C>) -> anyhow::Result<()> {
let tools = client.list().await?;
let mut tool_map = self.tools.write().await;
for mut tool in tools.into_iter() {
let actual_name = tool.name.clone();
let server = McpExecutor::new(actual_name, client.clone())?;
let generated_name = generate_mcp_tool_name(server_name, &tool.name);
tool.name = generated_name.clone();
tool_map.insert(
generated_name,
ToolHolder {
definition: tool,
executable: server,
server_name: server_name.to_string(),
},
);
}
Ok(())
}
async fn connect(
&self,
server_name: &ServerName,
config: McpServerConfig,
) -> anyhow::Result<()> {
let env_vars = self.infra.get_env_vars();
let environment = self.infra.get_environment();
let client = self.infra.connect(config, &env_vars, &environment).await?;
let client = Arc::new(C::from(client));
self.insert_clients(server_name, client).await?;
Ok(())
}
async fn ensure_mcp_initialized(&self) -> anyhow::Result<()> {
let raw_mcp = self.manager.read_mcp_config(None).await?;
// Fast path: if config is unchanged, skip reinitialization without acquiring
// the lock
if !self.is_config_modified(&raw_mcp).await {
return Ok(());
}
// Serialise concurrent initialisations so only one caller runs update_mcp at a
// time
let _guard = self.init_lock.lock().await;
// Double-check under the lock: a concurrent caller may have already updated
if !self.is_config_modified(&raw_mcp).await {
return Ok(());
}
// Apply the trust gate. The prompt was already shown at startup via
// init_mcp, so on first tool use the user's decision is re-applied by
// calling filter_trusted again.
let trusted_mcp = self.manager.filter_trusted(raw_mcp).await?;
self.update_mcp(trusted_mcp).await
}
async fn update_mcp(&self, mcp: McpConfig) -> Result<(), anyhow::Error> {
// Use the raw config hash (pre-trust-gate) so that is_config_modified always
// compares against the original file hash, preventing infinite re-prompt loops
// when some servers are rejected.
let new_hash = mcp.cache_key();
self.clear_tools().await;
// Clear failed servers map before attempting new connections
self.failed_servers.write().await.clear();
let connections: Vec<_> = mcp
.mcp_servers
.into_iter()
.filter(|v| !v.1.is_disabled())
.map(|(name, server)| async move {
let conn = self
.connect(&name, server)
.await
.context(format!("Failed to initiate MCP server: {name}"));
(name, conn)
})
.collect();
let results = futures::future::join_all(connections).await;
for (server_name, result) in results {
match result {
Ok(_) => {}
Err(error) => {
// Format error with full chain for detailed diagnostics
// Using Debug formatting with alternate flag shows the full error chain
let error_string = format!("{error:?}");
self.failed_servers
.write()
.await
.insert(server_name.clone(), error_string.clone());
}
}
}
// Write the hash only after join_all finishes so that any waiter on
// init_lock re-checks is_config_modified only once self.tools is fully
// populated, preventing "Tool not found" races.
*self.previous_config_hash.lock().await = new_hash;
Ok(())
}
async fn list(&self) -> anyhow::Result<McpServers> {
self.ensure_mcp_initialized().await?;
let tools = self.tools.read().await;
let mut grouped_tools = std::collections::HashMap::new();
for tool in tools.values() {
grouped_tools
.entry(ServerName::from(tool.server_name.clone()))
.or_insert_with(Vec::new)
.push(tool.definition.clone());
}
let failures = self.failed_servers.read().await.clone();
Ok(McpServers::new(grouped_tools, failures))
}
async fn clear_tools(&self) {
self.tools.write().await.clear()
}
async fn call(&self, call: ToolCallFull) -> anyhow::Result<ToolOutput> {
// Ensure MCP connections are initialized before calling tools
self.ensure_mcp_initialized().await?;
let tools = self.tools.read().await;
// Try exact match first, then fall back to legacy-format lookup for
// tool calls arriving in the Claude Code `mcp__{server}__{tool}` format.
let tool = tools
.get(&call.name)
.or_else(|| call.name.to_legacy_mcp_name().and_then(|n| tools.get(&n)))
.context("Tool not found")?;
tool.executable.call_tool(call.arguments.parse()?).await
}
/// Refresh the MCP cache by clearing cached data.
/// Does NOT eagerly connect to servers - connections happen lazily
/// when list() or call() is invoked, avoiding interactive OAuth during
/// reload.
async fn refresh_cache(&self) -> anyhow::Result<()> {
// Hold init_lock so we don't race with an in-flight update_mcp: without
// this, clear_tools could run while connections are still being
// established, leaving waiters released into an empty tool map.
let _guard = self.init_lock.lock().await;
// Clear the infra cache and reset config hash to force re-init on next access
self.infra.cache_clear().await?;
*self.previous_config_hash.lock().await = Default::default();
self.clear_tools().await;
self.failed_servers.write().await.clear();
Ok(())
}
}
#[async_trait::async_trait]
impl<M: McpConfigManager, I: McpServerInfra + KVStore + EnvironmentInfra, C> McpService
for ForgeMcpService<M, I, C>
where
C: McpClientInfra + Clone,
C: From<<I as McpServerInfra>::Client>,
{
async fn get_mcp_servers(&self) -> anyhow::Result<McpServers> {
// Apply the trust gate before computing the cache key so that rejected
// servers are excluded. Using the raw config hash would allow a stale KV
// cache entry (populated before a rejection) to be returned, bypassing
// filter_trusted entirely and leaking rejected tools into requests.
let raw_mcp = self.manager.read_mcp_config(None).await?;
let trusted_mcp = self.manager.filter_trusted(raw_mcp).await?;
let config_hash = trusted_mcp.cache_key();
// Check if cache is valid (exists and not expired)
if let Some(cache) = self.infra.cache_get::<_, McpServers>(&config_hash).await? {
return Ok(cache.clone());
}
let servers = self.list().await?;
self.infra.cache_set(&config_hash, &servers).await?;
Ok(servers)
}
async fn execute_mcp(&self, call: ToolCallFull) -> anyhow::Result<ToolOutput> {
self.call(call).await
}
async fn reload_mcp(&self) -> anyhow::Result<()> {
self.refresh_cache().await
}
async fn init_mcp(&self) -> anyhow::Result<()> {
// Run the trust gate prompt at startup so the user's decision is captured
// before any tool use. The result is intentionally discarded β servers are
// NOT connected here. Connections remain lazy and happen on first tool use
// via ensure_mcp_initialized.
let raw_mcp = self.manager.read_mcp_config(None).await?;
let _ = self.manager.filter_trusted(raw_mcp).await?;
Ok(())
}
}
#[cfg(test)]
mod tests {
use std::collections::BTreeMap;
use std::sync::Arc;
use fake::{Fake, Faker};
use forge_app::domain::{
ConfigOperation, Environment, McpConfig, McpServerConfig, Scope, ServerName, ToolCallFull,
ToolDefinition, ToolName, ToolOutput,
};
use forge_app::{
EnvironmentInfra, KVStore, McpClientInfra, McpConfigManager, McpServerInfra, McpService,
};
use forge_config::ForgeConfig;
use pretty_assertions::assert_eq;
use serde::de::DeserializeOwned;
use super::{ForgeMcpService, generate_mcp_tool_name};
// ββ Mock MCP client ββββββββββββββββββββββββββββββββββββββββββββββββββββββ
#[derive(Clone)]
struct MockMcpClient;
#[async_trait::async_trait]
impl McpClientInfra for MockMcpClient {
async fn list(&self) -> anyhow::Result<Vec<ToolDefinition>> {
Ok(vec![ToolDefinition::new("test_tool")])
}
async fn call(
&self,
_tool_name: &ToolName,
_input: serde_json::Value,
) -> anyhow::Result<ToolOutput> {
Ok(ToolOutput::text("mock result"))
}
}
// ββ Mock config manager ββββββββββββββββββββββββββββββββββββββββββββββββββ
struct MockMcpManager;
#[async_trait::async_trait]
impl McpConfigManager for MockMcpManager {
async fn read_mcp_config(&self, _scope: Option<&Scope>) -> anyhow::Result<McpConfig> {
let mut servers = BTreeMap::new();
servers.insert(
ServerName::from("test-server".to_string()),
McpServerConfig::new_stdio("echo", vec![], None),
);
Ok(McpConfig { mcp_servers: servers })
}
async fn write_mcp_config(
&self,
_config: &McpConfig,
_scope: &Scope,
) -> anyhow::Result<()> {
Ok(())
}
async fn filter_trusted(&self, raw: McpConfig) -> anyhow::Result<McpConfig> {
// In tests all configs are implicitly trusted.
Ok(raw)
}
}
// ββ Mock infrastructure ββββββββββββββββββββββββββββββββββββββββββββββββββ
#[derive(Clone)]
struct MockInfra;
#[async_trait::async_trait]
impl McpServerInfra for MockInfra {
type Client = MockMcpClient;
async fn connect(
&self,
_config: McpServerConfig,
_env_vars: &BTreeMap<String, String>,
_environment: &Environment,
) -> anyhow::Result<MockMcpClient> {
Ok(MockMcpClient)
}
}
#[async_trait::async_trait]
impl KVStore for MockInfra {
async fn cache_get<K, V>(&self, _key: &K) -> anyhow::Result<Option<V>>
where
K: std::hash::Hash + Sync,
V: serde::Serialize + DeserializeOwned + Send,
{
Ok(None)
}
async fn cache_set<K, V>(&self, _key: &K, _value: &V) -> anyhow::Result<()>
where
K: std::hash::Hash + Sync,
V: serde::Serialize + Sync,
{
Ok(())
}
async fn cache_clear(&self) -> anyhow::Result<()> {
Ok(())
}
}
impl EnvironmentInfra for MockInfra {
type Config = ForgeConfig;
fn get_env_var(&self, _key: &str) -> Option<String> {
None
}
fn get_env_vars(&self) -> BTreeMap<String, String> {
BTreeMap::new()
}
fn get_environment(&self) -> Environment {
Faker.fake()
}
fn get_config(&self) -> anyhow::Result<ForgeConfig> {
Ok(ForgeConfig::default())
}
async fn update_environment(&self, _ops: Vec<ConfigOperation>) -> anyhow::Result<()> {
Ok(())
}
}
// ββ Fixture ββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
fn fixture() -> ForgeMcpService<MockMcpManager, MockInfra, MockMcpClient> {
ForgeMcpService::new(Arc::new(MockMcpManager), Arc::new(MockInfra))
}
#[test]
fn test_generate_mcp_tool_name_uses_legacy_format() {
let fixture = ServerName::from("hugging-face".to_string());
let actual = generate_mcp_tool_name(&fixture, &ToolName::new("read-channel"));
let expected = ToolName::new("mcp_hugging_face_tool_read_channel");
assert_eq!(actual, expected);
}
#[test]
fn test_generate_mcp_tool_name_sanitizes_server_and_tool_names() {
let fixture = ServerName::from("claude.ai Slack".to_string());
let actual = generate_mcp_tool_name(&fixture, &ToolName::new("Add comment"));
let expected = ToolName::new("mcp_claude_ai_slack_tool_add_comment");
assert_eq!(actual, expected);
}
#[test]
fn test_to_legacy_mcp_name_converts_claude_code_format() {
let actual = ToolName::new("mcp__github__create_issue").to_legacy_mcp_name();
let expected = Some(ToolName::new("mcp_github_tool_create_issue"));
assert_eq!(actual, expected);
}
#[test]
fn test_to_legacy_mcp_name_converts_multipart_server_name() {
let actual = ToolName::new("mcp__hugging_face__read_channel").to_legacy_mcp_name();
let expected = Some(ToolName::new("mcp_hugging_face_tool_read_channel"));
assert_eq!(actual, expected);
}
#[test]
fn test_to_legacy_mcp_name_returns_none_for_non_mcp_tools() {
let actual = ToolName::new("read").to_legacy_mcp_name();
assert_eq!(actual, None);
}
#[test]
fn test_to_legacy_mcp_name_returns_none_for_legacy_format() {
// Already in legacy format β should not double-convert
let actual = ToolName::new("mcp_github_tool_create_issue").to_legacy_mcp_name();
assert_eq!(actual, None);
}
// ββ Concurrent initialisation test ββββββββββββββββββββββββββββββββββββββ
/// Verify that two concurrent callers of `get_mcp_servers` do not race:
/// after both futures settle, every registered tool must be callable
/// without a "Tool not found" error.
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn test_concurrent_init_does_not_race() {
let service = Arc::new(fixture());
let s1 = service.clone();
let s2 = service.clone();
let (r1, r2) = tokio::join!(s1.get_mcp_servers(), s2.get_mcp_servers());
r1.unwrap();
r2.unwrap();
let servers = service.get_mcp_servers().await.unwrap();
let tool_name = servers
.get_servers()
.values()
.flat_map(|tools| tools.iter())
.next()
.expect("at least one tool must be registered")
.name
.clone();
let call = ToolCallFull::new(tool_name);
let actual = service.execute_mcp(call).await.unwrap();
let expected = ToolOutput::text("mock result");
assert_eq!(actual, expected);
}
}
|