Files
codex/codex-rs/tui/src/app_event_sender.rs
T
Benjamin Carlsson 6f47fcb0be Route TUI request replies to their originating connection and thread (#53436)
## 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
2026-10-12 17:39:17 +00:00

172 lines
5.5 KiB
Rust

//! Convenience sender for app events and common outbound TUI commands.
//!
//! This wraps the raw channel so call sites can submit typed `AppCommand`s
//! without duplicating event construction or session logging behavior.
use std::path::PathBuf;
use std::sync::Arc;
use std::sync::atomic::AtomicBool;
use std::sync::atomic::Ordering;
use crate::app_command::AppCommand;
use crate::app_command::UserVerificationResponse;
use codex_app_server_protocol::CommandExecutionApprovalDecision;
use codex_app_server_protocol::FileChangeApprovalDecision;
use codex_app_server_protocol::McpServerElicitationAction;
use codex_app_server_protocol::RequestId as AppServerRequestId;
use codex_app_server_protocol::ReviewTarget;
use codex_app_server_protocol::ToolRequestUserInputResponse;
use codex_protocol::ThreadId;
use codex_protocol::request_permissions::RequestPermissionsResponse;
use tokio::sync::mpsc::UnboundedSender;
use crate::app_event::AppEvent;
use crate::session_log;
#[derive(Clone, Debug)]
pub(crate) struct AppEventSender {
pub app_event_tx: UnboundedSender<AppEvent>,
pub(crate) voice_only: Arc<AtomicBool>,
}
impl AppEventSender {
pub(crate) fn new(app_event_tx: UnboundedSender<AppEvent>) -> Self {
Self {
app_event_tx,
voice_only: Arc::default(),
}
}
/// Send an event to the app event channel. If it fails, we swallow the
/// error and log it.
pub(crate) fn send(&self, event: AppEvent) {
// A parked voice owner keeps processing its session, but its UI and queued
// typed work must not act on the visible session. Thread-scoped metadata still applies.
if self.voice_only.load(Ordering::Relaxed)
&& !matches!(
&event,
AppEvent::CodexOp(
AppCommand::RealtimeConversationStart { .. }
| AppCommand::RealtimeConversationStop { .. }
| AppCommand::RealtimeConversationSpeech { .. }
) | AppEvent::RealtimeWebrtcOfferCreated { .. }
| AppEvent::RealtimeWebrtcConnected { .. }
| AppEvent::StopRealtimeConversation { .. }
| AppEvent::RealtimeConversationStateChanged
| AppEvent::BackgroundVoiceError { .. }
| AppEvent::SyncThreadGitBranch { .. }
| AppEvent::RefreshRateLimits { .. }
)
{
return;
}
// Record inbound events for high-fidelity session replay.
// Avoid double-logging Ops; those are logged at the point of submission.
if !matches!(event, AppEvent::CodexOp(_)) {
session_log::log_inbound_app_event(&event);
}
if let Err(e) = self.app_event_tx.send(event) {
tracing::error!("failed to send event: {e}");
}
}
pub(crate) fn interrupt(&self) {
self.send(AppEvent::CodexOp(AppCommand::interrupt()));
}
pub(crate) fn compact(&self) {
self.send(AppEvent::CodexOp(AppCommand::compact()));
}
pub(crate) fn set_thread_name(&self, name: String) {
self.send(AppEvent::CodexOp(AppCommand::set_thread_name(name)));
}
pub(crate) fn review(&self, target: ReviewTarget) {
self.send(AppEvent::CodexOp(AppCommand::review(target)));
}
pub(crate) fn list_skills(&self, cwds: Vec<PathBuf>, force_reload: bool) {
self.send(AppEvent::CodexOp(AppCommand::list_skills(
cwds,
force_reload,
)));
}
pub(crate) fn user_input_answer(
&self,
thread_id: ThreadId,
id: String,
response: ToolRequestUserInputResponse,
) {
self.send(AppEvent::SubmitThreadOp {
thread_id,
op: AppCommand::user_input_answer(id, response),
});
}
pub(crate) fn exec_approval(
&self,
thread_id: ThreadId,
id: String,
decision: CommandExecutionApprovalDecision,
) {
self.send(AppEvent::SubmitThreadOp {
thread_id,
op: AppCommand::exec_approval(id, /*turn_id*/ None, decision),
});
}
pub(crate) fn request_permissions_response(
&self,
thread_id: ThreadId,
id: String,
response: RequestPermissionsResponse,
) {
self.send(AppEvent::SubmitThreadOp {
thread_id,
op: AppCommand::request_permissions_response(id, response),
});
}
pub(crate) fn patch_approval(
&self,
thread_id: ThreadId,
id: String,
decision: FileChangeApprovalDecision,
) {
self.send(AppEvent::SubmitThreadOp {
thread_id,
op: AppCommand::patch_approval(id, decision),
});
}
pub(crate) fn resolve_elicitation(
&self,
thread_id: ThreadId,
server_name: String,
request_id: AppServerRequestId,
decision: McpServerElicitationAction,
content: Option<serde_json::Value>,
meta: Option<serde_json::Value>,
) {
self.send(AppEvent::SubmitThreadOp {
thread_id,
op: AppCommand::resolve_elicitation(server_name, request_id, decision, content, meta),
});
}
pub(crate) fn resolve_user_verification(
&self,
thread_id: ThreadId,
server_name: String,
request_id: AppServerRequestId,
response: UserVerificationResponse,
) {
self.send(AppEvent::SubmitThreadOp {
thread_id,
op: AppCommand::resolve_user_verification(server_name, request_id, response),
});
}
}