mirror of
https://github.com/openai/codex.git
synced 2026-09-16 12:13:30 +00:00
## What changed - Update the `rmcp` model and transport integrations for `3.0.0-beta.3`. - Preserve legacy `elicitation/create` form requests, schema defaults, metadata, and wire-format compatibility while adopting the new elicitation types. - Harden OAuth discovery by using GET-first discovery without starting an MCP session, preventing cross-origin header redirects, validating authorization-server and callback issuers, and retaining compatibility with metadata that omits an issuer. - Keep stored OAuth credentials readable and avoid requiring reauthorization after transient refresh failures. ## Testing - Add coverage for legacy elicitation round trips, OAuth discovery variants, callback issuer validation, credential migration, and refresh failures. GitOrigin-RevId: 756197d26f3fd347c28c400228f6b3d06ed493b7
142 lines
4.2 KiB
Rust
142 lines
4.2 KiB
Rust
use std::sync::Arc;
|
|
|
|
use rmcp::ClientHandler;
|
|
use rmcp::RoleClient;
|
|
use rmcp::model::CancelledNotificationParam;
|
|
use rmcp::model::ClientInfo;
|
|
use rmcp::model::ElicitRequestParams;
|
|
use rmcp::model::ElicitResult;
|
|
#[allow(deprecated)]
|
|
use rmcp::model::LoggingLevel;
|
|
#[allow(deprecated)]
|
|
use rmcp::model::LoggingMessageNotificationParam;
|
|
use rmcp::model::ProgressNotificationParam;
|
|
use rmcp::model::ResourceUpdatedNotificationParam;
|
|
use rmcp::service::NotificationContext;
|
|
use rmcp::service::RequestContext;
|
|
use tracing::debug;
|
|
use tracing::error;
|
|
use tracing::info;
|
|
use tracing::warn;
|
|
|
|
use crate::rmcp_client::Elicitation;
|
|
use crate::rmcp_client::SendElicitation;
|
|
|
|
#[derive(Clone)]
|
|
pub(crate) struct LoggingClientHandler {
|
|
client_info: ClientInfo,
|
|
send_elicitation: Arc<SendElicitation>,
|
|
}
|
|
|
|
impl LoggingClientHandler {
|
|
pub(crate) fn new(client_info: ClientInfo, send_elicitation: SendElicitation) -> Self {
|
|
Self {
|
|
client_info,
|
|
send_elicitation: Arc::new(send_elicitation),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl ClientHandler for LoggingClientHandler {
|
|
async fn create_elicitation(
|
|
&self,
|
|
request: ElicitRequestParams,
|
|
context: RequestContext<RoleClient>,
|
|
) -> Result<ElicitResult, rmcp::ErrorData> {
|
|
(self.send_elicitation)(context.id, Elicitation::Mcp(request))
|
|
.await
|
|
.map(Into::into)
|
|
.map_err(|err| rmcp::ErrorData::internal_error(err.to_string(), None))
|
|
}
|
|
|
|
async fn on_cancelled(
|
|
&self,
|
|
params: CancelledNotificationParam,
|
|
_context: NotificationContext<RoleClient>,
|
|
) {
|
|
info!(
|
|
"MCP server cancelled request (request_id: {:?}, reason: {:?})",
|
|
params.request_id, params.reason
|
|
);
|
|
}
|
|
|
|
async fn on_progress(
|
|
&self,
|
|
params: ProgressNotificationParam,
|
|
_context: NotificationContext<RoleClient>,
|
|
) {
|
|
info!(
|
|
"MCP server progress notification (token: {:?}, progress: {}, total: {:?}, message: {:?})",
|
|
params.progress_token, params.progress, params.total, params.message
|
|
);
|
|
}
|
|
|
|
async fn on_resource_updated(
|
|
&self,
|
|
params: ResourceUpdatedNotificationParam,
|
|
_context: NotificationContext<RoleClient>,
|
|
) {
|
|
info!("MCP server resource updated (uri: {})", params.uri);
|
|
}
|
|
|
|
async fn on_resource_list_changed(&self, _context: NotificationContext<RoleClient>) {
|
|
info!("MCP server resource list changed");
|
|
}
|
|
|
|
async fn on_tool_list_changed(&self, _context: NotificationContext<RoleClient>) {
|
|
info!("MCP server tool list changed");
|
|
}
|
|
|
|
async fn on_prompt_list_changed(&self, _context: NotificationContext<RoleClient>) {
|
|
info!("MCP server prompt list changed");
|
|
}
|
|
|
|
fn get_info(&self) -> ClientInfo {
|
|
self.client_info.clone()
|
|
}
|
|
|
|
#[allow(deprecated)]
|
|
async fn on_logging_message(
|
|
&self,
|
|
params: LoggingMessageNotificationParam,
|
|
_context: NotificationContext<RoleClient>,
|
|
) {
|
|
let LoggingMessageNotificationParam {
|
|
level,
|
|
logger,
|
|
data,
|
|
..
|
|
} = params;
|
|
let logger = logger.as_deref();
|
|
match level {
|
|
LoggingLevel::Emergency
|
|
| LoggingLevel::Alert
|
|
| LoggingLevel::Critical
|
|
| LoggingLevel::Error => {
|
|
error!(
|
|
"MCP server log message (level: {:?}, logger: {:?}, data: {})",
|
|
level, logger, data
|
|
);
|
|
}
|
|
LoggingLevel::Warning => {
|
|
warn!(
|
|
"MCP server log message (level: {:?}, logger: {:?}, data: {})",
|
|
level, logger, data
|
|
);
|
|
}
|
|
LoggingLevel::Notice | LoggingLevel::Info => {
|
|
info!(
|
|
"MCP server log message (level: {:?}, logger: {:?}, data: {})",
|
|
level, logger, data
|
|
);
|
|
}
|
|
LoggingLevel::Debug => {
|
|
debug!(
|
|
"MCP server log message (level: {:?}, logger: {:?}, data: {})",
|
|
level, logger, data
|
|
);
|
|
}
|
|
}
|
|
}
|
|
}
|