diff --git a/.changeset/cruel-roses-stick.md b/.changeset/cruel-roses-stick.md
deleted file mode 100644
index 9f661d7d07..0000000000
--- a/.changeset/cruel-roses-stick.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@roo-code/types": patch
----
-
-Update x.ai supported models and metadata. Ensure accurate cost accounting.
diff --git a/.changeset/v3.20.0.md b/.changeset/v3.20.0.md
deleted file mode 100644
index e0dcfadce5..0000000000
--- a/.changeset/v3.20.0.md
+++ /dev/null
@@ -1,36 +0,0 @@
----
-"roo-cline": minor
----
-
-- Add comprehensive Marketplace system for extensions and modes (thanks @mrubens!)
-- Add Issue Writer mode for creating GitHub issues with comprehensive workflows (thanks @hannesrudolph!)
-- Add Issue Fixer mode for addressing GitHub issues and PR feedback (thanks @hannesrudolph!)
-- Add PR Reviewer mode for reviewing pull requests (thanks @daniel-lxs!)
-- Enhance apply_diff with XML for multi-file/multi-diff operations & batch UI (thanks @samhvw8!)
-- Improve MCP with McpExecution, make UX like terminal execute (thanks @samhvw8!)
-- Add magic variables support for MCPs with `workspaceFolder` injection (thanks @NamesMT!)
-- Add prompt history navigation via arrow up/down in prompt field (thanks @hannesrudolph!)
-- Add support for escaping context mentions (thanks @KJ7LNW!)
-- Add DeepSeek R1 support to Chutes provider (thanks @hannesrudolph!)
-- Add reasoning budget support to Bedrock models for extended thinking (thanks @hannesrudolph!)
-- Add mermaid diagram support buttons (thanks @qdaxb!)
-- Update XAI models and pricing (thanks @edwin-truthsearch-io!)
-- Update O3 model pricing (thanks @mrubens!)
-- Add manual OpenAI-compatible format specification and parsing (thanks @dflatline!)
-- Add core tools integration tests for comprehensive coverage (thanks @cte!)
-- Add JSDoc documentation for ClineAsk and ClineSay types (thanks @hannesrudolph!)
-- Populate whenToUse descriptions for built-in modes (thanks @mrubens!)
-- Move concurrent reads setting to context settings with default of 5 (thanks @mrubens!)
-- Add marketplace footer for issue reporting (thanks @mrubens!)
-- Fix file write tool with early relPath & newContent validation checks (thanks @Ruakij!)
-- Fix TaskItem display and copy issues with HTML tags in task messages (thanks @forestyoo!)
-- Fix OpenRouter cost calculation with BYOK (thanks @chrarnoldus!)
-- Fix terminal busy state reset after manual commands complete (thanks @hannesrudolph!)
-- Fix undefined output on multi-file apply_diff operations (thanks @daniel-lxs!)
-- Convert Jest tests to Vitest and disable default watch mode (thanks @cte!)
-- Move evals to Postgres database on roocode.com (thanks @cte!)
-- Update dependency @dotenvx/dotenvx to v1.44.2 (thanks @app/renovate!)
-- Bump @roo-code/types to v1.26.0 (thanks @cte!)
-- Apply evals fixes and improvements (thanks @cte!)
-- Revert panel focus changes that affected menu button visibility (thanks @mrubens!)
-- Remove temporary monorepo documentation (thanks @mrubens!)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c50c7e52e..9fee1873d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,29 @@
 # Roo Code Changelog
 
+## [3.20.0] - 2025-06-12
+
+- Add experimental Marketplace for extensions and modes (thanks @Smartsheet-JB-Brown, @elianiva, @monkeyDluffy6017, @NamesMT, @daniel-lxs, and more!)
+- Add experimental multi-file edits (thanks @samhvw8!)
+- Move concurrent reads setting to context settings with default of 5
+- Improve MCP execution UX (thanks @samhvw8!)
+- Add magic variables support for MCPs with `workspaceFolder` injection (thanks @NamesMT!)
+- Add prompt history navigation via arrow up/down in prompt field
+- Add support for escaping context mentions (thanks @KJ7LNW!)
+- Add DeepSeek R1 support to Chutes provider
+- Add reasoning budget support to Bedrock models for extended thinking
+- Add mermaid diagram support buttons (thanks @qdaxb!)
+- Update XAI models and pricing (thanks @edwin-truthsearch-io!)
+- Update O3 model pricing
+- Add manual OpenAI-compatible format specification and parsing (thanks @dflatline!)
+- Add core tools integration tests for comprehensive coverage
+- Add JSDoc documentation for ClineAsk and ClineSay types (thanks @hannesrudolph!)
+- Populate whenToUse descriptions for built-in modes
+- Fix file write tool with early relPath & newContent validation checks (thanks @Ruakij!)
+- Fix TaskItem display and copy issues with HTML tags in task messages (thanks @forestyoo!)
+- Fix OpenRouter cost calculation with BYOK (thanks @chrarnoldus!)
+- Fix terminal busy state reset after manual commands complete
+- Fix undefined output on multi-file apply_diff operations (thanks @daniel-lxs!)
+
 ## [3.19.7] - 2025-06-11
 
 - Fix McpHub sidebar focus behavior to prevent unwanted focus grabbing
diff --git a/src/package.json b/src/package.json
index 5993331542..20cae4b2ee 100644
--- a/src/package.json
+++ b/src/package.json
@@ -3,7 +3,7 @@
 	"displayName": "%extension.displayName%",
 	"description": "%extension.description%",
 	"publisher": "RooVeterinaryInc",
-	"version": "3.19.7",
+	"version": "3.20.0",
 	"icon": "assets/icons/icon.png",
 	"galleryBanner": {
 		"color": "#617A91",