Merge master into feature/amazonqLSP

packages/amazonq/.changes/1.52.0.json

@@ -0,0 +1,50 @@
+{
+	"date": "2025-03-20",
+	"version": "1.52.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q chat: @Folders and @Files are missing `@` prefix in chat history"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "/review: Code Issues ellipses menu displays AWS Toolkit options, if installed."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q chat: Progress indicator height is stretched"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q chat: Long descriptions in context list are cut off"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q chat: Improve responses for saved prompts and workspace rules"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "/test: show descriptive error message"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Code Review: Fixed a bug where issues are double counted in the Q chat"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q chat: Animation timings are too long"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fix inline completion failure due to context length exceeding the threshold"
+		},
+		{
+			"type": "Feature",
+			"description": "/review: passing referenceTrackerConfiguration to StartCodeFixJob"
+		},
+		{
+			"type": "Feature",
+			"description": "/review: rename setting `showInlineCodeSuggestionsWithCodeReferences` to `showCodeWithReferences`"
+		}
+	]
+}

packages/amazonq/.changes/next-release/Feature-7a3c930e-cc8e-4323-9ecd-c1bf767fd2ed.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "(Experimental) Amazon Q inline code suggestions via Amazon Q Language Server. (enable with `aws.experiments.amazonqLSP: true`)"
+}

packages/amazonq/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 1.52.0 2025-03-20
+
+- **Bug Fix** Amazon Q chat: @Folders and @Files are missing `@` prefix in chat history
+- **Bug Fix** /review: Code Issues ellipses menu displays AWS Toolkit options, if installed.
+- **Bug Fix** Amazon Q chat: Progress indicator height is stretched
+- **Bug Fix** Amazon Q chat: Long descriptions in context list are cut off
+- **Bug Fix** Amazon Q chat: Improve responses for saved prompts and workspace rules
+- **Bug Fix** /test: show descriptive error message
+- **Bug Fix** Code Review: Fixed a bug where issues are double counted in the Q chat
+- **Bug Fix** Amazon Q chat: Animation timings are too long
+- **Bug Fix** Fix inline completion failure due to context length exceeding the threshold
+- **Feature** /review: passing referenceTrackerConfiguration to StartCodeFixJob
+- **Feature** /review: rename setting `showInlineCodeSuggestionsWithCodeReferences` to `showCodeWithReferences`
+
 ## 1.51.0 2025-03-12
 
 - **Bug Fix** increase scan timeout to reduce front-end timeout errors

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.52.0-SNAPSHOT",
+    "version": "1.53.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],
@@ -32,7 +32,8 @@
         "Codewhisperer",
         "AI",
         "Assistant",
-        "Chatbot"
+        "Chatbot",
+        "Q Developer"
     ],
     "preview": false,
     "qna": "https://github.com/aws/aws-toolkit-vscode/issues",

packages/amazonq/scripts/build/copyFiles.ts

@@ -56,17 +56,6 @@ const tasks: CopyTask[] = [
         destination: 'vue/',
     },
 
-    // Mynah
-    {
-        target: path.join(
-            '../../node_modules',
-            '@aws',
-            'fully-qualified-names',
-            'node',
-            'aws_fully_qualified_names_bg.wasm'
-        ),
-        destination: path.join('src', 'aws_fully_qualified_names_bg.wasm'),
-    },
     {
         target: path.join('../../node_modules', 'web-tree-sitter', 'tree-sitter.wasm'),
         destination: path.join('src', 'tree-sitter.wasm'),

packages/amazonq/src/app/inline/completion.ts

@@ -22,40 +22,11 @@ import {
     logInlineCompletionSessionResultsNotificationType,
     LogInlineCompletionSessionResultsParams,
 } from '@aws/language-server-runtimes/protocol'
-
-export const CodewhispererInlineCompletionLanguages = [
-    { scheme: 'file', language: 'typescript' },
-    { scheme: 'file', language: 'javascript' },
-    { scheme: 'file', language: 'json' },
-    { scheme: 'file', language: 'yaml' },
-    { scheme: 'file', language: 'java' },
-    { scheme: 'file', language: 'go' },
-    { scheme: 'file', language: 'php' },
-    { scheme: 'file', language: 'rust' },
-    { scheme: 'file', language: 'kotlin' },
-    { scheme: 'file', language: 'terraform' },
-    { scheme: 'file', language: 'ruby' },
-    { scheme: 'file', language: 'shellscript' },
-    { scheme: 'file', language: 'dart' },
-    { scheme: 'file', language: 'lua' },
-    { scheme: 'file', language: 'powershell' },
-    { scheme: 'file', language: 'r' },
-    { scheme: 'file', language: 'swift' },
-    { scheme: 'file', language: 'systemverilog' },
-    { scheme: 'file', language: 'scala' },
-    { scheme: 'file', language: 'vue' },
-    { scheme: 'file', language: 'csharp' },
-    { scheme: 'file', language: 'python' },
-    { scheme: 'file', language: 'c' },
-    { scheme: 'file', language: 'cpp' },
-    { scheme: 'file', language: 'sql' },
-    { scheme: 'file', language: 'tsx' },
-    { scheme: 'file', language: 'jsx' },
-]
+import { CodeWhispererConstants } from 'aws-core-vscode/codewhisperer'
 
 export function registerInlineCompletion(languageClient: LanguageClient) {
     const inlineCompletionProvider = new AmazonQInlineCompletionItemProvider(languageClient)
-    languages.registerInlineCompletionItemProvider(CodewhispererInlineCompletionLanguages, inlineCompletionProvider)
+    languages.registerInlineCompletionItemProvider(CodeWhispererConstants.platformLanguageIds, inlineCompletionProvider)
 
     const onInlineAcceptance = async (
         sessionId: string,

packages/amazonq/src/extension.ts

@@ -157,7 +157,7 @@ export async function activateAmazonQCommon(context: vscode.ExtensionContext, is
 
     context.subscriptions.push(
         Experiments.instance.onDidChange(async (event) => {
-            if (event.key === 'amazonqLSP') {
+            if (event.key === 'amazonqLSP' || event.key === 'amazonqChatLSP') {
                 await vscode.window
                     .showInformationMessage(
                         'Amazon Q LSP setting has changed. Reload VS Code for the changes to take effect.',

packages/amazonq/src/extensionNode.ts

@@ -7,7 +7,15 @@ import * as vscode from 'vscode'
 import { activateAmazonQCommon, amazonQContextPrefix, deactivateCommon } from './extension'
 import { DefaultAmazonQAppInitContext } from 'aws-core-vscode/amazonq'
 import { activate as activateQGumby } from 'aws-core-vscode/amazonqGumby'
-import { ExtContext, globals, CrashMonitoring, getLogger, isNetworkError, isSageMaker } from 'aws-core-vscode/shared'
+import {
+    ExtContext,
+    globals,
+    CrashMonitoring,
+    getLogger,
+    isNetworkError,
+    isSageMaker,
+    Experiments,
+} from 'aws-core-vscode/shared'
 import { filetypes, SchemaService } from 'aws-core-vscode/sharedNode'
 import { updateDevMode } from 'aws-core-vscode/dev'
 import { CommonAuthViewProvider } from 'aws-core-vscode/login'
@@ -43,8 +51,10 @@ async function activateAmazonQNode(context: vscode.ExtensionContext) {
         extensionContext: context,
     }
 
-    await activateCWChat(context)
-    await activateQGumby(extContext as ExtContext)
+    if (!Experiments.instance.get('amazonqChatLSP', false)) {
+        await activateCWChat(context)
+        await activateQGumby(extContext as ExtContext)
+    }
 
     const authProvider = new CommonAuthViewProvider(
         context,

packages/amazonq/src/lsp/chat/activation.ts

@@ -0,0 +1,34 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { window } from 'vscode'
+import { LanguageClient } from 'vscode-languageclient'
+import { AmazonQChatViewProvider } from './webviewProvider'
+import { registerCommands } from './commands'
+import { registerLanguageServerEventListener, registerMessageListeners } from './messages'
+import { globals } from 'aws-core-vscode/shared'
+
+export function activate(languageClient: LanguageClient, encryptionKey: Buffer, mynahUIPath: string) {
+    const provider = new AmazonQChatViewProvider(mynahUIPath)
+
+    globals.context.subscriptions.push(
+        window.registerWebviewViewProvider(AmazonQChatViewProvider.viewType, provider, {
+            webviewOptions: {
+                retainContextWhenHidden: true,
+            },
+        })
+    )
+
+    /**
+     * Commands are registered independent of the webview being open because when they're executed
+     * they focus the webview
+     **/
+    registerCommands(provider)
+    registerLanguageServerEventListener(languageClient, provider)
+
+    provider.onDidResolveWebview(() => {
+        registerMessageListeners(languageClient, provider, encryptionKey)
+    })
+}

packages/amazonq/src/lsp/chat/commands.ts

@@ -0,0 +1,79 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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'
+
+export function registerCommands(provider: AmazonQChatViewProvider) {
+    globals.context.subscriptions.push(
+        registerGenericCommand('aws.amazonq.explainCode', 'Explain', provider),
+        registerGenericCommand('aws.amazonq.refactorCode', 'Refactor', provider),
+        registerGenericCommand('aws.amazonq.fixCode', 'Fix', provider),
+        registerGenericCommand('aws.amazonq.optimizeCode', 'Optimize', provider),
+        Commands.register('aws.amazonq.sendToPrompt', (data) => {
+            const triggerType = getCommandTriggerType(data)
+            const selection = getSelectedText()
+
+            void focusAmazonQPanel().then(() => {
+                void provider.webview?.postMessage({
+                    command: 'sendToPrompt',
+                    params: { selection: selection, triggerType },
+                })
+            })
+        }),
+        Commands.register('aws.amazonq.openTab', () => {
+            void focusAmazonQPanel().then(() => {
+                void provider.webview?.postMessage({
+                    command: 'aws/chat/openTab',
+                    params: {},
+                })
+            })
+        })
+    )
+}
+
+function getSelectedText(): string {
+    const editor = window.activeTextEditor
+    if (editor) {
+        const selection = editor.selection
+        const selectedText = editor.document.getText(selection)
+        return selectedText
+    }
+
+    return ' '
+}
+
+function getCommandTriggerType(data: any): string {
+    // data is undefined when commands triggered from keybinding or command palette. Currently no
+    // way to differentiate keybinding and command palette, so both interactions are recorded as keybinding
+    return data === undefined ? 'hotkeys' : 'contextMenu'
+}
+
+function registerGenericCommand(commandName: string, genericCommand: string, provider: AmazonQChatViewProvider) {
+    return Commands.register(commandName, (data) => {
+        const triggerType = getCommandTriggerType(data)
+        const selection = getSelectedText()
+
+        void focusAmazonQPanel().then(() => {
+            void provider.webview?.postMessage({
+                command: 'genericCommand',
+                params: { genericCommand, selection, triggerType },
+            })
+        })
+    })
+}
+
+/**
+ * Importing focusAmazonQPanel from aws-core-vscode/amazonq leads to several dependencies down the chain not resolving since AmazonQ chat
+ * is currently only activated on node, but the language server is activated on both web and node.
+ *
+ * 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')
+}