Merge branch 'main' into fix-telemetry-generate-fix

Author: ctlai95

.changes/next-release/bugfix-f290302a-3c37-4982-ad78-11f0b413c694.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix chat not retaining history when interaction is through onboarding tab type (#5189)"
+}

.changes/next-release/feature-ad2ca8aa-4d8d-4dc4-92f6-5ae2916e3ec6.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "/review: Code fix automatically scrolls into view after generation."
+}

.github/workflows/ssm-integ.yml

@@ -9,6 +9,7 @@ on:
     branches: [ main, feature/* ]
     # PRs only need to run this if the SSM plugin logic has changed
     paths:
+      - '.github/workflows/ssm-integ.yml'
       - 'jetbrains-core/src/software/aws/toolkits/jetbrains/services/ssm/SsmPlugin.kt'
       - 'jetbrains-core/it/software/aws/toolkits/jetbrains/services/ssm/SsmPluginTest.kt'
 
@@ -28,10 +29,10 @@ jobs:
         run: git config --system core.longpaths true
         if: ${{ matrix.os == 'windows-latest' }}
       - uses: actions/checkout@v2
-      - name: Set up JDK 17
-        uses: actions/setup-java@v1
+      - uses: actions/setup-java@v4
         with:
-          java-version: 17
+          distribution: 'corretto'
+          java-version: '21'
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 apache-commons-collections = "4.4"
-apache-commons-io = "2.16.0"
+apache-commons-io = "2.16.1"
 apache-commons-text = "1.12.0"
 assertJ = "3.26.3"
 # match with <root>/settings.gradle.kts

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

@@ -66,6 +66,7 @@ import software.aws.toolkits.jetbrains.services.amazonqDoc.messages.updateFileCo
 import software.aws.toolkits.jetbrains.services.amazonqDoc.session.DocSession
 import software.aws.toolkits.jetbrains.services.amazonqDoc.session.PrepareDocGenerationState
 import software.aws.toolkits.jetbrains.services.amazonqDoc.storage.ChatSessionStorage
+import software.aws.toolkits.jetbrains.services.amazonqDoc.util.getFollowUpOptions
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.CodeIterationLimitException
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.MonthlyConversationLimitError
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.CodeReferenceGenerated
@@ -813,7 +814,6 @@ class DocController(
 
             when (session.sessionState.phase) {
                 SessionStatePhase.CODEGEN -> {
-                    messenger.sendUpdatePromptProgress(tabId, inProgress(progress = 10))
                     onCodeGeneration(session, message, tabId, mode)
                 }
                 else -> null
@@ -904,29 +904,7 @@ class DocController(
             messenger.sendAnswer(
                 messageType = DocMessageType.SystemPrompt,
                 tabId = followUpMessage.tabId,
-                followUp = listOf(
-                    FollowUp(
-                        pillText = message("amazonqDoc.prompt.review.accept"),
-                        prompt = message("amazonqDoc.prompt.review.accept"),
-                        status = FollowUpStatusType.Success,
-                        type = FollowUpTypes.ACCEPT_CHANGES,
-                        icon = FollowUpIcons.Ok,
-                    ),
-                    FollowUp(
-                        pillText = message("amazonqDoc.prompt.review.changes"),
-                        prompt = message("amazonqDoc.prompt.review.changes"),
-                        status = FollowUpStatusType.Info,
-                        type = FollowUpTypes.MAKE_CHANGES,
-                        icon = FollowUpIcons.Info,
-                    ),
-                    FollowUp(
-                        pillText = message("general.reject"),
-                        prompt = message("general.reject"),
-                        status = FollowUpStatusType.Error,
-                        type = FollowUpTypes.REJECT_CHANGES,
-                        icon = FollowUpIcons.Cancel,
-                    )
-                )
+                followUp = getFollowUpOptions(session.sessionState.phase)
             )
 
             processOpenDiff(

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

@@ -4,6 +4,7 @@
 package software.aws.toolkits.jetbrains.services.amazonqDoc.controller
 
 import com.intellij.notification.NotificationAction
+import software.aws.toolkits.jetbrains.services.amazonqDoc.inProgress
 import software.aws.toolkits.jetbrains.services.amazonqDoc.messages.DocMessageType
 import software.aws.toolkits.jetbrains.services.amazonqDoc.messages.FollowUp
 import software.aws.toolkits.jetbrains.services.amazonqDoc.messages.FollowUpStatusType
@@ -14,19 +15,27 @@ import software.aws.toolkits.jetbrains.services.amazonqDoc.messages.sendChatInpu
 import software.aws.toolkits.jetbrains.services.amazonqDoc.messages.sendCodeResult
 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
 import software.aws.toolkits.jetbrains.services.amazonqDoc.session.DocSession
 import software.aws.toolkits.jetbrains.services.amazonqDoc.session.PrepareDocGenerationState
+import software.aws.toolkits.jetbrains.services.amazonqDoc.util.getFollowUpOptions
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.sendSystemPrompt
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.CodeReferenceGenerated
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.DeletedFileInfo
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.NewFileZipInfo
-import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util.InsertAction
-import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util.getFollowUpOptions
 import software.aws.toolkits.jetbrains.utils.notifyInfo
 import software.aws.toolkits.resources.message
 
 suspend fun DocController.onCodeGeneration(session: DocSession, message: String, tabId: String, mode: Mode) {
     try {
+        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),
+            messageType = DocMessageType.AnswerPart,
+            tabId = tabId,
+        )
+
         val sessionMessage = if (mode == Mode.CREATE) {
             message(
                 "amazonqDoc.session.create"
@@ -80,25 +89,27 @@ suspend fun DocController.onCodeGeneration(session: DocSession, message: String,
             return
         }
 
+        messenger.sendAnswer(
+            message = docGenerationProgressMessage(DocGenerationStep.COMPLETE, mode),
+            messageType = DocMessageType.AnswerPart,
+            tabId = tabId,
+        )
+
         messenger.sendCodeResult(tabId = tabId, uploadId = uploadId, filePaths = filePaths, deletedFiles = deletedFiles, references = references)
 
         if (remainingIterations != null && totalIterations != null) {
             messenger.sendAnswer(
                 tabId = tabId,
                 messageType = DocMessageType.Answer,
-                message = if (remainingIterations == 0) {
-                    message("amazonqFeatureDev.code_generation.iteration_zero")
+                message = if (this.mode === Mode.CREATE) {
+                    message("amazonqDoc.answer.readmeCreated")
                 } else {
-                    message(
-                        "amazonqFeatureDev.code_generation.iteration_counts",
-                        remainingIterations,
-                        totalIterations
-                    )
+                    "${message("amazonqDoc.answer.readmeUpdated")} ${message("amazonqDoc.answer.codeResult")}"
                 }
             )
         }
 
-        messenger.sendSystemPrompt(tabId = tabId, followUp = getFollowUpOptions(session.sessionState.phase, InsertAction.ALL))
+        messenger.sendSystemPrompt(tabId = tabId, followUp = getFollowUpOptions(session.sessionState.phase))
 
         messenger.sendUpdatePlaceholder(tabId = tabId, newPlaceholder = message("amazonqFeatureDev.placeholder.after_code_generation"))
     } finally {

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

@@ -15,19 +15,29 @@ fun getFollowUpOptions(phase: SessionStatePhase?): List<FollowUp> {
         SessionStatePhase.CODEGEN -> {
             return listOf(
                 FollowUp(
-                    pillText = message("amazonqDoc.follow_up.insert_code"),
-                    type = FollowUpTypes.INSERT_CODE,
+                    pillText = message("amazonqDoc.prompt.review.accept"),
+                    prompt = message("amazonqDoc.prompt.review.accept"),
+                    status = FollowUpStatusType.Success,
+                    type = FollowUpTypes.ACCEPT_CHANGES,
                     icon = FollowUpIcons.Ok,
-                    status = FollowUpStatusType.Success
                 ),
                 FollowUp(
-                    pillText = message("amazonqDoc.follow_up.provide_feedback_and_regenerate"),
-                    type = FollowUpTypes.PROVIDE_FEEDBACK_AND_REGENERATE_CODE,
-                    icon = FollowUpIcons.Refresh,
-                    status = FollowUpStatusType.Info
+                    pillText = message("amazonqDoc.prompt.review.changes"),
+                    prompt = message("amazonqDoc.prompt.review.changes"),
+                    status = FollowUpStatusType.Info,
+                    type = FollowUpTypes.MAKE_CHANGES,
+                    icon = FollowUpIcons.Info,
+                ),
+                FollowUp(
+                    pillText = message("general.reject"),
+                    prompt = message("general.reject"),
+                    status = FollowUpStatusType.Error,
+                    type = FollowUpTypes.REJECT_CHANGES,
+                    icon = FollowUpIcons.Cancel,
                 )
             )
         }
+
         else -> return emptyList()
     }
 }

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

@@ -72,6 +72,9 @@ internal class CodeWhispererCodeScanIssueDetailsPanel(
         )
         editorPane.revalidate()
         editorPane.repaint()
+        runInEdt {
+            editorPane.scrollToReference("fixLoadingSection")
+        }
 
         val codeFixResponse: AmazonQCodeFixSession.CodeFixResponse = amazonQCodeFixSession.runCodeFixWorkflow(issue)
         if (codeFixResponse.failureResponse != null) {
@@ -82,6 +85,9 @@ internal class CodeWhispererCodeScanIssueDetailsPanel(
                 )
                 revalidate()
                 repaint()
+                runInEdt {
+                    scrollToReference("fixFailureSection")
+                }
             }
             CodeWhispererTelemetryService.getInstance().sendCodeScanIssueGenerateFix(
                 Component.Webview,
@@ -123,6 +129,9 @@ internal class CodeWhispererCodeScanIssueDetailsPanel(
                 )
                 revalidate()
                 repaint()
+                runInEdt {
+                    scrollToReference("codeFixActions")
+                }
             }
 
             buttonPane.apply {

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

@@ -358,13 +358,14 @@ internal class CodeWhispererCodeScanResultsView(private val project: Project, pr
                         cell.icon = obj.fileType.icon
                     }
                     is CodeWhispererCodeScanIssue -> {
-                        val cellText = "${obj.title.trimEnd('.')}: ${obj.file.name} "
+                        val cellText = obj.title.trimEnd('.')
+                        val cellDescription = "${obj.file.name} ${obj.displayTextRange()}"
                         if (obj.isInvalid) {
-                            cell.text = message("codewhisperer.codescan.scan_recommendation_invalid", obj.title, obj.displayTextRange(), INACTIVE_TEXT_COLOR)
+                            cell.text = message("codewhisperer.codescan.scan_recommendation_invalid", obj.title, cellDescription, INACTIVE_TEXT_COLOR)
                             cell.toolTipText = message("codewhisperer.codescan.scan_recommendation_invalid.tooltip_text")
                             cell.icon = AllIcons.General.Information
                         } else {
-                            cell.text = message("codewhisperer.codescan.scan_recommendation", cellText, obj.displayTextRange(), INACTIVE_TEXT_COLOR)
+                            cell.text = message("codewhisperer.codescan.scan_recommendation", cellText, cellDescription, INACTIVE_TEXT_COLOR)
                             cell.toolTipText = cellText
                             cell.icon = obj.issueSeverity.icon
                         }

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

@@ -137,6 +137,7 @@ fun getCodeScanIssueDetailsHtml(
     }
 
     val fixLoadingSection = """
+        <a name="fixLoadingSection"></a>
         <div align="center" bgcolor="#2b2b2b" style="margin: 20px;">
             <font size="7" color="#ffffff" face="Arial">
                 &nbsp;&nbsp;&nbsp;&nbsp;...&nbsp;&nbsp;&nbsp;&nbsp;
@@ -145,6 +146,7 @@ fun getCodeScanIssueDetailsHtml(
     """.trimIndent()
 
     val fixFailureSection = """
+        <a name="fixFailureSection"></a>
         <div align="center" bgcolor="#2b2b2b" style="margin: 20px;">
             <font size="4" color="#e6e6e6" face="Arial">
                 <br>Amazon Q failed to generate fix. Please try again<br>
@@ -192,6 +194,7 @@ private fun createSuggestedFixSection(issue: CodeWhispererCodeScanIssue, suggest
             |${it.code.trim()}
             |``` 
             |</div>
+            |<a name="codeFixActions"></a>
             |<div>
             |    <a href="amazonq://issue/openDiff-${issue.findingId}">
             |        <font size="+1"><i>&#x2194;</i></font> <b>Open Diff</b>