Merge master into feature/flare-inline

Author: aws-toolkit-automation

package-lock.json

@@ -0,0 +1,10 @@
+{
+	"date": "2025-06-11",
+	"version": "1.73.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Add MCP Server Support"
+		}
+	]
+}

packages/amazonq/.changes/1.73.0.json

@@ -1,3 +1,7 @@
+## 1.73.0 2025-06-11
+
+- **Feature** Add MCP Server Support
+
 ## 1.72.0 2025-06-11
 
 - **Feature** Launch LSP with bundled artifacts as fallback

packages/amazonq/.changes/next-release/Feature-57661731-6180-4157-a04b-d3a8b50aa1a8.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.73.0-SNAPSHOT",
+    "version": "1.74.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],

packages/amazonq/CHANGELOG.md

@@ -3,6 +3,7 @@ import * as fs from 'fs'
 import * as crypto from 'crypto'
 import * as path from 'path'
 import * as os from 'os'
+import * as semver from 'semver'
 import AdmZip from 'adm-zip'
 
 interface ManifestContent {
@@ -27,6 +28,7 @@ interface ManifestVersion {
 interface Manifest {
     versions: ManifestVersion[]
 }
+
 async function verifyFileHash(filePath: string, expectedHash: string): Promise<boolean> {
     return new Promise((resolve, reject) => {
         const hash = crypto.createHash('sha384')
@@ -86,7 +88,7 @@ export async function downloadLanguageServer(): Promise<void> {
 
                         const latestVersion = manifest.versions
                             .filter((v) => !v.isDelisted)
-                            .sort((a, b) => b.serverVersion.localeCompare(a.serverVersion))[0]
+                            .sort((a, b) => semver.compare(b.serverVersion, a.serverVersion))[0]
 
                         if (!latestVersion) {
                             throw new Error('No valid version found in manifest')