Adding Q chat metrics

Author: laileni-aws

.changes/next-release/Feature-66094f43-8633-459a-b81a-714ef9b2b5fe.json

@@ -92,10 +92,7 @@ export class Connector {
         messageId: string,
         code?: string,
         type?: 'selection' | 'block',
-        codeReference?: CodeReference[],
-        eventId?: string,
-        codeBlockIndex?: number,
-        totalCodeBlocks?: number
+        codeReference?: CodeReference[]
     ): void => {
         this.sendMessageToExtension({
             tabID: tabID,
@@ -105,9 +102,6 @@ export class Connector {
             tabType: 'cwc',
             insertionTargetType: type,
             codeReference,
-            eventId,
-            codeBlockIndex,
-            totalCodeBlocks,
         })
     }
 
@@ -116,10 +110,7 @@ export class Connector {
         messageId: string,
         code?: string,
         type?: 'selection' | 'block',
-        codeReference?: CodeReference[],
-        eventId?: string,
-        codeBlockIndex?: number,
-        totalCodeBlocks?: number
+        codeReference?: CodeReference[]
     ): void => {
         this.sendMessageToExtension({
             tabID: tabID,
@@ -129,9 +120,6 @@ export class Connector {
             tabType: 'cwc',
             insertionTargetType: type,
             codeReference,
-            eventId,
-            codeBlockIndex,
-            totalCodeBlocks,
         })
     }
 

packages/core/src/amazonq/webview/ui/apps/cwChatConnector.ts

@@ -214,23 +214,11 @@ export class Connector {
         messageId: string,
         code?: string,
         type?: 'selection' | 'block',
-        codeReference?: CodeReference[],
-        eventId?: string,
-        codeBlockIndex?: number,
-        totalCodeBlocks?: number
+        codeReference?: CodeReference[]
     ): void => {
         switch (this.tabsStorage.getTab(tabID)?.type) {
             case 'cwc':
-                this.cwChatConnector.onCodeInsertToCursorPosition(
-                    tabID,
-                    messageId,
-                    code,
-                    type,
-                    codeReference,
-                    eventId,
-                    codeBlockIndex,
-                    totalCodeBlocks
-                )
+                this.cwChatConnector.onCodeInsertToCursorPosition(tabID, messageId, code, type, codeReference)
                 break
             case 'featuredev':
                 this.featureDevChatConnector.onCodeInsertToCursorPosition(tabID, code, type, codeReference)
@@ -243,23 +231,11 @@ export class Connector {
         messageId: string,
         code?: string,
         type?: 'selection' | 'block',
-        codeReference?: CodeReference[],
-        eventId?: string,
-        codeBlockIndex?: number,
-        totalCodeBlocks?: number
+        codeReference?: CodeReference[]
     ): void => {
         switch (this.tabsStorage.getTab(tabID)?.type) {
             case 'cwc':
-                this.cwChatConnector.onCopyCodeToClipboard(
-                    tabID,
-                    messageId,
-                    code,
-                    type,
-                    codeReference,
-                    eventId,
-                    codeBlockIndex,
-                    totalCodeBlocks
-                )
+                this.cwChatConnector.onCopyCodeToClipboard(tabID, messageId, code, type, codeReference)
                 break
             case 'featuredev':
                 this.featureDevChatConnector.onCopyCodeToClipboard(tabID, code, type, codeReference)

packages/core/src/amazonq/webview/ui/connector.ts

@@ -207,7 +207,6 @@ export const createMynahUI = (ideApi: any, amazonQEnabled: boolean) => {
         },
         onChatAnswerReceived: (tabID: string, item: ChatItem) => {
             if (item.type === ChatItemType.ANSWER_PART || item.type === ChatItemType.CODE_RESULT) {
-                // Enters after gen started 1st chunk with messageId
                 if (item.body !== undefined && item.messageId !== undefined) {
                     const totalCodeBlocks = countNumberOfCodeBlocks(item.body)
                     connector.handleMessageofStreamedData(tabID, totalCodeBlocks, item.messageId)
@@ -240,7 +239,6 @@ export const createMynahUI = (ideApi: any, amazonQEnabled: boolean) => {
                 item.type === ChatItemType.SYSTEM_PROMPT ||
                 item.type === ChatItemType.AI_PROMPT
             ) {
-                //Does not enter this
                 mynahUI.updateStore(tabID, {
                     loadingChat: true,
                     promptInputDisabledState: true,
@@ -251,7 +249,6 @@ export const createMynahUI = (ideApi: any, amazonQEnabled: boolean) => {
             }
 
             if (item.type === ChatItemType.ANSWER) {
-                //Enters only once before gen the code block but with messageID
                 mynahUI.updateStore(tabID, {
                     loadingChat: false,
                     promptInputDisabledState: tabsStorage.isTabDead(tabID),
@@ -397,26 +394,8 @@ export const createMynahUI = (ideApi: any, amazonQEnabled: boolean) => {
             })
         },
         onCodeInsertToCursorPosition: connector.onCodeInsertToCursorPosition,
-        onCopyCodeToClipboard: (
-            tabId,
-            messageId,
-            code,
-            type,
-            referenceTrackerInfo,
-            eventId,
-            codeBlockIndex,
-            totalCodeBlocks
-        ) => {
-            connector.onCopyCodeToClipboard(
-                tabId,
-                messageId,
-                code,
-                type,
-                referenceTrackerInfo,
-                eventId,
-                codeBlockIndex,
-                totalCodeBlocks
-            )
+        onCopyCodeToClipboard: (tabId, messageId, code, type, referenceTrackerInfo) => {
+            connector.onCopyCodeToClipboard(tabId, messageId, code, type, referenceTrackerInfo)
             mynahUI.notify({
                 type: NotificationType.SUCCESS,
                 content: 'Selected code is copied to clipboard',

packages/core/src/amazonq/webview/ui/main.ts

@@ -319,7 +319,7 @@ export class ChatController {
 
     private async processMessageofStreamedData(message: MessageofStreamedData) {
         // Check the telemtry and trigger from here
-        //this.telemetryHelper.recordInteractWithMessage(message)
+        this.telemetryHelper.recordInteractWithMessage(message)
     }
 
     private async processTabCreateMessage(message: TabCreatedMessage) {

packages/core/src/codewhispererChat/controllers/chat/controller.ts

@@ -41,9 +41,6 @@ export interface InsertCodeAtCursorPosition {
     code: string
     insertionTargetType: string | undefined
     codeReference: CodeReference[] | undefined
-    eventId: string
-    codeBlockIndex: number
-    totalCodeBlocks: number
 }
 
 export interface CopyCodeToClipboard {
@@ -53,9 +50,6 @@ export interface CopyCodeToClipboard {
     code: string
     insertionTargetType: string | undefined
     codeReference: CodeReference[] | undefined
-    eventId: string
-    codeBlockIndex: number
-    totalCodeBlocks: number
 }
 
 export interface MessageofStreamedData {

packages/core/src/codewhispererChat/controllers/chat/model.ts

@@ -162,8 +162,6 @@ export class CWCTelemetryHelper {
                     cwsprChatAcceptedCharactersLength: message.code.length,
                     cwsprChatInteractionTarget: message.insertionTargetType,
                     cwsprChatHasReference: message.codeReference && message.codeReference.length > 0,
-                    cwsprChatCodeBlockIndex: message.codeBlockIndex,
-                    cwsprChatTotalCodeBlocks: message.totalCodeBlocks,
                 }
                 break
             case 'code_was_copied_to_clipboard':
@@ -177,8 +175,6 @@ export class CWCTelemetryHelper {
                     cwsprChatAcceptedCharactersLength: message.code.length,
                     cwsprChatInteractionTarget: message.insertionTargetType,
                     cwsprChatHasReference: message.codeReference && message.codeReference.length > 0,
-                    cwsprChatCodeBlockIndex: message.codeBlockIndex,
-                    cwsprChatTotalCodeBlocks: message.totalCodeBlocks,
                 }
                 break
             case 'follow-up-was-clicked':

packages/core/src/codewhispererChat/controllers/chat/telemetryHelper.ts

@@ -159,9 +159,6 @@ export class UIMessageListener {
             code: msg.code,
             insertionTargetType: msg.insertionTargetType,
             codeReference: msg.codeReference,
-            eventId: msg.eventId,
-            codeBlockIndex: msg.codeBlockIndex,
-            totalCodeBlocks: msg.totalCodeBlocks,
         })
     }
 
@@ -173,9 +170,6 @@ export class UIMessageListener {
             code: msg.code,
             insertionTargetType: msg.insertionTargetType,
             codeReference: msg.codeReference,
-            eventId: msg.eventId,
-            codeBlockIndex: msg.codeBlockIndex,
-            totalCodeBlocks: msg.totalCodeBlocks,
         })
     }
 

packages/core/src/codewhispererChat/view/messages/messageListener.ts

@@ -256,11 +256,6 @@
             "type": "string",
             "description": "Identifies the entity within the message that user interacts with."
         },
-        {
-            "name": "cwsprChatCodeBlockIndex",
-            "type": "int",
-            "description": "Index of the code block inside a message in the conversation."
-        },
         {
             "name": "cwsprChatTotalCodeBlocks",
             "type": "int",
@@ -834,10 +829,6 @@
                     "type": "cwsprChatHasReference",
                     "required": false
                 },
-                {
-                    "type": "cwsprChatCodeBlockIndex",
-                    "required": false
-                },
                 {
                     "type": "cwsprChatTotalCodeBlocks",
                     "required": false