Merge branch 'main' into q-inline-jb-api

Author: andrewyuq

.changes/3.79.json

@@ -0,0 +1,11 @@
+{
+  "date" : "2025-06-25",
+  "version" : "3.79",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "/transform: run all builds client-side"
+  }, {
+    "type" : "feature",
+    "description" : "Amazon Q Chat: Pin context items in chat and manage workspace rules"
+  } ]
+}

.changes/next-release/feature-065d979a-e921-4252-a9a7-f0c2079015f3.json

@@ -1,3 +1,7 @@
+# _3.79_ (2025-06-25)
+- **(Feature)** /transform: run all builds client-side
+- **(Feature)** Amazon Q Chat: Pin context items in chat and manage workspace rules
+
 # _3.78_ (2025-06-18)
 - **(Feature)** Add model selection feature
 

.changes/next-release/feature-7e2ed4ba-b795-4c82-a99a-da610a0432c8.json

@@ -43,5 +43,11 @@ dependencyResolutionManagement {
                 includeGroupByRegex("org\\.jetbrains\\.intellij\\.platform.*")
             }
         }
+        maven {
+            url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
+            content {
+                includeGroupByRegex("org\\.mockito\\.kotlin")
+            }
+        }
     }
 }

CHANGELOG.md

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.79-SNAPSHOT
+toolkitVersion=3.80-SNAPSHOT
 
 # Publish Settings
 publishToken=

buildSrc/settings.gradle.kts

@@ -10,7 +10,7 @@ detekt = "1.23.7"
 diff-util = "4.12"
 intellijExt = "1.1.8"
 # match with <root>/settings.gradle.kts
-intellijGradle = "2.3.0"
+intellijGradle = "2.6.0"
 intellijRemoteRobot = "0.11.22"
 jackson = "2.17.2"
 jacoco = "0.8.12"
@@ -24,7 +24,7 @@ kotlin = "2.1.20"
 kotlinCoroutines = "1.8.0"
 lsp4j = "0.24.0"
 mockito = "5.12.0"
-mockitoKotlin = "5.4.0"
+mockitoKotlin = "5.4.1-SNAPSHOT"
 mockk = "1.13.17"
 nimbus-jose-jwt = "9.40"
 node-gradle = "7.0.2"

gradle.properties

@@ -7,8 +7,10 @@ import com.intellij.icons.AllIcons
 import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.progress.currentThreadCoroutineScope
 import com.intellij.openapi.project.DumbAwareAction
 import com.intellij.util.messages.Topic
+import kotlinx.coroutines.launch
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLspService
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.ChatCommunicationManager
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_TAB_REMOVE
@@ -22,9 +24,11 @@ class QRefreshPanelAction : DumbAwareAction(AmazonQBundle.message("amazonq.refre
 
         // Notify LSP server about all open tabs being removed
         val chatManager = ChatCommunicationManager.getInstance(project)
-        chatManager.getAllTabIds().forEach { tabId ->
-            AmazonQLspService.executeIfRunning(project) { server ->
-                rawEndpoint.notify(CHAT_TAB_REMOVE, mapOf("tabId" to tabId))
+        currentThreadCoroutineScope().launch {
+            chatManager.getAllTabIds().forEach { tabId ->
+                AmazonQLspService.executeAsyncIfRunning(project) {
+                    rawEndpoint.notify(CHAT_TAB_REMOVE, mapOf("tabId" to tabId))
+                }
             }
         }
 

gradle/libs.versions.toml

@@ -116,7 +116,7 @@ class BrowserConnector(
     private val themeBrowserAdapter: ThemeBrowserAdapter = ThemeBrowserAdapter(),
     private val project: Project,
 ) {
-    var uiReady = CompletableDeferred<Boolean>()
+    val uiReady = CompletableDeferred<Boolean>()
     private val chatCommunicationManager = ChatCommunicationManager.getInstance(project)
     private val chatAsyncResultManager = ChatAsyncResultManager.getInstance(project)
 
@@ -216,7 +216,7 @@ class BrowserConnector(
         }
     }
 
-    private fun handleFlareChatMessages(browser: Browser, node: JsonNode) {
+    private suspend fun handleFlareChatMessages(browser: Browser, node: JsonNode) {
         when (node.command) {
             SEND_CHAT_COMMAND_PROMPT -> {
                 val requestFromUi = serializer.deserializeChatMessages<SendChatPromptRequest>(node)
@@ -238,7 +238,7 @@ class BrowserConnector(
                 chatCommunicationManager.registerPartialResultToken(partialResultToken)
 
                 var encryptionManager: JwtEncryptionManager? = null
-                val result = AmazonQLspService.executeIfRunning(project) { server ->
+                val result = AmazonQLspService.executeAsyncIfRunning(project) { server ->
                     encryptionManager = this.encryptionManager
 
                     val encryptedParams = EncryptedChatParams(this.encryptionManager.encrypt(chatParams), partialResultToken)
@@ -258,7 +258,7 @@ class BrowserConnector(
                 val partialResultToken = chatCommunicationManager.addPartialChatMessage(tabId)
                 chatCommunicationManager.registerPartialResultToken(partialResultToken)
                 var encryptionManager: JwtEncryptionManager? = null
-                val result = AmazonQLspService.executeIfRunning(project) { server ->
+                val result = AmazonQLspService.executeAsyncIfRunning(project) { server ->
                     encryptionManager = this.encryptionManager
 
                     val encryptedParams = EncryptedQuickActionChatParams(this.encryptionManager.encrypt(quickActionParams), partialResultToken)
@@ -613,7 +613,7 @@ class BrowserConnector(
         }
     }
 
-    private inline fun <reified Request, Response> handleChat(
+    private suspend inline fun <reified Request, Response> handleChat(
         lspMethod: JsonRpcMethod<Request, Response>,
         node: JsonNode,
         crossinline serverAction: (params: Request, invokeService: () -> CompletableFuture<Response>) -> CompletableFuture<Response>,
@@ -624,7 +624,7 @@ class BrowserConnector(
             serializer.deserializeChatMessages<Request>(node.params, lspMethod.params)
         }
 
-        return AmazonQLspService.executeIfRunning(project) { _ ->
+        return AmazonQLspService.executeAsyncIfRunning(project) { _ ->
             val invokeService = when (lspMethod) {
                 is JsonRpcNotification<Request> -> {
                     // notify is Unit
@@ -646,7 +646,7 @@ class BrowserConnector(
         } ?: CompletableFuture.failedFuture<Response>(IllegalStateException("LSP Server not running"))
     }
 
-    private inline fun <reified Request, Response> handleChat(
+    private suspend inline fun <reified Request, Response> handleChat(
         lspMethod: JsonRpcMethod<Request, Response>,
         node: JsonNode,
     ): CompletableFuture<Response> = handleChat(

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

@@ -170,7 +170,7 @@ class FeatureDevControllerTest : FeatureDevTestBase() {
         whenever(featureDevClient.createTaskAssistConversation()).thenReturn(exampleCreateTaskAssistConversationResponse)
         whenever(featureDevClient.sendFeatureDevTelemetryEvent(any())).thenReturn(exampleSendTelemetryEventResponse)
         whenever(chatSessionStorage.getSession(any(), any())).thenReturn(spySession)
-        doNothing().`when`(chatSessionStorage).deleteSession(any())
+        doNothing().whenever(chatSessionStorage).deleteSession(any())
 
         mockkObject(AmazonqTelemetry)
         every { AmazonqTelemetry.endChat(amazonqConversationId = any(), amazonqEndOfTheConversationLatency = any()) } just runs