gate behind registry-enabled flag

Author: prathmeshpatel

mcpjam-inspector/client/src/App.tsx

@@ -145,6 +145,7 @@ export default function App() {
   );
   const learningEnabled = useFeatureFlagEnabled("mcpjam-learning");
   const clientConfigEnabled = useFeatureFlagEnabled("client-config-enabled");
+  const registryEnabled = useFeatureFlagEnabled("registry-enabled");
   const {
     getAccessToken,
     signIn,
@@ -657,6 +658,11 @@ export default function App() {
         )} plan. Upgrade the organization to continue.`,
       );
       applyNavigation("servers", { updateHash: true });
+    } else if (
+      activeTab === "registry" &&
+      registryEnabled !== true
+    ) {
+      applyNavigation("servers", { updateHash: true });
     } else if (
       activeTab === "learning" &&
       (learningEnabled !== true || !isAuthenticated)
@@ -671,6 +677,7 @@ export default function App() {
   }, [
     ciEvalsEnabled,
     clientConfigEnabled,
+    registryEnabled,
     activeTabBillingFeature,
     activeTabBillingLocked,
     learningEnabled,
@@ -892,10 +899,15 @@ export default function App() {
               isLoadingWorkspaces={isLoadingRemoteWorkspaces}
               onWorkspaceShared={handleWorkspaceShared}
               onLeaveWorkspace={() => handleLeaveWorkspace(activeWorkspaceId)}
-              onNavigateToRegistry={() => handleNavigate("registry")}
+              isRegistryEnabled={registryEnabled === true}
+              onNavigateToRegistry={
+                registryEnabled === true
+                  ? () => handleNavigate("registry")
+                  : undefined
+              }
             />
           )}
-          {activeTab === "registry" && (
+          {activeTab === "registry" && registryEnabled === true && (
             <RegistryTab
               workspaceId={convexWorkspaceId}
               isAuthenticated={isAuthenticated}

mcpjam-inspector/client/src/components/ServersTab.tsx

@@ -375,6 +375,7 @@ interface ServersTabProps {
   isLoadingWorkspaces?: boolean;
   onWorkspaceShared?: (sharedWorkspaceId: string) => void;
   onLeaveWorkspace?: () => void;
+  isRegistryEnabled?: boolean;
   onNavigateToRegistry?: () => void;
 }
 
@@ -389,6 +390,7 @@ export function ServersTab({
   activeWorkspaceId,
   isLoadingWorkspaces,
   onWorkspaceShared,
+  isRegistryEnabled = false,
   onNavigateToRegistry,
 }: ServersTabProps) {
   const posthog = usePostHog();
@@ -403,6 +405,7 @@ export function ServersTab({
     isLoading: isRegistryCatalogLoading,
     connect: connectRegistryServer,
   } = useRegistryServers({
+    enabled: isRegistryEnabled,
     workspaceId: registryWorkspaceId,
     isAuthenticated,
     liveServers: workspaceServers,
@@ -632,12 +635,15 @@ export function ServersTab({
   }, [totalServerCards]);
 
   const shouldShowQuickConnect =
-    isRegistryCatalogLoading ||
-    quickConnectCatalogAvailableCount > 0 ||
-    isPendingQuickConnectVisible;
+    isRegistryEnabled &&
+    (isRegistryCatalogLoading ||
+      quickConnectCatalogAvailableCount > 0 ||
+      isPendingQuickConnectVisible);
 
   const shouldShowBrowseRegistryOnly =
-    !shouldShowQuickConnect && quickConnectCatalogAvailableCount > 0;
+    isRegistryEnabled &&
+    !shouldShowQuickConnect &&
+    quickConnectCatalogAvailableCount > 0;
 
   const activeWorkspace = workspaces[activeWorkspaceId];
   const sharedWorkspaceId = activeWorkspace?.sharedWorkspaceId;

mcpjam-inspector/client/src/components/__tests__/ServersTab.test.tsx

@@ -384,6 +384,7 @@ describe("ServersTab shared detail modal", () => {
     isLoadingWorkspaces: false,
     onWorkspaceShared: vi.fn(),
     onLeaveWorkspace: vi.fn(),
+    isRegistryEnabled: true,
     onNavigateToRegistry: vi.fn(),
   };
 
@@ -982,6 +983,32 @@ describe("ServersTab shared detail modal", () => {
     ).not.toBeInTheDocument();
   });
 
+  it("hides quick connect and browse registry when the registry flag is disabled", () => {
+    mockIsAuthenticated = true;
+    mockCatalogCards = [createLinearCatalogCard()];
+
+    render(
+      <ServersTab
+        {...defaultProps}
+        isRegistryEnabled={false}
+        onNavigateToRegistry={undefined}
+        workspaceServers={{}}
+      />,
+    );
+
+    expect(
+      screen.queryByTestId("servers-quick-connect-section"),
+    ).not.toBeInTheDocument();
+    expect(
+      screen.queryByTestId("servers-tab-browse-registry-header-fallback"),
+    ).not.toBeInTheDocument();
+    expect(mockUseRegistryServers).toHaveBeenCalledWith(
+      expect.objectContaining({
+        enabled: false,
+      }),
+    );
+  });
+
   it("passes the shared workspace id to registry queries instead of the local workspace key", () => {
     mockIsAuthenticated = true;
     mockCatalogCards = [createLinearCatalogCard()];
@@ -1000,6 +1027,7 @@ describe("ServersTab shared detail modal", () => {
 
     expect(mockUseRegistryServers).toHaveBeenCalledWith(
       expect.objectContaining({
+        enabled: true,
         workspaceId: "ws_shared_123",
       }),
     );
@@ -1020,6 +1048,7 @@ describe("ServersTab shared detail modal", () => {
 
     expect(mockUseRegistryServers).toHaveBeenCalledWith(
       expect.objectContaining({
+        enabled: true,
         workspaceId: null,
       }),
     );

mcpjam-inspector/client/src/components/mcp-sidebar.tsx

@@ -138,6 +138,7 @@ const navigationSections: NavSection[] = [
         title: "Registry",
         url: "#registry",
         icon: LayoutGrid,
+        featureFlag: "registry-enabled",
       },
       {
         title: "Chat",
@@ -330,6 +331,7 @@ export function MCPSidebar({
   const learningFlagEnabled = useFeatureFlagEnabled("mcpjam-learning");
   const sandboxesEnabled = useFeatureFlagEnabled("sandboxes-enabled");
   const clientConfigEnabled = useFeatureFlagEnabled("client-config-enabled");
+  const registryEnabled = useFeatureFlagEnabled("registry-enabled");
   const { isAuthenticated } = useConvexAuth();
   const learningEnabled = !!learningFlagEnabled && isAuthenticated;
   const themeMode = usePreferencesStore((s) => s.themeMode);
@@ -433,12 +435,14 @@ export function MCPSidebar({
       "mcpjam-learning": !!learningEnabled,
       "sandboxes-enabled": !!sandboxesEnabled && isAuthenticated,
       "client-config-enabled": !!clientConfigEnabled && isAuthenticated,
+      "registry-enabled": registryEnabled === true,
     }),
     [
       ciEvalsEnabled,
       learningEnabled,
       sandboxesEnabled,
       clientConfigEnabled,
+      registryEnabled,
       isAuthenticated,
     ],
   );

mcpjam-inspector/client/src/hooks/useRegistryServers.ts

@@ -360,12 +360,14 @@ function isMissingWorkspaceConnectionError(error: unknown): boolean {
  * Pattern follows useWorkspaceMutations / useServerMutations in useWorkspaces.ts.
  */
 export function useRegistryServers({
+  enabled = true,
   workspaceId,
   isAuthenticated,
   liveServers,
   onConnect,
   onDisconnect,
 }: {
+  enabled?: boolean;
   workspaceId: string | null;
   isAuthenticated: boolean;
   liveServers?: Record<string, { connectionStatus: string }>;
@@ -401,11 +403,13 @@ export function useRegistryServers({
   }, []);
 
   useEffect(() => {
+    if (!enabled) return;
     if (DEV_MOCK_REGISTRY) return;
     void loadCatalog();
-  }, [loadCatalog]);
+  }, [enabled, loadCatalog]);
 
   useEffect(() => {
+    if (!enabled) return;
     if (!HOSTED_MODE || !isAuthenticated || DEV_MOCK_REGISTRY) return;
     const guestToken = peekStoredGuestToken();
     if (!guestToken || mergeRanRef.current) return;
@@ -425,11 +429,11 @@ export function useRegistryServers({
         toast.error(message);
       }
     })();
-  }, [isAuthenticated, loadCatalog]);
+  }, [enabled, isAuthenticated, loadCatalog]);
 
   const connections = useQuery(
     "registryServers:getWorkspaceRegistryConnections" as any,
-    !DEV_MOCK_REGISTRY && isAuthenticated && workspaceId
+    enabled && !DEV_MOCK_REGISTRY && isAuthenticated && workspaceId
       ? ({ workspaceId } as any)
       : "skip",
   ) as RegistryServerConnection[] | undefined;
@@ -447,30 +451,33 @@ export function useRegistryServers({
   }, [connections]);
 
   const catalogCards = useMemo(() => {
+    if (!enabled) return [];
     if (rawCatalog === null) return [];
     const enriched = enrichCatalogCards(
       rawCatalog,
       connectedRegistryIds,
       liveServers,
     );
     return sortCatalogCards(enriched);
-  }, [rawCatalog, connectedRegistryIds, liveServers]);
+  }, [enabled, rawCatalog, connectedRegistryIds, liveServers]);
 
   const categories = useMemo(() => {
+    if (!enabled) return [];
     const cats = new Set<string>();
     for (const card of catalogCards) {
       for (const v of card.variants) {
         if (v.category) cats.add(v.category);
       }
     }
     return Array.from(cats).sort();
-  }, [catalogCards]);
+  }, [enabled, catalogCards]);
 
   const [pendingServerIds, setPendingServerIds] = useState<Map<string, string>>(
     new Map(),
   );
 
   useEffect(() => {
+    if (!enabled) return;
     if (!isAuthenticated || !workspaceId || DEV_MOCK_REGISTRY) return;
     for (const [registryServerId, serverName] of pendingServerIds) {
       if (connectedRegistryIds.has(registryServerId)) {
@@ -500,18 +507,20 @@ export function useRegistryServers({
     pendingServerIds,
     isAuthenticated,
     workspaceId,
+    enabled,
     connectMutation,
     connectedRegistryIds,
   ]);
 
   const connectionsAreLoading =
+    enabled &&
     !DEV_MOCK_REGISTRY &&
     isAuthenticated &&
     !!workspaceId &&
     connections === undefined;
 
   const isLoading =
-    !DEV_MOCK_REGISTRY && (rawCatalog === null || connectionsAreLoading);
+    enabled && !DEV_MOCK_REGISTRY && (rawCatalog === null || connectionsAreLoading);
 
   const toggleStar = useCallback(
     async (registryCardKey: string) => {
@@ -635,8 +644,8 @@ export function useRegistryServers({
 
   /** Flat list of enriched servers for legacy callers / tests */
   const registryServers = useMemo(
-    () => catalogCards.flatMap((c) => c.variants),
-    [catalogCards],
+    () => (enabled ? catalogCards.flatMap((c) => c.variants) : []),
+    [enabled, catalogCards],
   );
 
   return {