Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

agent_ui: Fix duplicate terminal when starting a new agent thread (#59586)

Richard Boisvertaf56cb75a8ef
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 835bb0e5722..cc5a6a55bb3 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -2037,6 +2037,7 @@ impl AgentPanel {
window: &mut Window,
cx: &mut Context<Self>,
) {
+ self.pending_terminal_spawn = Some(terminal_id);
let terminal_working_directory = working_directory.clone();
let init_command = Self::terminal_init_command(run_init_command, cx);
let terminal_task = self.project.update(cx, |project, cx| {
@@ -7364,6 +7365,34 @@ mod tests {
});
}
+ #[gpui::test]
+ async fn test_explicit_terminal_blocks_redundant_auto_init(cx: &mut TestAppContext) {
+ let (panel, mut cx) = setup_panel(cx).await;
+
+ panel.update_in(&mut cx, |panel, window, cx| {
+ panel.last_created_entry_kind = AgentPanelEntryKind::Terminal;
+ assert!(
+ matches!(panel.base_view, BaseView::Uninitialized),
+ "precondition: the panel starts uninitialized"
+ );
+ assert!(
+ panel.pending_terminal_spawn.is_none(),
+ "precondition: no terminal spawn is in-flight yet"
+ );
+ panel.new_terminal(None, AgentThreadSource::AgentPanel, window, cx);
+ let pending = panel.pending_terminal_spawn;
+ assert!(
+ pending.is_some(),
+ "an explicit new terminal must mark a spawn in-flight"
+ );
+ panel.set_active(true, window, cx);
+ assert_eq!(
+ panel.pending_terminal_spawn, pending,
+ "activating the panel while a terminal spawn is in-flight must not schedule a second (auto-init) terminal"
+ );
+ });
+ }
+
#[gpui::test]
async fn test_restored_terminal_runs_init_command_once(cx: &mut TestAppContext) {
let (panel, mut cx) = setup_panel(cx).await;