Negotiate MCP extensions per app-server session (#36910)

## Why

App-server clients need to advertise structured MCP extension settings, including supported MCP App UI MIME types, rather than only opting into OpenAI form elicitation with a boolean.

## What changed

- Add an `extensions` map to initialize capabilities and preserve `mcpServerOpenaiFormElicitation` as a legacy alias for `openai/form`.
- Capture the declared extension profile when a thread is started, resumed, or forked, propagate it to subagents, and advertise it to downstream MCP servers during initialization.
- Keep the profile stable for the lifetime of the loaded session instead of changing it on later turns or direct tool calls.

## Testing

- Cover extension conversion, downstream MCP initialization, session isolation, legacy form support, and subagent inheritance.

GitOrigin-RevId: fbcedbb74ce788e574b0f884a4c45c4cedb9de54
This commit is contained in:
Martin Au-Yeung
2026-08-04 15:23:43 +00:00
committed by copyberry
parent bab7c2dcc1
commit ee46c5ba0e
61 changed files with 729 additions and 284 deletions
@@ -2472,6 +2472,12 @@ mod tests {
"thread/started".to_string(),
"item/agentMessage/delta".to_string(),
]),
extensions: Some(std::collections::HashMap::from([(
"io.modelcontextprotocol/ui".to_string(),
json!({
"mimeTypes": ["text/html;profile=mcp-app"],
}),
)])),
}),
},
};
@@ -2493,7 +2499,12 @@ mod tests {
"optOutNotificationMethods": [
"thread/started",
"item/agentMessage/delta"
]
],
"extensions": {
"io.modelcontextprotocol/ui": {
"mimeTypes": ["text/html;profile=mcp-app"]
}
}
}
}
}),
@@ -2520,7 +2531,12 @@ mod tests {
"optOutNotificationMethods": [
"thread/started",
"item/agentMessage/delta"
]
],
"extensions": {
"io.modelcontextprotocol/ui": {
"mimeTypes": ["text/html;profile=mcp-app"]
}
}
}
}
}))?;
@@ -2543,6 +2559,12 @@ mod tests {
"thread/started".to_string(),
"item/agentMessage/delta".to_string(),
]),
extensions: Some(std::collections::HashMap::from([(
"io.modelcontextprotocol/ui".to_string(),
json!({
"mimeTypes": ["text/html;profile=mcp-app"],
}),
)])),
}),
},
}
@@ -50,13 +50,19 @@ pub struct InitializeCapabilities {
/// Opt into `attestation/generate` requests for upstream `x-oai-attestation`.
#[serde(default)]
pub request_attestation: bool,
/// Allow downstream MCP servers to request OpenAI extended form elicitations.
/// Legacy opt-in for the `openai/form` MCP extension.
///
/// New clients should declare `openai/form` in [`Self::extensions`].
#[serde(default, skip_serializing_if = "std::ops::Not::not")]
pub mcp_server_openai_form_elicitation: bool,
/// Exact notification method names that should be suppressed for this
/// connection (for example `thread/started`).
#[ts(optional = nullable)]
pub opt_out_notification_methods: Option<Vec<String>>,
/// MCP extension settings declared by the app-server client.
#[serde(skip_serializing_if = "Option::is_none")]
#[ts(optional = nullable)]
pub extensions: Option<HashMap<String, serde_json::Value>>,
}
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]