Merge master into feature/emr

Author: aws-toolkit-automation

packages/amazonq/src/lsp/client.ts

@@ -34,6 +34,7 @@ import {
     isAmazonInternalOs,
     fs,
     getClientId,
+    extensionVersion,
 } from 'aws-core-vscode/shared'
 import { processUtils } from 'aws-core-vscode/shared'
 import { activate } from './chat/activation'
@@ -119,7 +120,7 @@ export async function startLanguageServer(
                     version: version,
                     extension: {
                         name: 'AmazonQ-For-VSCode',
-                        version: '0.0.1',
+                        version: extensionVersion,
                     },
                     clientId: getClientId(globals.globalState),
                 },