@agent-native/core 0.141.6 → 0.144.0

package/dist/client/resources/McpIntegrationDialog.js

@@ -7,7 +7,7 @@ import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle, }
 import { Tooltip, TooltipContent, TooltipTrigger, } from "../components/ui/tooltip.js";
 import { useT } from "../i18n.js";
 import { cn } from "../utils.js";
-import { buildMcpOAuthStartUrl, createMcpIntegrationFormDefaults, filterMcpIntegrations, getMcpIntegrationApiFallback, getDefaultMcpIntegrations, isCustomMcpIntegrationEnabled, navigateToMcpOAuthStart, resolveMcpIntegrationScope, shouldOfferMcpOrganizationScope, } from "./mcp-integration-catalog.js";
+import { buildMcpOAuthStartUrl, createMcpIntegrationFormDefaults, filterMcpIntegrations, getMcpIntegrationApiFallback, getDefaultMcpIntegrations, isCustomMcpIntegrationEnabled, navigateToMcpOAuthStart, resolveMcpIntegrationScope, shouldOfferMcpIntegrationOrganizationScope, shouldOfferMcpOrganizationScope, } from "./mcp-integration-catalog.js";
 import { formatMcpServerError, getMcpUrlValidationError, testMcpServerUrl, useMcpServers, } from "./use-mcp-servers.js";
 function IntegrationLogo({ name, logoUrl }) {
     const [loaded, setLoaded] = useState(false);
@@ -51,6 +51,17 @@ function compareUrl(value) {
         return value.trim().replace(/\/+$/, "");
     }
 }
+function requiresMcpIntegrationSetup(integration) {
+    return Boolean(!integration.managedOAuth &&
+        (integration.connectionMode === "manual" ||
+            integration.availability === "provider-setup" ||
+            integration.availability === "client-restricted"));
+}
+function resolveIntegrationScope(integration, defaultScope, hasOrg, canCreateOrgMcp) {
+    return resolveMcpIntegrationScope(defaultScope, hasOrg, canCreateOrgMcp, !integration ||
+        (integration.supportsOrganizationScope === true &&
+            integration.managedOAuth !== true));
+}
 export function McpIntegrationDialog({ open, onOpenChange, initialIntegrationId = null, defaultScope, canCreateOrgMcp, hasOrg, onCreateMcpServer, onCreated, integrations, }) {
     const t = useT();
     const [mode, setMode] = useState("catalog");
@@ -84,10 +95,7 @@ export function McpIntegrationDialog({ open, onOpenChange, initialIntegrationId
             .map((server) => compareUrl(server.url)));
     }, [mcpServersQuery.data]);
     const filteredIntegrations = useMemo(() => filterMcpIntegrations(query, defaultIntegrations), [defaultIntegrations, query]);
-    const selectedRequiresSetup = Boolean(selected &&
-        (selected.connectionMode === "manual" ||
-            selected.availability === "provider-setup" ||
-            selected.availability === "client-restricted"));
+    const selectedRequiresSetup = Boolean(selected && requiresMcpIntegrationSetup(selected));
     useEffect(() => {
         if (!open)
             return;
@@ -98,7 +106,7 @@ export function McpIntegrationDialog({ open, onOpenChange, initialIntegrationId
         setMode(initialIntegration || !showCatalog ? "form" : "catalog");
         setQuery("");
         setSelected(initialIntegration ?? null);
-        setScope(safeDefaultScope);
+        setScope(resolveIntegrationScope(initialIntegration, defaultScope, hasOrg, canCreateOrgMcp));
         setName(initialDefaults.name);
         setUrl(initialDefaults.url);
         setDescription(initialDefaults.description);
@@ -110,6 +118,9 @@ export function McpIntegrationDialog({ open, onOpenChange, initialIntegrationId
     }, [
         defaultIntegrations,
         initialIntegrationId,
+        canCreateOrgMcp,
+        defaultScope,
+        hasOrg,
         open,
         safeDefaultScope,
         showCatalog,
@@ -127,7 +138,7 @@ export function McpIntegrationDialog({ open, onOpenChange, initialIntegrationId
     const openForm = (integration) => {
         const defaults = createMcpIntegrationFormDefaults(integration);
         setSelected(integration ?? null);
-        setScope(safeDefaultScope);
+        setScope(resolveIntegrationScope(integration, defaultScope, hasOrg, canCreateOrgMcp));
         setName(defaults.name);
         setUrl(defaults.url);
         setDescription(defaults.description);
@@ -154,7 +165,7 @@ export function McpIntegrationDialog({ open, onOpenChange, initialIntegrationId
             name: args.name,
             url: args.url,
             description: args.description,
-            scope,
+            scope: options?.scope ?? scope,
             returnUrl,
         })));
     };
@@ -162,7 +173,13 @@ export function McpIntegrationDialog({ open, onOpenChange, initialIntegrationId
         name: integration.name,
         url: integration.url,
         description: integration.description,
-    }, options);
+    }, {
+        ...options,
+        scope: integration.supportsOrganizationScope === true &&
+            integration.managedOAuth !== true
+            ? scope
+            : "user",
+    });
     const connectCustomWithOAuth = () => {
         if (!name.trim()) {
             setError(t("mcpIntegrations.serverNameRequired"));
@@ -212,10 +229,12 @@ export function McpIntegrationDialog({ open, onOpenChange, initialIntegrationId
         });
     };
     const quickConnect = (integration) => {
-        if (integration.connectionMode === "manual" ||
-            integration.availability === "provider-setup") {
+        if (shouldOfferMcpIntegrationOrganizationScope(integration, hasOrg, canCreateOrgMcp)) {
+            openForm(integration);
             return;
         }
+        if (requiresMcpIntegrationSetup(integration))
+            return;
         if (integration.authMode === "oauth") {
             connectWithOAuth(integration, { quickId: integration.id });
             return;
@@ -225,7 +244,7 @@ export function McpIntegrationDialog({ open, onOpenChange, initialIntegrationId
             return;
         }
         void createServer({
-            scope: safeDefaultScope,
+            scope: resolveIntegrationScope(integration, defaultScope, hasOrg, canCreateOrgMcp),
             name: integration.name,
             url: integration.url,
             description: integration.description,
@@ -263,13 +282,20 @@ export function McpIntegrationDialog({ open, onOpenChange, initialIntegrationId
         }
     };
     const renderScopeSelector = () => {
-        if (!shouldOfferMcpOrganizationScope(hasOrg, canCreateOrgMcp))
+        if (selected?.managedOAuth)
+            return null;
+        const canSelectScope = selected
+            ? shouldOfferMcpIntegrationOrganizationScope(selected, hasOrg, canCreateOrgMcp)
+            : shouldOfferMcpOrganizationScope(hasOrg, canCreateOrgMcp);
+        if (!canSelectScope)
             return null;
-        return (_jsxs("div", { className: "flex gap-1 rounded-md border border-border bg-background p-0.5", children: [_jsx("button", { type: "button", onClick: () => setScope("user"), className: cn("flex-1 rounded px-2 py-1.5 text-[11px] font-medium", scope === "user"
-                        ? "bg-accent text-foreground"
-                        : "text-muted-foreground hover:text-foreground"), children: t("mcpIntegrations.personal") }), _jsx("button", { type: "button", onClick: () => setScope("org"), className: cn("flex-1 rounded px-2 py-1.5 text-[11px] font-medium", scope === "org"
-                        ? "bg-accent text-foreground"
-                        : "text-muted-foreground hover:text-foreground"), children: t("mcpIntegrations.organization") })] }));
+        return (_jsxs("div", { className: "space-y-1.5", children: [_jsx("p", { className: "text-[11px] font-medium text-foreground", children: t("mcpIntegrations.scopeQuestion") }), _jsxs("div", { className: "flex gap-1 rounded-md border border-border bg-background p-0.5", children: [_jsx("button", { type: "button", onClick: () => setScope("user"), "aria-pressed": scope === "user", className: cn("flex-1 rounded px-2 py-1.5 text-[11px] font-medium", scope === "user"
+                                ? "bg-accent text-foreground"
+                                : "text-muted-foreground hover:text-foreground"), children: t("mcpIntegrations.personal") }), _jsx("button", { type: "button", onClick: () => setScope("org"), "aria-pressed": scope === "org", className: cn("flex-1 rounded px-2 py-1.5 text-[11px] font-medium", scope === "org"
+                                ? "bg-accent text-foreground"
+                                : "text-muted-foreground hover:text-foreground"), children: t("mcpIntegrations.sharedWithWorkspace") })] }), _jsx("p", { className: "text-[11px] leading-relaxed text-muted-foreground", children: t(scope === "user"
+                        ? "mcpIntegrations.personalDescription"
+                        : "mcpIntegrations.organizationDescription") })] }));
     };
     if (!showCatalog && !customIntegrationEnabled)
         return null;
@@ -279,9 +305,7 @@ export function McpIntegrationDialog({ open, onOpenChange, initialIntegrationId
                                     const apiFallback = getMcpIntegrationApiFallback(integration);
                                     const connected = connectedUrls.has(compareUrl(integration.url));
                                     const requiresHeaders = integration.authMode === "headers";
-                                    const setupOnly = integration.connectionMode === "manual" ||
-                                        integration.availability === "provider-setup" ||
-                                        integration.availability === "client-restricted";
+                                    const setupOnly = requiresMcpIntegrationSetup(integration);
                                     return (_jsxs("article", { className: "flex min-h-[128px] flex-col rounded-md border border-border bg-card p-4 transition-colors hover:border-border/80 hover:bg-accent/20", children: [_jsxs("div", { className: "flex items-center gap-3", children: [_jsx(IntegrationLogo, { name: integration.name, logoUrl: integration.logoUrl }), _jsxs("div", { className: "min-w-0", children: [_jsx("h3", { className: "truncate text-[13px] font-semibold text-foreground", children: integration.name }), integration.availability !== "ready" && (_jsx("span", { className: "mt-0.5 inline-flex rounded-full border border-border/70 bg-muted/40 px-1.5 py-0.5 text-[9px] font-medium text-muted-foreground", children: integration.availability === "beta"
                                                                     ? t("mcpIntegrations.status.beta")
                                                                     : integration.availability ===
@@ -291,7 +315,7 @@ export function McpIntegrationDialog({ open, onOpenChange, initialIntegrationId
                                                                     ? t("mcpIntegrations.status.verified")
                                                                     : integration.verification === "restricted"
                                                                         ? t("mcpIntegrations.status.restricted")
-                                                                        : t("mcpIntegrations.status.preflightOnly") })] })] }), _jsx("p", { className: "mt-1 line-clamp-2 flex-1 text-[12px] leading-relaxed text-muted-foreground", children: t(integration.descriptionKey) }), _jsxs("div", { className: "mt-3 flex items-center gap-2", children: [connected ? (_jsx("button", { type: "button", disabled: true, className: "inline-flex h-8 flex-1 cursor-not-allowed items-center justify-center gap-1.5 rounded-md border border-border bg-muted px-2.5 text-[12px] font-medium text-muted-foreground opacity-70", children: t("mcpIntegrations.connected") })) : setupOnly ? (_jsxs(_Fragment, { children: [apiFallback && (_jsx("button", { type: "button", onClick: () => openAgentSettings(`secrets:${apiFallback.secretKey}`), className: "inline-flex h-8 flex-1 items-center justify-center gap-1.5 rounded-md bg-primary px-2.5 text-[12px] font-medium text-primary-foreground hover:bg-primary/90", children: t("mcpIntegrations.useApiToken") })), _jsxs("a", { href: integration.docsUrl, target: "_blank", rel: "noopener noreferrer", className: "inline-flex h-8 flex-1 items-center justify-center gap-1.5 rounded-md border border-border bg-background px-2.5 text-[12px] font-medium text-foreground hover:bg-accent", children: [t("mcpIntegrations.viewSetup"), _jsx(IconExternalLink, { className: "h-3.5 w-3.5" })] })] })) : (_jsxs("button", { type: "button", onClick: () => quickConnect(integration), disabled: busy, "aria-busy": quickBusyId === integration.id, className: cn("inline-flex h-8 flex-1 items-center justify-center gap-1.5 rounded-md bg-primary px-2.5 text-[12px] font-medium text-primary-foreground hover:bg-primary/90", busy && "cursor-not-allowed opacity-70"), children: [quickBusyId === integration.id ? (_jsx(IconLoader2, { className: "h-3.5 w-3.5 animate-spin" })) : null, integration.authMode === "oauth"
+                                                                        : t("mcpIntegrations.status.preflightOnly") })] })] }), _jsx("p", { className: "mt-1 line-clamp-2 flex-1 text-[12px] leading-relaxed text-muted-foreground", children: t(integration.descriptionKey) }), _jsxs("div", { className: "mt-3 flex items-center gap-2", children: [connected ? (_jsx("button", { type: "button", disabled: true, className: "inline-flex h-8 flex-1 cursor-not-allowed items-center justify-center gap-1.5 rounded-md border border-border bg-muted px-2.5 text-[12px] font-medium text-muted-foreground opacity-70", children: t("mcpIntegrations.connected") })) : setupOnly ? (_jsxs(_Fragment, { children: [apiFallback && (_jsx("button", { type: "button", onClick: () => openAgentSettings(`secrets:${apiFallback.secretKey}`), className: "inline-flex h-8 flex-1 items-center justify-center gap-1.5 rounded-md bg-primary px-2.5 text-[12px] font-medium text-primary-foreground hover:bg-primary/90", children: t("mcpIntegrations.useApiToken") })), _jsx("button", { type: "button", onClick: () => openForm(integration), className: "inline-flex h-8 flex-1 items-center justify-center gap-1.5 rounded-md border border-border bg-background px-2.5 text-[12px] font-medium text-foreground hover:bg-accent", children: t("mcpIntegrations.viewSetup") })] })) : (_jsxs("button", { type: "button", onClick: () => quickConnect(integration), disabled: busy, "aria-busy": quickBusyId === integration.id, className: cn("inline-flex h-8 flex-1 items-center justify-center gap-1.5 rounded-md bg-primary px-2.5 text-[12px] font-medium text-primary-foreground hover:bg-primary/90", busy && "cursor-not-allowed opacity-70"), children: [quickBusyId === integration.id ? (_jsx(IconLoader2, { className: "h-3.5 w-3.5 animate-spin" })) : null, integration.authMode === "oauth"
                                                                 ? t("mcpIntegrations.connectWithOAuth")
                                                                 : requiresHeaders
                                                                     ? t("mcpIntegrations.configure")
@@ -304,29 +328,37 @@ export function McpIntegrationDialog({ open, onOpenChange, initialIntegrationId
                                     clearFeedback();
                                     setMode("catalog");
                                 }, className: cn("mb-1 inline-flex w-fit items-center gap-1 text-[11px] text-muted-foreground hover:text-foreground", !showCatalog && "hidden"), children: [_jsx(IconArrowLeft, { className: "h-3 w-3 rtl:-scale-x-100" }), t("mcpIntegrations.backToIntegrations")] }), _jsx(DialogTitle, { children: selected
-                                    ? t("mcpIntegrations.configureTitle", {
-                                        name: selected.name,
-                                    })
+                                    ? selectedRequiresSetup
+                                        ? t("mcpIntegrations.setupTitle", {
+                                            name: selected.name,
+                                        })
+                                        : t("mcpIntegrations.configureTitle", {
+                                            name: selected.name,
+                                        })
                                     : t("mcpIntegrations.customTitle") }), _jsx(DialogDescription, { children: selected
-                                    ? selected.authMode === "none"
-                                        ? t("mcpIntegrations.presetNoAuthDescription")
-                                        : t("mcpIntegrations.presetAuthDescription")
-                                    : t("mcpIntegrations.customDescription") })] }), _jsx("div", { className: "min-h-0 flex-1 overflow-y-auto px-7 py-5", children: _jsxs("div", { className: "space-y-3", children: [renderScopeSelector(), selected?.setupNoteKey && (_jsx("div", { className: "rounded-md border border-border bg-muted/40 px-3 py-2 text-[11px] leading-relaxed text-muted-foreground", children: t(selected.setupNoteKey) })), selected?.authMode === "oauth" && (_jsx("div", { className: "rounded-md border border-blue-500/20 bg-blue-500/5 px-3 py-2 text-[11px] leading-relaxed text-blue-700 dark:text-blue-300", children: t("mcpIntegrations.oauthNotice") })), _jsxs("label", { className: "block", children: [_jsx("span", { className: "mb-1 block text-[10px] font-medium text-muted-foreground", children: t("mcpIntegrations.serverName") }), _jsx("input", { ref: inputRef, value: name, onChange: (event) => {
-                                                setName(event.target.value);
-                                                clearFeedback();
-                                            }, className: "w-full rounded-md border border-border bg-background px-2.5 py-1.5 text-[13px] text-foreground outline-none placeholder:text-muted-foreground/50 focus:ring-1 focus:ring-ring", placeholder: t("mcpIntegrations.serverNamePlaceholder") })] }), _jsxs("label", { className: "block", children: [_jsx("span", { className: "mb-1 block text-[10px] font-medium text-muted-foreground", children: t("mcpIntegrations.url") }), _jsx("input", { value: url, onChange: (event) => {
-                                                setUrl(event.target.value);
-                                                clearFeedback();
-                                            }, className: "w-full rounded-md border border-border bg-background px-2.5 py-1.5 text-[13px] text-foreground outline-none placeholder:text-muted-foreground/50 focus:ring-1 focus:ring-ring", placeholder: t("mcpIntegrations.urlPlaceholder") })] }), _jsxs("label", { className: "block", children: [_jsx("span", { className: "mb-1 block text-[10px] font-medium text-muted-foreground", children: t("mcpIntegrations.fieldDescription") }), _jsx("input", { value: description, onChange: (event) => {
-                                                setDescription(event.target.value);
-                                                clearFeedback();
-                                            }, className: "w-full rounded-md border border-border bg-background px-2.5 py-1.5 text-[13px] text-foreground outline-none placeholder:text-muted-foreground/50 focus:ring-1 focus:ring-ring", placeholder: t("mcpIntegrations.descriptionPlaceholder") })] }), selected?.authMode !== "oauth" && (_jsxs("label", { className: "block", children: [_jsx("span", { className: "mb-1 block text-[10px] font-medium text-muted-foreground", children: t("mcpIntegrations.headers") }), _jsx("textarea", { value: headersText, onChange: (event) => {
-                                                setHeadersText(event.target.value);
-                                                clearFeedback();
-                                            }, rows: 3, className: "w-full resize-y rounded-md border border-border bg-background px-2.5 py-1.5 text-[12px] text-foreground outline-none placeholder:text-muted-foreground/50 focus:ring-1 focus:ring-ring", style: {
-                                                fontFamily: 'ui-monospace, SFMono-Regular, "SF Mono", Menlo, Consolas, monospace',
-                                            }, placeholder: selected?.headerPlaceholder ??
-                                                t("mcpIntegrations.headersPlaceholder") })] })), selected?.docsUrl && (_jsxs("a", { href: selected.docsUrl, target: "_blank", rel: "noopener noreferrer", className: "inline-flex items-center gap-1 text-[11px] text-muted-foreground underline hover:text-foreground", children: [t("mcpIntegrations.openSetupDocs"), _jsx(IconExternalLink, { className: "h-3 w-3" })] })), testResult && (_jsxs("div", { className: cn("flex items-start gap-1 rounded-md px-3 py-2 text-[11px] leading-snug", testResult.ok
+                                    ? selectedRequiresSetup
+                                        ? t("mcpIntegrations.providerSetupFormDescription")
+                                        : selected.authMode === "none"
+                                            ? t("mcpIntegrations.presetNoAuthDescription")
+                                            : t("mcpIntegrations.presetAuthDescription")
+                                    : t("mcpIntegrations.customDescription") })] }), _jsx("div", { className: "min-h-0 flex-1 overflow-y-auto px-7 py-5", children: _jsxs("div", { className: "space-y-3", children: [renderScopeSelector(), selected?.setupNoteKey && (_jsx("div", { className: "rounded-md border border-border bg-muted/40 px-3 py-2 text-[11px] leading-relaxed text-muted-foreground", children: t(selected.setupNoteKey) })), selectedRequiresSetup && selected && (_jsxs("div", { className: "rounded-md border border-border bg-muted/40 px-3 py-2 text-[11px] leading-relaxed", children: [_jsx("p", { className: "font-medium text-foreground", children: t("mcpIntegrations.providerSetupRequired") }), _jsx("p", { className: "mt-0.5 text-muted-foreground", children: t("mcpIntegrations.providerSetupDescription", {
+                                                name: selected.name,
+                                            }) })] })), !selectedRequiresSetup && (_jsxs(_Fragment, { children: [selected?.authMode === "oauth" && (_jsx("div", { className: "rounded-md border border-primary/20 bg-primary/5 px-3 py-2 text-[11px] leading-relaxed text-primary", children: t("mcpIntegrations.oauthNotice") })), _jsxs("label", { className: "block", children: [_jsx("span", { className: "mb-1 block text-[10px] font-medium text-muted-foreground", children: t("mcpIntegrations.serverName") }), _jsx("input", { ref: inputRef, value: name, onChange: (event) => {
+                                                        setName(event.target.value);
+                                                        clearFeedback();
+                                                    }, className: "w-full rounded-md border border-border bg-background px-2.5 py-1.5 text-[13px] text-foreground outline-none placeholder:text-muted-foreground/50 focus:ring-1 focus:ring-ring", placeholder: t("mcpIntegrations.serverNamePlaceholder") })] }), _jsxs("label", { className: "block", children: [_jsx("span", { className: "mb-1 block text-[10px] font-medium text-muted-foreground", children: t("mcpIntegrations.url") }), _jsx("input", { value: url, onChange: (event) => {
+                                                        setUrl(event.target.value);
+                                                        clearFeedback();
+                                                    }, className: "w-full rounded-md border border-border bg-background px-2.5 py-1.5 text-[13px] text-foreground outline-none placeholder:text-muted-foreground/50 focus:ring-1 focus:ring-ring", placeholder: t("mcpIntegrations.urlPlaceholder") })] }), _jsxs("label", { className: "block", children: [_jsx("span", { className: "mb-1 block text-[10px] font-medium text-muted-foreground", children: t("mcpIntegrations.fieldDescription") }), _jsx("input", { value: description, onChange: (event) => {
+                                                        setDescription(event.target.value);
+                                                        clearFeedback();
+                                                    }, className: "w-full rounded-md border border-border bg-background px-2.5 py-1.5 text-[13px] text-foreground outline-none placeholder:text-muted-foreground/50 focus:ring-1 focus:ring-ring", placeholder: t("mcpIntegrations.descriptionPlaceholder") })] }), selected?.authMode !== "oauth" && (_jsxs("label", { className: "block", children: [_jsx("span", { className: "mb-1 block text-[10px] font-medium text-muted-foreground", children: t("mcpIntegrations.headers") }), _jsx("textarea", { value: headersText, onChange: (event) => {
+                                                        setHeadersText(event.target.value);
+                                                        clearFeedback();
+                                                    }, rows: 3, className: "w-full resize-y rounded-md border border-border bg-background px-2.5 py-1.5 text-[12px] text-foreground outline-none placeholder:text-muted-foreground/50 focus:ring-1 focus:ring-ring", style: {
+                                                        fontFamily: 'ui-monospace, SFMono-Regular, "SF Mono", Menlo, Consolas, monospace',
+                                                    }, placeholder: selected?.headerPlaceholder ??
+                                                        t("mcpIntegrations.headersPlaceholder") })] })), selected?.docsUrl && (_jsxs("a", { href: selected.docsUrl, target: "_blank", rel: "noopener noreferrer", className: "inline-flex items-center gap-1 text-[11px] text-muted-foreground underline hover:text-foreground", children: [t("mcpIntegrations.openSetupDocs"), _jsx(IconExternalLink, { className: "h-3 w-3" })] }))] })), testResult && (_jsxs("div", { className: cn("flex items-start gap-1 rounded-md px-3 py-2 text-[11px] leading-snug", testResult.ok
                                         ? "bg-green-500/5 text-green-600 dark:text-green-400"
-                                        : "bg-red-500/5 text-red-600 dark:text-red-400"), children: [testResult.ok && (_jsx(IconCheck, { className: "mt-0.5 h-3 w-3 shrink-0" })), _jsx("span", { className: "min-w-0 break-words", children: testResult.message })] })), error && (_jsx("div", { className: "break-words rounded-md bg-red-500/5 px-3 py-2 text-[11px] leading-snug text-red-600 dark:text-red-400", children: error }))] }) }), _jsxs("div", { className: "flex shrink-0 items-center justify-between gap-2 border-t border-border px-7 py-4", children: [!selectedRequiresSetup && (_jsx("button", { type: "button", onClick: runTest, disabled: !url.trim() || busy, className: "rounded-md border border-border bg-background px-3 py-1.5 text-[12px] font-medium text-foreground hover:bg-accent disabled:pointer-events-none disabled:opacity-40", children: t("mcpIntegrations.test") })), !selected ? (_jsxs("button", { type: "button", onClick: connectCustomWithOAuth, disabled: !name.trim() || !url.trim() || busy, "aria-busy": busy, className: "rounded-md border border-border bg-background px-3 py-1.5 text-[12px] font-medium text-foreground hover:bg-accent disabled:pointer-events-none disabled:opacity-40", children: [busy && (_jsx(IconLoader2, { className: "me-1.5 inline h-3.5 w-3.5 animate-spin" })), t("mcpIntegrations.connectWithOAuth")] })) : null, selectedRequiresSetup ? (selected?.docsUrl ? (_jsxs("a", { href: selected.docsUrl, target: "_blank", rel: "noopener noreferrer", className: "ms-auto inline-flex min-w-[92px] items-center justify-center gap-1.5 rounded-md bg-primary px-3 py-1.5 text-[12px] font-medium text-primary-foreground hover:bg-primary/90", children: [t("mcpIntegrations.viewSetup"), _jsx(IconExternalLink, { className: "h-3 w-3" })] })) : null) : selected?.authMode === "oauth" ? (_jsxs("button", { type: "button", onClick: () => connectWithOAuth(selected), disabled: !name.trim() || !url.trim() || busy, "aria-busy": busy, className: "inline-flex min-w-[92px] items-center justify-center gap-1.5 rounded-md bg-primary px-3 py-1.5 text-[12px] font-medium text-primary-foreground hover:bg-primary/90 disabled:pointer-events-none disabled:opacity-40", children: [busy && _jsx(IconLoader2, { className: "h-3.5 w-3.5 animate-spin" }), t("mcpIntegrations.connectWithOAuth")] })) : (_jsxs("button", { type: "button", onClick: submitForm, disabled: !name.trim() || !url.trim() || busy, className: "inline-flex min-w-[92px] items-center justify-center gap-1.5 rounded-md bg-primary px-3 py-1.5 text-[12px] font-medium text-primary-foreground hover:bg-primary/90 disabled:pointer-events-none disabled:opacity-40", children: [busy && _jsx(IconLoader2, { className: "h-3.5 w-3.5 animate-spin" }), t("mcpIntegrations.connect")] }))] })] })) }) }));
+                                        : "bg-red-500/5 text-red-600 dark:text-red-400"), children: [testResult.ok && (_jsx(IconCheck, { className: "mt-0.5 h-3 w-3 shrink-0" })), _jsx("span", { className: "min-w-0 break-words", children: testResult.message })] })), error && (_jsx("div", { className: "break-words rounded-md bg-red-500/5 px-3 py-2 text-[11px] leading-snug text-red-600 dark:text-red-400", children: error }))] }) }), _jsxs("div", { className: "flex shrink-0 items-center justify-between gap-2 border-t border-border px-7 py-4", children: [!selectedRequiresSetup && (_jsx("button", { type: "button", onClick: runTest, disabled: !url.trim() || busy, className: "rounded-md border border-border bg-background px-3 py-1.5 text-[12px] font-medium text-foreground hover:bg-accent disabled:pointer-events-none disabled:opacity-40", children: t("mcpIntegrations.test") })), !selected ? (_jsxs("button", { type: "button", onClick: connectCustomWithOAuth, disabled: !name.trim() || !url.trim() || busy, "aria-busy": busy, className: "rounded-md border border-border bg-background px-3 py-1.5 text-[12px] font-medium text-foreground hover:bg-accent disabled:pointer-events-none disabled:opacity-40", children: [busy && (_jsx(IconLoader2, { className: "me-1.5 inline h-3.5 w-3.5 animate-spin" })), t("mcpIntegrations.connectWithOAuth")] })) : null, selectedRequiresSetup ? (_jsxs("div", { className: "ms-auto flex items-center gap-2", children: [selected?.docsUrl ? (_jsxs("a", { href: selected.docsUrl, target: "_blank", rel: "noopener noreferrer", className: "inline-flex min-w-[92px] items-center justify-center gap-1.5 rounded-md border border-border bg-background px-3 py-1.5 text-[12px] font-medium text-foreground hover:bg-accent", children: [t("mcpIntegrations.viewSetup"), _jsx(IconExternalLink, { className: "h-3 w-3" })] })) : null, selected?.authMode === "oauth" && (_jsxs("button", { type: "button", onClick: () => connectWithOAuth(selected), disabled: busy, "aria-busy": busy, className: "inline-flex min-w-[132px] items-center justify-center gap-1.5 rounded-md bg-primary px-3 py-1.5 text-[12px] font-medium text-primary-foreground hover:bg-primary/90 disabled:pointer-events-none disabled:opacity-40", children: [busy && (_jsx(IconLoader2, { className: "h-3.5 w-3.5 animate-spin" })), t("mcpIntegrations.continueToConnect")] }))] })) : selected?.authMode === "oauth" ? (_jsxs("button", { type: "button", onClick: () => connectWithOAuth(selected), disabled: !name.trim() || !url.trim() || busy, "aria-busy": busy, className: "inline-flex min-w-[92px] items-center justify-center gap-1.5 rounded-md bg-primary px-3 py-1.5 text-[12px] font-medium text-primary-foreground hover:bg-primary/90 disabled:pointer-events-none disabled:opacity-40", children: [busy && _jsx(IconLoader2, { className: "h-3.5 w-3.5 animate-spin" }), t("mcpIntegrations.connectWithOAuth")] })) : (_jsxs("button", { type: "button", onClick: submitForm, disabled: !name.trim() || !url.trim() || busy, className: "inline-flex min-w-[92px] items-center justify-center gap-1.5 rounded-md bg-primary px-3 py-1.5 text-[12px] font-medium text-primary-foreground hover:bg-primary/90 disabled:pointer-events-none disabled:opacity-40", children: [busy && _jsx(IconLoader2, { className: "h-3.5 w-3.5 animate-spin" }), t("mcpIntegrations.connect")] }))] })] })) }) }));
 }

package/dist/client/resources/mcp-integration-catalog.d.ts

@@ -17,6 +17,17 @@ export interface DefaultMcpIntegration {
     availability: McpIntegrationAvailability;
     verification: McpIntegrationVerification;
     logoUrl: string;
+    /**
+     * The server has a first-party OAuth client configured for this provider.
+     * Keep the connection user-scoped even when the client itself is shared.
+     */
+    managedOAuth?: boolean;
+    /**
+     * The provider supports a workspace connection whose access can be shared
+     * with permitted workspace members. Keep this opt-in until provider scope
+     * semantics are verified.
+     */
+    supportsOrganizationScope?: boolean;
     docsUrl?: string;
     setupNoteKey?: string;
     apiFallback?: {
@@ -51,8 +62,9 @@ export declare function isMcpIntegrationCatalogAvailable(config?: McpIntegration
 export declare function mcpIntegrationAuthLabel(mode: McpIntegrationAuthMode): string;
 export declare function buildMcpOAuthStartUrl({ name, url, description, scope, returnUrl, }: McpOAuthStartParams): string;
 export declare function navigateToMcpOAuthStart(url: string): void;
-export declare function resolveMcpIntegrationScope(defaultScope: "user" | "org", hasOrg: boolean, canCreateOrgMcp: boolean): "user" | "org";
+export declare function resolveMcpIntegrationScope(defaultScope: "user" | "org", hasOrg: boolean, canCreateOrgMcp: boolean, supportsOrganizationScope?: boolean): "user" | "org";
 export declare function shouldOfferMcpOrganizationScope(hasOrg: boolean, canCreateOrgMcp: boolean): boolean;
+export declare function shouldOfferMcpIntegrationOrganizationScope(integration: DefaultMcpIntegration, hasOrg: boolean, canCreateOrgMcp: boolean): boolean;
 export declare function filterMcpIntegrations(query: string, integrations?: DefaultMcpIntegration[]): DefaultMcpIntegration[];
 export declare function findMcpIntegrationForText(text: string, integrations?: DefaultMcpIntegration[]): DefaultMcpIntegration | null;
 /**

package/dist/client/resources/mcp-integration-catalog.js

@@ -16,6 +16,7 @@ export const DEFAULT_MCP_INTEGRATIONS = [
         availability: "ready",
         verification: "verified",
         logoUrl: mcpIntegrationLogo("context7"),
+        supportsOrganizationScope: true,
         docsUrl: "https://context7.com/",
         keywords: ["docs", "documentation", "libraries", "frameworks"],
     },
@@ -63,6 +64,31 @@ export const DEFAULT_MCP_INTEGRATIONS = [
             "screenshots",
         ],
     },
+    {
+        id: "amplitude",
+        name: "Amplitude",
+        provider: "amplitude",
+        description: "Read and work with Amplitude product analytics.",
+        descriptionKey: "mcpIntegrations.catalog.amplitude.description",
+        useCase: "product analytics, charts, dashboards, cohorts, experiments",
+        useCaseKey: "mcpIntegrations.catalog.amplitude.useCase",
+        url: "https://mcp.amplitude.com/mcp",
+        authMode: "oauth",
+        connectionMode: "oauth",
+        availability: "ready",
+        verification: "preflight-only",
+        logoUrl: mcpIntegrationLogo("amplitude"),
+        docsUrl: "https://amplitude.com/docs/amplitude-ai/amplitude-mcp/other-clients",
+        setupNoteKey: "mcpIntegrations.catalog.amplitude.setupNote",
+        keywords: [
+            "analytics",
+            "product analytics",
+            "charts",
+            "dashboards",
+            "cohorts",
+            "experiments",
+        ],
+    },
     {
         id: "notion",
         name: "Notion",
@@ -107,6 +133,32 @@ export const DEFAULT_MCP_INTEGRATIONS = [
             "decisions",
         ],
     },
+    {
+        id: "gong",
+        name: "Gong",
+        provider: "gong",
+        description: "Search Gong calls and generate account and deal insights.",
+        descriptionKey: "mcpIntegrations.catalog.gong.description",
+        useCase: "sales calls, transcripts, deal insights, account summaries",
+        useCaseKey: "mcpIntegrations.catalog.gong.useCase",
+        url: "https://mcp.gong.io/mcp",
+        authMode: "oauth",
+        connectionMode: "manual",
+        availability: "provider-setup",
+        verification: "restricted",
+        logoUrl: mcpIntegrationLogo("gong"),
+        supportsOrganizationScope: true,
+        docsUrl: "https://help.gong.io/docs/create-an-integration-to-connect-to-the-mcp-server",
+        setupNoteKey: "mcpIntegrations.catalog.gong.setupNote",
+        keywords: [
+            "sales calls",
+            "calls",
+            "transcripts",
+            "deals",
+            "accounts",
+            "revenue intelligence",
+        ],
+    },
     {
         id: "semgrep",
         name: "Semgrep",
@@ -121,6 +173,7 @@ export const DEFAULT_MCP_INTEGRATIONS = [
         availability: "ready",
         verification: "preflight-only",
         logoUrl: mcpIntegrationLogo("semgrep"),
+        supportsOrganizationScope: true,
         docsUrl: "https://github.com/semgrep/mcp#readme",
         keywords: ["security", "sast", "code scanning", "vulnerabilities"],
     },
@@ -141,6 +194,82 @@ export const DEFAULT_MCP_INTEGRATIONS = [
         docsUrl: "https://linear.app/docs/mcp",
         keywords: ["issues", "tickets", "planning", "project management"],
     },
+    {
+        id: "apollo",
+        name: "Apollo",
+        provider: "apollo",
+        description: "Search, enrich, and manage Apollo GTM data.",
+        descriptionKey: "mcpIntegrations.catalog.apollo.description",
+        useCase: "prospecting, enrichment, contacts, sequences, account research",
+        useCaseKey: "mcpIntegrations.catalog.apollo.useCase",
+        url: "https://mcp.apollo.io/mcp",
+        authMode: "oauth",
+        connectionMode: "oauth",
+        availability: "ready",
+        verification: "preflight-only",
+        logoUrl: mcpIntegrationLogo("apollo"),
+        docsUrl: "https://docs.apollo.io/docs/apollo-mcp",
+        setupNoteKey: "mcpIntegrations.catalog.apollo.setupNote",
+        keywords: [
+            "prospecting",
+            "enrichment",
+            "contacts",
+            "sequences",
+            "accounts",
+            "GTM",
+        ],
+    },
+    {
+        id: "common-room",
+        name: "Common Room",
+        provider: "common-room",
+        description: "Research buyer signals, contacts, and organizations.",
+        descriptionKey: "mcpIntegrations.catalog.commonRoom.description",
+        useCase: "buyer intelligence, product signals, intent, contact enrichment",
+        useCaseKey: "mcpIntegrations.catalog.commonRoom.useCase",
+        url: "https://mcp.commonroom.io/mcp",
+        authMode: "oauth",
+        connectionMode: "oauth",
+        availability: "ready",
+        verification: "preflight-only",
+        logoUrl: mcpIntegrationLogo("common-room"),
+        docsUrl: "https://www.commonroom.io/docs/using-common-room/mcp-server/",
+        setupNoteKey: "mcpIntegrations.catalog.commonRoom.setupNote",
+        keywords: [
+            "buyer intelligence",
+            "intent",
+            "signals",
+            "contacts",
+            "organizations",
+            "GTM",
+        ],
+    },
+    {
+        id: "exa",
+        name: "Exa",
+        provider: "exa",
+        description: "Search the web and fetch pages with Exa.",
+        descriptionKey: "mcpIntegrations.catalog.exa.description",
+        useCase: "web search, research, code search, page fetching",
+        useCaseKey: "mcpIntegrations.catalog.exa.useCase",
+        url: "https://mcp.exa.ai/mcp",
+        authMode: "none",
+        connectionMode: "direct",
+        availability: "ready",
+        verification: "preflight-only",
+        logoUrl: mcpIntegrationLogo("exa"),
+        supportsOrganizationScope: true,
+        docsUrl: "https://exa.ai/docs/reference/exa-mcp",
+        setupNoteKey: "mcpIntegrations.catalog.exa.setupNote",
+        keywords: [
+            "web search",
+            "research",
+            "code search",
+            "crawl",
+            "fetch",
+            "web",
+        ],
+    },
     {
         id: "atlassian",
         name: "Atlassian",
@@ -229,6 +358,59 @@ export const DEFAULT_MCP_INTEGRATIONS = [
         setupNoteKey: "mcpIntegrations.catalog.cloudflare.setupNote",
         keywords: ["cloud", "workers", "dns", "security", "observability"],
     },
+    {
+        id: "grafana",
+        name: "Grafana",
+        provider: "grafana",
+        description: "Query Grafana Cloud metrics, logs, and observability data.",
+        descriptionKey: "mcpIntegrations.catalog.grafana.description",
+        useCase: "observability, metrics, logs, traces, dashboards",
+        useCaseKey: "mcpIntegrations.catalog.grafana.useCase",
+        url: "https://mcp.grafana.com/mcp",
+        authMode: "oauth",
+        connectionMode: "oauth",
+        availability: "beta",
+        verification: "preflight-only",
+        logoUrl: mcpIntegrationLogo("grafana"),
+        docsUrl: "https://grafana.com/docs/grafana-cloud/ai-tools/mcp-servers/cloud-mcp/",
+        setupNoteKey: "mcpIntegrations.catalog.grafana.setupNote",
+        keywords: [
+            "observability",
+            "metrics",
+            "logs",
+            "traces",
+            "dashboards",
+            "Grafana Cloud",
+        ],
+    },
+    {
+        id: "google-workspace",
+        name: "Google Workspace",
+        provider: "google-workspace",
+        description: "Search Google Workspace data through its remote MCP server.",
+        descriptionKey: "mcpIntegrations.catalog.googleWorkspace.description",
+        useCase: "Workspace search across Gmail, Drive, Calendar, Chat, Docs, Sheets, Slides",
+        useCaseKey: "mcpIntegrations.catalog.googleWorkspace.useCase",
+        url: "https://workspacemcp.googleapis.com/mcp/v1",
+        authMode: "oauth",
+        connectionMode: "manual",
+        availability: "beta",
+        verification: "restricted",
+        logoUrl: mcpIntegrationLogo("google-workspace"),
+        docsUrl: "https://developers.google.com/workspace/guides/configure-mcp-servers",
+        setupNoteKey: "mcpIntegrations.catalog.googleWorkspace.setupNote",
+        brandAliases: ["Google", "Gmail", "Google Drive", "Google Calendar"],
+        keywords: [
+            "email",
+            "gmail",
+            "drive",
+            "calendar",
+            "chat",
+            "docs",
+            "sheets",
+            "slides",
+        ],
+    },
     {
         id: "gitlab",
         name: "GitLab",
@@ -374,10 +556,36 @@ export const DEFAULT_MCP_INTEGRATIONS = [
         availability: "provider-setup",
         verification: "restricted",
         logoUrl: mcpIntegrationLogo("hubspot"),
+        managedOAuth: true,
         docsUrl: "https://developers.hubspot.com/docs/apps/developer-platform/build-apps/integrate-with-the-remote-hubspot-mcp-server",
         setupNoteKey: "mcpIntegrations.catalog.hubspot.setupNote",
         keywords: ["crm", "contacts", "companies", "deals", "tickets"],
     },
+    {
+        id: "pylon",
+        name: "Pylon",
+        provider: "pylon",
+        description: "Search and update Pylon support data.",
+        descriptionKey: "mcpIntegrations.catalog.pylon.description",
+        useCase: "customer support, issues, accounts, contacts, conversations",
+        useCaseKey: "mcpIntegrations.catalog.pylon.useCase",
+        url: "https://mcp.usepylon.com/",
+        authMode: "oauth",
+        connectionMode: "oauth",
+        availability: "provider-setup",
+        verification: "restricted",
+        logoUrl: mcpIntegrationLogo("pylon"),
+        docsUrl: "https://www.usepylon.com/integrations/mcp",
+        setupNoteKey: "mcpIntegrations.catalog.pylon.setupNote",
+        keywords: [
+            "support",
+            "issues",
+            "accounts",
+            "contacts",
+            "conversations",
+            "customer support",
+        ],
+    },
     {
         id: "intercom",
         name: "Intercom",
@@ -468,6 +676,32 @@ export const DEFAULT_MCP_INTEGRATIONS = [
         setupNoteKey: "mcpIntegrations.catalog.box.setupNote",
         keywords: ["files", "folders", "documents", "enterprise content"],
     },
+    {
+        id: "builder-cms",
+        name: "Builder.io",
+        provider: "builder",
+        description: "Search Builder Publish and Hybrid Space content.",
+        descriptionKey: "mcpIntegrations.catalog.builder.description",
+        useCase: "content models, pages, entries, Publish and Hybrid Spaces",
+        useCaseKey: "mcpIntegrations.catalog.builder.useCase",
+        url: "https://mcp.builder.io/mcp/publish",
+        authMode: "oauth",
+        connectionMode: "oauth",
+        availability: "ready",
+        verification: "preflight-only",
+        logoUrl: mcpIntegrationLogo("builder-cms"),
+        docsUrl: "https://www.builder.io/c/docs/mcp-builder-server/",
+        setupNoteKey: "mcpIntegrations.catalog.builder.setupNote",
+        keywords: [
+            "Builder",
+            "content",
+            "CMS",
+            "pages",
+            "models",
+            "Publish",
+            "Hybrid",
+        ],
+    },
     {
         id: "netlify",
         name: "Netlify",
@@ -608,12 +842,22 @@ export function navigateToMcpOAuthStart(url) {
         navigate();
     }
 }
-export function resolveMcpIntegrationScope(defaultScope, hasOrg, canCreateOrgMcp) {
-    return defaultScope === "org" && hasOrg && canCreateOrgMcp ? "org" : "user";
+export function resolveMcpIntegrationScope(defaultScope, hasOrg, canCreateOrgMcp, supportsOrganizationScope = true) {
+    return defaultScope === "org" &&
+        hasOrg &&
+        canCreateOrgMcp &&
+        supportsOrganizationScope
+        ? "org"
+        : "user";
 }
 export function shouldOfferMcpOrganizationScope(hasOrg, canCreateOrgMcp) {
     return hasOrg && canCreateOrgMcp;
 }
+export function shouldOfferMcpIntegrationOrganizationScope(integration, hasOrg, canCreateOrgMcp) {
+    return (shouldOfferMcpOrganizationScope(hasOrg, canCreateOrgMcp) &&
+        integration.supportsOrganizationScope === true &&
+        integration.managedOAuth !== true);
+}
 export function filterMcpIntegrations(query, integrations = getDefaultMcpIntegrations()) {
     const needle = query.trim().toLowerCase();
     if (!needle)
@@ -635,8 +879,16 @@ export function filterMcpIntegrations(query, integrations = getDefaultMcpIntegra
     });
 }
 const MCP_LINK_HOSTS = {
+    amplitude: ["amplitude.com"],
+    apollo: ["apollo.io"],
+    "common-room": ["commonroom.io"],
     context7: ["context7.com"],
+    exa: ["exa.ai"],
     sentry: ["sentry.io", "sentry.dev"],
+    gong: ["gong.io"],
+    grafana: ["grafana.com", "grafana.net"],
+    "google-workspace": ["google.com", "googleapis.com"],
+    "builder-cms": ["builder.io"],
     notion: ["notion.so", "notion.site"],
     granola: ["granola.ai"],
     semgrep: ["semgrep.dev", "semgrep.com"],
@@ -654,6 +906,7 @@ const MCP_LINK_HOSTS = {
     asana: ["asana.com"],
     hubspot: ["hubspot.com"],
     intercom: ["intercom.com"],
+    pylon: ["usepylon.com", "pylon.com"],
     monday: ["monday.com"],
     webflow: ["webflow.com"],
     paypal: ["paypal.com"],