Merge main into feature/remote-chat-lsp

aws-toolkit-automation · web-flow · commit 0ea7bc377ea7 · 2025-07-29T12:23:21.000-07:00
diff --git a/.changes/next-release/bugfix-7ceafecb-844d-46ce-a68d-b28360840ab6.json b/.changes/next-release/bugfix-7ceafecb-844d-46ce-a68d-b28360840ab6.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "change to use promptStickyCard to for image verification notification"
+}
diff --git a/.github/workflows/qodana-check-duplicatedcode.yml b/.github/workflows/qodana-check-duplicatedcode.yml
@@ -0,0 +1,49 @@
+name: Qodana - Duplicated Code
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ main, feature/** ]
+  pull_request:
+    branches: [ '**' ]
+
+concurrency:
+  group: ${{ github.workflow }}${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  qodana:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      # PR check
+      checks: write
+      # PR comments
+      pull-requests: write
+      # SARIF upload
+      security-events: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          fetch-depth: 0
+      - name: Maximize Build Space
+        if: runner.os == 'Linux'
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: false
+          large-packages: false
+      - name: 'Qodana Scan'
+        uses: JetBrains/qodana-action@v2025.1.1
+        env:
+          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
+        with:
+          # --config points to the DuplicatedCode-only Qodana config
+          args:
+            --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
+      - uses: github/codeql-action/upload-sarif@v3
+        with:
+          sarif_file: ${{ runner.temp }}/qodana/results/qodana.sarif.json
diff --git a/.github/workflows/qodana-check.yml b/.github/workflows/qodana-check.yml
@@ -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:
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt
@@ -181,12 +181,15 @@ class AmazonQPanel(val project: Project, private val scope: CoroutineScope) : Di
                                                 0
                                             )
 
-                                            val errorJson = OBJECT_MAPPER.writeValueAsString(errorMessages)
-                                            browserInstance.jcefBrowser.cefBrowser.executeJavaScript(
-                                                "window.handleNativeNotify('$errorJson')",
-                                                browserInstance.jcefBrowser.cefBrowser.url,
-                                                0
-                                            )
+                                            if (errorMessages.isNotEmpty()) {
+                                                val errorJson = OBJECT_MAPPER.writeValueAsString(errorMessages)
+                                                browserInstance.jcefBrowser.cefBrowser.executeJavaScript(
+                                                    "window.handleNativeNotify('$errorJson')",
+                                                    browserInstance.jcefBrowser.cefBrowser.url,
+                                                    0
+                                                )
+                                            }
+
                                             dtde.dropComplete(true)
                                         } else {
                                             dtde.dropComplete(false)
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt
@@ -182,11 +182,19 @@ class Browser(parent: Disposable, private val mynahAsset: Path, val project: Pro
                       
                     window.handleNativeNotify = function(errorMessages) {
                         const messages = JSON.parse(errorMessages);
-                        messages.forEach(msg => {
-                            qChat.notify({
-                                content: msg
-                            })
-                        });
+                        let message = messages.join('\n');
+                        qChat.updateStore(qChat.getSelectedTabId(), {
+                            promptInputStickyCard: {
+                                messageId: 'image-verification-banner',
+                                header: {
+                                    icon: 'warning',
+                                    iconStatus: 'warning',
+                                    body: '### Invalid Image',
+                                },
+                                body: message,
+                                canBeDismissed: true,
+                            },
+                        })
                     };
                 }
             </script>        
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt
@@ -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)
diff --git a/plugins/amazonq/src/main/resources/META-INF/plugin.xml b/plugins/amazonq/src/main/resources/META-INF/plugin.xml
@@ -7,34 +7,39 @@
     <description><![CDATA[
     <p>The most capable generative AI-powered assistant for building, operating, and transforming software, with advanced capabilities for managing data and AI</p>
 
-    <h2>Agent capabilities</h2>
+    <h2>Agentic coding experience</h2>
+	<p>Amazon Q Developer uses information across native and MCP server-based tools to intelligently perform actions beyond code suggestions, such as reading files, generating code diffs, and running commands based on your natural language instruction. Simply type your prompt in your preferred language and Q Developer will provide continuous status updates and iteratively apply changes based on your feedback, helping you accomplish tasks faster.</p>
+
     <h3>Implement new features</h3>
-    <p><code>/dev</code> to task Amazon Q with generating new code across your entire project and implement features.</p>
+    <p>Generate new code across your entire project and implement features.</p>
 
     <h3>Generate documentation</h3>
-    <p><code>/doc</code> to task Amazon Q with writing API, technical design, and onboarding documentation.</p>
+    <p>Write API, technical design, and onboarding documentation.</p>
 
     <h3>Automate code reviews</h3>
-    <p><code>/review</code> to ask Amazon Q to perform code reviews, flagging suspicious code patterns and assessing deployment risk.</p>
+    <p>Perform code reviews, flagging suspicious code patterns and assessing deployment risk.</p>
 
     <h3>Generate unit tests</h3>
-    <p><code>/test</code> to ask Amazon Q to generate unit tests and add them to your project, helping you improve code quality, fast.</p>
+    <p>Generate unit tests and add them to your project, helping you improve code quality, fast.</p>
 
     <h3>Transform workloads</h3>
     <p><code>/transform</code> to upgrade your Java applications in minutes, not weeks.</p>
 
     <h2>Core features</h2>
 
+	<h3>MCP support</h3>
+    <p>Add Model Context Protocol (MCP) servers to give Amazon Q Developer access to important context.</p>
+
+    <h3>Inline suggestions</h3>
+    <p>Receive real-time code suggestions ranging from snippets to full functions based on your comments and existing code.</p>
+    <p><i><a href="https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/q-language-ide-support.html">15+ languages supported including Python, TypeScript, Rust, Terraform, AWS Cloudformation, and more</a></i></p>
+
     <h3>Inline chat</h3>
     <p>Seamlessly initial chat within the inline coding experience. Select a section of code that you need assistance with and initiate chat within the editor to request actions such as "Optimize this code", "Add comments", or "Write tests".</p>
 
     <h3>Chat</h3>
     <p>Generate code, explain code, and get answers about software development.</p>
 
-    <h3>Inline suggestions</h3>
-    <p><Receive real-time code suggestions ranging from snippets to full functions based on your comments and existing code.</p>
-    <p><i><a href="https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/q-language-ide-support.html">15+ languages supported including Python, TypeScript, Rust, Terraform, AWS Cloudformation, and more</a></i></p>
-
     <h3>Code reference log</h3>
     <p>Attribute code from Amazon Q that is similar to training data. When code suggestions similar to training data are accepted, they will be added to the code reference log.</p>
 
diff --git a/qodana-configs/duplicated-code/README.md b/qodana-configs/duplicated-code/README.md
@@ -0,0 +1,3 @@
+# Duplicated Code Check
+
+This check only runs the Qodana DuplicatedCode check and should post duplicated code to [Github PRs](../../.github/workflows/qodana-check-duplicatedcode.yml).
diff --git a/qodana-configs/duplicated-code/qodana.yaml b/qodana-configs/duplicated-code/qodana.yaml
@@ -0,0 +1,10 @@
+version: 1.0
+linter: jetbrains/qodana-jvm-community:latest
+projectJDK: "21"
+bootstrap: ./gradlew :plugin-core:sdk-codegen:generateSdks :plugin-core:jetbrains-community:generateTelemetry :plugin-toolkit:jetbrains-rider:generateModels
+exclude:
+  - name: All
+dot-net:
+  solution: ReSharper.AWS.sln
+include:
+  - name: DuplicatedCode
diff --git a/qodana.yaml b/qodana.yaml
@@ -61,3 +61,4 @@ include:
   - name: SimplifiableServiceRetrieving
   - name: QuickFixGetFamilyNameViolation
   - name: TokenSetInParserDefinition
+  - name: DuplicatedCode

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type" : "bugfix",
 +  "description" : "change to use promptStickyCard to for image verification notification"
 +}
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# Duplicated Code Check`
	`2`	`+`
	`3`	`+This check only runs the Qodana DuplicatedCode check and should post duplicated code to [Github PRs](../../.github/workflows/qodana-check-duplicatedcode.yml).`