Merge master into feature/hybridChat-local

aws-toolkit-automation · web-flow · commit 2e5468744989 · 2025-06-11T19:02:41.000-04:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/amazonq/.changes/1.72.0.json b/packages/amazonq/.changes/1.72.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2025-06-11",
+	"version": "1.72.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Launch LSP with bundled artifacts as fallback"
+		}
+	]
+}
diff --git a/packages/amazonq/.changes/next-release/Feature-57661731-6180-4157-a04b-d3a8b50aa1a8.json b/packages/amazonq/.changes/next-release/Feature-57661731-6180-4157-a04b-d3a8b50aa1a8.json
@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Add MCP Server Support"
+}
diff --git a/packages/amazonq/.changes/next-release/Feature-d6714581-799f-49dc-bb63-f08d461e9bde.json b/packages/amazonq/.changes/next-release/Feature-d6714581-799f-49dc-bb63-f08d461e9bde.json
diff --git a/packages/amazonq/CHANGELOG.md b/packages/amazonq/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.72.0 2025-06-11
+
+- **Feature** Launch LSP with bundled artifacts as fallback
+
 ## 1.71.0 2025-06-04
 
 - Miscellaneous non-user-facing changes
diff --git a/packages/amazonq/package.json b/packages/amazonq/package.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.72.0-SNAPSHOT",
+    "version": "1.73.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],
diff --git a/packages/amazonq/src/lsp/client.ts b/packages/amazonq/src/lsp/client.ts
@@ -123,6 +123,7 @@ export async function startLanguageServer(
                 awsClientCapabilities: {
                     q: {
                         developerProfiles: true,
+                        mcp: true,
                     },
                     window: {
                         notifications: true,

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +	"type": "Feature",
 +	"description": "Add MCP Server Support"
 +}