Merge branch 'aws:main' into feature/extension

Author: laileni-aws

.changes/next-release/bugfix-c8090208-8e8a-4a41-bcdd-02579f74d40e.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix issue with competing SDK proxy configuration (#4279)"
+}

.github/workflows/prerelease.yml

@@ -95,7 +95,7 @@ jobs:
           java-version: '17'
       - name: Generate artifact
         run: |
-          ./gradlew -PideProfileName=${{ matrix.supported_versions }} :plugin-amazonq:buildPlugin --exclude-task buildResharperPlugin
+          ./gradlew -PideProfileName=${{ matrix.supported_versions }} :plugin-amazonq:buildPlugin
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:

buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt

@@ -107,20 +107,20 @@ object IdeVersions {
             ),
             community = ProductProfile(
                 sdkFlavor = IdeFlavor.IC,
-                sdkVersion = "241.14494-EAP-CANDIDATE-SNAPSHOT",
+                sdkVersion = "2024.1",
                 plugins = commonPlugins + listOf(
                     "java",
                     "com.intellij.gradle",
                     "org.jetbrains.idea.maven",
                     // transitive for python
-                    "org.toml.lang:241.14494.33",
-                    "PythonCore:241.14494.17",
-                    "Docker:241.14494.28"
+                    "org.toml.lang:241.14494.150",
+                    "PythonCore:241.14494.240",
+                    "Docker:241.14494.251"
                 )
             ),
             ultimate = ProductProfile(
                 sdkFlavor = IdeFlavor.IU,
-                sdkVersion = "241.14494-EAP-CANDIDATE-SNAPSHOT",
+                sdkVersion = "2024.1",
                 plugins = commonPlugins + listOf(
                     "JavaScript",
                     // Transitive dependency needed for javascript
@@ -130,21 +130,21 @@ object IdeVersions {
                     "com.intellij.database",
                     "com.jetbrains.codeWithMe",
                     // transitive for python
-                    "org.toml.lang:241.14494.33",
-                    "Pythonid:241.14494.17",
-                    "org.jetbrains.plugins.go:241.14494.17",
+                    "org.toml.lang:241.14494.150",
+                    "Pythonid:241.14494.314",
+                    "org.jetbrains.plugins.go:241.14494.240",
                     // https://github.com/JetBrains/gradle-intellij-plugin/issues/1056
                     "org.intellij.intelliLang"
                 )
             ),
             rider = RiderProfile(
-                sdkVersion = "2024.1-EAP8-SNAPSHOT",
+                sdkVersion = "2024.1",
                 plugins = commonPlugins + listOf(
                     "rider-plugins-appender" // Workaround for https://youtrack.jetbrains.com/issue/IDEA-179607
                 ),
                 netFrameworkTarget = "net472",
                 rdGenVersion = "2024.1.1",
-                nugetVersion = "2024.1.0-eap08"
+                nugetVersion = "2024.1.0"
             )
         ),
 

gradle/libs.versions.toml

@@ -3,7 +3,7 @@ apache-commons-collections = "4.4"
 apache-commons-io = "2.16.0"
 assertJ = "3.20.2" # Upgrading leads to SAM errors: https://youtrack.jetbrains.com/issue/KT-17765
 # match with <root>/settings.gradle.kts
-awsSdk = "2.21.33"
+awsSdk = "2.25.32"
 commonmark = "0.17.1"
 detekt = "1.23.6"
 intellijGradle = "1.17.3"
@@ -12,22 +12,22 @@ jackson = "2.16.1"
 jacoco = "0.8.11"
 jgit = "6.5.0.202303070854-r"
 junit4 = "4.13.2"
-junit5 = "5.10.1"
+junit5 = "5.10.2"
 # https://plugins.jetbrains.com/docs/intellij/kotlin.html#adding-kotlin-support
 # https://kotlinlang.org/docs/releases.html#release-details
 kotlin = "1.9.23"
 # set in <root>/settings.gradle.kts
 kotlinCoroutines = "1.7.3"
 mockito = "5.10.0"
 mockitoKotlin = "5.2.1"
-mockk = "1.13.8"
+mockk = "1.13.10"
 node-gradle = "7.0.1"
 telemetryGenerator = "1.0.201"
 testLogger = "4.0.0"
 testRetry = "1.5.2"
 # test-only; platform provides slf4j transitively at runtime. <233, 1.7.36; >=233, 2.0.9
 slf4j = "2.0.9"
-sshd = "2.11.0"
+sshd = "2.12.1"
 wiremock = "3.3.1"
 undercouch-download = "5.2.1"
 zjsonpatch = "0.4.16"

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/auth/AuthController.kt

@@ -28,10 +28,10 @@ class AuthController {
         val connectionState = checkBearerConnectionValidity(project, BearerTokenFeatureSet.Q)
         val codeWhispererState = checkBearerConnectionValidity(project, BearerTokenFeatureSet.CODEWHISPERER)
 
-        // CW chat is enabled for Builder and IDC users, Amazon Q is only valid for IDC users
+        // CW chat is enabled for Builder and IDC users, same for Amazon Q
         return AuthNeededStates(
             chat = getAuthNeededState(connectionState, codeWhispererState),
-            amazonQ = getAuthNeededState(connectionState, codeWhispererState, true)
+            amazonQ = getAuthNeededState(connectionState, codeWhispererState)
         )
     }
 

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/auth/FeatureDevAuthUtils.kt

@@ -11,5 +11,6 @@ import software.aws.toolkits.jetbrains.core.gettingstarted.editor.checkBearerCon
 
 fun isFeatureDevAvailable(project: Project): Boolean {
     val connection = checkBearerConnectionValidity(project, BearerTokenFeatureSet.Q)
-    return connection.connectionType == ActiveConnectionType.IAM_IDC && connection is ActiveConnection.ValidBearer
+    return (connection.connectionType == ActiveConnectionType.IAM_IDC || connection.connectionType == ActiveConnectionType.BUILDER_ID) &&
+        connection is ActiveConnection.ValidBearer
 }

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt

@@ -9,7 +9,6 @@ import com.intellij.diff.contents.EmptyContent
 import com.intellij.diff.requests.SimpleDiffRequest
 import com.intellij.diff.util.DiffUserDataKeys
 import com.intellij.ide.BrowserUtil
-import com.intellij.notification.NotificationAction
 import com.intellij.openapi.application.runInEdt
 import com.intellij.openapi.command.WriteCommandAction
 import com.intellij.openapi.editor.Caret
@@ -49,19 +48,19 @@ import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.sendA
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.sendAuthNeededException
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.sendAuthenticationInProgressMessage
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.sendChatInputEnabledMessage
-import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.sendCodeResult
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.sendError
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.sendSystemPrompt
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.sendUpdatePlaceholder
+import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.updateFileComponent
 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.session.PrepareCodeGenerationState
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.Session
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.SessionStatePhase
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.storage.ChatSessionStorage
+import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util.getFollowUpOptions
 import software.aws.toolkits.jetbrains.services.cwc.messages.CodeReference
 import software.aws.toolkits.jetbrains.ui.feedback.FeatureDevFeedbackDialog
-import software.aws.toolkits.jetbrains.utils.notifyInfo
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.AmazonqTelemetry
 import java.util.UUID
@@ -72,8 +71,8 @@ class FeatureDevController(
     private val authController: AuthController = AuthController()
 ) : InboundAppMessagesHandler {
 
-    private val messenger = context.messagesFromAppToUi
-    private val toolWindow = ToolWindowManager.getInstance(context.project).getToolWindow(AmazonQToolWindowFactory.WINDOW_ID)
+    val messenger = context.messagesFromAppToUi
+    val toolWindow = ToolWindowManager.getInstance(context.project).getToolWindow(AmazonQToolWindowFactory.WINDOW_ID)
 
     override suspend fun processPromptChatMessage(message: IncomingFeatureDevMessage.ChatPrompt) {
         handleChat(
@@ -225,12 +224,7 @@ class FeatureDevController(
         filePaths.find { it.zipFilePath == fileToUpdate }?.let { it.rejected = !it.rejected }
         deletedFiles.find { it.zipFilePath == fileToUpdate }?.let { it.rejected = !it.rejected }
 
-        session.updateFilesPaths(
-            messenger = messenger,
-            tabId = message.tabId,
-            filePaths = filePaths,
-            deletedFiles = deletedFiles
-        )
+        messenger.updateFileComponent(message.tabId, filePaths, deletedFiles)
     }
 
     private suspend fun newTabOpened(tabId: String) {
@@ -292,13 +286,18 @@ class FeatureDevController(
                     references = state.references
                 }
             }
+
             AmazonqTelemetry.isAcceptedCodeChanges(
-                project = null,
                 amazonqNumberOfFilesAccepted = (filePaths.filterNot { it.rejected }.size + deletedFiles.filterNot { it.rejected }.size) * 1.0,
                 amazonqConversationId = session.conversationId,
                 enabled = true
             )
-            session.insertChanges(filePaths = filePaths, deletedFiles = deletedFiles, references = references)
+
+            session.insertChanges(
+                filePaths = filePaths.filterNot { it.rejected },
+                deletedFiles = deletedFiles.filterNot { it.rejected },
+                references = references
+            )
 
             messenger.sendAnswer(
                 tabId = tabId,
@@ -502,124 +501,6 @@ class FeatureDevController(
         messenger.sendAsyncEventProgress(tabId = tabId, inProgress = false)
     }
 
-    private suspend fun onCodeGeneration(session: Session, message: String, tabId: String) {
-        messenger.sendAsyncEventProgress(
-            tabId = tabId,
-            inProgress = true,
-            message = message("amazonqFeatureDev.chat_message.start_code_generation"),
-        )
-
-        try {
-            messenger.sendAnswer(
-                tabId = tabId,
-                message = message("amazonqFeatureDev.chat_message.requesting_changes"),
-                messageType = FeatureDevMessageType.AnswerStream,
-            )
-
-            messenger.sendUpdatePlaceholder(tabId = tabId, newPlaceholder = message("amazonqFeatureDev.placeholder.generating_code"))
-
-            session.send(message) // Trigger code generation
-
-            val state = session.sessionState
-
-            var filePaths: List<NewFileZipInfo> = emptyList()
-            var deletedFiles: List<DeletedFileInfo> = emptyList()
-            var references: List<CodeReference> = emptyList()
-            var uploadId = ""
-
-            when (state) {
-                is PrepareCodeGenerationState -> {
-                    filePaths = state.filePaths
-                    deletedFiles = state.deletedFiles
-                    references = state.references
-                    uploadId = state.uploadId
-                }
-            }
-
-            // Atm this is the only possible path as codegen is mocked to return empty.
-            if (filePaths.size or deletedFiles.size == 0) {
-                messenger.sendAnswer(
-                    tabId = tabId,
-                    messageType = FeatureDevMessageType.Answer,
-                    message = message("amazonqFeatureDev.code_generation.no_file_changes")
-                )
-                messenger.sendSystemPrompt(
-                    tabId = tabId,
-                    followUp = if (retriesRemaining(session) > 0) {
-                        listOf(
-                            FollowUp(
-                                pillText = message("amazonqFeatureDev.follow_up.retry"),
-                                type = FollowUpTypes.RETRY,
-                                status = FollowUpStatusType.Warning
-                            )
-                        )
-                    } else {
-                        emptyList()
-                    }
-                )
-                messenger.sendChatInputEnabledMessage(tabId = tabId, enabled = false) // Lock chat input until retry is clicked.
-                return
-            }
-
-            messenger.sendCodeResult(tabId = tabId, uploadId = uploadId, filePaths = filePaths, deletedFiles = deletedFiles, references = references)
-
-            messenger.sendSystemPrompt(tabId = tabId, followUp = getFollowUpOptions(session.sessionState.phase, interactionSucceeded = true))
-
-            messenger.sendUpdatePlaceholder(tabId = tabId, newPlaceholder = message("amazonqFeatureDev.placeholder.after_code_generation"))
-        } finally {
-            messenger.sendAsyncEventProgress(tabId = tabId, inProgress = false) // Finish processing the event
-            messenger.sendChatInputEnabledMessage(tabId = tabId, enabled = false) // Lock chat input until a follow-up is clicked.
-
-            if (toolWindow != null && !toolWindow.isVisible) {
-                notifyInfo(
-                    title = message("amazonqFeatureDev.code_generation.notification_title"),
-                    content = message("amazonqFeatureDev.code_generation.notification_message"),
-                    project = context.project,
-                    notificationActions = listOf(openChatNotificationAction())
-                )
-            }
-        }
-    }
-
-    private fun openChatNotificationAction() = NotificationAction.createSimple(message("amazonqFeatureDev.code_generation.notification_open_link")) {
-        toolWindow?.show()
-    }
-
-    private fun getFollowUpOptions(phase: SessionStatePhase?, interactionSucceeded: Boolean): List<FollowUp> {
-        when (phase) {
-            SessionStatePhase.APPROACH -> {
-                return when (interactionSucceeded) {
-                    true -> listOf(
-                        FollowUp(
-                            pillText = message("amazonqFeatureDev.follow_up.generate_code"),
-                            type = FollowUpTypes.GENERATE_CODE,
-                            status = FollowUpStatusType.Info,
-                        )
-                    )
-
-                    false -> emptyList()
-                }
-            }
-            SessionStatePhase.CODEGEN -> {
-                return listOf(
-                    FollowUp(
-                        pillText = message("amazonqFeatureDev.follow_up.insert_code"),
-                        type = FollowUpTypes.INSERT_CODE,
-                        icon = FollowUpIcons.Ok,
-                        status = FollowUpStatusType.Success
-                    ),
-                    FollowUp(
-                        pillText = message("amazonqFeatureDev.follow_up.provide_feedback_and_regenerate"),
-                        type = FollowUpTypes.PROVIDE_FEEDBACK_AND_REGENERATE_CODE,
-                        icon = FollowUpIcons.Refresh,
-                        status = FollowUpStatusType.Info
-                    )
-                )
-            }
-            else -> return emptyList()
-        }
-    }
-
     private suspend fun retryRequests(tabId: String) {
         var session: Session? = null
         try {
@@ -728,9 +609,11 @@ class FeatureDevController(
         }
     }
 
+    fun getProject() = context.project
+
     private fun getSessionInfo(tabId: String) = chatSessionStorage.getSession(tabId, context.project)
 
-    private fun retriesRemaining(session: Session?): Int = session?.retries ?: DEFAULT_RETRY_LIMIT
+    fun retriesRemaining(session: Session?): Int = session?.retries ?: DEFAULT_RETRY_LIMIT
 
     companion object {
         private val logger = getLogger<FeatureDevController>()