@opensumi/ide-ai-native 3.8.1-next-1740726474.0 → 3.8.1-next-1740735952.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 { 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,65 +27,40 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
 
   private isAutoCollecting = false;
 
-  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 contextFiles: FileContext[] = [];
 
-  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,
-    };
+    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 {
@@ -103,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);
       }),
     );
 
@@ -112,8 +88,6 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
         if (event.payload.scheme !== 'file') {
           return;
         }
-
-        this.removeFileFromContext(event.payload, false);
       }),
     );
 
@@ -135,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,
             );
           }
         }
@@ -154,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/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 {