Reset MCP guards after replayed reviews

This commit is contained in:
Charlie Marsh
2026-06-29 09:39:14 -04:00
parent d4665d4754
commit 3f75f965da
3 changed files with 29 additions and 2 deletions
+8 -1
View File
@@ -1257,12 +1257,19 @@ impl ChatWidget {
self.request_redraw();
}
fn exit_review_mode_after_item(&mut self) {
fn exit_review_mode_after_item(&mut self, render_source: ThreadItemRenderSource) {
self.flush_answer_stream_with_separator();
self.flush_interrupt_queue();
self.flush_active_cell();
self.review.is_review_mode = false;
self.mcp_startup_updates_suppressed_for_review = false;
if render_source.is_replay() {
self.mcp_startup_ignore_updates_until_next_start = false;
self.mcp_startup_allow_terminal_only_next_round = false;
self.mcp_startup_pending_next_round.clear();
self.mcp_startup_pending_next_round_saw_starting = false;
self.mcp_startup_started_while_idle = false;
}
self.restore_pre_review_token_info();
self.add_to_history(history_cell::new_review_status_line(
"<< Code review finished >>".to_string(),
+1 -1
View File
@@ -165,7 +165,7 @@ impl ChatWidget {
}
}
ThreadItem::ExitedReviewMode { .. } => {
self.exit_review_mode_after_item();
self.exit_review_mode_after_item(render_source);
}
ThreadItem::ContextCompaction { .. } => {
self.add_info_message("Context compacted".to_string(), /*hint*/ None);
@@ -228,6 +228,26 @@ async fn replayed_active_review_rearms_mcp_startup_suppression() {
assert!(chat.mcp_startup_status.is_some());
}
#[tokio::test]
async fn completed_replayed_review_does_not_hide_fresh_mcp_round() {
let (mut chat, _rx, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await;
chat.set_mcp_startup_expected_servers(["alpha".to_string(), "beta".to_string()]);
replay_entered_review_mode(&mut chat, "current changes");
chat.replay_thread_item(
AppServerThreadItem::ExitedReviewMode {
id: "review-end".to_string(),
review: String::new(),
},
"turn-1".to_string(),
ReplayKind::ThreadSnapshot,
);
notify_mcp_status(&mut chat, "beta", McpServerStartupState::Ready);
assert!(chat.mcp_startup_status.is_some());
assert!(chat.bottom_pane.is_task_running());
}
#[tokio::test]
async fn lag_recovery_during_review_does_not_promote_skipped_terminal_round() {
let (mut chat, mut rx, mut op_rx) = make_chatwidget_manual(/*model_override*/ None).await;