Skip to content

Commit 92d2e1d

Browse files
authored
Retry failed Codex Apps MCP startup (#29920)
## Problem The built-in Codex Apps MCP client shares a future for the full startup operation: connect, complete `initialize`, fetch the initial tools, and return a usable client. Sharing deduplicates startup work, but it also memoizes terminal errors. After a transient connection, handshake, or initial `tools/list` failure, later tool builds observe the same failed future. The thread cannot reconnect after the backend recovers and continues serving its startup-time cached tool snapshot, which may be empty or stale. ## Fix When Apps MCP startup ends in an error, Codex starts bounded recovery without putting startup latency on tool-router construction: 1. The current tool build immediately continues with the cached startup snapshot. 2. After the initial failure is reported, Codex starts one fresh full startup attempt in the background. 3. Concurrent tool builds share that in-flight attempt and also continue with cached tools. 4. On success, the recovered client becomes active, refreshes the Apps tools cache, emits a `Ready` startup status, and is reused by later operations. 5. On failure, the cache remains unchanged and later tool builds may start another background attempt after exponential cooldown: 1s, 2s, 4s, 8s, 16s, then 30s maximum. Each recreated startup performs a fresh MCP `initialize` and uncached `tools/list`. The MCP client retains its existing bounded retries for retryable `initialize` and `tools/list` failures. This avoids adding the Apps startup timeout to every request during a sustained outage. ## Scope This is limited to the built-in Codex Apps MCP client: - no reconnects for user-configured MCP servers; - no cache deletion; and - no proactive refresh for a healthy client with stale tools. ## Tests Coverage verifies: - tool builds return cached tools without waiting for a blocked reconnect; - concurrent tool builds start only one background reconnect; - failed reconnects preserve cached tools and respect exponential cooldown; - a recovered client is retained and reused; and - a long-lived thread exposes recovered app tools on a later follow-up. Validation: - `just test -p codex-mcp` — 95 passed - `just test -p codex-core later_follow_up_uses_background_recovered_apps_after_mid_thread_startup_failures --no-capture` — passed - `just fix -p codex-mcp` - `just fmt`
1 parent f5f8123 commit 92d2e1d

5 files changed

Lines changed: 766 additions & 50 deletions

File tree

codex-rs/codex-mcp/src/connection_manager.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ impl McpConnectionManager {
208208
};
209209
let async_managed_client = AsyncManagedClient::new(
210210
server_name.clone(),
211+
startup_submit_id.clone(),
211212
server,
212213
store_mode,
213214
keyring_backend_kind,
@@ -257,6 +258,10 @@ impl McpConnectionManager {
257258
)
258259
.await;
259260

261+
if matches!(&outcome, Err(StartupOutcomeError::Failed { .. })) {
262+
async_managed_client.reconnect_failed_startup().await;
263+
}
264+
260265
(server_name, outcome)
261266
});
262267
}
@@ -479,6 +484,7 @@ impl McpConnectionManager {
479484
pub async fn list_all_tools(&self) -> Vec<ToolInfo> {
480485
let mut tools = Vec::new();
481486
for (server_name, managed_client) in &self.clients {
487+
managed_client.reconnect_failed_startup().await;
482488
let has_cached_tools = managed_client.has_cached_tools();
483489
let startup_complete = managed_client
484490
.startup_complete

0 commit comments

Comments
 (0)