@opensumi/ide-ai-native 3.8.1-next-1741228774.0 → 3.8.1-next-1741250387.0

package/src/browser/widget/inline-stream-diff/inline-stream-diff.handler.tsx

@@ -44,13 +44,10 @@ export enum EComputerMode {
 
 const inlineStreamDiffComputer = new InlineStreamDiffComputer();
 
-/**
- * Abstract base class for inline streaming diff handlers
- */
 @Injectable({ multiple: true })
-export abstract class BaseInlineStreamDiffHandler extends Disposable implements IInlineDiffPreviewerNode {
+export class InlineStreamDiffHandler extends Disposable implements IInlineDiffPreviewerNode {
   @Autowired(INJECTOR_TOKEN)
-  protected readonly injector: Injector;
+  private readonly injector: Injector;
 
   protected readonly _onDidEditChange = this.registerDispose(new Emitter<void>());
   public readonly onDidEditChange: Event<void> = this._onDidEditChange.event;
@@ -60,14 +57,15 @@ export abstract class BaseInlineStreamDiffHandler extends Disposable implements
 
   public previewerOptions: IDiffPreviewerOptions;
 
-  protected savedModel: ITextModel;
-  protected virtualModel: ITextModel;
+  private originalModel: ITextModel;
+  private virtualModel: ITextModel;
 
-  protected rawSavedTextLines: string[];
-  protected rawOriginTextLinesTokens: LineTokens[] | undefined;
-  protected undoRedoGroup: UndoRedoGroup = new UndoRedoGroup();
+  private rawOriginalTextLines: string[];
+  private rawOriginalTextLinesTokens: LineTokens[] = [];
+  private undoRedoGroup: UndoRedoGroup = new UndoRedoGroup();
 
-  protected readonly finallyDiffModel: ISettableObservable<IComputeDiffData | undefined> = observableValue(
+  private readonly diffModel: ISettableObservable<IComputeDiffData | undefined> = observableValue(this, undefined);
+  private readonly finallyDiffModel: ISettableObservable<IComputeDiffData | undefined> = observableValue(
     this,
     undefined,
   );
@@ -75,15 +73,14 @@ export abstract class BaseInlineStreamDiffHandler extends Disposable implements
   public livePreviewDiffDecorationModel: LivePreviewDiffDecorationModel;
 
   public get uri() {
-    return this.savedModel.uri;
+    return this.originalModel.uri;
   }
 
-  constructor(protected readonly monacoEditor: ICodeEditor) {
+  constructor(private readonly monacoEditor: ICodeEditor) {
     super();
 
     const modelService = StandaloneServices.get(IModelService);
-    const savedModel = this.monacoEditor.getModel()!;
-    const setModel = modelService.createModel(
+    this.virtualModel = modelService.createModel(
       '',
       null,
       Uri.from({
@@ -92,8 +89,7 @@ export abstract class BaseInlineStreamDiffHandler extends Disposable implements
       }),
       true,
     );
-    this.savedModel = savedModel;
-    this.virtualModel = setModel;
+    this.originalModel = this.monacoEditor.getModel()!;
 
     this.livePreviewDiffDecorationModel = this.injector.get(LivePreviewDiffDecorationModel, [this.monacoEditor]);
     this.addDispose(this.livePreviewDiffDecorationModel);
@@ -117,21 +113,45 @@ export abstract class BaseInlineStreamDiffHandler extends Disposable implements
     });
   }
 
-  abstract initialize(selection: Selection): void;
+  initialize(selection: Selection): void {
+    const eol = this.originalModel.getEOL();
+    const startPosition = selection.getStartPosition();
+    const endPosition = selection.getEndPosition();
+
+    this.rawOriginalTextLines = this.originalModel
+      .getValueInRange(Range.fromPositions(startPosition, endPosition))
+      .split(eol);
+
+    this.rawOriginalTextLinesTokens = this.rawOriginalTextLines.map((_, index) => {
+      const lineNumber = startPosition.lineNumber + index;
+      this.originalModel.tokenization.forceTokenization(lineNumber);
+      const lineTokens = this.originalModel.tokenization.getLineTokens(lineNumber);
+      return lineTokens;
+    });
+
+    const zone = LineRange.fromRangeInclusive(
+      Range.fromPositions(
+        { lineNumber: selection.startLineNumber, column: 1 },
+        { lineNumber: selection.endLineNumber, column: Number.MAX_SAFE_INTEGER },
+      ),
+    );
+
+    this.livePreviewDiffDecorationModel.initialize(zone);
+  }
 
   getVirtualModelValue() {
     return this.virtualModel.getValue();
   }
 
   getOriginModelValue() {
-    return this.rawSavedTextLines.join('\n');
+    return this.rawOriginalTextLines.join('\n');
   }
 
   get onPartialEditWidgetListChange() {
     return this.livePreviewDiffDecorationModel.onPartialEditWidgetListChange;
   }
 
-  protected computeDiff(
+  private computeDiff(
     originalTextLines: string[],
     newTextLines: string[],
     computerMode: EComputerMode = EComputerMode.default,
@@ -265,12 +285,7 @@ export abstract class BaseInlineStreamDiffHandler extends Disposable implements
           },
           textLines: removedTextLines.map((text, index) => ({
             text,
-            lineTokens:
-              this.rawOriginTextLinesTokens?.[removedLinesOriginalRange.startLineNumber - 1 + index] ||
-              LineTokens.createEmpty(text, {
-                encodeLanguageId: () => 0,
-                decodeLanguageId: () => 'plaintext',
-              }),
+            lineTokens: this.rawOriginalTextLinesTokens[removedLinesOriginalRange.startLineNumber - 1 + index],
           })),
         });
       }
@@ -283,11 +298,6 @@ export abstract class BaseInlineStreamDiffHandler extends Disposable implements
     });
   }
 
-  /**
-   * Get the original model for diff operations
-   */
-  protected abstract getOriginalModel(): ITextModel;
-
   /**
    * 令当前的 inline diff 在流式渲染过程当中使用 pushEditOperations 进行编辑的操作都放在同一组 undo/redo 堆栈里
    * 一旦撤销到最顶层则关闭当前的 inline diff
@@ -300,24 +310,22 @@ export abstract class BaseInlineStreamDiffHandler extends Disposable implements
     });
   }
 
-  protected renderDiffEdits(diffModel: IComputeDiffData): void {
+  private renderDiffEdits(diffModel: IComputeDiffData): void {
     const { activeLine, newFullRangeTextLines, pendingRange } = diffModel;
+    const eol = this.originalModel.getEOL();
     const zone = this.getZone();
 
-    const originalModel = this.getOriginalModel();
-    const eol = originalModel.getEOL();
-
     const validZone =
       zone.startLineNumber < zone.endLineNumberExclusive
         ? new Range(
             zone.startLineNumber,
             1,
             zone.endLineNumberExclusive - 1,
-            originalModel.getLineMaxColumn(zone.endLineNumberExclusive - 1),
+            this.originalModel.getLineMaxColumn(zone.endLineNumberExclusive - 1),
           )
         : new Range(zone.startLineNumber, 1, zone.startLineNumber, 1);
 
-    const newOriginalTextLines = originalModel.getValueInRange(validZone).split(eol);
+    const newOriginalTextLines = this.originalModel.getValueInRange(validZone).split(eol);
     const diffComputation = linesDiffComputers.getDefault().computeDiff(newOriginalTextLines, newFullRangeTextLines, {
       computeMoves: false,
       maxComputationTimeMs: 200,
@@ -362,7 +370,7 @@ export abstract class BaseInlineStreamDiffHandler extends Disposable implements
             validZone.startLineNumber + change.original.startLineNumber - 1,
             1,
             validZone.startLineNumber + change.original.endLineNumberExclusive - 2,
-            originalModel.getLineMaxColumn(validZone.startLineNumber + change.original.endLineNumberExclusive - 2),
+            this.originalModel.getLineMaxColumn(validZone.startLineNumber + change.original.endLineNumberExclusive - 2),
           );
         }
         const edit = {
@@ -373,7 +381,7 @@ export abstract class BaseInlineStreamDiffHandler extends Disposable implements
         realTimeChanges.push(edit);
       }
     }
-    originalModel.pushEditOperations(null, realTimeChanges, () => null, this.undoRedoGroup);
+    this.originalModel.pushEditOperations(null, realTimeChanges, () => null, this.undoRedoGroup);
 
     /**
      * 根据 newFullRangeTextLines 内容长度重新计算 zone，避免超过最大长度，进而影响未选中的代码区域
@@ -413,20 +421,17 @@ export abstract class BaseInlineStreamDiffHandler extends Disposable implements
     this._onDidEditChange.fire();
   }
 
-  public recompute(computerMode: EComputerMode, content?: string): IComputeDiffData {
-    if (content) {
-      this.virtualModel.setValue(content);
+  public recompute(computerMode: EComputerMode, newContent?: string): IComputeDiffData {
+    if (newContent) {
+      this.virtualModel.setValue(newContent);
     }
 
-    const textLines = this.virtualModel.getLinesContent();
-    return this.processDiffComputation(textLines, computerMode);
+    const newTextLines = this.virtualModel.getLinesContent();
+    return this.computeDiff(this.rawOriginalTextLines, newTextLines, computerMode);
   }
 
-  protected currentEditLine = 0;
-  protected isEditing = false;
-
-  protected abstract processDiffComputation(currentText: string[], computerMode?: EComputerMode): IComputeDiffData;
-
+  private currentEditLine = 0;
+  private isEditing = false;
   public async rateRenderEditController(): Promise<void> {
     if (this.isEditing === false) {
       this.isEditing = true;
@@ -438,14 +443,19 @@ export abstract class BaseInlineStreamDiffHandler extends Disposable implements
 
         const virtualTextLines = this.virtualModel.getLinesContent();
         const currentText = virtualTextLines.slice(0, this.currentEditLine);
-        const currentDiffModel = this.processDiffComputation(currentText);
+        const currentDiffModel = this.computeDiff(this.rawOriginalTextLines, currentText);
+        transaction((tx) => {
+          this.diffModel.set(currentDiffModel, tx);
+        });
+
+        this.onDiffFinishedEmitter.fire(currentDiffModel);
 
-        if (this.savedModel.id === this.monacoEditor.getModel()?.id) {
+        if (this.originalModel.id === this.monacoEditor.getModel()?.id) {
           this.renderDiffEdits(currentDiffModel);
         }
 
         this.currentEditLine += 1;
-        // 这个 sleep 会带来潜在的时序问题，如 finallyRender 时模型已经被 dispose
+
         await sleep(FRAME_THREE);
       }
 
@@ -459,7 +469,10 @@ export abstract class BaseInlineStreamDiffHandler extends Disposable implements
   }
 
   public addLinesToDiff(newText: string, computerMode: EComputerMode = EComputerMode.default): void {
-    this.recompute(computerMode, newText);
+    const diffModel = this.recompute(computerMode, newText);
+    transaction((tx) => {
+      this.diffModel.set(diffModel, tx);
+    });
   }
 
   public pushRateFinallyDiffStack(diffModel: IComputeDiffData): void {
@@ -475,17 +488,14 @@ export abstract class BaseInlineStreamDiffHandler extends Disposable implements
   public finallyRender(diffModel: IComputeDiffData): void {
     transaction((tx) => {
       this.finallyDiffModel.set(diffModel, tx);
+      this.diffModel.set(diffModel, tx);
     });
 
-    if (this.savedModel.id !== this.monacoEditor.getModel()?.id) {
+    if (this.originalModel.id !== this.monacoEditor.getModel()?.id) {
       return;
     }
 
     this.onDiffFinishedEmitter.fire(diffModel);
-
-    if (this.livePreviewDiffDecorationModel.disposed) {
-      return;
-    }
     this.renderPartialEditWidgets(diffModel);
     this.renderDiffEdits(diffModel);
     this.pushStackElement();
@@ -527,84 +537,3 @@ export abstract class BaseInlineStreamDiffHandler extends Disposable implements
     return this.livePreviewDiffDecorationModel.getTotalCodeInfo();
   }
 }
-
-/**
- * Regular inline stream diff handler (non-reverse mode)
- */
-@Injectable({ multiple: true })
-export class InlineStreamDiffHandler extends BaseInlineStreamDiffHandler {
-  initialize(selection: Selection): void {
-    const eol = this.savedModel.getEOL();
-    const startPosition = selection.getStartPosition();
-    const endPosition = selection.getEndPosition();
-
-    this.rawSavedTextLines = this.savedModel
-      .getValueInRange(Range.fromPositions(startPosition, endPosition))
-      .split(eol);
-
-    const zone = LineRange.fromRangeInclusive(
-      Range.fromPositions(
-        { lineNumber: selection.startLineNumber, column: 1 },
-        { lineNumber: selection.endLineNumber, column: Number.MAX_SAFE_INTEGER },
-      ),
-    );
-
-    this.livePreviewDiffDecorationModel.initialize(zone);
-    this.rawOriginTextLinesTokens = this.rawSavedTextLines.map((_, index) => {
-      const lineNumber = startPosition.lineNumber + index;
-      this.savedModel.tokenization.forceTokenization(lineNumber);
-      const lineTokens = this.savedModel.tokenization.getLineTokens(lineNumber);
-      return lineTokens;
-    });
-  }
-
-  protected processDiffComputation(currentText: string[], computerMode?: EComputerMode): IComputeDiffData {
-    return this.computeDiff(this.rawSavedTextLines, currentText, computerMode);
-  }
-
-  protected getOriginalModel(): ITextModel {
-    return this.savedModel;
-  }
-}
-
-/**
- * Reverse inline stream diff handler
- * In reverse mode, the roles of savedModel and virtualModel are swapped
- */
-@Injectable({ multiple: true })
-export class ReverseInlineStreamDiffHandler extends BaseInlineStreamDiffHandler {
-  recompute(computerMode: EComputerMode, content?: string): IComputeDiffData {
-    const result = super.recompute(computerMode, content);
-    this.rawOriginTextLinesTokens = this.virtualModel.getLinesContent().map((_, index) => {
-      const lineNumber = index + 1;
-      this.virtualModel.tokenization.forceTokenization(lineNumber);
-      const lineTokens = this.virtualModel.tokenization.getLineTokens(lineNumber);
-      return lineTokens;
-    });
-    return result;
-  }
-
-  initialize(): void {
-    const eol = this.savedModel.getEOL();
-
-    // reverse 模式不支持 range
-    this.rawSavedTextLines = this.savedModel.getValue().split(eol);
-
-    // TODO: reverse 模式暂不支持 range
-    const zone = LineRange.fromRangeInclusive(
-      Range.fromPositions(
-        { lineNumber: 1, column: 1 },
-        { lineNumber: this.virtualModel.getLineCount(), column: Number.MAX_SAFE_INTEGER },
-      ),
-    );
-    this.livePreviewDiffDecorationModel.initialize(zone);
-  }
-
-  protected getOriginalModel(): ITextModel {
-    return this.virtualModel;
-  }
-
-  protected processDiffComputation(currentText: string[], computerMode?: EComputerMode): IComputeDiffData {
-    return this.computeDiff(currentText, this.rawSavedTextLines, computerMode);
-  }
-}

package/src/browser/widget/inline-stream-diff/live-preview.decoration.tsx

@@ -7,13 +7,11 @@ import {
   Emitter,
   Event,
   IAIReporter,
-  localize,
   runWhenIdle,
 } from '@opensumi/ide-core-common';
 import { ISingleEditOperation } from '@opensumi/ide-editor';
 import { ICodeEditor, IEditorDecorationsCollection, ITextModel, Position, Range } from '@opensumi/ide-monaco';
 import { StandaloneServices } from '@opensumi/ide-monaco/lib/browser/monaco-api/services';
-import { IMessageService } from '@opensumi/ide-overlay';
 import { EditOperation } from '@opensumi/monaco-editor-core/esm/vs/editor/common/core/editOperation';
 import { LineRange } from '@opensumi/monaco-editor-core/esm/vs/editor/common/core/lineRange';
 import { ModelDecorationOptions } from '@opensumi/monaco-editor-core/esm/vs/editor/common/model/textModel';
@@ -69,9 +67,6 @@ export class LivePreviewDiffDecorationModel extends Disposable {
   @Autowired(InlineDiffService)
   private readonly inlineDiffService: InlineDiffService;
 
-  @Autowired(IMessageService)
-  private readonly messageService: IMessageService;
-
   private activeLineDec: IEditorDecorationsCollection;
   private pendingRangeDec: IEditorDecorationsCollection;
   private aiNativeContextKey: AINativeContextKey;
@@ -92,10 +87,6 @@ export class LivePreviewDiffDecorationModel extends Disposable {
   private removedZoneWidgets: RemovedZoneWidget[] = [];
   private zone: LineRange;
 
-  public get partialEditWidgetCount() {
-    return this.partialEditWidgetList.length;
-  }
-
   constructor(private readonly monacoEditor: ICodeEditor) {
     super();
     this.model = this.monacoEditor.getModel()!;
@@ -625,7 +616,7 @@ export class LivePreviewDiffDecorationModel extends Disposable {
     if (this.options.renderRemovedWidgetImmediately) {
       run();
     } else {
-      this.addDispose(runWhenIdle(run));
+      runWhenIdle(run);
     }
   }
 
@@ -690,26 +681,6 @@ export class LivePreviewDiffDecorationModel extends Disposable {
     }
   }
 
-  currentChangeIndex: number = 0;
-
-  revealSiblingChange(direction: 'up' | 'down') {
-    this.currentChangeIndex = this.currentChangeIndex + (direction === 'up' ? -1 : 1);
-    if (this.currentChangeIndex >= 0 && this.currentChangeIndex < this.partialEditWidgetList.length) {
-      const siblingChange = this.partialEditWidgetList[this.currentChangeIndex];
-      const pos = siblingChange.getPosition();
-      if (pos?.position) {
-        this.monacoEditor.revealLineInCenter(pos.position!.lineNumber);
-        return this.currentChangeIndex;
-      }
-    } else {
-      this.messageService.info(
-        direction === 'up'
-          ? localize('aiNative.inlineDiff.noMoreChangesUp')
-          : localize('aiNative.inlineDiff.noMoreChangesDown'),
-      );
-    }
-  }
-
   setPreviewerOptions(options: IModelOptions) {
     this.options = options;
   }

package/src/common/index.ts

@@ -12,18 +12,13 @@ import {
   IMarkdownString,
   Uri,
 } from '@opensumi/ide-core-common';
+import { IChatMessage } from '@opensumi/ide-core-common/lib/types/ai-native';
 import { DESIGN_MENUBAR_CONTAINER_VIEW_ID } from '@opensumi/ide-design/lib/common/constants';
 import { IPosition, ITextModel, InlineCompletionContext } from '@opensumi/ide-monaco/lib/common';
 
 import { MCPServerDescription } from './mcp-server-manager';
 import { MCPTool } from './types';
 
-import type { CoreMessage } from 'ai';
-
-export type { CoreMessage };
-
-export * from './model';
-
 export const IAINativeService = Symbol('IAINativeService');
 
 /**
@@ -36,9 +31,6 @@ export const AI_CHAT_CONTAINER_ID = 'AI-Chat-Container';
 export const AI_CHAT_LOGO_AVATAR_ID = 'AI-Chat-Logo-Avatar';
 export const AI_MENU_BAR_DEBUG_TOOLBAR = 'AI_MENU_BAR_DEBUG_TOOLBAR';
 
-// 内置 MCP 服务器名称
-export const BUILTIN_MCP_SERVER_NAME = 'sumi-builtin';
-
 /**
  * @deprecated Use {@link DESIGN_MENUBAR_CONTAINER_VIEW_ID} instead
  */
@@ -131,12 +123,9 @@ export const ChatProxyServiceToken = Symbol('ChatProxyServiceToken');
 export const TokenMCPServerProxyService = Symbol('TokenMCPServerProxyService');
 
 export interface ISumiMCPServerBackend {
-  initBuiltinMCPServer(enabled: boolean): void;
+  initBuiltinMCPServer(): void;
   initExternalMCPServers(servers: MCPServerDescription[]): void;
   getAllMCPTools(): Promise<MCPTool[]>;
-  getServers(): Promise<Array<{ name: string; isStarted: boolean }>>;
-  startServer(serverName: string): Promise<void>;
-  stopServer(serverName: string): Promise<void>;
 }
 
 export const SumiMCPServerProxyServicePath = 'SumiMCPServerProxyServicePath';
@@ -149,7 +138,7 @@ export interface IChatAgentService {
     id: string,
     request: IChatAgentRequest,
     progress: (part: IChatProgress) => void,
-    history: CoreMessage[],
+    history: IChatMessage[],
     token: CancellationToken,
   ): Promise<IChatAgentResult>;
   getAgents(): Array<IChatAgent>;
@@ -170,7 +159,7 @@ export interface IChatAgent extends IChatAgentData {
   invoke(
     request: IChatAgentRequest,
     progress: (part: IChatProgress) => void,
-    history: CoreMessage[],
+    history: IChatMessage[],
     token: CancellationToken,
   ): Promise<IChatAgentResult>;
   provideFollowups?(sessionId: string, token: CancellationToken): Promise<IChatFollowup[]>;

package/src/common/llm-context.ts

@@ -15,13 +15,13 @@ export interface LLMContextService {
    */
   cleanFileContext(): void;
 
-  onDidContextFilesChangeEvent: Event<{ viewed: FileContext[]; attached: FileContext[]; version: number }>;
+  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/mcp-server-manager.ts

@@ -1,15 +1,5 @@
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 
-export interface IMCPServer {
-  isStarted(): boolean;
-  start(): Promise<void>;
-  getServerName(): string;
-  callTool(toolName: string, toolCallId: string, arg_string: string): ReturnType<Client['callTool']>;
-  getTools(): ReturnType<Client['listTools']>;
-  update(command: string, args?: string[], env?: { [key: string]: string }): void;
-  stop(): void;
-}
-
 export interface MCPServerManager {
   callTool(
     serverName: string,
@@ -21,7 +11,7 @@ export interface MCPServerManager {
   addOrUpdateServer(description: MCPServerDescription): void;
   // invoke in node.js only
   addOrUpdateServerDirectly(server: any): void;
-  initBuiltinServer(builtinMCPServer: any, enabled: boolean): void;
+  initBuiltinServer(builtinMCPServer: any): void;
   getTools(serverName: string): ReturnType<Client['listTools']>;
   getServerNames(): Promise<string[]>;
   startServer(serverName: string): Promise<void>;
@@ -29,7 +19,6 @@ export interface MCPServerManager {
   getStartedServers(): Promise<string[]>;
   registerTools(serverName: string): Promise<void>;
   addExternalMCPServers(servers: MCPServerDescription[]): void;
-  getServers(): Map<string, IMCPServer>;
 }
 
 export type MCPTool = Awaited<ReturnType<MCPServerManager['getTools']>>['tools'][number];
@@ -56,11 +45,6 @@ export interface MCPServerDescription {
    * Optional environment variables to set when starting the server.
    */
   env?: { [key: string]: string };
-
-  /**
-   * Whether to enable the MCP server.
-   */
-  enabled?: boolean;
 }
 
 export const MCPServerManager = Symbol('MCPServerManager');

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

@@ -1,5 +1,5 @@
-import { Autowired, Injectable } from '@opensumi/di';
-import { WorkbenchEditorService } from '@opensumi/ide-editor/lib/common/editor';
+import { Injectable } from '@opensumi/di';
+import { MaybePromise } from '@opensumi/ide-core-common/lib/utils';
 
 import { SerializedContext } from '../llm-context';
 
@@ -10,46 +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 {
-  @Autowired(WorkbenchEditorService)
-  protected readonly workbenchEditorService: WorkbenchEditorService;
-
-  provideContextPrompt(context: SerializedContext, userMessage: string): string {
-    const editor = this.workbenchEditorService.currentEditor;
-    const currentModel = editor?.currentDocumentModel;
+  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.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>`;
+          <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/common/tool-invocation-registry.ts

@@ -72,7 +72,7 @@ export interface ToolInvocationRegistry {
    *
    * @param providerName - 要移除其工具的工具提供者名称（在 `ToolRequest` 中指定）
    */
-  unregisterProviderTools(providerName: string): void;
+  unregisterAllTools(providerName: string): void;
 }
 
 export const ToolProvider = Symbol('ToolProvider');
@@ -83,7 +83,7 @@ export interface ToolProvider {
 export class ToolInvocationRegistryImpl implements ToolInvocationRegistry {
   private tools: Map<string, ToolRequest> = new Map<string, ToolRequest>();
 
-  unregisterProviderTools(providerName: string): void {
+  unregisterAllTools(providerName: string): void {
     const toolsToRemove: string[] = [];
     for (const [id, tool] of this.tools.entries()) {
       if (tool.providerName === providerName) {