From 7114a5ca99aa14016a278100f136a32dd7911521 Mon Sep 17 00:00:00 2001 From: Bennet Bo Fenner Date: Wed, 9 Jul 2025 16:39:02 +0200 Subject: [PATCH] Fix panic in context server configuration (#34118) Release Notes: - Fixed a panic that could occur when configuring MCP servers --- .../src/agent_configuration/configure_context_server_modal.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs b/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs index ba0021c33ca32c50351387ab290bf33ce604b2e4..9e5f6e09c82489dd4ccdc89f188e962ceeec596d 100644 --- a/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs +++ b/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs @@ -740,7 +740,9 @@ fn wait_for_context_server( }); cx.spawn(async move |_cx| { - let result = rx.await.unwrap(); + let result = rx + .await + .map_err(|_| Arc::from("Context server store was dropped"))?; drop(subscription); result })