From 18c1f69d5e015527089f49060827bb8a8f3bad7f Mon Sep 17 00:00:00 2001
From: Hannes Rudolph <hrudolph@gmail.com>
Date: Wed, 10 Dec 2025 15:48:37 -0700
Subject: [PATCH] chore: scope ctrl-enter toggle changes

---
 webview-ui/src/components/chat/ChatView.tsx      | 9 +++------
 webview-ui/src/context/ExtensionStateContext.tsx | 3 ++-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/webview-ui/src/components/chat/ChatView.tsx b/webview-ui/src/components/chat/ChatView.tsx
index d9ea3c2a2d..8c62274205 100644
--- a/webview-ui/src/components/chat/ChatView.tsx
+++ b/webview-ui/src/components/chat/ChatView.tsx
@@ -789,8 +789,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 				case "action":
 					switch (message.action!) {
 						case "didBecomeVisible":
-							// Do not grab focus during follow-up questions
-							if (!isHidden && !sendingDisabled && !enableButtons && clineAsk !== "followup") {
+							if (!isHidden && !sendingDisabled && !enableButtons) {
 								textAreaRef.current?.focus()
 							}
 							break
@@ -859,7 +858,6 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 			handleSecondaryButtonClick,
 			setCheckpointWarning,
 			playSound,
-			clineAsk,
 		],
 	)
 
@@ -978,13 +976,12 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 
 	useDebounceEffect(
 		() => {
-			// Do not grab focus during follow-up questions
-			if (!isHidden && !sendingDisabled && !enableButtons && clineAsk !== "followup") {
+			if (!isHidden && !sendingDisabled && !enableButtons) {
 				textAreaRef.current?.focus()
 			}
 		},
 		50,
-		[isHidden, sendingDisabled, enableButtons, clineAsk],
+		[isHidden, sendingDisabled, enableButtons],
 	)
 
 	useEffect(() => {
diff --git a/webview-ui/src/context/ExtensionStateContext.tsx b/webview-ui/src/context/ExtensionStateContext.tsx
index 4e6996f1bc..a606a829cd 100644
--- a/webview-ui/src/context/ExtensionStateContext.tsx
+++ b/webview-ui/src/context/ExtensionStateContext.tsx
@@ -10,6 +10,7 @@ import {
 	type TelemetrySetting,
 	type OrganizationAllowList,
 	type CloudOrganizationMembership,
+	DEFAULT_CHECKPOINT_TIMEOUT_SECONDS,
 	ORGANIZATION_ALLOW_ALL,
 } from "@roo-code/types"
 
@@ -206,7 +207,7 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode
 		ttsSpeed: 1.0,
 		diffEnabled: false,
 		enableCheckpoints: true,
-		checkpointTimeout: 15, // Default to 15 seconds
+		checkpointTimeout: DEFAULT_CHECKPOINT_TIMEOUT_SECONDS, // Default to 15 seconds
 		fuzzyMatchThreshold: 1.0,
 		language: "en", // Default language code
 		writeDelayMs: 1000,