Merge master into feature/amazonqLSP-auth (#7225)

## Automatic merge failed

- Resolve conflicts and push to this PR branch.
- **Do not squash-merge** this PR. Use the "Create a merge commit"
option to do a regular merge.

## Command line hint

To perform the merge from the command line, you could do something like
the following (where "origin" is the name of the remote in your local
git repo):
```
git stash
git fetch --all
git checkout origin/feature/amazonqLSP-auth
git merge origin/master
git commit
git push origin HEAD:refs/heads/autoMerge/feature/amazonqLSP-auth
```

---------

Signed-off-by: nkomonen-amazon <[email protected]>
Co-authored-by: Josh Pinkney <[email protected]>
Co-authored-by: Josh Pinkney <[email protected]>
Co-authored-by: Justin M. Keyes <[email protected]>
Co-authored-by: Lei Gao <[email protected]>
Co-authored-by: aws-toolkit-automation <>
Co-authored-by: zuoyaofu <[email protected]>
Co-authored-by: aditya169 <[email protected]>
Co-authored-by: Zoe Lin <[email protected]>
Co-authored-by: Hweinstock <[email protected]>
Co-authored-by: Nikolas Komonen <[email protected]>
Co-authored-by: Will Lo <[email protected]>
Co-authored-by: Tai Lai <[email protected]>
Co-authored-by: opieter-aws <[email protected]>
Co-authored-by: chungjac <[email protected]>
Co-authored-by: Dogus Atasoy <[email protected]>
Co-authored-by: Avi Alpert <[email protected]>
Co-authored-by: nkomonen-amazon <[email protected]>
Co-authored-by: Frederic Mbea <[email protected]>
Co-authored-by: Tom Zu <[email protected]>
Co-authored-by: David <[email protected]>
Co-authored-by: chengoramazon <[email protected]>
Co-authored-by: Laxman Reddy <[email protected]>
Co-authored-by: Jiatong Li <[email protected]>
Co-authored-by: Adam Khamis <[email protected]>
Co-authored-by: Na Yue <[email protected]>
Co-authored-by: Jiatong Li <[email protected]>
Co-authored-by: Brad Skaggs <[email protected]>

Author: 24 people

package-lock.json

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

package.json

@@ -0,0 +1,14 @@
+{
+	"date": "2025-05-09",
+	"version": "1.66.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Avoid inline completion 'Improperly formed request' errors when file is too large"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Named agent tabs sometimes open with unnecessary input options"
+		}
+	]
+}

packages/amazonq/.changes/1.66.0.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Previous and subsequent cells are used as context for completion in a Jupyter notebook"
+}

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

@@ -1,3 +1,8 @@
+## 1.66.0 2025-05-09
+
+- **Bug Fix** Avoid inline completion 'Improperly formed request' errors when file is too large
+- **Bug Fix** Named agent tabs sometimes open with unnecessary input options
+
 ## 1.65.0 2025-05-05
 
 - **Feature** Support selecting customizations across all Q profiles with automatic profile switching for enterprise users

packages/amazonq/.changes/next-release/Bug Fix-9b0e6490-39a8-445f-9d67-9d762de7421c.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.66.0-SNAPSHOT",
+    "version": "1.67.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],

packages/amazonq/CHANGELOG.md

@@ -25,6 +25,11 @@ export async function activate(languageClient: LanguageClient, encryptionKey: Bu
         type: 'profile',
         profileArn: AuthUtil.instance.regionProfileManager.activeRegionProfile?.arn,
     })
+    // We need to push the cached customization on startup explicitly
+    await pushConfigUpdate(languageClient, {
+        type: 'customization',
+        customization: getSelectedCustomization(),
+    })
 
     const provider = new AmazonQChatViewProvider(mynahUIPath)
 

packages/amazonq/package.json

@@ -91,6 +91,7 @@ export function registerLanguageServerEventListener(languageClient: LanguageClie
         const telemetryName: string = e.name
 
         if (telemetryName in telemetry) {
+            languageClient.info(`[Telemetry] Emitting ${telemetryName} telemetry: ${JSON.stringify(e.data)}`)
             telemetry[telemetryName as keyof TelemetryBase].emit(e.data)
         }
     })

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

@@ -7,8 +7,8 @@ import vscode, { env, version } from 'vscode'
 import * as nls from 'vscode-nls'
 import * as crypto from 'crypto'
 import * as jose from 'jose'
-import { InlineCompletionManager } from '../app/inline/completion'
 import { LanguageClient, LanguageClientOptions, RequestType, State } from 'vscode-languageclient'
+import { InlineCompletionManager } from '../app/inline/completion'
 import {
     CreateFilesParams,
     DeleteFilesParams,
@@ -47,12 +47,15 @@ import {
     fs,
     oidcClientName,
     openUrl,
+    getClientId,
+    extensionVersion,
 } from 'aws-core-vscode/shared'
 import { processUtils } from 'aws-core-vscode/shared'
 import { activate as activateChat } from './chat/activation'
 import { AmazonQResourcePaths } from './lspInstaller'
 import { auth2 } from 'aws-core-vscode/auth'
 import { ConfigSection, isValidConfigSection, toAmazonQLSPLogLevel } from './config'
+import { telemetry } from 'aws-core-vscode/telemetry'
 
 const localize = nls.loadMessageBundle()
 const logger = getLogger('amazonqLsp.lspClient')
@@ -134,9 +137,9 @@ export async function startLanguageServer(
                     version: version,
                     extension: {
                         name: 'AmazonQ-For-VSCode',
-                        version: '0.0.1',
+                        version: extensionVersion,
                     },
-                    clientId: crypto.randomUUID(),
+                    clientId: getClientId(globals.globalState),
                 },
                 awsClientCapabilities: {
                     q: {
@@ -148,7 +151,7 @@ export async function startLanguageServer(
                     },
                 },
                 contextConfiguration: {
-                    workspaceIdentifier: extensionContext.storageUri,
+                    workspaceIdentifier: extensionContext.storageUri?.path,
                 },
                 logLevel: toAmazonQLSPLogLevel(globals.logOutputChannel.logLevel),
             },
@@ -375,6 +378,12 @@ function onServerRestartHandler(client: LanguageClient) {
             return
         }
 
+        // Emit telemetry that a crash was detected.
+        // It is not guaranteed to 100% be a crash since somehow the server may have been intentionally restarted,
+        // but most of the time it probably will have been due to a crash.
+        // TODO: Port this metric override to common definitions
+        telemetry.languageServer_crash.emit({ id: 'AmazonQ' })
+
         // Need to set the auth token in the again
         await AuthUtil.instance.restore()
     })
@@ -412,6 +421,8 @@ function getConfigSection(section: ConfigSection) {
                     includeSuggestionsWithCodeReferences:
                         CodeWhispererSettings.instance.isSuggestionsWithCodeReferencesEnabled(),
                     shareCodeWhispererContentWithAWS: !CodeWhispererSettings.instance.isOptoutEnabled(),
+                    includeImportsWithSuggestions: CodeWhispererSettings.instance.isImportRecommendationEnabled(),
+                    sendUserWrittenCodeMetrics: true,
                 },
             ]
         case 'aws.logLevel':