Merge branch 'master' into jscpd/addHintMessage

Author: Hweinstock

package-lock.json

@@ -40,7 +40,7 @@
         "mergeReports": "ts-node ./scripts/mergeReports.ts"
     },
     "devDependencies": {
-        "@aws-toolkits/telemetry": "^1.0.295",
+        "@aws-toolkits/telemetry": "^1.0.296",
         "@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 /test: Truncating user input to 4096 characters for unit test generation."
+}

packages/amazonq/.changes/next-release/Bug Fix-aff621e4-1c1a-450e-91a7-8fd63fe90a5d.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "/review: Code review starts automatically when invoked from menu"
+}

packages/amazonq/.changes/next-release/Bug Fix-e9cfb8e0-540c-45ec-b3b7-313ac07c87a7.json

@@ -44,7 +44,8 @@
             "problemMatcher": "$ts-webpack-watch",
             "options": {
                 "cwd": "${workspaceFolder}/../../packages/core"
-            }
+            },
+            "presentation": { "panel": "dedicated" }
         },
         {
             "label": "terminate",

packages/amazonq/.vscode/tasks.json

@@ -25,7 +25,6 @@ export function init(appContext: AmazonQAppInitContext) {
         authClicked: new vscode.EventEmitter<any>(),
         tabOpened: new vscode.EventEmitter<any>(),
         tabClosed: new vscode.EventEmitter<any>(),
-        runScan: new vscode.EventEmitter<any>(),
         formActionClicked: new vscode.EventEmitter<any>(),
         errorThrown: new vscode.EventEmitter<any>(),
         showSecurityScan: new vscode.EventEmitter<any>(),
@@ -35,6 +34,7 @@ export function init(appContext: AmazonQAppInitContext) {
         processResponseBodyLinkClick: new vscode.EventEmitter<any>(),
         fileClicked: new vscode.EventEmitter<any>(),
         scanCancelled: new vscode.EventEmitter<any>(),
+        processChatItemVotedMessage: new vscode.EventEmitter<any>(),
     }
     const dispatcher = new AppToWebViewMessageDispatcher(appContext.getAppsToWebViewMessagePublisher())
     const messenger = new Messenger(dispatcher)

packages/amazonq/src/app/amazonqScan/app.ts

@@ -32,6 +32,7 @@ import {
     scanSummaryMessage,
 } from '../../models/constants'
 import path from 'path'
+import { telemetry } from 'aws-core-vscode/telemetry'
 
 export class ScanController {
     private readonly messenger: Messenger
@@ -48,7 +49,7 @@ export class ScanController {
         this.authController = new AuthController()
 
         this.chatControllerMessageListeners.tabOpened.event((data) => {
-            return this.tabOpened(data)
+            return this.tabOpened(data).then(() => this.scanInitiated(data))
         })
 
         this.chatControllerMessageListeners.tabClosed.event((data) => {
@@ -59,10 +60,6 @@ export class ScanController {
             this.authClicked(data)
         })
 
-        this.chatControllerMessageListeners.runScan.event((data) => {
-            return this.scanInitiated(data)
-        })
-
         this.chatControllerMessageListeners.formActionClicked.event((data) => {
             return this.formActionClicked(data)
         })
@@ -98,6 +95,15 @@ export class ScanController {
         this.chatControllerMessageListeners.scanCancelled.event((data) => {
             return this.handleScanCancelled(data)
         })
+
+        this.chatControllerMessageListeners.processChatItemVotedMessage.event((data) => {
+            telemetry.amazonq_feedback.emit({
+                featureId: 'amazonQReview',
+                amazonqConversationId: this.sessionStorage.getSession().scanUuid,
+                credentialStartUrl: AuthUtil.instance.startUrl,
+                interactionType: data.vote,
+            })
+        })
     }
 
     private async tabOpened(message: any) {

packages/amazonq/src/app/amazonqScan/chat/controller/controller.ts

@@ -40,9 +40,6 @@ export class UIMessageListener {
             case 'auth-follow-up-was-clicked':
                 this.authClicked(msg)
                 break
-            case 'review':
-                this.scan(msg)
-                break
             case 'form-action-click':
                 this.formActionClicked(msg)
                 break
@@ -55,15 +52,12 @@ export class UIMessageListener {
             case 'file-click':
                 this.processFileClick(msg)
                 break
+            case 'chat-item-voted':
+                this.chatItemVoted(msg)
+                break
         }
     }
 
-    private scan(msg: UIMessage) {
-        this.scanControllerEventsEmitters?.runScan.fire({
-            tabID: msg.tabID,
-        })
-    }
-
     private formActionClicked(msg: UIMessage) {
         this.scanControllerEventsEmitters?.formActionClicked.fire({
             ...msg,
@@ -112,4 +106,12 @@ export class UIMessageListener {
             filePath: msg.filePath,
         })
     }
+
+    private chatItemVoted(msg: any) {
+        this.scanControllerEventsEmitters?.processChatItemVotedMessage.fire({
+            tabID: msg.tabID,
+            command: msg.command,
+            vote: msg.vote,
+        })
+    }
 }

packages/amazonq/src/app/amazonqScan/chat/views/actions/uiMessageListener.ts

@@ -424,7 +424,7 @@
         "compileOnly": "tsc -p ./",
         "compileDev": "npm run compile -- --mode development",
         "webpackDev": "webpack --mode development",
-        "serveVue": "webpack serve --config-name vue --mode development",
+        "serveVue": "ts-node ./scripts/build/checkServerPort.ts && webpack serve --port 8080 --config-name vue --mode development",
         "watch": "npm run clean && npm run buildScripts && npm run compileOnly -- --watch",
         "lint": "ts-node ./scripts/lint/testLint.ts",
         "generateClients": "ts-node ./scripts/build/generateServiceClient.ts ",

packages/core/package.json

@@ -0,0 +1,57 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Validate that the required port used by webviews during development is not being used.
+ */
+
+import * as net from 'net'
+
+/** This must be kept up to date with the port that is being used to serve the vue files. */
+const portNumber = 8080
+
+function checkPort(port: number): Promise<boolean> {
+    return new Promise((resolve) => {
+        const server = net.createServer()
+
+        server.once('error', (err) => {
+            if ((err as NodeJS.ErrnoException).code === 'EADDRINUSE') {
+                resolve(true)
+            }
+        })
+
+        server.once('listening', () => {
+            server.close()
+            resolve(false)
+        })
+
+        server.listen(port)
+    })
+}
+
+async function main() {
+    try {
+        const isPortInUse = await checkPort(portNumber)
+
+        if (isPortInUse) {
+            console.error(`
+    @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+
+    ERROR: Webviews will not load as expected, meaning Q may not work.
+    REASON: Port ${portNumber} is already in use, preventing the latest webview files from being served.
+    SOLUTION: Kill the current process using port ${portNumber}.
+              - Unix: "kill -9 $(lsof -t -i :${portNumber})"
+
+    @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+    `)
+            process.exit(1)
+        }
+    } catch (error) {
+        console.error('Error checking port:', error)
+        process.exit(1)
+    }
+}
+
+void main()