Merge remote-tracking branch 'origin/main' into rli/251-profile

Author: rli

.changes/3.50.json

@@ -0,0 +1,41 @@
+{
+  "date" : "2025-01-23",
+  "version" : "3.50",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "Amazon Q: Updated `/help` command to include re:invent 2024 features"
+  }, {
+    "type" : "feature",
+    "description" : "Amazon Q: UI improvements through more accurate code syntax highlighting"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fixed an issue where Amazon Q settings did not persist across IDE restarts"
+  }, {
+    "type" : "bugfix",
+    "description" : "Amazon Q: Fix context menu displaying when typing `@`, even though input is disallowed"
+  }, {
+    "type" : "bugfix",
+    "description" : "Amazon Q: Fix up/down history navigation only triggering on first/last line of prompt input"
+  }, {
+    "type" : "bugfix",
+    "description" : "Amazon Q /doc: Ask for user prompt if error occurs while updating documentation"
+  }, {
+    "type" : "bugfix",
+    "description" : "Amazon Q: cursor no longer jumps after navigating prompt history"
+  }, {
+    "type" : "bugfix",
+    "description" : "Improve text description of workspace index settings"
+  }, {
+    "type" : "bugfix",
+    "description" : "Amazon Q /doc: fix for user prompt to change folder in chat"
+  }, {
+    "type" : "bugfix",
+    "description" : "Amazon Q Doc README diff will re-open when the README file is clicked after it has been closed"
+  }, {
+    "type" : "bugfix",
+    "description" : "Amazon Q /test: Fix for test generation payload creation to not filter out target file."
+  }, {
+    "type" : "bugfix",
+    "description" : "Amazon Q: word duplication when pressing tab on context selector fixed"
+  } ]
+}

.changes/next-release/bugfix-f47212d1-8e2b-4c82-9e0d-450ce896e9bc.json

@@ -1,3 +1,17 @@
+# _3.50_ (2025-01-23)
+- **(Feature)** Amazon Q: Updated `/help` command to include re:invent 2024 features
+- **(Feature)** Amazon Q: UI improvements through more accurate code syntax highlighting
+- **(Bug Fix)** Fixed an issue where Amazon Q settings did not persist across IDE restarts
+- **(Bug Fix)** Amazon Q: Fix context menu displaying when typing `@`, even though input is disallowed
+- **(Bug Fix)** Amazon Q: Fix up/down history navigation only triggering on first/last line of prompt input
+- **(Bug Fix)** Amazon Q /doc: Ask for user prompt if error occurs while updating documentation
+- **(Bug Fix)** Amazon Q: cursor no longer jumps after navigating prompt history
+- **(Bug Fix)** Improve text description of workspace index settings
+- **(Bug Fix)** Amazon Q /doc: fix for user prompt to change folder in chat
+- **(Bug Fix)** Amazon Q Doc README diff will re-open when the README file is clicked after it has been closed
+- **(Bug Fix)** Amazon Q /test: Fix for test generation payload creation to not filter out target file.
+- **(Bug Fix)** Amazon Q: word duplication when pressing tab on context selector fixed
+
 # _3.49_ (2025-01-17)
 - **(Bug Fix)** /review: Improved success rate of code reviews for certain workspace configurations
 

CHANGELOG.md

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

gradle.properties

@@ -58,7 +58,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
         }
         val contentManager = toolWindow.contentManager
 
-        project.messageBus.connect().subscribe(
+        project.messageBus.connect(toolWindow.disposable).subscribe(
             ToolkitConnectionManagerListener.TOPIC,
             object : ToolkitConnectionManagerListener {
                 override fun activeConnectionChanged(newConnection: ToolkitConnection?) {
@@ -67,7 +67,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
             }
         )
 
-        project.messageBus.connect().subscribe(
+        project.messageBus.connect(toolWindow.disposable).subscribe(
             RefreshQChatPanelButtonPressedListener.TOPIC,
             object : RefreshQChatPanelButtonPressedListener {
                 override fun onRefresh() {
@@ -78,7 +78,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
             }
         )
 
-        project.messageBus.connect().subscribe(
+        project.messageBus.connect(toolWindow.disposable).subscribe(
             BearerTokenProviderListener.TOPIC,
             object : BearerTokenProviderListener {
                 override fun onChange(providerId: String, newScopes: List<String>?) {

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt

@@ -11,6 +11,8 @@ 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
 
@@ -34,7 +36,7 @@ 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/amazonqCodeScan/controller/CodeScanChatHelper.kt

@@ -71,6 +71,8 @@ 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
@@ -1205,6 +1207,7 @@ 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/amazonqCodeTest/controller/CodeTestChatController.kt

@@ -3,6 +3,11 @@
 
 package software.aws.toolkits.jetbrains.services.amazonqDoc
 
+import software.aws.toolkits.jetbrains.services.amazonqDoc.messages.FollowUp
+import software.aws.toolkits.jetbrains.services.amazonqDoc.messages.FollowUpStatusType
+import software.aws.toolkits.jetbrains.services.amazonqDoc.messages.FollowUpTypes
+import software.aws.toolkits.resources.message
+
 const val FEATURE_EVALUATION_PRODUCT_NAME = "DocGeneration"
 
 const val FEATURE_NAME = "Amazon Q Documentation Generation"
@@ -25,3 +30,16 @@ enum class ModifySourceFolderErrorReason(
 
     override fun toString(): String = reasonText
 }
+
+val NEW_SESSION_FOLLOWUPS: List<FollowUp> = listOf(
+    FollowUp(
+        pillText = message("amazonqDoc.prompt.reject.new_task"),
+        type = FollowUpTypes.NEW_TASK,
+        status = FollowUpStatusType.Info
+    ),
+    FollowUp(
+        pillText = message("amazonqDoc.prompt.reject.close_session"),
+        type = FollowUpTypes.CLOSE_SESSION,
+        status = FollowUpStatusType.Info
+    )
+)

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

@@ -5,17 +5,18 @@ package software.aws.toolkits.jetbrains.services.amazonqDoc
 
 import software.aws.toolkits.resources.message
 
-open class DocException(override val message: String?, override val cause: Throwable? = null) : RuntimeException()
+open class DocException(
+    override val message: String?,
+    override val cause: Throwable? = null,
+    val remainingIterations: Int? = null,
+) : RuntimeException()
 
 class ZipFileError(override val message: String, override val cause: Throwable?) : RuntimeException()
 
 class CodeIterationLimitError(override val message: String, override val cause: Throwable?) : RuntimeException()
 
-internal fun docServiceError(message: String?): Nothing =
-    throw DocException(message)
-
-internal fun codeGenerationFailedError(): Nothing =
-    throw DocException(message("amazonqFeatureDev.code_generation.failed_generation"))
+internal fun docServiceError(message: String?, cause: Throwable? = null, remainingIterations: Int? = null): Nothing =
+    throw DocException(message, cause, remainingIterations)
 
 internal fun conversationIdNotFound(): Nothing =
     throw DocException(message("amazonqFeatureDev.exception.conversation_not_found"))

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

@@ -53,8 +53,10 @@ import software.aws.toolkits.jetbrains.services.amazonqDoc.messages.sendAuthenti
 import software.aws.toolkits.jetbrains.services.amazonqDoc.messages.sendChatInputEnabledMessage
 import software.aws.toolkits.jetbrains.services.amazonqDoc.messages.sendCodeResult
 import software.aws.toolkits.jetbrains.services.amazonqDoc.messages.sendError
+import software.aws.toolkits.jetbrains.services.amazonqDoc.messages.sendErrorToUser
 import software.aws.toolkits.jetbrains.services.amazonqDoc.messages.sendFolderConfirmationMessage
 import software.aws.toolkits.jetbrains.services.amazonqDoc.messages.sendMonthlyLimitError
+import software.aws.toolkits.jetbrains.services.amazonqDoc.messages.sendRetryChangeFolderMessage
 import software.aws.toolkits.jetbrains.services.amazonqDoc.messages.sendSystemPrompt
 import software.aws.toolkits.jetbrains.services.amazonqDoc.messages.sendUpdatePlaceholder
 import software.aws.toolkits.jetbrains.services.amazonqDoc.messages.sendUpdatePromptProgress
@@ -70,6 +72,8 @@ 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.nio.file.Paths
 import java.util.UUID
@@ -337,6 +341,31 @@ class DocController(
         }
     }
 
+    private suspend fun promptForRetryFolderSelection(tabId: String, message: String) {
+        messenger.sendRetryChangeFolderMessage(
+            tabId = tabId,
+            message = message,
+            followUps = listOf(
+                FollowUp(
+                    icon = FollowUpIcons.Refresh,
+                    pillText = message("amazonqDoc.prompt.folder.change"),
+                    prompt = message("amazonqDoc.prompt.folder.change"),
+                    status = FollowUpStatusType.Info,
+                    type = FollowUpTypes.MODIFY_DEFAULT_SOURCE_FOLDER
+                ),
+                FollowUp(
+                    icon = FollowUpIcons.Cancel,
+                    pillText = message("general.cancel"),
+                    prompt = message("general.cancel"),
+                    status = FollowUpStatusType.Error,
+                    type = FollowUpTypes.CANCEL_FOLDER_SELECTION
+                ),
+            )
+        )
+
+        messenger.sendChatInputEnabledMessage(tabId, false)
+    }
+
     override suspend fun processLinkClick(message: IncomingDocMessage.ClickedLink) {
         BrowserUtil.browse(message.link)
     }
@@ -427,11 +456,10 @@ class DocController(
             messenger.sendUpdatePlaceholder(tabId, message("amazonqDoc.prompt.placeholder"))
         } catch (err: Exception) {
             val message = createUserFacingErrorMessage(err.message)
-            messenger.sendError(
+            messenger.sendErrorToUser(
                 tabId = tabId,
                 errMessage = message ?: message("amazonqFeatureDev.exception.request_failed"),
-                retries = retriesRemaining(session),
-                conversationId = session?.conversationIdUnsafe
+                conversationId = session?.conversationIdUnsafe,
             )
         }
     }
@@ -553,7 +581,7 @@ class DocController(
         messenger.sendUpdatePlaceholder(tabId, message("amazonqFeatureDev.placeholder.provide_code_feedback"))
     }
 
-    private suspend fun processErrorChatMessage(err: Exception, session: DocSession?, tabId: String) {
+    private suspend fun processErrorChatMessage(err: Exception, session: DocSession?, tabId: String, isEnableChatInput: Boolean) {
         logger.warn(err) { "Encountered ${err.message} for tabId: $tabId" }
         messenger.sendUpdatePromptProgress(tabId, null)
 
@@ -593,23 +621,21 @@ class DocController(
             }
 
             is DocException -> {
-                messenger.sendError(
+                messenger.sendErrorToUser(
                     tabId = tabId,
                     errMessage = err.message,
-                    retries = retriesRemaining(session),
-                    conversationId = session?.conversationIdUnsafe
+                    conversationId = session?.conversationIdUnsafe,
+                    isEnableChatInput
                 )
             }
 
             is CodeIterationLimitException -> {
                 messenger.sendUpdatePlaceholder(tabId, newPlaceholder = message("amazonqFeatureDev.placeholder.after_monthly_limit"))
                 messenger.sendChatInputEnabledMessage(tabId, enabled = true)
-                messenger.sendError(
+                messenger.sendErrorToUser(
                     tabId = tabId,
                     errMessage = err.message,
-                    retries = retriesRemaining(session),
-                    conversationId = session?.conversationIdUnsafe,
-                    showDefaultMessage = true,
+                    conversationId = session?.conversationIdUnsafe
                 )
 
                 val filePaths: List<NewFileZipInfo> = when (val state = session?.sessionState) {
@@ -718,17 +744,21 @@ class DocController(
                 is PrepareDocGenerationState -> state.filePaths
                 else -> emptyList()
             }
+            broadcastQEvent(QFeatureEvent.INVOCATION)
 
             if (filePaths.isNotEmpty()) {
                 processOpenDiff(
                     message = IncomingDocMessage.OpenDiff(tabId = tabId, filePath = filePaths[0].zipFilePath, deleted = false)
                 )
             }
         } catch (err: Exception) {
-            processErrorChatMessage(err, session, tabId)
+            // 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) {
+                isEnableChatInput = err.remainingIterations != null && err.remainingIterations > 0
+            }
 
-            // Lock the chat input until they explicitly click one of the follow-ups
-            messenger.sendChatInputEnabledMessage(tabId, enabled = false)
+            processErrorChatMessage(err, session, tabId, isEnableChatInput)
         }
     }
 
@@ -808,10 +838,7 @@ class DocController(
                 message = IncomingDocMessage.OpenDiff(tabId = followUpMessage.tabId, filePath = filePaths[0].zipFilePath, deleted = false)
             )
         } catch (err: Exception) {
-            processErrorChatMessage(err, session, tabId = followUpMessage.tabId)
-
-            // Lock the chat input until they explicitly click one of the follow-ups
-            messenger.sendChatInputEnabledMessage(tabId = followUpMessage.tabId, enabled = false)
+            processErrorChatMessage(err, session, tabId = followUpMessage.tabId, false)
         } finally {
             messenger.sendUpdatePlaceholder(
                 tabId = followUpMessage.tabId,
@@ -914,11 +941,22 @@ class DocController(
         val projectRoot = session.context.projectRoot
 
         withContext(EDT) {
+            messenger.sendAnswer(
+                tabId = tabId,
+                messageType = DocMessageType.Answer,
+                message = message("amazonqDoc.prompt.choose_folder_to_continue")
+            )
+
             val selectedFolder = selectFolder(context.project, currentSourceFolder)
 
             // No folder was selected
             if (selectedFolder == null) {
                 logger.info { "Cancelled dialog and not selected any folder" }
+                promptForRetryFolderSelection(
+                    tabId,
+                    message("amazonqDoc.prompt.canceled_source_folder_selection")
+                )
+
                 return@withContext
             }