diff --git a/apps/agent/components/elements/AppSelector.tsx b/apps/agent/components/elements/AppSelector.tsx index 02b0255c0..afb73e2aa 100644 --- a/apps/agent/components/elements/AppSelector.tsx +++ b/apps/agent/components/elements/AppSelector.tsx @@ -22,7 +22,7 @@ import { useGetMCPServersList } from '@/entrypoints/app/connect-mcp/useGetMCPSer import { useGetUserMCPIntegrations } from '@/entrypoints/app/connect-mcp/useGetUserMCPIntegrations' import { useSubmitApiKey } from '@/entrypoints/app/connect-mcp/useSubmitApiKey' import { MANAGED_MCP_ADDED_EVENT } from '@/lib/constants/analyticsEvents' -import { useMcpServers } from '@/lib/mcp/mcpServerStorage' +import { useAddMcpServer, useMcpConfig } from '@/lib/mcp/useMcpConfig' import { useSyncRemoteIntegrations } from '@/lib/mcp/useSyncRemoteIntegrations' import { track } from '@/lib/metrics/track' import { sentry } from '@/lib/sentry/sentry' @@ -43,7 +43,8 @@ export const AppSelector: FC = ({ apiKeyUrl: string } | null>(null) - const { servers: createdServers, addServer } = useMcpServers() + const { servers: createdServers } = useMcpConfig() + const { mutateAsync: addMcpServerMutation } = useAddMcpServer() useSyncRemoteIntegrations() const { trigger: addManagedServerMutation } = useAddManagedServer() const { trigger: submitApiKeyMutation, isMutating: isSubmittingApiKey } = @@ -125,8 +126,7 @@ export const AppSelector: FC = ({ const handleAddServer = async (name: string, description: string) => { try { const response = await addManagedServerMutation({ serverName: name }) - addServer({ - id: Date.now().toString(), + await addMcpServerMutation({ displayName: name, type: 'managed', managedServerName: name, diff --git a/apps/agent/entrypoints/app/connect-mcp/AddCustomMCPDialog.tsx b/apps/agent/entrypoints/app/connect-mcp/AddCustomMCPDialog.tsx index 381873a70..0ea8b31df 100644 --- a/apps/agent/entrypoints/app/connect-mcp/AddCustomMCPDialog.tsx +++ b/apps/agent/entrypoints/app/connect-mcp/AddCustomMCPDialog.tsx @@ -1,7 +1,14 @@ import { zodResolver } from '@hookform/resolvers/zod' -import { ChevronRight, Lightbulb } from 'lucide-react' -import type { FC } from 'react' -import { useForm } from 'react-hook-form' +import { + ChevronRight, + Info, + Lightbulb, + Minus, + Plus, + Terminal, +} from 'lucide-react' +import { type FC, useState } from 'react' +import { useFieldArray, useForm } from 'react-hook-form' import { z } from 'zod/v3' import { Button } from '@/components/ui/button' import { @@ -20,31 +27,54 @@ import { import { Form, FormControl, - FormDescription, FormField, FormItem, FormLabel, FormMessage, } from '@/components/ui/form' import { Input } from '@/components/ui/input' +import { Tabs, TabsList, TabsTrigger } from '@/components/ui/tabs' import { Textarea } from '@/components/ui/textarea' -const formSchema = z.object({ +type McpTransport = 'http' | 'sse' | 'stdio' + +const urlFormSchema = z.object({ + transport: z.enum(['http', 'sse']), name: z.string().min(1, 'Server name is required'), url: z.string().url('Please enter a valid URL'), + headers: z.array(z.object({ key: z.string(), value: z.string() })).optional(), description: z.string().optional(), }) -type FormValues = z.infer +const stdioFormSchema = z.object({ + transport: z.literal('stdio'), + name: z.string().min(1, 'Server name is required'), + command: z.string().min(1, 'Command is required'), + args: z.string().optional(), + cwd: z.string().optional(), + envVars: z.array(z.object({ key: z.string(), value: z.string() })).optional(), + description: z.string().optional(), +}) + +type UrlFormValues = z.infer +type StdioFormValues = z.infer + +export interface CustomServerConfig { + name: string + url: string + description: string + transport?: McpTransport + headers?: Record + command?: string + args?: string[] + cwd?: string + env?: Record +} interface AddCustomMCPDialogProps { open: boolean onOpenChange: (open: boolean) => void - onAddServer: (config: { - name: string - url: string - description: string - }) => void + onAddServer: (config: CustomServerConfig) => void } export const AddCustomMCPDialog: FC = ({ @@ -52,32 +82,108 @@ export const AddCustomMCPDialog: FC = ({ onOpenChange, onAddServer, }) => { - const form = useForm({ - resolver: zodResolver(formSchema), + const [transport, setTransport] = useState('http') + + const urlForm = useForm({ + resolver: zodResolver(urlFormSchema), defaultValues: { + transport: 'http', name: '', url: '', + headers: [], description: '', }, }) + const stdioForm = useForm({ + resolver: zodResolver(stdioFormSchema), + defaultValues: { + transport: 'stdio', + name: '', + command: '', + args: '', + cwd: '', + envVars: [], + description: '', + }, + }) + + const { + fields: headerFields, + append: addHeader, + remove: removeHeader, + } = useFieldArray({ control: urlForm.control, name: 'headers' }) + + const { + fields: envFields, + append: addEnvVar, + remove: removeEnvVar, + } = useFieldArray({ control: stdioForm.control, name: 'envVars' }) + + const resetForms = () => { + urlForm.reset() + stdioForm.reset() + setTransport('http') + } + const handleOpenChange = (isOpen: boolean) => { - if (!isOpen) { - form.reset() - } + if (!isOpen) resetForms() onOpenChange(isOpen) } - const onSubmit = (values: FormValues) => { + const handleTransportChange = (value: string) => { + const t = value as McpTransport + setTransport(t) + if (t === 'http' || t === 'sse') { + urlForm.setValue('transport', t) + } + } + + const onUrlSubmit = (values: UrlFormValues) => { + const headers: Record = {} + for (const h of values.headers ?? []) { + if (h.key.trim()) headers[h.key.trim()] = h.value + } + onAddServer({ name: values.name, url: values.url, description: values.description ?? '', + transport: values.transport, + headers: Object.keys(headers).length > 0 ? headers : undefined, }) - form.reset() + resetForms() onOpenChange(false) } + const onStdioSubmit = (values: StdioFormValues) => { + // Parse space-separated args string into array + const args = values.args?.trim() + ? values.args.trim().split(/\s+/) + : undefined + + // Convert env var pairs to record + const env: Record = {} + for (const v of values.envVars ?? []) { + if (v.key.trim()) env[v.key.trim()] = v.value + } + + onAddServer({ + name: values.name, + url: '', + description: values.description ?? '', + transport: 'stdio', + command: values.command, + args, + cwd: values.cwd?.trim() || undefined, + env: Object.keys(env).length > 0 ? env : undefined, + }) + resetForms() + onOpenChange(false) + } + + const isStdio = transport === 'stdio' + return ( @@ -88,97 +194,342 @@ export const AddCustomMCPDialog: FC = ({ -
- - ( - - Server Name - - - - - - )} - /> - - ( - - MCP Server URL - (only supports HTTP) - - - - - - )} - /> - - ( - - Description (Optional) - -