Handle MCP server interrupts cleanly

Author: temiroff

python/blacknode/cli.py

@@ -199,13 +199,16 @@ def add(label: str, ok: bool, detail: str, *, required: bool = True) -> None:
 def _mcp(args: argparse.Namespace | None = None) -> int:
     from .mcp import main as run_mcp
 
-    run_mcp(
-        transport=getattr(args, "transport", "stdio"),
-        host=getattr(args, "host", None),
-        port=getattr(args, "port", None),
-        path=getattr(args, "path", None),
-        allowed_hosts=getattr(args, "allowed_hosts", None),
-    )
+    try:
+        run_mcp(
+            transport=getattr(args, "transport", "stdio"),
+            host=getattr(args, "host", None),
+            port=getattr(args, "port", None),
+            path=getattr(args, "path", None),
+            allowed_hosts=getattr(args, "allowed_hosts", None),
+        )
+    except KeyboardInterrupt:
+        return 130
     return 0
 
 

tests/test_cli.py

@@ -223,6 +223,12 @@ def test_mcp_forwards_streamable_http_options(self):
             allowed_hosts=["localhost:*", "blacknode-mcp:*"],
         )
 
+    def test_mcp_ctrl_c_exits_without_traceback(self):
+        with patch("blacknode.mcp.main", side_effect=KeyboardInterrupt):
+            code = main(["mcp", "--transport", "streamable-http"])
+
+        self.assertEqual(code, 130)
+
 
 def _valid_workflow() -> dict:
     return workflow(