File size: 12,828 Bytes
17f328f | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 | use std::sync::Arc;
use std::sync::Weak;
use std::time::Duration;
use anyhow::Context;
use anyhow::Result;
use anyhow::anyhow;
use codex_protocol::mcp::Resource;
use codex_protocol::mcp::ResourceContent;
use codex_rmcp_client::CancellableEventStreamRequest;
use codex_rmcp_client::RmcpClient;
use rmcp::model::GetMeta;
use rmcp::model::PaginatedRequestParams;
use rmcp::model::ReadResourceRequestParams;
use rmcp::model::ServerResult;
use rmcp::service::ServiceError;
use serde::Deserialize;
use serde::Serialize;
use serde_json::Map;
use serde_json::Value;
use serde_json::json;
use tokio::runtime::Handle;
use tokio::sync::watch;
use crate::McpEventStreamOpener;
use crate::McpRuntime;
use crate::connection_manager::McpConnectionSet;
use crate::mcp::CODEX_APPS_MCP_SERVER_NAME;
/// One page of resources returned by an MCP server.
#[derive(Clone, Debug, PartialEq)]
pub struct McpResourcePage {
/// Resources advertised on this page.
pub resources: Vec<Resource>,
/// Opaque cursor to supply when requesting the next page.
pub next_cursor: Option<String>,
}
/// Parameters for one Codex Apps resource page.
///
/// Keep `mime_type` when requesting a continuation page: the server applies
/// the filter to each request separately.
#[derive(Clone, Debug, Serialize)]
#[serde(rename_all = "camelCase")]
pub struct CodexAppsResourceListParams {
#[serde(skip_serializing_if = "Option::is_none")]
pub cursor: Option<String>,
pub mime_type: String,
}
/// Contents returned after reading one MCP resource.
#[derive(Clone, Debug, PartialEq)]
pub struct McpResourceReadResult {
/// Text or blob content returned for the requested resource.
pub contents: Vec<ResourceContent>,
}
/// An event advertised by an MCP server.
#[derive(Clone, Debug, Deserialize, PartialEq)]
#[serde(rename_all = "camelCase")]
pub struct McpEventDefinition {
pub name: String,
pub description: String,
pub delivery: Vec<String>,
pub input_schema: Value,
pub payload_schema: Value,
}
/// Events returned from one stable MCP connection generation.
pub struct McpEventCatalogSnapshot {
pub cache_key: McpResourceClientCacheKey,
pub events: Vec<McpEventDefinition>,
}
/// One unmodified lifecycle notification from an MCP event subscription.
#[derive(Clone, Debug, PartialEq)]
pub struct McpEventNotification {
pub method: String,
pub params: Option<Value>,
}
/// Owns an MCP event subscription and cancels its request when dropped.
pub struct McpEventStream {
request: Option<CancellableEventStreamRequest>,
runtime_handle: Handle,
client: Option<Arc<RmcpClient>>,
cancel_event_streams_on_server_removal: watch::Receiver<()>,
}
impl McpEventStream {
pub(crate) async fn open(
client: Arc<RmcpClient>,
cancel_event_streams_on_server_removal: watch::Receiver<()>,
event_name: &str,
arguments: &Value,
request_meta: Option<&Map<String, Value>>,
) -> Result<Self> {
let mut params = json!({ "name": event_name, "arguments": arguments });
if let Some(request_meta) = request_meta {
params["_meta"] = Value::Object(request_meta.clone());
}
let request = client
.send_event_stream_request(Some(params))
.await
.context("events/stream request failed")?;
Ok(Self {
request: Some(request),
runtime_handle: Handle::current(),
client: Some(client),
cancel_event_streams_on_server_removal,
})
}
/// Receives the next raw lifecycle notification for this subscription.
pub async fn recv(&mut self) -> Result<Option<McpEventNotification>> {
let Some(request) = self.request.as_mut() else {
return Ok(None);
};
tokio::select! {
biased;
Ok(()) = self.cancel_event_streams_on_server_removal.changed() => {
self.cancel();
Err(anyhow!("hosted MCP event server was removed"))
}
Some(notification) = request.notifications.recv() => {
let metadata = notification.get_meta().0.0.clone();
let mut params = notification.params;
if !metadata.is_empty() {
params.get_or_insert_with(|| json!({}))["_meta"] = Value::Object(metadata);
}
Ok(Some(McpEventNotification {
method: notification.method,
params,
}))
}
response = &mut request.handle.rx => {
self.request = None;
self.client = None;
match response {
Ok(Ok(_))
| Ok(Err(ServiceError::Cancelled { .. }))
| Ok(Err(ServiceError::TransportClosed))
| Err(_) => Ok(None),
Ok(Err(error)) => Err(error.into()),
}
}
}
}
fn cancel(&mut self) {
if let Some(CancellableEventStreamRequest {
handle,
notifications,
}) = self.request.take()
{
drop(notifications);
let client = self.client.take();
self.runtime_handle.spawn(async move {
let _ = tokio::time::timeout(
Duration::from_secs(30),
handle.cancel(Some("event subscription closed".to_string())),
)
.await;
drop(client);
});
}
}
}
impl Drop for McpEventStream {
fn drop(&mut self) {
self.cancel();
}
}
#[derive(Deserialize)]
#[serde(rename_all = "camelCase")]
struct McpEventListResult {
events: Vec<McpEventDefinition>,
}
/// Access to MCP resources and event subscriptions through the latest runtime.
#[derive(Clone)]
pub struct McpResourceClient {
runtime: Arc<McpRuntime>,
}
/// Opaque identity for the connection set currently used by an MCP resource client.
#[derive(Clone)]
pub struct McpResourceClientCacheKey(Weak<McpConnectionSet>);
impl PartialEq for McpResourceClientCacheKey {
fn eq(&self, other: &Self) -> bool {
self.0.ptr_eq(&other.0)
}
}
impl Eq for McpResourceClientCacheKey {}
impl std::fmt::Debug for McpResourceClient {
fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
formatter
.debug_struct("McpResourceClient")
.finish_non_exhaustive()
}
}
impl McpResourceClient {
/// Creates a resource client that follows the thread's latest published runtime.
pub fn new(runtime: Arc<McpRuntime>) -> Self {
Self { runtime }
}
/// Returns the identity of the connection set used by this client.
pub fn cache_key(&self) -> McpResourceClientCacheKey {
McpResourceClientCacheKey(Arc::downgrade(&self.runtime.latest_connections()))
}
/// Returns whether this client can address the named server.
///
/// This does not wait for server startup.
pub async fn has_server(&self, server: &str) -> bool {
self.runtime.latest_connections().contains_server(server)
}
/// Lists one resource page from the named server.
pub async fn list_resources(
&self,
server: &str,
cursor: Option<String>,
) -> Result<McpResourcePage> {
let params =
cursor.map(|cursor| PaginatedRequestParams::default().with_cursor(Some(cursor)));
let result = self
.runtime
.latest_connections()
.list_resources(server, params)
.await?;
let resources = result
.resources
.into_iter()
.map(resource_from_rmcp)
.collect::<Result<Vec<_>>>()?;
Ok(McpResourcePage {
resources,
next_cursor: result.next_cursor,
})
}
/// Lists one Codex Apps resource page using plugin-service's top-level `mimeType` parameter.
pub async fn list_codex_apps_resources(
&self,
params: CodexAppsResourceListParams,
) -> Result<McpResourcePage> {
let params = serde_json::to_value(params)
.context("failed to serialize Codex Apps resource params")?;
let connections = self.runtime.latest_host_owned_codex_apps_connections()?;
let (managed, timeout) = connections
.client_by_name(CODEX_APPS_MCP_SERVER_NAME)
.await?;
let result = managed
.client
.send_custom_request_with_timeout("resources/list", Some(params), timeout)
.await
.context("resources/list failed for `codex_apps`")?;
let result = match result {
ServerResult::ListResourcesResult(result) => result,
ServerResult::CustomResult(result) => result
.result_as::<rmcp::model::ListResourcesResult>()
.context("resources/list returned invalid resources")?,
_ => return Err(anyhow!("resources/list returned an unexpected MCP result")),
};
let resources = result
.resources
.into_iter()
.map(resource_from_rmcp)
.collect::<Result<Vec<_>>>()?;
Ok(McpResourcePage {
resources,
next_cursor: result.next_cursor,
})
}
/// Reads one resource from the named server.
pub async fn read_resource(&self, server: &str, uri: &str) -> Result<McpResourceReadResult> {
let params = ReadResourceRequestParams::new(uri.to_string());
let result = self
.runtime
.latest_connections()
.read_resource(server, params)
.await?;
let contents = result
.contents
.into_iter()
.map(resource_content_from_rmcp)
.collect::<Result<Vec<_>>>()?;
Ok(McpResourceReadResult { contents })
}
/// Lists the events advertised by the MCP event server.
pub async fn list_events(&self) -> Result<McpEventCatalogSnapshot> {
let (connections, _) = self
.runtime
.latest_connections_for_event_server(CODEX_APPS_MCP_SERVER_NAME)?;
let cache_key = McpResourceClientCacheKey(Arc::downgrade(&connections));
let (managed, request_timeout) = connections
.client_by_name(CODEX_APPS_MCP_SERVER_NAME)
.await?;
let result = managed
.client
.send_custom_request_with_timeout("events/list", /*params*/ None, request_timeout)
.await
.context("events/list request failed")?;
let ServerResult::CustomResult(result) = result else {
return Err(anyhow!("events/list returned an unexpected MCP result"));
};
let result = result
.result_as::<McpEventListResult>()
.context("events/list returned invalid event definitions")?;
Ok(McpEventCatalogSnapshot {
cache_key,
events: result.events,
})
}
/// Opens an MCP event subscription with the supplied event arguments.
pub async fn open_event_stream(
&self,
event_name: &str,
arguments: &Value,
request_meta: Option<&Map<String, Value>>,
) -> Result<McpEventStream> {
let (connections, cancel_event_streams_on_server_removal) = self
.runtime
.latest_connections_for_event_server(CODEX_APPS_MCP_SERVER_NAME)?;
let (managed, _) = connections
.client_by_name(CODEX_APPS_MCP_SERVER_NAME)
.await?;
McpEventStream::open(
managed.client,
cancel_event_streams_on_server_removal,
event_name,
arguments,
request_meta,
)
.await
}
/// Creates an event stream opener using the task's event server settings.
pub fn event_stream_opener(&self) -> Result<McpEventStreamOpener> {
self.runtime.event_stream_opener()
}
/// Forwards event server removal to the owner of the task's subscriptions.
pub fn forward_event_server_removals_to(&self, cancellation: watch::Sender<()>) {
self.runtime.forward_event_server_removals_to(cancellation);
}
}
fn resource_from_rmcp(resource: rmcp::model::Resource) -> Result<Resource> {
let value = serde_json::to_value(resource).context("failed to serialize MCP resource")?;
Resource::from_mcp_value(value).context("failed to convert MCP resource")
}
fn resource_content_from_rmcp(content: rmcp::model::ResourceContents) -> Result<ResourceContent> {
let value =
serde_json::to_value(content).context("failed to serialize MCP resource content")?;
serde_json::from_value(value).context("failed to convert MCP resource content")
}
|