diff --git a/.changeset/lovely-moles-end.md b/.changeset/lovely-moles-end.md
new file mode 100644
index 00000000000..491913f377c
--- /dev/null
+++ b/.changeset/lovely-moles-end.md
@@ -0,0 +1,5 @@
+---
+"roo-cline": patch
+---
+
+Switch to the new Roo message parser
diff --git a/src/core/assistant-message/index.ts b/src/core/assistant-message/index.ts
index 72201b7722e..ee707b8bf4e 100644
--- a/src/core/assistant-message/index.ts
+++ b/src/core/assistant-message/index.ts
@@ -1,2 +1,3 @@
 export { type AssistantMessageContent, parseAssistantMessage } from "./parseAssistantMessage"
 export { presentAssistantMessage } from "./presentAssistantMessage"
+export { parseAssistantMessageV2 } from "./parseAssistantMessageV2"
diff --git a/src/core/task/Task.ts b/src/core/task/Task.ts
index bdc041ef57c..2d2180e391e 100644
--- a/src/core/task/Task.ts
+++ b/src/core/task/Task.ts
@@ -60,7 +60,11 @@ import { SYSTEM_PROMPT } from "../prompts/system"
 import { ToolRepetitionDetector } from "../tools/ToolRepetitionDetector"
 import { FileContextTracker } from "../context-tracking/FileContextTracker"
 import { RooIgnoreController } from "../ignore/RooIgnoreController"
-import { type AssistantMessageContent, parseAssistantMessage, presentAssistantMessage } from "../assistant-message"
+import {
+	type AssistantMessageContent,
+	parseAssistantMessageV2 as parseAssistantMessage,
+	presentAssistantMessage,
+} from "../assistant-message"
 import { truncateConversationIfNeeded } from "../sliding-window"
 import { ClineProvider } from "../webview/ClineProvider"
 import { MultiSearchReplaceDiffStrategy } from "../diff/strategies/multi-search-replace"