@opensumi/ide-ai-native 3.8.3-next-1741763229.0 → 3.8.3-next-1741763277.0

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

@@ -1,14 +1,7 @@
 import * as React from 'react';
 import { MessageList } from 'react-chat-elements';
 
-import {
-  AINativeConfigService,
-  AppConfig,
-  LabelService,
-  getIcon,
-  useInjectable,
-  useUpdateOnEvent,
-} from '@opensumi/ide-core-browser';
+import { AppConfig, getIcon, useInjectable, useUpdateOnEvent } from '@opensumi/ide-core-browser';
 import { Popover, PopoverPosition } from '@opensumi/ide-core-browser/lib/components';
 import { EnhanceIcon } from '@opensumi/ide-core-browser/lib/components/ai-native';
 import {
@@ -38,14 +31,13 @@ import { IMessageService } from '@opensumi/ide-overlay';
 
 import 'react-chat-elements/dist/main.css';
 import { AI_CHAT_VIEW_ID, IChatAgentService, IChatInternalService, IChatMessageStructure } from '../../common';
-import { LLMContextService, LLMContextServiceToken } from '../../common/llm-context';
 import { CodeBlockData } from '../../common/types';
 import { FileChange, FileListDisplay } from '../components/ChangeList';
+import { ChatContext } from '../components/ChatContext';
 import { CodeBlockWrapperInput } from '../components/ChatEditor';
 import ChatHistory, { IChatHistoryItem } from '../components/ChatHistory';
 import { ChatInput } from '../components/ChatInput';
 import { ChatMarkdown } from '../components/ChatMarkdown';
-import { ChatMentionInput } from '../components/ChatMentionInput';
 import { ChatNotify, ChatReply } from '../components/ChatReply';
 import { SlashCustomRender } from '../components/SlashCustomRender';
 import { MessageData, createMessageByAI, createMessageByUser } from '../components/utils';
@@ -113,8 +105,6 @@ export const AIChatView = () => {
   const chatFeatureRegistry = useInjectable<ChatFeatureRegistry>(ChatFeatureRegistryToken);
   const chatRenderRegistry = useInjectable<ChatRenderRegistry>(ChatRenderRegistryToken);
   const mcpServerRegistry = useInjectable<IMCPServerRegistry>(TokenMCPServerRegistry);
-  const aiNativeConfigService = useInjectable<AINativeConfigService>(AINativeConfigService);
-  const llmContextService = useInjectable<LLMContextService>(LLMContextServiceToken);
 
   const layoutService = useInjectable<IMainLayoutService>(IMainLayoutService);
   const msgHistoryManager = aiChatService.sessionModel.history;
@@ -124,7 +114,6 @@ export const AIChatView = () => {
   const editorService = useInjectable<WorkbenchEditorService>(WorkbenchEditorService);
   const appConfig = useInjectable<AppConfig>(AppConfig);
   const applyService = useInjectable<BaseApplyService>(BaseApplyService);
-  const labelService = useInjectable<LabelService>(LabelService);
   const [shortcutCommands, setShortcutCommands] = React.useState<ChatSlashCommandItemModel[]>([]);
 
   const [changeList, setChangeList] = React.useState<FileChange[]>(getFileChanges(applyService.getSessionCodeBlocks()));
@@ -195,9 +184,6 @@ export const AIChatView = () => {
     if (chatRenderRegistry.chatInputRender) {
       return chatRenderRegistry.chatInputRender;
     }
-    if (aiNativeConfigService.capabilities.supportsMCP) {
-      return ChatMentionInput;
-    }
     return ChatInput;
   }, [chatRenderRegistry.chatInputRender]);
 
@@ -276,7 +262,7 @@ export const AIChatView = () => {
           if (loading) {
             return;
           }
-          await handleSend(message.message, message.agentId, message.command);
+          await handleSend(message);
         } else {
           if (message.agentId) {
             setAgentId(message.agentId);
@@ -363,7 +349,6 @@ export const AIChatView = () => {
                       text={message}
                       agentId={visibleAgentId}
                       command={command}
-                      labelService={labelService}
                     />
                   ),
                 },
@@ -469,13 +454,7 @@ export const AIChatView = () => {
           text: ChatUserRoleRender ? (
             <ChatUserRoleRender content={message} agentId={visibleAgentId} command={command} />
           ) : (
-            <CodeBlockWrapperInput
-              labelService={labelService}
-              relationId={relationId}
-              text={message}
-              agentId={visibleAgentId}
-              command={command}
-            />
+            <CodeBlockWrapperInput relationId={relationId} text={message} agentId={visibleAgentId} command={command} />
           ),
         },
         styles.chat_message_code,
@@ -659,44 +638,11 @@ export const AIChatView = () => {
   );
 
   const handleSend = React.useCallback(
-    async (message: string, agentId?: string, command?: string) => {
-      const reportExtra = {
-        actionSource: ActionSourceEnum.Chat,
-        actionType: ActionTypeEnum.Send,
-      };
-      agentId = agentId ? agentId : ChatProxyService.AGENT_ID;
-      // 提取并替换 {{@file:xxx}} 中的文件内容
-      let processedContent = message;
-      const filePattern = /\{\{@file:(.*?)\}\}/g;
-      const fileMatches = message.match(filePattern);
-      let isCleanContext = false;
-      if (fileMatches) {
-        for (const match of fileMatches) {
-          const filePath = match.replace(/\{\{@file:(.*?)\}\}/, '$1');
-          if (filePath && !isCleanContext) {
-            isCleanContext = true;
-            llmContextService.cleanFileContext();
-          }
-          const fileUri = new URI(filePath);
-          llmContextService.addFileToContext(fileUri, undefined, true);
-          // 获取文件内容
-          // 替换占位符，后续支持自定义渲染时可替换为自定义渲染标签
-          processedContent = processedContent.replace(match, `\`<attached_file>${fileUri.displayName}\``);
-        }
-      }
+    async (value: IChatMessageStructure) => {
+      const { message, command, reportExtra } = value;
 
-      const folderPattern = /\{\{@folder:(.*?)\}\}/g;
-      const folderMatches = processedContent.match(folderPattern);
-      if (folderMatches) {
-        for (const match of folderMatches) {
-          const folderPath = match.replace(/\{\{@folder:(.*?)\}\}/, '$1');
-          const folderUri = new URI(folderPath);
-          llmContextService.addFolderToContext(folderUri);
-          // 替换占位符，后续支持自定义渲染时可替换为自定义渲染标签
-          processedContent = processedContent.replace(match, `\`<attached_folder>${folderUri.displayName}\``);
-        }
-      }
-      return handleAgentReply({ message: processedContent, agentId, command, reportExtra });
+      const agentId = value.agentId ? value.agentId : ChatProxyService.AGENT_ID;
+      return handleAgentReply({ message, agentId, command, reportExtra });
     },
     [handleAgentReply],
   );
@@ -813,6 +759,7 @@ export const AIChatView = () => {
             </div>
           ) : null}
           <div className={styles.chat_input_wrap}>
+            <ChatContext />
             <div className={styles.header_operate}>
               <div className={styles.header_operate_left}>
                 {shortcutCommands.map((command) => (
@@ -843,7 +790,17 @@ export const AIChatView = () => {
               />
             )}
             <ChatInputWrapperRender
-              onSend={handleSend}
+              onSend={(value, agentId, command) =>
+                handleSend({
+                  message: value,
+                  agentId,
+                  command,
+                  reportExtra: {
+                    actionSource: ActionSourceEnum.Chat,
+                    actionType: ActionTypeEnum.Send,
+                  },
+                })
+              }
               disabled={loading}
               enableOptions={true}
               theme={theme}

package/src/browser/components/{chat-context → ChatContext}/index.tsx

@@ -15,7 +15,7 @@ import { WorkbenchEditorService } from '@opensumi/ide-editor/lib/browser/types';
 
 import { FileContext, LLMContextService, LLMContextServiceToken } from '../../../common/llm-context';
 
-import { ContextSelector } from './context-selector';
+import { ContextSelector } from './ContextSelector';
 import styles from './style.module.less';
 
 const getCollapsedHeight = () => ({ height: 0, opacity: 0 });

package/src/browser/components/ChatEditor.tsx

@@ -2,15 +2,14 @@ import capitalize from 'lodash/capitalize';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import Highlight from 'react-highlight';
 
-import { IClipboardService, LabelService, getIcon, useInjectable, uuid } from '@opensumi/ide-core-browser';
-import { Icon, Popover } from '@opensumi/ide-core-browser/lib/components';
+import { IClipboardService, getIcon, useInjectable, uuid } from '@opensumi/ide-core-browser';
+import { Popover } from '@opensumi/ide-core-browser/lib/components';
 import { EnhanceIcon } from '@opensumi/ide-core-browser/lib/components/ai-native';
 import {
   ActionSourceEnum,
   ActionTypeEnum,
   ChatFeatureRegistryToken,
   IAIReporter,
-  URI,
   localize,
   runWhenIdle,
 } from '@opensumi/ide-core-common';
@@ -140,26 +139,16 @@ const CodeBlock = ({
   renderText,
   agentId = '',
   command = '',
-  labelService,
 }: {
   content?: string;
   relationId: string;
   renderText?: (t: string) => React.ReactNode;
   agentId?: string;
   command?: string;
-  labelService?: LabelService;
 }) => {
   const rgInlineCode = /`([^`]+)`/g;
   const rgBlockCode = /```([^]+?)```/g;
   const rgBlockCodeBefore = /```([^]+)?/g;
-  const rgAttachedFile = /<attached_file>(.*)/g;
-  const rgAttachedFolder = /<attached_folder>(.*)/g;
-  const renderAttachment = (text: string, isFolder = false, key: string) => (
-    <span className={styles.attachment} key={key}>
-      <Icon iconClass={isFolder ? getIcon('folder') : labelService?.getIcon(new URI(text || 'file'))} />
-      <span className={styles.attachment_text}>{text}</span>
-    </span>
-  );
 
   const renderCodeEditor = (content: string) => {
     const language = content.split('\n')[0].trim().toLowerCase();
@@ -204,47 +193,11 @@ const CodeBlock = ({
               renderedContent.push(text);
             }
           } else {
-            // 处理文件和文件夹标记
-            const processedText = text;
-            const fileMatches = [...text.matchAll(rgAttachedFile)];
-            const folderMatches = [...text.matchAll(rgAttachedFolder)];
-            if (fileMatches.length || folderMatches.length) {
-              let lastIndex = 0;
-              const fragments: (string | React.ReactNode)[] = [];
-
-              // 处理文件标记
-              fileMatches.forEach((match, matchIndex) => {
-                if (match.index !== undefined) {
-                  const spanText = processedText.slice(lastIndex, match.index);
-                  if (spanText) {
-                    fragments.push(<span key={`${index}-${matchIndex}`}>{spanText}</span>);
-                  }
-                  fragments.push(renderAttachment(match[1], false, `${index}-tag-${matchIndex}`));
-                  lastIndex = match.index + match[0].length;
-                }
-              });
-
-              // 处理文件夹标记
-              folderMatches.forEach((match, matchIndex) => {
-                if (match.index !== undefined) {
-                  const spanText = processedText.slice(lastIndex, match.index);
-                  if (spanText) {
-                    fragments.push(<span key={`${index}-${matchIndex}`}>{spanText}</span>);
-                  }
-                  fragments.push(renderAttachment(match[1], true, `${index}-tag-${matchIndex}`));
-                  lastIndex = match.index + match[0].length;
-                }
-              });
-
-              fragments.push(processedText.slice(lastIndex));
-              renderedContent.push(...fragments);
-            } else {
-              renderedContent.push(
-                <span className={styles.code_inline} key={index}>
-                  {text}
-                </span>,
-              );
-            }
+            renderedContent.push(
+              <span className={styles.code_inline} key={index}>
+                {text}
+              </span>,
+            );
           }
         });
       } else {
@@ -263,23 +216,15 @@ export const CodeBlockWrapper = ({
   renderText,
   relationId,
   agentId,
-  labelService,
 }: {
   text?: string;
   relationId: string;
   renderText?: (t: string) => React.ReactNode;
   agentId?: string;
-  labelService?: LabelService;
 }) => (
   <div className={styles.ai_chat_code_wrapper}>
     <div className={styles.render_text}>
-      <CodeBlock
-        content={text}
-        labelService={labelService}
-        renderText={renderText}
-        relationId={relationId}
-        agentId={agentId}
-      />
+      <CodeBlock content={text} renderText={renderText} relationId={relationId} agentId={agentId} />
     </div>
   </div>
 );
@@ -289,13 +234,11 @@ export const CodeBlockWrapperInput = ({
   relationId,
   agentId,
   command,
-  labelService,
 }: {
   text: string;
   relationId: string;
   agentId?: string;
   command?: string;
-  labelService?: LabelService;
 }) => {
   const chatFeatureRegistry = useInjectable<ChatFeatureRegistry>(ChatFeatureRegistryToken);
   const [tag, setTag] = useState<string>('');
@@ -328,13 +271,7 @@ export const CodeBlockWrapperInput = ({
           </div>
         )}
         {command && <div className={styles.tag}>/ {command}</div>}
-        <CodeBlock
-          content={txt}
-          labelService={labelService}
-          relationId={relationId}
-          agentId={agentId}
-          command={command}
-        />
+        <CodeBlock content={txt} relationId={relationId} agentId={agentId} command={command} />
       </div>
     </div>
   );

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

@@ -519,7 +519,6 @@
     display: flex;
     font-size: 11px;
     align-items: center;
-    min-width: 150px;
   }
 
   .mcp_desc {
@@ -566,21 +565,3 @@
     color: var(--descriptionForeground);
   }
 }
-
-.attachment {
-  display: inline-flex;
-  align-items: center;
-  padding: 0 4px;
-  margin: 0 2px;
-  background: var(--badge-background);
-  color: var(--badge-foreground);
-  border-radius: 3px;
-  vertical-align: middle;
-  font-size: 12px;
-}
-
-.attachment_text {
-  line-height: 20px;
-  vertical-align: middle;
-  font-size: 12px;
-}

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

@@ -10,7 +10,6 @@ import {
   IEditorDocumentModelService,
 } from '@opensumi/ide-editor/lib/browser/doc-model/types';
 import { EditorSelectionChangeEvent } from '@opensumi/ide-editor/lib/browser/types';
-import { FileType, IFileServiceClient } from '@opensumi/ide-file-service';
 import { IMarkerService } from '@opensumi/ide-markers/lib/common/types';
 import { Range } from '@opensumi/ide-monaco';
 
@@ -27,18 +26,13 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
   @Autowired(IMarkerService)
   protected readonly markerService: IMarkerService;
 
-  @Autowired(IFileServiceClient)
-  protected readonly fileService: IFileServiceClient;
-
   private isAutoCollecting = false;
 
   private contextVersion = 0;
 
   private readonly maxAttachFilesLimit = 10;
-  private readonly maxAttachFoldersLimit = 10;
   private readonly maxViewFilesLimit = 20;
-  private attachedFiles: FileContext[] = [];
-  private attachedFolders: FileContext[] = [];
+  private readonly attachedFiles: FileContext[] = [];
   private readonly recentlyViewFiles: FileContext[] = [];
   private readonly onDidContextFilesChangeEmitter = new Emitter<{
     viewed: FileContext[];
@@ -59,18 +53,6 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
     }
   }
 
-  private addFolderToList(folder: FileContext, list: FileContext[], maxLimit: number) {
-    const existingIndex = list.findIndex((f) => f.uri.toString() === folder.uri.toString());
-    if (existingIndex > -1) {
-      list.splice(existingIndex, 1);
-    }
-
-    list.push(folder);
-    if (list.length > maxLimit) {
-      list.shift();
-    }
-  }
-
   addFileToContext(uri: URI, selection?: [number, number], isManual = false): void {
     if (!uri) {
       return;
@@ -88,24 +70,12 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
     this.notifyContextChange();
   }
 
-  addFolderToContext(uri: URI): void {
-    if (!uri) {
-      return;
-    }
-
-    const file = { uri };
-
-    this.addFolderToList(file, this.attachedFolders, this.maxAttachFoldersLimit);
-    this.notifyContextChange();
-  }
-
   private notifyContextChange(): void {
     this.onDidContextFilesChangeEmitter.fire(this.getAllContextFiles());
   }
 
   cleanFileContext() {
-    this.attachedFiles = [];
-    this.attachedFolders = [];
+    this.attachedFiles.length = 0;
     this.notifyContextChange();
   }
 
@@ -113,7 +83,6 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
     return {
       viewed: this.recentlyViewFiles,
       attached: this.attachedFiles,
-      attachedFolders: this.attachedFolders,
       version: this.contextVersion++,
     };
   }
@@ -191,63 +160,16 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
     this.dispose();
   }
 
-  async serialize(): Promise<SerializedContext> {
+  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),
-      attachedFolders: await this.serializeAttachedFolders(files.attachedFolders, workspaceRoot),
     };
   }
 
-  private async serializeAttachedFolders(folders: FileContext[], workspaceRoot: URI): Promise<string[]> {
-    // 去重
-    const folderPath = Array.from(new Set(folders.map((folder) => folder.uri.toString())));
-    return Promise.all(
-      folderPath.map(async (folder) => {
-        const folderUri = new URI(folder);
-        const root = workspaceRoot.relative(folderUri)?.toString() || '/';
-        return `\`\`\`\n${root}\n${(await this.getPartiaFolderStructure(folderUri.codeUri.fsPath))
-          .map((line) => `- ${line}`)
-          .join('\n')}\n\`\`\`\n`;
-      }),
-    );
-  }
-
-  private async getPartiaFolderStructure(folder: string, level = 2): Promise<string[]> {
-    const result: string[] = [];
-    const stat = await this.fileService.getFileStat(folder);
-
-    for (const child of stat?.children || []) {
-      const relativePath = new URI(folder).relative(new URI(child.uri))!.toString();
-
-      if (child.isSymbolicLink) {
-        // 处理软链接
-        const target = await this.fileService.getFileStat(child.realUri || child.uri);
-        if (target) {
-          result.push(`${relativePath} -> ${target} (symbolic link)`);
-        } else {
-          result.push(`${relativePath} (broken symbolic link)`);
-        }
-        continue;
-      }
-
-      if (child.type === FileType.Directory) {
-        result.push(`${relativePath}/`);
-        if (level > 1) {
-          const subDirStructure = await this.getPartiaFolderStructure(child.uri, level - 1);
-          result.push(...subDirStructure.map((subEntry) => `${relativePath}/${subEntry}`));
-        }
-      } else if (child.type === FileType.File) {
-        result.push(relativePath);
-      }
-    }
-
-    return result;
-  }
-
   private serializeRecentlyViewFiles(files: FileContext[], workspaceRoot: URI): string[] {
     return files
       .map((file) => workspaceRoot.relative(file.uri)?.toString() || file.uri.parent.toString())

package/src/common/llm-context.ts

@@ -1,14 +1,8 @@
 import { Event, URI } from '@opensumi/ide-core-common/lib/utils';
 
 export interface LLMContextService {
-  /**
-   * 开始自动收集
-   */
   startAutoCollection(): void;
 
-  /**
-   * 停止自动收集
-   */
   stopAutoCollection(): void;
 
   /**
@@ -16,19 +10,11 @@ export interface LLMContextService {
    */
   addFileToContext(uri: URI, selection?: [number, number], isManual?: boolean): void;
 
-  /**
-   * 添加文件夹到 context 中
-   */
-  addFolderToContext(uri: URI, isManual?: boolean): void;
-
   /**
    * 清除上下文
    */
   cleanFileContext(): void;
 
-  /**
-   * 上下文文件变化事件
-   */
   onDidContextFilesChangeEvent: Event<{ viewed: FileContext[]; attached: FileContext[]; version: number }>;
 
   /**
@@ -38,7 +24,7 @@ export interface LLMContextService {
   removeFileFromContext(uri: URI, isManual?: boolean): void;
 
   /** 导出为可序列化格式 */
-  serialize(): Promise<SerializedContext>;
+  serialize(): SerializedContext;
 }
 
 export interface FileContext {
@@ -58,5 +44,4 @@ export interface AttachFileContext {
 export interface SerializedContext {
   recentlyViewFiles: string[];
   attachedFiles: Array<AttachFileContext>;
-  attachedFolders: string[];
 }