@opensumi/ide-ai-native 3.8.1-next-1740556231.0 → 3.8.1-next-1740571693.0

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

@@ -41,11 +41,14 @@ export abstract class BaseLanguageModel {
   ): Promise<any> {
     const provider = this.initializeProvider(options);
     const clientId = options.clientId;
-    if (!clientId) {
-      throw new Error('clientId is required');
+
+    let allFunctions: ToolRequest[] = [];
+    // 如果没有传入 clientId，则不使用工具
+    if (clientId) {
+      const registry = this.toolInvocationRegistryManager.getRegistry(clientId);
+      allFunctions = options.noTool ? [] : registry.getAllFunctions();
     }
-    const registry = this.toolInvocationRegistryManager.getRegistry(clientId);
-    const allFunctions = options.noTool ? [] : registry.getAllFunctions();
+
     return this.handleStreamingRequest(
       provider,
       request,
@@ -57,7 +60,6 @@ export abstract class BaseLanguageModel {
       options.topP,
       options.topK,
       options.providerOptions,
-      options.trimTexts,
       cancellationToken,
     );
   }
@@ -85,7 +87,6 @@ export abstract class BaseLanguageModel {
     topP?: number,
     topK?: number,
     providerOptions?: Record<string, any>,
-    trimTexts?: [string, string],
     cancellationToken?: CancellationToken,
   ): Promise<any> {
     try {
@@ -119,42 +120,9 @@ export abstract class BaseLanguageModel {
         providerOptions,
       });
 
-      // 状态跟踪变量
-      let isFirstChunk = true;
-      let bufferedText = '';
-      const pendingLines: string[] = [];
       for await (const chunk of stream.fullStream) {
         if (chunk.type === 'text-delta') {
-          if (trimTexts?.length) {
-            // 将收到的文本追加到缓冲区
-            bufferedText += chunk.textDelta;
-
-            // 处理第一个文本块的前缀（只处理一次）
-            if (isFirstChunk && bufferedText.includes(trimTexts[0])) {
-              bufferedText = bufferedText.substring(bufferedText.indexOf(trimTexts[0]) + trimTexts[0].length);
-              isFirstChunk = false;
-            }
-
-            // 检查是否有完整的行，并将它们添加到待发送行队列
-            const lines = bufferedText.split('\n');
-
-            // 最后一个元素可能是不完整的行，保留在缓冲区
-            bufferedText = lines.pop() || '';
-
-            // 将完整的行添加到待发送队列
-            if (lines.length > 0) {
-              pendingLines.push(...lines);
-            }
-
-            // 发送除最后几行外的所有行（保留足够的行以处理后缀）
-            while (pendingLines.length > 3) {
-              // 保留最后3行以确保能完整识别后缀
-              const lineToSend = pendingLines.shift() + '\n';
-              chatReadableStream.emitData({ kind: 'content', content: lineToSend });
-            }
-          } else {
-            chatReadableStream.emitData({ kind: 'content', content: chunk.textDelta });
-          }
+          chatReadableStream.emitData({ kind: 'content', content: chunk.textDelta });
         } else if (chunk.type === 'tool-call') {
           chatReadableStream.emitData({
             kind: 'toolCall',
@@ -201,33 +169,6 @@ export abstract class BaseLanguageModel {
         }
       }
 
-      if (trimTexts?.[1]) {
-        // 完成处理所有块后，检查并发送剩余文本
-
-        // 将剩余缓冲区加入待发送行
-        if (bufferedText) {
-          pendingLines.push(bufferedText);
-        }
-
-        // 处理最后一行可能存在的后缀
-        if (pendingLines.length > 0) {
-          let lastLine = pendingLines[pendingLines.length - 1];
-
-          if (lastLine.endsWith(trimTexts[1])) {
-            // 移除后缀
-            lastLine = lastLine.substring(0, lastLine.length - trimTexts[1].length);
-            pendingLines[pendingLines.length - 1] = lastLine;
-          }
-        }
-
-        // 发送所有剩余的行
-        for (let i = 0; i < pendingLines.length; i++) {
-          const isLastLine = i === pendingLines.length - 1;
-          const lineToSend = pendingLines[i] + (isLastLine ? '' : '\n');
-          chatReadableStream.emitData({ kind: 'content', content: lineToSend });
-        }
-      }
-
       chatReadableStream.end();
     } catch (error) {
       // Use a logger service in production instead of console

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 { ISumiMCPServerBackend } from '../../common';
-import { MCPServerDescription, MCPServerManager } from '../../common/mcp-server-manager';
+import { BUILTIN_MCP_SERVER_NAME, ISumiMCPServerBackend } from '../../common';
+import { IMCPServer, MCPServerDescription } from '../../common/mcp-server-manager';
 import { IToolInvocationRegistryManager, ToolInvocationRegistryManager } from '../../common/tool-invocation-registry';
 import { IMCPServerProxyService, MCPTool } from '../../common/types';
-import { IMCPServer } from '../mcp-server';
+import { StdioMCPServerImpl } from '../mcp-server';
 import { MCPServerManagerImpl } from '../mcp-server-manager-impl';
 
 // 每个 BrowserTab 都对应了一个 SumiMCPServerBackend 实例
@@ -55,7 +55,6 @@ 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;
   }
 
@@ -81,10 +80,10 @@ export class SumiMCPServerBackend extends RPCService<IMCPServerProxyService> imp
     }));
   }
 
-  public async initBuiltinMCPServer() {
+  public async initBuiltinMCPServer(enabled: boolean) {
     const builtinMCPServer = new BuiltinMCPServer(this, this.logger);
     this.mcpServerManager.setClientId(this.clientId);
-    await this.mcpServerManager.initBuiltinServer(builtinMCPServer);
+    await this.mcpServerManager.initBuiltinServer(builtinMCPServer, enabled);
     this.client?.$updateMCPServers();
   }
 
@@ -130,12 +129,72 @@ 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 = true;
+  private started: boolean = false;
 
   constructor(private readonly sumiMCPServer: SumiMCPServerBackend, private readonly logger: ILogger) {}
 
@@ -144,7 +203,7 @@ export class BuiltinMCPServer implements IMCPServer {
   }
 
   getServerName(): string {
-    return 'sumi-builtin';
+    return BUILTIN_MCP_SERVER_NAME;
   }
 
   async start(): Promise<void> {
@@ -182,7 +241,6 @@ 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,13 +2,12 @@ import { ToolExecutionOptions } from 'ai';
 
 import { ILogger } from '@opensumi/ide-core-common';
 
-import { MCPServerDescription, MCPServerManager, MCPTool } from '../common/mcp-server-manager';
+import { IMCPServer, 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';
-
+import { StdioMCPServerImpl } from './mcp-server';
 // 这应该是 Browser Tab 维度的，每个 Tab 对应一个 MCPServerManagerImpl
 export class MCPServerManagerImpl implements MCPServerManager {
   protected servers: Map<string, IMCPServer> = new Map();
@@ -16,6 +15,10 @@ 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,
@@ -25,13 +28,20 @@ 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.`);
     }
-    server.stop();
-    this.logger.log(`MCP server "${serverName}" stopped.`);
+    await server.stop();
+    // 停止服务器后，需要从注册表中移除该服务器的所有工具
+    this.unregisterServerTools(serverName);
+    this.logger.log(`MCP server "${serverName}" stopped and tools unregistered.`);
   }
 
   async getStartedServers(): Promise<string[]> {
@@ -63,6 +73,7 @@ export class MCPServerManagerImpl implements MCPServerManager {
       throw new Error(`MCP server "${serverName}" not found.`);
     }
     await server.start();
+    await this.registerTools(serverName);
   }
 
   async getServerNames(): Promise<string[]> {
@@ -122,7 +133,7 @@ export class MCPServerManagerImpl implements MCPServerManager {
     if (existingServer) {
       existingServer.update(command, args, env);
     } else {
-      const newServer = new MCPServerImpl(name, command, args, env, this.logger);
+      const newServer = new StdioMCPServerImpl(name, command, args, env, this.logger);
       this.servers.set(name, newServer);
     }
   }
@@ -131,16 +142,23 @@ export class MCPServerManagerImpl implements MCPServerManager {
     this.servers.set(server.getServerName(), server);
   }
 
-  async initBuiltinServer(builtinMCPServer: BuiltinMCPServer): Promise<void> {
+  // enabled 为 true 时，会自动启动内置服务器, 并注册工具
+  async initBuiltinServer(builtinMCPServer: BuiltinMCPServer, enabled: boolean = true): Promise<void> {
     this.addOrUpdateServerDirectly(builtinMCPServer);
-    await this.registerTools(builtinMCPServer.getServerName());
+    if (enabled) {
+      await builtinMCPServer.start();
+      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);
     }
   }
 
@@ -148,7 +166,10 @@ 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,20 +4,12 @@ import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js'
 
 import { ILogger } from '@opensumi/ide-core-common';
 
-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;
-}
+import { IMCPServer } from '../common/mcp-server-manager';
 
-export class MCPServerImpl implements IMCPServer {
+export class StdioMCPServerImpl implements IMCPServer {
   private name: string;
-  private command: string;
-  private args?: string[];
+  public command: string;
+  public args?: string[];
   private client: Client;
   private env?: { [key: string]: string };
   private started: boolean = false;
@@ -116,12 +108,17 @@ export class MCPServerImpl implements IMCPServer {
     this.env = env;
   }
 
-  stop(): void {
+  async stop(): Promise<void> {
     if (!this.started || !this.client) {
       return;
     }
     this.logger?.log(`Stopping MCP server "${this.name}"`);
-    this.client.close();
+    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.started = false;
   }
 }

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

@@ -1,25 +1,28 @@
-import { OpenAIProvider, createOpenAI } from '@ai-sdk/openai';
+import { OpenAICompatibleProvider, createOpenAICompatible } from '@ai-sdk/openai-compatible';
+import { LanguageModelV1 } from 'ai';
 
 import { Injectable } from '@opensumi/di';
 import { AINativeSettingSectionsId, IAIBackServiceOption } from '@opensumi/ide-core-common';
 
 import { BaseLanguageModel } from '../base-language-model';
+
 export const DeepSeekModelIdentifier = Symbol('DeepSeekModelIdentifier');
 
 @Injectable()
 export class OpenAIModel extends BaseLanguageModel {
-  protected initializeProvider(options: IAIBackServiceOption): OpenAIProvider {
+  protected initializeProvider(options: IAIBackServiceOption): OpenAICompatibleProvider {
     const apiKey = options.apiKey;
     if (!apiKey) {
       throw new Error(`Please provide OpenAI API Key in preferences (${AINativeSettingSectionsId.OpenaiApiKey})`);
     }
-    return createOpenAI({
+    return createOpenAICompatible({
       apiKey,
       baseURL: options.baseURL || 'https://dashscope.aliyuncs.com/compatible-mode/v1',
+      name: 'openai',
     });
   }
 
-  protected getModelIdentifier(provider: OpenAIProvider, modelId?: string) {
+  protected getModelIdentifier(provider: OpenAICompatibleProvider, modelId?: string): LanguageModelV1 {
     return provider(modelId || 'qwen-max');
   }
 }

package/lib/browser/widget/inline-diff/inline-diff-manager.d.ts

@@ -1,6 +0,0 @@
-import React from 'react';
-import { IResource } from '@opensumi/ide-editor';
-export declare const InlineDiffManager: React.FC<{
-    resource: IResource;
-}>;
-//# sourceMappingURL=inline-diff-manager.d.ts.map

package/lib/browser/widget/inline-diff/inline-diff-manager.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"inline-diff-manager.d.ts","sourceRoot":"","sources":["../../../../src/browser/widget/inline-diff/inline-diff-manager.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAInD,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAMjD,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC;IAAE,QAAQ,EAAE,SAAS,CAAA;CAAE,CA2B/D,CAAC"}

package/lib/browser/widget/inline-diff/inline-diff-manager.js

@@ -1,27 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.InlineDiffManager = void 0;
-const tslib_1 = require("tslib");
-const react_1 = tslib_1.__importStar(require("react"));
-const ide_components_1 = require("@opensumi/ide-components");
-const ide_core_browser_1 = require("@opensumi/ide-core-browser");
-const base_apply_service_1 = require("../../mcp/base-apply.service");
-const inline_diff_widget_module_less_1 = tslib_1.__importDefault(require("./inline-diff-widget.module.less"));
-const InlineDiffManager = (props) => {
-    const applyService = (0, ide_core_browser_1.useInjectable)(base_apply_service_1.BaseApplyService);
-    const [show, setShow] = (0, react_1.useState)(true);
-    (0, react_1.useEffect)(() => {
-        applyService.onCodeBlockUpdate((codeBlock) => {
-            setShow(codeBlock.status === 'pending');
-        });
-    }, []);
-    return (react_1.default.createElement("div", { className: inline_diff_widget_module_less_1.default.inlineDiffManager, style: { display: show ? 'flex' : 'none' } },
-        react_1.default.createElement(ide_components_1.Button, { onClick: () => {
-                applyService.processAll(props.resource.uri, 'accept');
-            } }, (0, ide_core_browser_1.localize)('aiNative.inlineDiff.acceptAll')),
-        react_1.default.createElement(ide_components_1.Button, { type: 'ghost', onClick: () => {
-                applyService.processAll(props.resource.uri, 'reject');
-            } }, (0, ide_core_browser_1.localize)('aiNative.inlineDiff.rejectAll'))));
-};
-exports.InlineDiffManager = InlineDiffManager;
-//# sourceMappingURL=inline-diff-manager.js.map

package/lib/browser/widget/inline-diff/inline-diff-manager.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"inline-diff-manager.js","sourceRoot":"","sources":["../../../../src/browser/widget/inline-diff/inline-diff-manager.tsx"],"names":[],"mappings":";;;;AAAA,uDAAmD;AAEnD,6DAAkD;AAClD,iEAAqE;AAGrE,qEAAgE;AAEhE,8GAAsD;AAE/C,MAAM,iBAAiB,GAAsC,CAAC,KAAK,EAAE,EAAE;IAC5E,MAAM,YAAY,GAAG,IAAA,gCAAa,EAAmB,qCAAgB,CAAC,CAAC;IACvE,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAA,gBAAQ,EAAC,IAAI,CAAC,CAAC;IACvC,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,YAAY,CAAC,iBAAiB,CAAC,CAAC,SAAS,EAAE,EAAE;YAC3C,OAAO,CAAC,SAAS,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;IACL,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,OAAO,CACL,uCAAK,SAAS,EAAE,wCAAM,CAAC,iBAAiB,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE;QAClF,8BAAC,uBAAM,IACL,OAAO,EAAE,GAAG,EAAE;gBACZ,YAAY,CAAC,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YACxD,CAAC,IAEA,IAAA,2BAAQ,EAAC,+BAA+B,CAAC,CACnC;QACT,8BAAC,uBAAM,IACL,IAAI,EAAC,OAAO,EACZ,OAAO,EAAE,GAAG,EAAE;gBACZ,YAAY,CAAC,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YACxD,CAAC,IAEA,IAAA,2BAAQ,EAAC,+BAA+B,CAAC,CACnC,CACL,CACP,CAAC;AACJ,CAAC,CAAC;AA3BW,QAAA,iBAAiB,qBA2B5B"}

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

@@ -1,38 +0,0 @@
-import React, { useEffect, useState } from 'react';
-
-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';
-
-export const InlineDiffManager: React.FC<{ resource: IResource }> = (props) => {
-  const applyService = useInjectable<BaseApplyService>(BaseApplyService);
-  const [show, setShow] = useState(true);
-  useEffect(() => {
-    applyService.onCodeBlockUpdate((codeBlock) => {
-      setShow(codeBlock.status === 'pending');
-    });
-  }, []);
-  return (
-    <div className={styles.inlineDiffManager} style={{ display: show ? 'flex' : 'none' }}>
-      <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>
-  );
-};