Skip to content

Backport: [v6.0] fix: more precise default message for tool execution denial#16835

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

Backport: [v6.0] fix: more precise default message for tool execution denial#16835
github-actions[bot] wants to merge 1 commit into
release-v5.0from
backport-pr-16804-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 #16804 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/ui/convert-to-model-messages.test.ts
CONFLICT (content): Merge conflict in packages/ai/src/ui/convert-to-model-messages.test.ts
Auto-merging packages/ai/src/ui/convert-to-model-messages.ts
CONFLICT (content): Merge conflict in packages/ai/src/ui/convert-to-model-messages.ts
Auto-merging packages/alibaba/src/convert-to-alibaba-chat-messages.ts
CONFLICT (content): Merge conflict in packages/alibaba/src/convert-to-alibaba-chat-messages.ts
Auto-merging packages/amazon-bedrock/src/convert-to-bedrock-chat-messages.ts
CONFLICT (content): Merge conflict in packages/amazon-bedrock/src/convert-to-bedrock-chat-messages.ts
Auto-merging packages/anthropic/src/convert-to-anthropic-messages-prompt.ts
CONFLICT (content): Merge conflict in packages/anthropic/src/convert-to-anthropic-messages-prompt.ts
Auto-merging packages/cohere/src/convert-to-cohere-chat-prompt.ts
CONFLICT (content): Merge conflict in packages/cohere/src/convert-to-cohere-chat-prompt.ts
Auto-merging packages/deepseek/src/chat/convert-to-deepseek-chat-messages.ts
CONFLICT (content): Merge conflict in packages/deepseek/src/chat/convert-to-deepseek-chat-messages.ts
Auto-merging packages/google/src/convert-to-google-generative-ai-messages.ts
CONFLICT (content): Merge conflict in packages/google/src/convert-to-google-generative-ai-messages.ts
Auto-merging packages/groq/src/convert-to-groq-chat-messages.ts
CONFLICT (content): Merge conflict in packages/groq/src/convert-to-groq-chat-messages.ts
Auto-merging packages/mistral/src/convert-to-mistral-chat-messages.ts
CONFLICT (content): Merge conflict in packages/mistral/src/convert-to-mistral-chat-messages.ts
CONFLICT (modify/delete): packages/open-responses/src/responses/convert-to-open-responses-input.ts deleted in HEAD and modified in 327642b278 ([v6.0] fix: more precise default message for tool execution denial (#16804)).  Version 327642b278 ([v6.0] fix: more precise default message for tool execution denial (#16804)) of packages/open-responses/src/responses/convert-to-open-responses-input.ts left in tree.
Auto-merging packages/openai-compatible/src/chat/convert-to-openai-compatible-chat-messages.ts
CONFLICT (content): Merge conflict in packages/openai-compatible/src/chat/convert-to-openai-compatible-chat-messages.ts
Auto-merging packages/openai/src/chat/convert-to-openai-chat-messages.ts
CONFLICT (content): Merge conflict in packages/openai/src/chat/convert-to-openai-chat-messages.ts
Auto-merging packages/openai/src/responses/convert-to-openai-responses-input.test.ts
CONFLICT (content): Merge conflict in packages/openai/src/responses/convert-to-openai-responses-input.test.ts
Auto-merging packages/openai/src/responses/convert-to-openai-responses-input.ts
CONFLICT (content): Merge conflict in packages/openai/src/responses/convert-to-openai-responses-input.ts
Auto-merging packages/xai/src/convert-to-xai-chat-messages.ts
CONFLICT (content): Merge conflict in packages/xai/src/convert-to-xai-chat-messages.ts
error: could not apply 327642b278... [v6.0] fix: more precise default message for tool execution denial (#16804)
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