The open-source agent harness - the runtime layer that turns an LLM into a working agent.
chore: add mcp oauth connection flow in composer (#179)
sayan-truefoundry87995fbf6d39
diff --git a/packages/frontend/src/connectorCatalog.ts b/packages/frontend/src/connectorCatalog.tsindex b92914443..7504a699d 100644--- a/packages/frontend/src/connectorCatalog.ts+++ b/packages/frontend/src/connectorCatalog.ts@@ -85,12 +85,13 @@ export function toUiConnector(server: TrueForgeApi.ConfiguredMcpServer): UiConne}export function toUiConnectorFromReadEntry(server: TrueForgeApi.McpServerReadEntry): UiConnector {+ const auth: UiConnectorAuthPublic = server.auth?.type ? { type: server.auth.type } : { type: 'none' };return {id: server.name,name: server.name,description: server.url,url: server.url,- auth: { type: 'none' },+ auth,requiresAuth: server.authStatus.status === 'auth_required',authenticated: server.authStatus.status !== 'auth_required',};diff --git a/packages/frontend/tests/connectorCatalog.test.ts b/packages/frontend/tests/connectorCatalog.test.tsindex b5a95b611..49662ce20 100644--- a/packages/frontend/tests/connectorCatalog.test.ts+++ b/packages/frontend/tests/connectorCatalog.test.ts@@ -101,6 +101,7 @@ describe('connectorCatalog mappers', () => {toUiConnectorFromReadEntry({name: 'linear',url: 'https://mcp.linear.app/mcp',+ auth: { type: 'dcr' },authStatus: { status: 'auth_required' },}),{@@ -108,7 +109,7 @@ describe('connectorCatalog mappers', () => {name: 'linear',description: 'https://mcp.linear.app/mcp',url: 'https://mcp.linear.app/mcp',- auth: { type: 'none' },+ auth: { type: 'dcr' },requiresAuth: true,authenticated: false,},diff --git a/packages/trueforge-ui-sdk/src/atoms/draft/DraftCatalogProvider.tsx b/packages/trueforge-ui-sdk/src/atoms/draft/DraftCatalogProvider.tsxindex f582d5adf..de8204008 100644--- a/packages/trueforge-ui-sdk/src/atoms/draft/DraftCatalogProvider.tsx+++ b/packages/trueforge-ui-sdk/src/atoms/draft/DraftCatalogProvider.tsx@@ -14,11 +14,14 @@ type DraftCatalogValue = {error: string | null;/** Kick off catalog fetch (idempotent). Call when a picker opens. */ensureLoaded: () => void;+ /** Refresh connector auth state without reloading unrelated catalogs. */+ refreshConnectors: () => Promise<void>;};const DraftCatalogContext = createContext<DraftCatalogValue | null>(null);const IDLE_ENSURE = () => undefined;+const IDLE_REFRESH = async () => undefined;export function DraftCatalogProvider({ children }: { children: ReactNode }) {const server = useOptionalServer();@@ -33,6 +36,20 @@ export function DraftCatalogProvider({ children }: { children: ReactNode }) {setRequested(true);}, []);+ const refreshConnectors = useCallback(async () => {+ if (!server) return;+ setLoading(true);+ setError(null);+ try {+ const nextConnectors = await server.getMcp();+ setConnectors(nextConnectors);+ } catch (reason: unknown) {+ setError(getErrorMessage(reason, 'Failed to load connectors.'));+ } finally {+ setLoading(false);+ }+ }, [server]);+useEffect(() => {if (!requested || !server) return;let cancelled = false;@@ -69,8 +86,8 @@ export function DraftCatalogProvider({ children }: { children: ReactNode }) {}, [requested, server]);const value = useMemo(- () => ({ models, skills, connectors, loading, error, ensureLoaded }),- [models, skills, connectors, loading, error, ensureLoaded],+ () => ({ models, skills, connectors, loading, error, ensureLoaded, refreshConnectors }),+ [models, skills, connectors, loading, error, ensureLoaded, refreshConnectors],);return <DraftCatalogContext.Provider value={value}>{children}</DraftCatalogContext.Provider>;@@ -86,6 +103,7 @@ export function useDraftCatalog(): DraftCatalogValue {loading: false,error: null,ensureLoaded: IDLE_ENSURE,+ refreshConnectors: IDLE_REFRESH,};}return ctx;diff --git a/packages/trueforge-ui-sdk/src/atoms/draft/DraftCompositeSelector.tsx b/packages/trueforge-ui-sdk/src/atoms/draft/DraftCompositeSelector.tsxindex 3439d40c5..b9fd33e60 100644--- a/packages/trueforge-ui-sdk/src/atoms/draft/DraftCompositeSelector.tsx+++ b/packages/trueforge-ui-sdk/src/atoms/draft/DraftCompositeSelector.tsx@@ -1,8 +1,9 @@'use client';import { useTrueFoundryAgentSpec, useTrueFoundryUpdateAgentSpec } from '@truefoundry/assistant-ui-runtime';-import { useCallback, useEffect, useId, useMemo, useRef, useState } from 'react';+import { useCallback, useEffect, useId, useMemo, useRef, useState, type ReactNode } from 'react';+import { useMCPAuth } from '../../hooks/useMcpAuth.js';import { Icon } from '../../icons/Icon.js';import { useServerCapabilities } from '../../server/ServerContext.js';import type { AgentSkill, ConnectorState } from '../../server/types.js';@@ -64,30 +65,99 @@ function CatalogRow({checked,disabled = false,onToggle,+ action,}: {title: string;description?: string;checked: boolean;disabled?: boolean;onToggle: () => void;+ action?: ReactNode;}) {+ const content = (+ <>+ <span className="bg-muted text-muted-foreground mt-0.5 flex size-7 shrink-0 items-center justify-center rounded text-xs font-semibold">+ {title.charAt(0).toUpperCase()}+ </span>+ <span className="min-w-0 flex-1">+ <span className="text-foreground block truncate text-sm font-medium">{title}</span>+ {description ? <span className="text-muted-foreground line-clamp-1 text-xs">{description}</span> : null}+ </span>+ </>+ );++ if (action) {+ return (+ <div+ role="menuitemcheckbox"+ aria-checked={checked}+ tabIndex={0}+ className="hover:bg-accent flex w-full cursor-pointer items-center gap-2 rounded-md px-2 py-2 text-left"+ onClick={onToggle}+ onKeyDown={event => {+ if (event.key !== 'Enter' && event.key !== ' ') return;+ event.preventDefault();+ onToggle();+ }}+ >+ {content}+ <span className="shrink-0">{action}</span>+ <Checkbox checked={checked} />+ </div>+ );+ }+return (<buttontype="button"role="menuitemcheckbox"aria-checked={checked}disabled={disabled}- className="hover:bg-accent flex w-full items-start gap-2 rounded-md px-2 py-2 text-left disabled:cursor-not-allowed disabled:opacity-50 disabled:hover:bg-transparent"+ className="hover:bg-accent flex w-full cursor-pointer items-center gap-2 rounded-md px-2 py-2 text-left disabled:cursor-not-allowed disabled:opacity-50 disabled:hover:bg-transparent"onClick={onToggle}>- <span className="bg-muted text-muted-foreground mt-0.5 flex size-7 shrink-0 items-center justify-center rounded text-xs font-semibold">- {title.charAt(0).toUpperCase()}- </span>- <span className="min-w-0 flex-1">- <span className="text-foreground block truncate text-sm font-medium">{title}</span>- {description ? <span className="text-muted-foreground line-clamp-1 text-xs">{description}</span> : null}- </span>- {disabled ? <Icon name="lock" className="text-muted-foreground mt-1 size-3" /> : <Checkbox checked={checked} />}+ {content}+ {disabled ? <Icon name="lock" className="text-muted-foreground size-3" /> : <Checkbox checked={checked} />}+ </button>+ );+}++function isUnauthenticatedDcrConnector(connector: ConnectorState): boolean {+ const auth = Reflect.get(connector, 'auth');+ return (+ connector.authenticated === false &&+ typeof auth === 'object' &&+ auth !== null &&+ Reflect.get(auth, 'type') === 'dcr'+ );+}++function ConnectorConnectButton({+ connector,+ onConnected,+}: {+ connector: ConnectorState;+ onConnected: () => Promise<void>;+}) {+ const { handleAuthorize, isOAuthLoading } = useMCPAuth();++ return (+ <button+ type="button"+ aria-label={`Connect ${connector.name}`}+ disabled={isOAuthLoading}+ className={auiButtonClass({ variant: 'secondary', size: 'sm' })}+ onKeyDown={event => {+ event.stopPropagation();+ }}+ onClick={event => {+ event.stopPropagation();+ void handleAuthorize(connector.id, isSuccess => {+ if (isSuccess) void onConnected();+ });+ }}+ >+ {isOAuthLoading ? 'Connecting...' : 'Connect'}</button>);}@@ -133,7 +203,7 @@ function SectionHeading({ label, count }: { label: string; count: number }) {}export function DraftCompositeSelector({ disabled, isRunning, onAttach }: DraftCompositeSelectorProps) {- const { skills, connectors, ensureLoaded } = useDraftCatalog();+ const { skills, connectors, ensureLoaded, refreshConnectors } = useDraftCatalog();const capabilities = useServerCapabilities();const { agentSpec } = useTrueFoundryAgentSpec();const updateAgentSpec = useTrueFoundryUpdateAgentSpec();@@ -218,20 +288,17 @@ export function DraftCompositeSelector({ disabled, isRunning, onAttach }: DraftCuseEffect(() => () => clearFlushTimer(), [clearFlushTimer]);- // Keep unavailable selections visible so users can remove them.- // Hosts that omit auth info keep their connectors selectable.- const selectableConnectors = useMemo(- () => connectors.filter(c => selectedMcpIds.has(c.id) || c.authenticated || !c.requiresAuth),- [connectors, selectedMcpIds],- );-const filteredConnectors = useMemo(() => {const needle = query.trim().toLowerCase();- if (!needle) return selectableConnectors;- return selectableConnectors.filter(- c => c.name.toLowerCase().includes(needle) || (c.description?.toLowerCase().includes(needle) ?? false),+ const matches = needle+ ? connectors.filter(+ c => c.name.toLowerCase().includes(needle) || (c.description?.toLowerCase().includes(needle) ?? false),+ )+ : connectors;+ return [...matches].sort(+ (left, right) => Number(isUnauthenticatedDcrConnector(left)) - Number(isUnauthenticatedDcrConnector(right)),);- }, [selectableConnectors, query]);+ }, [connectors, query]);const filteredSkills = useMemo(() => {const needle = query.trim().toLowerCase();@@ -366,6 +433,11 @@ export function DraftCompositeSelector({ disabled, isRunning, onAttach }: DraftCtitle={c.name}description={c.description}checked={selectedMcpIds.has(c.id)}+ action={+ isUnauthenticatedDcrConnector(c) ? (+ <ConnectorConnectButton connector={c} onConnected={refreshConnectors} />+ ) : undefined+ }onToggle={() => toggleConnector(c)}/>))}@@ -380,6 +452,11 @@ export function DraftCompositeSelector({ disabled, isRunning, onAttach }: DraftCtitle={c.name}description={c.description}checked={selectedMcpIds.has(c.id)}+ action={+ isUnauthenticatedDcrConnector(c) ? (+ <ConnectorConnectButton connector={c} onConnected={refreshConnectors} />+ ) : undefined+ }onToggle={() => toggleConnector(c)}/>))}diff --git a/packages/trueforge-ui-sdk/test/atoms/draft/DraftCatalogProvider.test.tsx b/packages/trueforge-ui-sdk/test/atoms/draft/DraftCatalogProvider.test.tsxindex bd088e886..3f385364d 100644--- a/packages/trueforge-ui-sdk/test/atoms/draft/DraftCatalogProvider.test.tsx+++ b/packages/trueforge-ui-sdk/test/atoms/draft/DraftCatalogProvider.test.tsx@@ -15,6 +15,9 @@ function CatalogProbe() {<button type="button" onClick={() => catalog.ensureLoaded()}>Load catalog</button>+ <button type="button" onClick={() => void catalog.refreshConnectors()}>+ Refresh connectors+ </button><output data-testid="models">{catalog.models.map(model => model.name).join(',')}</output><output data-testid="skills">{catalog.skills.map(skill => skill.name).join(',')}</output><output data-testid="connectors">{catalog.connectors.map(connector => connector.name).join(',')}</output>@@ -148,4 +151,31 @@ describe('DraftCatalogProvider', () => {expect(screen.getByTestId('skills')).toBeEmptyDOMElement();expect(screen.getByTestId('error')).toHaveTextContent('Skills unavailable');});++ it('refreshes connectors without reloading models or skills', async () => {+ const getModels = vi.fn(async () => [{ name: 'openai/gpt-4.1', provider: 'OpenAI' }]);+ const getSkills = vi.fn(async () => [{ id: 'skill-1', name: 'Release notes' }]);+ const getMcp = vi+ .fn<() => Promise<ConnectorState[]>>()+ .mockResolvedValueOnce([{ id: 'linear', name: 'Linear', authenticated: false }])+ .mockResolvedValueOnce([{ id: 'linear', name: 'Linear', authenticated: true }]);+ const server = createMockAgentUIServer({ getModels, getSkills, getMcp });++ render(+ <ServerProvider server={server}>+ <DraftCatalogProvider>+ <CatalogProbe />+ </DraftCatalogProvider>+ </ServerProvider>,+ );++ fireEvent.click(screen.getByRole('button', { name: 'Load catalog' }));+ await waitFor(() => expect(getMcp).toHaveBeenCalledTimes(1));++ fireEvent.click(screen.getByRole('button', { name: 'Refresh connectors' }));++ await waitFor(() => expect(getMcp).toHaveBeenCalledTimes(2));+ expect(getModels).toHaveBeenCalledTimes(1);+ expect(getSkills).toHaveBeenCalledTimes(1);+ });});diff --git a/packages/trueforge-ui-sdk/test/atoms/draft/DraftCompositeSelector.test.tsx b/packages/trueforge-ui-sdk/test/atoms/draft/DraftCompositeSelector.test.tsxindex 13ac310ee..4db08b2ee 100644--- a/packages/trueforge-ui-sdk/test/atoms/draft/DraftCompositeSelector.test.tsx+++ b/packages/trueforge-ui-sdk/test/atoms/draft/DraftCompositeSelector.test.tsx@@ -1,5 +1,5 @@// @vitest-environment jsdom-import { act, fireEvent, render, screen, within } from '@testing-library/react';+import { act, fireEvent, render, screen, waitFor, within } from '@testing-library/react';import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';import { DraftCatalogProvider } from '@/atoms/draft/DraftCatalogProvider.js';@@ -9,8 +9,14 @@ import {type DraftCompositeSelectorProps,} from '@/atoms/draft/DraftCompositeSelector.js';import { ServerProvider } from '@/server/ServerContext.js';-import type { AgentBuilderCapabilitiesResponse, AgentSpec, AgentUIServer } from '@/server/types.js';-import { createMockAgentUIServer } from '../../server/mockServer.js';+import type {+ AgentBuilderCapabilitiesResponse,+ AgentSpec,+ AgentUIServer,+ CatalogServer,+ ConnectorState,+} from '@/server/types.js';+import { createMockAgentUIServer, createMockCatalog } from '../../server/mockServer.js';let agentSpec: AgentSpec;const updateAgentSpec = vi.fn();@@ -25,11 +31,13 @@ type RenderSelectorOptions = {getCapabilities?: () => Promise<AgentBuilderCapabilitiesResponse>;getSkills?: AgentUIServer['getSkills'];getMcp?: AgentUIServer['getMcp'];+ catalog?: CatalogServer;};-function renderSelector({ props = {}, getCapabilities, getSkills, getMcp }: RenderSelectorOptions = {}) {+function renderSelector({ props = {}, getCapabilities, getSkills, getMcp, catalog }: RenderSelectorOptions = {}) {const server = createMockAgentUIServer({...(getCapabilities === undefined ? {} : { getCapabilities }),+ ...(catalog === undefined ? {} : { catalog }),getSkills:getSkills ??(async () => [@@ -90,6 +98,83 @@ describe('DraftCompositeSelector', () => {});});+ it('shows an unauthenticated DCR connector, authorizes it, and refetches connectors', async () => {+ const pendingConnector = {+ id: 'linear',+ name: 'Linear',+ description: 'Issue tracking',+ auth: { type: 'dcr' as const },+ requiresAuth: true,+ authenticated: false,+ };+ const connectedConnector = { ...pendingConnector, requiresAuth: false, authenticated: true };+ const getMcp = vi+ .fn<() => Promise<ConnectorState[]>>()+ .mockResolvedValueOnce([pendingConnector])+ .mockResolvedValueOnce([connectedConnector]);+ const authenticateConnector = vi.fn(async () => ({ status: 'AUTHENTICATED' }));+ const defaultCatalog = createMockCatalog();+ const catalog = createMockCatalog({+ connectorCatalog: {+ ...defaultCatalog.connectorCatalog,+ authenticateConnector,+ },+ });++ renderSelector({ getMcp, catalog });+ fireEvent.click(screen.getByRole('button', { name: 'Add connectors, skills, or attachments' }));++ const connect = await screen.findByRole('button', { name: 'Connect Linear' });+ const linear = screen.getByRole('menuitemcheckbox', { name: /Linear/ });+ expect(linear).toHaveAttribute('aria-checked', 'false');+ fireEvent.click(linear);+ expect(linear).toHaveAttribute('aria-checked', 'true');+ fireEvent.click(connect);+ expect(linear).toHaveAttribute('aria-checked', 'true');++ await waitFor(() =>+ expect(authenticateConnector).toHaveBeenCalledWith({+ id: 'linear',+ redirectURL: expect.stringContaining('screenType=mcp-auth'),+ }),+ );+ await waitFor(() => expect(getMcp).toHaveBeenCalledTimes(2));+ await waitFor(() => expect(screen.getByRole('menuitemcheckbox', { name: /Linear/ })).toBeEnabled());+ expect(screen.queryByRole('button', { name: 'Connect Linear' })).not.toBeInTheDocument();+ });++ it('lists selectable connectors before connectors that require connection', async () => {+ agentSpec = {+ model: { name: 'openai/gpt-4.1' },+ mcpServers: [],+ skills: [],+ };+ const pendingConnector = {+ id: 'linear',+ name: 'Linear',+ auth: { type: 'dcr' as const },+ requiresAuth: true,+ authenticated: false,+ };+ const readyConnector = {+ id: 'github',+ name: 'GitHub',+ requiresAuth: false,+ authenticated: true,+ };++ renderSelector({+ getMcp: async () => [pendingConnector, readyConnector],+ catalog: createMockCatalog(),+ });+ fireEvent.click(screen.getByRole('button', { name: 'Add connectors, skills, or attachments' }));++ const dialog = await screen.findByRole('dialog', { name: 'Add to composer' });+ const readyRow = within(dialog).getByRole('menuitemcheckbox', { name: /GitHub/ });+ const connectButton = within(dialog).getByRole('button', { name: 'Connect Linear' });+ expect(readyRow.compareDocumentPosition(connectButton)).toBe(Node.DOCUMENT_POSITION_FOLLOWING);+ });+it('hydrates name-only wire mounts so a toggle does not wipe them', async () => {agentSpec = {model: { name: 'openai/gpt-4.1' },