diff --git a/.changeset/automatic-tags-publish.md b/.changeset/automatic-tags-publish.md
deleted file mode 100644
index a3ff07fb4c3..00000000000
--- a/.changeset/automatic-tags-publish.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"roo-cline": patch
----
-
-Update GitHub Actions workflow to automatically create and push git tags during release
diff --git a/.changeset/lemon-bulldogs-unite.md b/.changeset/lemon-bulldogs-unite.md
deleted file mode 100644
index b87abc1bd2e..00000000000
--- a/.changeset/lemon-bulldogs-unite.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"roo-cline": patch
----
-
-App tab layout fixes
diff --git a/.changeset/seven-apricots-watch.md b/.changeset/seven-apricots-watch.md
deleted file mode 100644
index ec51cccdea7..00000000000
--- a/.changeset/seven-apricots-watch.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"roo-cline": patch
----
-
-ContextProxy fix - constructor should not be async
diff --git a/.changeset/strange-guests-divide.md b/.changeset/strange-guests-divide.md
deleted file mode 100644
index 127b58aa09b..00000000000
--- a/.changeset/strange-guests-divide.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"roo-cline": patch
----
-
-v3.8.5
diff --git a/.changeset/thin-fans-deliver.md b/.changeset/thin-fans-deliver.md
deleted file mode 100644
index 5244b7d0d75..00000000000
--- a/.changeset/thin-fans-deliver.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"roo-cline": patch
----
-
-Add prompt caching to OpenAI-compatible custom model info
diff --git a/.changeset/tidy-queens-pay.md b/.changeset/tidy-queens-pay.md
deleted file mode 100644
index 750a58c7892..00000000000
--- a/.changeset/tidy-queens-pay.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"roo-cline": patch
----
-
-Fix usage tracking for SiliconFlow etc
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd6a574dc6b..8bb70a87c0d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,33 @@
 # Roo Code Changelog
 
+## [3.8.5] - 2025-03-12
+
+- Refactor terminal architecture to address critical issues with the current design (thanks @KJ7LNW!)
+- MCP over SSE (thanks @aheizi!)
+- Support for remote browser connections (thanks @afshawnlotfi!)
+- Preserve parent-child relationship when cancelling subtasks (thanks @cannuri!)
+- Custom baseUrl for Google AI Studio Gemini (thanks @dqroid!)
+- PowerShell-specific command handling (thanks @KJ7LNW!)
+- OpenAI-compatible DeepSeek/QwQ reasoning support (thanks @lightrabbit!)
+- Anthropic-style prompt caching in the OpenAI-compatible provider (thanks @dleen!)
+- Add Deepseek R1 for AWS Bedrock (thanks @ATempsch!)
+- Fix MarkdownBlock text color for Dark High Contrast theme (thanks @cannuri!)
+- Add gemini-2.0-pro-exp-02-05 model to vertex (thanks @shohei-ihaya!)
+- Bring back progress status for multi-diff edits (thanks @qdaxb!)
+- Refactor alert dialog styles to use the correct vscode theme (thanks @cannuri!)
+- Custom ARNs in AWS Bedrock (thanks @Smartsheet-JB-Brown!)
+- Update MCP servers directory path for platform compatibility (thanks @hannesrudolph!)
+- Fix browser system prompt inclusion rules (thanks @cannuri!)
+- Publish git tags to github from CI (thanks @pdecat!)
+- Fixes to OpenAI-style cost calculations (thanks @dtrugman!)
+- Fix to allow using an excluded directory as your working directory (thanks @Szpadel!)
+- Kotlin language support in list_code_definition_names tool (thanks @kohii!)
+- Better handling of diff application errors (thanks @qdaxb!)
+- Update Bedrock prices to the latest (thanks @Smartsheet-JB-Brown!)
+- Fixes to OpenRouter custom baseUrl support
+- Fix usage tracking for SiliconFlow and other providers that include usage on every chunk
+- Telemetry for checkpoint save/restore/diff and diff strategies
+
 ## [3.8.4] - 2025-03-09
 
 - Roll back multi-diff progress indicator temporarily to fix a double-confirmation in saving edits
diff --git a/package-lock.json b/package-lock.json
index 300f5dd809a..201497bfd4b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "roo-cline",
-	"version": "3.8.4",
+	"version": "3.8.5",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "roo-cline",
-			"version": "3.8.4",
+			"version": "3.8.5",
 			"dependencies": {
 				"@anthropic-ai/bedrock-sdk": "^0.10.2",
 				"@anthropic-ai/sdk": "^0.37.0",
diff --git a/package.json b/package.json
index 1359f63f904..8c1a5c4672a 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
 	"displayName": "Roo Code (prev. Roo Cline)",
 	"description": "A whole dev team of AI agents in your editor.",
 	"publisher": "RooVeterinaryInc",
-	"version": "3.8.4",
+	"version": "3.8.5",
 	"icon": "assets/icons/rocket.png",
 	"galleryBanner": {
 		"color": "#617A91",