feat follow up suggest (#1783)

* feat follow up suggest

* Cleanup

---------

Co-authored-by: Matt Rubens <[email protected]>

Author: samhvw8

package-lock.json

@@ -362,6 +362,7 @@
 		"diff": "^5.2.0",
 		"diff-match-patch": "^1.0.5",
 		"fast-deep-equal": "^3.1.3",
+		"fast-xml-parser": "^4.5.1",
 		"fastest-levenshtein": "^1.0.16",
 		"fzf": "^0.5.2",
 		"get-folder-size": "^5.0.0",

package.json

@@ -79,6 +79,7 @@ import { DiffStrategy, getDiffStrategy } from "./diff/DiffStrategy"
 import { insertGroups } from "./diff/insert-groups"
 import { telemetryService } from "../services/telemetry/TelemetryService"
 import { validateToolUse, isToolAllowedForMode, ToolName } from "./mode-validator"
+import { parseXml } from "../utils/xml"
 import { readLines } from "../integrations/misc/read-lines"
 import { getWorkspacePath } from "../utils/path"
 
@@ -2324,8 +2325,6 @@ export class Cline extends EventEmitter<ClineEvents> {
 								let sourceCodeDef = ""
 
 								if (isRangeRead) {
-									// Read specific lines (startLine is guaranteed to be defined if isRangeRead is true)
-									console.log("Reading specific lines", startLine, endLine, startLineStr, endLineStr)
 									if (startLine === undefined) {
 										content = addLineNumbers(await readLines(absolutePath, endLine, startLine))
 									} else {
@@ -2868,6 +2867,7 @@ export class Cline extends EventEmitter<ClineEvents> {
 					}
 					case "ask_followup_question": {
 						const question: string | undefined = block.params.question
+						const follow_up: string | undefined = block.params.follow_up
 						try {
 							if (block.partial) {
 								await this.ask("followup", removeClosingTag("question", question), block.partial).catch(
@@ -2882,8 +2882,52 @@ export class Cline extends EventEmitter<ClineEvents> {
 									)
 									break
 								}
+
+								if (!follow_up) {
+									this.consecutiveMistakeCount++
+									pushToolResult(
+										await this.sayAndCreateMissingParamError("ask_followup_question", "follow_up"),
+									)
+									break
+								}
+
+								let normalizedSuggest = null
+
+								type Suggest = {
+									answer: string
+								}
+
+								let parsedSuggest: {
+									suggest: Suggest[] | Suggest
+								}
+
+								try {
+									parsedSuggest = parseXml(follow_up, ["suggest"]) as {
+										suggest: Suggest[] | Suggest
+									}
+								} catch (error) {
+									this.consecutiveMistakeCount++
+									await this.say("error", `Failed to parse operations: ${error.message}`)
+									pushToolResult(formatResponse.toolError("Invalid operations xml format"))
+									break
+								}
+
 								this.consecutiveMistakeCount = 0
-								const { text, images } = await this.ask("followup", question, false)
+
+								normalizedSuggest = Array.isArray(parsedSuggest?.suggest)
+									? parsedSuggest.suggest
+									: [parsedSuggest?.suggest].filter((sug): sug is Suggest => sug !== undefined)
+
+								const follow_up_json = {
+									question,
+									suggest: normalizedSuggest,
+								}
+
+								const { text, images } = await this.ask(
+									"followup",
+									JSON.stringify(follow_up_json),
+									false,
+								)
 								await this.say("user_feedback", text ?? "", images)
 								pushToolResult(formatResponse.toolResult(`<answer>\n${text}\n</answer>`, images))
 								break

src/core/Cline.ts

@@ -57,6 +57,7 @@ export const toolParamNames = [
 	"mode",
 	"message",
 	"cwd",
+	"follow_up",
 ] as const
 
 export type ToolParamName = (typeof toolParamNames)[number]
@@ -122,7 +123,7 @@ export interface AccessMcpResourceToolUse extends ToolUse {
 
 export interface AskFollowupQuestionToolUse extends ToolUse {
 	name: "ask_followup_question"
-	params: Partial<Pick<Record<ToolParamName, string>, "question">>
+	params: Partial<Pick<Record<ToolParamName, string>, "question" | "follow_up">>
 }
 
 export interface AttemptCompletionToolUse extends ToolUse {