pacnpal/Roo-Code
1
0
Fork 0
mirror of https://github.com/pacnpal/Roo-Code.git synced 2025-12-20 12:21:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make empty tool use result more explicit about what was missing so retry request doesn't fail again

Browse Source
This commit is contained in:
Saoud Rizwan
2024-08-08 08:40:57 -04:00
parent 6153b68f66
commit a5435a662e
1 changed files with 44 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/ClaudeDev.ts
View File

@@ -418,17 +418,21 @@ export class ClaudeDev {
} }
async writeToFile(relPath?: string, newContent?: string, isLast: boolean = true): Promise<ToolResponse> { async writeToFile(relPath?: string, newContent?: string, isLast: boolean = true): Promise<ToolResponse> {
if (relPath === undefined || newContent === undefined) { if (relPath === undefined) {
this.say(
"error",
"Claude tried to use write_to_file without value for required parameter 'path'. Retrying..."
)
return "Error: Missing value for required parameter 'path'. Please retry with complete response."
}
if (newContent === undefined) { if (newContent === undefined) {
// Special message for this case since this tends to happen the most // Special message for this case since this tends to happen the most
this.say( this.say(
"error", "error",
`Claude tried to use write_to_file for '${relPath}' without any content. This tends to happen due to API token limits. Retrying...` `Claude tried to use write_to_file for '${relPath}' without value for required parameter 'content'. This is likely due to output token limits. Retrying...`
) )
} else { return "Error: Missing value for required parameter 'content'. Please retry with complete response."
this.say("error", "Claude tried to use write_to_file with missing parameters. Retrying...")
}
return "Error: Missing required parameters. Please retry with complete parameters."
} }
try { try {
@@ -566,8 +570,8 @@ export class ClaudeDev {
async readFile(relPath?: string): Promise<ToolResponse> { async readFile(relPath?: string): Promise<ToolResponse> {
if (relPath === undefined) { if (relPath === undefined) {
this.say("error", "Claude tried to use read_file with missing parameters. Retrying...") this.say("error", "Claude tried to use read_file without value for required parameter 'path'. Retrying...")
return "Error: Missing required parameters. Please retry with complete parameters." return "Error: Missing value for required parameter 'path'. Please retry with complete response."
} }
try { try {
const absolutePath = path.resolve(cwd, relPath) const absolutePath = path.resolve(cwd, relPath)
@@ -596,8 +600,11 @@ export class ClaudeDev {
async listFilesTopLevel(relDirPath?: string): Promise<ToolResponse> { async listFilesTopLevel(relDirPath?: string): Promise<ToolResponse> {
if (relDirPath === undefined) { if (relDirPath === undefined) {
this.say("error", "Claude tried to use list_files_top_level with missing parameters. Retrying...") this.say(
return "Error: Missing required parameters. Please retry with complete parameters." "error",
"Claude tried to use list_files_top_level without value for required parameter 'path'. Retrying..."
)
return "Error: Missing value for required parameter 'path'. Please retry with complete response."
} }
try { try {
const absolutePath = path.resolve(cwd, relDirPath) const absolutePath = path.resolve(cwd, relDirPath)
@@ -636,8 +643,11 @@ export class ClaudeDev {
async listFilesRecursive(relDirPath?: string): Promise<ToolResponse> { async listFilesRecursive(relDirPath?: string): Promise<ToolResponse> {
if (relDirPath === undefined) { if (relDirPath === undefined) {
this.say("error", "Claude tried to use list_files_recursive with missing parameters. Retrying...") this.say(
return "Error: Missing required parameters. Please retry with complete parameters." "error",
"Claude tried to use list_files_recursive without value for required parameter 'path'. Retrying..."
)
return "Error: Missing value for required parameter 'path'. Please retry with complete response."
} }
try { try {
const absolutePath = path.resolve(cwd, relDirPath) const absolutePath = path.resolve(cwd, relDirPath)
@@ -725,9 +735,9 @@ export class ClaudeDev {
if (relDirPath === undefined) { if (relDirPath === undefined) {
this.say( this.say(
"error", "error",
"Claude tried to use view_source_code_definitions_top_level with missing parameters. Retrying..." "Claude tried to use view_source_code_definitions_top_level without value for required parameter 'path'. Retrying..."
) )
return "Error: Missing required parameters. Please retry with complete parameters." return "Error: Missing value for required parameter 'path'. Please retry with complete response."
} }
try { try {
const absolutePath = path.resolve(cwd, relDirPath) const absolutePath = path.resolve(cwd, relDirPath)
@@ -765,8 +775,11 @@ export class ClaudeDev {
async executeCommand(command?: string, returnEmptyStringOnSuccess: boolean = false): Promise<ToolResponse> { async executeCommand(command?: string, returnEmptyStringOnSuccess: boolean = false): Promise<ToolResponse> {
if (command === undefined) { if (command === undefined) {
this.say("error", "Claude tried to use execute_command with missing parameters. Retrying...") this.say(
return "Error: Missing required parameters. Please retry with complete parameters." "error",
"Claude tried to use execute_command without value for required parameter 'command'. Retrying..."
)
return "Error: Missing value for required parameter 'command'. Please retry with complete response."
} }
const { response, text, images } = await this.ask("command", command) const { response, text, images } = await this.ask("command", command)
if (response !== "yesButtonTapped") { if (response !== "yesButtonTapped") {
@@ -863,8 +876,11 @@ export class ClaudeDev {
async askFollowupQuestion(question?: string): Promise<ToolResponse> { async askFollowupQuestion(question?: string): Promise<ToolResponse> {
if (question === undefined) { if (question === undefined) {
this.say("error", "Claude tried to use ask_followup_question with missing parameters. Retrying...") this.say(
return "Error: Missing required parameters. Please retry with complete parameters." "error",
"Claude tried to use ask_followup_question without value for required parameter 'question'. Retrying..."
)
return "Error: Missing value for required parameter 'question'. Please retry with complete response."
} }
const { text, images } = await this.ask("followup", question) const { text, images } = await this.ask("followup", question)
await this.say("user_feedback", text ?? "", images) await this.say("user_feedback", text ?? "", images)
@@ -874,8 +890,11 @@ export class ClaudeDev {
async attemptCompletion(result?: string, command?: string): Promise<ToolResponse> { async attemptCompletion(result?: string, command?: string): Promise<ToolResponse> {
// result is required, command is optional // result is required, command is optional
if (result === undefined) { if (result === undefined) {
this.say("error", "Claude tried to use attempt_completion with missing parameters. Retrying...") this.say(
return "Error: Missing required parameters. Please retry with complete parameters." "error",
"Claude tried to use attempt_completion without value for required parameter 'result'. Retrying..."
)
return "Error: Missing value for required parameter 'result'. Please retry with complete response."
} }
let resultToSend = result let resultToSend = result
if (command) { if (command) {