@opensumi/ide-ai-native 3.8.1-next-1740452912.0 → 3.8.1-next-1740463566.0

package/src/browser/mcp/config/components/mcp-server-form.tsx

@@ -0,0 +1,144 @@
+import React from 'react';
+
+import { Button } from '@opensumi/ide-components/lib/button';
+import { Modal } from '@opensumi/ide-components/lib/modal';
+
+import styles from './mcp-server-form.module.less';
+
+export interface MCPServerFormData {
+  name: string;
+  command: string;
+  args: string[];
+  env?: Record<string, string>;
+}
+
+interface Props {
+  visible: boolean;
+  initialData?: MCPServerFormData;
+  onSave: (data: MCPServerFormData) => void;
+  onCancel: () => void;
+}
+
+export const MCPServerForm: React.FC<Props> = ({ visible, initialData, onSave, onCancel }) => {
+  const [formData, setFormData] = React.useState<MCPServerFormData>(() => ({
+    name: '',
+    command: '',
+    args: [],
+    env: {},
+    type: 'stdio', // TODO: 支持 SSE
+    ...initialData,
+  }));
+
+  const [argsText, setArgsText] = React.useState(() => initialData?.args?.join(' ') || '');
+  const [envText, setEnvText] = React.useState(() => {
+    if (!initialData?.env) {
+      return '';
+    }
+    return Object.entries(initialData.env)
+      .map(([key, value]) => `${key}=${value}`)
+      .join('\n');
+  });
+
+  // Update form data when initialData changes
+  React.useEffect(() => {
+    setFormData({
+      name: '',
+      command: '',
+      args: [],
+      env: {},
+      ...initialData,
+    });
+    setArgsText(initialData?.args?.join(' ') || '');
+    setEnvText(
+      initialData?.env
+        ? Object.entries(initialData.env)
+            .map(([key, value]) => `${key}=${value}`)
+            .join('\n')
+        : '',
+    );
+  }, [initialData]);
+
+  const handleSubmit = (e: React.FormEvent) => {
+    e.preventDefault();
+    const args = argsText.split(' ').filter(Boolean);
+    const env = envText
+      .split('\n')
+      .filter(Boolean)
+      .reduce((acc, line) => {
+        const [key, value] = line.split('=');
+        if (key && value) {
+          acc[key.trim()] = value.trim();
+        }
+        return acc;
+      }, {} as Record<string, string>);
+
+    onSave({
+      ...formData,
+      args,
+      env,
+    });
+  };
+
+  return (
+    <Modal
+      title={initialData ? 'Edit MCP Server' : 'Add New MCP Server'}
+      visible={visible}
+      onCancel={onCancel}
+      centered
+      width={600}
+      footer={null}
+      style={{
+        background: 'var(--editor-background)',
+      }}
+    >
+      <form className={styles.form} onSubmit={(e) => e.preventDefault()}>
+        <div className={styles.formItem}>
+          <label>Name:</label>
+          <input
+            type='text'
+            value={formData.name}
+            onChange={(e) => setFormData({ ...formData, name: e.target.value })}
+            placeholder='Enter server name'
+            required
+          />
+        </div>
+        <div className={styles.formItem}>
+          <label>Command:</label>
+          <input
+            type='text'
+            value={formData.command}
+            onChange={(e) => setFormData({ ...formData, command: e.target.value })}
+            placeholder='Enter command (e.g., npx)'
+            required
+          />
+        </div>
+        <div className={styles.formItem}>
+          <label>Arguments:</label>
+          <textarea
+            value={argsText}
+            onChange={(e) => setArgsText(e.target.value)}
+            placeholder='Enter arguments separated by space'
+            rows={3}
+          />
+        </div>
+        <div className={styles.formItem}>
+          <label>Environment Variables:</label>
+          <textarea
+            value={envText}
+            onChange={(e) => setEnvText(e.target.value)}
+            placeholder='KEY=value (one per line)'
+            rows={3}
+          />
+        </div>
+        <div className={styles.formActions}>
+          <Button onClick={onCancel} type='secondary'>
+            Cancel
+          </Button>
+          <Button onClick={handleSubmit} type='primary'>
+            Save
+          </Button>
+        </div>
+      </form>
+    </Modal>
+  );
+};

package/src/browser/mcp/config/mcp-config.commands.ts

@@ -0,0 +1,29 @@
+import { Autowired } from '@opensumi/di';
+import { CommandContribution, CommandRegistry, URI } from '@opensumi/ide-core-browser';
+import { Domain } from '@opensumi/ide-core-common';
+import { WorkbenchEditorService } from '@opensumi/ide-editor';
+
+import { MCP_CONFIG_COMPONENTS_SCHEME_ID } from './mcp-config.contribution';
+
+export const OPEN_MCP_CONFIG_COMMAND = {
+  id: 'opensumi-mcp.openConfig',
+  label: 'Open MCP Configuration',
+};
+
+@Domain(CommandContribution)
+export class MCPConfigCommandContribution implements CommandContribution {
+  @Autowired(WorkbenchEditorService)
+  private readonly editorService: WorkbenchEditorService;
+
+  registerCommands(registry: CommandRegistry) {
+    registry.registerCommand(OPEN_MCP_CONFIG_COMMAND, {
+      execute: () => {
+        const uri = new URI().withScheme(MCP_CONFIG_COMPONENTS_SCHEME_ID);
+        this.editorService.open(uri, {
+          preview: false,
+          focus: true,
+        });
+      },
+    });
+  }
+}

package/src/browser/mcp/config/mcp-config.contribution.ts

@@ -0,0 +1,65 @@
+import { Autowired } from '@opensumi/di';
+import { LabelService } from '@opensumi/ide-core-browser/lib/services';
+import { Domain, Schemes, URI } from '@opensumi/ide-core-common';
+import {
+  BrowserEditorContribution,
+  EditorComponentRegistry,
+  EditorComponentRenderMode,
+  IResource,
+  ResourceService,
+} from '@opensumi/ide-editor/lib/browser/types';
+import { IconService } from '@opensumi/ide-theme/lib/browser';
+import { IWorkspaceService } from '@opensumi/ide-workspace/lib/common';
+
+import { MCPConfigView } from './components/mcp-config.view';
+
+const COMPONENTS_ID = 'opensumi-mcp-config-viewer';
+export const MCP_CONFIG_COMPONENTS_SCHEME_ID = 'mcp-config';
+
+export type IMCPConfigResource = IResource<{ configType: string }>;
+
+@Domain(BrowserEditorContribution)
+export class MCPConfigContribution implements BrowserEditorContribution {
+  @Autowired(IWorkspaceService)
+  protected readonly workspaceService: IWorkspaceService;
+
+  @Autowired(IconService)
+  protected readonly iconService: IconService;
+
+  @Autowired()
+  labelService: LabelService;
+
+  registerEditorComponent(registry: EditorComponentRegistry) {
+    registry.registerEditorComponent({
+      uid: COMPONENTS_ID,
+      scheme: MCP_CONFIG_COMPONENTS_SCHEME_ID,
+      component: MCPConfigView,
+      renderMode: EditorComponentRenderMode.ONE_PER_WORKBENCH,
+    });
+
+    registry.registerEditorComponentResolver(MCP_CONFIG_COMPONENTS_SCHEME_ID, (resource, results) => {
+      results.push({
+        type: 'component',
+        componentId: COMPONENTS_ID,
+      });
+    });
+  }
+
+  registerResource(service: ResourceService) {
+    service.registerResourceProvider({
+      scheme: MCP_CONFIG_COMPONENTS_SCHEME_ID,
+      provideResource: async (uri: URI): Promise<IMCPConfigResource> => {
+        const { configType } = uri.getParsedQuery();
+
+        return {
+          uri,
+          name: 'MCP Configuration',
+          icon: 'settings',
+          metadata: {
+            configType,
+          },
+        };
+      },
+    });
+  }
+}

package/src/browser/mcp/mcp-server-proxy.service.ts

@@ -4,7 +4,7 @@ import { Autowired, Injectable } from '@opensumi/di';
 import { ILogger } from '@opensumi/ide-core-browser';
 import { Emitter, Event } from '@opensumi/ide-core-common';
 
-import { ISumiMCPServerBackend, SumiMCPServerProxyServicePath } from '../../common';
+import { BUILTIN_MCP_SERVER_NAME, ISumiMCPServerBackend, SumiMCPServerProxyServicePath } from '../../common';
 import { IMCPServerProxyService } from '../../common/types';
 import { IMCPServerRegistry, TokenMCPServerRegistry } from '../types';
 
@@ -35,7 +35,7 @@ export class MCPServerProxyService implements IMCPServerProxyService {
         name: tool.name,
         description: tool.description,
         inputSchema: zodToJsonSchema(tool.inputSchema),
-        providerName: 'sumi-builtin',
+        providerName: BUILTIN_MCP_SERVER_NAME,
       }),
     );
 
@@ -52,4 +52,16 @@ export class MCPServerProxyService implements IMCPServerProxyService {
   async getAllMCPTools() {
     return this.sumiMCPServerProxyService.getAllMCPTools();
   }
+
+  async $getServers() {
+    return this.sumiMCPServerProxyService.getServers();
+  }
+
+  async $startServer(serverName: string) {
+    await this.sumiMCPServerProxyService.startServer(serverName);
+  }
+
+  async $stopServer(serverName: string) {
+    await this.sumiMCPServerProxyService.stopServer(serverName);
+  }
 }

package/src/browser/mcp/mcp-server.feature.registry.ts

@@ -2,6 +2,7 @@
 import { Autowired, Injectable } from '@opensumi/di';
 import { ILogger } from '@opensumi/ide-core-common';
 
+import { BUILTIN_MCP_SERVER_NAME } from '../../common';
 import { getToolName } from '../../common/utils';
 import { IMCPServerRegistry, IMCPServerToolComponentProps, MCPLogger, MCPToolDefinition } from '../types';
 
@@ -25,7 +26,7 @@ export class MCPServerRegistry implements IMCPServerRegistry {
     return new LoggerAdapter(this.baseLogger);
   }
 
-  getMCPTool(name: string, serverName = 'sumi-builtin'): MCPToolDefinition | undefined {
+  getMCPTool(name: string, serverName = BUILTIN_MCP_SERVER_NAME): MCPToolDefinition | undefined {
     return this.tools.find((tool) => getToolName(tool.name, serverName) === name);
   }
 
@@ -36,7 +37,7 @@ export class MCPServerRegistry implements IMCPServerRegistry {
   registerToolComponent(
     name: string,
     component: React.FC<IMCPServerToolComponentProps>,
-    serverName = 'sumi-builtin',
+    serverName = BUILTIN_MCP_SERVER_NAME,
   ): void {
     this.toolComponents[getToolName(name, serverName)] = component;
   }

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

@@ -49,6 +49,7 @@ export class RunCommandHandler {
   }
 
   async handler(args: z.infer<typeof inputSchema> & { toolCallId: string }, logger: MCPLogger) {
+    logger.appendLine(`Executing command: ${args.command}`);
     if (args.require_user_approval) {
       const def = new Deferred<boolean>();
       this.approvalDeferredMap.set(args.toolCallId, def);
@@ -89,6 +90,7 @@ export class RunCommandHandler {
         content: result,
       });
 
+      logger.appendLine(`Command ${args.command} finished with exit code: ${e.code}`);
       terminalClient.term.writeln(
         `\n${color.italic}> Command ${args.command} executed successfully. Terminal will close in ${
           3000 / 1000

package/src/browser/preferences/schema.ts

@@ -108,11 +108,27 @@ export const aiNativePreferenceSchema: PreferenceSchema = {
             type: 'string',
             description: localize('preference.ai.native.mcp.servers.command.description'),
           },
+          type: {
+            type: 'string',
+            enum: ['stdio', 'sse'],
+            enumDescriptions: [
+              localize('preference.ai.native.mcp.servers.type.stdio'),
+              localize('preference.ai.native.mcp.servers.type.sse'),
+            ],
+            description: localize('preference.ai.native.mcp.servers.type.description'),
+            default: 'stdio',
+          },
+          enabled: {
+            type: 'boolean',
+            description: localize('preference.ai.native.mcp.servers.enabled.description'),
+            default: true,
+          },
           args: {
             type: 'array',
             items: {
               type: 'string',
             },
+            default: [],
             description: localize('preference.ai.native.mcp.servers.args.description'),
           },
           env: {

package/src/common/index.ts

@@ -31,6 +31,9 @@ export const AI_CHAT_CONTAINER_ID = 'AI-Chat-Container';
 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';
+
 /**
  * @deprecated Use {@link DESIGN_MENUBAR_CONTAINER_VIEW_ID} instead
  */
@@ -123,9 +126,12 @@ export const ChatProxyServiceToken = Symbol('ChatProxyServiceToken');
 export const TokenMCPServerProxyService = Symbol('TokenMCPServerProxyService');
 
 export interface ISumiMCPServerBackend {
-  initBuiltinMCPServer(): void;
+  initBuiltinMCPServer(enabled: boolean): void;
   initExternalMCPServers(servers: MCPServerDescription[]): void;
   getAllMCPTools(): Promise<MCPTool[]>;
+  getServers(): Promise<Array<{ name: string; isStarted: boolean }>>;
+  startServer(serverName: string): Promise<void>;
+  stopServer(serverName: string): Promise<void>;
 }
 
 export const SumiMCPServerProxyServicePath = 'SumiMCPServerProxyServicePath';

package/src/common/llm-context.ts

@@ -15,13 +15,13 @@ export interface LLMContextService {
    */
   cleanFileContext(): void;
 
-  onDidContextFilesChangeEvent: Event<FileContext[]>;
+  onDidContextFilesChangeEvent: Event<{ viewed: FileContext[]; attached: FileContext[] }>;
 
   /**
    * 从 context 中移除文件
    * @param uri URI
    */
-  removeFileFromContext(uri: URI): void;
+  removeFileFromContext(uri: URI, isManual?: boolean): void;
 
   /** 导出为可序列化格式 */
   serialize(): SerializedContext;
@@ -30,12 +30,18 @@ export interface LLMContextService {
 export interface FileContext {
   uri: URI;
   selection?: [number, number];
-  isManual: boolean;
 }
 
 export const LLMContextServiceToken = Symbol('LLMContextService');
 
+export interface AttachFileContext {
+  content: string;
+  lineErrors: string[];
+  path: string;
+  language: string;
+}
+
 export interface SerializedContext {
   recentlyViewFiles: string[];
-  attachedFiles: Array<{ content: string; lineErrors: string[]; path: string; language: string }>;
+  attachedFiles: Array<AttachFileContext>;
 }

package/src/common/mcp-server-manager.ts

@@ -1,5 +1,15 @@
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 
+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 interface MCPServerManager {
   callTool(
     serverName: string,
@@ -11,7 +21,7 @@ export interface MCPServerManager {
   addOrUpdateServer(description: MCPServerDescription): void;
   // invoke in node.js only
   addOrUpdateServerDirectly(server: any): void;
-  initBuiltinServer(builtinMCPServer: any): void;
+  initBuiltinServer(builtinMCPServer: any, enabled: boolean): void;
   getTools(serverName: string): ReturnType<Client['listTools']>;
   getServerNames(): Promise<string[]>;
   startServer(serverName: string): Promise<void>;
@@ -19,6 +29,7 @@ export interface MCPServerManager {
   getStartedServers(): Promise<string[]>;
   registerTools(serverName: string): Promise<void>;
   addExternalMCPServers(servers: MCPServerDescription[]): void;
+  getServers(): Map<string, IMCPServer>;
 }
 
 export type MCPTool = Awaited<ReturnType<MCPServerManager['getTools']>>['tools'][number];
@@ -45,6 +56,11 @@ export interface MCPServerDescription {
    * Optional environment variables to set when starting the server.
    */
   env?: { [key: string]: string };
+
+  /**
+   * Whether to enable the MCP server.
+   */
+  enabled?: boolean;
 }
 
 export const MCPServerManager = Symbol('MCPServerManager');

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

@@ -1,5 +1,4 @@
 import { Injectable } from '@opensumi/di';
-import { MaybePromise } from '@opensumi/ide-core-common/lib/utils';
 
 import { SerializedContext } from '../llm-context';
 
@@ -10,37 +9,36 @@ export interface ChatAgentPromptProvider {
    * 提供上下文提示
    * @param context 上下文
    */
-  provideContextPrompt(context: SerializedContext, userMessage: string): MaybePromise<string>;
+  provideContextPrompt(context: SerializedContext, userMessage: string): string;
 }
 
 @Injectable()
 export class DefaultChatAgentPromptProvider implements ChatAgentPromptProvider {
-  provideContextPrompt(context: SerializedContext, userMessage: string): MaybePromise<string> {
+  provideContextPrompt(context: SerializedContext, userMessage: string): 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>`;
+<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}`).join('\n')}
+  </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/tool-invocation-registry.ts

@@ -72,7 +72,7 @@ export interface ToolInvocationRegistry {
    *
    * @param providerName - 要移除其工具的工具提供者名称（在 `ToolRequest` 中指定）
    */
-  unregisterAllTools(providerName: string): void;
+  unregisterProviderTools(providerName: string): void;
 }
 
 export const ToolProvider = Symbol('ToolProvider');
@@ -83,7 +83,7 @@ export interface ToolProvider {
 export class ToolInvocationRegistryImpl implements ToolInvocationRegistry {
   private tools: Map<string, ToolRequest> = new Map<string, ToolRequest>();
 
-  unregisterAllTools(providerName: string): void {
+  unregisterProviderTools(providerName: string): void {
     const toolsToRemove: string[] = [];
     for (const [id, tool] of this.tools.entries()) {
       if (tool.providerName === providerName) {

package/src/common/types.ts

@@ -32,6 +32,12 @@ 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 {

package/src/common/utils.ts

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