fix(amazonq): Merge master into feature/amazonqLSP-auth

docs/lsp.md

@@ -26,9 +26,7 @@ sequenceDiagram
 
 ## Language Server Debugging
 
-1. Clone https://github.com/aws/language-servers.git and set it up in the same workspace as this project
-
-    e.g.
+1. Clone https://github.com/aws/language-servers.git and set it up in the same workspace as this project by cmd+shift+p and "add folder to workspace" and selecting the language-servers folder that you just cloned. Your VS code folder structure should look like below.
 
     ```
     /aws-toolkit-vscode
@@ -52,9 +50,9 @@ sequenceDiagram
       "amazonqLSPChat": true // optional: enables chat from flare
     }
     ```
-4. Uncomment the `__AMAZONQLSP_PATH` variable in `amazonq/.vscode/launch.json` Extension configuration
-    1. Uncomment the `__AMAZONQLSP_UI` variable in `amazonq/.vscode/launch.json` Extension configuration if you want to debug the flare chat-client as well
+4. Uncomment the `__AMAZONQLSP_PATH` and `__AMAZONQLSP_UI` variables in the `amazonq/.vscode/launch.json` extension configuration
 5. Use the `Launch LSP with Debugging` configuration and set breakpoints in VSCode or the language server
+6. (Optional): Enable `"amazonq.trace.server": "on"` or `"amazonq.trace.server": "verbose"` in your VSCode settings to view detailed log messages sent to/from the language server. These log messages will show up in the "Amazon Q Language Server" output channel
 
 ## Amazon Q Inline Activation
 

package.json

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

packages/amazonq/.changes/1.61.0.json

@@ -0,0 +1,14 @@
+{
+	"date": "2025-04-22",
+	"version": "1.61.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Some users not signaled they needed to select a Region Profile to get features working"
+		},
+		{
+			"type": "bugfix",
+			"description": "/review: disable auto-review by default"
+		}
+	]
+}

packages/amazonq/.changes/1.62.0.json

@@ -0,0 +1,14 @@
+{
+	"date": "2025-04-25",
+	"version": "1.62.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Toast message to warn users if Developer Profile is not selected"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fix users can not log in successfully with 2+ IDE instnaces open due to throttle error throw by the service"
+		}
+	]
+}

packages/amazonq/.changes/1.63.0.json

@@ -0,0 +1,14 @@
+{
+	"date": "2025-05-01",
+	"version": "1.63.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Q profile selection hangs when a region is blocked"
+		},
+		{
+			"type": "Feature",
+			"description": "Agentic coding experience: Amazon Q can now write code and run shell commands on your behalf"
+		}
+	]
+}

packages/amazonq/.changes/1.64.0.json

@@ -0,0 +1,10 @@
+{
+	"date": "2025-05-02",
+	"version": "1.64.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Enable Amazon Q LSP in AL2 instances"
+		}
+	]
+}

packages/amazonq/.vscode/launch.json

@@ -14,7 +14,8 @@
             "env": {
                 "SSMDOCUMENT_LANGUAGESERVER_PORT": "6010",
                 "WEBPACK_DEVELOPER_SERVER": "http://localhost:8080"
-                // "__AMAZONQLSP_PATH": "${workspaceFolder}/../../../language-servers/app/aws-lsp-codewhisperer-runtimes/out/token-standalone.js",
+                // Below allows for overrides used during development
+                // "__AMAZONQLSP_PATH": "${workspaceFolder}/../../../language-servers/app/aws-lsp-codewhisperer-runtimes/out/agent-standalone.js",
                 // "__AMAZONQLSP_UI": "${workspaceFolder}/../../../language-servers/chat-client/build/amazonq-ui.js"
             },
             "envFile": "${workspaceFolder}/.local.env",

packages/amazonq/CHANGELOG.md

@@ -1,3 +1,22 @@
+## 1.64.0 2025-05-02
+
+- **Bug Fix** Enable Amazon Q LSP in AL2 instances
+
+## 1.63.0 2025-05-01
+
+- **Bug Fix** Q profile selection hangs when a region is blocked
+- **Feature** Agentic coding experience: Amazon Q can now write code and run shell commands on your behalf
+
+## 1.62.0 2025-04-25
+
+- **Bug Fix** Toast message to warn users if Developer Profile is not selected
+- **Bug Fix** Fix users can not log in successfully with 2+ IDE instnaces open due to throttle error throw by the service
+
+## 1.61.0 2025-04-22
+
+- **Bug Fix** Some users not signaled they needed to select a Region Profile to get features working
+- **bugfix** /review: disable auto-review by default
+
 ## 1.60.0 2025-04-18
 
 - **Bug Fix** Users might be bound to a customization which they dont have access with the selected profile and it causes service throwing 403 when using inline suggestion and chat features

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.61.0-SNAPSHOT",
+    "version": "1.65.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],
@@ -131,6 +131,14 @@
                         "amazonQChatDisclaimer": {
                             "type": "boolean",
                             "default": false
+                        },
+                        "amazonQChatPairProgramming": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "amazonQSelectDeveloperProfile": {
+                            "type": "boolean",
+                            "default": false
                         }
                     },
                     "additionalProperties": false
@@ -177,7 +185,25 @@
                 "amazonQ.workspaceIndexMaxSize": {
                     "type": "number",
                     "markdownDescription": "%AWS.configuration.description.amazonq.workspaceIndexMaxSize%",
-                    "default": 250,
+                    "default": 2048,
+                    "scope": "application"
+                },
+                "amazonQ.workspaceIndexMaxFileSize": {
+                    "type": "number",
+                    "markdownDescription": "%AWS.configuration.description.amazonq.workspaceIndexMaxFileSize%",
+                    "default": 10,
+                    "scope": "application"
+                },
+                "amazonQ.workspaceIndexCacheDirPath": {
+                    "type": "string",
+                    "markdownDescription": "%AWS.configuration.description.amazonq.workspaceIndexCacheDirPath%",
+                    "default": null,
+                    "scope": "application"
+                },
+                "amazonQ.workspaceIndexIgnoreFilePatterns": {
+                    "type": "array",
+                    "markdownDescription": "%AWS.configuration.description.amazonq.workspaceIndexIgnoreFilePatterns%",
+                    "default": [],
                     "scope": "application"
                 },
                 "amazonQ.ignoredSecurityIssues": {

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

@@ -4,46 +4,32 @@
  */
 
 import * as vscode from 'vscode'
-import { ExtensionContext, window } from 'vscode'
+import { ExtensionContext } from 'vscode'
 import { telemetry } from 'aws-core-vscode/telemetry'
 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'
 
 export async function activate(context: ExtensionContext) {
     const appInitContext = amazonq.DefaultAmazonQAppInitContext.instance
-
-    registerApps(appInitContext, context)
-
-    const provider = new amazonq.AmazonQChatViewProvider(
-        context,
-        appInitContext.getWebViewToAppsMessagePublishers(),
-        appInitContext.getAppsToWebViewMessageListener(),
-        appInitContext.onDidChangeAmazonQVisibility
-    )
-
     await amazonq.TryChatCodeLensProvider.register(appInitContext.onDidChangeAmazonQVisibility.event)
 
     const setupLsp = funcUtil.debounce(async () => {
         void amazonq.LspController.instance.trySetupLsp(context, {
             startUrl: AuthUtil.instance.connection?.startUrl,
             maxIndexSize: CodeWhispererSettings.instance.getMaxIndexSize(),
-            isVectorIndexEnabled: CodeWhispererSettings.instance.isLocalIndexEnabled(),
+            isVectorIndexEnabled: false,
         })
     }, 5000)
 
     context.subscriptions.push(
-        window.registerWebviewViewProvider(amazonq.AmazonQChatViewProvider.viewType, provider, {
-            webviewOptions: {
-                retainContextWhenHidden: true,
-            },
-        }),
         amazonq.focusAmazonQChatWalkthrough.register(),
         amazonq.walkthroughInlineSuggestionsExample.register(),
         amazonq.walkthroughSecurityScanExample.register(),
         amazonq.openAmazonQWalkthrough.register(),
         amazonq.listCodeWhispererCommandsWalkthrough.register(),
+        amazonq.focusAmazonQPanel.register(),
+        amazonq.focusAmazonQPanelKeybinding.register(),
         amazonq.tryChatCodeLensCommand.register(),
         vscode.workspace.onDidChangeConfiguration(async (configurationChangeEvent) => {
             if (configurationChangeEvent.affectsConfiguration('amazonQ.workspaceIndex')) {
@@ -62,15 +48,6 @@ export async function activate(context: ExtensionContext) {
     void setupAuthNotification()
 }
 
-function registerApps(appInitContext: amazonq.AmazonQAppInitContext, context: ExtensionContext) {
-    amazonq.cwChatAppInit(appInitContext)
-    amazonq.featureDevChatAppInit(appInitContext)
-    amazonq.gumbyChatAppInit(appInitContext)
-    amazonq.testChatAppInit(appInitContext)
-    scanChatAppInit(appInitContext)
-    amazonq.docChatAppInit(appInitContext)
-}
-
 /**
  * Display a notification to user for Log In.
  *

packages/amazonq/src/app/chat/node/activateAgents.ts

@@ -0,0 +1,19 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as amazonqNode from 'aws-core-vscode/amazonq/node'
+import { scanChatAppInit } from '../../amazonqScan'
+import { DefaultAmazonQAppInitContext } from 'aws-core-vscode/amazonq'
+
+export function activateAgents() {
+    const appInitContext = DefaultAmazonQAppInitContext.instance
+
+    amazonqNode.cwChatAppInit(appInitContext)
+    amazonqNode.featureDevChatAppInit(appInitContext)
+    amazonqNode.gumbyChatAppInit(appInitContext)
+    amazonqNode.testChatAppInit(appInitContext)
+    amazonqNode.docChatAppInit(appInitContext)
+    scanChatAppInit(appInitContext)
+}

packages/amazonq/src/extension.ts

@@ -4,7 +4,12 @@
  */
 
 import { CredentialsStore, LoginManager, authUtils, initializeAuth } from 'aws-core-vscode/auth'
-import { activate as activateCodeWhisperer, shutdown as shutdownCodeWhisperer } from 'aws-core-vscode/codewhisperer'
+import { Auth, AuthUtils, CredentialsStore, LoginManager, initializeAuth } from 'aws-core-vscode/auth'
+import {
+    activate as activateCodeWhisperer,
+    AuthUtil,
+    shutdown as shutdownCodeWhisperer,
+} from 'aws-core-vscode/codewhisperer'
 import { makeEndpointsProvider, registerGenericCommands } from 'aws-core-vscode'
 import { CommonAuthWebview } from 'aws-core-vscode/login'
 import {
@@ -34,6 +39,7 @@ import {
     Experiments,
     isSageMaker,
     Commands,
+    isAmazonInternalOs,
 } from 'aws-core-vscode/shared'
 import { ExtStartUpSources } from 'aws-core-vscode/telemetry'
 import { VSCODE_EXTENSION_ID } from 'aws-core-vscode/utils'
@@ -45,6 +51,7 @@ import { focusAmazonQPanel } from 'aws-core-vscode/codewhispererChat'
 import { activate as activateAmazonqLsp } from './lsp/activation'
 import { activate as activateInlineCompletion } from './app/inline/activation'
 import { isAmazonInternalOs } from 'aws-core-vscode/shared'
+import { hasGlibcPatch } from './lsp/client'
 
 export const amazonQContextPrefix = 'amazonq'
 
@@ -120,11 +127,17 @@ export async function activateAmazonQCommon(context: vscode.ExtensionContext, is
         extensionContext: context,
     }
 
-    await activateAmazonqLsp(context)
-
     // This contains every lsp agnostic things (auth, security scan, code scan)
     await activateCodeWhisperer(extContext as ExtContext)
 
+    if (
+        (Experiments.instance.get('amazonqLSP', true) || AuthUtil.instance.isInternalAmazonUser()) &&
+        (!isAmazonInternalOs() || (await hasGlibcPatch()))
+    ) {
+        // start the Amazon Q LSP for internal users first
+        // for AL2, start LSP if glibc patch is found
+        await activateAmazonqLsp(context)
+    }
     if (!Experiments.instance.get('amazonqLSPInline', false)) {
         await activateInlineCompletion()
     }

packages/amazonq/src/extensionNode.ts

@@ -5,8 +5,8 @@
 
 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 { DefaultAmazonQAppInitContext, AmazonQChatViewProvider } from 'aws-core-vscode/amazonq'
+import { activate as activateTransformationHub } from 'aws-core-vscode/amazonqGumby'
 import { ExtContext, globals, CrashMonitoring, getLogger, isSageMaker, Experiments } from 'aws-core-vscode/shared'
 import { filetypes, SchemaService } from 'aws-core-vscode/sharedNode'
 import { updateDevMode } from 'aws-core-vscode/dev'
@@ -22,7 +22,8 @@ import { beta } from 'aws-core-vscode/dev'
 import * as amazonq from 'aws-core-vscode/amazonq'
 import { activate as activateNotifications, NotificationsController } from 'aws-core-vscode/notifications'
 import { AuthUtil } from 'aws-core-vscode/codewhisperer'
-import { telemetry, AuthUserState, AuthStatus } from 'aws-core-vscode/telemetry'
+import { telemetry, AuthUserState } from 'aws-core-vscode/telemetry'
+import { activateAgents } from './app/chat/node/activateAgents'
 
 export async function activate(context: vscode.ExtensionContext) {
     // IMPORTANT: No other code should be added to this function. Place it in one of the following 2 functions where appropriate.
@@ -45,10 +46,26 @@ async function activateAmazonQNode(context: vscode.ExtensionContext) {
         extensionContext: context,
     }
 
-    if (!Experiments.instance.get('amazonqChatLSP', false)) {
+    if (!Experiments.instance.get('amazonqChatLSP', true)) {
+        const appInitContext = DefaultAmazonQAppInitContext.instance
+        const provider = new AmazonQChatViewProvider(
+            context,
+            appInitContext.getWebViewToAppsMessagePublishers(),
+            appInitContext.getAppsToWebViewMessageListener(),
+            appInitContext.onDidChangeAmazonQVisibility
+        )
+        context.subscriptions.push(
+            vscode.window.registerWebviewViewProvider(AmazonQChatViewProvider.viewType, provider, {
+                webviewOptions: {
+                    retainContextWhenHidden: true,
+                },
+            })
+        )
+        // this is registered inside of lsp/chat/activation.ts when the chat experiment is enabled
         await activateCWChat(context)
-        await activateQGumby(extContext as ExtContext)
     }
+    activateAgents()
+    await activateTransformationHub(extContext as ExtContext)
     activateInlineChat(context)
 
     context.subscriptions.push(amazonq.focusAmazonQPanel.register(), amazonq.focusAmazonQPanelKeybinding.register())