Report runtime MCP connection status (#40068)

## Why

MCP inventory can be cached or collected separately from a thread's live
connections, so tool availability alone does not describe the current runtime
state.

## What changed

- Add a nullable `runtimeStatus` to `mcpServerStatus/list` for thread-scoped
  requests, covering not-started, starting, connected, authentication-required,
  failed, cancelled, and disabled connections.
- Observe published connection state without starting or reconnecting servers,
  and return an unknown status when no thread is supplied or the active
  configuration no longer matches the published registration.
- Show connection state and tool counts in the compact `/mcp` view while
  retaining the detailed inventory in `/mcp verbose` and compatibility with
  servers that omit `runtimeStatus`.

## Testing

- Cover runtime status transitions, deferred and disabled servers, closed
  transports, configuration changes, protocol compatibility, and TUI rendering.

GitOrigin-RevId: e3bb6efe652f0fa8b3c97d5c53e4729b3a87cd91
This commit is contained in:
Eric Traut authored and copyberry committed 2026-08-22 05:54:43 +00:00
1 parent 4f39251a01
commit 343074d420
34 files changed
+899 -48

No files matched your search

@@ -278,7 +278,7 @@ impl McpRequestProcessor {
let environment_manager = self.thread_manager.environment_manager();
tokio::spawn(async move {
let (mcp_config, runtime_context) = match thread {
let (mcp_config, runtime_context) = match thread.as_ref() {
Some(thread) => thread.runtime_mcp_config_and_context(&config).await,
None => {
let mcp_config = mcp_manager.runtime_config(&config).await;
@@ -288,41 +288,21 @@ impl McpRequestProcessor {
}
};
Self::list_mcp_server_status_task(
outgoing,
request,
let result = Self::list_mcp_server_status_response(
request.request_id.to_string(),
params,
mcp_config,
auth,
runtime_context,
mcp_manager,
thread,
)
.await;
outgoing.send_result(request, result).await;
});
Ok(())
}
async fn list_mcp_server_status_task(
outgoing: Arc<OutgoingMessageSender>,
request_id: ConnectionRequestId,
params: ListMcpServerStatusParams,
mcp_config: codex_mcp::McpConfig,
auth: Option<CodexAuth>,
runtime_context: McpRuntimeContext,
mcp_manager: Arc<McpManager>,
) {
let result = Self::list_mcp_server_status_response(
request_id.request_id.to_string(),
params,
mcp_config,
auth,
runtime_context,
mcp_manager,
)
.await;
outgoing.send_result(request_id, result).await;
}
async fn list_mcp_server_status_response(
request_id: String,
params: ListMcpServerStatusParams,
@@ -330,6 +310,7 @@ impl McpRequestProcessor {
auth: Option<CodexAuth>,
runtime_context: McpRuntimeContext,
mcp_manager: Arc<McpManager>,
thread: Option<Arc<codex_core::CodexThread>>,
) -> Result<ListMcpServerStatusResponse, JSONRPCErrorError> {
let detail = match params.detail.unwrap_or(McpServerStatusDetail::Full) {
McpServerStatusDetail::Full => McpSnapshotDetail::Full,
@@ -347,6 +328,10 @@ impl McpRequestProcessor {
)
.await;
let runtime_statuses = match thread {
Some(thread) => thread.mcp_connection_statuses(&mcp_config).await,
None => HashMap::new(),
};
let McpServerStatusSnapshot {
server_infos,
tools_by_server,
@@ -355,6 +340,7 @@ impl McpRequestProcessor {
auth_statuses,
mut server_names,
} = snapshot;
server_names.extend(runtime_statuses.keys().cloned());
server_names.extend(
auth_statuses
.keys()
@@ -388,6 +374,7 @@ impl McpRequestProcessor {
.iter()
.map(|name| McpServerStatus {
name: name.clone(),
runtime_status: runtime_statuses.get(name).copied().map(Into::into),
plugin_id: mcp_config.mcp_server_catalog.server(name).and_then(
|server| match server.source() {
McpServerSource::Plugin(plugin)