Skip to content

armgit / macro

Public Imported from GitHub
0

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

fix(agents): unchud new sidebar with old agents (#6511)

Eric Hayes829318862e47
diff --git a/apps/web/src/features/agents-view/components/AgentsSidebar.tsx b/apps/web/src/features/agents-view/components/AgentsSidebar.tsx
index ccee77d452..eb9dafbc1d 100644
--- a/apps/web/src/features/agents-view/components/AgentsSidebar.tsx
+++ b/apps/web/src/features/agents-view/components/AgentsSidebar.tsx
@@ -26,8 +26,6 @@ import ClockIcon from '@phosphor/clock-clockwise.svg';
import MagnifyingGlassIcon from '@phosphor/magnifying-glass.svg';
import PlugsIcon from '@phosphor/plugs.svg';
import PlusIcon from '@phosphor/plus.svg';
-import AgentIcon from '@phosphor/sparkle.svg';
-import SkillIcon from '@phosphor/sparkle.svg';
import SpinnerIcon from '@phosphor/spinner.svg';
import {
type FavoritesFilter,
@@ -51,12 +49,15 @@ import type {
AgentConversationTarget,
} from '../core/recent-conversations';
+// Configurable agents ship after the sidebar, so the 'agents' and 'skills'
+// pages have no nav entries yet. When they do, add
+// `{ id: 'agents', label: 'Agents', icon: AgentIcon }` and
+// `{ id: 'skills', label: 'Skills', icon: SkillIcon }` back here, both icons
+// imported from `@phosphor/sparkle.svg`.
const PAGES = [
{ id: 'new', label: 'New Chat', icon: PlusIcon },
{ id: 'routines', label: 'Routines', icon: ClockIcon },
- { id: 'agents', label: 'Agents', icon: AgentIcon },
{ id: 'connections', label: 'Connections', icon: PlugsIcon },
- { id: 'skills', label: 'Skills', icon: SkillIcon },
] satisfies {
id: AgentsPage;
label: string;
diff --git a/apps/web/src/features/agents-view/views/AgentsView.tsx b/apps/web/src/features/agents-view/views/AgentsView.tsx
index b1854a1d6e..9a55f64a94 100644
--- a/apps/web/src/features/agents-view/views/AgentsView.tsx
+++ b/apps/web/src/features/agents-view/views/AgentsView.tsx
@@ -4,7 +4,7 @@ import { AgentInput } from '@app/features/block-agent/ui';
import { HomeChatInput } from '@app/features/home/home';
import { QUERY_FILTERS_BASE } from '@app/features/next-soup/filters/query-filters';
import { Agents } from '@app/features/settings/Agents';
-import { ConnectedAccounts } from '@app/features/settings/ConnectedAccounts';
+import { McpConnections } from '@app/features/settings/McpConnections';
import { useFeatureFlag } from '@app/lib/analytics/posthog';
import { useGlobalBlockOrchestrator } from '@components/app/GlobalAppState';
import { PreviewPanel } from '@components/app/PreviewPanel';
@@ -215,7 +215,7 @@ function AgentsWorkspace() {
<Agents />
</Match>
<Match when={page() === 'connections'}>
- <ConnectedAccounts />
+ <McpConnections />
</Match>
<Match when={page() === 'skills'}>
<AgentResourceList page="skills" />
diff --git a/apps/web/src/features/settings/Agent.tsx b/apps/web/src/features/settings/Agent.tsx
index 68c8ccf8c4..3027b36012 100644
--- a/apps/web/src/features/settings/Agent.tsx
+++ b/apps/web/src/features/settings/Agent.tsx
@@ -4,7 +4,7 @@ import { SettingsPage } from './primitives';
/**
* The "MCP server" tab: setup instructions for pointing other agents and MCP
* clients (Claude Code, Codex, IDEs, ...) at Macro's own MCP server. Managing
- * Macro's outbound connectors lives on the Connections tab (see
+ * Macro's outbound connectors lives on the Integrations tab (see
* `Integrations.tsx`).
*/
export function Agent() {
diff --git a/apps/web/src/features/settings/Agents.tsx b/apps/web/src/features/settings/Agents.tsx
index 5e532bb9c8..18b33b301d 100644
--- a/apps/web/src/features/settings/Agents.tsx
+++ b/apps/web/src/features/settings/Agents.tsx
@@ -1008,7 +1008,7 @@ function AgentDialog(props: {
<Show when={share() === 'Team'}>
<p class="mt-3 border-t border-edge-muted pt-3 text-xs text-ink-extra-muted">
Connections are personal. Teammates who use this agent
- connect these apps under Settings → Connections; the
+ connect these apps under Settings → Integrations; the
indicators here show only your own.
</p>
</Show>
diff --git a/apps/web/src/features/settings/ConnectedAccounts.tsx b/apps/web/src/features/settings/ConnectedAccounts.tsx
index 75ff79b6f1..e128552614 100644
--- a/apps/web/src/features/settings/ConnectedAccounts.tsx
+++ b/apps/web/src/features/settings/ConnectedAccounts.tsx
@@ -8,14 +8,17 @@ import { PipedreamIntegrationsSection } from './PipedreamIntegrations';
import { SettingsPage, SettingsSection } from './primitives';
/**
- * Consolidated "Connections" page: one card per external account the user can
- * link (Gmail, GitHub), followed by the agent's MCP integrations.
+ * 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.
*/
export function ConnectedAccounts() {
const pipedreamMcp = usePipedreamMcpFlag();
return (
<SettingsPage
- title="Connections"
+ title="Integrations"
description="Connect your accounts so Macro can work across the tools you already use."
>
<SettingsSection title="Accounts">
diff --git a/apps/web/src/features/settings/Integrations.tsx b/apps/web/src/features/settings/Integrations.tsx
index 79c6ad6c20..adc3d30996 100644
--- a/apps/web/src/features/settings/Integrations.tsx
+++ b/apps/web/src/features/settings/Integrations.tsx
@@ -394,7 +394,7 @@ function FeaturedServerRow(props: { server: FeaturedMcpServer }) {
}
/**
- * The "MCP integrations" section of the Connections page: MCP servers the
+ * The "MCP integrations" section of the Connections/Integrations pages: MCP servers the
* user has connected, followed by the preset suggestions they haven't, with
* custom servers behind the "Add server" dialog.
*/
diff --git a/apps/web/src/features/settings/McpConnections.tsx b/apps/web/src/features/settings/McpConnections.tsx
new file mode 100644
index 0000000000..e6dbb63060
--- /dev/null
+++ b/apps/web/src/features/settings/McpConnections.tsx
@@ -0,0 +1,27 @@
+import { usePipedreamMcpFlag } from '@core/pipedream/flag';
+import { Show, Suspense } from 'solid-js';
+import { IntegrationsSection } from './Integrations';
+import { PipedreamIntegrationsSection } from './PipedreamIntegrations';
+import { SettingsPage } from './primitives';
+
+/**
+ * The agents sidebar's "Connections" page: MCP integrations only. Linking
+ * personal accounts (Gmail, GitHub) lives on the Integrations settings tab
+ * (see `ConnectedAccounts.tsx`), which keeps this page about what the agent
+ * can reach.
+ */
+export function McpConnections() {
+ const pipedreamMcp = usePipedreamMcpFlag();
+ return (
+ <SettingsPage
+ title="Connections"
+ description="Connect the tools your team already uses so Macro's agent can work in them."
+ >
+ <Suspense>
+ <Show when={pipedreamMcp()} fallback={<IntegrationsSection />}>
+ <PipedreamIntegrationsSection />
+ </Show>
+ </Suspense>
+ </SettingsPage>
+ );
+}
diff --git a/apps/web/src/features/settings/PipedreamAppPicker.tsx b/apps/web/src/features/settings/PipedreamAppPicker.tsx
index 86ef91f68c..6f53f65a14 100644
--- a/apps/web/src/features/settings/PipedreamAppPicker.tsx
+++ b/apps/web/src/features/settings/PipedreamAppPicker.tsx
@@ -26,7 +26,7 @@ import { IntegrationRow } from './primitives';
* same agent sees their own dots, because a session spends the connections
* of whoever runs it. So an unconnected pick is never an error here - it is
* the agent's author saying "this agent uses Linear", and each person
- * connects Linear on their own, from this row or from Settings → Connections.
+ * connects Linear on their own, from this row or from Settings → Integrations.
*/
export function PipedreamAppPicker(props: {
selected: readonly AgentMcpServer[];
diff --git a/apps/web/src/features/settings/PipedreamIntegrations.tsx b/apps/web/src/features/settings/PipedreamIntegrations.tsx
index c1439f4322..20845b2065 100644
--- a/apps/web/src/features/settings/PipedreamIntegrations.tsx
+++ b/apps/web/src/features/settings/PipedreamIntegrations.tsx
@@ -156,7 +156,7 @@ function CatalogRow(props: { entry: PipedreamCatalogEntryResponse }) {
}
/**
- * The "MCP integrations" section of the Connections page: apps the user has
+ * The "MCP integrations" section of the Connections/Integrations pages: apps the user has
* connected, then a searchable catalog of every connectable app, ranked by
* popularity — all connecting through Pipedream, the single connect path.
*/
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 c6f42a784c..64327ff31e 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
@@ -10,7 +10,7 @@ import { LexicalWrapperContext } from '../../context/LexicalWrapperContext';
/**
* The chip an agent's reply renders when a tool call failed because the
- * reader has not connected an app. Clicking it opens Settings → Connections
+ * reader has not connected an app. Clicking it opens Settings → Integrations
* with that app queued to connect. Once the reader has connected it, the same
* chip reads as connected rather than nagging.
*/
@@ -30,7 +30,7 @@ export function ConnectApp(props: ConnectAppDecoratorProps) {
const handleClick = () => {
if (connected()) return;
- // The Connections page picks this up and starts the Connect flow.
+ // The Integrations tab picks this up and starts the Connect flow.
requestConnectApp(props.appSlug);
openSettings('Connected');
};
diff --git a/apps/web/src/lib/core/constant/settingsTabsConfig.tsx b/apps/web/src/lib/core/constant/settingsTabsConfig.tsx
index 08f6967638..4dab62fca4 100644
--- a/apps/web/src/lib/core/constant/settingsTabsConfig.tsx
+++ b/apps/web/src/lib/core/constant/settingsTabsConfig.tsx
@@ -70,7 +70,7 @@ export const SETTINGS_TAB_GROUPS: SettingsTabGroup[] = [
{ tab: 'CRM', label: 'CRM', icon: BuildingsIcon },
{
tab: 'Connected',
- label: 'Connections',
+ label: 'Integrations',
icon: CpuIcon,
},
{ tab: 'Agent', label: 'MCP server', icon: PlugIcon },