@opensumi/ide-ai-native 3.7.2-next-1740064823.0 → 3.7.2-next-1740107209.0

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

@@ -1,5 +1,4 @@
 import { z } from 'zod';
-import { zodToJsonSchema } from 'zod-to-json-schema';
 
 import { Autowired, Injectable } from '@opensumi/di';
 import { Domain } from '@opensumi/ide-core-common';
@@ -25,13 +24,13 @@ export class ReplaceOpenEditorFileTool implements MCPServerContribution {
       name: 'replace_open_in_editor_file_text',
       description:
         'Replaces the entire content of the currently active file in the IDE editor with specified new text. ' +
-        'Use this tool when you need to completely overwrite the current file\'s content. ' +
+        "Use this tool when you need to completely overwrite the current file's content. " +
         'Requires a text parameter containing the new content. ' +
         'Returns one of three possible responses: ' +
         '"ok" if the file content was successfully replaced, ' +
         '"no file open" if no editor is active, ' +
         '"unknown error" if the operation fails.',
-      inputSchema: zodToJsonSchema(inputSchema),
+      inputSchema,
       handler: this.handler.bind(this),
     };
   }
@@ -60,10 +59,12 @@ export class ReplaceOpenEditorFileTool implements MCPServerContribution {
       const fullRange = model.getFullModelRange();
 
       // Execute the replacement
-      editor.monacoEditor.executeEdits('mcp.tool.replace-file', [{
-        range: fullRange,
-        text: args.text,
-      }]);
+      editor.monacoEditor.executeEdits('mcp.tool.replace-file', [
+        {
+          range: fullRange,
+          text: args.text,
+        },
+      ]);
 
       logger.appendLine('Successfully replaced file content');
       return {

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

@@ -1,5 +1,4 @@
 import { z } from 'zod';
-import { zodToJsonSchema } from 'zod-to-json-schema';
 
 import { Autowired, Injectable } from '@opensumi/di';
 import { Domain } from '@opensumi/ide-core-common';
@@ -34,7 +33,7 @@ export class ReplaceOpenEditorFileByDiffPreviewerTool implements MCPServerContri
         '"ok" if the file content was successfully replaced, ' +
         '"no file open" if no editor is active, ' +
         '"unknown error" if the operation fails.',
-      inputSchema: zodToJsonSchema(inputSchema),
+      inputSchema,
       handler: this.handler.bind(this),
     };
   }

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

@@ -1,5 +1,4 @@
 import { z } from 'zod';
-import { zodToJsonSchema } from 'zod-to-json-schema';
 
 import { Autowired } from '@opensumi/di';
 import { AppConfig } from '@opensumi/ide-core-browser';
@@ -48,7 +47,7 @@ export class RunTerminalCommandTool implements MCPServerContribution {
       name: 'run_terminal_cmd',
       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: zodToJsonSchema(inputSchema),
+      inputSchema,
       handler: this.handler.bind(this),
     };
   }

package/src/browser/preferences/schema.ts

@@ -122,5 +122,10 @@ export const aiNativePreferenceSchema: PreferenceSchema = {
       type: 'boolean',
       default: false,
     },
+    [AINativeSettingSectionsId.SystemPrompt]: {
+      type: 'string',
+      default: '',
+      description: localize('preference.ai.native.chat.system.prompt.description'),
+    },
   },
 };

package/src/browser/types.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { ZodSchema } from 'zod';
 
 import { AIActionItem } from '@opensumi/ide-core-browser/lib/components/ai-native/index';
 import {
@@ -349,8 +350,9 @@ export interface MCPLogger {
 
 export interface MCPToolDefinition {
   name: string;
+  label?: string;
   description: string;
-  inputSchema: any; // JSON Schema
+  inputSchema: ZodSchema<any>; // JSON Schema
   handler: (
     args: any,
     logger: MCPLogger,
@@ -360,9 +362,21 @@ export interface MCPToolDefinition {
   }>;
 }
 
+export interface IMCPServerToolComponentProps {
+  state?: 'streaming-start' | 'streaming' | 'complete' | 'result';
+  args?: Record<string, any>;
+  result?: any;
+  index?: number;
+  messageId?: string;
+  toolCallId?: string;
+}
+
 export interface IMCPServerRegistry {
   registerMCPTool(tool: MCPToolDefinition): void;
   getMCPTools(): MCPToolDefinition[];
+  getMCPTool(name: string): MCPToolDefinition | undefined;
+  registerToolComponent(name: string, component: React.FC<IMCPServerToolComponentProps>): void;
+  getToolComponent(name: string): React.FC<IMCPServerToolComponentProps> | undefined;
   callMCPTool(
     name: string,
     args: any,
@@ -405,13 +419,3 @@ export interface IAIMiddleware {
     provideInlineCompletions?: IProvideInlineCompletionsSignature;
   };
 }
-
-export const ChatAgentPromptProvider = Symbol('ChatAgentPromptProvider');
-
-export interface ChatAgentPromptProvider {
-  /**
-   * 提供上下文提示
-   * @param context 上下文
-   */
-  provideContextPrompt(context: SerializedContext, userMessage: string): MaybePromise<string>;
-}

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

@@ -69,6 +69,10 @@ export class InlineStreamDiffHandler extends Disposable implements IInlineDiffPr
 
   public livePreviewDiffDecorationModel: LivePreviewDiffDecorationModel;
 
+  public get uri() {
+    return this.originalModel.uri;
+  }
+
   constructor(private readonly monacoEditor: ICodeEditor) {
     super();
 

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

@@ -65,6 +65,10 @@ export interface IPartialEditEvent {
    * 已添加行数
    */
   totalAddedLinesCount: number;
+  /**
+   * 已采纳的个数
+   */
+  acceptPartialEditCount: number;
   /**
    * 已删除行数
    */

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

@@ -426,6 +426,7 @@ export class LivePreviewDiffDecorationModel extends Disposable {
       uri: this.model.uri,
       totalPartialEditCount: this.partialEditWidgetList.length,
       resolvedPartialEditCount: this.partialEditWidgetList.filter((w) => w.isHidden).length,
+      acceptPartialEditCount: this.partialEditWidgetList.filter((w) => w.isAccepted).length,
       currentPartialEdit: {
         addedLinesCount,
         deletedLinesCount,

package/src/common/index.ts

@@ -179,6 +179,7 @@ export interface IChatAgentMetadata {
   fullName?: string;
   icon?: Uri;
   iconDark?: Uri;
+  systemPrompt?: string;
 }
 
 export interface IChatAgentRequest {

package/src/common/prompts/context-prompt-provider.ts

@@ -0,0 +1,46 @@
+import { Injectable } from '@opensumi/di';
+import { MaybePromise } from '@opensumi/ide-core-common/lib/utils';
+
+import { SerializedContext } from '../llm-context';
+
+export const ChatAgentPromptProvider = Symbol('ChatAgentPromptProvider');
+
+export interface ChatAgentPromptProvider {
+  /**
+   * 提供上下文提示
+   * @param context 上下文
+   */
+  provideContextPrompt(context: SerializedContext, userMessage: string): MaybePromise<string>;
+}
+
+@Injectable()
+export class DefaultChatAgentPromptProvider implements ChatAgentPromptProvider {
+  provideContextPrompt(context: SerializedContext, userMessage: string): MaybePromise<string> {
+    return `
+          <additional_data>
+          Below are some potentially helpful/relevant pieces of information for figuring out to respond
+          <recently_viewed_files>
+          ${context.recentlyViewFiles.map((file, idx) => `${idx + 1} : ${file}`)}
+          </recently_viewed_files>
+          <attached_files>
+          ${context.attachedFiles.map(
+            (file) =>
+              `
+          <file_contents>
+          \`\`\`${file.language} ${file.path}
+          ${file.content}
+          \`\`\`
+          </file_contents>
+          <linter_errors>
+          ${file.lineErrors.join('\n')}
+          </linter_errors>
+          `,
+          )}
+          
+          </attached_files>
+          </additional_data>
+          <user_query>
+          ${userMessage}
+          </user_query>`;
+  }
+}

package/src/common/utils.ts

@@ -48,3 +48,5 @@ export const extractCodeBlocks = (content: string): string => {
 
   return newContents.join('\n');
 };
+
+export const getToolName = (toolName: string, serverName = 'sumi-builtin') => `mcp_${serverName}_${toolName}`;

package/src/node/base-language-model.ts

@@ -52,6 +52,11 @@ export abstract class BaseLanguageModel {
       allFunctions,
       chatReadableStream,
       options.history || [],
+      options.modelId,
+      options.temperature,
+      options.topP,
+      options.topK,
+      options.providerOptions,
       cancellationToken,
     );
   }
@@ -65,7 +70,7 @@ export abstract class BaseLanguageModel {
     });
   }
 
-  protected abstract getModelIdentifier(provider: any): any;
+  protected abstract getModelIdentifier(provider: any, modelId?: string): any;
 
   protected async handleStreamingRequest(
     provider: any,
@@ -73,6 +78,11 @@ export abstract class BaseLanguageModel {
     tools: ToolRequest[],
     chatReadableStream: ChatReadableStream,
     history: IChatMessage[] = [],
+    modelId?: string,
+    temperature?: number,
+    topP?: number,
+    topK?: number,
+    providerOptions?: Record<string, any>,
     cancellationToken?: CancellationToken,
   ): Promise<any> {
     try {
@@ -92,15 +102,18 @@ export abstract class BaseLanguageModel {
         })),
         { role: 'user', content: request },
       ];
-
-      const stream = await streamText({
-        model: this.getModelIdentifier(provider),
+      const stream = streamText({
+        model: this.getModelIdentifier(provider, modelId),
         maxTokens: 4096,
         tools: aiTools,
         messages,
         abortSignal: abortController.signal,
         experimental_toolCallStreaming: true,
         maxSteps: 12,
+        temperature,
+        topP: topP || 0.8,
+        topK: topK || 1,
+        providerOptions,
       });
 
       for await (const chunk of stream.fullStream) {

package/src/node/mcp-server-manager-impl.ts

@@ -2,6 +2,7 @@ import { ILogger } from '@opensumi/ide-core-common';
 
 import { MCPServerDescription, MCPServerManager, MCPTool } from '../common/mcp-server-manager';
 import { IToolInvocationRegistryManager, ToolRequest } from '../common/tool-invocation-registry';
+import { getToolName } from '../common/utils';
 
 import { BuiltinMCPServer } from './mcp/sumi-mcp-server';
 import { IMCPServer, MCPServerImpl } from './mcp-server';
@@ -62,7 +63,7 @@ export class MCPServerManagerImpl implements MCPServerManager {
   }
 
   private convertToToolRequest(tool: MCPTool, serverName: string): ToolRequest {
-    const id = `mcp_${serverName}_${tool.name}`;
+    const id = getToolName(tool.name, serverName);
 
     return {
       id,

package/src/node/openai/openai-language-model.ts

@@ -19,7 +19,7 @@ export class OpenAIModel extends BaseLanguageModel {
     });
   }
 
-  protected getModelIdentifier(provider: OpenAIProvider) {
-    return provider('qwen-max');
+  protected getModelIdentifier(provider: OpenAIProvider, modelId?: string) {
+    return provider(modelId || 'qwen-max');
   }
 }