From 33dad58052317345106e0319cec97dcc990cfc6d Mon Sep 17 00:00:00 2001
From: daniel-lxs <ricciodaniel98@gmail.com>
Date: Tue, 6 Jan 2026 18:25:38 -0500
Subject: [PATCH] fix: add alwaysAllowFollowupQuestions to integration tests

- Add nonInteractive: true to CLI integration test
- Add alwaysAllowFollowupQuestions: true to vscode-e2e tests
- Ensures tests auto-continue when model doesn't use tools
- Fixes timeout issues introduced by relaxed tool requirement in system prompt
---
 .../src/suite/markdown-lists.test.ts          | 28 ++++++++++++++++---
 apps/vscode-e2e/src/suite/modes.test.ts       |  7 ++++-
 apps/vscode-e2e/src/suite/subtasks.test.ts    |  1 +
 apps/vscode-e2e/src/suite/task.test.ts        |  7 ++++-
 4 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/apps/vscode-e2e/src/suite/markdown-lists.test.ts b/apps/vscode-e2e/src/suite/markdown-lists.test.ts
index 9b5c1bd845..154d83bc93 100644
--- a/apps/vscode-e2e/src/suite/markdown-lists.test.ts
+++ b/apps/vscode-e2e/src/suite/markdown-lists.test.ts
@@ -20,7 +20,12 @@ suite("Markdown List Rendering", function () {
 		})
 
 		const taskId = await api.startNewTask({
-			configuration: { mode: "ask", alwaysAllowModeSwitch: true, autoApprovalEnabled: true },
+			configuration: {
+				mode: "ask",
+				alwaysAllowModeSwitch: true,
+				autoApprovalEnabled: true,
+				alwaysAllowFollowupQuestions: true,
+			},
 			text: "Please show me an example of an unordered list with the following items: Apple, Banana, Orange",
 		})
 
@@ -57,7 +62,12 @@ suite("Markdown List Rendering", function () {
 		})
 
 		const taskId = await api.startNewTask({
-			configuration: { mode: "ask", alwaysAllowModeSwitch: true, autoApprovalEnabled: true },
+			configuration: {
+				mode: "ask",
+				alwaysAllowModeSwitch: true,
+				autoApprovalEnabled: true,
+				alwaysAllowFollowupQuestions: true,
+			},
 			text: "Please show me a numbered list with three steps: First step, Second step, Third step",
 		})
 
@@ -94,7 +104,12 @@ suite("Markdown List Rendering", function () {
 		})
 
 		const taskId = await api.startNewTask({
-			configuration: { mode: "ask", alwaysAllowModeSwitch: true, autoApprovalEnabled: true },
+			configuration: {
+				mode: "ask",
+				alwaysAllowModeSwitch: true,
+				autoApprovalEnabled: true,
+				alwaysAllowFollowupQuestions: true,
+			},
 			text: "Please create a nested list with 'Main item' having two sub-items: 'Sub-item A' and 'Sub-item B'",
 		})
 
@@ -146,7 +161,12 @@ suite("Markdown List Rendering", function () {
 		})
 
 		const taskId = await api.startNewTask({
-			configuration: { mode: "ask", alwaysAllowModeSwitch: true, autoApprovalEnabled: true },
+			configuration: {
+				mode: "ask",
+				alwaysAllowModeSwitch: true,
+				autoApprovalEnabled: true,
+				alwaysAllowFollowupQuestions: true,
+			},
 			text: "Please create a list that has both numbered items and bullet points, mixing ordered and unordered lists",
 		})
 
diff --git a/apps/vscode-e2e/src/suite/modes.test.ts b/apps/vscode-e2e/src/suite/modes.test.ts
index 7982f3cf22..2ae19cacec 100644
--- a/apps/vscode-e2e/src/suite/modes.test.ts
+++ b/apps/vscode-e2e/src/suite/modes.test.ts
@@ -14,7 +14,12 @@ suite("Roo Code Modes", function () {
 		globalThis.api.on(RooCodeEventName.TaskModeSwitched, (_taskId, mode) => modes.push(mode))
 
 		const switchModesTaskId = await globalThis.api.startNewTask({
-			configuration: { mode: "code", alwaysAllowModeSwitch: true, autoApprovalEnabled: true },
+			configuration: {
+				mode: "code",
+				alwaysAllowModeSwitch: true,
+				autoApprovalEnabled: true,
+				alwaysAllowFollowupQuestions: true,
+			},
 			text: "For each of `architect`, `ask`, and `debug` use the `switch_mode` tool to switch to that mode.",
 		})
 
diff --git a/apps/vscode-e2e/src/suite/subtasks.test.ts b/apps/vscode-e2e/src/suite/subtasks.test.ts
index e3e3457520..5b67636ae7 100644
--- a/apps/vscode-e2e/src/suite/subtasks.test.ts
+++ b/apps/vscode-e2e/src/suite/subtasks.test.ts
@@ -26,6 +26,7 @@ suite.skip("Roo Code Subtasks", () => {
 				alwaysAllowModeSwitch: true,
 				alwaysAllowSubtasks: true,
 				autoApprovalEnabled: true,
+				alwaysAllowFollowupQuestions: true,
 				enableCheckpoints: false,
 			},
 			text:
diff --git a/apps/vscode-e2e/src/suite/task.test.ts b/apps/vscode-e2e/src/suite/task.test.ts
index 10e4e4f9a6..58a6c4ba05 100644
--- a/apps/vscode-e2e/src/suite/task.test.ts
+++ b/apps/vscode-e2e/src/suite/task.test.ts
@@ -20,7 +20,12 @@ suite("Roo Code Task", function () {
 		})
 
 		const taskId = await api.startNewTask({
-			configuration: { mode: "ask", alwaysAllowModeSwitch: true, autoApprovalEnabled: true },
+			configuration: {
+				mode: "ask",
+				alwaysAllowModeSwitch: true,
+				autoApprovalEnabled: true,
+				alwaysAllowFollowupQuestions: true,
+			},
 			text: "Hello world, what is your name? Respond with 'My name is ...'",
 		})