common : fix gpt-oss Jinja error with content and thinking on tool-call messages#19704
Merged
aldehir merged 1 commit intoggml-org:masterfrom Feb 19, 2026
Merged
Conversation
…ent and thinking with tool calls Erase `content` from the adjusted message after copying `reasoning_content` to `thinking`, so the gpt-oss template does not see both fields on tool-call messages. Regression from ggml-org#16937.
aldehir
approved these changes
Feb 19, 2026
pwilkin
approved these changes
Feb 19, 2026
liparetejas
pushed a commit
to liparetejas/llama.cpp
that referenced
this pull request
Feb 23, 2026
…ent and thinking with tool calls (ggml-org#19704)
bartowski1182
pushed a commit
to bartowski1182/llama.cpp
that referenced
this pull request
Mar 2, 2026
…ent and thinking with tool calls (ggml-org#19704)
ArberSephirotheca
pushed a commit
to ArberSephirotheca/llama.cpp
that referenced
this pull request
Mar 3, 2026
…ent and thinking with tool calls (ggml-org#19704)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Erase the
contentfrom the adjusted message after copyingreasoning_contenttothinking.Regression from #16937
Fixes #19703.
All four tests related to chat have passed in this fix:
AI was used in an assistive capacity to help trace the regression source.