refactor(tool-validation): extract getMcpServerIssue, remove fake tool hack

Author: waleedlatif1

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/tool-input.tsx

@@ -20,8 +20,9 @@ import { cn } from '@/lib/core/utils/cn'
 import {
   getIssueBadgeLabel,
   getIssueBadgeVariant,
-  isToolUnavailable,
+  getMcpServerIssue as validateMcpServer,
   getMcpToolIssue as validateMcpTool,
+  isToolUnavailable,
 } from '@/lib/mcp/tool-validation'
 import type { McpToolSchema } from '@/lib/mcp/types'
 import { getProviderIdFromServiceId, type OAuthProvider, type OAuthService } from '@/lib/oauth'
@@ -550,28 +551,21 @@ export const ToolInput = memo(function ToolInput({
         connectionStatus: s.connectionStatus,
         lastError: s.lastError ?? undefined,
       }))
-      const discoveredTools = mcpTools.map((t) => ({
-        serverId: t.serverId,
-        name: t.name,
-        inputSchema: t.inputSchema,
-      }))
 
       if (tool.type === 'mcp-server') {
-        // Server-level validation: only check server connectivity
-        return validateMcpTool(
-          {
-            serverId,
-            serverUrl: tool.params?.serverUrl as string | undefined,
-            toolName: '__server_check__',
-            schema: undefined,
-          },
-          serverStates,
-          // Pass a fake discovered tool so tool_not_found doesn't trigger
-          [...discoveredTools, { serverId, name: '__server_check__', inputSchema: undefined }]
+        return validateMcpServer(
+          serverId,
+          tool.params?.serverUrl as string | undefined,
+          serverStates
         )
       }
 
       const toolName = tool.params?.toolName as string
+      const discoveredTools = mcpTools.map((t) => ({
+        serverId: t.serverId,
+        name: t.name,
+        inputSchema: t.inputSchema,
+      }))
 
       // Try to get fresh schema from DB (enables real-time updates after MCP refresh)
       const storedTool =

apps/sim/lib/mcp/tool-validation.ts

@@ -39,13 +39,15 @@ export function hasSchemaChanged(
   return !isEqual(storedWithoutDesc, serverWithoutDesc)
 }
 
-export function getMcpToolIssue(
-  storedTool: StoredMcpToolReference,
-  servers: ServerState[],
-  discoveredTools: DiscoveredTool[]
+/**
+ * Validates server-level connectivity for an MCP server.
+ * Checks: server existence, connection status, URL changes.
+ */
+export function getMcpServerIssue(
+  serverId: string,
+  serverUrl: string | undefined,
+  servers: ServerState[]
 ): McpToolIssue | null {
-  const { serverId, serverUrl, toolName, schema } = storedTool
-
   const server = servers.find((s) => s.id === serverId)
   if (!server) {
     return { type: 'server_not_found', message: 'Server not found' }
@@ -62,6 +64,19 @@ export function getMcpToolIssue(
     return { type: 'url_changed', message: 'Server URL changed' }
   }
 
+  return null
+}
+
+export function getMcpToolIssue(
+  storedTool: StoredMcpToolReference,
+  servers: ServerState[],
+  discoveredTools: DiscoveredTool[]
+): McpToolIssue | null {
+  const { serverId, serverUrl, toolName, schema } = storedTool
+
+  const serverIssue = getMcpServerIssue(serverId, serverUrl, servers)
+  if (serverIssue) return serverIssue
+
   const serverTool = discoveredTools.find((t) => t.serverId === serverId && t.name === toolName)
   if (!serverTool) {
     return { type: 'tool_not_found', message: 'Tool not found on server' }