@opensumi/ide-ai-native 3.3.3 → 3.3.4-next-1725949351.0

package/src/browser/contrib/problem-fix/problem-fix.handler.ts

@@ -0,0 +1,160 @@
+import { Autowired, INJECTOR_TOKEN, Injectable, Injector } from '@opensumi/di';
+import { AppConfig } from '@opensumi/ide-core-browser';
+import { InlineChatIsVisible } from '@opensumi/ide-core-browser/lib/contextkey/ai-native';
+import {
+  AISerivceType,
+  ActionSourceEnum,
+  ActionTypeEnum,
+  Disposable,
+  IAIReporter,
+  ProblemFixRegistryToken,
+} from '@opensumi/ide-core-common';
+import { IEditor } from '@opensumi/ide-editor';
+import { Range } from '@opensumi/ide-monaco';
+import { HoverController } from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/hover/browser/hover';
+import {
+  HoverParticipantRegistry,
+  IEditorHoverRenderContext,
+} from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/hover/browser/hoverTypes';
+import {
+  MarkerHover,
+  MarkerHoverParticipant,
+} from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/hover/browser/markerHoverParticipant';
+
+
+import { AINativeContextKey } from '../../contextkey/ai-native.contextkey.service';
+import { InlineChatHandler } from '../../widget/inline-chat/inline-chat.handler';
+import { IAIMonacoContribHandler } from '../base';
+
+import { MarkerHoverParticipantComponent } from './problem-fix.component';
+import { ProblemFixProviderRegistry } from './problem-fix.feature.registry';
+import { ProblemFixService } from './problem-fix.service';
+
+class AIMonacoHoverParticipant extends MarkerHoverParticipant {
+  static injector: Injector;
+
+  override renderHoverParts(context: IEditorHoverRenderContext, hoverParts: MarkerHover[]) {
+    const disposable = super.renderHoverParts(context, hoverParts);
+
+    const { fragment } = context;
+    MarkerHoverParticipantComponent.mount(fragment, hoverParts, AIMonacoHoverParticipant.injector.get(AppConfig));
+
+    return disposable;
+  }
+}
+
+@Injectable()
+export class ProblemFixHandler extends IAIMonacoContribHandler {
+  @Autowired(InlineChatHandler)
+  private readonly inlineChatHandler: InlineChatHandler;
+
+  @Autowired(INJECTOR_TOKEN)
+  private readonly injector: Injector;
+
+  @Autowired(ProblemFixService)
+  private readonly problemFixService: ProblemFixService;
+
+  @Autowired(ProblemFixRegistryToken)
+  private readonly problemFixProviderRegistry: ProblemFixProviderRegistry;
+
+  @Autowired(IAIReporter)
+  private readonly aiReporter: IAIReporter;
+
+  private aiNativeContextKey: AINativeContextKey;
+
+  mountEditor(editor: IEditor) {
+    this.aiNativeContextKey = this.injector.get(AINativeContextKey, [editor.monacoEditor.contextKeyService]);
+    return super.mountEditor(editor);
+  }
+
+  doContribute() {
+    const disposable = new Disposable();
+
+    // 先去掉 monaco 默认的 MarkerHoverParticipant
+    HoverParticipantRegistry._participants = HoverParticipantRegistry._participants.filter(
+      (participant) => participant !== MarkerHoverParticipant,
+    );
+
+    AIMonacoHoverParticipant.injector = this.injector;
+    HoverParticipantRegistry.register(AIMonacoHoverParticipant);
+
+    disposable.addDispose(
+      this.problemFixService.onHoverFixTrigger((part) => {
+        const hoverController = this.editor?.monacoEditor.getContribution<HoverController>(HoverController.ID);
+        if (hoverController) {
+          hoverController.hideContentHover();
+        }
+
+        this.handleHoverFix(part);
+      }),
+    );
+
+    return disposable;
+  }
+
+  private async handleHoverFix(part: MarkerHover) {
+    const provider = this.problemFixProviderRegistry.getHoverFixProvider();
+    if (!provider) {
+      return;
+    }
+
+    const monacoEditor = this.editor?.monacoEditor;
+
+    if (!monacoEditor) {
+      return;
+    }
+
+    const model = monacoEditor.getModel();
+
+    // 以 marker 的 range 为中心，向上取 2 行，向下取 3 行
+    const editRange = new Range(
+      Math.max(part.range.startLineNumber - 2, 0),
+      1,
+      Math.min(part.range.endLineNumber + 3, model!.getLineCount() ?? 0),
+      model!.getLineMaxColumn(part.range.endLineNumber + 3) ?? 0,
+    );
+
+    const context = {
+      marker: part.marker,
+      editRange,
+    };
+
+    monacoEditor.setSelection(editRange);
+
+    const contextKeyDisposed = new Disposable();
+    const inlineChatIsVisible = new Set([InlineChatIsVisible.raw]);
+
+    contextKeyDisposed.addDispose(
+      this.aiNativeContextKey.contextKeyService!.onDidChangeContext((e) => {
+        if (e.payload.affectsSome(inlineChatIsVisible)) {
+          const isVisible = this.aiNativeContextKey.inlineChatIsVisible.get();
+          if (isVisible) {
+            this.inlineChatHandler.runAction({
+              monacoEditor,
+              reporterFn: (): string => {
+                const relationId = this.aiReporter.start(AISerivceType.ProblemFix, {
+                  message: ActionTypeEnum.HoverFix,
+                  type: AISerivceType.InlineChat,
+                  source: ActionTypeEnum.HoverFix,
+                  actionSource: ActionSourceEnum.Hover,
+                  actionType: ActionTypeEnum.HoverFix,
+                });
+                return relationId;
+              },
+              crossSelection: monacoEditor.getSelection()!,
+              providerPreview: () => provider.provideFix(monacoEditor, context, this.inlineChatHandler.cancelIndicator.token),
+              extraData: {
+                actionSource: ActionSourceEnum.Hover,
+                actionType: ActionTypeEnum.HoverFix,
+              },
+            });
+          }
+
+          contextKeyDisposed.dispose();
+        }
+      }),
+    );
+
+    this.addDispose(contextKeyDisposed);
+  }
+}

package/src/browser/contrib/problem-fix/problem-fix.module.less

@@ -0,0 +1,5 @@
+.problem_fix_btn_container {
+  margin-left: 8px;
+  margin-bottom: 8px;
+  height: 22px;
+}

package/src/browser/contrib/problem-fix/problem-fix.service.ts

@@ -0,0 +1,13 @@
+import { Injectable } from '@opensumi/di';
+import { Emitter, Event } from '@opensumi/ide-core-common';
+import { MarkerHover } from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/hover/browser/markerHoverParticipant';
+
+@Injectable()
+export class ProblemFixService {
+  private readonly _onHoverFixTrigger = new Emitter<MarkerHover>();
+  public readonly onHoverFixTrigger: Event<MarkerHover> = this._onHoverFixTrigger.event;
+
+  public triggerHoverFix(isTrigger: MarkerHover) {
+    this._onHoverFixTrigger.fire(isTrigger);
+  }
+}

package/src/browser/index.ts

@@ -13,7 +13,11 @@ import {
   RenameCandidatesProviderRegistryToken,
   ResolveConflictRegistryToken,
 } from '@opensumi/ide-core-browser';
-import { IntelligentCompletionsRegistryToken, TerminalRegistryToken } from '@opensumi/ide-core-common';
+import {
+  IntelligentCompletionsRegistryToken,
+  ProblemFixRegistryToken,
+  TerminalRegistryToken,
+} from '@opensumi/ide-core-common';
 
 import { ChatProxyServiceToken, IChatAgentService, IChatInternalService, IChatManagerService } from '../common';
 
@@ -32,6 +36,7 @@ import { IntelligentCompletionsRegistry } from './contrib/intelligent-completion
 import { InterfaceNavigationContribution } from './contrib/interface-navigation/interface-navigation.contribution';
 import { MergeConflictContribution } from './contrib/merge-conflict';
 import { ResolveConflictRegistry } from './contrib/merge-conflict/merge-conflict.feature.registry';
+import { ProblemFixProviderRegistry } from './contrib/problem-fix/problem-fix.feature.registry';
 import { RenameCandidatesProviderRegistry } from './contrib/rename/rename.feature.registry';
 import { TerminalAIContribution } from './contrib/terminal/terminal-ai.contributon';
 import { TerminalFeatureRegistry } from './contrib/terminal/terminal.feature.registry';
@@ -112,6 +117,10 @@ export class AINativeModule extends BrowserModule {
       token: RenameCandidatesProviderRegistryToken,
       useClass: RenameCandidatesProviderRegistry,
     },
+    {
+      token: ProblemFixRegistryToken,
+      useClass: ProblemFixProviderRegistry,
+    },
     {
       token: TerminalRegistryToken,
       useClass: TerminalFeatureRegistry,

package/src/browser/types.ts

@@ -15,6 +15,7 @@ import {
 } from '@opensumi/ide-core-common';
 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';
 
@@ -206,6 +207,23 @@ export interface IIntelligentCompletionsRegistry {
   registerIntelligentCompletionProvider(provider: IIntelligentCompletionProvider): void;
 }
 
+export interface IProblemFixContext {
+  marker: IMarker;
+  editRange: IRange;
+}
+
+export interface IHoverFixHandler {
+  provideFix: (
+    editor: ICodeEditor,
+    context: IProblemFixContext,
+    token: CancellationToken,
+  ) => MaybePromise<ChatResponse | InlineChatController>;
+}
+
+export interface IProblemFixProviderRegistry {
+  registerHoverFixProvider(handler: IHoverFixHandler): void;
+}
+
 export const AINativeCoreContribution = Symbol('AINativeCoreContribution');
 
 export interface AINativeCoreContribution {
@@ -230,6 +248,10 @@ export interface AINativeCoreContribution {
    * 注册智能重命名相关功能
    */
   registerRenameProvider?(registry: IRenameCandidatesProviderRegistry): void;
+  /**
+   * 注册智能修复相关功能
+   */
+  registerProblemFixFeature?(registry: IProblemFixProviderRegistry): void;
   /**
    * 注册智能终端相关功能
    */

package/src/browser/widget/inline-chat/inline-chat.handler.ts

@@ -70,11 +70,14 @@ export class InlineChatHandler extends Disposable {
   private aiInlineContentWidget: AIInlineContentWidget;
   private aiInlineChatDisposable: Disposable = new Disposable();
   private aiInlineChatOperationDisposable: Disposable = new Disposable();
-  private cancelIndicator = new CancellationTokenSource();
+  private _cancelIndicator = new CancellationTokenSource();
+  get cancelIndicator() {
+    return this._cancelIndicator;
+  }
 
-  private cancelToken() {
-    this.cancelIndicator.cancel();
-    this.cancelIndicator = new CancellationTokenSource();
+  public cancelToken() {
+    this._cancelIndicator.cancel();
+    this._cancelIndicator = new CancellationTokenSource();
   }
 
   private disposeAllWidget() {
@@ -228,6 +231,11 @@ export class InlineChatHandler extends Disposable {
           return;
         }
 
+        const crossSelection = this.getCrossSelection(monacoEditor);
+        if (!crossSelection) {
+          return;
+        }
+
         const previewer = () => {
           // 兼容 providerDiffPreviewStrategy api
           const strategy = handler.providerDiffPreviewStrategy
@@ -237,11 +245,12 @@ export class InlineChatHandler extends Disposable {
             return undefined;
           }
 
-          return strategy.bind(this, monacoEditor, this.cancelIndicator.token);
+          return strategy.bind(this, monacoEditor, this._cancelIndicator.token);
         };
 
-        this.runInlineChatAction({
+        this.runAction({
           monacoEditor,
+          crossSelection,
           reporterFn: () => {
             const relationId = this.aiReporter.start(action.name, {
               message: action.name,
@@ -253,7 +262,7 @@ export class InlineChatHandler extends Disposable {
             });
             return relationId;
           },
-          execute: handler.execute ? handler.execute!.bind(this, monacoEditor, this.cancelIndicator.token) : undefined,
+          execute: handler.execute ? handler.execute!.bind(this, monacoEditor, this._cancelIndicator.token) : undefined,
           providerPreview: previewer(),
           extraData: {
             actionSource: source === 'codeAction' ? ActionSourceEnum.CodeAction : ActionSourceEnum.InlineChat,
@@ -273,8 +282,14 @@ export class InlineChatHandler extends Disposable {
 
         const strategy = await this.inlineChatFeatureRegistry.getInteractiveInputStrategyHandler()(monacoEditor, value);
 
-        this.runInlineChatAction({
+        const crossSelection = this.getCrossSelection(monacoEditor);
+        if (!crossSelection) {
+          return;
+        }
+
+        this.runAction({
           monacoEditor,
+          crossSelection,
           reporterFn: () => {
             const relationId = this.aiReporter.start(AISerivceType.InlineChatInput, {
               message: value,
@@ -286,11 +301,11 @@ export class InlineChatHandler extends Disposable {
           },
           execute:
             handler.execute && strategy === ERunStrategy.EXECUTE
-              ? handler.execute!.bind(this, monacoEditor, value, this.cancelIndicator.token)
+              ? handler.execute!.bind(this, monacoEditor, value, this._cancelIndicator.token)
               : undefined,
           providerPreview:
             handler.providePreviewStrategy && strategy === ERunStrategy.PREVIEW
-              ? handler.providePreviewStrategy.bind(this, monacoEditor, value, this.cancelIndicator.token)
+              ? handler.providePreviewStrategy.bind(this, monacoEditor, value, this._cancelIndicator.token)
               : undefined,
           extraData: {
             actionSource: ActionSourceEnum.InlineChatInput,
@@ -301,6 +316,18 @@ export class InlineChatHandler extends Disposable {
     );
   }
 
+  private getCrossSelection(monacoEditor: monaco.ICodeEditor) {
+    const selection = monacoEditor.getSelection();
+    if (!selection) {
+      this.logger.error('No selection found, aborting inline chat action.');
+      return;
+    }
+
+    return selection
+      .setStartPosition(selection.startLineNumber, 1)
+      .setEndPosition(selection.endLineNumber, monacoEditor.getModel()!.getLineMaxColumn(selection.endLineNumber));
+  }
+
   private convertInlineChatStatus(
     status: EInlineChatStatus,
     reportInfo: {
@@ -438,9 +465,6 @@ export class InlineChatHandler extends Disposable {
     }
   }
 
-  /**
-   * 重新生成代码
-   */
   private async handleDiffPreviewStrategy(params: {
     monacoEditor: monaco.ICodeEditor;
     strategy: (...arg: any[]) => MaybePromise<ChatResponse | InlineChatController>;
@@ -460,12 +484,11 @@ export class InlineChatHandler extends Disposable {
     this.aiInlineChatOperationDisposable.dispose();
 
     this.ensureInlineChatVisible(monacoEditor, crossSelection);
-
     this.aiInlineChatDisposable.addDispose(this.aiInlineContentWidget.launchChatStatus(EInlineChatStatus.THINKING));
 
     const startTime = Date.now();
 
-    if (this.cancelIndicator.token.isCancellationRequested) {
+    if (this._cancelIndicator.token.isCancellationRequested) {
       this.convertInlineChatStatus(EInlineChatStatus.READY, {
         relationId,
         message: 'abort',
@@ -567,9 +590,10 @@ export class InlineChatHandler extends Disposable {
     ]);
   }
 
-  private async runInlineChatAction(params: {
+  public async runAction(params: {
     monacoEditor: monaco.ICodeEditor;
     reporterFn: () => string;
+    crossSelection: monaco.Selection;
     execute?: () => MaybePromise<void>;
     providerPreview?: () => MaybePromise<ChatResponse | InlineChatController>;
     extraData?: {
@@ -577,12 +601,7 @@ export class InlineChatHandler extends Disposable {
       actionType: string;
     };
   }) {
-    const { monacoEditor, reporterFn, execute, providerPreview, extraData } = params;
-    const selection = monacoEditor.getSelection();
-    if (!selection) {
-      this.logger.error('No selection found, aborting inline chat action.');
-      return;
-    }
+    const { monacoEditor, crossSelection, reporterFn, execute, providerPreview, extraData } = params;
 
     if (execute) {
       await execute();
@@ -590,10 +609,6 @@ export class InlineChatHandler extends Disposable {
     }
 
     if (providerPreview) {
-      const crossSelection = selection
-        .setStartPosition(selection.startLineNumber, 1)
-        .setEndPosition(selection.endLineNumber, Number.MAX_SAFE_INTEGER);
-
       const relationId = reporterFn();
 
       await this.handleDiffPreviewStrategy({