fix(amazonq): delete AwsServerCapabilitiesProvider

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt

@@ -11,7 +11,6 @@ import com.intellij.openapi.util.Disposer
 import com.intellij.ui.jcef.JBCefJSQuery
 import org.cef.CefApp
 import software.aws.toolkits.jetbrains.services.amazonq.CodeWhispererFeatureConfigService
-import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.AwsServerCapabilitiesProvider
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.FlareUiMessage
 import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfile
 import software.aws.toolkits.jetbrains.services.amazonq.util.HighlightCommand
@@ -114,7 +113,7 @@ class Browser(parent: Disposable, private val webUri: URI, val project: Project)
     ): String {
         val postMessageToJavaJsCode = receiveMessageQuery.inject("JSON.stringify(message)")
         val connectorAdapterPath = "http://mynah/js/connectorAdapter.js"
-        generateQuickActionConfig()
+
         // https://github.com/highlightjs/highlight.js/issues/1387
         // language=HTML
         val jsScripts = """
@@ -266,10 +265,6 @@ class Browser(parent: Disposable, private val webUri: URI, val project: Project)
         activeProfile
     }
 
-    private fun generateQuickActionConfig() = AwsServerCapabilitiesProvider.getInstance(project).getChatOptions().quickActions.quickActionsCommandGroups
-        .let { OBJECT_MAPPER.writeValueAsString(it) }
-        ?: "[]"
-
     companion object {
         private const val MAX_ONBOARDING_PAGE_COUNT = 3
         private val OBJECT_MAPPER = jacksonObjectMapper()

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt

@@ -21,6 +21,7 @@
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.merge
 import kotlinx.coroutines.flow.onEach
@@ -40,7 +41,6 @@
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.JsonRpcNotification
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.JsonRpcRequest
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.encryption.JwtEncryptionManager
-import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.AwsServerCapabilitiesProvider
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.ChatAsyncResultManager
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.ChatCommunicationManager
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.FlareUiMessage
@@ -567,15 +567,19 @@
         browser.postChat(cancelMessage)
     }
 
-    private fun updateQuickActionsInBrowser(browser: Browser) {
+    private suspend fun updateQuickActionsInBrowser(browser: Browser) {
         val isFeatureDevAvailable = isFeatureDevAvailable(project)
         val isCodeTransformAvailable = isCodeTransformAvailable(project)
         val isDocAvailable = isDocAvailable(project)
         val isCodeScanAvailable = isCodeScanAvailable(project)
         val isCodeTestAvailable = isCodeTestAvailable(project)
 
+        val serverCapabilities = AmazonQLspService.getInstance(project).instanceFlow.first().initializeResult.await().awsServerCapabilities
+
+        // language=JavaScript
         val script = """
             try {
+                // hack to create the list of actions across all tab types
                 const tempConnector = connectorAdapter.initiateAdapter(
                     false, 
                     true, // the two values are not used here, needed for constructor
@@ -588,7 +592,7 @@
                 );
 
                 const commands = tempConnector.initialQuickActions?.slice(0, 2) || [];
-                const options = ${Gson().toJson(AwsServerCapabilitiesProvider.getInstance(project).getChatOptions())};
+                const options = ${Gson().toJson(serverCapabilities.chatOptions)};
                 options.quickActions.quickActionsCommandGroups = [
                     ...commands,
                     ...options.quickActions.quickActionsCommandGroups

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

@@ -129,7 +129,7 @@ open class CodeWhispererTestBase {
                     get() = CompletableFuture()
 
                 override val initializeResult: Deferred<AwsExtendedInitializeResult>
-                    get() = CompletableDeferred(AwsExtendedInitializeResult())
+                    get() = CompletableDeferred(AwsExtendedInitializeResult(mockk()))
 
                 override val encryptionManager: JwtEncryptionManager
                     get() = TODO("Not yet implemented")

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

@@ -37,7 +37,7 @@
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.future.asCompletableFuture
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
@@ -76,7 +76,6 @@
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.encryption.JwtEncryptionManager
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.AmazonQLspTypeAdapterFactory
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.AwsExtendedInitializeResult
-import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.AwsServerCapabilitiesProvider
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.createExtendedClientMetadata
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.textdocument.TextDocumentServiceHandler
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.WorkspaceFolderUtil.createWorkspaceFolders
@@ -155,7 +154,7 @@
     constructor(project: Project, cs: CoroutineScope) : this(DefaultAmazonQServerInstanceStarter, project, cs)
 
     private val _flowInstance = MutableSharedFlow<AmazonQServerInstanceFacade>(replay = 1, onBufferOverflow = BufferOverflow.DROP_OLDEST)
-    val instanceFlow = _flowInstance.asSharedFlow().map { it.languageServer }
+    val instanceFlow = _flowInstance.asSharedFlow()
 
     private var instance: Deferred<AmazonQServerInstanceFacade>
 
@@ -533,11 +532,6 @@
                         }
                     }
 
-                    if (message is ResponseMessage && message.result is AwsExtendedInitializeResult) {
-                        val result = message.result as AwsExtendedInitializeResult
-                        AwsServerCapabilitiesProvider.getInstance(project).setAwsServerCapabilities(result.getAwsServerCapabilities())
-                    }
-
                     // required
                     consumer?.consume(message)
                 }

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

@@ -10,6 +10,7 @@
 import com.google.gson.stream.JsonReader
 import com.google.gson.stream.JsonWriter
 import org.eclipse.lsp4j.InitializeResult
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.AwsServerCapabilities
 import java.io.IOException
 
 class AmazonQLspTypeAdapterFactory : TypeAdapterFactory {
@@ -32,12 +33,4 @@
     }
 }
 
-class AwsExtendedInitializeResult(awsServerCapabilities: AwsServerCapabilities? = null) : InitializeResult() {
-    private var awsServerCapabilities: AwsServerCapabilities? = null
-
-    fun getAwsServerCapabilities(): AwsServerCapabilities? = awsServerCapabilities
-
-    fun setAwsServerCapabilities(awsServerCapabilities: AwsServerCapabilities?) {
-        this.awsServerCapabilities = awsServerCapabilities
-    }
-}
+data class AwsExtendedInitializeResult(val awsServerCapabilities: AwsServerCapabilities) : InitializeResult()

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

@@ -17,18 +17,18 @@
 )
 
 data class AwsClientCapabilities(
-    val q: DeveloperProfiles,
-    val window: WindowSettings,
+    val q: QCapabilities,
+    val window: WindowCapabilities,
 )
 
-data class DeveloperProfiles(
+data class QCapabilities(
     val developerProfiles: Boolean,
     val mcp: Boolean,
     val pinnedContextEnabled: Boolean,
     val workspaceFilePath: String?,
 )
 
-data class WindowSettings(
+data class WindowCapabilities(
     val showSaveFileDialog: Boolean,
 )
 
@@ -62,13 +62,13 @@
                 name = metadata.parentProduct
             ),
             awsClientCapabilities = AwsClientCapabilities(
-                q = DeveloperProfiles(
+                q = QCapabilities(
                     developerProfiles = true,
                     mcp = true,
                     pinnedContextEnabled = true,
                     workspaceFilePath = project.workspaceFile?.path,
                 ),
-                window = WindowSettings(
+                window = WindowCapabilities(
                     showSaveFileDialog = true
                 )
             ),

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/AwsServerCapabilitiesProvider.kt → plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/AwsServerCapabilities.kt

@@ -1,44 +1,10 @@
 // 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.flareChat
+package software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws
 
-import com.intellij.openapi.components.Service
-import com.intellij.openapi.components.service
-import com.intellij.openapi.project.Project
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.IconType
 
-@Service(Service.Level.PROJECT)
-class AwsServerCapabilitiesProvider {
-    private var serverCapabilities: AwsServerCapabilities? = null
-
-    fun setAwsServerCapabilities(serverCapabilities: AwsServerCapabilities?) {
-        this.serverCapabilities = serverCapabilities
-    }
-
-    fun getChatOptions() = serverCapabilities?.chatOptions ?: DEFAULT_CHAT_OPTIONS
-
-    companion object {
-        fun getInstance(project: Project) = project.service<AwsServerCapabilitiesProvider>()
-
-        private val DEFAULT_CHAT_OPTIONS: ChatOptions = ChatOptions(
-            QuickActions(
-                listOf(
-                    QuickActionsCommandGroups(
-                        listOf(
-                            QuickActionCommand("/help", "Learn more about Amazon Q then"),
-                            QuickActionCommand("/clear", "Clear this session")
-                        )
-                    )
-                )
-            ),
-            history = true,
-            export = true,
-            mcpServers = true
-        )
-    }
-}
-
 data class AwsServerCapabilities(
     val chatOptions: ChatOptions,
 )
@@ -48,6 +14,7 @@
     val history: Boolean,
     val export: Boolean,
     val mcpServers: Boolean,
+    val modelSelection: Boolean,
 )
 
 data class QuickActions(

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/ChatPrompt.kt

@@ -4,7 +4,7 @@
 package software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.ContextCommand
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.ContextCommand
 
 data class ChatPrompt(
     val prompt: String,

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/SendChatPrompt.kt

@@ -4,7 +4,7 @@
 package software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat
 
 import org.eclipse.lsp4j.TextDocumentIdentifier
-import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.ContextCommand
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.ContextCommand
 
 data class ChatParams(
     val tabId: String,