Skip to content

Backport: fix(ai): fix lastAssistantMessageIsCompleteWithApprovalResponses to no longer ignore providerExecuted tool approvals#14327

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

Backport: fix(ai): fix lastAssistantMessageIsCompleteWithApprovalResponses to no longer ignore providerExecuted tool approvals#14327
felixarntz merged 2 commits intorelease-v6.0from
backport-pr-14323-to-release-v6.0

Conversation

@vercel-ai-sdk
Copy link
Copy Markdown
Contributor

@vercel-ai-sdk vercel-ai-sdk bot commented Apr 10, 2026

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 6866afe7c... 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"

@tigent tigent bot added ai/core core functions like generateText, streamText, etc. Provider utils, and provider spec. ai/ui anything UI related bug Something isn't working as documented labels Apr 10, 2026
@felixarntz felixarntz marked this pull request as ready for review April 10, 2026 15:38
@felixarntz felixarntz merged commit 295beba into release-v6.0 Apr 10, 2026
29 of 31 checks passed
@felixarntz felixarntz deleted the backport-pr-14323-to-release-v6.0 branch April 10, 2026 18:10
@vercel-ai-sdk
Copy link
Copy Markdown
Contributor Author

vercel-ai-sdk bot commented Apr 10, 2026

🚀 Published in:

Package Version
ai 6.0.158
@ai-sdk/angular 2.0.159
@ai-sdk/langchain 2.0.164
@ai-sdk/llamaindex 2.0.158
@ai-sdk/react 3.0.160
@ai-sdk/rsc 2.0.158
@ai-sdk/svelte 4.0.158
@ai-sdk/vue 3.0.158

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

Labels

ai/core core functions like generateText, streamText, etc. Provider utils, and provider spec. ai/ui anything UI related bug Something isn't working as documented

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant