@opensumi/ide-ai-native 3.8.1-next-1741091353.0 → 3.8.1-next-1741092802.0

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

@@ -128,10 +128,6 @@ export class MsgHistoryManager extends Disposable {
     return this.messageAdditionalMap.get(id) || {};
   }
 
-  public get sessionAdditionals() {
-    return this.messageAdditionalMap;
-  }
-
   toJSON() {
     return {
       messages: this.getMessages(),

package/src/browser/preferences/schema.ts

@@ -69,9 +69,14 @@ export const aiNativePreferenceSchema: PreferenceSchema = {
     [AINativeSettingSectionsId.LLMModelSelection]: {
       type: 'string',
       default: 'deepseek',
-      enum: ['deepseek', 'anthropic', 'openai'],
+      enum: ['deepseek', 'anthropic', 'openai', 'openai-compatible'],
       description: localize('preference.ai.native.llm.model.selection.description'),
     },
+    [AINativeSettingSectionsId.ModelID]: {
+      type: 'string',
+      default: 'deepseek-chat',
+      description: localize('preference.ai.native.llm.model.id'),
+    },
     [AINativeSettingSectionsId.DeepseekApiKey]: {
       type: 'string',
       default: '',

package/src/browser/widget/inline-diff/inline-diff-manager.tsx

@@ -1,160 +1,38 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 
-import { Icon, Popover } from '@opensumi/ide-components';
-import { AppConfig, IDisposable, URI, localize, path, useInjectable } from '@opensumi/ide-core-browser';
-import { IResource, WorkbenchEditorService } from '@opensumi/ide-editor';
-import { Path } from '@opensumi/ide-utils/lib/path';
+import { Button } from '@opensumi/ide-components';
+import { localize, useInjectable } from '@opensumi/ide-core-browser';
+import { IResource } from '@opensumi/ide-editor';
 
 import { BaseApplyService } from '../../mcp/base-apply.service';
 
 import styles from './inline-diff-widget.module.less';
 
-const IconWithPopover = (props: {
-  icon: string;
-  content: string;
-  id: string;
-  onClick?: () => void;
-  disabled?: boolean;
-}) => (
-  <Popover content={props.content} id={props.id} onClick={props.onClick}>
-    <Icon iconClass={props.icon} className={props.disabled ? styles.disabled : ''} />
-  </Popover>
-);
-
 export const InlineDiffManager: React.FC<{ resource: IResource }> = (props) => {
-  const { resource } = props;
   const applyService = useInjectable<BaseApplyService>(BaseApplyService);
-  const editorService = useInjectable<WorkbenchEditorService>(WorkbenchEditorService);
-  const appConfig = useInjectable<AppConfig>(AppConfig);
   const [show, setShow] = useState(true);
-  const [changesCount, setChangesCount] = useState(0);
-  const [currentChangeIndex, setCurrentChangeIndex] = useState(0);
-  const [filePaths, setFilePaths] = useState<string[]>([]);
-
-  const currentFilePath = useMemo(
-    () => path.relative(appConfig.workspaceDir, resource.uri.path.toString()),
-    [resource],
-  );
-
   useEffect(() => {
-    const toDispose = applyService.onCodeBlockUpdate((codeBlock) => {
-      if (path.relative(appConfig.workspaceDir, props.resource.uri.path.toString()) === codeBlock.relativePath) {
-        setShow(codeBlock.status === 'pending');
-      }
-      const pendingPaths = applyService.getPendingPaths();
-      setFilePaths(pendingPaths);
+    applyService.onCodeBlockUpdate((codeBlock) => {
+      setShow(codeBlock.status === 'pending');
     });
-    return () => {
-      toDispose.dispose();
-    };
   }, []);
-
-  // 不同编辑器是不同实例，所以不需要监听
-  const decorationModelService = applyService.currentPreviewer?.getNode()?.livePreviewDiffDecorationModel;
-
-  useEffect(() => {
-    let toDispose: IDisposable | undefined;
-    if (decorationModelService) {
-      setChangesCount(decorationModelService.partialEditWidgetCount);
-      toDispose = decorationModelService.onPartialEditWidgetListChange((e) => {
-        setChangesCount(e.filter((item) => item.status === 'pending').length);
-      });
-    }
-    return () => {
-      toDispose?.dispose();
-    };
-  }, [decorationModelService]);
-
-  const handleSiblingChange = useCallback(
-    (direction: 'up' | 'down') => {
-      const index = decorationModelService?.revealSiblingChange(direction);
-      if (index !== undefined) {
-        setCurrentChangeIndex(index);
-      }
-    },
-    [decorationModelService],
-  );
-
-  const handleSiblingFile = useCallback(
-    (direction: 'up' | 'down') => {
-      const index = filePaths.indexOf(currentFilePath!);
-      if (index === -1) {
-        return;
-      }
-      const uri = URI.file(path.join(appConfig.workspaceDir, filePaths[index + (direction === 'up' ? -1 : 1)]));
-      editorService.open(uri);
-    },
-    [currentFilePath, filePaths],
-  );
-
-  const changeTip = useMemo(() => {
-    if (changesCount === 0) {
-      return '';
-    }
-    return ` ${currentChangeIndex + 1} of ${changesCount}`;
-  }, [changesCount, currentChangeIndex]);
-
-  const fileTip = useMemo(() => {
-    if (!currentFilePath) {
-      return '';
-    }
-    return ` ${filePaths.indexOf(currentFilePath) + 1} of ${filePaths.length}`;
-  }, [currentFilePath, filePaths]);
-
   return (
     <div className={styles.inlineDiffManager} style={{ display: show ? 'flex' : 'none' }}>
-      {/* <div className={styles.left}>
-        <IconWithPopover
-          icon='codicon codicon-issues'
-          content={localize('aiNative.inlineDiff.reveal')}
-          id='inline-diff-manager-reveal'
-          onClick={handleReveal}
-        />
-      </div> */}
-      <div className={styles.mid}>
-        <IconWithPopover
-          icon='codicon codicon-check'
-          onClick={() => applyService.processAll(props.resource.uri, 'accept')}
-          content={localize('aiNative.inlineDiff.acceptAll')}
-          id='inline-diff-manager-accept-all'
-        />
-        <IconWithPopover
-          icon='codicon codicon-close'
-          onClick={() => applyService.processAll(props.resource.uri, 'reject')}
-          content={localize('aiNative.inlineDiff.rejectAll')}
-          id='inline-diff-manager-reject-all'
-        />
-        <IconWithPopover
-          icon='codicon codicon-arrow-up'
-          content={localize('aiNative.inlineDiff.up') + changeTip}
-          id='inline-diff-manager-up'
-          disabled={currentChangeIndex === 0}
-          onClick={() => handleSiblingChange('up')}
-        />
-        <IconWithPopover
-          icon='codicon codicon-arrow-down'
-          content={localize('aiNative.inlineDiff.down') + changeTip}
-          id='inline-diff-manager-down'
-          disabled={currentChangeIndex === changesCount - 1}
-          onClick={() => handleSiblingChange('down')}
-        />
-      </div>
-      <div className={styles.right}>
-        <IconWithPopover
-          icon='codicon codicon-arrow-left'
-          onClick={() => handleSiblingFile('up')}
-          disabled={filePaths.length === 0 || filePaths[0] === currentFilePath}
-          content={localize('aiNative.inlineDiff.left') + fileTip}
-          id='inline-diff-manager-left'
-        />
-        <IconWithPopover
-          icon='codicon codicon-arrow-right'
-          onClick={() => handleSiblingFile('down')}
-          disabled={filePaths.length === 0 || filePaths[filePaths.length - 1] === currentFilePath}
-          content={localize('aiNative.inlineDiff.right') + fileTip}
-          id='inline-diff-manager-right'
-        />
-      </div>
+      <Button
+        onClick={() => {
+          applyService.processAll(props.resource.uri, 'accept');
+        }}
+      >
+        {localize('aiNative.inlineDiff.acceptAll')}
+      </Button>
+      <Button
+        type='ghost'
+        onClick={() => {
+          applyService.processAll(props.resource.uri, 'reject');
+        }}
+      >
+        {localize('aiNative.inlineDiff.rejectAll')}
+      </Button>
     </div>
   );
 };

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

@@ -1,6 +1,5 @@
 import { Autowired, INJECTOR_TOKEN, Injectable, Injector } from '@opensumi/di';
 import { Disposable, ErrorResponse, IDisposable, ReplyResponse } from '@opensumi/ide-core-common';
-import { WorkbenchEditorService } from '@opensumi/ide-editor';
 import { EOL, ICodeEditor, IPosition, ITextModel, Position, Selection } from '@opensumi/ide-monaco';
 import { ContentWidgetPositionPreference } from '@opensumi/ide-monaco/lib/browser/monaco-exports/editor';
 import { empty, getLeadingWhitespace } from '@opensumi/ide-utils/lib/strings';
@@ -15,12 +14,7 @@ import {
 
 import { EResultKind } from '../inline-chat/inline-chat.service';
 import { AIInlineContentWidget } from '../inline-chat/inline-content-widget';
-import {
-  BaseInlineStreamDiffHandler,
-  EComputerMode,
-  InlineStreamDiffHandler,
-  ReverseInlineStreamDiffHandler,
-} from '../inline-stream-diff/inline-stream-diff.handler';
+import { EComputerMode, InlineStreamDiffHandler } from '../inline-stream-diff/inline-stream-diff.handler';
 
 import { InlineDiffWidget } from './inline-diff-widget';
 
@@ -35,11 +29,6 @@ export interface IDiffPreviewerOptions {
    * 默认情况下，removed widget 会在 `runWhenIdle` 内被添加，如果需要立即添加，可以设置为 true
    */
   renderRemovedWidgetImmediately?: boolean;
-
-  /**
-   * 是否为回退模式，即 setValue 内容作为 original，编辑器 getValue 内容作为 modified
-   */
-  reverse?: boolean;
 }
 
 export interface IInlineDiffPreviewerNode extends IDisposable {
@@ -52,8 +41,6 @@ export abstract class BaseInlineDiffPreviewer<N extends IInlineDiffPreviewerNode
   @Autowired(INJECTOR_TOKEN)
   protected readonly injector: Injector;
 
-  @Autowired(WorkbenchEditorService)
-  protected readonly editorService: WorkbenchEditorService;
   protected inlineContentWidget: AIInlineContentWidget | null = null;
   protected selection: Selection;
   protected model: ITextModel;
@@ -137,7 +124,7 @@ export abstract class BaseInlineDiffPreviewer<N extends IInlineDiffPreviewerNode
     return Disposable.NULL;
   }
 
-  protected abstract createNode(reverse?: boolean): N;
+  protected abstract createNode(): N;
   abstract onData(data: ReplyResponse): void;
   abstract handleAction(action: EResultKind): void;
   abstract getPosition(): IPosition;
@@ -149,7 +136,7 @@ export abstract class BaseInlineDiffPreviewer<N extends IInlineDiffPreviewerNode
     },
   ): void {
     this.selection = selection;
-    this.node = this.createNode(options.reverse);
+    this.node = this.createNode();
     this.node.setPreviewerOptions(options);
   }
 
@@ -324,8 +311,8 @@ export class SideBySideInlineDiffWidget extends BaseInlineDiffPreviewer<InlineDi
 }
 
 @Injectable({ multiple: true })
-export class LiveInlineDiffPreviewer extends BaseInlineDiffPreviewer<BaseInlineStreamDiffHandler> {
-  private listenNode(node: BaseInlineStreamDiffHandler): void {
+export class LiveInlineDiffPreviewer extends BaseInlineDiffPreviewer<InlineStreamDiffHandler> {
+  private listenNode(node: InlineStreamDiffHandler): void {
     node.addDispose(node.onDidEditChange(() => this.layout()));
     node.addDispose(
       node.onPartialEditWidgetListChange((widgets) => {
@@ -344,13 +331,8 @@ export class LiveInlineDiffPreviewer extends BaseInlineDiffPreviewer<BaseInlineS
     this.addDispose(node);
   }
 
-  createNode(reverse?: boolean): BaseInlineStreamDiffHandler {
-    let node: BaseInlineStreamDiffHandler;
-    if (reverse) {
-      node = this.injector.get(ReverseInlineStreamDiffHandler, [this.monacoEditor]);
-    } else {
-      node = this.injector.get(InlineStreamDiffHandler, [this.monacoEditor]);
-    }
+  createNode(): InlineStreamDiffHandler {
+    const node = this.injector.get(InlineStreamDiffHandler, [this.monacoEditor]);
     node.initialize(this.selection);
     this.listenNode(node);
     return node;

package/src/browser/widget/inline-diff/inline-diff-widget.module.less

@@ -22,33 +22,12 @@
 
 .inlineDiffManager {
   display: flex;
-  border-radius: 13px;
-  align-items: center;
+  padding: 12px 16px;
+  justify-content: center;
   position: absolute;
-  bottom: 18px;
+  bottom: 0;
   left: 50%;
   transform: translateX(-50%);
-  overflow: hidden;
+  gap: 12px;
   z-index: 999;
-  > div {
-    display: flex;
-    align-items: center;
-  }
-  .mid {
-    border-right: 1px solid var(--design-borderColor);
-  }
-  :global(.codicon) {
-    font-size: 20px;
-    padding: 6px;
-    color: var(--kt-primaryButton-foreground);
-    background-color: var(--kt-primaryButton-hoverBackground);
-    &:hover {
-      background-color: var(--kt-primaryButton-background);
-    }
-  }
-}
-.disabled {
-  // color: var(--kt-button-disableForeground) !important;
-  background-color: var(--kt-button-disableBackground) !important;
-  cursor: not-allowed;
 }

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

@@ -3,7 +3,6 @@ import {
   AINativeSettingSectionsId,
   ChatResponse,
   Disposable,
-  DisposableCollection,
   Emitter,
   Event,
   IDisposable,
@@ -24,7 +23,7 @@ import { BaseAIMonacoEditorController } from '../../contrib/base';
 import { EInlineDiffPreviewMode } from '../../preferences/schema';
 import { InlineChatController } from '../inline-chat/inline-chat-controller';
 import { EResultKind } from '../inline-chat/inline-chat.service';
-import { BaseInlineStreamDiffHandler } from '../inline-stream-diff/inline-stream-diff.handler';
+import { InlineStreamDiffHandler } from '../inline-stream-diff/inline-stream-diff.handler';
 
 import {
   BaseInlineDiffPreviewer,
@@ -34,7 +33,7 @@ import {
 } from './inline-diff-previewer';
 import { InlineDiffWidget } from './inline-diff-widget';
 
-type IInlineDiffPreviewer = BaseInlineDiffPreviewer<InlineDiffWidget | BaseInlineStreamDiffHandler>;
+type IInlineDiffPreviewer = BaseInlineDiffPreviewer<InlineDiffWidget | InlineStreamDiffHandler>;
 
 export class InlineDiffController extends BaseAIMonacoEditorController {
   public static readonly ID = 'editor.contrib.ai.inline.diff';
@@ -119,26 +118,28 @@ export class InlineDiffController extends BaseAIMonacoEditorController {
       chatResponse?: ChatResponse | InlineChatController;
       previewerOptions?: IDiffPreviewerOptions;
     },
-  ): BaseInlineDiffPreviewer<InlineDiffWidget | BaseInlineStreamDiffHandler> {
+  ): BaseInlineDiffPreviewer<InlineDiffWidget | InlineStreamDiffHandler> {
     const { crossSelection, chatResponse } = options;
 
     const disposable = new Disposable();
 
     const previewer = this.createDiffPreviewer(monacoEditor, crossSelection, options.previewerOptions);
+    transaction((tx) => {
+      this.currentPreviewer.set(previewer, tx);
+      this.previewerStore.set(previewer.modelId, previewer);
+    });
 
     const onFinish = () => {
       previewer.layout();
       disposable.dispose();
     };
 
-    const previewerDisposable = new DisposableCollection();
-
     disposable.addDispose(
       previewer.onReady(() => {
         if (InlineChatController.is(chatResponse)) {
           const controller = chatResponse as InlineChatController;
 
-          previewerDisposable.pushAll([
+          disposable.addDispose([
             controller.onData((data) => {
               if (ReplyResponse.is(data)) {
                 this.renderDiff(previewer, data);
@@ -166,10 +167,6 @@ export class InlineDiffController extends BaseAIMonacoEditorController {
       }),
     );
 
-    previewer.onDispose(() => {
-      previewerDisposable.dispose();
-    });
-    disposable.addDispose(previewerDisposable);
     previewer.layout();
     return previewer;
   }
@@ -199,11 +196,6 @@ export class InlineDiffController extends BaseAIMonacoEditorController {
       }),
     );
 
-    transaction((tx) => {
-      this.currentPreviewer.set(previewer, tx);
-      this.previewerStore.set(previewer.modelId, previewer);
-    });
-
     return previewer;
   }