@opensumi/ide-ai-native 3.8.1-next-1741232004.0 → 3.8.1-next-1741250387.0

package/src/common/types.ts

@@ -34,12 +34,6 @@ export interface IMCPServerProxyService {
   $getMCPTools(): Promise<MCPTool[]>;
   // 通知前端 MCP 服务注册表发生了变化
   $updateMCPServers(): Promise<void>;
-  // 获取所有 MCP 服务器列表
-  $getServers(): Promise<Array<{ name: string; isStarted: boolean }>>;
-  // 启动指定的 MCP 服务器
-  $startServer(serverName: string): Promise<void>;
-  // 停止指定的 MCP 服务器
-  $stopServer(serverName: string): Promise<void>;
 }
 
 export interface MCPTool {
@@ -50,10 +44,8 @@ export interface MCPTool {
 }
 
 export interface CodeBlockData {
-  messageId: string;
   toolCallId: string;
   codeEdit: string;
-  originalCode: string;
   updatedCode?: string;
   relativePath: string;
   status: CodeBlockStatus;

package/src/common/utils.ts

@@ -1,7 +1,5 @@
 import { IEditorDocumentModel } from '@opensumi/ide-editor';
 
-import { BUILTIN_MCP_SERVER_NAME } from './index';
-
 const BACK_QUOTE_3_SYMBOL = '```';
 const MIN_PROMPT_CHARS = 10;
 
@@ -51,4 +49,4 @@ export const extractCodeBlocks = (content: string): string => {
   return newContents.join('\n');
 };
 
-export const getToolName = (toolName: string, serverName = BUILTIN_MCP_SERVER_NAME) => `mcp_${serverName}_${toolName}`;
+export const getToolName = (toolName: string, serverName = 'sumi-builtin') => `mcp_${serverName}_${toolName}`;

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

@@ -4,7 +4,6 @@ import { Injectable } from '@opensumi/di';
 import { IAIBackServiceOption } from '@opensumi/ide-core-common';
 import { AINativeSettingSectionsId } from '@opensumi/ide-core-common/lib/settings/ai-native';
 
-import { ModelInfo, anthropicModels } from '../../common/model';
 import { BaseLanguageModel } from '../base-language-model';
 
 export const AnthropicModelIdentifier = Symbol('AnthropicModelIdentifier');
@@ -20,11 +19,7 @@ export class AnthropicModel extends BaseLanguageModel {
     return createAnthropic({ apiKey });
   }
 
-  protected getModelIdentifier(provider: AnthropicProvider, modelId = 'claude-3-5-sonnet-20241022') {
-    return provider(modelId);
-  }
-
-  protected getModelInfo(modelId: string): ModelInfo | undefined {
-    return anthropicModels[modelId];
+  protected getModelIdentifier(provider: AnthropicProvider) {
+    return provider('claude-3-5-sonnet-20241022');
   }
 }

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

@@ -1,11 +1,10 @@
 import { CoreMessage, ToolExecutionOptions, jsonSchema, streamText, tool } from 'ai';
 
 import { Autowired, Injectable } from '@opensumi/di';
-import { IAIBackServiceOption } from '@opensumi/ide-core-common';
+import { ChatMessageRole, IAIBackServiceOption, IChatMessage } from '@opensumi/ide-core-common';
 import { ChatReadableStream } from '@opensumi/ide-core-node';
 import { CancellationToken } from '@opensumi/ide-utils';
 
-import { ModelInfo } from '../common';
 import {
   IToolInvocationRegistryManager,
   ToolInvocationRegistryManager,
@@ -14,13 +13,26 @@ import {
 
 @Injectable()
 export abstract class BaseLanguageModel {
-  static ModelOptions: Record<string, ModelInfo>;
-
   @Autowired(ToolInvocationRegistryManager)
   protected readonly toolInvocationRegistryManager: IToolInvocationRegistryManager;
 
   protected abstract initializeProvider(options: IAIBackServiceOption): any;
 
+  private convertChatMessageRole(role: ChatMessageRole) {
+    switch (role) {
+      case ChatMessageRole.System:
+        return 'system';
+      case ChatMessageRole.User:
+        return 'user';
+      case ChatMessageRole.Assistant:
+        return 'assistant';
+      case ChatMessageRole.Function:
+        return 'tool';
+      default:
+        return 'user';
+    }
+  }
+
   async request(
     request: string,
     chatReadableStream: ChatReadableStream,
@@ -29,14 +41,11 @@ export abstract class BaseLanguageModel {
   ): Promise<any> {
     const provider = this.initializeProvider(options);
     const clientId = options.clientId;
-
-    let allFunctions: ToolRequest[] = [];
-    // 如果没有传入 clientId，则不使用工具
-    if (clientId) {
-      const registry = this.toolInvocationRegistryManager.getRegistry(clientId);
-      allFunctions = options.noTool ? [] : registry.getAllFunctions();
+    if (!clientId) {
+      throw new Error('clientId is required');
     }
-
+    const registry = this.toolInvocationRegistryManager.getRegistry(clientId);
+    const allFunctions = options.noTool ? [] : registry.getAllFunctions();
     return this.handleStreamingRequest(
       provider,
       request,
@@ -44,10 +53,11 @@ export abstract class BaseLanguageModel {
       chatReadableStream,
       options.history || [],
       options.modelId,
+      options.temperature,
+      options.topP,
+      options.topK,
       options.providerOptions,
       options.trimTexts,
-      options.system,
-      options.maxTokens,
       cancellationToken,
     );
   }
@@ -64,19 +74,18 @@ export abstract class BaseLanguageModel {
 
   protected abstract getModelIdentifier(provider: any, modelId?: string): any;
 
-  protected abstract getModelInfo(modelId: string): ModelInfo | undefined;
-
   protected async handleStreamingRequest(
     provider: any,
     request: string,
     tools: ToolRequest[],
     chatReadableStream: ChatReadableStream,
-    history: CoreMessage[] = [],
+    history: IChatMessage[] = [],
     modelId?: string,
+    temperature?: number,
+    topP?: number,
+    topK?: number,
     providerOptions?: Record<string, any>,
     trimTexts?: [string, string],
-    systemPrompt?: string,
-    maxTokens?: number,
     cancellationToken?: CancellationToken,
   ): Promise<any> {
     try {
@@ -89,20 +98,24 @@ export abstract class BaseLanguageModel {
         });
       }
 
-      const messages: CoreMessage[] = [...history, { role: 'user', content: request }];
-      const modelInfo = modelId ? this.getModelInfo(modelId) : undefined;
+      const messages: CoreMessage[] = [
+        ...history.map((msg) => ({
+          role: this.convertChatMessageRole(msg.role) as any, // 这个 SDK 包里的类型不太好完全对应，
+          content: msg.content,
+        })),
+        { role: 'user', content: request },
+      ];
       const stream = streamText({
         model: this.getModelIdentifier(provider, modelId),
+        maxTokens: 4096,
         tools: aiTools,
         messages,
         abortSignal: abortController.signal,
         experimental_toolCallStreaming: true,
         maxSteps: 12,
-        maxTokens,
-        temperature: modelInfo?.temperature || 0,
-        topP: modelInfo?.topP || 0.8,
-        topK: modelInfo?.topK || 1,
-        system: systemPrompt,
+        temperature,
+        topP: topP || 0.8,
+        topK: topK || 1,
         providerOptions,
       });
 

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

@@ -4,7 +4,6 @@ import { Injectable } from '@opensumi/di';
 import { IAIBackServiceOption } from '@opensumi/ide-core-common';
 import { AINativeSettingSectionsId } from '@opensumi/ide-core-common/lib/settings/ai-native';
 
-import { ModelInfo, deepSeekModels } from '../../common';
 import { BaseLanguageModel } from '../base-language-model';
 
 export const DeepSeekModelIdentifier = Symbol('DeepSeekModelIdentifier');
@@ -20,11 +19,7 @@ export class DeepSeekModel extends BaseLanguageModel {
     return createDeepSeek({ apiKey });
   }
 
-  protected getModelIdentifier(provider: DeepSeekProvider, modelId = 'deepseek-chat') {
-    return provider(modelId);
-  }
-
-  protected getModelInfo(modelId: string): ModelInfo | undefined {
-    return deepSeekModels[modelId];
+  protected getModelIdentifier(provider: DeepSeekProvider) {
+    return provider('deepseek-chat');
   }
 }

package/src/node/mcp/sumi-mcp-server.ts

@@ -10,11 +10,11 @@ import { RPCService } from '@opensumi/ide-connection';
 import { ILogger } from '@opensumi/ide-core-common';
 import { INodeLogger } from '@opensumi/ide-core-node';
 
-import { BUILTIN_MCP_SERVER_NAME, ISumiMCPServerBackend } from '../../common';
-import { IMCPServer, MCPServerDescription } from '../../common/mcp-server-manager';
+import { ISumiMCPServerBackend } from '../../common';
+import { MCPServerDescription, MCPServerManager } from '../../common/mcp-server-manager';
 import { IToolInvocationRegistryManager, ToolInvocationRegistryManager } from '../../common/tool-invocation-registry';
 import { IMCPServerProxyService, MCPTool } from '../../common/types';
-import { StdioMCPServerImpl } from '../mcp-server';
+import { IMCPServer } from '../mcp-server';
 import { MCPServerManagerImpl } from '../mcp-server-manager-impl';
 
 // 每个 BrowserTab 都对应了一个 SumiMCPServerBackend 实例
@@ -55,6 +55,7 @@ export class SumiMCPServerBackend extends RPCService<IMCPServerProxyService> imp
     }
     // 获取 MCP 工具
     const tools = await this.client.$getMCPTools();
+    this.logger.log('[Node backend] SUMI MCP tools', tools);
     return tools;
   }
 
@@ -80,10 +81,10 @@ export class SumiMCPServerBackend extends RPCService<IMCPServerProxyService> imp
     }));
   }
 
-  public async initBuiltinMCPServer(enabled: boolean) {
+  public async initBuiltinMCPServer() {
     const builtinMCPServer = new BuiltinMCPServer(this, this.logger);
     this.mcpServerManager.setClientId(this.clientId);
-    await this.mcpServerManager.initBuiltinServer(builtinMCPServer, enabled);
+    await this.mcpServerManager.initBuiltinServer(builtinMCPServer);
     this.client?.$updateMCPServers();
   }
 
@@ -129,72 +130,12 @@ export class SumiMCPServerBackend extends RPCService<IMCPServerProxyService> imp
 
     return this.server;
   }
-
-  async getServers() {
-    const servers = Array.from(this.mcpServerManager.getServers().entries());
-    const serverInfos = await Promise.all(
-      servers.map(async ([serverName, server]) => {
-        let toolNames: string[] = [];
-        if (server.isStarted()) {
-          // 只获取正在运行的 MCP Server 的工具列表
-          const toolsResponse = await server.getTools();
-          toolNames = toolsResponse.tools.map((tool) => tool.name);
-        }
-
-        // OpenSumi 内置的 MCP Server
-        if (serverName === BUILTIN_MCP_SERVER_NAME) {
-          return {
-            name: server.getServerName(),
-            isStarted: server.isStarted(),
-            type: 'builtin rpc',
-            tools: toolNames,
-          };
-        }
-
-        // 第三方 Stdio 类型的 MCP Server
-        if (server instanceof StdioMCPServerImpl) {
-          return {
-            name: server.getServerName(),
-            isStarted: server.isStarted(),
-            type: 'stdio',
-            command: server.command + ' ' + (server.args?.join(' ') || ''),
-            tools: toolNames,
-          };
-        }
-
-        // TODO SSE 类型的 MCP Server
-
-        return {
-          name: server.getServerName(),
-          isStarted: server.isStarted(),
-          type: '[MOCK] stdio',
-          command: '[MOCK] npx sumi-ide-mcp-server',
-          tools: toolNames,
-        };
-      }),
-    );
-
-    // 将 builtin server 放在第一位
-    const builtinServer = serverInfos.find((server) => server.name === BUILTIN_MCP_SERVER_NAME);
-    const otherServers = serverInfos.filter((server) => server.name !== BUILTIN_MCP_SERVER_NAME);
-    return builtinServer ? [builtinServer, ...otherServers] : otherServers;
-  }
-
-  async startServer(serverName: string) {
-    await this.mcpServerManager.startServer(serverName);
-    this.client?.$updateMCPServers();
-  }
-
-  async stopServer(serverName: string) {
-    await this.mcpServerManager.stopServer(serverName);
-    this.client?.$updateMCPServers();
-  }
 }
 
 export const TokenBuiltinMCPServer = Symbol('TokenBuiltinMCPServer');
 
 export class BuiltinMCPServer implements IMCPServer {
-  private started: boolean = false;
+  private started: boolean = true;
 
   constructor(private readonly sumiMCPServer: SumiMCPServerBackend, private readonly logger: ILogger) {}
 
@@ -203,7 +144,7 @@ export class BuiltinMCPServer implements IMCPServer {
   }
 
   getServerName(): string {
-    return BUILTIN_MCP_SERVER_NAME;
+    return 'sumi-builtin';
   }
 
   async start(): Promise<void> {
@@ -241,6 +182,7 @@ export class BuiltinMCPServer implements IMCPServer {
       throw new Error('MCP Server not started');
     }
     const tools = await this.sumiMCPServer.getMCPTools();
+    this.logger.debug('[BuiltinMCPServer] getTools', tools);
     return { tools } as any;
   }
 

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

@@ -2,12 +2,13 @@ import { ToolExecutionOptions } from 'ai';
 
 import { ILogger } from '@opensumi/ide-core-common';
 
-import { IMCPServer, MCPServerDescription, MCPServerManager, MCPTool } from '../common/mcp-server-manager';
+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 { StdioMCPServerImpl } from './mcp-server';
+import { IMCPServer, MCPServerImpl } from './mcp-server';
+
 // 这应该是 Browser Tab 维度的，每个 Tab 对应一个 MCPServerManagerImpl
 export class MCPServerManagerImpl implements MCPServerManager {
   protected servers: Map<string, IMCPServer> = new Map();
@@ -15,10 +16,6 @@ export class MCPServerManagerImpl implements MCPServerManager {
   // 当前实例对应的 clientId
   private clientId: string;
 
-  getServers(): Map<string, IMCPServer> {
-    return this.servers;
-  }
-
   constructor(
     private readonly toolInvocationRegistryManager: IToolInvocationRegistryManager,
     private readonly logger: ILogger,
@@ -28,20 +25,13 @@ export class MCPServerManagerImpl implements MCPServerManager {
     this.clientId = clientId;
   }
 
-  private unregisterServerTools(serverName: string) {
-    const registry = this.toolInvocationRegistryManager.getRegistry(this.clientId);
-    registry.unregisterProviderTools(serverName);
-  }
-
   async stopServer(serverName: string): Promise<void> {
     const server = this.servers.get(serverName);
     if (!server) {
       throw new Error(`MCP server "${serverName}" not found.`);
     }
-    await server.stop();
-    // 停止服务器后，需要从注册表中移除该服务器的所有工具
-    this.unregisterServerTools(serverName);
-    this.logger.log(`MCP server "${serverName}" stopped and tools unregistered.`);
+    server.stop();
+    this.logger.log(`MCP server "${serverName}" stopped.`);
   }
 
   async getStartedServers(): Promise<string[]> {
@@ -73,7 +63,6 @@ export class MCPServerManagerImpl implements MCPServerManager {
       throw new Error(`MCP server "${serverName}" not found.`);
     }
     await server.start();
-    await this.registerTools(serverName);
   }
 
   async getServerNames(): Promise<string[]> {
@@ -133,7 +122,7 @@ export class MCPServerManagerImpl implements MCPServerManager {
     if (existingServer) {
       existingServer.update(command, args, env);
     } else {
-      const newServer = new StdioMCPServerImpl(name, command, args, env, this.logger);
+      const newServer = new MCPServerImpl(name, command, args, env, this.logger);
       this.servers.set(name, newServer);
     }
   }
@@ -142,23 +131,16 @@ export class MCPServerManagerImpl implements MCPServerManager {
     this.servers.set(server.getServerName(), server);
   }
 
-  // enabled 为 true 时，会自动启动内置服务器, 并注册工具
-  async initBuiltinServer(builtinMCPServer: BuiltinMCPServer, enabled: boolean = true): Promise<void> {
+  async initBuiltinServer(builtinMCPServer: BuiltinMCPServer): Promise<void> {
     this.addOrUpdateServerDirectly(builtinMCPServer);
-    if (enabled) {
-      await builtinMCPServer.start();
-      await this.registerTools(builtinMCPServer.getServerName());
-    }
+    await this.registerTools(builtinMCPServer.getServerName());
   }
 
   async addExternalMCPServers(servers: MCPServerDescription[]): Promise<void> {
     for (const server of servers) {
       this.addOrUpdateServer(server);
-      if (!server.enabled) {
-        // 如果是 enabled 为 false 的 server，则不进行启动
-        continue;
-      }
       await this.startServer(server.name);
+      await this.registerTools(server.name);
     }
   }
 
@@ -166,10 +148,7 @@ export class MCPServerManagerImpl implements MCPServerManager {
     const server = this.servers.get(name);
     if (server) {
       server.stop();
-      // 移除服务器时，也需要从注册表中移除该服务器的所有工具
-      this.unregisterServerTools(name);
       this.servers.delete(name);
-      this.logger.log(`MCP server "${name}" removed and tools unregistered.`);
     } else {
       this.logger.warn(`MCP server "${name}" not found.`);
     }

package/src/node/mcp-server.ts

@@ -4,12 +4,20 @@ import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js'
 
 import { ILogger } from '@opensumi/ide-core-common';
 
-import { IMCPServer } from '../common/mcp-server-manager';
+export interface IMCPServer {
+  isStarted(): boolean;
+  start(): Promise<void>;
+  getServerName(): string;
+  callTool(toolName: string, toolCallId: string, arg_string: string): ReturnType<Client['callTool']>;
+  getTools(): ReturnType<Client['listTools']>;
+  update(command: string, args?: string[], env?: { [key: string]: string }): void;
+  stop(): void;
+}
 
-export class StdioMCPServerImpl implements IMCPServer {
+export class MCPServerImpl implements IMCPServer {
   private name: string;
-  public command: string;
-  public args?: string[];
+  private command: string;
+  private args?: string[];
   private client: Client;
   private env?: { [key: string]: string };
   private started: boolean = false;
@@ -108,17 +116,12 @@ export class StdioMCPServerImpl implements IMCPServer {
     this.env = env;
   }
 
-  async stop(): Promise<void> {
+  stop(): void {
     if (!this.started || !this.client) {
       return;
     }
     this.logger?.log(`Stopping MCP server "${this.name}"`);
-    try {
-      await this.client.close();
-    } catch (error) {
-      this.logger?.error(`Failed to stop MCP server "${this.name}":`, error);
-    }
-    this.logger?.log(`MCP server "${this.name}" stopped`);
+    this.client.close();
     this.started = false;
   }
 }

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

@@ -1,11 +1,10 @@
 import { OpenAIProvider, createOpenAI } from '@ai-sdk/openai';
-import { LanguageModelV1 } from 'ai';
 
 import { Injectable } from '@opensumi/di';
 import { AINativeSettingSectionsId, IAIBackServiceOption } from '@opensumi/ide-core-common';
 
-import { ModelInfo, openAiNativeModels } from '../../common/model';
 import { BaseLanguageModel } from '../base-language-model';
+export const DeepSeekModelIdentifier = Symbol('DeepSeekModelIdentifier');
 
 @Injectable()
 export class OpenAIModel extends BaseLanguageModel {
@@ -16,14 +15,11 @@ export class OpenAIModel extends BaseLanguageModel {
     }
     return createOpenAI({
       apiKey,
+      baseURL: options.baseURL || 'https://dashscope.aliyuncs.com/compatible-mode/v1',
     });
   }
 
-  protected getModelIdentifier(provider: OpenAIProvider, modelId: string) {
-    return provider(modelId) as LanguageModelV1;
-  }
-
-  protected getModelInfo(modelId: string): ModelInfo | undefined {
-    return openAiNativeModels[modelId];
+  protected getModelIdentifier(provider: OpenAIProvider, modelId?: string) {
+    return provider(modelId || 'qwen-max');
   }
 }

package/lib/browser/mcp/config/components/mcp-config.module.less

@@ -1,178 +0,0 @@
-.container {
-  padding: 20px;
-  color: var(--foreground);
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: flex-start;
-  margin-bottom: 24px;
-}
-
-.title {
-  margin: 0 0 8px 0;
-  font-size: 24px;
-  font-weight: 600;
-}
-
-.description {
-  margin: 0;
-  color: var(--descriptionForeground);
-  font-size: 14px;
-}
-
-.addButton {
-  padding: 8px 16px;
-  border-radius: 4px;
-  background-color: var(--button-primary-background);
-  color: var(--button-primary-foreground);
-  border: none;
-  cursor: pointer;
-  font-size: 13px;
-
-  &:hover {
-    background-color: var(--button-primary-hover-background);
-  }
-}
-
-.serversList {
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-}
-
-.serverItem {
-  padding: 16px;
-  border-radius: 8px;
-  background-color: var(--editorWidget-background);
-  border: 1px solid var(--border-color);
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
-  transition: all 0.2s ease;
-
-  &:hover {
-    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
-    border-color: var(--focusBorder);
-  }
-}
-
-.serverHeader {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 12px;
-}
-
-.serverTitleRow {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-}
-
-.serverName {
-  margin: 0;
-  font-size: 14px;
-  font-weight: 500;
-}
-
-.serverStatus,
-.serverType {
-  font-size: 12px;
-  padding: 2px 8px;
-  border-radius: 12px;
-  font-weight: 500;
-  display: inline-flex;
-  align-items: center;
-}
-
-.serverType {
-  background-color: var(--editor-background);
-  color: var(--descriptionForeground);
-}
-
-.running {
-  background-color: var(--notification-info-background);
-  color: var(--notification-info-foreground);
-}
-
-.stopped {
-  background-color: var(--notification-error-background);
-  color: var(--notification-error-foreground);
-}
-
-.serverActions {
-  display: flex;
-  gap: 4px;
-}
-
-.iconButton {
-  padding: 4px;
-  border: none;
-  background: none;
-  color: var(--icon-foreground);
-  cursor: pointer;
-  border-radius: 4px;
-
-  &:hover {
-    background-color: var(--list-hover-background);
-  }
-}
-
-.serverDetail {
-  margin-top: 12px;
-  padding: 12px;
-  border-radius: 6px;
-  background-color: var(--editor-background);
-  font-size: 13px;
-
-  &:not(:last-child) {
-    margin-bottom: 8px;
-  }
-}
-
-.detailRow {
-  display: flex;
-  gap: 8px;
-  margin-bottom: 4px;
-  align-items: center;
-
-  &:last-child {
-    margin-bottom: 0;
-  }
-}
-
-.detailLabel {
-  color: var(--descriptionForeground);
-  min-width: 70px;
-  height: 24px;
-  display: flex;
-  align-items: center;
-}
-
-.detailContent {
-  color: var(--foreground);
-  word-break: break-all;
-  flex: 1;
-  background-color: var(--editor-background);
-  padding: 4px 8px;
-  border-radius: 4px;
-  font-family: var(--monaco-monospace-font);
-  min-height: 24px;
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  flex-wrap: wrap;
-}
-
-.toolTag {
-  display: inline-flex;
-  align-items: center;
-  padding: 2px 8px;
-  background-color: var(--editorWidget-background);
-  color: var(--button-secondary-foreground);
-  border-radius: 12px;
-  font-size: 12px;
-  font-weight: 500;
-  transition: all 0.2s ease;
-  border: 1px solid var(--border-color);
-}