Merge master into feature/agentic-chat

package.json

@@ -54,7 +54,7 @@
         "@vscode/test-electron": "^2.3.8",
         "@vscode/test-web": "^0.0.65",
         "@vscode/vsce": "^2.19.0",
-        "eslint": "^8.56.0",
+        "eslint": "^8.57.0",
         "eslint-config-prettier": "^9.1.0",
         "eslint-plugin-aws-toolkits": "file:plugins/eslint-plugin-aws-toolkits",
         "eslint-plugin-header": "^3.1.1",

packages/amazonq/.changes/1.55.0.json

@@ -0,0 +1,38 @@
+{
+	"date": "2025-04-09",
+	"version": "1.55.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Update chat history icon"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: chat occasionally freezes and displays gray screen"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Set owner-only permissions for chat history and saved prompt files"
+		},
+		{
+			"type": "Feature",
+			"description": "`/test` generates tests in all languages, not only Java/Python"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q chat: Click export icon to save chat transcript in Markdown or HTML"
+		},
+		{
+			"type": "Feature",
+			"description": "SageMaker: Disable the unsupported agentic commands and welcome prompt"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q Chat: Add `@code` context for PHP, Ruby, Scala, Shell, and Swift projects"
+		},
+		{
+			"type": "Feature",
+			"description": "Enterprise users can choose their preferred Amazon Q profile to improve personalization and workflow across different business regions"
+		}
+	]
+}

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"
+		}
+	]
+}

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"
+		}
+	]
+}

packages/amazonq/.changes/next-release/Bug Fix-45379b8c-1faa-4b04-951a-26e234c6dc03.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "inline chat activates properly when using 'aws.experiments.amazonqChatLSP' feature flag"
+}

packages/amazonq/CHANGELOG.md

@@ -1,3 +1,24 @@
+## 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
+- **Bug Fix** Amazon Q Chat: chat occasionally freezes and displays gray screen
+- **Bug Fix** Amazon Q Chat: Set owner-only permissions for chat history and saved prompt files
+- **Feature** `/test` generates tests in all languages, not only Java/Python
+- **Feature** Amazon Q chat: Click export icon to save chat transcript in Markdown or HTML
+- **Feature** SageMaker: Disable the unsupported agentic commands and welcome prompt
+- **Feature** Amazon Q Chat: Add `@code` context for PHP, Ruby, Scala, Shell, and Swift projects
+- **Feature** Enterprise users can choose their preferred Amazon Q profile to improve personalization and workflow across different business regions
+
 ## 1.54.0 2025-04-03
 
 - **Bug Fix** Amazon Q chat: `@prompts` not added to context

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.55.0-SNAPSHOT",
+    "version": "1.58.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],
@@ -361,6 +361,11 @@
                     "when": "view =~ /^aws\\.amazonq/",
                     "group": "1_amazonQ@1"
                 },
+                {
+                    "command": "aws.amazonq.selectRegionProfile",
+                    "when": "view == aws.amazonq.AmazonQChatView && aws.amazonq.connectedSsoIdc == true",
+                    "group": "1_amazonQ@1"
+                },
                 {
                     "command": "aws.amazonq.signout",
                     "when": "(view == aws.amazonq.AmazonQChatView) && aws.codewhisperer.connected && !aws.isSageMakerUnifiedStudio",
@@ -573,6 +578,12 @@
                 "category": "%AWS.amazonq.title%",
                 "enablement": "aws.codewhisperer.connected"
             },
+            {
+                "command": "aws.amazonq.selectRegionProfile",
+                "title": "Change Profile",
+                "category": "%AWS.amazonq.title%",
+                "enablement": "aws.codewhisperer.connected"
+            },
             {
                 "command": "aws.amazonq.transformationHub.reviewChanges.acceptChanges",
                 "title": "%AWS.command.q.transform.acceptChanges%"

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

@@ -70,6 +70,9 @@ export function init(appContext: AmazonQAppInitContext) {
     AuthUtil.instance.secondaryAuth.onDidChangeActiveConnection(() => {
         return debouncedEvent()
     })
+    AuthUtil.instance.regionProfileManager.onDidChangeRegionProfile(() => {
+        return debouncedEvent()
+    })
 
     Commands.register('aws.amazonq.security.scan-statusbar', async () => {
         if (AuthUtil.instance.isConnectionExpired()) {

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

@@ -108,6 +108,10 @@ export class ScanController {
                 interactionType: data.vote,
             })
         })
+
+        AuthUtil.instance.regionProfileManager.onDidChangeRegionProfile(() => {
+            this.sessionStorage.removeActiveTab()
+        })
     }
 
     private async tabOpened(message: any) {

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)
 }
 
 /**

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,

packages/amazonq/src/inlineChat/app.ts → 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)
 }

packages/amazonq/src/inlineChat/provider/inlineChatProvider.ts

@@ -67,6 +67,7 @@ export class InlineChatProvider {
                         codeQuery: context?.focusAreaContext?.names,
                         userIntent: this.userIntentRecognizer.getFromPromptChatMessage(message),
                         customization: getSelectedCustomization(),
+                        profile: AuthUtil.instance.regionProfileManager.activeRegionProfile,
                         context: [],
                         relevantTextDocuments: [],
                         additionalContents: [],

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')
 }

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() }