@opensumi/ide-ai-native 3.7.1-next-1739756477.0 → 3.7.1-next-1739761524.0

package/src/browser/contrib/intelligent-completions/source/typing.source.ts

@@ -1,23 +1,26 @@
 import { Injectable } from '@opensumi/di';
 import { AINativeSettingSectionsId, ECodeEditsSourceTyping, IDisposable } from '@opensumi/ide-core-common';
-import { IModelContentChangedEvent } from '@opensumi/ide-monaco';
+import { IModelContentChangedEvent, Position } from '@opensumi/ide-monaco';
 
 import { BaseCodeEditsSource } from './base';
 
 @Injectable({ multiple: true })
 export class TypingCodeEditsSource extends BaseCodeEditsSource {
-  public priority = 2;
+  public priority = 0;
 
   public mount(): IDisposable {
     this.addDispose(
       this.monacoEditor.onDidChangeModelContent((event: IModelContentChangedEvent) => {
-        this.doTrigger(event);
+        const position = this.monacoEditor.getPosition();
+        if (position) {
+          this.doTrigger(position, event);
+        }
       }),
     );
     return this;
   }
 
-  protected async doTrigger(data: IModelContentChangedEvent) {
+  protected async doTrigger(position: Position, data: IModelContentChangedEvent) {
     const isTypingEnabled = this.preferenceService.getValid(AINativeSettingSectionsId.CodeEditsTyping, false);
 
     if (!isTypingEnabled || !this.model) {
@@ -26,9 +29,8 @@ export class TypingCodeEditsSource extends BaseCodeEditsSource {
 
     this.setBean({
       typing: ECodeEditsSourceTyping.Typing,
-      data: {
-        [ECodeEditsSourceTyping.Typing]: data,
-      },
+      position,
+      data,
     });
   }
 }

package/src/browser/layout/layout.module.less

@@ -119,20 +119,20 @@
   border: none;
 }
 
+.header {
+  height: 36px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 10px;
+  background-color: var(--editorGroupHeader-tabsBackground);
+}
+
 .right_slot_container_wrap {
   height: 100%;
   display: flex;
   flex-direction: column;
 
-  .header {
-    height: 36px;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 0 10px;
-    background-color: var(--editorGroupHeader-tabsBackground);
-  }
-
   .container {
     flex: 1;
   }

package/src/browser/layout/tabbar.view.tsx

@@ -174,16 +174,18 @@ export const AIRightTabRenderer = ({
     return (
       <ContainerView
         {...props}
+        customTitleBar={
+          <div className={styles.header}>
+            <span className={styles.title}>{options && options.title}</span>
+            <div className={styles.side}>
+              <EnhancePopover id={'ai_right_panel_header_close'} title={localize('editor.title.context.close')}>
+                <EnhanceIcon icon='close' onClick={handleClose} />
+              </EnhancePopover>
+            </div>
+          </div>
+        }
         renderContainerWrap={({ children }) => (
           <div className={styles.right_slot_container_wrap}>
-            <div className={styles.header}>
-              <span className={styles.title}>{options && options.title}</span>
-              <div className={styles.side}>
-                <EnhancePopover id={'ai_right_panel_header_close'} title={localize('editor.title.context.close')}>
-                  <EnhanceIcon icon='close' onClick={handleClose} />
-                </EnhancePopover>
-              </div>
-            </div>
             <div className={styles.container}>{children}</div>
           </div>
         )}

package/src/browser/types.ts

@@ -42,9 +42,7 @@ 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]
 >;

package/src/browser/widget/inline-chat/inline-chat-editor.controller.ts

@@ -280,7 +280,7 @@ export class InlineChatEditorController extends BaseAIMonacoEditorController {
             return undefined;
           }
 
-          return strategy.bind(this, monacoEditor, crossSelection, this.token);
+          return strategy.bind(this, monacoEditor, this.token);
         };
 
         this.runAction({
@@ -297,7 +297,7 @@ export class InlineChatEditorController extends BaseAIMonacoEditorController {
             });
             return relationId;
           },
-          execute: handler.execute ? handler.execute!.bind(this, monacoEditor, crossSelection, this.token) : undefined,
+          execute: handler.execute ? handler.execute!.bind(this, monacoEditor, this.token) : undefined,
           providerPreview: previewer(),
           extraData: {
             actionSource: source === 'codeAction' ? ActionSourceEnum.CodeAction : ActionSourceEnum.InlineChat,
@@ -508,6 +508,12 @@ export class InlineChatEditorController extends BaseAIMonacoEditorController {
       return;
     }
 
+    this.visibleDiffWidget({
+      monacoEditor,
+      options: { crossSelection, chatResponse: response },
+      reportInfo: { relationId, startTime, isRetry, actionType, actionSource },
+    });
+
     this.aiInlineChatOperationDisposable.addDispose([
       this.aiInlineContentWidget.onResultClick((kind: EResultKind) => {
         const modifyContent = this.inlineDiffController.getModifyContent();
@@ -573,12 +579,6 @@ export class InlineChatEditorController extends BaseAIMonacoEditorController {
         });
       }),
     ]);
-
-    this.visibleDiffWidget({
-      monacoEditor,
-      options: { crossSelection, chatResponse: response },
-      reportInfo: { relationId, startTime, isRetry, actionType, actionSource },
-    });
   }
 
   public async runAction(params: {

package/src/browser/widget/inline-diff/inline-diff.controller.ts

@@ -74,7 +74,7 @@ export class InlineDiffController extends BaseAIMonacoEditorController {
          * 保留 previewer 的实例，仅卸载 previewer 的渲染层
          */
         const id = model.id;
-        const previewer = this.currentPreviewer.get();
+        const previewer = this.currentPreviewer.read(reader);
         if (previewer && previewer.modelId !== id && !previewer.disposed) {
           previewer.hide();
         }

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

@@ -467,15 +467,17 @@ export class InlineStreamDiffHandler extends Disposable implements IInlineDiffPr
   }
 
   public pushRateFinallyDiffStack(diffModel: IComputeDiffData): void {
-    // 可能存在 rate editor controller 处理完之后接口层流式才结束
-    if (this.isEditing === false) {
-      this.finallyRender(diffModel);
-    }
+    transaction((tx) => {
+      this.finallyDiffModel.set(diffModel, tx);
+      // 可能存在 rate editor controller 处理完之后接口层流式才结束
+      if (this.isEditing === false) {
+        this.finallyRender(diffModel);
+      }
+    });
   }
 
   public finallyRender(diffModel: IComputeDiffData): void {
     transaction((tx) => {
-      this.finallyDiffModel.set(diffModel, tx);
       this.diffModel.set(diffModel, tx);
     });
 

package/src/common/utils.ts

@@ -32,10 +32,10 @@ export const extractCodeBlocks = (content: string): string => {
   let startLine = 0;
 
   lines.forEach((line, i) => {
-    if (!inBlock && line.trim().startsWith(BACK_QUOTE_3_SYMBOL)) {
+    if (!inBlock && line.startsWith(BACK_QUOTE_3_SYMBOL)) {
       inBlock = true;
       startLine = i + 1;
-    } else if (inBlock && line.trim().startsWith(BACK_QUOTE_3_SYMBOL)) {
+    } else if (inBlock && line.startsWith(BACK_QUOTE_3_SYMBOL)) {
       inBlock = false;
       const endLine = i;
       newContents = lines.slice(startLine, endLine);