@opensumi/ide-ai-native 3.8.2-next-1741418699.0 → 3.8.2

package/src/browser/mcp/tools/components/EditFile.tsx

@@ -12,13 +12,13 @@ import {
   path,
   useInjectable,
 } from '@opensumi/ide-core-browser';
-import { Loading } from '@opensumi/ide-core-browser/lib/components/ai-native';
 import { WorkbenchEditorService } from '@opensumi/ide-editor';
 import { ILanguageService } from '@opensumi/monaco-editor-core/esm/vs/editor/common/languages/language';
 import { IModelService } from '@opensumi/monaco-editor-core/esm/vs/editor/common/services/model';
 import { StandaloneServices } from '@opensumi/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
 
 import { CodeBlockData } from '../../../../common/types';
+import { ApplyStatus } from '../../../components/ApplyStatus';
 import { ChatMarkdown } from '../../../components/ChatMarkdown';
 import { IMCPServerToolComponentProps } from '../../../types';
 import { BaseApplyService } from '../../base-apply.service';
@@ -76,7 +76,7 @@ export const EditFileToolComponent = (props: IMCPServerToolComponentProps) => {
   }
 
   return [
-    instructions && <p>{instructions}</p>,
+    instructions && <p key={'edit-file-tool-instructions'}>{instructions}</p>,
     <div className={styles['edit-file-tool']} key={'edit-file-tool'}>
       <div
         className={cls(styles['edit-file-tool-header'], {
@@ -96,7 +96,7 @@ export const EditFileToolComponent = (props: IMCPServerToolComponentProps) => {
           {codeBlockData.iterationCount > 1 && (
             <span className={styles['edit-file-tool-iteration-count']}>{codeBlockData.iterationCount}/3</span>
           )}
-          {renderStatus(codeBlockData, props.result)}
+          <ApplyStatus status={codeBlockData.status} error={props.result} />
         </div>
         <div className={styles.right}>
           <Popover title={'Show Code'} id={'edit-file-tool-show-code'}>
@@ -137,37 +137,3 @@ export const EditFileToolComponent = (props: IMCPServerToolComponentProps) => {
     ),
   ];
 };
-
-const renderStatus = (codeBlockData: CodeBlockData, error?: string) => {
-  const status = codeBlockData.status;
-  switch (status) {
-    case 'generating':
-      return <Loading />;
-    case 'pending':
-      return (
-        <Popover title='Pending' id={'edit-file-tool-status-pending'}>
-          <Icon iconClass='codicon codicon-circle-large' />
-        </Popover>
-      );
-    case 'success':
-      return (
-        <Popover title='Success' id={'edit-file-tool-status-success'}>
-          <Icon iconClass='codicon codicon-check-all' />
-        </Popover>
-      );
-    case 'failed':
-      return (
-        <Popover title={`Failed (${error})`} id={'edit-file-tool-status-failed'}>
-          <Icon iconClass='codicon codicon-error' style={{ color: 'var(--debugConsole-errorForeground)' }} />
-        </Popover>
-      );
-    case 'cancelled':
-      return (
-        <Popover title='Cancelled' id={'edit-file-tool-status-cancelled'}>
-          <Icon iconClass='codicon codicon-close' style={{ color: 'var(--input-placeholderForeground)' }} />
-        </Popover>
-      );
-    default:
-      return null;
-  }
-};

package/src/browser/mcp/tools/components/ExpandableFileList.tsx

@@ -71,7 +71,9 @@ const ExpandableFileList: React.FC<ExpandableFileListProps> = ({
 
   useEffect(() => {
     const toDispose = chatService.sessionModel.history.onMessageAdditionalChange((additional) => {
-      setFileList(additional[toolCallId]?.files || []);
+      if (additional[toolCallId]) {
+        setFileList(additional[toolCallId].files || []);
+      }
     });
     return () => {
       toDispose.dispose();

package/src/browser/mcp/tools/handlers/EditFile.ts

@@ -13,8 +13,8 @@ export class EditFileHandler {
   private applyService: BaseApplyService;
 
   async handler(params: { targetFile: string; codeEdit: string; instructions?: string }, toolCallId: string) {
-    const { targetFile, codeEdit } = params;
-    const block = await this.applyService.registerCodeBlock(targetFile, codeEdit, toolCallId);
+    const { targetFile, codeEdit, instructions } = params;
+    const block = await this.applyService.registerCodeBlock(targetFile, codeEdit, toolCallId, instructions);
     const blockData = await this.applyService.apply(block);
     return blockData;
   }

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

@@ -1,7 +1,5 @@
-import { Injectable } from '@opensumi/di';
 import { Disposable, Emitter, Event, uuid } from '@opensumi/ide-core-common';
-import { ChatMessageRole } from '@opensumi/ide-core-common/lib/types/ai-native';
-import { IHistoryChatMessage } from '@opensumi/ide-core-common/lib/types/ai-native';
+import { ChatMessageRole, IHistoryChatMessage } from '@opensumi/ide-core-common/lib/types/ai-native';
 
 type IExcludeMessage = Omit<IHistoryChatMessage, 'id' | 'order'>;
 
@@ -31,7 +29,6 @@ export class MsgHistoryManager extends Disposable {
   public clearMessages() {
     this.messageMap.clear();
     this.messageAdditionalMap.clear();
-    this.startIndex = 0;
   }
 
   private doAddMessage(message: IExcludeMessage): string {
@@ -55,19 +52,13 @@ export class MsgHistoryManager extends Disposable {
     return Array.from(this.messageMap.values()).sort((a, b) => a.order - b.order);
   }
 
-  private startIndex = 0;
-
-  public get slicedMessageCount(): number {
-    return this.startIndex;
-  }
-
   public get lastMessageId(): string | undefined {
     const list = this.messageList;
     return list[list.length - 1]?.id;
   }
 
   public getMessages(): IHistoryChatMessage[] {
-    return this.messageList.slice(this.startIndex);
+    return this.messageList;
   }
 
   public addUserMessage(

package/src/browser/preferences/schema.ts

@@ -97,6 +97,14 @@ export const aiNativePreferenceSchema: PreferenceSchema = {
       default: '',
       description: localize('preference.ai.native.openai.baseURL.description'),
     },
+    [AINativeSettingSectionsId.ContextWindow]: {
+      type: 'number',
+      description: localize('preference.ai.native.contextWindow.description'),
+    },
+    [AINativeSettingSectionsId.MaxTokens]: {
+      type: 'number',
+      description: localize('preference.ai.native.maxTokens.description'),
+    },
     [AINativeSettingSectionsId.MCPServers]: {
       type: 'array',
       default: [],

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

@@ -114,13 +114,13 @@ export const InlineDiffManager: React.FC<{ resource: IResource }> = (props) => {
       <div className={styles.mid}>
         <IconWithPopover
           icon='codicon codicon-check'
-          onClick={() => applyService.processAll(props.resource.uri, 'accept')}
+          onClick={() => applyService.processAll('accept', props.resource.uri)}
           content={localize('aiNative.inlineDiff.acceptAll')}
           id='inline-diff-manager-accept-all'
         />
         <IconWithPopover
           icon='codicon codicon-close'
-          onClick={() => applyService.processAll(props.resource.uri, 'reject')}
+          onClick={() => applyService.processAll('reject', props.resource.uri)}
           content={localize('aiNative.inlineDiff.rejectAll')}
           id='inline-diff-manager-reject-all'
         />

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

@@ -23,7 +23,6 @@ import {
 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 {
@@ -34,6 +33,8 @@ import {
 } from './inline-diff-previewer';
 import { InlineDiffWidget } from './inline-diff-widget';
 
+import type { EResultKind } from '../inline-chat/inline-chat.service';
+
 type IInlineDiffPreviewer = BaseInlineDiffPreviewer<InlineDiffWidget | BaseInlineStreamDiffHandler>;
 
 export class InlineDiffController extends BaseAIMonacoEditorController {

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

@@ -1,10 +1,11 @@
 import { Injectable } from '@opensumi/di';
 import { Emitter } from '@opensumi/ide-utils';
 
-import { IPartialEditEvent } from '../inline-stream-diff/live-preview.component';
+import type { IInlineDiffService } from '../../../common/index';
+import type { IPartialEditEvent } from '../../../common/types';
 
 @Injectable()
-export class InlineDiffService {
+export class InlineDiffService implements IInlineDiffService {
   /**
    * Used in `codeblitz`, do not remove it.
    */

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

@@ -11,13 +11,13 @@ import { IModelService } from '@opensumi/monaco-editor-core/esm/vs/editor/common
 import { LineTokens } from '@opensumi/monaco-editor-core/esm/vs/editor/common/tokens/lineTokens';
 import { UndoRedoGroup } from '@opensumi/monaco-editor-core/esm/vs/platform/undoRedo/common/undoRedo';
 
-import { IDecorationSerializableState } from '../../model/enhanceDecorationsCollection';
-import { IDiffPreviewerOptions, IInlineDiffPreviewerNode } from '../inline-diff/inline-diff-previewer';
-
 import { InlineStreamDiffComputer } from './inline-stream-diff-computer';
-import { IRemovedWidgetState } from './live-preview.component';
 import { LivePreviewDiffDecorationModel } from './live-preview.decoration';
 
+import type { IRemovedWidgetState } from './live-preview.component';
+import type { IDecorationSerializableState } from '../../model/enhanceDecorationsCollection';
+import type { IDiffPreviewerOptions, IInlineDiffPreviewerNode } from '../inline-diff/inline-diff-previewer';
+
 interface IRangeChangeData {
   removedTextLines: string[];
   removedLinesOriginalRange: LineRange;

package/src/browser/widget/inline-stream-diff/live-preview.component.tsx

@@ -46,40 +46,6 @@ export interface IRemovedWidgetState {
   position: IPosition;
 }
 
-export enum EPartialEdit {
-  accept = 'accept',
-  discard = 'discard',
-}
-
-export interface IPartialEditEvent {
-  uri: URI;
-  /**
-   * 总 diff 数
-   */
-  totalPartialEditCount: number;
-  /**
-   * 已处理的个数
-   */
-  resolvedPartialEditCount: number;
-  /**
-   * 已添加行数
-   */
-  totalAddedLinesCount: number;
-  /**
-   * 已采纳的个数
-   */
-  acceptPartialEditCount: number;
-  /**
-   * 已删除行数
-   */
-  totalDeletedLinesCount: number;
-  currentPartialEdit: {
-    type: EPartialEdit;
-    addedLinesCount: number;
-    deletedLinesCount: number;
-  };
-}
-
 export interface ITextLinesTokens {
   text: string;
   lineTokens: LineTokens;

package/src/browser/widget/inline-stream-diff/live-preview.decoration.tsx

@@ -19,9 +19,10 @@ import { LineRange } from '@opensumi/monaco-editor-core/esm/vs/editor/common/cor
 import { ModelDecorationOptions } from '@opensumi/monaco-editor-core/esm/vs/editor/common/model/textModel';
 import { IUndoRedoService, UndoRedoGroup } from '@opensumi/monaco-editor-core/esm/vs/platform/undoRedo/common/undoRedo';
 
+import { IInlineDiffService, InlineDiffServiceToken } from '../../../common';
+import { EPartialEdit, IPartialEditEvent } from '../../../common/types';
 import { AINativeContextKey } from '../../ai-core.contextkeys';
 import { IDecorationSerializableState, IEnhanceModelDeltaDecoration } from '../../model/enhanceDecorationsCollection';
-import { InlineDiffService } from '../inline-diff';
 
 import styles from './inline-stream-diff.module.less';
 import { InlineStreamDiffService } from './inline-stream-diff.service';
@@ -31,8 +32,6 @@ import {
   ActiveLineDecoration,
   AddedRangeDecoration,
   AddedRangeDecorationsCollection,
-  EPartialEdit,
-  IPartialEditEvent,
   IPartialEditWidgetOptions,
   IRemovedWidgetState,
   IRemovedZoneWidgetOptions,
@@ -66,8 +65,8 @@ export class LivePreviewDiffDecorationModel extends Disposable {
   @Autowired(InlineStreamDiffService)
   private readonly inlineStreamDiffService: InlineStreamDiffService;
 
-  @Autowired(InlineDiffService)
-  private readonly inlineDiffService: InlineDiffService;
+  @Autowired(InlineDiffServiceToken)
+  private readonly inlineDiffService: IInlineDiffService;
 
   @Autowired(IMessageService)
   private readonly messageService: IMessageService;
@@ -537,15 +536,15 @@ export class LivePreviewDiffDecorationModel extends Disposable {
   }
 
   public acceptUnProcessed(): void {
-    const showingWidgets = this.partialEditWidgetList.filter((widget) => !widget.isHidden);
-    showingWidgets.forEach((widget) => {
+    const pendingWidgets = this.partialEditWidgetList.filter((widget) => widget.isPending);
+    pendingWidgets.forEach((widget) => {
       this.handlePartialEditAction(EPartialEdit.accept, widget, false);
     });
   }
 
   public discardUnProcessed(): void {
-    const showingWidgets = this.partialEditWidgetList.filter((widget) => !widget.isHidden);
-    showingWidgets.forEach((widget) => {
+    const pendingWidgets = this.partialEditWidgetList.filter((widget) => widget.isPending);
+    pendingWidgets.forEach((widget) => {
       this.handlePartialEditAction(EPartialEdit.discard, widget, false);
     });
   }

package/src/common/index.ts

@@ -16,7 +16,7 @@ import { DESIGN_MENUBAR_CONTAINER_VIEW_ID } from '@opensumi/ide-design/lib/commo
 import { IPosition, ITextModel, InlineCompletionContext } from '@opensumi/ide-monaco/lib/common';
 
 import { MCPServerDescription } from './mcp-server-manager';
-import { MCPTool } from './types';
+import { IPartialEditEvent, MCPTool } from './types';
 
 import type { CoreMessage } from 'ai';
 
@@ -37,7 +37,7 @@ export const AI_CHAT_LOGO_AVATAR_ID = 'AI-Chat-Logo-Avatar';
 export const AI_MENU_BAR_DEBUG_TOOLBAR = 'AI_MENU_BAR_DEBUG_TOOLBAR';
 
 // 内置 MCP 服务器名称
-export const BUILTIN_MCP_SERVER_NAME = 'sumi-builtin';
+export const BUILTIN_MCP_SERVER_NAME = 'builtin';
 
 /**
  * @deprecated Use {@link DESIGN_MENUBAR_CONTAINER_VIEW_ID} instead
@@ -309,3 +309,10 @@ export interface IAIInlineCompletionsProvider {
   ): Promise<T>;
   setVisibleCompletion(arg0: boolean): void;
 }
+
+export interface IInlineDiffService {
+  onPartialEdit: Event<IPartialEditEvent>;
+  firePartialEdit(event: IPartialEditEvent): void;
+}
+
+export const InlineDiffServiceToken = Symbol('InlineDiffService');

package/src/common/types.ts

@@ -1,4 +1,5 @@
 import { IMarker } from '@opensumi/ide-core-browser';
+import { Uri } from '@opensumi/monaco-editor-core';
 
 export enum NearestCodeBlockType {
   Block = 'block',
@@ -83,3 +84,37 @@ export interface CodeBlockData {
 }
 
 export type CodeBlockStatus = 'generating' | 'pending' | 'success' | 'rejected' | 'failed' | 'cancelled';
+
+export enum EPartialEdit {
+  accept = 'accept',
+  discard = 'discard',
+}
+
+export interface IPartialEditEvent {
+  uri: Uri;
+  /**
+   * 总 diff 数
+   */
+  totalPartialEditCount: number;
+  /**
+   * 已处理的个数
+   */
+  resolvedPartialEditCount: number;
+  /**
+   * 已添加行数
+   */
+  totalAddedLinesCount: number;
+  /**
+   * 已采纳的个数
+   */
+  acceptPartialEditCount: number;
+  /**
+   * 已删除行数
+   */
+  totalDeletedLinesCount: number;
+  currentPartialEdit: {
+    type: EPartialEdit;
+    addedLinesCount: number;
+    deletedLinesCount: number;
+  };
+}