feat(amazonq): client emits endChat when conversation ended

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt

@@ -7,6 +7,7 @@
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.runInEdt
+import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Disposer
 import com.intellij.ui.components.JBLoadingPanel
 import com.intellij.ui.components.JBPanelWithEmptyText
@@ -24,7 +25,7 @@
 import java.util.concurrent.CompletableFuture
 import javax.swing.JButton
 
-class AmazonQPanel(private val parent: Disposable) {
+class AmazonQPanel(private val parent: Disposable, val project: Project) {
     private val webviewContainer = Wrapper()
     val browser = CompletableFuture<Browser>()
 
@@ -91,7 +92,7 @@
                 loadingPanel.stopLoading()
                 runInEdt {
                     browser.complete(
-                        Browser(parent, webUri).also {
+                        Browser(parent, webUri, project).also {
                             wrapper.setContent(it.component())
                         }
                     )

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindow.kt

@@ -49,7 +49,7 @@
     private val browserConnector = BrowserConnector(project = project)
     private val editorThemeAdapter = EditorThemeAdapter()
 
-    private val chatPanel = AmazonQPanel(parent = this)
+    private val chatPanel = AmazonQPanel(parent = this, project)
 
     val component: JComponent = chatPanel.component
 

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

@@ -5,9 +5,12 @@
 
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.intellij.openapi.Disposable
+import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Disposer
 import com.intellij.ui.jcef.JBCefJSQuery
 import org.cef.CefApp
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLspService
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.AwsServerCapabilitiesProvider
 import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfile
 import software.aws.toolkits.jetbrains.services.amazonq.util.HighlightCommand
 import software.aws.toolkits.jetbrains.services.amazonq.util.createBrowser
@@ -17,7 +20,8 @@
 /*
 Displays the web view for the Amazon Q tool window
  */
-class Browser(parent: Disposable, private val webUri: URI) : Disposable {
+
+class Browser(parent: Disposable, private val webUri: URI, val project: Project) : Disposable {
 
     val jcefBrowser = createBrowser(parent)
 
@@ -39,8 +43,17 @@
                 "mynah",
                 AssetResourceHandler.AssetResourceHandlerFactory(),
             )
-
-        loadWebView(isCodeTransformAvailable, isFeatureDevAvailable, isDocAvailable, isCodeScanAvailable, isCodeTestAvailable, highlightCommand, activeProfile)
+        AmazonQLspService.getInstance(project).addServerStartedListener {
+            loadWebView(
+                isCodeTransformAvailable,
+                isFeatureDevAvailable,
+                isDocAvailable,
+                isCodeScanAvailable,
+                isCodeTestAvailable,
+                highlightCommand,
+                activeProfile
+            )
+        }
     }
 
     override fun dispose() {
@@ -101,6 +114,7 @@
         highlightCommand: HighlightCommand?,
         activeProfile: QRegionProfile?,
     ): String {
+        val quickActionConfig = generateQuickActionConfig()
         val postMessageToJavaJsCode = receiveMessageQuery.inject("JSON.stringify(message)")
         val jsScripts = """
             <script type="text/javascript" src="$webUri" defer onload="init()"></script>
@@ -113,7 +127,7 @@
                             }
                         }, 
                         {
-                        quickActionCommands: [],
+                        quickActionCommands: $quickActionConfig,
                         disclaimerAcknowledged: ${MeetQSettings.getInstance().disclaimerAcknowledged}
                         }
                     );
@@ -220,6 +234,10 @@
         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

@@ -17,6 +17,7 @@
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.merge
 import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.future.await
 import kotlinx.coroutines.launch
 import org.cef.browser.CefBrowser
 import org.eclipse.lsp4j.Position
@@ -27,11 +28,16 @@
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.encryption.JwtEncryptionManager
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.ChatCommunicationManager
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.getTextDocumentIdentifier
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_QUICK_ACTION
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatPrompt
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CursorState
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.EncryptedChatParams
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.EncryptedQuickActionChatParams
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.EndChatParams
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.QuickChatActionRequest
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SEND_CHAT_COMMAND_PROMPT
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SEND_END_CHAT
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SendChatPromptRequest
 import software.aws.toolkits.jetbrains.services.amazonq.util.command
 import software.aws.toolkits.jetbrains.services.amazonq.util.tabType
@@ -167,32 +173,69 @@
                     )
                 )
 
-                val partialResultToken = chatCommunicationManager.addPartialChatMessage(requestFromUi.params.tabId)
                 val chatParams = ChatParams(
                     requestFromUi.params.tabId,
                     chatPrompt,
                     textDocumentIdentifier,
                     cursorState
                 )
 
+                val tabId = requestFromUi.params.tabId
+                val partialResultToken = chatCommunicationManager.addPartialChatMessage(tabId)
+
                 var encryptionManager: JwtEncryptionManager? = null
                 val result = AmazonQLspService.executeIfRunning(project) { server ->
                     encryptionManager = this.encryptionManager
                     encryptionManager?.encrypt(chatParams)?.let { EncryptedChatParams(it, partialResultToken) }?.let { server.sendChatPrompt(it) }
                 } ?: (CompletableFuture.failedFuture(IllegalStateException("LSP Server not running")))
+                showResult(result, partialResultToken, tabId, encryptionManager, browser)
+            }
+            CHAT_QUICK_ACTION -> {
+                val requestFromUi = serializer.deserializeChatMessages(node, QuickChatActionRequest::class.java)
+                val tabId = requestFromUi.params.tabId
+                val quickActionParams = requestFromUi.params
+                val partialResultToken = chatCommunicationManager.addPartialChatMessage(tabId)
+                var encryptionManager: JwtEncryptionManager? = null
+                val result = AmazonQLspService.executeIfRunning(project) { server ->
+                    encryptionManager = this.encryptionManager
+                    encryptionManager?.encrypt(quickActionParams)?.let {
+                        EncryptedQuickActionChatParams(it, partialResultToken)
+                    }?.let {
+                        server.sendQuickAction(it)
+                    }
+                } ?: (CompletableFuture.failedFuture(IllegalStateException("LSP Server not running")))
 
-                result.whenComplete {
-                        value, error ->
-                    chatCommunicationManager.removePartialChatMessage(partialResultToken)
-                    val messageToChat = ChatCommunicationManager.convertToJsonToSendToChat(
-                        node.command,
-                        requestFromUi.params.tabId,
-                        encryptionManager?.decrypt(value).orEmpty(),
-                        isPartialResult = false
-                    )
-                    browser.postChat(messageToChat)
+                showResult(result, partialResultToken, tabId, encryptionManager, browser)
+            }
+            SEND_END_CHAT -> {
+                val requestFromUi = serializer.deserializeChatMessages(node, EndChatParams::class.java)
+                val endChatParams = EndChatParams(requestFromUi.tabId)
+                val result = AmazonQLspService.executeIfRunning(project) { server ->
+                    server.endChat(endChatParams)
+                } ?: CompletableFuture.failedFuture(IllegalStateException("LSP Server not running"))
+                result.whenComplete { value, error ->
+                    chatCommunicationManager.removePartialChatMessage(requestFromUi.tabId)
                 }
             }
         }
     }
+
+    private fun showResult(
+        result: CompletableFuture<String>,
+        partialResultToken: String,
+        tabId: String,
+        encryptionManager: JwtEncryptionManager?,
+        browser: Browser,
+    ) {
+        result.whenComplete { value, error ->
+            chatCommunicationManager.removePartialChatMessage(partialResultToken)
+            val messageToChat = ChatCommunicationManager.convertToJsonToSendToChat(
+                SEND_CHAT_COMMAND_PROMPT,
+                tabId,
+                encryptionManager?.decrypt(value).orEmpty(),
+                isPartialResult = false
+            )
+            browser.postChat(messageToChat)
+        }
+    }
 }

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

@@ -10,6 +10,8 @@ import org.eclipse.lsp4j.services.LanguageServer
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.GetConfigurationFromServerParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.LspServerConfigurations
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.EncryptedChatParams
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.EncryptedQuickActionChatParams
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.EndChatParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.credentials.UpdateCredentialsPayload
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.dependencies.DidChangeDependencyPathsParams
 import java.util.concurrent.CompletableFuture
@@ -33,4 +35,10 @@ interface AmazonQLanguageServer : LanguageServer {
 
     @JsonRequest("aws/chat/sendChatPrompt")
     fun sendChatPrompt(params: EncryptedChatParams): CompletableFuture<String>
+
+    @JsonRequest("aws/chat/sendChatQuickAction")
+    fun sendQuickAction(params: EncryptedQuickActionChatParams): CompletableFuture<String>
+
+    @JsonRequest("aws/chat/endChat")
+    fun endChat(params: EndChatParams): CompletableFuture<Boolean>
 }

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

@@ -40,7 +40,9 @@
 import org.eclipse.lsp4j.TextDocumentClientCapabilities
 import org.eclipse.lsp4j.WorkspaceClientCapabilities
 import org.eclipse.lsp4j.jsonrpc.Launcher
-import org.eclipse.lsp4j.launch.LSPLauncher
+import org.eclipse.lsp4j.jsonrpc.Launcher.Builder
+import org.eclipse.lsp4j.jsonrpc.MessageConsumer
+import org.eclipse.lsp4j.jsonrpc.messages.ResponseMessage
 import org.slf4j.event.Level
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.info
@@ -50,6 +52,9 @@
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.auth.DefaultAuthCredentialsService
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.dependencies.DefaultModuleDependenciesService
 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
@@ -101,6 +106,10 @@
 
 @Service(Service.Level.PROJECT)
 class AmazonQLspService(private val project: Project, private val cs: CoroutineScope) : Disposable {
+    private val serverStartedListener = mutableListOf<AmazonQServerStartedListener>()
+    fun addServerStartedListener(listener: AmazonQServerStartedListener) = serverStartedListener.add(listener)
+    fun notifyServerStarted() = serverStartedListener.forEach { it() }
+
     private var instance: Deferred<AmazonQServerInstance>
     val capabilities
         get() = instance.getCompleted().initializeResult.getCompleted().capabilities
@@ -265,7 +274,20 @@
         launcherHandler.addProcessListener(inputWrapper)
         launcherHandler.startNotify()
 
-        launcher = LSPLauncher.Builder<AmazonQLanguageServer>()
+        class AmazonQServerBuilder : Builder<AmazonQLanguageServer>() {
+
+            override fun wrapMessageConsumer(consumer: MessageConsumer?): MessageConsumer =
+                super.wrapMessageConsumer { message ->
+                    if (message is ResponseMessage && message.result is AwsExtendedInitializeResult) {
+                        val result = message.result as AwsExtendedInitializeResult
+                        AwsServerCapabilitiesProvider.getInstance(project).setAwsServerCapabilities(result.getAwsServerCapabilities())
+                        AmazonQLspService.getInstance(project).notifyServerStarted()
+                    }
+                    consumer?.consume(message)
+                }
+        }
+
+        launcher = AmazonQServerBuilder()
             .setLocalService(AmazonQLanguageClientImpl(project))
             .setRemoteInterface(AmazonQLanguageServer::class.java)
             .configureGson {
@@ -274,6 +296,7 @@
 
                 // otherwise Gson treats all numbers as double which causes deser issues
                 it.setObjectToNumberStrategy(ToNumberPolicy.LONG_OR_DOUBLE)
+                it.registerTypeAdapterFactory(AmazonQLspTypeAdapterFactory())
             }.traceMessages(
                 PrintWriter(
                     object : StringWriter() {
@@ -352,3 +375,5 @@
         private val LOG = getLogger<AmazonQServerInstance>()
     }
 }
+
+typealias AmazonQServerStartedListener = () -> Unit

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

@@ -0,0 +1,42 @@
+// 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.flareChat
+
+import com.google.gson.Gson
+import com.google.gson.TypeAdapter
+import com.google.gson.TypeAdapterFactory
+import com.google.gson.stream.JsonReader
+import com.google.gson.stream.JsonWriter
+import org.eclipse.lsp4j.InitializeResult
+import java.io.IOException
+
+class AmazonQLspTypeAdapterFactory : TypeAdapterFactory {
+    override fun <T : Any?> create(gson: Gson, type: com.google.gson.reflect.TypeToken<T>): TypeAdapter<T>? {
+        if (type.rawType === InitializeResult::class.java) {
+            val delegate: TypeAdapter<InitializeResult?> = gson.getDelegateAdapter(this, type) as TypeAdapter<InitializeResult?>
+
+            return object : TypeAdapter<InitializeResult>() {
+                @Throws(IOException::class)
+                override fun write(out: JsonWriter?, value: InitializeResult?) {
+                    delegate.write(out, value)
+                }
+
+                @Throws(IOException::class)
+                override fun read(`in`: JsonReader?): InitializeResult =
+                    gson.fromJson(`in`, AwsExtendedInitializeResult::class.java)
+            } as TypeAdapter<T>
+        }
+        return null
+    }
+}
+
+class AwsExtendedInitializeResult : InitializeResult() {
+    private var awsServerCapabilities: AwsServerCapabilities? = null
+
+    fun getAwsServerCapabilities(): AwsServerCapabilities? = awsServerCapabilities
+
+    fun setAwsServerCapabilities(awsServerCapabilities: AwsServerCapabilities?) {
+        this.awsServerCapabilities = awsServerCapabilities
+    }
+}