@opensumi/ide-ai-native 3.8.1-next-1741250387.0 → 3.8.1-next-1741251026.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,68 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
 
   private isAutoCollecting = false;
 
-  private contextFiles: FileContext[] = [];
+  private contextVersion = 0;
 
-  private maxFiles: number = 10; // 上下文的最大长度限制
-
-  private onDidContextFilesChangeEmitter = new Emitter<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;
 
-  addFileToContext(uri: URI, selection?: [number, number], isManual = true): void {
-    this.removeFileFromContext(uri);
+  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);
+    }
+
+    list.push(file);
+    if (list.length > maxLimit) {
+      list.shift();
+    }
+  }
+
+  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,
+      version: this.contextVersion++,
+    };
   }
 
-  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 +106,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 +115,8 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
         if (event.payload.scheme !== 'file') {
           return;
         }
+
+        this.removeFileFromContext(event.payload, false);
       }),
     );
 
@@ -109,11 +138,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 +157,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/contrib/inline-completions/inline-completions.controller.ts

@@ -170,7 +170,7 @@ export class InlineCompletionsController extends BaseAIMonacoEditorController {
     }
 
     // 如果上一次补全结果还在，则不重复请求
-    const isVisible = this.aiNativeContextKey.multiLineEditsIsVisible.get();
+    const isVisible = this.aiNativeContextKey.codeEditsIsVisible.get();
     if (isVisible) {
       return;
     }

package/src/browser/contrib/inline-completions/prompt/matcher.ts

@@ -244,8 +244,8 @@ export abstract class WindowedMatcher {
         tokens.slice(startLine, endLine).forEach((token) => token.forEach((word) => size.add(word)));
         cache.push(size);
       }
-      const target = cache[index];
-      const score = this.similarityScore(target, this.referenceTokens);
+      const traget = cache[index];
+      const score = this.similarityScore(traget, this.referenceTokens);
       snippets.push({
         score,
         startLine,

package/src/browser/contrib/inline-completions/prompt/similarSnippets.ts

@@ -15,9 +15,9 @@ import {
 import { MAX_NEIGHBOR_AGGREGATE_LENGTH } from './const';
 import { FixedWindowSizeJaccardMatcher } from './jaccardMatcher';
 
-export const getOpenedTabFileList = (documents: IEditorDocumentModel[]) => {
+export const getOpenedTabFileList = (docuemnts: IEditorDocumentModel[]) => {
   // 过滤超大文档
-  const recentFiles = documents.filter((document) => isDocumentValid(document));
+  const recentFiles = docuemnts.filter((document) => isDocumentValid(document));
   return recentFiles;
 };
 

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

@@ -69,7 +69,11 @@ export class CodeEditsResultValue<T extends ICodeEdit = ICodeEdit> extends Dispo
     }));
   }
 
-  public get range(): IRange {
+  public get firstRange(): IRange {
     return this.raw.items[0].range;
   }
+
+  public get firstText(): string {
+    return this.raw.items[0].insertText;
+  }
 }

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

@@ -8,7 +8,7 @@ import {
   KeybindingScope,
 } from '@opensumi/ide-core-browser';
 import { AI_CODE_EDITS_COMMANDS } from '@opensumi/ide-core-browser/lib/ai-native/command';
-import { MultiLineEditsIsVisible } from '@opensumi/ide-core-browser/lib/contextkey/ai-native';
+import { CodeEditsIsVisible } from '@opensumi/ide-core-browser/lib/contextkey/ai-native';
 import { CommandContribution, CommandRegistry, Domain } from '@opensumi/ide-core-common';
 import { WorkbenchEditorService } from '@opensumi/ide-editor';
 import { WorkbenchEditorServiceImpl } from '@opensumi/ide-editor/lib/browser/workbench-editor.service';
@@ -61,7 +61,7 @@ export class IntelligentCompletionsContribution implements KeybindingContributio
     keybindings.registerKeybinding({
       command: AI_CODE_EDITS_COMMANDS.DISCARD.id,
       keybinding: Key.ESCAPE.code,
-      when: MultiLineEditsIsVisible.raw,
+      when: CodeEditsIsVisible.raw,
       priority: 100,
     });
 
@@ -69,7 +69,7 @@ export class IntelligentCompletionsContribution implements KeybindingContributio
       {
         command: AI_CODE_EDITS_COMMANDS.ACCEPT.id,
         keybinding: Key.TAB.code,
-        when: MultiLineEditsIsVisible.raw,
+        when: CodeEditsIsVisible.raw,
       },
       KeybindingScope.USER,
     );

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

@@ -5,7 +5,7 @@ import {
   KeybindingScope,
   PreferenceService,
 } from '@opensumi/ide-core-browser';
-import { MultiLineEditsIsVisible } from '@opensumi/ide-core-browser/lib/contextkey/ai-native';
+import { CodeEditsIsVisible } from '@opensumi/ide-core-browser/lib/contextkey/ai-native';
 import {
   AINativeSettingSectionsId,
   CodeEditsRT,
@@ -98,13 +98,13 @@ export class IntelligentCompletionsController extends BaseAIMonacoEditorControll
       this.monacoEditor,
     ]);
 
-    const multiLineEditsIsVisibleKey = new Set([MultiLineEditsIsVisible.raw]);
+    const multiLineEditsIsVisibleKey = new Set([CodeEditsIsVisible.raw]);
     this.multiLineEditsIsVisibleObs = observableFromEvent(
       this,
       Event.filter(this.aiNativeContextKey.contextKeyService!.onDidChangeContext, (e: ContextKeyChangeEvent) =>
         e.payload.affectsSome(multiLineEditsIsVisibleKey),
       ),
-      () => !!this.aiNativeContextKey.multiLineEditsIsVisible.get(),
+      () => !!this.aiNativeContextKey.codeEditsIsVisible.get(),
     );
 
     this.registerFeature(this.monacoEditor);
@@ -205,7 +205,7 @@ export class IntelligentCompletionsController extends BaseAIMonacoEditorControll
 
   public hide() {
     this.cancelToken();
-    this.aiNativeContextKey.multiLineEditsIsVisible.reset();
+    this.aiNativeContextKey.codeEditsIsVisible.reset();
     this.codeEditsPreviewer.hide();
   }
 
@@ -273,6 +273,7 @@ export class IntelligentCompletionsController extends BaseAIMonacoEditorControll
   public trigger(tx: ITransaction): void {
     const triggerSource = this.codeEditsSourceCollection.getSource(TriggerCodeEditsSource) as TriggerCodeEditsSource;
     if (triggerSource) {
+      this.hide();
       triggerSource.triggerSignal.trigger(tx);
     }
   }
@@ -289,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();
             });
           }
         }
@@ -314,7 +315,7 @@ export class IntelligentCompletionsController extends BaseAIMonacoEditorControll
           handleChange: (context) => {
             if (context.didChange(this.codeEditsSourceCollection.codeEditsContextBean)) {
               // 如果上一次补全结果还在，则不重复请求
-              const isVisible = this.aiNativeContextKey.multiLineEditsIsVisible.get();
+              const isVisible = this.aiNativeContextKey.codeEditsIsVisible.get();
               return !isVisible;
             }
             return false;

package/src/browser/contrib/intelligent-completions/view/code-edits-previewer.ts

@@ -51,19 +51,21 @@ export class CodeEditsPreviewer extends Disposable {
 
   public render(completionModel: CodeEditsResultValue) {
     this.view?.render(completionModel);
-    this.aiNativeContextKey.multiLineEditsIsVisible.set(true);
+    this.aiNativeContextKey.codeEditsIsVisible.set(true);
   }
 
   public hide() {
     this.view?.hide();
-    this.aiNativeContextKey.multiLineEditsIsVisible.set(false);
+    this.aiNativeContextKey.codeEditsIsVisible.set(false);
   }
 
   public accept() {
     this.view?.accept();
+    this.aiNativeContextKey.codeEditsIsVisible.set(false);
   }
 
   public discard() {
     this.view?.discard();
+    this.aiNativeContextKey.codeEditsIsVisible.set(false);
   }
 }

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';
 
 /**
@@ -80,17 +83,23 @@ export class DefaultCodeEditsView extends BaseCodeEditsView {
       return;
     }
 
-    asyncTransaction(async (tx) => {
-      const position = this.editorObs.positions.get()?.[0];
-      if (!position) {
-        return;
-      }
+    const position = this.editorObs.positions.get()?.[0];
+    if (!position) {
+      return;
+    }
+
+    const model = this.editorObs.model.get();
+    if (!model) {
+      return;
+    }
 
-      const model = this.editorObs.model.get();
-      if (!model) {
-        return;
-      }
+    const originalContent = model.getValueInRange(completionModel.firstRange);
+    // edits 的内容与原内容一样就不展示
+    if (originalContent === completionModel.firstText) {
+      return;
+    }
 
+    asyncTransaction(async (tx) => {
       const versionId = this.editorObs.versionId.get();
       const context: InlineCompletionContext = {
         triggerKind: InlineCompletionTriggerKind.Automatic,
@@ -103,16 +112,20 @@ export class DefaultCodeEditsView extends BaseCodeEditsView {
       const inlineEdits: InlineCompletionProviderResult = await provideInlineCompletions(
         {
           all: () => [
-              {
-                provideInlineCompletions: () => {},
-                provideInlineEditsForRange(model, range, context, token) {
-                  return completionModel;
-                },
-                freeInlineCompletions: () => [],
-              } as InlineCompletionsProvider<ICodeEditsResult<ICodeEdit>>,
-            ],
+            {
+              provideInlineCompletions: () => {},
+              provideInlineEditsForRange(model, range, context, token) {
+                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>,
-        Range.lift(completionModel.range),
+        Range.lift(completionModel.firstRange),
         model,
         context,
       );
@@ -122,9 +135,11 @@ export class DefaultCodeEditsView extends BaseCodeEditsView {
         request,
         model,
         this.editorObs.versionId,
-        constObservable(1000),
+        constObservable(4000),
       );
+
       source.inlineCompletions.set(completions, tx);
+      source.loading.set(false, tx);
     });
   }
 

package/src/browser/index.ts

@@ -55,6 +55,8 @@ import { RenameCandidatesProviderRegistry } from './contrib/rename/rename.featur
 import { TerminalAIContribution } from './contrib/terminal/terminal-ai.contributon';
 import { TerminalFeatureRegistry } from './contrib/terminal/terminal.feature.registry';
 import { LanguageParserService } from './languages/service';
+import { MCPConfigCommandContribution } from './mcp/config/mcp-config.commands';
+import { MCPConfigContribution } from './mcp/config/mcp-config.contribution';
 import { MCPServerProxyService } from './mcp/mcp-server-proxy.service';
 import { MCPServerRegistry } from './mcp/mcp-server.feature.registry';
 import { CreateNewFileWithTextTool } from './mcp/tools/createNewFileWithText';
@@ -91,6 +93,8 @@ export class AINativeModule extends BrowserModule {
     AICodeActionContribution,
     AINativePreferencesContribution,
     IntelligentCompletionsContribution,
+    MCPConfigContribution,
+    MCPConfigCommandContribution,
 
     // MCP Server Contributions START
     ListDirTool,

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 {