Skip to content

armgit / macro

Public Imported from GitHub
0

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

feat(ai): list connections in the slash menu

Wolf Mermelsteinf462bb24a89c
diff --git a/apps/web/AGENTS.md b/apps/web/AGENTS.md
index a70ced4193..2e7de8396c 100644
--- a/apps/web/AGENTS.md
+++ b/apps/web/AGENTS.md
@@ -41,6 +41,10 @@ beside a scrolling editor whose selection runs past its visible bottom
(`clipToVisible`), have a backend-free browser regression:
`bunx playwright test --config src/lib/core/component/LexicalMarkdown/directive/browser-test/playwright.config.ts`.
+Composer `/` menus list Connections between Skills and Pull requests. Keep native
+and hosted providers aligned with `mcp_select::select_connections`, prefer native
+credentials per provider, and preserve editor focus on pointer and touch selection.
+
Undo in a large collaborative Markdown document (Loro undo, mirror, reconcile,
caret mapping) has a backend-free timing regression:
`bunx playwright test --config src/lib/core/component/LexicalMarkdown/collaboration/browser-test/playwright.config.ts`.
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/SkillsMenu/McpRow.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/SkillsMenu/McpRow.tsx
new file mode 100644
index 0000000000..86cb896999
--- /dev/null
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/SkillsMenu/McpRow.tsx
@@ -0,0 +1,48 @@
+import { PipedreamConnectorIcon } from '@core/pipedream/ConnectorIcon';
+import type { SlashMenuMcp } from '@queries/slash-menu-mcps';
+import { cn } from '@ui';
+import { createEffect } from 'solid-js';
+
+export function McpRow(props: {
+ item: SlashMenuMcp;
+ selected: boolean;
+ onSelect: () => void;
+ onHover: () => void;
+}) {
+ let ref: HTMLDivElement | undefined;
+ createEffect(() => {
+ if (props.selected) ref?.scrollIntoView({ block: 'nearest' });
+ });
+ return (
+ <div
+ ref={ref}
+ class={cn(
+ 'group flex items-center touch:min-h-[44px] p-1.5 mx-1.5 rounded-md',
+ {
+ 'bg-ink/5': props.selected,
+ }
+ )}
+ onPointerDown={(event) => event.preventDefault()}
+ onMouseDown={(event) => event.preventDefault()}
+ onMouseMove={props.onHover}
+ onClick={(event) => {
+ event.stopPropagation();
+ props.onSelect();
+ }}
+ >
+ <div class="mr-2 flex items-center">
+ <PipedreamConnectorIcon
+ appSlug={props.item.appSlug ?? ''}
+ class="size-4 shrink-0 text-ink-muted"
+ />
+ </div>
+ <span
+ class="min-w-0 max-w-full overflow-hidden text-nowrap text-ink text-xs sm:text-sm font-medium"
+ style={{ 'text-overflow': 'ellipsis' }}
+ title={props.item.name}
+ >
+ {props.item.name}
+ </span>
+ </div>
+ );
+}
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/SkillsMenu/SkillsMenu.test.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/SkillsMenu/SkillsMenu.test.tsx
index 7729ac3dc6..93d2b1fb18 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/SkillsMenu/SkillsMenu.test.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/SkillsMenu/SkillsMenu.test.tsx
@@ -76,6 +76,19 @@ vi.mock('@queries/soup/slash-menu-pull-requests', () => ({
],
}),
}));
+vi.mock('@queries/slash-menu-mcps', () => ({
+ useSlashMenuMcps: () => ({
+ loading: () => false,
+ error: () => false,
+ mcps: () => [
+ { id: 'pipedream:linear', name: 'Linear', appSlug: 'linear' },
+ { id: 'mcp:https://x.dev/mcp', name: 'Sentry MCP', appSlug: null },
+ ],
+ }),
+}));
+vi.mock('@core/pipedream/ConnectorIcon', () => ({
+ PipedreamConnectorIcon: () => null,
+}));
vi.mock('../MentionsMenu/hooks/useEntityMention', () => ({
useEntityMention: (options: { searchTerm: () => string }) => ({
entities: () =>
@@ -187,7 +200,7 @@ describe('skill slash menu', () => {
it('navigates across sections and inserts a PR chip then a command', () => {
const { dispatch, menu } = setup();
- for (let i = 0; i < 3; i++)
+ for (let i = 0; i < 5; i++)
fireEvent.keyDown(document, { key: 'ArrowDown' });
fireEvent.keyDown(document, { key: 'Enter' });
expect(dispatch).toHaveBeenCalledWith(INSERT_PR_MENTION_COMMAND, {
@@ -195,7 +208,7 @@ describe('skill slash menu', () => {
label: 'macro/app#42',
});
menu.openMenu();
- for (let i = 0; i < 4; i++)
+ for (let i = 0; i < 6; i++)
fireEvent.keyDown(document, { key: 'ArrowDown' });
fireEvent.keyDown(document, { key: 'Enter' });
expect(dispatch).toHaveBeenCalledWith(INSERT_AGENT_COMMAND_COMMAND, {
@@ -218,8 +231,36 @@ describe('skill slash menu', () => {
);
});
- it('keeps regular chat menus limited to skills with the same edit controls', () => {
+ it('lists connected MCPs and inserts the chosen one by name', () => {
+ const { editor, dispatch, menu } = setup();
+ const update = vi.spyOn(editor, 'update');
+ expect(screen.getByText('Connections')).toBeTruthy();
+ expect(screen.getByText('Sentry MCP')).toBeTruthy();
+ fireEvent.click(screen.getByText('Linear'));
+ expect(dispatch).toHaveBeenCalledWith(
+ REMOVE_AGENT_COMMAND_SEARCH_COMMAND,
+ undefined
+ );
+ expect(update).toHaveBeenCalledTimes(1);
+ expect(menu.isOpen()).toBe(false);
+ });
+
+ it('selects MCPs from the keyboard between skills and PRs', () => {
+ const { editor, dispatch } = setup();
+ const update = vi.spyOn(editor, 'update');
+ for (let i = 0; i < 3; i++)
+ fireEvent.keyDown(document, { key: 'ArrowDown' });
+ fireEvent.keyDown(document, { key: 'Enter' });
+ expect(update).toHaveBeenCalledTimes(1);
+ expect(dispatch).not.toHaveBeenCalledWith(
+ INSERT_PR_MENTION_COMMAND,
+ expect.anything()
+ );
+ });
+
+ it('keeps regular chat menus to skills and MCPs with the same edit controls', () => {
setup(false);
+ expect(screen.getByText('Linear')).toBeTruthy();
expect(screen.queryByText('Pull requests')).toBeNull();
expect(screen.queryByText('Commands')).toBeNull();
expect(screen.getByRole('button', { name: 'Edit My skill' })).toBeTruthy();
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/SkillsMenu/SkillsMenu.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/SkillsMenu/SkillsMenu.tsx
index a1278f0d9d..14460e464d 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/SkillsMenu/SkillsMenu.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/SkillsMenu/SkillsMenu.tsx
@@ -15,11 +15,12 @@ import { fireAndForget } from '@core/util/fireAndForget';
import { useIsKeyPressActive } from '@core/util/useIsKeyPressActive';
import type { GithubPullRequestEntity } from '@entity';
import PlusIcon from '@icon/system/regular/plus.svg';
+import { type SlashMenuMcp, useSlashMenuMcps } from '@queries/slash-menu-mcps';
import { useSlashMenuPullRequests } from '@queries/soup/slash-menu-pull-requests';
import { useSystemSkillsQuery } from '@queries/storage/system-skills';
import type { SystemSkillSummary } from '@service-storage/generated/schemas/systemSkillSummary';
import { cn, Surface } from '@ui';
-import type { LexicalEditor } from 'lexical';
+import { $createTextNode, $insertNodes, type LexicalEditor } from 'lexical';
import {
createEffect,
createMemo,
@@ -53,6 +54,7 @@ import { ItemBin } from '../MentionsMenu/components/ItemBin';
import { MentionsMenuItem } from '../MentionsMenu/components/MentionsMenuItem';
import { useEntityMention } from '../MentionsMenu/hooks/useEntityMention';
import { useMenuKeyboardNavigation } from '../useMenuKeyboardNavigation';
+import { McpRow } from './McpRow';
import { PullRequestRow } from './PullRequestRow';
import { SkillActions } from './SkillActions';
@@ -100,6 +102,7 @@ type SkillsMenuProps = {
* Typeahead menu opened by typing `/` in an AI markdown area. Lists skill
* documents the user can access; selecting one inserts a document mention
* for the skill at the cursor, which the AI reads with its document tools.
+ * Also lists the user's connected MCPs; selecting one names it in the prompt.
*/
export function SkillsMenu(props: SkillsMenuProps) {
return (
@@ -130,6 +133,17 @@ function SkillsMenuInner(props: SkillsMenuProps) {
...searchQuickAccessEntities(systemSkillItems(), activeSearchTerm()),
];
+ const {
+ mcps: allMcps,
+ loading: mcpsLoading,
+ error: mcpsError,
+ } = useSlashMenuMcps(props.menu.isOpen);
+ const mcps = createMemo(() => {
+ const term = activeSearchTerm().trim().toLowerCase();
+ return allMcps().filter((item) => item.name.toLowerCase().includes(term));
+ });
+ const pullRequestOffset = () => skills().length + mcps().length;
+
const commands = createMemo(() =>
filterCommands(props.agentCommands?.() ?? [], activeSearchTerm())
);
@@ -146,7 +160,7 @@ function SkillsMenuInner(props: SkillsMenuProps) {
.includes(term)
);
});
- const commandOffset = () => skills().length + pullRequests().length;
+ const commandOffset = () => pullRequestOffset() + pullRequests().length;
const newSkillIndex = () => commandOffset() + commands().length;
const [selectedIndex, setSelectedIndex] = createSignal(0);
@@ -221,6 +235,20 @@ function SkillsMenuInner(props: SkillsMenuProps) {
insertSkill(item);
};
+ /**
+ * MCP tools are already in the AI's toolset; naming the connection in the
+ * prompt steers it toward that server's tools.
+ */
+ const insertMcp = (item: SlashMenuMcp) => {
+ removeSearch();
+ const text = /\bmcp\b/i.test(item.name) ? item.name : `${item.name} MCP`;
+ props.editor.update(() => {
+ const textNode = $createTextNode(`${text} `);
+ $insertNodes([textNode]);
+ textNode.selectEnd();
+ });
+ };
+
const insertPullRequest = (item: GithubPullRequestEntity) => {
removeSearch();
props.editor.dispatchCommand(INSERT_PR_MENTION_COMMAND, {
@@ -284,11 +312,14 @@ function SkillsMenuInner(props: SkillsMenuProps) {
},
onSelect: () => {
const selectedItem = skills()[selectedIndex()];
+ const selectedMcp = mcps()[selectedIndex() - skills().length];
const selectedPullRequest =
- pullRequests()[selectedIndex() - skills().length];
+ pullRequests()[selectedIndex() - pullRequestOffset()];
const selectedCommand = commands()[selectedIndex() - commandOffset()];
if (selectedItem) {
itemAction(selectedItem);
+ } else if (selectedMcp) {
+ insertMcp(selectedMcp);
} else if (selectedPullRequest) {
insertPullRequest(selectedPullRequest);
} else if (selectedCommand) {
@@ -411,13 +442,53 @@ function SkillsMenuInner(props: SkillsMenuProps) {
</For>
</Show>
</ItemBin>
+ <div class="mt-2 border-t border-edge pt-2">
+ <ItemBin
+ label="Connections"
+ binType="connections"
+ isSelected={
+ selectedIndex() >= skills().length &&
+ selectedIndex() < pullRequestOffset()
+ }
+ >
+ <Show
+ when={mcps().length > 0}
+ fallback={
+ <div class="px-3.5 pb-2 text-xs text-ink-extra-muted">
+ {mcpsError()
+ ? 'Could not load connections'
+ : mcpsLoading()
+ ? 'Loading connections…'
+ : searchTerm()
+ ? 'No matching connections'
+ : 'No connections yet'}
+ </div>
+ }
+ >
+ <For each={mcps()}>
+ {(item, index) => (
+ <McpRow
+ item={item}
+ selected={
+ selectedIndex() === skills().length + index()
+ }
+ onHover={() =>
+ setSelectedIndexFromMouse(skills().length + index())
+ }
+ onSelect={() => insertMcp(item)}
+ />
+ )}
+ </For>
+ </Show>
+ </ItemBin>
+ </div>
<Show when={props.agentCommands}>
<div class="mt-2 border-t border-edge pt-2">
<ItemBin
label="Pull requests"
binType="pull-requests"
isSelected={
- selectedIndex() >= skills().length &&
+ selectedIndex() >= pullRequestOffset() &&
selectedIndex() < commandOffset()
}
>
@@ -438,11 +509,11 @@ function SkillsMenuInner(props: SkillsMenuProps) {
<PullRequestRow
item={item}
selected={
- selectedIndex() === skills().length + index()
+ selectedIndex() === pullRequestOffset() + index()
}
onHover={() =>
setSelectedIndexFromMouse(
- skills().length + index()
+ pullRequestOffset() + index()
)
}
onSelect={() => insertPullRequest(item)}
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/plugins/agent-commands/agentCommandsPlugin.ts b/apps/web/src/lib/core/component/LexicalMarkdown/plugins/agent-commands/agentCommandsPlugin.ts
index 2c7f9da588..6a3e25f5dc 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/plugins/agent-commands/agentCommandsPlugin.ts
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/plugins/agent-commands/agentCommandsPlugin.ts
@@ -89,7 +89,7 @@ function $getActiveCommandSearchNode(): InlineSearchNode | null {
/**
* Registers the `/` trigger for the agent commands menu. Typing `/` at a
* valid trigger position (start of line or after whitespace) opens a
- * combined skills, pull requests, and harness commands menu. Skills remain
+ * combined skills, MCPs, pull requests, and harness commands menu. Skills remain
* available before the agent advertises any commands. Selecting a command
* inserts `/name` as plain text at the cursor.
*
diff --git a/apps/web/src/lib/queries/mcp-servers.ts b/apps/web/src/lib/queries/mcp-servers.ts
index a5926002b1..29df0e899c 100644
--- a/apps/web/src/lib/queries/mcp-servers.ts
+++ b/apps/web/src/lib/queries/mcp-servers.ts
@@ -43,9 +43,12 @@ export function useMcpServersQuery(options?: {
* flash a fake "nothing connected" success state on first load.
*/
neverSuspend?: boolean;
+ /** Defer fetching until the surface needs the list. */
+ enabled?: () => boolean;
}) {
return useQuery(() => ({
...mcpServersQueryOptions(),
+ enabled: options?.enabled?.() ?? true,
refetchOnMount: 'always' as const,
refetchOnWindowFocus: 'always' as const,
refetchInterval: options?.refetchInterval,
diff --git a/apps/web/src/lib/queries/pipedream-connectors.ts b/apps/web/src/lib/queries/pipedream-connectors.ts
index 940a7c824b..cedd28803c 100644
--- a/apps/web/src/lib/queries/pipedream-connectors.ts
+++ b/apps/web/src/lib/queries/pipedream-connectors.ts
@@ -67,9 +67,12 @@ export function usePipedreamConnectionsQuery(options?: {
refetchInterval?: number;
/** See the same option on `useMcpServersQuery`. */
neverSuspend?: boolean;
+ /** See the same option on `useMcpServersQuery`. */
+ enabled?: () => boolean;
}) {
return useQuery(() => ({
...pipedreamConnectionsQueryOptions(),
+ enabled: options?.enabled?.() ?? true,
refetchOnMount: 'always' as const,
refetchOnWindowFocus: 'always' as const,
refetchInterval: options?.refetchInterval,
diff --git a/apps/web/src/lib/queries/slash-menu-mcps.test.ts b/apps/web/src/lib/queries/slash-menu-mcps.test.ts
new file mode 100644
index 0000000000..1220e2bcfd
--- /dev/null
+++ b/apps/web/src/lib/queries/slash-menu-mcps.test.ts
@@ -0,0 +1,190 @@
+import { createRoot } from 'solid-js';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { useSlashMenuMcps } from './slash-menu-mcps';
+
+const data = vi.hoisted(() => ({
+ nativePending: false,
+ pipedreamPending: false,
+ nativeError: false,
+ pipedreamError: false,
+ pipedream: [] as {
+ app_slug: string;
+ server_name: string;
+ enabled: boolean;
+ }[],
+ native: [] as {
+ url: string;
+ server_name: string;
+ enabled: boolean;
+ authenticated: boolean;
+ }[],
+}));
+
+vi.mock('@queries/pipedream-connectors', () => ({
+ usePipedreamConnectionsQuery: () => ({
+ get data() {
+ return data.pipedream;
+ },
+ get isPlaceholderData() {
+ return data.pipedreamPending;
+ },
+ get isPending() {
+ return data.pipedreamPending;
+ },
+ get isError() {
+ return data.pipedreamError;
+ },
+ }),
+}));
+vi.mock('@queries/mcp-servers', () => ({
+ useMcpServersQuery: () => ({
+ get data() {
+ return data.native;
+ },
+ get isPlaceholderData() {
+ return data.nativePending;
+ },
+ get isPending() {
+ return data.nativePending;
+ },
+ get isError() {
+ return data.nativeError;
+ },
+ }),
+}));
+
+function listMcps() {
+ return createRoot((dispose) => {
+ const result = useSlashMenuMcps(() => true).mcps();
+ dispose();
+ return result;
+ });
+}
+
+beforeEach(() => {
+ data.nativePending = false;
+ data.pipedreamPending = false;
+ data.nativeError = false;
+ data.pipedreamError = false;
+ data.pipedream = [];
+ data.native = [
+ {
+ url: 'https://mcp.sentry.dev/mcp',
+ server_name: 'Sentry',
+ enabled: true,
+ authenticated: true,
+ },
+ {
+ url: 'https://mcp.notion.com/mcp',
+ server_name: 'Unauthed',
+ enabled: true,
+ authenticated: false,
+ },
+ {
+ url: 'https://off.example.com/mcp',
+ server_name: 'Off',
+ enabled: false,
+ authenticated: true,
+ },
+ ];
+});
+
+describe('useSlashMenuMcps', () => {
+ it('lists enabled, authenticated native servers when there are no Pipedream connections', () => {
+ expect(listMcps()).toEqual([
+ { id: 'mcp:https://mcp.sentry.dev/mcp', name: 'Sentry', appSlug: null },
+ ]);
+ });
+
+ it('lists enabled hosted connectors alongside native connections', () => {
+ data.pipedream = [
+ { app_slug: 'linear', server_name: 'Linear', enabled: true },
+ { app_slug: 'asana', server_name: 'Asana', enabled: false },
+ ];
+ expect(listMcps()).toEqual([
+ { id: 'mcp:https://mcp.sentry.dev/mcp', name: 'Sentry', appSlug: null },
+ { id: 'pipedream:linear', name: 'Linear', appSlug: 'linear' },
+ ]);
+ });
+
+ it('keeps native connections when every hosted connector is disabled', () => {
+ data.pipedream = [
+ { app_slug: 'asana', server_name: 'Asana', enabled: false },
+ ];
+ expect(listMcps()).toEqual([
+ { id: 'mcp:https://mcp.sentry.dev/mcp', name: 'Sentry', appSlug: null },
+ ]);
+ });
+});
+
+it('prefers native credentials per provider and deduplicates endpoint and hosted aliases', () => {
+ data.native = [
+ {
+ url: 'https://mcp.linear.app/mcp/',
+ server_name: 'Issue tracker',
+ enabled: true,
+ authenticated: true,
+ },
+ {
+ url: 'https://mcp.linear.app/mcp',
+ server_name: 'Duplicate',
+ enabled: true,
+ authenticated: true,
+ },
+ ];
+ data.pipedream = [
+ { app_slug: 'linear', server_name: 'Linear hosted', enabled: true },
+ { app_slug: 'slack_v2', server_name: 'Slack v2', enabled: true },
+ { app_slug: 'slack', server_name: 'Slack', enabled: true },
+ ];
+ expect(listMcps()).toEqual([
+ {
+ id: 'mcp:https://mcp.linear.app/mcp',
+ name: 'Issue tracker',
+ appSlug: 'linear',
+ },
+ { id: 'pipedream:slack', name: 'Slack', appSlug: 'slack' },
+ ]);
+});
+
+it('includes enabled custom servers that do not require credentials', () => {
+ data.native = [
+ {
+ url: 'https://custom.example.com/mcp',
+ server_name: 'Custom',
+ enabled: true,
+ authenticated: false,
+ },
+ ];
+ expect(listMcps()).toEqual([
+ { id: 'mcp:https://custom.example.com/mcp', name: 'Custom', appSlug: null },
+ ]);
+});
+
+it('does not offer a hosted duplicate while native connections are unresolved', () => {
+ data.nativePending = true;
+ data.pipedream = [
+ { app_slug: 'linear', server_name: 'Linear', enabled: true },
+ ];
+ expect(listMcps()).toEqual([]);
+});
+
+it('retains loaded native connections while hosted connections load', () => {
+ data.pipedreamPending = true;
+ expect(listMcps()).toEqual([
+ { id: 'mcp:https://mcp.sentry.dev/mcp', name: 'Sentry', appSlug: null },
+ ]);
+});
+
+it('reports initial failures separately from loading', () => {
+ data.native = [];
+ data.nativeError = true;
+ data.pipedreamError = true;
+ createRoot((dispose) => {
+ const result = useSlashMenuMcps(() => true);
+ expect(result.error()).toBe(true);
+ expect(result.loading()).toBe(false);
+ expect(result.mcps()).toEqual([]);
+ dispose();
+ });
+});
diff --git a/apps/web/src/lib/queries/slash-menu-mcps.ts b/apps/web/src/lib/queries/slash-menu-mcps.ts
new file mode 100644
index 0000000000..8b42bff54a
--- /dev/null
+++ b/apps/web/src/lib/queries/slash-menu-mcps.ts
@@ -0,0 +1,87 @@
+import { QUICK_CONNECT_SERVERS } from '@core/component/AI/constant/mcpServers';
+import { canonicalPipedreamSlug } from '@core/pipedream/slugs';
+import { queryReadyGate } from '@queries/gate';
+import { useMcpServersQuery } from '@queries/mcp-servers';
+import { usePipedreamConnectionsQuery } from '@queries/pipedream-connectors';
+import { createMemo } from 'solid-js';
+
+/** An MCP connection the AI can currently use, as the `/` menu lists it. */
+export type SlashMenuMcp = {
+ id: string;
+ name: string;
+ /** Provider slug for its bundled icon; null for custom native servers. */
+ appSlug: string | null;
+};
+
+/** Mirrors `mcp_select::select_connections`: native credentials win per provider. */
+export function useSlashMenuMcps(enabled: () => boolean) {
+ const pipedream = usePipedreamConnectionsQuery({
+ neverSuspend: true,
+ enabled,
+ });
+ const native = useMcpServersQuery({ neverSuspend: true, enabled });
+
+ const nativeMcps = createMemo((): SlashMenuMcp[] => {
+ if (native.isPlaceholderData || !queryReadyGate(native)) return [];
+ const endpoints = new Set<string>();
+ return native.data.flatMap((server) => {
+ const endpoint = server.url.replace(/\/+$/, '');
+ const provider = QUICK_CONNECT_SERVERS.find(
+ (item) => item.url === endpoint
+ );
+ if (
+ !server.enabled ||
+ (provider && !server.authenticated) ||
+ endpoints.has(endpoint)
+ )
+ return [];
+ endpoints.add(endpoint);
+ return [
+ {
+ id: `mcp:${endpoint}`,
+ name: server.server_name,
+ appSlug: provider?.app_slug ?? null,
+ },
+ ];
+ });
+ });
+
+ const mcps = createMemo((): SlashMenuMcp[] => {
+ const servers = nativeMcps();
+ // Wait for native selection before offering a duplicate hosted provider.
+ if (native.isPlaceholderData || !queryReadyGate(native)) return servers;
+ if (pipedream.isPlaceholderData || !queryReadyGate(pipedream))
+ return servers;
+ const providers = new Set(
+ servers.flatMap((item) => (item.appSlug ? [item.appSlug] : []))
+ );
+ const connections = [...pipedream.data].sort(
+ (a, b) =>
+ Number(a.app_slug !== canonicalPipedreamSlug(a.app_slug)) -
+ Number(b.app_slug !== canonicalPipedreamSlug(b.app_slug))
+ );
+ return [
+ ...servers,
+ ...connections.flatMap((connection) => {
+ const slug = canonicalPipedreamSlug(connection.app_slug);
+ if (!connection.enabled || providers.has(slug)) return [];
+ providers.add(slug);
+ return [
+ {
+ id: `pipedream:${connection.app_slug}`,
+ name: connection.server_name,
+ appSlug: connection.app_slug,
+ },
+ ];
+ }),
+ ];
+ });
+
+ const loading = () =>
+ [native, pipedream].some(
+ (query) => !query.isError && (query.isPending || query.isPlaceholderData)
+ );
+ const error = () => native.isError || pipedream.isError;
+
+ return { mcps, loading, error };
+}
diff --git a/docs/agent-guide/ai-chat.md b/docs/agent-guide/ai-chat.md
index 0dd42b7102..e96ce9ef9f 100644
--- a/docs/agent-guide/ai-chat.md
+++ b/docs/agent-guide/ai-chat.md
@@ -570,7 +570,14 @@ the shimmer.
through other hints. Clearing a draft restores the same hint.
Coding agents show **Describe what you want to build**; phones keep the short
**Message Macro AI** placeholder. Type `@` for
- mentions and `/` for skills.
+ mentions and `/` for skills and connections. The **Connections** section lists enabled native
+ servers and Pipedream connectors, preferring the native connection when both
+ provide the same tools. Selecting one inserts its name as plain text
+ (`Linear MCP `) to steer the model toward those tools. Loading and failed
+ connection reads have distinct states; disabled connections are omitted.
+ See the slash menu on [desktop](media/ai-chat/slash-connections-desktop.png)
+ and [phone](media/ai-chat/slash-connections-phone.png).
+
Check `/` with the Android software keyboard too: the skills menu should open
and filter while typing, without sending the draft.
- Opening a conversation updates the URL based on that conversation's kind:
@@ -1334,10 +1341,10 @@ An agent session is `/app/agent/<uuid>`. The composer placeholder is
**`Message the agent, @mention anything`**. Creating one (`c` then `a`, or
`Create` → `Agent`) leaves that composer focused — on mobile that is the same
Create-menu `triggerFocusInput` as chat, so the keyboard opens. Type `/` to
-open sections for **Skills**, **Pull requests**, and **Commands**. Skills are
-available even before the connected agent advertises commands. Select a skill
-to insert its mention, a pull request to reference it, or a harness command
-to insert `/name` as text. Search filters all sections; arrow keys move across
+open sections for **Skills**, **Connections**, **Pull requests**, and **Commands**.
+Skills are available even before the connected agent advertises commands.
+Select a skill to insert its mention, a connection to name it as text, a pull
+request to reference it, or a harness command to insert `/name` as text. Search filters all sections; arrow keys move across
sections and Enter selects the highlighted item. Saved skills have an **Edit**
button that opens their document editor; skills you own also have **Delete**,
which opens the usual deletion confirmation. Built-in skills have no edit or
diff --git a/docs/agent-guide/media/ai-chat/slash-connections-desktop.png b/docs/agent-guide/media/ai-chat/slash-connections-desktop.png
new file mode 100644
index 0000000000..036a518d3a
Binary files /dev/null and b/docs/agent-guide/media/ai-chat/slash-connections-desktop.png differ
diff --git a/docs/agent-guide/media/ai-chat/slash-connections-phone.png b/docs/agent-guide/media/ai-chat/slash-connections-phone.png
new file mode 100644
index 0000000000..ae916fcab7
Binary files /dev/null and b/docs/agent-guide/media/ai-chat/slash-connections-phone.png differ