From: abhijitb11 <redacted>
Date: Thu, 19 Feb 2026 20:59:20 +0000 (-0800)
Subject: common : fix gpt-oss Jinja error when assistant message has both content and thinking... 
X-Git-Tag: gguf-v0.18.0~62
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=39e4b1dc9bd00eb21a4e9cc6950855f94bc66de0;p=pkg%2Fggml%2Fsources%2Fllama.cpp

common : fix gpt-oss Jinja error when assistant message has both content and thinking with tool calls (#19704)
---

diff --git a/common/chat.cpp b/common/chat.cpp
index 3c4e9f5cf..19f490c6b 100644
--- a/common/chat.cpp
+++ b/common/chat.cpp
@@ -2043,6 +2043,7 @@ static common_chat_params common_chat_params_init_gpt_oss(const common_chat_temp
         if (has_reasoning_content && has_tool_calls) {
             auto adjusted_message = msg;
             adjusted_message["thinking"] = msg.at("reasoning_content");
+            adjusted_message.erase("content");
             adjusted_messages.push_back(adjusted_message);
         } else {
             adjusted_messages.push_back(msg);