fix(mcp): third-round bugbot review

- discoverTools failure path now drops the per-server positive cache alongside
  writing the negative-cache marker, matching discoverServerTools' behavior so
  a workspace-aggregate failure doesn't leave stale tools cached.
- useForceRefreshMcpTools filters disabled and out-of-workspace rows before
  fan-out so disabled servers don't 404 → negative-cache themselves.
- Remove unused useMcpServerTools export — the aggregate goes through
  useQueries directly, no external consumer exists.

Author: waleedlatif1

apps/sim/hooks/queries/mcp.ts

@@ -122,17 +122,6 @@ async function fetchMcpTools(
   }
 }
 
-export function useMcpServerTools(workspaceId: string, serverId?: string) {
-  return useQuery({
-    queryKey: mcpKeys.serverToolsList(workspaceId, serverId),
-    queryFn: ({ signal }) => fetchMcpTools(workspaceId, false, signal, serverId),
-    enabled: !!workspaceId && !!serverId,
-    retry: false,
-    staleTime: 30 * 1000,
-    refetchOnWindowFocus: false,
-  })
-}
-
 /**
  * Workspace aggregate derived from N parallel per-server queries via
  * `useQueries`. One slow server cannot block the others.
@@ -195,7 +184,9 @@ export function useForceRefreshMcpTools() {
 
   return useMutation({
     mutationFn: async (workspaceId: string) => {
-      const servers = queryClient.getQueryData<McpServer[]>(mcpKeys.serversList(workspaceId)) ?? []
+      const allServers =
+        queryClient.getQueryData<McpServer[]>(mcpKeys.serversList(workspaceId)) ?? []
+      const servers = allServers.filter((s) => s.enabled && s.workspaceId === workspaceId)
       const results = await Promise.allSettled(
         servers.map(async (server) => {
           const tools = await fetchMcpTools(workspaceId, true, undefined, server.id)

apps/sim/lib/mcp/service.ts

@@ -590,7 +590,12 @@ class McpService {
         )
         deferredSideEffects.push(
           this.updateServerStatus(server.id, workspaceId, false, outcome.message),
-          this.markServerUnhealthy(workspaceId, server.id, outcome.originalError)
+          this.markServerUnhealthy(workspaceId, server.id, outcome.originalError),
+          this.cacheAdapter
+            .delete(serverCacheKey(workspaceId, server.id))
+            .catch((err) =>
+              logger.warn(`[${requestId}] Cache delete failed for ${server.name}:`, err)
+            )
         )
       })