Pull in Roo tool calling fixes (PRs 10466 & 10519)#5179
Merged
lambertjosh merged 2 commits intomainfrom Jan 19, 2026
Merged
Conversation
…466) Cherry-picked from RooCodeInc/Roo-Code commit f2276be Co-authored-by: Roo Code <[email protected]> Co-authored-by: daniel-lxs <[email protected]>
🦋 Changeset detectedLatest commit: aff6137 The changes in this PR will be included in the next version bump. This PR includes changesets to release 1 package
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
…icate (ROO-410) When users approve tool execution with feedback text, the feedback was being pushed as a separate tool_result before the actual tool executed and pushed its own result. This created duplicate tool_results with the same tool_use_id, violating the Anthropic API protocol (GitHub #10465). Changes: - Add approvalFeedback storage to hold feedback until tool completes - Modify pushToolResult to merge stored feedback into the tool's actual result - Update askApproval to store feedback instead of pushing as separate result - Apply fix to both MCP tools and regular tools, native and XML protocols - Update validateToolResultIds comments to clarify deduplication is now safety net Cherry-picked from RooCodeInc/Roo-Code commit e4e67e27dc9c8b1e8f70a0bbd56d70ebcbf887f3 (#10519)
lambertjosh
force-pushed
the
cherrypick/approval-feedback-fix
branch
from
406367a to
aff6137
Compare
marius-kilocode
approved these changes
Jan 18, 2026
kevinvandijk
approved these changes
Jan 19, 2026
This was referenced Jan 19, 2026
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Pulls in upstream fixes around tool calling and deduplication: