mirror of
https://github.com/openai/codex.git
synced 2026-11-22 07:13:50 +00:00
Keep interrupted prompts in conversation history (#33198)
## What changed - Leave an output-free interrupted prompt in the transcript and open a blank composer for the user's next instruction. - Use the normal interruption notice for both `Esc` and `Ctrl-C` interrupts. - Track safety-buffering prompts separately so failed retries can still restore the prompt, including after switching between threads. ## Testing - Cover output-free `Esc` and `Ctrl-C` interrupts, failed safety-buffer retries, and restoration of safety-buffer state from thread snapshots. GitOrigin-RevId: 30b368d00dfdb981d06d4c95ce3f252389b7917c
This commit is contained in:
1 parent
4df8027a97
commit
70a0b1eef8
29 files changed
+186
-269
No files matched your search
@@ -24,9 +24,7 @@ use serde_json::Value;
|
||||
#[allow(clippy::large_enum_variant)]
|
||||
#[derive(Debug, Clone, PartialEq, Serialize)]
|
||||
pub(crate) enum AppCommand {
|
||||
Interrupt {
|
||||
behavior: InterruptBehavior,
|
||||
},
|
||||
Interrupt,
|
||||
CleanBackgroundTerminals,
|
||||
RunUserShellCommand {
|
||||
command: String,
|
||||
@@ -104,23 +102,9 @@ pub(crate) enum AppCommand {
|
||||
},
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize)]
|
||||
pub(crate) enum InterruptBehavior {
|
||||
Default,
|
||||
RestorePromptIfNoOutput,
|
||||
}
|
||||
|
||||
impl AppCommand {
|
||||
pub(crate) fn interrupt() -> Self {
|
||||
Self::Interrupt {
|
||||
behavior: InterruptBehavior::Default,
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn interrupt_and_restore_prompt_if_no_output() -> Self {
|
||||
Self::Interrupt {
|
||||
behavior: InterruptBehavior::RestorePromptIfNoOutput,
|
||||
}
|
||||
Self::Interrupt
|
||||
}
|
||||
|
||||
pub(crate) fn clean_background_terminals() -> Self {
|
||||
|
||||
Reference in new issue
Block a user