From b582bab17cb75bf0123d2b1c007947cf32458c6b Mon Sep 17 00:00:00 2001
From: Alex Clarke <alex.j.tusa@gmail.com>
Date: Fri, 8 May 2026 12:28:24 -0600
Subject: [PATCH] fix: check for an existing session before starting up MCP
 servers when switching to a role

---
 src/config/request_context.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/config/request_context.rs b/src/config/request_context.rs
index 6e4102c..f2ac833 100644
--- a/src/config/request_context.rs
+++ b/src/config/request_context.rs
@@ -1976,6 +1976,10 @@ impl RequestContext {
         abort_signal: AbortSignal,
     ) -> Result<()> {
         let role = self.retrieve_role(app, name)?;
+        if let Some(session) = self.session.as_mut() {
+            session.guard_empty()?;
+        }
+
         let mcp_servers = if app.mcp_server_support {
             role.enabled_mcp_servers()
         } else {