@opensumi/ide-ai-native 3.8.1-next-1740556231.0 → 3.8.1-next-1740625266.0

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

@@ -1,13 +1,13 @@
 import { Autowired, Injectable, Optional } from '@opensumi/di';
 import { IContextKey, IContextKeyService, IScopedContextKeyService } from '@opensumi/ide-core-browser';
 import {
+  CodeEditsIsVisible,
   InlineChatIsVisible,
   InlineCompletionIsTrigger,
   InlineDiffPartialEditsIsVisible,
   InlineHintWidgetIsVisible,
   InlineInputWidgetIsStreaming,
   InlineInputWidgetIsVisible,
-  MultiLineEditsIsVisible,
 } from '@opensumi/ide-core-browser/lib/contextkey/ai-native';
 import { ContextKeyService } from '@opensumi/monaco-editor-core/esm/vs/platform/contextkey/browser/contextKeyService';
 import { IContextKeyServiceTarget } from '@opensumi/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey';
@@ -25,7 +25,7 @@ export class AINativeContextKey {
   public readonly inlineInputWidgetIsVisible: IContextKey<boolean>;
   public readonly inlineInputWidgetIsStreaming: IContextKey<boolean>;
   public readonly inlineDiffPartialEditsIsVisible: IContextKey<boolean>;
-  public readonly multiLineEditsIsVisible: IContextKey<boolean>;
+  public readonly codeEditsIsVisible: IContextKey<boolean>;
   public get contextKeyService() {
     return this._contextKeyService;
   }
@@ -38,6 +38,6 @@ export class AINativeContextKey {
     this.inlineInputWidgetIsVisible = InlineInputWidgetIsVisible.bind(this._contextKeyService);
     this.inlineInputWidgetIsStreaming = InlineInputWidgetIsStreaming.bind(this._contextKeyService);
     this.inlineDiffPartialEditsIsVisible = InlineDiffPartialEditsIsVisible.bind(this._contextKeyService);
-    this.multiLineEditsIsVisible = MultiLineEditsIsVisible.bind(this._contextKeyService);
+    this.codeEditsIsVisible = CodeEditsIsVisible.bind(this._contextKeyService);
   }
 }

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

@@ -76,6 +76,7 @@ import {
   AI_CHAT_LOGO_AVATAR_ID,
   AI_CHAT_VIEW_ID,
   AI_MENU_BAR_DEBUG_TOOLBAR,
+  BUILTIN_MCP_SERVER_NAME,
   ChatProxyServiceToken,
   IChatInternalService,
   IChatManagerService,
@@ -338,15 +339,23 @@ export class AINativeBrowserContribution
       }
 
       if (supportsMCP) {
-        // 初始化内置 MCP Server
-        this.sumiMCPServerBackendProxy.initBuiltinMCPServer();
-
         // 从 preferences 获取并初始化外部 MCP Servers
         const mcpServers = this.preferenceService.getValid<MCPServerDescription[]>(
           AINativeSettingSectionsId.MCPServers,
         );
+
+        // 查找内置 MCP Server 的配置
+        const builtinServer = mcpServers?.find((server) => server.name === BUILTIN_MCP_SERVER_NAME);
+
+        // 总是初始化内置服务器，根据配置决定是否启用
+        this.sumiMCPServerBackendProxy.initBuiltinMCPServer(builtinServer?.enabled ?? true);
+
+        // 初始化其他外部 MCP Servers
         if (mcpServers && mcpServers.length > 0) {
-          this.sumiMCPServerBackendProxy.initExternalMCPServers(mcpServers);
+          const externalServers = mcpServers.filter((server) => server.name !== BUILTIN_MCP_SERVER_NAME);
+          if (externalServers.length > 0) {
+            this.sumiMCPServerBackendProxy.initExternalMCPServers(externalServers);
+          }
         }
       }
     });

package/src/browser/chat/chat.view.tsx

@@ -3,6 +3,7 @@ import { MessageList } from 'react-chat-elements';
 
 import {
   AINativeConfigService,
+  CommandService,
   getIcon,
   useEventEffect,
   useInjectable,
@@ -52,6 +53,7 @@ import { ChatNotify, ChatReply } from '../components/ChatReply';
 import { SlashCustomRender } from '../components/SlashCustomRender';
 import { MessageData, createMessageByAI, createMessageByUser } from '../components/utils';
 import { WelcomeMessage } from '../components/WelcomeMsg';
+import { OPEN_MCP_CONFIG_COMMAND } from '../mcp/config/mcp-config.commands';
 import { MCPServerProxyService } from '../mcp/mcp-server-proxy.service';
 import { MCPToolsDialog } from '../mcp/mcp-tools-dialog.view';
 import { ChatViewHeaderRender, TSlashCommandCustomRender } from '../types';
@@ -63,6 +65,7 @@ import { ChatFeatureRegistry } from './chat.feature.registry';
 import { ChatInternalService } from './chat.internal.service';
 import styles from './chat.module.less';
 import { ChatRenderRegistry } from './chat.render.registry';
+
 const SCROLL_CLASSNAME = 'chat_scroll';
 
 interface TDispatchAction {
@@ -81,11 +84,15 @@ export const AIChatView = () => {
   const chatRenderRegistry = useInjectable<ChatRenderRegistry>(ChatRenderRegistryToken);
   const contextService = useInjectable<LLMContextService>(LLMContextServiceToken);
   const promptProvider = useInjectable<ChatAgentPromptProvider>(ChatAgentPromptProvider);
+  const mcpServerProxyService = useInjectable<MCPServerProxyService>(TokenMCPServerProxyService);
 
   const layoutService = useInjectable<IMainLayoutService>(IMainLayoutService);
   const msgHistoryManager = aiChatService.sessionModel.history;
   const containerRef = React.useRef<HTMLDivElement>(null);
   const chatInputRef = React.useRef<{ setInputValue: (v: string) => void } | null>(null);
+  const dialogService = useInjectable<IDialogService>(IDialogService);
+  const aiNativeConfigService = useInjectable<AINativeConfigService>(AINativeConfigService);
+  const commandService = useInjectable<CommandService>(CommandService);
 
   const [shortcutCommands, setShortcutCommands] = React.useState<ChatSlashCommandItemModel[]>([]);
 
@@ -107,6 +114,8 @@ export const AIChatView = () => {
   const [defaultAgentId, setDefaultAgentId] = React.useState<string>('');
   const [command, setCommand] = React.useState('');
   const [theme, setTheme] = React.useState<string | null>(null);
+  const [mcpToolsCount, setMcpToolsCount] = React.useState<number>(0);
+  const [mcpServersCount, setMcpServersCount] = React.useState<number>(0);
 
   React.useEffect(() => {
     const featureSlashCommands = chatFeatureRegistry.getAllShortcutSlashCommand();
@@ -658,6 +667,32 @@ export const AIChatView = () => {
     };
   }, [aiChatService.sessionModel]);
 
+  useEventEffect(
+    mcpServerProxyService.onChangeMCPServers,
+    () => {
+      mcpServerProxyService.getAllMCPTools().then((tools) => {
+        setMcpToolsCount(tools.length);
+      });
+      mcpServerProxyService.$getServers().then((servers) => {
+        setMcpServersCount(servers.length);
+      });
+    },
+    [mcpServerProxyService],
+  );
+
+  const handleShowMCPTools = React.useCallback(async () => {
+    const tools = await mcpServerProxyService.getAllMCPTools();
+    dialogService.open({
+      message: <MCPToolsDialog tools={tools} />,
+      type: MessageType.Empty,
+      buttons: ['关闭'],
+    });
+  }, [mcpServerProxyService, dialogService]);
+
+  const handleShowMCPConfig = React.useCallback(() => {
+    commandService.executeCommand(OPEN_MCP_CONFIG_COMMAND.id);
+  }, [commandService]);
+
   return (
     <div id={styles.ai_chat_view}>
       <div className={styles.header_container}>
@@ -697,6 +732,18 @@ export const AIChatView = () => {
                   </Popover>
                 ))}
               </div>
+              <div className={styles.header_operate_right}>
+                {aiNativeConfigService.capabilities.supportsMCP && (
+                  <>
+                    <div className={styles.tag} onClick={handleShowMCPConfig}>
+                      {`MCP Servers: ${mcpServersCount}`}
+                    </div>
+                    <div className={styles.tag} onClick={handleShowMCPTools}>
+                      {`MCP Tools: ${mcpToolsCount}`}
+                    </div>
+                  </>
+                )}
+              </div>
             </div>
             <ChatInputWrapperRender
               onSend={(value, agentId, command) =>

package/src/browser/contrib/inline-completions/inline-completions.controller.ts

@@ -170,7 +170,7 @@ export class InlineCompletionsController extends BaseAIMonacoEditorController {
     }
 
     // 如果上一次补全结果还在，则不重复请求
-    const isVisible = this.aiNativeContextKey.multiLineEditsIsVisible.get();
+    const isVisible = this.aiNativeContextKey.codeEditsIsVisible.get();
     if (isVisible) {
       return;
     }

package/src/browser/contrib/intelligent-completions/index.ts

@@ -69,7 +69,11 @@ export class CodeEditsResultValue<T extends ICodeEdit = ICodeEdit> extends Dispo
     }));
   }
 
-  public get range(): IRange {
+  public get firstRange(): IRange {
     return this.raw.items[0].range;
   }
+
+  public get firstText(): string {
+    return this.raw.items[0].insertText;
+  }
 }

package/src/browser/contrib/intelligent-completions/intelligent-completions.contribution.ts

@@ -8,7 +8,7 @@ import {
   KeybindingScope,
 } from '@opensumi/ide-core-browser';
 import { AI_CODE_EDITS_COMMANDS } from '@opensumi/ide-core-browser/lib/ai-native/command';
-import { MultiLineEditsIsVisible } from '@opensumi/ide-core-browser/lib/contextkey/ai-native';
+import { CodeEditsIsVisible } from '@opensumi/ide-core-browser/lib/contextkey/ai-native';
 import { CommandContribution, CommandRegistry, Domain } from '@opensumi/ide-core-common';
 import { WorkbenchEditorService } from '@opensumi/ide-editor';
 import { WorkbenchEditorServiceImpl } from '@opensumi/ide-editor/lib/browser/workbench-editor.service';
@@ -61,7 +61,7 @@ export class IntelligentCompletionsContribution implements KeybindingContributio
     keybindings.registerKeybinding({
       command: AI_CODE_EDITS_COMMANDS.DISCARD.id,
       keybinding: Key.ESCAPE.code,
-      when: MultiLineEditsIsVisible.raw,
+      when: CodeEditsIsVisible.raw,
       priority: 100,
     });
 
@@ -69,7 +69,7 @@ export class IntelligentCompletionsContribution implements KeybindingContributio
       {
         command: AI_CODE_EDITS_COMMANDS.ACCEPT.id,
         keybinding: Key.TAB.code,
-        when: MultiLineEditsIsVisible.raw,
+        when: CodeEditsIsVisible.raw,
       },
       KeybindingScope.USER,
     );

package/src/browser/contrib/intelligent-completions/intelligent-completions.controller.ts

@@ -5,7 +5,7 @@ import {
   KeybindingScope,
   PreferenceService,
 } from '@opensumi/ide-core-browser';
-import { MultiLineEditsIsVisible } from '@opensumi/ide-core-browser/lib/contextkey/ai-native';
+import { CodeEditsIsVisible } from '@opensumi/ide-core-browser/lib/contextkey/ai-native';
 import {
   AINativeSettingSectionsId,
   CodeEditsRT,
@@ -98,13 +98,13 @@ export class IntelligentCompletionsController extends BaseAIMonacoEditorControll
       this.monacoEditor,
     ]);
 
-    const multiLineEditsIsVisibleKey = new Set([MultiLineEditsIsVisible.raw]);
+    const multiLineEditsIsVisibleKey = new Set([CodeEditsIsVisible.raw]);
     this.multiLineEditsIsVisibleObs = observableFromEvent(
       this,
       Event.filter(this.aiNativeContextKey.contextKeyService!.onDidChangeContext, (e: ContextKeyChangeEvent) =>
         e.payload.affectsSome(multiLineEditsIsVisibleKey),
       ),
-      () => !!this.aiNativeContextKey.multiLineEditsIsVisible.get(),
+      () => !!this.aiNativeContextKey.codeEditsIsVisible.get(),
     );
 
     this.registerFeature(this.monacoEditor);
@@ -205,7 +205,7 @@ export class IntelligentCompletionsController extends BaseAIMonacoEditorControll
 
   public hide() {
     this.cancelToken();
-    this.aiNativeContextKey.multiLineEditsIsVisible.reset();
+    this.aiNativeContextKey.codeEditsIsVisible.reset();
     this.codeEditsPreviewer.hide();
   }
 
@@ -273,6 +273,7 @@ export class IntelligentCompletionsController extends BaseAIMonacoEditorControll
   public trigger(tx: ITransaction): void {
     const triggerSource = this.codeEditsSourceCollection.getSource(TriggerCodeEditsSource) as TriggerCodeEditsSource;
     if (triggerSource) {
+      this.hide();
       triggerSource.triggerSignal.trigger(tx);
     }
   }
@@ -314,7 +315,7 @@ export class IntelligentCompletionsController extends BaseAIMonacoEditorControll
           handleChange: (context) => {
             if (context.didChange(this.codeEditsSourceCollection.codeEditsContextBean)) {
               // 如果上一次补全结果还在，则不重复请求
-              const isVisible = this.aiNativeContextKey.multiLineEditsIsVisible.get();
+              const isVisible = this.aiNativeContextKey.codeEditsIsVisible.get();
               return !isVisible;
             }
             return false;

package/src/browser/contrib/intelligent-completions/view/code-edits-previewer.ts

@@ -51,19 +51,21 @@ export class CodeEditsPreviewer extends Disposable {
 
   public render(completionModel: CodeEditsResultValue) {
     this.view?.render(completionModel);
-    this.aiNativeContextKey.multiLineEditsIsVisible.set(true);
+    this.aiNativeContextKey.codeEditsIsVisible.set(true);
   }
 
   public hide() {
     this.view?.hide();
-    this.aiNativeContextKey.multiLineEditsIsVisible.set(false);
+    this.aiNativeContextKey.codeEditsIsVisible.set(false);
   }
 
   public accept() {
     this.view?.accept();
+    this.aiNativeContextKey.codeEditsIsVisible.set(false);
   }
 
   public discard() {
     this.view?.discard();
+    this.aiNativeContextKey.codeEditsIsVisible.set(false);
   }
 }

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

@@ -80,17 +80,23 @@ export class DefaultCodeEditsView extends BaseCodeEditsView {
       return;
     }
 
-    asyncTransaction(async (tx) => {
-      const position = this.editorObs.positions.get()?.[0];
-      if (!position) {
-        return;
-      }
+    const position = this.editorObs.positions.get()?.[0];
+    if (!position) {
+      return;
+    }
 
-      const model = this.editorObs.model.get();
-      if (!model) {
-        return;
-      }
+    const model = this.editorObs.model.get();
+    if (!model) {
+      return;
+    }
 
+    const originalContent = model.getValueInRange(completionModel.firstRange);
+    // edits 的内容与原内容一样就不展示
+    if (originalContent === completionModel.firstText) {
+      return;
+    }
+
+    asyncTransaction(async (tx) => {
       const versionId = this.editorObs.versionId.get();
       const context: InlineCompletionContext = {
         triggerKind: InlineCompletionTriggerKind.Automatic,
@@ -103,16 +109,16 @@ export class DefaultCodeEditsView extends BaseCodeEditsView {
       const inlineEdits: InlineCompletionProviderResult = await provideInlineCompletions(
         {
           all: () => [
-              {
-                provideInlineCompletions: () => {},
-                provideInlineEditsForRange(model, range, context, token) {
-                  return completionModel;
-                },
-                freeInlineCompletions: () => [],
-              } as InlineCompletionsProvider<ICodeEditsResult<ICodeEdit>>,
-            ],
+            {
+              provideInlineCompletions: () => {},
+              provideInlineEditsForRange(model, range, context, token) {
+                return completionModel;
+              },
+              freeInlineCompletions: () => [],
+            } as InlineCompletionsProvider<ICodeEditsResult<ICodeEdit>>,
+          ],
         } as unknown as LanguageFeatureRegistry<InlineCompletionsProvider>,
-        Range.lift(completionModel.range),
+        Range.lift(completionModel.firstRange),
         model,
         context,
       );
@@ -122,9 +128,11 @@ export class DefaultCodeEditsView extends BaseCodeEditsView {
         request,
         model,
         this.editorObs.versionId,
-        constObservable(1000),
+        constObservable(4000),
       );
+
       source.inlineCompletions.set(completions, tx);
+      source.loading.set(false, tx);
     });
   }
 

package/src/browser/index.ts

@@ -55,6 +55,8 @@ import { RenameCandidatesProviderRegistry } from './contrib/rename/rename.featur
 import { TerminalAIContribution } from './contrib/terminal/terminal-ai.contributon';
 import { TerminalFeatureRegistry } from './contrib/terminal/terminal.feature.registry';
 import { LanguageParserService } from './languages/service';
+import { MCPConfigCommandContribution } from './mcp/config/mcp-config.commands';
+import { MCPConfigContribution } from './mcp/config/mcp-config.contribution';
 import { MCPServerProxyService } from './mcp/mcp-server-proxy.service';
 import { MCPServerRegistry } from './mcp/mcp-server.feature.registry';
 import { CreateNewFileWithTextTool } from './mcp/tools/createNewFileWithText';
@@ -91,6 +93,8 @@ export class AINativeModule extends BrowserModule {
     AICodeActionContribution,
     AINativePreferencesContribution,
     IntelligentCompletionsContribution,
+    MCPConfigContribution,
+    MCPConfigCommandContribution,
 
     // MCP Server Contributions START
     ListDirTool,

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

@@ -0,0 +1,178 @@
+.container {
+  padding: 20px;
+  color: var(--foreground);
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  margin-bottom: 24px;
+}
+
+.title {
+  margin: 0 0 8px 0;
+  font-size: 24px;
+  font-weight: 600;
+}
+
+.description {
+  margin: 0;
+  color: var(--descriptionForeground);
+  font-size: 14px;
+}
+
+.addButton {
+  padding: 8px 16px;
+  border-radius: 4px;
+  background-color: var(--button-primary-background);
+  color: var(--button-primary-foreground);
+  border: none;
+  cursor: pointer;
+  font-size: 13px;
+
+  &:hover {
+    background-color: var(--button-primary-hover-background);
+  }
+}
+
+.serversList {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+
+.serverItem {
+  padding: 16px;
+  border-radius: 8px;
+  background-color: var(--editorWidget-background);
+  border: 1px solid var(--border-color);
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+  transition: all 0.2s ease;
+
+  &:hover {
+    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+    border-color: var(--focusBorder);
+  }
+}
+
+.serverHeader {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 12px;
+}
+
+.serverTitleRow {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.serverName {
+  margin: 0;
+  font-size: 14px;
+  font-weight: 500;
+}
+
+.serverStatus,
+.serverType {
+  font-size: 12px;
+  padding: 2px 8px;
+  border-radius: 12px;
+  font-weight: 500;
+  display: inline-flex;
+  align-items: center;
+}
+
+.serverType {
+  background-color: var(--editor-background);
+  color: var(--descriptionForeground);
+}
+
+.running {
+  background-color: var(--notification-info-background);
+  color: var(--notification-info-foreground);
+}
+
+.stopped {
+  background-color: var(--notification-error-background);
+  color: var(--notification-error-foreground);
+}
+
+.serverActions {
+  display: flex;
+  gap: 4px;
+}
+
+.iconButton {
+  padding: 4px;
+  border: none;
+  background: none;
+  color: var(--icon-foreground);
+  cursor: pointer;
+  border-radius: 4px;
+
+  &:hover {
+    background-color: var(--list-hover-background);
+  }
+}
+
+.serverDetail {
+  margin-top: 12px;
+  padding: 12px;
+  border-radius: 6px;
+  background-color: var(--editor-background);
+  font-size: 13px;
+
+  &:not(:last-child) {
+    margin-bottom: 8px;
+  }
+}
+
+.detailRow {
+  display: flex;
+  gap: 8px;
+  margin-bottom: 4px;
+  align-items: center;
+
+  &:last-child {
+    margin-bottom: 0;
+  }
+}
+
+.detailLabel {
+  color: var(--descriptionForeground);
+  min-width: 70px;
+  height: 24px;
+  display: flex;
+  align-items: center;
+}
+
+.detailContent {
+  color: var(--foreground);
+  word-break: break-all;
+  flex: 1;
+  background-color: var(--editor-background);
+  padding: 4px 8px;
+  border-radius: 4px;
+  font-family: var(--monaco-monospace-font);
+  min-height: 24px;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  flex-wrap: wrap;
+}
+
+.toolTag {
+  display: inline-flex;
+  align-items: center;
+  padding: 2px 8px;
+  background-color: var(--editorWidget-background);
+  color: var(--button-secondary-foreground);
+  border-radius: 12px;
+  font-size: 12px;
+  font-weight: 500;
+  transition: all 0.2s ease;
+  border: 1px solid var(--border-color);
+}