@opensumi/ide-ai-native 3.9.1-next-1749175927.0 → 3.9.1-next-1749196667.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-ai-native",
-  "version": "3.9.1-next-1749175927.0",
+  "version": "3.9.1-next-1749196667.0",
   "files": [
     "lib",
     "src"
@@ -24,28 +24,27 @@
     "@ai-sdk/openai": "^1.1.9",
     "@ai-sdk/openai-compatible": "^0.1.11",
     "@modelcontextprotocol/sdk": "^1.3.1",
-    "@opensumi/ide-addons": "3.9.1-next-1749175927.0",
-    "@opensumi/ide-components": "3.9.1-next-1749175927.0",
-    "@opensumi/ide-connection": "3.9.1-next-1749175927.0",
-    "@opensumi/ide-core-common": "3.9.1-next-1749175927.0",
-    "@opensumi/ide-core-node": "3.9.1-next-1749175927.0",
-    "@opensumi/ide-debug": "3.9.1-next-1749175927.0",
-    "@opensumi/ide-design": "3.9.1-next-1749175927.0",
-    "@opensumi/ide-editor": "3.9.1-next-1749175927.0",
-    "@opensumi/ide-file-search": "3.9.1-next-1749175927.0",
-    "@opensumi/ide-file-service": "3.9.1-next-1749175927.0",
-    "@opensumi/ide-main-layout": "3.9.1-next-1749175927.0",
-    "@opensumi/ide-markers": "3.9.1-next-1749175927.0",
-    "@opensumi/ide-monaco": "3.9.1-next-1749175927.0",
-    "@opensumi/ide-outline": "3.9.1-next-1749175927.0",
-    "@opensumi/ide-overlay": "3.9.1-next-1749175927.0",
-    "@opensumi/ide-preferences": "3.9.1-next-1749175927.0",
-    "@opensumi/ide-quick-open": "3.9.1-next-1749175927.0",
-    "@opensumi/ide-search": "3.9.1-next-1749175927.0",
-    "@opensumi/ide-terminal-next": "3.9.1-next-1749175927.0",
-    "@opensumi/ide-theme": "3.9.1-next-1749175927.0",
-    "@opensumi/ide-utils": "3.9.1-next-1749175927.0",
-    "@opensumi/ide-workspace": "3.9.1-next-1749175927.0",
+    "@opensumi/ide-addons": "3.9.1-next-1749196667.0",
+    "@opensumi/ide-components": "3.9.1-next-1749196667.0",
+    "@opensumi/ide-connection": "3.9.1-next-1749196667.0",
+    "@opensumi/ide-core-common": "3.9.1-next-1749196667.0",
+    "@opensumi/ide-core-node": "3.9.1-next-1749196667.0",
+    "@opensumi/ide-debug": "3.9.1-next-1749196667.0",
+    "@opensumi/ide-design": "3.9.1-next-1749196667.0",
+    "@opensumi/ide-editor": "3.9.1-next-1749196667.0",
+    "@opensumi/ide-file-search": "3.9.1-next-1749196667.0",
+    "@opensumi/ide-file-service": "3.9.1-next-1749196667.0",
+    "@opensumi/ide-main-layout": "3.9.1-next-1749196667.0",
+    "@opensumi/ide-markers": "3.9.1-next-1749196667.0",
+    "@opensumi/ide-monaco": "3.9.1-next-1749196667.0",
+    "@opensumi/ide-outline": "3.9.1-next-1749196667.0",
+    "@opensumi/ide-overlay": "3.9.1-next-1749196667.0",
+    "@opensumi/ide-preferences": "3.9.1-next-1749196667.0",
+    "@opensumi/ide-search": "3.9.1-next-1749196667.0",
+    "@opensumi/ide-terminal-next": "3.9.1-next-1749196667.0",
+    "@opensumi/ide-theme": "3.9.1-next-1749196667.0",
+    "@opensumi/ide-utils": "3.9.1-next-1749196667.0",
+    "@opensumi/ide-workspace": "3.9.1-next-1749196667.0",
     "@xterm/xterm": "5.5.0",
     "ai": "^4.1.45",
     "ansi-regex": "^2.0.0",
@@ -62,7 +61,7 @@
     "zod-to-json-schema": "^3.24.1"
   },
   "devDependencies": {
-    "@opensumi/ide-core-browser": "3.9.1-next-1749175927.0"
+    "@opensumi/ide-core-browser": "3.9.1-next-1749196667.0"
   },
-  "gitHead": "c3be72c306e4c3b8ff04f505a6886625dc22927d"
+  "gitHead": "ff3db69fd2b8ea0dc0843e0e8ae75af793e095bd"
 }

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

@@ -24,7 +24,6 @@ import {
   SlotLocation,
   SlotRendererContribution,
   SlotRendererRegistry,
-  TabbarBehaviorConfig,
   getIcon,
   localize,
 } from '@opensumi/ide-core-browser';
@@ -814,24 +813,15 @@ export class AINativeBrowserContribution
   }
 
   registerRenderer(registry: SlotRendererRegistry): void {
-    const tabbarConfig: TabbarBehaviorConfig = {
-      isLatter: true,
-    };
     if (this.designLayoutConfig.supportExternalChatPanel) {
-      registry.registerSlotRenderer(AI_CHAT_VIEW_ID, AIChatTabRendererWithTab, tabbarConfig);
+      registry.registerSlotRenderer(AI_CHAT_VIEW_ID, AIChatTabRendererWithTab);
     } else {
-      registry.registerSlotRenderer(AI_CHAT_VIEW_ID, AIChatTabRenderer, tabbarConfig);
+      registry.registerSlotRenderer(AI_CHAT_VIEW_ID, AIChatTabRenderer);
     }
 
     if (this.designLayoutConfig.useMergeRightWithLeftPanel) {
-      registry.registerSlotRenderer(
-        SlotLocation.view,
-        AILeftTabRenderer,
-        Object.assign({}, tabbarConfig, {
-          isLatter: false,
-        }),
-      );
-      registry.registerSlotRenderer(SlotLocation.extendView, AIRightTabRenderer, tabbarConfig);
+      registry.registerSlotRenderer(SlotLocation.left, AILeftTabRenderer);
+      registry.registerSlotRenderer(SlotLocation.right, AIRightTabRenderer);
     }
   }
 

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

@@ -1,16 +1,6 @@
 import { Autowired, Injectable } from '@opensumi/di';
-import {
-  AIBackSerivcePath,
-  CancellationTokenSource,
-  IAIBackService,
-  IChatProgress,
-  URI,
-  path,
-} from '@opensumi/ide-core-browser';
-import { CommandService } from '@opensumi/ide-core-common/lib/command';
+import { AIBackSerivcePath, IAIBackService, IChatProgress, URI, path } from '@opensumi/ide-core-browser';
 import { IEditorDocumentModelService } from '@opensumi/ide-editor/lib/browser';
-import { CodeAction, CodeActionContext, CodeActionTriggerType, ICodeEditor } from '@opensumi/ide-monaco';
-import { languageFeaturesService } from '@opensumi/ide-monaco/lib/browser/monaco-api/languages';
 import { SumiReadableStream } from '@opensumi/ide-utils/lib/stream';
 import { Range } from '@opensumi/monaco-editor-core';
 
@@ -20,59 +10,8 @@ import { BaseApplyService } from '../mcp/base-apply.service';
 
 import { ChatProxyService } from './chat-proxy.service';
 
-/**
- * Filter code actions to only apply batch fixes
- * Skip individual fixes as consecutive WorkspaceEdits may interfere with each other
- * @param codeAction The code action to check
- * @returns boolean indicating if the action is auto-fixable
- */
-function isAutoFixable(codeAction: CodeAction): boolean {
-  return codeAction.title.toLowerCase().includes('all');
-}
-
 @Injectable()
 export class ApplyService extends BaseApplyService {
-  @Autowired(CommandService)
-  private commandService: CommandService;
-
-  protected async postApplyHandler(editor: ICodeEditor): Promise<void> {
-    const model = editor.getModel();
-    if (!model) {
-      return Promise.resolve();
-    }
-    const providers = languageFeaturesService.codeActionProvider.ordered(model);
-
-    if (!providers) {
-      return Promise.resolve();
-    }
-
-    const [provider] = providers;
-    const range = model.getFullModelRange();
-    const context: CodeActionContext = {
-      trigger: CodeActionTriggerType.Auto,
-    };
-    const ts = new CancellationTokenSource();
-    const actionList = await provider.provideCodeActions(model, range, context, ts.token);
-
-    // 提取所有可修复的代码操作
-    const fixableActions = actionList?.actions.filter(isAutoFixable) || [];
-
-    if (fixableActions.length === 0) {
-      return Promise.resolve();
-    }
-
-    // 执行所有可修复的代码操作
-    await Promise.allSettled(
-      fixableActions.map(async (action) => {
-        if (action.command) {
-          try {
-            await this.commandService.executeCommand(action.command.id, ...(action.command.arguments || []));
-          } catch (err) {}
-        }
-      }),
-    );
-  }
-
   @Autowired(IEditorDocumentModelService)
   private readonly modelService: IEditorDocumentModelService;
 

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

@@ -15,13 +15,12 @@ import {
   StorageProvider,
   debounce,
 } from '@opensumi/ide-core-common';
-import { ChatFeatureRegistryToken, IHistoryChatMessage } from '@opensumi/ide-core-common/lib/types/ai-native';
+import { 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';
-import { ChatFeatureRegistry } from './chat.feature.registry';
 
 interface ISessionModel {
   sessionId: string;
@@ -79,23 +78,17 @@ export class ChatManagerService extends Disposable {
   @Autowired(PreferenceService)
   private preferenceService: PreferenceService;
 
-  @Autowired(ChatFeatureRegistryToken)
-  private chatFeatureRegistry: ChatFeatureRegistry;
-
   private _chatStorage: IStorage;
 
   protected fromJSON(data: ISessionModel[]) {
     return data
       .filter((item) => item.history.messages.length > 0)
       .map((item) => {
-        const model = new ChatModel(
-          this.chatFeatureRegistry,
-          {
-            sessionId: item.sessionId,
-            history: new MsgHistoryManager(this.chatFeatureRegistry, item.history),
-            modelId: item.modelId,
-          },
-        );
+        const model = new ChatModel({
+          sessionId: item.sessionId,
+          history: new MsgHistoryManager(item.history),
+          modelId: item.modelId,
+        });
         const requests = item.requests.map(
           (request) =>
             new ChatRequestModel(
@@ -138,9 +131,7 @@ export class ChatManagerService extends Disposable {
   }
 
   startSession() {
-    const model = new ChatModel(
-      this.chatFeatureRegistry,
-    );
+    const model = new ChatModel();
     this.#sessionModels.set(model.sessionId, model);
     this.listenSession(model);
     return model;

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

@@ -28,7 +28,7 @@ import {
 import { MsgHistoryManager } from '../model/msg-history-manager';
 import { IChatSlashCommandItem } from '../types';
 
-import { ChatFeatureRegistry } from './chat.feature.registry';
+import type { ImagePart, TextPart, ToolCallPart } from 'ai';
 
 export type IChatProgressResponseContent =
   | IChatMarkdownContent
@@ -296,13 +296,10 @@ export class ChatRequestModel implements IChatRequestModel {
 export class ChatModel extends Disposable implements IChatModel {
   private requestIdPool = 0;
 
-  constructor(
-    private chatFeatureRegistry: ChatFeatureRegistry,
-    initParams?: { sessionId?: string; history?: MsgHistoryManager; modelId?: string },
-  ) {
+  constructor(initParams?: { sessionId?: string; history?: MsgHistoryManager; modelId?: string }) {
     super();
     this.#sessionId = initParams?.sessionId ?? uuid();
-    this.history = initParams?.history ?? new MsgHistoryManager(this.chatFeatureRegistry);
+    this.history = initParams?.history ?? new MsgHistoryManager();
     this.#modelId = initParams?.modelId;
   }
 
@@ -339,142 +336,88 @@ export class ChatModel extends Disposable implements IChatModel {
     this.#modelId = modelId;
   }
 
-  private processMemorySummaries(): CoreMessage[] {
-    const memorySummaries = this.history.getMemorySummaries();
-    if (memorySummaries.length === 0) {
-      return [];
-    }
-
-    const processedSummaries = memorySummaries
-      .map((summary) => {
-        try {
-          const parsed = JSON.parse(summary.content);
-          return parsed.memory || parsed.content || summary.content;
-        } catch {
-          return summary.content;
-        }
-      })
-      .filter((content) => content && content !== 'no_memory_needed')
-      .filter((content, index, self) => self.indexOf(content) === index);
-
-    return processedSummaries.length > 0
-      ? [
-          {
-            role: 'system',
-            content: '以下是之前对话的总结：\n' + processedSummaries.join('\n\n'),
-          },
-        ]
-      : [];
-  }
-
-  private processToolCall(part: IChatToolContent, history: CoreMessage[]): void {
-    if (history[history.length - 1].role !== 'assistant') {
-      history.push({
-        role: 'assistant',
-        content: [],
-      });
-    }
-
-    const toolCallId = part.content.id;
-    const toolCallInfo = {
-      id: toolCallId,
-      name: part.content.function.name,
-      args: this.parseJsonSafely(part.content.function.arguments || '{}', 'tool call arguments'),
-      result: this.parseJsonSafely(part.content.result || '{}', 'tool result'),
-    };
-
-    this.history.addToolCall(toolCallInfo);
-    this.history.setMessageAdditional(part.content.id, { toolCallId });
-
-    const lastMessage = history[history.length - 1];
-    lastMessage.content = [
-      {
-        type: 'tool-call',
-        toolCallId: part.content.id,
-        toolName: part.content.function.name,
-        args: toolCallInfo.args,
-      },
-    ];
-
-    history.push({
-      role: 'tool',
-      content: [
-        {
-          type: 'tool-result',
-          toolCallId: part.content.id,
-          toolName: part.content.function.name,
-          result: toolCallInfo.result,
-        },
-      ],
-    });
-  }
-
-  private parseJsonSafely(jsonString: string, context: string): any {
-    try {
-      return JSON.parse(jsonString);
-    } catch (e) {
-      console.error(`[ChatModel] Failed to parse ${context}:`, e);
-      return {};
-    }
-  }
-
-  private processRecentMessages(): CoreMessage[] {
+  getMessageHistory(contextWindow?: number) {
     const history: CoreMessage[] = [];
-    // 从 MsgHistoryManager 获取消息，并过滤掉已总结的消息
-    const recentMessages = this.history
-      .getMessages()
-      .filter((msg) => !msg.isSummarized)
-      .slice(-this.history.memoryConfig.shortTermSize);
-
-    for (const message of recentMessages) {
+    for (const request of this.requests) {
+      if (!request.response.isComplete) {
+        continue;
+      }
       history.push({
         role: 'user',
-        content: message.content,
+        content: request.message.images?.length
+          ? [
+              { type: 'text', text: request.message.prompt },
+              ...request.message.images.map((image) => ({ type: 'image', image: new URL(image) } as ImagePart)),
+            ]
+          : request.message.prompt,
       });
-
-      // 如果有响应内容，添加响应
-      const additional = this.history.getMessageAdditional(message.id);
-      if (additional?.response) {
-        const response = additional.response;
-        if (response.kind === 'toolCall') {
-          this.processToolCall(response, history);
-        } else {
+      for (const part of request.response.responseParts) {
+        if (part.kind === 'treeData' || part.kind === 'component') {
+          continue;
+        }
+        if (part.kind !== 'toolCall') {
           history.push({
             role: 'assistant',
-            content: response.kind === 'markdownContent' ? response.content.value : response.content,
+            content: [
+              {
+                type: 'text',
+                text: part.kind === 'markdownContent' ? part.content.value : part.content,
+              },
+            ],
+          });
+        } else {
+          // 直接开始toolCall场景
+          if (history[history.length - 1].role !== 'assistant') {
+            history.push({
+              role: 'assistant',
+              content: [],
+            });
+          }
+          (history[history.length - 1].content as Array<TextPart | ToolCallPart>).push({
+            type: 'tool-call',
+            toolCallId: part.content.id,
+            toolName: part.content.function.name,
+            args: (() => {
+              try {
+                return JSON.parse(part.content.function.arguments || '{}');
+              } catch (e) {
+                console.error('Failed to parse tool call arguments:', e);
+                return {};
+              }
+            })(),
+          });
+          history.push({
+            role: 'tool',
+            content: [
+              {
+                type: 'tool-result',
+                toolCallId: part.content.id,
+                toolName: part.content.function.name,
+                result: (() => {
+                  try {
+                    return JSON.parse(part.content.result || '{}');
+                  } catch (e) {
+                    console.error('Failed to parse tool result:', e);
+                    return {};
+                  }
+                })(),
+              },
+            ],
           });
         }
       }
     }
-
-    return history;
-  }
-
-  private limitTokens(history: CoreMessage[], contextWindow?: number): CoreMessage[] {
-    if (!contextWindow) {
-      return history;
-    }
-
-    let currentHistory = history;
-    let tokenCount = JSON.stringify(currentHistory).length / 3;
-
-    while (tokenCount > contextWindow && currentHistory.length > 1) {
-      if (currentHistory[0].role === 'system' && currentHistory.length > 2) {
-        currentHistory = [currentHistory[0], ...currentHistory.slice(2)];
-      } else {
-        currentHistory = currentHistory.slice(1);
+    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++;
       }
-      tokenCount = JSON.stringify(currentHistory).length / 3;
     }
-
-    return currentHistory;
-  }
-
-  getMessageHistory(contextWindow?: number): CoreMessage[] {
-    const memorySummaries = this.processMemorySummaries();
-    const recentMessages = this.processRecentMessages();
-    const history = [...memorySummaries, ...recentMessages];
-    return this.limitTokens(history, contextWindow);
+    return history.slice(this.#slicedMessageCount);
   }
 
   addRequest(message: IChatRequestMessage): ChatRequestModel {