mirror of
https://github.com/openai/codex.git
synced 2026-11-21 22:50:37 +00:00
Suppress interrupted BTW warning in TUI
Co-authored-by: Codex <noreply@openai.com>
This commit is contained in:
co-authored by
Codex
parent
f96d0f66d5
commit
3f638d4ac9
@@ -1,4 +1,5 @@
|
||||
use super::*;
|
||||
use crate::chatwidget::InterruptedTurnNoticeMode;
|
||||
|
||||
const BTW_RENAME_BLOCK_MESSAGE: &str = "BTW threads are ephemeral and cannot be renamed.";
|
||||
|
||||
@@ -16,6 +17,7 @@ impl App {
|
||||
let clear_btw_ui = |chat_widget: &mut crate::chatwidget::ChatWidget| {
|
||||
chat_widget.set_thread_footer_hint_override(/*items*/ None);
|
||||
chat_widget.clear_thread_rename_block();
|
||||
chat_widget.set_interrupted_turn_notice_mode(InterruptedTurnNoticeMode::Default);
|
||||
};
|
||||
let Some(active_thread_id) = self.current_displayed_thread_id() else {
|
||||
clear_btw_ui(&mut self.chat_widget);
|
||||
@@ -32,6 +34,8 @@ impl App {
|
||||
|
||||
self.chat_widget
|
||||
.set_thread_rename_block_message(BTW_RENAME_BLOCK_MESSAGE);
|
||||
self.chat_widget
|
||||
.set_interrupted_turn_notice_mode(InterruptedTurnNoticeMode::Suppress);
|
||||
let mut depth = 1usize;
|
||||
while let Some(next_parent_thread_id) = self
|
||||
.btw_threads
|
||||
|
||||
@@ -775,6 +775,7 @@ pub(crate) struct ChatWidget {
|
||||
forked_from: Option<ThreadId>,
|
||||
/// Pretty parent label used only for the next fork banner inserted on session configure.
|
||||
next_fork_banner_parent_label: Option<String>,
|
||||
interrupted_turn_notice_mode: InterruptedTurnNoticeMode,
|
||||
frame_requester: FrameRequester,
|
||||
// Whether to include the initial welcome banner on session configured
|
||||
show_welcome_banner: bool,
|
||||
@@ -986,6 +987,13 @@ struct PendingSteer {
|
||||
compare_key: PendingSteerCompareKey,
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
|
||||
pub(crate) enum InterruptedTurnNoticeMode {
|
||||
#[default]
|
||||
Default,
|
||||
Suppress,
|
||||
}
|
||||
|
||||
pub(crate) fn create_initial_user_message(
|
||||
text: Option<String>,
|
||||
local_image_paths: Vec<PathBuf>,
|
||||
@@ -2281,7 +2289,9 @@ impl ChatWidget {
|
||||
self.finalize_turn();
|
||||
let send_pending_steers_immediately = self.submit_pending_steers_after_interrupt;
|
||||
self.submit_pending_steers_after_interrupt = false;
|
||||
if reason != TurnAbortReason::ReviewEnded {
|
||||
if reason != TurnAbortReason::ReviewEnded
|
||||
&& self.interrupted_turn_notice_mode != InterruptedTurnNoticeMode::Suppress
|
||||
{
|
||||
if send_pending_steers_immediately {
|
||||
self.add_to_history(history_cell::new_info_event(
|
||||
"Model interrupted to submit steer instructions.".to_owned(),
|
||||
@@ -3770,6 +3780,7 @@ impl ChatWidget {
|
||||
thread_rename_block_message: None,
|
||||
forked_from: None,
|
||||
next_fork_banner_parent_label: None,
|
||||
interrupted_turn_notice_mode: InterruptedTurnNoticeMode::Default,
|
||||
queued_user_messages: VecDeque::new(),
|
||||
rejected_steers_queue: VecDeque::new(),
|
||||
pending_steers: VecDeque::new(),
|
||||
@@ -3976,6 +3987,7 @@ impl ChatWidget {
|
||||
thread_rename_block_message: None,
|
||||
forked_from: None,
|
||||
next_fork_banner_parent_label: None,
|
||||
interrupted_turn_notice_mode: InterruptedTurnNoticeMode::Default,
|
||||
saw_plan_update_this_turn: false,
|
||||
saw_plan_item_this_turn: false,
|
||||
last_plan_progress: None,
|
||||
@@ -4174,6 +4186,7 @@ impl ChatWidget {
|
||||
thread_rename_block_message: None,
|
||||
forked_from: None,
|
||||
next_fork_banner_parent_label: None,
|
||||
interrupted_turn_notice_mode: InterruptedTurnNoticeMode::Default,
|
||||
queued_user_messages: VecDeque::new(),
|
||||
rejected_steers_queue: VecDeque::new(),
|
||||
pending_steers: VecDeque::new(),
|
||||
@@ -4483,6 +4496,10 @@ impl ChatWidget {
|
||||
self.next_fork_banner_parent_label = label;
|
||||
}
|
||||
|
||||
pub(crate) fn set_interrupted_turn_notice_mode(&mut self, mode: InterruptedTurnNoticeMode) {
|
||||
self.interrupted_turn_notice_mode = mode;
|
||||
}
|
||||
|
||||
pub(crate) fn show_selection_view(&mut self, params: SelectionViewParams) {
|
||||
self.bottom_pane.show_selection_view(params);
|
||||
self.request_redraw();
|
||||
|
||||
@@ -2044,6 +2044,7 @@ async fn make_chatwidget_manual(
|
||||
thread_rename_block_message: None,
|
||||
forked_from: None,
|
||||
next_fork_banner_parent_label: None,
|
||||
interrupted_turn_notice_mode: InterruptedTurnNoticeMode::Default,
|
||||
frame_requester: FrameRequester::test_dummy(),
|
||||
show_welcome_banner: true,
|
||||
startup_tooltip_override: None,
|
||||
@@ -5041,6 +5042,27 @@ queued draft"
|
||||
assert_no_submit_op(&mut op_rx);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn suppressed_interrupted_turn_notice_skips_history_warning() {
|
||||
let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(None).await;
|
||||
chat.thread_id = Some(ThreadId::new());
|
||||
chat.set_interrupted_turn_notice_mode(InterruptedTurnNoticeMode::Suppress);
|
||||
chat.on_task_started();
|
||||
chat.on_agent_message_delta("partial output".to_string());
|
||||
|
||||
chat.on_interrupted_turn(TurnAbortReason::Interrupted);
|
||||
|
||||
let inserted = drain_insert_history(&mut rx);
|
||||
assert!(
|
||||
inserted.iter().all(|cell| {
|
||||
let rendered = lines_to_single_string(cell);
|
||||
!rendered.contains("Conversation interrupted - tell the model what to do differently.")
|
||||
&& !rendered.contains("Model interrupted to submit steer instructions.")
|
||||
}),
|
||||
"unexpected interrupted-turn notice in BTW thread: {inserted:?}"
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn replaced_turn_clears_pending_steers_but_keeps_queued_drafts() {
|
||||
let (mut chat, mut rx, mut op_rx) = make_chatwidget_manual(None).await;
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
use super::*;
|
||||
use crate::chatwidget::InterruptedTurnNoticeMode;
|
||||
|
||||
const BTW_RENAME_BLOCK_MESSAGE: &str = "BTW threads are ephemeral and cannot be renamed.";
|
||||
|
||||
@@ -15,6 +16,7 @@ impl App {
|
||||
let clear_btw_ui = |chat_widget: &mut crate::chatwidget::ChatWidget| {
|
||||
chat_widget.set_thread_footer_hint_override(/*items*/ None);
|
||||
chat_widget.clear_thread_rename_block();
|
||||
chat_widget.set_interrupted_turn_notice_mode(InterruptedTurnNoticeMode::Default);
|
||||
};
|
||||
let Some(active_thread_id) = self.current_displayed_thread_id() else {
|
||||
clear_btw_ui(&mut self.chat_widget);
|
||||
@@ -31,6 +33,8 @@ impl App {
|
||||
|
||||
self.chat_widget
|
||||
.set_thread_rename_block_message(BTW_RENAME_BLOCK_MESSAGE);
|
||||
self.chat_widget
|
||||
.set_interrupted_turn_notice_mode(InterruptedTurnNoticeMode::Suppress);
|
||||
let mut depth = 1usize;
|
||||
while let Some(next_parent_thread_id) = self
|
||||
.btw_threads
|
||||
|
||||
@@ -807,6 +807,7 @@ pub(crate) struct ChatWidget {
|
||||
forked_from: Option<ThreadId>,
|
||||
/// Pretty parent label used only for the next fork banner inserted on session configure.
|
||||
next_fork_banner_parent_label: Option<String>,
|
||||
interrupted_turn_notice_mode: InterruptedTurnNoticeMode,
|
||||
frame_requester: FrameRequester,
|
||||
// Whether to include the initial welcome banner on session configured
|
||||
show_welcome_banner: bool,
|
||||
@@ -1019,6 +1020,13 @@ struct PendingSteer {
|
||||
compare_key: PendingSteerCompareKey,
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
|
||||
pub(crate) enum InterruptedTurnNoticeMode {
|
||||
#[default]
|
||||
Default,
|
||||
Suppress,
|
||||
}
|
||||
|
||||
pub(crate) fn create_initial_user_message(
|
||||
text: Option<String>,
|
||||
local_image_paths: Vec<PathBuf>,
|
||||
@@ -2672,7 +2680,9 @@ impl ChatWidget {
|
||||
self.finalize_turn();
|
||||
let send_pending_steers_immediately = self.submit_pending_steers_after_interrupt;
|
||||
self.submit_pending_steers_after_interrupt = false;
|
||||
if reason != TurnAbortReason::ReviewEnded {
|
||||
if reason != TurnAbortReason::ReviewEnded
|
||||
&& self.interrupted_turn_notice_mode != InterruptedTurnNoticeMode::Suppress
|
||||
{
|
||||
if send_pending_steers_immediately {
|
||||
self.add_to_history(history_cell::new_info_event(
|
||||
"Model interrupted to submit steer instructions.".to_owned(),
|
||||
@@ -4331,6 +4341,7 @@ impl ChatWidget {
|
||||
thread_rename_block_message: None,
|
||||
forked_from: None,
|
||||
next_fork_banner_parent_label: None,
|
||||
interrupted_turn_notice_mode: InterruptedTurnNoticeMode::Default,
|
||||
queued_user_messages: VecDeque::new(),
|
||||
rejected_steers_queue: VecDeque::new(),
|
||||
pending_steers: VecDeque::new(),
|
||||
@@ -6984,6 +6995,10 @@ impl ChatWidget {
|
||||
self.next_fork_banner_parent_label = label;
|
||||
}
|
||||
|
||||
pub(crate) fn set_interrupted_turn_notice_mode(&mut self, mode: InterruptedTurnNoticeMode) {
|
||||
self.interrupted_turn_notice_mode = mode;
|
||||
}
|
||||
|
||||
pub(crate) fn add_diff_in_progress(&mut self) {
|
||||
self.request_redraw();
|
||||
}
|
||||
|
||||
@@ -2063,6 +2063,7 @@ async fn make_chatwidget_manual(
|
||||
thread_rename_block_message: None,
|
||||
forked_from: None,
|
||||
next_fork_banner_parent_label: None,
|
||||
interrupted_turn_notice_mode: InterruptedTurnNoticeMode::Default,
|
||||
frame_requester: FrameRequester::test_dummy(),
|
||||
show_welcome_banner: true,
|
||||
startup_tooltip_override: None,
|
||||
@@ -5648,6 +5649,27 @@ queued draft"
|
||||
assert_no_submit_op(&mut op_rx);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn suppressed_interrupted_turn_notice_skips_history_warning() {
|
||||
let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(None).await;
|
||||
chat.thread_id = Some(ThreadId::new());
|
||||
chat.set_interrupted_turn_notice_mode(InterruptedTurnNoticeMode::Suppress);
|
||||
chat.on_task_started();
|
||||
chat.on_agent_message_delta("partial output".to_string());
|
||||
|
||||
chat.on_interrupted_turn(TurnAbortReason::Interrupted);
|
||||
|
||||
let inserted = drain_insert_history(&mut rx);
|
||||
assert!(
|
||||
inserted.iter().all(|cell| {
|
||||
let rendered = lines_to_single_string(cell);
|
||||
!rendered.contains("Conversation interrupted - tell the model what to do differently.")
|
||||
&& !rendered.contains("Model interrupted to submit steer instructions.")
|
||||
}),
|
||||
"unexpected interrupted-turn notice in BTW thread: {inserted:?}"
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn replaced_turn_clears_pending_steers_but_keeps_queued_drafts() {
|
||||
let (mut chat, mut rx, mut op_rx) = make_chatwidget_manual(None).await;
|
||||
|
||||
Reference in New Issue
Block a user