@opensumi/ide-ai-native 3.8.3-next-1741771971.0 → 3.8.3-next-1741772268.0

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

@@ -4,9 +4,9 @@
   height: 100%;
   .stop {
     position: absolute;
-    bottom: -15px;
+    bottom: -38px;
     padding-top: 12px;
-    left: -9px;
+    left: -8px;
     width: 105%;
   }
 
@@ -519,7 +519,6 @@
     display: flex;
     font-size: 11px;
     align-items: center;
-    min-width: 150px;
   }
 
   .mcp_desc {
@@ -566,34 +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;
-  cursor: pointer;
-  opacity: 0.8;
-  :global {
-    .kt-icon {
-      font-size: 12px;
-      margin-right: 3px;
-    }
-  }
-  &:hover {
-    opacity: 1;
-    background-color: var(--chat-slashCommandBackground);
-    color: var(--chat-slashCommandForeground);
-  }
-}
-
-.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[];
 }

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

@@ -1,6 +1,5 @@
 import { Autowired, Injectable } from '@opensumi/di';
 import { WorkbenchEditorService } from '@opensumi/ide-editor/lib/common/editor';
-import { IWorkspaceService } from '@opensumi/ide-workspace';
 
 import { SerializedContext } from '../llm-context';
 
@@ -11,7 +10,7 @@ export interface ChatAgentPromptProvider {
    * 提供上下文提示
    * @param context 上下文
    */
-  provideContextPrompt(context: SerializedContext, userMessage: string): Promise<string>;
+  provideContextPrompt(context: SerializedContext, userMessage: string): string;
 }
 
 @Injectable()
@@ -19,131 +18,42 @@ export class DefaultChatAgentPromptProvider implements ChatAgentPromptProvider {
   @Autowired(WorkbenchEditorService)
   protected readonly workbenchEditorService: WorkbenchEditorService;
 
-  @Autowired(IWorkspaceService)
-  protected readonly workspaceService: IWorkspaceService;
-
-  async provideContextPrompt(context: SerializedContext, userMessage: string) {
-    const currentFileInfo = await this.getCurrentFileInfo();
-
-    return this.buildPromptTemplate({
-      recentFiles: this.buildRecentFilesSection(context.recentlyViewFiles),
-      attachedFiles: this.buildAttachedFilesSection(context.attachedFiles),
-      attachedFolders: this.buildAttachedFoldersSection(context.attachedFolders),
-      currentFile: currentFileInfo,
-      userMessage,
-    });
-  }
-
-  private async getCurrentFileInfo() {
+  provideContextPrompt(context: SerializedContext, userMessage: string): string {
     const editor = this.workbenchEditorService.currentEditor;
     const currentModel = editor?.currentDocumentModel;
-
-    if (!currentModel?.uri) {
-      return null;
-    }
-
-    const currentPath =
-      (await this.workspaceService.asRelativePath(currentModel.uri))?.path || currentModel.uri.codeUri.fsPath;
-
-    return {
-      path: currentPath,
-      languageId: currentModel.languageId,
-      content: currentModel.getText(),
-    };
-  }
-
-  private buildPromptTemplate({
-    recentFiles,
-    attachedFiles,
-    attachedFolders,
-    currentFile,
-    userMessage,
-  }: {
-    recentFiles: string;
-    attachedFiles: string;
-    attachedFolders: string;
-    currentFile: { path: string; languageId: string; content: string } | null;
-    userMessage: string;
-  }) {
-    const sections = [
-      '<additional_data>',
-      'Below are some potentially helpful/relevant pieces of information for figuring out to respond',
-      recentFiles,
-      attachedFiles,
-      attachedFolders,
-      this.buildCurrentFileSection(currentFile),
-      '</additional_data>',
-      '<user_query>',
-      userMessage,
-      '</user_query>',
-    ].filter(Boolean);
-
-    return sections.join('\n');
-  }
-
-  private buildRecentFilesSection(files: string[]): string {
-    if (!files.length) {
-      return '';
-    }
-
-    return `<recently_viewed_files>
-${files.map((file, idx) => `    ${idx + 1}: ${file}`).join('\n')}
-</recently_viewed_files>`;
-  }
-
-  private buildAttachedFilesSection(files: { path: string; content: string; lineErrors: string[] }[]): string {
-    if (!files.length) {
-      return '';
-    }
-
-    const fileContents = files
-      .map((file) => {
-        const sections = [
-          this.buildFileContentSection(file),
-          file.lineErrors.length ? this.buildLineErrorsSection(file.lineErrors) : '',
-        ].filter(Boolean);
-
-        return sections.join('\n');
-      })
-      .filter(Boolean)
-      .join('\n');
-
-    return `<attached_files>\n${fileContents}\n</attached_files>`;
-  }
-
-  private buildFileContentSection(file: { path: string; content: string }): string {
-    return `<file_contents>
-\`\`\`${file.path}
-${file.content}
-\`\`\`
-</file_contents>`;
-  }
-
-  private buildLineErrorsSection(errors: string[]): string {
-    if (!errors.length) {
-      return '';
-    }
-
-    return `<linter_errors>\n${errors.join('\n')}\n</linter_errors>`;
-  }
-
-  private buildAttachedFoldersSection(folders: string[]): string {
-    if (!folders.length) {
-      return '';
-    }
-
-    return `<attached_folders>\n${folders.join('\n')}</attached_folders>`;
-  }
-
-  private buildCurrentFileSection(fileInfo: { path: string; languageId: string; content: string } | null): string {
-    if (!fileInfo) {
-      return '';
-    }
-
-    return `<current_opened_file>
-\`\`\`${fileInfo.languageId} ${fileInfo.path}
-${fileInfo.content}
-\`\`\`
-</current_opened_file>`;
+    return `
+<additional_data>
+  Below are some potentially helpful/relevant pieces of information for figuring out to respond
+  <recently_viewed_files>
+${context.recentlyViewFiles.map((file, idx) => `    ${idx + 1}: ${file}`).join('\n')}
+  </recently_viewed_files>
+  <attached_files>
+    ${context.attachedFiles.map(
+      (file) =>
+        `
+    <file_contents>
+    \`\`\`${file.path}
+    ${file.content}
+    \`\`\`
+    </file_contents>
+    <linter_errors>
+    ${file.lineErrors.join('\n')}
+    </linter_errors>
+              `,
+    )}
+  </attached_files>
+${
+  currentModel
+    ? `<current_opened_file>
+  \`\`\`${currentModel.languageId} ${currentModel.uri.toString()}
+${currentModel.getText()}
+  \`\`\`
+  </current_opened_file>`
+    : ''
+}
+</additional_data>
+<user_query>
+${userMessage}
+</user_query>`;
   }
 }

package/src/node/mcp-server.sse.ts

@@ -1,6 +1,5 @@
 // have to import with extension since the exports map is ./* -> ./dist/cjs/*
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
 import { EventSource } from 'eventsource';
 
 import { ILogger } from '@opensumi/ide-core-common';
@@ -34,6 +33,8 @@ export class SSEMCPServer implements IMCPServer {
     }
     this.logger?.log(`Starting server "${this.name}" with serverHost: ${this.serverHost}`);
 
+    const SSEClientTransport = (await import('@modelcontextprotocol/sdk/client/sse.js')).SSEClientTransport;
+
     const transport = new SSEClientTransport(new URL(this.serverHost));
     transport.onerror = (error) => {
       this.logger?.error('Transport Error:', error);

package/lib/browser/components/ChatMentionInput.d.ts

@@ -1,25 +0,0 @@
-import React from 'react';
-export interface IChatMentionInputProps {
-    onSend: (value: string, agentId?: string, command?: string, option?: {
-        model: string;
-        [key: string]: any;
-    }) => void;
-    onValueChange?: (value: string) => void;
-    onExpand?: (value: boolean) => void;
-    placeholder?: string;
-    enableOptions?: boolean;
-    disabled?: boolean;
-    sendBtnClassName?: string;
-    defaultHeight?: number;
-    value?: string;
-    autoFocus?: boolean;
-    theme?: string | null;
-    setTheme: (theme: string | null) => void;
-    agentId: string;
-    setAgentId: (id: string) => void;
-    defaultAgentId?: string;
-    command: string;
-    setCommand: (command: string) => void;
-}
-export declare const ChatMentionInput: React.ForwardRefExoticComponent<IChatMentionInputProps & React.RefAttributes<unknown>>;
-//# sourceMappingURL=ChatMentionInput.d.ts.map

package/lib/browser/components/ChatMentionInput.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ChatMentionInput.d.ts","sourceRoot":"","sources":["../../../src/browser/components/ChatMentionInput.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoD,MAAM,OAAO,CAAC;AAkBzE,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,KAAK,IAAI,CAAC;IACpH,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IACpC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;IACjC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACvC;AAGD,eAAO,MAAM,gBAAgB,wFAqO3B,CAAC"}