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(web): add agents sidebar navigation and move MCP connections (#6713)

Eric Hayes5277c61f12e3
diff --git a/apps/web/src/components/app/split-layout/componentRegistry.tsx b/apps/web/src/components/app/split-layout/componentRegistry.tsx
index 05a2d57abc..6f50a41630 100644
--- a/apps/web/src/components/app/split-layout/componentRegistry.tsx
+++ b/apps/web/src/components/app/split-layout/componentRegistry.tsx
@@ -24,6 +24,7 @@ import { NonMemberChannelPreview } from '@app/features/next-soup/soup-view/non-m
import { SoupView } from '@app/features/next-soup/soup-view/soup-view';
import { useRecentViewFlag } from '@app/features/next-soup/use-recent-view-flag';
import { ReminderEditorSplit } from '@app/features/reminders/ReminderEditorSplit';
+import { McpConnections } from '@app/features/settings/McpConnections';
import { SettingsPanelComponentWrapper } from '@app/features/settings/Settings';
import { TasksView } from '@app/features/tasks-view/tasks-view';
import { useAnalytics } from '@app/lib/analytics/analytics-context';
@@ -417,6 +418,13 @@ function RegisteredAgentsView(params: ComponentParams) {
const panel = useSplitPanelOrThrow();
const agentsFlag = useFeatureFlag(enableChatV3Agents);
const useAgentsWorkspace = () => agentsFlag().enabled && !isTouchDevice();
+ const connectionsRequested = () => {
+ const content = panel.handle.content();
+ return (
+ content.type === 'component' &&
+ content.params?.agentPage === 'connections'
+ );
+ };
createRenderEffect(() => {
if (agentsFlag().loading) return;
@@ -430,19 +438,26 @@ function RegisteredAgentsView(params: ComponentParams) {
<Show
when={useAgentsWorkspace()}
fallback={
- route ? (
- <RedirectSplit
- to={{
- type:
- route.conversation.type === 'agent_session'
- ? 'agent'
- : 'chat',
- id: route.conversation.id,
- }}
- />
- ) : (
- <LegacyAgentsView />
- )
+ <Show
+ when={connectionsRequested()}
+ fallback={
+ route ? (
+ <RedirectSplit
+ to={{
+ type:
+ route.conversation.type === 'agent_session'
+ ? 'agent'
+ : 'chat',
+ id: route.conversation.id,
+ }}
+ />
+ ) : (
+ <LegacyAgentsView />
+ )
+ }
+ >
+ <McpConnections />
+ </Show>
}
>
<AgentsView initialRoute={route} />
diff --git a/apps/web/src/features/agents-view/components/AgentsSidebar.test.tsx b/apps/web/src/features/agents-view/components/AgentsSidebar.test.tsx
index 926a740570..6be04afed5 100644
--- a/apps/web/src/features/agents-view/components/AgentsSidebar.test.tsx
+++ b/apps/web/src/features/agents-view/components/AgentsSidebar.test.tsx
@@ -145,8 +145,11 @@ describe('mixed Agents sidebar', () => {
];
const open = vi.fn();
const create = vi.fn();
+ const openPage = vi.fn();
render(() => (
<AgentsSidebar
+ activePage="new"
+ onOpenPage={openPage}
groups={groupConversations(conversations)}
modeForConversation={(conversation) =>
conversation.id === 'code' ? 'code' : 'chat'
@@ -164,6 +167,11 @@ describe('mixed Agents sidebar', () => {
onLoadMore={vi.fn()}
/>
));
+ for (const label of ['Agents', 'Connections']) {
+ fireEvent.click(screen.getByRole('button', { name: label }));
+ expect(openPage).toHaveBeenLastCalledWith(label.toLowerCase());
+ }
+ expect(screen.queryByRole('button', { name: 'Routines' })).toBeNull();
expect(screen.queryByRole('tablist')).toBeNull();
const code = screen.getByRole('button', { name: /Fix build/ });
const chat = screen.getByRole('button', { name: /Plan launch/ });
@@ -184,6 +192,8 @@ describe('mixed Agents sidebar', () => {
it('opens rename and delete on a session or chat right-click', async () => {
render(() => (
<AgentsSidebar
+ activePage="new"
+ onOpenPage={vi.fn()}
groups={groupConversations([
{
type: 'agent_session',
@@ -256,6 +266,8 @@ describe.each(['home', 'sidebar'] as const)('%s agent rows', (surface) => {
/>
) : (
<AgentsSidebar
+ activePage="new"
+ onOpenPage={vi.fn()}
groups={groupConversations([conversation])}
modeForConversation={() => 'code'}
activeConversationId={undefined}
diff --git a/apps/web/src/features/agents-view/components/AgentsSidebar.tsx b/apps/web/src/features/agents-view/components/AgentsSidebar.tsx
index dd826697cc..c42b363945 100644
--- a/apps/web/src/features/agents-view/components/AgentsSidebar.tsx
+++ b/apps/web/src/features/agents-view/components/AgentsSidebar.tsx
@@ -18,11 +18,14 @@ import {
import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';
import ChatIcon from '@phosphor/chat-circle.svg';
import MagnifyingGlassIcon from '@phosphor/magnifying-glass.svg';
+import PlugIcon from '@phosphor/plugs-connected.svg';
+import AgentIcon from '@phosphor/sparkle.svg';
import { Key } from '@solid-primitives/keyed';
import { cn } from '@ui';
import { createSignal, type JSX, Show } from 'solid-js';
import { compactAge } from '../core/format-age';
import type { AgentsMode } from '../core/mode';
+import type { AgentsPage } from '../core/pages';
import {
type AgentConversationEntity,
type ConversationGroup,
@@ -36,6 +39,8 @@ const AGENTS_ACTION_VIEW_CONTEXT: EntityActionViewContext = {
};
export type AgentsSidebarProps = {
+ activePage: AgentsPage | undefined;
+ onOpenPage: (page: AgentsPage) => void;
modeForConversation: (conversation: AgentConversationEntity) => AgentsMode;
activeConversationId: string | undefined;
search: string;
@@ -174,7 +179,27 @@ export function AgentsSidebar(props: AgentsSidebarProps) {
/>
</ViewSidebar.Primary>
- <ViewSidebar.Content class="overflow-hidden">
+ <ViewSidebar.Content class="gap-2 overflow-hidden pt-2">
+ <ViewSidebar.Nav aria-label="Agent tools">
+ <ViewSidebar.Item
+ active={props.activePage === 'agents'}
+ onClick={() => props.onOpenPage('agents')}
+ >
+ <ViewSidebar.Icon>
+ <AgentIcon />
+ </ViewSidebar.Icon>
+ <span>Agents</span>
+ </ViewSidebar.Item>
+ <ViewSidebar.Item
+ active={props.activePage === 'connections'}
+ onClick={() => props.onOpenPage('connections')}
+ >
+ <ViewSidebar.Icon>
+ <PlugIcon />
+ </ViewSidebar.Icon>
+ <span>Connections</span>
+ </ViewSidebar.Item>
+ </ViewSidebar.Nav>
<CollapsibleSection.Root
open={conversationsOpen()}
onOpenChange={setConversationsOpen}
diff --git a/apps/web/src/features/agents-view/core/pages.ts b/apps/web/src/features/agents-view/core/pages.ts
index 8ff3ca2f7c..c1c0d3caa5 100644
--- a/apps/web/src/features/agents-view/core/pages.ts
+++ b/apps/web/src/features/agents-view/core/pages.ts
@@ -1,6 +1,7 @@
-/**
- * The pages the Agents workspace can show in place of a conversation. Agents
- * is the settings-style roster (agents, coders, runtimes); everything else the
- * old page list offered lives in Settings or behind the composer's `/` menu.
- */
-export type AgentsPage = 'new' | 'agents';
+/** Pages shown in the Agents workspace in place of a conversation. */
+export type AgentsPage = 'new' | 'agents' | 'connections';
+
+export function parseAgentsPage(value: unknown): AgentsPage | undefined {
+ if (value === 'new' || value === 'agents' || value === 'connections')
+ return value;
+}
diff --git a/apps/web/src/features/agents-view/primitives/chat-composer-tip.ts b/apps/web/src/features/agents-view/primitives/chat-composer-tip.ts
index aac42f96cf..eff2e319e4 100644
--- a/apps/web/src/features/agents-view/primitives/chat-composer-tip.ts
+++ b/apps/web/src/features/agents-view/primitives/chat-composer-tip.ts
@@ -1,7 +1,7 @@
import { type Accessor, createSignal, onCleanup, onMount } from 'solid-js';
const TIPS = [
- 'Connect your apps in Settings → Connections',
+ 'Connect your apps in Agents → Connections',
'Type / to add a skill',
'Type @ to mention docs, people, or channels',
'Choose an agent to change who helps',
diff --git a/apps/web/src/features/agents-view/primitives/open-page.test.ts b/apps/web/src/features/agents-view/primitives/open-page.test.ts
new file mode 100644
index 0000000000..51c70f46a3
--- /dev/null
+++ b/apps/web/src/features/agents-view/primitives/open-page.test.ts
@@ -0,0 +1,32 @@
+import type { SplitContent } from '@components/app/split-layout/layoutManager';
+import { describe, expect, it, vi } from 'vitest';
+import { openAgentsPage } from './open-page';
+
+describe('openAgentsPage', () => {
+ it('requests Connections again when the workspace is already open on another page', () => {
+ let content: SplitContent = { type: 'component', id: 'agents' };
+ const replace = vi.fn(({ next }: { next: SplitContent }) => {
+ content = next;
+ });
+ const openWithSplit = vi.fn(() => ({ content: () => content, replace }));
+ // Only the navigation handle's content and replace capabilities are exercised.
+ const layout = { openWithSplit } as unknown as Parameters<
+ typeof openAgentsPage
+ >[0];
+ openAgentsPage(layout, 'connections');
+ const first = content;
+ openAgentsPage(layout, 'connections');
+ expect(replace).toHaveBeenCalledTimes(2);
+ expect(content).not.toEqual(first);
+ expect(content).toMatchObject({
+ id: 'agents',
+ params: { agentPage: 'connections' },
+ });
+ });
+
+ it('allows navigation to be intercepted', () => {
+ expect(() =>
+ openAgentsPage({ openWithSplit: () => undefined }, 'connections')
+ ).not.toThrow();
+ });
+});
diff --git a/apps/web/src/features/agents-view/primitives/open-page.ts b/apps/web/src/features/agents-view/primitives/open-page.ts
new file mode 100644
index 0000000000..7d0f39b7d9
--- /dev/null
+++ b/apps/web/src/features/agents-view/primitives/open-page.ts
@@ -0,0 +1,24 @@
+import type { SplitManager } from '@components/app/split-layout/layoutManager';
+import type { AgentsPage } from '../core/pages';
+
+/** Open a workspace page, also when an Agents split is already mounted. */
+export function openAgentsPage(
+ layout: Pick<SplitManager, 'openWithSplit'>,
+ page: AgentsPage
+) {
+ const content = {
+ type: 'component' as const,
+ id: 'agents',
+ preserveParams: true,
+ params: { agentPage: page, agentPageRequest: crypto.randomUUID() },
+ };
+ const split = layout.openWithSplit(content, { activate: true });
+ if (!split) return;
+ const current = split.content();
+ if (
+ current.type !== 'component' ||
+ current.params?.agentPageRequest !== content.params.agentPageRequest
+ ) {
+ split.replace({ next: content, mergeHistory: true });
+ }
+}
diff --git a/apps/web/src/features/agents-view/views/AgentsView.tsx b/apps/web/src/features/agents-view/views/AgentsView.tsx
index a5e42810e5..14a04d705a 100644
--- a/apps/web/src/features/agents-view/views/AgentsView.tsx
+++ b/apps/web/src/features/agents-view/views/AgentsView.tsx
@@ -1,6 +1,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 { McpConnections } from '@app/features/settings/McpConnections';
import { useGlobalBlockOrchestrator } from '@components/app/GlobalAppState';
import { PreviewPanel } from '@components/app/PreviewPanel';
import { useSplitLayout } from '@components/app/split-layout/layout';
@@ -46,7 +47,7 @@ import { Topbar } from '../components/Topbar';
import { DataModeProvider, dataModeFor } from '../context/data-mode';
import { type AgentKind, modeForKind } from '../core/agent-kind';
import type { AgentsMode } from '../core/mode';
-import type { AgentsPage } from '../core/pages';
+import { type AgentsPage, parseAgentsPage } from '../core/pages';
import {
type AgentConversationEntity,
type AgentConversationTarget,
@@ -178,6 +179,28 @@ function AgentsWorkspace(props: { initialRoute?: AgentsRoute }) {
}
)
);
+ const openPage = (next: AgentsPage) => {
+ setSelected(undefined);
+ setPage(next);
+ };
+ createEffect(
+ on(
+ () => {
+ const content = panel.handle.content();
+ return content.type === 'component'
+ ? content.params?.agentPageRequest
+ : undefined;
+ },
+ () => {
+ const content = panel.handle.content();
+ const next =
+ content.type === 'component'
+ ? parseAgentsPage(content.params?.agentPage)
+ : undefined;
+ if (next) openPage(next);
+ }
+ )
+ );
const openRoster = (kind: AgentKind) => {
setSelected(undefined);
setRosterKind(kind);
@@ -199,7 +222,10 @@ function AgentsWorkspace(props: { initialRoute?: AgentsRoute }) {
});
return;
}
- if (panel.handle.content().id === next.id) return;
+ if (panel.handle.content().id === next.id) {
+ setSelected({ conversation, activeConversationId: conversation.id });
+ return;
+ }
panel.handle.replace({ next, referredFrom: 'agents' });
};
const startConversation = (start: StartConversation) => {
@@ -294,6 +320,7 @@ function AgentsWorkspace(props: { initialRoute?: AgentsRoute }) {
const pageTitle = () => {
if (page() === 'agents') return 'Agents';
+ if (page() === 'connections') return 'Connections';
return 'New conversation';
};
@@ -322,6 +349,10 @@ function AgentsWorkspace(props: { initialRoute?: AgentsRoute }) {
>
<ViewShell.Aside>
<AgentsSidebar
+ activePage={selected() ? undefined : page()}
+ onOpenPage={(next) =>
+ next === 'agents' ? openRoster('agent') : openPage(next)
+ }
modeForConversation={modeForConversation}
activeConversationId={selected()?.activeConversationId}
search={search()}
@@ -355,6 +386,9 @@ function AgentsWorkspace(props: { initialRoute?: AgentsRoute }) {
<div class="body">
<Suspense fallback={<LoadingComposer />}>
<Switch>
+ <Match when={page() === 'connections'}>
+ <McpConnections />
+ </Match>
<Match when={page() === 'agents'}>
<RosterPage
kind={rosterKind()}
diff --git a/apps/web/src/features/home/chat-tips.tsx b/apps/web/src/features/home/chat-tips.tsx
index bc53ba8690..9c2e4b9d0d 100644
--- a/apps/web/src/features/home/chat-tips.tsx
+++ b/apps/web/src/features/home/chat-tips.tsx
@@ -1,4 +1,6 @@
import { LIST_VIEW_DOCS_URL } from '@app/constants/docs-links';
+import { openAgentsPage } from '@app/features/agents-view/primitives/open-page';
+import { useSplitLayout } from '@components/app/split-layout/layout';
import { useSettingsState } from '@core/constant/SettingsState';
import ArrowUpRightIcon from '@phosphor/arrow-up-right.svg';
import AtIcon from '@phosphor/at.svg';
@@ -15,6 +17,7 @@ import { SetupRow } from './home-rows';
* sends, tool/agent connections, and the agent docs.
*/
export function ChatTipsSection() {
+ const layout = useSplitLayout();
const { openSettings } = useSettingsState();
return (
@@ -45,7 +48,7 @@ export function ChatTipsSection() {
trailing={
<ChevronRightIcon class="size-4 shrink-0 text-ink-extra-muted" />
}
- onActivate={() => openSettings('Connected')}
+ onActivate={() => openAgentsPage(layout, 'connections')}
/>
<SetupRow
icon={<PuzzlePieceIcon class="size-4" />}
diff --git a/apps/web/src/features/home/home-hub.tsx b/apps/web/src/features/home/home-hub.tsx
index e6caa5b592..69efc0e739 100644
--- a/apps/web/src/features/home/home-hub.tsx
+++ b/apps/web/src/features/home/home-hub.tsx
@@ -1,7 +1,9 @@
import { DOCS_BASE } from '@app/constants/docs-links';
import { LIST_VIEW_PATHS } from '@app/constants/list-views';
+import { openAgentsPage } from '@app/features/agents-view/primitives/open-page';
import { globalSplitManager } from '@app/signal/splitLayout';
import { useGlobalNotificationSource } from '@components/app/GlobalAppState';
+import { useSplitLayout } from '@components/app/split-layout/layout';
import { useChatInputContext } from '@core/component/AI/context';
import { EntityIcon, getEntityIconType } from '@core/component/EntityIcon';
import { useSettingsState } from '@core/constant/SettingsState';
@@ -241,7 +243,7 @@ function useConnectionsCount() {
/** Onboarding rows. Hidden on mobile. */
export function GettingStartedSection(props: { preferences: HomePreferences }) {
- const { openSettings } = useSettingsState();
+ const layout = useSplitLayout();
const connectionsCount = useConnectionsCount();
const showConnectRow = () => connectionsCount() < CONNECTION_GOAL;
@@ -265,7 +267,7 @@ export function GettingStartedSection(props: { preferences: HomePreferences }) {
<SetupRow
icon={<PlusIcon class="size-4" />}
title="Connect your tools"
- desc="Link your inbox, Linear, Notion, GitHub & more"
+ desc="Connect Linear, Notion, GitHub & more"
trailing={
<span class="flex items-center gap-2">
<span class="text-xs tabular-nums text-ink-extra-muted">
@@ -275,7 +277,7 @@ export function GettingStartedSection(props: { preferences: HomePreferences }) {
<ChevronRightIcon class="size-4 shrink-0 text-ink-extra-muted" />
</span>
}
- onActivate={() => openSettings('Connected')}
+ onActivate={() => openAgentsPage(layout, 'connections')}
/>
</Show>
<SetupRow
diff --git a/apps/web/src/features/settings/ConnectedAccounts.tsx b/apps/web/src/features/settings/ConnectedAccounts.tsx
index e128552614..88f41e32b4 100644
--- a/apps/web/src/features/settings/ConnectedAccounts.tsx
+++ b/apps/web/src/features/settings/ConnectedAccounts.tsx
@@ -1,21 +1,11 @@
import { ENABLE_EMAIL } from '@core/constant/featureFlags';
-import { usePipedreamMcpFlag } from '@core/pipedream/flag';
import { Show, Suspense } from 'solid-js';
import { EmailCard } from './Email';
import { GitHubCard } from './GitHub';
-import { IntegrationsSection } from './Integrations';
-import { PipedreamIntegrationsSection } from './PipedreamIntegrations';
import { SettingsPage, SettingsSection } from './primitives';
-/**
- * The "Integrations" settings tab: one card per external account the user can
- * link (Gmail, GitHub), followed by the agent's MCP integrations. The agents
- * sidebar has its own MCP-only Connections page (see `McpConnections.tsx`);
- * the MCP section stays here too because deep links (the agent reply's
- * "Connect X" chip, the home hub's setup rows) open this tab to connect an app.
- */
+/** Personal account links. Agent MCP integrations live in Connections. */
export function ConnectedAccounts() {
- const pipedreamMcp = usePipedreamMcpFlag();
return (
<SettingsPage
title="Integrations"
@@ -33,11 +23,6 @@ export function ConnectedAccounts() {
</Suspense>
</div>
</SettingsSection>
- <Suspense>
- <Show when={pipedreamMcp()} fallback={<IntegrationsSection />}>
- <PipedreamIntegrationsSection />
- </Show>
- </Suspense>
</SettingsPage>
);
}
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/ConnectApp.test.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/ConnectApp.test.tsx
index 5646a449cc..fa42ebe1d9 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/ConnectApp.test.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/ConnectApp.test.tsx
@@ -4,6 +4,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';
const mocks = vi.hoisted(() => ({
openSettings: vi.fn(),
+ openAgentsPage: vi.fn(),
requestConnectApp: vi.fn(),
pipedreamSlugs: new Set<string>(),
cursor: { isSuccess: true, isLoading: false, data: { registered: false } },
@@ -13,6 +14,12 @@ const mocks = vi.hoisted(() => ({
},
claude: { isLoading: false, data: { connected: false } },
}));
+vi.mock('@app/features/agents-view/primitives/open-page', () => ({
+ openAgentsPage: mocks.openAgentsPage,
+}));
+vi.mock('@components/app/split-layout/layout', () => ({
+ useSplitLayout: () => ({}),
+}));
vi.mock('@core/context/user', () => ({
useUserId: () => () => 'macro|[email protected]',
}));
@@ -70,7 +77,8 @@ describe('connect-app chip', () => {
));
fireEvent.click(screen.getByRole('button', { name: 'Connect Linear' }));
expect(mocks.requestConnectApp).toHaveBeenCalledWith('linear');
- expect(mocks.openSettings).toHaveBeenCalledWith('Connected');
+ expect(mocks.openAgentsPage).toHaveBeenCalledWith({}, 'connections');
+ expect(mocks.openSettings).not.toHaveBeenCalled();
});
it('sends a harness chip to the Harness page without touching Pipedream', () => {
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/ConnectApp.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/ConnectApp.tsx
index cfa996eae9..f70cded705 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/ConnectApp.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/ConnectApp.tsx
@@ -1,3 +1,5 @@
+import { openAgentsPage } from '@app/features/agents-view/primitives/open-page';
+import { useSplitLayout } from '@components/app/split-layout/layout';
import { HarnessIcon } from '@core/component/HarnessIcon';
import { useSettingsState } from '@core/constant/SettingsState';
import { useUserId } from '@core/context/user';
@@ -27,7 +29,7 @@ export function ConnectApp(props: ConnectAppDecoratorProps) {
}
function ConnectPipedreamApp(props: ConnectAppDecoratorProps) {
- const { openSettings } = useSettingsState();
+ const layout = useSplitLayout();
const connections = usePipedreamConnectedSlugs();
return (
<ConnectChip
@@ -37,9 +39,9 @@ function ConnectPipedreamApp(props: ConnectAppDecoratorProps) {
}
icon={<PipedreamConnectorIcon appSlug={props.appSlug} class="size-3.5" />}
onConnect={() => {
- // The Integrations tab picks this up and starts the Connect flow.
+ // Connections picks this up and starts the Connect flow.
requestConnectApp(props.appSlug);
- openSettings('Connected');
+ openAgentsPage(layout, 'connections');
}}
/>
);
diff --git a/docs/AGENT_GUIDE/ai-chat.md b/docs/AGENT_GUIDE/ai-chat.md
index d33e9122ee..b9e36298e0 100644
--- a/docs/AGENT_GUIDE/ai-chat.md
+++ b/docs/AGENT_GUIDE/ai-chat.md
@@ -11,6 +11,12 @@
- Open **Go to Agents** → `/app/component/agents`. With AI agents enabled
(`enable-chat-v3-agents`), the workspace uses one sidebar for Chat and Code.
+ Below **New conversation**, **Agents** 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.
+ Home’s **Connect your tools** and agent replies’ **Connect app** chips open this
+ Connections page. Personal Gmail/GitHub account links remain under Settings →
+ Integrations.
**New conversation** opens the composer. **Conversations** is a mixed list
of chats and coding sessions, newest first, with one search across both.
Chat rows use a chat icon; coding rows use `</>` (the PR status icon when a
diff --git a/docs/AGENT_GUIDE/surfaces.md b/docs/AGENT_GUIDE/surfaces.md
index 8652f0009f..29f10af9f0 100644
--- a/docs/AGENT_GUIDE/surfaces.md
+++ b/docs/AGENT_GUIDE/surfaces.md
@@ -760,7 +760,7 @@ Workspace, and enabled agent/admin sections. Tap a row to open that settings
page inside the sheet; **Back to settings** returns to the grouped list at its
previous scroll position. **Close settings** at the top right, Escape, an
outside tap, or a downward swipe dismisses the sheet. Opening Settings again
-starts at the main page; explicit links (for example Connections) open their
+starts at the main page; explicit links (for example Account) open their
section directly. Existing settings URLs open the requested section in the sheet
and restore the underlying app route. The header stays visible while forms
scroll, including with the keyboard open. Desktop settings retain their panel
@@ -774,7 +774,7 @@ Workspace → `Team`, `Tags`, `CRM` (enable/disable; once enabled, a `Deal stage
with `Customize stages`, inline rename, reorder by drag handle or arrow keys (up/down
buttons on touch), delete, `Add stage`, `Reset to defaults`, and `Closed stages`
checkboxes, editable by the role set as `edit_stages_role`),
-`Connections` (email/tool OAuth), `MCP server`
+`Integrations` (personal Gmail/GitHub accounts), `MCP server`
(setup snippets for Claude Code / Codex CLI / Claude.ai / ChatGPT / IDE), `Agents`, `Bots`, `Harness`;
`Log out`.
`Agents` lists team and private agents with `Create agent` / `Edit <name>` dialogs grouped
@@ -786,7 +786,8 @@ with a connected / not-connected dot for the *current viewer* plus an inline `Co
that opens the Pipedream Connect flow inside the dialog. Unconnected picks never block
saving; each teammate connects their own account. An agent session that calls a picked
but unconnected app gets a tool result saying so, and the agent's reply renders a
-`Connect <app>` chip that opens Settings → Connections for that app.
+`Connect <app>` chip that opens Agents → Connections for that app. MCP integrations
+are managed on that page, rather than in Settings.
`Back to app` returns to the previous surface. Open via user-email button menu or `Ctrl+;`.
`Agents` → `Create agent` (or edit an existing agent) opens runtime selectors.