Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
feat(settings): unify integrations and simplify settings layout (#8476)
Wolf Mermelstein250a2b77f101
diff --git a/apps/web/AGENTS.md b/apps/web/AGENTS.mdindex 2510ac0e3c..f07810e31b 100644--- a/apps/web/AGENTS.md+++ b/apps/web/AGENTS.md@@ -91,6 +91,10 @@ without changing the active route. Backend registration still verifies accountownership. Cancel, logout, and the ten-minute timeout retire pending callbacks.### General+- Compose settings pages with `features/settings/primitives.tsx` so section headings,+ flat neutral cards, row spacing, and control shapes stay consistent.+- Keep personal accounts and agent tool connections together in Settings → Integrations;+ preserve `agent-connections` as an alias for existing links.- Keep bot setup focused on the token-and-SDK workflow; Agent and Ownershipcontrols live under collapsed Advanced settings. See the[Bots walkthrough](../../docs/agent-guide/settings.md#bots).diff --git a/apps/web/src/components/app/split-layout/tests/activity-registration.test.tsx b/apps/web/src/components/app/split-layout/tests/activity-registration.test.tsxindex c3defd7c97..240c1cb7e9 100644--- a/apps/web/src/components/app/split-layout/tests/activity-registration.test.tsx+++ b/apps/web/src/components/app/split-layout/tests/activity-registration.test.tsx@@ -140,7 +140,7 @@ vi.mock('@app/features/next-soup/use-recent-view-flag', () => ({}));vi.mock('@app/features/settings/Settings', () => ({SettingsPanelComponentWrapper: () => null,}));-vi.mock('@app/features/settings/McpConnections', () => ({}));+vi.mock('@app/features/settings/IntegrationsPage', () => ({}));vi.mock('@app/features/tasks-view/tasks-view', () => ({}));vi.mock('@app/features/tasks-view/components/TasksDetailView', () => ({TasksDetailRouteView: () => null,diff --git a/apps/web/src/features/agents-view/route-views.test.tsx b/apps/web/src/features/agents-view/route-views.test.tsxindex 7ea7588808..07e7d1bc67 100644--- a/apps/web/src/features/agents-view/route-views.test.tsx+++ b/apps/web/src/features/agents-view/route-views.test.tsx@@ -53,7 +53,9 @@ vi.mock('@core/mobile/isTouchDevice', () => ({vi.mock('@app/features/routines/queries/entities', () => ({}));vi.mock('../next-soup/sidebar/soup-filter-presets', () => ({}));vi.mock('./views/AgentsView', () => ({ AgentsView: () => null }));-vi.mock('../settings/McpConnections', () => ({ McpConnections: () => null }));+vi.mock('../settings/IntegrationsPage', () => ({+ IntegrationsPage: () => null,+}));beforeEach(() => {vi.clearAllMocks();diff --git a/apps/web/src/features/agents-view/route-views.tsx b/apps/web/src/features/agents-view/route-views.tsxindex 945bcb1490..bdddac662b 100644--- a/apps/web/src/features/agents-view/route-views.tsx+++ b/apps/web/src/features/agents-view/route-views.tsx@@ -25,8 +25,8 @@ const AgentsView = lazy(async () => ({const RoutinesPage = lazy(async () => ({default: (await import('../routines/routines-page')).RoutinesPage,}));-const McpConnections = lazy(async () => ({- default: (await import('../settings/McpConnections')).McpConnections,+const IntegrationsPage = lazy(async () => ({+ default: (await import('../settings/IntegrationsPage')).IntegrationsPage,}));function LegacyAgentsView() {@@ -154,7 +154,7 @@ export const AgentsRouteView = withAuth(() => {</Show>}>- <McpConnections />+ <IntegrationsPage /></Show>}>diff --git a/apps/web/src/features/agents-view/views/AgentsView.tsx b/apps/web/src/features/agents-view/views/AgentsView.tsxindex 175726c01c..14d5a64a64 100644--- a/apps/web/src/features/agents-view/views/AgentsView.tsx+++ b/apps/web/src/features/agents-view/views/AgentsView.tsx@@ -2,7 +2,7 @@ import { ViewShell } from '@app/components/view-shell';import { startPendingSession } from '@app/features/block-agent/context/pending-session';import { QUERY_FILTERS_BASE } from '@app/features/next-soup/filters/query-filters';import { AgentSettings } from '@app/features/settings/AgentSettings';-import { McpConnections } from '@app/features/settings/McpConnections';+import { IntegrationsPage } from '@app/features/settings/IntegrationsPage';import { withEntityNotifications } from '@app/features/soup/entity-notifications';import { ViewTour } from '@app/features/tours/ViewTour';import {@@ -295,7 +295,7 @@ function AgentsWorkspace(props: { initialRoute?: AgentsRoute }) {const pageTitle = () => {if (page() === 'routines') return 'Routines';if (page() === 'agents') return 'Agents';- if (page() === 'connections') return 'Connections';+ if (page() === 'connections') return 'Integrations';return undefined;};@@ -381,7 +381,7 @@ function AgentsWorkspace(props: { initialRoute?: AgentsRoute }) {<RoutinesPage /></Match><Match when={page() === 'connections'}>- <McpConnections />+ <IntegrationsPage /></Match><Match when={page() === 'agents'}><AgentSettings />diff --git a/apps/web/src/features/agents-view/views/ComposerAddMenu.test.tsx b/apps/web/src/features/agents-view/views/ComposerAddMenu.test.tsxindex a68223f678..464ffc8f1c 100644--- a/apps/web/src/features/agents-view/views/ComposerAddMenu.test.tsx+++ b/apps/web/src/features/agents-view/views/ComposerAddMenu.test.tsx@@ -26,6 +26,9 @@ const state = vi.hoisted(() => ({failed: false,retry: vi.fn(),}));+vi.mock('@core/constant/settingsTabsConfig', () => ({+ useSettingsTabAvailable: () => () => true,+}));vi.mock('@core/mobile/isMobile', () => ({ isMobile: () => state.mobile }));vi.mock('@core/constant/SettingsState', () => ({useSettingsState: () => ({ openSettings: vi.fn() }),@@ -49,15 +52,12 @@ vi.mock('../../settings/connections/use-connections-model', () => ({}),}),}));-vi.mock('../../settings/connections/ConnectionsPage', () => ({- ConnectionsPage: (props: {- initialMode?: string;- initialProvider?: string;- }) => (+vi.mock('../../settings/connections/integrations-view', () => ({+ IntegrationsView: (props: { initialProvider?: string }) => (<p>{props.initialProvider? `Settings for ${props.initialProvider}`- : `${props.initialMode} connections`}+ : 'Available integrations'}</p>),}));@@ -165,12 +165,12 @@ it('opens a disabled connection for management', async () => {await screen.findByText('Saved Slack connection settings: disabled')).toBeTruthy();});-it('opens discovery for Add connections', async () => {+it('opens the unified catalog for Add connections', async () => {setup();fireEvent.keyDown(screen.getByRole('menuitem', { name: /Add connections/ }), {key: 'Enter',});- expect(await screen.findByText('discover connections')).toBeTruthy();+ expect(await screen.findByText('Available integrations')).toBeTruthy();});it('offers retry without hiding the main actions when a source fails', () => {state.failed = true;diff --git a/apps/web/src/features/agents-view/views/ComposerAddMenu.tsx b/apps/web/src/features/agents-view/views/ComposerAddMenu.tsxindex c9a2702515..a76a1ff4a9 100644--- a/apps/web/src/features/agents-view/views/ComposerAddMenu.tsx+++ b/apps/web/src/features/agents-view/views/ComposerAddMenu.tsx@@ -4,6 +4,7 @@ import {type ComposerAddMenuGroup,} from '@channel/Input/ComposerAddMenu';import { useSettingsState } from '@core/constant/SettingsState';+import { useSettingsTabAvailable } from '@core/constant/settingsTabsConfig';import { isMobile } from '@core/mobile/isMobile';import { PipedreamConnectorIcon } from '@core/pipedream/ConnectorIcon';import BooksIcon from '@phosphor/books.svg';@@ -17,9 +18,9 @@ import type { ProviderId } from '../../settings/connections/model';import { providerIcon } from '../../settings/connections/provider-meta';import { useConnectionsModel } from '../../settings/connections/use-connections-model';-const ConnectionsPage = lazy(async () => ({- default: (await import('../../settings/connections/ConnectionsPage'))- .ConnectionsPage,+const IntegrationsView = lazy(async () => ({+ default: (await import('../../settings/connections/integrations-view'))+ .IntegrationsView,}));const LeftoverRow = lazy(async () => ({default: (await import('../../settings/connections/leftover-row'))@@ -42,6 +43,7 @@ export function AgentComposerAddMenu(props: {}) {const connections = useConnectionsModel();const settings = useSettingsState();+ const isTabAvailable = useSettingsTabAvailable();const [drawerOpen, setDrawerOpen] = createSignal(false);const [target, setTarget] = createSignal<Target>();const openTarget = (next: Target) => {@@ -203,15 +205,20 @@ export function AgentComposerAddMenu(props: {<Showwhen={selected.kind === 'other' ? selected : undefined}fallback={- <ConnectionsPage- initialMode={- selected.kind === 'overview' ? selected.mode : undefined- }+ <IntegrationsViewinitialProvider={selected.kind === 'provider'? selected.provider: undefined}+ onOpenLocalAgents={+ isTabAvailable('Harness')+ ? () => {+ setTarget(undefined);+ settings.openSettings('Harness');+ }+ : undefined+ }onOpenMacroMcp={() => {setTarget(undefined);settings.openSettings('Agent');diff --git a/apps/web/src/features/settings/Appearance.tsx b/apps/web/src/features/settings/Appearance.tsxindex 4d4991d686..9c6fdc81bd 100644--- a/apps/web/src/features/settings/Appearance.tsx+++ b/apps/web/src/features/settings/Appearance.tsx@@ -489,7 +489,7 @@ export function Appearance() {description="Choose how Macro looks on your screen."><div- class="mx-auto w-full max-w-lg py-4"+ class="mx-auto w-full max-w-lg py-2"data-settings-target="active-theme"><AppearanceModePicker@@ -501,7 +501,7 @@ export function Appearance() {applyTheme(resolveActiveThemeId());}}/>- <p class="mt-4 text-center text-xs text-ink-muted">+ <p class="mt-3 text-center text-sm text-ink-muted">{themeMode() === 'system'? 'Switches between your light and dark themes with your device.': `Always use your ${themeMode()} theme.`}diff --git a/apps/web/src/features/settings/ConnectedAccounts.tsx b/apps/web/src/features/settings/ConnectedAccounts.tsxdeleted file mode 100644index 09bdbceeea..0000000000--- a/apps/web/src/features/settings/ConnectedAccounts.tsx+++ /dev/null@@ -1,80 +0,0 @@-import { ENABLE_EMAIL } from '@core/constant/featureFlags';-import { useSettingsState } from '@core/constant/SettingsState';-import { useSettingsTabAvailable } from '@core/constant/settingsTabsConfig';-import { Button } from '@ui';-import { Show, Suspense } from 'solid-js';-import { EmailCard } from './Email';-import { GitHubCard } from './GitHub';-import { GranolaCard } from './Granola';-import {- SettingsCard,- SettingsPage,- SettingsRow,- SettingsSection,-} from './primitives';--/** Personal account links. Agent MCP integrations live in Connections. */-export function ConnectedAccounts() {- const { openSettings } = useSettingsState();- const isAvailable = useSettingsTabAvailable();- return (- <SettingsPage- title="Integrations"- description="Connect your accounts so Macro can work across the tools you already use."- >- <SettingsSection title="Accounts">- <div class="flex flex-col gap-3">- <Show when={ENABLE_EMAIL}>- <Suspense>- <EmailCard />- </Suspense>- </Show>- <Suspense>- <GitHubCard />- </Suspense>- <Suspense>- <GranolaCard />- </Suspense>- </div>- </SettingsSection>- <SettingsSection- title="Related settings"- description="Manage the same accounts where you use them."- >- <SettingsCard>- <Show when={ENABLE_EMAIL}>- <SettingsRow label="Email accounts and signatures">- <Button- variant="ghost"- size="sm"- onClick={() => openSettings('Email')}- >- Email settings- </Button>- </SettingsRow>- </Show>- <Show when={isAvailable('Calendar')}>- <SettingsRow label="Calendar connections and colors">- <Button- variant="ghost"- size="sm"- onClick={() => openSettings('Calendar')}- >- Calendar settings- </Button>- </SettingsRow>- </Show>- <SettingsRow label="Apps and tools for agents">- <Button- variant="ghost"- size="sm"- onClick={() => openSettings('Connections')}- >- Agent connections- </Button>- </SettingsRow>- </SettingsCard>- </SettingsSection>- </SettingsPage>- );-}diff --git a/apps/web/src/features/settings/Email.tsx b/apps/web/src/features/settings/Email.tsxindex 27f5799d7f..29443ec045 100644--- a/apps/web/src/features/settings/Email.tsx+++ b/apps/web/src/features/settings/Email.tsx@@ -22,6 +22,7 @@ import {reconnectScopes,} from '@core/email-link/consent';import { fireAndForget } from '@core/util/fireAndForget';+import GearIcon from '@phosphor/gear.svg';import ArrowsClockwiseIcon from '@phosphor-icons/core/regular/arrows-clockwise.svg?component-solid';import CalendarSlashIcon from '@phosphor-icons/core/regular/calendar-slash.svg?component-solid';import EnvelopeIcon from '@phosphor-icons/core/regular/envelope.svg?component-solid';@@ -39,7 +40,7 @@ import {type Link as EmailLink,SyncStatus,} from '@service-email/generated/schemas';-import { Dialog, Panel, Tooltip } from '@ui';+import { Dialog, Panel, Tooltip, Button as UiButton } from '@ui';import { createMemo, createSignal, For, Match, Show, Switch } from 'solid-js';import { match } from 'ts-pattern';import { InboxSettingsOperations } from './InboxSettingsOperations';@@ -58,7 +59,9 @@ import { clearSignatureState } from './SignatureSection';* disconnect controls. All the inbox + backfill logic is unchanged; only the* surrounding chrome moved from a standalone panel to a shared card.*/-export function EmailCard() {+export function EmailCard(+ props: { class?: string; onOpenSettings?: () => void } = {}+) {const email = useEmail();const userId = useUserId();const multiInboxFlag = useFeatureFlag(enableMultiInbox);@@ -157,11 +160,10 @@ export function EmailCard() {return (<>- <SettingsCard>+ <SettingsCard class={props.class}><IntegrationRowicon={<EnvelopeIcon />}title="Email"- description="Read, organize, and act on your email."status={<Show when={emailActive()}><StatusDot state="connected" label="Connected" />@@ -175,6 +177,17 @@ export function EmailCard() {disabled={isEmailActionPending()}/></Show>+ <Show when={props.onOpenSettings}>+ <UiButton+ variant="ghost"+ size="icon-md"+ label="Email settings"+ onClick={props.onOpenSettings}+ class="touch:min-h-11 touch:min-w-11"+ >+ <GearIcon class="size-4" />+ </UiButton>+ </Show></IntegrationRow><Show when={emailActive()}>diff --git a/apps/web/src/features/settings/GitHub.tsx b/apps/web/src/features/settings/GitHub.tsxindex ca7bf4ec37..4807651f3a 100644--- a/apps/web/src/features/settings/GitHub.tsx+++ b/apps/web/src/features/settings/GitHub.tsx@@ -18,7 +18,7 @@ import {import { IntegrationRow, SettingsCard, SettingsRow } from './primitives';/** GitHub integration as a Connected-accounts card. */-export function GitHubCard() {+export function GitHubCard(props: { class?: string } = {}) {const githubLink = useGithubLinkStatusQuery();const initGithubLink = useInitGithubLinkMutation();const deleteGithubLink = useDeleteGithubLinkMutation();@@ -68,12 +68,8 @@ export function GitHubCard() {};return (- <SettingsCard>- <IntegrationRow- icon={<GithubIcon />}- title="GitHub"- description="Connect Macro to your GitHub account and repositories."- />+ <SettingsCard class={props.class}>+ <IntegrationRow icon={<GithubIcon />} title="GitHub" /><SettingsRowlabel={@@ -86,11 +82,10 @@ export function GitHubCard() {</Show></span>}- description="Identify your GitHub activity in Macro."><Showwhen={!githubLink.isLoading}- fallback={<span class="text-xs text-ink-muted">Loading…</span>}+ fallback={<span class="text-sm text-ink-muted">Loading…</span>}><Switchfallback={@@ -104,7 +99,7 @@ export function GitHubCard() {<Match when={status() === 'linked'}><Show when={username()}>{(name) => (- <span class="ph-no-capture text-xs text-ink-muted">+ <span class="ph-no-capture text-sm text-ink-muted">@{name()}</span>)}@@ -127,16 +122,13 @@ export function GitHubCard() {</Show></SettingsRow>- <SettingsRow- label="GitHub App"- description="Choose repositories for Macro to sync."- >+ <SettingsRow label="Repositories">{/* The install callback rejects users without a linked account, sodon't offer the flow until the account above is connected. */}<Showwhen={status() === 'linked'}fallback={- <span class="text-xs text-ink-muted">+ <span class="text-sm text-ink-muted">{githubLink.isLoading? 'Loading…': 'Connect your GitHub account first'}diff --git a/apps/web/src/features/settings/Harness.test.tsx b/apps/web/src/features/settings/Harness.test.tsxindex 911493c7cc..b689cf5878 100644--- a/apps/web/src/features/settings/Harness.test.tsx+++ b/apps/web/src/features/settings/Harness.test.tsx@@ -510,4 +510,10 @@ describe('Harness', () => {{ replace: true });});+ it('uses the supplied return destination for the back button', () => {+ const onBack = vi.fn();+ render(() => <Harness onBack={onBack} backLabel="Integrations" />);+ fireEvent.click(screen.getByRole('button', { name: 'Integrations' }));+ expect(onBack).toHaveBeenCalledOnce();+ });});diff --git a/apps/web/src/features/settings/Harness.tsx b/apps/web/src/features/settings/Harness.tsxindex f1ad95796d..1c45a0349f 100644--- a/apps/web/src/features/settings/Harness.tsx+++ b/apps/web/src/features/settings/Harness.tsx@@ -44,7 +44,9 @@ function lastConnectedText(harness: RegisteredHarness): string {}/** Settings UI for choosing and configuring the available agent harnesses. */-export function Harness(props: { onBack?: () => void } = {}) {+export function Harness(+ props: { onBack?: () => void; backLabel?: string } = {}+) {const canUseClaude = useClaudeAgentsAccess();const canUseCodex = useCodexAgentsAccess();const [cursorApiKey, setCursorApiKey] = createSignal('');@@ -132,7 +134,7 @@ export function Harness(props: { onBack?: () => void } = {}) {title="Runtimes"description="Providers and machines your agents can run on."onBack={props.onBack}- backLabel="Agents"+ backLabel={props.backLabel ?? 'Agents'}actions={<Buttonvariant="cta"diff --git a/apps/web/src/features/settings/IntegrationsPage.test.tsx b/apps/web/src/features/settings/IntegrationsPage.test.tsxnew file mode 100644index 0000000000..2c8f6622ef--- /dev/null+++ b/apps/web/src/features/settings/IntegrationsPage.test.tsx@@ -0,0 +1,73 @@+/** @vitest-environment jsdom */+import { cleanup, fireEvent, render, screen } from '@solidjs/testing-library';+import { createSignal, Show } from 'solid-js';+import { afterEach, expect, it, vi } from 'vitest';+import { IntegrationsPage } from './IntegrationsPage';++const openSettings = vi.fn();+const [runtimesAvailable, setRuntimesAvailable] = createSignal(true);+vi.mock('@core/constant/settingsTabsConfig', () => ({+ useSettingsTabAvailable: () => () => runtimesAvailable(),+}));+vi.mock('@core/constant/SettingsState', () => ({+ useSettingsState: () => ({ openSettings }),+}));+vi.mock('@core/constant/featureFlags', () => ({ ENABLE_EMAIL: true }));+vi.mock('@core/pipedream/flag', () => ({+ usePipedreamMcpFlag: () => () => true,+}));+vi.mock('./Email', () => ({ EmailCard: () => <div>Email</div> }));+vi.mock('./Granola', () => ({ GranolaCard: () => <div>Granola</div> }));+vi.mock('./GitHub', () => ({ GitHubCard: () => <div>GitHub</div> }));+vi.mock('./Integrations', () => ({ IntegrationsSection: () => null }));+vi.mock('./connections/integrations-view', () => ({+ IntegrationsView: (props: { onOpenLocalAgents?: () => void }) => (+ <div>+ <h1>Integrations</h1>+ <Show when={props.onOpenLocalAgents}>+ <button type="button" onClick={props.onOpenLocalAgents}>+ Set up local agents+ </button>+ </Show>+ </div>+ ),+}));+vi.mock('./Harness', () => ({+ Harness: (props: { onBack?: () => void; backLabel?: string }) => (+ <div>+ <h1>Runtimes</h1>+ <button type="button" onClick={props.onBack}>+ {props.backLabel}+ </button>+ </div>+ ),+}));+afterEach(() => {+ cleanup();+ vi.clearAllMocks();+ setRuntimesAvailable(true);+});++it('returns local-agent setup to Integrations without opening the Agents settings route', () => {+ render(() => <IntegrationsPage />);+ fireEvent.click(screen.getByRole('button', { name: 'Set up local agents' }));+ expect(screen.getByRole('heading', { name: 'Runtimes' })).toBeTruthy();+ fireEvent.click(screen.getByRole('button', { name: 'Integrations' }));+ expect(screen.getByRole('heading', { name: 'Integrations' })).toBeTruthy();+ expect(openSettings).not.toHaveBeenCalled();+});++it('hides local-agent setup when the runtime tab is unavailable', () => {+ setRuntimesAvailable(false);+ render(() => <IntegrationsPage />);+ expect(+ screen.queryByRole('button', { name: 'Set up local agents' })+ ).toBeNull();+});+it('leaves inline runtime setup when the runtime tab becomes unavailable', () => {+ render(() => <IntegrationsPage />);+ fireEvent.click(screen.getByRole('button', { name: 'Set up local agents' }));+ setRuntimesAvailable(false);+ expect(screen.queryByRole('heading', { name: 'Runtimes' })).toBeNull();+ expect(screen.getByRole('heading', { name: 'Integrations' })).toBeTruthy();+});diff --git a/apps/web/src/features/settings/IntegrationsPage.tsx b/apps/web/src/features/settings/IntegrationsPage.tsxnew file mode 100644index 0000000000..f93e8423d4--- /dev/null+++ b/apps/web/src/features/settings/IntegrationsPage.tsx@@ -0,0 +1,83 @@+import { ENABLE_EMAIL } from '@core/constant/featureFlags';+import { useSettingsState } from '@core/constant/SettingsState';+import { useSettingsTabAvailable } from '@core/constant/settingsTabsConfig';+import { usePipedreamMcpFlag } from '@core/pipedream/flag';+import { createSignal, Show, Suspense } from 'solid-js';+import { IntegrationsView } from './connections/integrations-view';+import { EmailCard } from './Email';+import { GitHubCard } from './GitHub';+import { GranolaCard } from './Granola';+import { Harness } from './Harness';+import { IntegrationsSection } from './Integrations';+import { SettingsPage } from './primitives';++/** Personal accounts and agent tools share one Integrations settings page. */+export function IntegrationsPage() {+ const pipedreamMcp = usePipedreamMcpFlag();+ const isTabAvailable = useSettingsTabAvailable();+ const { openSettings } = useSettingsState();+ const [showLocalAgents, setShowLocalAgents] = createSignal(false);+ return (+ <Show+ when={pipedreamMcp()}+ fallback={+ <SettingsPage title="Integrations">+ <AccountConnections />+ <Suspense>+ <IntegrationsSection />+ </Suspense>+ </SettingsPage>+ }+ >+ <Show+ when={showLocalAgents() && isTabAvailable('Harness')}+ fallback={+ <IntegrationsView+ onOpenMacroMcp={() => openSettings('Agent')}+ onOpenLocalAgents={+ isTabAvailable('Harness')+ ? () => setShowLocalAgents(true)+ : undefined+ }+ >+ <AccountConnections />+ </IntegrationsView>+ }+ >+ <Harness+ onBack={() => setShowLocalAgents(false)}+ backLabel="Integrations"+ />+ </Show>+ </Show>+ );+}++function AccountConnections() {+ const { openSettings } = useSettingsState();+ return (+ <section+ data-settings-target="accounts"+ tabIndex={-1}+ class="pb-5 outline-none"+ >+ <h2 class="mb-4 text-lg font-medium text-ink">Core Integrations</h2>+ <div class="grid grid-cols-1 items-stretch gap-3 @[760px]/settings-page:auto-rows-fr @[760px]/settings-page:grid-cols-2">+ <Show when={ENABLE_EMAIL}>+ <Suspense>+ <EmailCard+ class="h-full bg-ink/4 shadow-none light-mode:shadow-none touch:bg-ink/4"+ onOpenSettings={() => openSettings('Email')}+ />+ </Suspense>+ </Show>+ <Suspense>+ <GitHubCard class="h-full bg-ink/4 shadow-none light-mode:shadow-none touch:bg-ink/4" />+ </Suspense>+ <Suspense>+ <GranolaCard />+ </Suspense>+ </div>+ </section>+ );+}diff --git a/apps/web/src/features/settings/McpConnections.tsx b/apps/web/src/features/settings/McpConnections.tsxdeleted file mode 100644index bb40d0aafc..0000000000--- a/apps/web/src/features/settings/McpConnections.tsx+++ /dev/null@@ -1,29 +0,0 @@-import { useSettingsState } from '@core/constant/SettingsState';-import { usePipedreamMcpFlag } from '@core/pipedream/flag';-import { Show, Suspense } from 'solid-js';-import { ConnectionsPage } from './connections/ConnectionsPage';-import { IntegrationsSection } from './Integrations';-import { SettingsPage } from './primitives';--/** Agent tool connections. Personal Gmail/GitHub accounts remain in Settings → Integrations. */-export function McpConnections() {- const pipedreamMcp = usePipedreamMcpFlag();- const { openSettings } = useSettingsState();- return (- <Show- when={pipedreamMcp()}- fallback={- <SettingsPage- title="Agent connections"- description="Connect the tools your team already uses so Macro's agent can work in them."- >- <Suspense>- <IntegrationsSection />- </Suspense>- </SettingsPage>- }- >- <ConnectionsPage onOpenMacroMcp={() => openSettings('Agent')} />- </Show>- );-}diff --git a/apps/web/src/features/settings/SettingsTabContent.tsx b/apps/web/src/features/settings/SettingsTabContent.tsxindex 2525211485..d5f4bd3f13 100644--- a/apps/web/src/features/settings/SettingsTabContent.tsx+++ b/apps/web/src/features/settings/SettingsTabContent.tsx@@ -12,10 +12,9 @@ import { ApiKeys } from './ApiKeys';import { Appearance } from './Appearance';import { Billing } from './Billing';import { Bots } from './Bots';-import { ConnectedAccounts } from './ConnectedAccounts';import { DesktopApp } from './DesktopApp';import { EmailSettings } from './email-settings';-import { McpConnections } from './McpConnections';+import { IntegrationsPage } from './IntegrationsPage';import { MobileApp } from './MobileApp';import { Notifications } from './Notifications';import { Shortcuts } from './Shortcuts';@@ -81,10 +80,7 @@ export function SettingsTabContent(props: { tab: SettingsTab }) {<Crm /></Show><Show when={isCurrentTab('Connected')}>- <ConnectedAccounts />- </Show>- <Show when={isCurrentTab('Connections')}>- <McpConnections />+ <IntegrationsPage /></Show><Show when={isCurrentTab('Desktop App')}><DesktopApp />diff --git a/apps/web/src/features/settings/connections/ConnectedView.tsx b/apps/web/src/features/settings/connections/ConnectedView.tsxindex e247051a17..e2c364caf0 100644--- a/apps/web/src/features/settings/connections/ConnectedView.tsx+++ b/apps/web/src/features/settings/connections/ConnectedView.tsx@@ -1,12 +1,11 @@import { DEBUG_SETTING_KEYS, useDebugSetting } from '@app/lib/debugSettings';import CaretRightIcon from '@phosphor/caret-right.svg';-import { Button } from '@ui';import { For, Show } from 'solid-js';-import { IntegrationRow, SettingsCard, SettingsSection } from '../primitives';+import { IntegrationRow } from '../primitives';import { LeftoverRow } from './leftover-row';import type { ConnectionsModel } from './model';import { isConnectionsEmpty } from './model';-import { EMPTY_STARTERS, providerIcon } from './provider-meta';+import { providerIcon } from './provider-meta';import { useConnectionsView } from './view-state';export function ConnectedView(props: { model: ConnectionsModel }) {@@ -16,106 +15,50 @@ export function ConnectedView(props: { model: ConnectionsModel }) {props.model.leftovers.filter((row) => row.kind === 'pipedream');const customMcps = () =>props.model.leftovers.filter((row) => row.kind === 'native-mcp');- const showConnectors = () =>- props.model.providers.length > 0 || pipedreamLeftovers().length > 0;return (<Showwhen={!forceEmpty() && !isConnectionsEmpty(props.model)}- fallback={<EmptyConnected />}+ fallback={+ <p class="rounded-2xl border border-edge-muted bg-ink/4 px-4 py-5 text-sm text-ink-muted">+ No tools connected yet. Choose one of the available apps to get+ started.+ </p>+ }>- <Show when={showConnectors()}>- <SettingsSection>- <SettingsCard>- <For each={props.model.providers}>- {(provider) => (- <button- type="button"- class="w-full text-left outline-none hover:bg-ink/4 focus-visible:bg-ink/6"- onClick={() => view.openProvider(provider.id)}- >- <IntegrationRow- icon={providerIcon(provider.id)}- title={provider.name}- description={- <span class="ph-no-capture">{provider.summary}</span>- }- facts={provider.accounts}- >- <CaretRightIcon class="size-4 text-ink-extra-muted" />- </IntegrationRow>- </button>- )}- </For>- <For each={pipedreamLeftovers()}>- {(leftover) => <LeftoverRow leftover={leftover} />}- </For>- </SettingsCard>- </SettingsSection>- </Show>-- <Show when={customMcps().length > 0}>- <SettingsSection- title="Custom MCP"- description="Servers you added by URL."- >- <SettingsCard>- <For each={customMcps()}>- {(leftover) => <LeftoverRow leftover={leftover} />}- </For>- </SettingsCard>- </SettingsSection>- </Show>-- <Button- type="button"- variant="outline"- depth={3}- class="w-full justify-between"- onClick={view.showDiscover}- >- Add a connection- <CaretRightIcon class="size-4 text-ink-extra-muted" />- </Button>- </Show>- );-}--function EmptyConnected() {- const view = useConnectionsView();- return (- <>- <SettingsSection title="Start with a connection">- <SettingsCard>- <For each={EMPTY_STARTERS}>- {(item) => (- <button- type="button"- class="w-full text-left outline-none hover:bg-ink/4 focus-visible:bg-ink/6"- onClick={() => view.openProvider(item.id)}+ <div class="grid grid-cols-1 gap-3 @[440px]/settings-page:grid-cols-2">+ <For each={props.model.providers}>+ {(provider) => (+ <button+ type="button"+ class="w-full overflow-hidden rounded-2xl border border-edge-muted bg-ink/4 text-left outline-none hover:bg-ink/6 focus-visible:bg-ink/6"+ onClick={() => view.openProvider(provider.id)}+ >+ <IntegrationRow+ icon={providerIcon(provider.id)}+ title={provider.name}+ class="gap-3 px-4 py-3"+ description={+ <span class="text-sm">+ {provider.ready} of {provider.total} active+ </span>+ }+ facts={provider.accounts || undefined}>- <IntegrationRow- icon={providerIcon(item.id)}- title={item.name}- description={item.note}- >+ <span class="flex size-8 shrink-0 items-center justify-center"><CaretRightIcon class="size-4 text-ink-extra-muted" />- </IntegrationRow>- </button>- )}- </For>- </SettingsCard>- </SettingsSection>-- <Button- type="button"- variant="outline"- depth={3}- class="w-full justify-between"- onClick={view.showDiscover}- >- Browse all Connections- <CaretRightIcon class="size-4 text-ink-extra-muted" />- </Button>- </>+ </span>+ </IntegrationRow>+ </button>+ )}+ </For>+ <For each={[...pipedreamLeftovers(), ...customMcps()]}>+ {(leftover) => (+ <div class="overflow-hidden rounded-2xl border border-edge-muted bg-ink/4">+ <LeftoverRow leftover={leftover} />+ </div>+ )}+ </For>+ </div>+ </Show>);}diff --git a/apps/web/src/features/settings/connections/DiscoverView.test.tsx b/apps/web/src/features/settings/connections/DiscoverView.test.tsxnew file mode 100644index 0000000000..e1fb97cbd4--- /dev/null+++ b/apps/web/src/features/settings/connections/DiscoverView.test.tsx@@ -0,0 +1,168 @@+/** @vitest-environment jsdom */+import {+ fireEvent,+ render,+ screen,+ waitFor,+ within,+} from '@solidjs/testing-library';+import { createSignal } from 'solid-js';+import { createStore } from 'solid-js/store';+import { afterEach, beforeEach, expect, it, vi } from 'vitest';+import { DiscoverView } from './DiscoverView';+import { ConnectionsViewProvider } from './view-state';++const sheets = {+ app_slug: 'Sheets',+ display_name: 'Sheets',+ description: 'Read spreadsheets',+ categories: ['Productivity'],+};+const airtable = {+ app_slug: 'Airtable',+ display_name: 'Airtable',+ description: 'Read databases',+ categories: ['Databases'],+};+const calendar = {+ app_slug: 'Calendar',+ display_name: 'Calendar',+ description: 'Read events',+ categories: ['Productivity'],+};+const [state, setState] = createStore({+ entries: [sheets, airtable],+ isFetching: false,+ hasNextPage: true,+ isError: false,+ isFetchNextPageError: false,+});+const fetchNextPage = vi.fn();+const observations: Array<{ intersect: () => void; node: Element }> = [];++vi.mock('@core/pipedream/catalog', () => ({+ createPipedreamCatalogSearch: () => {+ const [search, setSearch] = createSignal('');+ return {+ search,+ searchInput: search,+ onSearchInput: setSearch,+ entries: () => state.entries,+ query: {+ get isFetching() {+ return state.isFetching;+ },+ get hasNextPage() {+ return state.hasNextPage;+ },+ get isError() {+ return state.isError;+ },+ get isFetchNextPageError() {+ return state.isFetchNextPageError;+ },+ fetchNextPage,+ refetch: vi.fn(),+ },+ };+ },+ createPipedreamCatalogConnect: () => ({+ connect: vi.fn(),+ busy: () => false,+ }),+}));+vi.mock('@core/component/Toast/Toast', () => ({ toast: { success: vi.fn() } }));+vi.mock('@core/pipedream/ConnectorIcon', () => ({+ PipedreamConnectorIcon: () => null,+}));+vi.mock('./add-custom-mcp-dialog', () => ({ AddCustomMcpDialog: () => null }));++beforeEach(() => {+ observations.length = 0;+ fetchNextPage.mockReset();+ setState({+ entries: [sheets, airtable],+ isFetching: false,+ hasNextPage: true,+ isError: false,+ isFetchNextPageError: false,+ });+ vi.stubGlobal(+ 'IntersectionObserver',+ class {+ constructor(+ private callback: (entries: { isIntersecting: boolean }[]) => void+ ) {}+ observe(node: Element) {+ observations.push({+ node,+ intersect: () => this.callback([{ isIntersecting: true }]),+ });+ }+ disconnect() {}+ }+ );+});+afterEach(() => vi.unstubAllGlobals());++function showCatalog() {+ return render(() => (+ <ConnectionsViewProvider>+ <DiscoverView+ model={{ capabilities: [], leftovers: [], providers: [] }}+ />+ </ConnectionsViewProvider>+ ));+}++it('loads successive pages on intersection and pauses while fetching or exhausted', async () => {+ showCatalog();+ await waitFor(() => expect(observations.length).toBeGreaterThan(0));+ observations.at(-1)?.intersect();+ expect(fetchNextPage).toHaveBeenCalledTimes(1);+ setState('isFetching', true);+ observations.at(-1)?.intersect();+ expect(fetchNextPage).toHaveBeenCalledTimes(1);+ setState('entries', [...state.entries, calendar]);+ setState('isFetching', false);+ await waitFor(() =>+ expect(+ screen.getByRole('button', { name: 'Connect Calendar' })+ ).toBeTruthy()+ );+ observations.at(-1)?.intersect();+ expect(fetchNextPage).toHaveBeenCalledTimes(2);+ expect(+ within(screen.getByRole('region', { name: 'Productivity' })).getAllByRole(+ 'button'+ )+ ).toHaveLength(2);+ setState('hasNextPage', false);+ observations.at(-1)?.intersect();+ expect(fetchNextPage).toHaveBeenCalledTimes(2);+ expect(screen.queryByRole('button', { name: 'Load more' })).toBeNull();+});++it('keeps loaded apps on a page failure and retries only on request', async () => {+ showCatalog();+ setState({ isError: true, isFetchNextPageError: true });+ expect(screen.getByRole('button', { name: 'Connect Sheets' })).toBeTruthy();+ observations.at(-1)?.intersect();+ expect(fetchNextPage).not.toHaveBeenCalled();+ fireEvent.click(screen.getByRole('button', { name: 'Retry' }));+ expect(fetchNextPage).toHaveBeenCalledTimes(1);+});++it('searches only the apps catalog and keeps featured integrations visible', () => {+ showCatalog();+ fireEvent.input(screen.getByRole('searchbox', { name: 'Search apps' }), {+ target: { value: 'Airtable' },+ });+ expect(screen.queryByRole('button', { name: 'Connect Sheets' })).toBeNull();+ expect(screen.getByRole('button', { name: 'Connect Airtable' })).toBeTruthy();+ expect(+ within(+ screen.getByRole('region', { name: 'Featured integrations' })+ ).getByText('GitHub')+ ).toBeTruthy();+});diff --git a/apps/web/src/features/settings/connections/DiscoverView.tsx b/apps/web/src/features/settings/connections/DiscoverView.tsxindex 08a23b1be7..a91d1c03c3 100644--- a/apps/web/src/features/settings/connections/DiscoverView.tsx+++ b/apps/web/src/features/settings/connections/DiscoverView.tsx@@ -1,3 +1,4 @@+import { useInfiniteScrollSentinel } from '@app/lib/primitives/infinite-scroll-sentinel';import { toast } from '@core/component/Toast/Toast';import { PipedreamConnectorIcon } from '@core/pipedream/ConnectorIcon';import {@@ -5,17 +6,18 @@ import {createPipedreamCatalogSearch,} from '@core/pipedream/catalog';import { fireAndForget } from '@core/util/fireAndForget';-import CaretRightIcon from '@phosphor/caret-right.svg';import CheckIcon from '@phosphor/check.svg';+import MagnifyingGlassIcon from '@phosphor/magnifying-glass.svg';import PlusIcon from '@phosphor/plus.svg';import SpinnerIcon from '@phosphor/spinner-gap.svg';import XIcon from '@phosphor/x.svg';import type { PipedreamCatalogEntryResponse } from '@service-cognition/client';-import { Button } from '@ui';+import { Button, Tooltip } from '@ui';import { createMemo, createSignal, For, Show } from 'solid-js';-import { ConnectAction } from '../integration-ui';-import { IntegrationRow, SettingsCard, SettingsSection } from '../primitives';+import { SettingsSelect } from '../components/settings-select';+import { IntegrationRow } from '../primitives';import { AddCustomMcpDialog } from './add-custom-mcp-dialog';+import { groupCatalogByCategory } from './catalog-categories';import type { ConnectionsModel } from './model';import {EMPTY_STARTERS,@@ -41,14 +43,6 @@ export function DiscoverView(props: { model: ConnectionsModel }) {);const [addingCustom, setAddingCustom] = createSignal(false);- const featured = createMemo(() => {- const query = catalog.searchInput().trim().toLowerCase();- return EMPTY_STARTERS.filter((item) => {- const haystack = `${item.name} ${item.note}`.toLowerCase();- return !query || haystack.includes(query);- });- });-const rest = createMemo(() => {const query = catalog.search().trim().toLowerCase();return catalog.entries().filter((entry) => {@@ -59,35 +53,44 @@ export function DiscoverView(props: { model: ConnectionsModel }) {});});- return (- <div class="flex flex-col gap-10">- <label class="relative block">- <span class="sr-only">Search Connections</span>- <input- type="search"- value={catalog.searchInput()}- onInput={(event) => catalog.onSearchInput(event.currentTarget.value)}- placeholder="Search Connections"- class="settings-input h-11 w-full pr-10 [&::-webkit-search-cancel-button]:hidden"- />- <Show when={catalog.searchInput()}>- <button- type="button"- aria-label="Clear search"- class="absolute top-1/2 right-2 flex size-7 -translate-y-1/2 items-center justify-center rounded-md text-ink-muted outline-none hover:bg-ink/4 hover:text-ink focus-visible:bg-ink/6"- onPointerDown={(event) => event.preventDefault()}- onClick={() => catalog.onSearchInput('')}- >- <XIcon class="size-4" />- </button>- </Show>- </label>+ const categories = createMemo(() => groupCatalogByCategory(rest()));+ const [selectedCategory, setSelectedCategory] = createSignal('all');+ const activeCategory = () =>+ categories().some((category) => category.name === selectedCategory())+ ? selectedCategory()+ : 'all';+ const visibleCategories = createMemo(() =>+ categories().filter(+ (category) =>+ activeCategory() === 'all' || category.name === activeCategory()+ )+ );+ const categoryOptions = createMemo(() => [+ { id: 'all', name: 'All categories' },+ ...categories().map((category) => ({+ id: category.name,+ name: category.name,+ })),+ ]);++ const [sentinel, setSentinel] = createSignal<HTMLDivElement>();+ const loadMore = () =>+ fireAndForget(catalog.query.fetchNextPage(), 'connections-settings');+ useInfiniteScrollSentinel({+ sentinel,+ hasNextPage: () => catalog.query.hasNextPage && !catalog.query.isError,+ isFetchingNextPage: () => catalog.query.isFetching,+ fetchNextPage: loadMore,+ });- <SettingsSection title="Featured" class="@container">- <div class="grid grid-cols-1 gap-3 @[460px]:grid-cols-2">- <For each={featured()}>+ return (+ <div class="@container/catalog flex flex-col gap-7">+ <section aria-label="Featured integrations">+ <h3 class="mb-2 text-sm font-medium text-ink-muted">Featured</h3>+ <div class="grid grid-cols-1 gap-3 @[440px]/catalog:grid-cols-2">+ <For each={EMPTY_STARTERS}>{(item) => (- <SettingsCard class="@container">+ <div class="@container overflow-hidden rounded-2xl border border-edge-muted bg-ink/4"><buttontype="button"class="flex h-full w-full flex-col items-stretch text-left outline-none hover:bg-ink/4 focus-visible:bg-ink/6"@@ -96,27 +99,78 @@ export function DiscoverView(props: { model: ConnectionsModel }) {<IntegrationRowicon={providerIcon(item.id)}title={item.name}- description={item.note}+ class="gap-3 px-4 py-3"><Show when={alreadyHave().has(item.id)}><AddedMark /></Show>- <CaretRightIcon class="size-4 text-ink-extra-muted" />+ <Show when={!alreadyHave().has(item.id)}>+ <AddMark />+ </Show></IntegrationRow></button>- </SettingsCard>+ </div>)}</For></div>- <Show when={featured().length === 0}>- <p class="text-sm text-ink-muted">No featured Connections match.</p>- </Show>- </SettingsSection>+ </section>- <SettingsSection title="Browse">- <SettingsCard>- <Show when={catalog.query.isError}>- <div class="px-6 py-6 text-center text-sm text-ink-muted">+ <section aria-label="All integrations">+ <div class="mb-3 flex items-center justify-between gap-3">+ <h3 class="text-base font-medium text-ink">All apps</h3>+ <Button+ variant="ghost"+ size="md"+ class="h-10 bg-ink/4 px-4"+ onClick={() => setAddingCustom(true)}+ >+ <PlusIcon class="size-4" /> Add Custom+ </Button>+ </div>+ <div class="mb-5 grid grid-cols-1 gap-2 @[440px]/catalog:grid-cols-[minmax(0,1fr)_auto]">+ <label class="relative block min-w-0">+ <span class="sr-only">Search apps</span>+ <MagnifyingGlassIcon+ class="pointer-events-none absolute top-1/2 left-3 size-4 -translate-y-1/2 text-ink-muted"+ aria-hidden="true"+ />+ <input+ type="search"+ value={catalog.searchInput()}+ onInput={(event) => {+ setSelectedCategory('all');+ catalog.onSearchInput(event.currentTarget.value);+ }}+ placeholder="Search apps"+ class="h-10 w-full rounded-full border border-edge-muted bg-ink/4 pr-10 pl-9 text-sm text-ink outline-none placeholder:text-ink-muted focus-visible:border-edge-focus focus-visible:ring-1 focus-visible:ring-edge-focus [&::-webkit-search-cancel-button]:hidden"+ />+ <Show when={catalog.searchInput()}>+ <button+ type="button"+ aria-label="Clear search"+ class="absolute top-1/2 right-2 flex size-7 -translate-y-1/2 items-center justify-center rounded-md text-ink-muted outline-none hover:bg-ink/4 hover:text-ink focus-visible:bg-ink/6"+ onPointerDown={(event) => event.preventDefault()}+ onClick={() => {+ setSelectedCategory('all');+ catalog.onSearchInput('');+ }}+ >+ <XIcon class="size-4" />+ </button>+ </Show>+ </label>+ <SettingsSelect+ label="Filter apps by category"+ options={categoryOptions()}+ value={activeCategory()}+ onChange={setSelectedCategory}+ class="w-full @[440px]/catalog:w-52"+ triggerClass="h-10 w-full border-0 bg-ink/4 px-3 text-sm text-ink hover:bg-ink/6"+ />+ </div>+ <div class="grid grid-cols-1 gap-6">+ <Show when={catalog.query.isError && catalog.entries().length === 0}>+ <div class="col-span-full px-6 py-6 text-center text-sm text-ink-muted">Couldn't load the connector catalog.<Buttonvariant="outline"@@ -129,13 +183,32 @@ export function DiscoverView(props: { model: ConnectionsModel }) {</Button></div></Show>- <Show when={!catalog.query.isError}>- <For each={rest()}>- {(entry) => (- <CatalogRow- entry={entry}- added={alreadyHave().has(entry.app_slug)}- />+ <Show when={!catalog.query.isError || catalog.entries().length > 0}>+ <For each={visibleCategories()}>+ {(category) => (+ <section class="col-span-full" aria-label={category.name}>+ <div class="mb-2 flex items-center justify-between border-b border-edge-muted pb-2">+ <h4 class="text-sm font-medium text-ink">+ {category.name}+ </h4>+ <span+ class="text-sm text-ink-muted"+ aria-label={`${category.entries.length} apps`}+ >+ {category.entries.length}+ </span>+ </div>+ <div class="grid grid-cols-1 gap-3 @[440px]/catalog:grid-cols-2">+ <For each={category.entries}>+ {(entry) => (+ <CatalogRow+ entry={entry}+ added={alreadyHave().has(entry.app_slug)}+ />+ )}+ </For>+ </div>+ </section>)}</For><Show@@ -145,61 +218,43 @@ export function DiscoverView(props: { model: ConnectionsModel }) {catalog.search().trim()}>- <p class="px-6 py-6 text-sm text-ink-muted">+ <p class="col-span-full px-6 py-6 text-sm text-ink-muted">No Connections match that search.</p></Show><Show when={catalog.query.isFetching}><div- class="flex justify-center px-6 py-6"+ class="col-span-full flex justify-center px-6 py-6"role="status"aria-label="Loading"><SpinnerIcon class="size-4 animate-spin text-ink-muted" /></div></Show>+ <Show when={catalog.query.isFetchNextPageError}>+ <div class="col-span-full flex items-center justify-center gap-3 py-4 text-sm text-ink-muted">+ Couldn't load more apps.+ <Button variant="outline" size="sm" onClick={loadMore}>+ Retry+ </Button>+ </div>+ </Show><Showwhen={- rest().length > 0 &&+ catalog.query.hasNextPage &&!catalog.query.isFetching &&- catalog.query.hasNextPage+ !catalog.query.isError}>- <div class="px-4 py-3 text-center">- <Button- variant="outline"- size="sm"- depth={3}- onClick={() =>- fireAndForget(- catalog.query.fetchNextPage(),- 'connections-settings'- )- }- >- Load more- </Button>- </div>+ <div+ ref={setSentinel}+ class="col-span-full h-px"+ aria-hidden="true"+ /></Show></Show>- </SettingsCard>- </SettingsSection>-- <SettingsCard>- <button- type="button"- class="w-full text-left outline-none hover:bg-ink/4 focus-visible:bg-ink/6"- onClick={() => setAddingCustom(true)}- >- <IntegrationRow- icon={<PlusIcon />}- title="Add custom MCP"- description="Give Macro's agent access to the tools your team already uses."- >- <CaretRightIcon class="size-4 text-ink-extra-muted" />- </IntegrationRow>- </button>- </SettingsCard>+ </div>+ </section><AddCustomMcpDialogopen={addingCustom()}@@ -210,6 +265,19 @@ export function DiscoverView(props: { model: ConnectionsModel }) {);}+function AddMark(props: { loading?: boolean }) {+ return (+ <span+ aria-hidden="true"+ class="flex size-8 shrink-0 items-center justify-center rounded-full bg-ink/4 text-ink-muted"+ >+ <Show when={props.loading} fallback={<PlusIcon class="size-4" />}>+ <SpinnerIcon class="size-4 animate-spin" />+ </Show>+ </span>+ );+}+function AddedMark() {return (<span@@ -246,31 +314,37 @@ function CatalogRow(props: {class="size-8"/>}+ class="gap-3 px-4 py-3"title={name()}- description={<span id={descriptionId}>{description}</span>}+ description={+ <Tooltip label={description}>+ <span id={descriptionId} class="not-touch:line-clamp-1 text-sm">+ {description}+ </span>+ </Tooltip>+ }>- <Show- when={props.added}- fallback={<ConnectAction label="Connect" loading={busy()} />}- >+ <Show when={props.added} fallback={<AddMark loading={busy()} />}><AddedMark /></Show></IntegrationRow>);return (- <Show when={!props.added} fallback={row()}>- <button- type="button"- class="w-full text-left outline-none hover:bg-ink/4 focus-visible:bg-ink/6"- aria-label={busy() ? `Connecting ${name()}` : `Connect ${name()}`}- aria-describedby={descriptionId}- aria-busy={busy()}- disabled={busy()}- onClick={() => fireAndForget(connect(), 'connections-settings')}- >- {row()}- </button>- </Show>+ <div class="@container overflow-hidden rounded-2xl border border-edge-muted bg-ink/4">+ <Show when={!props.added} fallback={row()}>+ <button+ type="button"+ class="h-full w-full text-left outline-none hover:bg-ink/4 focus-visible:bg-ink/6"+ aria-label={busy() ? `Connecting ${name()}` : `Connect ${name()}`}+ aria-describedby={descriptionId}+ aria-busy={busy()}+ disabled={busy()}+ onClick={() => fireAndForget(connect(), 'connections-settings')}+ >+ {row()}+ </button>+ </Show>+ </div>);}diff --git a/apps/web/src/features/settings/connections/PipedreamAiProvider.tsx b/apps/web/src/features/settings/connections/PipedreamAiProvider.tsxindex 81b7659a62..b37c37cbeb 100644--- a/apps/web/src/features/settings/connections/PipedreamAiProvider.tsx+++ b/apps/web/src/features/settings/connections/PipedreamAiProvider.tsx@@ -198,7 +198,7 @@ export function PipedreamAiProvider(props: {icon={providerIcon(props.provider)}description={copy.outcome}onBack={view.closeProvider}- backLabel="Connections"+ backLabel="Integrations"><SettingsSection title="Macro AI"><SettingsCard>diff --git a/apps/web/src/features/settings/connections/catalog-categories.test.ts b/apps/web/src/features/settings/connections/catalog-categories.test.tsnew file mode 100644index 0000000000..eb7d69a50a--- /dev/null+++ b/apps/web/src/features/settings/connections/catalog-categories.test.ts@@ -0,0 +1,72 @@+import { describe, expect, it } from 'vitest';+import { groupCatalogByCategory } from './catalog-categories';++describe('groupCatalogByCategory', () => {+ it('uses the first nonempty Pipedream category without duplicating apps', () => {+ const groups = groupCatalogByCategory([+ {+ app_slug: 'sheets',+ display_name: 'Sheets',+ categories: [' Productivity ', 'Data Analytics'],+ },+ {+ app_slug: 'slack',+ display_name: 'Slack',+ categories: ['', 'Communication'],+ },+ {+ app_slug: 'notion',+ display_name: 'Notion',+ categories: ['Productivity'],+ },+ { app_slug: 'unknown', display_name: 'Unknown' },+ ]);+ expect(groups.map((group) => group.name)).toEqual([+ 'Productivity',+ 'Communication',+ 'More apps',+ ]);+ expect(groups[0].entries.map((entry) => entry.app_slug)).toEqual([+ 'sheets',+ 'notion',+ ]);+ expect(groups.flatMap((group) => group.entries)).toHaveLength(4);+ });++ it('puts work categories first, remaining categories alphabetically, and uncategorized apps last', () => {+ const groups = groupCatalogByCategory([+ { app_slug: 'unknown', display_name: 'Unknown' },+ ...[+ 'Travel',+ 'Databases',+ 'Developer Tools',+ 'Security',+ 'Productivity',+ 'Communication',+ 'Artificial Intelligence (AI)',+ 'File Storage',+ 'CRM',+ ].map((category) => ({+ app_slug: category,+ display_name: category,+ categories: [category],+ })),+ ]);+ expect(groups.map((group) => group.name)).toEqual([+ 'Productivity',+ 'Communication',+ 'Developer Tools',+ 'Artificial Intelligence (AI)',+ 'File Storage',+ 'CRM',+ 'Databases',+ 'Security',+ 'Travel',+ 'More apps',+ ]);+ });++ it('returns no sections for an empty result', () => {+ expect(groupCatalogByCategory([])).toEqual([]);+ });+});diff --git a/apps/web/src/features/settings/connections/catalog-categories.ts b/apps/web/src/features/settings/connections/catalog-categories.tsnew file mode 100644index 0000000000..931e37560f--- /dev/null+++ b/apps/web/src/features/settings/connections/catalog-categories.ts@@ -0,0 +1,44 @@+import type { PipedreamCatalogEntryResponse } from '@service-cognition/client';++const CATEGORY_ORDER = [+ 'Productivity',+ 'Communication',+ 'Developer Tools',+ 'Artificial Intelligence (AI)',+ 'File Storage',+ 'CRM',+ 'Business Management',+ 'Data Analytics',+ 'Databases',+];+const UNCATEGORIZED_LABEL = 'More apps';++function categoryRank(name: string) {+ const index = CATEGORY_ORDER.indexOf(name);+ return index < 0 ? CATEGORY_ORDER.length : index;+}++/** Group each app once, using Pipedream's first category and preserving its ranking. */+export function groupCatalogByCategory(+ entries: PipedreamCatalogEntryResponse[]+) {+ const groups = new Map<string, PipedreamCatalogEntryResponse[]>();+ for (const entry of entries) {+ const name =+ entry.categories?.find((category) => category.trim())?.trim() ??+ UNCATEGORIZED_LABEL;+ const group = groups.get(name) ?? [];+ group.push(entry);+ groups.set(name, group);+ }+ return [...groups]+ .map(([name, entries]) => ({ name, entries }))+ .sort((a, b) => {+ return (+ Number(a.name === UNCATEGORIZED_LABEL) -+ Number(b.name === UNCATEGORIZED_LABEL) ||+ categoryRank(a.name) - categoryRank(b.name) ||+ a.name.localeCompare(b.name)+ );+ });+}diff --git a/apps/web/src/features/settings/connections/connection-more.tsx b/apps/web/src/features/settings/connections/connection-more.tsxindex cbb51363bd..56702fb5f6 100644--- a/apps/web/src/features/settings/connections/connection-more.tsx+++ b/apps/web/src/features/settings/connections/connection-more.tsx@@ -39,11 +39,10 @@ export function ConnectionMore(props: {<Dropdown.Triggeraria-label="More"variant="ghost"- size="icon-sm"- depth={3}- class="text-ink-muted hover:text-ink"+ size="icon-md"+ class="text-ink-muted hover:text-ink touch:min-h-11 touch:min-w-11">- <DotsThreeIcon class="size-4" />+ <DotsThreeIcon class="size-5" /></Dropdown.Trigger><Dropdown.Content class="w-48"><Dropdown.Group>diff --git a/apps/web/src/features/settings/connections/ConnectionsPage.test.tsx b/apps/web/src/features/settings/connections/integrations-view.test.tsxsimilarity index 64%rename from apps/web/src/features/settings/connections/ConnectionsPage.test.tsxrename to apps/web/src/features/settings/connections/integrations-view.test.tsxindex ae5878798b..a19ce5ea59 100644--- a/apps/web/src/features/settings/connections/ConnectionsPage.test.tsx+++ b/apps/web/src/features/settings/connections/integrations-view.test.tsx@@ -12,7 +12,8 @@ import {} from '@solidjs/testing-library';import { createSignal, type JSX } from 'solid-js';import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';-import { ConnectionsPage } from './ConnectionsPage';+import { IntegrationsView } from './integrations-view';+import { useConnectionsView } from './view-state';const mocks = vi.hoisted(() => ({connected: false,@@ -54,11 +55,23 @@ vi.mock('./model', () => ({mocks.connected ? [{ mechanism: 'pipedream', status: 'connected' }] : [],}));vi.mock('./ConnectedView', () => ({- ConnectedView: () => <p>Connections overview</p>,+ ConnectedView: () => {+ const view = useConnectionsView();+ return (+ <button onClick={() => view.openProvider('slack')}>+ Installed Slack+ </button>+ );+ },+}));+vi.mock('./DiscoverView', () => ({+ DiscoverView: () => <p>Integration catalog</p>,}));-vi.mock('./DiscoverView', () => ({ DiscoverView: () => <div /> }));vi.mock('./PipedreamAiProvider', () => ({- PipedreamAiProvider: () => <div />,+ PipedreamAiProvider: () => {+ const view = useConnectionsView();+ return <button onClick={view.closeProvider}>Back to integrations</button>;+ },}));vi.mock('@queries/import', async (importOriginal) => ({...(await importOriginal<typeof import('@queries/import')>()),@@ -94,7 +107,10 @@ vi.mock('../primitives', () => ({</section>),SettingsSection: (props: { title: string; children: JSX.Element }) => (- <section aria-label={props.title}>{props.children}</section>+ <section aria-label={props.title}>+ <h2>{props.title}</h2>+ {props.children}+ </section>),SettingsCard: (props: { children: JSX.Element }) => (<div>{props.children}</div>@@ -111,7 +127,9 @@ afterEach(cleanup);function startImport() {requestConnectApp('slack', 'import-slack-channels');- render(() => <ConnectionsPage onOpenMacroMcp={() => {}} />);+ render(() => (+ <IntegrationsView onOpenMacroMcp={() => {}} onOpenLocalAgents={() => {}} />+ ));}function provideChannels() {@@ -187,10 +205,73 @@ describe('Slack channel import handoff', () => {it('preserves ordinary external connector requests', async () => {mocks.connect.mockResolvedValueOnce('connected');requestConnectApp('linear');- render(() => <ConnectionsPage onOpenMacroMcp={() => {}} />);+ render(() => (+ <IntegrationsView+ onOpenMacroMcp={() => {}}+ onOpenLocalAgents={() => {}}+ />+ ));await waitFor(() =>expect(mocks.connect).toHaveBeenCalledWith({ appSlug: 'linear' }));expect(mocks.discover).not.toHaveBeenCalled();});});++describe('unified Integrations page', () => {+ it('hides local harness setup when no allowed entry point is supplied', () => {+ render(() => <IntegrationsView onOpenMacroMcp={() => {}} />);+ expect(+ screen.queryByRole('button', { name: 'Set up local agents' })+ ).toBeNull();+ expect(+ screen.getByRole('button', { name: 'Set up Macro in AI apps' })+ ).toBeTruthy();+ });++ it('opens the matching setup flow for each callout', () => {+ const onOpenMacroMcp = vi.fn();+ const onOpenLocalAgents = vi.fn();+ render(() => (+ <IntegrationsView+ onOpenMacroMcp={onOpenMacroMcp}+ onOpenLocalAgents={onOpenLocalAgents}+ />+ ));+ fireEvent.click(+ screen.getByRole('button', { name: 'Set up Macro in AI apps' })+ );+ expect(onOpenMacroMcp).toHaveBeenCalledOnce();+ expect(onOpenLocalAgents).not.toHaveBeenCalled();+ fireEvent.click(+ screen.getByRole('button', { name: 'Set up local agents' })+ );+ expect(onOpenLocalAgents).toHaveBeenCalledOnce();+ });+ it('shows installed tools and the catalog together and restores both after provider details', () => {+ render(() => (+ <IntegrationsView onOpenMacroMcp={() => {}} onOpenLocalAgents={() => {}}>+ <p>Personal accounts</p>+ </IntegrationsView>+ ));+ expect(screen.getByRole('heading', { name: 'Integrations' })).toBeTruthy();+ expect(screen.getByRole('heading', { name: 'Installed' })).toBeTruthy();+ expect(screen.queryByRole('heading', { name: 'Discover' })).toBeNull();+ expect(+ screen.getByRole('region', { name: 'Available integrations' })+ ).toBeTruthy();+ expect(screen.getByText('Integration catalog')).toBeTruthy();+ expect(screen.getByText('Personal accounts')).toBeTruthy();+ expect(screen.queryByRole('tab')).toBeNull();+ fireEvent.click(screen.getByRole('button', { name: 'Installed Slack' }));+ expect(screen.queryByText('Integration catalog')).toBeNull();+ fireEvent.click(+ screen.getByRole('button', { name: 'Back to integrations' })+ );+ expect(screen.getByText('Integration catalog')).toBeTruthy();+ expect(screen.getByText('Personal accounts')).toBeTruthy();+ expect(+ screen.getByRole('button', { name: 'Installed Slack' })+ ).toBeTruthy();+ });+});diff --git a/apps/web/src/features/settings/connections/ConnectionsPage.tsx b/apps/web/src/features/settings/connections/integrations-view.tsxsimilarity index 58%rename from apps/web/src/features/settings/connections/ConnectionsPage.tsxrename to apps/web/src/features/settings/connections/integrations-view.tsxindex bc5dfdd594..873f0c61cd 100644--- a/apps/web/src/features/settings/connections/ConnectionsPage.tsx+++ b/apps/web/src/features/settings/connections/integrations-view.tsx@@ -1,4 +1,3 @@-import { TabsInset } from '@core/component/TabsInset';import { toast } from '@core/component/Toast/Toast';import {clearPendingConnectApp,@@ -7,7 +6,14 @@ import {import { fireAndForget } from '@core/util/fireAndForget';import { connectPipedreamApp } from '@queries/pipedream-connectors';import { Button } from '@ui';-import { createEffect, createSignal, on, Show, Suspense } from 'solid-js';+import {+ createEffect,+ createSignal,+ on,+ type ParentProps,+ Show,+ Suspense,+} from 'solid-js';import { SettingsPage } from '../primitives';import { ConnectedView } from './ConnectedView';import { DiscoverView } from './DiscoverView';@@ -16,44 +22,65 @@ import { PipedreamAiProvider } from './PipedreamAiProvider';import { SlackChannelImportFlow } from './slack-channel-import/SlackChannelImportFlow';import { useConnectionsModel } from './use-connections-model';import {- type ConnectionsMode,ConnectionsViewProvider,createConnectionsViewState,useConnectionsView,} from './view-state';-function MacroMcpSignpost(props: { onOpen: () => void }) {+function IntegrationSetupCallouts(props: {+ onOpenMacroMcp: () => void;+ onOpenLocalAgents?: () => void;+}) {return (- <p class="text-xs text-ink-muted text-balance">- Looking to use Macro in another app?{' '}- <button- type="button"- class="text-link outline-none hover:text-link-hover hover:underline focus-visible:underline"- onClick={props.onOpen}- >- Macro MCP- </button>- </p>+ <div class="flex flex-col gap-2">+ <div class="flex items-center justify-between gap-4 rounded-2xl border border-edge-muted bg-ink/4 px-4 py-2">+ <p class="text-base font-medium text-ink">+ Use Macro in your favorite AI harness with the official Macro MCP+ </p>+ <Button+ variant="ghost"+ size="md"+ aria-label="Set up Macro in AI apps"+ onClick={props.onOpenMacroMcp}+ >+ Set up+ </Button>+ </div>+ <Show when={props.onOpenLocalAgents}>+ <div class="flex items-center justify-between gap-4 rounded-2xl border border-edge-muted bg-ink/4 px-4 py-2">+ <p class="text-base font-medium text-ink">+ Stream sessions from your local AI harness to Macro+ </p>+ <Button+ variant="ghost"+ size="md"+ aria-label="Set up local agents"+ onClick={props.onOpenLocalAgents}+ >+ Set up+ </Button>+ </div>+ </Show>+ </div>);}-export function ConnectionsPage(props: {+type IntegrationsViewProps = ParentProps<{onOpenMacroMcp: () => void;- initialMode?: ConnectionsMode;+ onOpenLocalAgents?: () => void;initialProvider?: ProviderId;-}) {- const view = createConnectionsViewState({- mode: props.initialMode,- provider: props.initialProvider,- });+}>;++export function IntegrationsView(props: IntegrationsViewProps) {+ const view = createConnectionsViewState({ provider: props.initialProvider });return (<ConnectionsViewProvider value={view}>- <ConnectionsContent onOpenMacroMcp={props.onOpenMacroMcp} />+ <ConnectionsContent {...props} /></ConnectionsViewProvider>);}-function ConnectionsContent(props: { onOpenMacroMcp: () => void }) {+function ConnectionsContent(props: IntegrationsViewProps) {const { model, ready, error, partialError, retry } = useConnectionsModel();const view = useConnectionsView();const [importSlackChannels, setImportSlackChannels] = createSignal(false);@@ -87,8 +114,6 @@ function ConnectionsContent(props: { onOpenMacroMcp: () => void }) {capability.mechanism === 'pipedream' &&capability.status === 'connected');- const description =- "Connect the tools your team already uses so Macro's agent can work in them.";return (<Show@@ -98,11 +123,15 @@ function ConnectionsContent(props: { onOpenMacroMcp: () => void }) {when={!error()}fallback={<SettingsPage- title="Agent connections"- description={description}+ title="Integrations"onBack={view.provider() ? view.closeProvider : undefined}- backLabel="Connections"+ backLabel="Integrations">+ <IntegrationSetupCallouts+ onOpenMacroMcp={props.onOpenMacroMcp}+ onOpenLocalAgents={props.onOpenLocalAgents}+ />+ {props.children}<div class="flex items-center gap-3 text-sm text-ink-muted">Couldn't load Connections.<Button variant="outline" size="sm" depth={3} onClick={retry}>@@ -117,23 +146,15 @@ function ConnectionsContent(props: { onOpenMacroMcp: () => void }) {keyedfallback={<SettingsPage- title="Agent connections"- description={description}- signpost={<MacroMcpSignpost onOpen={props.onOpenMacroMcp} />}+ title="Integrations"+ contentClass="max-w-[1200px]"+ bodyClass="mt-6 gap-6">- <TabsInset- fullWidth- list={[- { value: 'connected', label: 'Connected' },- { value: 'discover', label: 'Discover' },- ]}- value={view.mode()}- onChange={(value) =>- value === 'discover'- ? view.showDiscover()- : view.showOverview()- }+ <IntegrationSetupCallouts+ onOpenMacroMcp={props.onOpenMacroMcp}+ onOpenLocalAgents={props.onOpenLocalAgents}/>+ {props.children}<Show when={partialError()}><divrole="status"@@ -156,12 +177,29 @@ function ConnectionsContent(props: { onOpenMacroMcp: () => void }) {<p class="text-sm text-ink-muted">Loading Connections…</p>}>- <Show- when={view.mode() === 'discover'}- fallback={<ConnectedView model={model()} />}+ <section+ aria-label="Agent Integrations"+ class="flex min-w-0 flex-col gap-4">- <DiscoverView model={model()} />- </Show>+ <h2 class="text-lg font-medium text-ink">+ Agent Integrations+ </h2>+ <section+ aria-label="Installed integrations"+ class="min-w-0 w-full"+ >+ <h3 class="mb-2 text-base font-medium text-ink">+ Installed+ </h3>+ <ConnectedView model={model()} />+ </section>+ <section+ aria-label="Available integrations"+ class="min-w-0 w-full"+ >+ <DiscoverView model={model()} />+ </section>+ </section></Show></SettingsPage>}diff --git a/apps/web/src/features/settings/connections/leftover-row.tsx b/apps/web/src/features/settings/connections/leftover-row.tsxindex aba8c897f3..d9c012a07f 100644--- a/apps/web/src/features/settings/connections/leftover-row.tsx+++ b/apps/web/src/features/settings/connections/leftover-row.tsx@@ -14,7 +14,7 @@ import {readMcpAuthAttempted,writeMcpAuthAttempted,} from '../mcp-auth-attempt';-import { IntegrationRow, SettingsRow } from '../primitives';+import { IntegrationRow } from '../primitives';import {type ConnectionMenuItem,ConnectionRowActions,@@ -286,8 +286,9 @@ export function LeftoverRow(props: { leftover: Leftover }) {const muted = leftoverDisabled(leftover);return match(leftover).with({ kind: 'native-mcp' }, (item) => (- <SettingsRow- label={item.title}+ <IntegrationRow+ class="gap-3 px-4 py-3"+ title={item.title}description={<><span class="block truncate">{item.subtitle}</span>@@ -299,10 +300,11 @@ export function LeftoverRow(props: { leftover: Leftover }) {muted={muted}>{actions()}- </SettingsRow>+ </IntegrationRow>)).with({ kind: 'pipedream' }, (item) => (<IntegrationRow+ class="gap-3 px-4 py-3"icon={<PipedreamConnectorIcon appSlug={item.appSlug} class="size-8" />}diff --git a/apps/web/src/features/settings/connections/view-state.test.ts b/apps/web/src/features/settings/connections/view-state.test.tsindex 9ae850a230..6c51d32131 100644--- a/apps/web/src/features/settings/connections/view-state.test.ts+++ b/apps/web/src/features/settings/connections/view-state.test.ts@@ -8,18 +8,16 @@ it('opens a selected provider and returns to its connection overview', () => {expect(view.provider()).toBe('github');view.showOverview();expect(view.provider()).toBeNull();- expect(view.mode()).toBe('connected');dispose();});});-it('starts in discovery and preserves that mode when closing a provider', () => {+it('starts with the unified overview and returns after closing a provider', () => {createRoot((dispose) => {- const view = createConnectionsViewState({ mode: 'discover' });- expect(view.mode()).toBe('discover');+ const view = createConnectionsViewState();+ expect(view.provider()).toBeNull();view.openProvider('github');view.closeProvider();expect(view.provider()).toBeNull();- expect(view.mode()).toBe('discover');dispose();});});diff --git a/apps/web/src/features/settings/connections/view-state.tsx b/apps/web/src/features/settings/connections/view-state.tsxindex f555930b71..dc22312ccd 100644--- a/apps/web/src/features/settings/connections/view-state.tsx+++ b/apps/web/src/features/settings/connections/view-state.tsx@@ -6,28 +6,16 @@ import {} from 'solid-js';import type { ProviderId } from './model';-export type ConnectionsMode = 'connected' | 'discover';--/** Navigation belongs to one mounted Agents Connections page, not global settings. */+/** Scope provider navigation to each mounted Integrations page. */export function createConnectionsViewState(initial?: {- mode?: ConnectionsMode;provider?: ProviderId;}) {- const [mode, setMode] = createSignal<ConnectionsMode>(- initial?.mode ?? 'connected'- );const [provider, setProvider] = createSignal<ProviderId | null>(initial?.provider ?? null);return {- mode,provider,showOverview: () => {- setMode('connected');- setProvider(null);- },- showDiscover: () => {- setMode('discover');setProvider(null);},openProvider: (id: ProviderId) => setProvider(id),diff --git a/apps/web/src/features/settings/core/settings-search.test.ts b/apps/web/src/features/settings/core/settings-search.test.tsindex e2d9a65a59..875465841f 100644--- a/apps/web/src/features/settings/core/settings-search.test.ts+++ b/apps/web/src/features/settings/core/settings-search.test.ts@@ -4,6 +4,13 @@ import { searchSettings } from './settings-search';const search = (query: string) => searchSettings(SETTINGS_TAB_GROUPS, query);describe('individual settings search', () => {+ it('finds agent tools on the unified Integrations page', () => {+ expect(+ search('agent apps').find(+ (result) => result.title === 'Agent apps and tools'+ )+ ).toMatchObject({ tab: 'Connected' });+ });it('keeps calendar connections searchable without removed booking settings', () => {expect(search('calendar color').find(diff --git a/apps/web/src/features/settings/core/settings-search.ts b/apps/web/src/features/settings/core/settings-search.tsindex ac0cb18f8e..fbb9ac5685 100644--- a/apps/web/src/features/settings/core/settings-search.ts+++ b/apps/web/src/features/settings/core/settings-search.ts@@ -246,7 +246,7 @@ const SETTINGS: Setting[] = [keywords: 'connect integration repository pull request',},{- tab: 'Connections',+ tab: 'Connected',title: 'Agent apps and tools',keywords: 'mcp integration connect external services',},diff --git a/apps/web/src/features/settings/primitives.tsx b/apps/web/src/features/settings/primitives.tsxindex 3aed5535e5..cf84137d6a 100644--- a/apps/web/src/features/settings/primitives.tsx+++ b/apps/web/src/features/settings/primitives.tsx@@ -1,5 +1,5 @@import CaretLeftIcon from '@phosphor/caret-left.svg';-import { Button, type ButtonProps, ComposerSurface, cn } from '@ui';+import { Button, type ButtonProps, cn } from '@ui';import { children, createContext, type JSX, Show, useContext } from 'solid-js';import { settingsTarget } from './core/settings-target';@@ -8,9 +8,8 @@ export const SettingsSheetContext = createContext(false);/** Shared building blocks for the settings panels. Every settings tab composes- * these so the whole menu shares one rhythm: a generous, centered content- * column with a large page title and raised composer surfaces whose rows- * are separated by hairline dividers.+ * these so the whole menu shares one rhythm: a centered content column,+ * clear section headings, and flat neutral surfaces with subtle row dividers.** <SettingsPage title="Account" description="…">* <SettingsSection title="Profile">@@ -28,6 +27,10 @@ export const SettingsSheetContext = createContext(false);*/export function SettingsPage(props: {title: string;+ /** Layout width and spacing for the page content. */+ contentClass?: string;+ /** Spacing between the heading and page sections. */+ bodyClass?: string;/** Inline subpages need their own heading beneath the mobile sheet chrome. */showTitleInSheet?: boolean;/** Optional one-line subtitle; accepts text or inline markup (e.g. a link). */@@ -58,7 +61,8 @@ export function SettingsPage(props: {'mx-auto w-full max-w-[960px]',inSheet? '@container px-3 pt-2 pb-[max(24px,var(--mobile-sheet-safe-padding))]'- : '@container px-12 pt-8 pb-24 @max-[480px]/settings-page:px-4 touch:px-5 touch:pt-[calc(var(--mobile-content-inset-top,0px)+2rem)] touch:pb-[calc(var(--mobile-content-inset-bottom,0px)+3rem)]'+ : '@container px-12 pt-8 pb-24 @max-[480px]/settings-page:px-4 touch:px-5 touch:pt-[calc(var(--mobile-content-inset-top,0px)+2rem)] touch:pb-[calc(var(--mobile-content-inset-bottom,0px)+3rem)]',+ props.contentClass)}><Show when={props.onBack}>@@ -97,7 +101,11 @@ export function SettingsPage(props: {</Show></header><div- class={cn('flex flex-col', inSheet ? 'gap-6 mt-3' : 'mt-12 gap-12')}+ class={cn(+ 'flex flex-col',+ inSheet ? 'mt-3 gap-6' : 'mt-6 gap-8',+ props.bodyClass+ )}>{props.children}</div>@@ -127,26 +135,26 @@ export function SettingsSection(props: {: undefined}tabIndex={-1}- class={cn('scroll-mt-4 outline-none rounded-[26.25px]', props.class)}+ class={cn('scroll-mt-4 outline-none', props.class)}>- <SettingsSurface class="flex flex-col gap-2 p-5 touch:p-4">- <Show when={props.title || actions()}>- <div class="flex flex-wrap items-end justify-between gap-3">- <div class="flex flex-col gap-0.5 min-w-0">- <Show when={props.title}>- <h2 class="text-base font-medium text-ink">{props.title}</h2>- </Show>- <Show when={props.description}>- <p class="text-sm leading-relaxed text-ink/60">- {props.description}- </p>- </Show>- </div>- <Show when={actions()}>- <div class="shrink-0">{actions()}</div>+ <Show when={props.title || actions()}>+ <div class="mb-2 flex flex-wrap items-start justify-between gap-3">+ <div class="flex min-w-0 flex-col gap-1">+ <Show when={props.title}>+ <h2 class="text-base font-medium text-ink">{props.title}</h2>+ </Show>+ <Show when={props.description}>+ <p class="text-sm leading-relaxed text-ink-muted">+ {props.description}+ </p></Show></div>- </Show>+ <Show when={actions()}>+ <div class="shrink-0">{actions()}</div>+ </Show>+ </div>+ </Show>+ <SettingsSurface class="flex flex-col gap-2 p-4">{props.children}</SettingsSurface></section>@@ -166,22 +174,21 @@ export function SettingsSurface(props: {when={!nested}fallback={<div class={props.class}>{props.children}</div>}>- <ComposerSurface- as="div"+ <divclass={cn(- 'relative min-w-0 touch:rounded-3xl touch:border touch:border-edge-muted touch:bg-composer touch:text-composer-ink',+ 'relative min-w-0 rounded-2xl border border-edge-muted bg-ink/4 text-ink',props.class)}><SettingsSurfaceContext.Provider value={true}>{props.children}</SettingsSurfaceContext.Provider>- </ComposerSurface>+ </div></Show>);}-/** Rows share a surface; standalone cards use the email composer's elevation. */+/** Rows share a flat neutral surface; nested cards do not add another box. */export function SettingsCard(props: { class?: string; children: JSX.Element }) {const nested = useContext(SettingsSurfaceContext);return (@@ -228,7 +235,7 @@ export function SettingsRow(props: {}tabIndex={-1}class={cn(- 'scroll-mt-4 outline-none flex gap-4 py-4 min-h-[64px]',+ 'scroll-mt-4 outline-none flex gap-4 py-3 min-h-[56px]',inSheet ? 'px-4 flex-wrap' : 'px-4',props.stackOnNarrow? 'flex-col gap-1.5 @[460px]:flex-row @[460px]:justify-between @[460px]:gap-4'@@ -312,7 +319,7 @@ export function ChoiceRow(props: {/><span class="min-w-0"><span class="block text-sm font-medium text-ink">{props.title}</span>- <span class="mt-0.5 block text-xs text-ink-muted">+ <span class="mt-0.5 block text-sm text-ink-muted">{props.description}</span></span>@@ -340,7 +347,7 @@ export function IntegrationRow(props: {class?: string;}) {return (- <div class={cn('flex flex-wrap items-center gap-4 px-4 py-4', props.class)}>+ <div class={cn('flex flex-wrap items-center gap-3 px-4 py-3', props.class)}><Show when={props.icon}><divclass={cn(@@ -386,7 +393,7 @@ export function SettingsButton(props: ButtonProps) {return (<Button{...props}- class={cn('rounded-lg font-normal gap-1.5', props.class)}+ class={cn('rounded-full font-normal gap-1.5', props.class)}/>);}diff --git a/apps/web/src/features/slack-import/slack-import.test.tsx b/apps/web/src/features/slack-import/slack-import.test.tsxindex 82923ab061..d9e592dce7 100644--- a/apps/web/src/features/slack-import/slack-import.test.tsx+++ b/apps/web/src/features/slack-import/slack-import.test.tsx@@ -108,7 +108,7 @@ describe('Slack import production boundary', () => {'slack_v2','import-slack-channels');- expect(host.openSettings).toHaveBeenCalledWith('Connections');+ expect(host.openSettings).toHaveBeenCalledWith('Connected');});it.each([diff --git a/apps/web/src/features/slack-import/slack-import.tsx b/apps/web/src/features/slack-import/slack-import.tsxindex 00a2003bb6..b9eac97059 100644--- a/apps/web/src/features/slack-import/slack-import.tsx+++ b/apps/web/src/features/slack-import/slack-import.tsx@@ -83,7 +83,7 @@ function SlackImportSettings(props: {const { openSettings } = useSettingsState();const connectSlack = () => {requestConnectApp(SLACK_CONNECT_SLUG, 'import-slack-channels');- openSettings('Connections');+ openSettings('Connected');};function channelHref(id: string): string | undefined {if (diff --git a/apps/web/src/features/usage/views/usage-settings.tsx b/apps/web/src/features/usage/views/usage-settings.tsxindex b68d7698b7..989d5e8824 100644--- a/apps/web/src/features/usage/views/usage-settings.tsx+++ b/apps/web/src/features/usage/views/usage-settings.tsx@@ -72,7 +72,7 @@ export function UsageSettingsView(props: { context: UsageContext }) {</Show><fieldsetdisabled={!props.context.available()}- class="flex min-w-0 flex-col gap-12 touch:gap-6"+ class="flex min-w-0 flex-col gap-6"classList={{ 'opacity-50': !props.context.available() }}><Showdiff --git a/apps/web/src/lib/core/constant/SettingsState.tsx b/apps/web/src/lib/core/constant/SettingsState.tsxindex 8e47bc1152..cbbb1aa809 100644--- a/apps/web/src/lib/core/constant/SettingsState.tsx+++ b/apps/web/src/lib/core/constant/SettingsState.tsx@@ -37,7 +37,6 @@ export type SettingsTab =| 'Tags'| 'CRM'| 'Connected'- | 'Connections'| 'Email'| 'GitHub'| 'Admin';diff --git a/apps/web/src/lib/core/constant/settingsTabsConfig.test.ts b/apps/web/src/lib/core/constant/settingsTabsConfig.test.tsindex a78afd9e39..1b9fde679a 100644--- a/apps/web/src/lib/core/constant/settingsTabsConfig.test.ts+++ b/apps/web/src/lib/core/constant/settingsTabsConfig.test.ts@@ -21,9 +21,8 @@ describe('settings navigation', () => {expect(settingsSlugToTab('calendar')).toBe('Calendar');expect(settingsSlugToTab('booking-links')).toBeUndefined();});- it('routes agent-connections to the Connections tab', () => {- expect(settingsSlugToTab('agent-connections')).toBe('Connections');- expect(settingsTabToSlug('Connections')).toBe('agent-connections');+ it('routes old agent-connections links to Integrations', () => {+ expect(settingsSlugToTab('agent-connections')).toBe('Connected');});it('keeps the connections slug on Integrations', () => {@@ -43,7 +42,7 @@ describe('settings navigation', () => {expect(settingsSlugToTab('team-connections')).toBe('Team Connections');});- it('groups blocks after the team and separates account and agent integrations', () => {+ it('groups blocks after the team and consolidates account and agent integrations', () => {expect(SETTINGS_TAB_GROUPS[1].label).toBe('Blocks');expect(SETTINGS_TAB_GROUPS[1].items.map((item) => item.tab)).toEqual(['Email',@@ -58,7 +57,11 @@ describe('settings navigation', () => {(group) => group.label === 'Developer');expect(workspace?.items.map((item) => item.tab)).toContain('Connected');- expect(developer?.items.map((item) => item.tab)).toContain('Connections');+ expect(+ SETTINGS_TAB_GROUPS.flatMap((group) => group.items).map(+ (item) => item.tab+ )+ ).not.toContain('Connections');expect(developer?.items.map((item) => item.tab)).toContain('Harness');});});diff --git a/apps/web/src/lib/core/constant/settingsTabsConfig.tsx b/apps/web/src/lib/core/constant/settingsTabsConfig.tsxindex 145159d370..a1f5822ecc 100644--- a/apps/web/src/lib/core/constant/settingsTabsConfig.tsx+++ b/apps/web/src/lib/core/constant/settingsTabsConfig.tsx@@ -13,7 +13,6 @@ import HardDrivesIcon from '@phosphor/hard-drives.svg';import KeyIcon from '@phosphor/key.svg';import KeyboardIcon from '@phosphor/keyboard.svg';import PlugIcon from '@phosphor/plug.svg';-import PlugsConnectedIcon from '@phosphor/plugs-connected.svg';import BotIcon from '@phosphor/robot.svg';import AgentIcon from '@phosphor/sparkle.svg';import SwatchesIcon from '@phosphor/swatches.svg';@@ -201,19 +200,20 @@ export const SETTINGS_TAB_GROUPS: SettingsTabGroup[] = [tab: 'Connected',label: 'Integrations',icon: CpuIcon,- keywords: ['integrations', 'apps', 'connections'],+ keywords: [+ 'integrations',+ 'apps',+ 'connections',+ 'agent',+ 'tools',+ 'mcp',+ ],},],},{label: 'Developer',items: [- {- tab: 'Connections',- label: 'Agent connections',- icon: PlugsConnectedIcon,- keywords: ['agent', 'tools', 'apps', 'mcp'],- },{tab: 'Harness',label: 'Runtimes',@@ -278,8 +278,6 @@ const SETTINGS_TAB_SLUGS: Record<SettingsTab, string> = {Tags: 'tags',CRM: 'crm',Connected: 'connections',- // `connections` predates this tab and stays on Integrations for old links.- Connections: 'agent-connections',Email: 'email',GitHub: 'github',Admin: 'admin',@@ -293,6 +291,8 @@ const SETTINGS_SLUG_TO_TAB = new Map<string, SettingsTab>(// Preserve daemon pairing links and bookmarks from before the rename.SETTINGS_SLUG_TO_TAB.set('harness', 'Harness');+SETTINGS_SLUG_TO_TAB.set('connections', 'Connected');+SETTINGS_SLUG_TO_TAB.set('agent-connections', 'Connected');/** The URL slug for a settings tab (e.g. `Connected` → `connections`). */export const settingsTabToSlug = (tab: SettingsTab): string =>@@ -345,7 +345,6 @@ export const useSettingsTabAvailable = () => {case 'CRM':return crmFlag().enabled;case 'Connected':- case 'Connections':return true;case 'Shortcuts':return !isTouchDevice();diff --git a/apps/web/src/lib/service-clients/service-cognition/client.ts b/apps/web/src/lib/service-clients/service-cognition/client.tsindex c8e2694f34..579b3d257f 100644--- a/apps/web/src/lib/service-clients/service-cognition/client.ts+++ b/apps/web/src/lib/service-clients/service-cognition/client.ts@@ -24,6 +24,7 @@ import type { GetChatResponse } from './generated/schemas/getChatResponse';import type { GetChatsForAttachmentResponse } from './generated/schemas/getChatsForAttachmentResponse';import type { HttpSendChatMessageRequest } from './generated/schemas/httpSendChatMessageRequest';import type { PatchChatRequest } from './generated/schemas/patchChatRequest';+import type { PipedreamCatalogResponse } from './generated/schemas/pipedreamCatalogResponse';import type { ProjectionStateResponse } from './generated/schemas/projectionStateResponse';import type { SendChatMessageResponse } from './generated/schemas/sendChatMessageResponse';import type { ServerResponse } from './generated/schemas/serverResponse';@@ -93,17 +94,8 @@ export type PipedreamCompleteRequest = {account_id: string;server_name?: string;};-export type PipedreamCatalogEntryResponse = {- app_slug: string;- display_name: string;- description?: string | null;- icon_url?: string | null;- priority: boolean;-};-export type PipedreamCatalogResponse = {- servers: PipedreamCatalogEntryResponse[];- next_cursor?: string | null;-};+export type { PipedreamCatalogEntryResponse } from './generated/schemas/pipedreamCatalogEntryResponse';+export type { PipedreamCatalogResponse } from './generated/schemas/pipedreamCatalogResponse';/** Error code for deployments where Pipedream MCP connect is not configured. */export const PIPEDREAM_DISABLED = 'PIPEDREAM_DISABLED' as const;@@ -474,8 +466,8 @@ export const cognitionApiServiceClient = {},/**- * Browse or search the Pipedream app catalog. Curated priority connectors- * come first (flagged `priority`), followed by directory results.+ * Browse or search Pipedream apps in popularity order, including their+ * category labels for grouping.*/async browsePipedreamCatalog(args: {search?: string;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.tsindex 44303311d1..c259af34c4 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@@ -13,6 +13,8 @@ import type { PipedreamCatalogEntryResponseIconUrl } from './pipedreamCatalogEntexport interface PipedreamCatalogEntryResponse {/** Pipedream app name slug — pass this to the connect flow. */app_slug: string;+ /** Categories assigned by Pipedream. */+ categories?: string[];/** One-line description of the app. */description?: PipedreamCatalogEntryResponseDescription;/** Human-readable name to display. */diff --git a/apps/web/src/lib/service-clients/service-cognition/openapi.json b/apps/web/src/lib/service-clients/service-cognition/openapi.jsonindex 34ef75823b..53e220375c 100644--- a/apps/web/src/lib/service-clients/service-cognition/openapi.json+++ b/apps/web/src/lib/service-clients/service-cognition/openapi.json@@ -4409,6 +4409,13 @@"type": "string","description": "Pipedream app name slug — pass this to the connect flow."},+ "categories": {+ "type": "array",+ "items": {+ "type": "string"+ },+ "description": "Categories assigned by Pipedream."+ },"description": {"type": ["string", "null"],"description": "One-line description of the app."diff --git a/crates/pipedream_mcp/AGENTS.md b/crates/pipedream_mcp/AGENTS.mdindex 218e18108c..d7a9438580 100644--- a/crates/pipedream_mcp/AGENTS.md+++ b/crates/pipedream_mcp/AGENTS.md@@ -11,7 +11,8 @@ AI loop calls their tools through Pipedream's remote MCP server.- `src/lib.rs`: crate doc comment — explains why this is fully separate fromthe native `mcp_client` stack.- `src/domain/ports.rs` + `src/domain/models.rs`: connection model and ports.-- `src/outbound/api.rs`: the Pipedream HTTP API client.+- `src/outbound/api.rs`: the Pipedream HTTP API client; catalog entries preserve+ Pipedream category labels for clients to group without a local taxonomy.- `src/outbound/pg_connection_repo.rs`: the `pipedream_mcp_connections` table.- `src/inbound/toolset.rs`: how connected apps surface as agent tools.diff --git a/crates/pipedream_mcp/src/domain/models.rs b/crates/pipedream_mcp/src/domain/models.rsindex b031d8e07f..6f89beb44f 100644--- a/crates/pipedream_mcp/src/domain/models.rs+++ b/crates/pipedream_mcp/src/domain/models.rs@@ -57,6 +57,8 @@ pub struct CatalogEntry {pub description: Option<String>,/// URL of the app's icon, when the directory provides one.pub icon_url: Option<String>,+ /// Categories assigned by the Pipedream app directory.+ pub categories: Vec<String>,}/// One page of catalog results.diff --git a/crates/pipedream_mcp/src/domain/service/catalog/test.rs b/crates/pipedream_mcp/src/domain/service/catalog/test.rsindex 4f4daeab7b..5235dbc78f 100644--- a/crates/pipedream_mcp/src/domain/service/catalog/test.rs+++ b/crates/pipedream_mcp/src/domain/service/catalog/test.rs@@ -2,10 +2,13 @@ use super::*;use crate::domain::models::CatalogEntry;use std::sync::Mutex;+/// Search text, pagination cursor, and page size sent to the directory.+type RecordedQuery = (Option<String>, Option<String>, u32);+/// Fake directory returning a canned page and recording the query it got.struct FakeDirectory {page: CatalogPage,- seen: Mutex<Vec<(Option<String>, Option<String>, u32)>>,+ seen: Mutex<Vec<RecordedQuery>>,}impl FakeDirectory {@@ -47,6 +50,7 @@ impl ConnectorDirectory for FakeDirectory {fn directory_entry(app_slug: &str) -> CatalogEntry {CatalogEntry {+ categories: vec![],app_slug: app_slug.to_owned(),display_name: app_slug.to_owned(),description: Some("from the directory".to_owned()),diff --git a/crates/pipedream_mcp/src/domain/service/discovery/test.rs b/crates/pipedream_mcp/src/domain/service/discovery/test.rsindex 8af7e12f9f..58bdcb34a2 100644--- a/crates/pipedream_mcp/src/domain/service/discovery/test.rs+++ b/crates/pipedream_mcp/src/domain/service/discovery/test.rs@@ -10,6 +10,7 @@ struct Directory {fn entry() -> CatalogEntry {CatalogEntry {+ categories: vec![],app_slug: "linear".into(),display_name: "Linear".into(),description: None,diff --git a/crates/pipedream_mcp/src/inbound/axum_router.rs b/crates/pipedream_mcp/src/inbound/axum_router.rsindex 05735c055a..f77ae577c1 100644--- a/crates/pipedream_mcp/src/inbound/axum_router.rs+++ b/crates/pipedream_mcp/src/inbound/axum_router.rs@@ -313,6 +313,9 @@ pub struct PipedreamCatalogEntryResponse {description: Option<String>,/// URL of the app's icon, when available.icon_url: Option<String>,+ /// Categories assigned by Pipedream.+ #[serde(default)]+ categories: Vec<String>,}impl From<CatalogEntry> for PipedreamCatalogEntryResponse {@@ -322,6 +325,7 @@ impl From<CatalogEntry> for PipedreamCatalogEntryResponse {display_name: entry.display_name,description: entry.description,icon_url: entry.icon_url,+ categories: entry.categories,}}}diff --git a/crates/pipedream_mcp/src/outbound/api.rs b/crates/pipedream_mcp/src/outbound/api.rsindex aead082711..e704915715 100644--- a/crates/pipedream_mcp/src/outbound/api.rs+++ b/crates/pipedream_mcp/src/outbound/api.rs@@ -371,6 +371,7 @@ impl ConnectorDirectory for PipedreamClient {// Apps without an auth flow have nothing to connect..filter(|app| app.auth_type.as_deref() != Some("none")).map(|app| CatalogEntry {+ categories: app.categories,app_slug: app.name_slug,display_name: app.name,description: app.description.filter(|d| !d.is_empty()),@@ -489,6 +490,7 @@ fn connectable_catalog_entry(requested_slug: &str, app: AppResponse) -> Option<Creturn None;}Some(CatalogEntry {+ categories: app.categories,app_slug: app.name_slug,display_name: app.name,description: app@@ -561,4 +563,6 @@ struct AppResponse {auth_type: Option<String>,#[serde(default)]img_src: String,+ #[serde(default)]+ categories: Vec<String>,}diff --git a/crates/pipedream_mcp/src/outbound/api/test.rs b/crates/pipedream_mcp/src/outbound/api/test.rsindex dd244258dd..6a0ffd1431 100644--- a/crates/pipedream_mcp/src/outbound/api/test.rs+++ b/crates/pipedream_mcp/src/outbound/api/test.rs@@ -2,6 +2,7 @@ use super::{AppResponse, connectable_catalog_entry};fn app(slug: &str, auth_type: Option<&str>) -> AppResponse {AppResponse {+ categories: vec!["Developer Tools".to_owned()],name_slug: slug.to_owned(),name: slug.to_owned(),description: None,@@ -14,6 +15,7 @@ fn app(slug: &str, auth_type: Option<&str>) -> AppResponse {fn a_matching_slug_with_an_auth_flow_is_connectable() {let entry = connectable_catalog_entry("linear", app("linear", Some("oauth"))).expect("app");assert_eq!(entry.app_slug, "linear");+ assert_eq!(entry.categories, vec!["Developer Tools"]);assert_eq!(entry.icon_url.as_deref(),Some("https://assets.pipedream.net/linear.png")@@ -30,6 +32,13 @@ fn a_different_slug_than_the_one_asked_for_is_not_that_app() {assert!(connectable_catalog_entry("linear", app("slack", Some("oauth"))).is_none());}+#[test]+fn app_categories_are_optional_for_older_directory_responses() {+ let app: AppResponse = serde_json::from_str(r#"{"name_slug":"linear","name":"Linear"}"#)+ .expect("valid app response");+ assert!(app.categories.is_empty());+}+#[tokio::test]async fn proxy_routes_the_connected_user_and_preserves_provider_status() {use super::{diff --git a/docs/agent-guide/ai-chat.md b/docs/agent-guide/ai-chat.mdindex c0fa44cc96..135ea05c21 100644--- a/docs/agent-guide/ai-chat.md+++ b/docs/agent-guide/ai-chat.md@@ -298,12 +298,11 @@ the shimmer.(`enable-chat-v3-agents`), the workspace uses one sidebar for Chat and Code.**Agents** in the sidebar opens the same roster as the composer’s**Create agent** action. **Connections** manages MCP integrations (including- app authentication and disconnection); this section has moved out of Settings.+ app authentication and disconnection), also available under Settings → Integrations.Home’s **Connect your tools** and agent replies’ **Connect app** chips open this- Connections page. Personal Gmail/GitHub account links remain under Settings →- Integrations.+ Integrations page. It shows installed tools above the app catalog, with personal Gmail/GitHub account links in a separate section above.- To recreate Slack channels, open **Settings → Connections → Slack → Import+ To recreate Slack channels, open **Settings → Integrations → Slack → Importchannels** (or **Connections → Slack** from the Agents workspace). The cardappears only for a connected, enabled Pipedream Slack account. Click **Findchannels** (or **Refresh** on subsequent visits), then wait for discovery anddiff --git a/docs/agent-guide/assets/settings-integrations-catalog.png b/docs/agent-guide/assets/settings-integrations-catalog.pngnew file mode 100644index 0000000000..f68f89eadaBinary files /dev/null and b/docs/agent-guide/assets/settings-integrations-catalog.png differdiff --git a/docs/agent-guide/assets/settings-integrations.png b/docs/agent-guide/assets/settings-integrations.pngnew file mode 100644index 0000000000..a5252ee932Binary files /dev/null and b/docs/agent-guide/assets/settings-integrations.png differdiff --git a/docs/agent-guide/settings.md b/docs/agent-guide/settings.mdindex d4670c3c03..beac0a8b67 100644--- a/docs/agent-guide/settings.md+++ b/docs/agent-guide/settings.md@@ -71,7 +71,7 @@ when Gmail has no signature. Unsaved draftssurvive switching settings pages. On phones, signature editing remains desktop-only;the replies/forwards toggle and clear action are available.Email accounts can also be managed from **Integrations**. Its **Email settings**-link opens the dedicated page, and Email links to Notifications and Calendar.+gear opens the dedicated page, and Email links to Notifications and Calendar.With a composer open, save a changed signature or reply-signature preference andverify its preview updates. Once the account refresh completes, reopen a composeroffline and confirm it uses the saved settings.@@ -186,10 +186,10 @@ settings split that shares the layout, or steps back to the previous view whenit is the only split (Home when there is none). Leave settings by picking anyother rail item; there is no separate back or fullscreen control.-Settings pages use the email composer’s raised surfaces on the page background.-Section headings and controls share a white surface in light mode and the-composer border in dark mode, with subtle row separators. The compact sidebar-uses the shared workspace width.+Settings pages use flat, light-gray cards with subtle row separators. Section+headings sit above the cards, with more space between major sections and compact+spacing within each group. Controls share rounded shapes. Nested rows share one surface instead of adding another box or shadow.+The compact sidebar uses the shared workspace width.When a newer version is ready, an **Update available** button (a download iconin a subtle accent circle that a glowing comet periodically circles) appears in@@ -234,8 +234,8 @@ Left nav (feature and platform gates still apply):results name their group, e.g. **Team · Members**.- **Blocks**: Email, Calendar, Agents, CRM.- **Personal**: Account, Appearance, Notifications, Keyboard shortcuts, Usage, Billing, Desktop App, Mobile App.-- **Workspace**: Tags, Integrations (personal Gmail/GitHub accounts).-- **Developer**: Agent connections, Runtimes, MCP server, API Keys, Bots.+- **Workspace**: Tags, Integrations (personal Gmail/GitHub accounts and agent tools).+- **Developer**: Runtimes, MCP server, API Keys, Bots.**Desktop App** (`/app/settings/desktop-app`) is titled**Desktop App (Alpha)** and shows a compact version and build-date card in the@@ -298,7 +298,7 @@ theme pill, then import it on another device or share it in a message forothers to copy and import.Existing settings URLs remain valid; `connections` still opens Integrations,-`agent-connections` opens Agent connections, and `harness` aliases Runtimes.+`agent-connections` aliases Integrations, and `harness` aliases Runtimes.`Usage` appears directly above Billing, including for Free accounts. Inproduction, the `enable-ai-usage-billing` PostHog flag controls activation. While@@ -468,7 +468,7 @@ to save the connection in the waiting app. Unconnected picks never blocksaving; each teammate connects their own account. An agent session that calls a pickedbut unconnected app gets a tool result saying so, and the agent's reply renders a`Connect <app>` chip that opens Agents → Connections for that app. The same page-is also available as Settings → Agent connections.+is also available as Settings → Integrations.Reference captures from an isolated browser fixture: [native waiting dialog](media/pipedream/native-waiting.png)and [browser return page](media/pipedream/browser-return.png). The fixture uses@@ -483,15 +483,48 @@ the picture after reopening settings and after a page reload, then type `@` andthe agent's name in a channel to check its mention-menu picture. Team agentsavailable in all channels should refresh there without reloading the channel.-With `pipedream-mcp` enabled, Connections (in Agents or Settings) has `Connected` and `Discover`-tabs. Connected groups GitHub, Linear, Notion, and Slack tool grants by provider,-lists other catalog connections alongside them, and puts custom MCP servers in-a separate section. Discover offers featured providers, a searchable catalog,-and `Add custom MCP`. Pipedream Slack OAuth is available in production and+++With `pipedream-mcp` enabled, Settings → Integrations labels the Email/GitHub+section Core Integrations and the connector section Agent Integrations, separated+by spacing without a divider. Installed tools use a two-column card grid (one+column on narrow screens), followed by Featured and All apps, without a Discover+heading or a separate installed sidebar. All apps has a gray Add Custom action beside its+heading. Search and the category picker share a row directly below that heading+and stack on narrow screens. The category picker uses a borderless light-gray+fill that matches the integration cards.+Installed, Featured, and All apps use headings above rounded cards. The overview uses+more space between major sections and consistent light gray card backgrounds.+Two thin, stacked setup rows appear at the top. “Use Macro in your favorite AI+harness with the official Macro MCP” opens connection setup; “Stream sessions+from your local AI harness to Macro” opens Runtimes within Integrations to connect+a local machine. Its Back button returns to Integrations; opening Runtimes from+Agents keeps the return to Agents. The local-harness setup row follows the+Runtimes availability gate and is hidden when that tab is unavailable.+Email, GitHub, and Granola cards appear next under Core Integrations;+they use two columns and share a height on wide screens, stacking on narrow screens. A small gear on the Email card opens Email settings;+Calendar settings remain available from the settings sidebar.+All apps groups each app under its first nonempty Pipedream category; apps without+category metadata appear under More apps. Categories lead with Productivity,+Communication, Developer Tools, AI, File Storage, and CRM; remaining categories+follow the configured work-app order, then alphabetically, with More apps last.+Search sits beside the category picker directly above the Pipedream catalog;+Featured remains visible while searching. Scrolling toward the end loads the next+page automatically and preserves category groups. A failed next page keeps loaded+apps visible and offers Retry. Use the category picker below+All apps to show one group; changing the search returns to all categories. Group+counts reflect the currently loaded results.+Featured and catalog cards use two columns on wide screens and one on narrow+screens, with a plus action for available apps. Featured cards show app names+without descriptions, and catalog descriptions+and connection status use readable body-sized text. The Agents workspace opens this same Integrations+page. Installed groups GitHub, Linear, Notion, and Slack tool grants by provider,+lists other catalog connections alongside them, and lists custom servers in the same installed grid. The available integrations include featured providers, a searchable catalog,+and `Add Custom`. Pipedream Slack OAuth is available in production anddevelopment from the featured Slack provider. Connecting Slack here grants toolaccess; channel import is a separate action where the user chooses channels.-Provider Back returns to the tab that opened it; navigation is local to each-Connections page and starts at Connected on a fresh visit.+Provider Back returns to the combined integrations overview; navigation+is local to each mounted Integrations page.Macro agents and external AI clients using Macro's MCP server can run`ImportNotionPage` and the shared import ledger tools against the user's@@ -518,7 +551,7 @@ owner's custom servers.An agent reply's `Connect <app>` chip still starts that app's connection flow.Cursor stays in Agents → Runtimes with its API key and default model controls; it is notfeatured or offered in the Connections catalog. Personal Gmail and GitHub account-links remain in Settings → Integrations. The native-only Connections page remains+links appear above the installed tools and app catalog on Settings → Integrations. The native-only integrations section remainsavailable when `pipedream-mcp` is disabled.Open Settings with the rail's gear button or `Ctrl+;`; leave it by picking any other rail item.diff --git a/packages/sdk-docs/reference/generated/cognition/types.gen/type-aliases/PipedreamCatalogEntryResponse.md b/packages/sdk-docs/reference/generated/cognition/types.gen/type-aliases/PipedreamCatalogEntryResponse.mdindex 12ef593cb7..5220a9ec87 100644--- a/packages/sdk-docs/reference/generated/cognition/types.gen/type-aliases/PipedreamCatalogEntryResponse.md+++ b/packages/sdk-docs/reference/generated/cognition/types.gen/type-aliases/PipedreamCatalogEntryResponse.md@@ -1,6 +1,6 @@# Type Alias: PipedreamCatalogEntryResponse-> **PipedreamCatalogEntryResponse** = \{ `app_slug`: `string`; `description?`: `string` \| `null`; `display_name`: `string`; `icon_url?`: `string` \| `null`; \}+> **PipedreamCatalogEntryResponse** = \{ `app_slug`: `string`; `categories?`: `string`[]; `description?`: `string` \| `null`; `display_name`: `string`; `icon_url?`: `string` \| `null`; \}One connectable app in the catalog.@@ -9,6 +9,7 @@ One connectable app in the catalog.| Property | Type | Description || ------ | ------ | ------ || <a id="property-app_slug"></a> `app_slug` | `string` | Pipedream app name slug — pass this to the connect flow. |+| <a id="property-categories"></a> `categories?` | `string`[] | Categories assigned by Pipedream. || <a id="property-description"></a> `description?` | `string` \| `null` | One-line description of the app. || <a id="property-display_name"></a> `display_name` | `string` | Human-readable name to display. || <a id="property-icon_url"></a> `icon_url?` | `string` \| `null` | URL of the app's icon, when available. |diff --git a/packages/sdk/generated/cognition/types.gen.ts b/packages/sdk/generated/cognition/types.gen.tsindex 086eafd91f..645b0f8c4a 100644--- a/packages/sdk/generated/cognition/types.gen.ts+++ b/packages/sdk/generated/cognition/types.gen.ts@@ -1072,6 +1072,10 @@ export type PipedreamCatalogEntryResponse = {* Pipedream app name slug — pass this to the connect flow.*/app_slug: string;+ /**+ * Categories assigned by Pipedream.+ */+ categories?: Array<string>;/*** One-line description of the app.*/diff --git a/packages/sdk/specs/cognition.json b/packages/sdk/specs/cognition.jsonindex 34ef75823b..53e220375c 100644--- a/packages/sdk/specs/cognition.json+++ b/packages/sdk/specs/cognition.json@@ -4409,6 +4409,13 @@"type": "string","description": "Pipedream app name slug — pass this to the connect flow."},+ "categories": {+ "type": "array",+ "items": {+ "type": "string"+ },+ "description": "Categories assigned by Pipedream."+ },"description": {"type": ["string", "null"],"description": "One-line description of the app."