@opensumi/ide-ai-native 3.7.2-next-1740450374.0 → 3.7.2-next-1741226843.0

package/lib/node/index.js

@@ -6,9 +6,6 @@ const di_1 = require("@opensumi/di");
 const ide_core_common_1 = require("@opensumi/ide-core-common");
 const ide_core_node_1 = require("@opensumi/ide-core-node");
 const base_back_service_1 = require("@opensumi/ide-core-node/lib/ai-native/base-back.service");
-const common_1 = require("../common");
-const tool_invocation_registry_1 = require("../common/tool-invocation-registry");
-const sumi_mcp_server_1 = require("./mcp/sumi-mcp-server");
 let AINativeModule = class AINativeModule extends ide_core_node_1.NodeModule {
     constructor() {
         super(...arguments);
@@ -17,28 +14,12 @@ let AINativeModule = class AINativeModule extends ide_core_node_1.NodeModule {
                 token: ide_core_common_1.AIBackSerivceToken,
                 useClass: base_back_service_1.BaseAIBackService,
             },
-            {
-                token: tool_invocation_registry_1.ToolInvocationRegistryManager,
-                useClass: tool_invocation_registry_1.ToolInvocationRegistryManagerImpl,
-            },
-            {
-                token: common_1.TokenMCPServerProxyService,
-                useClass: sumi_mcp_server_1.SumiMCPServerBackend,
-            },
         ];
         this.backServices = [
             {
                 servicePath: ide_core_common_1.AIBackSerivcePath,
                 token: ide_core_common_1.AIBackSerivceToken,
             },
-            // {
-            //   servicePath: MCPServerManagerPath,
-            //   token: MCPServerManager,
-            // },
-            {
-                servicePath: common_1.SumiMCPServerProxyServicePath,
-                token: common_1.TokenMCPServerProxyService,
-            },
         ];
     }
 };

package/lib/node/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":";;;;AAAA,qCAAoD;AACpD,+DAAkF;AAClF,2DAAqD;AACrD,+FAA4F;AAE5F,sCAAsF;AACtF,iFAAsH;AAEtH,2DAA6D;AAGtD,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,0BAAU;IAAvC;;QACL,cAAS,GAAe;YACtB;gBACE,KAAK,EAAE,oCAAkB;gBACzB,QAAQ,EAAE,qCAAiB;aAC5B;YACD;gBACE,KAAK,EAAE,wDAA6B;gBACpC,QAAQ,EAAE,4DAAiC;aAC5C;YACD;gBACE,KAAK,EAAE,mCAA0B;gBACjC,QAAQ,EAAE,sCAAoB;aAC/B;SACF,CAAC;QAEF,iBAAY,GAAG;YACb;gBACE,WAAW,EAAE,mCAAiB;gBAC9B,KAAK,EAAE,oCAAkB;aAC1B;YACD,IAAI;YACJ,uCAAuC;YACvC,6BAA6B;YAC7B,KAAK;YACL;gBACE,WAAW,EAAE,sCAA6B;gBAC1C,KAAK,EAAE,mCAA0B;aAClC;SACF,CAAC;IACJ,CAAC;CAAA,CAAA;AA9BY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,eAAU,GAAE;GACA,cAAc,CA8B1B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":";;;;AAAA,qCAAoD;AACpD,+DAAkF;AAClF,2DAAqD;AACrD,+FAA4F;AAGrF,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,0BAAU;IAAvC;;QACL,cAAS,GAAe;YACtB;gBACE,KAAK,EAAE,oCAAkB;gBACzB,QAAQ,EAAE,qCAAiB;aAC5B;SACF,CAAC;QAEF,iBAAY,GAAG;YACb;gBACE,WAAW,EAAE,mCAAiB;gBAC9B,KAAK,EAAE,oCAAkB;aAC1B;SACF,CAAC;IACJ,CAAC;CAAA,CAAA;AAdY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,eAAU,GAAE;GACA,cAAc,CAc1B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-ai-native",
-  "version": "3.7.2-next-1740450374.0",
+  "version": "3.7.2-next-1741226843.0",
   "files": [
     "lib",
     "src"
@@ -19,45 +19,34 @@
     "url": "git@github.com:opensumi/core.git"
   },
   "dependencies": {
-    "@ai-sdk/anthropic": "^1.1.6",
-    "@ai-sdk/deepseek": "^0.1.8",
-    "@ai-sdk/openai": "^1.1.9",
-    "@modelcontextprotocol/sdk": "^1.3.1",
-    "@opensumi/ide-addons": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-components": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-connection": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-core-common": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-core-node": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-debug": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-design": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-editor": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-file-search": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-file-service": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-main-layout": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-markers": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-monaco": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-overlay": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-preferences": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-search": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-terminal-next": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-theme": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-utils": "3.7.2-next-1740450374.0",
-    "@opensumi/ide-workspace": "3.7.2-next-1740450374.0",
+    "@opensumi/ide-components": "3.7.2-next-1741226843.0",
+    "@opensumi/ide-core-common": "3.7.2-next-1741226843.0",
+    "@opensumi/ide-core-node": "3.7.2-next-1741226843.0",
+    "@opensumi/ide-debug": "3.7.2-next-1741226843.0",
+    "@opensumi/ide-design": "3.7.2-next-1741226843.0",
+    "@opensumi/ide-editor": "3.7.2-next-1741226843.0",
+    "@opensumi/ide-file-service": "3.7.2-next-1741226843.0",
+    "@opensumi/ide-file-tree-next": "3.7.2-next-1741226843.0",
+    "@opensumi/ide-main-layout": "3.7.2-next-1741226843.0",
+    "@opensumi/ide-markers": "3.7.2-next-1741226843.0",
+    "@opensumi/ide-menu-bar": "3.7.2-next-1741226843.0",
+    "@opensumi/ide-monaco": "3.7.2-next-1741226843.0",
+    "@opensumi/ide-overlay": "3.7.2-next-1741226843.0",
+    "@opensumi/ide-preferences": "3.7.2-next-1741226843.0",
+    "@opensumi/ide-terminal-next": "3.7.2-next-1741226843.0",
+    "@opensumi/ide-theme": "3.7.2-next-1741226843.0",
+    "@opensumi/ide-utils": "3.7.2-next-1741226843.0",
+    "@opensumi/ide-workspace": "3.7.2-next-1741226843.0",
     "@xterm/xterm": "5.5.0",
-    "ai": "^4.1.21",
     "ansi-regex": "^2.0.0",
-    "diff": "^7.0.0",
     "dom-align": "^1.7.0",
-    "rc-collapse": "^4.0.0",
     "react-chat-elements": "^12.0.10",
     "react-highlight": "^0.15.0",
     "tiktoken": "1.0.12",
-    "web-tree-sitter": "0.22.6",
-    "zod": "^3.23.8",
-    "zod-to-json-schema": "^3.24.1"
+    "web-tree-sitter": "0.22.6"
   },
   "devDependencies": {
-    "@opensumi/ide-core-browser": "3.7.2-next-1740450374.0"
+    "@opensumi/ide-core-browser": "3.7.2-next-1741226843.0"
   },
-  "gitHead": "12458460da12fc6e96c4942034c7012b2381990c"
+  "gitHead": "4abde3a575df8a7ce66b2977604b054f8a512af1"
 }

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

@@ -5,7 +5,6 @@ import {
   InlineCompletionIsTrigger,
   InlineDiffPartialEditsIsVisible,
   InlineHintWidgetIsVisible,
-  InlineInputWidgetIsStreaming,
   InlineInputWidgetIsVisible,
   MultiLineEditsIsVisible,
 } from '@opensumi/ide-core-browser/lib/contextkey/ai-native';
@@ -23,7 +22,6 @@ export class AINativeContextKey {
   public readonly inlineCompletionIsTrigger: IContextKey<boolean>;
   public readonly inlineHintWidgetIsVisible: IContextKey<boolean>;
   public readonly inlineInputWidgetIsVisible: IContextKey<boolean>;
-  public readonly inlineInputWidgetIsStreaming: IContextKey<boolean>;
   public readonly inlineDiffPartialEditsIsVisible: IContextKey<boolean>;
   public readonly multiLineEditsIsVisible: IContextKey<boolean>;
   public get contextKeyService() {
@@ -36,7 +34,6 @@ export class AINativeContextKey {
     this.inlineCompletionIsTrigger = InlineCompletionIsTrigger.bind(this._contextKeyService);
     this.inlineHintWidgetIsVisible = InlineHintWidgetIsVisible.bind(this._contextKeyService);
     this.inlineInputWidgetIsVisible = InlineInputWidgetIsVisible.bind(this._contextKeyService);
-    this.inlineInputWidgetIsStreaming = InlineInputWidgetIsStreaming.bind(this._contextKeyService);
     this.inlineDiffPartialEditsIsVisible = InlineDiffPartialEditsIsVisible.bind(this._contextKeyService);
     this.multiLineEditsIsVisible = MultiLineEditsIsVisible.bind(this._contextKeyService);
   }

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

@@ -27,7 +27,6 @@ import {
 } from '@opensumi/ide-core-browser';
 import {
   AI_CHAT_VISIBLE,
-  AI_INLINE_CHAT_INTERACTIVE_INPUT_CANCEL,
   AI_INLINE_CHAT_INTERACTIVE_INPUT_VISIBLE,
   AI_INLINE_CHAT_VISIBLE,
   AI_INLINE_COMPLETION_REPORTER,
@@ -38,7 +37,6 @@ import {
   InlineChatIsVisible,
   InlineDiffPartialEditsIsVisible,
   InlineHintWidgetIsVisible,
-  InlineInputWidgetIsStreaming,
   InlineInputWidgetIsVisible,
 } from '@opensumi/ide-core-browser/lib/contextkey/ai-native';
 import { DesignLayoutConfig } from '@opensumi/ide-core-browser/lib/layout/constants';
@@ -58,9 +56,8 @@ import {
   runWhenIdle,
 } from '@opensumi/ide-core-common';
 import { DESIGN_MENU_BAR_RIGHT } from '@opensumi/ide-design';
-import { IEditor, WorkbenchEditorService } from '@opensumi/ide-editor';
+import { IEditor } from '@opensumi/ide-editor';
 import { BrowserEditorContribution, IEditorFeatureRegistry } from '@opensumi/ide-editor/lib/browser';
-import { WorkbenchEditorServiceImpl } from '@opensumi/ide-editor/lib/browser/workbench-editor.service';
 import { IMainLayoutService } from '@opensumi/ide-main-layout';
 import { ISettingRegistry, SettingContribution } from '@opensumi/ide-preferences';
 import { EditorContributionInstantiation } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/editorExtensions';
@@ -73,16 +70,9 @@ import {
   AI_CHAT_VIEW_ID,
   AI_MENU_BAR_DEBUG_TOOLBAR,
   ChatProxyServiceToken,
-  IChatInternalService,
-  IChatManagerService,
-  ISumiMCPServerBackend,
-  SumiMCPServerProxyServicePath,
 } from '../common';
-import { MCPServerDescription } from '../common/mcp-server-manager';
 
-import { ChatManagerService } from './chat/chat-manager.service';
 import { ChatProxyService } from './chat/chat-proxy.service';
-import { ChatInternalService } from './chat/chat.internal.service';
 import { AIChatView } from './chat/chat.view';
 import { CodeActionSingleHandler } from './contrib/code-action/code-action.handler';
 import { AIInlineCompletionsProvider } from './contrib/inline-completions/completeProvider';
@@ -104,21 +94,18 @@ 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';
-import { InlineChatService } from './widget/inline-chat/inline-chat.service';
+import { AIInlineChatService } from './widget/inline-chat/inline-chat.service';
 import { InlineDiffController } from './widget/inline-diff/inline-diff.controller';
 import { InlineHintController } from './widget/inline-hint/inline-hint.controller';
 import { InlineInputController } from './widget/inline-input/inline-input.controller';
-import { InlineInputService } from './widget/inline-input/inline-input.service';
+import { InlineInputChatService } from './widget/inline-input/inline-input.service';
 import { InlineStreamDiffService } from './widget/inline-stream-diff/inline-stream-diff.service';
 import { SumiLightBulbWidget } from './widget/light-bulb';
 
@@ -155,12 +142,6 @@ 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;
 
@@ -210,10 +191,10 @@ export class AINativeBrowserContribution
   private readonly chatProxyService: ChatProxyService;
 
   @Autowired(IAIInlineChatService)
-  private readonly aiInlineChatService: InlineChatService;
+  private readonly aiInlineChatService: AIInlineChatService;
 
-  @Autowired(InlineInputService)
-  private readonly inlineInputService: InlineInputService;
+  @Autowired(InlineInputChatService)
+  private readonly inlineInputChatService: InlineInputChatService;
 
   @Autowired(InlineStreamDiffService)
   private readonly inlineStreamDiffService: InlineStreamDiffService;
@@ -224,36 +205,22 @@ export class AINativeBrowserContribution
   @Autowired(CodeActionSingleHandler)
   private readonly codeActionSingleHandler: CodeActionSingleHandler;
 
-  @Autowired(SumiMCPServerProxyServicePath)
-  private readonly sumiMCPServerBackendProxy: ISumiMCPServerBackend;
-
-  @Autowired(WorkbenchEditorService)
-  private readonly workbenchEditorService: WorkbenchEditorServiceImpl;
-
-  @Autowired(IChatManagerService)
-  private readonly chatManagerService: ChatManagerService;
-
-  @Autowired(IChatInternalService)
-  private readonly chatInternalService: ChatInternalService;
-
   constructor() {
     this.registerFeature();
   }
 
-  async initialize() {
+  initialize() {
     const { supportsChatAssistant } = this.aiNativeConfigService.capabilities;
 
     if (supportsChatAssistant) {
       ComponentRegistryImpl.addLayoutModule(this.appConfig.layoutConfig, AI_CHAT_VIEW_ID, AI_CHAT_CONTAINER_ID);
       ComponentRegistryImpl.addLayoutModule(this.appConfig.layoutConfig, DESIGN_MENU_BAR_RIGHT, AI_CHAT_LOGO_AVATAR_ID);
       this.chatProxyService.registerDefaultAgent();
-      this.chatInternalService.init();
-      await this.chatManagerService.init();
     }
   }
 
   registerEditorExtensionContribution(register: IEditorExtensionContribution<any[]>): void {
-    const { supportsInlineChat, supportsInlineCompletion, supportsProblemFix, supportsCodeAction } =
+    const { supportsInlineChat, supportsInlineCompletion, supportsProblemFix } =
       this.aiNativeConfigService.capabilities;
 
     register(
@@ -262,18 +229,15 @@ export class AINativeBrowserContribution
       EditorContributionInstantiation.Lazy,
     );
 
-    if (supportsCodeAction) {
-      register(SumiLightBulbWidget.ID, SumiLightBulbWidget, EditorContributionInstantiation.Lazy);
-    }
-
     if (supportsInlineChat) {
+      register(SumiLightBulbWidget.ID, SumiLightBulbWidget, EditorContributionInstantiation.Lazy);
       register(
         InlineChatEditorController.ID,
         new SyncDescriptor(InlineChatEditorController, [this.injector]),
         EditorContributionInstantiation.BeforeFirstInteraction,
       );
 
-      if (this.inlineInputService.getInteractiveInputHandler()) {
+      if (this.inlineChatFeatureRegistry.getInteractiveInputHandler()) {
         register(
           InlineHintController.ID,
           new SyncDescriptor(InlineHintController, [this.injector]),
@@ -290,7 +254,7 @@ export class AINativeBrowserContribution
       register(
         IntelligentCompletionsController.ID,
         new SyncDescriptor(IntelligentCompletionsController, [this.injector]),
-        EditorContributionInstantiation.Eager,
+        EditorContributionInstantiation.AfterFirstRender,
       );
       register(
         InlineCompletionsController.ID,
@@ -309,7 +273,7 @@ export class AINativeBrowserContribution
 
   onDidStart() {
     runWhenIdle(() => {
-      const { supportsRenameSuggestions, supportsInlineChat, supportsMCP } = this.aiNativeConfigService.capabilities;
+      const { supportsRenameSuggestions, supportsInlineChat } = this.aiNativeConfigService.capabilities;
       const prefChatVisibleType = this.preferenceService.getValid(AINativeSettingSectionsId.ChatVisibleType);
 
       if (prefChatVisibleType === 'always') {
@@ -325,19 +289,6 @@ export class AINativeBrowserContribution
       if (supportsInlineChat) {
         this.codeActionSingleHandler.load();
       }
-
-      if (supportsMCP) {
-        // 初始化内置 MCP Server
-        this.sumiMCPServerBackendProxy.initBuiltinMCPServer();
-
-        // 从 preferences 获取并初始化外部 MCP Servers
-        const mcpServers = this.preferenceService.getValid<MCPServerDescription[]>(
-          AINativeSettingSectionsId.MCPServers,
-        );
-        if (mcpServers && mcpServers.length > 0) {
-          this.sumiMCPServerBackendProxy.initExternalMCPServers(mcpServers);
-        }
-      }
     });
   }
 
@@ -351,12 +302,6 @@ export class AINativeBrowserContribution
       contribution.registerTerminalProvider?.(this.terminalProviderRegistry);
       contribution.registerIntelligentCompletionFeature?.(this.intelligentCompletionsRegistry);
       contribution.registerProblemFixFeature?.(this.problemFixProviderRegistry);
-      contribution.registerChatAgentPromptProvider?.();
-    });
-
-    // 注册 Opensumi 框架提供的 MCP Server Tools 能力 (此时的 Opensumi 作为 MCP Server)
-    this.mcpServerContributions.getContributions().forEach((contribution) => {
-      contribution.registerMCPServer(this.mcpServerRegistry);
     });
   }
 
@@ -420,56 +365,6 @@ export class AINativeBrowserContribution
             id: AINativeSettingSectionsId.CodeEditsLineChange,
             localized: 'preference.ai.native.codeEdits.lineChange',
           },
-          {
-            id: AINativeSettingSectionsId.CodeEditsTyping,
-            localized: 'preference.ai.native.codeEdits.typing',
-          },
-          {
-            id: AINativeSettingSectionsId.SystemPrompt,
-            localized: 'preference.ai.native.chat.system.prompt',
-          },
-        ],
-      });
-    }
-
-    // Register language model API key settings
-    if (this.aiNativeConfigService.capabilities.supportsCustomLLMSettings) {
-      registry.registerSettingSection(AI_NATIVE_SETTING_GROUP_ID, {
-        title: localize('preference.ai.native.llm.apiSettings.title'),
-        preferences: [
-          {
-            id: AINativeSettingSectionsId.LLMModelSelection,
-            localized: 'preference.ai.native.llm.model.selection',
-          },
-          {
-            id: AINativeSettingSectionsId.DeepseekApiKey,
-            localized: 'preference.ai.native.deepseek.apiKey',
-          },
-          {
-            id: AINativeSettingSectionsId.AnthropicApiKey,
-            localized: 'preference.ai.native.anthropic.apiKey',
-          },
-          {
-            id: AINativeSettingSectionsId.OpenaiApiKey,
-            localized: 'preference.ai.native.openai.apiKey',
-          },
-          {
-            id: AINativeSettingSectionsId.OpenaiBaseURL,
-            localized: 'preference.ai.native.openai.baseURL',
-          },
-        ],
-      });
-    }
-
-    // Register MCP server settings
-    if (this.aiNativeConfigService.capabilities.supportsMCP) {
-      registry.registerSettingSection(AI_NATIVE_SETTING_GROUP_ID, {
-        title: localize('preference.ai.native.mcp.settings.title'),
-        preferences: [
-          {
-            id: AINativeSettingSectionsId.MCPServers,
-            localized: 'preference.ai.native.mcp.servers',
-          },
         ],
       });
     }
@@ -519,48 +414,14 @@ export class AINativeBrowserContribution
     });
 
     commands.registerCommand(AI_INLINE_CHAT_INTERACTIVE_INPUT_VISIBLE, {
-      execute: async (isVisible: boolean) => {
-        if (!isVisible) {
-          this.inlineInputService.hide();
-          return;
+      execute: (isVisible: boolean) => {
+        if (isVisible) {
+          this.inlineInputChatService.visible();
+        } else {
+          this.inlineInputChatService.hide();
         }
 
-        // 每次在展示 inline input 的时候，先隐藏 inline chat
-        this.commandService.executeCommand(AI_INLINE_CHAT_VISIBLE.id, false);
-
-        const editor = this.workbenchEditorService.currentCodeEditor;
-        if (!editor) {
-          return;
-        }
-
-        const position = editor.monacoEditor.getPosition();
-        if (!position) {
-          return;
-        }
-
-        const selection = editor.monacoEditor.getSelection();
-        const isEmptyLine = position ? editor.monacoEditor.getModel()?.getLineLength(position.lineNumber) === 0 : false;
-
-        if (isEmptyLine) {
-          this.inlineInputService.visibleByPosition(position);
-          return;
-        }
-
-        if (selection && !selection.isEmpty()) {
-          this.inlineInputService.visibleBySelection(selection);
-          return;
-        }
-
-        this.inlineInputService.visibleByNearestCodeBlock(position, editor.monacoEditor);
-      },
-    });
-
-    commands.registerCommand(AI_INLINE_CHAT_INTERACTIVE_INPUT_CANCEL, {
-      execute: () => {
-        const editor = this.workbenchEditorService.currentCodeEditor;
-        if (editor) {
-          InlineInputController.get(editor.monacoEditor)?.cancelToken();
-        }
+        this.aiInlineChatService._onInteractiveInputVisible.fire(isVisible);
       },
     });
 
@@ -651,12 +512,12 @@ export class AINativeBrowserContribution
         when: `editorFocus && ${InlineChatIsVisible.raw}`,
       });
 
-      if (this.inlineInputService.getInteractiveInputHandler()) {
+      if (this.inlineChatFeatureRegistry.getInteractiveInputHandler()) {
         // 当 Inline Chat （浮动组件）展示时，通过 CMD K 唤起 Inline Input
         keybindings.registerKeybinding(
           {
             command: AI_INLINE_CHAT_INTERACTIVE_INPUT_VISIBLE.id,
-            keybinding: this.aiNativeConfigService.inlineChat.inputKeybinding,
+            keybinding: 'ctrlcmd+k',
             args: true,
             priority: 0,
             when: `editorFocus && (${InlineChatIsVisible.raw} || inlineSuggestionVisible)`,
@@ -671,18 +532,11 @@ export class AINativeBrowserContribution
           priority: 0,
           when: `editorFocus && ${InlineInputWidgetIsVisible.raw}`,
         });
-        // 当 Inline Input 流式编辑时，通过 ESC 退出
-        keybindings.registerKeybinding({
-          command: AI_INLINE_CHAT_INTERACTIVE_INPUT_CANCEL.id,
-          keybinding: 'esc',
-          priority: 1,
-          when: `editorFocus && ${InlineInputWidgetIsStreaming.raw}`,
-        });
         // 当出现 CMD K 展示信息时，通过快捷键快速唤起 Inline Input
         keybindings.registerKeybinding(
           {
             command: AI_INLINE_CHAT_INTERACTIVE_INPUT_VISIBLE.id,
-            keybinding: this.aiNativeConfigService.inlineChat.inputKeybinding,
+            keybinding: 'ctrlcmd+k',
             args: true,
             priority: 0,
             when: `editorFocus && ${InlineHintWidgetIsVisible.raw} && ${InlineChatIsVisible.not}`,

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

@@ -13,7 +13,6 @@ import {
   ILogger,
   toDisposable,
 } from '@opensumi/ide-core-common';
-import { ChatMessageRole } from '@opensumi/ide-core-common';
 import { IChatMessage } from '@opensumi/ide-core-common/lib/types/ai-native';
 
 import {
@@ -120,12 +119,6 @@ export class ChatAgentService extends Disposable implements IChatAgentService {
     if (!data) {
       throw new Error(`No agent with id ${id}`);
     }
-    if (data.agent.metadata.systemPrompt) {
-      history.unshift({
-        role: ChatMessageRole.System,
-        content: data.agent.metadata.systemPrompt,
-      });
-    }
 
     const result = await data.agent.invoke(request, progress, history, token);
     return result;

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

@@ -4,41 +4,19 @@ import {
   CancellationTokenSource,
   Disposable,
   DisposableMap,
-  Emitter,
   IChatProgress,
-  IStorage,
-  STORAGE_NAMESPACE,
-  StorageProvider,
 } from '@opensumi/ide-core-common';
-import { ChatMessageRole, IChatMessage, IHistoryChatMessage } from '@opensumi/ide-core-common/lib/types/ai-native';
-
-import { IChatAgentService, IChatFollowup, IChatRequestMessage, IChatResponseErrorDetails } from '../../common';
-import { MsgHistoryManager } from '../model/msg-history-manager';
-
-import { ChatModel, ChatRequestModel, ChatResponseModel, IChatProgressResponseContent } from './chat-model';
-
-interface ISessionModel {
-  sessionId: string;
-  history: { additional: Record<string, any>; messages: IHistoryChatMessage[] };
-  requests: {
-    requestId: string;
-    message: IChatRequestMessage;
-    response: {
-      isCanceled: boolean;
-      responseText: string;
-      responseContents: IChatProgressResponseContent[];
-      errorDetails: IChatResponseErrorDetails | undefined;
-      followups: IChatFollowup[];
-    };
-  }[];
-}
+import { ChatMessageRole } from '@opensumi/ide-core-common/lib/types/ai-native';
+import { IChatMessage } from '@opensumi/ide-core-common/lib/types/ai-native';
+
+import { IChatAgentService } from '../../common';
+
+import { ChatModel, ChatRequestModel } from './chat-model';
 
 @Injectable()
 export class ChatManagerService extends Disposable {
   #sessionModels = this.registerDispose(new DisposableMap<string, ChatModel>());
   #pendingRequests = this.registerDispose(new DisposableMap<string, CancellationTokenSource>());
-  private storageInitEmitter = new Emitter<void>();
-  public onStorageInit = this.storageInitEmitter.event;
 
   @Autowired(INJECTOR_TOKEN)
   injector: Injector;
@@ -46,59 +24,12 @@ export class ChatManagerService extends Disposable {
   @Autowired(IChatAgentService)
   chatAgentService: IChatAgentService;
 
-  @Autowired(StorageProvider)
-  private storageProvider: StorageProvider;
-
-  private _chatStorage: IStorage;
-
-  protected fromJSON(data: ISessionModel[]) {
-    // TODO: 支持ApplyService恢复
-    return data.map((item) => {
-      const model = new ChatModel({
-        sessionId: item.sessionId,
-        history: new MsgHistoryManager(item.history),
-      });
-      const requests = item.requests.map(
-        (request) =>
-          new ChatRequestModel(
-            request.requestId,
-            model,
-            request.message,
-            new ChatResponseModel(request.requestId, model, request.message.agentId, {
-              responseContents: request.response.responseContents,
-              isComplete: true,
-              responseText: request.response.responseText,
-              errorDetails: request.response.errorDetails,
-              followups: request.response.followups,
-              isCanceled: request.response.isCanceled,
-            }),
-          ),
-      );
-      model.restoreRequests(requests);
-      return model;
-    });
-  }
-
   constructor() {
     super();
   }
 
-  async init() {
-    this._chatStorage = await this.storageProvider(STORAGE_NAMESPACE.CHAT);
-    const sessionsModelData = this._chatStorage.get<ISessionModel[]>('sessionModels', []);
-    const savedSessions = this.fromJSON(sessionsModelData);
-    savedSessions.forEach((session) => {
-      this.#sessionModels.set(session.sessionId, session);
-    });
-    await this.storageInitEmitter.fireAndAwait();
-  }
-
-  getSessions() {
-    return Array.from(this.#sessionModels.values());
-  }
-
   startSession() {
-    const model = new ChatModel();
+    const model = this.injector.get(ChatModel);
     this.#sessionModels.set(model.sessionId, model);
     return model;
   }
@@ -115,7 +46,6 @@ export class ChatManagerService extends Disposable {
     this.#sessionModels.disposeKey(sessionId);
     this.#pendingRequests.get(sessionId)?.cancel();
     this.#pendingRequests.disposeKey(sessionId);
-    this.saveSessions();
   }
 
   createRequest(sessionId: string, message: string, agentId: string, command?: string) {
@@ -192,17 +122,11 @@ export class ChatManagerService extends Disposable {
     } finally {
       listener.dispose();
       this.#pendingRequests.disposeKey(model.sessionId);
-      this.saveSessions();
     }
   }
 
-  protected saveSessions() {
-    this._chatStorage.set('sessionModels', this.getSessions());
-  }
-
   cancelRequest(sessionId: string) {
     this.#pendingRequests.get(sessionId)?.cancel();
     this.#pendingRequests.disposeKey(sessionId);
-    this.saveSessions();
   }
 }