@opensumi/ide-ai-native 3.8.1-next-1741091353.0 → 3.8.1-next-1741092802.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-ai-native",
-  "version": "3.8.1-next-1741091353.0",
+  "version": "3.8.1-next-1741092802.0",
   "files": [
     "lib",
     "src"
@@ -21,28 +21,29 @@
   "dependencies": {
     "@ai-sdk/anthropic": "^1.1.9",
     "@ai-sdk/deepseek": "^0.1.11",
+    "@ai-sdk/openai": "^1.1.9",
     "@ai-sdk/openai-compatible": "^0.1.11",
     "@modelcontextprotocol/sdk": "^1.3.1",
-    "@opensumi/ide-addons": "3.8.1-next-1741091353.0",
-    "@opensumi/ide-components": "3.8.1-next-1741091353.0",
-    "@opensumi/ide-connection": "3.8.1-next-1741091353.0",
-    "@opensumi/ide-core-common": "3.8.1-next-1741091353.0",
-    "@opensumi/ide-core-node": "3.8.1-next-1741091353.0",
-    "@opensumi/ide-debug": "3.8.1-next-1741091353.0",
-    "@opensumi/ide-design": "3.8.1-next-1741091353.0",
-    "@opensumi/ide-editor": "3.8.1-next-1741091353.0",
-    "@opensumi/ide-file-search": "3.8.1-next-1741091353.0",
-    "@opensumi/ide-file-service": "3.8.1-next-1741091353.0",
-    "@opensumi/ide-main-layout": "3.8.1-next-1741091353.0",
-    "@opensumi/ide-markers": "3.8.1-next-1741091353.0",
-    "@opensumi/ide-monaco": "3.8.1-next-1741091353.0",
-    "@opensumi/ide-overlay": "3.8.1-next-1741091353.0",
-    "@opensumi/ide-preferences": "3.8.1-next-1741091353.0",
-    "@opensumi/ide-search": "3.8.1-next-1741091353.0",
-    "@opensumi/ide-terminal-next": "3.8.1-next-1741091353.0",
-    "@opensumi/ide-theme": "3.8.1-next-1741091353.0",
-    "@opensumi/ide-utils": "3.8.1-next-1741091353.0",
-    "@opensumi/ide-workspace": "3.8.1-next-1741091353.0",
+    "@opensumi/ide-addons": "3.8.1-next-1741092802.0",
+    "@opensumi/ide-components": "3.8.1-next-1741092802.0",
+    "@opensumi/ide-connection": "3.8.1-next-1741092802.0",
+    "@opensumi/ide-core-common": "3.8.1-next-1741092802.0",
+    "@opensumi/ide-core-node": "3.8.1-next-1741092802.0",
+    "@opensumi/ide-debug": "3.8.1-next-1741092802.0",
+    "@opensumi/ide-design": "3.8.1-next-1741092802.0",
+    "@opensumi/ide-editor": "3.8.1-next-1741092802.0",
+    "@opensumi/ide-file-search": "3.8.1-next-1741092802.0",
+    "@opensumi/ide-file-service": "3.8.1-next-1741092802.0",
+    "@opensumi/ide-main-layout": "3.8.1-next-1741092802.0",
+    "@opensumi/ide-markers": "3.8.1-next-1741092802.0",
+    "@opensumi/ide-monaco": "3.8.1-next-1741092802.0",
+    "@opensumi/ide-overlay": "3.8.1-next-1741092802.0",
+    "@opensumi/ide-preferences": "3.8.1-next-1741092802.0",
+    "@opensumi/ide-search": "3.8.1-next-1741092802.0",
+    "@opensumi/ide-terminal-next": "3.8.1-next-1741092802.0",
+    "@opensumi/ide-theme": "3.8.1-next-1741092802.0",
+    "@opensumi/ide-utils": "3.8.1-next-1741092802.0",
+    "@opensumi/ide-workspace": "3.8.1-next-1741092802.0",
     "@xterm/xterm": "5.5.0",
     "ai": "^4.1.45",
     "ansi-regex": "^2.0.0",
@@ -57,7 +58,7 @@
     "zod-to-json-schema": "^3.24.1"
   },
   "devDependencies": {
-    "@opensumi/ide-core-browser": "3.8.1-next-1741091353.0"
+    "@opensumi/ide-core-browser": "3.8.1-next-1741092802.0"
   },
-  "gitHead": "4134fdda0b299adad482b64b0dbabad013e36dc3"
+  "gitHead": "7dc1c6d485b184de145a648f66959aa243447ea3"
 }

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

@@ -14,10 +14,12 @@ import {
   Domain,
   IAIInlineChatService,
   IEditorExtensionContribution,
+  IPreferenceSettingsService,
   KeybindingContribution,
   KeybindingRegistry,
   KeybindingScope,
   MonacoContribution,
+  PreferenceSchemaProvider,
   PreferenceService,
   SlotLocation,
   SlotRendererContribution,
@@ -82,6 +84,9 @@ import {
   IChatManagerService,
   ISumiMCPServerBackend,
   SumiMCPServerProxyServicePath,
+  anthropicModels,
+  deepSeekModels,
+  openAiNativeModels,
 } from '../common';
 import { MCPServerDescription } from '../common/mcp-server-manager';
 
@@ -209,6 +214,12 @@ export class AINativeBrowserContribution
   @Autowired(CommandService)
   private readonly commandService: CommandService;
 
+  @Autowired(PreferenceSchemaProvider)
+  private preferenceSchemaProvider: PreferenceSchemaProvider;
+
+  @Autowired(IPreferenceSettingsService)
+  private preferenceSettings: IPreferenceSettingsService;
+
   @Autowired(PreferenceService)
   private readonly preferenceService: PreferenceService;
 
@@ -328,7 +339,8 @@ export class AINativeBrowserContribution
 
   onDidStart() {
     runWhenIdle(() => {
-      const { supportsRenameSuggestions, supportsInlineChat, supportsMCP } = this.aiNativeConfigService.capabilities;
+      const { supportsRenameSuggestions, supportsInlineChat, supportsMCP, supportsCustomLLMSettings } =
+        this.aiNativeConfigService.capabilities;
       const prefChatVisibleType = this.preferenceService.getValid(AINativeSettingSectionsId.ChatVisibleType);
 
       if (prefChatVisibleType === 'always') {
@@ -345,6 +357,33 @@ export class AINativeBrowserContribution
         this.codeActionSingleHandler.load();
       }
 
+      if (supportsCustomLLMSettings) {
+        this.preferenceService.onSpecificPreferenceChange(AINativeSettingSectionsId.LLMModelSelection, (change) => {
+          const model = this.getModelByName(change.newValue);
+          const modelIds = model ? Object.keys(model) : [];
+          const defaultModelId = modelIds.length ? modelIds[0] : '';
+          const currentSchemas = this.preferenceSchemaProvider.getPreferenceProperty(AINativeSettingSectionsId.ModelID);
+          this.preferenceSchemaProvider.setSchema(
+            {
+              properties: {
+                [AINativeSettingSectionsId.ModelID]: {
+                  ...currentSchemas,
+                  default: defaultModelId,
+                  defaultValue: defaultModelId,
+                  enum: modelIds.length ? modelIds : undefined,
+                },
+              },
+            },
+            true,
+          );
+          this.preferenceService.set(AINativeSettingSectionsId.ModelID, defaultModelId, change.scope);
+          this.preferenceSettings.setEnumLabels(
+            AINativeSettingSectionsId.ModelID,
+            modelIds.reduce((obj, item) => ({ ...obj, [item]: item }), {}),
+          );
+        });
+      }
+
       if (supportsMCP) {
         this.initMCPServers();
       }
@@ -370,6 +409,19 @@ export class AINativeBrowserContribution
     }
   }
 
+  private getModelByName(modelName: string) {
+    switch (modelName) {
+      case 'deepseek':
+        return deepSeekModels;
+      case 'anthropic':
+        return anthropicModels;
+      case 'openai':
+        return openAiNativeModels;
+      default:
+        return undefined;
+    }
+  }
+
   private registerFeature() {
     this.contributions.getContributions().forEach((contribution) => {
       contribution.registerInlineChatFeature?.(this.inlineChatFeatureRegistry);
@@ -474,6 +526,10 @@ export class AINativeBrowserContribution
             id: AINativeSettingSectionsId.LLMModelSelection,
             localized: 'preference.ai.native.llm.model.selection',
           },
+          {
+            id: AINativeSettingSectionsId.ModelID,
+            localized: 'preference.ai.native.llm.model.id',
+          },
           {
             id: AINativeSettingSectionsId.DeepseekApiKey,
             localized: 'preference.ai.native.deepseek.apiKey',

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

@@ -10,7 +10,6 @@ import {
   STORAGE_NAMESPACE,
   StorageProvider,
   debounce,
-  formatLocalize,
 } from '@opensumi/ide-core-common';
 import { ChatMessageRole, IChatMessage, IHistoryChatMessage } from '@opensumi/ide-core-common/lib/types/ai-native';
 
@@ -35,8 +34,6 @@ interface ISessionModel {
   }[];
 }
 
-const MAX_SESSION_COUNT = 20;
-
 @Injectable()
 export class ChatManagerService extends Disposable {
   #sessionModels = this.registerDispose(new DisposableMap<string, ChatModel>());
@@ -103,9 +100,6 @@ export class ChatManagerService extends Disposable {
   }
 
   startSession() {
-    if (this.#sessionModels.size >= MAX_SESSION_COUNT) {
-      throw new Error(formatLocalize('aiNative.chat.session.max', MAX_SESSION_COUNT.toString()));
-    }
     const model = new ChatModel();
     this.#sessionModels.set(model.sessionId, model);
     this.listenSession(model);

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

@@ -115,15 +115,19 @@ export class ChatProxyService extends Disposable {
           }
 
           const model = this.preferenceService.get<string>(AINativeSettingSectionsId.LLMModelSelection);
+          const modelId = this.preferenceService.get<string>(AINativeSettingSectionsId.ModelID);
           let apiKey: string = '';
           let baseURL: string = '';
           if (model === 'deepseek') {
             apiKey = this.preferenceService.get<string>(AINativeSettingSectionsId.DeepseekApiKey, '');
           } else if (model === 'openai') {
             apiKey = this.preferenceService.get<string>(AINativeSettingSectionsId.OpenaiApiKey, '');
-            baseURL = this.preferenceService.get<string>(AINativeSettingSectionsId.OpenaiBaseURL, '');
-          } else {
+          } else if (model === 'anthropic') {
             apiKey = this.preferenceService.get<string>(AINativeSettingSectionsId.AnthropicApiKey, '');
+          } else {
+            // openai-compatible 为兜底
+            apiKey = this.preferenceService.get<string>(AINativeSettingSectionsId.OpenaiApiKey, '');
+            baseURL = this.preferenceService.get<string>(AINativeSettingSectionsId.OpenaiBaseURL, '');
           }
           const MAX_INPUT_TOKENS = 30720;
           const agent = this.chatAgentService.getAgent(ChatProxyService.AGENT_ID);
@@ -136,6 +140,7 @@ export class ChatProxyService extends Disposable {
               clientId: this.applicationService.clientId,
               apiKey,
               model,
+              modelId,
               baseURL,
               system: agent?.metadata.systemPrompt,
             },

package/src/browser/chat/chat.view.tsx

@@ -31,7 +31,7 @@ import {
   uuid,
 } from '@opensumi/ide-core-common';
 import { IMainLayoutService } from '@opensumi/ide-main-layout';
-import { IDialogService, IMessageService } from '@opensumi/ide-overlay';
+import { IDialogService } from '@opensumi/ide-overlay';
 
 import 'react-chat-elements/dist/main.css';
 import {
@@ -756,18 +756,13 @@ export function DefaultChatViewHeader({
   const aiNativeConfigService = useInjectable<AINativeConfigService>(AINativeConfigService);
   const mcpServerProxyService = useInjectable<MCPServerProxyService>(TokenMCPServerProxyService);
   const aiChatService = useInjectable<ChatInternalService>(IChatInternalService);
-  const messageService = useInjectable<IMessageService>(IMessageService);
   const commandService = useInjectable<CommandService>(CommandService);
 
   const [historyList, setHistoryList] = React.useState<IChatHistoryItem[]>([]);
   const [currentTitle, setCurrentTitle] = React.useState<string>('');
   const handleNewChat = React.useCallback(() => {
     if (aiChatService.sessionModel.history.getMessages().length > 0) {
-      try {
-        aiChatService.createSessionModel();
-      } catch (error) {
-        messageService.error(error.message);
-      }
+      aiChatService.createSessionModel();
     }
   }, [aiChatService]);
   const handleHistoryItemSelect = React.useCallback(

package/src/browser/components/chat-history.module.less

@@ -78,7 +78,6 @@
   .dm-chat-history-list {
     overflow: auto;
     max-height: 400px;
-    max-width: 400px;
     margin-top: 4px;
     font-size: 13px;
   }