Include user intent for copy and insert code interactions

Author: lalexcaws

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/ChatController.kt

@@ -221,6 +221,7 @@ class ChatController private constructor(
                         InsertedCodeModificationEntry(
                             telemetryHelper.getConversationId(message.tabId).orEmpty(),
                             message.messageId,
+                            message.userIntent,
                             Instant.now(),
                             PsiDocumentManager.getInstance(context.project).getPsiFile(editor.document)?.virtualFile,
                             editor.document.createRangeMarker(caret.selectionStart, caret.selectionEnd, true),

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/telemetry/TelemetryHelper.kt

@@ -210,6 +210,7 @@ class TelemetryHelper(private val context: AmazonQAppInitContext, private val se
                 AmazonqTelemetry.interactWithMessage(
                     cwsprChatConversationId = getConversationId(message.tabId).orEmpty(),
                     cwsprChatMessageId = message.messageId,
+                    cwsprChatUserIntent = message.userIntent?.let { getTelemetryUserIntent(it) },
                     cwsprChatInteractionType = CwsprChatInteractionType.CopySnippet,
                     cwsprChatAcceptedCharactersLength = message.code.length,
                     cwsprChatInteractionTarget = message.insertionTargetType,
@@ -233,6 +234,7 @@ class TelemetryHelper(private val context: AmazonQAppInitContext, private val se
                 AmazonqTelemetry.interactWithMessage(
                     cwsprChatConversationId = getConversationId(message.tabId).orEmpty(),
                     cwsprChatMessageId = message.messageId,
+                    cwsprChatUserIntent = message.userIntent?.let { getTelemetryUserIntent(it) },
                     cwsprChatInteractionType = CwsprChatInteractionType.InsertAtCursor,
                     cwsprChatAcceptedCharactersLength = message.code.length,
                     cwsprChatAcceptedNumberOfLines = message.code.lines().size,

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/messages/CwcMessage.kt

@@ -13,6 +13,7 @@ import com.fasterxml.jackson.databind.JsonSerializer
 import com.fasterxml.jackson.databind.SerializerProvider
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
 import com.fasterxml.jackson.databind.annotation.JsonSerialize
+import software.amazon.awssdk.services.codewhispererstreaming.model.UserIntent
 import software.aws.toolkits.jetbrains.services.amazonq.auth.AuthFollowUpType
 import software.aws.toolkits.jetbrains.services.amazonq.messages.AmazonQMessage
 import software.aws.toolkits.jetbrains.services.amazonq.onboarding.OnboardingPageInteractionType
@@ -65,6 +66,7 @@ sealed interface IncomingCwcMessage : CwcMessage {
         val command: String?,
         @JsonProperty("tabID") val tabId: String,
         val messageId: String,
+        val userIntent: UserIntent?,
         val code: String,
         val insertionTargetType: String?,
         val eventId: String?,
@@ -75,6 +77,7 @@ sealed interface IncomingCwcMessage : CwcMessage {
     data class InsertCodeAtCursorPosition(
         @JsonProperty("tabID") val tabId: String,
         val messageId: String,
+        val userIntent: UserIntent?,
         val code: String,
         val insertionTargetType: String?,
         val codeReference: List<CodeReference>?,

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/telemetry/InsertedCodeModificationEntry.kt

@@ -5,12 +5,14 @@ package software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry
 
 import com.intellij.openapi.editor.RangeMarker
 import com.intellij.openapi.vfs.VirtualFile
+import software.amazon.awssdk.services.codewhispererstreaming.model.UserIntent
 import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.UserModificationTrackingEntry
 import java.time.Instant
 
 data class InsertedCodeModificationEntry(
     val conversationId: String,
     val messageId: String,
+    val userIntent: UserIntent?,
     override val time: Instant,
     val vFile: VirtualFile?,
     val range: RangeMarker,