Skip to content

Backport: [v6.0] fix(provider/xai): extract reasoning text from content in responses doGenerate#16827

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

Backport: [v6.0] fix(provider/xai): extract reasoning text from content in responses doGenerate#16827
github-actions[bot] wants to merge 1 commit into
release-v5.0from
backport-pr-16798-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 #16798 to the release-v5.0 branch. FYI @gr2m
This backport has conflicts that need to be resolved manually.

git cherry-pick output

CONFLICT (file location): examples/ai-functions/src/generate-text/xai/responses-reasoning.ts added in 19eece65b8 ([v6.0] fix(provider/xai): extract reasoning text from content in responses doGenerate (#16798)) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to examples/ai-core/src/generate-text/responses-reasoning.ts.
Auto-merging packages/xai/src/responses/xai-responses-api.ts
Auto-merging packages/xai/src/responses/xai-responses-language-model.test.ts
CONFLICT (content): Merge conflict in packages/xai/src/responses/xai-responses-language-model.test.ts
Auto-merging packages/xai/src/responses/xai-responses-language-model.ts
CONFLICT (content): Merge conflict in packages/xai/src/responses/xai-responses-language-model.ts
error: could not apply 19eece65b8... [v6.0] fix(provider/xai): extract reasoning text from content in responses doGenerate (#16798)
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