feat(amazonq): implement configuration/didChangeConfiguration message for data sharing (#5441)

Author: rli

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

@@ -13,17 +13,22 @@ import com.intellij.openapi.wm.impl.status.widget.StatusBarWidgetsManager
 import com.intellij.testFramework.replaceService
 import com.intellij.testFramework.runInEdtAndWait
 import com.intellij.util.xmlb.XmlSerializer
+import io.mockk.every
+import io.mockk.junit4.MockKRule
+import io.mockk.mockkObject
 import org.assertj.core.api.Assertions.assertThat
 import org.jdom.output.XMLOutputter
 import org.junit.Before
 import org.junit.Ignore
+import org.junit.Rule
 import org.junit.Test
 import org.mockito.kotlin.any
 import org.mockito.kotlin.never
 import org.mockito.kotlin.spy
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
 import software.aws.toolkits.jetbrains.core.ToolWindowHeadlessManagerImpl
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLspService
 import software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererLoginType
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExploreActionState
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.isCodeWhispererEnabled
@@ -40,6 +45,9 @@ class CodeWhispererSettingsTest : CodeWhispererTestBase() {
     private lateinit var codewhispererServiceSpy: CodeWhispererService
     private lateinit var toolWindowHeadlessManager: ToolWindowHeadlessManagerImpl
 
+    @get:Rule
+    val mockkRule = MockKRule(this)
+
     @Before
     override fun setUp() {
         super.setUp()
@@ -212,6 +220,18 @@ class CodeWhispererSettingsTest : CodeWhispererTestBase() {
         assertThat(actual.autoBuildSetting).hasSize(1)
         assertThat(actual.autoBuildSetting["project1"]).isTrue()
     }
+
+    @Test
+    fun `toggleMetricOptIn should trigger LSP didChangeConfiguration`() {
+        mockkObject(AmazonQLspService)
+        every { AmazonQLspService.didChangeConfiguration(any()) } returns Unit
+        settingsManager.toggleMetricOptIn(true)
+        settingsManager.toggleMetricOptIn(false)
+
+        io.mockk.verify(atLeast = 2) {
+            AmazonQLspService.didChangeConfiguration(any())
+        }
+    }
 }
 
 class CodeWhispererSettingUnitTest {

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

@@ -12,6 +12,7 @@ import org.eclipse.lsp4j.PublishDiagnosticsParams
 import org.eclipse.lsp4j.ShowMessageRequestParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.credentials.ConnectionMetadata
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.credentials.SsoProfileData
+import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
 import java.util.concurrent.CompletableFuture
 
 /**
@@ -58,6 +59,17 @@ class AmazonQLanguageClientImpl : AmazonQLanguageClient {
 
         return CompletableFuture.completedFuture(
             buildList {
+                params.items.forEach {
+                    when (it.section) {
+                        AmazonQLspConstants.LSP_CW_CONFIGURATION_KEY -> {
+                            add(
+                                CodeWhispererLspConfiguration(
+                                    shouldShareData = CodeWhispererSettings.getInstance().isMetricOptIn()
+                                )
+                            )
+                        }
+                    }
+                }
             }
         )
     }

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

@@ -0,0 +1,9 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.amazonq.lsp
+
+object AmazonQLspConstants {
+    const val LSP_CW_CONFIGURATION_KEY = "aws.codeWhisperer"
+    const val LSP_CW_OPT_OUT_KEY = "shareCodeWhispererContentWithAWS"
+}

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

@@ -29,6 +29,7 @@ import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withTimeout
 import org.eclipse.lsp4j.ClientCapabilities
 import org.eclipse.lsp4j.ClientInfo
+import org.eclipse.lsp4j.DidChangeConfigurationParams
 import org.eclipse.lsp4j.FileOperationsWorkspaceCapabilities
 import org.eclipse.lsp4j.InitializeParams
 import org.eclipse.lsp4j.InitializeResult
@@ -178,6 +179,12 @@ class AmazonQLspService(private val project: Project, private val cs: CoroutineS
 
         fun <T> executeIfRunning(project: Project, runnable: AmazonQLspService.(AmazonQLanguageServer) -> T): T? =
             project.serviceIfCreated<AmazonQLspService>()?.executeSync(runnable)
+
+        fun didChangeConfiguration(project: Project) {
+            executeIfRunning(project) {
+                it.workspaceService.didChangeConfiguration(DidChangeConfigurationParams())
+            }
+        }
     }
 }
 

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

@@ -0,0 +1,11 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.amazonq.lsp
+
+import com.google.gson.annotations.SerializedName
+
+data class CodeWhispererLspConfiguration(
+    @SerializedName(AmazonQLspConstants.LSP_CW_OPT_OUT_KEY)
+    val shouldShareData: Boolean? = null,
+)

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/settings/CodeWhispererSettings.kt

@@ -10,7 +10,9 @@ import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.State
 import com.intellij.openapi.components.Storage
 import com.intellij.openapi.components.service
+import com.intellij.openapi.project.ProjectManager
 import com.intellij.util.xmlb.annotations.Property
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLspService
 import software.aws.toolkits.jetbrains.utils.notifyInfo
 import software.aws.toolkits.resources.AmazonQBundle
 
@@ -49,6 +51,13 @@ class CodeWhispererSettings : PersistentStateComponent<CodeWhispererConfiguratio
 
     fun toggleMetricOptIn(value: Boolean) {
         state.value[CodeWhispererConfigurationType.OptInSendingMetric] = value
+        ProjectManager.getInstance().openProjects.forEach {
+            if (it.isDisposed) {
+                return@forEach
+            }
+
+            AmazonQLspService.didChangeConfiguration(it)
+        }
     }
 
     fun isMetricOptIn() = state.value.getOrDefault(

plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImplTest.kt

@@ -0,0 +1,70 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+@file:Suppress("BannedImports")
+
+package software.aws.toolkits.jetbrains.services.amazonq.lsp
+
+import com.google.gson.Gson
+import com.intellij.testFramework.ApplicationExtension
+import org.assertj.core.api.Assertions.assertThat
+import org.eclipse.lsp4j.ConfigurationItem
+import org.eclipse.lsp4j.ConfigurationParams
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.extension.ExtendWith
+import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
+
+@ExtendWith(ApplicationExtension::class)
+class AmazonQLanguageClientImplTest {
+    private val sut = AmazonQLanguageClientImpl()
+
+    @Test
+    fun `configuration null if no attributes requested`() {
+        assertThat(sut.configuration(configurationParams()).get()).isNull()
+    }
+
+    @Test
+    fun `configuration for codeWhisperer respects opt-out`() {
+        CodeWhispererSettings.getInstance().toggleMetricOptIn(false)
+        assertThat(sut.configuration(configurationParams("aws.codeWhisperer")).get())
+            .singleElement()
+            .isEqualTo(
+                CodeWhispererLspConfiguration(shouldShareData = false)
+            )
+    }
+
+    @Test
+    fun `configuration for codeWhisperer respects opt-in`() {
+        CodeWhispererSettings.getInstance().toggleMetricOptIn(true)
+        assertThat(sut.configuration(configurationParams("aws.codeWhisperer")).get())
+            .singleElement()
+            .isEqualTo(
+                CodeWhispererLspConfiguration(shouldShareData = true)
+            )
+    }
+
+    @Test
+    fun `configuration empty if attributes unknown`() {
+        CodeWhispererSettings.getInstance().toggleMetricOptIn(true)
+        assertThat(sut.configuration(configurationParams("something random")).get()).isEmpty()
+    }
+
+    @Test
+    fun `Gson serializes CodeWhispererLspConfiguration serializes correctly`() {
+        val sut = CodeWhispererLspConfiguration(shouldShareData = true)
+        assertThat(Gson().toJson(sut)).isEqualToIgnoringWhitespace(
+            """
+                {
+                    "shareCodeWhispererContentWithAWS": true
+                }
+            """.trimIndent()
+        )
+    }
+
+    private fun configurationParams(vararg attributes: String) = ConfigurationParams(
+        attributes.map {
+            ConfigurationItem().apply {
+                section = it
+            }
+        }
+    )
+}