Concedo 6054bacadd Merge branch 'upstream' into concedo_experimental ... # Conflicts: # .github/workflows/ai-issues.yml # CONTRIBUTING.md # docs/autoparser.md # docs/ops.md # docs/ops/Metal.csv # ggml/src/ggml-cann/aclnn_ops.cpp # ggml/src/ggml-cann/ggml-cann.cpp # ggml/src/ggml-cpu/CMakeLists.txt # ggml/src/ggml-hexagon/ggml-hexagon.cpp # ggml/src/ggml-hexagon/htp/CMakeLists.txt # ggml/src/ggml-hexagon/htp/hex-dma.h # ggml/src/ggml-hexagon/htp/hex-utils.h # ggml/src/ggml-hexagon/htp/htp-ctx.h # ggml/src/ggml-hexagon/htp/htp-msg.h # ggml/src/ggml-hexagon/htp/htp_iface.idl # ggml/src/ggml-hexagon/htp/hvx-base.h # ggml/src/ggml-hexagon/htp/main.c # ggml/src/ggml-hip/CMakeLists.txt # models/templates/Apriel-1.6-15b-Thinker-fixed.jinja # models/templates/deepseek-ai-DeepSeek-R1-Distill-Qwen-32B.jinja # models/templates/deepseek-ai-DeepSeek-V3.1.jinja # models/templates/llama-cpp-deepseek-r1.jinja # models/templates/meetkai-functionary-medium-v3.1.jinja # scripts/fetch_server_test_models.py # scripts/snapdragon/adb/run-cli.sh # scripts/snapdragon/adb/run-completion.sh # scripts/snapdragon/adb/run-mtmd.sh # scripts/snapdragon/adb/run-tool.sh # tests/test-chat-auto-parser.cpp # tests/test-chat-peg-parser.cpp # tests/test-chat.cpp # tools/cli/cli.cpp # tools/server/README.md		2026-03-21 12:06:01 +08:00
..
bench	Merge branch 'upstream' into concedo_experimental	2025-08-23 11:35:28 +08:00
public	common/parser: add proper reasoning tag prefill reading (#20424)	2026-03-19 16:58:21 +01:00
public_legacy	Autoparser - complete refactoring of parser architecture (#18675)	2026-03-06 21:01:00 +01:00
public_simplechat	Merge commit '2cd20b72ed' into concedo_experimental	2026-03-10 22:11:08 +08:00
tests	Merge branch 'upstream' into concedo_experimental	2026-03-21 12:06:01 +08:00
themes	Merge branch 'upstream' into concedo_experimental	2026-02-03 19:00:42 +08:00
webui	Merge branch 'upstream' into concedo_experimental	2026-03-21 12:06:01 +08:00
chat-llama2.sh	scripts : make the shell scripts cross-platform (#14341)	2025-06-30 10:17:18 +02:00
chat.mjs	llama : move end-user examples to tools directory (#13249)	2025-05-02 20:27:13 +02:00
chat.sh	scripts : make the shell scripts cross-platform (#14341)	2025-06-30 10:17:18 +02:00
README-dev.md	server: (doc) clarify in-scope and out-scope features (#20794)	2026-03-20 14:03:50 +01:00
server-common.cpp	common/parser: add proper reasoning tag prefill reading (#20424)	2026-03-19 16:58:21 +01:00
server-common.h	common/parser: add --skip-chat-parsing to force a pure content parser. (#20289)	2026-03-17 16:16:43 +01:00
server-context.cpp	server : improve mtmd ctx checkpoints (#20726)	2026-03-20 11:13:12 +02:00
server-context.h	server: Add pragma once to server-context.h (#19944)	2026-02-27 18:28:36 +01:00
server-cors-proxy.h	server: Parse port numbers from MCP server URLs in CORS proxy (#20208)	2026-03-09 17:47:54 +01:00
server-http.cpp	server: fix query params lost when proxying requests in multi-model router mode (#19854)	2026-02-24 21:46:06 +01:00
server-http.h	server: fix query params lost when proxying requests in multi-model router mode (#19854)	2026-02-24 21:46:06 +01:00
server-models.cpp	server: fix router mode deadlock on child crash and TOCTOU race in models_max (#20763)	2026-03-19 22:16:05 +01:00
server-models.h	server: Parse port numbers from MCP server URLs in CORS proxy (#20208)	2026-03-09 17:47:54 +01:00
server-queue.cpp	server: improve slots scheduling for n_cmpl (#18789)	2026-01-15 17:10:28 +01:00
server-queue.h	server: improve slots scheduling for n_cmpl (#18789)	2026-01-15 17:10:28 +01:00
server-task.cpp	common/parser: fix nasty bug causing subtle corruption of generation prompt (#20825)	2026-03-21 00:19:04 +01:00
server-task.h	server: Add cached_tokens info to oaicompat responses (#19361)	2026-03-19 19:09:33 +01:00
server.cpp	webui: Agentic Loop + MCP Client with support for Tools, Resources and Prompts (#18655)	2026-03-06 10:00:39 +01:00