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

Add didAlreadyUseTool flag to prevent multiple tools from being called to mitigate haiku 3.5 hallucinations

Browse Source
This commit is contained in:
Saoud Rizwan
2024-11-04 16:30:26 -05:00
parent 48cdfa9874
commit c54c6d82f5
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/core/Cline.ts
View File

@@ -86,6 +86,7 @@ export class Cline {
private userMessageContent: (Anthropic.TextBlockParam | Anthropic.ImageBlockParam)[] = [] private userMessageContent: (Anthropic.TextBlockParam | Anthropic.ImageBlockParam)[] = []
private userMessageContentReady = false private userMessageContentReady = false
private didRejectTool = false private didRejectTool = false
private didAlreadyUseTool = false
private didCompleteReadingStream = false private didCompleteReadingStream = false
constructor( constructor(
@@ -828,7 +829,7 @@ export class Cline {
const block = cloneDeep(this.assistantMessageContent[this.currentStreamingContentIndex]) // need to create copy bc while stream is updating the array, it could be updating the reference block properties too const block = cloneDeep(this.assistantMessageContent[this.currentStreamingContentIndex]) // need to create copy bc while stream is updating the array, it could be updating the reference block properties too
switch (block.type) { switch (block.type) {
case "text": { case "text": {
if (this.didRejectTool) { if (this.didRejectTool || this.didAlreadyUseTool) {
break break
} }
let content = block.content let content = block.content
@@ -915,6 +916,15 @@ export class Cline {
break break
} }
if (this.didAlreadyUseTool) {
// ignore any content after a tool has already been used
this.userMessageContent.push({
type: "text",
text: `Tool [${block.name}] was not executed because a tool has already been used in this message. Only one tool may be used per message. You must assess the first tool's result before proceeding to use the next tool.`,
})
break
}
const pushToolResult = (content: ToolResponse) => { const pushToolResult = (content: ToolResponse) => {
this.userMessageContent.push({ this.userMessageContent.push({
type: "text", type: "text",
@@ -928,6 +938,8 @@ export class Cline {
} else { } else {
this.userMessageContent.push(...content) this.userMessageContent.push(...content)
} }
// once a tool result has been collected, ignore all other tool uses since we should only ever present one tool result per message
this.didAlreadyUseTool = true
} }
const askApproval = async (type: ClineAsk, partialMessage?: string) => { const askApproval = async (type: ClineAsk, partialMessage?: string) => {
@@ -1692,7 +1704,7 @@ export class Cline {
*/ */
this.presentAssistantMessageLocked = false // this needs to be placed here, if not then calling this.presentAssistantMessage below would fail (sometimes) since it's locked this.presentAssistantMessageLocked = false // this needs to be placed here, if not then calling this.presentAssistantMessage below would fail (sometimes) since it's locked
// NOTE: when tool is rejected, iterator stream is interrupted and it waits for userMessageContentReady to be true. Future calls to present will skip execution since didRejectTool and iterate until contentIndex is set to message length and it sets userMessageContentReady to true itself (instead of preemptively doing it in iterator) // NOTE: when tool is rejected, iterator stream is interrupted and it waits for userMessageContentReady to be true. Future calls to present will skip execution since didRejectTool and iterate until contentIndex is set to message length and it sets userMessageContentReady to true itself (instead of preemptively doing it in iterator)
if (!block.partial || this.didRejectTool) { if (!block.partial || this.didRejectTool || this.didAlreadyUseTool) {
// block is finished streaming and executing // block is finished streaming and executing
if (this.currentStreamingContentIndex === this.assistantMessageContent.length - 1) { if (this.currentStreamingContentIndex === this.assistantMessageContent.length - 1) {
// its okay that we increment if !didCompleteReadingStream, it'll just return bc out of bounds and as streaming continues it will call presentAssitantMessage if a new block is ready. if streaming is finished then we set userMessageContentReady to true when out of bounds. This gracefully allows the stream to continue on and all potential content blocks be presented. // its okay that we increment if !didCompleteReadingStream, it'll just return bc out of bounds and as streaming continues it will call presentAssitantMessage if a new block is ready. if streaming is finished then we set userMessageContentReady to true when out of bounds. This gracefully allows the stream to continue on and all potential content blocks be presented.
@@ -1852,6 +1864,7 @@ export class Cline {
this.userMessageContent = [] this.userMessageContent = []
this.userMessageContentReady = false this.userMessageContentReady = false
this.didRejectTool = false this.didRejectTool = false
this.didAlreadyUseTool = false
this.presentAssistantMessageLocked = false this.presentAssistantMessageLocked = false
this.presentAssistantMessageHasPendingUpdates = false this.presentAssistantMessageHasPendingUpdates = false
await this.diffViewProvider.reset() await this.diffViewProvider.reset()
@@ -1896,6 +1909,14 @@ export class Cline {
// this.userMessageContentReady = true // instead of setting this premptively, we allow the present iterator to finish and set userMessageContentReady when its ready // this.userMessageContentReady = true // instead of setting this premptively, we allow the present iterator to finish and set userMessageContentReady when its ready
break break
} }
// we need to let the request finish for openrouter to get generation details
// if (this.didAlreadyUseTool) {
// // a tool has been called, so interrupt the assistant's response to present the user's feedback
// assistantMessage +=
// "\n\n[Response interrupted by a tool use. Only one tool may be used per message.]"
// break
// }
} }
} catch (error) { } catch (error) {
// abandoned happens when extension is no longer waiting for the cline instance to finish aborting (error is thrown here when any function in the for loop throws due to this.abort) // abandoned happens when extension is no longer waiting for the cline instance to finish aborting (error is thrown here when any function in the for loop throws due to this.abort)