From ea73079763172e4422113d49486540c3cd9697a8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 16 Apr 2025 18:48:34 +0000
Subject: [PATCH 1/2] changeset version bump

---
 .changeset/fair-donuts-wash.md | 5 -----
 .changeset/poor-mangos-drop.md | 5 -----
 .changeset/young-pots-bow.md   | 5 -----
 CHANGELOG.md                   | 8 ++++++++
 package-lock.json              | 4 ++--
 package.json                   | 2 +-
 6 files changed, 11 insertions(+), 18 deletions(-)
 delete mode 100644 .changeset/fair-donuts-wash.md
 delete mode 100644 .changeset/poor-mangos-drop.md
 delete mode 100644 .changeset/young-pots-bow.md

diff --git a/.changeset/fair-donuts-wash.md b/.changeset/fair-donuts-wash.md
deleted file mode 100644
index 74ae66f6d75..00000000000
--- 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 1af1bd0e6df..00000000000
--- 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 46cecb61353..00000000000
--- 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 0f7dc2fae7f..1941fb675cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Roo Code Changelog
 
+## 3.12.2
+
+### Patch Changes
+
+- Add consecutive mistake count to diff error telemetry
+- v3.12.2
+- Add OpenAI o3 & 4o-mini
+
 ## [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 1b3df5aade7..51ad2217026 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 3185904403d..720efbea71f 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",

From b838e11132f34355870b4fc68f421d6a59dea4b8 Mon Sep 17 00:00:00 2001
From: Matt Rubens <mrubens@users.noreply.github.com>
Date: Wed, 16 Apr 2025 14:52:07 -0400
Subject: [PATCH 2/2] Update CHANGELOG.md

---
 CHANGELOG.md | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1941fb675cc..2559714ab94 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,10 @@
 # Roo Code Changelog
 
-## 3.12.2
+## [3.12.2] - 2025-04-16
 
-### Patch Changes
-
-- Add consecutive mistake count to diff error telemetry
-- v3.12.2
-- Add OpenAI o3 & 4o-mini
+- 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