Merge branch 'main' into help

Author: Will-ShaoHua

.changes/next-release/bugfix-7920ece4-99d6-4828-931e-29b66994dc10.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "/dev: Fix missing Amazon Q feature dev auto build setting."
+}

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

@@ -544,7 +544,8 @@ class FeatureDevController(
     }
 
     private suspend fun handleDevCommandUserSetting(tabId: String, value: Boolean) {
-        CodeWhispererSettings.getInstance().toggleAutoBuildFeature(context.project.basePath, value)
+        val session = getSessionInfo(tabId)
+        CodeWhispererSettings.getInstance().toggleAutoBuildFeature(session.context.workspaceRoot.path, value)
         messenger.sendAnswer(
             tabId = tabId,
             message = message("amazonqFeatureDev.chat_message.setting_updated"),

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

@@ -90,9 +90,7 @@ class DefaultCodeWhispererModelConfigurator : CodeWhispererModelConfigurator, Pe
             QRegionProfileSelectedListener.TOPIC,
             object : QRegionProfileSelectedListener {
                 override fun onProfileSelected(project: Project, profile: QRegionProfile?) {
-                    pluginAwareExecuteOnPooledThread {
-                        CodeWhispererModelConfigurator.getInstance().listCustomizations(project, passive = true)
-                    }
+                    switchCustomization(project, null)
                 }
             }
         )

plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererModelConfiguratorTest.kt

@@ -615,7 +615,7 @@ class CodeWhispererModelConfiguratorTest {
     }
 
     @Test
-    fun `profile switch should keep using existing customization if new list still contains that arn`() {
+    fun `should switch to default customization on profile changed`() {
         val ssoConn = spy(LegacyManagedBearerSsoConnection(region = "us-east-1", startUrl = "url 1", scopes = Q_SCOPES))
         ToolkitConnectionManager.getInstance(projectRule.project).switchConnection(ssoConn)
         val oldCustomization = CodeWhispererCustomization("oldArn", "oldName", "oldDescription")
@@ -632,7 +632,7 @@ class CodeWhispererModelConfiguratorTest {
             .syncPublisher(QRegionProfileSelectedListener.TOPIC)
             .onProfileSelected(projectRule.project, null)
 
-        assertThat(sut.activeCustomization(projectRule.project)).isEqualTo(oldCustomization)
+        assertThat(sut.activeCustomization(projectRule.project)).isEqualTo(null)
     }
 
     @Test

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ArtifactHelper.kt

@@ -19,12 +19,13 @@ import software.aws.toolkits.jetbrains.core.saveFileFromUrl
 import software.aws.toolkits.jetbrains.services.amazonq.project.manifest.ManifestManager
 import software.aws.toolkits.resources.AwsCoreBundle
 import java.nio.file.Path
+import java.nio.file.Paths
 import java.util.concurrent.atomic.AtomicInteger
 
 class ArtifactHelper(private val lspArtifactsPath: Path = DEFAULT_ARTIFACT_PATH, private val maxDownloadAttempts: Int = MAX_DOWNLOAD_ATTEMPTS) {
 
     companion object {
-        private val DEFAULT_ARTIFACT_PATH = getToolkitsCommonCacheRoot().resolve("aws").resolve("toolkits").resolve("language-servers")
+        private val DEFAULT_ARTIFACT_PATH = getToolkitsCommonCacheRoot().resolve(Paths.get("aws", "toolkits", "language-servers", "AmazonQ"))
         private val logger = getLogger<ArtifactHelper>()
         private const val MAX_DOWNLOAD_ATTEMPTS = 3
     }