Merge branch 'master' into kevin/fix-session

Author: KevinDing1

package-lock.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Amazon Q chat: Use `@` to add folders, files, and saved prompts as context"
+}

packages/amazonq/.changes/next-release/Feature-1707f610-2dde-4af1-b704-0e541efb7c4a.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "/review: Code reviews are now created with additional workspace context to enable grouping of related scans in the backend"
+}

packages/amazonq/.changes/next-release/Feature-90704e88-3ab3-4030-8bc6-fdde95aa3923.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Amazon Q chat: increase chat input height to 3 lines"
+}

packages/amazonq/.changes/next-release/Feature-cf1e3d13-1b3d-4b23-bf6b-d6d46c75565c.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Amazon Q chat: Show list of files sent as context in chat response"
+}

packages/amazonq/.changes/next-release/Feature-dc148db8-5936-478c-a8cf-909d0885105b.json

@@ -11,7 +11,7 @@ import { MynahUIDataModel } from '@aws/mynah-ui'
 import { assertContextCommands, assertQuickActions } from './assert'
 import { registerAuthHook, using } from 'aws-core-vscode/test'
 import { loginToIdC } from './utils/setup'
-import { webviewConstants } from 'aws-core-vscode/amazonq'
+import { webviewConstants, webviewTabConstants } from 'aws-core-vscode/amazonq'
 
 describe('Amazon Q Chat', function () {
     let framework: qTestingFramework
@@ -60,7 +60,7 @@ describe('Amazon Q Chat', function () {
     })
 
     it('Shows placeholder', () => {
-        assert.deepStrictEqual(store.promptInputPlaceholder, 'Ask a question or enter "/" for quick actions')
+        assert.deepStrictEqual(store.promptInputPlaceholder, webviewTabConstants.commonTabData.placeholder)
     })
 
     it('Sends message', async () => {

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

@@ -40,6 +40,9 @@ export function injectJSDOM() {
         get() {
             return this.textContent
         },
+        set(value) {
+            this.textContent = value
+        },
     })
 
     // jsdom doesn't have support for structuredClone. See https://github.com/jsdom/jsdom/issues/3363

packages/amazonq/test/e2e/amazonq/framework/jsdomInjector.ts

@@ -15,8 +15,9 @@ import {
     ListCodeScanFindingsResponse,
     pollScanJobStatus,
     SecurityScanTimedOutError,
+    generateScanName,
 } from 'aws-core-vscode/codewhisperer'
-import { timeoutUtils } from 'aws-core-vscode/shared'
+import { getStringHash, timeoutUtils } from 'aws-core-vscode/shared'
 import assert from 'assert'
 import sinon from 'sinon'
 import * as vscode from 'vscode'
@@ -320,4 +321,37 @@ describe('securityScanHandler', function () {
             await assert.rejects(() => pollPromise, SecurityScanTimedOutError)
         })
     })
+
+    describe('generateScanName', function () {
+        const clientId = 'ffffffff-ffff-ffff-ffff-ffffffffffff'
+
+        it('generates scan name for FILE_AUTO scope', function () {
+            const result = generateScanName(['/some/root/path'], CodeAnalysisScope.FILE_AUTO, '/path/to/some/file')
+            assert.strictEqual(result, getStringHash(`${clientId}::/path/to/some/file::FILE_AUTO`))
+        })
+
+        it('generates scan name for FILE_ON_DEMAND scope', function () {
+            const result = generateScanName(['/some/root/path'], CodeAnalysisScope.FILE_ON_DEMAND, '/path/to/some/file')
+            assert.strictEqual(result, getStringHash(`${clientId}::/path/to/some/file::FILE_ON_DEMAND`))
+        })
+
+        it('generates scan name for PROJECT scope with a single project root', function () {
+            const result = generateScanName(['/some/root/path'], CodeAnalysisScope.PROJECT)
+            assert.strictEqual(result, getStringHash(`${clientId}::/some/root/path::PROJECT`))
+        })
+
+        it('generates scan name for PROJECT scope with multiple project roots', function () {
+            const result = generateScanName(['/some/root/pathB', '/some/root/pathA'], CodeAnalysisScope.PROJECT)
+            assert.strictEqual(result, getStringHash(`${clientId}::/some/root/pathA,/some/root/pathB::PROJECT`))
+        })
+
+        it('does not exceed 126 characters', function () {
+            let reallyDeepFilePath = ''
+            for (let i = 0; i < 100; i++) {
+                reallyDeepFilePath += '/some/deep/path'
+            }
+            const result = generateScanName(['/some/root/path'], CodeAnalysisScope.FILE_ON_DEMAND, reallyDeepFilePath)
+            assert.ok(result.length <= 126)
+        })
+    })
 })

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

@@ -510,7 +510,7 @@
         "@aws-sdk/property-provider": "<3.696.0",
         "@aws-sdk/smithy-client": "<3.696.0",
         "@aws-sdk/util-arn-parser": "<3.696.0",
-        "@aws/mynah-ui": "^4.22.1",
+        "@aws/mynah-ui": "^4.23.0",
         "@gerhobbelt/gitignore-parser": "^0.2.0-9",
         "@iarna/toml": "^2.2.5",
         "@smithy/middleware-retry": "^3.0.0",

packages/core/package.json

@@ -309,6 +309,17 @@
     "AWS.codewhisperer.customization.notification.new_customizations.learn_more": "Learn More",
     "AWS.amazonq.title": "Amazon Q",
     "AWS.amazonq.chat": "Chat",
+    "AWS.amazonq.context.folders.title": "Folders",
+    "AWS.amazonq.context.folders.description": "Add all files in a folder to context",
+    "AWS.amazonq.context.files.title": "Files",
+    "AWS.amazonq.context.files.description": "Add a file to context",
+    "AWS.amazonq.context.prompts.title": "Prompts",
+    "AWS.amazonq.context.prompts.description": "Add a saved prompt to context",
+    "AWS.amazonq.savedPrompts.title": "Prompt name",
+    "AWS.amazonq.savedPrompts.create": "Create",
+    "AWS.amazonq.savedPrompts.action": "Create a new prompt",
+    "AWS.amazonq.savedPrompts.placeholder": "Enter prompt name",
+    "AWS.amazonq.savedPrompts.description": "Use this prompt by typing '@' followed by the prompt name.",
     "AWS.amazonq.chat.workspacecontext.enable.message": "Amazon Q: Workspace index is now enabled. You can disable it from Amazon Q settings.",
     "AWS.amazonq.security": "Code Issues",
     "AWS.amazonq.login": "Login",