diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index b964b20038..bb6d959896 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,9 +1,9 @@
 {
-    "chat-client": "0.1.16",
+    "chat-client": "0.1.17",
     "core/aws-lsp-core": "0.0.9",
-    "server/aws-lsp-antlr4": "0.1.11",
-    "server/aws-lsp-codewhisperer": "0.0.49",
-    "server/aws-lsp-json": "0.1.11",
-    "server/aws-lsp-partiql": "0.0.12",
-    "server/aws-lsp-yaml": "0.1.11"
+    "server/aws-lsp-antlr4": "0.1.12",
+    "server/aws-lsp-codewhisperer": "0.0.50",
+    "server/aws-lsp-json": "0.1.12",
+    "server/aws-lsp-partiql": "0.0.13",
+    "server/aws-lsp-yaml": "0.1.12"
 }
diff --git a/chat-client/CHANGELOG.md b/chat-client/CHANGELOG.md
index edcb9d36d2..c962b8dae2 100644
--- a/chat-client/CHANGELOG.md
+++ b/chat-client/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.1.17](https://github.com/aws/language-servers/compare/chat-client/v0.1.16...chat-client/v0.1.17) (2025-06-16)
+
+
+### Features
+
+* **amazonq:** model throttling message as card instead of chat message ([#1657](https://github.com/aws/language-servers/issues/1657)) ([7ee1f2a](https://github.com/aws/language-servers/commit/7ee1f2ac0bdaa9f73fb63fc6d20d0de6d7b07523))
+* **amazonq:** pinned context and rules ([#1663](https://github.com/aws/language-servers/issues/1663)) ([25e7a5a](https://github.com/aws/language-servers/commit/25e7a5ab8b6630525a4fd6acc0524f67f00af817))
+* update list of models and set default to 4 ([#1659](https://github.com/aws/language-servers/issues/1659)) ([1991658](https://github.com/aws/language-servers/commit/19916584d3f46049d30f0c23b41c3857a07bc622))
+
+
+### Bug Fixes
+
+* **agenticChat:** UX fixes for MCP ([#1661](https://github.com/aws/language-servers/issues/1661)) ([bbdb4b4](https://github.com/aws/language-servers/commit/bbdb4b451352af50a914df684d7654686142a13b))
+
 ## [0.1.16](https://github.com/aws/language-servers/compare/chat-client/v0.1.15...chat-client/v0.1.16) (2025-06-12)
 
 
diff --git a/chat-client/package.json b/chat-client/package.json
index 67b049d77f..a11a7ababf 100644
--- a/chat-client/package.json
+++ b/chat-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@aws/chat-client",
-    "version": "0.1.16",
+    "version": "0.1.17",
     "description": "AWS Chat Client",
     "main": "out/index.js",
     "repository": {
diff --git a/package-lock.json b/package-lock.json
index b033e5b60b..7982044ad9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -244,7 +244,7 @@
         },
         "chat-client": {
             "name": "@aws/chat-client",
-            "version": "0.1.16",
+            "version": "0.1.17",
             "license": "Apache-2.0",
             "dependencies": {
                 "@aws/chat-client-ui-types": "^0.1.40",
@@ -27220,7 +27220,7 @@
         },
         "server/aws-lsp-antlr4": {
             "name": "@aws/lsp-antlr4",
-            "version": "0.1.11",
+            "version": "0.1.12",
             "license": "Apache-2.0",
             "dependencies": {
                 "@aws/language-server-runtimes": "^0.2.97",
@@ -27284,7 +27284,7 @@
         },
         "server/aws-lsp-codewhisperer": {
             "name": "@aws/lsp-codewhisperer",
-            "version": "0.0.49",
+            "version": "0.0.50",
             "bundleDependencies": [
                 "@amzn/amazon-q-developer-streaming-client"
             ],
@@ -27482,7 +27482,7 @@
         },
         "server/aws-lsp-json": {
             "name": "@aws/lsp-json",
-            "version": "0.1.11",
+            "version": "0.1.12",
             "license": "Apache-2.0",
             "dependencies": {
                 "@aws/language-server-runtimes": "^0.2.97",
@@ -27542,7 +27542,7 @@
         },
         "server/aws-lsp-partiql": {
             "name": "@aws/lsp-partiql",
-            "version": "0.0.12",
+            "version": "0.0.13",
             "license": "Apache-2.0",
             "dependencies": {
                 "@aws/language-server-runtimes": "^0.2.97",
@@ -27574,7 +27574,7 @@
         },
         "server/aws-lsp-yaml": {
             "name": "@aws/lsp-yaml",
-            "version": "0.1.11",
+            "version": "0.1.12",
             "hasInstallScript": true,
             "license": "Apache-2.0",
             "dependencies": {
diff --git a/server/aws-lsp-antlr4/CHANGELOG.md b/server/aws-lsp-antlr4/CHANGELOG.md
index 3a040086bb..960a610fd6 100644
--- a/server/aws-lsp-antlr4/CHANGELOG.md
+++ b/server/aws-lsp-antlr4/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.1.12](https://github.com/aws/language-servers/compare/lsp-antlr4/v0.1.11...lsp-antlr4/v0.1.12) (2025-06-16)
+
+
+### Features
+
+* **amazonq:** pinned context and rules ([#1663](https://github.com/aws/language-servers/issues/1663)) ([25e7a5a](https://github.com/aws/language-servers/commit/25e7a5ab8b6630525a4fd6acc0524f67f00af817))
+
 ## [0.1.11](https://github.com/aws/language-servers/compare/lsp-antlr4/v0.1.10...lsp-antlr4/v0.1.11) (2025-06-10)
 
 
diff --git a/server/aws-lsp-antlr4/package.json b/server/aws-lsp-antlr4/package.json
index 68d4e109c9..0b4baae72c 100644
--- a/server/aws-lsp-antlr4/package.json
+++ b/server/aws-lsp-antlr4/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@aws/lsp-antlr4",
-    "version": "0.1.11",
+    "version": "0.1.12",
     "description": "ANTLR4 language server",
     "main": "out/index.js",
     "repository": {
diff --git a/server/aws-lsp-codewhisperer/CHANGELOG.md b/server/aws-lsp-codewhisperer/CHANGELOG.md
index 88da5cbeda..ef563e155a 100644
--- a/server/aws-lsp-codewhisperer/CHANGELOG.md
+++ b/server/aws-lsp-codewhisperer/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Changelog
 
+## [0.0.50](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.49...lsp-codewhisperer/v0.0.50) (2025-06-16)
+
+
+### Features
+
+* add EnableWebFormsToBlazorTransform flag to support WebForms to Blazor transformation ([#1577](https://github.com/aws/language-servers/issues/1577)) ([8c6e9f6](https://github.com/aws/language-servers/commit/8c6e9f6e0a6fd1a7464b26572c1b613b3864b27a))
+* **amazonq:** edit predition auto trigger ([#1662](https://github.com/aws/language-servers/issues/1662)) ([cbcd82b](https://github.com/aws/language-servers/commit/cbcd82bf6632859539e46d1fbe12ec75ab505fb4))
+* **amazonq:** model throttling message as card instead of chat message ([#1657](https://github.com/aws/language-servers/issues/1657)) ([7ee1f2a](https://github.com/aws/language-servers/commit/7ee1f2ac0bdaa9f73fb63fc6d20d0de6d7b07523))
+* **amazonq:** pinned context and rules ([#1663](https://github.com/aws/language-servers/issues/1663)) ([25e7a5a](https://github.com/aws/language-servers/commit/25e7a5ab8b6630525a4fd6acc0524f67f00af817))
+* update list of models and set default to 4 ([#1659](https://github.com/aws/language-servers/issues/1659)) ([1991658](https://github.com/aws/language-servers/commit/19916584d3f46049d30f0c23b41c3857a07bc622))
+
+
+### Bug Fixes
+
+* **agenticChat:** UX fixes for MCP ([#1661](https://github.com/aws/language-servers/issues/1661)) ([bbdb4b4](https://github.com/aws/language-servers/commit/bbdb4b451352af50a914df684d7654686142a13b))
+* **amazonq:** properly deposit workspace context server resources on exit ([#1647](https://github.com/aws/language-servers/issues/1647)) ([34efb2b](https://github.com/aws/language-servers/commit/34efb2b0e4ded031b33ed1ed7b96cf41fbe8e03b))
+* increase timeout value for the streaming client ([#1654](https://github.com/aws/language-servers/issues/1654)) ([439a488](https://github.com/aws/language-servers/commit/439a488fc95683ab0da2df18a5044d66b689f4ed))
+
 ## [0.0.49](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.48...lsp-codewhisperer/v0.0.49) (2025-06-13)
 
 
diff --git a/server/aws-lsp-codewhisperer/package.json b/server/aws-lsp-codewhisperer/package.json
index 3be95a6462..656aef0d0d 100644
--- a/server/aws-lsp-codewhisperer/package.json
+++ b/server/aws-lsp-codewhisperer/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@aws/lsp-codewhisperer",
-    "version": "0.0.49",
+    "version": "0.0.50",
     "description": "CodeWhisperer Language Server",
     "main": "out/index.js",
     "repository": {
diff --git a/server/aws-lsp-json/CHANGELOG.md b/server/aws-lsp-json/CHANGELOG.md
index 516fde6e42..436d60d0c0 100644
--- a/server/aws-lsp-json/CHANGELOG.md
+++ b/server/aws-lsp-json/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.1.12](https://github.com/aws/language-servers/compare/lsp-json/v0.1.11...lsp-json/v0.1.12) (2025-06-16)
+
+
+### Features
+
+* **amazonq:** pinned context and rules ([#1663](https://github.com/aws/language-servers/issues/1663)) ([25e7a5a](https://github.com/aws/language-servers/commit/25e7a5ab8b6630525a4fd6acc0524f67f00af817))
+
 ## [0.1.11](https://github.com/aws/language-servers/compare/lsp-json/v0.1.10...lsp-json/v0.1.11) (2025-06-10)
 
 
diff --git a/server/aws-lsp-json/package.json b/server/aws-lsp-json/package.json
index 40c876e330..0e364a37ac 100644
--- a/server/aws-lsp-json/package.json
+++ b/server/aws-lsp-json/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@aws/lsp-json",
-    "version": "0.1.11",
+    "version": "0.1.12",
     "description": "JSON Language Server",
     "main": "out/index.js",
     "repository": {
diff --git a/server/aws-lsp-partiql/CHANGELOG.md b/server/aws-lsp-partiql/CHANGELOG.md
index e0fc016cbf..b08deb34dc 100644
--- a/server/aws-lsp-partiql/CHANGELOG.md
+++ b/server/aws-lsp-partiql/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.0.13](https://github.com/aws/language-servers/compare/lsp-partiql/v0.0.12...lsp-partiql/v0.0.13) (2025-06-16)
+
+
+### Features
+
+* **amazonq:** pinned context and rules ([#1663](https://github.com/aws/language-servers/issues/1663)) ([25e7a5a](https://github.com/aws/language-servers/commit/25e7a5ab8b6630525a4fd6acc0524f67f00af817))
+
 ## [0.0.12](https://github.com/aws/language-servers/compare/lsp-partiql/v0.0.11...lsp-partiql/v0.0.12) (2025-06-10)
 
 
diff --git a/server/aws-lsp-partiql/package.json b/server/aws-lsp-partiql/package.json
index 1d38e31cbc..020b0c5a37 100644
--- a/server/aws-lsp-partiql/package.json
+++ b/server/aws-lsp-partiql/package.json
@@ -3,7 +3,7 @@
     "author": "Amazon Web Services",
     "license": "Apache-2.0",
     "description": "PartiQL language server",
-    "version": "0.0.12",
+    "version": "0.0.13",
     "repository": {
         "type": "git",
         "url": "https://github.com/aws/language-servers"
diff --git a/server/aws-lsp-yaml/CHANGELOG.md b/server/aws-lsp-yaml/CHANGELOG.md
index 6ffddf83d5..18bbc4fe6d 100644
--- a/server/aws-lsp-yaml/CHANGELOG.md
+++ b/server/aws-lsp-yaml/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.1.12](https://github.com/aws/language-servers/compare/lsp-yaml/v0.1.11...lsp-yaml/v0.1.12) (2025-06-16)
+
+
+### Features
+
+* **amazonq:** pinned context and rules ([#1663](https://github.com/aws/language-servers/issues/1663)) ([25e7a5a](https://github.com/aws/language-servers/commit/25e7a5ab8b6630525a4fd6acc0524f67f00af817))
+
 ## [0.1.11](https://github.com/aws/language-servers/compare/lsp-yaml/v0.1.10...lsp-yaml/v0.1.11) (2025-06-10)
 
 
diff --git a/server/aws-lsp-yaml/package.json b/server/aws-lsp-yaml/package.json
index 200d9ecd57..bd46ab124b 100644
--- a/server/aws-lsp-yaml/package.json
+++ b/server/aws-lsp-yaml/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@aws/lsp-yaml",
-    "version": "0.1.11",
+    "version": "0.1.12",
     "description": "YAML Language Server",
     "main": "out/index.js",
     "repository": {