Merge branch 'v3.8' of github.com:opensumi/core

Author: erha19

lerna.json

@@ -1,4 +1,4 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "3.8.1"
+  "version": "3.8.2"
 }

packages/addons/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-addons",
-  "version": "3.8.1",
+  "version": "3.8.2",
   "files": [
     "lib",
     "src"

packages/ai-native/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-ai-native",
-  "version": "3.8.1",
+  "version": "3.8.2",
   "files": [
     "lib",
     "src"

packages/ai-native/src/browser/ai-core.contribution.ts

@@ -360,6 +360,7 @@ export class AINativeBrowserContribution
       if (supportsCustomLLMSettings) {
         this.preferenceService.onSpecificPreferenceChange(AINativeSettingSectionsId.LLMModelSelection, (change) => {
           const model = this.getModelByName(change.newValue);
+          // support modelIds
           const modelIds = model ? Object.keys(model) : [];
           const defaultModelId = modelIds.length ? modelIds[0] : '';
           const currentSchemas = this.preferenceSchemaProvider.getPreferenceProperty(AINativeSettingSectionsId.ModelID);
@@ -382,6 +383,25 @@ export class AINativeBrowserContribution
             modelIds.reduce((obj, item) => ({ ...obj, [item]: item }), {}),
           );
         });
+        this.preferenceService.onSpecificPreferenceChange(AINativeSettingSectionsId.ModelID, (change) => {
+          const model = this.preferenceService.get<string>(AINativeSettingSectionsId.LLMModelSelection);
+          if (!model) {
+            return;
+          }
+          const modelInfo = this.getModelByName(model);
+          if (modelInfo && modelInfo[change.newValue]) {
+            this.preferenceService.set(
+              AINativeSettingSectionsId.MaxTokens,
+              modelInfo[change.newValue].maxTokens,
+              change.scope,
+            );
+            this.preferenceService.set(
+              AINativeSettingSectionsId.ContextWindow,
+              modelInfo[change.newValue].contextWindow,
+              change.scope,
+            );
+          }
+        });
       }
 
       if (supportsMCP) {
@@ -546,6 +566,14 @@ export class AINativeBrowserContribution
             id: AINativeSettingSectionsId.OpenaiBaseURL,
             localized: 'preference.ai.native.openai.baseURL',
           },
+          {
+            id: AINativeSettingSectionsId.MaxTokens,
+            localized: 'preference.ai.native.maxTokens',
+          },
+          {
+            id: AINativeSettingSectionsId.ContextWindow,
+            localized: 'preference.ai.native.contextWindow',
+          },
         ],
       });
     }

packages/ai-native/src/browser/chat/chat-manager.service.ts

@@ -1,16 +1,19 @@
 import { Autowired, INJECTOR_TOKEN, Injectable, Injector } from '@opensumi/di';
+import { PreferenceService } from '@opensumi/ide-core-browser';
 import {
+  AINativeSettingSectionsId,
   CancellationToken,
   CancellationTokenSource,
   Disposable,
   DisposableMap,
   Emitter,
   IChatProgress,
+  IDisposable,
   IStorage,
+  LRUCache,
   STORAGE_NAMESPACE,
   StorageProvider,
   debounce,
-  formatLocalize,
 } from '@opensumi/ide-core-common';
 import { IHistoryChatMessage } from '@opensumi/ide-core-common/lib/types/ai-native';
 
@@ -38,9 +41,26 @@ interface ISessionModel {
 
 const MAX_SESSION_COUNT = 20;
 
+class DisposableLRUCache<K, V extends IDisposable = IDisposable> extends LRUCache<K, V> implements IDisposable {
+  disposeKey(key: K): void {
+    const disposable = this.get(key);
+    if (disposable) {
+      disposable.dispose();
+    }
+    this.delete(key);
+  }
+
+  dispose(): void {
+    this.forEach((disposable) => {
+      disposable.dispose();
+    });
+    this.clear();
+  }
+}
+
 @Injectable()
 export class ChatManagerService extends Disposable {
-  #sessionModels = this.registerDispose(new DisposableMap<string, ChatModel>());
+  #sessionModels = this.registerDispose(new DisposableLRUCache<string, ChatModel>(MAX_SESSION_COUNT));
   #pendingRequests = this.registerDispose(new DisposableMap<string, CancellationTokenSource>());
   private storageInitEmitter = new Emitter<void>();
   public onStorageInit = this.storageInitEmitter.event;
@@ -54,35 +74,39 @@ export class ChatManagerService extends Disposable {
   @Autowired(StorageProvider)
   private storageProvider: StorageProvider;
 
+  @Autowired(PreferenceService)
+  private preferenceService: PreferenceService;
+
   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),
+    return data
+      .filter((item) => item.history.messages.length > 0)
+      .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,
+                responseParts: request.response.responseParts,
+                errorDetails: request.response.errorDetails,
+                followups: request.response.followups,
+                isCanceled: request.response.isCanceled,
+              }),
+            ),
+        );
+        model.restoreRequests(requests);
+        return model;
       });
-      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,
-              responseParts: request.response.responseParts,
-              errorDetails: request.response.errorDetails,
-              followups: request.response.followups,
-              isCanceled: request.response.isCanceled,
-            }),
-          ),
-      );
-      model.restoreRequests(requests);
-      return model;
-    });
   }
 
   constructor() {
@@ -105,9 +129,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);
@@ -155,7 +176,8 @@ export class ChatManagerService extends Disposable {
       request.response.cancel();
     });
 
-    const history = model.messageHistory;
+    const contextWindow = this.preferenceService.get<number>(AINativeSettingSectionsId.ContextWindow);
+    const history = model.getMessageHistory(contextWindow);
 
     try {
       const progressCallback = (progress: IChatProgress) => {

packages/ai-native/src/browser/chat/chat-model.ts

@@ -276,15 +276,12 @@ export class ChatRequestModel implements IChatRequestModel {
 }
 
 export class ChatModel extends Disposable implements IChatModel {
-  private static requestIdPool = 0;
+  private requestIdPool = 0;
 
-  constructor(initParams?: { sessionId?: string; history?: MsgHistoryManager; requests?: ChatRequestModel[] }) {
+  constructor(initParams?: { sessionId?: string; history?: MsgHistoryManager }) {
     super();
     this.#sessionId = initParams?.sessionId ?? uuid();
     this.history = initParams?.history ?? new MsgHistoryManager();
-    if (initParams?.requests) {
-      this.#requests = new Map(initParams.requests.map((r) => [r.requestId, r]));
-    }
   }
 
   #sessionId: string;
@@ -299,11 +296,18 @@ export class ChatModel extends Disposable implements IChatModel {
 
   restoreRequests(requests: ChatRequestModel[]): void {
     this.#requests = new Map(requests.map((r) => [r.requestId, r]));
+    this.requestIdPool = requests.length;
   }
 
   readonly history: MsgHistoryManager;
 
-  get messageHistory() {
+  #slicedMessageCount = 0;
+
+  public get slicedMessageCount() {
+    return this.#slicedMessageCount;
+  }
+
+  getMessageHistory(contextWindow?: number) {
     const history: CoreMessage[] = [];
     for (const request of this.requests) {
       if (!request.response.isComplete) {
@@ -352,13 +356,23 @@ export class ChatModel extends Disposable implements IChatModel {
         }
       }
     }
-    return history;
+    if (contextWindow) {
+      while (this.#slicedMessageCount < history.length) {
+        // 简单的使用 JSON.stringify 计算 token 数量
+        const tokenCount = JSON.stringify(history.slice(this.#slicedMessageCount)).length / 3;
+        if (tokenCount <= contextWindow) {
+          break;
+        }
+        this.#slicedMessageCount++;
+      }
+    }
+    return history.slice(this.#slicedMessageCount);
   }
 
   addRequest(message: IChatRequestMessage): ChatRequestModel {
     const msg = message;
 
-    const requestId = `${this.sessionId}_request_${ChatModel.requestIdPool++}`;
+    const requestId = `${this.sessionId}_request_${this.requestIdPool++}`;
     const response = new ChatResponseModel(requestId, this, msg.agentId);
     const request = new ChatRequestModel(requestId, this, msg, response);
 

packages/ai-native/src/browser/chat/chat-proxy.service.ts

@@ -92,13 +92,15 @@ export class ChatProxyService extends Disposable {
       apiKey = this.preferenceService.get<string>(AINativeSettingSectionsId.OpenaiApiKey, '');
       baseURL = this.preferenceService.get<string>(AINativeSettingSectionsId.OpenaiBaseURL, '');
     }
+    const maxTokens = this.preferenceService.get<number>(AINativeSettingSectionsId.MaxTokens);
     const agent = this.chatAgentService.getAgent(ChatProxyService.AGENT_ID);
     return {
       clientId: this.applicationService.clientId,
       model,
       modelId,
       apiKey,
       baseURL,
+      maxTokens,
       system: agent?.metadata.systemPrompt,
     };
   }