merge: resolve package-lock conflicts

Author: Hweinstock

package-lock.json

@@ -41,7 +41,7 @@
         "skippedTestReport": "ts-node ./scripts/skippedTestReport.ts ./packages/amazonq/test/e2e/"
     },
     "devDependencies": {
-        "@aws-toolkits/telemetry": "^1.0.307",
+        "@aws-toolkits/telemetry": "^1.0.308",
         "@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": "increase scan timeout to reduce front-end timeout errors"
+}

packages/amazonq/.changes/next-release/Bug Fix-4f680a31-ba5e-4baa-9984-666e0c1c2b72.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

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "/test: display test plan summary in chat after generating tests"
+}

packages/amazonq/.changes/next-release/Feature-96409066-931c-4488-b943-7bee68626547.json

@@ -15,6 +15,7 @@ import {
     ListCodeScanFindingsResponse,
     pollScanJobStatus,
     SecurityScanTimedOutError,
+    CodeWhispererConstants,
 } from 'aws-core-vscode/codewhisperer'
 import { timeoutUtils } from 'aws-core-vscode/shared'
 import assert from 'assert'
@@ -303,7 +304,7 @@ describe('securityScanHandler', function () {
 
             const pollPromise = pollScanJobStatus(mockClient, mockJobId, CodeAnalysisScope.FILE_AUTO, mockStartTime)
 
-            const expectedTimeoutMs = 60_000
+            const expectedTimeoutMs = CodeWhispererConstants.expressScanTimeoutMs
             clock.tick(expectedTimeoutMs + 1000)
 
             await assert.rejects(() => pollPromise, SecurityScanTimedOutError)
@@ -314,7 +315,7 @@ describe('securityScanHandler', function () {
 
             const pollPromise = pollScanJobStatus(mockClient, mockJobId, CodeAnalysisScope.PROJECT, mockStartTime)
 
-            const expectedTimeoutMs = 600_000
+            const expectedTimeoutMs = CodeWhispererConstants.standardScanTimeoutMs
             clock.tick(expectedTimeoutMs + 1000)
 
             await assert.rejects(() => pollPromise, SecurityScanTimedOutError)

packages/amazonq/test/unit/codewhisperer/service/securityScanHandler.test.ts

@@ -504,6 +504,7 @@
         "@aws-sdk/client-ec2": "<3.696.0",
         "@aws-sdk/client-iam": "<3.696.0",
         "@aws-sdk/client-s3": "<3.696.0",
+        "@aws-sdk/client-api-gateway": "<3.696.0",
         "@aws-sdk/lib-storage": "<3.696.0",
         "@aws-sdk/client-lambda": "<3.696.0",
         "@aws-sdk/client-ssm": "<3.696.0",
@@ -517,6 +518,7 @@
         "@aws-sdk/protocol-http": "<3.696.0",
         "@aws-sdk/smithy-client": "<3.696.0",
         "@aws-sdk/util-arn-parser": "<3.696.0",
+        "@aws-sdk/client-codecatalyst": "<3.696.0",
         "@aws-sdk/s3-request-presigner": "<3.696.0",
         "@aws/mynah-ui": "^4.23.1",
         "@gerhobbelt/gitignore-parser": "^0.2.0-9",

packages/core/package.json

@@ -357,6 +357,7 @@ export class LspController {
                     amazonqIndexMemoryUsageInMB: usage ? usage.memoryUsage / (1024 * 1024) : undefined,
                     amazonqIndexCpuUsagePercentage: usage ? usage.cpuUsage : undefined,
                     amazonqIndexFileSizeInMB: totalSizeBytes / (1024 * 1024),
+                    amazonqVectorIndexEnabled: buildIndexConfig.isVectorIndexEnabled,
                     credentialStartUrl: buildIndexConfig.startUrl,
                 })
             } else {
@@ -366,6 +367,7 @@ export class LspController {
                     result: 'Failed',
                     amazonqIndexFileCount: 0,
                     amazonqIndexFileSizeInMB: 0,
+                    amazonqVectorIndexEnabled: buildIndexConfig.isVectorIndexEnabled,
                     reason: `Unknown`,
                 })
             }
@@ -377,6 +379,7 @@ export class LspController {
                 result: 'Failed',
                 amazonqIndexFileCount: 0,
                 amazonqIndexFileSizeInMB: 0,
+                amazonqVectorIndexEnabled: buildIndexConfig.isVectorIndexEnabled,
                 reason: `${error instanceof Error ? error.name : 'Unknown'}`,
                 reasonDesc: `Error when building index. ${error instanceof Error ? error.message : error}`,
             })

packages/core/src/amazonq/lsp/lspController.ts

@@ -86,6 +86,7 @@ export class Connector extends BaseConnector {
 
     onCustomFormAction(
         tabId: string,
+        messageId: string,
         action: {
             id: string
             text?: string | undefined
@@ -105,6 +106,33 @@ export class Connector extends BaseConnector {
             tabID: tabId,
             description: action.description,
         })
+
+        if (this.onChatAnswerUpdated === undefined) {
+            return
+        }
+        const answer: ChatItem = {
+            type: ChatItemType.ANSWER,
+            messageId: messageId,
+            buttons: [],
+        }
+        // TODO: Add more cases for Accept/Reject/viewDiff.
+        switch (action.id) {
+            case 'Provide-Feedback':
+                answer.buttons = [
+                    {
+                        keepCardAfterClick: true,
+                        text: 'Thanks for providing feedback.',
+                        id: 'utg_provided_feedback',
+                        status: 'success',
+                        position: 'outside',
+                        disabled: true,
+                    },
+                ]
+                break
+            default:
+                break
+        }
+        this.onChatAnswerUpdated(tabId, answer)
     }
 
     onFileDiff = (tabID: string, filePath: string, deleted: boolean, messageId?: string): void => {

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

@@ -695,7 +695,7 @@ export class Connector {
                 this.gumbyChatConnector.onCustomFormAction(tabId, action)
                 break
             case 'testgen':
-                this.testChatConnector.onCustomFormAction(tabId, action)
+                this.testChatConnector.onCustomFormAction(tabId, messageId ?? '', action)
                 break
             case 'review':
                 this.scanChatConnector.onCustomFormAction(tabId, action)