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

aldehir · xiukeding · commit 5a1d0899de4e · 2026-03-21T06:34:35.000+08:00
diff --git 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);
     }

Original file line number	Diff line number	Diff line change
`@@ -936,7 +936,9 @@ static common_chat_params common_chat_params_init_gpt_oss(const common_chat_temp`
`936`	`936`	`for (auto msg : inputs.messages) {`
`937`	`937`	`if (msg.contains("reasoning_content") && msg.at("reasoning_content").is_string()) {`
`938`	`938`	`msg["thinking"] = msg.at("reasoning_content");`
`939`		`- msg.erase("content");`
	`939`	`+ if (msg.contains("tool_calls") && msg.at("tool_calls").is_array() && !msg.at("tool_calls").empty()) {`
	`940`	`+ msg.erase("content");`
	`941`	`+ }`
`940`	`942`	`}`
`941`	`943`	`adjusted_messages.push_back(msg);`
`942`	`944`	`}`