Merge master into feature/sdkv3

Author: aws-toolkit-automation

package-lock.json

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

package.json

@@ -501,29 +501,29 @@
         "@aws-sdk/client-cognito-identity": "<3.696.0",
         "@aws-sdk/client-docdb": "<3.696.0",
         "@aws-sdk/client-docdb-elastic": "<3.696.0",
+        "@aws-sdk/client-ec2": "<3.696.0",
+        "@aws-sdk/client-iam": "<3.696.0",
         "@aws-sdk/client-lambda": "<3.696.0",
+        "@aws-sdk/client-ssm": "<3.696.0",
         "@aws-sdk/client-sso": "<3.696.0",
         "@aws-sdk/client-sso-oidc": "<3.696.0",
-        "@aws-sdk/client-ssm": "<3.696.0",
-        "@aws-sdk/client-ec2": "<3.696.0",
-        "@aws-sdk/client-iam": "<3.696.0",
         "@aws-sdk/credential-provider-env": "<3.696.0",
         "@aws-sdk/credential-provider-process": "<3.696.0",
         "@aws-sdk/credential-provider-sso": "<3.696.0",
         "@aws-sdk/property-provider": "<3.696.0",
-        "@aws-sdk/smithy-client": "<3.696.0",
         "@aws-sdk/protocol-http": "<3.696.0",
+        "@aws-sdk/smithy-client": "<3.696.0",
         "@aws-sdk/util-arn-parser": "<3.696.0",
-        "@aws/mynah-ui": "^4.23.0",
+        "@aws/mynah-ui": "^4.23.1",
         "@gerhobbelt/gitignore-parser": "^0.2.0-9",
         "@iarna/toml": "^2.2.5",
+        "@smithy/fetch-http-handler": "^3.0.0",
         "@smithy/middleware-retry": "^3.0.0",
+        "@smithy/node-http-handler": "^3.0.0",
         "@smithy/protocol-http": "^4.0.0",
         "@smithy/service-error-classification": "^3.0.0",
         "@smithy/shared-ini-file-loader": "^3.0.0",
         "@smithy/util-retry": "^3.0.0",
-        "@smithy/fetch-http-handler": "^3.0.0",
-        "@smithy/node-http-handler": "^3.0.0",
         "@vscode/debugprotocol": "^1.57.0",
         "@zip.js/zip.js": "^2.7.41",
         "adm-zip": "^0.5.10",
@@ -539,6 +539,7 @@
         "glob": "^10.3.10",
         "got": "^11.8.5",
         "highlight.js": "^11.9.0",
+        "http2": "^3.3.6",
         "i18n-ts": "^1.0.5",
         "immutable": "^4.3.0",
         "jose": "5.4.1",
@@ -563,8 +564,7 @@
         "winston": "^3.11.0",
         "winston-transport": "^4.6.0",
         "xml2js": "^0.6.1",
-        "yaml-cfn": "^0.3.2",
-        "http2": "^3.3.6"
+        "yaml-cfn": "^0.3.2"
     },
     "overrides": {
         "webfont": {

packages/core/package.json

@@ -263,6 +263,19 @@ export async function startSecurityScan(
             scope,
             editor
         )
+        for (const issue of securityRecommendationCollection
+            .flatMap(({ issues }) => issues)
+            .filter(({ visible, autoDetected }) => visible && !autoDetected)) {
+            telemetry.codewhisperer_codeScanIssueDetected.emit({
+                autoDetected: issue.autoDetected,
+                codewhispererCodeScanJobId: issue.scanJobId,
+                detectorId: issue.detectorId,
+                findingId: issue.findingId,
+                includesFix: issue.suggestedFixes.length > 0,
+                ruleId: issue.ruleId,
+                result: 'Succeeded',
+            })
+        }
         const { total, withFixes } = securityRecommendationCollection.reduce(
             (accumulator, current) => ({
                 total: accumulator.total + current.issues.length,

packages/core/src/codewhisperer/commands/startSecurityScan.ts

@@ -1058,7 +1058,7 @@ export class ChatController {
             ) || false
         triggerPayload.documentReferences = []
         if (triggerPayload.useRelevantDocuments && triggerPayload.message) {
-            triggerPayload.message = triggerPayload.message.replace(/workspace/, '')
+            triggerPayload.message = triggerPayload.message.replace(/@workspace/, '')
             if (CodeWhispererSettings.instance.isLocalIndexEnabled()) {
                 const start = performance.now()
                 let remainingContextLength = contextMaxLength

packages/core/src/codewhispererChat/controllers/chat/controller.ts

@@ -1485,6 +1485,34 @@
         {
             "name": "docdb_addRegion",
             "description": "User clicked on add region command"
+        },
+        {
+            "name": "codewhisperer_codeScanIssueDetected",
+            "description": "Called when a code scan issue is returned from the service",
+            "metadata": [
+                {
+                    "type": "autoDetected",
+                    "required": false
+                },
+                {
+                    "type": "codewhispererCodeScanJobId",
+                    "required": false
+                },
+                {
+                    "type": "detectorId"
+                },
+                {
+                    "type": "findingId"
+                },
+                {
+                    "type": "includesFix",
+                    "required": false
+                },
+                {
+                    "type": "ruleId",
+                    "required": false
+                }
+            ]
         }
     ]
 }

packages/core/src/shared/telemetry/vscodeTelemetry.json

@@ -232,6 +232,11 @@ describe('startSecurityScan', function () {
             codewhispererCodeScanScope: 'PROJECT',
             passive: false,
         })
+        assertTelemetry('codewhisperer_codeScanIssueDetected', {
+            autoDetected: false,
+            detectorId: 'detectorId',
+            findingId: 'findingId',
+        })
     })
 
     it('Should cancel a scan if a newer one has started', async function () {