Merge remote-tracking branch 'origin/main' into HEAD

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

Author: rli

.changes/3.74.json

@@ -0,0 +1,11 @@
+{
+  "date" : "2025-06-05",
+  "version" : "3.74",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "Agentic coding experience: Amazon Q can now write code and run shell commands on your behalf"
+  }, {
+    "type" : "bugfix",
+    "description" : "Support full Unicode range in inline chat panel on Windows"
+  } ]
+}

.changes/next-release/bugfix-061149bd-c6ef-4c86-9f12-98e38fe3b576.json

@@ -1,3 +1,7 @@
+# _3.74_ (2025-06-05)
+- **(Feature)** Agentic coding experience: Amazon Q can now write code and run shell commands on your behalf
+- **(Bug Fix)** Support full Unicode range in inline chat panel on Windows
+
 # _3.73_ (2025-05-29)
 - **(Bug Fix)** /transform: handle InvalidGrantException properly when polling job status
 

CHANGELOG.md

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

gradle.properties

@@ -25,6 +25,7 @@ import software.aws.toolkits.jetbrains.isDeveloperMode
 import software.aws.toolkits.jetbrains.services.amazonq.apps.AmazonQAppInitContext
 import software.aws.toolkits.jetbrains.services.amazonq.apps.AppConnection
 import software.aws.toolkits.jetbrains.services.amazonq.commands.MessageTypeRegistry
+import software.aws.toolkits.jetbrains.services.amazonq.isQSupportedInThisVersion
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLspService
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.AsyncChatUiListener
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.FlareUiMessage
@@ -41,6 +42,7 @@ import software.aws.toolkits.jetbrains.services.amazonqCodeTest.auth.isCodeTestA
 import software.aws.toolkits.jetbrains.services.amazonqDoc.auth.isDocAvailable
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.auth.isFeatureDevAvailable
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.isCodeTransformAvailable
+import software.aws.toolkits.resources.message
 import java.nio.file.Paths
 import java.util.concurrent.CompletableFuture
 import javax.swing.JButton
@@ -102,6 +104,9 @@ class AmazonQPanel(val project: Project, private val scope: CoroutineScope) : Di
                 webviewContainer.add(JBTextArea("JCEF not supported"))
             }
             browser.complete(null)
+        } else if (!isQSupportedInThisVersion()) {
+            webviewContainer.add(JBTextArea("${message("q.unavailable")}\n ${message("q.unavailable.node")}"))
+            browser.complete(null)
         } else {
             val loadingPanel = JBLoadingPanel(null, this)
             val wrapper = Wrapper()

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

@@ -224,7 +224,7 @@ class BrowserConnector(
                 )
 
                 val serializedEnrichmentParams = serializer.objectMapper.valueToTree<ObjectNode>(enrichmentParams)
-                val chatParams: ObjectNode = (node as ObjectNode)
+                val chatParams: ObjectNode = (node.params as ObjectNode)
                     .setAll(serializedEnrichmentParams)
 
                 val tabId = requestFromUi.params.tabId
@@ -235,7 +235,7 @@ class BrowserConnector(
                 val result = AmazonQLspService.executeIfRunning(project) { server ->
                     encryptionManager = this.encryptionManager
 
-                    val encryptedParams = EncryptedChatParams(this.encryptionManager.encrypt(chatParams.params), partialResultToken)
+                    val encryptedParams = EncryptedChatParams(this.encryptionManager.encrypt(chatParams), partialResultToken)
                     rawEndpoint.request(SEND_CHAT_COMMAND_PROMPT, encryptedParams) as CompletableFuture<String>
                 } ?: (CompletableFuture.failedFuture(IllegalStateException("LSP Server not running")))
 

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

@@ -29,7 +29,7 @@ class ActionRegistrar {
 
     fun reportMessageClick(command: EditorContextCommand, project: Project) {
         if (command == EditorContextCommand.GenerateUnitTests) {
-            AsyncChatUiListener.notifyPartialMessageUpdate(Gson().toJson(TestCommandMessage()))
+            AsyncChatUiListener.notifyPartialMessageUpdate(project, Gson().toJson(TestCommandMessage()))
         } else {
             // new agentic chat route
             ApplicationManager.getApplication().executeOnPooledThread {
@@ -45,7 +45,7 @@ class ActionRegistrar {
                         val params = SendToPromptParams(selection = codeSelection, triggerType = TriggerType.CONTEXT_MENU)
                         uiMessage = FlareUiMessage(command = SEND_TO_PROMPT, params = params)
                     }
-                    AsyncChatUiListener.notifyPartialMessageUpdate(uiMessage)
+                    AsyncChatUiListener.notifyPartialMessageUpdate(project, uiMessage)
                 }
             }
         }

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/commands/ActionRegistrar.kt

@@ -4,6 +4,7 @@
 package software.aws.toolkits.jetbrains.services.cwc.commands.codescan.actions
 
 import com.intellij.openapi.actionSystem.ActionManager
+import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.DataKey
@@ -18,7 +19,14 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SendT
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.TriggerType
 
 class ExplainCodeIssueAction : AnAction(), DumbAware {
+    override fun getActionUpdateThread() = ActionUpdateThread.BGT
+
+    override fun update(e: AnActionEvent) {
+        e.presentation.isEnabledAndVisible = e.project != null
+    }
+
     override fun actionPerformed(e: AnActionEvent) {
+        val project = e.project ?: return
         val issueDataKey = DataKey.create<MutableMap<String, String>>("amazonq.codescan.explainissue")
         val issueContext = e.getData(issueDataKey) ?: return
 
@@ -50,7 +58,7 @@ class ExplainCodeIssueAction : AnAction(), DumbAware {
                 )
 
                 val uiMessage = FlareUiMessage(SEND_TO_PROMPT, params)
-                AsyncChatUiListener.notifyPartialMessageUpdate(uiMessage)
+                AsyncChatUiListener.notifyPartialMessageUpdate(project, uiMessage)
             }
         }
     }

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/commands/codescan/actions/ExplainCodeIssueAction.kt

@@ -3,7 +3,9 @@
 
 package software.aws.toolkits.jetbrains.services.amazonq
 
+import com.intellij.openapi.application.ApplicationInfo
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.util.BuildNumber
 import com.intellij.openapi.util.SystemInfo
 import software.amazon.awssdk.services.codewhispererruntime.model.IdeCategory
 import software.amazon.awssdk.services.codewhispererruntime.model.OperatingSystem
@@ -52,3 +54,12 @@ fun codeWhispererUserContext(): UserContext = ClientMetadata.getDefault().let {
         .ideVersion(it.awsVersion)
         .build()
 }
+
+fun isQSupportedInThisVersion(): Boolean {
+    val currentBuild = ApplicationInfo.getInstance().build.withoutProductCode()
+
+    return !(
+        currentBuild.baselineVersion == 242 &&
+            BuildNumber.fromString("242.22855.74")?.let { currentBuild < it } == true
+        )
+}

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

@@ -158,18 +158,21 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
             // 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)
-                        ?: throw IllegalArgumentException("Cannot find file: $fileToOpen")
-
-                    FileEditorManager.getInstance(project).openFile(virtualFile, true)
-                } catch (e: Exception) {
-                    LOG.warn { "Failed to show document: $fileToOpen" }
-                }
-            }
+            return CompletableFuture.supplyAsync(
+                {
+                    try {
+                        val virtualFile = VirtualFileManager.getInstance().refreshAndFindFileByUrl(fileToOpen)
+                            ?: throw IllegalArgumentException("Cannot find file: $fileToOpen")
 
-            return CompletableFuture.completedFuture(ShowDocumentResult(true))
+                        FileEditorManager.getInstance(project).openFile(virtualFile, true)
+                        ShowDocumentResult(true)
+                    } catch (e: Exception) {
+                        LOG.warn { "Failed to show document: $fileToOpen" }
+                        ShowDocumentResult(false)
+                    }
+                },
+                ApplicationManager.getApplication()::invokeLater
+            )
         } catch (e: Exception) {
             LOG.warn { "Error showing document" }
             return CompletableFuture.completedFuture(ShowDocumentResult(false))
@@ -312,6 +315,7 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
 
     override fun sendChatUpdate(params: LSPAny): CompletableFuture<Unit> {
         AsyncChatUiListener.notifyPartialMessageUpdate(
+            project,
             FlareUiMessage(
                 command = CHAT_SEND_UPDATE,
                 params = params,