@opensumi/ide-ai-native 3.7.2-next-1740448398.0 → 3.7.2-next-1741226843.0

package/src/browser/model/enhanceDecorationsCollection.ts

@@ -1,15 +1,20 @@
-import { Disposable, Emitter, Event, isDefined, isUndefined, uuid } from '@opensumi/ide-core-common';
+import { Disposable, Emitter, Event, isDefined, isUndefined } from '@opensumi/ide-core-common';
 import {
   ICodeEditor,
   IContentSizeChangedEvent,
   IModelDecorationOptions,
+  IModelDecorationsChangeAccessor,
   IModelDeltaDecoration,
   IPosition,
   IRange,
   ITextModel,
+  Range,
 } from '@opensumi/ide-monaco';
+import { space } from '@opensumi/ide-utils/lib/strings';
 import { UndoRedoGroup } from '@opensumi/monaco-editor-core/esm/vs/platform/undoRedo/common/undoRedo';
 
+import styles from './styles.module.less';
+
 export interface IDecorationSerializableState {
   startPosition: IPosition;
   endPosition: IPosition;
@@ -23,10 +28,8 @@ interface IDeltaData extends IModelDeltaDecoration {
 
 export interface IEnhanceModelDeltaDecoration extends IDeltaData {
   id: string;
-  decorationId: string;
   isHidden: boolean;
   readonly editorDecoration: IModelDeltaDecoration;
-  show(): void;
   hide(): void;
   resume(): void;
   getRange(): IRange;
@@ -44,13 +47,12 @@ export interface IDeltaDecorationsOptions {
   group?: UndoRedoGroup;
 }
 
-export class DeltaDecorations implements IEnhanceModelDeltaDecoration {
+class DeltaDecorations implements IEnhanceModelDeltaDecoration {
   length: number;
   range: IRange;
   options: IModelDecorationOptions;
 
   private resumeRange: IRange;
-  private _decorationId: string;
   private _group: UndoRedoGroup;
 
   private _hidden = false;
@@ -70,10 +72,6 @@ export class DeltaDecorations implements IEnhanceModelDeltaDecoration {
     return this.metadata.id;
   }
 
-  get decorationId(): string {
-    return this._decorationId;
-  }
-
   get editorDecoration(): IModelDeltaDecoration {
     return this.metadata.editorDecoration;
   }
@@ -110,6 +108,25 @@ export class DeltaDecorations implements IEnhanceModelDeltaDecoration {
     this._group = group;
   }
 
+  private changeVisibility(newClassName: string, newRange: Range): void {
+    if (!this.options.className) {
+      return;
+    }
+
+    const classList = this.options.className
+      .split(space)
+      .filter((s) => s !== styles.hidden && s !== styles.visible)
+      .filter(Boolean);
+    classList.push(newClassName);
+
+    this.options.className = classList.join(space);
+
+    this.codeEditor.changeDecorations((accessor) => {
+      accessor.changeDecorationOptions(this.id, this.options);
+      accessor.changeDecoration(this.id, newRange);
+    });
+  }
+
   setRange(newRange: IRange): void {
     this.range = newRange;
   }
@@ -119,45 +136,28 @@ export class DeltaDecorations implements IEnhanceModelDeltaDecoration {
   }
 
   dispose(): void {
-    this.hide();
     this.deltaData.dispose?.();
   }
 
-  show(): void {
-    this.codeEditor.changeDecorations((accessor) => {
-      this._decorationId = accessor.addDecoration(this.range, this.options);
-    });
-  }
-
   hide(): void {
     this.resumeRange = this.range;
     this._hidden = true;
-    if (this._decorationId) {
-      this.codeEditor.changeDecorations((accessor) => {
-        accessor.removeDecoration(this._decorationId);
-      });
-    }
+    const startPosition = { lineNumber: this.range.startLineNumber, column: 1 };
+    const newRange = Range.fromPositions(startPosition);
+    this.changeVisibility(styles.hidden, newRange);
   }
 
   resume(): void {
-    if (!this._hidden) {
-      return;
-    }
-
     this._hidden = false;
-    this.codeEditor.changeDecorations((accessor) => {
-      this._decorationId = accessor.addDecoration(this.resumeRange, this.options);
-    });
+    this.changeVisibility(styles.visible, Range.lift(this.resumeRange));
   }
 }
 
-export class EnhanceDecorationsCollection<
-  T extends IEnhanceModelDeltaDecoration = IEnhanceModelDeltaDecoration,
-> extends Disposable {
-  private deltaDecorations: T[] = [];
+export class EnhanceDecorationsCollection extends Disposable {
+  private deltaDecorations: IEnhanceModelDeltaDecoration[] = [];
 
-  protected readonly _onDidDecorationsChange = this.registerDispose(new Emitter<T[]>());
-  public readonly onDidDecorationsChange: Event<T[]> = this._onDidDecorationsChange.event;
+  protected readonly _onDidDecorationsChange = this.registerDispose(new Emitter<IEnhanceModelDeltaDecoration[]>());
+  public readonly onDidDecorationsChange: Event<IEnhanceModelDeltaDecoration[]> = this._onDidDecorationsChange.event;
 
   private get model(): ITextModel {
     return this.codeEditor.getModel()!;
@@ -182,11 +182,11 @@ export class EnhanceDecorationsCollection<
   private flush(): void {
     this.deltaDecorations = this.deltaDecorations.map((d) => {
       const {
-        decorationId,
+        id,
         editorDecoration: { range },
       } = d;
 
-      const newRange = this.model.getDecorationRange(decorationId);
+      const newRange = this.model.getDecorationRange(id);
       d.setRange(newRange ?? range);
 
       return d;
@@ -196,51 +196,66 @@ export class EnhanceDecorationsCollection<
   }
 
   private delete(id: string): void {
-    this.deltaDecorations = this.deltaDecorations.filter((d) => d.id !== id);
+    this.codeEditor.changeDecorations((accessor) => {
+      accessor.removeDecoration(id);
+
+      this.deltaDecorations = this.deltaDecorations.filter((d) => d.id !== id);
+    });
   }
 
   protected createDecorations(metaData: IDeltaDecorationsOptions) {
-    return new DeltaDecorations(metaData) as unknown as T;
+    return new DeltaDecorations(metaData);
   }
 
-  set(decorations: (IModelDeltaDecoration & Partial<Pick<T, 'length' | 'isHidden' | 'group'>>)[]): void {
+  set(
+    decorations: (IModelDeltaDecoration &
+      Partial<Pick<IEnhanceModelDeltaDecoration, 'length' | 'isHidden' | 'group'>>)[],
+  ): void {
     this.clear();
 
-    this.deltaDecorations = decorations.map((decoration) => {
-      const id = uuid(6);
-
-      const dec = this.createDecorations({
-        id,
-        editorDecoration: decoration,
-        codeEditor: this.codeEditor,
-        isHidden: decoration.isHidden,
-        group: decoration.group,
-        deltaData: {
-          dispose: () => this.delete(id),
-          length: decoration.length,
-        },
-      });
-
-      dec.show();
-
-      return dec;
+    this.codeEditor.changeDecorations((accessor: IModelDecorationsChangeAccessor) => {
+      const newDecorations: IEnhanceModelDeltaDecoration[] = [];
+
+      for (const decoration of decorations) {
+        const id = accessor.addDecoration(decoration.range, decoration.options);
+        newDecorations.push(
+          this.createDecorations({
+            id,
+            editorDecoration: decoration,
+            codeEditor: this.codeEditor,
+            isHidden: decoration.isHidden,
+            group: decoration.group,
+            deltaData: {
+              dispose: () => this.delete(id),
+              length: decoration.length,
+            },
+          }),
+        );
+      }
+
+      this.deltaDecorations = newDecorations;
     });
   }
 
-  getDecorations(): T[] {
+  getDecorations(): IEnhanceModelDeltaDecoration[] {
     return this.deltaDecorations;
   }
 
-  getDecorationByGroup(group: UndoRedoGroup): T | undefined {
+  getDecorationByGroup(group: UndoRedoGroup): IEnhanceModelDeltaDecoration | undefined {
     return this.deltaDecorations.find((d) => d.group === group);
   }
 
-  getDecorationByLineNumber(lineNumber: number): T | undefined {
+  getDecorationByLineNumber(lineNumber: number): IEnhanceModelDeltaDecoration | undefined {
     return this.deltaDecorations.find((d) => d.getRange().startLineNumber === lineNumber);
   }
 
   clear(): void {
-    this.deltaDecorations.map((d) => d.dispose());
-    this.deltaDecorations = [];
+    this.codeEditor.changeDecorations((accessor) => {
+      for (const decoration of this.deltaDecorations) {
+        accessor.removeDecoration(decoration.id);
+      }
+
+      this.deltaDecorations = [];
+    });
   }
 }

package/src/browser/model/msg-history-manager.ts

@@ -5,24 +5,13 @@ import { IHistoryChatMessage } from '@opensumi/ide-core-common/lib/types/ai-nati
 
 type IExcludeMessage = Omit<IHistoryChatMessage, 'id' | 'order'>;
 
+@Injectable({ multiple: false })
 export class MsgHistoryManager extends Disposable {
   private messageMap: Map<string, IHistoryChatMessage> = new Map();
-  private messageAdditionalMap: Map<string, Record<string, any>> = new Map();
 
   private readonly _onMessageChange = new Emitter<IHistoryChatMessage[]>();
   public readonly onMessageChange: Event<IHistoryChatMessage[]> = this._onMessageChange.event;
 
-  private readonly _onMessageAdditionalChange = new Emitter<Record<string, any>>();
-  public readonly onMessageAdditionalChange: Event<Record<string, any>> = this._onMessageAdditionalChange.event;
-
-  constructor(data?: { additional: Record<string, any>; messages: IHistoryChatMessage[] }) {
-    super();
-    if (data) {
-      this.messageMap = new Map(data.messages.map((item) => [item.id, item]));
-      this.messageAdditionalMap = new Map(Object.entries(data.additional));
-    }
-  }
-
   override dispose(): void {
     this.clearMessages();
     super.dispose();
@@ -30,8 +19,6 @@ export class MsgHistoryManager extends Disposable {
 
   public clearMessages() {
     this.messageMap.clear();
-    this.messageAdditionalMap.clear();
-    this.startIndex = 0;
   }
 
   private doAddMessage(message: IExcludeMessage): string {
@@ -51,30 +38,10 @@ export class MsgHistoryManager extends Disposable {
     return id;
   }
 
-  private get messageList(): IHistoryChatMessage[] {
+  public getMessages(): IHistoryChatMessage[] {
     return Array.from(this.messageMap.values()).sort((a, b) => a.order - b.order);
   }
 
-  private startIndex = 0;
-
-  private get totalTokens(): number {
-    const list = this.messageList.slice(this.startIndex);
-    return list.reduce((acc, msg) => acc + (msg.content.length || 0), 0) / 3;
-  }
-
-  public get slicedMessageCount(): number {
-    return this.startIndex;
-  }
-
-  public getMessages(maxTokens?: number): IHistoryChatMessage[] {
-    if (maxTokens && this.totalTokens > maxTokens) {
-      while (this.totalTokens > maxTokens) {
-        this.startIndex++;
-      }
-    }
-    return this.messageList.slice(this.startIndex);
-  }
-
   public addUserMessage(
     message: Required<Pick<IExcludeMessage, 'agentId' | 'agentCommand' | 'content' | 'relationId'>>,
   ): string {
@@ -103,25 +70,4 @@ export class MsgHistoryManager extends Disposable {
       content: message.content,
     });
   }
-
-  public setMessageAdditional(id: string, additional: Record<string, any>) {
-    if (!this.messageMap.has(id)) {
-      return;
-    }
-
-    this.messageAdditionalMap.set(id, additional);
-
-    this._onMessageAdditionalChange.fire(additional);
-  }
-
-  public getMessageAdditional(id: string): Record<string, any> {
-    return this.messageAdditionalMap.get(id) || {};
-  }
-
-  toJSON() {
-    return {
-      messages: this.getMessages(),
-      additional: Object.fromEntries(this.messageAdditionalMap.entries()),
-    };
-  }
 }

package/src/browser/model/styles.module.less

@@ -0,0 +1,7 @@
+.hidden {
+  visibility: hidden;
+}
+
+.visible {
+  visibility: visible;
+}

package/src/browser/preferences/schema.ts

@@ -58,74 +58,5 @@ export const aiNativePreferenceSchema: PreferenceSchema = {
       type: 'boolean',
       default: false,
     },
-    [AINativeSettingSectionsId.LLMModelSelection]: {
-      type: 'string',
-      default: 'deepseek',
-      enum: ['deepseek', 'anthropic', 'openai'],
-      description: localize('preference.ai.native.llm.model.selection.description'),
-    },
-    [AINativeSettingSectionsId.DeepseekApiKey]: {
-      type: 'string',
-      default: '',
-      description: localize('preference.ai.native.deepseek.apiKey.description'),
-    },
-    [AINativeSettingSectionsId.AnthropicApiKey]: {
-      type: 'string',
-      default: '',
-      description: localize('preference.ai.native.anthropic.apiKey.description'),
-    },
-    [AINativeSettingSectionsId.OpenaiApiKey]: {
-      type: 'string',
-      default: '',
-      description: localize('preference.ai.native.openai.apiKey.description'),
-    },
-    [AINativeSettingSectionsId.OpenaiBaseURL]: {
-      type: 'string',
-      default: '',
-      description: localize('preference.ai.native.openai.baseURL.description'),
-    },
-    [AINativeSettingSectionsId.MCPServers]: {
-      type: 'array',
-      default: [],
-      description: localize('preference.ai.native.mcp.servers.description'),
-      items: {
-        type: 'object',
-        required: ['name', 'command', 'args'],
-        properties: {
-          name: {
-            type: 'string',
-            description: localize('preference.ai.native.mcp.servers.name.description'),
-          },
-          command: {
-            type: 'string',
-            description: localize('preference.ai.native.mcp.servers.command.description'),
-          },
-          args: {
-            type: 'array',
-            items: {
-              type: 'string',
-            },
-            description: localize('preference.ai.native.mcp.servers.args.description'),
-          },
-          env: {
-            type: 'object',
-            additionalProperties: {
-              type: 'string',
-            },
-            description: localize('preference.ai.native.mcp.servers.env.description'),
-            default: {},
-          },
-        },
-      },
-    },
-    [AINativeSettingSectionsId.CodeEditsTyping]: {
-      type: 'boolean',
-      default: false,
-    },
-    [AINativeSettingSectionsId.SystemPrompt]: {
-      type: 'string',
-      default: '',
-      description: localize('preference.ai.native.chat.system.prompt.description'),
-    },
   },
 };

package/src/browser/types.ts

@@ -1,5 +1,4 @@
 import React from 'react';
-import { ZodSchema } from 'zod';
 
 import { AIActionItem } from '@opensumi/ide-core-browser/lib/components/ai-native/index';
 import {
@@ -14,20 +13,11 @@ import {
   MaybePromise,
   MergeConflictEditorMode,
 } from '@opensumi/ide-core-common';
-import {
-  ICodeEditor,
-  IRange,
-  ISelection,
-  ITextModel,
-  InlineEditProvider,
-  NewSymbolNamesProvider,
-  Position,
-} from '@opensumi/ide-monaco';
+import { ICodeEditor, IRange, ITextModel, NewSymbolNamesProvider, Position } from '@opensumi/ide-monaco';
 import { SumiReadableStream } from '@opensumi/ide-utils/lib/stream';
 import { IMarker } from '@opensumi/monaco-editor-core/esm/vs/platform/markers/common/markers';
 
 import { IChatWelcomeMessageContent, ISampleQuestions, ITerminalCommandSuggestionDesc } from '../common';
-import { SerializedContext } from '../common/llm-context';
 
 import {
   ICodeEditsContextBean,
@@ -52,11 +42,9 @@ interface IBaseInlineChatHandler<T extends any[]> {
   providerDiffPreviewStrategy?: (...args: T) => MaybePromise<ChatResponse | InlineChatController>;
 }
 
-export type IEditorInlineChatHandler = IBaseInlineChatHandler<
-  [editor: ICodeEditor, selection: ISelection, token: CancellationToken]
->;
+export type IEditorInlineChatHandler = IBaseInlineChatHandler<[editor: ICodeEditor, token: CancellationToken]>;
 export type IInteractiveInputHandler = IBaseInlineChatHandler<
-  [editor: ICodeEditor, selection: ISelection, value: string, token: CancellationToken]
+  [editor: ICodeEditor, value: string, token: CancellationToken]
 >;
 
 export enum ERunStrategy {
@@ -236,39 +224,14 @@ export type ICodeEditsProvider = (
   token: CancellationToken,
 ) => MaybePromise<ICodeEditsResult | undefined>;
 
-export type IIntelligentInlineEditProvider = (
-  editor: ICodeEditor,
-  position: IPosition,
-  contextBean: IAICompletionOption,
-  token: CancellationToken,
-) => MaybePromise<IIntelligentCompletionsResult>;
-
-/**
- * Interface for registering intelligent completion providers and code edits providers.
- */
 export interface IIntelligentCompletionsRegistry {
   /**
-   * Registers an intelligent completion provider.
-   * @deprecated Use the `registerInlineCompletionsProvider` method instead.
-   * @param provider - The intelligent completion provider to register.
+   *  @deprecated use registerInlineCompletionProvider API
    */
   registerIntelligentCompletionProvider(provider: IIntelligentCompletionProvider): void;
-
-  /**
-   * Registers an inline completions provider.
-   * @param provider - The intelligent completion provider to register.
-   */
   registerInlineCompletionsProvider(provider: IIntelligentCompletionProvider): void;
-
-  /**
-   * Registers an inline edit provider.
-   * @param provider The inline edit provider to register.
-   */
-  registerInlineEditProvider(provider: InlineEditProvider): void;
-
   /**
-   * Registers a code edits provider.
-   * @param provider - The code edits provider to register.
+   * 注册 code edits 功能
    */
   registerCodeEditsProvider(provider: ICodeEditsProvider): void;
 }
@@ -327,64 +290,6 @@ export interface AINativeCoreContribution {
    * proposed api
    */
   registerIntelligentCompletionFeature?(registry: IIntelligentCompletionsRegistry): void;
-
-  /**
-   * 注册 Agent 模式下的 chat prompt provider
-   * @param provider
-   */
-  registerChatAgentPromptProvider?(): void;
-}
-
-// MCP Server 的 贡献点
-export const MCPServerContribution = Symbol('MCPServerContribution');
-
-export const TokenMCPServerRegistry = Symbol('TokenMCPServerRegistry');
-
-export interface MCPServerContribution {
-  registerMCPServer(registry: IMCPServerRegistry): void;
-}
-
-export interface MCPLogger {
-  appendLine(message: string): void;
-}
-
-export interface MCPToolDefinition {
-  name: string;
-  label?: string;
-  description: string;
-  inputSchema: ZodSchema<any>; // JSON Schema
-  handler: (
-    args: any,
-    logger: MCPLogger,
-  ) => Promise<{
-    content: { type: string; text: string }[];
-    isError?: boolean;
-  }>;
-}
-
-export interface IMCPServerToolComponentProps {
-  state?: 'streaming-start' | 'streaming' | 'complete' | 'result';
-  args?: Record<string, any>;
-  result?: any;
-  index?: number;
-  messageId?: string;
-  toolCallId?: string;
-}
-
-export interface IMCPServerRegistry {
-  registerMCPTool(tool: MCPToolDefinition): void;
-  getMCPTools(): MCPToolDefinition[];
-  getMCPTool(name: string): MCPToolDefinition | undefined;
-  registerToolComponent(name: string, component: React.FC<IMCPServerToolComponentProps>): void;
-  getToolComponent(name: string): React.FC<IMCPServerToolComponentProps> | undefined;
-  callMCPTool(
-    name: string,
-    args: any,
-  ): Promise<{
-    content: { type: string; text: string }[];
-    isError?: boolean;
-  }>;
-  // 后续支持其他 MCP 功能
 }
 
 export interface IChatComponentConfig {