Merge commit '0b14b87d7c20cb753b94b96854dd7b45306fc696' into concedo_experimental

# Conflicts:
#	.github/workflows/build-cpu.yml
#	.github/workflows/release.yml
#	AGENTS.md
#	ggml/src/ggml-opencl/ggml-opencl.cpp
#	ggml/src/ggml-sycl/common.hpp
#	ggml/src/ggml-sycl/ggml-sycl.cpp
#	ggml/src/ggml-webgpu/ggml-webgpu-shader-lib.hpp
#	ggml/src/ggml-webgpu/ggml-webgpu.cpp
#	ggml/src/ggml-webgpu/wgsl-shaders/repeat.wgsl
#	src/models/qwen3next.cpp
#	tests/test-backend-ops.cpp
#	tests/test-chat-peg-parser.cpp
#	tests/test-chat.cpp
#	tests/test-llama-archs.cpp
#	tests/test-recurrent-state-rollback.cpp
This commit is contained in:
Concedo
2026-08-07 18:04:33 +08:00
67 changed files with 4134 additions and 807 deletions
+6 -2
View File
@@ -624,10 +624,14 @@ int cli_context::run() {
generated_content content;
generate_completion(content, timings);
impl->messages.push_back({
json assistant_msg = {
{"role", "assistant"},
{"content", content.content}
});
};
if (!content.reasoning.empty()) {
assistant_msg["reasoning_content"] = content.reasoning;
}
impl->messages.push_back(std::move(assistant_msg));
if (output_file) {
std::string out_content = "Assistant:\n";