@opensumi/ide-ai-native 3.8.1-next-1740556231.0 → 3.8.1-next-1740571693.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

@@ -59,11 +59,7 @@ import {
 } from '@opensumi/ide-core-common';
 import { DESIGN_MENU_BAR_RIGHT } from '@opensumi/ide-design';
 import { IEditor, WorkbenchEditorService } from '@opensumi/ide-editor';
-import {
-  BrowserEditorContribution,
-  EditorComponentRegistry,
-  IEditorFeatureRegistry,
-} from '@opensumi/ide-editor/lib/browser';
+import { BrowserEditorContribution, IEditorFeatureRegistry } from '@opensumi/ide-editor/lib/browser';
 import { WorkbenchEditorServiceImpl } from '@opensumi/ide-editor/lib/browser/workbench-editor.service';
 import { IMainLayoutService } from '@opensumi/ide-main-layout';
 import { ISettingRegistry, SettingContribution } from '@opensumi/ide-preferences';
@@ -76,6 +72,7 @@ import {
   AI_CHAT_LOGO_AVATAR_ID,
   AI_CHAT_VIEW_ID,
   AI_MENU_BAR_DEBUG_TOOLBAR,
+  BUILTIN_MCP_SERVER_NAME,
   ChatProxyServiceToken,
   IChatInternalService,
   IChatManagerService,
@@ -103,7 +100,6 @@ import {
   AIRightTabRenderer,
 } from './layout/tabbar.view';
 import { AIChatLogoAvatar } from './layout/view/avatar/avatar.view';
-import { BaseApplyService } from './mcp/base-apply.service';
 import {
   AINativeCoreContribution,
   IChatFeatureRegistry,
@@ -120,7 +116,6 @@ import {
 import { InlineChatEditorController } from './widget/inline-chat/inline-chat-editor.controller';
 import { InlineChatFeatureRegistry } from './widget/inline-chat/inline-chat.feature.registry';
 import { InlineChatService } from './widget/inline-chat/inline-chat.service';
-import { InlineDiffManager } from './widget/inline-diff/inline-diff-manager';
 import { InlineDiffController } from './widget/inline-diff/inline-diff.controller';
 import { InlineHintController } from './widget/inline-hint/inline-hint.controller';
 import { InlineInputController } from './widget/inline-input/inline-input.controller';
@@ -128,8 +123,6 @@ import { InlineInputService } from './widget/inline-input/inline-input.service';
 import { InlineStreamDiffService } from './widget/inline-stream-diff/inline-stream-diff.service';
 import { SumiLightBulbWidget } from './widget/light-bulb';
 
-export const INLINE_DIFF_MANAGER_WIDGET_ID = 'inline-diff-manager-widget';
-
 @Domain(
   ClientAppContribution,
   BrowserEditorContribution,
@@ -244,9 +237,6 @@ export class AINativeBrowserContribution
   @Autowired(IChatInternalService)
   private readonly chatInternalService: ChatInternalService;
 
-  @Autowired(BaseApplyService)
-  private readonly applyService: BaseApplyService;
-
   constructor() {
     this.registerFeature();
   }
@@ -338,15 +328,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);
+          }
         }
       }
     });
@@ -526,19 +524,6 @@ export class AINativeBrowserContribution
     });
   }
 
-  registerEditorComponent(registry: EditorComponentRegistry): void {
-    registry.registerEditorSideWidget({
-      id: INLINE_DIFF_MANAGER_WIDGET_ID,
-      component: InlineDiffManager,
-      displaysOnResource: (resource) => {
-        if (this.applyService.getUriPendingCodeBlock(resource.uri)) {
-          return true;
-        }
-        return false;
-      },
-    });
-  }
-
   registerCommands(commands: CommandRegistry): void {
     commands.registerCommand(AI_INLINE_CHAT_VISIBLE, {
       execute: (value: boolean) => {

package/src/browser/chat/chat-manager.service.ts

@@ -9,7 +9,6 @@ import {
   IStorage,
   STORAGE_NAMESPACE,
   StorageProvider,
-  debounce,
 } from '@opensumi/ide-core-common';
 import { ChatMessageRole, IChatMessage, IHistoryChatMessage } from '@opensumi/ide-core-common/lib/types/ai-native';
 
@@ -90,7 +89,6 @@ export class ChatManagerService extends Disposable {
     const savedSessions = this.fromJSON(sessionsModelData);
     savedSessions.forEach((session) => {
       this.#sessionModels.set(session.sessionId, session);
-      this.listenSession(session);
     });
     await this.storageInitEmitter.fireAndAwait();
   }
@@ -102,7 +100,6 @@ export class ChatManagerService extends Disposable {
   startSession() {
     const model = new ChatModel();
     this.#sessionModels.set(model.sessionId, model);
-    this.listenSession(model);
     return model;
   }
 
@@ -199,15 +196,6 @@ export class ChatManagerService extends Disposable {
     }
   }
 
-  protected listenSession(session: ChatModel) {
-    this.addDispose(
-      session.history.onMessageAdditionalChange(() => {
-        this.saveSessions();
-      }),
-    );
-  }
-
-  @debounce(1000)
   protected saveSessions() {
     this._chatStorage.set('sessionModels', this.getSessions());
   }

package/src/browser/chat/chat.internal.service.ts

@@ -94,10 +94,6 @@ export class ChatInternalService extends Disposable {
     return this.chatManagerService.getSessions();
   }
 
-  getSession(sessionId: string) {
-    return this.chatManagerService.getSession(sessionId);
-  }
-
   activateSession(sessionId: string) {
     const targetSession = this.chatManagerService.getSession(sessionId);
     if (!targetSession) {

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/components/ChatHistory.tsx

@@ -2,11 +2,10 @@ import cls from 'classnames';
 import React, { FC, memo, useCallback, useEffect, useRef, useState } from 'react';
 
 import { Icon, Input, Loading, Popover, PopoverPosition, PopoverTriggerType, getIcon } from '@opensumi/ide-components';
+import './chat-history.css';
 import { localize } from '@opensumi/ide-core-browser';
 import { EnhanceIcon } from '@opensumi/ide-core-browser/lib/components/ai-native';
 
-import styles from './chat-history.module.less';
-
 export interface IChatHistoryItem {
   id: string;
   title: string;
@@ -163,25 +162,22 @@ const ChatHistory: FC<IChatHistoryProps> = memo(
       (item: IChatHistoryItem) => (
         <div
           key={item.id}
-          className={cls(
-            styles['dm-chat-history-item'],
-            item.id === currentId ? styles['dm-chat-history-item-selected'] : '',
-          )}
+          className={cls('dm-chat-history-item', item.id === currentId ? 'dm-chat-history-item-selected' : '')}
           onClick={() => handleHistoryItemSelect(item)}
         >
-          <div className={styles['dm-chat-history-item-content']}>
+          <div className='dm-chat-history-item-content'>
             {item.loading ? (
               <Loading />
             ) : (
               <Icon icon='message' style={{ width: '16px', height: '16px', marginRight: 4 }} />
             )}
             {!historyTitleEditable?.[item.id] ? (
-              <span id={`dm-chat-history-item-title-${item.id}`} className={styles['dm-chat-history-item-title']}>
+              <span id={`dm-chat-history-item-title-${item.id}`} className='dm-chat-history-item-title'>
                 {item.title}
               </span>
             ) : (
               <Input
-                className={styles['dm-chat-history-item-title']}
+                className='dm-chat-history-item-title'
                 defaultValue={item.title}
                 ref={inputRef}
                 onPressEnter={(e: any) => {
@@ -191,7 +187,7 @@ const ChatHistory: FC<IChatHistoryProps> = memo(
               />
             )}
           </div>
-          <div className={styles['dm-chat-history-item-actions']}>
+          <div className='dm-chat-history-item-actions'>
             {/* <EditOutlined
               title={localize('aiNative.operate.chatHistory.edit')}
               style={{ marginRight: 8 }}
@@ -202,7 +198,7 @@ const ChatHistory: FC<IChatHistoryProps> = memo(
               }}
             /> */}
             <EnhanceIcon
-              className={cls(styles['dm-chat-history-item-actions-delete'], getIcon('delete'))}
+              className={cls('dm-chat-history-item-actions-delete', getIcon('delete'))}
               onClick={(e) => {
                 e.preventDefault();
                 e.stopPropagation();
@@ -241,10 +237,10 @@ const ChatHistory: FC<IChatHistoryProps> = memo(
             value={searchValue}
             onChange={handleSearchChange}
           />
-          <div className={styles['dm-chat-history-list']}>
+          <div className='dm-chat-history-list'>
             {groupedHistoryList.map((group) => (
               <div key={group.key} style={{ padding: '4px' }}>
-                <div className={styles['dm-chat-history-time']}>{group.key}</div>
+                <div className='dm-chat-history-time'>{group.key}</div>
                 {group.items.map(renderHistoryItem)}
               </div>
             ))}
@@ -257,11 +253,11 @@ const ChatHistory: FC<IChatHistoryProps> = memo(
     const getPopupContainer = useCallback((triggerNode: HTMLElement) => triggerNode.parentElement!, []);
 
     return (
-      <div className={cls(styles['dm-chat-history-header'], className)}>
-        <div className={styles['dm-chat-history-header-title']}>
+      <div className={cls('dm-chat-history-header', className)}>
+        <div className='dm-chat-history-header-title'>
           <span>{title}</span>
         </div>
-        <div className={styles['dm-chat-history-header-actions']}>
+        <div className='dm-chat-history-header-actions'>
           <Popover
             id='dm-chat-history-header-actions-history'
             content={renderHistory()}
@@ -271,12 +267,10 @@ const ChatHistory: FC<IChatHistoryProps> = memo(
             getPopupContainer={getPopupContainer}
           >
             <div
-              className={styles['dm-chat-history-header-actions-history']}
+              className='dm-chat-history-header-actions-history'
               title={localize('aiNative.operate.chatHistory.title')}
             >
-              <EnhanceIcon
-                className={cls(styles['dm-chat-history-header-actions-history'], 'codicon codicon-history')}
-              />
+              <EnhanceIcon className={cls('dm-chat-history-header-actions-history', 'codicon codicon-history')} />
             </div>
           </Popover>
           <Popover
@@ -285,7 +279,7 @@ const ChatHistory: FC<IChatHistoryProps> = memo(
             title={localize('aiNative.operate.newChat.title')}
           >
             <EnhanceIcon
-              className={cls(styles['dm-chat-history-header-actions-new'], getIcon('plus'))}
+              className={cls('dm-chat-history-header-actions-new', getIcon('plus'))}
               onClick={handleNewChat}
             />
           </Popover>

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,