Merge branch 'main' into thumb-up-and-down

Author: Randall-Jiang

.github/workflows/prerelease.yml

@@ -17,7 +17,7 @@ jobs:
   generate_artifact_toolkit_standalone:
     strategy:
       matrix:
-        supported_versions: [ '2024.1', '2024.2', '2024.3' ]
+        supported_versions: [ '2024.1', '2024.2', '2024.3', '2025.1' ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeTestChatApp.kt

@@ -41,6 +41,7 @@ class CodeTestChatApp(private val scope: CoroutineScope) : AmazonQApp {
             "button-click" to IncomingCodeTestMessage.ButtonClicked::class,
             "chat-item-voted" to IncomingCodeTestMessage.ChatItemVoted::class,
             "chat-item-feedback" to IncomingCodeTestMessage.ChatItemFeedback::class,
+            "auth-follow-up-was-clicked" to IncomingCodeTestMessage.AuthFollowUpWasClicked::class
         )
 
         scope.launch {
@@ -83,6 +84,7 @@ class CodeTestChatApp(private val scope: CoroutineScope) : AmazonQApp {
             is IncomingCodeTestMessage.ButtonClicked -> inboundAppMessagesHandler.processButtonClickedMessage(message)
             is IncomingCodeTestMessage.ChatItemVoted -> inboundAppMessagesHandler.processChatItemVoted(message)
             is IncomingCodeTestMessage.ChatItemFeedback -> inboundAppMessagesHandler.processChatItemFeedBack(message)
+            is IncomingCodeTestMessage.AuthFollowUpWasClicked -> inboundAppMessagesHandler.processAuthFollowUpClick(message)
         }
     }
 

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/InboundAppMessagesHandler.kt

@@ -25,4 +25,7 @@ interface InboundAppMessagesHandler {
     suspend fun processChatItemVoted(message: IncomingCodeTestMessage.ChatItemVoted)
 
     suspend fun processChatItemFeedBack(message: IncomingCodeTestMessage.ChatItemFeedback)
+
+    suspend fun processAuthFollowUpClick(message: IncomingCodeTestMessage.AuthFollowUpWasClicked)
+
 }

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt

@@ -1013,6 +1013,14 @@ class CodeTestChatController(
         }
     }
 
+    override suspend fun processAuthFollowUpClick(message: IncomingCodeTestMessage.AuthFollowUpWasClicked) {
+        codeTestChatHelper.sendUpdatePromptProgress(message.tabId, null)
+        authController.handleAuth(context.project, message.authType)
+        codeTestChatHelper.sendAuthenticationInProgressMessage(message.tabId) // show user that authentication is in progress
+        codeTestChatHelper.sendChatInputEnabledMessage(false) // disable the input field while authentication is in progress
+        sessionCleanUp(codeTestChatHelper.getActiveSession().tabId)
+    }
+
     private suspend fun updateBuildAndExecuteProgressCard(
         currentStatus: BuildAndExecuteProgressStatus,
         messageId: String?,
@@ -1269,6 +1277,17 @@ class CodeTestChatController(
      * */
     private suspend fun handleChat(tabId: String, message: String) {
         val session = codeTestChatHelper.getActiveSession()
+        session.projectRoot
+        val credentialState = authController.getAuthNeededStates(context.project).amazonQ
+        if (credentialState != null) {
+            messenger.sendAuthNeededException(
+                tabId = tabId,
+                triggerId = UUID.randomUUID().toString(),
+                credentialState = credentialState,
+            )
+            session.isAuthenticating = true
+            return
+        }
         LOG.debug {
             "$FEATURE_NAME: " +
                 "Processing message: $message " +

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatHelper.kt

@@ -4,6 +4,7 @@
 package software.aws.toolkits.jetbrains.services.amazonqCodeTest.controller
 
 import software.aws.toolkits.jetbrains.services.amazonq.messages.MessagePublisher
+import software.aws.toolkits.jetbrains.services.amazonqCodeTest.messages.ChatInputEnabledMessage
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.messages.CodeTestAddAnswerMessage
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.messages.CodeTestChatMessage
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.messages.CodeTestChatMessageContent
@@ -15,6 +16,8 @@ import software.aws.toolkits.jetbrains.services.amazonqCodeTest.messages.UpdateP
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.session.Session
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.storage.ChatSessionStorage
 import software.aws.toolkits.jetbrains.services.cwc.messages.ChatMessageType
+import software.aws.toolkits.jetbrains.services.cwc.messages.FollowUp
+import software.aws.toolkits.resources.message
 import java.util.UUID
 
 class CodeTestChatHelper(
@@ -153,4 +156,27 @@ class CodeTestChatHelper(
             )
         )
     }
+
+    suspend fun sendChatInputEnabledMessage(isEnabled: Boolean) {
+        if (isInvalidSession()) return
+        messagePublisher.publish(ChatInputEnabledMessage(activeCodeTestTabId as String, enabled = isEnabled))
+    }
+
+    suspend fun sendAuthenticationInProgressMessage(
+        tabId: String,
+        messageId: String? = null,
+        followUp: List<FollowUp>? = null,
+        canBeVoted: Boolean? = false,
+    ) {
+        val chatMessage =
+            CodeTestChatMessage(
+                tabId = tabId,
+                messageId = messageId ?: UUID.randomUUID().toString(),
+                messageType = ChatMessageType.Answer,
+                message = message("amazonqFeatureDev.follow_instructions_for_authentication"),
+                followUps = followUp,
+                canBeVoted = canBeVoted ?: false,
+            )
+        messagePublisher.publish(chatMessage)
+    }
 }

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/messages/CodeTestMessage.kt

@@ -104,6 +104,11 @@ sealed interface IncomingCodeTestMessage : CodeTestBaseMessage {
         @JsonProperty("tabID") val tabId: String,
         val selectedOption: String,
         val comment: String?,
+
+    data class AuthFollowUpWasClicked(
+        @JsonProperty("tabID") val tabId: String,
+        val authType: AuthFollowUpType,
+
     ) : IncomingCodeTestMessage
 }
 

plugins/amazonq/codewhisperer/jetbrains-community/src/migration/software/aws/toolkits/jetbrains/services/codewhisperer/customization/CodeWhispererModelConfigurator.kt

@@ -18,6 +18,8 @@ interface CodeWhispererModelConfigurator {
 
     fun switchCustomization(project: Project, newCustomization: CodeWhispererCustomization?)
 
+    fun switchCustomization(project: Project, newCustomization: CodeWhispererCustomization?, isOverride: Boolean)
+
     /**
      * This method is only used for invalidate a stale customization which was previously active but was removed, it will remove all usage of this customization
      * but not limited to the specific connection.

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codetest/sessionconfig/CodeTestSessionConfig.kt

@@ -29,6 +29,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.codetest.noFileOpe
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.CodeWhispererProgrammingLanguage
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererUnknownLanguage
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.programmingLanguage
+import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.CODE_SCAN_CREATE_PAYLOAD_TIMEOUT_IN_SECONDS
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.DEFAULT_CODE_SCAN_TIMEOUT_IN_SECONDS
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.DEFAULT_PAYLOAD_LIMIT_IN_BYTES
@@ -217,7 +218,7 @@ class CodeTestSessionConfig(
             for (module in project.modules) {
                 val changeListManager = ChangeListManager.getInstance(module.project)
                 module.guessModuleDir()?.let { moduleDir ->
-                    val gitIgnoreFilteringUtil = GitIgnoreFilteringUtil(moduleDir)
+                    val gitIgnoreFilteringUtil = GitIgnoreFilteringUtil(moduleDir, CodeWhispererConstants.FeatureName.TEST_GENERATION)
                     stack.push(moduleDir)
                     while (stack.isNotEmpty()) {
                         val current = stack.pop()

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/customization/CodeWhispererModelConfigurator.kt

@@ -76,6 +76,8 @@ class DefaultCodeWhispererModelConfigurator : CodeWhispererModelConfigurator, Pe
 
     private val hasShownNewCustomizationNotification = AtomicBoolean(false)
 
+    private var serviceDefaultArn: String? = null
+
     override fun showConfigDialog(project: Project) {
         runInEdt {
             calculateIfIamIdentityCenterConnection(project) {
@@ -165,20 +167,23 @@ class DefaultCodeWhispererModelConfigurator : CodeWhispererModelConfigurator, Pe
     override fun activeCustomization(project: Project): CodeWhispererCustomization? {
         val selectedCustomization = calculateIfIamIdentityCenterConnection(project) { connectionIdToActiveCustomizationArn[it.id] }
 
-        if (selectedCustomization != null) {
-            return selectedCustomization
-        } else {
-            val customizationOverride = CodeWhispererFeatureConfigService.getInstance().getCustomizationFeature()
-            if (customizationOverride == null || customizationOverride.value.stringValue().isEmpty()) return null
-            return CodeWhispererCustomization(
-                arn = customizationOverride.value.stringValue(),
-                name = customizationOverride.variation,
-            )
-        }
+        return selectedCustomization
     }
 
     override fun switchCustomization(project: Project, newCustomization: CodeWhispererCustomization?) {
+        switchCustomization(project, newCustomization, false)
+    }
+
+    /**
+     * Override happens when ALL following conditions are met
+     *  1. service returns non-empty override customization arn, refer to [CodeWhispererFeatureConfigService]
+     *  2. the override customization arn is different from the previous override customization if any. The purpose is to only do override once on users' behalf.
+     */
+    override fun switchCustomization(project: Project, newCustomization: CodeWhispererCustomization?, isOverride: Boolean) {
         calculateIfIamIdentityCenterConnection(project) {
+            if (isOverride && (newCustomization == null || newCustomization.arn.isEmpty() || serviceDefaultArn == newCustomization.arn)) {
+                return@calculateIfIamIdentityCenterConnection
+            }
             val oldCus = connectionIdToActiveCustomizationArn[it.id]
             if (oldCus != newCustomization) {
                 newCustomization?.let { newCus ->
@@ -191,6 +196,9 @@ class DefaultCodeWhispererModelConfigurator : CodeWhispererModelConfigurator, Pe
 
                 CodeWhispererCustomizationListener.notifyCustomUiUpdate()
             }
+            if (isOverride) {
+                serviceDefaultArn = newCustomization?.arn
+            }
         }
     }
 
@@ -240,6 +248,7 @@ class DefaultCodeWhispererModelConfigurator : CodeWhispererModelConfigurator, Pe
         val state = CodeWhispererCustomizationState()
         state.connectionIdToActiveCustomizationArn.putAll(this.connectionIdToActiveCustomizationArn)
         state.previousAvailableCustomizations.putAll(this.connectionToCustomizationsShownLastTime)
+        state.serviceDefaultArn = this.serviceDefaultArn
 
         return state
     }
@@ -250,6 +259,8 @@ class DefaultCodeWhispererModelConfigurator : CodeWhispererModelConfigurator, Pe
 
         connectionToCustomizationsShownLastTime.clear()
         connectionToCustomizationsShownLastTime.putAll(state.previousAvailableCustomizations)
+
+        this.serviceDefaultArn = state.serviceDefaultArn
     }
 
     override fun dispose() {}
@@ -280,6 +291,9 @@ class CodeWhispererCustomizationState : BaseState() {
     @get:Property
     @get:MapAnnotation
     val previousAvailableCustomizations by map<String, MutableList<String>>()
+
+    @get:Property
+    var serviceDefaultArn by string()
 }
 
 data class CustomizationUiItem(

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/startup/CodeWhispererProjectStartupActivity.kt

@@ -13,6 +13,7 @@ import software.aws.toolkits.jetbrains.core.coroutines.projectCoroutineScope
 import software.aws.toolkits.jetbrains.services.amazonq.CodeWhispererFeatureConfigService
 import software.aws.toolkits.jetbrains.services.amazonq.calculateIfIamIdentityCenterConnection
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.CodeWhispererCodeScanManager
+import software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererCustomization
 import software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererModelConfigurator
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerActionManager
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.isUserBuilderId
@@ -78,6 +79,14 @@ class CodeWhispererProjectStartupActivity : StartupActivity.DumbAware {
         projectCoroutineScope(project).launch {
             while (isActive) {
                 CodeWhispererFeatureConfigService.getInstance().fetchFeatureConfigs(project)
+                CodeWhispererFeatureConfigService.getInstance().getCustomizationFeature()?.let { customization ->
+                    CodeWhispererModelConfigurator.getInstance().switchCustomization(
+                        project,
+                        CodeWhispererCustomization(arn = customization.value.stringValue(), name = customization.variation),
+                        isOverride = true
+                    )
+                }
+
                 delay(FEATURE_CONFIG_POLL_INTERVAL_IN_MS)
             }
         }