Skip to content

Backport: [v6.0] fix(ai): enforce timeout.stepMs for the whole step in streamText#16828

Draft
github-actions[bot] wants to merge 1 commit into
release-v5.0from
backport-pr-16801-to-release-v5.0
Draft

Backport: [v6.0] fix(ai): enforce timeout.stepMs for the whole step in streamText#16828
github-actions[bot] wants to merge 1 commit into
release-v5.0from
backport-pr-16801-to-release-v5.0

Conversation

@github-actions

@github-actions github-actions Bot commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

This is an automated backport of #16801 to the release-v5.0 branch. FYI @gr2m
This backport has conflicts that need to be resolved manually.

git cherry-pick output

Auto-merging packages/ai/src/generate-text/stream-text.test.ts
CONFLICT (content): Merge conflict in 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 faaef7c83e... [v6.0] fix(ai): enforce timeout.stepMs for the whole step in streamText (#16801)
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"

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant