Merge pull request #7271 from opieter-aws/feature/amazonqLSP-auth

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

Author: opieter-aws

.github/CODEOWNERS

@@ -1,6 +1,4 @@
 * @aws/aws-ides-team
 packages/core/src/codewhisperer/ @aws/codewhisperer-team
 packages/core/src/amazonqFeatureDev/ @aws/earlybird
-packages/core/src/codewhispererChat/ @aws/flare
-packages/core/src/amazonq/ @aws/flare
 packages/core/src/awsService/accessanalyzer/ @aws/access-analyzer

CONTRIBUTING.md

@@ -534,6 +534,7 @@ Unlike the user setting overrides, not all of these environment variables have t
 -   `AWS_TOOLKIT_TEST_NO_COLOR`: If the tests should include colour in their output
 -   `DEVELOPMENT_PATH`: The path to the aws toolkit vscode project
 -   `TEST_DIR` - The directory where the test runner should find the tests
+-   `AMAZONQ_FEATUREDEV_ITERATION_TEST` - Controls whether to enable multiple iteration testing for Amazon Q feature development
 
 ### SAM/CFN ("goformation") JSON schema
 

package-lock.json

@@ -0,0 +1,14 @@
+{
+	"date": "2025-05-05",
+	"version": "1.65.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Support selecting customizations across all Q profiles with automatic profile switching for enterprise users"
+		},
+		{
+			"type": "Feature",
+			"description": "Memorize and autofill users' last Sso login profile"
+		}
+	]
+}

packages/amazonq/.changes/1.65.0.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Avoid inline completion 'Improperly formed request' errors when file is too large"
+}

packages/amazonq/.changes/next-release/Bug Fix-75375702-36b5-4e89-af57-4afe983a7238.json

@@ -1,3 +1,8 @@
+## 1.65.0 2025-05-05
+
+- **Feature** Support selecting customizations across all Q profiles with automatic profile switching for enterprise users
+- **Feature** Memorize and autofill users' last Sso login profile
+
 ## 1.64.0 2025-05-02
 
 - **Bug Fix** Enable Amazon Q LSP in AL2 instances

packages/amazonq/CHANGELOG.md

@@ -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.65.0-SNAPSHOT",
+    "version": "1.66.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],
@@ -59,7 +59,6 @@
         "watch": "npm run clean && npm run buildScripts && tsc -watch -p ./",
         "testCompile": "npm run clean && npm run buildScripts && npm run compileOnly",
         "test": "npm run testCompile && c8 --allowExternal ts-node ../core/scripts/test/launchTest.ts unit dist/test/unit/index.js ../core/dist/src/testFixtures/workspaceFolder",
-        "testE2E": "npm run testCompile && c8 --allowExternal ts-node ../core/scripts/test/launchTest.ts e2e dist/test/e2e/index.js ../core/dist/src/testFixtures/workspaceFolder",
         "testWeb": "npm run compileDev && c8 --allowExternal ts-node ../core/scripts/test/launchTest.ts web dist/test/web/testRunnerWebCore.js",
         "webRun": "npx @vscode/test-web --open-devtools --browserOption=--disable-web-security --waitForDebugger=9222 --extensionDevelopmentPath=. .",
         "webWatch": "npm run clean && npm run buildScripts && webpack --mode development --watch",

packages/amazonq/package.json

@@ -30,14 +30,7 @@ export async function activate(context: ExtensionContext) {
         amazonq.listCodeWhispererCommandsWalkthrough.register(),
         amazonq.focusAmazonQPanel.register(),
         amazonq.focusAmazonQPanelKeybinding.register(),
-        amazonq.tryChatCodeLensCommand.register(),
-        vscode.workspace.onDidChangeConfiguration(async (configurationChangeEvent) => {
-            if (configurationChangeEvent.affectsConfiguration('amazonQ.workspaceIndex')) {
-                if (CodeWhispererSettings.instance.isLocalIndexEnabled()) {
-                    void setupLsp()
-                }
-            }
-        })
+        amazonq.tryChatCodeLensCommand.register()
     )
 
     Commands.register('aws.amazonq.learnMore', () => {

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

@@ -124,7 +124,6 @@ export async function activateAmazonQCommon(context: vscode.ExtensionContext, is
 
     // This contains every lsp agnostic things (auth, security scan, code scan)
     await activateCodeWhisperer(extContext as ExtContext)
-
     if (!Experiments.instance.get('amazonqLSPInline', false)) {
         await activateInlineCompletion()
     }

packages/amazonq/src/extension.ts

@@ -147,6 +147,9 @@ export async function startLanguageServer(
                         showSaveFileDialog: true,
                     },
                 },
+                contextConfiguration: {
+                    workspaceIdentifier: extensionContext.storageUri,
+                },
                 logLevel: toAmazonQLSPLogLevel(globals.logOutputChannel.logLevel),
             },
             credentials: {
@@ -280,8 +283,9 @@ export async function startLanguageServer(
             })
         )
     }
-
-    await activateChat(client, encryptionKey, resourcePaths.ui)
+    if (Experiments.instance.get('amazonqChatLSP', true)) {
+        await activateChat(client, encryptionKey, resourcePaths.ui)
+    }
 
     toDispose.push(
         AuthUtil.instance.regionProfileManager.onDidChangeRegionProfile(sendProfileToLsp),