@opensumi/ide-ai-native 3.9.1-next-1748435481.0 → 3.9.1-next-1748523870.0

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

@@ -1,5 +1,5 @@
 import cls from 'classnames';
-import React, { useCallback, useMemo } from 'react';
+import React, { useCallback, useEffect, useMemo } from 'react';
 
 import {
   ComponentRegistryInfo,
@@ -29,18 +29,25 @@ import {
   TabbarViewBase,
 } from '@opensumi/ide-main-layout/lib/browser/tabbar/bar.view';
 import { BaseTabPanelView, ContainerView } from '@opensumi/ide-main-layout/lib/browser/tabbar/panel.view';
-import { TabRendererBase } from '@opensumi/ide-main-layout/lib/browser/tabbar/renderer.view';
+import { TabRendererBase, TabbarConfig } from '@opensumi/ide-main-layout/lib/browser/tabbar/renderer.view';
 import { TabbarService, TabbarServiceFactory } from '@opensumi/ide-main-layout/lib/browser/tabbar/tabbar.service';
 
 import { AI_CHAT_VIEW_ID } from '../../common';
 
 import styles from './layout.module.less';
 
-const ChatTabbarRenderer: React.FC = () => (
-  <div style={{ width: 0 }}>
-    <TabbarViewBase tabSize={0} MoreTabView={IconElipses} TabView={IconTabView} barSize={0} panelBorderSize={1} />
-  </div>
-);
+const ChatTabbarRenderer: React.FC = () => {
+  const { side } = React.useContext(TabbarConfig);
+  const tabbarService: TabbarService = useInjectable(TabbarServiceFactory)(side);
+  useEffect(() => {
+    tabbarService.setIsLatter(true);
+  }, [tabbarService]);
+  return (
+    <div style={{ width: 0 }}>
+      <TabbarViewBase tabSize={0} MoreTabView={IconElipses} TabView={IconTabView} barSize={0} panelBorderSize={1} />
+    </div>
+  );
+};
 
 export const AIChatTabRenderer = ({
   className,
@@ -103,7 +110,7 @@ export const AILeftTabRenderer = ({
 const AILeftTabbarRenderer: React.FC = () => {
   const layoutService = useInjectable<IMainLayoutService>(IMainLayoutService);
 
-  const tabbarService: TabbarService = useInjectable(TabbarServiceFactory)(SlotLocation.extendView);
+  const tabbarService: TabbarService = useInjectable(TabbarServiceFactory)(SlotLocation.right);
   const currentContainerId = useAutorun(tabbarService.currentContainerId);
 
   const extraMenus = React.useMemo(() => layoutService.getExtraMenu(), [layoutService]);
@@ -147,8 +154,14 @@ const AILeftTabbarRenderer: React.FC = () => {
   );
 };
 
-export const AIRightTabRenderer = ({ components }: { className: string; components: ComponentRegistryInfo[] }) => {
-  const tabbarService: TabbarService = useInjectable(TabbarServiceFactory)(SlotLocation.extendView);
+export const AIRightTabRenderer = ({
+  className,
+  components,
+}: {
+  className: string;
+  components: ComponentRegistryInfo[];
+}) => {
+  const tabbarService: TabbarService = useInjectable(TabbarServiceFactory)(SlotLocation.right);
   const designLayoutConfig = useInjectable<DesignLayoutConfig>(DesignLayoutConfig);
 
   const handleClose = useCallback(() => {

package/src/browser/mcp/base-apply.service.ts

@@ -63,6 +63,8 @@ export abstract class BaseApplyService extends WithEventBus {
 
   private currentSessionId?: string;
 
+  protected abstract postApplyHandler(editor: ICodeEditor): Promise<void>;
+
   constructor() {
     super();
     this.addDispose(
@@ -313,10 +315,26 @@ export abstract class BaseApplyService extends WithEventBus {
       );
       codeBlock.updatedCode = res.updatedCode;
       codeBlock.status = 'pending';
+
+      // apply 结果流式输出完成后，自动尝试修复代码中的 lint 错误
+      if (this.postApplyHandler && typeof this.postApplyHandler === 'function') {
+        try {
+          await this.postApplyHandler(result.group.codeEditor.monacoEditor);
+        } catch (error) {}
+      }
+
+      const textModel = result.group.codeEditor.monacoEditor.getModel();
+      const diagnosticInfos = this.getDiagnosticInfos(textModel!.uri.toString(), res.result?.rangesFromDiffHunk || []);
+
       // 用户实际接受的 apply 结果
-      codeBlock.applyResult = res.result;
-      this.updateCodeBlock(codeBlock);
+      if (res.result) {
+        codeBlock.applyResult = {
+          diff: res.result?.diff,
+          diagnosticInfos,
+        };
+      }
 
+      this.updateCodeBlock(codeBlock);
       return codeBlock;
     } catch (err) {
       codeBlock.status = 'failed';
@@ -336,8 +354,8 @@ export abstract class BaseApplyService extends WithEventBus {
     codeBlock: CodeBlockData,
     updatedContentOrStream: string | SumiReadableStream<IChatProgress>,
     range?: Range,
-  ): Promise<{ result?: { diff: string; diagnosticInfos: IMarker[] }; updatedCode: string }> {
-    const deferred = new Deferred<{ result?: { diff: string; diagnosticInfos: IMarker[] }; updatedCode: string }>();
+  ): Promise<{ result?: { diff: string; rangesFromDiffHunk: Range[] }; updatedCode: string }> {
+    const deferred = new Deferred<{ result?: { diff: string; rangesFromDiffHunk: Range[] }; updatedCode: string }>();
     const inlineDiffController = InlineDiffController.get(editor)!;
     range = range || editor.getModel()!.getFullModelRange();
 
@@ -373,7 +391,11 @@ export abstract class BaseApplyService extends WithEventBus {
 
       this.listenPartialEdit(editor.getModel()!, codeBlock).then((result) => {
         if (result) {
-          codeBlock.applyResult = result;
+          const diagnosticInfos = this.getDiagnosticInfos(editor.getModel()!.uri.toString(), rangesFromDiffHunk);
+          codeBlock.applyResult = {
+            diff: result.diff,
+            diagnosticInfos,
+          };
         }
         this.updateCodeBlock(codeBlock);
         this.editorService.save(URI.file(path.join(this.appConfig.workspaceDir, codeBlock.relativePath)));
@@ -384,11 +406,10 @@ export abstract class BaseApplyService extends WithEventBus {
         updatedContent,
         codeBlock.relativePath,
       );
-      const diagnosticInfos = this.getDiagnosticInfos(editor.getModel()!.uri.toString(), rangesFromDiffHunk);
       deferred.resolve({
         result: {
           diff,
-          diagnosticInfos,
+          rangesFromDiffHunk,
         },
         updatedCode: updatedContent,
       });
@@ -534,7 +555,7 @@ export abstract class BaseApplyService extends WithEventBus {
   }
 
   protected listenPartialEdit(model: ITextModel, codeBlock: CodeBlockData) {
-    const deferred = new Deferred<{ diff: string; diagnosticInfos: IMarker[] }>();
+    const deferred = new Deferred<{ diff: string; rangesFromDiffHunk: Range[] }>();
     const uriString = model.uri.toString();
     const toDispose = this.inlineDiffService.onPartialEdit((event) => {
       if (
@@ -574,7 +595,7 @@ export abstract class BaseApplyService extends WithEventBus {
           });
           deferred.resolve({
             diff,
-            diagnosticInfos,
+            rangesFromDiffHunk,
           });
         } else {
           // 用户全部取消

package/src/browser/types.ts

@@ -5,6 +5,7 @@ import { ZodSchema } from 'zod';
 import { AIActionItem } from '@opensumi/ide-core-browser/lib/components/ai-native/index';
 import {
   CancellationToken,
+  ChatMessageRole,
   ChatResponse,
   Deferred,
   IAICompletionOption,
@@ -134,6 +135,8 @@ export interface IChatFeatureRegistry {
   registerImageUploadProvider(provider: IImageUploadProvider): void;
   registerWelcome(content: IChatWelcomeMessageContent | React.ReactNode, sampleQuestions?: ISampleQuestions[]): void;
   registerSlashCommand(command: IChatSlashCommandItem, handler: IChatSlashCommandHandler): void;
+
+  registerMessageSummaryProvider(provider: IMessageSummaryProvider): void;
 }
 
 export type ChatWelcomeRender = (props: {
@@ -298,6 +301,15 @@ export interface IImageUploadProvider {
   imageUpload(file: File): Promise<DataContent | URL>;
 }
 
+export interface IMessageSummaryProvider {
+  getMessageSummary(
+    messages: Array<{
+      role: ChatMessageRole;
+      content: string;
+    }>,
+  ): Promise<string | undefined>;
+}
+
 export const AINativeCoreContribution = Symbol('AINativeCoreContribution');
 
 export interface AINativeCoreContribution {