From 72bd98f05ae6bc8fcdc779f87e07fe4c1488c6e5 Mon Sep 17 00:00:00 2001
From: Roo Code <roomote@roocode.com>
Date: Sun, 30 Nov 2025 17:11:36 +0000
Subject: [PATCH] fix: ensure todo tool respects approve/reject flow

- Clear approvedTodoList on rejection to prevent stale state
- Clear approvedTodoList after processing to avoid persistence
- Fixes issue where todo list was updated even when user rejected

Fixes #9705
---
 src/core/tools/UpdateTodoListTool.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/core/tools/UpdateTodoListTool.ts b/src/core/tools/UpdateTodoListTool.ts
index f8b3653b9a..1f7981141e 100644
--- a/src/core/tools/UpdateTodoListTool.ts
+++ b/src/core/tools/UpdateTodoListTool.ts
@@ -59,15 +59,19 @@ export class UpdateTodoListTool extends BaseTool<"update_todo_list"> {
 				todos: normalizedTodos,
 			})
 
-			approvedTodoList = cloneDeep(normalizedTodos)
 			const didApprove = await askApproval("tool", approvalMsg)
 			if (!didApprove) {
+				// Clear approvedTodoList on rejection to prevent stale state
+				approvedTodoList = undefined
 				pushToolResult("User declined to update the todoList.")
 				return
 			}
 
+			// Check if user edited the todos during approval
 			const isTodoListChanged =
 				approvedTodoList !== undefined && JSON.stringify(normalizedTodos) !== JSON.stringify(approvedTodoList)
+
+			// If user edited the todos, use the edited version
 			if (isTodoListChanged) {
 				normalizedTodos = approvedTodoList ?? []
 				task.say(
@@ -79,6 +83,9 @@ export class UpdateTodoListTool extends BaseTool<"update_todo_list"> {
 				)
 			}
 
+			// Clear approvedTodoList after processing to prevent stale state
+			approvedTodoList = undefined
+
 			await setTodoListForTask(task, normalizedTodos)
 
 			if (isTodoListChanged) {