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

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 { FileContext, LLMContextService, SerializedContext } from '../../common/llm-context';
+import { AttachFileContext, FileContext, LLMContextService, SerializedContext } from '../../common/llm-context';
 
 @Injectable()
 export class LLMContextServiceImpl extends WithEventBus implements LLMContextService {
@@ -27,40 +27,65 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
 
   private isAutoCollecting = false;
 
-  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[] }>();
+  onDidContextFilesChangeEvent = this.onDidContextFilesChangeEmitter.event;
 
-  private maxFiles: number = 10; // 上下文的最大长度限制
+  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 onDidContextFilesChangeEmitter = new Emitter<FileContext[]>();
-  onDidContextFilesChangeEvent = this.onDidContextFilesChangeEmitter.event;
+    list.push(file);
+    if (list.length > maxLimit) {
+      list.shift();
+    }
+  }
 
-  addFileToContext(uri: URI, selection?: [number, number], isManual = true): void {
-    this.removeFileFromContext(uri);
+  addFileToContext(uri: URI, selection?: [number, number], isManual = false): void {
+    if (!uri) {
+      return;
+    }
 
-    this.contextFiles.push({ uri, selection, isManual });
+    const file = { uri, selection };
+    const targetList = isManual ? this.attachedFiles : this.recentlyViewFiles;
+    const maxLimit = isManual ? this.maxAttachFilesLimit : this.maxViewFilesLimit;
 
-    if (this.contextFiles.length > this.maxFiles) {
-      this.contextFiles.shift();
+    if (isManual) {
+      this.docModelManager.createModelReference(uri);
     }
 
+    this.addFileToList(file, targetList, maxLimit);
+    this.notifyContextChange();
+  }
+
+  private notifyContextChange(): void {
     this.onDidContextFilesChangeEmitter.fire(this.getAllContextFiles());
   }
 
   cleanFileContext() {
-    this.contextFiles = [];
-    this.onDidContextFilesChangeEmitter.fire(this.getAllContextFiles());
+    this.attachedFiles.length = 0;
+    this.notifyContextChange();
   }
 
   private getAllContextFiles() {
-    return [...this.contextFiles];
+    return {
+      viewed: this.recentlyViewFiles,
+      attached: this.attachedFiles,
+    };
   }
 
-  removeFileFromContext(uri: URI): void {
-    const index = this.contextFiles.findIndex((file) => file.uri.toString() === uri.toString());
+  removeFileFromContext(uri: URI, isManual = false): void {
+    const targetList = isManual ? this.attachedFiles : this.recentlyViewFiles;
+    const index = targetList.findIndex((file) => file.uri.toString() === uri.toString());
     if (index > -1) {
-      this.contextFiles.splice(index, 1);
-      this.onDidContextFilesChangeEmitter.fire(this.getAllContextFiles());
+      targetList.splice(index, 1);
     }
+    this.notifyContextChange();
   }
 
   startAutoCollection(): void {
@@ -78,8 +103,7 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
         if (event.payload.uri.scheme !== 'file') {
           return;
         }
-        // FIXME: 暂时不自动添加
-        // this.addFileToContext(event.payload.uri);
+        this.addFileToContext(event.payload.uri, undefined, false);
       }),
     );
 
@@ -88,6 +112,8 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
         if (event.payload.scheme !== 'file') {
           return;
         }
+
+        this.removeFileFromContext(event.payload, false);
       }),
     );
 
@@ -109,11 +135,12 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
           ].sort() as [number, number];
 
           if (selection[0] === selection[1]) {
-            this.addFileToContext(event.payload.editorUri, undefined);
+            this.addFileToContext(event.payload.editorUri, undefined, false);
           } else {
             this.addFileToContext(
               event.payload.editorUri,
               selection.sort((a, b) => a - b),
+              false,
             );
           }
         }
@@ -127,42 +154,51 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
 
   serialize(): SerializedContext {
     const files = this.getAllContextFiles();
-    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);
-
-    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!,
-        };
-      })
-      .filter(Boolean);
+    const workspaceRoot = URI.file(this.appConfig.workspaceDir);
 
     return {
-      recentlyViewFiles,
-      attachedFiles,
+      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())
+      .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,
+      })
+      .map((marker) => marker.message);
+  }
 }

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,6 +154,7 @@
   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,6 +27,7 @@ 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,6 +29,7 @@ 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. ' +

package/src/browser/mcp/tools/handlers/RunCommand.ts

@@ -49,6 +49,7 @@ export class RunCommandHandler {
   }
 
   async handler(args: z.infer<typeof inputSchema> & { toolCallId: string }, logger: MCPLogger) {
+    logger.appendLine(`Executing command: ${args.command}`);
     if (args.require_user_approval) {
       const def = new Deferred<boolean>();
       this.approvalDeferredMap.set(args.toolCallId, def);
@@ -89,6 +90,7 @@ export class RunCommandHandler {
         content: result,
       });
 
+      logger.appendLine(`Command ${args.command} finished with exit code: ${e.code}`);
       terminalClient.term.writeln(
         `\n${color.italic}> Command ${args.command} executed successfully. Terminal will close in ${
           3000 / 1000

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

@@ -32,6 +32,7 @@ export class RunTerminalCommandTool implements MCPServerContribution {
   getToolDefinition(): MCPToolDefinition {
     return {
       name: 'run_terminal_cmd',
+      label: 'Run Command',
       description:
         "PROPOSE a command to run on behalf of the user.\nIf you have this tool, note that you DO have the ability to run commands directly on the USER's system.\n\nAdhere to these rules:\n1. Based on the contents of the conversation, you will be told if you are in the same shell as a previous step or a new shell.\n2. If in a new shell, you should `cd` to the right directory and do necessary setup in addition to running the command.\n3. If in the same shell, the state will persist, no need to do things like `cd` to the same directory.\n4. For ANY commands that would use a pager, you should append ` | cat` to the command (or whatever is appropriate). You MUST do this for: git, less, head, tail, more, etc.\n5. For commands that are long running/expected to run indefinitely until interruption, please run them in the background. To run jobs in the background, set `is_background` to true rather than changing the details of the command.\n6. Dont include any newlines in the command.",
       inputSchema,

package/src/common/llm-context.ts

@@ -15,13 +15,13 @@ export interface LLMContextService {
    */
   cleanFileContext(): void;
 
-  onDidContextFilesChangeEvent: Event<FileContext[]>;
+  onDidContextFilesChangeEvent: Event<{ viewed: FileContext[]; attached: FileContext[] }>;
 
   /**
    * 从 context 中移除文件
    * @param uri URI
    */
-  removeFileFromContext(uri: URI): void;
+  removeFileFromContext(uri: URI, isManual?: boolean): void;
 
   /** 导出为可序列化格式 */
   serialize(): SerializedContext;
@@ -30,12 +30,18 @@ export interface LLMContextService {
 export interface FileContext {
   uri: URI;
   selection?: [number, number];
-  isManual: boolean;
 }
 
 export const LLMContextServiceToken = Symbol('LLMContextService');
 
+export interface AttachFileContext {
+  content: string;
+  lineErrors: string[];
+  path: string;
+  language: string;
+}
+
 export interface SerializedContext {
   recentlyViewFiles: string[];
-  attachedFiles: Array<{ content: string; lineErrors: string[]; path: string; language: string }>;
+  attachedFiles: Array<AttachFileContext>;
 }

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

@@ -1,5 +1,5 @@
-import { Injectable } from '@opensumi/di';
-import { MaybePromise } from '@opensumi/ide-core-common/lib/utils';
+import { Autowired, Injectable } from '@opensumi/di';
+import { WorkbenchEditorService } from '@opensumi/ide-editor/lib/browser/types';
 
 import { SerializedContext } from '../llm-context';
 
@@ -10,37 +10,47 @@ export interface ChatAgentPromptProvider {
    * 提供上下文提示
    * @param context 上下文
    */
-  provideContextPrompt(context: SerializedContext, userMessage: string): MaybePromise<string>;
+  provideContextPrompt(context: SerializedContext, userMessage: string): string;
 }
 
 @Injectable()
 export class DefaultChatAgentPromptProvider implements ChatAgentPromptProvider {
-  provideContextPrompt(context: SerializedContext, userMessage: string): MaybePromise<string> {
+  @Autowired(WorkbenchEditorService)
+  protected readonly workbenchEditorService: WorkbenchEditorService;
+
+  provideContextPrompt(context: SerializedContext, userMessage: string): string {
+    const editor = this.workbenchEditorService.currentEditor;
+    const currentModel = editor?.currentDocumentModel;
+    currentModel
     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}`)}
-          </recently_viewed_files>
-          <attached_files>
-          ${context.attachedFiles.map(
-            (file) =>
-              `
-          <file_contents>
-          \`\`\`${file.language} ${file.path}
-          ${file.content}
-          \`\`\`
-          </file_contents>
-          <linter_errors>
-          ${file.lineErrors.join('\n')}
-          </linter_errors>
-          `,
-          )}
-          
-          </attached_files>
-          </additional_data>
-          <user_query>
-          ${userMessage}
-          </user_query>`;
+<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.language} ${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>`;
   }
 }