Concedo 42ad89cd86 Merge branch 'upstream' into concedo_experimental ... # Conflicts: # .devops/cann.Dockerfile # .devops/cpu.Dockerfile # .devops/llama-cli-cann.Dockerfile # .devops/nix/package.nix # .github/workflows/build-android.yml # .github/workflows/build-cann.yml # .github/workflows/build-msys.yml # .github/workflows/docker.yml # .github/workflows/editorconfig.yml # .github/workflows/gguf-publish.yml # .github/workflows/python-lint.yml # .github/workflows/release.yml # CMakeLists.txt # docs/backend/CANN.md # ggml/src/ggml-hexagon/ggml-hexagon.cpp # ggml/src/ggml-hexagon/htp/hmx-matmul-ops.c # ggml/src/ggml-hexagon/htp/htp-ctx.h # ggml/src/ggml-hexagon/htp/main.c # ggml/src/ggml-hexagon/htp/matmul-ops.c # ggml/src/ggml-rpc/ggml-rpc.cpp # scripts/sync_vendor.py # tests/test-chat-auto-parser.cpp # tests/test-chat.cpp # tests/test-json-schema-to-grammar.cpp # tests/test-reasoning-budget.cpp # tools/cli/cli.cpp # tools/server/CMakeLists.txt # tools/server/README.md		2026-03-30 20:45:38 +08:00
..
bench	Merge branch 'upstream' into concedo_experimental	2026-03-22 23:39:13 +08:00
public	webui: Conversation forking + branching improvements (#21021)	2026-03-28 13:38:15 +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-30 20:45:38 +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-30 20:45:38 +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: add built-in tools backend support (#20898)	2026-03-27 10:07:11 +01:00
server-common.cpp	common : inhibit lazy grammar sampler while reasoning is active (#20970)	2026-03-27 18:30:40 +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 : fix processing of multiple back-to-back mtmd chunks (#21107)	2026-03-28 16:27:36 +02:00
server-context.h	server: allow router to report child instances sleep status (#20849)	2026-03-22 18:33:52 +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	vendor : update cpp-httplib to 0.40.0 (#21100)	2026-03-28 08:59:44 +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: allow router to report child instances sleep status (#20849)	2026-03-22 18:33:52 +01:00
server-models.h	server: allow router to report child instances sleep status (#20849)	2026-03-22 18:33:52 +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: allow router to report child instances sleep status (#20849)	2026-03-22 18:33:52 +01:00
server-task.cpp	common : inhibit lazy grammar sampler while reasoning is active (#20970)	2026-03-27 18:30:40 +01:00
server-task.h	server: Add cached_tokens info to oaicompat responses (#19361)	2026-03-19 19:09:33 +01:00
server-tools.cpp	cli : add /glob command (#21084)	2026-03-28 02:33:04 +01:00
server-tools.h	server: add built-in tools backend support (#20898)	2026-03-27 10:07:11 +01:00
server.cpp	server: add built-in tools backend support (#20898)	2026-03-27 10:07:11 +01:00