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

Fix completion result and text without tool calls

Browse Source
This commit is contained in:
Saoud Rizwan
2024-09-27 22:18:52 -04:00
parent 68b87e6056
commit 103f82145e
1 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/core/ClaudeDev.ts
View File

@@ -1770,35 +1770,37 @@ ${this.customInstructions.trim()}
break break
} }
this.consecutiveMistakeCount = 0 this.consecutiveMistakeCount = 0
if (lastMessage && lastMessage.ask === "command") { if (lastMessage && lastMessage.ask === "command") {
// complete command message // complete command message
const didApprove = await askApproval("command", command) const didApprove = await askApproval("command", command)
if (!didApprove) { if (!didApprove) {
break break
} }
const [userRejected, result] = await this.executeCommandTool(command!) const [userRejected, commandResult] = await this.executeCommandTool(command!, true)
if (userRejected) { if (commandResult) {
this.didRejectTool = true // test whats going on here if (userRejected) {
} this.didRejectTool = true // test whats going on here
pushToolResult(result) }
break pushToolResult(commandResult)
} else {
// last message is completion_result, not command so it wasn't completed, need to complete it
// empty string makes it invisible and just shows new task button
const { response, text, images } = await this.ask("completion_result", "", false)
if (response === "yesButtonTapped") {
pushToolResult("") // signals to recursive loop to stop (for now this never happens since yesButtonTapped will trigger a new task)
break break
} }
await this.say("user_feedback", text ?? "", images) }
pushToolResult(
this.formatToolResponseWithImages( // we already sent completion_result says, an empty string asks relinquishes control over button and field
`The user has provided feedback on the results. Consider their input to continue the task, and then attempt completion again.\n<feedback>\n${text}\n</feedback>`, const { response, text, images } = await this.ask("completion_result", "", false)
images if (response === "yesButtonTapped") {
) pushToolResult("") // signals to recursive loop to stop (for now this never happens since yesButtonTapped will trigger a new task)
)
break break
} }
await this.say("user_feedback", text ?? "", images)
pushToolResult(
this.formatToolResponseWithImages(
`The user has provided feedback on the results. Consider their input to continue the task, and then attempt completion again.\n<feedback>\n${text}\n</feedback>`,
images
)
)
break
} }
} catch (error) { } catch (error) {
await handleError("inspecting site", error) await handleError("inspecting site", error)
@@ -2081,6 +2083,11 @@ ${this.customInstructions.trim()}
} }
} }
// in case no tool calls were made or tool call wasn't closed properly, set partial to false
if (this.assistantMessageContent.some((e) => e.partial)) {
this.assistantMessageContent.forEach((e) => (e.partial = false))
this.presentAssistantMessage() // if there is content to update then it will complete and update this.userMessageContentReady to true, which we pwaitfor before making the next request
}
this.didCompleteReadingStream = true this.didCompleteReadingStream = true
console.log("contentBlocks", apiContentBlocks) console.log("contentBlocks", apiContentBlocks)