@opensumi/ide-ai-native 3.8.3-next-1745805174.0 → 3.8.3-next-1745835516.0

package/src/browser/ai-core.contribution.ts

@@ -52,9 +52,13 @@ import {
   CommandService,
   InlineChatFeatureRegistryToken,
   IntelligentCompletionsRegistryToken,
+  MCPConfigServiceToken,
+  PreferenceScope,
   ProblemFixRegistryToken,
   RenameCandidatesProviderRegistryToken,
   ResolveConflictRegistryToken,
+  STORAGE_NAMESPACE,
+  StorageProvider,
   TerminalRegistryToken,
   isUndefined,
   runWhenIdle,
@@ -88,7 +92,7 @@ import {
   deepSeekModels,
   openAiNativeModels,
 } from '../common';
-import { MCPServerDescription } from '../common/mcp-server-manager';
+import { MCPServerDescription, MCPServersEnabledKey } from '../common/mcp-server-manager';
 import { MCP_SERVER_TYPE } from '../common/types';
 
 import { ChatManagerService } from './chat/chat-manager.service';
@@ -111,6 +115,7 @@ import {
 } from './layout/tabbar.view';
 import { AIChatLogoAvatar } from './layout/view/avatar/avatar.view';
 import { BaseApplyService } from './mcp/base-apply.service';
+import { MCPConfigService } from './mcp/config/mcp-config.service';
 import {
   AINativeCoreContribution,
   IChatFeatureRegistry,
@@ -248,6 +253,9 @@ export class AINativeBrowserContribution
   @Autowired(SumiMCPServerProxyServicePath)
   private readonly sumiMCPServerBackendProxy: ISumiMCPServerBackend;
 
+  @Autowired(MCPConfigServiceToken)
+  private readonly mcpConfigService: MCPConfigService;
+
   @Autowired(WorkbenchEditorService)
   private readonly workbenchEditorService: WorkbenchEditorServiceImpl;
 
@@ -260,6 +268,9 @@ export class AINativeBrowserContribution
   @Autowired(BaseApplyService)
   private readonly applyService: BaseApplyService;
 
+  @Autowired(StorageProvider)
+  private readonly storageProvider: StorageProvider;
+
   constructor() {
     this.registerFeature();
   }
@@ -411,24 +422,68 @@ export class AINativeBrowserContribution
     });
   }
 
-  private initMCPServers() {
-    // 从 preferences 获取并初始化外部 MCP Servers
-    const mcpServers = this.preferenceService.getValid<MCPServerDescription[]>(AINativeSettingSectionsId.MCPServers);
+  private async initMCPServers() {
+    const storage = await this.storageProvider(STORAGE_NAMESPACE.CHAT);
+    let enabledMCPServers = storage.get<string[]>(MCPServersEnabledKey, [BUILTIN_MCP_SERVER_NAME]);
 
-    // 查找内置 MCP Server 的配置
-    const builtinServer = mcpServers?.find(
-      (server) => server.name === BUILTIN_MCP_SERVER_NAME && server.type === MCP_SERVER_TYPE.BUILTIN,
+    const oldMCPServers = this.preferenceService.get<MCPServerDescription[]>(AINativeSettingSectionsId.MCPServers, []);
+    let mcpServerFromWorkspace = this.preferenceService.resolve<{ mcpServers: Record<string, any>[] }>(
+      'mcp',
+      {
+        mcpServers: [] as any,
+      },
+      undefined,
     );
-
+    if (mcpServerFromWorkspace.scope === PreferenceScope.Default && oldMCPServers.length > 0) {
+      // 如果用户没有配置，也没有存储，则从旧配置迁移
+      const newMCPServers = {
+        mcpServers: [] as any,
+      };
+      const mcpServersEnabled = new Set<string>([BUILTIN_MCP_SERVER_NAME]);
+      oldMCPServers.forEach((server) => {
+        if (server.type === MCP_SERVER_TYPE.SSE) {
+          newMCPServers.mcpServers.push({
+            [server.name]: {
+              url: (server as any).serverHost,
+            },
+          });
+        } else if (server.type === MCP_SERVER_TYPE.STDIO) {
+          newMCPServers.mcpServers.push({
+            [server.name]: {
+              command: server.command,
+              args: server.args,
+              env: server.env,
+            },
+          });
+        }
+        if (server.enabled) {
+          mcpServersEnabled.add(server.name);
+        }
+      });
+      await this.preferenceService.set('mcp', newMCPServers, PreferenceScope.Workspace);
+      mcpServerFromWorkspace = this.preferenceService.resolve<{ mcpServers: Record<string, any>[] }>(
+        'mcp',
+        undefined,
+        undefined,
+      );
+      enabledMCPServers = Array.from(mcpServersEnabled);
+      storage.set(MCPServersEnabledKey, enabledMCPServers);
+    }
+    const userServers = mcpServerFromWorkspace.value?.mcpServers;
     // 总是初始化内置服务器，根据配置决定是否启用
-    this.sumiMCPServerBackendProxy.$initBuiltinMCPServer(builtinServer?.enabled ?? true);
-
-    // 初始化其他外部 MCP Servers
-    if (mcpServers && mcpServers.length > 0) {
-      const externalServers = mcpServers.filter((server) => server.name !== BUILTIN_MCP_SERVER_NAME);
-      if (externalServers.length > 0) {
-        this.sumiMCPServerBackendProxy.$initExternalMCPServers(externalServers);
-      }
+    this.sumiMCPServerBackendProxy.$initBuiltinMCPServer(enabledMCPServers.includes(BUILTIN_MCP_SERVER_NAME));
+
+    if (userServers && userServers.length > 0) {
+      const mcpServers = (
+        await Promise.all(
+          userServers.map(async (server) => {
+            const name = Object.keys(server)[0];
+            return await this.mcpConfigService.getServerConfigByName(name);
+          }),
+        )
+      ).filter((server) => server !== undefined) as MCPServerDescription[];
+      await this.sumiMCPServerBackendProxy.$initExternalMCPServers(mcpServers);
+      this.mcpConfigService.fireMCPServersChange(true);
     }
   }
 

package/src/browser/components/ChatInput.tsx

@@ -28,7 +28,7 @@ import { ChatSlashCommandItemModel } from '../chat/chat-model';
 import { ChatProxyService } from '../chat/chat-proxy.service';
 import { ChatFeatureRegistry } from '../chat/chat.feature.registry';
 import { ChatInternalService } from '../chat/chat.internal.service';
-import { OPEN_MCP_CONFIG_COMMAND } from '../mcp/config/mcp-config.commands';
+import { MCPConfigCommands } from '../mcp/config/mcp-config.commands';
 import { MCPServerProxyService } from '../mcp/mcp-server-proxy.service';
 import { MCPToolsDialog } from '../mcp/mcp-tools-dialog.view';
 import { IChatSlashCommandItem } from '../types';
@@ -223,7 +223,7 @@ export const ChatInput = React.forwardRef((props: IChatInputProps, ref) => {
   const currentAgentIdRef = useLatest(agentId);
 
   const handleShowMCPConfig = React.useCallback(() => {
-    commandService.executeCommand(OPEN_MCP_CONFIG_COMMAND.id);
+    commandService.executeCommand(MCPConfigCommands.OPEN_MCP_CONFIG.id);
   }, [commandService]);
 
   const handleShowMCPTools = React.useCallback(async () => {

package/src/browser/components/ChatMentionInput.tsx

@@ -18,7 +18,7 @@ import { IChatInternalService } from '../../common';
 import { LLMContextService } from '../../common/llm-context';
 import { ChatFeatureRegistry } from '../chat/chat.feature.registry';
 import { ChatInternalService } from '../chat/chat.internal.service';
-import { OPEN_MCP_CONFIG_COMMAND } from '../mcp/config/mcp-config.commands';
+import { MCPConfigCommands } from '../mcp/config/mcp-config.commands';
 
 import styles from './components.module.less';
 import { MentionInput } from './mention-input/mention-input';
@@ -71,7 +71,7 @@ export const ChatMentionInput = (props: IChatMentionInputProps) => {
   const outlineTreeService = useInjectable<OutlineTreeService>(OutlineTreeService);
   const prevOutlineItems = useRef<MentionItem[]>([]);
   const handleShowMCPConfig = React.useCallback(() => {
-    commandService.executeCommand(OPEN_MCP_CONFIG_COMMAND.id);
+    commandService.executeCommand(MCPConfigCommands.OPEN_MCP_CONFIG.id);
   }, [commandService]);
 
   useEffect(() => {

package/src/browser/components/ChatToolResult.module.less

@@ -7,8 +7,6 @@
   margin: 8px 0;
   width: 100%;
   padding: 5px;
-  background-color: var(--editor-background);
-  color: var(--editor-foreground);
 }
 
 .image_content {

package/src/browser/components/mention-input/mention-input.tsx

@@ -483,7 +483,6 @@ export const MentionInput: React.FC<MentionInputProps> = ({
     // 这里可以添加额外的逻辑，如果需要的话
   };
 
-  // 添加粘贴事件处理
   const handlePaste = async (e: React.ClipboardEvent<HTMLDivElement>) => {
     const items = e.clipboardData.items;
 
@@ -551,13 +550,16 @@ export const MentionInput: React.FC<MentionInputProps> = ({
     });
 
     // 插入处理后的内容
+    const lastNode = fragment.lastChild;
     range.insertNode(fragment);
 
     // 将光标移动到插入内容的末尾
-    range.setStartAfter(fragment);
-    range.setEndAfter(fragment);
-    selection.removeAllRanges();
-    selection.addRange(range);
+    if (lastNode && lastNode.parentNode) {
+      const newRange = document.createRange();
+      newRange.setStartAfter(lastNode);
+      selection.removeAllRanges();
+      selection.addRange(newRange);
+    }
 
     // 触发 input 事件以更新状态
     handleInput();
@@ -1060,25 +1062,27 @@ export const MentionInput: React.FC<MentionInputProps> = ({
         </div>
         <div className={styles.right_control}>
           {renderButtons(FooterButtonPosition.RIGHT)}
-          <Popover
-            overlayClassName={styles.popover_icon}
-            id={'ai-chat-clear-context'}
-            position={PopoverPosition.top}
-            content={localize('aiNative.chat.context.clear')}
-          >
-            <div className={styles.context_container} onClick={handleClearContext}>
-              <div className={styles.context_icon}>
-                <Icon icon='out-link' />
-                <Icon icon='close' />
-              </div>
-              <div className={styles.context_description}>
-                {formatLocalize(
-                  'aiNative.chat.context.description',
-                  attachedFiles.files.length + attachedFiles.folders.length,
-                )}
+          {hasContext && (
+            <Popover
+              overlayClassName={styles.popover_icon}
+              id={'ai-chat-clear-context'}
+              position={PopoverPosition.top}
+              content={localize('aiNative.chat.context.clear')}
+            >
+              <div className={styles.context_container} onClick={handleClearContext}>
+                <div className={styles.context_icon}>
+                  <Icon icon='out-link' />
+                  <Icon icon='close' />
+                </div>
+                <div className={styles.context_description}>
+                  {formatLocalize(
+                    'aiNative.chat.context.description',
+                    attachedFiles.files.length + attachedFiles.folders.length,
+                  )}
+                </div>
               </div>
-            </div>
-          </Popover>
+            </Popover>
+          )}
           <Popover
             overlayClassName={styles.popover_icon}
             id={'ai-chat-send'}

package/src/browser/index.ts

@@ -15,9 +15,11 @@ import {
 } from '@opensumi/ide-core-browser';
 import {
   IntelligentCompletionsRegistryToken,
+  MCPConfigServiceToken,
   ProblemFixRegistryToken,
   TerminalRegistryToken,
 } from '@opensumi/ide-core-common';
+import { FolderFilePreferenceProvider } from '@opensumi/ide-preferences/lib/browser/folder-file-preference-provider';
 
 import {
   ChatProxyServiceToken,
@@ -60,6 +62,9 @@ import { LanguageParserService } from './languages/service';
 import { BaseApplyService } from './mcp/base-apply.service';
 import { MCPConfigCommandContribution } from './mcp/config/mcp-config.commands';
 import { MCPConfigContribution } from './mcp/config/mcp-config.contribution';
+import { MCPConfigService } from './mcp/config/mcp-config.service';
+import { MCPFolderPreferenceProvider } from './mcp/mcp-folder-preference-provider';
+import { MCPPreferencesContribution } from './mcp/mcp-preferences-contribution';
 import { MCPServerProxyService } from './mcp/mcp-server-proxy.service';
 import { MCPServerRegistry } from './mcp/mcp-server.feature.registry';
 import { CreateNewFileWithTextTool } from './mcp/tools/createNewFileWithText';
@@ -98,6 +103,7 @@ export class AINativeModule extends BrowserModule {
     IntelligentCompletionsContribution,
     MCPConfigContribution,
     MCPConfigCommandContribution,
+    MCPPreferencesContribution,
 
     // MCP Server Contributions START
     ListDirTool,
@@ -206,6 +212,16 @@ export class AINativeModule extends BrowserModule {
       token: BaseApplyService,
       useClass: ApplyService,
     },
+    {
+      token: MCPConfigServiceToken,
+      useClass: MCPConfigService,
+    },
+    {
+      token: FolderFilePreferenceProvider,
+      useClass: MCPFolderPreferenceProvider,
+      dropdownForTag: true,
+      tag: 'mcp',
+    },
   ];
 
   backServices = [

package/src/browser/mcp/config/components/mcp-config.module.less

@@ -22,7 +22,7 @@
   font-size: 14px;
 }
 
-.addButton {
+.actionButton {
   padding: 8px 16px;
   border-radius: 4px;
   background-color: var(--button-primary-background);
@@ -30,6 +30,9 @@
   border: none;
   cursor: pointer;
   font-size: 13px;
+  .actionButtonIcon {
+    margin-right: 5px;
+  }
 
   &:hover {
     background-color: var(--button-primary-hover-background);

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

@@ -1,190 +1,99 @@
 import cls from 'classnames';
 import React, { useCallback } from 'react';
 
-import { Badge, Button, Popover, PopoverTriggerType } from '@opensumi/ide-components';
-import { AINativeSettingSectionsId, ILogger, useInjectable } from '@opensumi/ide-core-browser';
-import { PreferenceService } from '@opensumi/ide-core-browser/lib/preferences';
-import { PreferenceScope, localize } from '@opensumi/ide-core-common';
-import { IMessageService } from '@opensumi/ide-overlay';
+import { Badge, Button, Icon, Popover, PopoverTriggerType } from '@opensumi/ide-components';
+import { useInjectable } from '@opensumi/ide-core-browser';
+import { MCPConfigServiceToken, localize } from '@opensumi/ide-core-common';
 
-import { BUILTIN_MCP_SERVER_NAME, ISumiMCPServerBackend, SumiMCPServerProxyServicePath } from '../../../../common';
-import { MCPServerDescription } from '../../../../common/mcp-server-manager';
-import { MCPServer, MCP_SERVER_TYPE } from '../../../../common/types';
-import { MCPServerProxyService } from '../../mcp-server-proxy.service';
+import { BUILTIN_MCP_SERVER_NAME } from '../../../../common';
+import { MCPServer } from '../../../../common/types';
+import { MCPConfigService } from '../mcp-config.service';
 
 import styles from './mcp-config.module.less';
 import { MCPServerForm, MCPServerFormData } from './mcp-server-form';
 
 export const MCPConfigView: React.FC = () => {
-  const mcpServerProxyService = useInjectable<MCPServerProxyService>(MCPServerProxyService);
-  const preferenceService = useInjectable<PreferenceService>(PreferenceService);
-  const messageService = useInjectable<IMessageService>(IMessageService);
-  const sumiMCPServerBackendProxy = useInjectable<ISumiMCPServerBackend>(SumiMCPServerProxyServicePath);
-  const logger = useInjectable<ILogger>(ILogger);
+  const mcpConfigService = useInjectable<MCPConfigService>(MCPConfigServiceToken);
   const [servers, setServers] = React.useState<MCPServer[]>([]);
   const [formVisible, setFormVisible] = React.useState(false);
   const [editingServer, setEditingServer] = React.useState<MCPServerFormData | undefined>();
   const [loadingServer, setLoadingServer] = React.useState<string | undefined>();
+  const [isReady, setIsReady] = React.useState(false);
+
   const loadServers = useCallback(async () => {
-    const userServers = preferenceService.get<MCPServerDescription[]>(AINativeSettingSectionsId.MCPServers, []);
-    const runningServers = await mcpServerProxyService.$getServers();
-    const builtinServer = runningServers.find((server) => server.name === BUILTIN_MCP_SERVER_NAME);
-    const allServers = userServers
-      .filter((server) => server.type === MCP_SERVER_TYPE.STDIO || server.type === MCP_SERVER_TYPE.SSE)
-      .map((server) => {
-        const runningServer = runningServers.find((s) => s.name === server.name);
-        return {
-          ...server,
-          name: server.name,
-          isStarted: runningServer?.isStarted,
-          tools: runningServer?.tools,
-        };
-      }) as MCPServer[];
-    if (builtinServer) {
-      allServers.unshift(builtinServer);
-    }
+    const allServers = await mcpConfigService.getServers();
     setServers(allServers);
-  }, [mcpServerProxyService]);
+  }, [mcpConfigService]);
 
   React.useEffect(() => {
     loadServers();
-    const disposer = mcpServerProxyService.onChangeMCPServers(() => {
+    const disposer = mcpConfigService.onMCPServersChange((isReady) => {
+      if (isReady) {
+        setIsReady(true);
+      }
       loadServers();
     });
 
     return () => {
       disposer.dispose();
     };
-  }, []);
+  }, [loadServers]);
 
   const handleServerControl = useCallback(
     async (serverName: string, start: boolean) => {
       try {
         setLoadingServer(serverName);
-        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,
-                type: MCP_SERVER_TYPE.BUILTIN,
-              },
-            ];
-          } else {
-            // 如果已经存在配置，更新 enabled 状态
-            updatedServers = servers.map((server) => {
-              if (server.name === BUILTIN_MCP_SERVER_NAME) {
-                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, PreferenceScope.User);
+        await mcpConfigService.controlServer(serverName, start);
         await loadServers();
         setLoadingServer(undefined);
       } catch (error) {
-        const msg = error.message || error;
-        logger.error(`Failed to ${start ? 'start' : 'stop'} server ${serverName}:`, msg);
-        messageService.error(msg);
         setLoadingServer(undefined);
       }
     },
-    [mcpServerProxyService, preferenceService, sumiMCPServerBackendProxy, loadServers],
+    [mcpConfigService, loadServers],
   );
 
   const handleAddServer = useCallback(() => {
     setEditingServer(undefined);
     setFormVisible(true);
-  }, [editingServer, formVisible]);
+  }, []);
 
   const handleEditServer = useCallback(
-    (server: MCPServer) => {
-      const servers = preferenceService.get<MCPServerFormData[]>(AINativeSettingSectionsId.MCPServers, []);
-      const serverConfig = servers.find((s) => s.name === server.name);
-
+    async (server: MCPServer) => {
+      const serverConfig = await mcpConfigService.getServerConfigByName(server.name);
       if (serverConfig) {
         setEditingServer(serverConfig);
         setFormVisible(true);
       }
     },
-    [editingServer, formVisible],
+    [mcpConfigService],
   );
 
   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, PreferenceScope.User);
+      await mcpConfigService.deleteServer(serverName);
       await loadServers();
     },
-    [editingServer, formVisible],
+    [mcpConfigService, 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[]);
+      await mcpConfigService.saveServer(data);
       setFormVisible(false);
-      await sumiMCPServerBackendProxy.$addOrUpdateServer(data as MCPServerDescription);
-      await preferenceService.set(AINativeSettingSectionsId.MCPServers, servers, PreferenceScope.User);
       await loadServers();
     },
-    [servers, formVisible, loadServers],
+    [mcpConfigService, loadServers],
   );
 
-  const getReadableServerType = useCallback((type: string) => {
-    switch (type) {
-      case MCP_SERVER_TYPE.STDIO:
-        return localize('ai.native.mcp.type.stdio');
-      case MCP_SERVER_TYPE.SSE:
-        return localize('ai.native.mcp.type.sse');
-      case MCP_SERVER_TYPE.BUILTIN:
-        return localize('ai.native.mcp.type.builtin');
-      default:
-        return type;
-    }
-  }, []);
-
   const handleSyncServer = useCallback(
     async (server: MCPServer) => {
       setLoadingServer(server.name);
-      await sumiMCPServerBackendProxy.$syncServer(server.name);
+      await mcpConfigService.syncServer(server.name);
       await loadServers();
       setLoadingServer(undefined);
     },
-    [loadServers, loadingServer],
+    [mcpConfigService, loadServers],
   );
 
   return (
@@ -194,8 +103,9 @@ export const MCPConfigView: React.FC = () => {
           <h2 className={styles.title}>MCP Servers</h2>
           <p className={styles.description}>{localize('ai.native.mcp.manage.connections')}</p>
         </div>
-        <button className={styles.addButton} onClick={handleAddServer}>
-          + {localize('ai.native.mcp.addMCPServer.title')}
+        <button className={styles.actionButton} onClick={handleAddServer}>
+          <Icon icon='plus' className={styles.actionButtonIcon} />
+          {localize('ai.native.mcp.addMCPServer.title')}
         </button>
       </div>
       <div className={styles.serversList}>
@@ -225,7 +135,7 @@ export const MCPConfigView: React.FC = () => {
                   >
                     <i
                       className={`codicon ${
-                        loadingServer === server.name
+                        loadingServer === server.name || (!isReady && server.name !== BUILTIN_MCP_SERVER_NAME)
                           ? 'codicon-loading kt-icon-loading'
                           : server.isStarted
                           ? 'codicon-check'
@@ -268,7 +178,9 @@ export const MCPConfigView: React.FC = () => {
               {server.type && (
                 <div className={styles.detailRow}>
                   <span className={styles.detailLabel}>Type:</span>
-                  <Badge className={cls(styles.serverType, styles.typeTag)}>{getReadableServerType(server.type)}</Badge>
+                  <Badge className={cls(styles.serverType, styles.typeTag)}>
+                    {mcpConfigService.getReadableServerType(server.type)}
+                  </Badge>
                 </div>
               )}
             </div>
@@ -294,11 +206,11 @@ export const MCPConfigView: React.FC = () => {
                 </div>
               </div>
             )}
-            {server.serverHost && (
+            {server.url && (
               <div className={styles.serverDetail}>
                 <div className={styles.detailRow}>
                   <span className={styles.detailLabel}>Server Link:</span>
-                  <span className={cls(styles.detailContent, styles.link)}>{server.serverHost}</span>
+                  <span className={cls(styles.detailContent, styles.link)}>{server.url}</span>
                 </div>
               </div>
             )}

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

@@ -17,7 +17,7 @@ export interface MCPServerFormData {
   args?: string[];
   env?: Record<string, string>;
   type: MCP_SERVER_TYPE;
-  serverHost?: string;
+  url?: string;
 }
 
 interface Props {
@@ -81,9 +81,9 @@ export const MCPServerForm: FC<Props> = ({ visible, initialData, onSave, onCance
         return false;
       }
       if (formData.type === MCP_SERVER_TYPE.SSE) {
-        const isServerHostValid = formData.serverHost?.trim() !== '';
+        const isServerHostValid = formData.url?.trim() !== '';
         if (!isServerHostValid) {
-          messageService.error(localize('ai.native.mcp.serverHost.isRequired'));
+          messageService.error(localize('ai.native.mcp.url.isRequired'));
         }
         return isServerHostValid;
       }
@@ -107,7 +107,7 @@ export const MCPServerForm: FC<Props> = ({ visible, initialData, onSave, onCance
         ...formData,
       };
       if (formData.type === MCP_SERVER_TYPE.SSE) {
-        form.serverHost = form.serverHost?.trim();
+        form.url = form.url?.trim();
       } else {
         const args = argsText.split(' ').filter(Boolean);
         const env = envText
@@ -127,7 +127,7 @@ export const MCPServerForm: FC<Props> = ({ visible, initialData, onSave, onCance
       setFormData({
         ...formData,
         command: '',
-        serverHost: '',
+        url: '',
         args: [],
         env: {},
       });
@@ -160,7 +160,7 @@ export const MCPServerForm: FC<Props> = ({ visible, initialData, onSave, onCance
 
   const handleServerHostChange = useCallback(
     (e: ChangeEvent<HTMLTextAreaElement>) => {
-      setFormData({ ...formData, serverHost: e.target.value });
+      setFormData({ ...formData, url: e.target.value });
     },
     [formData],
   );
@@ -173,7 +173,7 @@ export const MCPServerForm: FC<Props> = ({ visible, initialData, onSave, onCance
         command: '',
         args: [],
         env: {},
-        serverHost: '',
+        url: '',
       });
     },
     [formData],
@@ -217,11 +217,11 @@ export const MCPServerForm: FC<Props> = ({ visible, initialData, onSave, onCance
       return (
         <>
           <div className={styles.formItem}>
-            <label>{localize('ai.native.mcp.serverHost')}</label>
+            <label>{localize('ai.native.mcp.url')}</label>
             <textarea
-              value={formData.serverHost}
+              value={formData.url}
               onChange={handleServerHostChange}
-              placeholder={localize('ai.native.mcp.serverHost.placeHolder')}
+              placeholder={localize('ai.native.mcp.url.placeHolder')}
               rows={3}
             />
           </div>