improvement(mcp): update server status from discoverServerTools + cap list-tools timeout at 30s

Author: waleedlatif1

apps/sim/lib/mcp/client.test.ts

@@ -37,6 +37,7 @@ vi.mock('@modelcontextprotocol/sdk/types.js', () => ({
 
 vi.mock('@/lib/core/execution-limits', () => ({
   getMaxExecutionTimeout: vi.fn().mockReturnValue(30000),
+  DEFAULT_EXECUTION_TIMEOUT_MS: 30000,
 }))
 
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js'

apps/sim/lib/mcp/client.ts

@@ -36,6 +36,7 @@ import {
   type McpToolsChangedCallback,
   type McpVersionInfo,
 } from '@/lib/mcp/types'
+import { MCP_CLIENT_CONSTANTS } from '@/lib/mcp/utils'
 
 const logger = createLogger('McpClient')
 
@@ -167,7 +168,9 @@ export class McpClient {
     }
 
     try {
-      const result: ListToolsResult = await this.client.listTools()
+      const result: ListToolsResult = await this.client.listTools(undefined, {
+        timeout: MCP_CLIENT_CONSTANTS.LIST_TOOLS_TIMEOUT_MS,
+      })
 
       if (!result.tools || !Array.isArray(result.tools)) {
         logger.warn(`Invalid tools response from server ${this.config.name}:`, result)

apps/sim/lib/mcp/service.ts

@@ -580,13 +580,17 @@ class McpService {
         try {
           const tools = await client.listTools()
           logger.info(`[${requestId}] Discovered ${tools.length} tools from server ${config.name}`)
-          // Prime the per-server cache so the next discoverTools call hits it
-          // instead of re-fetching live (which can stall on slow upstreams).
-          await this.cacheAdapter
-            .set(serverCacheKey(workspaceId, serverId), tools, this.cacheTimeout)
-            .catch((err) =>
-              logger.warn(`[${requestId}] Cache write failed for ${config.name}:`, err)
-            )
+          // Prime the per-server cache and reflect the successful connection on
+          // the row so the UI doesn't keep showing "Connect with OAuth" or stale
+          // disconnected/error state.
+          await Promise.allSettled([
+            this.cacheAdapter
+              .set(serverCacheKey(workspaceId, serverId), tools, this.cacheTimeout)
+              .catch((err) =>
+                logger.warn(`[${requestId}] Cache write failed for ${config.name}:`, err)
+              ),
+            this.updateServerStatus(serverId, workspaceId, true, undefined, tools.length),
+          ])
           return tools
         } finally {
           await client.disconnect()

apps/sim/lib/mcp/utils.ts

@@ -46,6 +46,8 @@ export function sanitizeHeaders(
 export const MCP_CLIENT_CONSTANTS = {
   CLIENT_TIMEOUT: DEFAULT_EXECUTION_TIMEOUT_MS,
   AUTO_REFRESH_INTERVAL: 5 * 60 * 1000,
+  // Cap metadata calls so a slow upstream can't hang the UI for 60s+.
+  LIST_TOOLS_TIMEOUT_MS: 30_000,
 } as const
 
 /**