Cherry-pick approved changes from staging

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

@@ -76,7 +76,7 @@
         }
     }
 
     private fun sendMessageAppToUi(message: AmazonQMessage, tabType: String) {
         appConnections.filter { it.app.tabTypes.contains(tabType) }.forEach {
             scope.launch {
                 it.messagesFromAppToUi.publish(message)
@@ -155,18 +155,20 @@
         }
 
         fun getStarted(project: Project) {
-            // Make sure the window is shown
-            showChatWindow(project)
-
-            // Send the interaction message
-            val window = getInstance(project)
-            window.sendMessage(OnboardingPageInteraction(OnboardingPageInteractionType.CwcButtonClick), "cwc")
+            openTab(project, OnboardingPageInteraction(OnboardingPageInteractionType.CwcButtonClick), "cwc")
         }
 
         fun openScanTab(project: Project) {
+            openTab(project, runCodeScanMessage, "codescan")
+        }
+
+        private fun openTab(project: Project, message: AmazonQMessage, tabType: String) {
+            // Make sure the window is shown
             showChatWindow(project)
+
+            // Send the interaction message
             val window = getInstance(project)
-            window.sendMessageAppToUi(runCodeScanMessage, tabType = "codescan")
+            window.sendMessage(message, tabType)
         }
     }
 

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

@@ -128,7 +128,8 @@ fun buildClearPromptProgressMessage(tabId: String) = PromptProgressMessage(
     tabId = tabId
 )
 
-val runCodeScanMessage = CodeScanChatMessage(messageType = ChatMessageType.Prompt, command = "review", tabId = UUID.randomUUID().toString())
+val runCodeScanMessage
+    get() = CodeScanChatMessage(messageType = ChatMessageType.Prompt, command = "review", tabId = UUID.randomUUID().toString())
 
 val cancelFileScanButton = Button(
     id = CodeScanButtonId.StopFileScan.id,

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

@@ -96,7 +96,7 @@ class AmazonQCodeFixSession(val project: Project) {
             val createCodeFixResponse = createCodeFixJob(
                 sourceZipUploadResponse.uploadId(),
                 issueRange,
-                issue.description.toString(),
+                issue.recommendation.text,
                 codeFixName,
                 issue.ruleId
             )