Merge main into feature/build-execute

Author: aws-toolkit-automation

.changes/3.87.json

@@ -0,0 +1,11 @@
+{
+  "date" : "2025-07-30",
+  "version" : "3.87",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "change to use promptStickyCard to for image verification notification"
+  }, {
+    "type" : "bugfix",
+    "description" : "Suppress IDE error when current editor context is not valid for Amazon Q"
+  } ]
+}

.changes/next-release/bugfix-7ceafecb-844d-46ce-a68d-b28360840ab6.json

@@ -34,13 +34,13 @@ jobs:
           tool-cache: false
           large-packages: false
       - name: 'Qodana Scan'
-        uses: JetBrains/qodana-action@v2024.2.3
+        uses: JetBrains/qodana-action@v2025.1.1
         env:
           QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
         with:
           # --config points to the DuplicatedCode-only Qodana config
           args:
-            --config,${{ github.workspace }}/qodana-configs/duplicated-code/qodana.yaml
+            --config,qodana-configs/duplicated-code/qodana.yaml
           cache-default-branch-only: true
           # pr-mode off means that the whole repo should be checked for duplicate code, instead of just copy/pastes within the PR
           pr-mode: false

.changes/next-release/bugfix-846e7004-5426-4f6b-970f-2b9437314b98.json

@@ -34,7 +34,7 @@ jobs:
           tool-cache: false
           large-packages: false
       - name: 'Qodana Scan'
-        uses: JetBrains/qodana-action@v2024.2.3
+        uses: JetBrains/qodana-action@v2025.1.1
         env:
           QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
         with:

.github/workflows/qodana-check-duplicatedcode.yml

@@ -1,3 +1,7 @@
+# _3.87_ (2025-07-30)
+- **(Bug Fix)** change to use promptStickyCard to for image verification notification
+- **(Bug Fix)** Suppress IDE error when current editor context is not valid for Amazon Q
+
 # _3.86_ (2025-07-16)
 - **(Bug Fix)** - Fixed "Insert to Cursor" button to correctly insert code blocks at the current cursor position in the active file
 

.github/workflows/qodana-check.yml

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

CHANGELOG.md

@@ -463,6 +463,7 @@ private class AmazonQServerInstance(private val project: Project, private val cs
 
         val node = if (SystemInfo.isWindows) "node.exe" else "node"
         val nodePath = getNodeRuntimePath(artifact.resolve(node))
+        val emptyFile = Files.createTempFile("empty", null).toAbsolutePath().toString()
 
         val cmd = NodeExePatcher.patch(nodePath)
             .withParameters(
@@ -476,6 +477,9 @@ private class AmazonQServerInstance(private val project: Project, private val cs
                         put("NODE_EXTRA_CA_CERTS", it)
                     }
 
+                    put("AWS_CONFIG_FILE", emptyFile)
+                    put("AWS_SHARED_CREDENTIALS_FILE", emptyFile)
+
                     // assume default endpoint will pick correct proxy if needed
                     val qUri = URI(QDefaultServiceConfig.ENDPOINT)
                     val proxy = JdkProxyProvider.getInstance().proxySelector.select(qUri)