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

package/src/browser/components/ChatToolRender.tsx

@@ -5,7 +5,6 @@ import { useInjectable } from '@opensumi/ide-core-browser';
 import { Icon } from '@opensumi/ide-core-browser/lib/components';
 import { Loading } from '@opensumi/ide-core-browser/lib/components/ai-native';
 import { IChatToolContent, uuid } from '@opensumi/ide-core-common';
-import { localize } from '@opensumi/ide-core-common/lib/localize';
 
 import { IMCPServerRegistry, TokenMCPServerRegistry } from '../types';
 
@@ -65,29 +64,28 @@ export const ChatToolRender = (props: { value: IChatToolContent['content']; mess
       toolCallId={value.id}
     />
   ) : (
-    <div className={styles.chat_tool_render}>
-      <div className={styles.tool_header} onClick={toggleExpand}>
-        <div className={styles.tool_name}>
-          <Icon iconClass={`codicon codicon-chevron-${isExpanded ? 'down' : 'right'}`} />
-          <Icon size='small' iconClass={cls('codicon codicon-tools', styles.tool_icon)} />
-          <span className={styles.tool_label}>{label}</span>
+    <div className={styles['chat-tool-render']}>
+      <div className={styles['tool-header']} onClick={toggleExpand}>
+        <div className={styles['tool-name']}>
+          <Icon iconClass={`codicon codicon-triangle-${isExpanded ? 'down' : 'right'}`} />
+          {label}
         </div>
         {value.state && (
-          <div className={styles.tool_state}>
-            <span className={styles.state_icon}>{stateInfo.icon}</span>
+          <div className={styles['tool-state']}>
+            <span className={styles['state-icon']}>{stateInfo.icon}</span>
           </div>
         )}
       </div>
-      <div className={cls(styles.tool_content, { [styles.expanded]: isExpanded })}>
+      <div className={cls(styles['tool-content'], { [styles.expanded]: isExpanded })}>
         {value?.function?.arguments && (
-          <div className={styles.tool_arguments}>
-            <div className={styles.section_label}>{localize('ai.native.mcp.tool.arguments')}:</div>
+          <div className={styles['tool-arguments']}>
+            <div className={styles['section-label']}>Arguments</div>
             <CodeEditorWithHighlight input={value?.function?.arguments} language={'json'} relationId={uuid(4)} />
           </div>
         )}
         {value?.result && (
-          <div className={styles.tool_result}>
-            <div className={styles.section_label}>{localize('ai.native.mcp.tool.results')}:</div>
+          <div className={styles['tool-result']}>
+            <div className={styles['section-label']}>Result</div>
             <CodeEditorWithHighlight input={value.result} language={'json'} relationId={uuid(4)} />
           </div>
         )}

package/src/browser/contrib/inline-completions/prompt/matcher.ts

@@ -244,8 +244,8 @@ export abstract class WindowedMatcher {
         tokens.slice(startLine, endLine).forEach((token) => token.forEach((word) => size.add(word)));
         cache.push(size);
       }
-      const traget = cache[index];
-      const score = this.similarityScore(traget, this.referenceTokens);
+      const target = cache[index];
+      const score = this.similarityScore(target, this.referenceTokens);
       snippets.push({
         score,
         startLine,

package/src/browser/contrib/inline-completions/prompt/similarSnippets.ts

@@ -15,9 +15,9 @@ import {
 import { MAX_NEIGHBOR_AGGREGATE_LENGTH } from './const';
 import { FixedWindowSizeJaccardMatcher } from './jaccardMatcher';
 
-export const getOpenedTabFileList = (docuemnts: IEditorDocumentModel[]) => {
+export const getOpenedTabFileList = (documents: IEditorDocumentModel[]) => {
   // 过滤超大文档
-  const recentFiles = docuemnts.filter((document) => isDocumentValid(document));
+  const recentFiles = documents.filter((document) => isDocumentValid(document));
   return recentFiles;
 };
 

package/src/browser/contrib/intelligent-completions/view/default.ts

@@ -29,7 +29,6 @@ import {
 
 import { CodeEditsResultValue, ICodeEdit, ICodeEditsResult } from '../index';
 
-
 import { BaseCodeEditsView } from './base';
 
 /**

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

@@ -225,7 +225,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 +245,7 @@ export abstract class BaseApplyService extends WithEventBus {
       createdAt: Date.now(),
       toolCallId,
       messageId: lastMessageId,
+      instructions,
       // TODO: 支持range
       originalCode: originalModelRef.instance.getText(),
     };
@@ -565,8 +571,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,6 +593,7 @@ export abstract class BaseApplyService extends WithEventBus {
     result?: string;
   }>;
 
+  // FIXME: 貌似筛选逻辑不太对，需要重构
   // TODO: 支持使用内存中的document获取诊断信息，实现并行apply accept
   protected getDiagnosticInfos(uri: string, ranges: Range[]) {
     const markers = this.markerService.getManager().getMarkers({ resource: uri });

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

@@ -4,8 +4,7 @@ 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 { BUILTIN_MCP_SERVER_NAME, ISumiMCPServerBackend, SumiMCPServerProxyServicePath } from '../../../../common';
 import { MCPServerDescription } from '../../../../common/mcp-server-manager';
@@ -18,13 +17,12 @@ 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 [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 +42,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 +85,10 @@ 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);
       }
     },
     [mcpServerProxyService, preferenceService, sumiMCPServerBackendProxy, loadServers],
@@ -124,7 +117,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 +136,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 +160,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 +184,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 +197,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')}

package/src/browser/mcp/config/mcp-config.contribution.ts

@@ -1,6 +1,6 @@
 import { Autowired } from '@opensumi/di';
 import { LabelService } from '@opensumi/ide-core-browser/lib/services';
-import { Domain, URI } from '@opensumi/ide-core-common';
+import { Domain, Schemes, URI } from '@opensumi/ide-core-common';
 import {
   BrowserEditorContribution,
   EditorComponentRegistry,

package/src/browser/mcp/tools/handlers/EditFile.ts

@@ -13,8 +13,8 @@ export class EditFileHandler {
   private applyService: BaseApplyService;
 
   async handler(params: { targetFile: string; codeEdit: string; instructions?: string }, toolCallId: string) {
-    const { targetFile, codeEdit } = params;
-    const block = await this.applyService.registerCodeBlock(targetFile, codeEdit, toolCallId);
+    const { targetFile, codeEdit, instructions } = params;
+    const block = await this.applyService.registerCodeBlock(targetFile, codeEdit, toolCallId, instructions);
     const blockData = await this.applyService.apply(block);
     return blockData;
   }

package/src/browser/model/msg-history-manager.ts

@@ -1,7 +1,5 @@
-import { Injectable } from '@opensumi/di';
 import { Disposable, Emitter, Event, uuid } from '@opensumi/ide-core-common';
-import { ChatMessageRole } from '@opensumi/ide-core-common/lib/types/ai-native';
-import { IHistoryChatMessage } from '@opensumi/ide-core-common/lib/types/ai-native';
+import { ChatMessageRole, IHistoryChatMessage } from '@opensumi/ide-core-common/lib/types/ai-native';
 
 type IExcludeMessage = Omit<IHistoryChatMessage, 'id' | 'order'>;
 

package/src/browser/widget/inline-diff/inline-diff-manager.tsx

@@ -3,7 +3,6 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { Icon, Popover } from '@opensumi/ide-components';
 import { AppConfig, IDisposable, URI, localize, path, useInjectable } from '@opensumi/ide-core-browser';
 import { IResource, WorkbenchEditorService } from '@opensumi/ide-editor';
-import { Path } from '@opensumi/ide-utils/lib/path';
 
 import { BaseApplyService } from '../../mcp/base-apply.service';
 

package/src/common/prompts/context-prompt-provider.ts

@@ -42,11 +42,15 @@ ${context.recentlyViewFiles.map((file, idx) => `    ${idx + 1}: ${file}`).join('
               `,
     )}
   </attached_files>
-${currentModel ? `<current_opened_file>
+${
+  currentModel
+    ? `<current_opened_file>
   \`\`\`${currentModel.languageId} ${currentModel.uri.toString()}
 ${currentModel.getText()}
   \`\`\`
-  </current_opened_file>` : ''}
+  </current_opened_file>`
+    : ''
+}
 </additional_data>
 <user_query>
 ${userMessage}