Merge branch 'feature/q-lsp-chat' into rli/paidtier

rli · web-flow · commit 16e9a04e2e6a · 2025-06-03T10:15:57.000-07:00
diff --git a/buildspec/linuxTests.yml b/buildspec/linuxTests.yml
@@ -40,7 +40,7 @@ phases:
         fi
 
       - chmod +x gradlew
-      - su codebuild-user -c "./gradlew -PideProfileName=$ALTERNATIVE_IDE_PROFILE_NAME check coverageReport --info --console plain --continue"
+      - su codebuild-user -c "./gradlew -PideProfileName=$ALTERNATIVE_IDE_PROFILE_NAME check coverageReport --info --stacktrace --console plain --continue"
       - su codebuild-user -c "./gradlew -PideProfileName=$ALTERNATIVE_IDE_PROFILE_NAME buildPlugin"
       - VCS_COMMIT_ID="${CODEBUILD_RESOLVED_SOURCE_VERSION}"
       - CI_BUILD_URL=$(echo $CODEBUILD_BUILD_URL | sed 's/#/%23/g') # Encode `#` in the URL because otherwise the url is clipped in the Codecov.io site
diff --git a/plugins/amazonq/build.gradle.kts b/plugins/amazonq/build.gradle.kts
@@ -115,8 +115,8 @@ val prepareBundledFlare by tasks.registering(Copy::class) {
 
     val dest = layout.buildDirectory.dir("tmp/extractFlare")
     into(dest)
-
     from(downloadFlareArtifacts.map { it.outputFiles.filterNot { file -> file.name.endsWith(".zip") } })
+
     doLast {
         copy {
             into(dest)
diff --git a/plugins/amazonq/shared/jetbrains-community/build.gradle.kts b/plugins/amazonq/shared/jetbrains-community/build.gradle.kts
@@ -24,3 +24,12 @@ dependencies {
 
     testFixturesApi(testFixtures(project(":plugin-core:jetbrains-community")))
 }
+
+// hack because our test structure currently doesn't make complete sense
+tasks.prepareTestSandbox {
+    val pluginXmlJar = project(":plugin-amazonq").tasks.jar
+
+    dependsOn(pluginXmlJar)
+    intoChild(intellijPlatform.projectName.map { "$it/lib" })
+        .from(pluginXmlJar)
+}
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClient.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClient.kt
@@ -8,6 +8,7 @@ import org.eclipse.lsp4j.jsonrpc.services.JsonRequest
 import org.eclipse.lsp4j.services.LanguageClient
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.LSPAny
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_OPEN_TAB
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_OPTIONS_UPDATE_NOTIFICATION
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_SEND_CONTEXT_COMMANDS
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_SEND_UPDATE
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CopyFileParams
@@ -67,4 +68,7 @@ interface AmazonQLanguageClient : LanguageClient {
 
     @JsonNotification(DID_CREATE_DIRECTORY)
     fun createDirectory(params: FileParams)
+
+    @JsonNotification(CHAT_OPTIONS_UPDATE_NOTIFICATION)
+    fun sendChatOptionsUpdate(params: LSPAny)
 }
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt
@@ -41,6 +41,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.ChatCommun
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.FlareUiMessage
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.LSPAny
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_OPEN_TAB
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_OPTIONS_UPDATE_NOTIFICATION
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_SEND_CONTEXT_COMMANDS
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_SEND_UPDATE
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CopyFileParams
@@ -149,14 +150,14 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
                 return CompletableFuture.completedFuture(ShowDocumentResult(false))
             }
 
-            // The filepath sent by the server contains unicode characters which need to be
-            // decoded for JB file handling APIs to be handle to handle file operations
-            val fileToOpen = URLDecoder.decode(params.uri, StandardCharsets.UTF_8.name())
             if (params.external == true) {
-                BrowserUtil.open(fileToOpen)
+                BrowserUtil.open(params.uri)
                 return CompletableFuture.completedFuture(ShowDocumentResult(true))
             }
 
+            // The filepath sent by the server contains unicode characters which need to be
+            // decoded for JB file handling APIs to be handle to handle file operations
+            val fileToOpen = URLDecoder.decode(params.uri, StandardCharsets.UTF_8.name())
             ApplicationManager.getApplication().invokeLater {
                 try {
                     val virtualFile = VirtualFileManager.getInstance().findFileByUrl(fileToOpen)
@@ -413,6 +414,16 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
         return refreshVfs(params.newPath)
     }
 
+    override fun sendChatOptionsUpdate(params: LSPAny) {
+        val chatManager = ChatCommunicationManager.getInstance(project)
+        chatManager.notifyUi(
+            FlareUiMessage(
+                command = CHAT_OPTIONS_UPDATE_NOTIFICATION,
+                params = params,
+            )
+        )
+    }
+
     private fun refreshVfs(path: String) {
         val currPath = Paths.get(path)
         if (currPath.startsWith(localHistoryPath)) return
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt
@@ -371,15 +371,21 @@ private class AmazonQServerInstance(private val project: Project, private val cs
         // make assumption that all requests will resolve to the same CA
         // also terrible assumption that default endpoint is reachable
         val qUri = URI(QDefaultServiceConfig.ENDPOINT)
-        val rtsTrustChain = TrustChainUtil.getTrustChain(qUri)
-        val extraCaCerts = Files.createTempFile("q-extra-ca", ".pem").apply {
-            writeText(
-                TrustChainUtil.certsToPem(rtsTrustChain)
-            )
+        val extraCaCerts = try {
+            val rtsTrustChain = TrustChainUtil.getTrustChain(qUri)
+
+            Files.createTempFile("q-extra-ca", ".pem").apply {
+                writeText(
+                    TrustChainUtil.certsToPem(rtsTrustChain)
+                )
+            }
+        } catch (e: Exception) {
+            LOG.info(e) { "Could not resolve trust chain for $qUri, skipping NODE_EXTRA_CA_CERTS" }
+            null
         }
 
         val node = if (SystemInfo.isWindows) "node.exe" else "node"
-        var nodePath = getNodeRuntimePath(artifact.resolve(node))
+        val nodePath = getNodeRuntimePath(artifact.resolve(node))
 
         val cmd = NodeExePatcher.patch(nodePath)
             .withParameters(
@@ -388,7 +394,7 @@ private class AmazonQServerInstance(private val project: Project, private val cs
                 "--set-credentials-encryption-key",
             ).withEnvironment(
                 buildMap {
-                    put("NODE_EXTRA_CA_CERTS", extraCaCerts.toAbsolutePath().toString())
+                    extraCaCerts?.let { put("NODE_EXTRA_CA_CERTS", it.toAbsolutePath().toString()) }
 
                     val proxy = JdkProxyProvider.getInstance().proxySelector.select(qUri)
                         // log if only socks proxy available
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ArtifactManager.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ArtifactManager.kt
@@ -16,6 +16,9 @@ import org.jetbrains.annotations.VisibleForTesting
 import software.aws.toolkits.core.utils.error
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.info
+import software.aws.toolkits.core.utils.warn
+import software.aws.toolkits.jetbrains.AwsPlugin
+import software.aws.toolkits.jetbrains.AwsToolkit
 import java.nio.file.Path
 
 @Service
@@ -54,36 +57,43 @@ class ArtifactManager @NonInjectable internal constructor(private val manifestFe
         return mutex.withLock {
             coroutineScope {
                 async {
-                    val manifest = manifestFetcher.fetch() ?: throw LspException(
-                        "Language Support is not available, as manifest is missing.",
-                        LspException.ErrorCode.MANIFEST_FETCH_FAILED
-                    )
-                    val lspVersions = getLSPVersionsFromManifestWithSpecifiedRange(manifest)
-
-                    artifactHelper.removeDelistedVersions(lspVersions.deListedVersions)
-
-                    if (lspVersions.inRangeVersions.isEmpty()) {
-                        // No versions are found which are in the given range. Fallback to local lsp artifacts.
-                        val localLspArtifacts = artifactHelper.getAllLocalLspArtifactsWithinManifestRange(DEFAULT_VERSION_RANGE)
-                        if (localLspArtifacts.isNotEmpty()) {
-                            return@async localLspArtifacts.first().first
+                    try {
+                        val manifest = manifestFetcher.fetch() ?: throw LspException(
+                            "Language Support is not available, as manifest is missing.",
+                            LspException.ErrorCode.MANIFEST_FETCH_FAILED
+                        )
+                        val lspVersions = getLSPVersionsFromManifestWithSpecifiedRange(manifest)
+
+                        artifactHelper.removeDelistedVersions(lspVersions.deListedVersions)
+
+                        if (lspVersions.inRangeVersions.isEmpty()) {
+                            // No versions are found which are in the given range. Fallback to local lsp artifacts.
+                            val localLspArtifacts = artifactHelper.getAllLocalLspArtifactsWithinManifestRange(DEFAULT_VERSION_RANGE)
+                            if (localLspArtifacts.isNotEmpty()) {
+                                return@async localLspArtifacts.first().first
+                            }
+                            throw LspException("Language server versions not found in manifest.", LspException.ErrorCode.NO_COMPATIBLE_LSP_VERSION)
                         }
-                        throw LspException("Language server versions not found in manifest.", LspException.ErrorCode.NO_COMPATIBLE_LSP_VERSION)
-                    }
 
-                    val targetVersion = lspVersions.inRangeVersions.first()
+                        val targetVersion = lspVersions.inRangeVersions.first()
 
-                    // If there is an LSP Manifest with the same version
-                    val target = getTargetFromLspManifest(targetVersion)
-                    // Get Local LSP files and check if we can re-use existing LSP Artifacts
-                    val artifactPath: Path = if (artifactHelper.getExistingLspArtifacts(targetVersion, target)) {
-                        artifactHelper.getAllLocalLspArtifactsWithinManifestRange(DEFAULT_VERSION_RANGE).first().first
-                    } else {
-                        artifactHelper.tryDownloadLspArtifacts(project, targetVersion, target)
-                            ?: throw LspException("Failed to download LSP artifacts", LspException.ErrorCode.DOWNLOAD_FAILED)
+                        // If there is an LSP Manifest with the same version
+                        val target = getTargetFromLspManifest(targetVersion)
+                        // Get Local LSP files and check if we can re-use existing LSP Artifacts
+                        val artifactPath: Path = if (artifactHelper.getExistingLspArtifacts(targetVersion, target)) {
+                            artifactHelper.getAllLocalLspArtifactsWithinManifestRange(DEFAULT_VERSION_RANGE).first().first
+                        } else {
+                            artifactHelper.tryDownloadLspArtifacts(project, targetVersion, target)
+                                ?: throw LspException("Failed to download LSP artifacts", LspException.ErrorCode.DOWNLOAD_FAILED)
+                        }
+                        artifactHelper.deleteOlderLspArtifacts(DEFAULT_VERSION_RANGE)
+                        return@async artifactPath
+                    } catch (e: Exception) {
+                        logger.warn(e) { "Failed to resolve assets from Flare CDN" }
+                        val path = AwsToolkit.PLUGINS_INFO[AwsPlugin.Q]?.path?.resolve("flare") ?: error("not even bundled")
+                        logger.info { "Falling back to bundled assets at $path" }
+                        return@async path
                     }
-                    artifactHelper.deleteOlderLspArtifacts(DEFAULT_VERSION_RANGE)
-                    return@async artifactPath
                 }
             }.also {
                 artifactDeferred = it
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/FlareChatCommands.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/FlareChatCommands.kt
@@ -20,6 +20,7 @@ const val CHAT_INSERT_TO_CURSOR_NOTIFICATION = "aws/chat/insertToCursorPosition"
 const val CHAT_LINK_CLICK = "aws/chat/linkClick"
 const val CHAT_LIST_CONVERSATIONS = "aws/chat/listConversations"
 const val CHAT_OPEN_TAB = "aws/chat/openTab"
+const val CHAT_OPTIONS_UPDATE_NOTIFICATION = "aws/chat/chatOptionsUpdate"
 const val CHAT_PROMPT_OPTION_ACKNOWLEDGED = "chatPromptOptionAcknowledged"
 const val CHAT_QUICK_ACTION = "aws/chat/sendChatQuickAction"
 const val CHAT_READY = "aws/chat/ready"
diff --git a/plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ArtifactManagerTest.kt b/plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ArtifactManagerTest.kt
@@ -3,6 +3,8 @@
 
 package software.aws.toolkits.jetbrains.services.amazonq.lsp.artifacts
 
+import com.intellij.ide.plugins.PluginManagerCore
+import com.intellij.openapi.extensions.PluginId
 import com.intellij.testFramework.ProjectExtension
 import com.intellij.util.text.SemVer
 import io.mockk.Runs
@@ -17,7 +19,6 @@ import kotlinx.coroutines.test.runTest
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.assertThrows
 import org.junit.jupiter.api.extension.RegisterExtension
 import org.junit.jupiter.api.io.TempDir
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.artifacts.ArtifactManager.SupportedManifestVersionRange
@@ -51,29 +52,27 @@ class ArtifactManagerTest {
     }
 
     @Test
-    fun `fetch artifact fetcher throws exception if manifest is null`() = runTest {
+    fun `fetch artifact fetcher returns bundled if manifest is null`() = runTest {
         every { manifestFetcher.fetch() }.returns(null)
 
-        val exception = assertThrows<LspException> {
-            artifactManager.fetchArtifact(projectExtension.project)
-        }
-        assertThat(exception)
-            .hasFieldOrPropertyWithValue("errorCode", LspException.ErrorCode.MANIFEST_FETCH_FAILED)
+        assertThat(artifactManager.fetchArtifact(projectExtension.project))
+            .isEqualTo(
+                PluginManagerCore.getPlugin(PluginId.getId("amazon.q"))?.pluginPath?.resolve("flare")
+            )
     }
 
     @Test
-    fun `fetch artifact does not have any valid lsp versions`() = runTest {
+    fun `fetch artifact does not have any valid lsp versions returns bundled`() = runTest {
         every { manifestFetcher.fetch() }.returns(Manifest())
 
         every { artifactManager.getLSPVersionsFromManifestWithSpecifiedRange(any()) }.returns(
             ArtifactManager.LSPVersions(deListedVersions = emptyList(), inRangeVersions = emptyList())
         )
 
-        val exception = assertThrows<LspException> {
-            artifactManager.fetchArtifact(projectExtension.project)
-        }
-        assertThat(exception)
-            .hasFieldOrPropertyWithValue("errorCode", LspException.ErrorCode.NO_COMPATIBLE_LSP_VERSION)
+        assertThat(artifactManager.fetchArtifact(projectExtension.project))
+            .isEqualTo(
+                PluginManagerCore.getPlugin(PluginId.getId("amazon.q"))?.pluginPath?.resolve("flare")
+            )
     }
 
     @Test
diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/AwsToolkit.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/AwsToolkit.kt
@@ -4,11 +4,9 @@
 package software.aws.toolkits.jetbrains
 
 import com.intellij.ide.plugins.PluginManagerCore
-import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.extensions.PluginDescriptor
 import com.intellij.openapi.extensions.PluginId
 import java.nio.file.Path
-import java.nio.file.Paths
 import java.util.EnumMap
 
 object AwsToolkit {
@@ -37,12 +35,7 @@ data class PluginInfo(val id: String, val name: String) {
     val version: String?
         get() = descriptor?.version
     val path: Path?
-        get() =
-            if (ApplicationManager.getApplication().isUnitTestMode) {
-                Paths.get(System.getProperty("plugin.path"))
-            } else {
-                descriptor?.pluginPath
-            }
+        get() = descriptor?.pluginPath
 }
 
 enum class AwsPlugin {
diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/bearer/BearerTokenProvider.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/bearer/BearerTokenProvider.kt
@@ -17,7 +17,6 @@ import software.amazon.awssdk.regions.Region
 import software.amazon.awssdk.services.ssooidc.SsoOidcClient
 import software.amazon.awssdk.services.ssooidc.SsoOidcTokenProvider
 import software.amazon.awssdk.services.ssooidc.internal.OnDiskTokenManager
-import software.amazon.awssdk.services.ssooidc.model.InvalidGrantException
 import software.amazon.awssdk.services.ssooidc.model.SsoOidcException
 import software.amazon.awssdk.utils.SdkAutoCloseable
 import software.amazon.awssdk.utils.cache.CachedSupplier
@@ -252,13 +251,6 @@ internal val DEFAULT_PREFETCH_DURATION = Duration.ofMinutes(20)
 val ssoOidcClientConfigurationBuilder: (ClientOverrideConfiguration.Builder) -> ClientOverrideConfiguration.Builder = { configuration ->
     configuration.nullDefaultProfileFile()
 
-    // Add InvalidGrantException to the RetryOnExceptionsCondition
-    configuration.retryStrategy { strategy ->
-        strategy.retryOnException {
-            it is InvalidGrantException
-        }
-    }
-
     configuration.addExecutionInterceptor(object : ExecutionInterceptor {
         override fun modifyException(context: Context.FailedExecution, executionAttributes: ExecutionAttributes): Throwable {
             val exception = context.exception()
diff --git a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/sso/bearer/InteractiveBearerTokenProviderTest.kt b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/sso/bearer/InteractiveBearerTokenProviderTest.kt
@@ -84,16 +84,14 @@ class InteractiveBearerTokenProviderTest {
     }
 
     @Test
-    fun `oidcClient retries twice on InvalidGrantException failure`() {
+    fun `oidcClient does not retry on InvalidGrantException failure`() {
         fun verifyRetryAttempts(configuration: ClientOverrideConfiguration.Builder) {
             configuration.addExecutionInterceptor(
                 object : ExecutionInterceptor {
                     override fun onExecutionFailure(context: Context.FailedExecution?, executionAttributes: ExecutionAttributes?) {
                         super.onExecutionFailure(context, executionAttributes)
 
-                        // 3 total network calls, showing 4 since the sdk increments the attempt count at the beginning
-                        // of the loop before it checks whether it's allowed to retry.
-                        assertThat(executionAttributes?.getAttribute(InternalCoreExecutionAttribute.EXECUTION_ATTEMPT)).isEqualTo(4)
+                        assertThat(executionAttributes?.getAttribute(InternalCoreExecutionAttribute.EXECUTION_ATTEMPT)).isEqualTo(1)
                     }
                 }
             )
