Merge branch 'main' into e2e

Author: ashishrp-aws

.changes/next-release/bugfix-79596dfc-37a0-44c8-adf2-a6c87ba806ac.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q: Fix data isolation between tabs to prevent interference when using /doc in multiple tabs"
+}

.changes/next-release/feature-0b164167-b04b-4a26-a59b-5ac41a717975.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "/review: Code reviews are now created with additional workspace context to enable grouping of related scans in the backend"
+}

.changes/next-release/removal-5b5b9cf3-701c-48b5-b232-96e726a9a860.json

@@ -0,0 +1,4 @@
+{
+  "type" : "removal",
+  "description" : "The Amazon Q inline suggestion popup goes back to being under the suggestions and is always showing."
+}

CONTRIBUTING.md

@@ -31,6 +31,7 @@ reported the issue. Please try to include as much information as you can. Detail
     brew install dotnet@6
     ```
   * If Gradle cannot find `dotnet`, run `./gradlew --stop` and `./gradlew projects` to reload the daemon. Note that this should be done in your terminal as invoking Gradle through the IDE will use the IDE's cached PATH.
+* It is recommended to [launch your IDE from the terminal](https://www.jetbrains.com/help/idea/working-with-the-ide-features-from-command-line.html) due to a known issue with Gradle/Java 21 where the Gradle daemon does not respect your PATH variable when the IDE is started from the desktop/Toolbox.
 
 ### Instructions
 

gradle/libs.versions.toml

@@ -27,7 +27,7 @@ mockitoKotlin = "5.4.0"
 mockk = "1.13.10"
 nimbus-jose-jwt = "9.40"
 node-gradle = "7.0.2"
-telemetryGenerator = "1.0.297"
+telemetryGenerator = "1.0.301"
 testLogger = "4.0.0"
 testRetry = "1.5.10"
 # test-only; platform provides slf4j transitively at runtime

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

@@ -132,9 +132,8 @@ class DocController(
     private val authController: AuthController = AuthController(),
 ) : InboundAppMessagesHandler {
     val messenger = context.messagesFromAppToUi
-    var mode: Mode = Mode.CREATE
     val toolWindow = ToolWindowManager.getInstance(context.project).getToolWindow(AmazonQToolWindowFactory.WINDOW_ID)
-    var docGenerationTask = DocGenerationTask()
+    private val docGenerationTasks = DocGenerationTasks()
 
     override suspend fun processPromptChatMessage(message: IncomingDocMessage.ChatPrompt) {
         handleChat(
@@ -148,7 +147,7 @@ class DocController(
     }
 
     override suspend fun processTabRemovedMessage(message: IncomingDocMessage.TabRemoved) {
-        docGenerationTask.reset()
+        docGenerationTasks.deleteTask(message.tabId)
         chatSessionStorage.deleteSession(message.tabId)
     }
 
@@ -160,6 +159,7 @@ class DocController(
 
     override suspend fun processFollowupClickedMessage(message: IncomingDocMessage.FollowupClicked) {
         val session = getSessionInfo(message.tabId)
+        val docGenerationTask = docGenerationTasks.getTask(message.tabId)
 
         session.preloader(message.followUp.pillText, messenger) // also stores message in session history
 
@@ -173,7 +173,7 @@ class DocController(
             FollowUpTypes.CLOSE_SESSION -> closeSession(message.tabId)
             FollowUpTypes.CREATE_DOCUMENTATION -> {
                 docGenerationTask.interactionType = DocInteractionType.GENERATE_README
-                mode = Mode.CREATE
+                docGenerationTask.mode = Mode.CREATE
                 promptForDocTarget(message.tabId)
             }
 
@@ -183,19 +183,19 @@ class DocController(
             }
 
             FollowUpTypes.CANCEL_FOLDER_SELECTION -> {
-                docGenerationTask.folderLevel = DocFolderLevel.ENTIRE_WORKSPACE
+                docGenerationTask.reset()
                 newTask(message.tabId)
             }
 
-            FollowUpTypes.PROCEED_FOLDER_SELECTION -> if (mode == Mode.EDIT) makeChanges(message.tabId) else onDocsGeneration(message)
+            FollowUpTypes.PROCEED_FOLDER_SELECTION -> if (docGenerationTask.mode == Mode.EDIT) makeChanges(message.tabId) else onDocsGeneration(message)
             FollowUpTypes.ACCEPT_CHANGES -> {
                 docGenerationTask.userDecision = DocUserDecision.ACCEPT
                 sendDocAcceptanceTelemetry(message.tabId)
                 acceptChanges(message)
             }
 
             FollowUpTypes.MAKE_CHANGES -> {
-                mode = Mode.EDIT
+                docGenerationTask.mode = Mode.EDIT
                 makeChanges(message.tabId)
             }
 
@@ -206,12 +206,12 @@ class DocController(
             }
 
             FollowUpTypes.SYNCHRONIZE_DOCUMENTATION -> {
-                mode = Mode.SYNC
+                docGenerationTask.mode = Mode.SYNC
                 promptForDocTarget(message.tabId)
             }
 
             FollowUpTypes.EDIT_DOCUMENTATION -> {
-                mode = Mode.EDIT
+                docGenerationTask.mode = Mode.EDIT
                 docGenerationTask.interactionType = DocInteractionType.EDIT_README
                 promptForDocTarget(message.tabId)
             }
@@ -241,7 +241,6 @@ class DocController(
             session.sessionState.token?.cancel()
         }
 
-        docGenerationTask.reset()
         newTask(message.tabId)
     }
 
@@ -307,13 +306,14 @@ class DocController(
 
     private suspend fun promptForDocTarget(tabId: String) {
         val session = getSessionInfo(tabId)
+        val docGenerationTask = docGenerationTasks.getTask(tabId)
 
         val currentSourceFolder = session.context.selectedSourceFolder
 
         try {
             messenger.sendFolderConfirmationMessage(
                 tabId = tabId,
-                message = if (mode == Mode.CREATE) message("amazonqDoc.prompt.create.confirmation") else message("amazonqDoc.prompt.update"),
+                message = if (docGenerationTask.mode == Mode.CREATE) message("amazonqDoc.prompt.create.confirmation") else message("amazonqDoc.prompt.update"),
                 folderPath = currentSourceFolder.name,
                 followUps = listOf(
                     FollowUp(
@@ -452,6 +452,9 @@ class DocController(
         var session: DocSession? = null
         try {
             session = getSessionInfo(tabId)
+            val docGenerationTask = docGenerationTasks.getTask(tabId)
+            docGenerationTask.mode = Mode.NONE
+
             logger.debug { "$FEATURE_NAME: Session created with id: ${session.tabID}" }
 
             val credentialState = authController.getAuthNeededStates(context.project).amazonQ
@@ -528,7 +531,7 @@ class DocController(
     }
 
     private suspend fun newTask(tabId: String) {
-        docGenerationTask = DocGenerationTask()
+        docGenerationTasks.deleteTask(tabId)
         chatSessionStorage.deleteSession(tabId)
 
         messenger.sendAnswer(
@@ -577,7 +580,7 @@ class DocController(
         )
 
         messenger.sendChatInputEnabledMessage(tabId = tabId, enabled = false)
-        docGenerationTask.reset()
+        docGenerationTasks.deleteTask(tabId)
     }
 
     private suspend fun provideFeedbackAndRegenerateCode(tabId: String) {
@@ -728,6 +731,7 @@ class DocController(
         message: String,
     ) {
         var session: DocSession? = null
+        val docGenerationTask = docGenerationTasks.getTask(tabId)
         try {
             logger.debug { "$FEATURE_NAME: Processing message: $message" }
             session = getSessionInfo(tabId)
@@ -746,7 +750,7 @@ class DocController(
 
             when (session.sessionState.phase) {
                 SessionStatePhase.CODEGEN -> {
-                    onCodeGeneration(session, message, tabId, mode)
+                    onCodeGeneration(session, message, tabId, docGenerationTask.mode)
                 }
 
                 else -> null
@@ -756,7 +760,7 @@ class DocController(
                 is PrepareDocGenerationState -> state.filePaths
                 else -> emptyList()
             }
-            sendDocGenerationTelemetry(filePaths, session)
+            sendDocGenerationTelemetry(filePaths, session, docGenerationTask)
             broadcastQEvent(QFeatureEvent.INVOCATION)
 
             if (filePaths.isNotEmpty()) {
@@ -767,7 +771,7 @@ class DocController(
         } catch (err: Exception) {
             // For non edit mode lock the chat input until they explicitly click one of the follow-ups
             var isEnableChatInput = false
-            if (err is DocException && Mode.EDIT == mode) {
+            if (err is DocException && docGenerationTask.mode == Mode.EDIT) {
                 isEnableChatInput = err.remainingIterations != null && err.remainingIterations > 0
             }
 
@@ -779,15 +783,16 @@ class DocController(
         messenger.sendUpdatePromptProgress(tabId = followUpMessage.tabId, inProgress(progress = 10, message("amazonqDoc.progress_message.scanning")))
 
         val session = getSessionInfo(followUpMessage.tabId)
+        val docGenerationTask = docGenerationTasks.getTask(followUpMessage.tabId)
 
         messenger.sendAnswer(
-            message = docGenerationProgressMessage(DocGenerationStep.UPLOAD_TO_S3, this.mode),
+            message = docGenerationProgressMessage(DocGenerationStep.UPLOAD_TO_S3, docGenerationTask.mode),
             messageType = DocMessageType.AnswerPart,
             tabId = followUpMessage.tabId,
         )
 
         try {
-            val sessionMessage: String = when (mode) {
+            val sessionMessage: String = when (docGenerationTask.mode) {
                 Mode.CREATE -> message("amazonqDoc.session.create")
                 else -> message("amazonqDoc.session.sync")
             }
@@ -821,10 +826,10 @@ class DocController(
                 return
             }
 
-            sendDocGenerationTelemetry(filePaths, session)
+            sendDocGenerationTelemetry(filePaths, session, docGenerationTask)
 
             messenger.sendAnswer(
-                message = docGenerationProgressMessage(DocGenerationStep.COMPLETE, mode),
+                message = docGenerationProgressMessage(DocGenerationStep.COMPLETE, docGenerationTask.mode),
                 messageType = DocMessageType.AnswerPart,
                 tabId = followUpMessage.tabId,
             )
@@ -907,7 +912,6 @@ class DocController(
 
     private suspend fun retryRequests(tabId: String) {
         var session: DocSession? = null
-        docGenerationTask = DocGenerationTask()
         try {
             messenger.sendAsyncEventProgress(
                 tabId = tabId,
@@ -954,6 +958,7 @@ class DocController(
         val session = getSessionInfo(tabId)
         val currentSourceFolder = session.context.selectedSourceFolder
         val projectRoot = session.context.projectRoot
+        val docGenerationTask = docGenerationTasks.getTask(tabId)
 
         withContext(EDT) {
             messenger.sendAnswer(
@@ -1017,7 +1022,7 @@ class DocController(
         }
     }
 
-    private fun sendDocGenerationTelemetry(filePaths: List<NewFileZipInfo>, session: DocSession) {
+    private fun sendDocGenerationTelemetry(filePaths: List<NewFileZipInfo>, session: DocSession, docGenerationTask: DocGenerationTask) {
         docGenerationTask.conversationId = session.conversationId
         val (totalGeneratedChars, totalGeneratedLines, totalGeneratedFiles) = session.countedGeneratedContent(filePaths, docGenerationTask.interactionType)
         docGenerationTask.numberOfGeneratedChars = totalGeneratedChars
@@ -1030,6 +1035,7 @@ class DocController(
 
     private fun sendDocAcceptanceTelemetry(tabId: String) {
         val session = getSessionInfo(tabId)
+        val docGenerationTask = docGenerationTasks.getTask(tabId)
         var filePaths: List<NewFileZipInfo> = emptyList()
 
         when (val state = session.sessionState) {

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

@@ -31,7 +31,7 @@ suspend fun DocController.onCodeGeneration(session: DocSession, message: String,
         messenger.sendAsyncEventProgress(tabId, inProgress = true)
         messenger.sendUpdatePromptProgress(tabId, inProgress(progress = 10, message("amazonqDoc.progress_message.scanning")))
         messenger.sendAnswer(
-            message = docGenerationProgressMessage(DocGenerationStep.UPLOAD_TO_S3, this.mode),
+            message = docGenerationProgressMessage(DocGenerationStep.UPLOAD_TO_S3, mode),
             messageType = DocMessageType.AnswerPart,
             tabId = tabId,
         )
@@ -108,7 +108,7 @@ suspend fun DocController.onCodeGeneration(session: DocSession, message: String,
             messenger.sendAnswer(
                 tabId = tabId,
                 messageType = DocMessageType.Answer,
-                message = if (this.mode === Mode.CREATE) {
+                message = if (mode === Mode.CREATE) {
                     message("amazonqDoc.answer.readmeCreated")
                 } else {
                     "${message("amazonqDoc.answer.readmeUpdated")} ${message("amazonqDoc.answer.codeResult")}"

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

@@ -11,7 +11,19 @@ import software.amazon.awssdk.services.codewhispererruntime.model.DocV2Generatio
 import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.getLogger
 
+class DocGenerationTasks {
+    private val tasks: MutableMap<String, DocGenerationTask> = mutableMapOf()
+
+    fun getTask(tabId: String): DocGenerationTask = tasks.getOrPut(tabId) { DocGenerationTask() }
+
+    fun deleteTask(tabId: String) {
+        tasks.remove(tabId)
+    }
+}
+
 class DocGenerationTask {
+    var mode: Mode = Mode.NONE
+
     // Telemetry fields
     var conversationId: String? = null
     var numberOfAddedChars: Int? = null
@@ -22,8 +34,8 @@ class DocGenerationTask {
     var numberOfGeneratedFiles: Int? = null
     var userDecision: DocUserDecision? = null
     var interactionType: DocInteractionType? = null
-    var numberOfNavigations = 0
-    var folderLevel: DocFolderLevel? = DocFolderLevel.ENTIRE_WORKSPACE
+    var numberOfNavigations: Int = 0
+    var folderLevel: DocFolderLevel = DocFolderLevel.ENTIRE_WORKSPACE
     fun docGenerationEventBase(): DocV2GenerationEvent {
         val undefinedProps = this::class.java.declaredFields
             .filter { it.get(this) == null }

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanSession.kt

@@ -7,16 +7,21 @@ import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
 import com.intellij.openapi.application.ApplicationInfo
+import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.runInEdt
 import com.intellij.openapi.application.runReadAction
 import com.intellij.openapi.fileEditor.FileDocumentManager
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.project.modules
+import com.intellij.openapi.roots.ModuleRootManager
 import com.intellij.openapi.vfs.LocalFileSystem
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.time.withTimeout
 import kotlinx.coroutines.withContext
+import migration.software.aws.toolkits.jetbrains.settings.AwsSettings
+import org.apache.commons.codec.digest.DigestUtils
 import software.amazon.awssdk.services.codewhisperer.model.ArtifactType
 import software.amazon.awssdk.services.codewhisperer.model.CodeScanFindingsSchema
 import software.amazon.awssdk.services.codewhisperer.model.CodeScanStatus
@@ -33,12 +38,14 @@ import software.aws.toolkits.core.utils.Waiters.waitUntil
 import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.info
+import software.aws.toolkits.core.utils.toHexString
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.sessionconfig.CodeScanSessionConfig
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.sessionconfig.PayloadContext
 import software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererClientAdaptor
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerActionManager
 import software.aws.toolkits.jetbrains.services.codewhisperer.model.CodeScanResponseContext
 import software.aws.toolkits.jetbrains.services.codewhisperer.model.CreateUploadUrlServiceInvocationContext
+import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.CodeWhispererTelemetryService
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.CODE_SCAN_POLLING_INTERVAL_IN_SECONDS
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.FILE_SCANS_THROTTLING_MESSAGE
@@ -52,12 +59,14 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhisperer
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.getTelemetryErrorMessage
 import software.aws.toolkits.jetbrains.utils.assertIsNonDispatchThread
 import software.aws.toolkits.resources.message
+import software.aws.toolkits.telemetry.CodewhispererCodeScanScope
 import software.aws.toolkits.telemetry.CodewhispererLanguage
 import java.nio.file.Path
 import java.time.Duration
 import java.time.Instant
 import java.util.UUID
 import kotlin.coroutines.coroutineContext
+import kotlin.io.path.pathString
 
 class CodeWhispererCodeScanSession(val sessionContext: CodeScanSessionContext) {
     private val clientToken: UUID = UUID.randomUUID()
@@ -103,7 +112,7 @@ class CodeWhispererCodeScanSession(val sessionContext: CodeScanSessionContext) {
             // 2 & 3. CreateUploadURL and upload the context.
             currentCoroutineContext.ensureActive()
             val artifactsUploadStartTime = now()
-            val codeScanName = UUID.randomUUID().toString()
+            val codeScanName = generateScanName()
 
             val taskType = if (sessionContext.codeAnalysisScope == CodeWhispererConstants.CodeAnalysisScope.PROJECT) {
                 CodeWhispererConstants.UploadTaskType.SCAN_PROJECT
@@ -366,6 +375,26 @@ class CodeWhispererCodeScanSession(val sessionContext: CodeScanSessionContext) {
     private fun isAutoScan(): Boolean =
         sessionContext.codeAnalysisScope == CodeWhispererConstants.CodeAnalysisScope.FILE && !sessionContext.sessionConfig.isInitiatedByChat()
 
+    private fun generateScanName(): String {
+        val clientId = AwsSettings.getInstance().clientId
+        val filePath = sessionContext.sessionConfig.getSelectedFile()?.toNioPath()?.pathString
+        val scope = CodeWhispererTelemetryService.getInstance().mapToTelemetryScope(
+            sessionContext.codeAnalysisScope,
+            sessionContext.sessionConfig.isInitiatedByChat()
+        )
+        val projectId = if (scope != CodewhispererCodeScanScope.PROJECT && filePath != null) {
+            filePath
+        } else {
+            ApplicationManager.getApplication().runReadAction<String> {
+                sessionContext.project.modules.map { module ->
+                    ModuleRootManager.getInstance(module).contentRoots.firstOrNull()?.path
+                }.joinToString(",")
+            }
+        }
+
+        return DigestUtils.sha256("$clientId::$projectId::$scope").toHexString()
+    }
+
     companion object {
         private val LOG = getLogger<CodeWhispererCodeScanSession>()
         private val MAPPER = jacksonObjectMapper()