Skip to content

Backport: fix(ai): fix providerExecuted tool approvals being passed to language model twice#14319

Merged
felixarntz merged 3 commits intorelease-v6.0from
backport-pr-14289-to-release-v6.0
Apr 10, 2026
Merged

Backport: fix(ai): fix providerExecuted tool approvals being passed to language model twice#14319
felixarntz merged 3 commits intorelease-v6.0from
backport-pr-14289-to-release-v6.0

Conversation

@vercel-ai-sdk
Copy link
Copy Markdown
Contributor

@vercel-ai-sdk vercel-ai-sdk bot commented Apr 10, 2026 •
edited by felixarntz
Loading

This is an automated backport of #14289 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/generate-text.test.ts
Auto-merging packages/ai/src/generate-text/generate-text.ts
CONFLICT (content): Merge conflict in packages/ai/src/generate-text/generate-text.ts
Auto-merging packages/ai/src/generate-text/stream-text.test.ts
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 f37254792... fix(ai): fix `providerExecuted` tool approvals being passed to language model twice (#14289)
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"

@vercel-ai-sdk vercel-ai-sdk bot mentioned this pull request Apr 10, 2026
Merged
4 tasks
@tigent tigent bot added ai/core core functions like generateText, streamText, etc. Provider utils, and provider spec. bug Something isn't working as documented maintenance CI, internal documentation, automations, etc labels Apr 10, 2026
felixarntz
felixarntz reviewed Apr 10, 2026
View reviewed changes
packages/ai/src/generate-text/stream-text.ts
Comment on lines -1363 to -1366
const providerExecutedToolApprovals = [
...approvedToolApprovals,
...deniedToolApprovals,
].filter(toolApproval => toolApproval.toolCall.providerExecuted);
Copy link
Copy Markdown
Collaborator

@felixarntz felixarntz Apr 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this was actually missed to remove in the original PR #14289, but it's an unused variable even in v7. Covered in this separate PR for v7: #14323

@felixarntz felixarntz marked this pull request as ready for review April 10, 2026 14:47
@felixarntz felixarntz enabled auto-merge (squash) April 10, 2026 14:50
@felixarntz felixarntz merged commit ff11aee into release-v6.0 Apr 10, 2026
18 checks passed
@felixarntz felixarntz deleted the backport-pr-14289-to-release-v6.0 branch April 10, 2026 14:55
@vercel-ai-sdk
Copy link
Copy Markdown
Contributor Author

vercel-ai-sdk bot commented Apr 10, 2026

🚀 Published in:

Package Version
ai 6.0.157
@ai-sdk/angular 2.0.158
@ai-sdk/langchain 2.0.163
@ai-sdk/llamaindex 2.0.157
@ai-sdk/mcp 1.0.36
@ai-sdk/react 3.0.159
@ai-sdk/rsc 2.0.157
@ai-sdk/svelte 4.0.157
@ai-sdk/vue 3.0.157

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@felixarntz felixarntz felixarntz approved these changes

Assignees

@felixarntz felixarntz

Labels

ai/core core functions like generateText, streamText, etc. Provider utils, and provider spec. bug Something isn't working as documented maintenance CI, internal documentation, automations, etc

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@felixarntz