From 5627d0e4d17c2a0d49bc284cd9bc5953987379bd Mon Sep 17 00:00:00 2001
From: Roo Code <roomote@roocode.com>
Date: Sat, 8 Nov 2025 15:21:34 +0000
Subject: [PATCH] fix: show correct button text for subtask completion after
 interruption

Fixes #9133 - When a subtask is interrupted and then resumed, it now correctly
shows "Complete Subtask and Return" button instead of "Start New Task".

The fix adds conditional logic to check for parentTaskId in both the
completion_result and resume_completed_task message handlers in ChatView.tsx.
---
 webview-ui/src/components/chat/ChatView.tsx | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/webview-ui/src/components/chat/ChatView.tsx b/webview-ui/src/components/chat/ChatView.tsx
index 19b7613b3e..37e915d735 100644
--- a/webview-ui/src/components/chat/ChatView.tsx
+++ b/webview-ui/src/components/chat/ChatView.tsx
@@ -387,7 +387,12 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 							setSendingDisabled(isPartial)
 							setClineAsk("completion_result")
 							setEnableButtons(!isPartial)
-							setPrimaryButtonText(t("chat:startNewTask.title"))
+							// Check if current task has a parent task to return to
+							setPrimaryButtonText(
+								currentTaskItem?.parentTaskId
+									? t("chat:completeSubtaskAndReturn")
+									: t("chat:startNewTask.title"),
+							)
 							setSecondaryButtonText(undefined)
 							break
 						case "resume_task":
@@ -402,7 +407,12 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 							setSendingDisabled(false)
 							setClineAsk("resume_completed_task")
 							setEnableButtons(true)
-							setPrimaryButtonText(t("chat:startNewTask.title"))
+							// Check if current task has a parent task to return to
+							setPrimaryButtonText(
+								currentTaskItem?.parentTaskId
+									? t("chat:completeSubtaskAndReturn")
+									: t("chat:startNewTask.title"),
+							)
 							setSecondaryButtonText(undefined)
 							setDidClickCancel(false)
 							break