feat(amazonq): mynah version bump up

packages/amazonq/.changes/next-release/Bug Fix-sagemaker-al2-support.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Improved Amazon Linux 2 support with better SageMaker environment detection"
+}

packages/amazonq/src/extension.ts

@@ -126,12 +126,15 @@ 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 (
+
+    // Always activate LSP for SageMaker environments
+    const shouldActivateLsp =
         (Experiments.instance.get('amazonqLSP', true) || Auth.instance.isInternalAmazonUser()) &&
-        (!isAmazonLinux2() || hasGlibcPatch())
-    ) {
+        (isSageMaker() || !isAmazonLinux2() || (await hasGlibcPatch()))
+
+    if (shouldActivateLsp) {
         // start the Amazon Q LSP for internal users first
-        // for AL2, start LSP if glibc patch is found
+        // for AL2, start LSP if glibc patch is found or if it's a SageMaker environment
         await activateAmazonqLsp(context)
     }
     if (!Experiments.instance.get('amazonqLSPInline', true)) {

packages/amazonq/src/lsp/client.ts

@@ -36,10 +36,11 @@ import {
     undefinedIfEmpty,
     getOptOutPreference,
     isAmazonLinux2,
+    fs,
     getClientId,
     extensionVersion,
 } from 'aws-core-vscode/shared'
-import { processUtils } from 'aws-core-vscode/shared'
+import { processUtils, isSageMaker } from 'aws-core-vscode/shared'
 import { activate } from './chat/activation'
 import { AmazonQResourcePaths } from './lspInstaller'
 import { ConfigSection, isValidConfigSection, pushConfigUpdate, toAmazonQLSPLogLevel } from './config'
@@ -53,11 +54,24 @@ import { InlineChatTutorialAnnotation } from '../app/inline/tutorials/inlineChat
 const localize = nls.loadMessageBundle()
 const logger = getLogger('amazonqLsp.lspClient')
 
-export const glibcLinker: string = process.env.VSCODE_SERVER_CUSTOM_GLIBC_LINKER || ''
-export const glibcPath: string = process.env.VSCODE_SERVER_CUSTOM_GLIBC_PATH || ''
+export async function hasGlibcPatch(): Promise<boolean> {
+    // Skip GLIBC patching for SageMaker environments
+    if (isSageMaker()) {
+        getLogger('amazonqLsp').info('SageMaker environment detected in hasGlibcPatch, skipping GLIBC patching')
+        return false // Return false to ensure SageMaker doesn't try to use GLIBC patching
+    }
+
+    // Check for environment variables first (for CDM)
+    const glibcLinker = process.env.VSCODE_SERVER_CUSTOM_GLIBC_LINKER || ''
+    const glibcPath = process.env.VSCODE_SERVER_CUSTOM_GLIBC_PATH || ''
 
-export function hasGlibcPatch(): boolean {
-    return glibcLinker.length > 0 && glibcPath.length > 0
+    if (glibcLinker.length > 0 && glibcPath.length > 0) {
+        getLogger('amazonqLsp').info('GLIBC patching environment variables detected')
+        return true
+    }
+
+    // Fall back to file check for other environments
+    return await fs.exists('/opt/vsc-sysroot/lib64/ld-linux-x86-64.so.2')
 }
 
 export async function startLanguageServer(
@@ -82,9 +96,31 @@ export async function startLanguageServer(
     const traceServerEnabled = Settings.instance.isSet(`${clientId}.trace.server`)
     let executable: string[] = []
     // apply the GLIBC 2.28 path to node js runtime binary
-    if (isAmazonLinux2() && hasGlibcPatch()) {
-        executable = [glibcLinker, '--library-path', glibcPath, resourcePaths.node]
-        getLogger('amazonqLsp').info(`Patched node runtime with GLIBC to ${executable}`)
+    if (isSageMaker()) {
+        // SageMaker doesn't need GLIBC patching
+        getLogger('amazonqLsp').info('SageMaker environment detected, skipping GLIBC patching')
+        executable = [resourcePaths.node]
+    } else if (isAmazonLinux2() && (await hasGlibcPatch())) {
+        // Use environment variables if available (for CDM)
+        if (process.env.VSCODE_SERVER_CUSTOM_GLIBC_LINKER && process.env.VSCODE_SERVER_CUSTOM_GLIBC_PATH) {
+            executable = [
+                process.env.VSCODE_SERVER_CUSTOM_GLIBC_LINKER,
+                '--library-path',
+                process.env.VSCODE_SERVER_CUSTOM_GLIBC_PATH,
+                resourcePaths.node,
+            ]
+            getLogger('amazonqLsp').info(`Patched node runtime with GLIBC using env vars to ${executable}`)
+        }
+        // Fall back to hardcoded path
+        else {
+            executable = [
+                '/opt/vsc-sysroot/lib64/ld-linux-x86-64.so.2',
+                '--library-path',
+                '/opt/vsc-sysroot/lib64',
+                resourcePaths.node,
+            ]
+            getLogger('amazonqLsp').info(`Patched node runtime with GLIBC using hardcoded path to ${executable}`)
+        }
     } else {
         executable = [resourcePaths.node]
     }

packages/core/package.json

@@ -526,7 +526,7 @@
         "@aws-sdk/s3-request-presigner": "<3.731.0",
         "@aws-sdk/smithy-client": "<3.731.0",
         "@aws-sdk/util-arn-parser": "<3.731.0",
-        "@aws/mynah-ui": "^4.35.4",
+        "@aws/mynah-ui": "^4.35.6",
         "@gerhobbelt/gitignore-parser": "^0.2.0-9",
         "@iarna/toml": "^2.2.5",
         "@smithy/fetch-http-handler": "^5.0.1",

packages/core/src/shared/extensionUtilities.ts

@@ -176,6 +176,18 @@ export function isCloud9(flavor: 'classic' | 'codecatalyst' | 'any' = 'any'): bo
  * @returns true if the current system is SageMaker(SMAI or SMUS)
  */
 export function isSageMaker(appName: 'SMAI' | 'SMUS' = 'SMAI'): boolean {
+    // Check for SageMaker-specific environment variables first
+    if (
+        process.env.SAGEMAKER_APP_TYPE !== undefined ||
+        process.env.SERVICE_NAME === sageMakerUnifiedStudio ||
+        process.env.SAGEMAKER_INTERNAL_IMAGE_URI !== undefined ||
+        process.env.STUDIO_LOGGING_DIR?.includes('/var/log/studio') === true
+    ) {
+        getLogger().debug('SageMaker environment detected via environment variables')
+        return true
+    }
+
+    // Fall back to app name checks
     switch (appName) {
         case 'SMAI':
             return vscode.env.appName === sageMakerAppname