feat(amazonq): Inline E2E flow using flare (#5629)

* Inline E2E flow using flare

* Add accept, reject and discard hooks

* clean up codebase

* fix perceivedLatency

* fix userInput and remove unused code

* remove not needed methods and fields

* detekt

* remvoe IDE auto trigger logic

* fix tests

* remove debug options

* fix tests in lsp

* address comments and further remove no longer used logic

* fix tests

* fix tests

* fix tests

* fix tests

* remove debug options

---------

Co-authored-by: manodnyab <[email protected]>

Author: andrewyuq

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeScan/controller/CodeScanChatHelper.kt

@@ -11,8 +11,6 @@ import software.aws.toolkits.jetbrains.services.amazonqCodeScan.messages.CodeSca
 import software.aws.toolkits.jetbrains.services.amazonqCodeScan.messages.CodeScanChatMessageContent
 import software.aws.toolkits.jetbrains.services.amazonqCodeScan.messages.UpdatePlaceholderMessage
 import software.aws.toolkits.jetbrains.services.amazonqCodeScan.storage.ChatSessionStorage
-import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.QFeatureEvent
-import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.broadcastQEvent
 import software.aws.toolkits.jetbrains.services.cwc.messages.ChatMessageType
 import java.util.UUID
 
@@ -36,7 +34,6 @@ class CodeScanChatHelper(
         clearPreviousItemButtons: Boolean? = false,
     ) {
         if (isInValidSession()) return
-        broadcastQEvent(QFeatureEvent.INVOCATION)
         messagePublisher.publish(
             CodeScanChatMessage(
                 tabId = activeCodeScanTabId as String,

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt

@@ -54,6 +54,8 @@ import software.aws.toolkits.jetbrains.core.coroutines.EDT
 import software.aws.toolkits.jetbrains.core.credentials.sono.isInternalUser
 import software.aws.toolkits.jetbrains.services.amazonq.apps.AmazonQAppInitContext
 import software.aws.toolkits.jetbrains.services.amazonq.auth.AuthController
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.textDocument.InlineCompletionReference
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.textDocument.InlineCompletionReferencePosition
 import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileManager
 import software.aws.toolkits.jetbrains.services.amazonq.project.RelevantDocument
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.CodeWhispererUTGChatManager
@@ -74,8 +76,6 @@ import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.sendA
 import software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererClientAdaptor
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.CodeWhispererProgrammingLanguage
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.programmingLanguage
-import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.QFeatureEvent
-import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.broadcastQEvent
 import software.aws.toolkits.jetbrains.services.codewhisperer.toolwindow.CodeWhispererCodeReferenceManager
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.isWithin
 import software.aws.toolkits.jetbrains.services.cwc.ChatConstants
@@ -637,7 +637,21 @@ class CodeTestChatController(
                         }
                         LOG.debug { "Original code content from reference span: $originalContent" }
                         withContext(EDT) {
-                            manager.addReferenceLogPanelEntry(reference = reference, null, null, originalContent?.split("\n"))
+                            // TODO flare: hook /test references with flare correctly, this is only a compile error fix which is not tested
+                            manager.addReferenceLogPanelEntry(
+                                reference = InlineCompletionReference(
+                                    referenceName = reference.repository(),
+                                    referenceUrl = reference.url(),
+                                    licenseName = reference.licenseName(),
+                                    position = InlineCompletionReferencePosition(
+                                        startCharacter = reference.recommendationContentSpan().start(),
+                                        endCharacter = reference.recommendationContentSpan().end()
+                                    )
+                                ),
+                                null,
+                                null,
+                                originalContent?.split("\n")
+                            )
                             manager.toolWindow?.show()
                         }
                     }
@@ -1298,7 +1312,6 @@ class CodeTestChatController(
                 "Processing message: $message " +
                 "tabId: $tabId"
         }
-        broadcastQEvent(QFeatureEvent.INVOCATION)
         when (session.conversationState) {
             ConversationState.WAITING_FOR_BUILD_COMMAND_INPUT -> handleBuildCommandInput(session, message)
             ConversationState.WAITING_FOR_REGENERATE_INPUT -> handleRegenerateInput(session, message)

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/controller/DocController.kt

@@ -79,8 +79,6 @@ import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.Delete
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.NewFileZipInfo
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.SessionStatePhase
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util.CancellationTokenSource
-import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.QFeatureEvent
-import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.broadcastQEvent
 import software.aws.toolkits.resources.message
 import java.util.UUID
 
@@ -768,7 +766,6 @@ class DocController(
                 else -> emptyList()
             }
             sendDocGenerationTelemetry(filePaths, session, docGenerationTask)
-            broadcastQEvent(QFeatureEvent.INVOCATION)
 
             if (filePaths.isNotEmpty()) {
                 processOpenDiff(

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt

@@ -75,8 +75,6 @@ import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.Sessio
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.storage.ChatSessionStorage
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util.InsertAction
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util.getFollowUpOptions
-import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.QFeatureEvent
-import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.broadcastQEvent
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.content
 import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.FeedbackComment
 import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.getStartUrl
@@ -219,7 +217,6 @@ class FeatureDevController(
         logger.debug { "$FEATURE_NAME: Processing InsertCodeAtCursorPosition: $message" }
 
         withContext(EDT) {
-            broadcastQEvent(QFeatureEvent.STARTS_EDITING)
             val editor: Editor = FileEditorManager.getInstance(context.project).selectedTextEditor ?: return@withContext
 
             val caret: Caret = editor.caretModel.primaryCaret
@@ -231,7 +228,6 @@ class FeatureDevController(
                 }
                 editor.document.insertString(offset, message.code)
             }
-            broadcastQEvent(QFeatureEvent.FINISHES_EDITING)
         }
     }
 
@@ -750,7 +746,6 @@ class FeatureDevController(
             }
 
             session.preloader(messenger)
-            broadcastQEvent(QFeatureEvent.INVOCATION)
 
             when (session.sessionState.phase) {
                 SessionStatePhase.CODEGEN -> onCodeGeneration(session, message, tabId)

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

@@ -19,7 +19,6 @@ import com.intellij.openapi.editor.Caret
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.options.ShowSettingsUtil
-import com.intellij.psi.PsiDocumentManager
 import kotlinx.coroutines.cancelChildren
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.filter
@@ -46,9 +45,6 @@ import software.aws.toolkits.jetbrains.services.amazonq.onboarding.OnboardingPag
 import software.aws.toolkits.jetbrains.services.amazonq.project.ProjectContextController
 import software.aws.toolkits.jetbrains.services.amazonq.project.RelevantDocument
 import software.aws.toolkits.jetbrains.services.codewhisperer.settings.CodeWhispererConfigurable
-import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.CodeWhispererUserModificationTracker
-import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.QFeatureEvent
-import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.broadcastQEvent
 import software.aws.toolkits.jetbrains.services.cwc.InboundAppMessagesHandler
 import software.aws.toolkits.jetbrains.services.cwc.clients.chat.exceptions.ChatApiException
 import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.ChatRequestData
@@ -61,7 +57,6 @@ import software.aws.toolkits.jetbrains.services.cwc.commands.EditorContextComman
 import software.aws.toolkits.jetbrains.services.cwc.controller.chat.StaticPrompt
 import software.aws.toolkits.jetbrains.services.cwc.controller.chat.StaticTextResponse
 import software.aws.toolkits.jetbrains.services.cwc.controller.chat.messenger.ChatPromptHandler
-import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.InsertedCodeModificationEntry
 import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.TelemetryHelper
 import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.getStartUrl
 import software.aws.toolkits.jetbrains.services.cwc.controller.chat.userIntent.UserIntentRecognizer
@@ -82,7 +77,6 @@ import software.aws.toolkits.jetbrains.services.cwc.messages.QuickActionMessage
 import software.aws.toolkits.jetbrains.services.cwc.storage.ChatSessionStorage
 import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
 import software.aws.toolkits.telemetry.CwsprChatCommandType
-import java.time.Instant
 import java.util.UUID
 
 data class TestCommandMessage(
@@ -207,7 +201,6 @@ class ChatController private constructor(
     }
 
     override suspend fun processInsertCodeAtCursorPosition(message: IncomingCwcMessage.InsertCodeAtCursorPosition) {
-        broadcastQEvent(QFeatureEvent.STARTS_EDITING)
         withContext(EDT) {
             val editor: Editor = FileEditorManager.getInstance(context.project).selectedTextEditor ?: return@withContext
 
@@ -223,23 +216,10 @@ class ChatController private constructor(
                     editor.document.insertString(offset, message.code)
 
                     ReferenceLogController.addReferenceLog(message.code, message.codeReference, editor, context.project, null)
-
-                    CodeWhispererUserModificationTracker.getInstance(context.project).enqueue(
-                        InsertedCodeModificationEntry(
-                            telemetryHelper.getConversationId(message.tabId).orEmpty(),
-                            message.messageId,
-                            Instant.now(),
-                            PsiDocumentManager.getInstance(context.project).getPsiFile(editor.document)?.virtualFile,
-                            editor.document.createRangeMarker(caret.selectionStart, caret.selectionEnd, true),
-                            message.code,
-                        ),
-                    )
                 }
             }
         }
         telemetryHelper.recordInteractWithMessage(message)
-
-        broadcastQEvent(QFeatureEvent.FINISHES_EDITING)
     }
 
     override suspend fun processStopResponseMessage(message: IncomingCwcMessage.StopResponse) {
@@ -433,7 +413,6 @@ class ChatController private constructor(
         sessionInfo.history.add(requestData)
         telemetryHelper.recordEnterFocusConversation(tabId)
         telemetryHelper.recordStartConversation(tabId, requestData)
-        broadcastQEvent(QFeatureEvent.INVOCATION)
         // Send the request to the API and publish the responses back to the UI.
         // This is launched in a scope attached to the sessionInfo so that the Job can be cancelled on a per-session basis.
         ChatPromptHandler(telemetryHelper).handle(tabId, triggerId, requestData, sessionInfo, shouldAddIndexInProgressMessage)

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

@@ -5,8 +5,8 @@ package software.aws.toolkits.jetbrains.services.cwc.controller
 
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
-import software.amazon.awssdk.services.codewhispererruntime.model.Reference
-import software.amazon.awssdk.services.codewhispererruntime.model.Span
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.textDocument.InlineCompletionReference
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.textDocument.InlineCompletionReferencePosition
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.CodeReferenceGenerated
 import software.aws.toolkits.jetbrains.services.codewhisperer.editor.CodeWhispererEditorUtil
 import software.aws.toolkits.jetbrains.services.codewhisperer.model.CaretPosition
@@ -15,21 +15,18 @@ import software.aws.toolkits.jetbrains.services.cwc.messages.CodeReference
 
 object ReferenceLogController {
     fun addReferenceLog(originalCode: String, codeReferences: List<CodeReference>?, editor: Editor, project: Project, inlineChatStartPosition: CaretPosition?) {
+        // TODO flare: hook /dev references with flare correctly, this is only a compile error fix which is not tested
         codeReferences?.let { references ->
             val cwReferences = references.map { reference ->
-                Reference.builder()
-                    .licenseName(reference.licenseName)
-                    .repository(reference.repository)
-                    .url(reference.url)
-                    .recommendationContentSpan(
-                        reference.recommendationContentSpan?.let { span ->
-                            Span.builder()
-                                .start(span.start)
-                                .end(span.end)
-                                .build()
-                        }
+                InlineCompletionReference(
+                    referenceName = reference.repository.orEmpty(),
+                    referenceUrl = reference.url.orEmpty(),
+                    licenseName = reference.licenseName.orEmpty(),
+                    position = InlineCompletionReferencePosition(
+                        startCharacter = reference.recommendationContentSpan?.start ?: 0,
+                        endCharacter = reference.recommendationContentSpan?.end ?: 0,
                     )
-                    .build()
+                )
             }
             val manager = CodeWhispererCodeReferenceManager.getInstance(project)
 
@@ -38,29 +35,24 @@ object ReferenceLogController {
                 cwReferences,
                 editor,
                 inlineChatStartPosition ?: CodeWhispererEditorUtil.getCaretPosition(editor),
-                null,
             )
         }
     }
 
     fun addReferenceLog(codeReferences: List<CodeReferenceGenerated>?, project: Project) {
         val manager = CodeWhispererCodeReferenceManager.getInstance(project)
 
+        // TODO flare: hook /dev references with flare correctly, this is only a compile error fix which is not tested
         codeReferences?.forEach { reference ->
-            val cwReferences = Reference.builder()
-                .licenseName(reference.licenseName)
-                .repository(reference.repository)
-                .url(reference.url)
-                .recommendationContentSpan(
-                    reference.recommendationContentSpan?.let { span ->
-                        Span.builder()
-                            .start(span.start)
-                            .end(span.end)
-                            .build()
-                    }
+            val cwReferences = InlineCompletionReference(
+                referenceName = reference.repository.orEmpty(),
+                referenceUrl = reference.url.orEmpty(),
+                licenseName = reference.licenseName.orEmpty(),
+                position = InlineCompletionReferencePosition(
+                    startCharacter = reference.recommendationContentSpan?.start ?: 0,
+                    endCharacter = reference.recommendationContentSpan?.end ?: 0,
                 )
-                .build()
-
+            )
             manager.addReferenceLogPanelEntry(reference = cwReferences, null, null, null)
         }
     }

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

@@ -13,8 +13,6 @@ import software.amazon.awssdk.awscore.exception.AwsServiceException
 import software.amazon.awssdk.services.codewhispererstreaming.model.CodeWhispererStreamingException
 import software.aws.toolkits.core.utils.convertMarkdownToHTML
 import software.aws.toolkits.core.utils.extractCodeBlockLanguage
-import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.QFeatureEvent
-import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.broadcastQEvent
 import software.aws.toolkits.jetbrains.services.cwc.clients.chat.exceptions.ChatApiException
 import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.ChatRequestData
 import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.ChatResponseEvent
@@ -117,8 +115,6 @@ class ChatPromptHandler(private val telemetryHelper: TelemetryHelper) {
                 )
                 telemetryHelper.recordAddMessage(data, response, responseText.length, statusCode, countTotalNumberOfCodeBlocks(responseText))
                 emit(response)
-
-                broadcastQEvent(QFeatureEvent.INVOCATION)
             }
             .catch { exception ->
                 val statusCode = if (exception is AwsServiceException) exception.statusCode() else 0

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/inline/InlineChatController.kt

@@ -60,8 +60,6 @@ import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileSe
 import software.aws.toolkits.jetbrains.services.amazonq.toolwindow.AMAZON_Q_WINDOW_ID
 import software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererModelConfigurator
 import software.aws.toolkits.jetbrains.services.codewhisperer.model.CaretPosition
-import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.QFeatureEvent
-import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.broadcastQEvent
 import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.ChatRequestData
 import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.TriggerType
 import software.aws.toolkits.jetbrains.services.cwc.controller.ReferenceLogController
@@ -545,7 +543,6 @@ class InlineChatController(
     private fun insertString(editor: Editor, offset: Int, text: String): RangeMarker {
         lateinit var rangeMarker: RangeMarker
 
-        broadcastQEvent(QFeatureEvent.STARTS_EDITING)
         ApplicationManager.getApplication().invokeAndWait {
             CommandProcessor.getInstance().runUndoTransparentAction {
                 WriteCommandAction.runWriteCommandAction(project) {
@@ -555,20 +552,17 @@ class InlineChatController(
                 highlightCodeWithBackgroundColor(editor, rangeMarker.startOffset, rangeMarker.endOffset, true)
             }
         }
-        broadcastQEvent(QFeatureEvent.FINISHES_EDITING)
         return rangeMarker
     }
 
     private fun replaceString(document: Document, start: Int, end: Int, text: String) {
-        broadcastQEvent(QFeatureEvent.STARTS_EDITING)
         ApplicationManager.getApplication().invokeAndWait {
             CommandProcessor.getInstance().runUndoTransparentAction {
                 WriteCommandAction.runWriteCommandAction(project) {
                     document.replaceString(start, end, text)
                 }
             }
         }
-        broadcastQEvent(QFeatureEvent.FINISHES_EDITING)
     }
 
     private fun highlightString(editor: Editor, start: Int, end: Int, isInsert: Boolean) {
@@ -725,8 +719,6 @@ class InlineChatController(
             canPopupAbort.set(true)
             undoChanges()
         }
-
-        broadcastQEvent(QFeatureEvent.FINISHES_EDITING)
         return errorMessage
     }