mirror of
https://github.com/openai/codex.git
synced 2026-11-17 14:58:36 +00:00
Add MCP 2026-07-28 discovery support (#35724)
## What changed - Add an opt-in `mcp_2026_07_28` protocol mode while preserving the legacy lifecycle by default. - Negotiate the new protocol over streamable HTTP with `server/discover`, including bounded responses, redirect protection, and fallback only when a response establishes that the endpoint is legacy-only. - Require stdio servers to opt in with `CODEX_MCP_PROTOCOL_VERSION=2026-07-28`, and add a bounded local stdio transport for the modern lifecycle. - Consume paginated tool, resource, and resource-template catalogs in modern mode, reject repeated cursors, and retain discovered server identity. - Reconnect reusable MCP clients when their selected protocol mode changes. ## Testing - Cover HTTP JSON and SSE discovery, legacy fallback and rejection cases, redirects, retries, response limits, and pagination. - Cover local and executor stdio discovery, protocol markers, message limits, and legacy compatibility. GitOrigin-RevId: f6a78816e127d2a482292d63b91c8384f1595903
This commit is contained in:
1 parent
85c6da1c79
commit
be2e4afcd7
28 files changed
+2891
-105
No files matched your search
@@ -76,12 +76,9 @@ impl RmcpClient {
|
||||
}
|
||||
let attempt_timeout = remaining_initialize_timeout(timeout, retry_deadline)?;
|
||||
|
||||
match Self::connect_pending_transport(
|
||||
transport,
|
||||
client_service.clone(),
|
||||
attempt_timeout,
|
||||
)
|
||||
.await
|
||||
match self
|
||||
.connect_pending_transport(transport, client_service.clone(), attempt_timeout)
|
||||
.await
|
||||
{
|
||||
Ok(result) => return Ok(result),
|
||||
Err(error) if should_retry && Self::is_retryable_initialize_error(&error) => {
|
||||
@@ -124,7 +121,10 @@ impl RmcpClient {
|
||||
fn is_retryable_client_initialize_error(error: &rmcp::service::ClientInitializeError) -> bool {
|
||||
match error {
|
||||
rmcp::service::ClientInitializeError::TransportError { error, context }
|
||||
if context.as_ref() == "send initialize request" =>
|
||||
if matches!(
|
||||
context.as_ref(),
|
||||
"send initialize request" | "send discover request"
|
||||
) =>
|
||||
{
|
||||
error
|
||||
.error
|
||||
|
||||
Reference in new issue
Block a user