@opensumi/ide-ai-native 3.8.1-next-1740965430.0 → 3.8.1-next-1741061006.0

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

@@ -5,6 +5,7 @@ import {
   AINativeConfigService,
   CommandService,
   getIcon,
+  useEventEffect,
   useInjectable,
   useUpdateOnEvent,
 } from '@opensumi/ide-core-browser';
@@ -41,6 +42,8 @@ import {
   IChatMessageStructure,
   TokenMCPServerProxyService,
 } from '../../common';
+import { LLMContextService, LLMContextServiceToken } from '../../common/llm-context';
+import { ChatAgentPromptProvider } from '../../common/prompts/context-prompt-provider';
 import { ChatContext } from '../components/ChatContext';
 import { CodeBlockWrapperInput } from '../components/ChatEditor';
 import ChatHistory, { IChatHistoryItem } from '../components/ChatHistory';
@@ -79,11 +82,18 @@ export const AIChatView = () => {
   const chatAgentService = useInjectable<IChatAgentService>(IChatAgentService);
   const chatFeatureRegistry = useInjectable<ChatFeatureRegistry>(ChatFeatureRegistryToken);
   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 autoScroll = React.useRef<boolean>(true);
   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[]>([]);
 
@@ -105,6 +115,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();
@@ -154,8 +166,29 @@ export const AIChatView = () => {
     [],
   );
 
+  const onDidWheel = React.useCallback(
+    (e: WheelEvent) => {
+      // 向上滚动
+      if (e.deltaY < 0) {
+        autoScroll.current = false;
+      } else {
+        autoScroll.current = true;
+      }
+    },
+    [autoScroll],
+  );
+
+  React.useEffect(() => {
+    if (containerRef.current) {
+      containerRef.current.addEventListener('wheel', onDidWheel);
+      return () => {
+        containerRef.current?.removeEventListener('wheel', onDidWheel);
+      };
+    }
+  }, [autoScroll]);
+
   const scrollToBottom = React.useCallback(() => {
-    if (containerRef && containerRef.current) {
+    if (containerRef && containerRef.current && autoScroll.current) {
       const lastElement = containerRef.current.lastElementChild;
       if (lastElement) {
         lastElement.scrollIntoView({ behavior: 'smooth', block: 'end' });
@@ -165,7 +198,7 @@ export const AIChatView = () => {
         containerRef.current.classList.add(SCROLL_CLASSNAME);
       }
     }
-  }, [containerRef]);
+  }, [containerRef, autoScroll]);
 
   const handleDispatchMessage = React.useCallback(
     (dispatch: TDispatchAction) => {
@@ -187,7 +220,7 @@ export const AIChatView = () => {
     disposer.addDispose(
       chatApiService.onScrollToBottom(() => {
         requestAnimationFrame(() => {
-          scrollToBottom();
+          // scrollToBottom();
         });
       }),
     );
@@ -504,7 +537,10 @@ export const AIChatView = () => {
       const { message, agentId, command, reportExtra } = value;
       const { actionType, actionSource } = reportExtra || {};
 
-      const request = aiChatService.createRequest(message, agentId!, command);
+      const context = contextService.serialize();
+      const fullMessage = await promptProvider.provideContextPrompt(context, message);
+
+      const request = aiChatService.createRequest(fullMessage, agentId!, command);
       if (!request) {
         return;
       }
@@ -653,6 +689,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}>
@@ -692,6 +754,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) =>
@@ -734,8 +808,6 @@ export function DefaultChatViewHeader({
   const aiNativeConfigService = useInjectable<AINativeConfigService>(AINativeConfigService);
   const mcpServerProxyService = useInjectable<MCPServerProxyService>(TokenMCPServerProxyService);
   const aiChatService = useInjectable<ChatInternalService>(IChatInternalService);
-  const commandService = useInjectable<CommandService>(CommandService);
-
   const [historyList, setHistoryList] = React.useState<IChatHistoryItem[]>([]);
   const [currentTitle, setCurrentTitle] = React.useState<string>('');
   const handleNewChat = React.useCallback(() => {
@@ -756,10 +828,6 @@ export function DefaultChatViewHeader({
     [aiChatService],
   );
 
-  const handleShowMCPConfig = React.useCallback(() => {
-    commandService.executeCommand(OPEN_MCP_CONFIG_COMMAND.id);
-  }, [commandService]);
-
   const handleShowMCPTools = React.useCallback(async () => {
     const tools = await mcpServerProxyService.getAllMCPTools();
     dialogService.open({
@@ -848,6 +916,23 @@ export function DefaultChatViewHeader({
           ariaLabel={localize('aiNative.operate.clear.title')}
         />
       </Popover>
+      {aiNativeConfigService.capabilities.supportsMCP && (
+        <Popover
+          overlayClassName={styles.popover_icon}
+          id={'ai-chat-header-tools'}
+          position={PopoverPosition.left}
+          title={localize('aiNative.operate.tools.title')}
+        >
+          <EnhanceIcon
+            wrapperClassName={styles.action_btn}
+            className={getIcon('menubar-tool')}
+            onClick={handleShowMCPTools}
+            tabIndex={0}
+            role='button'
+            ariaLabel={localize('aiNative.operate.tools.title')}
+          />
+        </Popover>
+      )}
       <Popover
         overlayClassName={styles.popover_icon}
         id={'ai-chat-header-close'}

package/src/browser/components/ChatContext/index.tsx

@@ -39,7 +39,7 @@ export const ChatContext = memo(() => {
       50,
     )((files) => {
       if (files) {
-        updateAddedFiles([...files.attached]);
+        updateAddedFiles(files);
       }
     }, contextService);
 
@@ -57,7 +57,7 @@ export const ChatContext = memo(() => {
   }, []);
 
   const onDidDeselect = useCallback((uri: URI) => {
-    contextService.removeFileFromContext(uri, true);
+    contextService.removeFileFromContext(uri);
   }, []);
 
   const onDidClickFile = useCallback((uri: URI) => {

package/src/browser/components/ChatInput.tsx

@@ -1,29 +1,18 @@
 import cls from 'classnames';
 import React, { useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 
-import { AINativeConfigService, useInjectable, useLatest } from '@opensumi/ide-core-browser';
+import { useInjectable, useLatest } from '@opensumi/ide-core-browser';
 import { Icon, Popover, PopoverPosition, getIcon } from '@opensumi/ide-core-browser/lib/components';
 import { EnhanceIcon } from '@opensumi/ide-core-browser/lib/components/ai-native';
 import { InteractiveInput } from '@opensumi/ide-core-browser/lib/components/ai-native/interactive-input/index';
-import {
-  ChatAgentViewServiceToken,
-  ChatFeatureRegistryToken,
-  MessageType,
-  localize,
-  runWhenIdle,
-} from '@opensumi/ide-core-common';
-import { CommandService } from '@opensumi/ide-core-common/lib/command';
+import { ChatAgentViewServiceToken, ChatFeatureRegistryToken, localize, runWhenIdle } from '@opensumi/ide-core-common';
 import { MonacoCommandRegistry } from '@opensumi/ide-editor/lib/browser/monaco-contrib/command/command.service';
-import { IDialogService } from '@opensumi/ide-overlay';
 
-import { AT_SIGN_SYMBOL, IChatAgentService, SLASH_SYMBOL, TokenMCPServerProxyService } from '../../common';
+import { AT_SIGN_SYMBOL, IChatAgentService, SLASH_SYMBOL } from '../../common';
 import { ChatAgentViewService } from '../chat/chat-agent.view.service';
 import { ChatSlashCommandItemModel } from '../chat/chat-model';
 import { ChatProxyService } from '../chat/chat-proxy.service';
 import { ChatFeatureRegistry } from '../chat/chat.feature.registry';
-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 { IChatSlashCommandItem } from '../types';
 
 import styles from './components.module.less';
@@ -205,29 +194,12 @@ export const ChatInput = React.forwardRef((props: IChatInputProps, ref) => {
   const [isExpand, setIsExpand] = useState(false);
   const [placeholder, setPlaceHolder] = useState(localize('aiNative.chat.input.placeholder.default'));
 
-  const dialogService = useInjectable<IDialogService>(IDialogService);
-  const aiNativeConfigService = useInjectable<AINativeConfigService>(AINativeConfigService);
-  const mcpServerProxyService = useInjectable<MCPServerProxyService>(TokenMCPServerProxyService);
   const monacoCommandRegistry = useInjectable<MonacoCommandRegistry>(MonacoCommandRegistry);
   const chatAgentService = useInjectable<IChatAgentService>(IChatAgentService);
   const chatFeatureRegistry = useInjectable<ChatFeatureRegistry>(ChatFeatureRegistryToken);
-  const commandService = useInjectable<CommandService>(CommandService);
 
   const currentAgentIdRef = useLatest(agentId);
 
-  const handleShowMCPConfig = React.useCallback(() => {
-    commandService.executeCommand(OPEN_MCP_CONFIG_COMMAND.id);
-  }, [commandService]);
-
-  const handleShowMCPTools = React.useCallback(async () => {
-    const tools = await mcpServerProxyService.getAllMCPTools();
-    dialogService.open({
-      message: <MCPToolsDialog tools={tools} />,
-      type: MessageType.Empty,
-      buttons: ['关闭'],
-    });
-  }, [mcpServerProxyService, dialogService]);
-
   useImperativeHandle(ref, () => ({
     setInputValue: (v: string) => {
       setValue(v);
@@ -489,42 +461,6 @@ export const ChatInput = React.forwardRef((props: IChatInputProps, ref) => {
         height={inputHeight}
         popoverPosition={PopoverPosition.left}
       />
-      <div className={styles.chat_input_footer}>
-        {aiNativeConfigService.capabilities.supportsMCP && (
-          <div className={styles.mcp_desc}>
-            <Popover
-              overlayClassName={styles.popover_icon}
-              id={'ai-chat-header-mcp-server'}
-              position={PopoverPosition.left}
-              title={'MCP Server'}
-            >
-              <EnhanceIcon
-                wrapperClassName={styles.action_btn}
-                className={'codicon codicon-server'}
-                onClick={handleShowMCPConfig}
-                tabIndex={0}
-                role='button'
-                ariaLabel={'MCP Server'}
-              />
-            </Popover>
-            <Popover
-              overlayClassName={styles.popover_icon}
-              id={'ai-chat-header-tools'}
-              position={PopoverPosition.left}
-              title={localize('aiNative.operate.tools.title')}
-            >
-              <EnhanceIcon
-                wrapperClassName={styles.action_btn}
-                className={getIcon('menubar-tool')}
-                onClick={handleShowMCPTools}
-                tabIndex={0}
-                role='button'
-                ariaLabel={localize('aiNative.operate.tools.title')}
-              />
-            </Popover>
-          </div>
-        )}
-      </div>
     </div>
   );
 });

package/src/browser/components/ChatToolRender.tsx

@@ -67,12 +67,13 @@ export const ChatToolRender = (props: { value: IChatToolContent['content']; mess
     <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'}`} />
+          <span className={cls(styles['expand-icon'], { [styles.expanded]: isExpanded })}>▶</span>
           {label}
         </div>
         {value.state && (
           <div className={styles['tool-state']}>
             <span className={styles['state-icon']}>{stateInfo.icon}</span>
+            <span className={styles['state-label']}>{stateInfo.label}</span>
           </div>
         )}
       </div>

package/src/browser/components/chat-history.module.less

@@ -3,7 +3,7 @@
   align-items: center;
   justify-content: space-between;
   font-size: 13px;
-  padding: 0 0 0 12px;
+  padding: 0 4px 0 12px;
   color: var(--editor-foreground);
   text-overflow: ellipsis;
   white-space: nowrap;

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

@@ -96,7 +96,6 @@
 .chat_input_container {
   position: relative;
   border-radius: 9px;
-  padding: 10px 0px 0px 0px;
   border: 1px solid var(--kt-input-border);
   background-color: var(--design-chatInput-background);
   &.active {
@@ -506,22 +505,3 @@
     }
   }
 }
-
-.chat_input_footer {
-  padding: 0px 10px;
-  display: flex;
-  align-items: center;
-  font-size: 12px;
-
-  .model_selector {
-    display: flex;
-    font-size: 11px;
-    align-items: center;
-  }
-
-  .mcp_desc {
-    padding: 5px 0px;
-    display: flex;
-    align-items: center;
-  }
-}

package/src/browser/context/llm-context.service.ts

@@ -12,7 +12,7 @@ import {
 import { EditorSelectionChangeEvent } from '@opensumi/ide-editor/lib/browser/types';
 import { IMarkerService } from '@opensumi/ide-markers/lib/common/types';
 
-import { AttachFileContext, FileContext, LLMContextService, SerializedContext } from '../../common/llm-context';
+import { FileContext, LLMContextService, SerializedContext } from '../../common/llm-context';
 
 @Injectable()
 export class LLMContextServiceImpl extends WithEventBus implements LLMContextService {
@@ -27,68 +27,40 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
 
   private isAutoCollecting = false;
 
-  private contextVersion = 0;
+  private contextFiles: FileContext[] = [];
 
-  private readonly maxAttachFilesLimit = 10;
-  private readonly maxViewFilesLimit = 20;
-  private readonly attachedFiles: FileContext[] = [];
-  private readonly recentlyViewFiles: FileContext[] = [];
-  private readonly onDidContextFilesChangeEmitter = new Emitter<{ viewed: FileContext[]; attached: FileContext[]; version: number }>();
-  onDidContextFilesChangeEvent = this.onDidContextFilesChangeEmitter.event;
-
-  private addFileToList(file: FileContext, list: FileContext[], maxLimit: number) {
-    const existingIndex = list.findIndex((f) => f.uri.toString() === file.uri.toString());
-    if (existingIndex > -1) {
-      list.splice(existingIndex, 1);
-    }
+  private maxFiles: number = 10; // 上下文的最大长度限制
 
-    list.push(file);
-    if (list.length > maxLimit) {
-      list.shift();
-    }
-  }
+  private onDidContextFilesChangeEmitter = new Emitter<FileContext[]>();
+  onDidContextFilesChangeEvent = this.onDidContextFilesChangeEmitter.event;
 
-  addFileToContext(uri: URI, selection?: [number, number], isManual = false): void {
-    if (!uri) {
-      return;
-    }
+  addFileToContext(uri: URI, selection?: [number, number], isManual = true): void {
+    this.removeFileFromContext(uri);
 
-    const file = { uri, selection };
-    const targetList = isManual ? this.attachedFiles : this.recentlyViewFiles;
-    const maxLimit = isManual ? this.maxAttachFilesLimit : this.maxViewFilesLimit;
+    this.contextFiles.push({ uri, selection, isManual });
 
-    if (isManual) {
-      this.docModelManager.createModelReference(uri);
+    if (this.contextFiles.length > this.maxFiles) {
+      this.contextFiles.shift();
     }
 
-    this.addFileToList(file, targetList, maxLimit);
-    this.notifyContextChange();
-  }
-
-  private notifyContextChange(): void {
     this.onDidContextFilesChangeEmitter.fire(this.getAllContextFiles());
   }
 
   cleanFileContext() {
-    this.attachedFiles.length = 0;
-    this.notifyContextChange();
+    this.contextFiles = [];
+    this.onDidContextFilesChangeEmitter.fire(this.getAllContextFiles());
   }
 
   private getAllContextFiles() {
-    return {
-      viewed: this.recentlyViewFiles,
-      attached: this.attachedFiles,
-      version: this.contextVersion++,
-    };
+    return [...this.contextFiles];
   }
 
-  removeFileFromContext(uri: URI, isManual = false): void {
-    const targetList = isManual ? this.attachedFiles : this.recentlyViewFiles;
-    const index = targetList.findIndex((file) => file.uri.toString() === uri.toString());
+  removeFileFromContext(uri: URI): void {
+    const index = this.contextFiles.findIndex((file) => file.uri.toString() === uri.toString());
     if (index > -1) {
-      targetList.splice(index, 1);
+      this.contextFiles.splice(index, 1);
+      this.onDidContextFilesChangeEmitter.fire(this.getAllContextFiles());
     }
-    this.notifyContextChange();
   }
 
   startAutoCollection(): void {
@@ -106,7 +78,8 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
         if (event.payload.uri.scheme !== 'file') {
           return;
         }
-        this.addFileToContext(event.payload.uri, undefined, false);
+        // FIXME: 暂时不自动添加
+        // this.addFileToContext(event.payload.uri);
       }),
     );
 
@@ -115,8 +88,6 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
         if (event.payload.scheme !== 'file') {
           return;
         }
-
-        this.removeFileFromContext(event.payload, false);
       }),
     );
 
@@ -138,12 +109,11 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
           ].sort() as [number, number];
 
           if (selection[0] === selection[1]) {
-            this.addFileToContext(event.payload.editorUri, undefined, false);
+            this.addFileToContext(event.payload.editorUri, undefined);
           } else {
             this.addFileToContext(
               event.payload.editorUri,
               selection.sort((a, b) => a - b),
-              false,
             );
           }
         }
@@ -157,51 +127,42 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
 
   serialize(): SerializedContext {
     const files = this.getAllContextFiles();
-    const workspaceRoot = URI.file(this.appConfig.workspaceDir);
-
-    return {
-      recentlyViewFiles: this.serializeRecentlyViewFiles(files.viewed, workspaceRoot),
-      attachedFiles: this.serializeAttachedFiles(files.attached, workspaceRoot),
-    };
-  }
-
-  private serializeRecentlyViewFiles(files: FileContext[], workspaceRoot: URI): string[] {
-    return files
-      .map((file) => workspaceRoot.relative(file.uri)?.toString() || file.uri.parent.toString())
+    const recentlyViewFiles = files
+      .filter((v) => !v.selection)
+      .map((file) => {
+        const relativePath = URI.file(this.appConfig.workspaceDir).relative(file.uri);
+        if (relativePath) {
+          return relativePath.toString();
+        }
+        return file.uri.parent.toString();
+      })
       .filter(Boolean);
-  }
-
-  private serializeAttachedFiles(files: FileContext[], workspaceRoot: URI): AttachFileContext[] {
-    return files
-      .map((file) => this.serializeAttachedFile(file, workspaceRoot))
-      .filter(Boolean) as unknown as AttachFileContext[];
-  }
 
-  private serializeAttachedFile(file: FileContext, workspaceRoot: URI) {
-    try {
-      const ref = this.docModelManager.getModelReference(file.uri);
-      if (!ref) {
-        return null;
-      }
-
-      return {
-        content: ref.instance.getText(),
-        lineErrors: this.getFileErrors(file.uri),
-        path: workspaceRoot.relative(file.uri)!.toString(),
-        language: ref.instance.languageId!,
-      };
-    } catch (e) {
-      return null;
-    }
-  }
-
-  private getFileErrors(uri: URI): string[] {
-    return this.markerService
-      .getManager()
-      .getMarkers({
-        resource: uri.toString(),
-        severities: MarkerSeverity.Error,
+    const attachedFiles = files
+      .filter((v) => v.selection)
+      .map((file) => {
+        const ref = this.docModelManager.getModelReference(file.uri);
+        const content = ref!.instance.getText();
+        const lineErrors = this.markerService
+          .getManager()
+          .getMarkers({
+            resource: file.uri.toString(),
+            severities: MarkerSeverity.Error,
+          })
+          .map((marker) => marker.message);
+
+        return {
+          content,
+          lineErrors,
+          path: URI.file(this.appConfig.workspaceDir).relative(file.uri)!.toString(),
+          language: ref?.instance.languageId!,
+        };
       })
-      .map((marker) => marker.message);
+      .filter(Boolean);
+
+    return {
+      recentlyViewFiles,
+      attachedFiles,
+    };
   }
 }

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

@@ -290,7 +290,7 @@ export class IntelligentCompletionsController extends BaseAIMonacoEditorControll
           const range = completionModel.items[0].range;
           if (position.lineNumber < range.startLineNumber || position.lineNumber > range.endLineNumber) {
             runWhenIdle(() => {
-              this.discard.get();
+              this.hide();
             });
           }
         }

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

@@ -1,3 +1,5 @@
+import { AI_CODE_EDITS_COMMANDS } from '@opensumi/ide-core-browser/lib/ai-native/command';
+import { CommandService } from '@opensumi/ide-core-common';
 import {
   InlineCompletionContext,
   InlineCompletionTriggerKind,
@@ -27,6 +29,7 @@ import {
 
 import { CodeEditsResultValue, ICodeEdit, ICodeEditsResult } from '../index';
 
+
 import { BaseCodeEditsView } from './base';
 
 /**
@@ -115,6 +118,10 @@ export class DefaultCodeEditsView extends BaseCodeEditsView {
                 return completionModel;
               },
               freeInlineCompletions: () => [],
+              handleRejection: (completions, item) => {
+                const commandService: CommandService = this.injector.get(CommandService);
+                commandService.executeCommand(AI_CODE_EDITS_COMMANDS.DISCARD.id);
+              },
             } as InlineCompletionsProvider<ICodeEditsResult<ICodeEdit>>,
           ],
         } as unknown as LanguageFeatureRegistry<InlineCompletionsProvider>,

package/src/browser/layout/layout.module.less

@@ -14,16 +14,16 @@
       padding: 8px 12px;
       min-width: initial;
       margin: 0;
+
+      ::after {
+        content: '';
+      }
     }
 
     .rce-mbox-text {
       line-height: 18px;
       width: inherit;
       font-size: 12px;
-
-      &::after {
-        display: none;
-      }
     }
 
     .rce-smsg {

package/src/browser/mcp/tools/components/index.module.less

@@ -154,7 +154,6 @@
   background-color: var(--design-chatInput-background);
   padding: 10px;
   border-radius: 4px;
-  margin: 10px 0px;
 
   .command_title {
     display: flex;

package/src/browser/mcp/tools/createNewFileWithText.ts

@@ -27,7 +27,6 @@ export class CreateNewFileWithTextTool implements MCPServerContribution {
   getToolDefinition(): MCPToolDefinition {
     return {
       name: 'create_new_file_with_text',
-      label: 'Create File',
       description:
         'Creates a new file at the specified path within the project directory and populates it with the provided text. ' +
         'Use this tool to generate new files in your project structure. ' +

package/src/browser/mcp/tools/getDiagnosticsByPath.ts

@@ -29,7 +29,6 @@ export class GetDiagnosticsByPathTool implements MCPServerContribution {
   getToolDefinition(): MCPToolDefinition {
     return {
       name: 'get_diagnostics_by_path',
-      label: 'Get Diagnostics',
       description:
         'Retrieves diagnostic information (errors, warnings, etc.) from a specific file in the project. ' +
         'Use this tool to get information about problems in any project file. ' +