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

 Conflicts:
	plugins/amazonq/build.gradle.kts
	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

@@ -1,13 +1,24 @@
 // Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+import com.fasterxml.jackson.databind.DeserializationFeature
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import de.undercouch.gradle.tasks.download.Download
+import org.jetbrains.intellij.platform.gradle.tasks.PrepareSandboxTask
 import software.aws.toolkits.gradle.changelog.tasks.GeneratePluginChangeLog
 
 plugins {
     id("toolkit-publishing-conventions")
     id("toolkit-publish-root-conventions")
     id("toolkit-jvm-conventions")
     id("toolkit-testing")
+    id("de.undercouch.download")
+}
+
+buildscript {
+    dependencies {
+        classpath(libs.bundles.jackson)
+    }
 }
 
 val changelog = tasks.register<GeneratePluginChangeLog>("pluginChangeLog") {
@@ -47,3 +58,81 @@ tasks.check {
         }
     }
 }
+
+val downloadFlareManifest by tasks.registering(Download::class) {
+    src("https://aws-toolkit-language-servers.amazonaws.com/qAgenticChatServer/0/manifest.json")
+    dest(layout.buildDirectory.file("flare/manifest.json"))
+    onlyIfModified(true)
+    useETag(true)
+}
+
+data class FlareManifest(
+    val versions: List<FlareVersion>,
+)
+
+data class FlareVersion(
+    val serverVersion: String,
+    val thirdPartyLicenses: String,
+    val targets: List<FlareTarget>,
+)
+
+data class FlareTarget(
+    val platform: String,
+    val arch: String,
+    val contents: List<FlareContent>
+)
+
+data class FlareContent(
+    val url: String,
+)
+
+val downloadFlareArtifacts by tasks.registering(Download::class) {
+    dependsOn(downloadFlareManifest)
+    inputs.files(downloadFlareManifest)
+
+    val manifestFile = downloadFlareManifest.map { it.outputFiles.first() }
+    val manifest = manifestFile.map { jacksonObjectMapper().disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES).readValue(it.readText(), FlareManifest::class.java) }
+
+    // use darwin-aarch64 because its the smallest and we're going to throw away everything platform specific
+    val latest = manifest.map { it.versions.first() }
+    val latestVersion = latest.map { it.serverVersion }
+    val licensesUrl = latest.map { it.thirdPartyLicenses }
+    val darwin = latest.map { it.targets.first { target -> target.platform == "darwin" && target.arch == "arm64" } }
+    val contentUrls = darwin.map { it.contents.map { content -> content.url } }
+
+    val destination = layout.buildDirectory.dir(latestVersion.map { "flare/$it" })
+    outputs.dir(destination)
+
+    src(contentUrls.zip(licensesUrl) { left, right -> left + right})
+    dest(destination)
+    onlyIfModified(true)
+    useETag(true)
+}
+
+val prepareBundledFlare by tasks.registering(Copy::class) {
+    dependsOn(downloadFlareArtifacts)
+    inputs.files(downloadFlareArtifacts)
+
+    val dest = layout.buildDirectory.dir("tmp/extractFlare")
+    into(dest)
+    from(downloadFlareArtifacts.map { it.outputFiles.filterNot { file -> file.name.endsWith(".zip") } })
+
+    doLast {
+        copy {
+            into(dest)
+            includeEmptyDirs = false
+            downloadFlareArtifacts.get().outputFiles.filter { it.name.endsWith(".zip") }.forEach {
+                dest.get().file(it.parentFile.name).asFile.createNewFile()
+                from(zipTree(it)) {
+                    include("*.js")
+                    include("*.txt")
+                }
+            }
+        }
+    }
+}
+
+tasks.withType<PrepareSandboxTask>().configureEach {
+    intoChild(intellijPlatform.projectName.map { "$it/flare" })
+        .from(prepareBundledFlare)
+}

plugins/amazonq/build.gradle.kts

@@ -9,13 +9,25 @@ import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.project.DumbAwareAction
 import com.intellij.util.messages.Topic
+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
 import software.aws.toolkits.jetbrains.services.amazonq.toolwindow.AmazonQToolWindow
 import software.aws.toolkits.resources.AmazonQBundle
 import java.util.EventListener
 
 class QRefreshPanelAction : DumbAwareAction(AmazonQBundle.message("amazonq.refresh.panel"), null, AllIcons.Actions.Refresh) {
     override fun actionPerformed(e: AnActionEvent) {
         val project = e.project ?: return
+
+        // 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))
+            }
+        }
+
         // recreate chat browser
         AmazonQToolWindow.getInstance(project).disposeAndRecreate()
         // recreate signin browser

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

@@ -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.artifacts.ArtifactManager
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.AsyncChatUiListener
@@ -42,6 +43,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 software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
 import java.util.concurrent.CompletableFuture
 import javax.swing.JButton
@@ -103,6 +105,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 = if (isRunningOnRemoteBackend()) {
                 JBLoadingPanel(null) {

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")))
 
@@ -307,14 +307,19 @@ class BrowserConnector(
             }
 
             CHAT_TAB_ADD -> {
-                handleChat(AmazonQChatServer.tabAdd, node)
+                handleChat(AmazonQChatServer.tabAdd, node) { params, invoke ->
+                    // Track the tab ID when a tab is added
+                    chatCommunicationManager.addTabId(params.tabId)
+                    invoke()
+                }
             }
 
             CHAT_TAB_REMOVE -> {
                 handleChat(AmazonQChatServer.tabRemove, node) { params, invoke ->
                     chatCommunicationManager.removePartialChatMessage(params.tabId)
                     cancelInflightRequests(params.tabId)
-
+                    // Remove the tab ID from tracking when a tab is removed
+                    chatCommunicationManager.removeTabId(params.tabId)
                     invoke()
                 }
             }

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

@@ -16,6 +16,8 @@ data class AmazonQTheme(
     val defaultText: Color,
     val inactiveText: Color,
     val linkText: Color,
+    val lightText: Color,
+    val emptyText: Color,
 
     val background: Color,
     val border: Color,
@@ -31,6 +33,8 @@ data class AmazonQTheme(
     val buttonBackground: Color,
     val secondaryButtonForeground: Color,
     val secondaryButtonBackground: Color,
+    val inputBorderFocused: Color,
+    val inputBorderUnfocused: Color,
 
     val info: Color,
     val success: Color,

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

@@ -16,6 +16,7 @@ enum class CssVariable(
     TextColorAlt("--mynah-color-text-alternate"),
     TextColorStrong("--mynah-color-text-strong"),
     TextColorWeak("--mynah-color-text-weak"),
+    TextColorLight("--mynah-color-light"),
     TextColorLink("--mynah-color-text-link"),
     TextColorInput("--mynah-color-text-input"),
     TextColorDisabled("--mynah-color-text-disabled"),
@@ -27,6 +28,8 @@ enum class CssVariable(
     ColorDeep("--mynah-color-deep"),
     ColorDeepReverse("--mynah-color-deep-reverse"),
     BorderDefault("--mynah-color-border-default"),
+    BorderFocused("--mynah-color-text-input-border-focused"),
+    BorderUnfocused("--mynah-color-text-input-border"),
     InputBackground("--mynah-input-bg"),
 
     SyntaxBackground("--mynah-color-syntax-bg"),