@opensumi/ide-ai-native 3.8.2-next-1741418699.0 → 3.8.2

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

@@ -527,3 +527,17 @@
     align-items: center;
   }
 }
+
+.status {
+  :global {
+    .codicon-pass {
+      color: #52c41a;
+    }
+    .codicon-error {
+      color: var(--debugConsole-errorForeground);
+    }
+    .codicon-circle-slash {
+      color: var(--input-placeholderForeground);
+    }
+  }
+}

package/src/browser/index.ts

@@ -25,6 +25,7 @@ import {
   IChatAgentService,
   IChatInternalService,
   IChatManagerService,
+  InlineDiffServiceToken,
   SumiMCPServerProxyServicePath,
   TokenMCPServerProxyService,
 } from '../common';
@@ -193,14 +194,14 @@ export class AINativeModule extends BrowserModule {
       token: IAIInlineCompletionsProvider,
       useClass: AIInlineCompletionsProvider,
     },
-    {
-      token: InlineDiffService,
-      useClass: InlineDiffService,
-    },
     {
       token: ChatAgentPromptProvider,
       useClass: DefaultChatAgentPromptProvider,
     },
+    {
+      token: InlineDiffServiceToken,
+      useClass: InlineDiffService,
+    },
     {
       token: BaseApplyService,
       useClass: ApplyService,

package/src/browser/mcp/base-apply.service.ts

@@ -26,17 +26,13 @@ import { Deferred, DisposableMap, Emitter, IDisposable, URI, path } from '@opens
 import { SumiReadableStream } from '@opensumi/ide-utils/lib/stream';
 import { EditOperation } from '@opensumi/monaco-editor-core/esm/vs/editor/common/core/editOperation';
 
-import { IChatInternalService } from '../../common';
+import { IChatInternalService, IInlineDiffService, InlineDiffServiceToken } from '../../common';
 import { CodeBlockData, CodeBlockStatus } from '../../common/types';
 import { ChatInternalService } from '../chat/chat.internal.service';
 import { InlineChatController } from '../widget/inline-chat/inline-chat-controller';
-import {
-  BaseInlineDiffPreviewer,
-  InlineDiffController,
-  InlineDiffService,
-  LiveInlineDiffPreviewer,
-} from '../widget/inline-diff';
-import { BaseInlineStreamDiffHandler } from '../widget/inline-stream-diff/inline-stream-diff.handler';
+import { BaseInlineDiffPreviewer, InlineDiffController, LiveInlineDiffPreviewer } from '../widget/inline-diff';
+
+import type { BaseInlineStreamDiffHandler } from '../widget/inline-stream-diff/inline-stream-diff.handler';
 
 export abstract class BaseApplyService extends WithEventBus {
   @Autowired(IChatInternalService)
@@ -48,8 +44,8 @@ export abstract class BaseApplyService extends WithEventBus {
   @Autowired(WorkbenchEditorService)
   protected readonly editorService: WorkbenchEditorService;
 
-  @Autowired(InlineDiffService)
-  private readonly inlineDiffService: InlineDiffService;
+  @Autowired(InlineDiffServiceToken)
+  private readonly inlineDiffService: IInlineDiffService;
 
   @Autowired(IMarkerService)
   private readonly markerService: IMarkerService;
@@ -155,7 +151,7 @@ export abstract class BaseApplyService extends WithEventBus {
     // 使用最后一个版本内容渲染 apply 内容
     if (filePendingApplies.length > 0 && filePendingApplies[0].updatedCode) {
       const editor = event.payload.group.codeEditor.monacoEditor;
-      this.renderApplyResult(editor, filePendingApplies[0], filePendingApplies[0].updatedCode);
+      await this.renderApplyResult(editor, filePendingApplies[0], filePendingApplies[0].updatedCode);
     }
   }
 
@@ -183,9 +179,10 @@ export abstract class BaseApplyService extends WithEventBus {
     return sessionCodeBlocks.filter((block) => block.status === 'pending').map((block) => block.relativePath);
   }
 
-  protected getSessionCodeBlocks(sessionId?: string) {
-    sessionId = sessionId || this.chatInternalService.sessionModel.sessionId;
-    const sessionModel = this.chatInternalService.getSession(sessionId);
+  getSessionCodeBlocks(sessionId?: string) {
+    const sessionModel = sessionId
+      ? this.chatInternalService.getSession(sessionId)
+      : this.chatInternalService.sessionModel;
     if (!sessionModel) {
       throw new Error(`Session ${sessionId} not found`);
     }
@@ -225,7 +222,12 @@ export abstract class BaseApplyService extends WithEventBus {
     this.onCodeBlockUpdateEmitter.fire(codeBlock);
   }
 
-  async registerCodeBlock(relativePath: string, content: string, toolCallId: string): Promise<CodeBlockData> {
+  async registerCodeBlock(
+    relativePath: string,
+    content: string,
+    toolCallId: string,
+    instructions?: string,
+  ): Promise<CodeBlockData> {
     const lastMessageId = this.chatInternalService.sessionModel.history.lastMessageId!;
     const uriCodeBlocks = this.getUriCodeBlocks(URI.file(path.join(this.appConfig.workspaceDir, relativePath)));
     const originalModelRef = await this.editorDocumentModelService.createModelReference(
@@ -240,6 +242,7 @@ export abstract class BaseApplyService extends WithEventBus {
       createdAt: Date.now(),
       toolCallId,
       messageId: lastMessageId,
+      instructions,
       // TODO: 支持range
       originalCode: originalModelRef.instance.getText(),
     };
@@ -295,22 +298,17 @@ export abstract class BaseApplyService extends WithEventBus {
       if (!result) {
         throw new Error('Failed to open file');
       }
-      if (typeof fastApplyFileResult.result === 'string') {
-        codeBlock.updatedCode = fastApplyFileResult.result;
-        codeBlock.status = 'pending';
-        this.updateCodeBlock(codeBlock);
-      }
-      const applyResult = await this.renderApplyResult(
+      const res = await this.renderApplyResult(
         result.group.codeEditor.monacoEditor,
         codeBlock,
         (fastApplyFileResult.result || fastApplyFileResult.stream)!,
         fastApplyFileResult.range,
       );
-      if (applyResult) {
-        // 用户实际接受的 apply 结果
-        codeBlock.applyResult = applyResult;
-        this.updateCodeBlock(codeBlock);
-      }
+      codeBlock.updatedCode = res.updatedCode;
+      codeBlock.status = 'pending';
+      // 用户实际接受的 apply 结果
+      codeBlock.applyResult = res.result;
+      this.updateCodeBlock(codeBlock);
 
       return codeBlock;
     } catch (err) {
@@ -322,31 +320,33 @@ export abstract class BaseApplyService extends WithEventBus {
     }
   }
 
+  /**
+   * 渲染apply结果（支持流式和直接输出结果）
+   * 副作用：渲染时会添加accept、reject操作监听器，监听到结果时会自动更新codeBlock的result
+   */
   async renderApplyResult(
     editor: ICodeEditor,
     codeBlock: CodeBlockData,
     updatedContentOrStream: string | SumiReadableStream<IChatProgress>,
     range?: Range,
-  ): Promise<{ diff: string; diagnosticInfos: IMarker[] } | undefined> {
-    const deferred = new Deferred<{ diff: string; diagnosticInfos: IMarker[] }>();
+  ): Promise<{ result?: { diff: string; diagnosticInfos: IMarker[] }; updatedCode: string }> {
+    const deferred = new Deferred<{ result?: { diff: string; diagnosticInfos: IMarker[] }; updatedCode: string }>();
     const inlineDiffController = InlineDiffController.get(editor)!;
     range = range || editor.getModel()!.getFullModelRange();
 
     if (typeof updatedContentOrStream === 'string') {
+      const updatedContent = updatedContentOrStream;
       const editorCurrentContent = editor.getModel()!.getValue();
       const uri = URI.file(path.join(this.appConfig.workspaceDir, codeBlock.relativePath));
       const document = this.editorDocumentModelService.getModelReference(uri);
-      if (editorCurrentContent !== updatedContentOrStream || document?.instance.dirty) {
-        editor.getModel()?.pushEditOperations([], [EditOperation.replace(range, updatedContentOrStream)], () => null);
+      if (editorCurrentContent !== updatedContent || document?.instance.dirty) {
+        editor.getModel()?.pushEditOperations([], [EditOperation.replace(range, updatedContent)], () => null);
         await this.editorService.save(uri);
       }
       const uriPendingCodeBlocks = this.getUriCodeBlocks(uri)?.filter((block) => block.status === 'pending');
       const earlistPendingCodeBlock = uriPendingCodeBlocks?.[uriPendingCodeBlocks.length - 1];
-      if ((earlistPendingCodeBlock?.originalCode || codeBlock.originalCode) === updatedContentOrStream) {
-        codeBlock.status = 'cancelled';
-        this.updateCodeBlock(codeBlock);
-        deferred.resolve();
-        return;
+      if ((earlistPendingCodeBlock || codeBlock)?.originalCode === updatedContent) {
+        throw new Error('No changes applied');
       }
       // Create diff previewer
       const previewer = inlineDiffController.createDiffPreviewer(
@@ -374,13 +374,16 @@ export abstract class BaseApplyService extends WithEventBus {
 
       const { diff, rangesFromDiffHunk } = this.getDiffResult(
         codeBlock.originalCode,
-        codeBlock.updatedCode || updatedContentOrStream,
+        updatedContent,
         codeBlock.relativePath,
       );
       const diagnosticInfos = this.getDiagnosticInfos(editor.getModel()!.uri.toString(), rangesFromDiffHunk);
       deferred.resolve({
-        diff,
-        diagnosticInfos,
+        result: {
+          diff,
+          diagnosticInfos,
+        },
+        updatedCode: updatedContent,
       });
     } else {
       const controller = new InlineChatController();
@@ -408,21 +411,21 @@ export abstract class BaseApplyService extends WithEventBus {
       this.addDispose(
         // 流式输出结束后，转为直接输出逻辑
         previewer.getNode()!.onDiffFinished(async (diffModel) => {
-          codeBlock.updatedCode = diffModel.newFullRangeTextLines.join('\n');
           // TODO: 添加 reapply
+          const updatedCode = diffModel.newFullRangeTextLines.join('\n');
           // 实际应用结果为空，则取消
-          if (codeBlock.updatedCode === codeBlock.originalCode) {
-            codeBlock.status = 'failed';
-            this.updateCodeBlock(codeBlock);
+          if (codeBlock.originalCode === updatedCode) {
             previewer.dispose();
             deferred.reject(new Error('no changes applied'));
             return;
           }
-          codeBlock.status = 'pending';
-          this.updateCodeBlock(codeBlock);
           previewer.dispose();
-          const result = await this.renderApplyResult(editor, codeBlock, codeBlock.updatedCode);
-          deferred.resolve(result);
+          try {
+            const res = await this.renderApplyResult(editor, codeBlock, updatedCode);
+            deferred.resolve(res);
+          } catch (err) {
+            deferred.reject(err);
+          }
         }),
       );
       this.activePreviewerMap.set(codeBlock.relativePath, previewer);
@@ -477,14 +480,36 @@ export abstract class BaseApplyService extends WithEventBus {
     }
   }
 
-  processAll(uri: URI, type: 'accept' | 'reject'): void {
-    const codeBlocks = this.getUriCodeBlocks(uri)?.filter((block) => block.status === 'pending');
+  processAll(type: 'accept' | 'reject', uri?: URI): void {
+    const codeBlocks = uri
+      ? this.getUriCodeBlocks(uri)?.filter((block) => block.status === 'pending')
+      : this.getSessionCodeBlocks().filter((block) => block.status === 'pending');
     if (!codeBlocks?.length) {
       throw new Error('No pending code block found');
     }
-    const decorationModel = this.activePreviewerMap
-      .get(codeBlocks[0].relativePath)
-      ?.getNode()?.livePreviewDiffDecorationModel;
+    const relativePaths = uri
+      ? [codeBlocks[0].relativePath]
+      : codeBlocks
+          .map((block) => block.relativePath)
+          .reduce((acc, cur) => {
+            if (acc.includes(cur)) {
+              return acc;
+            }
+            acc.push(cur);
+            return acc;
+          }, [] as string[]);
+    relativePaths.forEach((relativePath) => {
+      this.doProcess(type, relativePath);
+    });
+    codeBlocks.forEach((codeBlock) => {
+      codeBlock.status = type === 'accept' ? 'success' : 'cancelled';
+      // TODO: 批量更新
+      this.updateCodeBlock(codeBlock);
+    });
+  }
+
+  protected doProcess(type: 'accept' | 'reject', relativePath: string) {
+    const decorationModel = this.activePreviewerMap.get(relativePath)?.getNode()?.livePreviewDiffDecorationModel;
     if (!decorationModel) {
       throw new Error('No active previewer found');
     }
@@ -493,19 +518,13 @@ export abstract class BaseApplyService extends WithEventBus {
     } else {
       decorationModel.discardUnProcessed();
     }
-    this.editorService.save(uri);
-    codeBlocks.forEach((codeBlock) => {
-      codeBlock.status = type === 'accept' ? 'success' : 'cancelled';
-      // TODO: 批量更新
-      this.updateCodeBlock(codeBlock);
-    });
+    this.editorService.save(URI.file(path.join(this.appConfig.workspaceDir, relativePath)));
   }
 
   protected listenPartialEdit(model: ITextModel, codeBlock: CodeBlockData) {
     const deferred = new Deferred<{ diff: string; diagnosticInfos: IMarker[] }>();
     const uriString = model.uri.toString();
     const toDispose = this.inlineDiffService.onPartialEdit((event) => {
-      // TODO 支持自动保存
       if (
         event.totalPartialEditCount === event.resolvedPartialEditCount &&
         event.uri.path === model.uri.path.toString()
@@ -526,11 +545,19 @@ export abstract class BaseApplyService extends WithEventBus {
             actionSource: ActionSourceEnum.Chat,
             sessionId: this.chatInternalService.sessionModel.sessionId,
             isReceive: true,
-            isDrop: false,
-            code: codeBlock.codeEdit,
+            // 是否有丢弃部分代码
+            isDrop: event.acceptPartialEditCount !== event.totalPartialEditCount,
+            code: appliedResult,
+            originCode: codeBlock.originalCode,
             message: JSON.stringify({
               diff,
               diagnosticInfos,
+              instructions: codeBlock.instructions,
+              codeEdit: codeBlock.codeEdit,
+              partialEditCount: event.totalPartialEditCount,
+              acceptPartialEditCount: event.acceptPartialEditCount,
+              addedLinesCount: event.totalAddedLinesCount,
+              deletedLinesCount: event.totalDeletedLinesCount,
             }),
           });
           deferred.resolve({
@@ -548,8 +575,11 @@ export abstract class BaseApplyService extends WithEventBus {
             sessionId: this.chatInternalService.sessionModel.sessionId,
             isReceive: false,
             isDrop: true,
-            code: codeBlock.codeEdit,
             originCode: codeBlock.originalCode,
+            message: JSON.stringify({
+              instructions: codeBlock.instructions,
+              codeEdit: codeBlock.codeEdit,
+            }),
           });
         }
         this.editorListenerMap.disposeKey(uriString);
@@ -565,8 +595,8 @@ export abstract class BaseApplyService extends WithEventBus {
       .split('\n')
       .map((line) => {
         if (line.startsWith('@@')) {
-          const [, , , start, end] = line.match(/@@ -(\d+),(\d+) \+(\d+),(\d+) @@/)!;
-          return new Range(parseInt(start, 10), 0, parseInt(end, 10), 0);
+          const [, , , start, lineCount] = line.match(/@@ -(\d+),(\d+) \+(\d+),(\d+) @@/)!;
+          return new Range(parseInt(start, 10), 0, parseInt(start, 10) + parseInt(lineCount, 10) - 1, 0);
         }
         return null;
       })
@@ -587,7 +617,6 @@ export abstract class BaseApplyService extends WithEventBus {
     result?: string;
   }>;
 
-  // TODO: 支持使用内存中的document获取诊断信息，实现并行apply accept
   protected getDiagnosticInfos(uri: string, ranges: Range[]) {
     const markers = this.markerService.getManager().getMarkers({ resource: uri });
     return markers.filter(

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

@@ -4,8 +4,8 @@ import React, { useCallback } from 'react';
 import { Badge } 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 { localize } from '@opensumi/ide-core-common';
+import { IMessageService } from '@opensumi/ide-overlay/lib/common';
 
 import { BUILTIN_MCP_SERVER_NAME, ISumiMCPServerBackend, SumiMCPServerProxyServicePath } from '../../../../common';
 import { MCPServerDescription } from '../../../../common/mcp-server-manager';
@@ -18,13 +18,13 @@ 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 messageService = useInjectable<IMessageService>(IMessageService);
   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 loadServers = useCallback(async () => {
     const allServers = await mcpServerProxyService.$getServers();
     setServers(allServers);
@@ -44,7 +44,6 @@ export const MCPConfigView: React.FC = () => {
   const handleServerControl = useCallback(
     async (serverName: string, start: boolean) => {
       try {
-        setLoadingServer(serverName);
         if (start) {
           await mcpServerProxyService.$startServer(serverName);
         } else {
@@ -88,14 +87,12 @@ export const MCPConfigView: React.FC = () => {
           });
         }
 
-        await preferenceService.set(AINativeSettingSectionsId.MCPServers, updatedServers, PreferenceScope.User);
+        await preferenceService.set(AINativeSettingSectionsId.MCPServers, updatedServers);
         await loadServers();
-        setLoadingServer(undefined);
       } catch (error) {
         const msg = error.message || error;
         logger.error(`Failed to ${start ? 'start' : 'stop'} server ${serverName}:`, error);
-        messageService.error(error.message);
-        setLoadingServer(undefined);
+        messageService.error(`Failed to ${start ? 'start' : 'stop'} server ${serverName}:` + msg);
       }
     },
     [mcpServerProxyService, preferenceService, sumiMCPServerBackendProxy, loadServers],
@@ -124,7 +121,7 @@ export const MCPConfigView: React.FC = () => {
       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 preferenceService.set(AINativeSettingSectionsId.MCPServers, updatedServers);
       await loadServers();
     },
     [editingServer, formVisible],
@@ -143,7 +140,7 @@ export const MCPConfigView: React.FC = () => {
       setServers(servers as MCPServer[]);
       setFormVisible(false);
       await sumiMCPServerBackendProxy.addOrUpdateServer(data as MCPServerDescription);
-      await preferenceService.set(AINativeSettingSectionsId.MCPServers, servers, PreferenceScope.User);
+      await preferenceService.set(AINativeSettingSectionsId.MCPServers, servers);
       await loadServers();
     },
     [servers, formVisible, loadServers],
@@ -167,10 +164,10 @@ export const MCPConfigView: React.FC = () => {
       <div className={styles.header}>
         <div>
           <h2 className={styles.title}>MCP Servers</h2>
-          <p className={styles.description}>{localize('ai.native.mcp.manage.connections')}</p>
+          <p className={styles.description}>Manage your MCP server connections.</p>
         </div>
         <button className={styles.addButton} onClick={handleAddServer}>
-          + {localize('ai.native.mcp.addMCPServer.title')}
+          + Add new MCP server
         </button>
       </div>
       <div className={styles.serversList}>
@@ -191,15 +188,7 @@ export const MCPConfigView: React.FC = () => {
                   title={server.isStarted ? 'Stop' : 'Start'}
                   onClick={() => handleServerControl(server.name, !server.isStarted)}
                 >
-                  <i
-                    className={`codicon ${
-                      loadingServer === server.name
-                        ? 'codicon-loading kt-icon-loading'
-                        : server.isStarted
-                        ? 'codicon-debug-stop'
-                        : 'codicon-debug-start'
-                    }`}
-                  />
+                  <i className={`codicon ${server.isStarted ? 'codicon-debug-stop' : 'codicon-debug-start'}`} />
                 </button>
                 {server.name !== BUILTIN_MCP_SERVER_NAME && (
                   <button className={styles.iconButton} title='Delete' onClick={() => handleDeleteServer(server.name)}>
@@ -212,7 +201,7 @@ export const MCPConfigView: React.FC = () => {
               <div className={styles.detailRow}>
                 <span className={styles.detailLabel}>Status:</span>
                 <span className={`${styles.serverStatus} ${server.isStarted ? styles.running : styles.stopped}`}>
-                  {server.isStarted ? localize('ai.native.mcp.running') : localize('ai.native.mcp.stopped')}
+                  {server.isStarted ? 'Running' : 'Stopped'}
                 </span>
               </div>
               {server.type && (

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

@@ -67,75 +67,35 @@ export const MCPServerForm: FC<Props> = ({ visible, initialData, onSave, onCance
     );
   }, [initialData]);
 
-  const validateForm = useCallback(
-    (formData: MCPServerFormData) => {
-      if (formData.name.trim() === '') {
-        messageService.error(localize('ai.native.mcp.name.isRequired'));
-        return false;
-      }
-      if (
-        !initialData &&
-        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, initialData],
-  );
-
-  const handleSubmit = useCallback(
-    (e: FormEvent) => {
-      e.preventDefault();
-      const isValid = validateForm(formData);
-      if (!isValid) {
-        return;
-      }
-      const form = {
-        ...formData,
-      };
-      if (formData.type === MCP_SERVER_TYPE.SSE) {
-        form.serverHost = form.serverHost?.trim();
-      } else {
-        const args = argsText.split(' ').filter(Boolean);
-        const env = envText
-          .split('\n')
-          .filter(Boolean)
-          .reduce((acc, line) => {
-            const [key, value] = line.split('=');
-            if (key && value) {
-              acc[key.trim()] = value.trim();
-            }
-            return acc;
-          }, {} as Record<string, string>);
-        form.args = args;
-        form.env = env;
-      }
-
-      setFormData({
-        ...formData,
-        command: '',
-        serverHost: '',
-        args: [],
-        env: {},
-      });
+  const handleSubmit = (e: FormEvent) => {
+    e.preventDefault();
+    const isValid = validateForm(formData);
+    if (!isValid) {
+      return;
+    }
+    const form = {
+      ...formData,
+    };
+    if (formData.type === MCP_SERVER_TYPE.SSE) {
+      form.serverHost = form.serverHost?.trim();
+    } else {
+      const args = argsText.split(' ').filter(Boolean);
+      const env = envText
+        .split('\n')
+        .filter(Boolean)
+        .reduce((acc, line) => {
+          const [key, value] = line.split('=');
+          if (key && value) {
+            acc[key.trim()] = value.trim();
+          }
+          return acc;
+        }, {} as Record<string, string>);
+      form.args = args;
+      form.env = env;
+    }
 
-      onSave(form);
-    },
-    [formData, argsText, envText, onSave, validateForm],
-  );
+    onSave(form);
+  };
 
   const handleCommandChange = useCallback(
     (e: ChangeEvent<HTMLInputElement>) => {
@@ -223,6 +183,32 @@ export const MCPServerForm: FC<Props> = ({ visible, initialData, onSave, onCance
     }
   }, [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')}