@opensumi/ide-ai-native 3.7.1-next-1737628160.0 → 3.7.1-next-1737703128.0

package/src/browser/ai-core.contribution.ts

@@ -70,7 +70,11 @@ import {
   AI_CHAT_VIEW_ID,
   AI_MENU_BAR_DEBUG_TOOLBAR,
   ChatProxyServiceToken,
+  ISumiMCPServerBackend,
+  SumiMCPServerProxyServicePath,
 } from '../common';
+import { MCPServerDescription, MCPServerManager, MCPServerManagerPath } from '../common/mcp-server-manager';
+import { ToolInvocationRegistry, ToolInvocationRegistryImpl } from '../common/tool-invocation-registry';
 
 import { ChatProxyService } from './chat/chat-proxy.service';
 import { AIChatView } from './chat/chat.view';
@@ -94,10 +98,13 @@ import {
   IChatFeatureRegistry,
   IChatRenderRegistry,
   IIntelligentCompletionsRegistry,
+  IMCPServerRegistry,
   IProblemFixProviderRegistry,
   IRenameCandidatesProviderRegistry,
   IResolveConflictRegistry,
   ITerminalProviderRegistry,
+  MCPServerContribution,
+  TokenMCPServerRegistry,
 } from './types';
 import { InlineChatEditorController } from './widget/inline-chat/inline-chat-editor.controller';
 import { InlineChatFeatureRegistry } from './widget/inline-chat/inline-chat.feature.registry';
@@ -142,6 +149,12 @@ export class AINativeBrowserContribution
   @Autowired(AINativeCoreContribution)
   private readonly contributions: ContributionProvider<AINativeCoreContribution>;
 
+  @Autowired(MCPServerContribution)
+  private readonly mcpServerContributions: ContributionProvider<MCPServerContribution>;
+
+  @Autowired(TokenMCPServerRegistry)
+  private readonly mcpServerRegistry: IMCPServerRegistry;
+
   @Autowired(InlineChatFeatureRegistryToken)
   private readonly inlineChatFeatureRegistry: InlineChatFeatureRegistry;
 
@@ -205,6 +218,12 @@ export class AINativeBrowserContribution
   @Autowired(CodeActionSingleHandler)
   private readonly codeActionSingleHandler: CodeActionSingleHandler;
 
+  // @Autowired(MCPServerManagerPath)
+  // private readonly mcpServerManager: MCPServerManager;
+
+  @Autowired(SumiMCPServerProxyServicePath)
+  private readonly sumiMCPServerBackendProxy: ISumiMCPServerBackend;
+
   constructor() {
     this.registerFeature();
   }
@@ -303,6 +322,11 @@ export class AINativeBrowserContribution
       contribution.registerIntelligentCompletionFeature?.(this.intelligentCompletionsRegistry);
       contribution.registerProblemFixFeature?.(this.problemFixProviderRegistry);
     });
+
+    // 注册 Opensumi 框架提供的 MCP Server Tools 能力 (此时的 Opensumi 作为 MCP Server)
+    this.mcpServerContributions.getContributions().forEach((contribution) => {
+      contribution.registerMCPServer(this.mcpServerRegistry);
+    });
   }
 
   registerSetting(registry: ISettingRegistry) {
@@ -365,10 +389,6 @@ export class AINativeBrowserContribution
             id: AINativeSettingSectionsId.CodeEditsLineChange,
             localized: 'preference.ai.native.codeEdits.lineChange',
           },
-          {
-            id: AINativeSettingSectionsId.CodeEditsTyping,
-            localized: 'preference.ai.native.codeEdits.typing',
-          },
         ],
       });
     }
@@ -411,6 +431,29 @@ export class AINativeBrowserContribution
   }
 
   registerCommands(commands: CommandRegistry): void {
+    commands.registerCommand(
+      { id: 'ai.native.mcp.start', label: 'MCP: Start MCP Server' },
+      {
+        execute: async () => {
+          // this.mcpServerManager.initBuiltinServer();
+
+          this.sumiMCPServerBackendProxy.initBuiltinMCPServer();
+
+          const description: MCPServerDescription = {
+            name: 'filesystem',
+            command: 'npx',
+            args: ['-y', '@modelcontextprotocol/server-filesystem', '/Users/retrox/AlipayProjects/core'],
+            env: {},
+          };
+
+          // this.mcpServerManager.addOrUpdateServer(description);
+
+          // await this.mcpServerManager.startServer(description.name);
+          // await this.mcpServerManager.collectTools(description.name);
+        },
+      },
+    );
+
     commands.registerCommand(AI_INLINE_CHAT_VISIBLE, {
       execute: (value: boolean) => {
         this.aiInlineChatService._onInlineChatVisible.fire(value);

package/src/browser/chat/chat-model.ts

@@ -6,6 +6,7 @@ import {
   IChatComponent,
   IChatMarkdownContent,
   IChatProgress,
+  IChatToolContent,
   IChatTreeData,
   ILogger,
   memoize,
@@ -26,7 +27,7 @@ import {
 import { MsgHistoryManager } from '../model/msg-history-manager';
 import { IChatSlashCommandItem } from '../types';
 
-export type IChatProgressResponseContent = IChatMarkdownContent | IChatAsyncContent | IChatTreeData | IChatComponent;
+export type IChatProgressResponseContent = IChatMarkdownContent | IChatAsyncContent | IChatTreeData | IChatComponent | IChatToolContent;
 
 @Injectable({ multiple: true })
 export class ChatResponseModel extends Disposable {
@@ -81,8 +82,8 @@ export class ChatResponseModel extends Disposable {
   }
 
   updateContent(progress: IChatProgress, quiet?: boolean): void {
+    const responsePartLength = this.#responseParts.length - 1;
     if (progress.kind === 'content' || progress.kind === 'markdownContent') {
-      const responsePartLength = this.#responseParts.length - 1;
       const lastResponsePart = this.#responseParts[responsePartLength];
 
       if (!lastResponsePart || lastResponsePart.kind !== 'markdownContent') {
@@ -120,11 +121,19 @@ export class ChatResponseModel extends Disposable {
         }
         this.#updateResponseText(quiet);
       });
-    } else if (progress.kind === 'treeData') {
+    } else if (progress.kind === 'treeData' || progress.kind === 'component') {
       this.#responseParts.push(progress);
       this.#updateResponseText(quiet);
-    } else if (progress.kind === 'component') {
-      this.#responseParts.push(progress);
+    } else if (progress.kind === 'toolCall') {
+      // @ts-ignore
+      const find: IChatToolContent | undefined = this.#responseParts.find((item) => item.kind === 'toolCall' && (item.content.id === progress.content.id || item.content.index === progress.content.index));
+      if (find) {
+        find.content.function.arguments = find.content.function.arguments + progress.content.function.arguments;
+        this.#responseParts[responsePartLength] = find;
+      } else {
+        this.#responseParts.push(progress);
+      }
+      console.log("🚀 ~ ChatResponseModel ~ updateContent ~ this.#responseParts:", this.#responseParts)
       this.#updateResponseText(quiet);
     }
   }
@@ -141,6 +150,9 @@ export class ChatResponseModel extends Disposable {
         if (part.kind === 'component') {
           return '';
         }
+        if (part.kind === 'toolCall') {
+          return part.content.function.name;
+        }
         return part.content.value;
       })
       .join('\n\n');
@@ -162,9 +174,9 @@ export class ChatResponseModel extends Disposable {
     }
     this.#responseContents = result;
 
-    if (!quiet) {
+    // if (!quiet) {
       this.#onDidChange.fire();
-    }
+    // }
   }
 
   complete(): void {
@@ -258,10 +270,10 @@ export class ChatModel extends Disposable implements IChatModel {
 
     const { kind } = progress;
 
-    const basicKind = ['content', 'markdownContent', 'asyncContent', 'treeData', 'component'];
+    const basicKind = ['content', 'markdownContent', 'asyncContent', 'treeData', 'component', 'toolCall'];
 
     if (basicKind.includes(kind)) {
-      request.response.updateContent(progress, quiet);
+      request.response.updateContent(progress, false);
     } else {
       this.logger.error(`Couldn't handle progress: ${JSON.stringify(progress)}`);
     }

package/src/browser/chat/chat-proxy.service.ts

@@ -25,6 +25,9 @@ import {
 
 import { ChatService } from './chat.api.service';
 import { ChatFeatureRegistry } from './chat.feature.registry';
+import { ChatAgentViewServiceToken } from '@opensumi/ide-core-common';
+import { IChatAgentViewService } from '../types';
+import { ChatToolRender } from '../components/ChatToolRender';
 
 /**
  * @internal
@@ -52,9 +55,18 @@ export class ChatProxyService extends Disposable {
   @Autowired(IAIReporter)
   private readonly aiReporter: IAIReporter;
 
+  @Autowired(ChatAgentViewServiceToken)
+  private readonly chatAgentViewService: IChatAgentViewService;
+
   private chatDeferred: Deferred<void> = new Deferred<void>();
 
   public registerDefaultAgent() {
+    this.chatAgentViewService.registerChatComponent({
+      id: 'toolCall',
+      component: ChatToolRender,
+      initialProps: {},
+    });
+
     this.addDispose(
       this.chatAgentService.registerAgent({
         id: ChatProxyService.AGENT_ID,

package/src/browser/components/ChatEditor.tsx

@@ -130,11 +130,12 @@ export const CodeEditorWithHighlight = (props: Props) => {
   );
 };
 
-const CodeBlock = ({
+export const CodeBlock = ({
   content = '',
   relationId,
   renderText,
   agentId = '',
+  language = '',
   command = '',
 }: {
   content?: string;
@@ -142,14 +143,15 @@ const CodeBlock = ({
   renderText?: (t: string) => React.ReactNode;
   agentId?: string;
   command?: string;
+  language?: string;
 }) => {
   const rgInlineCode = /`([^`]+)`/g;
   const rgBlockCode = /```([^]+?)```/g;
   const rgBlockCodeBefore = /```([^]+)?/g;
 
   const renderCodeEditor = (content: string) => {
-    const language = content.split('\n')[0].trim().toLowerCase();
-    const heighLightLang = highLightLanguageSupport.find((lang) => lang === language) || 'plaintext';
+    const _language = content.split('\n')[0].trim().toLowerCase();
+    const heighLightLang = highLightLanguageSupport.find((lang) => lang === _language) || 'plaintext';
 
     content = content.replace(/.*?\n/, '');
     content = content.trim();
@@ -158,7 +160,7 @@ const CodeBlock = ({
         <div className={styles.code_language}>{capitalize(heighLightLang)}</div>
         <CodeEditorWithHighlight
           input={content}
-          language={language}
+          language={_language || language}
           relationId={relationId}
           agentId={agentId}
           command={command}

package/src/browser/components/ChatReply.tsx

@@ -38,6 +38,7 @@ import {
   IChatComponent,
   IChatContent,
   IChatResponseProgressFileTreeData,
+  IChatToolContent,
   URI,
 } from '@opensumi/ide-core-common';
 import { IIconService } from '@opensumi/ide-theme';
@@ -148,6 +149,34 @@ const TreeRenderer = (props: { treeData: IChatResponseProgressFileTreeData }) =>
   );
 };
 
+const ToolCallRender = (props: { toolCall: IChatToolContent['content'] }) => {
+  console.log("🚀 ~ ToolCallRender ~ props:", props)
+  const { toolCall } = props;
+  const chatAgentViewService = useInjectable<IChatAgentViewService>(ChatAgentViewServiceToken);
+  const [node, setNode] = useState<React.JSX.Element | null>(null);
+
+  useEffect(() => {
+    const config = chatAgentViewService.getChatComponent('toolCall');
+    if (config) {
+      const { component: Component, initialProps } = config;
+      setNode(<Component {...initialProps} value={toolCall} />);
+      return;
+    }
+    setNode(
+      <div>
+        <Loading />
+        <span style={{ marginLeft: 4 }}>正在加载组件</span>
+      </div>,
+    );
+    const deferred = chatAgentViewService.getChatComponentDeferred('toolCall')!;
+    deferred.promise.then(({ component: Component, initialProps }) => {
+      setNode(<Component {...initialProps} value={toolCall} />);
+    });
+  }, [toolCall]);
+
+  return node;
+};
+
 const ComponentRender = (props: { component: string; value?: unknown }) => {
   const chatAgentViewService = useInjectable<IChatAgentViewService>(ChatAgentViewServiceToken);
   const [node, setNode] = useState<React.JSX.Element | null>(null);
@@ -202,6 +231,7 @@ export const ChatReply = (props: IChatReplyProps) => {
 
     disposableCollection.push(
       request.response.onDidChange(() => {
+        console.log("🚀 ~ request.response.onDidChange ~ onDidChange:", 'onDidChange')
         history.updateAssistantMessage(msgId, { content: request.response.responseText });
 
         if (request.response.isComplete) {
@@ -219,10 +249,10 @@ export const ChatReply = (props: IChatReplyProps) => {
           });
         }
 
-        startTransition(() => {
-          onDidChange?.();
-          update();
-        });
+        // startTransition(() => {
+        // });
+        onDidChange?.();
+        update();
       }),
     );
 
@@ -274,6 +304,10 @@ export const ChatReply = (props: IChatReplyProps) => {
     <ComponentRender component={componentId} value={value} />
   );
 
+  const renderToolCall = (toolCall: IChatToolContent['content']) => {
+    return <ToolCallRender toolCall={toolCall} />;
+  };
+
   const contentNode = React.useMemo(
     () =>
       request.response.responseContents.map((item, index) => {
@@ -284,6 +318,8 @@ export const ChatReply = (props: IChatReplyProps) => {
           node = renderTreeData(item.treeData);
         } else if (item.kind === 'component') {
           node = renderComponent(item.component, item.value);
+        } else if (item.kind === 'toolCall') {
+          node = renderToolCall(item.content);
         } else {
           node = renderMarkdown(item.content);
         }

package/src/browser/components/ChatToolRender.tsx

@@ -0,0 +1,27 @@
+import { IChatToolContent, uuid } from "@opensumi/ide-core-common";
+import React from "react";
+import { CodeEditorWithHighlight } from "./ChatEditor";
+
+export const ChatToolRender = (props: { value: IChatToolContent['content'] }) => {
+    const { value } = props;
+    console.log("🚀 ~ ChatToolRender ~ toolCall:", value)
+
+    if (!value || !value.function || !value.id) {
+        return null;
+    }
+
+    return <div>
+        <span>当前调用的工具: </span>
+        <span>{value?.function?.name}</span>
+        <br />
+        <span></span>
+        {
+            value?.function?.arguments &&
+            (<CodeEditorWithHighlight
+                input={value?.function?.arguments}
+                language={'json'}
+                relationId={uuid(4)}
+            />)
+        }
+    </div>
+};

package/src/browser/components/components.module.less

@@ -244,44 +244,45 @@
   }
 }
 
-.code_block {
+.monaco_wrapper {
   position: relative;
-  min-width: 100px;
-  margin-top: 4px;
-  .monaco_wrapper {
-    position: relative;
-    min-width: 130px;
-    > pre {
-      margin-bottom: 10px;
-    }
-    .editor {
-      border-radius: 8px;
-      font-size: 12px;
-      padding: 32px 8px 8px 8px;
-      line-height: 18px;
-      &::-webkit-scrollbar {
-        width: auto;
-        height: 4px;
-      }
+  min-width: 130px;
+  > pre {
+    margin-bottom: 10px;
+  }
+  .editor {
+    border-radius: 8px;
+    font-size: 12px;
+    padding: 32px 8px 8px 8px;
+    line-height: 18px;
+    &::-webkit-scrollbar {
+      width: auto;
+      height: 4px;
     }
+  }
 
-    .action_toolbar {
-      display: flex;
-      position: absolute;
-      right: 8px;
-      top: 6px;
-      z-index: 100;
-      height: 20px;
-      align-items: center;
-      overflow: hidden;
+  .action_toolbar {
+    display: flex;
+    position: absolute;
+    right: 8px;
+    top: 6px;
+    z-index: 100;
+    height: 20px;
+    align-items: center;
+    overflow: hidden;
 
-      :global {
-        .kt-popover {
-          height: inherit;
-        }
+    :global {
+      .kt-popover {
+        height: inherit;
       }
     }
   }
+}
+
+.code_block {
+  position: relative;
+  min-width: 100px;
+  margin-top: 4px;
 
   :global {
     .hljs {

package/src/browser/contrib/intelligent-completions/index.ts

@@ -1,5 +1,5 @@
 import { Disposable, ECodeEditsSourceTyping } from '@opensumi/ide-core-common';
-import { IModelContentChangedEvent, IPosition, IRange, InlineCompletion } from '@opensumi/ide-monaco';
+import { IPosition, IRange, InlineCompletion } from '@opensumi/ide-monaco';
 
 import type { ILineChangeData } from './source/line-change.source';
 import type { ILinterErrorData } from './source/lint-error.source';
@@ -14,8 +14,7 @@ export interface IIntelligentCompletionsResult<T = any> {
 
 export type ICodeEditsContextBean =
   | { typing: ECodeEditsSourceTyping.LinterErrors; position: IPosition; data: ILinterErrorData }
-  | { typing: ECodeEditsSourceTyping.LineChange; position: IPosition; data: ILineChangeData }
-  | { typing: ECodeEditsSourceTyping.Typing; position: IPosition; data: IModelContentChangedEvent };
+  | { typing: ECodeEditsSourceTyping.LineChange; position: IPosition; data: ILineChangeData };
 
 export interface ICodeEdit {
   /**

package/src/browser/contrib/intelligent-completions/intelligent-completions.controller.ts

@@ -47,7 +47,6 @@ import { IntelligentCompletionsRegistry } from './intelligent-completions.featur
 import { CodeEditsSourceCollection } from './source/base';
 import { LineChangeCodeEditsSource } from './source/line-change.source';
 import { LintErrorCodeEditsSource } from './source/lint-error.source';
-import { TypingCodeEditsSource } from './source/typing.source';
 
 import { CodeEditsResultValue } from './index';
 
@@ -96,7 +95,7 @@ export class IntelligentCompletionsController extends BaseAIMonacoEditorControll
     this.additionsDeletionsDecorationModel = new AdditionsDeletionsDecorationModel(this.monacoEditor);
     this.aiNativeContextKey = this.injector.get(AINativeContextKey, [this.monacoEditor.contextKeyService]);
     this.codeEditsSourceCollection = this.injector.get(CodeEditsSourceCollection, [
-      [LintErrorCodeEditsSource, LineChangeCodeEditsSource, TypingCodeEditsSource],
+      [LintErrorCodeEditsSource, LineChangeCodeEditsSource],
       this.monacoEditor,
     ]);
 

package/src/browser/contrib/intelligent-completions/source/base.ts

@@ -69,6 +69,8 @@ export abstract class BaseCodeEditsSource extends Disposable {
   private cancellationTokenSource = new CancellationTokenSource();
   private readonly relationID = observableValue<string | undefined>(this, undefined);
 
+  protected abstract doTrigger(...args: any[]): MaybePromise<void>;
+
   public readonly codeEditsContextBean = disposableObservableValue<CodeEditsContextBean | undefined>(this, undefined);
   public abstract priority: number;
   public abstract mount(): IDisposable;

package/src/browser/contrib/intelligent-completions/source/line-change.source.ts

@@ -1,102 +1,47 @@
 import { Injectable } from '@opensumi/di';
 import { AINativeSettingSectionsId, ECodeEditsSourceTyping, IDisposable } from '@opensumi/ide-core-common';
-import { ICursorPositionChangedEvent, IModelContentChangedEvent } from '@opensumi/ide-monaco';
-import {
-  autorunDelta,
-  derivedHandleChanges,
-  observableFromEvent,
-  recomputeInitiallyAndOnChange,
-} from '@opensumi/ide-monaco/lib/common/observable';
+import { ICursorPositionChangedEvent, Position } from '@opensumi/ide-monaco';
 
 import { BaseCodeEditsSource } from './base';
 
 export interface ILineChangeData {
   currentLineNumber: number;
   preLineNumber?: number;
-  change?: IModelContentChangedEvent;
 }
 
 @Injectable({ multiple: true })
 export class LineChangeCodeEditsSource extends BaseCodeEditsSource {
   public priority = 2;
 
-  public mount(): IDisposable {
-    const modelContentChangeObs = observableFromEvent<IModelContentChangedEvent>(
-      this,
-      this.monacoEditor.onDidChangeModelContent,
-      (event: IModelContentChangedEvent) => event,
-    );
-    const positionChangeObs = observableFromEvent<ICursorPositionChangedEvent>(
-      this,
-      this.monacoEditor.onDidChangeCursorPosition,
-      (event: ICursorPositionChangedEvent) => event,
-    );
+  private prePosition = this.monacoEditor.getPosition();
 
-    const latestModelContentChangeObs = derivedHandleChanges(
-      {
-        owner: this,
-        createEmptyChangeSummary: () => ({ change: undefined }),
-        handleChange: (ctx, changeSummary: { change: IModelContentChangedEvent | undefined }) => {
-          // 如果只是改了光标则设置 change 为空，避免获取到缓存的 change
-          if (ctx.didChange(positionChangeObs)) {
-            changeSummary.change = undefined;
-          } else {
-            changeSummary.change = modelContentChangeObs.get();
-          }
-          return true;
-        },
-      },
-      (reader, changeSummary) => {
-        positionChangeObs.read(reader);
-        modelContentChangeObs.read(reader);
-        return changeSummary.change;
-      },
-    );
-
-    this.addDispose(recomputeInitiallyAndOnChange(latestModelContentChangeObs));
-
-    let lastModelContent: IModelContentChangedEvent | undefined;
+  public mount(): IDisposable {
     this.addDispose(
-      /**
-       * 由于 monaco 的 changeModelContent 事件比 changeCursorPosition 事件先触发，所以这里需要拿上一次的值进行消费
-       * 否则永远返回 undefined
-       */
-      autorunDelta(latestModelContentChangeObs, ({ lastValue }) => {
-        lastModelContent = lastValue;
+      this.monacoEditor.onDidChangeCursorPosition((event: ICursorPositionChangedEvent) => {
+        const currentPosition = event.position;
+        if (this.prePosition && this.prePosition.lineNumber !== currentPosition.lineNumber) {
+          this.doTrigger(currentPosition);
+          this.prePosition = currentPosition;
+        }
       }),
     );
+    return this;
+  }
 
-    this.addDispose(
-      autorunDelta(positionChangeObs, ({ lastValue, newValue }) => {
-        const contentChange = lastModelContent;
-
-        const isLineChangeEnabled = this.preferenceService.getValid(
-          AINativeSettingSectionsId.CodeEditsLineChange,
-          false,
-        );
-        if (!isLineChangeEnabled) {
-          return false;
-        }
-
-        const prePosition = lastValue?.position;
-        const currentPosition = newValue?.position;
-        if (prePosition && prePosition.lineNumber !== currentPosition?.lineNumber) {
-          this.setBean({
-            typing: ECodeEditsSourceTyping.LineChange,
-            position: currentPosition,
-            data: {
-              preLineNumber: prePosition.lineNumber,
-              currentLineNumber: currentPosition.lineNumber,
-              change: contentChange,
-            },
-          });
-        }
+  protected doTrigger(position: Position) {
+    const isLineChangeEnabled = this.preferenceService.getValid(AINativeSettingSectionsId.CodeEditsLineChange, false);
 
-        // 消费完之后设置为 undefined，避免下次获取到缓存的值
-        lastModelContent = undefined;
-      }),
-    );
+    if (!isLineChangeEnabled || !position) {
+      return;
+    }
 
-    return this;
+    this.setBean({
+      typing: ECodeEditsSourceTyping.LineChange,
+      position,
+      data: {
+        preLineNumber: this.prePosition?.lineNumber,
+        currentLineNumber: position.lineNumber,
+      },
+    });
   }
 }