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

package/src/browser/context/llm-context.service.ts

@@ -12,7 +12,7 @@ import {
 import { EditorSelectionChangeEvent } from '@opensumi/ide-editor/lib/browser/types';
 import { IMarkerService } from '@opensumi/ide-markers/lib/common/types';
 
-import { FileContext, LLMContextService, SerializedContext } from '../../common/llm-context';
+import { AttachFileContext, FileContext, LLMContextService, SerializedContext } from '../../common/llm-context';
 
 @Injectable()
 export class LLMContextServiceImpl extends WithEventBus implements LLMContextService {
@@ -27,40 +27,65 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
 
   private isAutoCollecting = false;
 
-  private contextFiles: FileContext[] = [];
+  private readonly maxAttachFilesLimit = 10;
+  private readonly maxViewFilesLimit = 20;
+  private readonly attachedFiles: FileContext[] = [];
+  private readonly recentlyViewFiles: FileContext[] = [];
+  private readonly onDidContextFilesChangeEmitter = new Emitter<{ viewed: FileContext[]; attached: FileContext[] }>();
+  onDidContextFilesChangeEvent = this.onDidContextFilesChangeEmitter.event;
 
-  private maxFiles: number = 10; // 上下文的最大长度限制
+  private addFileToList(file: FileContext, list: FileContext[], maxLimit: number) {
+    const existingIndex = list.findIndex((f) => f.uri.toString() === file.uri.toString());
+    if (existingIndex > -1) {
+      list.splice(existingIndex, 1);
+    }
 
-  private onDidContextFilesChangeEmitter = new Emitter<FileContext[]>();
-  onDidContextFilesChangeEvent = this.onDidContextFilesChangeEmitter.event;
+    list.push(file);
+    if (list.length > maxLimit) {
+      list.shift();
+    }
+  }
 
-  addFileToContext(uri: URI, selection?: [number, number], isManual = true): void {
-    this.removeFileFromContext(uri);
+  addFileToContext(uri: URI, selection?: [number, number], isManual = false): void {
+    if (!uri) {
+      return;
+    }
 
-    this.contextFiles.push({ uri, selection, isManual });
+    const file = { uri, selection };
+    const targetList = isManual ? this.attachedFiles : this.recentlyViewFiles;
+    const maxLimit = isManual ? this.maxAttachFilesLimit : this.maxViewFilesLimit;
 
-    if (this.contextFiles.length > this.maxFiles) {
-      this.contextFiles.shift();
+    if (isManual) {
+      this.docModelManager.createModelReference(uri);
     }
 
+    this.addFileToList(file, targetList, maxLimit);
+    this.notifyContextChange();
+  }
+
+  private notifyContextChange(): void {
     this.onDidContextFilesChangeEmitter.fire(this.getAllContextFiles());
   }
 
   cleanFileContext() {
-    this.contextFiles = [];
-    this.onDidContextFilesChangeEmitter.fire(this.getAllContextFiles());
+    this.attachedFiles.length = 0;
+    this.notifyContextChange();
   }
 
   private getAllContextFiles() {
-    return [...this.contextFiles];
+    return {
+      viewed: this.recentlyViewFiles,
+      attached: this.attachedFiles,
+    };
   }
 
-  removeFileFromContext(uri: URI): void {
-    const index = this.contextFiles.findIndex((file) => file.uri.toString() === uri.toString());
+  removeFileFromContext(uri: URI, isManual = false): void {
+    const targetList = isManual ? this.attachedFiles : this.recentlyViewFiles;
+    const index = targetList.findIndex((file) => file.uri.toString() === uri.toString());
     if (index > -1) {
-      this.contextFiles.splice(index, 1);
-      this.onDidContextFilesChangeEmitter.fire(this.getAllContextFiles());
+      targetList.splice(index, 1);
     }
+    this.notifyContextChange();
   }
 
   startAutoCollection(): void {
@@ -78,8 +103,7 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
         if (event.payload.uri.scheme !== 'file') {
           return;
         }
-        // FIXME: 暂时不自动添加
-        // this.addFileToContext(event.payload.uri);
+        this.addFileToContext(event.payload.uri, undefined, false);
       }),
     );
 
@@ -88,6 +112,8 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
         if (event.payload.scheme !== 'file') {
           return;
         }
+
+        this.removeFileFromContext(event.payload, false);
       }),
     );
 
@@ -109,11 +135,12 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
           ].sort() as [number, number];
 
           if (selection[0] === selection[1]) {
-            this.addFileToContext(event.payload.editorUri, undefined);
+            this.addFileToContext(event.payload.editorUri, undefined, false);
           } else {
             this.addFileToContext(
               event.payload.editorUri,
               selection.sort((a, b) => a - b),
+              false,
             );
           }
         }
@@ -127,42 +154,51 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
 
   serialize(): SerializedContext {
     const files = this.getAllContextFiles();
-    const recentlyViewFiles = files
-      .filter((v) => !v.selection)
-      .map((file) => {
-        const relativePath = URI.file(this.appConfig.workspaceDir).relative(file.uri);
-        if (relativePath) {
-          return relativePath.toString();
-        }
-        return file.uri.parent.toString();
-      })
-      .filter(Boolean);
-
-    const attachedFiles = files
-      .filter((v) => v.selection)
-      .map((file) => {
-        const ref = this.docModelManager.getModelReference(file.uri);
-        const content = ref!.instance.getText();
-        const lineErrors = this.markerService
-          .getManager()
-          .getMarkers({
-            resource: file.uri.toString(),
-            severities: MarkerSeverity.Error,
-          })
-          .map((marker) => marker.message);
-
-        return {
-          content,
-          lineErrors,
-          path: URI.file(this.appConfig.workspaceDir).relative(file.uri)!.toString(),
-          language: ref?.instance.languageId!,
-        };
-      })
-      .filter(Boolean);
+    const workspaceRoot = URI.file(this.appConfig.workspaceDir);
 
     return {
-      recentlyViewFiles,
-      attachedFiles,
+      recentlyViewFiles: this.serializeRecentlyViewFiles(files.viewed, workspaceRoot),
+      attachedFiles: this.serializeAttachedFiles(files.attached, workspaceRoot),
     };
   }
+
+  private serializeRecentlyViewFiles(files: FileContext[], workspaceRoot: URI): string[] {
+    return files
+      .map((file) => workspaceRoot.relative(file.uri)?.toString() || file.uri.parent.toString())
+      .filter(Boolean);
+  }
+
+  private serializeAttachedFiles(files: FileContext[], workspaceRoot: URI): AttachFileContext[] {
+    return files
+      .map((file) => this.serializeAttachedFile(file, workspaceRoot))
+      .filter(Boolean) as unknown as AttachFileContext[];
+  }
+
+  private serializeAttachedFile(file: FileContext, workspaceRoot: URI) {
+    try {
+      const ref = this.docModelManager.getModelReference(file.uri);
+      if (!ref) {
+        return null;
+      }
+
+      return {
+        content: ref.instance.getText(),
+        lineErrors: this.getFileErrors(file.uri),
+        path: workspaceRoot.relative(file.uri)!.toString(),
+        language: ref.instance.languageId!,
+      };
+    } catch (e) {
+      return null;
+    }
+  }
+
+  private getFileErrors(uri: URI): string[] {
+    return this.markerService
+      .getManager()
+      .getMarkers({
+        resource: uri.toString(),
+        severities: MarkerSeverity.Error,
+      })
+      .map((marker) => marker.message);
+  }
 }

package/src/browser/index.ts

@@ -55,6 +55,8 @@ import { RenameCandidatesProviderRegistry } from './contrib/rename/rename.featur
 import { TerminalAIContribution } from './contrib/terminal/terminal-ai.contributon';
 import { TerminalFeatureRegistry } from './contrib/terminal/terminal.feature.registry';
 import { LanguageParserService } from './languages/service';
+import { MCPConfigCommandContribution } from './mcp/config/mcp-config.commands';
+import { MCPConfigContribution } from './mcp/config/mcp-config.contribution';
 import { MCPServerProxyService } from './mcp/mcp-server-proxy.service';
 import { MCPServerRegistry } from './mcp/mcp-server.feature.registry';
 import { CreateNewFileWithTextTool } from './mcp/tools/createNewFileWithText';
@@ -91,6 +93,8 @@ export class AINativeModule extends BrowserModule {
     AICodeActionContribution,
     AINativePreferencesContribution,
     IntelligentCompletionsContribution,
+    MCPConfigContribution,
+    MCPConfigCommandContribution,
 
     // MCP Server Contributions START
     ListDirTool,

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

@@ -0,0 +1,178 @@
+.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);
+}

package/src/browser/mcp/config/components/mcp-config.view.tsx

@@ -0,0 +1,215 @@
+import React from 'react';
+
+import { AINativeSettingSectionsId, ILogger, useInjectable } from '@opensumi/ide-core-browser';
+import { PreferenceService } from '@opensumi/ide-core-browser/lib/preferences';
+
+import { BUILTIN_MCP_SERVER_NAME } from '../../../../common';
+import { MCPServerDescription } from '../../../../common/mcp-server-manager';
+import { MCPServerProxyService } from '../../mcp-server-proxy.service';
+
+import styles from './mcp-config.module.less';
+import { MCPServerForm, MCPServerFormData } from './mcp-server-form';
+
+interface MCPServer {
+  name: string;
+  isStarted: boolean;
+  tools?: string[];
+  command?: string;
+  type?: string;
+}
+
+export const MCPConfigView: React.FC = () => {
+  const mcpServerProxyService = useInjectable<MCPServerProxyService>(MCPServerProxyService);
+  const preferenceService = useInjectable<PreferenceService>(PreferenceService);
+  const logger = useInjectable<ILogger>(ILogger);
+  const [servers, setServers] = React.useState<MCPServer[]>([]);
+  const [formVisible, setFormVisible] = React.useState(false);
+  const [editingServer, setEditingServer] = React.useState<MCPServerFormData | undefined>();
+
+  const loadServers = React.useCallback(async () => {
+    const allServers = await mcpServerProxyService.$getServers();
+    setServers(allServers);
+  }, [mcpServerProxyService]);
+
+  React.useEffect(() => {
+    loadServers();
+    const disposer = mcpServerProxyService.onChangeMCPServers(() => {
+      loadServers();
+    });
+
+    return () => {
+      disposer.dispose();
+    };
+  }, [mcpServerProxyService, loadServers]);
+
+  const handleServerControl = async (serverName: string, start: boolean) => {
+    try {
+      if (start) {
+        await mcpServerProxyService.$startServer(serverName);
+      } else {
+        await mcpServerProxyService.$stopServer(serverName);
+      }
+
+      // Update enabled state in preferences
+      const servers = preferenceService.get<MCPServerDescription[]>(AINativeSettingSectionsId.MCPServers, []);
+      let updatedServers = servers;
+
+      // 处理内置服务器的特殊情况
+      if (serverName === BUILTIN_MCP_SERVER_NAME) {
+        const builtinServerExists = servers.some((server) => server.name === BUILTIN_MCP_SERVER_NAME);
+        if (!builtinServerExists && !start) {
+          // 如果是停止内置服务器且之前没有配置，添加一个新的配置项
+          // 内置服务器不需要 command，因为它是直接集成在 IDE 中的
+          updatedServers = [
+            ...servers,
+            {
+              name: BUILTIN_MCP_SERVER_NAME,
+              enabled: false,
+              command: '', // 内置服务器的 command 为空字符串
+            },
+          ];
+        } else {
+          // 如果已经存在配置，更新 enabled 状态
+          updatedServers = servers.map((server) => {
+            if (server.name === BUILTIN_MCP_SERVER_NAME) {
+              return { ...server, enabled: start };
+            }
+            return server;
+          });
+        }
+      } else {
+        // 处理其他外部服务器
+        updatedServers = servers.map((server) => {
+          if (server.name === serverName) {
+            return { ...server, enabled: start };
+          }
+          return server;
+        });
+      }
+
+      await preferenceService.set(AINativeSettingSectionsId.MCPServers, updatedServers);
+      await loadServers();
+    } catch (error) {
+      logger.error(`Failed to ${start ? 'start' : 'stop'} server ${serverName}:`, error);
+    }
+  };
+
+  const handleAddServer = () => {
+    setEditingServer(undefined);
+    setFormVisible(true);
+  };
+
+  const handleEditServer = (server: MCPServer) => {
+    const servers = preferenceService.get<MCPServerFormData[]>(AINativeSettingSectionsId.MCPServers, []);
+    const serverConfig = servers.find((s) => s.name === server.name);
+
+    if (serverConfig) {
+      setEditingServer(serverConfig);
+      setFormVisible(true);
+    }
+  };
+
+  const handleDeleteServer = async (serverName: string) => {
+    const servers = preferenceService.get<MCPServerFormData[]>(AINativeSettingSectionsId.MCPServers, []);
+    const updatedServers = servers.filter((s) => s.name !== serverName);
+    await preferenceService.set(AINativeSettingSectionsId.MCPServers, updatedServers);
+    await loadServers();
+  };
+
+  const handleSaveServer = async (data: MCPServerFormData) => {
+    const servers = preferenceService.get<MCPServerFormData[]>(AINativeSettingSectionsId.MCPServers, []);
+    const existingIndex = servers.findIndex((s) => s.name === data.name);
+
+    if (existingIndex >= 0) {
+      servers[existingIndex] = data;
+    } else {
+      servers.push(data);
+    }
+
+    await preferenceService.set(AINativeSettingSectionsId.MCPServers, servers);
+    setFormVisible(false);
+    await loadServers();
+  };
+
+  return (
+    <div className={styles.container}>
+      <div className={styles.header}>
+        <div>
+          <h2 className={styles.title}>MCP Servers</h2>
+          <p className={styles.description}>Manage your MCP server connections.</p>
+        </div>
+        <button className={styles.addButton} onClick={handleAddServer}>
+          + Add new MCP server
+        </button>
+      </div>
+      <div className={styles.serversList}>
+        {servers.map((server) => (
+          <div key={server.name} className={styles.serverItem}>
+            <div className={styles.serverHeader}>
+              <div className={styles.serverTitleRow}>
+                <h3 className={styles.serverName}>{server.name}</h3>
+              </div>
+              <div className={styles.serverActions}>
+                <button className={styles.iconButton} title='Edit' onClick={() => handleEditServer(server)}>
+                  <i className='codicon codicon-edit' />
+                </button>
+                <button
+                  className={styles.iconButton}
+                  title={server.isStarted ? 'Stop' : 'Start'}
+                  onClick={() => handleServerControl(server.name, !server.isStarted)}
+                >
+                  <i className={`codicon ${server.isStarted ? 'codicon-debug-stop' : 'codicon-debug-start'}`} />
+                </button>
+                <button className={styles.iconButton} title='Delete' onClick={() => handleDeleteServer(server.name)}>
+                  <i className='codicon codicon-trash' />
+                </button>
+              </div>
+            </div>
+            <div className={styles.serverDetail}>
+              <div className={styles.detailRow}>
+                <span className={styles.detailLabel}>Status:</span>
+                <span className={`${styles.serverStatus} ${server.isStarted ? styles.running : styles.stopped}`}>
+                  {server.isStarted ? 'Running' : 'Stopped'}
+                </span>
+              </div>
+              {server.type && (
+                <div className={styles.detailRow}>
+                  <span className={styles.detailLabel}>Type:</span>
+                  <span className={styles.serverType}>{server.type}</span>
+                </div>
+              )}
+            </div>
+            {server.tools && server.tools.length > 0 && (
+              <div className={styles.serverDetail}>
+                <div className={styles.detailRow}>
+                  <span className={styles.detailLabel}>Tools:</span>
+                  <span className={styles.detailContent}>
+                    {server.tools.map((tool, index) => (
+                      <span key={index} className={styles.toolTag}>
+                        {tool}
+                      </span>
+                    ))}
+                  </span>
+                </div>
+              </div>
+            )}
+            {server.command && (
+              <div className={styles.serverDetail}>
+                <div className={styles.detailRow}>
+                  <span className={styles.detailLabel}>Command:</span>
+                  <span className={styles.detailContent}>{server.command}</span>
+                </div>
+              </div>
+            )}
+          </div>
+        ))}
+      </div>
+      <MCPServerForm
+        visible={formVisible}
+        initialData={editingServer}
+        onSave={handleSaveServer}
+        onCancel={() => setFormVisible(false)}
+      />
+    </div>
+  );
+};

package/src/browser/mcp/config/components/mcp-server-form.module.less

@@ -0,0 +1,78 @@
+.form {
+  padding: 16px;
+}
+
+.formItem {
+  margin-bottom: 16px;
+
+  label {
+    display: block;
+    margin-bottom: 8px;
+    color: var(--foreground);
+    font-size: 13px;
+  }
+
+  input,
+  textarea {
+    width: 100%;
+    padding: 8px;
+    border: 1px solid var(--input-border);
+    border-radius: 4px;
+    background-color: var(--input-background);
+    color: var(--input-foreground);
+    font-size: 13px;
+    font-family: var(--monaco-monospace-font);
+
+    &:focus {
+      border-color: var(--focusBorder);
+      outline: none;
+    }
+
+    &::placeholder {
+      color: var(--descriptionForeground);
+      opacity: 0.6;
+    }
+  }
+
+  textarea {
+    resize: vertical;
+    min-height: 60px;
+  }
+}
+
+.formActions {
+  display: flex;
+  justify-content: flex-end;
+  gap: 8px;
+  margin-top: 24px;
+  padding-top: 16px;
+  border-top: 1px solid var(--border-color);
+}
+
+.cancelButton {
+  padding: 6px 12px;
+  border: 1px solid var(--button-border);
+  border-radius: 4px;
+  background-color: var(--button-secondary-background);
+  color: var(--button-secondary-foreground);
+  cursor: pointer;
+  font-size: 13px;
+
+  &:hover {
+    background-color: var(--button-secondary-hover-background);
+  }
+}
+
+.submitButton {
+  padding: 6px 12px;
+  border: none;
+  border-radius: 4px;
+  background-color: var(--button-primary-background);
+  color: var(--button-primary-foreground);
+  cursor: pointer;
+  font-size: 13px;
+
+  &:hover {
+    background-color: var(--button-primary-hover-background);
+  }
+}