diff --git a/.changeset/fair-donuts-wash.md b/.changeset/fair-donuts-wash.md
deleted file mode 100644
index 74ae66f6d7..0000000000
--- a/.changeset/fair-donuts-wash.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"roo-cline": patch
----
-
-Add consecutive mistake count to diff error telemetry
diff --git a/.changeset/poor-mangos-drop.md b/.changeset/poor-mangos-drop.md
deleted file mode 100644
index 1af1bd0e6d..0000000000
--- a/.changeset/poor-mangos-drop.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"roo-cline": patch
----
-
-v3.12.2
diff --git a/.changeset/young-pots-bow.md b/.changeset/young-pots-bow.md
deleted file mode 100644
index 46cecb6135..0000000000
--- a/.changeset/young-pots-bow.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"roo-cline": patch
----
-
-Add OpenAI o3 & 4o-mini
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f7dc2fae7..2559714ab9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Roo Code Changelog
 
+## [3.12.2] - 2025-04-16
+
+- Add OpenAI o3 & 4o-mini (thanks @PeterDaveHello!)
+- Improve file/folder context mention UI (thanks @elianiva!)
+- Improve diff error telemetry
+
 ## [3.12.1] - 2025-04-16
 
 - Bugfix to Edit button visibility in the select dropdowns
diff --git a/package-lock.json b/package-lock.json
index 1b3df5aade..51ad221702 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "roo-cline",
-	"version": "3.12.1",
+	"version": "3.12.2",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "roo-cline",
-			"version": "3.12.1",
+			"version": "3.12.2",
 			"dependencies": {
 				"@anthropic-ai/bedrock-sdk": "^0.10.2",
 				"@anthropic-ai/sdk": "^0.37.0",
diff --git a/package.json b/package.json
index 3185904403..720efbea71 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
 	"displayName": "%extension.displayName%",
 	"description": "%extension.description%",
 	"publisher": "RooVeterinaryInc",
-	"version": "3.12.1",
+	"version": "3.12.2",
 	"icon": "assets/icons/icon.png",
 	"galleryBanner": {
 		"color": "#617A91",