From: Aldehir Rojas <redacted>
Date: Thu, 19 Mar 2026 10:40:39 +0000 (-0500)
Subject: common : fix gpt-oss content removal (#20745)
X-Git-Tag: upstream/0.0.8611~186
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=1b9bbaa35716978dc38eb838bfe1af094ac7c1d4;p=pkg%2Fggml%2Fsources%2Fllama.cpp

common : fix gpt-oss content removal (#20745)
---

diff --git a/common/chat.cpp b/common/chat.cpp
index 6a9c0845f..6addf613f 100644
--- a/common/chat.cpp
+++ b/common/chat.cpp
@@ -936,7 +936,9 @@ static common_chat_params common_chat_params_init_gpt_oss(const common_chat_temp
     for (auto msg : inputs.messages) {
         if (msg.contains("reasoning_content") && msg.at("reasoning_content").is_string()) {
             msg["thinking"] = msg.at("reasoning_content");
-            msg.erase("content");
+            if (msg.contains("tool_calls") && msg.at("tool_calls").is_array() && !msg.at("tool_calls").empty()) {
+                msg.erase("content");
+            }
         }
         adjusted_messages.push_back(msg);
     }