mirror of
https://github.com/openai/codex.git
synced 2026-11-22 15:15:18 +00:00
Start cached MCP servers lazily for subagents (#37261)
## Why Subagents can reuse cached MCP tool definitions without starting every optional server before any of its tools are used. ## What changed - Defer startup for subagent-owned, optional MCP servers when their cache has at least one visible, allowed tool, and trigger startup on the first operation that needs the live client. - Keep root sessions, required servers, selected plugin servers, and explicit reconnects eager. - Exclude empty catalogs from cache eligibility and keep dormant servers out of the initial startup summary. ## Testing - Extend MCP tool-cache coverage for eager root startup, unused and filtered subagent servers, deferred startup status events, and startup that survives an interrupted first tool call. GitOrigin-RevId: e7528ff08312583a6747cbc6550ea5b6eabda9a6
This commit is contained in:
1 parent
a17da5e6e4
commit
1151b23f01
13 files changed
+325
-31
No files matched your search
@@ -177,9 +177,6 @@ impl McpConnectionSet {
|
||||
let revision = self.tool_catalog_revision.read().await;
|
||||
let mut listed_tools = Vec::new();
|
||||
let mut clients = std::collections::HashMap::new();
|
||||
let optional_startup_deadline = *self
|
||||
.optional_startup_deadline
|
||||
.get_or_init(|| tokio::time::Instant::now() + OPTIONAL_MCP_STARTUP_GRACE);
|
||||
join_all(self.servers.iter().map(|(server_name, view)| async move {
|
||||
if !view
|
||||
.connection
|
||||
@@ -199,6 +196,13 @@ impl McpConnectionSet {
|
||||
return;
|
||||
}
|
||||
if !must_wait_for_startup {
|
||||
let optional_startup_deadline = if view.connection.startup_is_dormant() {
|
||||
tokio::time::Instant::now() + OPTIONAL_MCP_STARTUP_GRACE
|
||||
} else {
|
||||
*self.optional_startup_deadline.get_or_init(|| {
|
||||
tokio::time::Instant::now() + OPTIONAL_MCP_STARTUP_GRACE
|
||||
})
|
||||
};
|
||||
let startup_deadline = view
|
||||
.connection
|
||||
.client
|
||||
@@ -206,7 +210,7 @@ impl McpConnectionSet {
|
||||
.as_ref()
|
||||
.map(|cache| cache.optional_startup_deadline(optional_startup_deadline))
|
||||
.unwrap_or(optional_startup_deadline);
|
||||
if tokio::time::timeout_at(startup_deadline, view.connection.client.client())
|
||||
if tokio::time::timeout_at(startup_deadline, view.connection.client())
|
||||
.await
|
||||
.is_err()
|
||||
{
|
||||
@@ -214,7 +218,7 @@ impl McpConnectionSet {
|
||||
}
|
||||
return;
|
||||
}
|
||||
let _ = view.connection.client.client().await;
|
||||
let _ = view.connection.client().await;
|
||||
}
|
||||
}))
|
||||
.await;
|
||||
@@ -241,7 +245,7 @@ impl McpConnectionSet {
|
||||
return Some((server_name.clone(), None, server_tools));
|
||||
}
|
||||
view.connection.client.reconnect_failed_startup().await;
|
||||
let Ok(mut client) = view.connection.client.client().await else {
|
||||
let Ok(mut client) = view.connection.client().await else {
|
||||
trace!(server_name = %server_name, "omitting MCP server without an exact ready client");
|
||||
return None;
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user