Merge master into feature/amazonqLSP

Author: aws-toolkit-automation

.github/workflows/filterDuplicates.js

@@ -111,6 +111,9 @@ async function run() {
     console.log('%s duplicates found', filteredDuplicates.length)
     if (filteredDuplicates.length > 0) {
         console.log(formatDuplicates(filteredDuplicates, commitHash, repoName))
+        console.log(
+            '* Hint: if these duplicates appear unrelated to the changes, rebase onto or merge in the latest target branch.'
+        )
         process.exit(1)
     }
 }

package-lock.json

@@ -41,7 +41,7 @@
         "skippedTestReport": "ts-node ./scripts/skippedTestReport.ts ./packages/amazonq/test/e2e/"
     },
     "devDependencies": {
-        "@aws-toolkits/telemetry": "^1.0.305",
+        "@aws-toolkits/telemetry": "^1.0.307",
         "@playwright/browser-chromium": "^1.43.1",
         "@stylistic/eslint-plugin": "^2.11.0",
         "@types/he": "^1.2.3",

package.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q chat: Create a new prompt form does not autofocus or submit with Enter press"
+}

packages/amazonq/.changes/next-release/Bug Fix-917c4c75-6019-4d7d-a246-0248cf2be55d.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "/review: Zip files are created with the wrong file path for file scans in multifolder workspaces."
+}

packages/amazonq/.changes/next-release/Bug Fix-b89574ec-9f50-4b4c-b548-30bfce5d0999.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "/review: show code diff for fix preview"
+}

packages/amazonq/.changes/next-release/Feature-6192cfc5-c6cb-4302-bfcf-ec90cac95b72.json

@@ -14,6 +14,7 @@ import { loginToIdC } from './utils/setup'
 import { webviewConstants, webviewTabConstants } from 'aws-core-vscode/amazonq'
 
 describe('Amazon Q Chat', function () {
+    this.retries(3)
     let framework: qTestingFramework
     let tab: Messenger
     let store: MynahUIDataModel

packages/amazonq/test/e2e/amazonq/chat.test.ts

@@ -19,8 +19,10 @@ import { Commands, globals, sleep, waitUntil, collectionUtil } from 'aws-core-vs
 import { loginToIdC } from '../amazonq/utils/setup'
 
 describe('Amazon Q Inline', async function () {
-    let tempFolder: string
     const retries = 3
+    this.retries(retries)
+
+    let tempFolder: string
     const waitOptions = {
         interval: 500,
         timeout: 10000,

packages/amazonq/test/e2e/inline/inline.test.ts

@@ -160,6 +160,29 @@ export class Connector extends BaseConnector {
         )
     }
 
+    onFormTextualItemKeyPress = (
+        tabId: string,
+        event: KeyboardEvent,
+        formData: Record<string, string>,
+        itemId: string,
+        eventId?: string
+    ) => {
+        if (itemId === 'prompt-name' && event.key === 'Enter') {
+            event.preventDefault()
+            this.sendMessageToExtension({
+                command: 'form-action-click',
+                action: {
+                    id: 'submit-create-prompt',
+                    formItemValues: formData,
+                },
+                tabType: this.getTabType(),
+                tabID: tabId,
+            })
+            return true
+        }
+        return false
+    }
+
     handleMessageReceive = async (messageData: any): Promise<void> => {
         if (messageData.type === 'chatMessage') {
             await this.processChatMessage(messageData)

packages/core/src/amazonq/webview/ui/apps/cwChatConnector.ts

@@ -162,6 +162,7 @@ export class Connector extends BaseConnector {
                 body: messageData.message,
                 canBeVoted: false,
                 informationCard: messageData.informationCard,
+                buttons: messageData.buttons ?? [],
             }
             this.onChatAnswerReceived(messageData.tabID, answer, messageData)
         }