Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix: Rank Pipedream catalog by popularity and drop the curated pin list (#5905)

Eric Hayesaad89c3e9cca
diff --git a/apps/web/src/features/settings/PipedreamIntegrations.tsx b/apps/web/src/features/settings/PipedreamIntegrations.tsx
index fb735acb4a..fe0922b532 100644
--- a/apps/web/src/features/settings/PipedreamIntegrations.tsx
+++ b/apps/web/src/features/settings/PipedreamIntegrations.tsx
@@ -1,16 +1,14 @@
-import {
- FEATURED_MCP_SERVERS,
- PIPEDREAM_ICON_MAP,
- pipedreamAppAvailableInEnv,
-} from '@core/component/AI/constant/mcpServers';
+import { PIPEDREAM_ICON_MAP } from '@core/component/AI/constant/mcpServers';
import { toast } from '@core/component/Toast/Toast';
-import { proxyImageUrl } from '@core/util/imageProxy';
+import { PipedreamConnectorIcon } from '@core/pipedream/ConnectorIcon';
+import {
+ createPipedreamCatalogConnect,
+ createPipedreamCatalogSearch,
+} from '@core/pipedream/catalog';
import PlugIcon from '@phosphor-icons/core/regular/plug.svg?component-solid';
import XIcon from '@phosphor-icons/core/regular/x.svg?component-solid';
import {
- connectPipedreamApp,
useDeletePipedreamConnectionMutation,
- usePipedreamCatalogQuery,
usePipedreamConnectionsQuery,
useUpdatePipedreamConnectionMutation,
} from '@queries/pipedream-connectors';
@@ -19,7 +17,7 @@ import type {
PipedreamConnectionResponse,
} from '@service-cognition/client';
import { Button, ToggleSwitch } from '@ui';
-import { createSignal, For, onCleanup, Show } from 'solid-js';
+import { createMemo, createSignal, For, Show } from 'solid-js';
import { ConnectAction } from './integration-ui';
import { IntegrationRow, SettingsCard, SettingsSection } from './primitives';
@@ -120,143 +118,47 @@ function ServerRow(props: { server: PipedreamConnectionResponse }) {
* Once connected, the app shows up as a regular {@link ServerRow} instead.
*/
function CatalogRow(props: { entry: PipedreamCatalogEntryResponse }) {
- const [busy, setBusy] = createSignal(false);
-
- const handleConnect = async () => {
- if (busy()) return;
- setBusy(true);
- try {
- const outcome = await connectPipedreamApp({
- appSlug: props.entry.app_slug,
- serverName: props.entry.display_name,
- });
- if (outcome === 'connected') {
- toast.success(`${props.entry.display_name} connected`);
- } else if (outcome === 'unsupported') {
- toast.failure('Connectors are not available on this deployment');
- }
- } catch {
- toast.failure(`Failed to connect ${props.entry.display_name}`);
- } finally {
- setBusy(false);
- }
- };
+ const { connect, busy } = createPipedreamCatalogConnect({
+ entry: () => props.entry,
+ onConnected: (entry) => toast.success(`${entry.display_name} connected`),
+ });
return (
<IntegrationRow
- icon={<CatalogIcon entry={props.entry} />}
+ icon={
+ <PipedreamConnectorIcon
+ appSlug={props.entry.app_slug}
+ iconUrl={props.entry.icon_url}
+ />
+ }
title={props.entry.display_name}
description={props.entry.description ?? props.entry.app_slug}
>
- <ConnectAction label="Connect" onClick={handleConnect} loading={busy()} />
+ <ConnectAction
+ label="Connect"
+ onClick={() => void connect()}
+ loading={busy()}
+ />
</IntegrationRow>
);
}
-/**
- * Connector icon: our bundled SVG for the apps we ship icons for, the
- * directory-provided icon otherwise, and a generic plug as the fallback.
- * Directory icons load through the image proxy — the app's COEP blocks
- * cross-origin images from hosts that don't send CORP headers.
- */
-function CatalogIcon(props: { entry: PipedreamCatalogEntryResponse }) {
- const BundledIcon = () => PIPEDREAM_ICON_MAP.get(props.entry.app_slug);
- return (
- <Show
- when={BundledIcon()}
- fallback={
- <Show
- when={props.entry.icon_url}
- fallback={<PlugIcon class="size-5" />}
- >
- {(iconUrl) => (
- <img
- src={proxyImageUrl(iconUrl())}
- alt=""
- loading="lazy"
- class="size-5 rounded object-contain"
- />
- )}
- </Show>
- }
- >
- {(Icon) => {
- const C = Icon();
- return <C class="size-5" />;
- }}
- </Show>
- );
-}
-
-/**
- * Featured connectors as catalog entries, for when the catalog API hasn't
- * answered yet (or is unavailable): the same curated list the backend pins,
- * derived from the bundled presets so the section never renders empty.
- */
-const FALLBACK_FEATURED: PipedreamCatalogEntryResponse[] =
- FEATURED_MCP_SERVERS.map((server) => ({
- app_slug: server.app_slug,
- display_name: server.server_name,
- description: server.tagline,
- icon_url: null,
- priority: true,
- }));
-
/**
* The "MCP integrations" section of the Connections page: apps the user has
- * connected, then the curated featured connectors they haven't, then a
- * searchable catalog of every connectable app — all connecting through
- * Pipedream, the single connect path.
+ * connected, then a searchable catalog of every connectable app, ranked by
+ * popularity — all connecting through Pipedream, the single connect path.
*/
export function PipedreamIntegrationsSection() {
const serversQuery = usePipedreamConnectionsQuery();
- const [searchInput, setSearchInput] = createSignal('');
- const [search, setSearch] = createSignal('');
- let debounceTimer: ReturnType<typeof setTimeout> | undefined;
- const onSearchInput = (value: string) => {
- setSearchInput(value);
- clearTimeout(debounceTimer);
- debounceTimer = setTimeout(() => setSearch(value), 250);
- };
- onCleanup(() => clearTimeout(debounceTimer));
-
- const catalogQuery = usePipedreamCatalogQuery(search);
- // Separate un-searched instance backing the featured section, so it stays
- // put while the user types in the catalog search below. Same cache entry
- // as browsing with an empty search, so this costs no extra request.
- const featuredQuery = usePipedreamCatalogQuery(() => '');
-
const servers = () => serversQuery.data ?? [];
- const connectedSlugs = () => new Set(servers().map((s) => s.app_slug));
-
- const offered = (entry: PipedreamCatalogEntryResponse) =>
- pipedreamAppAvailableInEnv(entry.app_slug) &&
- !connectedSlugs().has(entry.app_slug);
-
- const catalogEntries = () =>
- (catalogQuery.data?.pages ?? [])
- .flatMap((page) => page.servers)
- .filter(offered);
-
- // The featured section always shows the full curated list, served from
- // the presets bundled with the app until the catalog answers — the
- // backend pins the same list, so nothing jumps when it does.
- const featured = () => {
- const entries = (featuredQuery.data?.pages ?? [])
- .flatMap((page) => page.servers)
- .filter((entry) => entry.priority)
- .filter(offered);
- return entries.length > 0 ? entries : FALLBACK_FEATURED.filter(offered);
- };
+ const connectedSlugs = createMemo(
+ () => new Set(servers().map((s) => s.app_slug))
+ );
- // Searching shows every match, with featured connectors ranked first by
- // the backend (flagged `priority`); browsing shows only organic directory
- // results, since the full featured list already sits above.
- const browseResults = () =>
- search().trim()
- ? catalogEntries()
- : catalogEntries().filter((entry) => !entry.priority);
+ const catalog = createPipedreamCatalogSearch(connectedSlugs);
+ const catalogQuery = catalog.query;
+ const browseResults = catalog.entries;
return (
<SettingsSection
@@ -280,12 +182,11 @@ export function PipedreamIntegrationsSection() {
</SettingsCard>
</Show>
- <Show when={!serversQuery.isError}>
+ <Show when={!serversQuery.isError && servers().length > 0}>
<SettingsCard>
<For each={servers()}>
{(server) => <ServerRow server={server} />}
</For>
- <For each={featured()}>{(entry) => <CatalogRow entry={entry} />}</For>
</SettingsCard>
</Show>
@@ -295,8 +196,8 @@ export function PipedreamIntegrationsSection() {
type="search"
class="settings-input w-full"
placeholder="Search all connectors..."
- value={searchInput()}
- onInput={(e) => onSearchInput(e.currentTarget.value)}
+ value={catalog.searchInput()}
+ onInput={(e) => catalog.onSearchInput(e.currentTarget.value)}
/>
</div>
@@ -330,11 +231,11 @@ export function PipedreamIntegrationsSection() {
when={
!catalogQuery.isFetching &&
browseResults().length === 0 &&
- search().trim()
+ catalog.search().trim()
}
>
<div class="px-6 py-6 text-center text-sm text-ink-muted">
- No connectors found for "{search().trim()}".
+ No connectors found for "{catalog.search().trim()}".
</div>
</Show>
diff --git a/apps/web/src/features/setup/flow/ConnectorCatalogStep.tsx b/apps/web/src/features/setup/flow/ConnectorCatalogStep.tsx
new file mode 100644
index 0000000000..d86ab610b3
--- /dev/null
+++ b/apps/web/src/features/setup/flow/ConnectorCatalogStep.tsx
@@ -0,0 +1,216 @@
+import { useAnalytics } from '@app/lib/analytics/analytics-context';
+import { PipedreamConnectorIcon } from '@core/pipedream/ConnectorIcon';
+import {
+ createPipedreamCatalogConnect,
+ createPipedreamCatalogSearch,
+} from '@core/pipedream/catalog';
+import ArrowUpRightIcon from '@phosphor/arrow-up-right.svg';
+import SpinnerIcon from '@phosphor/spinner-gap.svg';
+import { usePipedreamConnectionsQuery } from '@queries/pipedream-connectors';
+import type { PipedreamCatalogEntryResponse } from '@service-cognition/client';
+import { Button, cn, Layer } from '@ui';
+import { createMemo, For, Show } from 'solid-js';
+import { StatusDot } from '../../settings/integration-ui';
+import { ContinueButton, SkipButton } from './shared';
+
+/** One connectable app: click to run Pipedream's hosted Connect UI. */
+function CatalogRow(props: {
+ entry: PipedreamCatalogEntryResponse;
+ onConnected: (entry: PipedreamCatalogEntryResponse) => void;
+}) {
+ const { connect, busy } = createPipedreamCatalogConnect({
+ entry: () => props.entry,
+ onConnected: (entry) => props.onConnected(entry),
+ });
+
+ return (
+ <Layer depth={2}>
+ <button
+ type="button"
+ title={props.entry.description ?? props.entry.display_name}
+ onClick={() => void connect()}
+ class={cn(
+ 'group flex h-11 w-full items-center gap-2.5 rounded-xl border border-ink/[0.05] bg-surface px-3.5 text-sm',
+ 'cursor-default outline-none hover:border-ink/10 focus-visible:ring-1 focus-visible:ring-accent/50'
+ )}
+ >
+ <span class="flex size-4 shrink-0 items-center justify-center [&_svg]:size-4">
+ <PipedreamConnectorIcon
+ appSlug={props.entry.app_slug}
+ iconUrl={props.entry.icon_url}
+ class="size-4"
+ />
+ </span>
+ <span class="min-w-0 truncate font-medium text-ink">
+ {props.entry.display_name}
+ </span>
+ <span class="ml-auto shrink-0">
+ <Show
+ when={busy()}
+ fallback={
+ <span class="flex items-center gap-1 text-xs font-medium text-ink-muted group-hover:text-ink">
+ Connect
+ <ArrowUpRightIcon class="size-3 shrink-0" />
+ </span>
+ }
+ >
+ <span class="flex items-center gap-1.5 text-xs text-ink-muted">
+ <SpinnerIcon class="size-3 shrink-0 animate-spin" />
+ Connecting…
+ </span>
+ </Show>
+ </span>
+ </button>
+ </Layer>
+ );
+}
+
+/** An app connected on this step — the list's feedback that it landed. */
+function ConnectedRow(props: { appSlug: string; name: string }) {
+ return (
+ <Layer depth={2}>
+ <div class="flex h-11 w-full items-center gap-2.5 rounded-xl border border-ink/[0.05] bg-surface px-3.5 text-sm">
+ <span class="flex size-4 shrink-0 items-center justify-center [&_svg]:size-4">
+ <PipedreamConnectorIcon appSlug={props.appSlug} class="size-4" />
+ </span>
+ <span class="min-w-0 truncate font-medium text-ink">{props.name}</span>
+ <span class="ml-auto flex shrink-0 items-center gap-1.5 text-xs text-ink-muted">
+ <StatusDot state="connected" />
+ Connected
+ </span>
+ </div>
+ </Layer>
+ );
+}
+
+/**
+ * The catch-all connector step: everything Pipedream can connect, searchable
+ * and ranked by popularity, for the tools that don't get a dedicated step.
+ * Only reachable on the Pipedream stack — the native stack has no catalog to
+ * browse, just the fixed presets the earlier steps already offered.
+ */
+export function ConnectorCatalogStep(props: {
+ /** Slugs handled by their own step, left out to avoid re-offering them. */
+ curatedSlugs: readonly string[];
+ onContinue: () => void;
+ onSkip: () => void;
+}) {
+ const analytics = useAnalytics();
+ // Poll: connecting finishes inside the Connect UI iframe, so nothing else
+ // would flip these rows.
+ const connectionsQuery = usePipedreamConnectionsQuery({
+ refetchInterval: 4_000,
+ neverSuspend: true,
+ });
+
+ const curated = createMemo(() => new Set(props.curatedSlugs));
+ /** Connected here, i.e. everything outside the curated steps' remit. */
+ const connected = createMemo(() =>
+ (connectionsQuery.data ?? []).filter(
+ (connection) => !curated().has(connection.app_slug)
+ )
+ );
+ const exclude = createMemo(
+ () =>
+ new Set([
+ ...curated(),
+ ...(connectionsQuery.data ?? []).map((c) => c.app_slug),
+ ])
+ );
+
+ const catalog = createPipedreamCatalogSearch(exclude);
+ const query = catalog.query;
+
+ const onConnected = (entry: PipedreamCatalogEntryResponse) => {
+ analytics.track('onboarding_v4_connector_connected', {
+ connector: entry.app_slug,
+ });
+ void connectionsQuery.refetch();
+ };
+
+ return (
+ <div class="flex flex-col gap-3">
+ <Show when={connected().length > 0}>
+ <div class="flex flex-col gap-2">
+ <For each={connected()}>
+ {(connection) => (
+ <ConnectedRow
+ appSlug={connection.app_slug}
+ name={connection.server_name}
+ />
+ )}
+ </For>
+ </div>
+ </Show>
+
+ <input
+ type="search"
+ placeholder="Search 2,000+ tools…"
+ value={catalog.searchInput()}
+ onInput={(e) => catalog.onSearchInput(e.currentTarget.value)}
+ class="w-full rounded-lg border border-edge bg-surface px-4 py-3 text-sm text-ink transition-colors placeholder:text-ink-placeholder focus:border-accent focus:outline-none"
+ />
+
+ <Show
+ when={!query.isError}
+ fallback={
+ <div class="flex flex-col items-center gap-2 py-6 text-center text-sm text-ink-muted">
+ Couldn't load the connector catalog.
+ <Button
+ variant="base"
+ size="sm"
+ depth={3}
+ onClick={() => void query.refetch()}
+ >
+ Retry
+ </Button>
+ </div>
+ }
+ >
+ <div class="flex max-h-64 flex-col gap-2 overflow-y-auto">
+ <For each={catalog.entries()}>
+ {(entry) => <CatalogRow entry={entry} onConnected={onConnected} />}
+ </For>
+
+ <Show when={query.isFetching && catalog.entries().length === 0}>
+ <p class="py-6 text-center text-sm text-ink-muted">
+ Loading connectors…
+ </p>
+ </Show>
+
+ <Show
+ when={
+ !query.isFetching &&
+ catalog.entries().length === 0 &&
+ catalog.search().trim()
+ }
+ >
+ <p class="py-6 text-center text-sm text-ink-muted">
+ No connectors found for "{catalog.search().trim()}".
+ </p>
+ </Show>
+
+ <Show when={query.hasNextPage}>
+ <Button
+ variant="base"
+ size="sm"
+ depth={3}
+ class="self-center"
+ disabled={query.isFetchingNextPage}
+ onClick={() => void query.fetchNextPage()}
+ >
+ {query.isFetchingNextPage ? 'Loading…' : 'Load more'}
+ </Button>
+ </Show>
+ </div>
+ </Show>
+
+ <Show
+ when={connected().length > 0}
+ fallback={<SkipButton onClick={props.onSkip} />}
+ >
+ <ContinueButton onClick={props.onContinue} />
+ </Show>
+ </div>
+ );
+}
diff --git a/apps/web/src/features/setup/flow/OnboardingFlow.tsx b/apps/web/src/features/setup/flow/OnboardingFlow.tsx
index 1c98d4a4f5..319b303c80 100644
--- a/apps/web/src/features/setup/flow/OnboardingFlow.tsx
+++ b/apps/web/src/features/setup/flow/OnboardingFlow.tsx
@@ -1,6 +1,7 @@
import { useAnalytics } from '@app/lib/analytics/analytics-context';
import { useFeatureFlag } from '@app/lib/analytics/posthog';
import { FEATURED_MCP_SERVERS } from '@core/component/AI/constant/mcpServers';
+import { usePipedreamMcpFlag } from '@core/pipedream/flag';
import LogoIcon from '@icon/macro-logo.svg';
import { authKeys } from '@queries/auth/keys';
import { useCompleteTutorialMutation } from '@queries/auth/tutorial';
@@ -28,10 +29,12 @@ import type { ModuleLogo, ModuleState } from '../Module';
import { MODULE_LOGOS } from '../moduleLogos';
import { BrandHandoff, type BrandHandoffSource } from './BrandHandoff';
import { BuildingStep, type ConnectedTools } from './BuildingStep';
+import { ConnectorCatalogStep } from './ConnectorCatalogStep';
import { ConnectorStep } from './ConnectorStep';
import { createFlowFinish } from './createFlowFinish';
import { EmailStep } from './EmailStep';
import {
+ ONBOARDING_CATALOG_STEP_KEY,
ONBOARDING_CONNECTORS_FEATURE_FLAG,
type OnboardingConnectorServerName,
resolveOnboardingConnectorNames,
@@ -142,8 +145,11 @@ const CONNECTOR_COPY: Record<string, ConnectorStepCopy> = {
function buildSteps(
connectorNames: readonly OnboardingConnectorServerName[],
connectedTools: () => ConnectedTools,
- onBuildingDone: (source: BrandHandoffSource | null) => void
+ onBuildingDone: (source: BrandHandoffSource | null) => void,
+ /** Whether to offer the searchable catalog after the curated connectors. */
+ includeCatalog: boolean
): StepDef[] {
+ const curatedSlugs: string[] = [];
const connectorSteps: StepDef[] = connectorNames.flatMap((name) => {
const server = FEATURED_MCP_SERVERS.find(
(candidate) => candidate.server_name === name
@@ -151,6 +157,7 @@ function buildSteps(
const copy = CONNECTOR_COPY[name];
if (!server || !copy) return [];
const logo = connectorLogo(name);
+ curatedSlugs.push(server.app_slug);
return [
{
key: `connect-${name.toLowerCase()}`,
@@ -184,6 +191,25 @@ function buildSteps(
),
},
...connectorSteps,
+ // Only on the Pipedream stack: the native stack has no catalog to
+ // browse, just the presets the curated steps already offered.
+ ...(includeCatalog
+ ? [
+ {
+ key: ONBOARDING_CATALOG_STEP_KEY,
+ title: 'Connect anything else',
+ subtitle:
+ "Macro's agent can work in any of these tools. Connect the ones your team lives in — you can add more later in Settings.",
+ render: (controls: StepControls) => (
+ <ConnectorCatalogStep
+ curatedSlugs={curatedSlugs}
+ onContinue={controls.next}
+ onSkip={controls.skip}
+ />
+ ),
+ } satisfies StepDef,
+ ]
+ : []),
{
key: 'team',
title: 'Macro is meant for teams',
@@ -328,12 +354,14 @@ function FlowContent() {
};
const connectorConfig = useFeatureFlag(ONBOARDING_CONNECTORS_FEATURE_FLAG);
+ const pipedreamMcp = usePipedreamMcpFlag();
const steps = createMemo(() => {
const config = connectorConfig();
return buildSteps(
resolveOnboardingConnectorNames(config.enabled, config.payload),
connectedTools,
- startBrandHandoff
+ startBrandHandoff,
+ pipedreamMcp()
);
});
diff --git a/apps/web/src/features/setup/flow/onboardingConnectorConfig.test.ts b/apps/web/src/features/setup/flow/onboardingConnectorConfig.test.ts
index 1f5f6d63ec..7d63f18534 100644
--- a/apps/web/src/features/setup/flow/onboardingConnectorConfig.test.ts
+++ b/apps/web/src/features/setup/flow/onboardingConnectorConfig.test.ts
@@ -1,5 +1,6 @@
import { describe, expect, it } from 'vitest';
import {
+ ONBOARDING_CATALOG_STEP_KEY,
ONBOARDING_CONNECTORS,
resolveOnboardingConnectorNames,
resolveOnboardingStepIndex,
@@ -65,6 +66,7 @@ describe('resolveOnboardingStepIndex', () => {
'connect-notion',
'connect-slack',
'connect-github',
+ ONBOARDING_CATALOG_STEP_KEY,
'team',
'building',
'summary',
@@ -104,4 +106,28 @@ describe('resolveOnboardingStepIndex', () => {
it('falls back safely for an unknown saved step', () => {
expect(resolveOnboardingStepIndex(fullStepList, 'unknown')).toBe(0);
});
+
+ // The catalog step only exists on the Pipedream stack. A session that saved
+ // it and came back without it must fall forward, not restart the flow —
+ // which is what an unranked step key would do (indexOf -1 → step 0).
+ it('falls forward to team when the catalog step is absent', () => {
+ const withoutCatalog = fullStepList.filter(
+ (key) => key !== ONBOARDING_CATALOG_STEP_KEY
+ );
+ const index = resolveOnboardingStepIndex(
+ withoutCatalog,
+ ONBOARDING_CATALOG_STEP_KEY
+ );
+
+ expect(withoutCatalog[index]).toBe('team');
+ });
+
+ it('resumes into the catalog step when it is present', () => {
+ const index = resolveOnboardingStepIndex(
+ fullStepList,
+ ONBOARDING_CATALOG_STEP_KEY
+ );
+
+ expect(fullStepList[index]).toBe(ONBOARDING_CATALOG_STEP_KEY);
+ });
});
diff --git a/apps/web/src/features/setup/flow/onboardingConnectorConfig.ts b/apps/web/src/features/setup/flow/onboardingConnectorConfig.ts
index c0c1187294..3e08e0e698 100644
--- a/apps/web/src/features/setup/flow/onboardingConnectorConfig.ts
+++ b/apps/web/src/features/setup/flow/onboardingConnectorConfig.ts
@@ -8,9 +8,13 @@ export const ONBOARDING_CONNECTORS = [
{ key: 'github', serverName: 'GitHub' },
] as const;
+/** The catch-all catalog step, after every curated connector step. */
+export const ONBOARDING_CATALOG_STEP_KEY = 'connect-more';
+
const ONBOARDING_STEP_ORDER = [
'email',
...ONBOARDING_CONNECTORS.map(({ key }) => `connect-${key}`),
+ ONBOARDING_CATALOG_STEP_KEY,
'team',
'building',
'summary',
diff --git a/apps/web/src/lib/core/constant/featureFlags.ts b/apps/web/src/lib/core/constant/featureFlags.ts
index 34349e1ec9..64027f4888 100644
--- a/apps/web/src/lib/core/constant/featureFlags.ts
+++ b/apps/web/src/lib/core/constant/featureFlags.ts
@@ -13,7 +13,11 @@ export const LOCAL_ONLY = !!import.meta.hot;
type FeatureFlagValue = 'true' | 'false' | undefined;
-function getFeatureFlagOverride(flagName: string): boolean | undefined {
+/**
+ * Reads a `VITE_<flagName>` env override. Returns `undefined` when unset, so
+ * callers can fall through to PostHog rather than forcing the flag off.
+ */
+export function getFeatureFlagOverride(flagName: string): boolean | undefined {
const envKey = `VITE_${flagName}` as const;
const value = import.meta.env[envKey] as FeatureFlagValue;
diff --git a/apps/web/src/lib/core/pipedream/ConnectorIcon.tsx b/apps/web/src/lib/core/pipedream/ConnectorIcon.tsx
new file mode 100644
index 0000000000..2b14128b00
--- /dev/null
+++ b/apps/web/src/lib/core/pipedream/ConnectorIcon.tsx
@@ -0,0 +1,42 @@
+import { PIPEDREAM_ICON_MAP } from '@core/component/AI/constant/mcpServers';
+import { proxyImageUrl } from '@core/util/imageProxy';
+import PlugIcon from '@phosphor-icons/core/regular/plug.svg?component-solid';
+import { Show } from 'solid-js';
+
+/**
+ * Connector icon: our bundled SVG for the apps we ship icons for, the
+ * directory-provided icon otherwise, and a generic plug as the fallback.
+ * Directory icons load through the image proxy — the app's COEP blocks
+ * cross-origin images from hosts that don't send CORP headers.
+ */
+export function PipedreamConnectorIcon(props: {
+ appSlug: string;
+ iconUrl?: string | null;
+ /** Sizing for both the bundled SVG and the directory image. */
+ class?: string;
+}) {
+ const BundledIcon = () => PIPEDREAM_ICON_MAP.get(props.appSlug);
+ const sizeClass = () => props.class ?? 'size-5';
+ return (
+ <Show
+ when={BundledIcon()}
+ fallback={
+ <Show when={props.iconUrl} fallback={<PlugIcon class={sizeClass()} />}>
+ {(iconUrl) => (
+ <img
+ src={proxyImageUrl(iconUrl())}
+ alt=""
+ loading="lazy"
+ class={`${sizeClass()} rounded object-contain`}
+ />
+ )}
+ </Show>
+ }
+ >
+ {(Icon) => {
+ const C = Icon();
+ return <C class={sizeClass()} />;
+ }}
+ </Show>
+ );
+}
diff --git a/apps/web/src/lib/core/pipedream/catalog.ts b/apps/web/src/lib/core/pipedream/catalog.ts
new file mode 100644
index 0000000000..7dcd4e304c
--- /dev/null
+++ b/apps/web/src/lib/core/pipedream/catalog.ts
@@ -0,0 +1,86 @@
+import { pipedreamAppAvailableInEnv } from '@core/component/AI/constant/mcpServers';
+import { toast } from '@core/component/Toast/Toast';
+import {
+ connectPipedreamApp,
+ usePipedreamCatalogQuery,
+} from '@queries/pipedream-connectors';
+import type { PipedreamCatalogEntryResponse } from '@service-cognition/client';
+import { type Accessor, createSignal, onCleanup } from 'solid-js';
+
+/** How long typing settles before the catalog is re-queried. */
+const SEARCH_DEBOUNCE_MS = 250;
+
+/**
+ * Debounced search over the Pipedream app catalog, shared by every surface
+ * that offers connectors (the Connections settings page and onboarding's
+ * catalog step). Holds the query and the input/committed search split; the
+ * caller owns presentation.
+ *
+ * `exclude` drops entries the surface has already accounted for — the user's
+ * existing connections everywhere, plus the connectors that got their own
+ * onboarding step, which would otherwise dominate the popularity ranking on
+ * the screen right after the user walked past them.
+ */
+export function createPipedreamCatalogSearch(
+ exclude: Accessor<ReadonlySet<string>>
+) {
+ const [searchInput, setSearchInput] = createSignal('');
+ const [search, setSearch] = createSignal('');
+
+ let debounceTimer: ReturnType<typeof setTimeout> | undefined;
+ const onSearchInput = (value: string) => {
+ setSearchInput(value);
+ clearTimeout(debounceTimer);
+ debounceTimer = setTimeout(() => setSearch(value), SEARCH_DEBOUNCE_MS);
+ };
+ onCleanup(() => clearTimeout(debounceTimer));
+
+ const query = usePipedreamCatalogQuery(search);
+
+ const entries = (): PipedreamCatalogEntryResponse[] =>
+ (query.data?.pages ?? [])
+ .flatMap((page) => page.servers)
+ .filter(
+ (entry) =>
+ pipedreamAppAvailableInEnv(entry.app_slug) &&
+ !exclude().has(entry.app_slug)
+ );
+
+ return { searchInput, onSearchInput, search, query, entries };
+}
+
+/**
+ * Connecting one catalog entry through Pipedream's hosted Connect UI, with
+ * the toasts every surface wants. Success needs no toast of its own on
+ * surfaces that re-render the row as connected, so callers opt in via
+ * `onConnected`.
+ */
+export function createPipedreamCatalogConnect(options: {
+ entry: Accessor<PipedreamCatalogEntryResponse>;
+ onConnected?: (entry: PipedreamCatalogEntryResponse) => void;
+}) {
+ const [busy, setBusy] = createSignal(false);
+
+ const connect = async () => {
+ if (busy()) return;
+ const entry = options.entry();
+ setBusy(true);
+ try {
+ const outcome = await connectPipedreamApp({
+ appSlug: entry.app_slug,
+ serverName: entry.display_name,
+ });
+ if (outcome === 'connected') {
+ options.onConnected?.(entry);
+ } else if (outcome === 'unsupported') {
+ toast.failure('Connectors are not available on this deployment');
+ }
+ } catch {
+ toast.failure(`Failed to connect ${entry.display_name}`);
+ } finally {
+ setBusy(false);
+ }
+ };
+
+ return { connect, busy };
+}
diff --git a/apps/web/src/lib/core/pipedream/flag.ts b/apps/web/src/lib/core/pipedream/flag.ts
index 1fd664b389..f650fe9280 100644
--- a/apps/web/src/lib/core/pipedream/flag.ts
+++ b/apps/web/src/lib/core/pipedream/flag.ts
@@ -1,4 +1,8 @@
import { useFeatureFlag } from '@app/lib/analytics/posthog';
+import {
+ DEV_MODE_ENV,
+ getFeatureFlagOverride,
+} from '@core/constant/featureFlags';
import type { Accessor } from 'solid-js';
/**
@@ -10,8 +14,20 @@ import type { Accessor } from 'solid-js';
*/
export const PIPEDREAM_MCP_FLAG = 'pipedream-mcp';
+/**
+ * On in dev without waiting on PostHog — otherwise local and dev.macro.com
+ * fall back to the native stack's fixed preset list and the searchable
+ * Pipedream catalog is unreachable. Override either way with
+ * VITE_ENABLE_PIPEDREAM_MCP; `undefined` defers to PostHog (production).
+ */
+export const PIPEDREAM_MCP_OVERRIDE =
+ getFeatureFlagOverride('ENABLE_PIPEDREAM_MCP') ??
+ (DEV_MODE_ENV ? true : undefined);
+
/** Whether this user sees the Pipedream connector frontend. */
export function usePipedreamMcpFlag(): Accessor<boolean> {
- const flag = useFeatureFlag(PIPEDREAM_MCP_FLAG);
+ const flag = useFeatureFlag(PIPEDREAM_MCP_FLAG, {
+ enabledOverride: PIPEDREAM_MCP_OVERRIDE,
+ });
return () => flag().enabled;
}
diff --git a/apps/web/src/lib/queries/pipedream-connectors.ts b/apps/web/src/lib/queries/pipedream-connectors.ts
index a7d6c62d40..329ae4d8de 100644
--- a/apps/web/src/lib/queries/pipedream-connectors.ts
+++ b/apps/web/src/lib/queries/pipedream-connectors.ts
@@ -49,9 +49,8 @@ export function usePipedreamConnectionsQuery(options?: {
}
/**
- * Browse or search the Pipedream app catalog, paged by cursor. Curated
- * priority connectors arrive first (flagged `priority`), followed by
- * organic results from Pipedream's app directory.
+ * Browse or search the Pipedream app catalog, paged by cursor. Entries come
+ * from Pipedream's app directory, ranked most-popular-first.
*/
export function usePipedreamCatalogQuery(search: () => string) {
return useInfiniteQuery(() => ({
diff --git a/apps/web/src/lib/service-clients/service-cognition/generated/client.ts b/apps/web/src/lib/service-clients/service-cognition/generated/client.ts
index 236125934e..3346a770cd 100644
--- a/apps/web/src/lib/service-clients/service-cognition/generated/client.ts
+++ b/apps/web/src/lib/service-clients/service-cognition/generated/client.ts
@@ -1929,8 +1929,7 @@ export const completeHandler = async (
};
/**
- * Curated priority connectors come first (flagged `priority`), followed by
-results from Pipedream's app directory.
+ * Results come from Pipedream's app directory, most popular first.
* @summary Browse or search the catalog of connectable apps.
*/
export type browsePipedreamMcpCatalogResponse200 = {
diff --git a/apps/web/src/lib/service-clients/service-cognition/generated/schemas/pipedreamCatalogEntryResponse.ts b/apps/web/src/lib/service-clients/service-cognition/generated/schemas/pipedreamCatalogEntryResponse.ts
index 9d9cbe5c70..44303311d1 100644
--- a/apps/web/src/lib/service-clients/service-cognition/generated/schemas/pipedreamCatalogEntryResponse.ts
+++ b/apps/web/src/lib/service-clients/service-cognition/generated/schemas/pipedreamCatalogEntryResponse.ts
@@ -19,7 +19,4 @@ export interface PipedreamCatalogEntryResponse {
display_name: string;
/** URL of the app's icon, when available. */
icon_url?: PipedreamCatalogEntryResponseIconUrl;
- /** Curated priority connectors rank first and may be rendered as their
-own featured section. */
- priority: boolean;
}
diff --git a/apps/web/src/lib/service-clients/service-cognition/generated/schemas/pipedreamCatalogResponse.ts b/apps/web/src/lib/service-clients/service-cognition/generated/schemas/pipedreamCatalogResponse.ts
index 6c0b4addc2..20e0ecb98c 100644
--- a/apps/web/src/lib/service-clients/service-cognition/generated/schemas/pipedreamCatalogResponse.ts
+++ b/apps/web/src/lib/service-clients/service-cognition/generated/schemas/pipedreamCatalogResponse.ts
@@ -14,6 +14,6 @@ import type { PipedreamCatalogResponseNextCursor } from './pipedreamCatalogRespo
export interface PipedreamCatalogResponse {
/** Cursor for the next page. Absent on the last page. */
next_cursor?: PipedreamCatalogResponseNextCursor;
- /** Catalog entries in display order (priority connectors first). */
+ /** Catalog entries in display order (most popular first). */
servers: PipedreamCatalogEntryResponse[];
}
diff --git a/apps/web/src/lib/service-clients/service-cognition/openapi.json b/apps/web/src/lib/service-clients/service-cognition/openapi.json
index 3dcbb6a645..32d7dae9f2 100644
--- a/apps/web/src/lib/service-clients/service-cognition/openapi.json
+++ b/apps/web/src/lib/service-clients/service-cognition/openapi.json
@@ -1566,7 +1566,7 @@
"get": {
"tags": ["pipedream-mcp"],
"summary": "Browse or search the catalog of connectable apps.",
- "description": "Curated priority connectors come first (flagged `priority`), followed by\nresults from Pipedream's app directory.",
+ "description": "Results come from Pipedream's app directory, most popular first.",
"operationId": "browse_pipedream_mcp_catalog",
"parameters": [
{
@@ -3971,7 +3971,7 @@
"PipedreamCatalogEntryResponse": {
"type": "object",
"description": "One connectable app in the catalog.",
- "required": ["app_slug", "display_name", "priority"],
+ "required": ["app_slug", "display_name"],
"properties": {
"app_slug": {
"type": "string",
@@ -3988,10 +3988,6 @@
"icon_url": {
"type": ["string", "null"],
"description": "URL of the app's icon, when available."
- },
- "priority": {
- "type": "boolean",
- "description": "Curated priority connectors rank first and may be rendered as their\nown featured section."
}
}
},
@@ -4009,7 +4005,7 @@
"items": {
"$ref": "#/components/schemas/PipedreamCatalogEntryResponse"
},
- "description": "Catalog entries in display order (priority connectors first)."
+ "description": "Catalog entries in display order (most popular first)."
}
}
},
diff --git a/crates/pipedream_mcp/src/domain/models.rs b/crates/pipedream_mcp/src/domain/models.rs
index eee82f0aee..8160ac7347 100644
--- a/crates/pipedream_mcp/src/domain/models.rs
+++ b/crates/pipedream_mcp/src/domain/models.rs
@@ -74,9 +74,6 @@ pub struct CatalogEntry {
pub description: Option<String>,
/// URL of the app's icon, when the directory provides one.
pub icon_url: Option<String>,
- /// Whether this is a curated priority connector, ranked above organic
- /// directory results (and renderable as its own section).
- pub priority: bool,
}
/// One page of catalog results.
diff --git a/crates/pipedream_mcp/src/domain/ports.rs b/crates/pipedream_mcp/src/domain/ports.rs
index b5cbcd48f0..573fd238da 100644
--- a/crates/pipedream_mcp/src/domain/ports.rs
+++ b/crates/pipedream_mcp/src/domain/ports.rs
@@ -90,8 +90,9 @@ pub trait ConnectorDirectory: Send + Sync + 'static {
///
/// `search` filters apps by name; `None` browses everything. `cursor` is
/// the opaque pagination cursor from a previous page. Implementations
- /// return only apps that can actually be connected (i.e. apps with an
- /// auth flow).
+ /// return entries most-popular-first, and only apps that can actually be
+ /// connected and used (i.e. apps with an auth flow and at least one
+ /// action to expose as a tool).
fn search(
&self,
search: Option<&str>,
diff --git a/crates/pipedream_mcp/src/domain/service/catalog.rs b/crates/pipedream_mcp/src/domain/service/catalog.rs
index acb5f26336..e807efd170 100644
--- a/crates/pipedream_mcp/src/domain/service/catalog.rs
+++ b/crates/pipedream_mcp/src/domain/service/catalog.rs
@@ -1,93 +1,22 @@
//! Browsing the catalog of connectable MCP apps.
//!
-//! The catalog merges two sources: a curated list of priority connectors we
-//! actively promote, and Pipedream's app directory. Priority connectors rank
-//! above organic directory results (clients may also render them as their
-//! own section, via [`CatalogEntry::priority`]).
+//! The catalog is Pipedream's app directory, ranked by Pipedream's own
+//! popularity ordering (see the directory adapter). Clients render the
+//! user's connected apps as their own section from the connections
+//! endpoint; the catalog itself carries no curated pinning.
-use crate::domain::models::{CatalogEntry, CatalogPage};
+use crate::domain::models::CatalogPage;
use crate::domain::ports::ConnectorDirectory;
#[cfg(test)]
mod test;
-/// A curated connector we promote above organic directory results.
-struct PriorityConnector {
- /// Pipedream app name slug (see the app's page at pipedream.com/apps).
- app_slug: &'static str,
- display_name: &'static str,
- /// Product-voice tagline shown instead of the directory's description.
- tagline: &'static str,
-}
-
-/// The promoted connectors, in the order they should rank.
-///
-/// This is the place to "advertise" a connector: entries here are pinned to
-/// the top of the catalog (or shown in a dedicated featured section).
-const PRIORITY_CONNECTORS: &[PriorityConnector] = &[
- PriorityConnector {
- app_slug: "linear",
- display_name: "Linear",
- tagline: "Create and update issues without leaving Macro.",
- },
- PriorityConnector {
- app_slug: "slack",
- display_name: "Slack",
- tagline: "Search conversations and post updates to channels.",
- },
- PriorityConnector {
- app_slug: "notion",
- display_name: "Notion",
- tagline: "Search your pages, databases, and wikis.",
- },
- PriorityConnector {
- app_slug: "posthog",
- display_name: "PostHog",
- tagline: "Query product analytics and user insights.",
- },
- PriorityConnector {
- app_slug: "github",
- display_name: "GitHub",
- tagline: "Give the agent access to your repos, PRs, and issues.",
- },
- PriorityConnector {
- app_slug: "datadog",
- display_name: "Datadog",
- tagline: "Query metrics, logs, and monitors.",
- },
- PriorityConnector {
- app_slug: "grafana",
- display_name: "Grafana",
- tagline: "Search dashboards and query your data sources.",
- },
-];
-
/// Bounds for the page size, applied to whatever the client asks for.
const MAX_PAGE_SIZE: u32 = 50;
const DEFAULT_PAGE_SIZE: u32 = 20;
-fn matches_priority(entry: &CatalogEntry) -> bool {
- PRIORITY_CONNECTORS
- .iter()
- .any(|p| p.app_slug == entry.app_slug)
-}
-
-fn priority_entry(connector: &PriorityConnector) -> CatalogEntry {
- CatalogEntry {
- app_slug: connector.app_slug.to_owned(),
- display_name: connector.display_name.to_owned(),
- description: Some(connector.tagline.to_owned()),
- icon_url: None,
- priority: true,
- }
-}
-
-/// Browse the connector catalog: curated priority connectors first, then
-/// organic directory results, deduplicated.
-///
-/// Priority connectors matching `search` (or all of them, when browsing) are
-/// pinned to the front of the first page; directory entries duplicating a
-/// priority connector are dropped on every page so they never show up twice.
+/// Browse the connector catalog: popularity-ranked directory results,
+/// optionally filtered by `search`.
#[tracing::instrument(skip(directory), err)]
pub async fn browse_catalog<D: ConnectorDirectory>(
directory: &D,
@@ -98,25 +27,5 @@ pub async fn browse_catalog<D: ConnectorDirectory>(
let search = search.map(str::trim).filter(|s| !s.is_empty());
let limit = limit.unwrap_or(DEFAULT_PAGE_SIZE).clamp(1, MAX_PAGE_SIZE);
- let mut page = directory.search(search, cursor, limit).await?;
- page.entries.retain(|entry| !matches_priority(entry));
-
- // Priority connectors lead the first page only; on later pages they'd be
- // repeats of what the client already has.
- if cursor.is_none() {
- let needle = search.map(str::to_lowercase);
- let pinned = PRIORITY_CONNECTORS
- .iter()
- .filter(|p| match &needle {
- Some(needle) => {
- p.display_name.to_lowercase().contains(needle)
- || p.app_slug.to_lowercase().contains(needle)
- }
- None => true,
- })
- .map(priority_entry);
- page.entries.splice(0..0, pinned);
- }
-
- Ok(page)
+ directory.search(search, cursor, limit).await
}
diff --git a/crates/pipedream_mcp/src/domain/service/catalog/test.rs b/crates/pipedream_mcp/src/domain/service/catalog/test.rs
index b4dacdfca6..ff91b18e12 100644
--- a/crates/pipedream_mcp/src/domain/service/catalog/test.rs
+++ b/crates/pipedream_mcp/src/domain/service/catalog/test.rs
@@ -1,4 +1,5 @@
use super::*;
+use crate::domain::models::CatalogEntry;
use std::sync::Mutex;
/// Fake directory returning a canned page and recording the query it got.
@@ -41,73 +42,33 @@ fn directory_entry(app_slug: &str) -> CatalogEntry {
display_name: app_slug.to_owned(),
description: Some("from the directory".to_owned()),
icon_url: None,
- priority: false,
}
}
#[tokio::test]
-async fn first_page_pins_priority_connectors_before_directory_results() {
- let directory = FakeDirectory::returning(vec![directory_entry("airtable")]);
-
- let page = browse_catalog(&directory, None, None, None).await.unwrap();
-
- let split = page.entries.iter().position(|e| !e.priority).unwrap();
- assert_eq!(split, PRIORITY_CONNECTORS.len());
- assert!(page.entries[..split].iter().all(|e| e.priority));
- assert_eq!(page.entries[split].app_slug, "airtable");
-}
-
-#[tokio::test]
-async fn directory_duplicates_of_priority_connectors_are_dropped() {
+async fn directory_results_pass_through_in_order() {
let directory =
- FakeDirectory::returning(vec![directory_entry("linear"), directory_entry("airtable")]);
+ FakeDirectory::returning(vec![directory_entry("slack"), directory_entry("airtable")]);
let page = browse_catalog(&directory, None, None, None).await.unwrap();
- let linear: Vec<_> = page
- .entries
- .iter()
- .filter(|e| e.app_slug == "linear")
- .collect();
- assert_eq!(linear.len(), 1, "Linear must appear exactly once");
- assert!(linear[0].priority);
- assert_eq!(
- linear[0].description.as_deref(),
- Some("Create and update issues without leaving Macro."),
- "priority tagline wins over the directory description"
- );
-}
-
-#[tokio::test]
-async fn search_filters_priority_connectors_and_marks_them() {
- let directory = FakeDirectory::returning(vec![directory_entry("linear_helper")]);
-
- let page = browse_catalog(&directory, Some("linear"), None, None)
- .await
- .unwrap();
-
- assert_eq!(page.entries[0].display_name, "Linear");
- assert!(page.entries[0].priority);
- assert_eq!(
- page.entries.iter().filter(|e| e.priority).count(),
- 1,
- "only the matching priority connector is pinned"
- );
- assert_eq!(page.entries[1].app_slug, "linear_helper");
+ let slugs: Vec<_> = page.entries.iter().map(|e| e.app_slug.as_str()).collect();
+ assert_eq!(slugs, ["slack", "airtable"]);
}
#[tokio::test]
-async fn later_pages_never_repeat_priority_connectors() {
- let directory = FakeDirectory::returning(vec![directory_entry("linear")]);
+async fn search_is_trimmed_and_forwarded() {
+ let directory = FakeDirectory::returning(vec![]);
- let page = browse_catalog(&directory, None, Some("cursor-1"), None)
+ browse_catalog(&directory, Some(" linear "), Some("cursor-1"), Some(5))
.await
.unwrap();
- assert!(
- page.entries.is_empty(),
- "priority connectors are neither pinned nor repeated on later pages"
- );
+ let seen = directory.seen.lock().unwrap();
+ let (search, cursor, limit) = seen[0].clone();
+ assert_eq!(search.as_deref(), Some("linear"));
+ assert_eq!(cursor.as_deref(), Some("cursor-1"));
+ assert_eq!(limit, 5);
}
#[tokio::test]
diff --git a/crates/pipedream_mcp/src/inbound/axum_router.rs b/crates/pipedream_mcp/src/inbound/axum_router.rs
index f825ca5b52..044ae79bc9 100644
--- a/crates/pipedream_mcp/src/inbound/axum_router.rs
+++ b/crates/pipedream_mcp/src/inbound/axum_router.rs
@@ -230,9 +230,6 @@ pub struct PipedreamCatalogEntryResponse {
description: Option<String>,
/// URL of the app's icon, when available.
icon_url: Option<String>,
- /// Curated priority connectors rank first and may be rendered as their
- /// own featured section.
- priority: bool,
}
impl From<CatalogEntry> for PipedreamCatalogEntryResponse {
@@ -242,7 +239,6 @@ impl From<CatalogEntry> for PipedreamCatalogEntryResponse {
display_name: entry.display_name,
description: entry.description,
icon_url: entry.icon_url,
- priority: entry.priority,
}
}
}
@@ -250,7 +246,7 @@ impl From<CatalogEntry> for PipedreamCatalogEntryResponse {
/// A page of the connector catalog.
#[derive(Debug, Serialize, ToSchema)]
pub struct PipedreamCatalogResponse {
- /// Catalog entries in display order (priority connectors first).
+ /// Catalog entries in display order (most popular first).
servers: Vec<PipedreamCatalogEntryResponse>,
/// Cursor for the next page. Absent on the last page.
next_cursor: Option<String>,
@@ -527,8 +523,7 @@ where
)]
/// Browse or search the catalog of connectable apps.
///
-/// Curated priority connectors come first (flagged `priority`), followed by
-/// results from Pipedream's app directory.
+/// Results come from Pipedream's app directory, most popular first.
#[tracing::instrument(skip_all, err)]
pub async fn browse_catalog_handler<S, P, Auth>(
State(state): State<PipedreamRouterState<S, P, Auth>>,
diff --git a/crates/pipedream_mcp/src/outbound/api.rs b/crates/pipedream_mcp/src/outbound/api.rs
index ab5bb8b705..3de2411403 100644
--- a/crates/pipedream_mcp/src/outbound/api.rs
+++ b/crates/pipedream_mcp/src/outbound/api.rs
@@ -229,7 +229,17 @@ impl ConnectorDirectory for PipedreamClient {
cursor: Option<&str>,
limit: u32,
) -> anyhow::Result<CatalogPage> {
- let mut query: Vec<(&str, String)> = vec![("limit", limit.to_string())];
+ let mut query: Vec<(&str, String)> = vec![
+ ("limit", limit.to_string()),
+ // `featured_weight` is Pipedream's popularity ordering (the sort
+ // behind pipedream.com/apps); without it the directory comes back
+ // in an order nobody would browse.
+ ("sort_key", "featured_weight".to_owned()),
+ ("sort_direction", "desc".to_owned()),
+ // Apps without actions expose no MCP tools, so there is nothing
+ // to connect them for.
+ ("has_actions", "true".to_owned()),
+ ];
if let Some(search) = search {
query.push(("q", search.to_owned()));
}
@@ -238,7 +248,7 @@ impl ConnectorDirectory for PipedreamClient {
}
let response = self
- .authed(self.http.get(self.api("/apps")))
+ .authed(self.http.get(self.api("/connect/apps")))
.await?
.query(&query)
.send()
@@ -267,9 +277,8 @@ impl ConnectorDirectory for PipedreamClient {
.map(|app| CatalogEntry {
app_slug: app.name_slug,
display_name: app.name,
- description: Some(app.description).filter(|d| !d.is_empty()),
+ description: app.description.filter(|d| !d.is_empty()),
icon_url: Some(app.img_src).filter(|u| u.starts_with("https://")),
- priority: false,
})
.collect();
@@ -362,8 +371,9 @@ struct PageInfo {
struct AppResponse {
name_slug: String,
name: String,
+ // Nullable in the API, not just omissible.
#[serde(default)]
- description: String,
+ description: Option<String>,
#[serde(default)]
auth_type: Option<String>,
#[serde(default)]
diff --git a/packages/sdk/generated/cognition/sdk.gen.ts b/packages/sdk/generated/cognition/sdk.gen.ts
index 1a7fd72632..ef0938a549 100644
--- a/packages/sdk/generated/cognition/sdk.gen.ts
+++ b/packages/sdk/generated/cognition/sdk.gen.ts
@@ -407,8 +407,7 @@ export class Sdk extends HeyApiClient {
/**
* Browse or search the catalog of connectable apps.
*
- * Curated priority connectors come first (flagged `priority`), followed by
- * results from Pipedream's app directory.
+ * Results come from Pipedream's app directory, most popular first.
*/
public browsePipedreamMcpCatalog<ThrowOnError extends boolean = false>(options?: Options<BrowsePipedreamMcpCatalogData, ThrowOnError>): RequestResult<BrowsePipedreamMcpCatalogResponses, BrowsePipedreamMcpCatalogErrors, ThrowOnError> {
return (options?.client ?? this.client).get<BrowsePipedreamMcpCatalogResponses, BrowsePipedreamMcpCatalogErrors, ThrowOnError>({ url: '/pipedream/mcp/catalog', ...options });
diff --git a/packages/sdk/generated/cognition/types.gen.ts b/packages/sdk/generated/cognition/types.gen.ts
index 6ad13958c3..046df7f421 100644
--- a/packages/sdk/generated/cognition/types.gen.ts
+++ b/packages/sdk/generated/cognition/types.gen.ts
@@ -987,11 +987,6 @@ export type PipedreamCatalogEntryResponse = {
* URL of the app's icon, when available.
*/
icon_url?: string | null;
- /**
- * Curated priority connectors rank first and may be rendered as their
- * own featured section.
- */
- priority: boolean;
};
/**
@@ -1003,7 +998,7 @@ export type PipedreamCatalogResponse = {
*/
next_cursor?: string | null;
/**
- * Catalog entries in display order (priority connectors first).
+ * Catalog entries in display order (most popular first).
*/
servers: Array<PipedreamCatalogEntryResponse>;
};
diff --git a/packages/sdk/specs/cognition.json b/packages/sdk/specs/cognition.json
index 3dcbb6a645..32d7dae9f2 100644
--- a/packages/sdk/specs/cognition.json
+++ b/packages/sdk/specs/cognition.json
@@ -1566,7 +1566,7 @@
"get": {
"tags": ["pipedream-mcp"],
"summary": "Browse or search the catalog of connectable apps.",
- "description": "Curated priority connectors come first (flagged `priority`), followed by\nresults from Pipedream's app directory.",
+ "description": "Results come from Pipedream's app directory, most popular first.",
"operationId": "browse_pipedream_mcp_catalog",
"parameters": [
{
@@ -3971,7 +3971,7 @@
"PipedreamCatalogEntryResponse": {
"type": "object",
"description": "One connectable app in the catalog.",
- "required": ["app_slug", "display_name", "priority"],
+ "required": ["app_slug", "display_name"],
"properties": {
"app_slug": {
"type": "string",
@@ -3988,10 +3988,6 @@
"icon_url": {
"type": ["string", "null"],
"description": "URL of the app's icon, when available."
- },
- "priority": {
- "type": "boolean",
- "description": "Curated priority connectors rank first and may be rendered as their\nown featured section."
}
}
},
@@ -4009,7 +4005,7 @@
"items": {
"$ref": "#/components/schemas/PipedreamCatalogEntryResponse"
},
- "description": "Catalog entries in display order (priority connectors first)."
+ "description": "Catalog entries in display order (most popular first)."
}
}
},