The open-source agent harness - the runtime layer that turns an LLM into a working agent.
Refactor: Remove preload tools functionality and enhance error handling in MCP tool selector (#646)
Govinda Vashishtha2284d3b9254e
diff --git a/.changeset/remove-modal-preload-tools.md b/.changeset/remove-modal-preload-tools.mdnew file mode 100644index 000000000..41ddfab19--- /dev/null+++ b/.changeset/remove-modal-preload-tools.md@@ -0,0 +1,5 @@+---+"@truefoundry/trueforge-ui": patch+---++Polish the MCP tool selector controls, loading state, and API error messages.diff --git a/packages/trueforge-ui/src/atoms/draft/AgentConfigEditors.tsx b/packages/trueforge-ui/src/atoms/draft/AgentConfigEditors.tsxindex 6d4a7b6e2..d323f0e9b 100644--- a/packages/trueforge-ui/src/atoms/draft/AgentConfigEditors.tsx+++ b/packages/trueforge-ui/src/atoms/draft/AgentConfigEditors.tsx@@ -4,6 +4,7 @@ import { useEffect, useMemo, useState } from 'react';import type { AgentSkill, AgentSpec, ConnectorState, McpToolSelection, ModelSelection } from '../../server/types.js';import { useSlot } from '../../theme/SlotsProvider.js';+import { getErrorMessage } from '../../utils/getErrorMessage.js';import type { AgentInstructionsDraft } from './AgentInstructionsDrawer.js';import { initialUserMessagesFromSpec, withInitialUserMessages } from './agentConfigMessages.js';import { editableMountsFromSpec } from './agentConfigMounts.js';@@ -83,7 +84,7 @@ export function AgentConfigEditors({if (!cancelled) setTools(nextTools);}).catch((reason: unknown) => {- if (!cancelled) setToolsError(reason instanceof Error ? reason.message : 'Failed to load tools.');+ if (!cancelled) setToolsError(getErrorMessage(reason, 'Failed to load tools.'));}).finally(() => {if (!cancelled) setToolsLoading(false);diff --git a/packages/trueforge-ui/src/atoms/draft/AgentMcpEditorContent.tsx b/packages/trueforge-ui/src/atoms/draft/AgentMcpEditorContent.tsxindex 4a2437eef..5e54b4aea 100644--- a/packages/trueforge-ui/src/atoms/draft/AgentMcpEditorContent.tsx+++ b/packages/trueforge-ui/src/atoms/draft/AgentMcpEditorContent.tsx@@ -14,13 +14,7 @@ import { CatalogLogo } from '../primitives/CatalogLogo.js';import { Spinner } from '../primitives/Spinner.js';import { Switch } from '../primitives/Switch.js';import { Tooltip } from '../primitives/Tooltip.js';-import {- editableMountsFromSpec,- enabledToolsFromMount,- preloadFromMount,- withEnabledTools,- withPreload,-} from './agentConfigMounts.js';+import { editableMountsFromSpec, enabledToolsFromMount, withEnabledTools } from './agentConfigMounts.js';import { useDraftCatalog } from './DraftCatalogProvider.js';import { connectorsWithSelectedStubs } from './mcpConnectorStubs.js';@@ -241,7 +235,7 @@ export function AgentMcpEditorContent({Retry loading connectors</button>) : connectorsLoadingMore ? (- <span className="text-text-secondary text-[0.625rem]">Loading…</span>+ <Spinner size={16} className="text-text-secondary" aria-label="Loading more MCP servers" />) : null}</div>) : null}@@ -352,17 +346,6 @@ export function AgentMcpEditorContent({}): null}</div>- <label className="text-text-secondary flex shrink-0 cursor-pointer items-center justify-end gap-2 border-t border-border p-3 text-xs has-[:disabled]:cursor-not-allowed">- Preload tools- <Switch- checked={activeMount !== undefined && preloadFromMount(activeMount.value)}- disabled={activeMount === undefined}- onCheckedChange={preload => {- if (activeMount) updateMount(activeMount.id, withPreload(activeMount.value, preload));- }}- aria-label="Preload tools"- />- </label></>)) : (diff --git a/packages/trueforge-ui/test/atoms/draft/AgentConfigEditors.test.tsx b/packages/trueforge-ui/test/atoms/draft/AgentConfigEditors.test.tsxindex d5d0acb33..8f7e5497d 100644--- a/packages/trueforge-ui/test/atoms/draft/AgentConfigEditors.test.tsx+++ b/packages/trueforge-ui/test/atoms/draft/AgentConfigEditors.test.tsx@@ -510,6 +510,33 @@ describe('AgentConfigEditors', () => {expect(screen.getByRole('button', { name: 'GitHub' })).toHaveAttribute('aria-current', 'true');});+ it('shows the API error message when loading MCP tools fails', async () => {+ const error = Object.assign(new Error('BadGatewayError Status code: 502 Body: <html>…</html>'), {+ statusCode: 502,+ body: { error: { message: 'Failed to connect to remote MCP server' } },+ });++ render(+ <SlotsProvider>+ <AgentConfigEditors+ editor="mcp"+ spec={{ model: { name: 'openai/gpt' } }}+ models={[]}+ connectors={[{ id: 'broken', name: 'Broken MCP', authenticated: true }]}+ skills={[]}+ loading={false}+ error={null}+ loadMcpTools={async () => Promise.reject(error)}+ onChange={vi.fn()}+ onClose={vi.fn()}+ />+ </SlotsProvider>,+ );++ expect(await screen.findByText('Failed to connect to remote MCP server')).toBeInTheDocument();+ expect(screen.queryByText(/BadGatewayError/)).not.toBeInTheDocument();+ });+it('keeps an off-page selected MCP active via catalog stubs', async () => {const loadMcpTools = vi.fn(async (connectorId: string) => [{ id: `${connectorId}.tool`, name: `${connectorId}.tool` },diff --git a/packages/trueforge-ui/test/atoms/draft/AgentMcpEditorContent.search.test.tsx b/packages/trueforge-ui/test/atoms/draft/AgentMcpEditorContent.search.test.tsxindex 29110e3cd..7a0875e50 100644--- a/packages/trueforge-ui/test/atoms/draft/AgentMcpEditorContent.search.test.tsx+++ b/packages/trueforge-ui/test/atoms/draft/AgentMcpEditorContent.search.test.tsx@@ -33,6 +33,7 @@ describe('AgentMcpEditorContent tool search', () => {expect(screen.getByRole('menuitemcheckbox', { name: 'web_search' })).toBeInTheDocument();expect(screen.getByRole('menuitemcheckbox', { name: 'web_fetch' })).toBeInTheDocument();+ expect(screen.queryByRole('switch', { name: 'Preload tools' })).not.toBeInTheDocument();fireEvent.change(screen.getByPlaceholderText('Search Tools'), { target: { value: 'fetch' } });