Merge branch 'main' into rli/remote-chat-wip

Author: rli

.changes/3.49.json

@@ -0,0 +1,8 @@
+{
+  "date" : "2025-01-17",
+  "version" : "3.49",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "/review: Improved success rate of code reviews for certain workspace configurations"
+  } ]
+}

.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-02a84512-83ae-4fbe-a527-292ba072e3e0.json

@@ -1,3 +1,20 @@
+# _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
+
 # _3.48_ (2025-01-16)
 - **(Feature)** Enhance Q inline completion context fetching for better suggestion quality
 - **(Feature)** /doc: Add error message if updated README is too large

CHANGELOG.md

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.49-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,7 +71,10 @@ 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
 import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.ChatRequestData
 import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.TriggerType
@@ -277,7 +280,7 @@ class CodeTestChatController(
 
             val requestData = ChatRequestData(
                 tabId = session.tabId,
-                message = "Generate unit tests for the following part of my code: ${message.prompt}",
+                message = "Generate unit tests for the following part of my code: ${message.prompt.ifBlank { fileInfo.fileName }}",
                 activeFileContext = activeFileContext,
                 userIntent = UserIntent.GENERATE_UNIT_TESTS,
                 triggerType = TriggerType.ContextMenu,
@@ -1176,7 +1179,7 @@ class CodeTestChatController(
                 filePath = activeFile.path,
                 fileName = activeFile.name,
                 fileLanguage = programmingLanguage,
-                fileInWorkspace = activeFile.path.startsWith(projectRoot.path)
+                fileInWorkspace = activeFile.isWithin(projectRoot)
             )
         } catch (e: Exception) {
             LOG.debug { "Error checking active file: $e" }
@@ -1204,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"))