Skip to content

The open-source agent harness - the runtime layer that turns an LLM into a working agent.

feat: check live MCP auth before loading tools (#660)

Govinda Vashishtha4e7b67a82f9a
diff --git a/.changeset/live-mcp-auth.md b/.changeset/live-mcp-auth.md
new file mode 100644
index 000000000..18477ff3d
--- /dev/null
+++ b/.changeset/live-mcp-auth.md
@@ -0,0 +1,6 @@
+---
+"@truefoundry/trueforge-ui": patch
+"@truefoundry/trueforge": patch
+---
+
+Check live per-user MCP authentication before loading tools in the agent builder.
diff --git a/packages/trueforge-ui/src/atoms/draft/AgentConfigEditors.tsx b/packages/trueforge-ui/src/atoms/draft/AgentConfigEditors.tsx
index d323f0e9b..148e36618 100644
--- a/packages/trueforge-ui/src/atoms/draft/AgentConfigEditors.tsx
+++ b/packages/trueforge-ui/src/atoms/draft/AgentConfigEditors.tsx
@@ -1,6 +1,6 @@
'use client';
-import { useEffect, useMemo, useState } from 'react';
+import { useEffect, useMemo, useRef, useState } from 'react';
import type { AgentSkill, AgentSpec, ConnectorState, McpToolSelection, ModelSelection } from '../../server/types.js';
import { useSlot } from '../../theme/SlotsProvider.js';
@@ -24,6 +24,7 @@ export type AgentConfigEditorsProps = {
sandboxAvailable?: boolean;
instructions?: string;
onInstructionsSave?: (draft: AgentInstructionsDraft) => void;
+ loadMcpConnector?: (connectorId: string) => Promise<ConnectorState | undefined>;
loadMcpTools?: (connectorId: string) => Promise<McpToolSelection[]>;
onRefreshConnectors?: () => Promise<void>;
onChange: (spec: AgentSpec) => void;
@@ -42,6 +43,7 @@ export function AgentConfigEditors({
sandboxAvailable = false,
instructions,
onInstructionsSave,
+ loadMcpConnector,
loadMcpTools,
onRefreshConnectors,
onChange,
@@ -53,6 +55,9 @@ export function AgentConfigEditors({
const AgentInstructionsDrawer = useSlot('AgentInstructionsDrawer');
const [query, setQuery] = useState('');
const [activeConnectorId, setActiveConnectorId] = useState<string | null>(null);
+ const [activeConnector, setActiveConnector] = useState<ConnectorState | undefined>();
+ const [connectorLoading, setConnectorLoading] = useState(false);
+ const [connectorError, setConnectorError] = useState<string | null>(null);
const [tools, setTools] = useState<McpToolSelection[]>([]);
const [toolsLoading, setToolsLoading] = useState(false);
const [toolsError, setToolsError] = useState<string | null>(null);
@@ -62,6 +67,8 @@ export function AgentConfigEditors({
() => connectorsWithSelectedStubs({ connectors, selected: mounts }),
[connectors, mounts],
);
+ const catalogConnectorsRef = useRef(catalogConnectors);
+ catalogConnectorsRef.current = catalogConnectors;
const activeConnectorAvailable =
activeConnectorId !== null && catalogConnectors.some(connector => connector.id === activeConnectorId);
const firstMountedConnectorId = mounts
@@ -72,31 +79,65 @@ export function AgentConfigEditors({
firstMountedConnectorId ??
catalogConnectors[0]?.id ??
null;
+ const selectedListedAuthenticated =
+ selectedConnectorId === null
+ ? undefined
+ : catalogConnectors.find(connector => connector.id === selectedConnectorId)?.authenticated;
+ const resolvedConnectors = useMemo(
+ () =>
+ activeConnector === undefined
+ ? catalogConnectors
+ : catalogConnectors.map(connector =>
+ connector.id === activeConnector.id ? { ...connector, ...activeConnector } : connector,
+ ),
+ [activeConnector, catalogConnectors],
+ );
useEffect(() => {
- if (editor !== 'mcp' || selectedConnectorId === null || loadMcpTools === undefined) return;
+ if (editor !== 'mcp' || selectedConnectorId === null) return;
let cancelled = false;
+ const listedConnector = catalogConnectorsRef.current.find(connector => connector.id === selectedConnectorId);
+ setActiveConnector(undefined);
+ setConnectorLoading(loadMcpConnector !== undefined);
+ setConnectorError(null);
setTools([]);
- setToolsLoading(true);
+ setToolsLoading(false);
setToolsError(null);
- void loadMcpTools(selectedConnectorId)
- .then(nextTools => {
+ void (async () => {
+ let connector = listedConnector;
+ if (loadMcpConnector !== undefined) {
+ try {
+ connector = (await loadMcpConnector(selectedConnectorId)) ?? listedConnector;
+ if (cancelled) return;
+ setActiveConnector(connector);
+ } catch (reason: unknown) {
+ if (!cancelled) setConnectorError(getErrorMessage(reason, 'Failed to load MCP server.'));
+ return;
+ } finally {
+ if (!cancelled) setConnectorLoading(false);
+ }
+ }
+ if (cancelled || connector?.authenticated === false || loadMcpTools === undefined) return;
+ setToolsLoading(true);
+ try {
+ const nextTools = await loadMcpTools(selectedConnectorId);
if (!cancelled) setTools(nextTools);
- })
- .catch((reason: unknown) => {
+ } catch (reason: unknown) {
if (!cancelled) setToolsError(getErrorMessage(reason, 'Failed to load tools.'));
- })
- .finally(() => {
+ } finally {
if (!cancelled) setToolsLoading(false);
- });
+ }
+ })();
return () => {
cancelled = true;
};
- }, [editor, loadMcpTools, selectedConnectorId, toolsRequestEpoch]);
+ }, [editor, loadMcpConnector, loadMcpTools, selectedConnectorId, selectedListedAuthenticated, toolsRequestEpoch]);
const close = () => {
setQuery('');
setActiveConnectorId(null);
+ setActiveConnector(undefined);
+ setConnectorError(null);
setTools([]);
setToolsError(null);
onClose();
@@ -154,18 +195,33 @@ export function AgentConfigEditors({
<AgentResourceConfigModal
editor={resourceEditor}
spec={spec}
- connectors={connectors}
+ connectors={resolvedConnectors}
skills={skills}
skillsDisabled={skillsDisabled}
query={query}
activeConnectorId={selectedConnectorId}
tools={tools}
+ connectorLoading={
+ connectorLoading ||
+ (loadMcpConnector !== undefined && activeConnector?.id !== selectedConnectorId && connectorError === null)
+ }
+ connectorError={connectorError}
toolsLoading={toolsLoading}
toolsError={toolsError}
onQueryChange={setQuery}
onSelectConnector={setActiveConnectorId}
onRetryTools={() => setToolsRequestEpoch(epoch => epoch + 1)}
- onRefreshConnectors={onRefreshConnectors}
+ {...(loadMcpConnector !== undefined
+ ? { onRefreshConnector: () => setToolsRequestEpoch(epoch => epoch + 1) }
+ : onRefreshConnectors !== undefined
+ ? {
+ onRefreshConnector: () => {
+ void onRefreshConnectors().then(() => {
+ setToolsRequestEpoch(epoch => epoch + 1);
+ });
+ },
+ }
+ : {})}
onChange={onChange}
onClose={close}
/>
diff --git a/packages/trueforge-ui/src/atoms/draft/AgentMcpEditorContent.tsx b/packages/trueforge-ui/src/atoms/draft/AgentMcpEditorContent.tsx
index 94d0de6d4..5b17e8958 100644
--- a/packages/trueforge-ui/src/atoms/draft/AgentMcpEditorContent.tsx
+++ b/packages/trueforge-ui/src/atoms/draft/AgentMcpEditorContent.tsx
@@ -22,12 +22,14 @@ export type AgentMcpEditorContentProps = {
query: string;
activeConnectorId: string | null;
tools: McpToolSelection[];
+ connectorLoading: boolean;
+ connectorError: string | null;
toolsLoading: boolean;
toolsError: string | null;
onQueryChange: (query: string) => void;
onSelectConnector: (connectorId: string) => void;
onRetryTools: () => void;
- onRefreshConnectors?: () => Promise<void>;
+ onRefreshConnector?: () => void;
onChange: (spec: AgentSpec) => void;
};
@@ -66,7 +68,7 @@ function selectedToolsHeaderLabel(mcpMounts: ReturnType<typeof editableMountsFro
return `Selected Tools (${count})`;
}
-function ConnectNowButton({ connectorId, onConnected }: { connectorId: string; onConnected: () => Promise<void> }) {
+function ConnectNowButton({ connectorId, onConnected }: { connectorId: string; onConnected: () => void }) {
const { handleAuthorize, isOAuthLoading } = useMCPAuth();
return (
<Button.Primary
@@ -75,7 +77,7 @@ function ConnectNowButton({ connectorId, onConnected }: { connectorId: string; o
disabled={isOAuthLoading}
onClick={() => {
void handleAuthorize(connectorId, isSuccess => {
- if (isSuccess) void onConnected();
+ if (isSuccess) onConnected();
});
}}
>
@@ -90,12 +92,14 @@ export function AgentMcpEditorContent({
query,
activeConnectorId,
tools,
+ connectorLoading,
+ connectorError,
toolsLoading,
toolsError,
onQueryChange,
onSelectConnector,
onRetryTools,
- onRefreshConnectors,
+ onRefreshConnector,
onChange,
}: AgentMcpEditorContentProps) {
const [toolQuery, setToolQuery] = useState('');
@@ -216,12 +220,23 @@ export function AgentMcpEditorContent({
<div className="flex min-h-0 min-w-0 flex-1 flex-col border-b border-border md:border-r md:border-b-0">
{selectedConnector ? (
- needsAuth ? (
+ connectorLoading ? (
+ <div className="flex min-h-0 flex-1 items-center justify-center p-3" aria-label="Loading MCP server">
+ <Spinner size={20} className="text-text-secondary" />
+ </div>
+ ) : connectorError ? (
+ <div className="flex min-h-0 flex-1 flex-col items-center justify-center p-6 text-center">
+ <p className="text-failure-bg text-sm">{connectorError}</p>
+ <Button.Secondary type="button" size="small" className="mt-2" onClick={onRetryTools}>
+ Retry
+ </Button.Secondary>
+ </div>
+ ) : needsAuth ? (
<div className="flex min-h-0 flex-1 flex-col items-center justify-center gap-4 p-6 text-center">
<Icon name="lock" className="text-text-secondary size-10" />
<p className="text-text-primary text-sm font-semibold">You&apos;re not connected to this MCP Server</p>
- {onRefreshConnectors ? (
- <ConnectNowButton connectorId={selectedConnector.id} onConnected={onRefreshConnectors} />
+ {onRefreshConnector ? (
+ <ConnectNowButton connectorId={selectedConnector.id} onConnected={onRefreshConnector} />
) : null}
<div className="text-text-secondary flex w-full max-w-xs items-center gap-3 text-xs">
<span className="bg-border h-px flex-1" />
diff --git a/packages/trueforge-ui/src/atoms/draft/AgentResourceConfigModal.tsx b/packages/trueforge-ui/src/atoms/draft/AgentResourceConfigModal.tsx
index cce71e2d0..d8e0b4da9 100644
--- a/packages/trueforge-ui/src/atoms/draft/AgentResourceConfigModal.tsx
+++ b/packages/trueforge-ui/src/atoms/draft/AgentResourceConfigModal.tsx
@@ -14,12 +14,14 @@ export type AgentResourceConfigModalProps = {
query: string;
activeConnectorId: string | null;
tools: McpToolSelection[];
+ connectorLoading: boolean;
+ connectorError: string | null;
toolsLoading: boolean;
toolsError: string | null;
onQueryChange: (query: string) => void;
onSelectConnector: (connectorId: string) => void;
onRetryTools: () => void;
- onRefreshConnectors?: () => Promise<void>;
+ onRefreshConnector?: () => void;
onChange: (spec: AgentSpec) => void;
onClose: () => void;
};
diff --git a/packages/trueforge-ui/src/atoms/draft/AgentResourceEditorContent.tsx b/packages/trueforge-ui/src/atoms/draft/AgentResourceEditorContent.tsx
index 29d54c3da..187ee4862 100644
--- a/packages/trueforge-ui/src/atoms/draft/AgentResourceEditorContent.tsx
+++ b/packages/trueforge-ui/src/atoms/draft/AgentResourceEditorContent.tsx
@@ -12,12 +12,14 @@ export type AgentResourceEditorContentProps = {
query: string;
activeConnectorId: string | null;
tools: McpToolSelection[];
+ connectorLoading: boolean;
+ connectorError: string | null;
toolsLoading: boolean;
toolsError: string | null;
onQueryChange: (query: string) => void;
onSelectConnector: (connectorId: string) => void;
onRetryTools: () => void;
- onRefreshConnectors?: () => Promise<void>;
+ onRefreshConnector?: () => void;
onChange: (spec: AgentSpec) => void;
};
@@ -45,12 +47,14 @@ export function AgentResourceEditorContent(props: AgentResourceEditorContentProp
query={props.query}
activeConnectorId={props.activeConnectorId}
tools={props.tools}
+ connectorLoading={props.connectorLoading}
+ connectorError={props.connectorError}
toolsLoading={props.toolsLoading}
toolsError={props.toolsError}
onQueryChange={props.onQueryChange}
onSelectConnector={props.onSelectConnector}
onRetryTools={props.onRetryTools}
- onRefreshConnectors={props.onRefreshConnectors}
+ onRefreshConnector={props.onRefreshConnector}
onChange={props.onChange}
/>
);
diff --git a/packages/trueforge-ui/src/containers/AgentConfigDrawerContainer.tsx b/packages/trueforge-ui/src/containers/AgentConfigDrawerContainer.tsx
index 358209584..c3e8498f8 100644
--- a/packages/trueforge-ui/src/containers/AgentConfigDrawerContainer.tsx
+++ b/packages/trueforge-ui/src/containers/AgentConfigDrawerContainer.tsx
@@ -14,7 +14,7 @@ import { useDraftCatalog } from '../atoms/draft/DraftCatalogProvider.js';
import { withInitialUserMessages } from '../atoms/draft/agentConfigMessages.js';
import { useOptionalServer, useServerCapabilities } from '../server/ServerContext.js';
import { shellIsCreateAgent, useShellMode } from '../server/ShellModeContext.js';
-import type { AgentSpec, McpToolSelection } from '../server/types.js';
+import type { AgentSpec, ConnectorState, McpToolSelection } from '../server/types.js';
import { useSlot } from '../theme/SlotsProvider.js';
export function AgentConfigDrawerContainer({ showClose = false }: { showClose?: boolean }) {
@@ -113,6 +113,12 @@ export function AgentConfigDrawerContainer({ showClose = false }: { showClose?:
},
[server],
);
+ const loadMcpConnector = useCallback(
+ async (connectorId: string): Promise<ConnectorState | undefined> => {
+ return server?.getMcpConnector?.({ connectorId });
+ },
+ [server],
+ );
if (!isBuilder || agentSpec === null || (showClose && !shell.agentConfigOpen)) {
return null;
@@ -146,6 +152,7 @@ export function AgentConfigDrawerContainer({ showClose = false }: { showClose?:
sandboxAvailable={capabilities?.sandbox.enabled === true}
instructions={instructionDraft}
onInstructionsSave={saveInstructions}
+ {...(server?.getMcpConnector === undefined ? {} : { loadMcpConnector })}
loadMcpTools={loadMcpTools}
onRefreshConnectors={catalog.refreshConnectors}
onChange={updateSpec}
diff --git a/packages/trueforge-ui/src/containers/SettingsBuilder/ConnectorDetails.tsx b/packages/trueforge-ui/src/containers/SettingsBuilder/ConnectorDetails.tsx
index 94ba3c6d0..1ba58db91 100644
--- a/packages/trueforge-ui/src/containers/SettingsBuilder/ConnectorDetails.tsx
+++ b/packages/trueforge-ui/src/containers/SettingsBuilder/ConnectorDetails.tsx
@@ -179,7 +179,7 @@ const ConnectorDetails = ({
</span>
<span
className={cn(
- 'flex items-center gap-1.5 text-xs font-medium',
+ 'flex items-center gap-1.5 rounded-full border border-border bg-secondary-bg/40 px-2 py-0.5 text-xs font-medium',
connector.authenticated ? 'text-success-bg' : 'text-text-primary',
)}
>
diff --git a/packages/trueforge-ui/src/containers/SettingsBuilder/ModelSettings.tsx b/packages/trueforge-ui/src/containers/SettingsBuilder/ModelSettings.tsx
index 80fb839ab..404964a3d 100644
--- a/packages/trueforge-ui/src/containers/SettingsBuilder/ModelSettings.tsx
+++ b/packages/trueforge-ui/src/containers/SettingsBuilder/ModelSettings.tsx
@@ -354,7 +354,7 @@ const ModelSettings = () => {
}
}}
>
- <Icon name="wrench" className="size-3.5" />
+ <Icon name="pencil" className="size-3.5" />
Edit
</Button.Secondary>
{modelCatalog.deleteModelProvider ? (
diff --git a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/builderServer.ts b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/builderServer.ts
index d26acece6..b6b8adef4 100644
--- a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/builderServer.ts
+++ b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/builderServer.ts
@@ -88,6 +88,10 @@ export function createHarnessBuilderServer(
return skills.map(skill => ({ id: skill.name, name: skill.name, description: skill.description }));
},
getMcp: async () => (await listConfiguredMcpServers(client)).map(toUiConnectorFromReadEntry),
+ getMcpConnector: async ({ connectorId }: { connectorId: string }) => {
+ const body = await client.mcpServers.get(connectorId);
+ return toUiConnectorFromReadEntry(body.data);
+ },
getMcpTools: async ({ connectorId }: { connectorId: string }) => {
const body = await client.mcpServers.listTools(connectorId);
return body.data.flatMap(tool =>
diff --git a/packages/trueforge-ui/src/server/createTrueFoundryServer.ts b/packages/trueforge-ui/src/server/createTrueFoundryServer.ts
index 5c5e30b62..78fddcab9 100644
--- a/packages/trueforge-ui/src/server/createTrueFoundryServer.ts
+++ b/packages/trueforge-ui/src/server/createTrueFoundryServer.ts
@@ -35,6 +35,7 @@ export type CreateTrueFoundryServerOptions<
getModels: () => Promise<TModel[]>;
getSkills: () => Promise<TSkill[]>;
getMcp: () => Promise<TMcp[]>;
+ getMcpConnector?: AgentBuilderServer<TSpec, TModel, TSkill, TMcp, TAgent, TSave, TCapabilities>['getMcpConnector'];
getMcpTools?: AgentBuilderServer<TSpec, TModel, TSkill, TMcp, TAgent, TSave, TCapabilities>['getMcpTools'];
searchAgents: (req?: SearchAgentsParams) => Promise<TAgent[]>;
saveAgent: (req: SaveAgentRequest<TSpec>) => Promise<TSave>;
@@ -118,6 +119,7 @@ export function createTrueFoundryServer<
getModels: opts.getModels,
getSkills: opts.getSkills,
getMcp: opts.getMcp,
+ ...(opts.getMcpConnector === undefined ? {} : { getMcpConnector: opts.getMcpConnector }),
...(opts.getMcpTools === undefined ? {} : { getMcpTools: opts.getMcpTools }),
searchAgents: opts.searchAgents,
saveAgent: opts.saveAgent,
diff --git a/packages/trueforge-ui/test/atoms/draft/AgentConfigEditors.test.tsx b/packages/trueforge-ui/test/atoms/draft/AgentConfigEditors.test.tsx
index 3d457210e..1cbafaea6 100644
--- a/packages/trueforge-ui/test/atoms/draft/AgentConfigEditors.test.tsx
+++ b/packages/trueforge-ui/test/atoms/draft/AgentConfigEditors.test.tsx
@@ -1,12 +1,15 @@
// @vitest-environment jsdom
-import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { act, fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { useState } from 'react';
import { beforeAll, describe, expect, it, vi } from 'vitest';
import { AgentConfigEditors } from '@/atoms/draft/AgentConfigEditors.js';
import { AgentModelSettingsContent } from '@/atoms/draft/AgentModelSettingsContent.js';
import { withInitialUserMessages } from '@/atoms/draft/agentConfigMessages.js';
-import type { AgentSpec } from '@/server/types.js';
+import { ServerProvider } from '@/server/ServerContext.js';
+import type { AgentSpec, ConnectorState } from '@/server/types.js';
import { SlotsProvider } from '@/theme/SlotsProvider.js';
+import { createMockAgentUIServer, createMockCatalog } from '../../server/mockServer.js';
vi.mock('@/atoms/MonacoEditorCore.js', () => ({
MonacoEditorCore: ({ value, onChange }: { value: string; onChange?: (value: string) => void }) => (
@@ -14,6 +17,27 @@ vi.mock('@/atoms/MonacoEditorCore.js', () => ({
),
}));
+const oauthMock = vi.hoisted(() => ({
+ handleAuthorize: vi.fn(),
+ isOAuthLoading: false,
+}));
+
+vi.mock('@/hooks/useMcpAuth.js', () => ({
+ useMCPAuth: () => oauthMock,
+}));
+
+function deferred<T>() {
+ let settle: ((value: T) => void) | undefined;
+ return {
+ promise: new Promise<T>(resolve => {
+ settle = resolve;
+ }),
+ resolve(value: T) {
+ settle?.(value);
+ },
+ };
+}
+
beforeAll(() => {
HTMLDialogElement.prototype.showModal = function showModal() {
this.setAttribute('open', '');
@@ -714,6 +738,216 @@ describe('AgentConfigEditors', () => {
expect(onChange).not.toHaveBeenCalled();
});
+ it('loads tools after the connector list marks the selection authenticated', async () => {
+ const loadMcpTools = vi.fn(async () => [{ id: 'secret.read', name: 'secret.read' }]);
+ const props = {
+ editor: 'mcp' as const,
+ spec: { model: { name: 'openai/gpt' } } satisfies AgentSpec,
+ models: [],
+ skills: [],
+ loading: false,
+ error: null,
+ loadMcpTools,
+ onChange: vi.fn(),
+ onClose: vi.fn(),
+ };
+
+ const { rerender } = render(
+ <SlotsProvider>
+ <AgentConfigEditors {...props} connectors={[{ id: 'private', name: 'Private', authenticated: false }]} />
+ </SlotsProvider>,
+ );
+
+ expect(await screen.findByText("You're not connected to this MCP Server")).toBeInTheDocument();
+ expect(loadMcpTools).not.toHaveBeenCalled();
+
+ rerender(
+ <SlotsProvider>
+ <AgentConfigEditors {...props} connectors={[{ id: 'private', name: 'Private', authenticated: true }]} />
+ </SlotsProvider>,
+ );
+
+ expect(await screen.findByRole('menuitemcheckbox', { name: 'secret.read' })).toBeInTheDocument();
+ expect(loadMcpTools).toHaveBeenCalledWith('private');
+ });
+
+ it('loads tools after Connect Now when only connector list refresh is available', async () => {
+ oauthMock.handleAuthorize.mockImplementation(async (_id: string, callback: (isSuccess: boolean) => void) => {
+ callback(true);
+ });
+ const loadMcpTools = vi.fn(async () => [{ id: 'secret.read', name: 'secret.read' }]);
+
+ function Harness() {
+ const [connectors, setConnectors] = useState<ConnectorState[]>([
+ { id: 'private', name: 'Private', authenticated: false },
+ ]);
+ return (
+ <SlotsProvider>
+ <AgentConfigEditors
+ editor="mcp"
+ spec={{ model: { name: 'openai/gpt' } }}
+ models={[]}
+ connectors={connectors}
+ skills={[]}
+ loading={false}
+ error={null}
+ loadMcpTools={loadMcpTools}
+ onRefreshConnectors={async () => {
+ setConnectors([{ id: 'private', name: 'Private', authenticated: true }]);
+ }}
+ onChange={vi.fn()}
+ onClose={vi.fn()}
+ />
+ </SlotsProvider>
+ );
+ }
+
+ render(<Harness />);
+
+ expect(await screen.findByText("You're not connected to this MCP Server")).toBeInTheDocument();
+ expect(loadMcpTools).not.toHaveBeenCalled();
+
+ fireEvent.click(screen.getByRole('button', { name: 'Connect Now' }));
+
+ expect(await screen.findByRole('menuitemcheckbox', { name: 'secret.read' })).toBeInTheDocument();
+ expect(loadMcpTools).toHaveBeenCalledWith('private');
+ });
+
+ it('checks live auth before loading tools and overrides stale listing auth', async () => {
+ const calls: string[] = [];
+ const loadMcpConnector = vi.fn(async () => {
+ calls.push('detail');
+ return { id: 'private', name: 'Private', authenticated: true };
+ });
+ const loadMcpTools = vi.fn(async () => {
+ calls.push('tools');
+ return [{ id: 'secret.read', name: 'secret.read' }];
+ });
+
+ render(
+ <SlotsProvider>
+ <AgentConfigEditors
+ editor="mcp"
+ spec={{ model: { name: 'openai/gpt' } }}
+ models={[]}
+ connectors={[{ id: 'private', name: 'Private', authenticated: false }]}
+ skills={[]}
+ loading={false}
+ error={null}
+ loadMcpConnector={loadMcpConnector}
+ loadMcpTools={loadMcpTools}
+ onChange={vi.fn()}
+ onClose={vi.fn()}
+ />
+ </SlotsProvider>,
+ );
+
+ expect(await screen.findByRole('menuitemcheckbox', { name: 'secret.read' })).toBeInTheDocument();
+ expect(calls).toEqual(['detail', 'tools']);
+ });
+
+ it('does not load tools when the live detail requires auth', async () => {
+ const loadMcpTools = vi.fn(async () => [{ id: 'secret.read', name: 'secret.read' }]);
+
+ render(
+ <ServerProvider server={createMockAgentUIServer({ catalog: createMockCatalog() })}>
+ <SlotsProvider>
+ <AgentConfigEditors
+ editor="mcp"
+ spec={{ model: { name: 'openai/gpt' } }}
+ models={[]}
+ connectors={[{ id: 'private', name: 'Private', authenticated: true }]}
+ skills={[]}
+ loading={false}
+ error={null}
+ loadMcpConnector={async () => ({ id: 'private', name: 'Private', authenticated: false })}
+ loadMcpTools={loadMcpTools}
+ onChange={vi.fn()}
+ onClose={vi.fn()}
+ />
+ </SlotsProvider>
+ </ServerProvider>,
+ );
+
+ expect(await screen.findByText("You're not connected to this MCP Server")).toBeInTheDocument();
+ expect(loadMcpTools).not.toHaveBeenCalled();
+ });
+
+ it('retries the selected MCP detail after an error', async () => {
+ const loadMcpConnector = vi
+ .fn<(connectorId: string) => Promise<{ id: string; name: string; authenticated: boolean }>>()
+ .mockRejectedValueOnce(new Error('Detail unavailable'))
+ .mockResolvedValue({ id: 'private', name: 'Private', authenticated: false });
+
+ render(
+ <ServerProvider server={createMockAgentUIServer({ catalog: createMockCatalog() })}>
+ <SlotsProvider>
+ <AgentConfigEditors
+ editor="mcp"
+ spec={{ model: { name: 'openai/gpt' } }}
+ models={[]}
+ connectors={[{ id: 'private', name: 'Private', authenticated: true }]}
+ skills={[]}
+ loading={false}
+ error={null}
+ loadMcpConnector={loadMcpConnector}
+ loadMcpTools={vi.fn()}
+ onChange={vi.fn()}
+ onClose={vi.fn()}
+ />
+ </SlotsProvider>
+ </ServerProvider>,
+ );
+
+ expect(await screen.findByText('Detail unavailable')).toBeInTheDocument();
+ fireEvent.click(screen.getByRole('button', { name: 'Retry' }));
+ expect(await screen.findByText("You're not connected to this MCP Server")).toBeInTheDocument();
+ expect(loadMcpConnector).toHaveBeenCalledTimes(2);
+ });
+
+ it('ignores stale MCP detail results after selecting another connector', async () => {
+ const first = deferred<{ id: string; name: string; authenticated: boolean }>();
+ const second = deferred<{ id: string; name: string; authenticated: boolean }>();
+ const loadMcpConnector = vi.fn((connectorId: string) => (connectorId === 'first' ? first.promise : second.promise));
+ const loadMcpTools = vi.fn(async (connectorId: string) => [
+ { id: `${connectorId}.tool`, name: `${connectorId}.tool` },
+ ]);
+
+ render(
+ <SlotsProvider>
+ <AgentConfigEditors
+ editor="mcp"
+ spec={{ model: { name: 'openai/gpt' } }}
+ models={[]}
+ connectors={[
+ { id: 'first', name: 'First', authenticated: true },
+ { id: 'second', name: 'Second', authenticated: true },
+ ]}
+ skills={[]}
+ loading={false}
+ error={null}
+ loadMcpConnector={loadMcpConnector}
+ loadMcpTools={loadMcpTools}
+ onChange={vi.fn()}
+ onClose={vi.fn()}
+ />
+ </SlotsProvider>,
+ );
+
+ await waitFor(() => expect(loadMcpConnector).toHaveBeenCalledWith('first'));
+ fireEvent.click(screen.getByRole('button', { name: 'Second' }));
+ await act(async () => {
+ second.resolve({ id: 'second', name: 'Second', authenticated: true });
+ });
+ expect(await screen.findByRole('menuitemcheckbox', { name: 'second.tool' })).toBeInTheDocument();
+ await act(async () => {
+ first.resolve({ id: 'first', name: 'First', authenticated: false });
+ });
+ expect(screen.getByRole('menuitemcheckbox', { name: 'second.tool' })).toBeInTheDocument();
+ expect(loadMcpTools).toHaveBeenCalledTimes(1);
+ expect(loadMcpTools).toHaveBeenCalledWith('second');
+ });
+
it('mounts an unauthenticated connector with Connect During Chat', async () => {
const spec: AgentSpec = { model: { name: 'openai/gpt' } };
const onChange = vi.fn();
diff --git a/packages/trueforge-ui/test/atoms/draft/AgentMcpEditorContent.search.test.tsx b/packages/trueforge-ui/test/atoms/draft/AgentMcpEditorContent.search.test.tsx
index 0959b307f..0dad86c32 100644
--- a/packages/trueforge-ui/test/atoms/draft/AgentMcpEditorContent.search.test.tsx
+++ b/packages/trueforge-ui/test/atoms/draft/AgentMcpEditorContent.search.test.tsx
@@ -15,6 +15,8 @@ describe('AgentMcpEditorContent tool search', () => {
],
activeConnectorId: 'github',
tools: [],
+ connectorLoading: false,
+ connectorError: null,
toolsLoading: false,
toolsError: null,
onQueryChange: vi.fn(),
@@ -56,11 +58,14 @@ describe('AgentMcpEditorContent tool search', () => {
{ id: 'web_search', name: 'web_search', description: 'Perform web searches' },
{ id: 'web_fetch', name: 'web_fetch', description: 'Fetch web URLs' },
]}
+ connectorLoading={false}
+ connectorError={null}
toolsLoading={false}
toolsError={null}
onQueryChange={vi.fn()}
onSelectConnector={vi.fn()}
onRetryTools={vi.fn()}
+ onRefreshConnector={vi.fn()}
onChange={vi.fn()}
/>
</SlotsProvider>,
@@ -92,11 +97,14 @@ describe('AgentMcpEditorContent tool search', () => {
},
{ id: 'web_fetch', name: 'web_fetch', description: 'Fetch web URLs' },
]}
+ connectorLoading={false}
+ connectorError={null}
toolsLoading={false}
toolsError={null}
onQueryChange={vi.fn()}
onSelectConnector={vi.fn()}
onRetryTools={vi.fn()}
+ onRefreshConnector={vi.fn()}
onChange={vi.fn()}
/>
</SlotsProvider>,
diff --git a/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/harnessBuilderServer.test.ts b/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/harnessBuilderServer.test.ts
index 3873e69e2..fe5399138 100644
--- a/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/harnessBuilderServer.test.ts
+++ b/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/harnessBuilderServer.test.ts
@@ -155,6 +155,36 @@ describe('harnessBuilderServer', () => {
]);
});
+ it('getMcpConnector loads the live per-user auth status', async () => {
+ const fetchMock: typeof fetch = async input => {
+ const url = input instanceof Request ? input.url : String(input);
+ if (url.endsWith('/api/v1/mcp-servers/github%20enterprise')) {
+ return Response.json({
+ data: {
+ name: 'github enterprise',
+ url: 'https://github.example/mcp',
+ auth: { type: 'dcr' },
+ auth_status: { status: 'auth_required' },
+ },
+ });
+ }
+ return new Response(`Unexpected request: ${url}`, { status: 500 });
+ };
+
+ const builder = createHarnessBuilderServer({ fetch: fetchMock });
+ if (builder.getMcpConnector === undefined) throw new Error('expected getMcpConnector');
+
+ assert.deepEqual(await builder.getMcpConnector({ connectorId: 'github enterprise' }), {
+ id: 'github enterprise',
+ name: 'github enterprise',
+ description: 'https://github.example/mcp',
+ url: 'https://github.example/mcp',
+ auth: { type: 'dcr' },
+ requiresAuth: true,
+ authenticated: false,
+ });
+ });
+
it('getMcpTools loads connector tools and normalizes untrusted rows', async () => {
const fetchMock: typeof fetch = async input => {
const url = input instanceof Request ? input.url : String(input);
diff --git a/packages/trueforge-ui/test/server/createTrueFoundryServer.test.ts b/packages/trueforge-ui/test/server/createTrueFoundryServer.test.ts
index e0a977da5..6ad692421 100644
--- a/packages/trueforge-ui/test/server/createTrueFoundryServer.test.ts
+++ b/packages/trueforge-ui/test/server/createTrueFoundryServer.test.ts
@@ -33,6 +33,11 @@ describe('createTrueFoundryServer', () => {
]);
const getSkills = vi.fn(async () => []);
const getMcp = vi.fn(async () => []);
+ const getMcpConnector = vi.fn(async ({ connectorId }: { connectorId: string }) => ({
+ id: connectorId,
+ name: connectorId,
+ authenticated: true,
+ }));
const getMcpTools = vi.fn(async () => [{ id: 'search', name: 'search', description: 'Search repositories' }]);
const searchAgents = vi.fn(async () => [{ name: 'ask-ai-agent', agentId: 'ask-ai-agent' }]);
const saveAgent = vi.fn(async (): Promise<SaveAgentResult> => ({ agentId: 'agent-1' }));
@@ -49,6 +54,7 @@ describe('createTrueFoundryServer', () => {
getModels,
getSkills,
getMcp,
+ getMcpConnector,
getMcpTools,
searchAgents,
saveAgent,
@@ -62,6 +68,12 @@ describe('createTrueFoundryServer', () => {
await expect(server.getCapabilities()).resolves.toEqual(capabilities);
await expect(server.getModels()).resolves.toHaveLength(1);
+ await expect(server.getMcpConnector?.({ connectorId: 'github' })).resolves.toEqual({
+ id: 'github',
+ name: 'github',
+ authenticated: true,
+ });
+ expect(getMcpConnector).toHaveBeenCalledWith({ connectorId: 'github' });
await expect(server.getMcpTools?.({ connectorId: 'github' })).resolves.toEqual([
{ id: 'search', name: 'search', description: 'Search repositories' },
]);