From 0eb0bec74cac9e5022087e40deba27ff466d4f6b Mon Sep 17 00:00:00 2001
From: 0xbyt4 <35742124+0xbyt4@users.noreply.github.com>
Date: Mon, 2 Mar 2026 21:06:17 +0300
Subject: [PATCH] feat(gateway): add MCP server shutdown on gateway exit

Ensures MCP subprocess connections are closed when the messaging
gateway shuts down, preventing orphan processes.
---
 gateway/run.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gateway/run.py b/gateway/run.py
index 8154b76f1..2a40149e9 100644
--- a/gateway/run.py
+++ b/gateway/run.py
@@ -2202,7 +2202,14 @@ async def start_gateway(config: Optional[GatewayConfig] = None) -> bool:
     # Stop cron ticker cleanly
     cron_stop.set()
     cron_thread.join(timeout=5)
-    
+
+    # Close MCP server connections
+    try:
+        from tools.mcp_tool import shutdown_mcp_servers
+        shutdown_mcp_servers()
+    except Exception:
+        pass
+
     return True