Timeout on tool closure

Author: Drummersbrother

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "open-edison"
-version = "0.1.50"
+version = "0.1.51"
 description = "Open-source MCP security, aggregation, and monitoring. Single-user, self-hosted MCP proxy."
 readme = "README.md"
 authors = [

src/mcp_importer/api.py

@@ -230,8 +230,18 @@ async def _list_tools_only() -> Any:
                     if oauth_info.status in (OAuthStatus.NEEDS_AUTH, OAuthStatus.AUTHENTICATED):
                         return True
                     # NOT_REQUIRED: quick unauthenticated ping
-                    async with FastMCPClient(remote_url, auth=None) as client:  # type: ignore
+                    # print(f"Pinging remote server '{server.name}' without OAuth")
+                    async with FastMCPClient(remote_url, auth=None, timeout=10.0) as client:  # type: ignore
+                        # print(
+                        #    f"Pinging remote server '{server.name}' without OAuth - Inside client with-statement"
+                        # )
                         await asyncio.wait_for(client.ping(), timeout=10.0)
+                        # print(
+                        #    f"Pinging remote server '{server.name}' without OAuth - Inside client with-statement but after ping"
+                        # )
+                    # print(
+                    #    f"Pinging remote server '{server.name}' without OAuth - After client with-statement"
+                    # )
                     return True
                 except Exception as e:  # noqa: BLE001
                     log.error("MCP remote verification failed for '{}': {}", server.name, e)

src/setup_tui/main.py

@@ -173,13 +173,12 @@ def run(*, dry_run: bool = False, skip_oauth: bool = False) -> None:
     show_welcome_screen(dry_run=dry_run)
     # Additional setup steps will be added here
 
-    mcp_sources = detect_clients()
-    mcp_clients = detect_clients()
+    mcp_clients = list(sorted(detect_clients(), key=lambda x: x.value))
 
     configs: list[MCPServerConfig] = []
 
-    for source in mcp_sources:
-        configs.extend(handle_mcp_source(source, dry_run=dry_run, skip_oauth=skip_oauth))
+    for client in mcp_clients:
+        configs.extend(handle_mcp_source(client, dry_run=dry_run, skip_oauth=skip_oauth))
 
     if len(configs) == 0:
         print(