mirror of
https://github.com/openai/codex.git
synced 2026-11-08 20:40:33 +00:00
## Why Pending requests can outlive a session switch, and different threads or connections can reuse request IDs. Replies and resolution notifications must stay associated with the request that prompted them. ## What changed - Retain the original app-server reply handle for pending and buffered requests, including requests replayed after thread attachment or session reset. - Scope user input, MCP elicitation, and user verification bookkeeping by thread, and send user input answers to the requesting thread. - Keep background resolution notifications from dismissing foreground prompts. - Consume failed replies to closed connections and clear pending replay state without falling through to another request route. ## Testing Add WebSocket regression tests for direct and buffered approvals with colliding request IDs and replies to closed connections. Extend coverage for foreground prompt preservation and thread-scoped user verification cancellation. GitOrigin-RevId: 541acb9910e92f6f2e83c27d2a2384185d4f8fec
138 lines
3.9 KiB
Rust
138 lines
3.9 KiB
Rust
//! Keeps the approved request bytes separate from the view and rejects late signing results.
|
|
|
|
use std::collections::HashMap;
|
|
|
|
use codex_app_server_protocol::McpServerElicitationRequest;
|
|
use codex_app_server_protocol::McpServerElicitationRequestParams;
|
|
use codex_app_server_protocol::RequestId;
|
|
use codex_app_server_protocol::UserVerificationVerifyParams;
|
|
use tokio_util::sync::CancellationToken;
|
|
use uuid::Uuid;
|
|
|
|
#[derive(Debug, Default)]
|
|
pub(super) struct UserVerificationRequests {
|
|
pending: HashMap<(String, String, RequestId), PendingVerification>,
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
struct PendingVerification {
|
|
params: UserVerificationVerifyParams,
|
|
attempt: Option<Uuid>,
|
|
cancelled: CancellationToken,
|
|
}
|
|
|
|
pub(super) struct UserVerificationAttempt {
|
|
pub(super) id: Uuid,
|
|
pub(super) params: UserVerificationVerifyParams,
|
|
pub(super) cancelled: CancellationToken,
|
|
}
|
|
|
|
impl Drop for PendingVerification {
|
|
fn drop(&mut self) {
|
|
self.cancelled.cancel();
|
|
}
|
|
}
|
|
|
|
impl UserVerificationRequests {
|
|
pub(super) fn note_request(
|
|
&mut self,
|
|
thread_id: &str,
|
|
request_id: &RequestId,
|
|
params: &McpServerElicitationRequestParams,
|
|
) {
|
|
if let McpServerElicitationRequest::UserVerification {
|
|
title,
|
|
description,
|
|
challenge,
|
|
..
|
|
} = ¶ms.request
|
|
{
|
|
self.pending.insert(
|
|
(
|
|
thread_id.to_string(),
|
|
params.server_name.clone(),
|
|
request_id.clone(),
|
|
),
|
|
PendingVerification {
|
|
params: UserVerificationVerifyParams {
|
|
title: title.clone(),
|
|
description: description.clone(),
|
|
challenge: challenge.clone(),
|
|
},
|
|
attempt: None,
|
|
cancelled: CancellationToken::new(),
|
|
},
|
|
);
|
|
}
|
|
}
|
|
|
|
pub(super) fn begin(
|
|
&mut self,
|
|
thread_id: &str,
|
|
server_name: &str,
|
|
request_id: &RequestId,
|
|
) -> Option<UserVerificationAttempt> {
|
|
let pending = self.pending.get_mut(&(
|
|
thread_id.to_string(),
|
|
server_name.to_string(),
|
|
request_id.clone(),
|
|
))?;
|
|
if pending.attempt.is_some() {
|
|
return None;
|
|
}
|
|
let attempt = Uuid::new_v4();
|
|
pending.attempt = Some(attempt);
|
|
Some(UserVerificationAttempt {
|
|
id: attempt,
|
|
params: pending.params.clone(),
|
|
cancelled: pending.cancelled.clone(),
|
|
})
|
|
}
|
|
|
|
pub(super) fn is_pending(
|
|
&self,
|
|
thread_id: &str,
|
|
server_name: &str,
|
|
request_id: &RequestId,
|
|
attempt: Uuid,
|
|
) -> bool {
|
|
self.pending
|
|
.get(&(
|
|
thread_id.to_string(),
|
|
server_name.to_string(),
|
|
request_id.clone(),
|
|
))
|
|
.is_some_and(|pending| pending.attempt == Some(attempt))
|
|
}
|
|
|
|
pub(super) fn remove(&mut self, thread_id: &str, server_name: &str, request_id: &RequestId) {
|
|
self.pending.remove(&(
|
|
thread_id.to_string(),
|
|
server_name.to_string(),
|
|
request_id.clone(),
|
|
));
|
|
}
|
|
|
|
pub(super) fn cancel_thread(&mut self, thread_id: &str) -> Vec<(String, RequestId)> {
|
|
let mut discarded = Vec::new();
|
|
self.pending
|
|
.retain(|(pending_thread_id, server_name, request_id), _| {
|
|
if pending_thread_id == thread_id {
|
|
discarded.push((server_name.clone(), request_id.clone()));
|
|
false
|
|
} else {
|
|
true
|
|
}
|
|
});
|
|
discarded
|
|
}
|
|
|
|
pub(super) fn clear(&mut self) {
|
|
self.pending.clear();
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
#[path = "user_verification_requests_tests.rs"]
|
|
mod tests;
|