Merge master into feature/flare-NEP

CONTRIBUTING.md

@@ -382,7 +382,7 @@ If you need to report an issue attach these to give the most detailed informatio
     - ![](./docs/images/logsView.png)
 2. Click the gear icon on the bottom right and select `Debug`
     - ![](./docs/images/logsSetDebug.png)
-3. Click the gear icon again and select `Set As Default`. This will ensure we stay in `Debug` until explicitly changed
+3. Click the gear icon again and select `Set As Default`. This will ensure we stay in `Debug` until explicitly changed.
     - ![](./docs/images/logsSetDefault.png)
 4. Open the Command Palette again and select `Reload Window`.
 5. Now you should see additional `[debug]` prefixed logs in the output.

buildspec/release/50githubrelease.yml

@@ -36,10 +36,13 @@ phases:
             - echo "posting $VERSION with sha384 hash $HASH to GitHub"
             - PKG_DISPLAY_NAME=$(grep -m 1 displayName packages/${TARGET_EXTENSION}/package.json | grep -o '[a-zA-z][^\"]\+' | tail -n1)
             - RELEASE_MESSAGE="${PKG_DISPLAY_NAME} for VS Code $VERSION"
+            # Only set amazonq as "latest" release. This ensures https://api.github.com/repos/aws/aws-toolkit-vscode/releases/latest
+            # consistently points to the amazonq artifact, instead of being "random".
+            - LATEST="$([ "$TARGET_EXTENSION" = amazonq ] && echo '--latest' || echo '--latest=false' )"
             - |
                 if [ "$STAGE" = "prod" ]; then
                   # note: the tag arg passed here should match what is in 10changeversion.yml
-                  gh release create --repo $REPO --title "$PKG_DISPLAY_NAME $VERSION" --notes "$RELEASE_MESSAGE" -- "${TARGET_EXTENSION}/v${VERSION}" "$UPLOAD_TARGET" "$HASH_UPLOAD_TARGET"
+                  gh release create "$LATEST" --repo $REPO --title "$PKG_DISPLAY_NAME $VERSION" --notes "$RELEASE_MESSAGE" -- "${TARGET_EXTENSION}/v${VERSION}" "$UPLOAD_TARGET" "$HASH_UPLOAD_TARGET"
                 else
                   echo "SKIPPED (stage=${STAGE}): 'gh release create --repo $REPO'"
                 fi

package.json

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

packages/amazonq/.changes/1.70.0.json

@@ -0,0 +1,10 @@
+{
+	"date": "2025-05-28",
+	"version": "1.70.0",
+	"entries": [
+		{
+			"type": "Removal",
+			"description": "Disable local workspace LSP"
+		}
+	]
+}

packages/amazonq/.changes/1.71.0.json

@@ -0,0 +1,5 @@
+{
+	"date": "2025-06-04",
+	"version": "1.71.0",
+	"entries": []
+}

packages/amazonq/.changes/1.72.0.json

@@ -0,0 +1,10 @@
+{
+	"date": "2025-06-11",
+	"version": "1.72.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Launch LSP with bundled artifacts as fallback"
+		}
+	]
+}

packages/amazonq/.changes/1.73.0.json

@@ -0,0 +1,10 @@
+{
+	"date": "2025-06-11",
+	"version": "1.73.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Add MCP Server Support"
+		}
+	]
+}

packages/amazonq/.changes/1.74.0.json

@@ -0,0 +1,5 @@
+{
+	"date": "2025-06-12",
+	"version": "1.74.0",
+	"entries": []
+}

packages/amazonq/.changes/1.75.0.json

@@ -0,0 +1,5 @@
+{
+	"date": "2025-06-13",
+	"version": "1.75.0",
+	"entries": []
+}

packages/amazonq/CHANGELOG.md

@@ -1,3 +1,27 @@
+## 1.75.0 2025-06-13
+
+- Miscellaneous non-user-facing changes
+
+## 1.74.0 2025-06-12
+
+- Miscellaneous non-user-facing changes
+
+## 1.73.0 2025-06-11
+
+- **Feature** Add MCP Server Support
+
+## 1.72.0 2025-06-11
+
+- **Feature** Launch LSP with bundled artifacts as fallback
+
+## 1.71.0 2025-06-04
+
+- Miscellaneous non-user-facing changes
+
+## 1.70.0 2025-05-28
+
+- **Removal** Disable local workspace LSP
+
 ## 1.69.0 2025-05-22
 
 - **Bug Fix** /transform: avoid prompting user for target JDK path unnecessarily

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.70.0-SNAPSHOT",
+    "version": "1.76.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],
@@ -213,6 +213,12 @@
                     "items": {
                         "type": "string"
                     }
+                },
+                "amazonQ.proxy.certificateAuthority": {
+                    "type": "string",
+                    "markdownDescription": "%AWS.configuration.description.amazonq.proxy.certificateAuthority%",
+                    "default": null,
+                    "scope": "application"
                 }
             }
         },
@@ -382,16 +388,21 @@
                     "when": "view == aws.amazonq.AmazonQChatView",
                     "group": "0_topAmazonQ@1"
                 },
-                {
-                    "command": "aws.amazonq.learnMore",
-                    "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.manageSubscription",
+                    "when": "(view == aws.amazonq.AmazonQChatView) && aws.codewhisperer.connected",
+                    "group": "1_amazonQ@2"
+                },
+                {
+                    "command": "aws.amazonq.learnMore",
+                    "when": "view =~ /^aws\\.amazonq/",
+                    "group": "1_amazonQ@3"
+                },
                 {
                     "command": "aws.amazonq.signout",
                     "when": "(view == aws.amazonq.AmazonQChatView) && aws.codewhisperer.connected && !aws.isSageMakerUnifiedStudio",
@@ -673,6 +684,13 @@
                 "category": "%AWS.amazonq.title%",
                 "icon": "$(question)"
             },
+            {
+                "command": "aws.amazonq.manageSubscription",
+                "title": "%AWS.command.manageSubscription%",
+                "category": "%AWS.amazonq.title%",
+                "icon": "$(gear)",
+                "enablement": "aws.codewhisperer.connected && !aws.amazonq.connectedSsoIdc"
+            },
             {
                 "command": "aws.amazonq.signout",
                 "title": "%AWS.command.codewhisperer.signout%",

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

@@ -7,7 +7,7 @@ import * as vscode from 'vscode'
 import { ExtensionContext } from 'vscode'
 import { telemetry } from 'aws-core-vscode/telemetry'
 import { AuthUtil } from 'aws-core-vscode/codewhisperer'
-import { Commands, placeholder } from 'aws-core-vscode/shared'
+import { Commands, getLogger, placeholder } from 'aws-core-vscode/shared'
 import * as amazonq from 'aws-core-vscode/amazonq'
 
 export async function activate(context: ExtensionContext) {
@@ -67,7 +67,9 @@ async function setupAuthNotification() {
         const selection = await vscode.window.showWarningMessage('Start using Amazon Q', buttonAction)
 
         if (selection === buttonAction) {
-            void amazonq.focusAmazonQPanel.execute(placeholder, source)
+            amazonq.focusAmazonQPanel.execute(placeholder, source).catch((e) => {
+                getLogger().error('focusAmazonQPanel failed: %s', e)
+            })
         }
     }
 }

packages/amazonq/src/extension.ts

@@ -34,6 +34,7 @@ import {
     Experiments,
     isSageMaker,
     isAmazonLinux2,
+    ProxyUtil,
 } from 'aws-core-vscode/shared'
 import { ExtStartUpSources } from 'aws-core-vscode/telemetry'
 import { VSCODE_EXTENSION_ID } from 'aws-core-vscode/utils'
@@ -119,6 +120,10 @@ export async function activateAmazonQCommon(context: vscode.ExtensionContext, is
     const extContext = {
         extensionContext: context,
     }
+
+    // Configure proxy settings early
+    ProxyUtil.configureProxyForLanguageServer()
+
     // This contains every lsp agnostic things (auth, security scan, code scan)
     await activateCodeWhisperer(extContext as ExtContext)
     if (
@@ -166,7 +171,9 @@ export async function activateAmazonQCommon(context: vscode.ExtensionContext, is
         // Give time for the extension to finish initializing.
         globals.clock.setTimeout(async () => {
             CommonAuthWebview.authSource = ExtStartUpSources.firstStartUp
-            void focusAmazonQPanel.execute(placeholder, ExtStartUpSources.firstStartUp)
+            focusAmazonQPanel.execute(placeholder, ExtStartUpSources.firstStartUp).catch((e) => {
+                getLogger().error('focusAmazonQPanel failed: %s', e)
+            })
         }, 1000)
     }
 

packages/amazonq/src/lsp/activation.ts

@@ -5,8 +5,8 @@
 
 import vscode from 'vscode'
 import { startLanguageServer } from './client'
-import { AmazonQLspInstaller } from './lspInstaller'
-import { lspSetupStage, ToolkitError, messages } from 'aws-core-vscode/shared'
+import { AmazonQLspInstaller, getBundledResourcePaths } from './lspInstaller'
+import { lspSetupStage, ToolkitError, messages, getLogger } from 'aws-core-vscode/shared'
 
 export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
     try {
@@ -16,6 +16,15 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
         })
     } catch (err) {
         const e = err as ToolkitError
-        void messages.showViewLogsMessage(`Failed to launch Amazon Q language server: ${e.message}`)
+        getLogger('amazonqLsp').warn(`Failed to start downloaded LSP, falling back to bundled LSP: ${e.message}`)
+        try {
+            await lspSetupStage('all', async () => {
+                await lspSetupStage('launch', async () => await startLanguageServer(ctx, getBundledResourcePaths(ctx)))
+            })
+        } catch (error) {
+            void messages.showViewLogsMessage(
+                `Failed to launch Amazon Q language server: ${(error as ToolkitError).message}`
+            )
+        }
     }
 }

packages/amazonq/src/lsp/auth.ts

@@ -96,6 +96,8 @@ export class AmazonQLspAuth {
             token,
         })
 
+        // "aws/credentials/token/update"
+        // https://github.com/aws/language-servers/blob/44d81f0b5754747d77bda60b40cc70950413a737/core/aws-lsp-core/src/credentials/credentialsProvider.ts#L27
         await this.client.sendRequest(bearerCredentialsUpdateRequestType.method, request)
 
         this.client.info(`UpdateBearerToken: ${JSON.stringify(request)}`)

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

@@ -6,7 +6,7 @@
 import { window } from 'vscode'
 import { LanguageClient } from 'vscode-languageclient'
 import { AmazonQChatViewProvider } from './webviewProvider'
-import { registerCommands } from './commands'
+import { focusAmazonQPanel, registerCommands } from './commands'
 import { registerLanguageServerEventListener, registerMessageListeners } from './messages'
 import { Commands, getLogger, globals, undefinedIfEmpty } from 'aws-core-vscode/shared'
 import { activate as registerLegacyChatListeners } from '../../app/chat/activation'
@@ -73,6 +73,18 @@ export async function activate(languageClient: LanguageClient, encryptionKey: Bu
                 customization: undefinedIfEmpty(getSelectedCustomization().arn),
             })
         }),
+        Commands.register('aws.amazonq.manageSubscription', () => {
+            focusAmazonQPanel().catch((e) => languageClient.error(`[VSCode Client] focusAmazonQPanel() failed`))
+
+            languageClient
+                .sendRequest('workspace/executeCommand', {
+                    command: 'aws/chat/manageSubscription',
+                    // arguments: [],
+                })
+                .catch((e) => {
+                    getLogger('amazonqLsp').error('failed request: aws/chat/manageSubscription: %O', e)
+                })
+        }),
         globals.logOutputChannel.onDidChangeLogLevel((logLevel) => {
             getLogger('amazonqLsp').info(`Local log level changed to ${logLevel}, notifying LSP`)
             void pushConfigUpdate(languageClient, {

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

@@ -125,7 +125,7 @@ function registerGenericCommand(commandName: string, genericCommand: string, pro
  *
  * Instead, we just create our own as a temporary solution
  */
-async function focusAmazonQPanel() {
+export async function focusAmazonQPanel() {
     await Commands.tryExecute('aws.amazonq.AmazonQChatView.focus')
     await Commands.tryExecute('aws.amazonq.AmazonCommonAuth.focus')
 }