fix: improve chat reporter

Author: Ricbet

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

@@ -1,17 +1,6 @@
 import { Autowired, Injectable } from '@opensumi/di';
 import { PreferenceService } from '@opensumi/ide-core-browser';
-import {
-  AIBackSerivcePath,
-  CancelResponse,
-  CancellationTokenSource,
-  Disposable,
-  Emitter,
-  ErrorResponse,
-  Event,
-  IAIBackService,
-  IAIBackServiceOption,
-  ReplyResponse,
-} from '@opensumi/ide-core-common';
+import { AIBackSerivcePath, Disposable, Emitter, Event, IAIBackService } from '@opensumi/ide-core-common';
 
 import { IChatManagerService } from '../../common';
 

packages/ai-native/src/browser/chat/chat.view.tsx

@@ -159,7 +159,6 @@ export const AIChatView = observer(() => {
     disposer.addDispose(
       chatApiService.onChatReplyMessageLaunch((chunk) => {
         const relationId = aiReporter.start(AISerivceType.CustomReplay, {
-          msgType: AISerivceType.CustomReplay,
           message: chunk,
         });
 
@@ -192,8 +191,7 @@ export const AIChatView = observer(() => {
         list.forEach((item) => {
           const { role } = item;
 
-          const relationId = aiReporter.start(AISerivceType.Agent, {
-            msgType: AISerivceType.Agent,
+          const relationId = aiReporter.start(AISerivceType.Chat, {
             message: '',
           });
 
@@ -256,7 +254,6 @@ export const AIChatView = observer(() => {
       chatAgentService.onDidSendMessage((chunk) => {
         const newChunk = chunk as IChatComponent | IChatContent;
         const relationId = aiReporter.start(AISerivceType.Agent, {
-          msgType: AISerivceType.Agent,
           message: '',
         });
 
@@ -333,9 +330,12 @@ export const AIChatView = observer(() => {
       const ChatUserRoleRender = chatRenderRegistry.chatUserRoleRender;
 
       const startTime = Date.now();
-      const relationId = aiReporter.start(AISerivceType.Agent, {
-        msgType: AISerivceType.Agent,
-        message: value.message,
+      const reportType = ChatProxyService.AGENT_ID === agentId ? AISerivceType.Chat : AISerivceType.Agent;
+      const relationId = aiReporter.start(command || reportType, {
+        type: AISerivceType.Chat,
+        message,
+        agentId,
+        userMessage: message,
       });
 
       msgHistoryManager.addUserMessage({

packages/ai-native/src/browser/components/ChatReply.tsx

@@ -197,7 +197,7 @@ export const ChatReply = (props: IChatReplyProps) => {
           }
 
           aiReporter.end(relationId, {
-            message: request.response.responseText,
+            assistantMessage: request.response.responseText,
             replytime: Date.now() - startTime,
             success: true,
             isStop: false,
@@ -220,7 +220,7 @@ export const ChatReply = (props: IChatReplyProps) => {
       onDone();
     }
     aiReporter.end(relationId, {
-      message: request.response.responseText,
+      assistantMessage: request.response.responseText,
       replytime: Date.now() - startTime,
       success: false,
       isStop: true,

packages/ai-native/src/browser/contrib/rename/rename.handler.ts

@@ -34,7 +34,7 @@ export class RenameHandler extends IAIMonacoContribHandler {
       this.lastModelRequestRenameSessionId = undefined;
 
       const startTime = +new Date();
-      const relationId = this.aiReporter.start('rename', {
+      const relationId = this.aiReporter.start(AISerivceType.Rename, {
         message: 'start',
         type: AISerivceType.Rename,
         modelRequestStartTime: startTime,

packages/ai-native/src/browser/contrib/terminal/ps1-terminal.service.tsx

@@ -5,7 +5,13 @@ import { IDecoration, IDisposable, IMarker, Terminal } from 'xterm';
 
 import { Autowired, Injectable } from '@opensumi/di';
 import { localize } from '@opensumi/ide-core-browser';
-import { CancellationTokenSource, Disposable, IAIReporter, TerminalRegistryToken } from '@opensumi/ide-core-common';
+import {
+  AISerivceType,
+  CancellationTokenSource,
+  Disposable,
+  IAIReporter,
+  TerminalRegistryToken,
+} from '@opensumi/ide-core-common';
 import { ITerminalConnection, ITerminalController } from '@opensumi/ide-terminal-next';
 import { listenReadable } from '@opensumi/ide-utils/lib/stream';
 
@@ -222,7 +228,7 @@ export class PS1TerminalService extends Disposable {
   ) {
     await this.stopAIStreamRequest();
 
-    const reportRelationId = this.aiReporter.start('terminalAICommand', { message: commandDescription });
+    const reportRelationId = this.aiReporter.start(AISerivceType.TerminalAICommand, { message: commandDescription });
 
     const terminalReadableStream = await this.terminalFeatureRegistry.readableCommandSuggestions(
       commandDescription,

packages/ai-native/src/common/index.ts

@@ -72,7 +72,7 @@ export type IChatMessageListAssistantItem = (IChatComponent | IChatContent) & {
 
 export type IChatMessageListItem = IChatMessageListUserItem | IChatMessageListAssistantItem;
 
-export enum ChatCompletionRequestMessageRoleEnum {
+export const enum ChatCompletionRequestMessageRoleEnum {
   System = 'system',
   User = 'user',
   Assistant = 'assistant',

packages/core-common/src/types/ai-native/reporter.ts

@@ -9,6 +9,7 @@ export enum AISerivceType {
   Agent = 'agent',
   MergeConflict = 'mergeConflict',
   Rename = 'rename',
+  TerminalAICommand = 'terminalAICommand',
 }
 
 export interface CommonLogInfo {
@@ -52,6 +53,12 @@ export enum MergeConflictEditorMode {
   'traditional' = 'traditional',
 }
 
+export interface ChatRT extends Partial<CommonLogInfo> {
+  agentId?: string;
+  userMessage?: string;
+  assistantMessage?: string;
+}
+
 export interface MergeConflictRT extends Partial<CommonLogInfo> {
   // 解决冲突模式 （3-way 或 传统模式）
   editorMode: MergeConflictEditorMode;
@@ -104,7 +111,9 @@ export type ReportInfo =
   | ({ type: AISerivceType.MergeConflict } & MergeConflictRT)
   | ({ type: AISerivceType.Rename } & RenameRT)
   | ({ type: AISerivceType.InlineChat } & InlineChatRT)
-  | ({ type: AISerivceType.InlineChatInput } & InlineChatRT);
+  | ({ type: AISerivceType.InlineChatInput } & InlineChatRT)
+  | ({ type: AISerivceType.Chat } & ChatRT)
+  | ({ type: AISerivceType.Agent } & ChatRT);
 
 export const IAIReporter = Symbol('IAIReporter');