Merge branch 'master' into E2E-test

zuoyaofu · zuoyaofu · commit 7c877b168fd4 · 2025-04-14T11:05:28.000-07:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/amazonq/.changes/1.56.0.json b/packages/amazonq/.changes/1.56.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2025-04-09",
+	"version": "1.56.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Improve status message while loading Amazon Q Profiles during login"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "\"failed to run command\" error"
+		}
+	]
+}
diff --git a/packages/amazonq/.changes/1.57.0.json b/packages/amazonq/.changes/1.57.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2025-04-10",
+	"version": "1.57.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Fix bug where generate fix does not work"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fix bug where review shows 0 findings"
+		}
+	]
+}
diff --git a/packages/amazonq/.changes/1.58.0.json b/packages/amazonq/.changes/1.58.0.json
@@ -0,0 +1,22 @@
+{
+	"date": "2025-04-11",
+	"version": "1.58.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "inline chat activates properly when using 'aws.experiments.amazonqChatLSP' feature flag"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: code blocks in responses flicker, switching tabs during answer streaming makes expand button disappear"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: tab bar buttons disappear when closing non-active tab"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: chat history list does not truncate markdown"
+		}
+	]
+}
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-42b2c2f0-e40e-4f97-842b-cb7ead1a010b.json b/packages/amazonq/.changes/next-release/Bug Fix-42b2c2f0-e40e-4f97-842b-cb7ead1a010b.json
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Code fix line number or file is sometimes not accurate"
+}
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-54ef457b-7e27-4168-b04a-ad54c571e9d3.json b/packages/amazonq/.changes/next-release/Bug Fix-54ef457b-7e27-4168-b04a-ad54c571e9d3.json
diff --git a/packages/amazonq/CHANGELOG.md b/packages/amazonq/CHANGELOG.md
@@ -1,3 +1,20 @@
+## 1.58.0 2025-04-11
+
+- **Bug Fix** inline chat activates properly when using 'aws.experiments.amazonqChatLSP' feature flag
+- **Bug Fix** Amazon Q Chat: code blocks in responses flicker, switching tabs during answer streaming makes expand button disappear
+- **Bug Fix** Amazon Q Chat: tab bar buttons disappear when closing non-active tab
+- **Bug Fix** Amazon Q Chat: chat history list does not truncate markdown
+
+## 1.57.0 2025-04-10
+
+- **Bug Fix** Fix bug where generate fix does not work
+- **Bug Fix** Fix bug where review shows 0 findings
+
+## 1.56.0 2025-04-09
+
+- **Bug Fix** Improve status message while loading Amazon Q Profiles during login
+- **Bug Fix** "failed to run command" error
+
 ## 1.55.0 2025-04-09
 
 - **Bug Fix** Amazon Q Chat: Update chat history icon
diff --git a/packages/amazonq/package.json b/packages/amazonq/package.json
@@ -2,7 +2,7 @@
     "name": "amazon-q-vscode",
     "displayName": "Amazon Q",
     "description": "The most capable generative AI-powered assistant for building, operating, and transforming software, with advanced capabilities for managing data and AI",
-    "version": "1.56.0-SNAPSHOT",
+    "version": "1.59.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],
diff --git a/packages/amazonq/src/app/chat/activation.ts b/packages/amazonq/src/app/chat/activation.ts
@@ -10,7 +10,6 @@ import { AuthUtil, CodeWhispererSettings } from 'aws-core-vscode/codewhisperer'
 import { Commands, placeholder, funcUtil } from 'aws-core-vscode/shared'
 import * as amazonq from 'aws-core-vscode/amazonq'
 import { scanChatAppInit } from '../amazonqScan'
-import { init as inlineChatInit } from '../../inlineChat/app'
 
 export async function activate(context: ExtensionContext) {
     const appInitContext = amazonq.DefaultAmazonQAppInitContext.instance
@@ -72,7 +71,6 @@ function registerApps(appInitContext: amazonq.AmazonQAppInitContext, context: Ex
     amazonq.testChatAppInit(appInitContext)
     scanChatAppInit(appInitContext)
     amazonq.docChatAppInit(appInitContext)
-    inlineChatInit(context)
 }
 
 /**
diff --git a/packages/amazonq/src/extensionNode.ts b/packages/amazonq/src/extensionNode.ts
@@ -25,6 +25,7 @@ import { DevOptions } from 'aws-core-vscode/dev'
 import { Auth, AuthUtils, getTelemetryMetadataForConn, isAnySsoConnection } from 'aws-core-vscode/auth'
 import api from './api'
 import { activate as activateCWChat } from './app/chat/activation'
+import { activate as activateInlineChat } from './inlineChat/activation'
 import { beta } from 'aws-core-vscode/dev'
 import { activate as activateNotifications, NotificationsController } from 'aws-core-vscode/notifications'
 import { AuthState, AuthUtil } from 'aws-core-vscode/codewhisperer'
@@ -55,6 +56,7 @@ async function activateAmazonQNode(context: vscode.ExtensionContext) {
         await activateCWChat(context)
         await activateQGumby(extContext as ExtContext)
     }
+    activateInlineChat(context)
 
     const authProvider = new CommonAuthViewProvider(
         context,
diff --git a/packages/amazonq/src/inlineChat/activation.ts b/packages/amazonq/src/inlineChat/activation.ts
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import * as vscode from 'vscode'
-import { InlineChatController } from '../inlineChat/controller/inlineChatController'
-import { registerInlineCommands } from '../inlineChat/command/registerInlineCommands'
+import { InlineChatController } from './controller/inlineChatController'
+import { registerInlineCommands } from './command/registerInlineCommands'
 
-export function init(context: vscode.ExtensionContext) {
+export function activate(context: vscode.ExtensionContext) {
     const inlineChatController = new InlineChatController(context)
     registerInlineCommands(context, inlineChatController)
 }
diff --git a/packages/amazonq/src/lsp/chat/commands.ts b/packages/amazonq/src/lsp/chat/commands.ts
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as vscode from 'vscode'
 import { Commands, globals } from 'aws-core-vscode/shared'
 import { window } from 'vscode'
 import { AmazonQChatViewProvider } from './webviewProvider'
@@ -74,6 +73,6 @@ function registerGenericCommand(commandName: string, genericCommand: string, pro
  * Instead, we just create our own as a temporary solution
  */
 async function focusAmazonQPanel() {
-    await vscode.commands.executeCommand('aws.amazonq.AmazonQChatView.focus')
-    await vscode.commands.executeCommand('aws.amazonq.AmazonCommonAuth.focus')
+    await Commands.tryExecute('aws.amazonq.AmazonQChatView.focus')
+    await Commands.tryExecute('aws.amazonq.AmazonCommonAuth.focus')
 }
diff --git a/packages/amazonq/src/lsp/chat/messages.ts b/packages/amazonq/src/lsp/chat/messages.ts
@@ -23,12 +23,12 @@ import {
     insertToCursorPositionNotificationType,
 } from '@aws/language-server-runtimes/protocol'
 import { v4 as uuidv4 } from 'uuid'
-import { window } from 'vscode'
+import * as vscode from 'vscode'
 import { Disposable, LanguageClient, Position, State, TextDocumentIdentifier } from 'vscode-languageclient'
 import * as jose from 'jose'
 import { AmazonQChatViewProvider } from './webviewProvider'
 import { AuthUtil } from 'aws-core-vscode/codewhisperer'
-import { AmazonQPromptSettings } from 'aws-core-vscode/shared'
+import { AmazonQPromptSettings, messages } from 'aws-core-vscode/shared'
 
 export function registerLanguageServerEventListener(languageClient: LanguageClient, provider: AmazonQChatViewProvider) {
     languageClient.onDidChangeState(({ oldState, newState }) => {
@@ -62,11 +62,15 @@ export function registerMessageListeners(
 
         switch (message.command) {
             case COPY_TO_CLIPBOARD:
-                // TODO see what we need to hook this up
                 languageClient.info('[VSCode Client] Copy to clipboard event received')
+                try {
+                    await messages.copyToClipboard(message.params.code)
+                } catch (e) {
+                    languageClient.error(`[VSCode Client] Failed to copy to clipboard: ${(e as Error).message}`)
+                }
                 break
             case INSERT_TO_CURSOR_POSITION: {
-                const editor = window.activeTextEditor
+                const editor = vscode.window.activeTextEditor
                 let textDocument: TextDocumentIdentifier | undefined = undefined
                 let cursorPosition: Position | undefined = undefined
                 if (editor) {
@@ -119,8 +123,8 @@ export function registerMessageListeners(
                 )
 
                 const editor =
-                    window.activeTextEditor ||
-                    window.visibleTextEditors.find((editor) => editor.document.languageId !== 'Log')
+                    vscode.window.activeTextEditor ||
+                    vscode.window.visibleTextEditors.find((editor) => editor.document.languageId !== 'Log')
                 if (editor) {
                     message.params.cursorPosition = [editor.selection.active]
                     message.params.textDocument = { uri: editor.document.uri.toString() }
diff --git a/packages/amazonq/test/unit/amazonq/lsp/chat/messages.test.ts b/packages/amazonq/test/unit/amazonq/lsp/chat/messages.test.ts
@@ -9,6 +9,7 @@ import { AuthUtil } from 'aws-core-vscode/codewhisperer'
 import { registerMessageListeners } from '../../../../../src/lsp/chat/messages'
 import { AmazonQChatViewProvider } from '../../../../../src/lsp/chat/webviewProvider'
 import { secondaryAuth, authConnection, AuthFollowUpType } from 'aws-core-vscode/amazonq'
+import { messages } from 'aws-core-vscode/shared'
 
 describe('registerMessageListeners', () => {
     let languageClient: LanguageClient
@@ -126,4 +127,35 @@ describe('registerMessageListeners', () => {
             })
         })
     })
+
+    describe('COPY_TO_CLIPBOARD', () => {
+        let copyToClipboardStub: sinon.SinonStub
+        const testCode = 'test'
+        const copyMessage = {
+            command: 'copyToClipboard',
+            params: {
+                code: testCode,
+            },
+        }
+
+        beforeEach(() => {
+            copyToClipboardStub = sandbox.stub().resolves()
+            sandbox.stub(messages, 'copyToClipboard').get(() => copyToClipboardStub)
+        })
+
+        it('successfully copies code to clipboard', async () => {
+            await messageHandler(copyMessage)
+
+            sinon.assert.calledWith(copyToClipboardStub, testCode)
+        })
+
+        it('handles clipboard copy failure', async () => {
+            const errorMessage = 'Failed to copy'
+            copyToClipboardStub.rejects(new Error(errorMessage))
+
+            await messageHandler(copyMessage)
+
+            sinon.assert.calledWith(errorStub, `[VSCode Client] Failed to copy to clipboard: ${errorMessage}`)
+        })
+    })
 })
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -524,7 +524,7 @@
         "@aws-sdk/s3-request-presigner": "<3.731.0",
         "@aws-sdk/smithy-client": "<3.731.0",
         "@aws-sdk/util-arn-parser": "<3.731.0",
-        "@aws/mynah-ui": "^4.30.0",
+        "@aws/mynah-ui": "^4.30.1",
         "@gerhobbelt/gitignore-parser": "^0.2.0-9",
         "@iarna/toml": "^2.2.5",
         "@smithy/fetch-http-handler": "^5.0.1",
diff --git a/packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts b/packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts
@@ -42,7 +42,7 @@ import { AuthUtil } from '../../../codewhisperer/util/authUtil'
 import { AuthController } from '../../../amazonq/auth/controller'
 import { getLogger } from '../../../shared/logger/logger'
 import { submitFeedback } from '../../../feedback/vue/submitFeedback'
-import { placeholder } from '../../../shared/vscode/commands2'
+import { Commands, placeholder } from '../../../shared/vscode/commands2'
 import { EditorContentController } from '../../../amazonq/commons/controllers/contentController'
 import { openUrl } from '../../../shared/utilities/vsCodeUtils'
 import { checkForDevFile, getPathsFromZipFilePath } from '../../../amazonq/util/files'
@@ -579,7 +579,7 @@ export class FeatureDevController {
                         open
                     )
                     if (resp === open) {
-                        await vscode.commands.executeCommand('aws.amazonq.AmazonQChatView.focus')
+                        await Commands.tryExecute('aws.amazonq.AmazonQChatView.focus')
                         // TODO add focusing on the specific tab once that's implemented
                     }
                 }
diff --git a/packages/core/src/codewhisperer/client/codewhisperer.ts b/packages/core/src/codewhisperer/client/codewhisperer.ts
@@ -202,13 +202,15 @@ export class DefaultCodeWhispererClient {
     }
 
     public async listCodeScanFindings(
-        request: ListCodeScanFindingsRequest
+        request: ListCodeScanFindingsRequest,
+        profileArn: string | undefined
     ): Promise<PromiseResult<ListCodeScanFindingsResponse, AWSError>> {
         if (this.isBearerTokenAuth()) {
             const req = {
                 jobId: request.jobId,
                 nextToken: request.nextToken,
                 codeAnalysisFindingsSchema: 'codeanalysis/findings/1.0',
+                profileArn: profileArn,
             } as CodeWhispererUserClient.ListCodeAnalysisFindingsRequest
             return (await this.createUserSdkClient()).listCodeAnalysisFindings(req).promise()
         }
diff --git a/packages/core/src/codewhisperer/commands/startCodeFixGeneration.ts b/packages/core/src/codewhisperer/commands/startCodeFixGeneration.ts
@@ -20,6 +20,7 @@ import { TelemetryHelper } from '../util/telemetryHelper'
 import { tempDirPath } from '../../shared/filesystemUtilities'
 import { CodeWhispererSettings } from '../util/codewhispererSettings'
 import { AuthUtil } from '../util/authUtil'
+import { saveDocumentIfDirty } from '../../shared/utilities/textDocumentUtilities'
 
 export async function startCodeFixGeneration(
     client: DefaultCodeWhispererClient,
@@ -44,6 +45,9 @@ export async function startCodeFixGeneration(
          * Step 1: Generate zip
          */
         throwIfCancelled()
+
+        // Save the file if it has unsaved changes to ensure the latest content is included in the zip
+        await saveDocumentIfDirty(filePath)
         const admZip = new AdmZip()
         admZip.addLocalFile(filePath)
 
@@ -78,7 +82,8 @@ export async function startCodeFixGeneration(
                     : 'BLOCK',
             },
             codeFixName,
-            issue.ruleId
+            issue.ruleId,
+            profile
         )
         if (codeFixJob.status === 'Failed') {
             throw new CreateCodeFixError()
diff --git a/packages/core/src/codewhisperer/service/securityIssueProvider.ts b/packages/core/src/codewhisperer/service/securityIssueProvider.ts
@@ -48,10 +48,11 @@ export class SecurityIssueProvider {
                     .filter((issue) => {
                         const range = new vscode.Range(
                             issue.startLine,
-                            event.document.lineAt(issue.startLine)?.range.start.character ?? 0,
-                            issue.endLine,
-                            event.document.lineAt(issue.endLine - 1)?.range.end.character ?? 0
+                            0,
+                            issue.startLine === issue.endLine ? issue.endLine + 1 : issue.endLine,
+                            0
                         )
+
                         const intersection = changedRange.intersection(range)
                         return !(intersection && (/\S/.test(changedText) || changedText === ''))
                     })
diff --git a/packages/core/src/codewhisperer/service/securityScanHandler.ts b/packages/core/src/codewhisperer/service/securityScanHandler.ts
@@ -57,7 +57,8 @@ export async function listScanResults(
     const logger = getLoggerForScope(scope)
     const codeScanIssueMap: Map<string, RawCodeScanIssue[]> = new Map()
     const aggregatedCodeScanIssueList: AggregatedCodeScanIssue[] = []
-    const requester = (request: codewhispererClient.ListCodeScanFindingsRequest) => client.listCodeScanFindings(request)
+    const requester = (request: codewhispererClient.ListCodeScanFindingsRequest) =>
+        client.listCodeScanFindings(request, profile?.arn)
     const request: codewhispererClient.ListCodeScanFindingsRequest = {
         jobId,
         codeAnalysisFindingsSchema: codeScanFindingsSchema,
diff --git a/packages/core/src/codewhispererChat/commands/registerCommands.ts b/packages/core/src/codewhispererChat/commands/registerCommands.ts
@@ -7,7 +7,6 @@ import { commandPalette } from '../../codewhisperer/commands/types'
 import { CodeScanIssue } from '../../codewhisperer/models/model'
 import { Commands, VsCodeCommandArg, placeholder } from '../../shared/vscode/commands2'
 import { ChatControllerMessagePublishers } from '../controllers/chat/controller'
-import vscode from 'vscode'
 
 /**
  * Opens the Amazon Q panel, showing the correct View that should
@@ -25,8 +24,8 @@ export const focusAmazonQPanel = Commands.declare(
          * So when we try to focus the following Views, only one will show depending
          * on the context.
          */
-        await vscode.commands.executeCommand('aws.amazonq.AmazonQChatView.focus')
-        await vscode.commands.executeCommand('aws.amazonq.AmazonCommonAuth.focus')
+        await Commands.tryExecute('aws.amazonq.AmazonQChatView.focus')
+        await Commands.tryExecute('aws.amazonq.AmazonCommonAuth.focus')
     }
 )
 
diff --git a/packages/core/src/login/webview/vue/regionProfileSelector.vue b/packages/core/src/login/webview/vue/regionProfileSelector.vue
diff --git a/packages/core/src/shared/utilities/collectionUtils.ts b/packages/core/src/shared/utilities/collectionUtils.ts
diff --git a/packages/core/src/shared/utilities/processUtils.ts b/packages/core/src/shared/utilities/processUtils.ts
diff --git a/packages/core/src/shared/vscode/commands2.ts b/packages/core/src/shared/vscode/commands2.ts
diff --git a/packages/core/src/test/shared/utilities/processUtils.test.ts b/packages/core/src/test/shared/utilities/processUtils.test.ts
diff --git a/packages/core/src/testInteg/codecatalyst/devEnv.test.ts b/packages/core/src/testInteg/codecatalyst/devEnv.test.ts

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +	"type": "Bug Fix",
 +	"description": "Code fix line number or file is sometimes not accurate"
 +}