@opensumi/ide-ai-native 3.8.1-next-1741317422.0 → 3.8.1

package/src/browser/mcp/config/components/mcp-config.view.tsx

@@ -6,32 +6,24 @@ import { AINativeSettingSectionsId, ILogger, useInjectable } from '@opensumi/ide
 import { PreferenceService } from '@opensumi/ide-core-browser/lib/preferences';
 import { localize } from '@opensumi/ide-core-common';
 
-import { BUILTIN_MCP_SERVER_NAME } from '../../../../common';
+import { BUILTIN_MCP_SERVER_NAME, ISumiMCPServerBackend, SumiMCPServerProxyServicePath } from '../../../../common';
 import { MCPServerDescription } from '../../../../common/mcp-server-manager';
-import { MCP_SERVER_TYPE } from '../../../../common/types';
+import { MCPServer, MCP_SERVER_TYPE } from '../../../../common/types';
 import { MCPServerProxyService } from '../../mcp-server-proxy.service';
 
 import styles from './mcp-config.module.less';
 import { MCPServerForm, MCPServerFormData } from './mcp-server-form';
 
-interface MCPServer {
-  name: string;
-  isStarted: boolean;
-  tools?: string[];
-  command?: string;
-  type?: string;
-  serverHost?: string;
-}
-
 export const MCPConfigView: React.FC = () => {
   const mcpServerProxyService = useInjectable<MCPServerProxyService>(MCPServerProxyService);
   const preferenceService = useInjectable<PreferenceService>(PreferenceService);
+  const sumiMCPServerBackendProxy = useInjectable<ISumiMCPServerBackend>(SumiMCPServerProxyServicePath);
   const logger = useInjectable<ILogger>(ILogger);
   const [servers, setServers] = React.useState<MCPServer[]>([]);
   const [formVisible, setFormVisible] = React.useState(false);
   const [editingServer, setEditingServer] = React.useState<MCPServerFormData | undefined>();
 
-  const loadServers = React.useCallback(async () => {
+  const loadServers = useCallback(async () => {
     const allServers = await mcpServerProxyService.$getServers();
     setServers(allServers);
   }, [mcpServerProxyService]);
@@ -45,96 +37,110 @@ export const MCPConfigView: React.FC = () => {
     return () => {
       disposer.dispose();
     };
-  }, [mcpServerProxyService, loadServers]);
+  }, []);
 
-  const handleServerControl = async (serverName: string, start: boolean) => {
-    try {
-      if (start) {
-        await mcpServerProxyService.$startServer(serverName);
-      } else {
-        await mcpServerProxyService.$stopServer(serverName);
-      }
+  const handleServerControl = useCallback(
+    async (serverName: string, start: boolean) => {
+      try {
+        if (start) {
+          await mcpServerProxyService.$startServer(serverName);
+        } else {
+          await mcpServerProxyService.$stopServer(serverName);
+        }
 
-      // Update enabled state in preferences
-      const servers = preferenceService.get<MCPServerDescription[]>(AINativeSettingSectionsId.MCPServers, []);
-      let updatedServers = servers;
-      // 处理内置服务器的特殊情况
-      if (serverName === BUILTIN_MCP_SERVER_NAME) {
-        const builtinServerExists = servers.some((server) => server.name === BUILTIN_MCP_SERVER_NAME);
-        if (!builtinServerExists && !start) {
-          // 如果是停止内置服务器且之前没有配置，添加一个新的配置项
-          // 内置服务器不需要 command，因为它是直接集成在 IDE 中的
-          updatedServers = [
-            ...servers,
-            {
-              name: BUILTIN_MCP_SERVER_NAME,
-              enabled: false,
-              command: '', // 内置服务器的 command 为空字符串
-              type: MCP_SERVER_TYPE.STDIO,
-            },
-          ];
+        // Update enabled state in preferences
+        const servers = preferenceService.get<MCPServerDescription[]>(AINativeSettingSectionsId.MCPServers, []);
+        let updatedServers = servers;
+        // 处理内置服务器的特殊情况
+        if (serverName === BUILTIN_MCP_SERVER_NAME) {
+          const builtinServerExists = servers.some((server) => server.name === BUILTIN_MCP_SERVER_NAME);
+          if (!builtinServerExists && !start) {
+            // 如果是停止内置服务器且之前没有配置，添加一个新的配置项
+            // 内置服务器不需要 command，因为它是直接集成在 IDE 中的
+            updatedServers = [
+              ...servers,
+              {
+                name: BUILTIN_MCP_SERVER_NAME,
+                enabled: false,
+                command: '', // 内置服务器的 command 为空字符串
+                type: MCP_SERVER_TYPE.STDIO,
+              },
+            ];
+          } else {
+            // 如果已经存在配置，更新 enabled 状态
+            updatedServers = servers.map((server) => {
+              if (server.name === BUILTIN_MCP_SERVER_NAME) {
+                return { ...server, enabled: start };
+              }
+              return server;
+            });
+          }
         } else {
-          // 如果已经存在配置，更新 enabled 状态
+          // 处理其他外部服务器
           updatedServers = servers.map((server) => {
-            if (server.name === BUILTIN_MCP_SERVER_NAME) {
+            if (server.name === serverName) {
               return { ...server, enabled: start };
             }
             return server;
           });
         }
-      } else {
-        // 处理其他外部服务器
-        updatedServers = servers.map((server) => {
-          if (server.name === serverName) {
-            return { ...server, enabled: start };
-          }
-          return server;
-        });
-      }
 
-      await preferenceService.set(AINativeSettingSectionsId.MCPServers, updatedServers);
-      await loadServers();
-    } catch (error) {
-      logger.error(`Failed to ${start ? 'start' : 'stop'} server ${serverName}:`, error);
-    }
-  };
+        await preferenceService.set(AINativeSettingSectionsId.MCPServers, updatedServers);
+        await loadServers();
+      } catch (error) {
+        logger.error(`Failed to ${start ? 'start' : 'stop'} server ${serverName}:`, error);
+      }
+    },
+    [mcpServerProxyService, preferenceService, sumiMCPServerBackendProxy, loadServers],
+  );
 
-  const handleAddServer = () => {
+  const handleAddServer = useCallback(() => {
     setEditingServer(undefined);
     setFormVisible(true);
-  };
+  }, [editingServer, formVisible]);
 
-  const handleEditServer = (server: MCPServer) => {
-    const servers = preferenceService.get<MCPServerFormData[]>(AINativeSettingSectionsId.MCPServers, []);
-    const serverConfig = servers.find((s) => s.name === server.name);
+  const handleEditServer = useCallback(
+    (server: MCPServer) => {
+      const servers = preferenceService.get<MCPServerFormData[]>(AINativeSettingSectionsId.MCPServers, []);
+      const serverConfig = servers.find((s) => s.name === server.name);
 
-    if (serverConfig) {
-      setEditingServer(serverConfig);
-      setFormVisible(true);
-    }
-  };
-
-  const handleDeleteServer = async (serverName: string) => {
-    const servers = preferenceService.get<MCPServerFormData[]>(AINativeSettingSectionsId.MCPServers, []);
-    const updatedServers = servers.filter((s) => s.name !== serverName);
-    await preferenceService.set(AINativeSettingSectionsId.MCPServers, updatedServers);
-    await loadServers();
-  };
-
-  const handleSaveServer = async (data: MCPServerFormData) => {
-    const servers = preferenceService.get<MCPServerFormData[]>(AINativeSettingSectionsId.MCPServers, []);
-    const existingIndex = servers.findIndex((s) => s.name === data.name);
-
-    if (existingIndex >= 0) {
-      servers[existingIndex] = data;
-    } else {
-      servers.push(data);
-    }
+      if (serverConfig) {
+        setEditingServer(serverConfig);
+        setFormVisible(true);
+      }
+    },
+    [editingServer, formVisible],
+  );
+
+  const handleDeleteServer = useCallback(
+    async (serverName: string) => {
+      const servers = preferenceService.get<MCPServerFormData[]>(AINativeSettingSectionsId.MCPServers, []);
+      const updatedServers = servers.filter((s) => s.name !== serverName);
+      sumiMCPServerBackendProxy.removeServer(serverName);
+      await preferenceService.set(AINativeSettingSectionsId.MCPServers, updatedServers);
+      await loadServers();
+    },
+    [editingServer, formVisible],
+  );
 
-    await preferenceService.set(AINativeSettingSectionsId.MCPServers, servers);
-    setFormVisible(false);
-    await loadServers();
-  };
+  const handleSaveServer = useCallback(
+    async (data: MCPServerFormData) => {
+      const servers = preferenceService.get<MCPServerFormData[]>(AINativeSettingSectionsId.MCPServers, []);
+      const existingIndex = servers.findIndex((s) => s.name === data.name);
+
+      if (existingIndex >= 0) {
+        servers[existingIndex] = data;
+      } else {
+        servers.push(data);
+      }
+      setServers(servers as MCPServer[]);
+      setFormVisible(false);
+      await sumiMCPServerBackendProxy.addOrUpdateServer(data as MCPServerDescription);
+      await preferenceService.set(AINativeSettingSectionsId.MCPServers, servers);
+      await loadServers();
+    },
+    [servers, formVisible, loadServers],
+  );
 
   const getReadableServerType = useCallback((type: string) => {
     switch (type) {
@@ -237,6 +243,7 @@ export const MCPConfigView: React.FC = () => {
       <MCPServerForm
         visible={formVisible}
         initialData={editingServer}
+        servers={servers}
         onSave={handleSaveServer}
         onCancel={() => setFormVisible(false)}
       />

package/src/browser/mcp/config/components/mcp-server-form.tsx

@@ -1,12 +1,14 @@
 import cls from 'classnames';
-import React, { useCallback } from 'react';
+import React, { ChangeEvent, FC, FormEvent, useCallback, useEffect, useState } from 'react';
 
 import { Select } from '@opensumi/ide-components';
 import { Button } from '@opensumi/ide-components/lib/button';
 import { Modal } from '@opensumi/ide-components/lib/modal';
-import { localize } from '@opensumi/ide-core-common';
+import { useInjectable } from '@opensumi/ide-core-browser';
+import { formatLocalize, localize } from '@opensumi/ide-core-common';
+import { IMessageService } from '@opensumi/ide-overlay';
 
-import { MCP_SERVER_TYPE } from '../../../../common/types';
+import { MCPServer, MCP_SERVER_TYPE } from '../../../../common/types';
 
 import styles from './mcp-server-form.module.less';
 export interface MCPServerFormData {
@@ -21,12 +23,13 @@ export interface MCPServerFormData {
 interface Props {
   visible: boolean;
   initialData?: MCPServerFormData;
+  servers: MCPServer[];
   onSave: (data: MCPServerFormData) => void;
   onCancel: () => void;
 }
 
-export const MCPServerForm: React.FC<Props> = ({ visible, initialData, onSave, onCancel }) => {
-  const [formData, setFormData] = React.useState<MCPServerFormData>(() => ({
+export const MCPServerForm: FC<Props> = ({ visible, initialData, onSave, onCancel, servers: existingServers }) => {
+  const [formData, setFormData] = useState<MCPServerFormData>(() => ({
     name: '',
     command: '',
     args: [],
@@ -34,9 +37,9 @@ export const MCPServerForm: React.FC<Props> = ({ visible, initialData, onSave, o
     type: MCP_SERVER_TYPE.STDIO,
     ...initialData,
   }));
-
-  const [argsText, setArgsText] = React.useState(() => initialData?.args?.join(' ') || '');
-  const [envText, setEnvText] = React.useState(() => {
+  const messageService = useInjectable<IMessageService>(IMessageService);
+  const [argsText, setArgsText] = useState(() => initialData?.args?.join(' ') || '');
+  const [envText, setEnvText] = useState(() => {
     if (!initialData?.env) {
       return '';
     }
@@ -45,7 +48,7 @@ export const MCPServerForm: React.FC<Props> = ({ visible, initialData, onSave, o
       .join('\n');
   });
 
-  React.useEffect(() => {
+  useEffect(() => {
     setFormData({
       name: '',
       command: '',
@@ -64,8 +67,12 @@ export const MCPServerForm: React.FC<Props> = ({ visible, initialData, onSave, o
     );
   }, [initialData]);
 
-  const handleSubmit = (e: React.FormEvent) => {
+  const handleSubmit = (e: FormEvent) => {
     e.preventDefault();
+    const isValid = validateForm(formData);
+    if (!isValid) {
+      return;
+    }
     const form = {
       ...formData,
     };
@@ -91,29 +98,28 @@ export const MCPServerForm: React.FC<Props> = ({ visible, initialData, onSave, o
   };
 
   const handleCommandChange = useCallback(
-    (e: React.ChangeEvent<HTMLInputElement>) => {
+    (e: ChangeEvent<HTMLInputElement>) => {
       setFormData({ ...formData, command: e.target.value });
-      setArgsText(e.target.value.split(' ').filter(Boolean).join(' '));
     },
     [formData, argsText],
   );
 
   const handleArgsChange = useCallback(
-    (e: React.ChangeEvent<HTMLTextAreaElement>) => {
+    (e: ChangeEvent<HTMLTextAreaElement>) => {
       setArgsText(e.target.value);
     },
     [argsText],
   );
 
   const handleEnvChange = useCallback(
-    (e: React.ChangeEvent<HTMLTextAreaElement>) => {
+    (e: ChangeEvent<HTMLTextAreaElement>) => {
       setEnvText(e.target.value);
     },
     [envText],
   );
 
   const handleServerHostChange = useCallback(
-    (e: React.ChangeEvent<HTMLTextAreaElement>) => {
+    (e: ChangeEvent<HTMLTextAreaElement>) => {
       setFormData({ ...formData, serverHost: e.target.value });
     },
     [formData],
@@ -177,6 +183,32 @@ export const MCPServerForm: React.FC<Props> = ({ visible, initialData, onSave, o
     }
   }, [formData, argsText, envText]);
 
+  const validateForm = useCallback(
+    (formData: MCPServerFormData) => {
+      if (formData.name.trim() === '') {
+        messageService.error(localize('ai.native.mcp.name.isRequired'));
+        return false;
+      }
+      if (existingServers.some((server) => server.name.toLocaleLowerCase() === formData.name.toLocaleLowerCase())) {
+        messageService.error(formatLocalize('ai.native.mcp.serverNameExists', formData.name));
+        return false;
+      }
+      if (formData.type === MCP_SERVER_TYPE.SSE) {
+        const isServerHostValid = formData.serverHost?.trim() !== '';
+        if (!isServerHostValid) {
+          messageService.error(localize('ai.native.mcp.serverHost.isRequired'));
+        }
+        return isServerHostValid;
+      }
+      const isCommandValid = formData.command?.trim() !== '';
+      if (!isCommandValid) {
+        messageService.error(localize('ai.native.mcp.command.isRequired'));
+      }
+      return isCommandValid;
+    },
+    [existingServers],
+  );
+
   return (
     <Modal
       title={initialData ? localize('ai.native.mcp.editMCPServer.title') : localize('ai.native.mcp.addMCPServer.title')}

package/src/common/index.ts

@@ -137,6 +137,8 @@ export interface ISumiMCPServerBackend {
   getServers(): Promise<Array<{ name: string; isStarted: boolean }>>;
   startServer(serverName: string): Promise<void>;
   stopServer(serverName: string): Promise<void>;
+  addOrUpdateServer(description: MCPServerDescription): void;
+  removeServer(name: string): void;
 }
 
 export const SumiMCPServerProxyServicePath = 'SumiMCPServerProxyServicePath';

package/src/common/types.ts

@@ -42,6 +42,15 @@ export interface IMCPServerProxyService {
   $stopServer(serverName: string): Promise<void>;
 }
 
+export interface MCPServer {
+  name: string;
+  isStarted: boolean;
+  tools?: string[];
+  command?: string;
+  type?: string;
+  serverHost?: string;
+}
+
 export interface MCPTool {
   name: string;
   description: string;

package/src/node/base-language-model.ts

@@ -198,7 +198,7 @@ export abstract class BaseLanguageModel {
 
         // 处理最后一行可能存在的后缀
         if (pendingLines.length > 0) {
-          let lastLine = pendingLines[pendingLines.length - 1];
+          let lastLine = pendingLines[pendingLines.length - 1].trim();
 
           if (lastLine.endsWith(trimTexts[1])) {
             // 移除后缀

package/src/node/mcp/sumi-mcp-server.ts

@@ -198,6 +198,14 @@ export class SumiMCPServerBackend extends RPCService<IMCPServerProxyService> imp
     await this.mcpServerManager.stopServer(serverName);
     this.client?.$updateMCPServers();
   }
+
+  public addOrUpdateServer(description: MCPServerDescription) {
+    this.mcpServerManager.addOrUpdateServer(description);
+  }
+
+  public removeServer(name: string) {
+    this.mcpServerManager.removeServer(name);
+  }
 }
 
 export const TokenBuiltinMCPServer = Symbol('TokenBuiltinMCPServer');

package/src/node/mcp-server.sse.ts

@@ -34,9 +34,7 @@ export class SSEMCPServer implements IMCPServer {
     }
     this.logger?.log(`Starting server "${this.name}" with serverHost: ${this.serverHost}`);
 
-    const transport = new SSEClientTransport(new URL(this.serverHost), {
-      eventSourceInit: {},
-    });
+    const transport = new SSEClientTransport(new URL(this.serverHost));
     transport.onerror = (error) => {
       this.logger?.error('Transport Error:', error);
     };