feat: implement multi-question support with options and UI enhancements

Author: ScDor

packages/types/src/global-settings.ts

@@ -197,6 +197,12 @@ export const globalSettingsSchema = z.object({
 	hasOpenedModeSelector: z.boolean().optional(),
 	lastModeExportPath: z.string().optional(),
 	lastModeImportPath: z.string().optional(),
+
+	/**
+	 * Whether to show multiple questions one by one or all at once.
+	 * @default false (all at once)
+	 */
+	showQuestionsOneByOne: z.boolean().optional(),
 })
 
 export type GlobalSettings = z.infer<typeof globalSettingsSchema>
@@ -364,6 +370,7 @@ export const EVALS_SETTINGS: RooCodeSettings = {
 	mode: "code", // "architect",
 
 	customModes: [],
+	showQuestionsOneByOne: false,
 }
 
 export const EVALS_TIMEOUT = 5 * 60 * 1_000

packages/types/src/vscode-extension-host.ts

@@ -260,6 +260,7 @@ export type ExtensionState = Pick<
 	| "enterBehavior"
 	| "includeCurrentTime"
 	| "includeCurrentCost"
+	| "showQuestionsOneByOne"
 	| "maxGitStatusFiles"
 	| "requestDelaySeconds"
 > & {

src/core/assistant-message/NativeToolCallParser.ts

@@ -394,9 +394,9 @@ export class NativeToolCallParser {
 				break
 
 			case "ask_followup_question":
-				if (partialArgs.question !== undefined || partialArgs.follow_up !== undefined) {
+				if (partialArgs.questions !== undefined || partialArgs.follow_up !== undefined) {
 					nativeArgs = {
-						question: partialArgs.question,
+						questions: Array.isArray(partialArgs.questions) ? partialArgs.questions : undefined,
 						follow_up: Array.isArray(partialArgs.follow_up) ? partialArgs.follow_up : undefined,
 					}
 				}
@@ -676,9 +676,9 @@ export class NativeToolCallParser {
 					break
 
 				case "ask_followup_question":
-					if (args.question !== undefined && args.follow_up !== undefined) {
+					if (args.questions !== undefined && args.follow_up !== undefined) {
 						nativeArgs = {
-							question: args.question,
+							questions: Array.isArray(args.questions) ? args.questions : undefined,
 							follow_up: args.follow_up,
 						} as NativeArgsFor<TName>
 					}

src/core/prompts/tools/native-tools/ask_followup_question.ts

@@ -3,16 +3,26 @@ import type OpenAI from "openai"
 const ASK_FOLLOWUP_QUESTION_DESCRIPTION = `Ask the user a question to gather additional information needed to complete the task. Use when you need clarification or more details to proceed effectively.
 
 Parameters:
-- question: (required) A clear, specific question addressing the information needed
+- questions: (required) A list of questions to ask. Each question can be a simple string or an object with "text" and "options" for multiple choice.
 - follow_up: (required) A list of 2-4 suggested answers. Suggestions must be complete, actionable answers without placeholders. Optionally include mode to switch modes (code/architect/etc.)
 
 Example: Asking for file path
-{ "question": "What is the path to the frontend-config.json file?", "follow_up": [{ "text": "./src/frontend-config.json", "mode": null }, { "text": "./config/frontend-config.json", "mode": null }, { "text": "./frontend-config.json", "mode": null }] }
+{ "questions": ["What is the path to the frontend-config.json file?"], "follow_up": [{ "text": "./src/frontend-config.json", "mode": null }, { "text": "./config/frontend-config.json", "mode": null }, { "text": "./frontend-config.json", "mode": null }] }
+
+Example: Asking with multiple questions and choices
+{
+  "questions": [
+    { "text": "Which framework are you using?", "options": ["React", "Vue", "Svelte", "Other"] },
+    "What is your project name?",
+    { "text": "Include telemetry?", "options": ["Yes", "No"] }
+  ],
+  "follow_up": [{ "text": "I've answered the questions", "mode": null }]
+}
 
 Example: Asking with mode switch
-{ "question": "Would you like me to implement this feature?", "follow_up": [{ "text": "Yes, implement it now", "mode": "code" }, { "text": "No, just plan it out", "mode": "architect" }] }`
+{ "questions": ["Would you like me to implement this feature?"], "follow_up": [{ "text": "Yes, implement it now", "mode": "code" }, { "text": "No, just plan it out", "mode": "architect" }] }`
 
-const QUESTION_PARAMETER_DESCRIPTION = `Clear, specific question that captures the missing information you need`
+const QUESTIONS_PARAMETER_DESCRIPTION = `List of questions to ask. Each question can be a string or an object with "text" and "options" for multiple choice.`
 
 const FOLLOW_UP_PARAMETER_DESCRIPTION = `Required list of 2-4 suggested responses; each suggestion must be a complete, actionable answer and may include a mode switch`
 
@@ -29,9 +39,29 @@ export default {
 		parameters: {
 			type: "object",
 			properties: {
-				question: {
-					type: "string",
-					description: QUESTION_PARAMETER_DESCRIPTION,
+				questions: {
+					type: "array",
+					items: {
+						anyOf: [
+							{
+								type: "string",
+							},
+							{
+								type: "object",
+								properties: {
+									text: { type: "string" },
+									options: {
+										type: "array",
+										items: { type: "string" },
+									},
+								},
+								required: ["text", "options"],
+								additionalProperties: false,
+							},
+						],
+					},
+					description: QUESTIONS_PARAMETER_DESCRIPTION,
+					minItems: 1,
 				},
 				follow_up: {
 					type: "array",
@@ -55,7 +85,7 @@ export default {
 					maxItems: 4,
 				},
 			},
-			required: ["question", "follow_up"],
+			required: ["questions", "follow_up"],
 			additionalProperties: false,
 		},
 	},

src/core/tools/AskFollowupQuestionTool.ts

@@ -10,9 +10,13 @@ interface Suggestion {
 	mode?: string
 }
 
+interface Question {
+	text: string
+	options?: string[]
+}
+
 interface AskFollowupQuestionParams {
-	question: string
-	questions?: string[]
+	questions: Array<string | Question>
 	follow_up: Suggestion[]
 }
 
@@ -25,21 +29,33 @@ export class AskFollowupQuestionTool extends BaseTool<"ask_followup_question"> {
 		const follow_up_xml = params.follow_up
 
 		const suggestions: Suggestion[] = []
-		const questions: string[] = []
+		const questions: Array<string | Question> = []
 
 		if (questions_xml) {
 			try {
+				// Handle both simple <question> tags and more complex <question> tags with options
 				const parsedQuestions = parseXml(questions_xml, ["question"]) as {
-					question: string[] | string
+					question: any[] | any
 				}
 
 				const rawQuestions = Array.isArray(parsedQuestions?.question)
 					? parsedQuestions.question
-					: [parsedQuestions?.question].filter((q): q is string => q !== undefined)
+					: [parsedQuestions?.question].filter((q): q is any => q !== undefined)
 
 				for (const q of rawQuestions) {
 					if (typeof q === "string") {
 						questions.push(q)
+					} else if (typeof q === "object" && q !== null) {
+						const text = q["#text"] || ""
+						const optionsStr = q["@_options"]
+						if (optionsStr) {
+							questions.push({
+								text,
+								options: optionsStr.split(",").map((o: string) => o.trim()),
+							})
+						} else {
+							questions.push(text)
+						}
 					}
 				}
 			} catch (error) {
@@ -49,8 +65,12 @@ export class AskFollowupQuestionTool extends BaseTool<"ask_followup_question"> {
 			}
 		}
 
+		// If no questions array but we have a single question, use that
+		if (questions.length === 0 && question) {
+			questions.push(question)
+		}
+
 		if (follow_up_xml) {
-			// Define the actual structure returned by the XML parser
 			type ParsedSuggestion = string | { "#text": string; "@_mode"?: string }
 
 			try {
@@ -62,13 +82,10 @@ export class AskFollowupQuestionTool extends BaseTool<"ask_followup_question"> {
 					? parsedSuggest.suggest
 					: [parsedSuggest?.suggest].filter((sug): sug is ParsedSuggestion => sug !== undefined)
 
-				// Transform parsed XML to our Suggest format
 				for (const sug of rawSuggestions) {
 					if (typeof sug === "string") {
-						// Simple string suggestion (no mode attribute)
 						suggestions.push({ text: sug })
 					} else {
-						// XML object with text content and optional mode attribute
 						const suggestion: Suggestion = { text: sug["#text"] }
 						if (sug["@_mode"]) {
 							suggestion.mode = sug["@_mode"]
@@ -84,34 +101,32 @@ export class AskFollowupQuestionTool extends BaseTool<"ask_followup_question"> {
 		}
 
 		return {
-			question,
 			questions,
 			follow_up: suggestions,
 		}
 	}
 
 	async execute(params: AskFollowupQuestionParams, task: Task, callbacks: ToolCallbacks): Promise<void> {
-		const { question, questions, follow_up } = params
-		const { handleError, pushToolResult, toolProtocol } = callbacks
+		const { questions, follow_up } = params
+		const { handleError, pushToolResult } = callbacks
 
 		try {
-			if (!question && (!questions || questions.length === 0)) {
+			if (!questions || questions.length === 0) {
 				task.consecutiveMistakeCount++
 				task.recordToolError("ask_followup_question")
 				task.didToolFailInCurrentTurn = true
-				pushToolResult(await task.sayAndCreateMissingParamError("ask_followup_question", "question"))
+				pushToolResult(await task.sayAndCreateMissingParamError("ask_followup_question", "questions"))
 				return
 			}
 
 			// Transform follow_up suggestions to the format expected by task.ask
-			const follow_up_json = {
-				question,
+			const followup_json = {
 				questions,
 				suggest: follow_up.map((s) => ({ answer: s.text, mode: s.mode })),
 			}
 
 			task.consecutiveMistakeCount = 0
-			const { text, images } = await task.ask("followup", JSON.stringify(follow_up_json), false)
+			const { text, images } = await task.ask("followup", JSON.stringify(followup_json), false)
 			await task.say("user_feedback", text ?? "", images)
 			pushToolResult(formatResponse.toolResult(`<answer>\n${text}\n</answer>`, images))
 		} catch (error) {
@@ -120,15 +135,15 @@ export class AskFollowupQuestionTool extends BaseTool<"ask_followup_question"> {
 	}
 
 	override async handlePartial(task: Task, block: ToolUse<"ask_followup_question">): Promise<void> {
-		// Get question from params (for XML protocol) or nativeArgs (for native protocol)
-		const question: string | undefined = block.params.question ?? block.nativeArgs?.question
-		// For now we don't stream multiple questions, only the main one if present
-		// We could improve this to stream multiple questions but it requires UI changes to handle partial arrays
+		// Get first question from questions array for streaming display
+		const questions = block.nativeArgs?.questions ?? []
+		const firstQuestion = questions[0]
+		const questionText = typeof firstQuestion === "string" ? firstQuestion : firstQuestion?.text
 
-		// During partial streaming, only show the question to avoid displaying raw JSON
-		// The full JSON with suggestions will be sent when the tool call is complete (!block.partial)
+		// During partial streaming, only show the first question to avoid displaying raw JSON
+		// The full JSON with all questions and suggestions will be sent when the tool call is complete
 		await task
-			.ask("followup", this.removeClosingTag("question", question, block.partial), block.partial)
+			.ask("followup", this.removeClosingTag("question", questionText, block.partial), block.partial)
 			.catch(() => {})
 	}
 }