fix(ui): replace client-side registry detection with server-side binding filter

Use useConnections({ binding: "REGISTRY" }) instead of loading all
connections and filtering client-side with useRegistryConnections().
Also replace bare useConnections() for duplicate checking in
add-connection-dialog with a direct MCP tool call, and use targeted
searchTerm queries for publisher lookup in mcp-server-detail.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: viktormarinho

apps/mesh/src/web/components/details/virtual-mcp/add-connection-dialog.tsx

@@ -3,7 +3,6 @@ import { CollectionTabs } from "@/web/components/collections/collection-tabs.tsx
 import { ConnectionCard } from "@/web/components/connections/connection-card.tsx";
 import { IntegrationIcon } from "@/web/components/integration-icon.tsx";
 import type { RegistryItem } from "@/web/components/store/types";
-import { useRegistryConnections } from "@/web/hooks/use-binding";
 import { useInfiniteScroll } from "@/web/hooks/use-infinite-scroll";
 import { useLocalStorage } from "@/web/hooks/use-local-storage";
 import { LOCALSTORAGE_KEYS } from "@/web/lib/localstorage-keys";
@@ -34,8 +33,10 @@ import {
 import { cn } from "@deco/ui/lib/utils.ts";
 import {
   type ConnectionEntity,
+  SELF_MCP_ALIAS_ID,
   useConnectionActions,
   useConnections,
+  useMCPClient,
   useProjectContext,
 } from "@decocms/mesh-sdk";
 import { useQueryClient } from "@tanstack/react-query";
@@ -174,22 +175,17 @@ function AddConnectionDialogContent({
     () => "all",
   );
 
-  // Connections
-  const allConnections = useConnections();
+  // Connections - use server-side search, exclude virtual
+  const allConnections = useConnections({
+    searchTerm: search || undefined,
+  });
   const nonVirtual = allConnections.filter(
     (c) => c.connection_type !== "VIRTUAL",
   );
-  const filteredConnections = search
-    ? nonVirtual.filter(
-        (c) =>
-          c.title.toLowerCase().includes(searchLower) ||
-          c.description?.toLowerCase().includes(searchLower),
-      )
-    : nonVirtual;
-  const grouped = groupConnections(filteredConnections);
-
-  // Registry / catalog
-  const registryConnections = useRegistryConnections(allConnections).sort(
+  const grouped = groupConnections(nonVirtual);
+
+  // Registry / catalog - use server-side binding filter
+  const registryConnections = useConnections({ binding: "REGISTRY" }).sort(
     (a, b) => {
       const isSelfA = a.app_name === "@deco/management-mcp";
       const isSelfB = b.app_name === "@deco/management-mcp";
@@ -569,7 +565,10 @@ export function AddConnectionDialog({
   const { data: session } = authClient.useSession();
   const connectionActions = useConnectionActions();
   const queryClient = useQueryClient();
-  const allConnections = useConnections();
+  const selfClient = useMCPClient({
+    connectionId: SELF_MCP_ALIAS_ID,
+    orgId: org.id,
+  });
 
   const handleInlineConnect = async (item: RegistryItem) => {
     if (!org || !session?.user?.id) return;
@@ -599,14 +598,34 @@ export function AddConnectionDialog({
         return;
       }
 
-      // Check for duplicates
+      // Check for duplicates via server-side search
       const appName = item.id ?? item.title;
-      const existing = allConnections.filter(
-        (c) => c.app_name === appName || c.title === connectionData.title,
-      );
-      if (existing.length > 0) {
+      let existingCount = 0;
+      try {
+        const result = (await selfClient.callTool({
+          name: "COLLECTION_CONNECTIONS_LIST",
+          arguments: {
+            where: {
+              operator: "or",
+              conditions: [
+                { field: ["app_name"], operator: "eq", value: appName },
+                {
+                  field: ["title"],
+                  operator: "eq",
+                  value: connectionData.title,
+                },
+              ],
+            },
+            limit: 100,
+          },
+        })) as { structuredContent?: { totalCount?: number } };
+        existingCount = result.structuredContent?.totalCount ?? 0;
+      } catch {
+        // If the check fails, proceed without renaming
+      }
+      if (existingCount > 0) {
         const baseName = connectionData.title || "MCP Server";
-        connectionData.title = `${baseName} (${existing.length + 1})`;
+        connectionData.title = `${baseName} (${existingCount + 1})`;
       }
 
       const { id } = await connectionActions.create.mutateAsync(connectionData);

apps/mesh/src/web/hooks/use-binding-schema-from-registry.ts

@@ -8,7 +8,6 @@
 
 import { useSuspenseQueries } from "@tanstack/react-query";
 import type { BindingDefinition } from "@/web/hooks/use-binding";
-import { useRegistryConnections } from "@/web/hooks/use-binding";
 import { KEYS } from "@/web/lib/query-keys";
 import { MCP_REGISTRY_DECOCMS_KEY } from "@/web/utils/constants";
 import { findListToolName, callRegistryTool } from "@/web/utils/registry-utils";
@@ -102,9 +101,8 @@ export function useBindingSchemaFromRegistry(
   serverName: string | undefined,
 ): UseBindingSchemaFromRegistryResult {
   const { org } = useProjectContext();
-  // Get all connections and filter to registry connections
-  const allConnections = useConnections();
-  const registryConnections = useRegistryConnections(allConnections);
+  // Get registry connections using server-side binding filter
+  const registryConnections = useConnections({ binding: "REGISTRY" });
 
   // Parse the MCP Server name for the query
   const parsedServerName = serverName ? parseServerName(serverName) : "";

apps/mesh/src/web/hooks/use-install-from-registry.ts

@@ -5,7 +5,6 @@
 
 import { toast } from "sonner";
 import type { RegistryItem } from "@/web/components/store/types";
-import { useRegistryConnections } from "@/web/hooks/use-binding";
 import { authClient } from "@/web/lib/auth-client";
 import {
   useConnectionActions,
@@ -56,9 +55,8 @@ export function useInstallFromRegistry(): UseInstallFromRegistryResult {
   const { data: session } = authClient.useSession();
   const actions = useConnectionActions();
 
-  // Get all connections and filter to registry connections
-  const allConnections = useConnections();
-  const registryConnections = useRegistryConnections(allConnections);
+  // Get registry connections using server-side binding filter
+  const registryConnections = useConnections({ binding: "REGISTRY" });
 
   // Installation function - queries registries directly with MCP Server name filter
   const installByBinding = async (

apps/mesh/src/web/routes/orgs/connections.tsx

@@ -8,7 +8,6 @@ import { ErrorBoundary } from "@/web/components/error-boundary";
 import { IntegrationIcon } from "@/web/components/integration-icon.tsx";
 import { Page } from "@/web/components/page";
 import type { RegistryItem } from "@/web/components/store/types";
-import { useRegistryConnections } from "@/web/hooks/use-binding";
 import { useInfiniteScroll } from "@/web/hooks/use-infinite-scroll";
 import { useLocalStorage } from "@/web/hooks/use-local-storage";
 import { LOCALSTORAGE_KEYS } from "@/web/lib/localstorage-keys";
@@ -806,9 +805,10 @@ function OrgMcpsContent() {
 
   const actions = useConnectionActions();
   const connections = useConnections(listState);
-  // Unfiltered connections for catalog metadata (connectedAppNames, appInstances)
+  // Connections without search filter for catalog metadata (connectedAppNames, appInstances)
   // so the "Connected" badge and modal aren't affected by the search term
-  const allConnections = useConnections();
+  const { searchTerm: _ignored, ...listStateWithoutSearch } = listState;
+  const allConnections = useConnections(listStateWithoutSearch);
 
   const [dialogState, dispatch] = useReducer(dialogReducer, { mode: "idle" });
 
@@ -864,7 +864,7 @@ function OrgMcpsContent() {
   // Optional registry lookup: support multiple registries, let user pick on "All" tab
   // Sort so the self/management MCP (Mesh MCP) appears last — external registries like
   // Deco Store / MCP Registry should be the default catalog source.
-  const registryConnections = useRegistryConnections(allConnections).sort(
+  const registryConnections = useConnections({ binding: "REGISTRY" }).sort(
     (a, b) => {
       const isSelfA = a.app_name === "@deco/management-mcp";
       const isSelfB = b.app_name === "@deco/management-mcp";

apps/mesh/src/web/routes/orgs/store/mcp-server-detail.tsx

@@ -18,7 +18,6 @@ import {
   BreadcrumbPage,
   BreadcrumbSeparator,
 } from "@deco/ui/components/breadcrumb.tsx";
-import { useRegistryConnections } from "@/web/hooks/use-binding";
 import { usePublisherConnection } from "@/web/hooks/use-publisher-connection";
 import {
   useConnection,
@@ -282,9 +281,8 @@ function StoreMCPServerDetailContent() {
   const [isConnecting, setIsConnecting] = useState(false);
   const queryClient = useQueryClient();
   const actions = useConnectionActions();
-  const allConnections = useConnections();
   const { data: session } = authClient.useSession();
-  const registryConnections = useRegistryConnections(allConnections);
+  const registryConnections = useConnections({ binding: "REGISTRY" });
 
   // Use passed registryId or default to first one
   const effectiveRegistryId =
@@ -486,12 +484,21 @@ function StoreMCPServerDetailContent() {
   // Combine local and remote tools - prefer local if available
   const effectiveTools = hasLocalTools ? data?.tools || [] : remoteTools;
 
-  // Get publisher connection from database
+  // Get publisher connection from database (targeted search by publisher name)
+  const publisherCandidates = useConnections({
+    searchTerm: data?.publisher || "",
+  });
   const publisherConnection = usePublisherConnection(
-    allConnections,
+    publisherCandidates,
     data?.publisher,
   );
 
+  // Fetch existing connections matching this server for duplicate detection
+  const serverAppName = selectedItem?.id ?? selectedItem?.title ?? "";
+  const existingInstallations = useConnections({
+    searchTerm: serverAppName,
+  });
+
   // Calculate publisher info
   const publisherInfo: PublisherInfo = !data
     ? { count: 0 }
@@ -702,8 +709,9 @@ function StoreMCPServerDetailContent() {
     if (!version) return;
 
     const appName = version.id ?? version.title;
-    const existing = allConnections.filter(
-      (c) => c.app_name === appName || c.title === version.title,
+    const existing = existingInstallations.filter(
+      (c: ConnectionEntity) =>
+        c.app_name === appName || c.title === version.title,
     );
 
     if (existing.length > 0) {

apps/mesh/src/web/routes/orgs/store/page.tsx

@@ -8,7 +8,7 @@ import {
 import { StoreDiscovery } from "@/web/components/store";
 import { StoreRegistrySelect } from "@/web/components/store/store-registry-select";
 import { StoreRegistryEmptyState } from "@/web/components/store/store-registry-empty-state";
-import { useRegistryConnections } from "@/web/hooks/use-binding";
+
 import { useLocalStorage } from "@/web/hooks/use-local-storage";
 import { LOCALSTORAGE_KEYS } from "@/web/lib/localstorage-keys";
 import {
@@ -71,7 +71,6 @@ function StoreErrorFallback({
 
 export default function StorePage() {
   const { org, project } = useProjectContext();
-  const allConnections = useConnections();
   const connectionActions = useConnectionActions();
 
   // Check if we're viewing a child route (server detail)
@@ -80,8 +79,8 @@ export default function StorePage() {
     routerState.location.pathname.includes("/store/") &&
     routerState.location.pathname.split("/").length > 3;
 
-  // Filter to only show registry connections (those with collections)
-  const allRegistryConnections = useRegistryConnections(allConnections);
+  // Filter to only show registry connections using server-side binding
+  const allRegistryConnections = useConnections({ binding: "REGISTRY" });
 
   // The self MCP caches ALL tools (including plugin tools) in its tools column.
   // When the private-registry plugin is disabled, the COLLECTION_REGISTRY_APP_*