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

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

@@ -6,7 +6,6 @@ import {
   IChatComponent,
   IChatMarkdownContent,
   IChatProgress,
-  IChatToolContent,
   IChatTreeData,
   ILogger,
   memoize,
@@ -27,13 +26,9 @@ import {
 import { MsgHistoryManager } from '../model/msg-history-manager';
 import { IChatSlashCommandItem } from '../types';
 
-export type IChatProgressResponseContent =
-  | IChatMarkdownContent
-  | IChatAsyncContent
-  | IChatTreeData
-  | IChatComponent
-  | IChatToolContent;
+export type IChatProgressResponseContent = IChatMarkdownContent | IChatAsyncContent | IChatTreeData | IChatComponent;
 
+@Injectable({ multiple: true })
 export class ChatResponseModel extends Disposable {
   #responseParts: IChatProgressResponseContent[] = [];
   get responseParts() {
@@ -80,34 +75,14 @@ export class ChatResponseModel extends Disposable {
     return this.#onDidChange.event;
   }
 
-  constructor(
-    requestId: string,
-    public readonly session: IChatModel,
-    public readonly agentId: string,
-    initParams?: {
-      isComplete: boolean;
-      isCanceled: boolean;
-      responseContents: IChatProgressResponseContent[];
-      responseText: string;
-      errorDetails: IChatResponseErrorDetails | undefined;
-      followups: IChatFollowup[] | undefined;
-    },
-  ) {
+  constructor(requestId: string, public readonly session: IChatModel, public readonly agentId: string) {
     super();
     this.#requestId = requestId;
-    if (initParams) {
-      this.#responseContents = initParams.responseContents;
-      this.#responseText = initParams.responseText;
-      this.#isComplete = initParams.isComplete;
-      this.#isCanceled = initParams.isCanceled;
-      this.#errorDetails = initParams.errorDetails;
-      this.#followups = initParams.followups;
-    }
   }
 
   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') {
@@ -145,20 +120,11 @@ export class ChatResponseModel extends Disposable {
         }
         this.#updateResponseText(quiet);
       });
-    } else if (progress.kind === 'treeData' || progress.kind === 'component') {
+    } else if (progress.kind === 'treeData') {
       this.#responseParts.push(progress);
       this.#updateResponseText(quiet);
-    } else if (progress.kind === 'toolCall') {
-      const find = this.#responseParts.find(
-        (item) => item.kind === 'toolCall' && item.content.id === progress.content.id,
-      );
-      if (find) {
-        // @ts-ignore
-        find.content = progress.content;
-        // this.#responseParts[responsePartLength] = find;
-      } else {
-        this.#responseParts.push(progress);
-      }
+    } else if (progress.kind === 'component') {
+      this.#responseParts.push(progress);
       this.#updateResponseText(quiet);
     }
   }
@@ -175,9 +141,6 @@ 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');
@@ -235,18 +198,9 @@ export class ChatResponseModel extends Disposable {
     this.#followups = followups;
     this.#onDidChange.fire();
   }
-
-  toJSON() {
-    return {
-      isCanceled: this.isCanceled,
-      responseContents: this.responseContents,
-      responseText: this.responseText,
-      errorDetails: this.errorDetails,
-      followups: this.followups,
-    };
-  }
 }
 
+@Injectable({ multiple: true })
 export class ChatRequestModel implements IChatRequestModel {
   #requestId: string;
   public get requestId(): string {
@@ -261,29 +215,19 @@ export class ChatRequestModel implements IChatRequestModel {
   ) {
     this.#requestId = requestId;
   }
-
-  toJSON() {
-    return {
-      requestId: this.requestId,
-      message: this.message,
-      response: this.response,
-    };
-  }
 }
 
+@Injectable({ multiple: true })
 export class ChatModel extends Disposable implements IChatModel {
   private static requestIdPool = 0;
 
-  constructor(initParams?: { sessionId?: string; history?: MsgHistoryManager; requests?: ChatRequestModel[] }) {
-    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]));
-    }
-  }
+  @Autowired(ILogger)
+  protected readonly logger: ILogger;
+
+  @Autowired(INJECTOR_TOKEN)
+  injector: Injector;
 
-  #sessionId: string;
+  #sessionId: string = uuid();
   get sessionId(): string {
     return this.#sessionId;
   }
@@ -293,12 +237,11 @@ export class ChatModel extends Disposable implements IChatModel {
     return Array.from(this.#requests.values());
   }
 
-  restoreRequests(requests: ChatRequestModel[]): void {
-    this.#requests = new Map(requests.map((r) => [r.requestId, r]));
+  @memoize
+  get history(): MsgHistoryManager {
+    return this.injector.get(MsgHistoryManager, []);
   }
 
-  readonly history: MsgHistoryManager;
-
   addRequest(message: IChatRequestMessage): ChatRequestModel {
     const requestId = `${this.sessionId}_request_${ChatModel.requestIdPool++}`;
     const response = new ChatResponseModel(requestId, this, message.agentId);
@@ -315,13 +258,12 @@ export class ChatModel extends Disposable implements IChatModel {
 
     const { kind } = progress;
 
-    const basicKind = ['content', 'markdownContent', 'asyncContent', 'treeData', 'component', 'toolCall'];
+    const basicKind = ['content', 'markdownContent', 'asyncContent', 'treeData', 'component'];
 
     if (basicKind.includes(kind)) {
       request.response.updateContent(progress, quiet);
     } else {
-      // eslint-disable-next-line no-console
-      console.error(`Couldn't handle progress: ${JSON.stringify(progress)}`);
+      this.logger.error(`Couldn't handle progress: ${JSON.stringify(progress)}`);
     }
   }
 
@@ -333,14 +275,6 @@ export class ChatModel extends Disposable implements IChatModel {
     super.dispose();
     this.#requests.forEach((r) => r.response.dispose());
   }
-
-  toJSON() {
-    return {
-      sessionId: this.sessionId,
-      history: this.history,
-      requests: this.requests,
-    };
-  }
 }
 
 @Injectable({ multiple: true })

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

@@ -1,23 +1,18 @@
 import { Autowired, Injectable } from '@opensumi/di';
-import { AppConfig, PreferenceService } from '@opensumi/ide-core-browser';
 import {
   AIBackSerivcePath,
   CancellationToken,
-  ChatAgentViewServiceToken,
   ChatFeatureRegistryToken,
   ChatServiceToken,
   Deferred,
   Disposable,
   IAIBackService,
   IAIReporter,
-  IApplicationService,
   IChatProgress,
   uuid,
 } from '@opensumi/ide-core-common';
-import { AINativeSettingSectionsId } from '@opensumi/ide-core-common/lib/settings/ai-native';
 import { IChatMessage } from '@opensumi/ide-core-common/lib/types/ai-native';
 import { MonacoCommandRegistry } from '@opensumi/ide-editor/lib/browser/monaco-contrib/command/command.service';
-import { IMessageService } from '@opensumi/ide-overlay';
 import { listenReadable } from '@opensumi/ide-utils/lib/stream';
 
 import {
@@ -27,8 +22,6 @@ import {
   IChatAgentService,
   IChatAgentWelcomeMessage,
 } from '../../common';
-import { ChatToolRender } from '../components/ChatToolRender';
-import { IChatAgentViewService } from '../types';
 
 import { ChatService } from './chat.api.service';
 import { ChatFeatureRegistry } from './chat.feature.registry';
@@ -39,7 +32,7 @@ import { ChatFeatureRegistry } from './chat.feature.registry';
 @Injectable()
 export class ChatProxyService extends Disposable {
   // 避免和插件注册的 agent id 冲突
-  static readonly AGENT_ID = 'Default_Chat_Agent';
+  static readonly AGENT_ID = 'Default_Chat_Agent_' + uuid(6);
 
   @Autowired(IChatAgentService)
   private readonly chatAgentService: IChatAgentService;
@@ -59,41 +52,13 @@ export class ChatProxyService extends Disposable {
   @Autowired(IAIReporter)
   private readonly aiReporter: IAIReporter;
 
-  @Autowired(ChatAgentViewServiceToken)
-  private readonly chatAgentViewService: IChatAgentViewService;
-
-  @Autowired(PreferenceService)
-  private readonly preferenceService: PreferenceService;
-
-  @Autowired(IApplicationService)
-  private readonly applicationService: IApplicationService;
-
-  @Autowired(IMessageService)
-  private readonly messageService: IMessageService;
-
-  @Autowired(AppConfig)
-  private readonly appConfig: AppConfig;
-
   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,
-        metadata: {
-          systemPrompt:
-            this.preferenceService.get<string>(
-              AINativeSettingSectionsId.SystemPrompt,
-              'You are a powerful AI coding assistant working in OpenSumi, a top IDE framework. You collaborate with a USER to solve coding tasks, which may involve creating, modifying, or debugging code, or answering questions. When the USER sends a message, relevant context (e.g., open files, cursor position, edit history, linter errors) may be attached. Use this information as needed.\n\n<tool_calling>\nYou have access to tools to assist with tasks. Follow these rules:\n1. Always adhere to the tool call schema and provide all required parameters.\n2. Only use tools explicitly provided; ignore unavailable ones.\n3. Avoid mentioning tool names to the USER (e.g., say "I will edit your file" instead of "I need to use the edit_file tool").\n4. Only call tools when necessary; respond directly if the task is general or you already know the answer.\n5. Explain to the USER why you’re using a tool before calling it.\n</tool_calling>\n\n<making_code_changes>\nWhen modifying code:\n1. Use code edit tools instead of outputting code unless explicitly requested.\n2. Limit tool calls to one per turn.\n3. Ensure generated code is immediately executable by including necessary imports, dependencies, and endpoints.\n4. For new projects, create a dependency management file (e.g., requirements.txt) and a README.\n5. For web apps, design a modern, user-friendly UI.\n6. Avoid generating non-textual or excessively long code.\n7. Read file contents before editing, unless appending a small change or creating a new file.\n8. Fix introduced linter errors if possible, but stop after 3 attempts and ask the USER for guidance.\n9. Reapply reasonable code edits if they weren’t followed initially.\n</making_code_changes>\n\nUse the appropriate tools to fulfill the USER’s request, ensuring all required parameters are provided or inferred from context.',
-            ) +
-            `\n\n<user_info>\nThe user's OS version is ${this.applicationService.frontendOS}. The absolute path of the user's workspace is ${this.appConfig.workspaceDir}.\n</user_info>`,
-        },
+        metadata: {},
         invoke: async (
           request: IChatAgentRequest,
           progress: (part: IChatProgress) => void,
@@ -114,28 +79,12 @@ export class ChatProxyService extends Disposable {
             }
           }
 
-          const model = this.preferenceService.get<string>(AINativeSettingSectionsId.LLMModelSelection);
-          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 {
-            apiKey = this.preferenceService.get<string>(AINativeSettingSectionsId.AnthropicApiKey, '');
-          }
-          const MAX_INPUT_TOKENS = 30720;
           const stream = await this.aiBackService.requestStream(
             prompt,
             {
               requestId: request.requestId,
               sessionId: request.sessionId,
-              history: this.aiChatService.getHistoryMessages(MAX_INPUT_TOKENS),
-              clientId: this.applicationService.clientId,
-              apiKey,
-              model,
-              baseURL,
+              history: this.aiChatService.getHistoryMessages(),
             },
             token,
           );
@@ -148,7 +97,6 @@ export class ChatProxyService extends Disposable {
               this.chatDeferred.resolve();
             },
             onError: (error) => {
-              this.messageService.error(error.message);
               this.aiReporter.end(request.sessionId + '_' + request.requestId, {
                 message: error.message,
                 success: false,

package/src/browser/chat/chat.api.service.ts

@@ -65,8 +65,8 @@ export class ChatService extends Disposable {
     this._onChatMessageListLaunch.fire(list);
   }
 
-  public getHistoryMessages(maxInputTokens?: number): IHistoryChatMessage[] {
-    return this.chatInternalService.sessionModel?.history.getMessages(maxInputTokens) || [];
+  public getHistoryMessages(): IHistoryChatMessage[] {
+    return this.chatInternalService.sessionModel?.history.getMessages() || [];
   }
 
   public scrollToBottom(): void {

package/src/browser/chat/chat.internal.service.ts

@@ -27,12 +27,6 @@ export class ChatInternalService extends Disposable {
   private readonly _onChangeSession = new Emitter<string>();
   public readonly onChangeSession: Event<string> = this._onChangeSession.event;
 
-  private readonly _onCancelRequest = new Emitter<void>();
-  public readonly onCancelRequest: Event<void> = this._onCancelRequest.event;
-
-  private readonly _onRegenerateRequest = new Emitter<void>();
-  public readonly onRegenerateRequest: Event<void> = this._onRegenerateRequest.event;
-
   private _latestRequestId: string;
   public get latestRequestId(): string {
     return this._latestRequestId;
@@ -43,15 +37,9 @@ export class ChatInternalService extends Disposable {
     return this.#sessionModel;
   }
 
-  init() {
-    this.chatManagerService.onStorageInit(() => {
-      const sessions = this.chatManagerService.getSessions();
-      if (sessions.length > 0) {
-        this.activateSession(sessions[sessions.length - 1].sessionId);
-      } else {
-        this.createSessionModel();
-      }
-    });
+  constructor() {
+    super();
+    this.#sessionModel = this.chatManagerService.startSession();
   }
 
   public setLatestRequestId(id: string): void {
@@ -64,36 +52,19 @@ export class ChatInternalService extends Disposable {
   }
 
   sendRequest(request: ChatRequestModel, regenerate = false) {
-    const result = this.chatManagerService.sendRequest(this.#sessionModel.sessionId, request, regenerate);
-    if (regenerate) {
-      this._onRegenerateRequest.fire();
-    }
-    return result;
+    return this.chatManagerService.sendRequest(this.#sessionModel.sessionId, request, regenerate);
   }
 
   cancelRequest() {
     this.chatManagerService.cancelRequest(this.#sessionModel.sessionId);
-    this._onCancelRequest.fire();
   }
 
-  createSessionModel() {
+  clearSessionModel() {
+    this.chatManagerService.clearSession(this.#sessionModel.sessionId);
     this.#sessionModel = this.chatManagerService.startSession();
     this._onChangeSession.fire(this.#sessionModel.sessionId);
   }
 
-  clearSessionModel(sessionId?: string) {
-    sessionId = sessionId || this.#sessionModel.sessionId;
-    this.chatManagerService.clearSession(sessionId);
-    if (sessionId === this.#sessionModel.sessionId) {
-      this.#sessionModel = this.chatManagerService.startSession();
-    }
-    this._onChangeSession.fire(this.#sessionModel.sessionId);
-  }
-
-  getSessions() {
-    return this.chatManagerService.getSessions();
-  }
-
   activateSession(sessionId: string) {
     const targetSession = this.chatManagerService.getSession(sessionId);
     if (!targetSession) {

package/src/browser/chat/chat.module.less

@@ -75,14 +75,53 @@
 
   .header_container {
     height: 36px;
-    padding: 8px 0 8px 16px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 12px 0 12px 16px;
     box-sizing: border-box;
     background-color: var(--editorGroupHeader-tabsBackground);
     user-select: none;
 
-    .header {
+    .left {
       display: flex;
       align-items: center;
+      height: 16px;
+      color: var(--design-title-foreground);
+      font-size: 12px;
+
+      .ai_avatar_icon {
+        width: 18px;
+        height: 18px;
+      }
+
+      .avatar_icon_normal {
+        width: 18px;
+        height: 18px;
+        font-size: 14px !important;
+      }
+
+      & > * {
+        margin-right: 8px;
+      }
+    }
+
+    .right {
+      display: flex;
+      align-items: center;
+      padding-right: 10px;
+      .popover_icon {
+        margin-left: 2px;
+      }
+
+      .action_btn {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 22px;
+        height: 22px;
+        padding: 0;
+      }
     }
   }
 
@@ -278,18 +317,3 @@
     }
   }
 }
-
-
-.chat_tips_container {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  color: var(--tab-inactiveForeground);
-  font-size: 12px;
-  margin-top: 16px;
-}
-
-.chat_history {
-  width: calc(100% - 60px);
-  color: var(--design-text-foreground);
-}