mirror of
https://github.com/openai/codex.git
synced 2026-11-15 21:50:46 +00:00
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
This commit is contained in:
committed by
copyberry
parent
b3c3bad976
commit
6f47fcb0be
@@ -51,6 +51,7 @@ use codex_app_server_protocol::ToolRequestUserInputOption;
|
||||
use codex_app_server_protocol::ToolRequestUserInputParams;
|
||||
use codex_app_server_protocol::ToolRequestUserInputQuestion;
|
||||
use codex_app_server_protocol::ToolRequestUserInputResponse;
|
||||
use codex_protocol::ThreadId;
|
||||
use codex_protocol::user_input::TextElement;
|
||||
use unicode_width::UnicodeWidthStr;
|
||||
|
||||
@@ -897,7 +898,12 @@ impl RequestUserInputOverlay {
|
||||
},
|
||||
);
|
||||
}
|
||||
let Ok(thread_id) = ThreadId::from_string(&self.request.thread_id) else {
|
||||
tracing::error!("user input request had an invalid thread ID");
|
||||
return;
|
||||
};
|
||||
self.app_event_tx.user_input_answer(
|
||||
thread_id,
|
||||
self.request.turn_id.clone(),
|
||||
ToolRequestUserInputResponse {
|
||||
answers: answers.clone(),
|
||||
@@ -916,7 +922,12 @@ impl RequestUserInputOverlay {
|
||||
fn submit_empty_auto_resolution(&mut self, now: Instant) {
|
||||
self.confirm_unanswered = None;
|
||||
let answers: HashMap<String, ToolRequestUserInputAnswer> = HashMap::new();
|
||||
let Ok(thread_id) = ThreadId::from_string(&self.request.thread_id) else {
|
||||
tracing::error!("user input request had an invalid thread ID");
|
||||
return;
|
||||
};
|
||||
self.app_event_tx.user_input_answer(
|
||||
thread_id,
|
||||
self.request.turn_id.clone(),
|
||||
ToolRequestUserInputResponse {
|
||||
answers: answers.clone(),
|
||||
@@ -1705,7 +1716,7 @@ mod tests {
|
||||
questions: Vec<ToolRequestUserInputQuestion>,
|
||||
) -> ToolRequestUserInputParams {
|
||||
ToolRequestUserInputParams {
|
||||
thread_id: "thread-1".to_string(),
|
||||
thread_id: "00000000-0000-0000-0000-000000000001".to_string(),
|
||||
item_id: "call-1".to_string(),
|
||||
turn_id: turn_id.to_string(),
|
||||
questions,
|
||||
@@ -1714,6 +1725,19 @@ mod tests {
|
||||
}
|
||||
}
|
||||
|
||||
fn expect_user_input_answer(
|
||||
event: AppEvent,
|
||||
) -> (ThreadId, String, ToolRequestUserInputResponse) {
|
||||
let AppEvent::SubmitThreadOp {
|
||||
thread_id,
|
||||
op: Op::UserInputAnswer { id, response },
|
||||
} = event
|
||||
else {
|
||||
panic!("expected thread-scoped UserInputAnswer event");
|
||||
};
|
||||
(thread_id, id, response)
|
||||
}
|
||||
|
||||
fn request_event_with_auto_resolution(
|
||||
turn_id: &str,
|
||||
questions: Vec<ToolRequestUserInputQuestion>,
|
||||
@@ -1851,9 +1875,8 @@ mod tests {
|
||||
assert!(overlay.done);
|
||||
|
||||
let event = rx.try_recv().expect("expected UserInputAnswer event");
|
||||
let AppEvent::CodexOp(Op::UserInputAnswer { id, response }) = event else {
|
||||
panic!("expected UserInputAnswer event");
|
||||
};
|
||||
let (thread_id, id, response) = expect_user_input_answer(event);
|
||||
assert_eq!(thread_id.to_string(), overlay.request.thread_id);
|
||||
assert_eq!(id, "turn-1");
|
||||
assert_eq!(response.answers, HashMap::new());
|
||||
}
|
||||
@@ -1976,9 +1999,8 @@ mod tests {
|
||||
assert!(overlay.done);
|
||||
|
||||
let event = rx.try_recv().expect("expected UserInputAnswer event");
|
||||
let AppEvent::CodexOp(Op::UserInputAnswer { id, response }) = event else {
|
||||
panic!("expected UserInputAnswer event");
|
||||
};
|
||||
let (thread_id, id, response) = expect_user_input_answer(event);
|
||||
assert_eq!(thread_id.to_string(), overlay.request.thread_id);
|
||||
assert_eq!(id, "turn-1");
|
||||
assert_eq!(response.answers, HashMap::new());
|
||||
|
||||
@@ -2155,7 +2177,7 @@ mod tests {
|
||||
let (tx, mut rx) = test_sender();
|
||||
let mut overlay = RequestUserInputOverlay::new(
|
||||
ToolRequestUserInputParams {
|
||||
thread_id: "thread-1".to_string(),
|
||||
thread_id: "00000000-0000-0000-0000-000000000001".to_string(),
|
||||
item_id: "call-1".to_string(),
|
||||
turn_id: "turn-1".to_string(),
|
||||
questions: vec![question_with_options("q1", "First")],
|
||||
@@ -2222,9 +2244,8 @@ mod tests {
|
||||
overlay.submit_answers();
|
||||
|
||||
let event = rx.try_recv().expect("expected AppEvent");
|
||||
let AppEvent::CodexOp(Op::UserInputAnswer { id, response, .. }) = event else {
|
||||
panic!("expected UserInputAnswer");
|
||||
};
|
||||
let (thread_id, id, response) = expect_user_input_answer(event);
|
||||
assert_eq!(thread_id.to_string(), overlay.request.thread_id);
|
||||
assert_eq!(id, "turn-1");
|
||||
let answer = response.answers.get("q1").expect("answer missing");
|
||||
assert_eq!(answer.answers, Vec::<String>::new());
|
||||
@@ -2244,9 +2265,7 @@ mod tests {
|
||||
overlay.handle_key_event(KeyEvent::from(KeyCode::Enter));
|
||||
|
||||
let event = rx.try_recv().expect("expected AppEvent");
|
||||
let AppEvent::CodexOp(Op::UserInputAnswer { response, .. }) = event else {
|
||||
panic!("expected UserInputAnswer");
|
||||
};
|
||||
let (_, _, response) = expect_user_input_answer(event);
|
||||
let answer = response.answers.get("q1").expect("answer missing");
|
||||
assert_eq!(answer.answers, vec!["Option 1".to_string()]);
|
||||
}
|
||||
@@ -2280,9 +2299,7 @@ mod tests {
|
||||
|
||||
overlay.handle_key_event(KeyEvent::from(KeyCode::Enter));
|
||||
let event = rx.try_recv().expect("expected AppEvent");
|
||||
let AppEvent::CodexOp(Op::UserInputAnswer { response, .. }) = event else {
|
||||
panic!("expected UserInputAnswer");
|
||||
};
|
||||
let (_, _, response) = expect_user_input_answer(event);
|
||||
let mut expected = HashMap::new();
|
||||
expected.insert(
|
||||
"q1".to_string(),
|
||||
@@ -2313,9 +2330,7 @@ mod tests {
|
||||
overlay.handle_key_event(KeyEvent::from(KeyCode::Char('2')));
|
||||
|
||||
let event = rx.try_recv().expect("expected AppEvent");
|
||||
let AppEvent::CodexOp(Op::UserInputAnswer { response, .. }) = event else {
|
||||
panic!("expected UserInputAnswer");
|
||||
};
|
||||
let (_, _, response) = expect_user_input_answer(event);
|
||||
let answer = response.answers.get("q1").expect("answer missing");
|
||||
assert_eq!(answer.answers, vec!["Option 2".to_string()]);
|
||||
}
|
||||
@@ -2683,9 +2698,7 @@ mod tests {
|
||||
overlay.handle_key_event(KeyEvent::from(KeyCode::Enter));
|
||||
|
||||
let event = rx.try_recv().expect("expected AppEvent");
|
||||
let AppEvent::CodexOp(Op::UserInputAnswer { response, .. }) = event else {
|
||||
panic!("expected UserInputAnswer");
|
||||
};
|
||||
let (_, _, response) = expect_user_input_answer(event);
|
||||
let answer = response.answers.get("q1").expect("answer missing");
|
||||
assert_eq!(answer.answers, Vec::<String>::new());
|
||||
let answer = response.answers.get("q2").expect("answer missing");
|
||||
@@ -3074,9 +3087,7 @@ mod tests {
|
||||
overlay.submit_answers();
|
||||
|
||||
let event = rx.try_recv().expect("expected AppEvent");
|
||||
let AppEvent::CodexOp(Op::UserInputAnswer { response, .. }) = event else {
|
||||
panic!("expected UserInputAnswer");
|
||||
};
|
||||
let (_, _, response) = expect_user_input_answer(event);
|
||||
let answer = response.answers.get("q1").expect("answer missing");
|
||||
assert_eq!(answer.answers, Vec::<String>::new());
|
||||
}
|
||||
@@ -3099,9 +3110,7 @@ mod tests {
|
||||
overlay.submit_answers();
|
||||
|
||||
let event = rx.try_recv().expect("expected AppEvent");
|
||||
let AppEvent::CodexOp(Op::UserInputAnswer { response, .. }) = event else {
|
||||
panic!("expected UserInputAnswer");
|
||||
};
|
||||
let (_, _, response) = expect_user_input_answer(event);
|
||||
let answer = response.answers.get("q1").expect("answer missing");
|
||||
assert_eq!(answer.answers, Vec::<String>::new());
|
||||
}
|
||||
@@ -3142,9 +3151,7 @@ mod tests {
|
||||
overlay.submit_answers();
|
||||
|
||||
let event = rx.try_recv().expect("expected AppEvent");
|
||||
let AppEvent::CodexOp(Op::UserInputAnswer { response, .. }) = event else {
|
||||
panic!("expected UserInputAnswer");
|
||||
};
|
||||
let (_, _, response) = expect_user_input_answer(event);
|
||||
let answer = response.answers.get("q1").expect("answer missing");
|
||||
assert_eq!(answer.answers, Vec::<String>::new());
|
||||
}
|
||||
@@ -3178,9 +3185,7 @@ mod tests {
|
||||
overlay.submit_answers();
|
||||
|
||||
let event = rx.try_recv().expect("expected AppEvent");
|
||||
let AppEvent::CodexOp(Op::UserInputAnswer { response, .. }) = event else {
|
||||
panic!("expected UserInputAnswer");
|
||||
};
|
||||
let (_, _, response) = expect_user_input_answer(event);
|
||||
let answer = response.answers.get("q1").expect("answer missing");
|
||||
assert_eq!(
|
||||
answer.answers,
|
||||
@@ -3292,9 +3297,7 @@ mod tests {
|
||||
overlay.submit_answers();
|
||||
|
||||
let event = rx.try_recv().expect("expected AppEvent");
|
||||
let AppEvent::CodexOp(Op::UserInputAnswer { response, .. }) = event else {
|
||||
panic!("expected UserInputAnswer");
|
||||
};
|
||||
let (_, _, response) = expect_user_input_answer(event);
|
||||
let answer = response.answers.get("q1").expect("answer missing");
|
||||
assert_eq!(
|
||||
answer.answers,
|
||||
|
||||
Reference in New Issue
Block a user