fix(ai): fix lastAssistantMessageIsCompleteWithApprovalResponses to no longer ignore providerExecuted tool approvals#14323
Merged
felixarntz merged 5 commits intomainfrom Apr 10, 2026
Conversation
…ignore providerExecuted tools
lgrammel
approved these changes
Apr 10, 2026
Contributor
|
|
Contributor
|
🚀 Published in:
|
felixarntz
added a commit
that referenced
this pull request
Apr 10, 2026
…ponses` to no longer ignore `providerExecuted` tool approvals (#14327) This is an automated backport of #14323 to the release-v6.0 branch. FYI @felixarntz ~~This backport has conflicts that need to be resolved manually.~~ Conflicts resolved. ### `git cherry-pick` output ``` Auto-merging packages/ai/src/generate-text/stream-text.ts CONFLICT (content): Merge conflict in packages/ai/src/generate-text/stream-text.ts error: could not apply 6866afe... fix(ai): fix `lastAssistantMessageIsCompleteWithApprovalResponses` to no longer ignore `providerExecuted` tool approvals (#14323) hint: After resolving the conflicts, mark them with hint: "git add/rm <pathspec>", then run hint: "git cherry-pick --continue". hint: You can instead skip this commit with "git cherry-pick --skip". hint: To abort and get back to the state before "git cherry-pick", hint: run "git cherry-pick --abort". hint: Disable this message with "git config set advice.mergeConflict false" ``` --------- Co-authored-by: Felix Arntz <felix.arntz@vercel.com>
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
2 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.
Summary
lastAssistantMessageIsCompleteWithApprovalResponses()so far ignoresproviderExecutedtools. There's no good reason for that, and we already had to work around it in one of the Next.js E2E examples.This PR removes the condition so that
providerExecutedtools are also considered.Manual Verification
run the modified example, where the custom workaround helper was replaced with the function from
aiChecklist
pnpm changesetin the project root)Related Issues
includes a follow-up cleanup of an unused variable from #14289 (which for some reason wasn't flagged by CI in that PR)