diff --git a/.changeset/v3.36.1.md b/.changeset/v3.36.1.md
deleted file mode 100644
index 6219679ac7d..00000000000
--- a/.changeset/v3.36.1.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-"roo-cline": patch
----
-
-![3.36.1 Release - Message Management & Stability Improvements](/releases/3.36.1-release.png)
-
-- Add MessageManager layer for centralized history coordination, fixing message synchronization issues (PR #9842 by @hannesrudolph)
-- Fix: Prevent cascading truncation loop by only truncating visible messages (PR #9844 by @hannesrudolph)
-- Fix: Handle unknown/invalid native tool calls to prevent extension freeze (PR #9834 by @daniel-lxs)
-- Always enable reasoning for models that require it (PR #9836 by @cte)
-- ChatView: Smoother stick-to-bottom behavior during streaming (PR #8999 by @hannesrudolph)
-- UX: Improved error messages and documentation links (PR #9777 by @brunobergher)
-- Fix: Overly round follow-up question suggestions styling (PR #9829 by @brunobergher)
-- Add symlink support for slash commands in .roo/commands folder (PR #9838 by @mrubens)
-- Ignore input to the execa terminal process for safer command execution (PR #9827 by @mrubens)
-- Be safer about large file reads (PR #9843 by @jr)
-- Add gpt-5.1-codex-max model to OpenAI provider (PR #9848 by @hannesrudolph)
-- Evals UI: Add filtering, bulk delete, tool consolidation, and run notes (PR #9837 by @hannesrudolph)
-- Evals UI: Add multi-model launch and UI improvements (PR #9845 by @hannesrudolph)
-- Web: New pricing page (PR #9821 by @brunobergher)
-- Revert reasoning_details ID sanitization in favor of alternative fix (PR #9839 by @daniel-lxs, reverted in PR #9846 by @mrubens)
-- Revert reasoning_details ID exclusion in favor of alternative fix (PR #9847 by @mrubens, reverted in PR #9850 by @mrubens)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index effbcbdc353..a92ed0392dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Roo Code Changelog
 
+## [3.36.1] - 2025-12-04
+
+![3.36.1 Release - Message Management & Stability Improvements](/releases/3.36.1-release.png)
+
+- Add MessageManager layer for centralized history coordination, fixing message synchronization issues (PR #9842 by @hannesrudolph)
+- Fix: Prevent cascading truncation loop by only truncating visible messages (PR #9844 by @hannesrudolph)
+- Fix: Handle unknown/invalid native tool calls to prevent extension freeze (PR #9834 by @daniel-lxs)
+- Always enable reasoning for models that require it (PR #9836 by @cte)
+- ChatView: Smoother stick-to-bottom behavior during streaming (PR #8999 by @hannesrudolph)
+- UX: Improved error messages and documentation links (PR #9777 by @brunobergher)
+- Fix: Overly round follow-up question suggestions styling (PR #9829 by @brunobergher)
+- Add symlink support for slash commands in .roo/commands folder (PR #9838 by @mrubens)
+- Ignore input to the execa terminal process for safer command execution (PR #9827 by @mrubens)
+- Be safer about large file reads (PR #9843 by @jr)
+- Add gpt-5.1-codex-max model to OpenAI provider (PR #9848 by @hannesrudolph)
+- Evals UI: Add filtering, bulk delete, tool consolidation, and run notes (PR #9837 by @hannesrudolph)
+- Evals UI: Add multi-model launch and UI improvements (PR #9845 by @hannesrudolph)
+- Web: New pricing page (PR #9821 by @brunobergher)
+
 ## [3.36.0] - 2025-12-04
 
 ![3.36.0 Release - Rewind Kangaroo](/releases/3.36.0-release.png)
diff --git a/src/package.json b/src/package.json
index 75e7de91b4b..89c50ee849c 100644
--- a/src/package.json
+++ b/src/package.json
@@ -3,7 +3,7 @@
 	"displayName": "%extension.displayName%",
 	"description": "%extension.description%",
 	"publisher": "RooVeterinaryInc",
-	"version": "3.36.0",
+	"version": "3.36.1",
 	"icon": "assets/icons/icon.png",
 	"galleryBanner": {
 		"color": "#617A91",