mirror of
https://github.com/openai/codex.git
synced 2026-10-27 18:48:37 +00:00
## Why Unanswered questions from the previous prompt remain visible after a new follow-up. Clear them when the user moves on to new work. ## What changed - Clear pending questions when a model prompt is submitted or queued, and when a review starts. Clear again on queued prompt delivery to remove questions that arrived while waiting. - Retain seen question IDs so replay cannot restore cleared questions. - Track question answers separately from prompts through queues, retries, thread restoration, and reconnects so delivering an answer preserves other pending questions. - Preserve questions for local commands and rejected submissions. ## Testing Add regression tests for immediate and queued follow-ups, replay suppression, slash prompts, reviews, rejected input, and answer preservation across delivery and recovery. Add a snapshot of the composer after questions are cleared. GitOrigin-RevId: 76353c6ee098c1505678ac43b1dc6391ea9fa738
387 lines
15 KiB
Rust
387 lines
15 KiB
Rust
//! User input submission, queue draining, and draft restore flow for `ChatWidget`.
|
|
//!
|
|
//! The queue data itself lives in `input_queue`; this module owns the app-level
|
|
//! effects around taking composer input, submitting user turns, draining queued
|
|
//! follow-ups, and restoring draft state across interrupts or thread switches.
|
|
|
|
use super::*;
|
|
use crate::bottom_pane::prompt_args::parse_slash_name;
|
|
use crate::bottom_pane::slash_commands::SlashCommandItem;
|
|
use crate::bottom_pane::slash_commands::find_slash_command;
|
|
|
|
impl ChatWidget {
|
|
pub(crate) fn set_parent_owned_thread(&mut self) {
|
|
self.blocks_direct_input = true;
|
|
self.bottom_pane.set_parent_owned_thread();
|
|
}
|
|
|
|
pub(super) fn handle_composer_input_result(
|
|
&mut self,
|
|
input_result: InputResult,
|
|
had_modal_or_popup: bool,
|
|
) {
|
|
match input_result {
|
|
InputResult::Submitted {
|
|
text,
|
|
text_elements,
|
|
} => {
|
|
let user_message = self.user_message_from_submission(text, text_elements);
|
|
if user_message.text.is_empty()
|
|
&& user_message.local_images.is_empty()
|
|
&& user_message.remote_image_urls.is_empty()
|
|
{
|
|
return;
|
|
}
|
|
let should_submit_now = self.is_session_configured()
|
|
&& !self.is_plan_streaming_in_tui()
|
|
&& !self.input_queue.suppress_queue_autosend
|
|
&& !self.input_queue.rate_limit_recovery_pending
|
|
&& (!self.input_queue.user_turn_pending_start
|
|
|| self.turn_lifecycle.agent_turn_running);
|
|
if should_submit_now {
|
|
if self.only_user_shell_commands_running()
|
|
&& !user_message.text.starts_with('!')
|
|
{
|
|
self.queue_user_message(user_message);
|
|
return;
|
|
}
|
|
// Submitted is emitted when user submits.
|
|
// Reset any reasoning header only when we are actually submitting a turn.
|
|
self.reasoning_buffer.clear();
|
|
self.reasoning_header = None;
|
|
self.reasoning_summary_parts.clear();
|
|
self.set_status_header(String::from("Working"));
|
|
self.submit_user_message(user_message);
|
|
} else {
|
|
self.queue_user_message(user_message);
|
|
}
|
|
}
|
|
InputResult::Queued {
|
|
text,
|
|
text_elements,
|
|
action,
|
|
pending_pastes,
|
|
} => {
|
|
let user_message = self.user_message_from_submission(text, text_elements);
|
|
self.queue_user_message_with_options(user_message, action, pending_pastes);
|
|
}
|
|
InputResult::Command(cmd) => {
|
|
self.handle_slash_command_dispatch(cmd);
|
|
}
|
|
InputResult::ServiceTierCommand(command) => {
|
|
self.handle_service_tier_command_dispatch(command);
|
|
}
|
|
InputResult::CommandWithArgs(cmd, args, text_elements) => {
|
|
self.handle_slash_command_with_args_dispatch(cmd, args, text_elements);
|
|
}
|
|
InputResult::ParentOwnedInputBlocked => {
|
|
self.add_error_message(PARENT_OWNED_INPUT_MESSAGE.to_string());
|
|
}
|
|
InputResult::None => {}
|
|
}
|
|
if had_modal_or_popup && self.bottom_pane.no_modal_or_popup_active() {
|
|
self.maybe_send_next_queued_input();
|
|
}
|
|
}
|
|
|
|
pub(super) fn defer_input_until_settings_applied(&mut self) {
|
|
if !self.bottom_pane.no_modal_or_popup_active() {
|
|
self.input_queue.suppress_queue_autosend = true;
|
|
}
|
|
}
|
|
|
|
pub(super) fn on_modal_or_popup_closed(&mut self) {
|
|
if self.input_queue.suppress_queue_autosend {
|
|
self.app_event_tx.send(AppEvent::SettingsSelectionClosed);
|
|
} else {
|
|
self.maybe_send_next_queued_input();
|
|
}
|
|
}
|
|
|
|
pub(super) fn queue_user_message(&mut self, user_message: UserMessage) -> bool {
|
|
self.queue_user_message_with_options_and_source(
|
|
user_message,
|
|
QueuedInputAction::Plain,
|
|
Vec::new(),
|
|
UserMessageSource::Prompt,
|
|
)
|
|
}
|
|
|
|
pub(crate) fn set_queue_submissions_until_session_configured(&mut self, queue: bool) {
|
|
self.bottom_pane
|
|
.set_queue_submissions(queue && !self.is_session_configured());
|
|
}
|
|
|
|
pub(super) fn queue_user_message_with_options(
|
|
&mut self,
|
|
user_message: UserMessage,
|
|
action: QueuedInputAction,
|
|
pending_pastes: Vec<(String, String)>,
|
|
) -> bool {
|
|
self.queue_user_message_with_options_and_source(
|
|
user_message,
|
|
action,
|
|
pending_pastes,
|
|
UserMessageSource::Prompt,
|
|
)
|
|
}
|
|
|
|
pub(super) fn queue_user_message_with_options_and_source(
|
|
&mut self,
|
|
user_message: UserMessage,
|
|
action: QueuedInputAction,
|
|
pending_pastes: Vec<(String, String)>,
|
|
source: UserMessageSource,
|
|
) -> bool {
|
|
if self.has_misalignment_policy_violation() {
|
|
return false;
|
|
}
|
|
let should_run_now = self.is_session_configured()
|
|
&& !self.is_user_turn_pending_or_running()
|
|
&& !self.input_queue.suppress_queue_autosend
|
|
&& !self.input_queue.rate_limit_recovery_pending;
|
|
if !should_run_now || action != QueuedInputAction::Plain {
|
|
let queued_slash_prompt = action == QueuedInputAction::ParseSlash
|
|
&& parse_slash_name(&user_message.text).is_none_or(|(name, args, _)| {
|
|
if name.contains('/') {
|
|
return true;
|
|
}
|
|
!args.trim().is_empty()
|
|
&& find_slash_command(
|
|
name,
|
|
self.builtin_command_flags(),
|
|
&self.current_model_service_tier_commands(),
|
|
)
|
|
.is_some_and(|command| {
|
|
!command.supports_inline_args()
|
|
|| matches!(
|
|
command,
|
|
SlashCommandItem::Builtin(
|
|
SlashCommand::Plan | SlashCommand::Review
|
|
)
|
|
)
|
|
})
|
|
});
|
|
let model_prompt = source == UserMessageSource::Prompt
|
|
&& (action == QueuedInputAction::Literal
|
|
|| action == QueuedInputAction::Plain && !user_message.text.starts_with('!')
|
|
|| queued_slash_prompt);
|
|
self.input_queue
|
|
.queued_user_messages
|
|
.push_back(QueuedUserMessage {
|
|
user_message,
|
|
action,
|
|
pending_pastes,
|
|
source,
|
|
});
|
|
self.input_queue
|
|
.queued_user_message_history_records
|
|
.push_back(UserMessageHistoryRecord::UserMessageText);
|
|
self.refresh_pending_input_preview();
|
|
if model_prompt && !should_run_now {
|
|
self.bottom_pane.clear_pending_questions();
|
|
}
|
|
if should_run_now {
|
|
self.maybe_send_next_queued_input();
|
|
}
|
|
true
|
|
} else {
|
|
self.submit_user_message_with_history_and_shell_escape_policy(
|
|
user_message,
|
|
UserMessageHistoryRecord::UserMessageText,
|
|
ShellEscapePolicy::Allow,
|
|
source,
|
|
)
|
|
.0
|
|
}
|
|
}
|
|
|
|
/// If idle and there are queued inputs, submit exactly one to start the next turn.
|
|
pub(crate) fn maybe_send_next_queued_input(&mut self) -> bool {
|
|
if !self.is_session_configured()
|
|
|| self.has_misalignment_policy_violation()
|
|
|| self.input_queue.suppress_queue_autosend
|
|
|| self.input_queue.rate_limit_recovery_pending
|
|
|| self.input_queue.recovered_queue
|
|
{
|
|
return false;
|
|
}
|
|
if self.blocks_direct_input {
|
|
return false;
|
|
}
|
|
if self.is_user_turn_pending_or_running() {
|
|
return false;
|
|
}
|
|
let mut submitted_follow_up = false;
|
|
while !self.is_user_turn_pending_or_running() {
|
|
let Some((queued_message, history_record)) = self.pop_next_queued_user_message() else {
|
|
break;
|
|
};
|
|
match queued_message.action {
|
|
QueuedInputAction::Plain => {
|
|
let source = queued_message.source;
|
|
submitted_follow_up = self
|
|
.submit_user_message_with_history_and_shell_escape_policy(
|
|
queued_message.into_user_message(),
|
|
history_record,
|
|
ShellEscapePolicy::Allow,
|
|
source,
|
|
)
|
|
.0;
|
|
break;
|
|
}
|
|
QueuedInputAction::Literal => {
|
|
let QueuedUserMessage {
|
|
user_message,
|
|
pending_pastes,
|
|
source,
|
|
..
|
|
} = queued_message;
|
|
let mut restored_pending_pastes = self.bottom_pane.composer_pending_pastes();
|
|
let mut used_paste_placeholders = restored_pending_pastes
|
|
.iter()
|
|
.map(|(placeholder, _)| placeholder.clone())
|
|
.collect();
|
|
let (mut user_message, pending_pastes) =
|
|
super::user_messages::remap_colliding_paste_placeholders(
|
|
user_message,
|
|
pending_pastes,
|
|
&mut used_paste_placeholders,
|
|
);
|
|
if !self.current_model().trim().is_empty()
|
|
&& (self.current_model_supports_images()
|
|
|| (user_message.local_images.is_empty()
|
|
&& user_message.remote_image_urls.is_empty()))
|
|
{
|
|
(user_message.text, user_message.text_elements) =
|
|
crate::bottom_pane::ChatComposer::expand_pending_pastes(
|
|
&user_message.text,
|
|
user_message.text_elements,
|
|
&pending_pastes,
|
|
);
|
|
}
|
|
submitted_follow_up = self
|
|
.submit_user_message_with_history_and_shell_escape_policy(
|
|
user_message,
|
|
history_record,
|
|
ShellEscapePolicy::Disallow,
|
|
source,
|
|
)
|
|
.0;
|
|
if !submitted_follow_up {
|
|
restored_pending_pastes.extend(pending_pastes);
|
|
self.bottom_pane
|
|
.set_composer_pending_pastes(restored_pending_pastes);
|
|
}
|
|
break;
|
|
}
|
|
QueuedInputAction::ParseSlash => {
|
|
let drain = self.submit_queued_slash_prompt(queued_message);
|
|
if drain == QueueDrain::Stop {
|
|
submitted_follow_up = self.is_user_turn_pending_or_running();
|
|
break;
|
|
}
|
|
}
|
|
QueuedInputAction::RunShell => {
|
|
let drain = self.submit_queued_shell_prompt(queued_message.into_user_message());
|
|
if drain == QueueDrain::Stop {
|
|
submitted_follow_up = self.is_user_turn_pending_or_running();
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
// Update the list to reflect the remaining queued messages (if any).
|
|
self.refresh_pending_input_preview();
|
|
submitted_follow_up
|
|
}
|
|
|
|
pub(crate) fn is_user_turn_pending_or_running(&self) -> bool {
|
|
self.input_queue.user_turn_pending_start
|
|
|| self.turn_lifecycle.agent_turn_running
|
|
|| self.review.is_review_mode
|
|
|| (self.bottom_pane.is_task_running() && self.mcp_startup_status.is_none())
|
|
}
|
|
|
|
pub(super) fn only_user_shell_commands_running(&self) -> bool {
|
|
self.turn_lifecycle.agent_turn_running
|
|
&& !self.running_commands.is_empty()
|
|
&& self
|
|
.running_commands
|
|
.values()
|
|
.all(|command| command.source == ExecCommandSource::UserShell)
|
|
}
|
|
|
|
/// Rebuild and update the bottom-pane pending-input preview.
|
|
pub(super) fn refresh_pending_input_preview(&mut self) {
|
|
let has_queued = self.has_queued_follow_up_messages();
|
|
if let Some(questions) = &mut self.bottom_pane.questions {
|
|
questions.has_queued_messages = has_queued;
|
|
}
|
|
let preview = self.input_queue.preview();
|
|
self.bottom_pane.set_pending_input_preview(
|
|
preview.queued_messages,
|
|
preview.pending_steers,
|
|
preview.rejected_steers,
|
|
);
|
|
}
|
|
|
|
pub(crate) fn submit_user_message_with_mode(
|
|
&mut self,
|
|
text: String,
|
|
mut collaboration_mode: CollaborationModeMask,
|
|
) {
|
|
if self.blocks_direct_input {
|
|
self.add_error_message(if self.external_writer_view {
|
|
"This thread is open elsewhere. Close it there and retry resume to continue."
|
|
.to_string()
|
|
} else {
|
|
PARENT_OWNED_INPUT_MESSAGE.to_string()
|
|
});
|
|
return;
|
|
}
|
|
if collaboration_mode.mode == Some(ModeKind::Plan)
|
|
&& let Some(effort) = self.config.plan_mode_reasoning_effort.clone()
|
|
{
|
|
collaboration_mode.reasoning_effort = Some(Some(effort));
|
|
}
|
|
if self.turn_lifecycle.agent_turn_running
|
|
&& self.active_collaboration_mask.as_ref() != Some(&collaboration_mode)
|
|
{
|
|
self.add_error_message(
|
|
"Cannot switch collaboration mode while a turn is running.".to_string(),
|
|
);
|
|
return;
|
|
}
|
|
self.set_collaboration_mask_from_user_action(collaboration_mode);
|
|
let should_queue = self.is_plan_streaming_in_tui();
|
|
let user_message = UserMessage {
|
|
text,
|
|
local_images: Vec::new(),
|
|
remote_image_urls: Vec::new(),
|
|
text_elements: Vec::new(),
|
|
mention_bindings: Vec::new(),
|
|
};
|
|
if should_queue {
|
|
self.queue_user_message(user_message);
|
|
} else {
|
|
self.submit_user_message(user_message);
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
pub(crate) fn queued_user_message_texts(&self) -> Vec<String> {
|
|
self.input_queue
|
|
.rejected_steers_queue
|
|
.iter()
|
|
.map(|message| message.text.clone())
|
|
.chain(
|
|
self.input_queue
|
|
.queued_user_messages
|
|
.iter()
|
|
.map(|message| message.text.clone()),
|
|
)
|
|
.collect()
|
|
}
|
|
}
|