diff --git a/frontend/src/components/ui/DynamicForm.tsx b/frontend/src/components/ui/DynamicForm.tsx index 690c206..86ea193 100644 --- a/frontend/src/components/ui/DynamicForm.tsx +++ b/frontend/src/components/ui/DynamicForm.tsx @@ -18,9 +18,10 @@ interface DynamicFormProps { onCancel: () => void; loading?: boolean; storageKey?: string; // Optional key for localStorage persistence + title?: string; // Optional title to display instead of default parameters title } -const DynamicForm: React.FC = ({ schema, onSubmit, onCancel, loading = false, storageKey }) => { +const DynamicForm: React.FC = ({ schema, onSubmit, onCancel, loading = false, storageKey, title }) => { const { t } = useTranslation(); const [formValues, setFormValues] = useState>({}); const [errors, setErrors] = useState>({}); @@ -624,15 +625,15 @@ const DynamicForm: React.FC = ({ schema, onSubmit, onCancel, l return (
{/* Mode Toggle */} -
-

{t('tool.parameters')}

+
+
{title}
@@ -685,7 +686,7 @@ const DynamicForm: React.FC = ({ schema, onSubmit, onCancel, l } }} disabled={loading || !!jsonError} - className="px-4 py-2 text-sm text-white bg-blue-600 rounded-md hover:bg-blue-700 disabled:opacity-50" + className="px-4 py-1 text-sm text-white bg-blue-600 rounded-md hover:bg-blue-700 disabled:opacity-50" > {loading ? t('tool.running') : t('tool.runTool')} @@ -702,14 +703,14 @@ const DynamicForm: React.FC = ({ schema, onSubmit, onCancel, l diff --git a/frontend/src/components/ui/ToolCard.tsx b/frontend/src/components/ui/ToolCard.tsx index c9a6656..704a830 100644 --- a/frontend/src/components/ui/ToolCard.tsx +++ b/frontend/src/components/ui/ToolCard.tsx @@ -229,13 +229,13 @@ const ToolCard = ({ tool, server, onToggle, onDescriptionUpdate }: ToolCardProps {/* Run Form */} {showRunForm && (
-

{t('tool.runToolWithName', { name: tool.name.replace(server + '-', '') })}

{/* Tool Result */} {result && ( diff --git a/frontend/src/locales/zh.json b/frontend/src/locales/zh.json index b4f0a20..b8c205d 100644 --- a/frontend/src/locales/zh.json +++ b/frontend/src/locales/zh.json @@ -303,7 +303,7 @@ "tool": { "run": "运行", "running": "运行中...", - "runTool": "运行工具", + "runTool": "运行", "cancel": "取消", "noDescription": "无描述信息", "inputSchema": "输入模式：", diff --git a/src/services/mcpService.ts b/src/services/mcpService.ts index 52f5d7e..dcf143e 100644 --- a/src/services/mcpService.ts +++ b/src/services/mcpService.ts @@ -101,6 +101,187 @@ export const syncToolEmbedding = async (serverName: string, toolName: string) => // Store all server information let serverInfos: ServerInfo[] = []; +// Helper function to create transport based on server configuration +const createTransportFromConfig = (name: string, conf: ServerConfig): any => { + let transport; + + if (conf.type === 'streamable-http') { + const options: any = {}; + if (conf.headers && Object.keys(conf.headers).length > 0) { + options.requestInit = { + headers: conf.headers, + }; + } + transport = new StreamableHTTPClientTransport(new URL(conf.url || ''), options); + } else if (conf.url) { + // SSE transport + const options: any = {}; + if (conf.headers && Object.keys(conf.headers).length > 0) { + options.eventSourceInit = { + headers: conf.headers, + }; + options.requestInit = { + headers: conf.headers, + }; + } + transport = new SSEClientTransport(new URL(conf.url), options); + } else if (conf.command && conf.args) { + // Stdio transport + const env: Record = { + ...(process.env as Record), + ...replaceEnvVars(conf.env || {}), + }; + env['PATH'] = expandEnvVars(process.env.PATH as string) || ''; + + const settings = loadSettings(); + // Add UV_DEFAULT_INDEX and npm_config_registry if needed + if ( + settings.systemConfig?.install?.pythonIndexUrl && + (conf.command === 'uvx' || conf.command === 'uv' || conf.command === 'python') + ) { + env['UV_DEFAULT_INDEX'] = settings.systemConfig.install.pythonIndexUrl; + } + + if ( + settings.systemConfig?.install?.npmRegistry && + (conf.command === 'npm' || + conf.command === 'npx' || + conf.command === 'pnpm' || + conf.command === 'yarn' || + conf.command === 'node') + ) { + env['npm_config_registry'] = settings.systemConfig.install.npmRegistry; + } + + transport = new StdioClientTransport({ + command: conf.command, + args: conf.args, + env: env, + stderr: 'pipe', + }); + transport.stderr?.on('data', (data) => { + console.log(`[${name}] [child] ${data}`); + }); + } else { + throw new Error(`Unable to create transport for server: ${name}`); + } + + return transport; +}; + +// Helper function to handle client.callTool with reconnection logic +const callToolWithReconnect = async ( + serverInfo: ServerInfo, + toolParams: any, + options?: any, + maxRetries: number = 1, +): Promise => { + if (!serverInfo.client) { + throw new Error(`Client not found for server: ${serverInfo.name}`); + } + + for (let attempt = 0; attempt <= maxRetries; attempt++) { + try { + const result = await serverInfo.client.callTool(toolParams, undefined, options || {}); + return result; + } catch (error: any) { + // Check if error message starts with "Error POSTing to endpoint (HTTP 40" + const isHttp40xError = error?.message?.startsWith?.('Error POSTing to endpoint (HTTP 40'); + // Only retry for StreamableHTTPClientTransport + const isStreamableHttp = serverInfo.transport instanceof StreamableHTTPClientTransport; + + if (isHttp40xError && attempt < maxRetries && serverInfo.transport && isStreamableHttp) { + console.warn( + `HTTP 40x error detected for StreamableHTTP server ${serverInfo.name}, attempting reconnection (attempt ${attempt + 1}/${maxRetries + 1})`, + ); + + try { + // Close existing connection + if (serverInfo.keepAliveIntervalId) { + clearInterval(serverInfo.keepAliveIntervalId); + serverInfo.keepAliveIntervalId = undefined; + } + + serverInfo.client.close(); + serverInfo.transport.close(); + + // Get server configuration to recreate transport + const settings = loadSettings(); + const conf = settings.mcpServers[serverInfo.name]; + if (!conf) { + throw new Error(`Server configuration not found for: ${serverInfo.name}`); + } + + // Recreate transport using helper function + const newTransport = createTransportFromConfig(serverInfo.name, conf); + + // Create new client + const client = new Client( + { + name: `mcp-client-${serverInfo.name}`, + version: '1.0.0', + }, + { + capabilities: { + prompts: {}, + resources: {}, + tools: {}, + }, + }, + ); + + // Reconnect with new transport + await client.connect(newTransport, serverInfo.options || {}); + + // Update server info with new client and transport + serverInfo.client = client; + serverInfo.transport = newTransport; + serverInfo.status = 'connected'; + + // Reload tools list after reconnection + try { + const tools = await client.listTools({}, serverInfo.options || {}); + serverInfo.tools = tools.tools.map((tool) => ({ + name: `${serverInfo.name}-${tool.name}`, + description: tool.description || '', + inputSchema: tool.inputSchema || {}, + })); + + // Save tools as vector embeddings for search + saveToolsAsVectorEmbeddings(serverInfo.name, serverInfo.tools); + } catch (listToolsError) { + console.warn( + `Failed to reload tools after reconnection for server ${serverInfo.name}:`, + listToolsError, + ); + // Continue anyway, as the connection might still work for the current tool + } + + console.log(`Successfully reconnected to server: ${serverInfo.name}`); + + // Continue to next attempt + continue; + } catch (reconnectError) { + console.error(`Failed to reconnect to server ${serverInfo.name}:`, reconnectError); + serverInfo.status = 'disconnected'; + serverInfo.error = `Failed to reconnect: ${reconnectError}`; + + // If this was the last attempt, throw the original error + if (attempt === maxRetries) { + throw error; + } + } + } else { + // Not an HTTP 40x error or no more retries, throw the original error + throw error; + } + } + } + + // This should not be reached, but just in case + throw new Error('Unexpected error in callToolWithReconnect'); +}; + // Initialize MCP server clients export const initializeClientsFromSettings = async (isInit: boolean): Promise => { const settings = loadSettings(); @@ -154,21 +335,21 @@ export const initializeClientsFromSettings = async (isInit: boolean): Promise s.name === name); - if (existingServerIndex !== -1) { - serverInfos[existingServerIndex].status = 'disconnected'; - serverInfos[existingServerIndex].error = `Failed to initialize OpenAPI server: ${error}`; - } else { - // Add new server info with error status - serverInfos.push({ - name, - status: 'disconnected', - error: `Failed to initialize OpenAPI server: ${error}`, - tools: [], - createTime: Date.now(), - }); - } + // Update the already pushed server info with error status + serverInfo.status = 'disconnected'; + serverInfo.error = `Failed to initialize OpenAPI server: ${error}`; continue; } - } else if (conf.type === 'streamable-http') { - const options: any = {}; - if (conf.headers && Object.keys(conf.headers).length > 0) { - options.requestInit = { - headers: conf.headers, - }; - } - transport = new StreamableHTTPClientTransport(new URL(conf.url || ''), options); - } else if (conf.url) { - // Default to SSE only when 'conf.type' is not specified and 'conf.url' is available - const options: any = {}; - if (conf.headers && Object.keys(conf.headers).length > 0) { - options.eventSourceInit = { - headers: conf.headers, - }; - options.requestInit = { - headers: conf.headers, - }; - } - transport = new SSEClientTransport(new URL(conf.url), options); - } else if (conf.command && conf.args) { - // If type is stdio or if command and args are provided without type - const env: Record = { - ...(process.env as Record), // Inherit all environment variables from parent process - ...replaceEnvVars(conf.env || {}), // Override with configured env vars - }; - env['PATH'] = expandEnvVars(process.env.PATH as string) || ''; - - // Add UV_DEFAULT_INDEX from settings if available (for Python packages) - const settings = loadSettings(); // Add UV_DEFAULT_INDEX from settings if available (for Python packages) - if ( - settings.systemConfig?.install?.pythonIndexUrl && - (conf.command === 'uvx' || conf.command === 'uv' || conf.command === 'python') - ) { - env['UV_DEFAULT_INDEX'] = settings.systemConfig.install.pythonIndexUrl; - } - - // Add npm_config_registry from settings if available (for NPM packages) - if ( - settings.systemConfig?.install?.npmRegistry && - (conf.command === 'npm' || - conf.command === 'npx' || - conf.command === 'pnpm' || - conf.command === 'yarn' || - conf.command === 'node') - ) { - env['npm_config_registry'] = settings.systemConfig.install.npmRegistry; - } - - transport = new StdioClientTransport({ - command: conf.command, - args: conf.args, - env: env, - stderr: 'pipe', - }); - transport.stderr?.on('data', (data) => { - console.log(`[${name}] [child] ${data}`); - }); } else { - console.warn(`Skipping server '${name}': missing required configuration`); - serverInfos.push({ - name, - status: 'disconnected', - error: 'Missing required configuration', - tools: [], - createTime: Date.now(), - }); - continue; + transport = createTransportFromConfig(name, conf); } const client = new Client( @@ -312,6 +415,19 @@ export const initializeClientsFromSettings = async (isInit: boolean): Promise { @@ -320,11 +436,6 @@ export const initializeClientsFromSettings = async (isInit: boolean): Promise { console.log(`Successfully listed ${tools.tools.length} tools for server: ${name}`); - const serverInfo = getServerByName(name); - if (!serverInfo) { - console.warn(`Server info not found for server: ${name}`); - return; - } serverInfo.tools = tools.tools.map((tool) => ({ name: `${name}-${tool.name}`, @@ -344,33 +455,17 @@ export const initializeClientsFromSettings = async (isInit: boolean): Promise { console.error( `Failed to connect client for server ${name} by error: ${error} with stack: ${error.stack}`, ); - const serverInfo = getServerByName(name); - if (serverInfo) { - serverInfo.status = 'disconnected'; - serverInfo.error = `Failed to connect: ${error.stack} `; - } + serverInfo.status = 'disconnected'; + serverInfo.error = `Failed to connect: ${error.stack} `; }); - serverInfos.push({ - name, - status: 'connecting', - error: null, - tools: [], - client, - transport, - options: requestOptions, - createTime: Date.now(), - }); console.log(`Initialized client for server: ${name}`); } @@ -902,12 +997,12 @@ export const handleCallToolRequest = async (request: any, extra: any) => { toolName = toolName.startsWith(`${targetServerInfo.name}-`) ? toolName.replace(`${targetServerInfo.name}-`, '') : toolName; - const result = await client.callTool( + const result = await callToolWithReconnect( + targetServerInfo, { name: toolName, arguments: finalArgs, }, - undefined, targetServerInfo.options || {}, ); @@ -957,7 +1052,11 @@ export const handleCallToolRequest = async (request: any, extra: any) => { request.params.name = request.params.name.startsWith(`${serverInfo.name}-`) ? request.params.name.replace(`${serverInfo.name}-`, '') : request.params.name; - const result = await client.callTool(request.params, undefined, serverInfo.options || {}); + const result = await callToolWithReconnect( + serverInfo, + request.params, + serverInfo.options || {}, + ); console.log(`Tool call result: ${JSON.stringify(result)}`); return result; } catch (error) {