mirror of
https://github.com/openai/codex.git
synced 2026-11-20 07:06:24 +00:00
Preserve queued TUI input semantics (#39604)
## Why Paste placeholders and deferred slash-command parsing can hide the meaning of an input until it is expanded or a session is configured. Draining such input as an ordinary message can accidentally treat pasted text beginning with `!` as a shell command or lose `/plan` behavior. ## What changed - Track paste-expanded inputs that begin with `!` as literal model input through history, queue editing, retries, and startup queues. - Defer `/plan` parsing when session or model state is unavailable, then submit it in plan mode with shell escapes disabled. - Drain queued input only after session configuration, and keep later queued prompts pending when an initial prompt cannot be submitted. - Suppress queue auto-send before applying a replayed thread session so input from the outgoing thread is not submitted during restoration. ## Testing Add coverage for direct, recalled, edited, interrupted, rejected, startup-queued, and plan-mode paste flows, including placeholder collisions and rejected initial images. GitOrigin-RevId: d482220d8df21754f166fea5b54e9945f622a978
This commit is contained in:
1 parent
8e7f646974
commit
3434c2545b
10 files changed
+519
-36
No files matched your search
@@ -784,7 +784,7 @@ impl ChatWidget {
|
||||
if !self.apply_plan_slash_command() {
|
||||
return;
|
||||
}
|
||||
let user_message = self.prepared_inline_user_message(
|
||||
let mut user_message = self.prepared_inline_user_message(
|
||||
args,
|
||||
text_elements,
|
||||
local_images,
|
||||
@@ -792,14 +792,34 @@ impl ChatWidget {
|
||||
mention_bindings,
|
||||
source,
|
||||
);
|
||||
if !self.is_session_configured()
|
||||
|| self.current_model().trim().is_empty()
|
||||
|| (!self.current_model_supports_images()
|
||||
&& (!user_message.local_images.is_empty()
|
||||
|| !user_message.remote_image_urls.is_empty()))
|
||||
{
|
||||
const PLAN_PREFIX: &str = "/plan ";
|
||||
user_message.text.insert_str(0, PLAN_PREFIX);
|
||||
for element in &mut user_message.text_elements {
|
||||
element.byte_range.start += PLAN_PREFIX.len();
|
||||
element.byte_range.end += PLAN_PREFIX.len();
|
||||
}
|
||||
}
|
||||
if self.is_session_configured() {
|
||||
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);
|
||||
self.submit_user_message_with_shell_escape_policy(
|
||||
user_message,
|
||||
ShellEscapePolicy::Disallow,
|
||||
);
|
||||
} else {
|
||||
self.queue_user_message(user_message);
|
||||
self.queue_user_message_with_options(
|
||||
user_message,
|
||||
QueuedInputAction::ParseSlash,
|
||||
Vec::new(),
|
||||
);
|
||||
}
|
||||
}
|
||||
SlashCommand::Goal if !trimmed.is_empty() => {
|
||||
|
||||
Reference in new issue
Block a user