Merge branch 'master' of github.com:leigaol/aws-toolkit-vscode into al2_arm

Author: leigaol

package-lock.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

@@ -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-75375702-36b5-4e89-af57-4afe983a7238.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

@@ -5,7 +5,6 @@
 
 import vscode, { env, version } from 'vscode'
 import * as nls from 'vscode-nls'
-import * as crypto from 'crypto'
 import { LanguageClient, LanguageClientOptions, RequestType, State } from 'vscode-languageclient'
 import { InlineCompletionManager } from '../app/inline/completion'
 import { AmazonQLspAuth, encryptionKey, notificationTypes } from './auth'
@@ -34,11 +33,13 @@ import {
     getOptOutPreference,
     isAmazonLinux2,
     fs,
+    getClientId,
 } from 'aws-core-vscode/shared'
 import { processUtils } from 'aws-core-vscode/shared'
 import { activate } from './chat/activation'
 import { AmazonQResourcePaths } from './lspInstaller'
 import { ConfigSection, isValidConfigSection, toAmazonQLSPLogLevel } from './config'
+import { telemetry } from 'aws-core-vscode/telemetry'
 
 const localize = nls.loadMessageBundle()
 const logger = getLogger('amazonqLsp.lspClient')
@@ -124,7 +125,7 @@ export async function startLanguageServer(
                         name: 'AmazonQ-For-VSCode',
                         version: '0.0.1',
                     },
-                    clientId: crypto.randomUUID(),
+                    clientId: getClientId(globals.globalState),
                 },
                 awsClientCapabilities: {
                     q: {
@@ -292,6 +293,12 @@ function onServerRestartHandler(client: LanguageClient, auth: AmazonQLspAuth) {
             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 auth.refreshConnection(true)
     })

packages/amazonq/package.json

@@ -355,6 +355,8 @@ export class QuickActionHandler {
                 loadingChat: true,
                 cancelButtonWhenLoading: false,
             })
+        } else {
+            this.mynahUI.updateStore(affectedTabId, { promptInputOptions: [] })
         }
 
         if (affectedTabId && this.isHybridChatEnabled) {

packages/amazonq/src/lsp/client.ts

@@ -205,6 +205,14 @@ export class FeatureDevCodeGenState extends BaseCodeGenState {
                     429
                 )
             }
+            case codegenResult.codeGenerationStatusDetail?.includes('FileCreationFailed'): {
+                return new ApiServiceError(
+                    i18n('AWS.amazonq.featureDev.error.codeGen.default'),
+                    'GetTaskAssistCodeGeneration',
+                    'FileCreationFailedException',
+                    500
+                )
+            }
             default: {
                 return new ApiServiceError(
                     i18n('AWS.amazonq.featureDev.error.codeGen.default'),

packages/core/src/amazonq/webview/ui/quickActions/handler.ts

@@ -59,7 +59,7 @@ export const onProfileChangedListener: (event: ProfileChangedEvent) => any = asy
     if (event.intent === 'customization') {
         return
     }
-
+    const logger = getLogger()
     if (!event.profile) {
         await setSelectedCustomization(baseCustomization)
         return
@@ -69,7 +69,16 @@ export const onProfileChangedListener: (event: ProfileChangedEvent) => any = asy
     const selectedCustomization = getSelectedCustomization()
     // No need to validate base customization which has empty arn.
     if (selectedCustomization.arn.length > 0) {
-        await switchToBaseCustomizationAndNotify()
+        const customizationProvider = await CustomizationProvider.init(event.profile)
+        const customizations = await customizationProvider.listAvailableCustomizations()
+
+        const r = customizations.find((it) => it.arn === selectedCustomization.arn)
+        if (!r) {
+            logger.debug(
+                `profile ${event.profile.name} doesnt have access to customization ${selectedCustomization.name} but has access to ${customizations.map((it) => it.name)}`
+            )
+            await switchToBaseCustomizationAndNotify()
+        }
     }
 }
 

packages/core/src/amazonqFeatureDev/session/sessionState.ts

@@ -1019,6 +1019,15 @@
                 }
             ]
         },
+        {
+            "name": "languageServer_crash",
+            "description": "Called when a language server crash is detected. TODO: Port this to common",
+            "metadata": [
+                {
+                    "type": "id"
+                }
+            ]
+        },
         {
             "name": "ide_heartbeat",
             "description": "A heartbeat sent by the extension",