@opensumi/ide-ai-native 3.8.2-next-1741622293.0 → 3.8.3-next-1741661270.0

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/createNewFileWithText.ts

@@ -35,6 +35,7 @@ export class CreateNewFileWithTextTool implements MCPServerContribution {
     return {
       name: 'create_new_file_with_text',
       label: 'Create File',
+      order: 7,
       description:
         'Creates a new file at the specified path within the project directory and populates it with the provided text. ' +
         'Use this tool to generate new files in your project structure. ' +

package/src/browser/mcp/tools/editFile.ts

@@ -46,6 +46,7 @@ export class EditFileTool implements MCPServerContribution {
     return {
       name: 'edit_file',
       label: 'Edit File',
+      order: 5,
       description: `Use this tool to propose an edit to an existing file.
 This will be read by a less intelligent model, which will quickly apply the edit. You should make it clear what the edit is, while also minimizing the unchanged code you write.
 When writing the edit, you should specify each edit in sequence, with the special comment \`// ... existing code ...\` to represent unchanged code in between edited lines.

package/src/browser/mcp/tools/fileSearch.ts

@@ -41,6 +41,7 @@ export class FileSearchTool implements MCPServerContribution {
     return {
       name: 'file_search',
       label: 'Search Files',
+      order: 6,
       description:
         "Fast file search based on fuzzy matching against file path. Use if you know part of the file path but don't know where it's located exactly. Response will be capped to 10 results. Make your query more specific if need to filter results further.",
       inputSchema,

package/src/browser/mcp/tools/getDiagnosticsByPath.ts

@@ -29,7 +29,8 @@ export class GetDiagnosticsByPathTool implements MCPServerContribution {
   getToolDefinition(): MCPToolDefinition {
     return {
       name: 'get_diagnostics_by_path',
-      label: 'Get Diagnostics',
+      label: 'Get Diagnostics By Path',
+      order: 9,
       description:
         'Retrieves diagnostic information (errors, warnings, etc.) from a specific file in the project. ' +
         'Use this tool to get information about problems in any project file. ' +

package/src/browser/mcp/tools/getOpenEditorFileDiagnostics.ts

@@ -31,6 +31,8 @@ export class GetOpenEditorFileDiagnosticsTool implements MCPServerContribution {
   getToolDefinition(): MCPToolDefinition {
     return {
       name: 'get_open_in_editor_file_diagnostics',
+      label: 'Get Current Editor Diagnostics',
+      order: 8,
       description:
         'Retrieves diagnostic information (errors, warnings, etc.) from the currently active file in VS Code editor. ' +
         'Use this tool to get information about problems in your current file. ' +

package/src/browser/mcp/tools/grepSearch.ts

@@ -48,6 +48,7 @@ export class GrepSearchTool implements MCPServerContribution {
     return {
       name: 'grep_search',
       label: 'Search Contents',
+      order: 4,
       description:
         // TODO: 支持语义化搜索后需要描述清楚优劣势
         'Fast text-based regex search that finds exact pattern matches within files or directories, utilizing the ripgrep command for efficient searching.\nResults will be formatted in the style of ripgrep and can be configured to include line numbers and content.\nTo avoid overwhelming output, the results are capped at 50 matches.\nUse the include or exclude patterns to filter the search scope by file type or specific paths.\n\nThis is best for finding exact text matches or regex patterns.',

package/src/browser/mcp/tools/listDir.ts

@@ -41,6 +41,7 @@ export class ListDirTool implements MCPServerContribution {
     return {
       name: 'list_dir',
       label: 'List Directory',
+      order: 3,
       description:
         'List the contents of a directory. The quick tool to use for discovery, before using more targeted tools like semantic search or file reading. Useful to try to understand the file structure before diving deeper into specific files. Can be used to explore the codebase.',
       inputSchema,

package/src/browser/mcp/tools/readFile.ts

@@ -38,6 +38,7 @@ export class ReadFileTool implements MCPServerContribution {
     return {
       name: 'read_file',
       label: 'Read File',
+      order: 1,
       description: `Read the contents of a file (and the outline).
 
 When using this tool to gather information, it's your responsibility to ensure you have the COMPLETE context. Each time you call this command you should:

package/src/browser/mcp/tools/runTerminalCmd.ts

@@ -33,6 +33,7 @@ export class RunTerminalCommandTool implements MCPServerContribution {
     return {
       name: 'run_terminal_cmd',
       label: 'Run Command',
+      order: 2,
       description:
         "PROPOSE a command to run on behalf of the user.\nIf you have this tool, note that you DO have the ability to run commands directly on the USER's system.\n\nAdhere to these rules:\n1. Based on the contents of the conversation, you will be told if you are in the same shell as a previous step or a new shell.\n2. If in a new shell, you should `cd` to the right directory and do necessary setup in addition to running the command.\n3. If in the same shell, the state will persist, no need to do things like `cd` to the same directory.\n4. For ANY commands that would use a pager, you should append ` | cat` to the command (or whatever is appropriate). You MUST do this for: git, less, head, tail, more, etc.\n5. For commands that are long running/expected to run indefinitely until interruption, please run them in the background. To run jobs in the background, set `is_background` to true rather than changing the details of the command.\n6. Dont include any newlines in the command.",
       inputSchema,

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

@@ -29,7 +29,6 @@ export class MsgHistoryManager extends Disposable {
   public clearMessages() {
     this.messageMap.clear();
     this.messageAdditionalMap.clear();
-    this.startIndex = 0;
   }
 
   private doAddMessage(message: IExcludeMessage): string {
@@ -53,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/types.ts

@@ -350,6 +350,7 @@ export interface MCPLogger {
 export interface MCPToolDefinition {
   name: string;
   label?: string;
+  order?: number;
   description: string;
   inputSchema: ZodSchema<any>; // JSON Schema
   handler: (

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

@@ -3,6 +3,7 @@ import React, { useCallback, useEffect, useMemo, 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 { BaseApplyService } from '../../mcp/base-apply.service';
 
@@ -113,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/prompts/context-prompt-provider.ts

@@ -42,15 +42,11 @@ ${context.recentlyViewFiles.map((file, idx) => `    ${idx + 1}: ${file}`).join('
               `,
     )}
   </attached_files>
-${
-  currentModel
-    ? `<current_opened_file>
+${currentModel ? `<current_opened_file>
   \`\`\`${currentModel.languageId} ${currentModel.uri.toString()}
 ${currentModel.getText()}
   \`\`\`
-  </current_opened_file>`
-    : ''
-}
+  </current_opened_file>` : ''}
 </additional_data>
 <user_query>
 ${userMessage}

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;
+  };
+}