@opensumi/ide-ai-native 3.8.1-next-1740478950.0 → 3.8.1-next-1740571693.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/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/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);
     }
   }
@@ -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

@@ -80,17 +80,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 +109,16 @@ 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: () => [],
+            } as InlineCompletionsProvider<ICodeEditsResult<ICodeEdit>>,
+          ],
         } as unknown as LanguageFeatureRegistry<InlineCompletionsProvider>,
-        Range.lift(completionModel.range),
+        Range.lift(completionModel.firstRange),
         model,
         context,
       );
@@ -122,9 +128,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/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

@@ -135,7 +135,6 @@
   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,7 +27,6 @@ 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,7 +29,6 @@ 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,7 +49,6 @@ 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);
@@ -90,7 +89,6 @@ 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,7 +32,6 @@ 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<{ viewed: FileContext[]; attached: FileContext[] }>;
+  onDidContextFilesChangeEvent: Event<FileContext[]>;
 
   /**
    * 从 context 中移除文件
    * @param uri URI
    */
-  removeFileFromContext(uri: URI, isManual?: boolean): void;
+  removeFileFromContext(uri: URI): void;
 
   /** 导出为可序列化格式 */
   serialize(): SerializedContext;
@@ -30,18 +30,12 @@ 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<AttachFileContext>;
+  attachedFiles: Array<{ content: string; lineErrors: string[]; path: string; language: string }>;
 }

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

@@ -1,4 +1,5 @@
 import { Injectable } from '@opensumi/di';
+import { MaybePromise } from '@opensumi/ide-core-common/lib/utils';
 
 import { SerializedContext } from '../llm-context';
 
@@ -9,36 +10,37 @@ export interface ChatAgentPromptProvider {
    * 提供上下文提示
    * @param context 上下文
    */
-  provideContextPrompt(context: SerializedContext, userMessage: string): string;
+  provideContextPrompt(context: SerializedContext, userMessage: string): MaybePromise<string>;
 }
 
 @Injectable()
 export class DefaultChatAgentPromptProvider implements ChatAgentPromptProvider {
-  provideContextPrompt(context: SerializedContext, userMessage: string): string {
+  provideContextPrompt(context: SerializedContext, userMessage: string): MaybePromise<string> {
     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.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}`)}
+          </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>`;
   }
 }

package/src/node/base-language-model.ts

@@ -41,11 +41,14 @@ export abstract class BaseLanguageModel {
   ): Promise<any> {
     const provider = this.initializeProvider(options);
     const clientId = options.clientId;
-    if (!clientId) {
-      throw new Error('clientId is required');
+
+    let allFunctions: ToolRequest[] = [];
+    // 如果没有传入 clientId，则不使用工具
+    if (clientId) {
+      const registry = this.toolInvocationRegistryManager.getRegistry(clientId);
+      allFunctions = options.noTool ? [] : registry.getAllFunctions();
     }
-    const registry = this.toolInvocationRegistryManager.getRegistry(clientId);
-    const allFunctions = options.noTool ? [] : registry.getAllFunctions();
+
     return this.handleStreamingRequest(
       provider,
       request,