Preserve question context in recovered TUI answer drafts (#50052)

## Why

When a turn ends, unsent question answers are recovered into the main composer. Recovering only the answers loses which question each answer belongs to.

## What changed

Prepend each recovered answer with its question title as a Markdown blockquote. Separate questions, answers, and existing composer text with blank lines.

Sanitize question titles and limit them to 512 bytes at a UTF-8 character boundary, adding an ellipsis when truncated. Keep answer text untruncated.

## Testing

Add coverage for bounded titles, multibyte characters, control characters, and multiline question-and-answer submission. Update recovery assertions and snapshots for turn completion, failure, interruption, large pastes, and Vim undo.

GitOrigin-RevId: 141dacfb64bcad5fcabc5be217d2340ef7de1eb5
This commit is contained in:
Ian MacLeod
2026-10-01 17:52:19 +00:00
committed by copyberry
parent 9561a34531
commit 57a38c1beb
10 changed files with 139 additions and 36 deletions
@@ -5,11 +5,11 @@ use crate::bottom_pane::QueuedInputAction;
use codex_protocol::items::AsyncUserInputQuestion;
use pretty_assertions::assert_eq;
fn questions(chat: &mut ChatWidget, message_id: &str) {
fn questions(chat: &mut ChatWidget, message_id: &str, title: &str) {
chat.add_async_questions(
message_id,
&[AsyncUserInputQuestion {
title: "Which way?".into(),
title: title.into(),
options: None,
}],
);
@@ -94,8 +94,8 @@ async fn question_turn_end_appends_open_drafts_in_order_once() {
Vec::new(),
);
chat.bottom_pane.set_composer_cursor(/*cursor*/ 0);
questions(&mut chat, "first");
questions(&mut chat, "second");
questions(&mut chat, "first", "Which style?");
questions(&mut chat, "second", "What budget?");
chat.handle_key_event(KeyEvent::new(KeyCode::Up, KeyModifiers::ALT));
chat.bottom_pane.handle_paste(" Over-ear ".into());
chat.handle_key_event(KeyEvent::new(KeyCode::Up, KeyModifiers::ALT));
@@ -103,6 +103,8 @@ async fn question_turn_end_appends_open_drafts_in_order_once() {
chat.handle_key_event(KeyEvent::new(KeyCode::Char('r'), KeyModifiers::CONTROL));
chat.handle_key_event(KeyEvent::from(KeyCode::Char('e')));
let recovered =
"$tool existing draft\n\n> Which style?\n\nOver-ear\n\n> What budget?\n\nUnder 250";
handle_turn_completed(&mut chat, "ended-turn", /*duration_ms*/ None);
assert_eq!(
(
@@ -110,11 +112,7 @@ async fn question_turn_end_appends_open_drafts_in_order_once() {
chat.bottom_pane.composer_text_elements(),
chat.bottom_pane.question_editor().unanswered_count()
),
(
"$tool existing draft\nOver-ear\nUnder 250".into(),
vec![element],
0
)
(recovered.into(), vec![element], 0)
);
assert!(ops.try_recv().is_err());
insta::assert_snapshot!(
@@ -123,19 +121,16 @@ async fn question_turn_end_appends_open_drafts_in_order_once() {
);
handle_turn_completed(&mut chat, "ended-turn", /*duration_ms*/ None);
assert_recovered_draft(&mut chat, "$tool existing draft\nOver-ear\nUnder 250");
assert_recovered_draft(&mut chat, recovered);
questions(&mut chat, "large");
questions(&mut chat, "large", "Which way?");
chat.handle_key_event(KeyEvent::new(KeyCode::Up, KeyModifiers::ALT));
let large_answer = "long answer ".repeat(/*n*/ 200);
chat.bottom_pane.handle_paste(large_answer.clone());
handle_turn_completed(&mut chat, "ended-turn", /*duration_ms*/ None);
assert_eq!(
chat.bottom_pane.composer_text_with_pending(),
format!(
"$tool existing draft\nOver-ear\nUnder 250\n{}",
large_answer.trim()
)
format!("{recovered}\n\n> Which way?\n\n{}", large_answer.trim())
);
assert_eq!(chat.bottom_pane.composer_pending_pastes().len(), 1);
insta::assert_snapshot!(
@@ -151,7 +146,7 @@ async fn question_turn_end_recovers_collapsed_drafts_on_completion_and_failure()
chat.thread_id = Some(ThreadId::new());
chat.bottom_pane.set_disable_paste_burst(/*disabled*/ false);
handle_turn_started(&mut chat, "turn");
questions(&mut chat, "question");
questions(&mut chat, "question", "Which way?");
chat.handle_key_event(KeyEvent::new(KeyCode::Up, KeyModifiers::ALT));
// Leave typing buffered, then collapse before completion.
for ch in "answer".chars() {
@@ -182,7 +177,7 @@ async fn question_turn_end_recovers_collapsed_drafts_on_completion_and_failure()
.composer
.unwrap()
.text,
"main\nanswer"
"main\n\n> Which way?\n\nanswer"
);
}
chat.handle_server_notification(
@@ -205,7 +200,7 @@ async fn question_turn_end_recovers_collapsed_drafts_on_completion_and_failure()
assert_eq!(chat.bottom_pane.composer_text(), "earlier prompt");
assert!(!chat.bottom_pane.no_modal_or_popup_active());
chat.handle_key_event(KeyEvent::from(KeyCode::Esc));
assert_recovered_draft(&mut chat, "main\nanswer");
assert_recovered_draft(&mut chat, "main\n\n> Which way?\n\nanswer");
assert!(ops.try_recv().is_err());
}
}
@@ -227,7 +222,7 @@ async fn question_turn_end_recovers_after_interruption_restores_queued_input() {
chat.bottom_pane.set_disable_paste_burst(/*disabled*/ false);
chat.bottom_pane
.set_composer_text("main draft".into(), Vec::new(), Vec::new());
questions(&mut chat, "question");
questions(&mut chat, "question", "Which way?");
chat.handle_key_event(KeyEvent::new(KeyCode::Up, KeyModifiers::ALT));
chat.bottom_pane.handle_paste("answer".into());
chat.handle_key_event(KeyEvent::new(KeyCode::Down, KeyModifiers::ALT));
@@ -266,7 +261,7 @@ async fn question_turn_end_recovers_after_interruption_restores_queued_input() {
.composer
.unwrap()
.text,
"pending steer\nqueued prompt\nmain draft\nanswer"
"pending steer\nqueued prompt\nmain draft\n\n> Which way?\n\nanswer"
);
// A query miss and unsuccessful Enter must retain both the search and the answers.
chat.handle_key_event(KeyEvent::from(KeyCode::Char('z')));
@@ -290,7 +285,7 @@ async fn question_turn_end_recovers_after_interruption_restores_queued_input() {
} else {
assert_recovered_draft(
&mut chat,
&format!("pending steer\nqueued prompt\n{main_draft}\nanswer"),
&format!("pending steer\nqueued prompt\n{main_draft}\n\n> Which way?\n\nanswer"),
);
}
assert!(!chat.has_queued_follow_up_messages());
@@ -298,6 +293,45 @@ async fn question_turn_end_recovers_after_interruption_restores_queued_input() {
}
}
#[tokio::test]
async fn question_turn_end_keeps_multiline_question_and_answer_as_text() {
let (mut chat, _rx, mut ops) = make_chatwidget_manual(/*model_override*/ None).await;
chat.thread_id = Some(ThreadId::new());
handle_turn_started(&mut chat, "turn");
questions(
&mut chat,
"question",
"First line\r\n\r\n\x1b[31mLast\r line?\x1b[0m\x07",
);
chat.handle_key_event(KeyEvent::new(KeyCode::Up, KeyModifiers::ALT));
chat.bottom_pane
.handle_paste(" First answer line\n\nLast answer line ".into());
chat.handle_key_event(KeyEvent::new(KeyCode::Down, KeyModifiers::ALT));
handle_turn_completed(&mut chat, "turn", /*duration_ms*/ None);
let recovered = "> First line\n>\n> Last line?\n\nFirst answer line\n\nLast answer line";
assert_eq!(
(
chat.bottom_pane.composer_text_with_pending(),
chat.bottom_pane.question_editor().unanswered_count(),
),
(recovered.to_string(), 0),
);
assert!(ops.try_recv().is_err());
chat.handle_key_event(KeyEvent::from(KeyCode::Enter));
let Op::UserTurn { items, .. } = ops.try_recv().unwrap() else {
panic!("user turn")
};
assert_eq!(
items,
vec![UserInput::Text {
text: recovered.into(),
text_elements: Vec::new(),
}]
);
}
fn assert_recovered_draft(chat: &mut ChatWidget, text: &str) {
assert_eq!(
(
@@ -1,11 +1,18 @@
---
source: tui/src/chatwidget/tests/question_turn_end_tests.rs
assertion_line: 86
assertion_line: 73
expression: "normalize_snapshot_paths(render_bottom_popup(&chat, 80))"
---
› $tool existing draft
> Which style?
Over-ear
> What budget?
Under 250
[Pasted Content 2399 chars]
[Pasted Content 2413 chars]
GPT-5.6-Sol default · /tmp/project
@@ -1,9 +1,16 @@
---
source: tui/src/chatwidget/tests/question_turn_end_tests.rs
expression: "render_bottom_popup(&chat, 80)"
assertion_line: 55
expression: "normalize_snapshot_paths(render_bottom_popup(&chat, 80))"
---
› $tool existing draft
> Which style?
Over-ear
> What budget?
Under 250
GPT-5.6-Sol default · /tmp/project