Merge branch 'main' into transformPupTesting

Author: dhasani23

.changes/3.58.json

@@ -0,0 +1,11 @@
+{
+  "date" : "2025-03-06",
+  "version" : "3.58",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "Amazon Q: Fix data isolation between tabs to prevent interference when using /doc in multiple tabs"
+  }, {
+    "type" : "removal",
+    "description" : "The Amazon Q inline suggestion popup goes back to being under the suggestions and is always showing."
+  } ]
+}

.changes/next-release/bugfix-fd9065e5-2661-4250-852c-ec51deedd10f.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "fix Q chat request timeout"
+}

CHANGELOG.md

@@ -1,3 +1,7 @@
+# _3.58_ (2025-03-06)
+- **(Bug Fix)** Amazon Q: Fix data isolation between tabs to prevent interference when using /doc in multiple tabs
+- **(Removal)** The Amazon Q inline suggestion popup goes back to being under the suggestions and is always showing.
+
 # _3.57_ (2025-02-28)
 - **(Bug Fix)** Fix suggestion not visible in remote for 2024.3
 - **(Bug Fix)** /test: update capability card text

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
 

buildspec/linuxIntegrationTests.yml

@@ -15,10 +15,6 @@ phases:
   install:
     commands:
       - startDocker.sh
-      # login to DockerHub so we don't get throttled
-      - export DOCKER_USERNAME=`echo $DOCKER_HUB_TOKEN | jq -r '.username'`
-      - export DOCKER_PASSWORD=`echo $DOCKER_HUB_TOKEN | jq -r '.password'`
-      - docker login --username $DOCKER_USERNAME --password $DOCKER_PASSWORD || true
       # should probably be managed as an extension/rule in any tests that need a screen available
       - /usr/bin/Xvfb :22 -screen 0 1920x1080x24 &
 

buildspec/linuxUiTests.yml

@@ -21,11 +21,6 @@ phases:
     commands:
       - dnf install -y marco mate-media e2fsprogs
       - startDesktop.sh
-
-      # login to DockerHub so we don't get throttled
-      - export DOCKER_USERNAME=`echo $DOCKER_HUB_TOKEN | jq -r '.username'`
-      - export DOCKER_PASSWORD=`echo $DOCKER_HUB_TOKEN | jq -r '.password'`
-      - docker login --username $DOCKER_USERNAME --password $DOCKER_PASSWORD || true
       - export PATH="$PATH:$HOME/.dotnet/tools"
       - dotnet codeartifact-creds install
 

gradle.properties

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.58-SNAPSHOT
+toolkitVersion=3.59-SNAPSHOT
 
 # Publish Settings
 publishToken=

gradle/libs.versions.toml

@@ -24,10 +24,10 @@ kotlin = "2.0.0"
 kotlinCoroutines = "1.8.0"
 mockito = "5.12.0"
 mockitoKotlin = "5.4.0"
-mockk = "1.13.10"
+mockk = "1.13.17"
 nimbus-jose-jwt = "9.40"
 node-gradle = "7.0.2"
-telemetryGenerator = "1.0.297"
+telemetryGenerator = "1.0.307"
 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/amazonq/webview/BrowserConnector.kt

@@ -67,7 +67,7 @@ class BrowserConnector(
                                 it.elementId(source.asText())
                             }
                         } else if (module != null && trigger != null) {
-                            Telemetry.toolkit.openModule.use {
+                            Telemetry.toolkit.willOpenModule.use {
                                 it.module(module.asText())
                                 it.source(trigger.asText())
                             }

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

@@ -55,6 +55,7 @@ import software.aws.toolkits.jetbrains.utils.isQConnected
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.AmazonqTelemetry
 import software.aws.toolkits.telemetry.MetricResult
+import software.aws.toolkits.telemetry.Status
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.File
@@ -583,7 +584,8 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                     artifactsUploadDuration = session.artifactUploadDuration,
                     buildPayloadBytes = session.srcPayloadSize,
                     buildZipFileBytes = session.srcZipFileSize,
-                    requestId = session.startTestGenerationRequestId
+                    requestId = session.startTestGenerationRequestId,
+                    status = if (e.message == message("testgen.message.cancelled")) Status.CANCELLED else Status.FAILED,
                 )
                 session.isGeneratingTests = false
             } finally {

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

@@ -98,6 +98,7 @@ import software.aws.toolkits.telemetry.AmazonqTelemetry
 import software.aws.toolkits.telemetry.FeatureId
 import software.aws.toolkits.telemetry.InteractionType
 import software.aws.toolkits.telemetry.MetricResult
+import software.aws.toolkits.telemetry.Status
 import software.aws.toolkits.telemetry.UiTelemetry
 import java.io.File
 import java.nio.file.Files
@@ -310,7 +311,8 @@ class CodeTestChatController(
                     credentialStartUrl = getStartUrl(project),
                     result = MetricResult.Succeeded,
                     perfClientLatency = (Instant.now().toEpochMilli() - session.startTimeOfTestGeneration),
-                    requestId = id
+                    requestId = id,
+                    status = Status.ACCEPTED,
                 )
             }
             session.isGeneratingTests = false
@@ -682,7 +684,8 @@ class CodeTestChatController(
                     artifactsUploadDuration = session.artifactUploadDuration,
                     buildPayloadBytes = session.srcPayloadSize,
                     buildZipFileBytes = session.srcZipFileSize,
-                    requestId = session.startTestGenerationRequestId
+                    requestId = session.startTestGenerationRequestId,
+                    status = Status.ACCEPTED,
                 )
                 codeTestChatHelper.addAnswer(
                     CodeTestChatMessageContent(
@@ -878,7 +881,8 @@ class CodeTestChatController(
                     artifactsUploadDuration = session.artifactUploadDuration,
                     buildPayloadBytes = session.srcPayloadSize,
                     buildZipFileBytes = session.srcZipFileSize,
-                    requestId = session.startTestGenerationRequestId
+                    requestId = session.startTestGenerationRequestId,
+                    status = Status.REJECTED,
                 )
                 sessionCleanUp(message.tabId)
             }

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")}"