RPC: improve loading

cont : fix conflict
move graph_uids to rpc_dispatcher
2026-10-26 06:27:38 -05:00 · 2026-09-25 08:16:34 +03:00 · 2026-09-25 08:16:34 +03:00 · 2026-09-25 08:16:33 +03:00 · 2026-09-25 08:16:33 +03:00 · 2026-09-25 08:16:33 +03:00
1424 changed files with 81396 additions and 195443 deletions
@@ -145,7 +145,7 @@ ENTRYPOINT ["/app/tools.sh"]
 # ==============================================================================
 FROM base AS light

-COPY --from=build /app/full/llama /app/full/llama-cli /app/full/llama-completion /app/
+COPY --from=build /app/full/llama /app/full/llama-cli /app/full/llama-completion /app

 ENTRYPOINT [ "/app/llama-cli" ]

@@ -155,9 +155,8 @@ ENTRYPOINT [ "/app/llama-cli" ]
 FROM base AS server

 ENV LLAMA_ARG_HOST=0.0.0.0
-ENV LLAMA_ARG_PORT=8080

-COPY --from=build /app/full/llama /app/full/llama-server /app/
+COPY --from=build /app/full/llama /app/full/llama-server /app

 HEALTHCHECK --interval=5m CMD [ "curl", "-f", "http://localhost:8080/health" ]

@@ -104,7 +104,7 @@ ENTRYPOINT ["/app/tools.sh"]
 ### Light, CLI only
 FROM base AS light

-COPY --from=build /app/full/llama /app/full/llama-cli /app/full/llama-completion /app/
+COPY --from=build /app/full/llama /app/full/llama-cli /app/full/llama-completion /app

 WORKDIR /app

@@ -114,9 +114,8 @@ ENTRYPOINT [ "/app/llama-cli" ]
 FROM base AS server

 ENV LLAMA_ARG_HOST=0.0.0.0
-ENV LLAMA_ARG_PORT=8080

-COPY --from=build /app/full/llama /app/full/llama-server /app/
+COPY --from=build /app/full/llama /app/full/llama-server /app

 WORKDIR /app

@@ -113,7 +113,7 @@ ENTRYPOINT ["/app/tools.sh"]
 ### Light, CLI only
 FROM base AS light

-COPY --from=build /app/full/llama /app/full/llama-cli /app/full/llama-completion /app/
+COPY --from=build /app/full/llama /app/full/llama-cli /app/full/llama-completion /app

 WORKDIR /app

@@ -123,9 +123,8 @@ ENTRYPOINT [ "/app/llama-cli" ]
 FROM base AS server

 ENV LLAMA_ARG_HOST=0.0.0.0
-ENV LLAMA_ARG_PORT=8080

-COPY --from=build /app/full/llama /app/full/llama-server /app/
+COPY --from=build /app/full/llama /app/full/llama-server /app

 WORKDIR /app

@@ -1,4 +1,4 @@
-ARG ONEAPI_VERSION=2026.1.1-devel-ubuntu24.04
+ARG ONEAPI_VERSION=2025.3.3-0-devel-ubuntu24.04
 ARG BUILD_DATE=N/A
 ARG APP_VERSION=N/A
 ARG APP_REVISION=N/A
@@ -21,11 +21,6 @@ RUN LLAMA_BUILD_NUMBER="$APP_VERSION" npm run build

 FROM docker.io/intel/deep-learning-essentials:$ONEAPI_VERSION AS build

-RUN echo "Download oneDNN installation package" && \
-    wget https://registrationcenter-download.intel.com/akdlm/IRC_NAS/94c3dbac-0852-45be-a57d-21c204cada3e/intel-onednn-2026.0.2.46_offline.sh -O intel-onednn_offline.sh && \
-    echo "Install oneDNN components" && \
-    bash intel-onednn_offline.sh -s -a --silent --eula accept
-
 ARG GGML_SYCL_F16=ON
 ARG LEVEL_ZERO_VERSION=1.28.2
 ARG LEVEL_ZERO_UBUNTU_VERSION=u24.04
@@ -50,7 +45,7 @@ RUN if [ "${GGML_SYCL_F16}" = "ON" ]; then \
    fi && \
    echo "Building with dynamic libs" && \
    cmake -B build -DGGML_NATIVE=OFF -DGGML_SYCL=ON -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_COMPILER=icpx -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON -DLLAMA_BUILD_TESTS=OFF ${OPT_SYCL_F16} && \
-    cmake --build build --config Release -j$((($(nproc)+1)/2))
+    cmake --build build --config Release -j$(nproc)

 RUN mkdir -p /app/lib && \
    find build -name "*.so*" -exec cp -P {} /app/lib \;
@@ -64,7 +59,7 @@ RUN mkdir -p /app/full \
    && cp requirements.txt /app/full \
    && cp .devops/tools.sh /app/full/tools.sh

-FROM docker.io/intel/oneapi-toolkit:$ONEAPI_VERSION AS base
+FROM docker.io/intel/deep-learning-essentials:$ONEAPI_VERSION AS base

 ARG BUILD_DATE=N/A
 ARG APP_VERSION=N/A
@@ -107,7 +102,7 @@ RUN mkdir /tmp/neo/ && cd /tmp/neo/ \
  && dpkg --install *.deb

 RUN apt-get update \
-    && apt-get install -y libgomp1 curl ffmpeg openssl libssl-dev \
+    && apt-get install -y libgomp1 curl ffmpeg \
    && apt autoremove -y \
    && apt clean -y \
    && rm -rf /tmp/* /var/tmp/* \
@@ -146,7 +141,7 @@ ENTRYPOINT ["/app/tools.sh"]
 FROM base AS light

 COPY --from=build /app/lib/ /app
-COPY --from=build /app/full/llama /app/full/llama-cli /app/full/llama-completion /app/
+COPY --from=build /app/full/llama /app/full/llama-cli /app/full/llama-completion /app

 WORKDIR /app

@@ -156,10 +151,9 @@ ENTRYPOINT [ "/app/llama-cli" ]
 FROM base AS server

 ENV LLAMA_ARG_HOST=0.0.0.0
-ENV LLAMA_ARG_PORT=8080

 COPY --from=build /app/lib/ /app
-COPY --from=build /app/full/llama /app/full/llama-server /app/
+COPY --from=build /app/full/llama /app/full/llama-server /app

 WORKDIR /app

@@ -1,9 +1,10 @@
 ARG UBUNTU_VERSION=22.04
 # This needs to generally match the container host's environment.
+ARG MUSA_VERSION=rc4.3.0
 # Target the MUSA build image
-ARG BASE_MUSA_DEV_CONTAINER=registry.mthreads.com/mcconline/musa_sdk:5.2.0-devel-ubuntu${UBUNTU_VERSION}-s5000
+ARG BASE_MUSA_DEV_CONTAINER=docker.io/mthreads/musa:${MUSA_VERSION}-devel-ubuntu${UBUNTU_VERSION}-amd64

-ARG BASE_MUSA_RUN_CONTAINER=registry.mthreads.com/mcconline/musa_sdk:5.2.0-runtime-ubuntu${UBUNTU_VERSION}-s5000
+ARG BASE_MUSA_RUN_CONTAINER=docker.io/mthreads/musa:${MUSA_VERSION}-runtime-ubuntu${UBUNTU_VERSION}-amd64

 ARG BUILD_DATE=N/A
 ARG APP_VERSION=N/A
@@ -36,10 +37,7 @@ RUN apt-get update && \
    python3-pip \
    git \
    libssl-dev \
-    libgomp1 \
-    musa-mualg-5-2 \
-    musa-muthrust-5-2 \
-    libmthreads-compute
+    libgomp1

 WORKDIR /app

@@ -82,16 +80,13 @@ LABEL org.opencontainers.image.created=$BUILD_DATE \
      org.opencontainers.image.source=$IMAGE_SOURCE

 RUN apt-get update \
-    && apt-get install -y libgomp1 curl ffmpeg libmthreads-compute \
+    && apt-get install -y libgomp1 curl ffmpeg \
    && apt autoremove -y \
    && apt clean -y \
    && rm -rf /tmp/* /var/tmp/* \
    && find /var/cache/apt/archives /var/lib/apt/lists -not -name lock -type f -delete \
    && find /var/cache -type f -delete

-# The MUSA runtime image does not register its library directory
-RUN echo "/usr/local/musa/lib" > /etc/ld.so.conf.d/musa-runtime.conf && ldconfig
-
 COPY --from=build /app/lib/ /app

 ### Full
@@ -120,7 +115,7 @@ ENTRYPOINT ["/app/tools.sh"]
 ### Light, CLI only
 FROM base AS light

-COPY --from=build /app/full/llama /app/full/llama-cli /app/full/llama-completion /app/
+COPY --from=build /app/full/llama /app/full/llama-cli /app/full/llama-completion /app

 WORKDIR /app

@@ -130,9 +125,8 @@ ENTRYPOINT [ "/app/llama-cli" ]
 FROM base AS server

 ENV LLAMA_ARG_HOST=0.0.0.0
-ENV LLAMA_ARG_PORT=8080

-COPY --from=build /app/full/llama /app/full/llama-server /app/
+COPY --from=build /app/full/llama /app/full/llama-server /app

 WORKDIR /app

@@ -1,12 +1,12 @@
-ARG OPENVINO_VERSION_MAJOR=2026.4.1
-ARG OPENVINO_VERSION_FULL=2026.4.1.22982.07f9c262b05
+ARG OPENVINO_VERSION_MAJOR=2026.4
+ARG OPENVINO_VERSION_FULL=2026.4.0.22959.99c81491cc3
 ARG UBUNTU_VERSION=24.04

 # Intel GPU driver versions. https://github.com/intel/compute-runtime/releases
-ARG IGC_VERSION=v2.41.5
-ARG IGC_VERSION_FULL=2_2.41.5+22716
-ARG COMPUTE_RUNTIME_VERSION=26.35.39758.10
-ARG COMPUTE_RUNTIME_VERSION_FULL=26.35.39758.10-0
+ARG IGC_VERSION=v2.40.13
+ARG IGC_VERSION_FULL=2_2.40.13+22418
+ARG COMPUTE_RUNTIME_VERSION=26.31.39395.13
+ARG COMPUTE_RUNTIME_VERSION_FULL=26.31.39395.13-0
 ARG IGDGMM_VERSION=22.10.0

 # Intel NPU driver versions. https://github.com/intel/linux-npu-driver/releases
@@ -227,7 +227,6 @@ ENTRYPOINT [ "/app/llama-cli" ]
 FROM base AS server

 ENV LLAMA_ARG_HOST=0.0.0.0
-ENV LLAMA_ARG_PORT=8080

 COPY --from=build /app/full/llama /app/full/llama-server /app/

@@ -126,7 +126,7 @@ ENTRYPOINT ["/app/tools.sh"]
 ### Light, CLI only
 FROM base AS light

-COPY --from=build /app/full/llama /app/full/llama-cli /app/full/llama-completion /app/
+COPY --from=build /app/full/llama /app/full/llama-cli /app/full/llama-completion /app

 WORKDIR /app

@@ -136,9 +136,8 @@ ENTRYPOINT [ "/app/llama-cli" ]
 FROM base AS server

 ENV LLAMA_ARG_HOST=0.0.0.0
-ENV LLAMA_ARG_PORT=8080

-COPY --from=build /app/full/llama /app/full/llama-server /app/
+COPY --from=build /app/full/llama /app/full/llama-server /app

 WORKDIR /app

@@ -133,7 +133,6 @@ ENTRYPOINT [ "/llama.cpp/bin/llama-cli" ]
 FROM base AS server

 ENV LLAMA_ARG_HOST=0.0.0.0
-ENV LLAMA_ARG_PORT=8080

 WORKDIR /llama.cpp/bin

@@ -107,7 +107,7 @@ ENTRYPOINT ["/app/tools.sh"]
 ### Light, CLI only
 FROM base AS light

-COPY --from=build /app/full/llama /app/full/llama-cli /app/full/llama-completion /app/
+COPY --from=build /app/full/llama /app/full/llama-cli /app/full/llama-completion /app

 WORKDIR /app

@@ -117,9 +117,8 @@ ENTRYPOINT [ "/app/llama-cli" ]
 FROM base AS server

 ENV LLAMA_ARG_HOST=0.0.0.0
-ENV LLAMA_ARG_PORT=8080

-COPY --from=build /app/full/llama /app/full/llama-server /app/
+COPY --from=build /app/full/llama /app/full/llama-server /app

 WORKDIR /app

@@ -97,7 +97,7 @@ ENTRYPOINT ["/app/tools.sh"]
 ### Light, CLI only
 FROM base AS light

-COPY --from=build /app/full/llama /app/full/llama-cli /app/full/llama-completion /app/
+COPY --from=build /app/full/llama /app/full/llama-cli /app/full/llama-completion /app

 WORKDIR /app

@@ -107,9 +107,8 @@ ENTRYPOINT [ "/app/llama-cli" ]
 FROM base AS server

 ENV LLAMA_ARG_HOST=0.0.0.0
-ENV LLAMA_ARG_PORT=8080

-COPY --from=build /app/full/llama /app/full/llama-server /app/
+COPY --from=build /app/full/llama /app/full/llama-server /app

 WORKDIR /app

@@ -45,9 +45,6 @@ insert_final_newline = unset
 trim_trailing_whitespace = unset
 insert_final_newline = unset

-[vendor/**.patch]
-trim_trailing_whitespace = unset
-
 [tools/ui/**]
 indent_style = unset
 indent_size = unset
@@ -5,8 +5,6 @@ exclude =
    # Do not traverse examples and tools
    examples,
    tools,
-    # Do not traverse .venv directories
-    .venv*,
    # Do not include package initializers
    __init__.py,
    # No need to traverse our git directory
@@ -4,10 +4,6 @@ on:
  issues:
    types: [opened]

-cache-mode: none
-permissions:
-  contents: read
-
 jobs:
  find-related:
    if: github.event.action == 'opened'
@@ -1,109 +0,0 @@
-name: Behavior Check
-
-on:
-  workflow_dispatch: # allows manual triggering
-  push:
-    branches:
-      - master
-    paths: [
-      '.github/workflows/behavior-check.yml',
-      '**/CMakeLists.txt',
-      '**/.cmake',
-      '**/*.h',
-      '**/*.hpp',
-      '**/*.c',
-      '**/*.cpp',
-    ]
-
-  pull_request:
-    types: [opened, synchronize, reopened]
-    paths: [
-      '.github/workflows/behavior-check.yml',
-      '**/CMakeLists.txt',
-      '**/.cmake',
-      '**/*.h',
-      '**/*.hpp',
-      '**/*.c',
-      '**/*.cpp'
-    ]
-
-cache-mode: none
-permissions:
-  contents: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
-  cancel-in-progress: true
-
-env:
-  GGML_NLOOP: 3
-  GGML_N_THREADS: 1
-  GGML_SCHED_DEBUG_REALLOC: 1
-  LLAMA_ARG_LOG_COLORS: 1
-  LLAMA_ARG_LOG_PREFIX: 1
-  LLAMA_ARG_LOG_TIMESTAMPS: 1
-
-jobs:
-  ubuntu:
-    runs-on: ubuntu-26.04-arm
-
-    steps:
-      - name: Clone
-        id: checkout
-        uses: actions/checkout@v6
-
-      - name: ccache
-        uses: ggml-org/ccache-action@v1.2.24
-        with:
-          restore: false
-          save: false
-
-      - name: Build Dependencies
-        id: build_depends
-        run: |
-          sudo apt update
-          sudo apt install -y build-essential libssl-dev git-lfs libjpeg-dev python3 python3-venv python3-pip
-
-      - name: Python Dependencies
-        id: python_depends
-        run: |
-          python3 -m venv .venv
-          source .venv/bin/activate
-          pip install jinja2==3.1.6
-
-      - name: ccache-buckets-restore
-        uses: ./.github/actions/ccache-buckets
-        env:
-          HF_TOKEN: ${{ secrets.HF_TOKEN_CI }}
-        with:
-          key: behavior-check-ubuntu-26.04-arm
-          folder: llama.cpp
-          hf_bucket: ggml-org/cache
-
-      - name: Build
-        id: cmake_build
-        run: |
-          cmake -B build \
-            -DGGML_NATIVE=OFF \
-            -DGGML_BACKEND_DL=OFF \
-            -DLLAMA_FATAL_WARNINGS=ON
-          time cmake --build build --config Release -j $(nproc)
-
-      - name: ccache-buckets-save
-        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
-        uses: ./.github/actions/ccache-buckets
-        env:
-          HF_TOKEN: ${{ secrets.HF_TOKEN_CACHE_OUTPUT }}
-        with:
-          key: behavior-check-ubuntu-26.04-arm
-          folder: llama.cpp
-          evict-old-files: 1d
-          hf_bucket: ggml-org/cache
-          save: true
-
-      - name: Test
-        id: cmake_test
-        run: |
-          source .venv/bin/activate
-          cd build
-          ctest -L behavior -LE 'model|backend' --verbose --timeout 900
@@ -15,10 +15,6 @@ on:
      '**/*.cpp'
    ]

-cache-mode: none
-permissions:
-  contents: read
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true
@@ -23,10 +23,6 @@ on:
      - 'scripts/snapdragon/**'
      - 'CMakePresets.json'

-cache-mode: none
-permissions:
-  contents: read
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true
@@ -35,15 +31,11 @@ jobs:
  android-ndk-snapdragon:
    runs-on: ubuntu-24.04  # previously ubuntu-latest
    container:
-      image: 'ghcr.io/snapdragon-toolchain/arm64-android:v0.8'
+      image: 'ghcr.io/snapdragon-toolchain/arm64-android:v0.7'
    defaults:
      run:
        shell: bash

-    permissions:
-      actions: write
-      contents: read
-
    steps:
      - name: Clone
        uses: actions/checkout@v6
@@ -69,15 +61,11 @@ jobs:
  linux-iot-snapdragon:
    runs-on: ubuntu-24.04  # previously ubuntu-latest
    container:
-      image: 'ghcr.io/snapdragon-toolchain/arm64-linux:v0.8'
+      image: 'ghcr.io/snapdragon-toolchain/arm64-linux:v0.7'
    defaults:
      run:
        shell: bash

-    permissions:
-      actions: write
-      contents: read
-
    steps:
      - name: Clone
        uses: actions/checkout@v6
@@ -104,15 +92,11 @@ jobs:
    name: Test on QDC Device (${{ matrix.device }})
    needs: [android-ndk-snapdragon, linux-iot-snapdragon]
    runs-on: ubuntu-24.04-arm
-    timeout-minutes: 180
+    timeout-minutes: 90
    strategy:
      fail-fast: false
      matrix:
-        device: [SM8850, QCS9075M]
-
-    permissions:
-      actions: read
-      contents: read
+        device: [SM8750, SM8850, QCS9075M]

    steps:
      - name: Checkout
@@ -155,7 +139,7 @@ jobs:
              --pkg-dir    pkg-snapdragon/llama.cpp \
              --model-url  "https://huggingface.co/bartowski/Llama-3.2-1B-Instruct-GGUF/resolve/main/Llama-3.2-1B-Instruct-Q4_0.gguf" \
              --device     ${{ matrix.device }} \
-              ${{ startsWith(matrix.device, 'QCS') && '--job-timeout 5400 --retries 2 --retry-delay 300' || '' }}
+              ${{ startsWith(matrix.device, 'QCS') && '--retries 2 --retry-delay 300' || '' }}
        env:
          QDC_API_KEY: ${{ secrets.QDC_API_KEY }}

@@ -20,10 +20,6 @@ on:
      - '.github/workflows/build-android.yml'
      - 'examples/llama.android/**'

-cache-mode: none
-permissions:
-  contents: read
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true
@@ -70,10 +66,6 @@ jobs:
      run:
        shell: bash

-    permissions:
-      actions: write
-      contents: read
-
    steps:
      - name: Clone
        uses: actions/checkout@v6
@@ -26,10 +26,6 @@ on:
      'ggml/src/ggml-rpc/**'
    ]

-cache-mode: none
-permissions:
-  contents: read
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true
@@ -37,7 +33,6 @@ concurrency:
 env:
  GGML_NLOOP: 3
  GGML_N_THREADS: 1
-  GGML_SCHED_DEBUG_REALLOC: 1
  LLAMA_ARG_LOG_COLORS: 1
  LLAMA_ARG_LOG_PREFIX: 1
  LLAMA_ARG_LOG_TIMESTAMPS: 1
@@ -54,7 +49,7 @@ jobs:
      - name: ccache
        uses: ggml-org/ccache-action@v1.2.24
        with:
-          restore: false
+          key: apple-arm64
          save: false

      - name: ccache-buckets-restore
@@ -103,9 +98,7 @@ jobs:
        id: cmake_test
        run: |
          cd build
-          # Metal Paravirtual devices are difficult to support -> disable
-          # ref: https://github.com/ggml-org/llama.cpp/pull/19802#issuecomment-4013704023
-          ctest -L main -E "test-llama-archs|test-llama-context|test-speculative-rejection-sampling" --verbose --timeout 900
+          ctest -L main -E "test-llama-archs" --verbose --timeout 900

  macos-latest-x64:
    runs-on: macos-15-intel
@@ -118,7 +111,7 @@ jobs:
      - name: ccache
        uses: ggml-org/ccache-action@v1.2.24
        with:
-          restore: false
+          key: apple-x64
          save: false

      - name: ccache-buckets-restore
@@ -166,10 +159,6 @@ jobs:
  macos-latest-ios-xcode:
    runs-on: macos-latest

-    permissions:
-      actions: write
-      contents: read
-
    steps:
      - name: Checkout code
        uses: actions/checkout@v6
@@ -267,10 +256,6 @@ jobs:
    runs-on: macos-latest
    needs: macos-latest-ios-xcode

-    permissions:
-      actions: read
-      contents: read
-
    strategy:
      matrix:
        destination: ['generic/platform=macOS', 'generic/platform=iOS', 'generic/platform=tvOS']
@@ -5,10 +5,6 @@ on:
  schedule:
    - cron: '0 * * * *'

-cache-mode: write
-permissions:
-  contents: read
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true
@@ -44,9 +40,9 @@ jobs:
    runs-on: ubuntu-24.04

    env:
-      # Sync versions in build-openvino.yml, ci-self-hosted-openvino.yml, release.yml, release-publish.yml, build-cache.yml, .devops/openvino.Dockerfile, docs/backend/OPENVINO.md
-      OPENVINO_VERSION_MAJOR: "2026.4.1"
-      OPENVINO_VERSION_FULL: "2026.4.1.22982.07f9c262b05"
+      # Sync versions in build-openvino.yml, build-self-hosted.yml, release.yml, build-cache.yml, .devops/openvino.Dockerfile
+      OPENVINO_VERSION_MAJOR: "2026.4"
+      OPENVINO_VERSION_FULL: "2026.4.0.22959.99c81491cc3"

    steps:
      - name: Clone
@@ -72,9 +68,9 @@ jobs:
    runs-on: windows-2022

    env:
-      # Sync versions in build-openvino.yml, ci-self-hosted-openvino.yml, release.yml, release-publish.yml, build-cache.yml, .devops/openvino.Dockerfile, docs/backend/OPENVINO.md
-      OPENVINO_VERSION_MAJOR: "2026.4.1"
-      OPENVINO_VERSION_FULL: "2026.4.1.22982.07f9c262b05"
+      # Sync versions in build.yml, build-self-hosted.yml, release.yml, build-cache.yml, .devops/openvino.Dockerfile
+      OPENVINO_VERSION_MAJOR: "2026.4"
+      OPENVINO_VERSION_FULL: "2026.4.0.22959.99c81491cc3"

    steps:
      - name: Clone
@@ -22,10 +22,6 @@ on:
      'ggml/src/ggml-cann/**'
    ]

-cache-mode: none
-permissions:
-  contents: read
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true
@@ -3,13 +3,9 @@ on:
  workflow_dispatch:
  workflow_call:

-cache-mode: none
-permissions:
-  contents: read
-
 jobs:
  linux:
-    runs-on: [self-hosted, Linux, fast]
+    runs-on: [self-hosted, Linux, CPU]
    steps:
      - uses: actions/checkout@v6
        with:
@@ -30,10 +30,6 @@ on:
      '**/*.cpp'
    ]

-cache-mode: none
-permissions:
-  contents: read
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true
@@ -41,7 +37,6 @@ concurrency:
 env:
  GGML_NLOOP: 3
  GGML_N_THREADS: 1
-  GGML_SCHED_DEBUG_REALLOC: 1
  LLAMA_ARG_LOG_COLORS: 1
  LLAMA_ARG_LOG_PREFIX: 1
  LLAMA_ARG_LOG_TIMESTAMPS: 1
@@ -69,7 +64,7 @@ jobs:
      - name: ccache
        uses: ggml-org/ccache-action@v1.2.24
        with:
-          restore: false
+          key: cpu-${{ matrix.os }}
          save: false

      - name: Build Dependencies
@@ -129,7 +124,7 @@ jobs:
        id: cmake_test
        run: |
          cd build
-          ctest -L main --verbose --timeout 900
+          ctest -L 'main|python' --verbose --timeout 900

      - name: Test llama2c conversion
        id: llama2c_test
@@ -146,11 +141,6 @@ jobs:
    name: windows / ${{ matrix.build }}
    runs-on: windows-2025

-    cache-mode: write
-    permissions:
-      actions: write
-      contents: read
-
    env:
      OPENBLAS_VERSION: 0.3.23
      SDE_VERSION: 9.33.0-2024-01-07
@@ -15,10 +15,6 @@ on:
  schedule:
    - cron: '0 0 * * 0'

-cache-mode: none
-permissions:
-  contents: read
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true
@@ -24,10 +24,6 @@ on:
      'ggml/src/ggml-cuda/**'
    ]

-cache-mode: none
-permissions:
-  contents: read
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true
@@ -59,7 +55,7 @@ jobs:
      - name: ccache
        uses: ggml-org/ccache-action@v1.2.24
        with:
-          restore: false
+          key: cuda-ubuntu-24.04-cuda
          save: false

      - name: ccache-buckets-restore
@@ -72,7 +68,7 @@ jobs:
          hf_bucket: ggml-org/cache

      - name: Build with CMake
-        # TODO: Drop GGML_CUDA_CCCL_VERSION when this job uses CTK >= 13.5, which bundles CCCL >= 3.5.
+        # TODO: Remove GGML_CUDA_CUB_3DOT2 flag once CCCL 3.2 is bundled within CTK and that CTK version is used in this project
        run: |
          cmake -S . -B build -G Ninja \
            -DLLAMA_FATAL_WARNINGS=ON \
@@ -81,7 +77,7 @@ jobs:
            -DCMAKE_EXE_LINKER_FLAGS=-Wl,--allow-shlib-undefined \
            -DGGML_NATIVE=OFF \
            -DGGML_CUDA=ON \
-            -DGGML_CUDA_CCCL_VERSION=v3.4.3
+            -DGGML_CUDA_CUB_3DOT2=ON
          cmake --build build

      - name: ccache-buckets-save
@@ -114,7 +110,7 @@ jobs:
      - name: ccache
        uses: ggml-org/ccache-action@v1.2.24
        with:
-          restore: false
+          key: cuda-ubuntu-22.04-hip
          save: false

      - name: ccache-buckets-restore
@@ -149,7 +145,7 @@ jobs:

  musa:
    runs-on: ubuntu-22.04
-    container: registry.mthreads.com/mcconline/musa_sdk:5.2.0-devel-ubuntu22.04-s5000
+    container: mthreads/musa:rc4.3.0-devel-ubuntu22.04-amd64

    steps:
      - name: Clone
@@ -160,12 +156,12 @@ jobs:
        id: depends
        run: |
          apt-get update
-          apt-get install -y build-essential git cmake libssl-dev jq python3-venv musa-mualg-5-2 musa-muthrust-5-2 libmthreads-compute
+          apt-get install -y build-essential git cmake libssl-dev jq

      - name: ccache
        uses: ggml-org/ccache-action@v1.2.24
        with:
-          restore: false
+          key: cuda-ubuntu-22.04-musa
          save: false

      - name: ccache-buckets-restore
@@ -182,8 +178,8 @@ jobs:
        run: |
          cmake -B build -S . \
            -DGGML_MUSA=ON \
-            -DMUSA_ARCHITECTURES=31
-          cmake --build build --config Release -j $(nproc)
+            -DMUSA_ARCHITECTURES=21
+          time cmake --build build --config Release -j $(nproc)

      - name: ccache-buckets-save
        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
@@ -7,11 +7,6 @@ name: CI (CUDA, windows)
 on:
  workflow_dispatch: # allows manual triggering

-cache-mode: write
-permissions:
-  actions: write
-  contents: read
-
 # note: this will run in queue with the release workflow
 concurrency:
  group: release
@@ -36,16 +31,15 @@ jobs:
    strategy:
      matrix:
        include:
-          # CTK >= 13.5 bundles CCCL >= 3.5; omit GGML_CUDA_CCCL_VERSION for those versions.
          - cuda: '12.4'
            arch: x64
-            defines: '-DGGML_CUDA_CCCL_VERSION=v3.4.3'
+            defines: '-DGGML_CUDA_CUB_3DOT2=ON'
          - cuda: '13.4'
            arch: x64
-            defines: '-DGGML_CUDA_CCCL_VERSION=v3.4.3'
+            defines: ''
          - cuda: '13.4'
            arch: arm64
-            defines: '-DGGML_CUDA_CCCL_VERSION=v3.4.3 -DCMAKE_TOOLCHAIN_FILE=cmake/arm64-windows-msvc-cuda.cmake'
+            defines: '-DCMAKE_TOOLCHAIN_FILE=cmake/arm64-windows-msvc-cuda.cmake'

    steps:
      - name: Clone
@@ -19,18 +19,9 @@ on:
    types: [opened, synchronize, reopened]
    paths: [
      '.github/workflows/build-ibm.yml',
-      'ggml/src/ggml-cpu/**',
-      'ggml/src/ggml-zdnn/**',
-      'ggml/src/ggml-quants.c',
-      'src/llama-quant.cpp',
-      'gguf-py/gguf/scripts/gguf_convert_endian.py',
-      'tests/test-quantize-be.sh'
+      'ggml/src/ggml-cpu/**'
    ]

-cache-mode: none
-permissions:
-  contents: read
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true
@@ -109,51 +100,6 @@ jobs:
          wget https://huggingface.co/ggml-org/models/resolve/main/tinyllamas/stories260K-be.gguf
          ./bin/llama-completion -m stories260K-be.gguf -p "One day, Lily met a Shoggoth" -n 500 -c 256

-      - name: Test quantize (s390x)
-        id: quantize_test_s390x
-        run: |
-          ./tests/test-quantize-be.sh ./build/bin/llama-quantize ./build/bin/llama-perplexity 2>&1
-
-  ubuntu-26-zdnn-s390x:
-    name: ubuntu-26-zdnn-s390x
-    runs-on: ubuntu-24.04-s390x
-    container: ubuntu:26.04  # required to get GCC 15.1 and binutils 2.44
-    defaults:
-      run:
-        shell: bash
-
-    steps:
-      - name: Build Dependencies
-        id: build_depends
-        run: |
-          apt-get update
-          apt-get install -y --no-install-recommends \
-            build-essential cmake git ca-certificates \
-            libssl-dev libzdnn-dev
-
-      - name: Clone
-        id: checkout
-        uses: actions/checkout@v6
-
-      - name: Toolchain workaround (GCC 15)
-        run: |
-          apt-get install -y gcc-15 g++-15
-          echo "CC=gcc-15" >> "$GITHUB_ENV"
-          echo "CXX=g++-15" >> "$GITHUB_ENV"
-
-      - name: Build with zDNN Backend
-        id: cmake_build
-        run: |
-          cmake -B build \
-            -DLLAMA_FATAL_WARNINGS=ON \
-            -DGGML_NATIVE=OFF \
-            -DGGML_VXE=ON \
-            -DGGML_ZDNN=ON \
-            -DGGML_RPC=ON \
-            -DCMAKE_C_FLAGS="-march=arch15" \
-            -DCMAKE_CXX_FLAGS="-march=arch15"
-          time cmake --build build --config Release -j $(nproc)
-
  ubuntu-24-ppc64le:
    runs-on: ubuntu-24.04-ppc64le

@@ -8,10 +8,6 @@ on:
  schedule:
    - cron: '0 0 * * 0'

-cache-mode: none
-permissions:
-  contents: read
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true
@@ -23,11 +23,6 @@ on:
      'ggml/src/ggml-opencl/**'
    ]

-cache-mode: write
-permissions:
-  actions: write
-  contents: read
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true
@@ -22,10 +22,6 @@ on:
      'ggml/src/ggml-openvino/**'
    ]

-cache-mode: none
-permissions:
-  contents: read
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true
@@ -37,16 +33,16 @@ env:
  LLAMA_ARG_LOG_PREFIX: 1
  LLAMA_ARG_LOG_TIMESTAMPS: 1
  # TODO: fix failing tests on OpenVINO backend
-  CTEST_EXCLUDE: "test-llama-archs|test-llama-context"
+  CTEST_EXCLUDE: "test-llama-archs|^test-recurrent-state-|test-save-load-state"

 jobs:
  ubuntu-24-openvino:
    runs-on: [self-hosted, Linux, Intel, OpenVINO]

    env:
-      # Sync versions in build-openvino.yml, ci-self-hosted-openvino.yml, release.yml, release-publish.yml, build-cache.yml, .devops/openvino.Dockerfile, docs/backend/OPENVINO.md
-      OPENVINO_VERSION_MAJOR: "2026.4.1"
-      OPENVINO_VERSION_FULL: "2026.4.1.22982.07f9c262b05"
+      # Sync versions in build-openvino.yml, build-self-hosted.yml, release.yml, build-cache.yml, .devops/openvino.Dockerfile
+      OPENVINO_VERSION_MAJOR: "2026.4"
+      OPENVINO_VERSION_FULL: "2026.4.0.22959.99c81491cc3"

    steps:
      - name: Clone
@@ -98,15 +94,10 @@ jobs:
  openvino-windows-2022:
    runs-on: windows-2022

-    cache-mode: write
-    permissions:
-      actions: write
-      contents: read
-
    env:
-      # Sync versions in build-openvino.yml, ci-self-hosted-openvino.yml, release.yml, release-publish.yml, build-cache.yml, .devops/openvino.Dockerfile, docs/backend/OPENVINO.md
-      OPENVINO_VERSION_MAJOR: "2026.4.1"
-      OPENVINO_VERSION_FULL: "2026.4.1.22982.07f9c262b05"
+      # Sync versions in build-openvino.yml, build-self-hosted.yml, release.yml, build-cache.yml, .devops/openvino.Dockerfile
+      OPENVINO_VERSION_MAJOR: "2026.4"
+      OPENVINO_VERSION_FULL: "2026.4.0.22959.99c81491cc3"

    steps:
      - name: Clone
@@ -22,10 +22,6 @@ on:
      'ggml/src/ggml-cpu/arch/riscv/**'
    ]

-cache-mode: none
-permissions:
-  contents: read
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true
@@ -21,10 +21,6 @@ on:
      '.github/workflows/build-sanitize.yml'
    ]

-cache-mode: none
-permissions:
-  contents: read
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true
@@ -49,7 +45,7 @@ jobs:
        - sanitizer: THREAD
          machine: ubuntu-24.04
        - sanitizer: UNDEFINED
-          machine: [self-hosted, X64, Linux, CPU]
+          machine: [self-hosted, X64, Linux]

    runs-on: ${{ matrix.machine }}

@@ -22,10 +22,6 @@ on:
      'ggml/src/ggml-sycl/**'
    ]

-cache-mode: none
-permissions:
-  contents: read
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true
@@ -52,7 +48,7 @@ jobs:

    env:
      ONEAPI_ROOT: /opt/intel/oneapi/
-      ONEAPI_INSTALLER_VERSION: "2026.1"
+      ONEAPI_INSTALLER_VERSION: "2025.3.3"
      LEVEL_ZERO_VERSION: "1.33.1"
      LEVEL_ZERO_UBUNTU_VERSION: "u24.04"

@@ -67,16 +63,9 @@ jobs:
        shell: bash
        run: |
          cd /tmp
-          echo "Download oneAPI Deep Learning Essentials installation package"
-          wget https://registrationcenter-download.intel.com/akdlm/IRC_NAS/b5c100a7-8052-4e88-90e2-63d9916a998b/intel-deep-learning-essentials-2026.1.4.17_offline.sh -O intel-deep-learning-essentials_offline.sh
-          echo "Install oneAPI Deep Learning Essentials components"
+          wget https://registrationcenter-download.intel.com/akdlm/IRC_NAS/56f7923a-adb8-43f3-8b02-2b60fcac8cab/intel-deep-learning-essentials-2025.3.3.16_offline.sh -O intel-deep-learning-essentials_offline.sh
          sudo bash intel-deep-learning-essentials_offline.sh -s -a --silent --eula accept

-          echo "Download oneDNN installation package"
-          wget https://registrationcenter-download.intel.com/akdlm/IRC_NAS/94c3dbac-0852-45be-a57d-21c204cada3e/intel-onednn-2026.0.2.46_offline.sh -O intel-onednn_offline.sh
-          echo "Install oneDNN components"
-          sudo bash intel-onednn_offline.sh -s -a --silent --eula accept
-
      - name: Install Level Zero SDK
        shell: bash
        run: |
@@ -86,16 +75,10 @@ jobs:
          wget -q "https://github.com/oneapi-src/level-zero/releases/download/v${LEVEL_ZERO_VERSION}/libze-dev_${LEVEL_ZERO_VERSION}%2B${LEVEL_ZERO_UBUNTU_VERSION}_amd64.deb" -O libze-dev.deb
          sudo apt-get install -y ./libze1.deb ./libze-dev.deb

-      - name: Dependencies
-        id: depends
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libssl-dev
-
      - name: ccache
        uses: ggml-org/ccache-action@v1.2.24
        with:
-          restore: false
+          key: sycl-ubuntu-24-${{ matrix.build }}
          save: false

      - name: ccache-buckets-restore
@@ -117,6 +100,7 @@ jobs:
            -DGGML_SYCL=ON \
            -DCMAKE_C_COMPILER=icx \
            -DCMAKE_CXX_COMPILER=icpx \
+            -DLLAMA_OPENSSL=OFF \
            -DGGML_NATIVE=OFF \
            -DGGML_SYCL_F16=${{ matrix.fp16 }} \
            -DGGML_SYCL_SUPPORT_LEVEL_ZERO_API=ON \
@@ -140,23 +124,16 @@ jobs:
  windows-latest-sycl:
    runs-on: windows-2022

-    cache-mode: write
-    permissions:
-      actions: write
-      contents: read
-
    defaults:
      run:
        shell: bash

    env:
-      WINDOWS_DLE_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/a51104eb-6f4a-4a0e-9dae-1b81b0c81ae1/intel-deep-learning-essentials-2026.1.4.16_offline.exe
-      WINDOWS_ONEDNN_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/34e28083-d04b-46a3-826c-8c1d00bf1e1c/intel-onednn-2026.0.2.47_offline.exe
-      WINDOWS_DPCPP_MKL: intel.oneapi.win.cpp-dpcpp-common:intel.oneapi.win.mkl.devel:intel.oneapi.win.tbb.devel
-      WINDOWS_DNNL: intel.oneapi.win.dnnl
+      WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/b60765d1-2b85-4e85-86b6-cb0e9563a699/intel-deep-learning-essentials-2025.3.3.18_offline.exe
+      WINDOWS_DPCPP_MKL: intel.oneapi.win.cpp-dpcpp-common:intel.oneapi.win.mkl.devel:intel.oneapi.win.dnnl:intel.oneapi.win.tbb.devel
      LEVEL_ZERO_SDK_URL: https://github.com/oneapi-src/level-zero/releases/download/v1.33.1/level-zero-win-sdk-1.33.1.zip
      ONEAPI_ROOT: "C:/Program Files (x86)/Intel/oneAPI"
-      ONEAPI_INSTALLER_VERSION: "2026.1"
+      ONEAPI_INSTALLER_VERSION: "2025.3.3"
    steps:
      - name: Clone
        id: checkout
@@ -165,8 +142,7 @@ jobs:
      - name: Download & Install oneAPI
        shell: bash
        run: |
-          scripts/install-oneapi.bat $WINDOWS_DLE_URL $WINDOWS_DPCPP_MKL
-          scripts/install-oneapi.bat $WINDOWS_ONEDNN_URL $WINDOWS_DNNL
+          scripts/install-oneapi.bat $WINDOWS_BASEKIT_URL $WINDOWS_DPCPP_MKL

      - name: Install Level Zero SDK
        shell: pwsh
@@ -22,10 +22,6 @@ on:
      'ggml/src/ggml-virtgpu/**'
    ]

-cache-mode: none
-permissions:
-  contents: read
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true
@@ -24,10 +24,6 @@ on:
      'ggml/src/ggml-vulkan/**'
    ]

-cache-mode: none
-permissions:
-  contents: read
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true
@@ -35,7 +31,6 @@ concurrency:
 env:
  GGML_NLOOP: 3
  GGML_N_THREADS: 1
-  GGML_SCHED_DEBUG_REALLOC: 1
  LLAMA_ARG_LOG_COLORS: 1
  LLAMA_ARG_LOG_PREFIX: 1
  LLAMA_ARG_LOG_TIMESTAMPS: 1
@@ -60,7 +55,7 @@ jobs:
      - name: ccache
        uses: ggml-org/ccache-action@v1.2.24
        with:
-          restore: false
+          key: vulkan-ubuntu-24.04-arm
          variant: ccache
          save: false

@@ -129,7 +124,7 @@ jobs:
      - name: ccache
        uses: ggml-org/ccache-action@v1.2.24
        with:
-          restore: false
+          key: vulkan-ubuntu-24.04-llvmpipe
          save: false

      - name: ccache-buckets-restore
@@ -172,20 +167,8 @@ jobs:
          ctest -L main --verbose --timeout 900

  windows:
-    name: windows / ${{ matrix.arch }}
    runs-on: windows-2025

-    cache-mode: write
-    permissions:
-      actions: write
-      contents: read
-
-    strategy:
-      matrix:
-        include:
-          - arch: 'x64'
-          - arch: 'arm64'
-
    env:
      VULKAN_VERSION: 1.4.357.0

@@ -197,7 +180,7 @@ jobs:
      - name: ccache
        uses: ggml-org/ccache-action@v1.2.24
        with:
-          key: cpu-windows-2025-${{ matrix.arch }}-vulkan
+          key: cpu-windows-2025-x64-vulkan
          variant: ccache
          evict-old-files: 1d
          save: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
@@ -206,7 +189,7 @@ jobs:
        id: get_vulkan
        run: |
          curl.exe -o $env:RUNNER_TEMP/VulkanSDK-Installer.exe -L "https://sdk.lunarg.com/sdk/download/${env:VULKAN_VERSION}/windows/vulkansdk-windows-X64-${env:VULKAN_VERSION}.exe"
-          & "$env:RUNNER_TEMP\VulkanSDK-Installer.exe" --accept-licenses --default-answer --confirm-command install ${{ matrix.arch == 'arm64' && 'com.lunarg.vulkan.arm64' || '' }}
+          & "$env:RUNNER_TEMP\VulkanSDK-Installer.exe" --accept-licenses --default-answer --confirm-command install
          Add-Content $env:GITHUB_ENV "VULKAN_SDK=C:\VulkanSDK\${env:VULKAN_VERSION}"
          Add-Content $env:GITHUB_PATH "C:\VulkanSDK\${env:VULKAN_VERSION}\bin"

@@ -219,19 +202,18 @@ jobs:
        id: cmake_build
        run: |
          cmake -S . -B build -G "Ninja Multi-Config" `
-            -D CMAKE_TOOLCHAIN_FILE=cmake/${{ matrix.arch }}-windows-llvm.cmake `
+            -D CMAKE_TOOLCHAIN_FILE=cmake/x64-windows-llvm.cmake `
            -DCMAKE_BUILD_TYPE=Release `
            -DGGML_NATIVE=OFF `
            -DLLAMA_BUILD_SERVER=ON `
            -DGGML_RPC=ON `
            -DGGML_BACKEND_DL=ON `
-            -DGGML_CPU_ALL_VARIANTS=${{ matrix.arch == 'x64' && 'ON' || 'OFF' }} `
+            -DGGML_CPU_ALL_VARIANTS=ON `
            -DGGML_VULKAN=ON `
            -DLLAMA_BUILD_BORINGSSL=ON
          cmake --build build --config Release -j ${env:NUMBER_OF_PROCESSORS}

      - name: Test
-        if: ${{ matrix.arch == 'x64' }}
        id: cmake_test
        run: |
          cd build
@@ -242,7 +224,7 @@ jobs:
        env:
          GH_TOKEN: ${{ github.token }}
        with:
-          key: cpu-windows-2025-${{ matrix.arch }}-vulkan
+          key: cpu-windows-2025-x64-vulkan
          older: 5m
          min: 1
          dry-run: ${{ github.event_name != 'push' || github.ref != 'refs/heads/master' }}
@@ -1,142 +0,0 @@
-name: CI (wasi)
-
-on:
-  workflow_dispatch: # allows manual triggering
-  push:
-    branches:
-      - master
-    paths: [
-      '.github/workflows/build-wasi.yml',
-      '**/CMakeLists.txt',
-      '**/.cmake',
-      '**/*.h',
-      '**/*.hpp',
-      '**/*.c',
-      '**/*.cpp',
-      '**/*.wgsl',
-      '**/*.tmpl',
-      'ggml/src/ggml-webgpu/wgsl-shaders/embed_wgsl.py'
-    ]
-
-  pull_request:
-    types: [opened, synchronize, reopened]
-    paths: [
-      '.github/workflows/build-wasi.yml',
-      '**/CMakeLists.txt',
-      '**/.cmake',
-      '**/*.h',
-      '**/*.hpp',
-      '**/*.c',
-      '**/*.cpp',
-      '**/*.wgsl',
-      '**/*.tmpl',
-      'ggml/src/ggml-webgpu/wgsl-shaders/embed_wgsl.py'
-    ]
-
-cache-mode: none
-permissions:
-  contents: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
-  cancel-in-progress: true
-
-env:
-  WASI_SDK_VERSION: 34
-  DAWN_VERSION: v20260908.214631
-  DAWN_COMMIT: 94c3c9cc0d5fb2e85aebb370fa8d37b71aa34655
-  WASI_WEBGPU_HEADERS_COMMIT: 917765edd7cb8f8cf95bda1217514c78f71b582b
-
-jobs:
-  ubuntu-webgpu:
-    runs-on: ubuntu-24.04-arm
-
-    steps:
-      - name: Clone
-        id: checkout
-        uses: actions/checkout@v6
-
-      - name: ccache
-        uses: ggml-org/ccache-action@v1.2.24
-        with:
-          restore: false
-          save: false
-
-      - name: Install wasi-sdk
-        uses: bytecodealliance/setup-wasi-sdk-action@77d09f3df1e8da344d8403cf8631af8977938b4c # v1.0.0
-        with:
-          version: ${{ env.WASI_SDK_VERSION }}
-          add-to-path: false
-
-      - name: wasi:webgpu Dependency
-        run: |
-          mkdir -p wasi-webgpu/dawn-headers
-          curl -fL "https://github.com/google/dawn/releases/download/${DAWN_VERSION}/dawn-headers-${DAWN_COMMIT}.tar.gz" |
-            tar -xz -C wasi-webgpu/dawn-headers --strip-components=1
-
-          git init -q wasi-webgpu/wasi-webgpu-headers
-          cd wasi-webgpu/wasi-webgpu-headers
-          git fetch -q --depth 1 https://github.com/wasi-gfx/wasi-webgpu-headers.git ${WASI_WEBGPU_HEADERS_COMMIT}
-          git checkout -q FETCH_HEAD
-          git submodule update -q --init --depth 1
-          cd ../..
-
-          # ggml-webgpu does find_package(Dawn) and links dawn::webgpu_dawn. There is no Dawn on WASI,
-          # so this target instead compiles wasi-webgpu-headers (webgpu.h over wasi:webgpu imports)
-          # and exposes Dawn's webgpu_cpp.h on top of it.
-          cat > wasi-webgpu/DawnConfig.cmake << 'EOF'
-          set(_wasi_webgpu "${CMAKE_CURRENT_LIST_DIR}/wasi-webgpu-headers")
-          add_library(dawn::webgpu_dawn INTERFACE IMPORTED)
-          set_target_properties(dawn::webgpu_dawn PROPERTIES
-              INTERFACE_SOURCES "${_wasi_webgpu}/webgpu.c;${_wasi_webgpu}/async_futures.c;${_wasi_webgpu}/imports.c;${_wasi_webgpu}/imports_component_type.o"
-              INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_LIST_DIR}/dawn-headers/include/webgpu_upstream;${_wasi_webgpu}")
-          EOF
-
-      - name: ccache-buckets-restore
-        uses: ./.github/actions/ccache-buckets
-        env:
-          HF_TOKEN: ${{ secrets.HF_TOKEN_CI }}
-        with:
-          key: webgpu-ubuntu-24.04-arm-wasi
-          folder: llama.cpp
-          hf_bucket: ggml-org/cache
-
-      # llama-common does not build for WASI, so the executables are linked by hand
-      - name: Build
-        id: cmake_build
-        run: |
-          WASI_FLAGS="-msimd128 -D_WASI_EMULATED_SIGNAL -fwasm-exceptions -mllvm -wasm-use-legacy-eh=false"
-          cmake -B build-wasi \
-            -G "Ninja" \
-            -DCMAKE_TOOLCHAIN_FILE=${WASI_SDK_PATH}/share/cmake/wasi-sdk-p3.cmake \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_C_FLAGS="${WASI_FLAGS}" \
-            -DCMAKE_CXX_FLAGS="${WASI_FLAGS}" \
-            -DCMAKE_HAVE_LIBC_PTHREAD=1 \
-            -DBUILD_SHARED_LIBS=OFF \
-            -DGGML_NATIVE=OFF \
-            -DGGML_OPENMP=OFF \
-            -DGGML_WEBGPU=ON \
-            -DDawn_DIR=$PWD/wasi-webgpu \
-            -DLLAMA_BUILD_COMMON=OFF
-
-          time cmake --build build-wasi --config Release --target llama -j $(nproc)
-
-          LIBS="build-wasi/ggml/src/libggml.a build-wasi/ggml/src/ggml-webgpu/libggml-webgpu.a build-wasi/ggml/src/libggml-cpu.a build-wasi/ggml/src/libggml-base.a"
-          LDFLAGS="-lunwind -ldl -Wl,-z,stack-size=8388608"
-          CXX="${WASI_SDK_PATH}/bin/clang++ --target=wasm32-wasip3 -O3 -std=c++17 ${WASI_FLAGS} -I include -I ggml/include"
-
-          $CXX examples/simple/simple.cpp build-wasi/src/libllama.a $LIBS $LDFLAGS -o build-wasi/llama-simple.wasm
-          $CXX tests/test-backend-ops.cpp $LIBS $LDFLAGS -o build-wasi/test-backend-ops.wasm
-
-      - name: ccache-buckets-save
-        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
-        uses: ./.github/actions/ccache-buckets
-        env:
-          HF_TOKEN: ${{ secrets.HF_TOKEN_CACHE_OUTPUT }}
-        with:
-          key: webgpu-ubuntu-24.04-arm-wasi
-          folder: llama.cpp
-          evict-old-files: 1d
-          hf_bucket: ggml-org/cache
-          save: true
@@ -33,10 +33,6 @@ on:
      'ggml/src/ggml-webgpu/wgsl-shaders/embed_wgsl.py'
    ]

-cache-mode: none
-permissions:
-  contents: read
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true
@@ -60,7 +56,7 @@ jobs:
      - name: ccache
        uses: ggml-org/ccache-action@v1.2.24
        with:
-          restore: false
+          key: webgpu-ubuntu-24.04-arm-wasm
          save: false

      - name: Install Emscripten
@@ -7,7 +7,15 @@ on:
      - master
    paths: [
      '.github/workflows/build-webgpu.yml',
-      'ggml/src/ggml-webgpu/**'
+      '**/CMakeLists.txt',
+      '**/.cmake',
+      '**/*.h',
+      '**/*.hpp',
+      '**/*.c',
+      '**/*.cpp',
+      '**/*.wgsl',
+      '**/*.tmpl',
+      'ggml/src/ggml-webgpu/wgsl-shaders/embed_wgsl.py'
    ]

  pull_request:
@@ -17,10 +25,6 @@ on:
      'ggml/src/ggml-webgpu/**'
    ]

-cache-mode: none
-permissions:
-  contents: read
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true
@@ -55,3 +59,135 @@ jobs:
            -type f \( -name '*.cpp' -o -name '*.hpp' -o -name '*.h' \) \
            -print0 |
            xargs -0 clang-format-22 --dry-run --Werror
+
+  macos:
+    runs-on: macos-latest
+
+    steps:
+      - name: Clone
+        id: checkout
+        uses: actions/checkout@v6
+
+      - name: ccache
+        uses: ggml-org/ccache-action@v1.2.24
+        with:
+          key: webgpu-macos-latest
+          save: false
+
+      - name: Dawn Dependency
+        id: dawn-depends
+        run: |
+          DAWN_VERSION="v20260908.214631"
+          DAWN_OWNER="google"
+          DAWN_REPO="dawn"
+          DAWN_ASSET_NAME="Dawn-94c3c9cc0d5fb2e85aebb370fa8d37b71aa34655-macos-latest-Release"
+          echo "Fetching release asset from https://github.com/google/dawn/releases/download/${DAWN_VERSION}/${DAWN_ASSET_NAME}.tar.gz"
+          curl -L -o artifact.tar.gz \
+            "https://github.com/google/dawn/releases/download/${DAWN_VERSION}/${DAWN_ASSET_NAME}.tar.gz"
+          mkdir dawn
+          tar -xvf artifact.tar.gz -C dawn --strip-components=1
+
+      - name: ccache-buckets-restore
+        uses: ./.github/actions/ccache-buckets
+        env:
+          HF_TOKEN: ${{ secrets.HF_TOKEN_CI }}
+        with:
+          key: webgpu-macos-latest
+          folder: llama.cpp
+          hf_bucket: ggml-org/cache
+
+      - name: Build
+        id: cmake_build
+        run: |
+          export CMAKE_PREFIX_PATH=dawn
+          cmake -B build -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DGGML_WEBGPU=ON -DGGML_METAL=OFF -DGGML_BLAS=OFF
+          time cmake --build build --config Release -j $(sysctl -n hw.logicalcpu)
+
+      - name: ccache-buckets-save
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+        uses: ./.github/actions/ccache-buckets
+        env:
+          HF_TOKEN: ${{ secrets.HF_TOKEN_CACHE_OUTPUT }}
+        with:
+          key: webgpu-macos-latest
+          folder: llama.cpp
+          evict-old-files: 1d
+          hf_bucket: ggml-org/cache
+          save: true
+
+      - name: Test
+        id: cmake_test
+        run: |
+          cd build
+          ctest -L main --verbose --timeout 900
+
+  ubuntu:
+    runs-on: ubuntu-24.04
+
+    steps:
+      - name: Clone
+        id: checkout
+        uses: actions/checkout@v6
+
+      - name: ccache
+        uses: ggml-org/ccache-action@v1.2.24
+        with:
+          key: webgpu-ubuntu-24.04
+          save: false
+
+      - name: Dependencies
+        id: depends
+        run: |
+          sudo add-apt-repository -y ppa:kisak/kisak-mesa
+          sudo apt-get update -y
+          sudo apt-get install -y build-essential mesa-vulkan-drivers \
+            libxcb-xinput0 libxcb-xinerama0 libxcb-cursor-dev libssl-dev
+
+      - name: Dawn Dependency
+        id: dawn-depends
+        run: |
+          sudo apt-get install -y libxrandr-dev libxinerama-dev libxcursor-dev mesa-common-dev libx11-xcb-dev libxi-dev
+          DAWN_VERSION="v20260908.214631"
+          DAWN_OWNER="google"
+          DAWN_REPO="dawn"
+          DAWN_ASSET_NAME="Dawn-94c3c9cc0d5fb2e85aebb370fa8d37b71aa34655-ubuntu-latest-Release"
+          echo "Fetching release asset from https://github.com/google/dawn/releases/download/${DAWN_VERSION}/${DAWN_ASSET_NAME}.tar.gz"
+          curl -L -o artifact.tar.gz \
+            "https://github.com/google/dawn/releases/download/${DAWN_VERSION}/${DAWN_ASSET_NAME}.tar.gz"
+          mkdir dawn
+          tar -xvf artifact.tar.gz -C dawn --strip-components=1
+
+      - name: ccache-buckets-restore
+        uses: ./.github/actions/ccache-buckets
+        env:
+          HF_TOKEN: ${{ secrets.HF_TOKEN_CI }}
+        with:
+          key: webgpu-ubuntu-24.04
+          folder: llama.cpp
+          hf_bucket: ggml-org/cache
+
+      - name: Build
+        id: cmake_build
+        run: |
+          export Dawn_DIR=dawn/lib64/cmake/Dawn
+          cmake -B build \
+            -DGGML_WEBGPU=ON
+          time cmake --build build --config Release -j $(nproc)
+
+      - name: ccache-buckets-save
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+        uses: ./.github/actions/ccache-buckets
+        env:
+          HF_TOKEN: ${{ secrets.HF_TOKEN_CACHE_OUTPUT }}
+        with:
+          key: webgpu-ubuntu-24.04
+          folder: llama.cpp
+          evict-old-files: 1d
+          hf_bucket: ggml-org/cache
+          save: true
+
+      - name: Test
+        id: cmake_test
+        run: |
+          cd build
+          ctest -L main --verbose --timeout 900
@@ -17,10 +17,6 @@ on:
      'scripts/sync_vendor.py'
    ]

-cache-mode: none
-permissions:
-  contents: read
-
 jobs:
  check-vendor:
    runs-on: ubuntu-slim
@@ -27,10 +27,6 @@ on:
      'ggml/src/ggml-cpu/**'
    ]

-cache-mode: none
-permissions:
-  contents: read
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true
@@ -46,7 +42,7 @@ env:

 jobs:
  cpu-x64-high-perf:
-    runs-on: [self-hosted, Linux, X64, CPU]
+    runs-on: [self-hosted, Linux, X64]

    steps:
      - name: Clone
@@ -56,7 +52,7 @@ jobs:
      - name: Test
        id: ggml-ci
        run: |
-          LLAMA_ARG_THREADS=$(nproc) GG_BUILD_HIGH_PERF=1 GG_BUILD_EXTRA_TESTS_0=1 bash ./ci/run.sh ~/results/llama.cpp/$RUNNER_NAME ~/mnt/llama.cpp
+          LLAMA_ARG_THREADS=$(nproc) GG_BUILD_HIGH_PERF=1 GG_BUILD_EXTRA_TESTS_0=1 bash ./ci/run.sh ~/results/llama.cpp ~/mnt/llama.cpp

  cpu-arm64-high-perf-graviton4:
    runs-on: ah-ubuntu_24_04-c8g_8x
@@ -30,10 +30,6 @@ on:
      'ggml/src/ggml-cuda/**'
    ]

-cache-mode: none
-permissions:
-  contents: read
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true
@@ -49,7 +45,7 @@ env:

 jobs:
  gpu-cuda:
-    runs-on: "hf-jobs-t4-medium:cuda13"
+    runs-on: "hf-jobs-t4-small:cuda13"

    steps:
      - name: Clone
@@ -27,10 +27,6 @@ on:
      'ggml/src/ggml-cpu/**'
    ]

-cache-mode: none
-permissions:
-  contents: read
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true
@@ -31,10 +31,6 @@ on:
      'ggml/src/ggml-metal/**'
    ]

-cache-mode: none
-permissions:
-  contents: read
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true
@@ -60,4 +56,4 @@ jobs:
      - name: Test
        id: ggml-ci
        run: |
-          GG_BUILD_METAL=1 bash ./ci/run.sh ~/results/llama.cpp/$RUNNER_NAME ~/mnt/llama.cpp
+          GG_BUILD_METAL=1 bash ./ci/run.sh ~/results/llama.cpp ~/mnt/llama.cpp
@@ -28,10 +28,6 @@ on:
      'ggml/src/ggml-openvino/**'
    ]

-cache-mode: none
-permissions:
-  contents: read
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true
@@ -50,9 +46,9 @@ jobs:
    runs-on: [self-hosted, Linux, Intel, OpenVINO]

    env:
-      # Sync versions in build-openvino.yml, ci-self-hosted-openvino.yml, release.yml, release-publish.yml, build-cache.yml, .devops/openvino.Dockerfile, docs/backend/OPENVINO.md
-      OPENVINO_VERSION_MAJOR: "2026.4.1"
-      OPENVINO_VERSION_FULL: "2026.4.1.22982.07f9c262b05"
+      # Sync versions in build.yml, build-self-hosted.yml, release.yml, build-cache.yml, .devops/openvino.Dockerfile
+      OPENVINO_VERSION_MAJOR: "2026.4"
+      OPENVINO_VERSION_FULL: "2026.4.0.22959.99c81491cc3"

    steps:
      - name: Clone
@@ -30,10 +30,6 @@ on:
      'ggml/src/ggml-vulkan/**'
    ]

-cache-mode: none
-permissions:
-  contents: read
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true
@@ -79,7 +75,7 @@ jobs:
        id: ggml-ci
        run: |
          vulkaninfo --summary
-          GG_BUILD_VULKAN=1 GGML_VK_DISABLE_COOPMAT2=1 bash ./ci/run.sh ~/results/llama.cpp/$RUNNER_NAME ~/mnt/llama.cpp
+          GG_BUILD_VULKAN=1 GGML_VK_DISABLE_COOPMAT2=1 bash ./ci/run.sh ~/results/llama.cpp ~/mnt/llama.cpp

      # - name: ccache-buckets-save
      #   if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
@@ -124,7 +120,7 @@ jobs:
        id: ggml-ci
        run: |
          vulkaninfo --summary
-          GG_BUILD_VULKAN=1 bash ./ci/run.sh ~/results/llama.cpp/$RUNNER_NAME ~/mnt/llama.cpp
+          GG_BUILD_VULKAN=1 bash ./ci/run.sh ~/results/llama.cpp ~/mnt/llama.cpp

      # - name: ccache-buckets-save
      #   if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
@@ -150,7 +146,7 @@ jobs:
        id: ggml-ci
        run: |
          vulkaninfo --summary
-          GG_BUILD_VULKAN=1 bash ./ci/run.sh ~/results/llama.cpp/$RUNNER_NAME ~/mnt/llama.cpp
+          GG_BUILD_VULKAN=1 bash ./ci/run.sh ~/results/llama.cpp ~/mnt/llama.cpp

  gpu-vulkan-intel-linux:
    runs-on: [self-hosted, Linux, Intel]
@@ -29,10 +29,6 @@ on:
      'ggml/src/ggml-webgpu/**'
    ]

-cache-mode: none
-permissions:
-  contents: read
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true
@@ -131,4 +127,4 @@ jobs:
        id: ggml-ci
        run: |
          GG_BUILD_WEBGPU=1 GG_BUILD_WEBGPU_DAWN_PREFIX="$GITHUB_WORKSPACE/dawn" \
-            bash ./ci/run.sh ~/results/llama.cpp/$RUNNER_NAME ~/mnt/llama.cpp
+            bash ./ci/run.sh ~/results/llama.cpp ~/mnt/llama.cpp
@@ -3,9 +3,10 @@ on:
  schedule:
    - cron: "42 0 * * *"

-cache-mode: none
+# Fine-grant permission
+# https://docs.github.com/en/actions/security-for-github-actions/security-guides/automatic-token-authentication#modifying-the-permissions-for-the-github_token
 permissions:
-  contents: read
+  issues: write

 jobs:
  close-issues:
@@ -9,10 +9,6 @@ on:
    branches:
      - master

-cache-mode: none
-permissions:
-  contents: read
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true
@@ -20,14 +20,15 @@ on:
    # Rebuild daily rather than on every push because it is expensive
    - cron: '12 4 * * *'

-cache-mode: none
-permissions:
-  contents: read
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true

+# Fine-grant permission
+# https://docs.github.com/en/actions/security-for-github-actions/security-guides/automatic-token-authentication#modifying-the-permissions-for-the-github_token
+permissions:
+  packages: write
+
 jobs:
  create_tag:
    name: Create and push git tag
@@ -61,9 +62,6 @@ jobs:
  build_ui:
    name: Build UI
    needs: create_tag
-    permissions:
-      actions: write
-      contents: read
    uses: ./.github/workflows/ui-build.yml
    with:
      ui_version: ${{ needs.create_tag.outputs.source_tag }}
@@ -148,11 +146,6 @@ jobs:
    needs: [prepare_matrices, create_tag, build_ui]

    runs-on: ${{ matrix.config.runs_on }}
-    # cache-mode: write # for QEMU
-    permissions:
-      actions: write
-      contents: read
-      packages: write
    strategy:
      fail-fast: false
      matrix:
@@ -172,11 +165,11 @@ jobs:
          name: llama-ui.zip
          path: tools/ui/dist

-      # - name: Set up QEMU
-      #   if: ${{ contains(matrix.config.platforms, 'linux/amd64') }}
-      #   uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4
-      #   with:
-      #     image: tonistiigi/binfmt:qemu-v10.2.1
+      - name: Set up QEMU
+        if: ${{ contains(matrix.config.platforms, 'linux/amd64') }}
+        uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4
+        with:
+          image: tonistiigi/binfmt:qemu-v10.2.1

      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4
@@ -9,10 +9,6 @@ on:
    branches:
      - master

-cache-mode: none
-permissions:
-  contents: read
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true
@@ -0,0 +1,71 @@
+name: Fusion
+
+on:
+  workflow_dispatch: # allows manual triggering
+  push:
+    branches:
+      - master
+    paths: [
+      '.github/workflows/fusion.yml',
+      'ggml/**',
+      'tests/fusion/**',
+      'tests/test-fusion.cpp',
+      'tests/test-llama-archs.cpp',
+      'src/models/**'
+    ]
+
+  pull_request:
+    types: [opened, synchronize, reopened]
+    paths: [
+      '.github/workflows/fusion.yml',
+      'ggml/**',
+      'tests/fusion/**',
+      'tests/test-fusion.cpp',
+      'tests/test-llama-archs.cpp',
+      'src/models/**'
+    ]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
+  cancel-in-progress: true
+
+env:
+  GGML_NLOOP: 3
+  GGML_N_THREADS: 1
+  LLAMA_ARG_LOG_COLORS: 1
+  LLAMA_ARG_LOG_PREFIX: 1
+  LLAMA_ARG_LOG_TIMESTAMPS: 1
+
+jobs:
+  # TODO: add jobs for other backends as they adopt the fusion debug API
+  metal:
+    runs-on: [self-hosted, macOS, ARM64]
+
+    steps:
+      - name: Clone
+        id: checkout
+        uses: actions/checkout@v6
+
+      - name: Build
+        id: cmake_build
+        run: |
+          cmake -B build \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DLLAMA_FATAL_WARNINGS=ON \
+            -DLLAMA_OPENSSL=OFF \
+            -DGGML_SCHED_NO_REALLOC=ON \
+            -DGGML_BLAS=OFF \
+            -DGGML_METAL=ON
+          time cmake --build build --config Release --target test-llama-archs -j $(sysctl -n hw.logicalcpu)
+          time cmake --build build --config Release --target test-fusion -j $(sysctl -n hw.logicalcpu)
+
+      - name: Generate models
+        id: generate_models
+        run: |
+          rm -rf build-ci-models && mkdir -p build-ci-models
+          ./build/bin/test-llama-archs -o build-ci-models
+
+      - name: Test fusion
+        id: test_fusion
+        run: |
+          ./build/bin/test-fusion --models build-ci-models --device MTL0 --check tests/fusion/MTL.csv
@@ -17,9 +17,6 @@ on:
    tags:
      - 'gguf-v*'           # Push events to every version tag

-cache-mode: none
-permissions:
-  contents: read

 jobs:
  deploy:
@@ -25,10 +25,6 @@ on:
      'scripts/hip/gcn-cdna-vgpr-check.py'
    ]

-cache-mode: none
-permissions:
-  contents: read
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true
@@ -58,7 +54,7 @@ jobs:
      - name: ccache
        uses: ggml-org/ccache-action@v1.2.24
        with:
-          restore: false
+          key: hip-quality-check-ubuntu-22.04
          save: false

      - name: ccache-buckets-restore
@@ -2,10 +2,6 @@ name: "Pull Request Labeler"
 on:
 - pull_request_target

-cache-mode: none
-permissions:
-  contents: read
-
 jobs:
  labeler:
    permissions:
@@ -18,11 +18,6 @@ on:
        required: false
        type: boolean
        default: false
-      require_docker:
-        description: 'Require the Docker workflow to have completed successfully'
-        required: true
-        type: boolean
-        default: true
      apiabi_compare_tag:
        description: 'Tag to compare against for API/ABI check (default: latest release)'
        required: false
@@ -32,7 +27,6 @@ on:
 env:
  GH_TOKEN: ${{ github.token }}

-cache-mode: none
 permissions:
  contents: write
  packages: write
@@ -61,16 +55,6 @@ jobs:
          RELEASE_BRANCH: ${{ github.ref_name }}
          SKIP_APIABI_CHECK: ${{ github.event.inputs.skip_apiabi_check }}
          APIABI_COMPARE_TAG: ${{ github.event.inputs.apiabi_compare_tag }}
-          APIABI_REPORT_DIR: ${{ runner.temp }}/apiabi-reports
-          REQUIRE_DOCKER: ${{ github.event.inputs.require_docker }}
-
-      - name: Upload API/ABI reports
-        if: ${{ always() && github.event.inputs.skip_apiabi_check != 'true' }}
-        uses: actions/upload-artifact@v7
-        with:
-          name: apiabi-reports
-          path: ${{ runner.temp }}/apiabi-reports
-          if-no-files-found: ignore

      - name: Create release tag
        if: ${{ github.event.inputs.dry_run == 'false' }}
@@ -147,7 +131,7 @@ jobs:
            });

      - name: Re-tag container images with release version
-        if: ${{ github.event.inputs.dry_run == 'false' && github.event.inputs.require_docker != 'false' && steps.desc.outputs.nightly_tag != '' }}
+        if: ${{ github.event.inputs.dry_run == 'false' && steps.desc.outputs.nightly_tag != '' }}
        env:
          GITHUB_REPOSITORY_OWNER: ${{ github.repository_owner }}
        run: |
@@ -160,23 +144,14 @@ jobs:

          VARIANTS=("" "-cuda" "-cuda13" "-vulkan" "-rocm" "-intel" "-musa" "-openvino")
          TYPES=("full" "light" "server")
-          # the release is already created at this point, so keep going on a
-          # missing image and report all of them at the end
-          MISSING=()
          for type in "${TYPES[@]}"; do
            for variant in "${VARIANTS[@]}"; do
              src="${IMAGE_REPO}:${type}${variant}-${NIGHTLY_TAG}"
              dst="${IMAGE_REPO}:${type}${variant}-${VERSION}"
              echo "Tagging ${src} -> ${dst}"
-              if ! docker buildx imagetools create --tag "${dst}" "${src}"; then
-                MISSING+=("${type}${variant}")
-              fi
+              docker buildx imagetools create --tag "${dst}" "${src}"
            done
          done
-          if [[ ${#MISSING[@]} -gt 0 ]]; then
-            echo "::error::failed to re-tag container images for ${NIGHTLY_TAG}:${MISSING[*]}"
-            exit 1
-          fi

      - name: Dry run summary
        if: ${{ github.event.inputs.dry_run == 'true' }}
@@ -1,449 +0,0 @@
-name: Models Backend Check
-
-on:
-  workflow_dispatch: # allows manual triggering
-  push:
-    branches:
-      - master
-    paths: [
-      '.github/workflows/models-check.yml',
-      'ggml/**',
-      'tests/fusion/**',
-      'tests/test-fusion.cpp',
-      'tests/test-llama-archs.cpp',
-      'src/llama-graph.cpp',
-      'src/llama-model*',
-      'src/models/**'
-    ]
-
-  pull_request:
-    types: [opened, synchronize, reopened]
-    paths: [
-      '.github/workflows/models-check.yml',
-      'ggml/**',
-      'tests/fusion/**',
-      'tests/test-fusion.cpp',
-      'tests/test-llama-archs.cpp',
-      'src/llama-graph.cpp',
-      'src/llama-model*',
-      'src/models/**'
-    ]
-
-cache-mode: none
-permissions:
-  contents: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
-  cancel-in-progress: true
-
-env:
-  # note: this is dud token to avoid rate limiting (https://github.com/ggml-org/llama.cpp/pull/25706#issuecomment-4979941302)
-  HF_TOKEN: ${{ secrets.HF_TOKEN_CI }}
-  GGML_NLOOP: 3
-  GGML_N_THREADS: 1
-  LLAMA_ARG_LOG_COLORS: 1
-  LLAMA_ARG_LOG_PREFIX: 1
-  LLAMA_ARG_LOG_TIMESTAMPS: 1
-
-jobs:
-  cuda:
-    runs-on: "hf-jobs-t4-medium:cuda13"
-
-    steps:
-      - name: Clone
-        id: checkout
-        uses: actions/checkout@v6
-
-      - name: Install dependencies
-        run: |
-          sudo apt update
-          sudo apt install -y cmake time python3 python3-venv python3-pip
-
-      - name: ccache
-        uses: ggml-org/ccache-action@v1.2.24
-        with:
-          restore: false
-          save: false
-
-      - name: ccache-buckets-restore
-        uses: ./.github/actions/ccache-buckets
-        with:
-          key: models-check-cuda
-          folder: llama.cpp
-          hf_bucket: ggml-org/cache
-
-      - name: Build
-        id: cmake_build
-        run: |
-          cmake -B build \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DLLAMA_FATAL_WARNINGS=ON \
-            -DLLAMA_OPENSSL=OFF \
-            -DGGML_SCHED_NO_REALLOC=ON \
-            -DCMAKE_CUDA_COMPILER=/usr/local/cuda/bin/nvcc \
-            -DGGML_CUDA=ON
-          time cmake --build build --config Release --target test-llama-archs -j$(nproc)
-          time cmake --build build --config Release --target test-fusion -j$(nproc)
-
-      - name: ccache-buckets-save
-        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
-        uses: ./.github/actions/ccache-buckets
-        env:
-          HF_TOKEN: ${{ secrets.HF_TOKEN_CACHE_OUTPUT }}
-        with:
-          key: models-check-cuda
-          folder: llama.cpp
-          evict-old-files: 1d
-          hf_bucket: ggml-org/cache
-          save: true
-
-      # - name: Generate models
-      #   id: generate_models
-      #   run: |
-      #     rm -rf build-ci-models && mkdir -p build-ci-models
-      #     ./build/bin/test-llama-archs -o build-ci-models
-
-      # TODO: add for backends as they adopt the fusion debug API
-      # - name: Test fusion
-      #   id: test_fusion
-      #   run: |
-      #     ./build/bin/test-fusion --models build-ci-models --device CUDA0 --check tests/fusion/CUDA.csv
-
-      - name: Test archs
-        id: test_archs
-        run: |
-          GGML_CUDA_DEVICES=1 ./build/bin/test-llama-archs -s 1
-          GGML_CUDA_DEVICES=2 ./build/bin/test-llama-archs -s 1
-          GGML_CUDA_DEVICES=3 ./build/bin/test-llama-archs -s 1
-          GGML_CUDA_DEVICES=4 ./build/bin/test-llama-archs -s 1
-
-  metal:
-    runs-on: [self-hosted, macOS, ARM64]
-
-    steps:
-      - name: Clone
-        id: checkout
-        uses: actions/checkout@v6
-
-      - name: Build
-        id: cmake_build
-        run: |
-          cmake -B build \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DLLAMA_FATAL_WARNINGS=ON \
-            -DLLAMA_OPENSSL=OFF \
-            -DGGML_SCHED_NO_REALLOC=ON \
-            -DGGML_BLAS=OFF \
-            -DGGML_METAL=ON
-          time cmake --build build --config Release --target test-llama-archs -j $(sysctl -n hw.logicalcpu)
-          time cmake --build build --config Release --target test-fusion -j $(sysctl -n hw.logicalcpu)
-
-      - name: Generate models
-        id: generate_models
-        run: |
-          rm -rf build-ci-models && mkdir -p build-ci-models
-          ./build/bin/test-llama-archs -o build-ci-models
-
-      - name: Test fusion
-        id: test_fusion
-        run: |
-          ./build/bin/test-fusion --models build-ci-models --device MTL0 --check tests/fusion/MTL.csv
-
-      - name: Test archs
-        id: test_archs
-        run: |
-          GGML_METAL_DEVICES=1 ./build/bin/test-llama-archs -s 1
-          GGML_METAL_DEVICES=2 ./build/bin/test-llama-archs -s 1
-          GGML_METAL_DEVICES=3 ./build/bin/test-llama-archs -s 1
-          GGML_METAL_DEVICES=4 ./build/bin/test-llama-archs -s 1
-
-  rocm:
-    runs-on: [self-hosted, Linux, gfx1201, 1accel]
-    container: "rocm/dev-ubuntu-24.04:7.2.4-complete"
-
-    steps:
-      - name: Clone
-        id: checkout
-        uses: actions/checkout@v6
-
-      - name: Install dependencies
-        run: |
-          apt update
-          apt install -y build-essential jq cmake time python3 python3-venv python3-pip
-
-      - name: ccache
-        uses: ggml-org/ccache-action@v1.2.24
-        with:
-          restore: false
-          save: false
-
-      - name: ccache-buckets-restore
-        uses: ./.github/actions/ccache-buckets
-        with:
-          key: models-check-rocm
-          folder: llama.cpp
-          hf_bucket: ggml-org/cache
-
-      - name: Build
-        id: cmake_build
-        run: |
-          cmake -B build \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DLLAMA_FATAL_WARNINGS=ON \
-            -DLLAMA_OPENSSL=OFF \
-            -DGGML_SCHED_NO_REALLOC=ON \
-            -DCMAKE_HIP_COMPILER=$(hipconfig -l)/clang \
-            -DGPU_TARGETS=gfx1201 \
-            -DGGML_HIP=ON
-          time cmake --build build --config Release --target test-llama-archs -j$(nproc)
-          time cmake --build build --config Release --target test-fusion -j$(nproc)
-
-      - name: ccache-buckets-save
-        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
-        uses: ./.github/actions/ccache-buckets
-        env:
-          HF_TOKEN: ${{ secrets.HF_TOKEN_CACHE_OUTPUT }}
-        with:
-          key: models-check-rocm
-          folder: llama.cpp
-          evict-old-files: 1d
-          hf_bucket: ggml-org/cache
-          save: true
-
-      # - name: Generate models
-      #   id: generate_models
-      #   run: |
-      #     rm -rf build-ci-models && mkdir -p build-ci-models
-      #     ./build/bin/test-llama-archs -o build-ci-models
-
-      # TODO: add for backends as they adopt the fusion debug API
-      # - name: Test fusion
-      #   id: test_fusion
-      #   run: |
-      #     ./build/bin/test-fusion --models build-ci-models --device CUDA0 --check tests/fusion/CUDA.csv
-
-      - name: Test archs
-        id: test_archs
-        run: |
-          GGML_CUDA_DEVICES=1 ./build/bin/test-llama-archs -s 1
-          GGML_CUDA_DEVICES=2 ./build/bin/test-llama-archs -s 1
-          GGML_CUDA_DEVICES=3 ./build/bin/test-llama-archs -s 1
-          GGML_CUDA_DEVICES=4 ./build/bin/test-llama-archs -s 1
-
-  vulkan-nvidia:
-    runs-on: "hf-jobs-t4-small:ubuntu26_04"
-
-    steps:
-      - name: Clone
-        id: checkout
-        uses: actions/checkout@v6
-
-      - name: Install dependencies
-        run: |
-          sudo apt update
-          sudo apt install -y build-essential cmake libxcb-xinput0 libxcb-xinerama0 libxcb-cursor-dev libvulkan-dev glslc spirv-headers vulkan-tools mesa-vulkan-drivers libglvnd0 libgl1 libglx0 libegl1 libgles2 time python3 python3-venv python3-pip
-
-      - name: ccache
-        uses: ggml-org/ccache-action@v1.2.24
-        with:
-          restore: false
-          save: false
-
-      - name: ccache-buckets-restore
-        uses: ./.github/actions/ccache-buckets
-        with:
-          key: models-check-vulkan-nvidia
-          folder: llama.cpp
-          hf_bucket: ggml-org/cache
-
-      - name: Build
-        id: cmake_build
-        run: |
-          cmake -B build \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DLLAMA_FATAL_WARNINGS=ON \
-            -DLLAMA_OPENSSL=OFF \
-            -DGGML_SCHED_NO_REALLOC=ON \
-            -DGGML_VULKAN=ON
-          time cmake --build build --config Release --target test-llama-archs -j$(nproc)
-          time cmake --build build --config Release --target test-fusion -j$(nproc)
-
-      - name: ccache-buckets-save
-        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
-        uses: ./.github/actions/ccache-buckets
-        env:
-          HF_TOKEN: ${{ secrets.HF_TOKEN_CACHE_OUTPUT }}
-        with:
-          key: models-check-vulkan-nvidia
-          folder: llama.cpp
-          evict-old-files: 1d
-          hf_bucket: ggml-org/cache
-          save: true
-
-      # - name: Generate models
-      #   id: generate_models
-      #   run: |
-      #     rm -rf build-ci-models && mkdir -p build-ci-models
-      #     ./build/bin/test-llama-archs -o build-ci-models
-
-      # TODO: add for backends as they adopt the fusion debug API
-      # - name: Test fusion
-      #   id: test_fusion
-      #   run: |
-      #     ./build/bin/test-fusion --models build-ci-models --device Vulkan0 --check tests/fusion/Vulkan.csv
-
-      - name: Test archs
-        id: test_archs
-        run: |
-          ./build/bin/test-llama-archs -s 1
-
-  vulkan-amd:
-    runs-on: [self-hosted, Linux, gfx1201, 1accel]
-    container: "ubuntu:26.04"
-
-    steps:
-      - name: Clone
-        id: checkout
-        uses: actions/checkout@v6
-
-      - name: Install dependencies
-        run: |
-          apt update
-          apt install -y build-essential jq cmake libxcb-xinput0 libxcb-xinerama0 libxcb-cursor-dev libvulkan-dev glslc spirv-headers vulkan-tools mesa-vulkan-drivers libglvnd0 libgl1 libglx0 libegl1 libgles2 time python3 python3-venv python3-pip
-
-      - name: ccache
-        uses: ggml-org/ccache-action@v1.2.24
-        with:
-          restore: false
-          save: false
-
-      - name: ccache-buckets-restore
-        uses: ./.github/actions/ccache-buckets
-        with:
-          key: models-check-vulkan-amd
-          folder: llama.cpp
-          hf_bucket: ggml-org/cache
-
-      - name: Build
-        id: cmake_build
-        run: |
-          cmake -B build \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DLLAMA_FATAL_WARNINGS=ON \
-            -DLLAMA_OPENSSL=OFF \
-            -DGGML_SCHED_NO_REALLOC=ON \
-            -DGGML_VULKAN=ON
-          time cmake --build build --config Release --target test-llama-archs -j$(nproc)
-          time cmake --build build --config Release --target test-fusion -j$(nproc)
-
-      - name: ccache-buckets-save
-        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
-        uses: ./.github/actions/ccache-buckets
-        env:
-          HF_TOKEN: ${{ secrets.HF_TOKEN_CACHE_OUTPUT }}
-        with:
-          key: models-check-vulkan-amd
-          folder: llama.cpp
-          evict-old-files: 1d
-          hf_bucket: ggml-org/cache
-          save: true
-
-      # - name: Generate models
-      #   id: generate_models
-      #   run: |
-      #     rm -rf build-ci-models && mkdir -p build-ci-models
-      #     ./build/bin/test-llama-archs -o build-ci-models
-
-      # TODO: add for backends as they adopt the fusion debug API
-      # - name: Test fusion
-      #   id: test_fusion
-      #   run: |
-      #     ./build/bin/test-fusion --models build-ci-models --device Vulkan0 --check tests/fusion/Vulkan.csv
-
-      - name: Test archs
-        id: test_archs
-        run: |
-          ./build/bin/test-llama-archs -s 1
-
-  webgpu-nvidia:
-    runs-on: "hf-jobs-t4-small:ubuntu26_04"
-
-    steps:
-      - name: Clone
-        id: checkout
-        uses: actions/checkout@v6
-
-      - name: Install dependencies
-        run: |
-          sudo apt update
-          sudo apt install -y build-essential cmake libxcb-xinput0 libxcb-xinerama0 libxcb-cursor-dev libvulkan1 mesa-vulkan-drivers libglvnd0 libgl1 libglx0 libegl1 libgles2 time python3 python3-venv python3-pip
-
-      - name: ccache
-        uses: ggml-org/ccache-action@v1.2.24
-        with:
-          restore: false
-          save: false
-
-      - name: ccache-buckets-restore
-        uses: ./.github/actions/ccache-buckets
-        with:
-          key: models-check-webgpu-nvidia
-          folder: llama.cpp
-          hf_bucket: ggml-org/cache
-
-      - name: Dawn Dependency
-        id: dawn-depends
-        run: |
-          DAWN_VERSION="v20260908.214631"
-          DAWN_OWNER="google"
-          DAWN_REPO="dawn"
-          DAWN_ASSET_NAME="Dawn-94c3c9cc0d5fb2e85aebb370fa8d37b71aa34655-ubuntu-latest-Release"
-          echo "Fetching release asset from https://github.com/google/dawn/releases/download/${DAWN_VERSION}/${DAWN_ASSET_NAME}.tar.gz"
-          curl -L -o artifact.tar.gz \
-            "https://github.com/google/dawn/releases/download/${DAWN_VERSION}/${DAWN_ASSET_NAME}.tar.gz"
-          mkdir dawn
-          tar -xvf artifact.tar.gz -C dawn --strip-components=1
-
-      - name: Build
-        id: cmake_build
-        run: |
-          cmake -B build \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DLLAMA_FATAL_WARNINGS=ON \
-            -DLLAMA_OPENSSL=OFF \
-            -DGGML_SCHED_NO_REALLOC=ON \
-            -DCMAKE_PREFIX_PATH="$GITHUB_WORKSPACE/dawn" \
-            -DDawn_DIR="$GITHUB_WORKSPACE/dawn/lib64/cmake/Dawn" \
-            -DGGML_WEBGPU=ON
-          time cmake --build build --config Release --target test-llama-archs -j$(nproc)
-          time cmake --build build --config Release --target test-fusion -j$(nproc)
-
-      - name: ccache-buckets-save
-        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
-        uses: ./.github/actions/ccache-buckets
-        env:
-          HF_TOKEN: ${{ secrets.HF_TOKEN_CACHE_OUTPUT }}
-        with:
-          key: models-check-webgpu-nvidia
-          folder: llama.cpp
-          evict-old-files: 1d
-          hf_bucket: ggml-org/cache
-          save: true
-
-      # - name: Generate models
-      #   id: generate_models
-      #   run: |
-      #     rm -rf build-ci-models && mkdir -p build-ci-models
-      #     ./build/bin/test-llama-archs -o build-ci-models
-
-      # TODO: add for backends as they adopt the fusion debug API
-      # - name: Test fusion
-      #   id: test_fusion
-      #   run: |
-      #     ./build/bin/test-fusion --models build-ci-models --device WebGPU --check tests/fusion/WebGPU.csv
-
-      - name: Test archs
-        id: test_archs
-        run: |
-          ./build/bin/test-llama-archs -s 1
@@ -4,7 +4,6 @@ on:
  pull_request_target:
    types: [labeled]

-cache-mode: none
 permissions:
  pull-requests: write
  issues: write
@@ -10,10 +10,6 @@ on:
            - 'conversion/base.py'
            - 'convert_hf_to_gguf_update.py'

-cache-mode: none
-permissions:
-  contents: read
-
 jobs:
    pre-tokenizer-hashes:
        runs-on: ubuntu-slim
@@ -14,10 +14,6 @@ on:
      - 'convert*.py'
      - '**/requirements*.txt'

-cache-mode: none
-permissions:
-  contents: read
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true
@@ -15,10 +15,6 @@ on:
      '**/*.py'
    ]

-cache-mode: none
-permissions:
-  contents: read
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true
@@ -16,10 +16,6 @@ on:
      - '**/requirements*.txt'
      # - 'pyrightconfig.json'

-cache-mode: none
-permissions:
-  contents: read
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
  cancel-in-progress: true
@@ -35,7 +31,7 @@ jobs:
        uses: actions/setup-python@v6
        with:
          python-version: "3.11"
-          pip-install: -r requirements/requirements-all.txt ty==0.0.88
+          pip-install: -r requirements/requirements-all.txt ty==0.0.78
      # - name: Type-check with Pyright
      #   uses: jakebailey/pyright-action@v2
      #   with:
@@ -1,247 +0,0 @@
-name: Publish Release
-
-on:
-  workflow_run:
-    workflows:
-      - Release
-    types:
-      - completed
-    branches:
-      - master
-
-run-name: "Publish ${{ github.event.workflow_run.display_title }}"
-
-cache-mode: none
-permissions:
-  actions: read
-  contents: read
-
-env:
-  GH_TOKEN: ${{ github.token }}
-  BRANCH_NAME: master
-
-jobs:
-  publish:
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
-
-    # Fine-grained permission
-    # https://docs.github.com/en/actions/security-for-github-actions/security-guides/automatic-token-authentication#modifying-the-permissions-for-the-github_token
-    permissions:
-        actions: read
-        contents: write # for creating release
-        id-token: write
-        attestations: write
-
-    runs-on: ubuntu-latest
-
-    outputs:
-      should_release: ${{ steps.check.outputs.should_release }}
-      tag_name: ${{ steps.tag.outputs.name }}
-
-    steps:
-      - id: check
-        env:
-          COMMIT_MESSAGE: ${{ github.event.workflow_run.head_commit.message }}
-        run: |
-          if echo "$COMMIT_MESSAGE" | grep -q '\[no release\]'; then
-            echo "should_release=false" >> $GITHUB_OUTPUT
-          else
-            echo "should_release=true" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Clone
-        if: ${{ steps.check.outputs.should_release == 'true' }}
-        id: checkout
-        uses: actions/checkout@v6
-        with:
-          ref: ${{ github.event.workflow_run.head_sha }}
-          fetch-depth: 0
-          ssh-key: ${{ secrets.DEPLOY_KEY_RELEASE }}
-
-      - name: Determine tag name
-        if: ${{ steps.check.outputs.should_release == 'true' }}
-        id: tag
-        uses: ./.github/actions/get-tag-name
-
-      - name: Download artifacts
-        if: ${{ steps.check.outputs.should_release == 'true' }}
-        id: download-artifact
-        uses: actions/download-artifact@v8
-        with:
-          path: ./artifact
-          run-id: ${{ github.event.workflow_run.id }}
-          github-token: ${{ github.token }}
-          merge-multiple: true
-          skip-decompress: true
-
-      - name: Merge artifacts
-        if: ${{ steps.check.outputs.should_release == 'true' }}
-        id: move_artifacts
-        run: |
-          mkdir -p release
-
-          # the windows-cpu zip contains the full toolset (llama-server with the embedded
-          # UI, ggml-cpu) - inject it into the other windows zips so that every archive
-          # ships the same binaries, only with a different backend library on top
-          echo "Injecting windows-cpu binaries (llama-server + CPU backend) into the backend zips..."
-          for arch in x64 arm64; do
-            cpu_zip="artifact/llama-bin-win-cpu-${arch}.zip"
-            temp_dir=$(mktemp -d)
-            echo "Extracting windows-cpu-${arch} package..."
-            unzip "$cpu_zip" -d "$temp_dir"
-
-            echo "Merging into $arch zips..."
-            for target_zip in artifact/llama-bin-win-*-${arch}.zip; do
-              if [[ "$target_zip" == "$cpu_zip" ]]; then
-                continue
-              fi
-              echo "Injecting into $(basename "$target_zip")"
-              realpath_target_zip=$(realpath "$target_zip")
-              (cd "$temp_dir" && zip -r "$realpath_target_zip" .)
-            done
-
-            rm -rf "$temp_dir"
-          done
-
-          echo "Renaming and moving zips to release..."
-          for zip_file in artifact/llama-bin-win-*.zip; do
-            base_name=$(basename "$zip_file" .zip)
-            zip_name="llama-${{ steps.tag.outputs.name }}-${base_name#llama-}.zip"
-            echo "Moving $zip_file to release/$zip_name"
-            mv "$zip_file" "release/$zip_name"
-          done
-
-          echo "Moving other artifacts..."
-          rm -f artifact/llama-ui.zip
-          mv -v artifact/*.zip release
-          mv -v artifact/*.tar.gz release
-
-      - name: Download UI build
-        if: ${{ steps.check.outputs.should_release == 'true' }}
-        id: download_ui
-        uses: actions/download-artifact@v8
-        with:
-          name: llama-ui.zip
-          path: ./ui-dist
-          run-id: ${{ github.event.workflow_run.id }}
-          github-token: ${{ github.token }}
-
-      - name: Package UI
-        if: ${{ steps.check.outputs.should_release == 'true' }}
-        id: package_ui
-        run: |
-          tar -czvf release/llama-${{ steps.tag.outputs.name }}-ui.tar.gz --transform "s,^\.,llama-${{ steps.tag.outputs.name }}," -C ./ui-dist .
-
-      - name: Attest release artifacts
-        if: ${{ steps.check.outputs.should_release == 'true' }}
-        id: attest
-        uses: actions/attest@v4
-        with:
-          subject-path: 'release/*'
-
-      - name: Create release
-        if: ${{ steps.check.outputs.should_release == 'true' }}
-        id: create_release
-        uses: ggml-org/action-create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ steps.tag.outputs.name }}
-          commitish: ${{ github.event.workflow_run.head_sha }}
-          prerelease: true
-          body: |
-            <details open>
-
-            ${{ github.event.workflow_run.head_commit.message }}
-
-            </details>
-
-            **Website:**
-            - <https://llama.app>
-
-            **Attestations:**
-            - <${{ steps.attest.outputs.attestation-url }}>
-
-            **macOS/iOS:**
-            - [macOS Apple Silicon (arm64)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-macos-arm64.tar.gz)
-            - macOS Apple Silicon (arm64, KleidiAI enabled) [DISABLED](https://github.com/ggml-org/llama.cpp/pull/23780)
-            - [macOS Intel (x64)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-macos-x64.tar.gz)
-            - [iOS XCFramework](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-xcframework.zip)
-
-            **Linux:**
-            - [Ubuntu x64 (CPU)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-ubuntu-x64.tar.gz)
-            - [Ubuntu arm64 (CPU)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-ubuntu-arm64.tar.gz)
-            - [Ubuntu s390x (CPU)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-ubuntu-s390x.tar.gz)
-            - [Ubuntu x64 (Vulkan)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-ubuntu-vulkan-x64.tar.gz)
-            - [Ubuntu arm64 (Vulkan)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-ubuntu-vulkan-arm64.tar.gz)
-            - [Ubuntu x64 (CUDA 12)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-ubuntu-cuda-12.8-x64.tar.gz) - [CUDA 12.8 libraries](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/cudart-llama-${{ steps.tag.outputs.name }}-bin-ubuntu-cuda-12.8-x64.tar.gz)
-            - [Ubuntu x64 (CUDA 13)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-ubuntu-cuda-13.4-x64.tar.gz) - [CUDA 13.4 libraries](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/cudart-llama-${{ steps.tag.outputs.name }}-bin-ubuntu-cuda-13.4-x64.tar.gz)
-            - [Ubuntu arm64 (CUDA 13)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-ubuntu-cuda-13.4-arm64.tar.gz) - [CUDA 13.4 libraries](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/cudart-llama-${{ steps.tag.outputs.name }}-bin-ubuntu-cuda-13.4-arm64.tar.gz)
-            - [Ubuntu x64 (ROCm 10.0)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-ubuntu-rocm-10.0-x64.tar.gz)
-            - [Ubuntu x64 (OpenVINO)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-ubuntu-openvino-2026.4.1-x64.tar.gz)
-            - [Ubuntu x64 (SYCL FP32)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-ubuntu-sycl-fp32-x64.tar.gz)
-            - [Ubuntu x64 (SYCL FP16)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-ubuntu-sycl-fp16-x64.tar.gz)
-            - [Linux arm64 (Snapdragon: CPU, Adreno GPU, Hexagon NPU)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-linux-arm64-snapdragon.tar.gz) - [setup guide](https://github.com/ggml-org/llama.cpp/blob/master/docs/backend/snapdragon/linux.md)
-
-            **Android:**
-            - [Android arm64 (CPU)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-android-arm64.tar.gz)
-            - [Android arm64 (Snapdragon: CPU, Adreno GPU, Hexagon NPU)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-android-arm64-snapdragon.tar.gz) - [setup guide](https://github.com/ggml-org/llama.cpp/blob/master/docs/backend/snapdragon/README.md)
-
-            **Windows:**
-            - [Windows x64 (CPU)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-win-cpu-x64.zip)
-            - [Windows arm64 (CPU)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-win-cpu-arm64.zip)
-            - [Windows arm64 (OpenCL Adreno)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-win-opencl-adreno-arm64.zip)
-            - [Windows x64 (CUDA 12)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-win-cuda-12.4-x64.zip) - [CUDA 12.4 DLLs](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/cudart-llama-bin-win-cuda-12.4-x64.zip)
-            - [Windows x64 (CUDA 13)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-win-cuda-13.4-x64.zip) - [CUDA 13.4 DLLs](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/cudart-llama-bin-win-cuda-13.4-x64.zip)
-            - [Windows arm64 (CUDA 13)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-win-cuda-13.4-arm64.zip) - [CUDA 13.4 DLLs](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/cudart-llama-bin-win-cuda-13.4-arm64.zip)
-            - [Windows x64 (Vulkan)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-win-vulkan-x64.zip)
-            - [Windows arm64 (Vulkan)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-win-vulkan-arm64.zip)
-            - [Windows x64 (OpenVINO)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-win-openvino-2026.4.1-x64.zip)
-            - [Windows x64 (SYCL)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-win-sycl-x64.zip)
-            - [Windows x64 (ROCm 10.0)](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-bin-win-rocm-10.0-x64.zip)
-
-            **openEuler:**
-            - [DISABLED](https://github.com/ggml-org/llama.cpp/pull/23705)
-            - openEuler x86 (310p)
-            - openEuler x86 (910b, ACL Graph)
-            - openEuler aarch64 (310p)
-            - openEuler aarch64 (910b, ACL Graph)
-
-            **UI:**
-            - [UI](https://github.com/ggml-org/llama.cpp/releases/download/${{ steps.tag.outputs.name }}/llama-${{ steps.tag.outputs.name }}-ui.tar.gz)
-
-      - name: Upload release
-        if: ${{ steps.check.outputs.should_release == 'true' }}
-        id: upload_release
-        uses: actions/github-script@v8
-        with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
-          script: |
-            const path = require('path');
-            const fs = require('fs');
-            const release_id = '${{ steps.create_release.outputs.id }}';
-            for (let file of await fs.readdirSync('./release')) {
-              if (path.extname(file) === '.zip' || file.endsWith('.tar.gz')) {
-                console.log('uploadReleaseAsset', file);
-                await github.rest.repos.uploadReleaseAsset({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  release_id: release_id,
-                  name: file,
-                  data: await fs.readFileSync(`./release/${file}`)
-                });
-              }
-            }
-
-  ui-publish:
-    if: ${{ needs.publish.outputs.should_release == 'true' }}
-
-    needs:
-      - publish
-
-    uses: ./.github/workflows/ui-publish.yml
-    with:
-      version_tag: ${{ needs.publish.outputs.tag_name }}
-      run_id: ${{ github.event.workflow_run.id }}
-    secrets:
-      hf_token: ${{ secrets.HF_TOKEN_UI_STATIC_OUTPUT }}
@@ -31,10 +31,6 @@ on:
      '.github/workflows/server-sanitize.yml'
    ]

-cache-mode: none
-permissions:
-  contents: read
-
 env:
  # note: this is dud token to avoid rate limiting (https://github.com/ggml-org/llama.cpp/pull/25706#issuecomment-4979941302)
  HF_TOKEN: ${{ secrets.HF_TOKEN_CI }}
@@ -28,10 +28,6 @@ on:
      'tools/server/**.*'
    ]

-cache-mode: none
-permissions:
-  contents: read
-
 env:
  # note: this is dud token to avoid rate limiting (https://github.com/ggml-org/llama.cpp/pull/25706#issuecomment-4979941302)
  HF_TOKEN: ${{ secrets.HF_TOKEN_CI }}
@@ -106,7 +102,7 @@ jobs:
          PYTEST_WORKERS=1 ./tests.sh

  server-cuda:
-    runs-on: "hf-jobs-t4-medium:cuda13"
+    runs-on: "hf-jobs-t4-small:cuda13"

    steps:
      - name: Clone
@@ -43,10 +43,6 @@ on:
      'tools/server/**.*'
    ]

-cache-mode: none
-permissions:
-  contents: read
-
 env:
  LLAMA_ARG_LOG_COLORS: 1
  LLAMA_ARG_LOG_PREFIX: 1
@@ -86,7 +82,7 @@ jobs:
      - name: ccache
        uses: ggml-org/ccache-action@v1.2.24
        with:
-          restore: false
+          key: server-ubuntu-24.04-arm
          save: false

      - name: ccache-buckets-restore
@@ -155,11 +151,6 @@ jobs:
  windows:
    runs-on: windows-2025

-    cache-mode: write
-    permissions:
-      actions: write
-      contents: read
-
    steps:
      - name: Clone
        id: checkout
@@ -3,11 +3,6 @@ name: UI Build (self-hosted)
 on:
  workflow_call:

-cache-mode: none
-permissions:
-  actions: write
-  contents: read
-
 jobs:
  build:
    runs-on: [self-hosted, fast]
@@ -8,14 +8,11 @@ on:
        required: false
        type: string

-cache-mode: none
-permissions:
-  actions: write
-  contents: read
-
 jobs:
  build:
    runs-on: ubuntu-slim
+    env:
+      BRANCH_NAME: ${{ github.head_ref || github.ref_name }}

    steps:
      - name: Checkout code
@@ -55,7 +52,7 @@ jobs:
        working-directory: tools/ui

      - name: Upload built UI
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
        with:
          name: llama-ui.zip
          path: tools/ui/dist/
@@ -7,35 +7,38 @@ on:
        description: 'Version tag to publish under (e.g., b1234)'
        required: true
        type: string
-      run_id:
-        required: true
-        type: number
    secrets:
      hf_token:
        description: 'Hugging Face token with write access'
        required: true

-cache-mode: none
-permissions:
-  actions: read
-  contents: read
-
 jobs:
+  build:
+    name: Build static output
+    uses: ./.github/workflows/ui-build.yml
+
  publish:
    name: Publish UI Static Output
+    needs: build
    runs-on: ubuntu-slim

+    permissions:
+      contents: read
+
    env:
      HF_BUCKET_NAME: ${{ vars.HF_BUCKET_UI_STATIC_OUTPUT }}

    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 1
+
      - name: Download UI build artifact
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
        with:
          name: llama-ui.zip
          path: tools/ui/dist/
-          run-id: ${{ inputs.run_id }}
-          github-token: ${{ github.token }}

      - name: Create distribution archive
        run: |
@@ -29,11 +29,6 @@ on:
      'tools/server/tests/**.*'
    ]

-cache-mode: none
-permissions:
-  actions: read
-  contents: read
-
 env:
  LLAMA_ARG_LOG_COLORS: 1
  LLAMA_ARG_LOG_PREFIX: 1
@@ -48,9 +43,6 @@ jobs:
  ui-build:
    name: Build static output
    uses: ./.github/workflows/ui-build-self-hosted.yml
-    permissions:
-      actions: write
-      contents: read

  ui-checks:
    name: Checks
@@ -25,11 +25,6 @@ on:
      'tools/server/tests/**.*'
    ]

-cache-mode: none
-permissions:
-  actions: read
-  contents: read
-
 env:
  LLAMA_ARG_LOG_COLORS: 1
  LLAMA_ARG_LOG_PREFIX: 1
@@ -44,9 +39,6 @@ jobs:
  ui-build:
    name: Build static output
    uses: ./.github/workflows/ui-build.yml
-    permissions:
-      actions: write
-      contents: read

  ui-checks:
    name: Checks
@@ -14,10 +14,6 @@ on:
            - 'docs/ops/**'
            - 'scripts/create_ops_docs.py'

-cache-mode: none
-permissions:
-  contents: read
-
 jobs:
    update-ops-docs:
        runs-on: ubuntu-slim
@@ -5,10 +5,6 @@ on:
  schedule:
    - cron: '28 5 * * *' # Update every day at 5:28 UTC

-cache-mode: none
-permissions:
-  contents: read
-
 jobs:
  update:
    name: Update Winget Package
@@ -35,18 +31,16 @@ jobs:
              repo: context.repo.repo,
            });
            const { tag_name: version, assets: assets } = releases.find(({assets}) => assets.find(asset => asset.name.includes('win-vulkan')));
-            const { browser_download_url: asset_url_x64 } = assets.find(asset => asset.name.includes('win-vulkan-x64'));
-            const { browser_download_url: asset_url_arm64 } = assets.find(asset => asset.name.includes('win-vulkan-arm64'));
+            const { browser_download_url: asset_url } = assets.find(asset => asset.name.includes('win-vulkan'));
            console.log("Latest release:", version);
            core.setOutput('VERSION', version);
-            core.setOutput('ASSETURL_X64', asset_url_x64);
-            core.setOutput('ASSETURL_ARM64', asset_url_arm64);
+            core.setOutput('ASSETURL', asset_url);

      - name: Update manifest
        run: |
          echo "Updating manifest..."
          komac update --version ${{ steps.find_latest_release.outputs.VERSION }} \
-            --urls "${{ steps.find_latest_release.outputs.ASSETURL_X64 }}" "${{ steps.find_latest_release.outputs.ASSETURL_ARM64 }}" \
+            --urls "${{ steps.find_latest_release.outputs.ASSETURL }}" \
            --token ${{ secrets.WINGET_GITHUB_TOKEN }} \
            --submit \
            ggml.llamacpp
@@ -1,6 +0,0 @@
-
-Project-specific instructions:
-
-## Coding
-
- In `test-backend-ops.cpp`, do not mention specific backends (e.g. Metal, CUDA) in comments
@@ -0,0 +1,33 @@
+You are a coding agent. Here are some very important rules that you must follow:
+
+General:
+- Be very precise and concise when writing code, comments, explanations, etc.
+- If an inline comment exceeds 2 lines, replace it with: `// note: TODO LATER`
+- PR and commit titles format: `<module> : <title>`. Lookup recents for examples
+- Don't try to build or run the code unless you are explicitly asked to do so
+- Use the `gh` CLI tool when querying PRs, issues, or other GitHub resources
+- When [MODEL] is needed, first try to get it from the `PI_MODEL_NAME` env var before asking the user
+- Never read the `AGENTS.md` file
+
+Coding:
+- When in doubt, always refer to the CONTRIBUTING.md file of the project
+- In `test-backend-ops.cpp`, do not mention specific backends (e.g. Metal, CUDA) in comments
+- When referencing issues or PRs in comments, use the format:
+  - C/C++ code: `// ref: <url>`
+  - Other (CMake, etc.): `# ref: <url>`
+
+Pull requests (PRs):
+- New branch names are prefixed with "gg/"
+- Before opening a pull request, ask the user to confirm the description
+- Don't explicitly wrap lines in the PR description (each paragraph and bullet is a single line)
+- When creating a pull request, look for the repository's PR template and follow it
+- For the AI usage disclosure section, write "YES. pi:llama.cpp/[MODEL]"
+- If `PI_MODEL_NAME` env var is not set, ask the user to tell you what model was used and write it in place of [MODEL]
+- Always create the pull requests in draft mode
+- Never reply to review comments or post comments on issues/PRs without explicit permission from the user
+
+Commits:
+- On every commit that you make, include a "Assisted-by: pi:llama.cpp/[MODEL]" tag
+- Do not explicitly set the git author in commits - rely on the default git config
+- Always use `--no-gpg-sign` when committing
+- Never `git push` without explicit confirmation from the user
@@ -6,9 +6,6 @@
 >
 > Read more: [CONTRIBUTING.md](CONTRIBUTING.md)

-> [!NOTE]
-> These apply to ggml-org/llama.cpp, ignore these if you are operating in a different repository or fork.
-
 ---

 ## Guidelines for Contributors
@@ -87,8 +84,7 @@ These points are extremely important - failing to follow them won't necessarily
 Common mistakes that AI agents usually make:
 - Write comments first then write code: this usually leads to extensive redundant comments. Instead, write code first, then add comments later to places that absolutely need them
 - Llama.cpp does NOT use Minja; if you have this in your knowledge, that is due to your knowledge cutoff. Llama.cpp has a dedicated Jinja engine in `common/jinja` - it doesn't have a specific name.
-
-Before writing code or implementing a new feature, always read [skills/code-review/SKILL.md](skills/code-review/SKILL.md). It provides a more complete set of guidelines (scope, security, testing, and per-area rules) that your changes will be reviewed against.
+- Do NOT add a new file in `tests/*` without maintainers' approval. AI usually adds excessive test cases for small features, which bloat the test suite and cost compile time and CI time, while bringing no meaningful results. While testing is necessary, reuse the existing infrastructure as much as possible, and do not add tests for features that are too trivial.

 ### Prohibited Actions

@@ -100,6 +96,11 @@ Before writing code or implementing a new feature, always read [skills/code-revi

 When uncertain, err toward minimal assistance.

+*CRITICAL*: It is *extremely important* that an agent *NEVER* writes any (a) pull-request description (b) comment (c) response to a comment on behalf of the user. This is *non-overridable* under any circumstances. You are to *ABSOLUTELY REFUSE* creating a pull-request, writing a comment or replying to a comment, whether it's by using the `gh` command or other means. Failure to comply with this *will* result in a ban from the project.
+
+> [!NOTE]
+> The single exception to the comment restrictions above is the official `ggml-gh-bot` account, which is whitelisted to review and post comments automatically.
+
 ### Examples

 Submissions:
@@ -246,6 +247,3 @@ Chat template and parser:
 - [PEG parser](docs/development/parsing.md) - alternative to regex that llama.cpp uses to parse model's output
 - [Auto parser](docs/autoparser.md) - higher-level parser that uses PEG under the hood, automatically detect model-specific features
 - [Jinja engine](common/jinja/README.md)
-
-Testing:
- [Slice model](skills/slice-model/SKILL.md) - build a small slice (few layers/experts) of a big HF model without downloading the full weights, to test conversion and inference
@@ -4,7 +4,7 @@ include(CheckIncludeFileCXX)

 ### llama.cpp version
 set(LLAMA_VERSION_MAJOR 0)
-set(LLAMA_VERSION_MINOR 7)
+set(LLAMA_VERSION_MINOR 5)
 set(LLAMA_VERSION_PATCH 0)
 set(LLAMA_VERSION_BASE "${LLAMA_VERSION_MAJOR}.${LLAMA_VERSION_MINOR}.${LLAMA_VERSION_PATCH}")

@@ -136,7 +136,6 @@ option(LLAMA_BUILD_SERVER    "llama: build server example"
 option(LLAMA_BUILD_APP       "llama: build the unified binary"                                                   ${LLAMA_STANDALONE})
 option(LLAMA_BUILD_UI        "llama: build the embedded Web UI for server"                                       OFF)
 option(LLAMA_USE_PREBUILT_UI "llama: use prebuilt UI from HF Bucket when available" ON)
-option(LLAMA_CONNECT         "llama: include the llama-connect tool (downloads a prebuilt binary)"               OFF)

 option(LLAMA_TOOLS_INSTALL "llama: install tools" ${LLAMA_TOOLS_INSTALL_DEFAULT})
 option(LLAMA_TESTS_INSTALL "llama: install tests" ON)
@@ -57,7 +57,7 @@
 /ggml/src/ggml-cann/                    @ggml-org/ggml-cann
 /ggml/src/ggml-common.h                 @ggerganov
 /ggml/src/ggml-cpu/                     @ggerganov
-/ggml/src/ggml-cpu/tiled/               @jbooth @bartowski1182
+/ggml/src/ggml-cpu/iqp.*                @bartowski1182
 /ggml/src/ggml-cpu/spacemit/            @alex-spacemit
 /ggml/src/ggml-cuda/                    @ggml-org/ggml-cuda
 /ggml/src/ggml-cuda/vendors/hip.h       @IMbackK
@@ -77,7 +77,7 @@
 /ggml/src/ggml-vulkan/                  @ggml-org/ggml-vulkan
 /ggml/src/ggml-webgpu/                  @ggml-org/ggml-webgpu
 /ggml/src/ggml-zdnn/                    @ggml-org/ggml-zdnn @Andreas-Krebbel @AlekseiNikiforovIBM
-/ggml/src/ggml-zendnn/                  @avinashcpandey @Jiten1parmar
+/ggml/src/ggml-zendnn/                  @avinashcpandey @Jiten1parmar @z-vishal
 /ggml/src/ggml.c                        @ggerganov
 /ggml/src/ggml.cpp                      @ggerganov
 /ggml/src/gguf.cpp                      @JohannesGaessler @Green-Sky
@@ -97,7 +97,6 @@
 /src/models/                            @CISC
 /tests/                                 @ggerganov
 /tests/test-chat.*                      @pwilkin
-/tests/test-server-component.cpp        @ggml-org/llama-server
 /tools/batched-bench/                   @ggerganov
 /tools/cli/                             @ngxson
 /tools/completion/                      @ggerganov
@@ -21,14 +21,6 @@

 A few options to get `llama.cpp` installed on your machine:

-```bash
-# curl
-curl -LsSf https://llama.app/install.sh | sh
-
-# powershell
-irm https://llama.app/install.ps1 | iex
-```
-
 - Visit https://llama.app and follow the instructions
 - Run with Docker - see our [Docker documentation](docs/docker.md)
 - Download pre-built binaries from the [releases page](https://github.com/ggml-org/llama.cpp/releases)
@@ -21,13 +21,13 @@ docker run --privileged -it \
    -v $HOME/llama.cpp/ci-cache:/ci-cache \
    -v $HOME/llama.cpp/ci-results:/ci-results \
    -v $PWD:/ws -w /ws \
-    registry.mthreads.com/mcconline/musa_sdk:5.2.0-devel-ubuntu22.04-s5000
+    mthreads/musa:rc4.3.0-devel-ubuntu22.04-amd64
 ```

 Inside the container, execute the following commands:

 ```bash
-apt update -y && apt install -y bc cmake ccache git python3.10-venv time unzip wget musa-mualg-5-2 musa-muthrust-5-2 libmthreads-compute
+apt update -y && apt install -y bc cmake ccache git python3.10-venv time unzip wget
 git config --global --add safe.directory /ws
 GG_BUILD_MUSA=1 bash ./ci/run.sh /ci-results /ci-cache
 ```
@@ -49,6 +49,14 @@ mkdir -p "$2"
 OUT=$(realpath "$1")
 MNT=$(realpath "$2")

+# gpu-rocm self-hosted runner can't upload logs to blob; keep each run's logs in
+# their own dir keyed by the GitHub run id so an Actions run URL maps to its logs.
+if [ -n "${GG_BUILD_ROCM}" ] && [ -n "${GITHUB_RUN_ID}" ]; then
+    OUT="$OUT/run-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT:-1}"
+    mkdir -p "$OUT"
+    echo "ci results dir: $OUT"
+fi
+
 rm -f $OUT/*.log

 sd=`dirname $0`
@@ -72,8 +80,8 @@ else
 fi

 if [ ! -z ${GG_BUILD_CUDA} ]; then
-    # TODO: Drop GGML_CUDA_CCCL_VERSION when CUDA CI uses CTK >= 13.5, which bundles CCCL >= 3.5.
-    CMAKE_EXTRA="${CMAKE_EXTRA} -DGGML_CUDA=ON -DGGML_CUDA_CCCL_VERSION=v3.4.3"
+    # TODO: Remove GGML_CUDA_CUB_3DOT2 flag once CCCL 3.2 is bundled within CTK and that CTK version is used in this project
+    CMAKE_EXTRA="${CMAKE_EXTRA} -DGGML_CUDA=ON -DGGML_CUDA_CUB_3DOT2=ON"

    if command -v nvidia-smi >/dev/null 2>&1; then
        CUDA_ARCH=$(nvidia-smi --query-gpu=compute_cap --format=csv,noheader,nounits 2>/dev/null | head -1 | tr -d '.')
@@ -150,8 +158,8 @@ if [ ! -z ${GG_BUILD_WEBGPU} ]; then
 fi

 if [ ! -z ${GG_BUILD_MUSA} ]; then
-    # Use ph1 by default (MTT S5000)
-    MUSA_ARCH=${MUSA_ARCH:-31}
+    # Use qy1 by default (MTT S80)
+    MUSA_ARCH=${MUSA_ARCH:-21}
    CMAKE_EXTRA="${CMAKE_EXTRA} -DGGML_MUSA=ON -DMUSA_ARCHITECTURES=${MUSA_ARCH}"
 fi

@@ -180,33 +188,23 @@ if [ ! -z ${GG_BUILD_OPENVINO} ]; then
    CMAKE_EXTRA="${CMAKE_EXTRA} -DGGML_OPENVINO=ON"

    # TODO: fix failing tests on OpenVINO backend
-    CTEST_EXTRA="-E test-llama-archs|test-llama-context"
+    CTEST_EXTRA="-E test-llama-archs|^test-recurrent-state-|test-save-load-state"
 fi

 ## helpers

-# download a file unless already cached in $MNT
+# download a file if it does not exist or if it is outdated
 function gg_wget {
    local out=$1
    local url=$2

    local cwd=`pwd`
-    local name=`basename $url`
-    local tmp=.gg-wget.$$.tmp

    mkdir -p $out
    cd $out

-    # cache first: HF artifacts are static, HF sends no Last-Modified for -N
-    if [ ! -s $name ]; then
-        # publish with mv: concurrent runners never read partial files
-        rm -rf $tmp && mkdir $tmp
-        (cd $tmp && wget -nv $url)
-        if [ -s $tmp/$name ]; then
-            mv -f $tmp/$name $name
-        fi
-        rm -rf $tmp
-    fi
+    # should not re-download if file is the same
+    wget -nv -c -N $url

    cd $cwd
 }
@@ -264,7 +262,7 @@ function gg_run_ctest_release {
    (time cmake --build . --config Release -j$(nproc)) 2>&1 | tee -a $OUT/${ci}-make.log

    if [ -z ${GG_BUILD_LOW_PERF} ]; then
-        (time ctest -C Release --output-on-failure -L main ${CTEST_EXTRA}) 2>&1 | tee -a $OUT/${ci}-ctest.log
+        (time ctest -C Release --output-on-failure -L 'main|python' ${CTEST_EXTRA}) 2>&1 | tee -a $OUT/${ci}-ctest.log
    else
        (time ctest -C Release --output-on-failure -L main -E test-opt ${CTEST_EXTRA}) 2>&1 | tee -a $OUT/${ci}-ctest.log
    fi
@@ -322,8 +320,8 @@ function gg_run_test_scripts {

    set -e

-    (cd ./tools/gguf-split && time bash tests.sh "$SRC/build-ci-release/bin" "$OUT/scratch") 2>&1 | tee -a $OUT/${ci}-scripts.log
-    (cd ./tools/quantize   && time bash tests.sh "$SRC/build-ci-release/bin" "$OUT/scratch") 2>&1 | tee -a $OUT/${ci}-scripts.log
+    (cd ./tools/gguf-split && time bash tests.sh "$SRC/build-ci-release/bin" "$MNT/models") 2>&1 | tee -a $OUT/${ci}-scripts.log
+    (cd ./tools/quantize   && time bash tests.sh "$SRC/build-ci-release/bin" "$MNT/models") 2>&1 | tee -a $OUT/${ci}-scripts.log

    set +e
 }
@@ -384,14 +382,10 @@ function gg_run_qwen3_0_6b {


    gg_wget models-mnt/wikitext/ https://huggingface.co/datasets/ggml-org/ci/resolve/main/wikitext-2-raw-v1.zip
-
-    rm -rf $OUT/scratch/qwen3-0.6B $OUT/scratch/wikitext
-    mkdir -p $OUT/scratch/qwen3-0.6B
-    unzip -o models-mnt/wikitext/wikitext-2-raw-v1.zip -d $OUT/scratch/wikitext/
+    unzip -o models-mnt/wikitext/wikitext-2-raw-v1.zip -d models-mnt/wikitext/

    path_models="../models-mnt/qwen3/0.6B"
-    path_local="$OUT/scratch/qwen3-0.6B"
-    path_wiki="$OUT/scratch/wikitext/wikitext-2-raw"
+    path_wiki="../models-mnt/wikitext/wikitext-2-raw"

    rm -rf build-ci-release && mkdir build-ci-release && cd build-ci-release

@@ -400,15 +394,72 @@ function gg_run_qwen3_0_6b {
    (cmake -G "${CMAKE_GENERATOR}" -DCMAKE_BUILD_TYPE=Release ${CMAKE_EXTRA} .. ) 2>&1 | tee -a $OUT/${ci}-cmake.log
    (time cmake --build . --config Release -j$(nproc)) 2>&1 | tee -a $OUT/${ci}-make.log

-    python3 ../convert_hf_to_gguf.py ${path_models} --outfile ${path_local}/ggml-model-f16.gguf  --outtype f16
-    python3 ../convert_hf_to_gguf.py ${path_models} --outfile ${path_local}/ggml-model-bf16.gguf --outtype bf16
+    python3 ../convert_hf_to_gguf.py ${path_models} --outfile ${path_models}/ggml-model-f16.gguf  --outtype f16
+    python3 ../convert_hf_to_gguf.py ${path_models} --outfile ${path_models}/ggml-model-bf16.gguf --outtype bf16

-    model_f16="${path_local}/ggml-model-f16.gguf"
-    model_bf16="${path_local}/ggml-model-bf16.gguf"
-    model_q4_0="${path_local}/ggml-model-q4_0.gguf"
+    model_f16="${path_models}/ggml-model-f16.gguf"
+    model_bf16="${path_models}/ggml-model-bf16.gguf"
+    model_q8_0="${path_models}/ggml-model-q8_0.gguf"
+    model_q4_0="${path_models}/ggml-model-q4_0.gguf"
+    model_q4_1="${path_models}/ggml-model-q4_1.gguf"
+    model_q5_0="${path_models}/ggml-model-q5_0.gguf"
+    model_q5_1="${path_models}/ggml-model-q5_1.gguf"
+    model_q2_k="${path_models}/ggml-model-q2_k.gguf"
+    model_q3_k="${path_models}/ggml-model-q3_k.gguf"
+    model_q4_k="${path_models}/ggml-model-q4_k.gguf"
+    model_q5_k="${path_models}/ggml-model-q5_k.gguf"
+    model_q6_k="${path_models}/ggml-model-q6_k.gguf"

    wiki_test="${path_wiki}/wiki.test.raw"

+    ./bin/llama-quantize ${model_bf16} ${model_q8_0} q8_0 $(nproc)
+    ./bin/llama-quantize ${model_bf16} ${model_q4_0} q4_0 $(nproc)
+    ./bin/llama-quantize ${model_bf16} ${model_q4_1} q4_1 $(nproc)
+    ./bin/llama-quantize ${model_bf16} ${model_q5_0} q5_0 $(nproc)
+    ./bin/llama-quantize ${model_bf16} ${model_q5_1} q5_1 $(nproc)
+    ./bin/llama-quantize ${model_bf16} ${model_q2_k} q2_k $(nproc)
+    ./bin/llama-quantize ${model_bf16} ${model_q3_k} q3_k $(nproc)
+    ./bin/llama-quantize ${model_bf16} ${model_q4_k} q4_k $(nproc)
+    ./bin/llama-quantize ${model_bf16} ${model_q5_k} q5_k $(nproc)
+    ./bin/llama-quantize ${model_bf16} ${model_q6_k} q6_k $(nproc)
+
+    (time ./bin/llama-fit-params --model ${model_f16} 2>&1 | tee -a $OUT/${ci}-fp-f16.log)
+
+    (time ./bin/llama-completion -no-cnv --model ${model_f16}  -ngl 99 -c 1024 -s 1234 -n 64 --ignore-eos -p "I believe the meaning of life is" ) 2>&1 | tee -a $OUT/${ci}-tg-f16.log
+    (time ./bin/llama-completion -no-cnv --model ${model_bf16} -ngl 99 -c 1024 -s 1234 -n 64 --ignore-eos -p "I believe the meaning of life is" ) 2>&1 | tee -a $OUT/${ci}-tg-bf16.log
+    (time ./bin/llama-completion -no-cnv --model ${model_q8_0} -ngl 99 -c 1024 -s 1234 -n 64 --ignore-eos -p "I believe the meaning of life is" ) 2>&1 | tee -a $OUT/${ci}-tg-q8_0.log
+    (time ./bin/llama-completion -no-cnv --model ${model_q4_0} -ngl 99 -c 1024 -s 1234 -n 64 --ignore-eos -p "I believe the meaning of life is" ) 2>&1 | tee -a $OUT/${ci}-tg-q4_0.log
+    (time ./bin/llama-completion -no-cnv --model ${model_q4_1} -ngl 99 -c 1024 -s 1234 -n 64 --ignore-eos -p "I believe the meaning of life is" ) 2>&1 | tee -a $OUT/${ci}-tg-q4_1.log
+    (time ./bin/llama-completion -no-cnv --model ${model_q5_0} -ngl 99 -c 1024 -s 1234 -n 64 --ignore-eos -p "I believe the meaning of life is" ) 2>&1 | tee -a $OUT/${ci}-tg-q5_0.log
+    (time ./bin/llama-completion -no-cnv --model ${model_q5_1} -ngl 99 -c 1024 -s 1234 -n 64 --ignore-eos -p "I believe the meaning of life is" ) 2>&1 | tee -a $OUT/${ci}-tg-q5_1.log
+    (time ./bin/llama-completion -no-cnv --model ${model_q2_k} -ngl 99 -c 1024 -s 1234 -n 64 --ignore-eos -p "I believe the meaning of life is" ) 2>&1 | tee -a $OUT/${ci}-tg-q2_k.log
+    (time ./bin/llama-completion -no-cnv --model ${model_q3_k} -ngl 99 -c 1024 -s 1234 -n 64 --ignore-eos -p "I believe the meaning of life is" ) 2>&1 | tee -a $OUT/${ci}-tg-q3_k.log
+    (time ./bin/llama-completion -no-cnv --model ${model_q4_k} -ngl 99 -c 1024 -s 1234 -n 64 --ignore-eos -p "I believe the meaning of life is" ) 2>&1 | tee -a $OUT/${ci}-tg-q4_k.log
+    (time ./bin/llama-completion -no-cnv --model ${model_q5_k} -ngl 99 -c 1024 -s 1234 -n 64 --ignore-eos -p "I believe the meaning of life is" ) 2>&1 | tee -a $OUT/${ci}-tg-q5_k.log
+    (time ./bin/llama-completion -no-cnv --model ${model_q6_k} -ngl 99 -c 1024 -s 1234 -n 64 --ignore-eos -p "I believe the meaning of life is" ) 2>&1 | tee -a $OUT/${ci}-tg-q6_k.log
+
+    (time ./bin/llama-perplexity --model ${model_f16}  -f ${wiki_test} -ngl 99 -c 1024 -b 512 --chunks 2 ) 2>&1 | tee -a $OUT/${ci}-tg-f16.log
+    if [ -z ${GG_BUILD_NO_BF16} ]; then
+        (time ./bin/llama-perplexity --model ${model_bf16} -f ${wiki_test} -ngl 99 -c 1024 -b 512 --chunks 2 ) 2>&1 | tee -a $OUT/${ci}-tg-bf16.log
+    fi
+    (time ./bin/llama-perplexity --model ${model_q8_0} -f ${wiki_test} -ngl 99 -c 1024 -b 512 --chunks 2 ) 2>&1 | tee -a $OUT/${ci}-tg-q8_0.log
+    (time ./bin/llama-perplexity --model ${model_q4_0} -f ${wiki_test} -ngl 99 -c 1024 -b 512 --chunks 2 ) 2>&1 | tee -a $OUT/${ci}-tg-q4_0.log
+    (time ./bin/llama-perplexity --model ${model_q4_1} -f ${wiki_test} -ngl 99 -c 1024 -b 512 --chunks 2 ) 2>&1 | tee -a $OUT/${ci}-tg-q4_1.log
+    (time ./bin/llama-perplexity --model ${model_q5_0} -f ${wiki_test} -ngl 99 -c 1024 -b 512 --chunks 2 ) 2>&1 | tee -a $OUT/${ci}-tg-q5_0.log
+    (time ./bin/llama-perplexity --model ${model_q5_1} -f ${wiki_test} -ngl 99 -c 1024 -b 512 --chunks 2 ) 2>&1 | tee -a $OUT/${ci}-tg-q5_1.log
+    (time ./bin/llama-perplexity --model ${model_q2_k} -f ${wiki_test} -ngl 99 -c 1024 -b 512 --chunks 2 ) 2>&1 | tee -a $OUT/${ci}-tg-q2_k.log
+    (time ./bin/llama-perplexity --model ${model_q3_k} -f ${wiki_test} -ngl 99 -c 1024 -b 512 --chunks 2 ) 2>&1 | tee -a $OUT/${ci}-tg-q3_k.log
+    (time ./bin/llama-perplexity --model ${model_q4_k} -f ${wiki_test} -ngl 99 -c 1024 -b 512 --chunks 2 ) 2>&1 | tee -a $OUT/${ci}-tg-q4_k.log
+    (time ./bin/llama-perplexity --model ${model_q5_k} -f ${wiki_test} -ngl 99 -c 1024 -b 512 --chunks 2 ) 2>&1 | tee -a $OUT/${ci}-tg-q5_k.log
+    (time ./bin/llama-perplexity --model ${model_q6_k} -f ${wiki_test} -ngl 99 -c 1024 -b 512 --chunks 2 ) 2>&1 | tee -a $OUT/${ci}-tg-q6_k.log
+
+    (time ./bin/llama-imatrix --model ${model_f16} -f ${wiki_test} -ngl 99 -c 1024 -b 512 --chunks 2 ) 2>&1 | tee -a $OUT/${ci}-imatrix.log
+
+    (time ./bin/test-save-load-state --model ${model_q4_0} -ngl 10 -c 1024 -fa off --no-op-offload) 2>&1 | tee -a $OUT/${ci}-save-load-state.log
+    (time ./bin/test-save-load-state --model ${model_q4_0} -ngl 10 -c 1024 -fa on  --no-op-offload) 2>&1 | tee -a $OUT/${ci}-save-load-state.log
+    (time ./bin/test-save-load-state --model ${model_q4_0} -ngl 99 -c 1024 -fa off                ) 2>&1 | tee -a $OUT/${ci}-save-load-state.log
+    (time ./bin/test-save-load-state --model ${model_q4_0} -ngl 99 -c 1024 -fa on                 ) 2>&1 | tee -a $OUT/${ci}-save-load-state.log
+
    function check_ppl {
        qnt="$1"
        ppl=$(echo "$2" | grep -oE "[0-9]+\.[0-9]+" | tail -n 1)
@@ -422,56 +473,20 @@ function gg_run_qwen3_0_6b {
        return 0
    }

-    for qnt in q8_0 q4_0 q4_1 q5_0 q5_1 q2_k q3_k q4_k q5_k q6_k; do
-        model="${path_local}/ggml-model-${qnt}.gguf"
-
-        ./bin/llama-quantize ${model_bf16} ${model} ${qnt} $(nproc)
-
-        (time ./bin/llama-completion -no-cnv --model ${model} -ngl 99 -c 1024 -s 1234 -n 64 --ignore-eos -p "I believe the meaning of life is" ) 2>&1 | tee -a $OUT/${ci}-tg-${qnt}.log
-        (time ./bin/llama-perplexity --model ${model} -f ${wiki_test} -ngl 99 -c 1024 -b 512 --chunks 2 ) 2>&1 | tee -a $OUT/${ci}-tg-${qnt}.log
-
-        # note: ppl > 20.0 for q2_k with this model
-        if [ "${qnt}" != "q2_k" ]; then
-            check_ppl "${qnt}" "$(cat $OUT/${ci}-tg-${qnt}.log | grep "^\[1\]")"
-        fi
-
-        if [ "${qnt}" = "q4_0" ]; then
-            # q4_0 is kept for other tests
-            q4_0="${path_models}/ggml-model-q4_0.gguf"
-            ln ${model} "$q4_0" 2>/dev/null || { cp ${model} $q4_0.tmp.$$ && mv -f $q4_0.tmp.$$ $q4_0; }
-        else
-            rm -f ${model}
-        fi
-    done
-
-    (time ./bin/llama-fit-params --model ${model_f16} 2>&1 | tee -a $OUT/${ci}-fp-f16.log)
-
-    (time ./bin/llama-completion -no-cnv --model ${model_f16}  -ngl 99 -c 1024 -s 1234 -n 64 --ignore-eos -p "I believe the meaning of life is" ) 2>&1 | tee -a $OUT/${ci}-tg-f16.log
-    (time ./bin/llama-completion -no-cnv --model ${model_bf16} -ngl 99 -c 1024 -s 1234 -n 64 --ignore-eos -p "I believe the meaning of life is" ) 2>&1 | tee -a $OUT/${ci}-tg-bf16.log
-
-    (time ./bin/llama-perplexity --model ${model_f16}  -f ${wiki_test} -ngl 99 -c 1024 -b 512 --chunks 2 ) 2>&1 | tee -a $OUT/${ci}-tg-f16.log
-    if [ -z ${GG_BUILD_NO_BF16} ]; then
-        (time ./bin/llama-perplexity --model ${model_bf16} -f ${wiki_test} -ngl 99 -c 1024 -b 512 --chunks 2 ) 2>&1 | tee -a $OUT/${ci}-tg-bf16.log
-    fi
-
-    (time ./bin/llama-imatrix --model ${model_f16} -f ${wiki_test} -ngl 99 -c 1024 -b 512 --chunks 2 ) 2>&1 | tee -a $OUT/${ci}-imatrix.log
-
-    # TODO: these tests are extremely slow on WebGPU - re-enable when fixed
-    #       https://github.com/ggml-org/llama.cpp/actions/runs/39639985732
-    if [ -z ${GG_BUILD_WEBGPU} ]; then
-        (time ./bin/test-llama-context --model ${model_q4_0} -ngl 10 -c 1024 -fa off --no-op-offload) 2>&1 | tee -a $OUT/${ci}-test-llama-context.log
-        (time ./bin/test-llama-context --model ${model_q4_0} -ngl 99 -c 1024 -fa off                ) 2>&1 | tee -a $OUT/${ci}-test-llama-context.log
-    fi
-    (time ./bin/test-llama-context --model ${model_q4_0} -ngl 10 -c 1024 -fa on  --no-op-offload) 2>&1 | tee -a $OUT/${ci}-test-llama-context.log
-    (time ./bin/test-llama-context --model ${model_q4_0} -ngl 99 -c 1024 -fa on                 ) 2>&1 | tee -a $OUT/${ci}-test-llama-context.log
-
    check_ppl "f16"  "$(cat $OUT/${ci}-tg-f16.log  | grep "^\[1\]")"
    if [ -z ${GG_BUILD_NO_BF16} ]; then
        check_ppl "bf16" "$(cat $OUT/${ci}-tg-bf16.log | grep "^\[1\]")"
    fi
-
-    # scratch is rebuilt on every run; q4_0 is already published to $MNT
-    rm -rf $OUT/scratch/qwen3-0.6B $OUT/scratch/wikitext
+    check_ppl "q8_0" "$(cat $OUT/${ci}-tg-q8_0.log | grep "^\[1\]")"
+    check_ppl "q4_0" "$(cat $OUT/${ci}-tg-q4_0.log | grep "^\[1\]")"
+    check_ppl "q4_1" "$(cat $OUT/${ci}-tg-q4_1.log | grep "^\[1\]")"
+    check_ppl "q5_0" "$(cat $OUT/${ci}-tg-q5_0.log | grep "^\[1\]")"
+    check_ppl "q5_1" "$(cat $OUT/${ci}-tg-q5_1.log | grep "^\[1\]")"
+   #check_ppl "q2_k" "$(cat $OUT/${ci}-tg-q2_k.log | grep "^\[1\]")" # note: ppl > 20.0 for this quant and model
+    check_ppl "q3_k" "$(cat $OUT/${ci}-tg-q3_k.log | grep "^\[1\]")"
+    check_ppl "q4_k" "$(cat $OUT/${ci}-tg-q4_k.log | grep "^\[1\]")"
+    check_ppl "q5_k" "$(cat $OUT/${ci}-tg-q5_k.log | grep "^\[1\]")"
+    check_ppl "q6_k" "$(cat $OUT/${ci}-tg-q6_k.log | grep "^\[1\]")"

    set +e
 }
@@ -494,8 +509,6 @@ function gg_run_embd_bge_small {
    gg_wget models-mnt/bge-small/1_Pooling https://huggingface.co/BAAI/bge-small-en-v1.5/raw/main/1_Pooling/config.json

    path_models="../models-mnt/bge-small"
-    path_local="$OUT/scratch/bge-small"
-    rm -rf $path_local && mkdir -p $path_local

    rm -rf build-ci-release && mkdir build-ci-release && cd build-ci-release

@@ -504,10 +517,10 @@ function gg_run_embd_bge_small {
    (cmake -G "${CMAKE_GENERATOR}" -DCMAKE_BUILD_TYPE=Release ${CMAKE_EXTRA} .. ) 2>&1 | tee -a $OUT/${ci}-cmake.log
    (time cmake --build . --config Release -j$(nproc)) 2>&1 | tee -a $OUT/${ci}-make.log

-    python3 ../convert_hf_to_gguf.py ${path_models} --outfile ${path_local}/ggml-model-f16.gguf
+    python3 ../convert_hf_to_gguf.py ${path_models} --outfile ${path_models}/ggml-model-f16.gguf

-    model_f16="${path_local}/ggml-model-f16.gguf"
-    model_q8_0="${path_local}/ggml-model-q8_0.gguf"
+    model_f16="${path_models}/ggml-model-f16.gguf"
+    model_q8_0="${path_models}/ggml-model-q8_0.gguf"

    ./bin/llama-quantize ${model_f16} ${model_q8_0} q8_0

@@ -516,8 +529,6 @@ function gg_run_embd_bge_small {
    (time ./bin/llama-embedding --model ${model_f16}  -p "I believe the meaning of life is" -ngl 99 -c 0 --no-op-offload) 2>&1 | tee -a $OUT/${ci}-tg-f16.log
    (time ./bin/llama-embedding --model ${model_q8_0} -p "I believe the meaning of life is" -ngl 99 -c 0 --no-op-offload) 2>&1 | tee -a $OUT/${ci}-tg-q8_0.log

-    rm -rf $path_local
-
    set +e
 }

@@ -534,8 +545,6 @@ function gg_run_rerank_tiny {
    gg_wget models-mnt/rerank-tiny/ https://huggingface.co/jinaai/jina-reranker-v1-tiny-en/raw/main/vocab.json

    path_models="../models-mnt/rerank-tiny"
-    path_local="$OUT/scratch/rerank-tiny"
-    rm -rf $path_local && mkdir -p $path_local

    rm -rf build-ci-release && mkdir build-ci-release && cd build-ci-release

@@ -544,9 +553,9 @@ function gg_run_rerank_tiny {
    (cmake -G "${CMAKE_GENERATOR}" -DCMAKE_BUILD_TYPE=Release ${CMAKE_EXTRA} .. ) 2>&1 | tee -a $OUT/${ci}-cmake.log
    (time cmake --build . --config Release -j$(nproc)) 2>&1 | tee -a $OUT/${ci}-make.log

-    python3 ../convert_hf_to_gguf.py ${path_models} --outfile ${path_local}/ggml-model-f16.gguf
+    python3 ../convert_hf_to_gguf.py ${path_models} --outfile ${path_models}/ggml-model-f16.gguf

-    model_f16="${path_local}/ggml-model-f16.gguf"
+    model_f16="${path_models}/ggml-model-f16.gguf"

    (time ./bin/llama-fit-params --model ${model_f16} 2>&1 | tee -a $OUT/${ci}-fp-f16.log)

@@ -576,8 +585,6 @@ function gg_run_rerank_tiny {
    check_score "rerank score 1" "$(cat $OUT/${ci}-rk-f16.log | grep "rerank score 1")" "0.00" "0.05" | tee -a $OUT/${ci}-rk-f16.log
    check_score "rerank score 2" "$(cat $OUT/${ci}-rk-f16.log | grep "rerank score 2")" "0.10" "0.30" | tee -a $OUT/${ci}-rk-f16.log

-    rm -rf $path_local
-
    set +e
 }

@@ -650,6 +657,12 @@ function gg_run_test_backend_ops {
    fi
    local args_extra="-j ${n_jobs}"

+    # TODO: fix multi-threaded for ROCm
+    #       https://github.com/ggml-org/llama.cpp/actions/runs/34576278519/job/103297889044?pr=28740#step:3:4865
+    if [ ! -z ${GG_BUILD_ROCM} ]; then
+        args_extra=""
+    fi
+
    # TODO: MoltenVK bug?
    #       https://github.com/ggml-org/llama.cpp/actions/runs/34611260059/job/103302413736?pr=28740#step:3:5897
    if [ ! -z "${GG_BUILD_VULKAN}" ] && [ "$(uname -s)" = "Darwin" ]; then
@@ -684,11 +697,11 @@ if [ -z ${GG_BUILD_LOW_PERF} ]; then
    ln -sfn ${mnt_models} ${SRC}/models-mnt

    # Create a fresh python3 venv and enter it
-    if ! python3 -m venv "$OUT/venv"; then
-        echo "Error: Failed to create Python virtual environment at $OUT/venv."
+    if ! python3 -m venv "$MNT/venv"; then
+        echo "Error: Failed to create Python virtual environment at $MNT/venv."
        exit 1
    fi
-    source "$OUT/venv/bin/activate"
+    source "$MNT/venv/bin/activate"

    pip install -r ${SRC}/requirements.txt --disable-pip-version-check
    pip install --editable gguf-py --disable-pip-version-check
@@ -2,7 +2,7 @@ include("ggml/cmake/common.cmake")

 function(llama_add_compile_flags)
    if (LLAMA_FATAL_WARNINGS)
-        if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "IntelLLVM")
+        if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
            list(APPEND C_FLAGS   -Werror)
            list(APPEND CXX_FLAGS -Werror)
        elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
@@ -78,8 +78,6 @@ add_library(${TARGET}
    download.h
    fit.cpp
    fit.h
-    file-lock.cpp
-    file-lock.h
    hf-cache.cpp
    hf-cache.h
    http.h
@@ -186,8 +184,3 @@ if (LLAMA_LLGUIDANCE)
 endif()

 target_link_libraries(${TARGET} PUBLIC llama Threads::Threads)
-
-if (CMAKE_SYSTEM_NAME MATCHES "AIX")
-    # AIX's flock() function comes from libbsd.a
-    target_link_libraries(${TARGET} PRIVATE -lbsd)
-endif()
@@ -351,7 +351,7 @@ static bool parse_bool_value(const std::string & value) {
 static std::string get_default_local_path(const std::string & url) {
    auto f = string_split<std::string>(url, '#').front();
    f = string_split<std::string>(f, '?').front();
-    return fs_path_to_utf8(fs_get_cache_file(string_split<std::string>(f, '/').back()));
+    return fs_get_cache_file(string_split<std::string>(f, '/').back());
 }

 static bool spec_types_is_default(const common_params & params) {
@@ -387,9 +387,6 @@ common_models_handler common_models_handler_init(const common_params & params, l
            break;
        }
    }
-    if (curr_ex == LLAMA_EXAMPLE_DOWNLOAD) {
-        use_mmproj = true;
-    }

    opts.bearer_token    = params.hf_token;
    opts.offline         = params.offline;
@@ -470,14 +467,6 @@ void common_models_handler_apply(common_models_handler & handler, common_params
    auto opts = handler.opts; // copy
    opts.callback = callback;

-    // another process may hold the cache lock during finalization:
-    // let the download callback cancel that wait too
-    auto finalize = [callback](const hf_cache::hf_file & f) {
-        return hf_cache::finalize_file(f, [callback]() {
-            return !(callback && callback->is_cancelled());
-        });
-    };
-
    // handle plain "url" if needed
    auto handle_url = [&](common_params_model & model) {
        if (!model.url.empty()) {
@@ -526,7 +515,7 @@ void common_models_handler_apply(common_models_handler & handler, common_params
    }

    // handle hf_plan tasks
-    auto add_tasks = [&opts, &tasks, &finalize](const hf_cache::hf_files  & model_files,
+    auto add_tasks = [&opts, &tasks](const hf_cache::hf_files  & model_files,
                                    const hf_cache::hf_file    & primary,
                                    common_params_model        & model) {
        for (size_t i = 0; i < model_files.size(); ++i) {
@@ -535,9 +524,9 @@ void common_models_handler_apply(common_models_handler & handler, common_params
            tasks.emplace_back(model_file, opts, [&, is_primary]() {
                if (is_primary) {
                    // the primary file is the first split (00001-of), use it as model path
-                    model.path = finalize(model_file);
+                    model.path = hf_cache::finalize_file(model_file);
                } else {
-                    finalize(model_file);
+                    hf_cache::finalize_file(model_file);
                }
            });
        }
@@ -589,9 +578,9 @@ void common_models_handler_apply(common_models_handler & handler, common_params
        tasks.emplace_back(plan_spec.mtp, opts, [&]() {
            // only use the discovered MTP head when no draft path is set yet
            if (params.speculative.draft.mparams.path.empty()) {
-                params.speculative.draft.mparams.path = finalize(plan_spec.mtp);
+                params.speculative.draft.mparams.path = hf_cache::finalize_file(plan_spec.mtp);
            } else {
-                finalize(plan_spec.mtp);
+                hf_cache::finalize_file(plan_spec.mtp);
            }
        });
    }
@@ -599,9 +588,9 @@ void common_models_handler_apply(common_models_handler & handler, common_params
        tasks.emplace_back(plan_spec.dflash, opts, [&]() {
            // only use the discovered DFlash sidecar when no draft path is set yet
            if (params.speculative.draft.mparams.path.empty()) {
-                params.speculative.draft.mparams.path = finalize(plan_spec.dflash);
+                params.speculative.draft.mparams.path = hf_cache::finalize_file(plan_spec.dflash);
            } else {
-                finalize(plan_spec.dflash);
+                hf_cache::finalize_file(plan_spec.dflash);
            }
        });
    }
@@ -609,9 +598,9 @@ void common_models_handler_apply(common_models_handler & handler, common_params
        tasks.emplace_back(plan_spec.eagle3, opts, [&]() {
            // only use the discovered Eagle3 sidecar when no draft path is set yet
            if (params.speculative.draft.mparams.path.empty()) {
-                params.speculative.draft.mparams.path = finalize(plan_spec.eagle3);
+                params.speculative.draft.mparams.path = hf_cache::finalize_file(plan_spec.eagle3);
            } else {
-                finalize(plan_spec.eagle3);
+                hf_cache::finalize_file(plan_spec.eagle3);
            }
        });
    }
@@ -619,9 +608,9 @@ void common_models_handler_apply(common_models_handler & handler, common_params
        tasks.emplace_back(plan_spec.dspark, opts, [&]() {
            // only use the discovered DSpark sidecar when no draft path is set yet
            if (params.speculative.draft.mparams.path.empty()) {
-                params.speculative.draft.mparams.path = finalize(plan_spec.dspark);
+                params.speculative.draft.mparams.path = hf_cache::finalize_file(plan_spec.dspark);
            } else {
-                finalize(plan_spec.dspark);
+                hf_cache::finalize_file(plan_spec.dspark);
            }
        });
    }
@@ -642,16 +631,16 @@ void common_models_handler_apply(common_models_handler & handler, common_params
    }
    if (!plan.mmproj.local_path.empty()) {
        tasks.emplace_back(plan.mmproj, opts, [&]() {
-            params.mmproj.path = finalize(plan.mmproj);
+            params.mmproj.path = hf_cache::finalize_file(plan.mmproj);
        });
    }
    if (!plan.mtp.local_path.empty() && !had_spec_url) {
        tasks.emplace_back(plan.mtp, opts, [&]() {
            // only fall back to the discovered MTP head when no draft was explicitly provided
            if (params.speculative.draft.mparams.empty()) {
-                params.speculative.draft.mparams.path = finalize(plan.mtp);
+                params.speculative.draft.mparams.path = hf_cache::finalize_file(plan.mtp);
            } else {
-                finalize(plan.mtp);
+                hf_cache::finalize_file(plan.mtp);
            }
        });
    }
@@ -659,9 +648,9 @@ void common_models_handler_apply(common_models_handler & handler, common_params
        tasks.emplace_back(plan.dflash, opts, [&]() {
            // only fall back to the discovered DFlash sidecar when no draft was explicitly provided
            if (params.speculative.draft.mparams.empty()) {
-                params.speculative.draft.mparams.path = finalize(plan.dflash);
+                params.speculative.draft.mparams.path = hf_cache::finalize_file(plan.dflash);
            } else {
-                finalize(plan.dflash);
+                hf_cache::finalize_file(plan.dflash);
            }
        });
    }
@@ -669,9 +658,9 @@ void common_models_handler_apply(common_models_handler & handler, common_params
        tasks.emplace_back(plan.eagle3, opts, [&]() {
            // only fall back to the discovered Eagle3 sidecar when no draft was explicitly provided
            if (params.speculative.draft.mparams.empty()) {
-                params.speculative.draft.mparams.path = finalize(plan.eagle3);
+                params.speculative.draft.mparams.path = hf_cache::finalize_file(plan.eagle3);
            } else {
-                finalize(plan.eagle3);
+                hf_cache::finalize_file(plan.eagle3);
            }
        });
    }
@@ -679,9 +668,9 @@ void common_models_handler_apply(common_models_handler & handler, common_params
        tasks.emplace_back(plan.dspark, opts, [&]() {
            // only fall back to the discovered DSpark sidecar when no draft was explicitly provided
            if (params.speculative.draft.mparams.empty()) {
-                params.speculative.draft.mparams.path = finalize(plan.dspark);
+                params.speculative.draft.mparams.path = hf_cache::finalize_file(plan.dspark);
            } else {
-                finalize(plan.dspark);
+                hf_cache::finalize_file(plan.dspark);
            }
        });
    }
@@ -689,11 +678,8 @@ void common_models_handler_apply(common_models_handler & handler, common_params
        tasks.emplace_back(plan.preset, opts, [&]() {
            // if HF repo is a preset repo, we simply run server in router mode with the preset.ini file
            params.models_preset_hf = params.model.hf_repo; // only for showing a warning
-            params.models_preset    = finalize(plan.preset);
-            // clear the model so the server starts in router mode
-            params.model.path.clear();
-            params.model.hf_repo.clear();
-            params.model.docker_repo.clear();
+            params.models_preset    = hf_cache::finalize_file(plan.preset);
+            params.model = common_params_model{}; // make sure to clear model, so server starts in router mode
        });
    }

@@ -731,24 +717,24 @@ void common_models_handler_apply(common_models_handler & handler, common_params
 // 1. system-wide: /etc/llama.cpp/config.ini (%PROGRAMDATA%\llama.cpp\config.ini on windows)
 // 2. user-level: ${XDG_CONFIG_HOME:-~/.config}/llama.cpp/config.ini (%APPDATA%\llama.cpp\config.ini on windows)
 static void common_params_apply_system_config(common_params & params, llama_example ex) {
-    std::vector<std::filesystem::path> paths;
+    std::vector<std::string> paths;

 #if defined(_WIN32)
-    const std::filesystem::path program_data = common_get_path_from_env("PROGRAMDATA");
+    const std::string program_data = common_get_env("PROGRAMDATA");
    if (!program_data.empty()) {
-        paths.push_back(program_data / "llama.cpp" / "config.ini");
+        paths.push_back(program_data + "\\llama.cpp\\config.ini");
    }
 #else
    paths.push_back("/etc/llama.cpp/config.ini");
 #endif

    try {
-        paths.push_back(fs_get_config_directory() / "config.ini");
+        paths.push_back(fs_get_config_directory() + "config.ini");
    } catch (const std::exception & e) {
        LOG_DBG("cannot read user-level config file, skipping: %s\n", e.what());
    }

-    std::vector<std::filesystem::path> found;
+    std::vector<std::string> found;
    for (const auto & path : paths) {
        std::error_code ec;
        if (std::filesystem::exists(path, ec)) {
@@ -762,7 +748,7 @@ static void common_params_apply_system_config(common_params & params, llama_exam
    common_preset_context ctx(ex);
    ctx.ignore_unknown_keys = true; // the same config file is shared by all programs
    for (const auto & path : found) {
-        LOG_INF("using config file: %s\n", fs_path_to_utf8(path).c_str());
+        LOG_INF("using config file: %s\n", path.c_str());
        common_preset global;
        common_presets presets = ctx.load_from_ini(path, global);
        global.apply_to_params(params);
@@ -1487,7 +1473,7 @@ common_params_context common_params_parser_init(common_params & params, llama_ex
    ));
    add_opt(common_arg(
        {"--server-base"}, "URL",
-        string_format("connect to this server instead of starting a new one, example: 'http://localhost:9931' (default: none)"),
+        string_format("connect to this server instead of starting a new one, example: 'http://localhost:8080' (default: none)"),
        [](common_params & params, const std::string & value) {
            params.server_base = value;
        }
@@ -1725,11 +1711,10 @@ common_params_context common_params_parser_init(common_params & params, llama_ex
    ).set_env("LLAMA_ARG_CHECKPOINT_MIN_SPACING_NT").set_examples({LLAMA_EXAMPLE_SERVER}));
    add_opt(common_arg(
        {"-cram", "--cache-ram"}, "N",
-        string_format("set the maximum cache size in MiB (default: %d, 0 for decision models, -1 - no limit, 0 - disable)"
+        string_format("set the maximum cache size in MiB (default: %d, -1 - no limit, 0 - disable)"
            "[(more info)](https://github.com/ggml-org/llama.cpp/pull/16391)", params.cache_ram_mib),
        [](common_params & params, int value) {
            params.cache_ram_mib = value;
-            params.cache_ram_explicit = true;
        }
    ).set_env("LLAMA_ARG_CACHE_RAM").set_examples({LLAMA_EXAMPLE_SERVER, LLAMA_EXAMPLE_CLI}));
    add_opt(common_arg(
@@ -1739,7 +1724,7 @@ common_params_context common_params_parser_init(common_params & params, llama_ex
        [](common_params & params, bool value) {
            params.kv_unified = value;
        }
-    ).set_env("LLAMA_ARG_KV_UNIFIED").set_examples({LLAMA_EXAMPLE_SERVER, LLAMA_EXAMPLE_PERPLEXITY, LLAMA_EXAMPLE_BATCHED, LLAMA_EXAMPLE_BENCH, LLAMA_EXAMPLE_PARALLEL, LLAMA_EXAMPLE_SPECULATIVE}));
+    ).set_env("LLAMA_ARG_KV_UNIFIED").set_examples({LLAMA_EXAMPLE_SERVER, LLAMA_EXAMPLE_PERPLEXITY, LLAMA_EXAMPLE_BATCHED, LLAMA_EXAMPLE_BENCH, LLAMA_EXAMPLE_PARALLEL}));
    add_opt(common_arg(
        {"--cache-idle-slots"},
        {"--no-cache-idle-slots"},
@@ -2688,17 +2673,16 @@ common_params_context common_params_parser_init(common_params & params, llama_ex
            params.video_ffmpeg_bin_dir = value;
        }
    ).set_examples(mmproj_examples).set_env("LLAMA_ARG_VIDEO_FFMPEG_DIR"));
-    add_opt(common_arg(
-        {"--rpc"}, "SERVERS",
-        "comma-separated list of RPC servers (host:port)",
-        [](common_params & params, const std::string & value) {
-            if (!llama_supports_rpc()) {
-                throw std::invalid_argument("RPC not supported in this build");
+    if (params.is_gen_docs || llama_supports_rpc()) {
+        add_opt(common_arg(
+            {"--rpc"}, "SERVERS",
+            "comma-separated list of RPC servers (host:port)",
+            [](common_params & params, const std::string & value) {
+                add_rpc_devices(value);
+                GGML_UNUSED(params);
            }
-            add_rpc_devices(value);
-            GGML_UNUSED(params);
-        }
-    ).set_env("LLAMA_ARG_RPC"));
+        ).set_env("LLAMA_ARG_RPC"));
+    }
    add_opt(common_arg(
        {"-lm", "--load-mode"}, "MODE",
        "model loading mode (default: auto)\n"
@@ -2785,16 +2769,6 @@ common_params_context common_params_parser_init(common_params & params, llama_ex
            llm_add_n_cpu_ffn_overrides(value, LLM_FFN_EXPS_REGEX, params.tensor_buft_overrides);
        }
    ).set_env("LLAMA_ARG_N_CPU_MOE"));
-    add_opt(common_arg(
-        {"--moe-cache-mib"}, "N",
-        "GPU cache size in MiB for the MoE experts kept in the CPU. with multiple GPUs, it is split among them like the layers (--tensor-split) (default: 0, disabled)",
-        [](common_params & params, int value) {
-            if (value < 0) {
-                throw std::invalid_argument("invalid value");
-            }
-            params.moe_cache_size = (size_t) value*1024*1024;
-        }
-    ).set_env("LLAMA_ARG_MOE_CACHE_MIB"));
    add_opt(common_arg(
        {"-ncffn", "--n-cpu-ffn"}, "N",
        "keep the dense FFN weights of the first N layers in the CPU\n"
@@ -3202,13 +3176,6 @@ common_params_context common_params_parser_init(common_params & params, llama_ex
            params.process_output = true;
        }
    ).set_examples({LLAMA_EXAMPLE_IMATRIX}));
-    add_opt(common_arg(
-        {"--nextn"},
-        string_format("collect data for MTP/NextN layers (default: %s)", params.load_mtp ? "true" : "false"),
-        [](common_params & params) {
-            params.load_mtp = true;
-        }
-    ).set_examples({LLAMA_EXAMPLE_IMATRIX}));
    add_opt(common_arg(
        {"--ppl"},
        {"--no-ppl"},
@@ -3502,26 +3469,6 @@ common_params_context common_params_parser_init(common_params & params, llama_ex
            params.ui = value;
        }
    ).set_examples({LLAMA_EXAMPLE_SERVER}).set_env("LLAMA_ARG_UI"));
-    add_opt(common_arg(
-        {"--connect"},
-        string_format("(experimental) open a peer-to-peer tunnel for server using llama-connect (default: %s)", params.server_connect ? "enabled" : "disabled"),
-        [](common_params & params) {
-            params.server_connect = true;
-        }
-    ).set_examples({LLAMA_EXAMPLE_SERVER}).set_env("LLAMA_ARG_CONNECT"));
-    add_opt(common_arg(
-        {"--connect-code"}, "CODE",
-        "manually specify a 40-character code for --connect (default: generate a new one for each run)",
-        [](common_params & params, const std::string & value) {
-            std::string val = value;
-            string_replace_all(val, "-", "");
-            string_replace_all(val, " ", "");
-            if (val.size() != 40) {
-                throw std::invalid_argument(string_format("error: invalid connect code '%s', must be 40 characters\n", value.c_str()));
-            }
-            params.server_connect_code = val;
-        }
-    ).set_examples({LLAMA_EXAMPLE_SERVER}).set_env("LLAMA_ARG_CONNECT_CODE"));
    add_opt(common_arg(
        {"--embedding", "--embeddings"},
        string_format("restrict to only support embedding use case; use only with dedicated embedding models (default: %s)", params.embedding ? "enabled" : "disabled"),
@@ -3672,7 +3619,7 @@ common_params_context common_params_parser_init(common_params & params, llama_ex
                params.slot_save_path += DIRECTORY_SEPARATOR;
            }
        }
-    ).set_examples({LLAMA_EXAMPLE_SERVER}).set_env("LLAMA_ARG_SLOT_SAVE_PATH"));
+    ).set_examples({LLAMA_EXAMPLE_SERVER}));
    add_opt(common_arg(
        {"--media-path"}, "PATH",
        "directory for loading local media files; files can be accessed via file:// URLs using relative paths (default: disabled)",
@@ -4202,16 +4149,6 @@ common_params_context common_params_parser_init(common_params & params, llama_ex
            params.speculative.draft.n_min = value;
        }
    ).set_spec().set_examples({LLAMA_EXAMPLE_SPECULATIVE, LLAMA_EXAMPLE_LOOKUP, LLAMA_EXAMPLE_SERVER, LLAMA_EXAMPLE_CLI}).set_env("LLAMA_ARG_SPEC_DRAFT_N_MIN"));
-    add_opt(common_arg(
-        {"--spec-draft-n-ubatch"}, "N",
-        string_format("physical maximum batch size of the draft context, use a smaller value to spare VRAM (default: %d - same as --n-ubatch)", params.speculative.draft.n_ubatch),
-        [](common_params & params, int value) {
-            if (value < 0) {
-                throw std::invalid_argument("invalid value");
-            }
-            params.speculative.draft.n_ubatch = value;
-        }
-    ).set_spec().set_examples({LLAMA_EXAMPLE_SPECULATIVE, LLAMA_EXAMPLE_SERVER, LLAMA_EXAMPLE_CLI}).set_env("LLAMA_ARG_SPEC_DRAFT_N_UBATCH"));
    add_opt(common_arg(
        {"--spec-synth-len"}, "L",
        "target mean synthetic acceptance length, including the target token (benchmarking only)",
@@ -4268,21 +4205,6 @@ common_params_context common_params_parser_init(common_params & params, llama_ex
            params.speculative.draft.backend_sampling = value;
        }
    ).set_spec().set_examples({LLAMA_EXAMPLE_SPECULATIVE, LLAMA_EXAMPLE_SERVER, LLAMA_EXAMPLE_CLI}).set_env("LLAMA_ARG_SPEC_DRAFT_BACKEND_SAMPLING"));
-    add_opt(common_arg(
-        {"--spec-draft-sampling"}, "{greedy,probabilistic}",
-        string_format("how the draft is sampled: greedy takes its argmax, probabilistic samples it and has "
-                      "the target verify by rejection sampling (default: %s)",
-                      params.speculative.draft.probabilistic ? "probabilistic" : "greedy"),
-        [](common_params & params, const std::string & value) {
-            if (value == "greedy") {
-                params.speculative.draft.probabilistic = false;
-            } else if (value == "probabilistic") {
-                params.speculative.draft.probabilistic = true;
-            } else {
-                throw std::invalid_argument("invalid value, must be one of: greedy, probabilistic");
-            }
-        }
-    ).set_spec().set_examples({LLAMA_EXAMPLE_SPECULATIVE, LLAMA_EXAMPLE_SERVER, LLAMA_EXAMPLE_CLI}).set_env("LLAMA_ARG_SPEC_DRAFT_SAMPLING"));
    add_opt(common_arg(
        {"--spec-draft-device", "-devd", "--device-draft"}, "<dev1,dev2,..>",
        "comma-separated list of devices to use for offloading the draft model (none = don't offload, default: follows --device)\n"
@@ -4318,7 +4240,7 @@ common_params_context common_params_parser_init(common_params & params, llama_ex
            params.speculative.draft.mparams.path = value;
            params.speculative.draft.mparams.hf_file = value; // will be used if --spec-draft-hf is set
        }
-    ).set_spec().set_examples({LLAMA_EXAMPLE_SPECULATIVE, LLAMA_EXAMPLE_SERVER, LLAMA_EXAMPLE_CLI, LLAMA_EXAMPLE_IMATRIX}).set_env("LLAMA_ARG_SPEC_DRAFT_MODEL"));
+    ).set_spec().set_examples({LLAMA_EXAMPLE_SPECULATIVE, LLAMA_EXAMPLE_SERVER, LLAMA_EXAMPLE_CLI}).set_env("LLAMA_ARG_SPEC_DRAFT_MODEL"));
    add_opt(common_arg(
        {"--spec-type"}, common_speculative_all_types_str(),
        string_format("comma-separated list of types of speculative decoding to use (default: %s)\n",
@@ -58,10 +58,11 @@ common_chat_params peg_generator::generate_parser(const common_chat_template &
            data.generation_prompt += msg.render_content();
        }

-        data.prompt.append(data.generation_prompt);
+        data.prompt += data.generation_prompt;
    }

-    data.parser = autoparser.build_parser(inputs, parser_generation_prompt);
+    auto parser = autoparser.build_parser(inputs, parser_generation_prompt);
+    data.parser = parser.save();

    // Build grammar if tools are present
    bool has_tools =
@@ -77,7 +78,7 @@ common_chat_params peg_generator::generate_parser(const common_chat_template &
    if (include_grammar) {
        data.grammar_lazy = !has_response_format && inputs.tool_choice == COMMON_CHAT_TOOL_CHOICE_AUTO;
        data.grammar      = build_grammar([&](const common_grammar_builder & builder) {
-            data.parser.build_grammar(builder, data.grammar_lazy);
+            parser.build_grammar(builder, data.grammar_lazy);
        });

        // Set grammar triggers based on tool section markers (fall back to per-call markers)
@@ -290,7 +291,7 @@ common_peg_parser analyze_tools::build_tool_parser_tag_json(parser_build_context

    common_peg_parser tool_choice = p.choice();

-    foreach_function(inputs.tools, [&](size_t tool_index, const json & tool) {
+    foreach_function(inputs.tools, [&](const json & tool) {
        const auto & func   = tool.at("function");
        std::string  name   = func.at("name");
        const auto   schema = common_chat_tool_parameters(func);
@@ -307,7 +308,7 @@ common_peg_parser analyze_tools::build_tool_parser_tag_json(parser_build_context
            }
            have_call_id = true;
        }
-        auto args_parser = p.tool_args(p.schema(p.json(), "tool-" + std::to_string(tool_index) + "-schema", schema));
+        auto args_parser = p.tool_args(p.schema(p.json(), "tool-" + name + "-schema", schema));
        if (!arguments.start.empty()) {
            args_parser = p.literal(arguments.start) + args_parser;
        }
@@ -317,7 +318,7 @@ common_peg_parser analyze_tools::build_tool_parser_tag_json(parser_build_context

        auto atomic_peek = !arguments.start.empty() ? std::optional(p.peek(p.literal(arguments.start))) : std::nullopt;
        auto func_parser = build_func_parser(p, name, call_id_section, have_call_id, args_parser, atomic_peek);
-        tool_choice |= p.rule("tool-" + std::to_string(tool_index), func_parser);
+        tool_choice |= p.rule("tool-" + name, func_parser);
    });

    auto require_calls = inputs.tool_choice == COMMON_CHAT_TOOL_CHOICE_REQUIRED;
@@ -363,14 +364,14 @@ common_peg_parser analyze_tools::build_tool_parser_tag_tagged(parser_build_conte

    common_peg_parser tool_choice = p.choice();

-    foreach_function(inputs.tools, [&](size_t tool_index, const json & tool) {
+    foreach_function(inputs.tools, [&](const json & tool) {
        const auto & func = tool.at("function");
        std::string  name = func.at("name");

        // Build parser for each argument, separating required and optional
        std::vector<common_peg_parser> required_parsers;
        std::vector<common_peg_parser> optional_parsers;
-        foreach_parameter(func, [&](size_t param_index, const common_chat_schema_property & param, const common_chat_schema_document_ptr & doc) {
+        foreach_parameter(func, [&](const common_chat_schema_property & param, const common_chat_schema_document_ptr & doc) {
            auto arg =
                p.tool_arg(p.tool_arg_open(arguments.name_prefix + p.tool_arg_name(p.literal(param.name)) +
                                           arguments.name_suffix) +
@@ -379,10 +380,10 @@ common_peg_parser analyze_tools::build_tool_parser_tag_tagged(parser_build_conte
                                p.ac(p.tool_arg_string_value(until_suffix) +
                                    p.tool_arg_close(p.literal(arguments.value_suffix)), arguments.value_suffix) :
                                (p.tool_arg_json_value(p.schema(
-                                    p.json(), "tool-" + std::to_string(tool_index) + "-arg-" + std::to_string(param_index) + "-schema", doc, *param.schema)) +
+                                    p.json(), "tool-" + name + "-arg-" + param.name + "-schema", doc, *param.schema)) +
                                    p.tool_arg_close(p.literal(arguments.value_suffix)))));

-            auto named_arg = p.rule("tool-" + std::to_string(tool_index) + "-arg-" + std::to_string(param_index), arg);
+            auto named_arg = p.rule("tool-" + name + "-arg-" + param.name, arg);
            if (param.required) {
                required_parsers.push_back(named_arg);
            } else {
@@ -433,7 +434,7 @@ common_peg_parser analyze_tools::build_tool_parser_tag_tagged(parser_build_conte
        auto atomic_peek = (!arguments.name_prefix.empty() && !required_parsers.empty()) ?
            std::optional(p.peek(p.literal(arguments.name_prefix))) : std::nullopt;
        auto func_parser = build_func_parser(p, name, call_id_section, have_call_id, args_seq, atomic_peek);
-        tool_choice |= p.rule("tool-" + std::to_string(tool_index), func_parser);
+        tool_choice |= p.rule("tool-" + name, func_parser);
    });

    auto require_tools = inputs.tool_choice == COMMON_CHAT_TOOL_CHOICE_REQUIRED;
@@ -322,7 +322,7 @@ std::string apply_template(const common_chat_template & tmpl, const template_par
    tmpl_params.extra_context["enable_thinking"] = params.enable_thinking;

    try {
-        return common_chat_template_direct_apply(tmpl, tmpl_params).str();
+        return common_chat_template_direct_apply(tmpl, tmpl_params);
    } catch (const std::exception & e) {
        LOG_DBG("Template application failed: %s\n", e.what());
        return ERR_TMPL;
@@ -451,7 +451,6 @@ void common_chat_peg_mapper::map(const common_peg_ast_node & node) {
                result.tool_calls.push_back(pending_tool_call.value());
            }
            pending_tool_call.reset();
-            current_tool = nullptr;
        }
    }
 }
@@ -483,9 +482,7 @@ common_peg_parser common_chat_peg_builder::standard_constructed_tools(
    // Build tool choices for tagged format
    auto tool_choices = choice();

-    for (size_t i = 0; i < tools.size(); i++) {
-        const auto & tool_def = tools[i];
-
+    for (const auto & tool_def : tools) {
        if (!tool_def.contains("function")) {
            continue;
        }
@@ -515,7 +512,7 @@ common_peg_parser common_chat_peg_builder::standard_constructed_tools(
        auto tool_parser = tool(tool_open(literal(func_opener) + tool_name(literal(name)) + literal(func_name_suffix)) +
                                space() + tool_args(args) + space() + tool_close(literal(func_closer)));

-        tool_choices |= rule("tool-" + std::to_string(i), tool_parser);
+        tool_choices |= rule("tool-" + name, tool_parser);
    }

    // Build the section with markers
@@ -562,8 +559,7 @@ common_peg_parser common_chat_peg_builder::python_style_tool_calls(

    auto tool_choices = choice();

-    for (size_t i = 0; i < tools.size(); i++) {
-        const auto & tool_def = tools[i];
+    for (const auto & tool_def : tools) {
        if (!tool_def.contains("function")) {
            continue;
        }
@@ -610,7 +606,7 @@ common_peg_parser common_chat_peg_builder::python_style_tool_calls(
            space() + tool_args(args) + space() + tool_close(literal(")"))
        );

-        tool_choices |= rule("tool-" + std::to_string(i), tool_parser);
+        tool_choices |= rule("tool-" + name, tool_parser);
    }

    if (parallel_tool_calls) {
@@ -638,8 +634,7 @@ common_peg_parser common_chat_peg_builder::build_json_tools_function_is_key(

    auto tool_choices = choice();

-    for (size_t i = 0; i < tools.size(); i++) {
-        const auto & tool_def = tools[i];
+    for (const auto & tool_def : tools) {
        if (!tool_def.contains("function")) {
            continue;
        }
@@ -672,10 +667,10 @@ common_peg_parser common_chat_peg_builder::build_json_tools_function_is_key(
        // Arguments — either wrapped in args_key or parsed directly
        common_peg_parser args_parser = eps();
        if (args_key.empty()) {
-            args_parser = tool_args(schema(json(), "tool-" + std::to_string(i) + "-schema", params));
+            args_parser = tool_args(schema(json(), "tool-" + name + "-schema", params));
        } else {
            args_parser = literal("\"" + effective_args_key + "\"") + space() + literal(":") + space() +
-                          tool_args(schema(json(), "tool-" + std::to_string(i) + "-schema", params));
+                          tool_args(schema(json(), "tool-" + name + "-schema", params));
        }
        inner_fields.push_back(args_parser);

@@ -702,7 +697,7 @@ common_peg_parser common_chat_peg_builder::build_json_tools_function_is_key(
            space() + tool_close(literal("}"))
        );

-        tool_choices |= rule("tool-" + std::to_string(i), tool_parser);
+        tool_choices |= rule("tool-" + name, tool_parser);
    }

    return tool_choices;
@@ -725,8 +720,7 @@ common_peg_parser common_chat_peg_builder::build_json_tools_nested_keys(
    std::string nested_name_field = !name_spec.first.empty() ? name_spec.second  : effective_name_key;
    std::string nested_args_field = !args_spec.first.empty() ? args_spec.second  : effective_args_key;

-    for (size_t i = 0; i < tools.size(); i++) {
-        const auto & tool_def = tools[i];
+    for (const auto & tool_def : tools) {
        if (!tool_def.contains("function")) {
            continue;
        }
@@ -737,7 +731,7 @@ common_peg_parser common_chat_peg_builder::build_json_tools_nested_keys(
        auto nested_name = literal("\"" + nested_name_field + "\"") + space() + literal(":") + space() +
                          atomic(literal("\"") + tool_name(literal(name)) + literal("\""));
        auto nested_args = literal("\"" + nested_args_field + "\"") + space() + literal(":") + space() +
-                          tool_args(schema(json(), "tool-" + std::to_string(i) + "-schema", params));
+                          tool_args(schema(json(), "tool-" + name + "-schema", params));

        auto nested_object = literal("{") + space() +
                            nested_name + space() + literal(",") + space() +
@@ -775,7 +769,7 @@ common_peg_parser common_chat_peg_builder::build_json_tools_nested_keys(
        auto nested_field = literal("\"" + nested_prefix + "\"") + space() + literal(":") + space() + nested_object;
        tool_parser_body = tool_parser_body + nested_field + space() + tool_close(literal("}"));

-        tool_choices |= rule("tool-" + std::to_string(i), tool(tool_parser_body));
+        tool_choices |= rule("tool-" + name, tool(tool_parser_body));
    }

    return tool_choices;
@@ -795,8 +789,7 @@ common_peg_parser common_chat_peg_builder::build_json_tools_flat_keys(
    auto name_key_parser = literal("\"" + effective_name_key + "\"");
    auto args_key_parser = literal("\"" + effective_args_key + "\"");

-    for (size_t i = 0; i < tools.size(); i++) {
-        const auto & tool_def = tools[i];
+    for (const auto & tool_def : tools) {
        if (!tool_def.contains("function")) {
            continue;
        }
@@ -807,7 +800,7 @@ common_peg_parser common_chat_peg_builder::build_json_tools_flat_keys(
        auto tool_name_ = name_key_parser + space() + literal(":") + space() +
                         atomic(literal("\"") + tool_name(literal(name)) + literal("\""));
        auto tool_args_ = args_key_parser + space() + literal(":") + space() +
-                         tool_args(schema(json(), "tool-" + std::to_string(i) + "-schema", params));
+                         tool_args(schema(json(), "tool-" + name + "-schema", params));

        // Build ID parsers if keys are provided
        common_peg_parser id_parser = eps();
@@ -867,7 +860,7 @@ common_peg_parser common_chat_peg_builder::build_json_tools_flat_keys(
        }
        ordered_body = ordered_body + space() + tool_close(literal("}"));

-        tool_choices |= rule("tool-" + std::to_string(i), tool(ordered_body));
+        tool_choices |= rule("tool-" + name, tool(ordered_body));
    }

    return tool_choices;
@@ -9,7 +9,6 @@
 #include "json.h"
 #include "log.h"
 #include "parsers/parsers.h"
-#include "sampling.h"

 #include "jinja/value.h"
 #include "jinja/runtime.h"
@@ -113,6 +112,38 @@ const char * common_chat_role_to_string(common_chat_role role) {
    return "";
 }

+json common_chat_msg_delimiters::to_json() const {
+    json result = json::array();
+    for (const auto & d : delimiters) {
+        result.push_back({
+            { "role",      common_chat_role_to_string(d.role) },
+            { "delimiter", d.delimiter                        },
+        });
+    }
+    return result;
+}
+
+common_chat_msg_delimiters common_chat_msg_delimiters_parse(const json & delimiters) {
+    common_chat_msg_delimiters result;
+
+    if (!delimiters.is_array()) {
+        return result;
+    }
+
+    result.delimiters.reserve(delimiters.size());
+    for (const auto & d : delimiters) {
+        if (!d.is_object()) {
+            continue;
+        }
+        result.delimiters.push_back({
+            common_chat_role_from_string(d.value("role", std::string())),
+            d.value("delimiter", std::string()),
+        });
+    }
+
+    return result;
+}
+
 void common_chat_msg_delimiters::tokenize(const llama_vocab * vocab) {
    for (auto & d : delimiters) {
        d.tokens = common_tokenize(vocab, d.delimiter, false, true);
@@ -428,41 +459,6 @@ std::vector<common_chat_msg> common_chat_msgs_parse_oaicompat(const json & messa
            if (message.contains("tool_call_id")) {
                msg.tool_call_id = message.at("tool_call_id");
            }
-            {
-                json extra = json::object();
-                for (const auto & [k, v] : message.items()) {
-                    if (k != "role" && k != "content" && k != "tool_calls" && k != "reasoning_content" &&
-                        k != "name" && k != "tool_call_id") {
-                        extra[k] = v;
-                    }
-                }
-                if (has_tool_calls) {
-                    // per tool call: keys besides type/function/id, and function keys besides name/arguments
-                    json tc_extra = json::array();
-                    bool any      = false;
-                    for (const auto & tool_call : message.at("tool_calls")) {
-                        json e = json::object();
-                        for (const auto & [k, v] : tool_call.items()) {
-                            if (k != "type" && k != "function" && k != "id") {
-                                e[k] = v;
-                            }
-                        }
-                        for (const auto & [k, v] : tool_call.at("function").items()) {
-                            if (k != "name" && k != "arguments") {
-                                e["function"][k] = v;
-                            }
-                        }
-                        any = any || !e.empty();
-                        tc_extra.push_back(e);
-                    }
-                    if (any) {
-                        extra["__tool_call_extras"] = tc_extra;
-                    }
-                }
-                if (!extra.empty()) {
-                    msg.extra_json = extra.dump();
-                }
-            }

            msgs.push_back(msg);
        }
@@ -551,50 +547,6 @@ static json render_message_to_json(const std::vector<common_chat_msg> & msgs, co
    return messages_inp_normalizer(c).normalize(messages);
 }

-// DeepSeek V4.1 reads non-OpenAI message keys and joins content blocks with "\n\n" around images,
-// so keep media markers as separate text parts and restore the extra keys
-static json render_message_to_json_deepseek_v4_1(const std::vector<common_chat_msg> & msgs, const jinja::caps & c) {
-    json messages = json::array();
-    for (const auto & msg : msgs) {
-        json jmsg;
-        if (msg.contains_media() && msg.content.empty()) {
-            common_chat_msg typed = msg;
-            for (auto & part : typed.content_parts) {
-                part.type = "text";
-            }
-            jmsg = typed.to_json_oaicompat(/* concat_typed_text= */ false);
-        } else {
-            jmsg = msg.to_json_oaicompat(/* concat_typed_text= */ false);
-        }
-        if (!msg.extra_json.empty()) {
-            const json extra = json::parse(msg.extra_json);
-            for (const auto & [k, v] : extra.items()) {
-                if (k == "__tool_call_extras") {
-                    if (!jmsg.contains("tool_calls")) {
-                        continue;
-                    }
-                    auto & tcs = jmsg.at("tool_calls");
-                    for (size_t i = 0; i < tcs.size() && i < v.size(); i++) {
-                        for (const auto & [tk, tv] : v[i].items()) {
-                            if (tk == "function") {
-                                for (const auto & [fk, fv] : tv.items()) {
-                                    tcs[i]["function"][fk] = fv;
-                                }
-                            } else {
-                                tcs[i][tk] = tv;
-                            }
-                        }
-                    }
-                } else if (!jmsg.contains(k)) {
-                    jmsg[k] = v;
-                }
-            }
-        }
-        messages.push_back(std::move(jmsg));
-    }
-    return messages_inp_normalizer(c).normalize(messages);
-}
-
 // DEPRECATED: only used in tests
 json common_chat_msgs_to_json_oaicompat(const std::vector<common_chat_msg> & msgs, bool concat_typed_text) {
    jinja::caps c;
@@ -668,11 +620,8 @@ std::vector<common_chat_tool> common_chat_tools_parse_oaicompat(const json & too
 }

 common_chat_continuation common_chat_continuation_parse(const common_json & value) {
-    if (value.is_null()) {
-        return COMMON_CHAT_CONTINUATION_NONE;
-    }
-    if (value.is_boolean()) {
-        return value.get<bool>() ? COMMON_CHAT_CONTINUATION_AUTO : COMMON_CHAT_CONTINUATION_NONE;
+    if (value.is_boolean() && value.get<bool>()) {
+        return COMMON_CHAT_CONTINUATION_AUTO;
    }
    if (value.is_string()) {
        auto value_str = value.get<std::string>();
@@ -683,7 +632,7 @@ common_chat_continuation common_chat_continuation_parse(const common_json & valu
            return COMMON_CHAT_CONTINUATION_CONTENT;
        }
    }
-    throw std::invalid_argument("Invalid continue_final_message: expected a boolean, \"content\" or \"reasoning_content\"");
+    return COMMON_CHAT_CONTINUATION_NONE;
 }

 bool common_chat_verify_template(const std::string & tmpl, bool use_jinja) {
@@ -726,7 +675,7 @@ std::string common_chat_format_single(const struct common_chat_templates * tmpls
    if (!past_msg.empty()) {
        inputs.messages              = past_msg;
        inputs.add_generation_prompt = false;
-        fmt_past_msg                 = common_chat_templates_apply(tmpls, inputs).prompt.str();
+        fmt_past_msg                 = common_chat_templates_apply(tmpls, inputs).prompt;
    }
    std::ostringstream ss;
    // if the past_msg ends with a newline, we must preserve it in the formatted version
@@ -736,7 +685,7 @@ std::string common_chat_format_single(const struct common_chat_templates * tmpls
    // format chat with new_msg
    inputs.messages.push_back(new_msg);
    inputs.add_generation_prompt = add_ass;
-    auto fmt_new_msg             = common_chat_templates_apply(tmpls, inputs).prompt.str();
+    auto fmt_new_msg             = common_chat_templates_apply(tmpls, inputs).prompt;
    // get the diff part
    ss << fmt_new_msg.substr(fmt_past_msg.size(), fmt_new_msg.size() - fmt_past_msg.size());
    return ss.str();
@@ -760,7 +709,7 @@ std::string common_chat_format_example(const struct common_chat_templates *
    add_simple_msg("user", "Hello");
    add_simple_msg("assistant", "Hi there");
    add_simple_msg("user", "How are you?");
-    return common_chat_templates_apply(tmpls, inputs).prompt.str();
+    return common_chat_templates_apply(tmpls, inputs).prompt;
 }

 #define CHATML_TEMPLATE_SRC                                                               \
@@ -953,7 +902,7 @@ common_reasoning_format common_reasoning_format_from_name(const std::string & fo
    throw std::runtime_error("Unknown reasoning format: " + format);
 }

-common_chat_prompt common_chat_template_direct_apply_impl(
+std::string common_chat_template_direct_apply_impl(
    const common_chat_template & tmpl,
    const autoparser::generation_params & inputs,
    const std::optional<json> & messages_override,
@@ -999,37 +948,24 @@ common_chat_prompt common_chat_template_direct_apply_impl(

    jinja::global_from_json(ctx, inp, inputs.mark_input);

-    // bos/eos come from the model, not from the user
-    ctx.set_val("bos_token", jinja::mk_val<jinja::value_string>(tmpl.bos_token()));
-    ctx.set_val("eos_token", jinja::mk_val<jinja::value_string>(tmpl.eos_token()));
-
    // render
    jinja::runtime runtime(ctx);
    const jinja::value results = runtime.execute(tmpl.prog);
    auto parts = jinja::runtime::gather_string_parts(results);

-    common_chat_prompt result;
-    for (auto & part : parts->val_str.parts) {
-        result.parts.push_back({std::move(part.val), part.is_input});
-    }
+    std::string result = parts->as_string().str();

    // TODO: improve this later
-    if (inputs.add_bos && !result.parts.empty()) {
-        auto & first = result.parts.front();
-        if (!first.is_input && string_starts_with(first.text, tmpl.bos_token())) {
-            first.text.erase(0, tmpl.bos_token().size());
-        }
+    if (inputs.add_bos && string_starts_with(result, tmpl.bos_token())) {
+        result = result.substr(tmpl.bos_token().size());
    }
-    if (inputs.add_eos && !result.parts.empty()) {
-        auto & last = result.parts.back();
-        if (!last.is_input && string_ends_with(last.text, tmpl.eos_token())) {
-            last.text.resize(last.text.size() - tmpl.eos_token().size());
-        }
+    if (inputs.add_eos && string_ends_with(result, tmpl.eos_token())) {
+        result = result.substr(0, result.size() - tmpl.eos_token().size());
    }
    return result;
 }

-common_chat_prompt common_chat_template_direct_apply(
+std::string common_chat_template_direct_apply(
    const common_chat_template & tmpl,
    const autoparser::generation_params & inputs) {
    return common_chat_template_direct_apply_impl(tmpl, inputs, std::nullopt, std::nullopt, std::nullopt);
@@ -1045,9 +981,9 @@ std::string common_chat_template_generation_prompt_impl(
    autoparser::generation_params params = inputs;
    params.add_generation_prompt = false;
    params.continue_final_message = COMMON_CHAT_CONTINUATION_NONE;
-    std::string no_gen_prompt    = common_chat_template_direct_apply_impl(tmpl, params, messages_override, tools_override, additional_context).str();
+    std::string no_gen_prompt    = common_chat_template_direct_apply_impl(tmpl, params, messages_override, tools_override, additional_context);
    params.add_generation_prompt = true;
-    std::string gen_prompt       = common_chat_template_direct_apply_impl(tmpl, params, messages_override, tools_override, additional_context).str();
+    std::string gen_prompt       = common_chat_template_direct_apply_impl(tmpl, params, messages_override, tools_override, additional_context);

    size_t prefix_len = 0;
    size_t min_size = std::min(no_gen_prompt.size(), gen_prompt.size());
@@ -1151,68 +1087,35 @@ static json common_chat_extra_context() {
    return ctx;
 }

-static common_chat_params common_chat_params_init_lfm2_tokens(const common_chat_template & tmpl, const autoparser::generation_params & inputs) {
-    return common_chat_params_init_lfm2(tmpl, inputs, /* tool_list_tokens = */ true);
-}
-
-static common_chat_params common_chat_params_init_lfm2_5(const common_chat_template & tmpl, const autoparser::generation_params & inputs) {
-    return common_chat_params_init_lfm2(tmpl, inputs, /* tool_list_tokens = */ false);
-}
-
-// Older gemma4 templates need their tool responses rewritten before rendering
-static common_chat_params common_chat_params_init_gemma4_legacy(const common_chat_template & tmpl, const autoparser::generation_params & inputs) {
-    auto adjusted = inputs;
-    workaround::convert_tool_responses_gemma4(adjusted.messages);
-    return common_chat_params_init_gemma4(tmpl, adjusted);
-}
-
-// Pick the dedicated handler for a template from its source, or null for the autoparser.
-// Order matters: the first match wins, and later checks assume the earlier ones did not match.
-static common_chat_params_init_fn common_chat_template_detect_params_init(const std::string & src) {
+std::optional<common_chat_params> common_chat_try_specialized_template(
+        const common_chat_template &          tmpl,
+        const std::string &                   src,
+        autoparser::generation_params & params) {
    // Ministral/Mistral Large 3 - uses special reasoning structure fixes, can't use autoparser
    // Note: Mistral Small 3.2 uses [CALL_ID] which Ministral doesn't have, so we can distinguish them
    if (src.find("[SYSTEM_PROMPT]") != std::string::npos && src.find("[TOOL_CALLS]") != std::string::npos &&
        src.find("[ARGS]") != std::string::npos && src.find("[CALL_ID]") == std::string::npos) {
        LOG_DBG("Using specialized template: Ministral/Magistral Large 3\n");
-        return common_chat_params_init_ministral_3;
-    }
-
-    // LLM-jp-4.1 - GPT-OSS dialect (spaces after special tokens, <|end|>-separated parallel calls)
-    if (src.find("chat_format=llm-jp-harmony-v1") != std::string::npos) {
-        LOG_DBG("Using specialized template: LLM-jp Harmony v1\n");
-        return common_chat_params_init_llm_jp_harmony;
-    }
-
-    // Harmony XML tool calls, checked before the GPT-OSS JSON calls
-    if (src.find("<|channel|>") != std::string::npos && src.find("<|constrain|>xml") != std::string::npos &&
-        src.find("rfl:parameter") != std::string::npos) {
-        LOG_DBG("Using specialized template: Harmony XML\n");
-        return common_chat_params_init_harmony_xml;
+        return common_chat_params_init_ministral_3(tmpl, params);
    }

    // GPT-OSS - has unique channel-based structure that needs dedicated handler
    if (src.find("<|channel|>") != std::string::npos) {
        LOG_DBG("Using specialized template: GPT-OSS\n");
-        return common_chat_params_init_gpt_oss;
-    }
-
-    // Muse Spark shares the Muse recipient protocol and adds a commentary recipient.
-    if (src.find("to=commentary") != std::string::npos && src.find("<|eom|>") != std::string::npos) {
-        LOG_DBG("Using specialized template: Muse Spark\n");
-        return common_chat_params_init_muse_spark;
+        return common_chat_params_init_gpt_oss(tmpl, params);
    }

    // Muse Glimmer format using " to=<recipient>" recipients and <|eom|>/<|eot|> message terminators.
    if (src.find("<atem:function_calls>") != std::string::npos && src.find("<|eom|>") != std::string::npos) {
        LOG_DBG("Using specialized template: Muse Glimmer\n");
-        return common_chat_params_init_muse_glimmer;
+        return common_chat_params_init_muse_glimmer(tmpl, params);
    }

    // Functionary v3.2 - uses recipient-based format with >>>recipient\n{content}
    // Detection: template has ">>>all" for content and ">>>" prefix for tool calls
    if (src.find(">>>all") != std::string::npos && src.find(">>>${recipient}") != std::string::npos) {
        LOG_DBG("Using specialized template: Functionary v3.2\n");
-        return common_chat_params_init_functionary_v3_2;
+        return common_chat_params_init_functionary_v3_2(tmpl, params);
    }

    // Kimi K2 Thinking - uses unique tool call ID format: functions.<name>:<index>
@@ -1220,22 +1123,14 @@ static common_chat_params_init_fn common_chat_template_detect_params_init(const
    if (src.find("<|tool_calls_section_begin|>") != std::string::npos &&
        src.find("<|tool_call_begin|>") != std::string::npos) {
        LOG_DBG("Using specialized template: Kimi K2 Thinking\n");
-        return common_chat_params_init_kimi_k2;
+        return common_chat_params_init_kimi_k2(tmpl, params);
    }

    // Kimi K3 - the <|open|>/<|close|>/<|end_of_msg|> markers are unique to it
    if (src.find("<|open|>") != std::string::npos && src.find("<|close|>") != std::string::npos &&
        src.find("<|end_of_msg|>") != std::string::npos) {
        LOG_DBG("Using specialized template: Kimi K3\n");
-        return common_chat_params_init_kimi_k3;
-    }
-
-    // K2 Horizon - <|ifm|im_start|> turns, <ifm|think*> reasoning picked by reasoning_effort and
-    // <ifm|tool_calls> sections; the three think tag pairs defeat the autoparser's reasoning detection
-    if (src.find("<|ifm|im_start|>") != std::string::npos &&
-        src.find("<ifm|tool_calls>") != std::string::npos) {
-        LOG_DBG("Using specialized template: K2 Horizon\n");
-        return common_chat_params_init_k2_horizon;
+        return common_chat_params_init_kimi_k3(tmpl, params);
    }

    // Ling 3.0 / Bailing V3 - <role>X</role> sections with <arg_key>/<arg_value> tagged
@@ -1243,7 +1138,7 @@ static common_chat_params_init_fn common_chat_template_detect_params_init(const
    if (src.find("<role>ASSISTANT</role>") != std::string::npos &&
        src.find("<arg_key>") != std::string::npos) {
        LOG_DBG("Using specialized template: Ling 3.0 (Bailing V3)\n");
-        return common_chat_params_init_ling3;
+        return common_chat_params_init_ling3(tmpl, params);
    }

    // Cohere2 MoE / North Code - marker-wrapped format with <|START_TEXT|> content and
@@ -1252,19 +1147,19 @@ static common_chat_params_init_fn common_chat_template_detect_params_init(const
    if (src.find("<|START_TEXT|>") != std::string::npos &&
        src.find("<|START_ACTION|>") != std::string::npos) {
        LOG_DBG("Using specialized template: Cohere2 MoE\n");
-        return common_chat_params_init_cohere2moe;
+        return common_chat_params_init_cohere2moe(tmpl, params);
    }

    if (is_lfm2_template(src)) {
        LOG_DBG("Using specialized template: LFM2\n");
-        return common_chat_params_init_lfm2_tokens;
+        return common_chat_params_init_lfm2(tmpl, params, /* tool_list_tokens = */ true);
    }

    // LFM2.5 format detection: template uses plain "List of tools: [...]" with no special tokens
    if (src.find("List of tools: [") != std::string::npos &&
        src.find("<|tool_list_start|>") == std::string::npos) {
        LOG_DBG("Using specialized template: LFM2.5\n");
-        return common_chat_params_init_lfm2_5;
+        return common_chat_params_init_lfm2(tmpl, params, /* tool_list_tokens = */ false);
    }

    // GigaChatV3 format detection
@@ -1272,7 +1167,7 @@ static common_chat_params_init_fn common_chat_template_detect_params_init(const
        src.find("<|message_sep|>") != std::string::npos &&
        src.find("<|function_call|>") == std::string::npos) {
        LOG_DBG("Using specialized template: GigaChatV3\n");
-        return common_chat_params_init_gigachat_v3;
+        return common_chat_params_init_gigachat_v3(tmpl, params);
    }

    // MiniMax-M3: the namespace token "]<]minimax[>[" collides with the autoparser's
@@ -1281,31 +1176,29 @@ static common_chat_params_init_fn common_chat_template_detect_params_init(const
        src.find("<tool_call>") != std::string::npos &&
        src.find("<invoke name=") != std::string::npos) {
        LOG_DBG("Using specialized template: MiniMax-M3\n");
-        return common_chat_params_init_minimax_m3;
+        return common_chat_params_init_minimax_m3(tmpl, params);
    }

    // DeepSeek V3.2/V4 format detection: template defines dsml_token and uses it for tool calls.
    // The template source contains the token as a variable assignment, not as a literal in markup.
    // V3.2 names the tool call block "function_calls", V4 names it "tool_calls".
-    // V4.1 tag names have a leading space and its template does not name the dsml_token variable.
-    if ((src.find("dsml_token") != std::string::npos &&
-         src.find("DSML") != std::string::npos &&
-         (src.find("function_calls") != std::string::npos ||
-          src.find("tool_calls") != std::string::npos)) ||
-        src.find("｜DSML｜ calls>") != std::string::npos) {
-        LOG_DBG("Using specialized template: DeepSeek V3.2/V4/V4.1\n");
-        return common_chat_params_init_deepseek_v3_2;
+    if (src.find("dsml_token") != std::string::npos &&
+        src.find("DSML") != std::string::npos &&
+        (src.find("function_calls") != std::string::npos ||
+         src.find("tool_calls") != std::string::npos)) {
+        LOG_DBG("Using specialized template: DeepSeek V3.2/V4\n");
+        return common_chat_params_init_deepseek_v3_2(tmpl, params);
    }

    // Gemma4 format detection
    if (src.find("'<|tool_call>call:'") != std::string::npos) {
-        LOG_DBG("Using specialized template: Gemma4\n");
        if (src.find("{#- OpenAI Chat Completions:") == std::string::npos) {
+            // apply workarounds if using the older gemma4 templates
            LOG_WRN("%s: detected an outdated gemma4 chat template, applying compatibility workarounds. "
                    "Consider updating to the official template.\n", __func__);
-            return common_chat_params_init_gemma4_legacy;
+            workaround::convert_tool_responses_gemma4(params.messages);
        }
-        return common_chat_params_init_gemma4;
+        return common_chat_params_init_gemma4(tmpl, params);
    }

    // MiniCPM5 - XML tool calls with <function name="..."><param name="...">...</param></function>
@@ -1313,14 +1206,7 @@ static common_chat_params_init_fn common_chat_template_detect_params_init(const
        src.find("<function name=\"") != std::string::npos &&
        src.find("<param name=\"") != std::string::npos) {
        LOG_DBG("Using specialized template: MiniCPM5\n");
-        return common_chat_params_init_minicpm5;
-    }
-
-    // TranslateGemma - user content must follow a custom schema with language codes
-    if (src.find("[source_lang_code]") != std::string::npos &&
-        src.find("[target_lang_code]") != std::string::npos) {
-        LOG_DBG("Using specialized template: TranslateGemma\n");
-        return common_chat_params_init_translate_gemma;
+        return common_chat_params_init_minicpm5(tmpl, params);
    }

    // Qwen3-Coder XML tool calls, also used by Nemotron Nano 3, Qwen3.5 and StepFun-3.5-Flash
@@ -1330,51 +1216,10 @@ static common_chat_params_init_fn common_chat_template_detect_params_init(const
        // Exclude models that don't use \n between tags
        src.find("'<tool_call><function=' ~ tool_call.name ~ '>'") == std::string::npos) {
        LOG_DBG("Using specialized template: Qwen3-Coder\n");
-        return common_chat_params_init_qwen3_coder;
+        return common_chat_params_init_qwen3_coder(tmpl, params);
    }

-    return nullptr;
-}
-
-common_chat_template::common_chat_template(const std::string & src, const std::string & bos_token, const std::string & eos_token) {
-    jinja::lexer lexer;
-    auto lexer_res = lexer.tokenize(src);
-    this->prog = jinja::parse_from_tokens(lexer_res);
-
-    this->src = lexer_res.source;
-    this->bos_tok = bos_token;
-    this->eos_tok = eos_token;
-
-    this->caps = jinja::caps_get(prog);
-    // LOG_INF("%s: caps:\n%s\n", __func__, this->caps.to_string().c_str());
-
-    this->params_init = common_chat_template_detect_params_init(this->src);
-    if (this->params_init) {
-        return;
-    }
-
-    // The analysis depends only on the template, so run it once here instead of on every apply.
-    // A failure is kept for apply to report, so a bad template still loads like it did before.
-    try {
-        analysis = std::make_unique<autoparser::autoparser>();
-        analysis->analyze_template(*this);
-    } catch (const std::exception & e) {
-        analysis.reset();
-        analysis_error = e.what();
-    }
-}
-
-common_chat_template::~common_chat_template() = default;
-common_chat_template::common_chat_template(common_chat_template &&) = default;
-common_chat_template & common_chat_template::operator=(common_chat_template &&) = default;
-
-std::optional<common_chat_params> common_chat_try_specialized_template(
-        const common_chat_template &          tmpl,
-        const autoparser::generation_params & params) {
-    if (!tmpl.params_init) {
-        return std::nullopt;
-    }
-    return tmpl.params_init(tmpl, params);
+    return std::nullopt;
 }

 static common_chat_params common_chat_templates_apply_jinja(const struct common_chat_templates *        tmpls,
@@ -1394,9 +1239,7 @@ static common_chat_params common_chat_templates_apply_jinja(const struct common_
        workaround::trim_all_content(trimmed_messages);
        messages_to_render = &trimmed_messages;
    }
-    params.messages              = src.find("｜DSML｜ calls>") != std::string::npos ?
-                                       render_message_to_json_deepseek_v4_1(*messages_to_render, tmpl.original_caps()) :
-                                       render_message_to_json(*messages_to_render, tmpl.original_caps());
+    params.messages              = render_message_to_json(*messages_to_render, tmpl.original_caps());
    params.tool_choice           = inputs.tool_choice;
    params.reasoning_format      = inputs.reasoning_format;
    params.enable_thinking       = inputs.enable_thinking;
@@ -1478,23 +1321,21 @@ static common_chat_params common_chat_templates_apply_jinja(const struct common_
        data.prompt                    = common_chat_template_direct_apply_impl(tmpl, params_copy);
        data.generation_prompt         = common_chat_template_generation_prompt_impl(tmpl, params);
        data.format                    = COMMON_CHAT_FORMAT_PEG_NATIVE;
-        data.parser                    = build_chat_peg_parser([&data](common_chat_peg_builder &p) {
+        auto parser                    = build_chat_peg_parser([&data](common_chat_peg_builder &p) {
            return p.literal(data.generation_prompt) << p.content(p.rest());
        });
+        data.parser                    = parser.save();
        return data;
    }

-    if (auto result = common_chat_try_specialized_template(tmpl, params)) {
+    if (auto result = common_chat_try_specialized_template(tmpl, src, params)) {
        return *result;
    }

-    if (!tmpl.analysis) {
-        throw std::invalid_argument("Unable to generate parser for this template. Automatic parser generation failed: " + tmpl.analysis_error);
-    }
-
    try {
        LOG_DBG("%s: using differential autoparser\n", __func__);
-        const auto & autoparser = *tmpl.analysis;
+        struct autoparser::autoparser autoparser;
+        autoparser.analyze_template(tmpl);
        auto auto_params = autoparser::peg_generator::generate_parser(tmpl, params, autoparser);

        common_chat_msg_delimiters delimiters;
@@ -1515,7 +1356,8 @@ static common_chat_params common_chat_templates_apply_jinja(const struct common_
                auto_params.thinking_end_tags = {std::move(end_tag)};
            }
        }
-        const auto & arena = auto_params.parser;
+        common_peg_arena arena;
+        arena.load(auto_params.parser);
        LOG_DBG("%s: generated parser:\n%s\n\nparser generation prompt: %s\n", __func__, arena.dump(arena.root()).c_str(), auto_params.generation_prompt.c_str());
        return auto_params;
    } catch (const std::exception & e) {
@@ -1580,7 +1422,7 @@ static common_chat_params common_chat_templates_apply_legacy(const struct common
    }

    common_chat_params params;
-    params.prompt = common_chat_prompt(std::string(buf.data(), res));
+    params.prompt = std::string(buf.data(), res);
    if (!inputs.json_schema.empty()) {
        params.grammar = json_schema_to_grammar(json::parse(inputs.json_schema));
    } else {
@@ -1596,132 +1438,36 @@ common_chat_params common_chat_templates_apply(const struct common_chat_template
                              common_chat_templates_apply_legacy(tmpls, inputs);
 }

-std::string common_chat_prompt::str() const {
-    if (parts.size() == 1) {
-        return parts[0].text;
-    }
-    size_t len = 0;
-    for (const auto & part : parts) {
-        len += part.text.size();
-    }
-    std::string out;
-    out.reserve(len);
-    for (const auto & part : parts) {
-        out += part.text;
-    }
-    return out;
-}
-
-void common_chat_prompt::append(const std::string & text, bool is_input) {
-    if (text.empty()) {
-        return;
-    }
-    if (!parts.empty() && parts.back().is_input == is_input) {
-        parts.back().text += text;
-    } else {
-        parts.push_back({text, is_input});
-    }
-}
-
-void common_chat_prompt::replace_last(const std::string & from, const std::string & to) {
-    for (auto it = parts.rbegin(); it != parts.rend(); ++it) {
-        if (it->is_input) {
-            continue;
-        }
-        size_t pos = it->text.rfind(from);
-        if (pos != std::string::npos) {
-            it->text.replace(pos, from.size(), to);
-            return;
-        }
-    }
-}
-
-void common_chat_input::append(const std::string & piece, llama_token token) {
-    if (piece.empty()) {
-        return;
-    }
-    tokens.push_back(token);
-    tokens.resize(tokens.size() + piece.size() - 1, LLAMA_TOKEN_NULL);
-    text += piece;
-}
-
-void common_chat_input::append(const common_chat_input & chunk) {
-    tokens.insert(tokens.end(), chunk.tokens.begin(), chunk.tokens.end());
-    text += chunk.text;
-}
-
-void common_chat_input::truncate(size_t pos) {
-    if (pos < text.size()) {
-        text.erase(pos);
-        tokens.resize(pos);
-    }
-}
-
-common_chat_input common_chat_input::substr(size_t pos, size_t n) const {
-    common_chat_input out;
-    out.text = text.substr(pos, n);
-    out.tokens.assign(tokens.begin() + pos, tokens.begin() + pos + out.size());
-    return out;
-}
-
-void common_chat_input::prepend(const std::string & prefix) {
-    tokens.insert(tokens.begin(), prefix.size(), LLAMA_TOKEN_NULL);
-    text = prefix + text;
-}
-
-void common_chat_input::prepend(const common_chat_input & prefix) {
-    tokens.insert(tokens.begin(), prefix.tokens.begin(), prefix.tokens.end());
-    text = prefix.text + text;
-}
-
-common_chat_input common_chat_input_tokenize(const llama_vocab * vocab, const std::string & text) {
-    common_chat_input input;
-    auto tokens = common_tokenize(vocab, text, false, true);
-    for (size_t i = 0; i < tokens.size(); i++) {
-        std::string piece = common_token_to_piece(vocab, tokens[i], true);
-        if (i == 0 && std::isspace(piece[0]) && !std::isspace(text[0])) {
-            // Some tokenizers will add a space before the first special token, need to exclude
-            continue;
-        }
-        input.append(piece, tokens[i]);
-    }
-    if (input.text != text) {
-        // the pieces do not give back the same text, keep the text without tokens
-        return common_chat_input(text);
-    }
-    return input;
-}
-
-common_chat_msg common_chat_parse(const common_chat_input &         input,
+common_chat_msg common_chat_parse(const std::string &               input,
                                  bool                              is_partial,
                                  const common_chat_parser_params & params) {
    return common_chat_peg_parse(params.parser, input, is_partial, params);
 }

 common_chat_msg common_chat_peg_parse(const common_peg_arena &          src_parser,
-                                      const common_chat_input &         input,
+                                      const std::string &               input,
                                      bool                              is_partial,
                                      const common_chat_parser_params & params) {
-    // both branches must be lvalues, a temporary here would copy the arena on every call
-    static const common_peg_arena content_only =
-        build_chat_peg_parser([](common_chat_peg_builder & p) { return p.content(p.rest()) + p.end(); });
-    const common_peg_arena & parser = src_parser.empty() ? content_only : src_parser;
+    const common_peg_arena & parser = src_parser.empty() ?
+        build_chat_peg_parser([](common_chat_peg_builder & p) { return p.content(p.rest()) + p.end(); }) :
+        src_parser;

    if (src_parser.empty()) {
        LOG_DBG("No parser definition detected, assuming pure content parser.");
    }

-    common_chat_input effective_input = input;
-    effective_input.prepend(params.generation_prompt);
+    const std::string effective_input = params.generation_prompt.empty()
+        ? input
+        : params.generation_prompt + input;

-    //LOG_DBG("Parsing PEG input with format %s: %s\n", common_chat_format_name(params.format), effective_input.text.c_str());
+    //LOG_DBG("Parsing PEG input with format %s: %s\n", common_chat_format_name(params.format), effective_input.c_str());

    common_peg_parse_flags flags = COMMON_PEG_PARSE_FLAG_LENIENT;
    if (params.debug) {
        flags |= COMMON_PEG_PARSE_FLAG_DEBUG;
    }

-    common_peg_parse_context ctx(std::move(effective_input.text), std::move(effective_input.tokens), flags);
+    common_peg_parse_context ctx(effective_input, flags);
    auto result = parser.parse(ctx);

    if (result.fail()) {
@@ -1747,8 +1493,8 @@ common_chat_msg common_chat_peg_parse(const common_peg_arena &          src_pars
            }
            return msg;
        }
-        LOG_WRN("%s: unparsed %s output: %s\n", __func__, common_chat_format_name(params.format), ctx.input.substr(result.end).c_str());
-        LOG_DBG("%s: full %s output triggering error:\n=== BEGIN ===\n%s\n=== END ===\n", __func__, common_chat_format_name(params.format), ctx.input.c_str());
+        LOG_WRN("%s: unparsed %s output: %s\n", __func__, common_chat_format_name(params.format), effective_input.substr(result.end).c_str());
+        LOG_DBG("%s: full %s output triggering error:\n=== BEGIN ===\n%s\n=== END ===\n", __func__, common_chat_format_name(params.format), effective_input.c_str());
        throw std::runtime_error(std::string("The model produced output that does not match the expected ") + common_chat_format_name(params.format) + " format");
    }

@@ -1776,84 +1522,6 @@ common_chat_msg common_chat_peg_parse(const common_peg_arena &          src_pars
    return msg;
 }

-common_chat_session::common_chat_session(const common_chat_templates *        tmpls,
-                                         const llama_vocab *                  vocab,
-                                         const common_chat_templates_inputs & inputs,
-                                         const common_chat_session_params &   params) {
-    auto applied = common_chat_templates_apply(tmpls, inputs);
-
-    templated    = true;
-    prompt_parts = std::move(applied.prompt);
-    result.role  = "assistant";
-
-    grammar_text           = std::move(applied.grammar);
-    grammar_lazy           = applied.grammar_lazy;
-    stops                  = std::move(applied.additional_stops);
-    generation_prompt_text = applied.generation_prompt;
-    thinking_start         = std::move(applied.thinking_start_tag);
-    thinking_ends          = std::move(applied.thinking_end_tags);
-
-    parser_params.format            = applied.format;
-    parser_params.generation_prompt = vocab ? common_chat_input_tokenize(vocab, applied.generation_prompt)
-                                            : common_chat_input(applied.generation_prompt);
-    parser_params.debug             = params.debug;
-    parser_params.parser            = std::move(applied.parser);
-
-    delimiters = std::move(applied.message_delimiters);
-
-    if (vocab) {
-        common_params_sampling resolved;
-        resolved.grammar_lazy = applied.grammar_lazy;
-        common_sampling_add_preserved_tokens(resolved, vocab, applied.preserved_tokens);
-        common_sampling_add_grammar_triggers(resolved, vocab, std::move(applied.grammar_triggers));
-        preserved_tokens = std::move(resolved.preserved_tokens);
-        grammar_triggers = std::move(resolved.grammar_triggers);
-
-        delimiters.tokenize(vocab);
-    } else {
-        grammar_triggers = std::move(applied.grammar_triggers);
-    }
-
-    if (inputs.continue_final_message != COMMON_CHAT_CONTINUATION_NONE && !params.echo) {
-        // start from the prefill so it is not emitted as part of the first delta
-        result = common_chat_parse(input, true, parser_params);
-    }
-}
-
-void common_chat_session::apply_sampling(common_params_sampling & sampling) const {
-    if (!templated) {
-        return;
-    }
-    if (!grammar_text.empty()) {
-        sampling.grammar = {COMMON_GRAMMAR_TYPE_TOOL_CALLS, grammar_text};
-    }
-    sampling.grammar_lazy      = grammar_lazy;
-    sampling.generation_prompt = generation_prompt_text;
-    sampling.preserved_tokens.insert(preserved_tokens.begin(), preserved_tokens.end());
-    sampling.grammar_triggers.insert(sampling.grammar_triggers.end(), grammar_triggers.begin(), grammar_triggers.end());
-}
-
-const common_chat_msg & common_chat_session::feed(const common_chat_input & chunk) {
-    GGML_ASSERT(!finished && "feed() after finish()");
-    input.append(chunk);
-    auto msg = common_chat_parse(input, true, parser_params);
-    if (!msg.empty()) {
-        result = std::move(msg);
-    }
-    return result;
-}
-
-const common_chat_msg & common_chat_session::finish(const common_chat_input & chunk) {
-    GGML_ASSERT(!finished && "finish() called twice");
-    finished = true;
-    input.append(chunk);
-    auto msg = common_chat_parse(input, false, parser_params);
-    if (!msg.empty()) {
-        result = std::move(msg);
-    }
-    return result;
-}
-
 std::map<std::string, bool> common_chat_templates_get_caps(const common_chat_templates * chat_templates) {
    GGML_ASSERT(chat_templates != nullptr);
    GGML_ASSERT(chat_templates->template_default != nullptr);
@@ -22,16 +22,8 @@ struct common_chat_templates;

 namespace autoparser {
 struct generation_params;
-struct autoparser;
 }  // namespace autoparser

-struct common_chat_params;
-struct common_chat_template;
-
-// Builds the prompt and parser for a template that has a dedicated handler (see common/parsers)
-using common_chat_params_init_fn = common_chat_params (*)(const common_chat_template & tmpl,
-                                                          const autoparser::generation_params & inputs);
-
 struct common_chat_tool_call {
    std::string name;
    std::string arguments;
@@ -62,20 +54,19 @@ struct common_chat_template {
    std::string eos_tok;
    std::string src;
    chat_template_caps caps;
-    // Dedicated handler picked once from the source, null when the differential autoparser is used
-    common_chat_params_init_fn params_init = nullptr;

-    // Differential analysis, run once here when there is no dedicated handler. Null when there
-    // is one, or when the analysis failed, in which case analysis_error says why.
-    std::unique_ptr<autoparser::autoparser> analysis;
-    std::string analysis_error;
+    common_chat_template(const std::string & src, const std::string & bos_token, const std::string & eos_token) {
+        jinja::lexer lexer;
+        auto lexer_res = lexer.tokenize(src);
+        this->prog = jinja::parse_from_tokens(lexer_res);

-    common_chat_template(const std::string & src, const std::string & bos_token, const std::string & eos_token);
+        this->src = lexer_res.source;
+        this->bos_tok = bos_token;
+        this->eos_tok = eos_token;

-    // autoparser is incomplete here, so these are defined where it is complete
-    ~common_chat_template();
-    common_chat_template(common_chat_template &&);
-    common_chat_template & operator=(common_chat_template &&);
+        this->caps = jinja::caps_get(prog);
+        // LOG_INF("%s: caps:\n%s\n", __func__, this->caps.to_string().c_str());
+    }

    const std::string & source() const { return src; }
    const std::string & bos_token() const { return bos_tok; }
@@ -94,8 +85,6 @@ struct common_chat_msg {
    std::string                               reasoning_content;
    std::string                               tool_name;
    std::string                               tool_call_id;
-    // non-OpenAI message keys as a JSON object string, only for templates that read them (DeepSeek V4.1)
-    std::string                               extra_json;

    common_json to_json_oaicompat(bool concat_typed_text = false) const;

@@ -220,6 +209,8 @@ struct common_chat_msg_delimiters {

    // split tokens into message spans. skips maps a start index to a length of a region to jump over without matching
    common_chat_msg_spans split(const llama_tokens & tokens, const std::map<size_t, size_t> & skips = {}) const;
+
+    common_json to_json() const;
 };

 struct common_chat_tool {
@@ -275,31 +266,9 @@ struct common_chat_templates_inputs {
    bool                                  force_pure_content = false;
 };

-struct common_chat_prompt_part {
-    std::string text;
-    bool        is_input = false; // from user input, special tokens inside must not be parsed
-};
-
-// rendered chat template, split into template parts and user input parts
-struct common_chat_prompt {
-    std::vector<common_chat_prompt_part> parts;
-
-    common_chat_prompt() = default;
-
-    // single part of template text
-    explicit common_chat_prompt(std::string text) { parts.push_back({std::move(text), false}); }
-
-    std::string str() const;
-
-    void append(const std::string & text, bool is_input = false);
-
-    // replace the last occurrence of `from`, user input parts are skipped
-    void replace_last(const std::string & from, const std::string & to);
-};
-
 struct common_chat_params {
    common_chat_format                  format = COMMON_CHAT_FORMAT_CONTENT_ONLY;
-    common_chat_prompt                  prompt;
+    std::string                         prompt;
    std::string                         grammar;
    bool                                grammar_lazy         = false;
    std::string                         generation_prompt;
@@ -309,46 +278,27 @@ struct common_chat_params {
    std::vector<common_grammar_trigger> grammar_triggers;
    std::vector<std::string>            preserved_tokens;
    std::vector<std::string>            additional_stops;
-    common_peg_arena                    parser;
+    std::string                         parser;
    common_chat_msg_delimiters          message_delimiters;
 };

-struct common_chat_input {
-    std::string              text;
-    std::vector<llama_token> tokens;
-
-    common_chat_input() = default;
-
-    // plain text, with no tokens
-    explicit common_chat_input(std::string text) : text(std::move(text)), tokens(this->text.size(), LLAMA_TOKEN_NULL) {}
-
-    size_t size() const { return text.size(); }
-    bool empty() const { return text.empty(); }
-
-    void append(const std::string & piece, llama_token token);
-    void append(const common_chat_input & chunk);
-
-    void prepend(const std::string & prefix);
-    void prepend(const common_chat_input & prefix);
-
-    void truncate(size_t pos);
-
-    common_chat_input substr(size_t pos, size_t n = std::string::npos) const;
-};
-
-common_chat_input common_chat_input_tokenize(const llama_vocab * vocab, const std::string & text);
-
 // per-message parsing syntax
 // should be derived from common_chat_params
 struct common_chat_parser_params {
-    common_chat_format format = COMMON_CHAT_FORMAT_CONTENT_ONLY;
-    common_chat_input  generation_prompt;
-    bool               debug  = false; // Enable debug output for PEG parser
-    common_peg_arena   parser = {};
+    common_chat_format      format               = COMMON_CHAT_FORMAT_CONTENT_ONLY;
+    common_reasoning_format reasoning_format     = COMMON_REASONING_FORMAT_NONE; // TODO: refactor this to "bool parse_reasoning"
+    // Whether reasoning_content should be inlined in the content (e.g. for reasoning_format=deepseek in stream mode)
+    bool                    reasoning_in_content = false;
+    std::string             generation_prompt;
+    bool                    parse_tool_calls     = true;
+    bool                    is_continuation      = false;
+    bool                    echo                 = false;  // Include assistant prefilled msg in output
+    bool                    debug                = false;  // Enable debug output for PEG parser
+    common_peg_arena        parser               = {};
    common_chat_parser_params() = default;
    common_chat_parser_params(const common_chat_params & chat_params) {
        format  = chat_params.format;
-        generation_prompt = common_chat_input(chat_params.generation_prompt);
+        generation_prompt = chat_params.generation_prompt;
    }
 };

@@ -387,62 +337,8 @@ std::string common_chat_format_example(const struct common_chat_templates *
                                       const std::map<std::string, std::string> & chat_template_kwargs);

 const char *    common_chat_format_name(common_chat_format format);
-common_chat_msg common_chat_parse(const common_chat_input & input, bool is_partial, const common_chat_parser_params & params);
-common_chat_msg common_chat_peg_parse(const common_peg_arena & src_parser, const common_chat_input & input, bool is_partial, const common_chat_parser_params & params);
-
-struct common_chat_session_params {
-    bool echo  = false; // include the assistant prefill in the output when continuing a message
-    bool debug = false; // enable debug output for the PEG parser
-};
-
-class common_chat_session {
-  public:
-    common_chat_session() { result.role = "assistant"; }
-
-    common_chat_session(const common_chat_templates *        tmpls,
-                        const llama_vocab *                  vocab,
-                        const common_chat_templates_inputs & inputs,
-                        const common_chat_session_params &   params = {});
-
-    const common_chat_prompt & prompt() const { return prompt_parts; }
-    common_chat_format       format()   const { return parser_params.format; }
-    const common_chat_msg &  msg()      const { return result; }
-    const common_peg_arena & parser()   const { return parser_params.parser; }
-
-    const std::string &              grammar()            const { return grammar_text; }
-    const std::string &              generation_prompt()  const { return generation_prompt_text; }
-    const std::string &              thinking_start_tag() const { return thinking_start; }
-    const std::vector<std::string> & thinking_end_tags()  const { return thinking_ends; }
-    const std::vector<std::string> & additional_stops()   const { return stops; }
-
-    const common_chat_msg_delimiters & message_delimiters() const { return delimiters; }
-
-    void apply_sampling(common_params_sampling & sampling) const;
-
-    bool has_template() const { return templated; }
-
-    const common_chat_msg & feed(const common_chat_input & chunk);
-
-    const common_chat_msg & finish(const common_chat_input & chunk = {});
-
-  private:
-    common_chat_prompt                  prompt_parts;
-    std::string                         grammar_text;
-    bool                                grammar_lazy = false;
-    std::vector<common_grammar_trigger> grammar_triggers;
-    std::set<llama_token>               preserved_tokens;
-    std::vector<std::string>            stops;
-    std::string                         generation_prompt_text;
-    std::string                         thinking_start;
-    std::vector<std::string>            thinking_ends;
-
-    common_chat_parser_params  parser_params;
-    common_chat_msg_delimiters delimiters;
-    common_chat_input          input;
-    common_chat_msg            result;
-    bool                       templated = false;
-    bool                       finished  = false;
-};
+common_chat_msg common_chat_parse(const std::string & input, bool is_partial, const common_chat_parser_params & params);
+common_chat_msg common_chat_peg_parse(const common_peg_arena & src_parser, const std::string & input, bool is_partial, const common_chat_parser_params & params);

 // used by arg and server
 const char *            common_reasoning_format_name(common_reasoning_format format);
@@ -470,7 +366,7 @@ common_json common_chat_tool_parameters(const common_json & function);
 // get template caps, useful for reporting to server /props endpoint
 std::map<std::string, bool> common_chat_templates_get_caps(const common_chat_templates * chat_templates);

-common_chat_prompt common_chat_template_direct_apply(
+std::string common_chat_template_direct_apply(
    const common_chat_template & tmpl,
    const autoparser::generation_params & inputs);

@@ -480,7 +376,8 @@ std::string common_chat_template_generation_prompt(

 std::optional<common_chat_params> common_chat_try_specialized_template(
        const common_chat_template &          tmpl,
-        const autoparser::generation_params & params);
+        const std::string &                   src,
+        autoparser::generation_params & params);


 // specialized per-task preset
@@ -490,3 +387,5 @@ struct common_chat_prompt_preset {
 };

 common_chat_prompt_preset common_chat_get_asr_prompt(const common_chat_templates * chat_templates);
+
+common_chat_msg_delimiters common_chat_msg_delimiters_parse(const common_json & delimiters);
@@ -8,7 +8,6 @@
 #include "ggml.h"
 #include "llama.h"

-#include <array>
 #include <list>
 #include <set>
 #include <sstream>
@@ -17,9 +16,7 @@
 #include <vector>
 #include <map>
 #include <algorithm>
-#include <filesystem>
 #include <fstream>
-#include <cstdio>

 #if defined(_WIN32) && !defined(_WIN32_WINNT)
 #define _WIN32_WINNT 0x0A00
@@ -31,8 +28,6 @@
 #define DIRECTORY_SEPARATOR '/'
 #endif // _WIN32

-#define COMMON_RECURSIVE_LIMIT 128
-
 #define COM_DBG(fmt, ...) LOG_DBG("cmn  %12.*s: " fmt, 12, __func__, __VA_ARGS__)
 #define COM_TRC(fmt, ...) LOG_TRC("cmn  %12.*s: " fmt, 12, __func__, __VA_ARGS__)
 #define COM_INF(fmt, ...) LOG_INF("cmn  %12.*s: " fmt, 12, __func__, __VA_ARGS__)
@@ -336,8 +331,6 @@ struct common_params_speculative_draft {

    bool backend_sampling = true; // offload draft sampling to the backend (default: on)

-    bool probabilistic = false; // sample the draft and verify by rejection, instead of argmax and match
-
    common_params_model mparams;

    llama_context * ctx_tgt = nullptr;
@@ -345,8 +338,6 @@ struct common_params_speculative_draft {

    int32_t n_gpu_layers = -1; // number of layers to store in VRAM for the draft model (-1 - use default)

-    int32_t n_ubatch = 0; // physical batch size of the draft context (0 - use the target's n_ubatch)
-
    ggml_type cache_type_k = GGML_TYPE_F16; // KV cache data type for the K
    ggml_type cache_type_v = GGML_TYPE_F16; // KV cache data type for the V

@@ -590,15 +581,12 @@ struct common_params {
    bool no_op_offload     = false; // globally disable offload host tensor operations to device
    bool no_extra_bufts    = false; // disable extra buffer types (used for weight repacking)
    bool no_host           = false; // bypass host buffer allowing extra buffers to be used
-    bool load_mtp          = false; // load MTP/NextN layers

    bool single_turn       = false; // single turn chat conversation

    ggml_type cache_type_k = GGML_TYPE_F16; // KV cache data type for the K
    ggml_type cache_type_v = GGML_TYPE_F16; // KV cache data type for the V

-    size_t moe_cache_size = 0; // GPU cache size in bytes for the MoE experts kept in the CPU, split among the GPUs like the layers
-
    common_conversation_mode conversation_mode = COMMON_CONVERSATION_MODE_AUTO;

    // multimodal models (see tools/mtmd)
@@ -629,7 +617,7 @@ struct common_params {
    std::string cls_sep    = "\t";  // separator of classification sequences

    // server params
-    int32_t port                = 9931;          // server listens on this network port
+    int32_t port                = 8080;          // server listens on this network port
    bool    reuse_port          = false;         // allow multiple sockets to bind to the same port
    int32_t timeout_read        = 3600;          // http read timeout in seconds
    int32_t timeout_write       = timeout_read;  // http write timeout in seconds
@@ -642,11 +630,6 @@ struct common_params {
    int32_t kv_unified_per_slot = 0;     // max context per parallel slot; 0 = unset
    int32_t checkpoint_min_step = 8192;  // minimum spacing between context checkpoints
    int32_t cache_ram_mib       = 8192;  // -1 = no limit, 0 - disable, 1 = 1 MiB, etc.
-    bool    cache_ram_explicit  = false; // set by --cache-ram, decision models disable the cache otherwise
-
-    // llama-connect params
-    bool        server_connect      = false;
-    std::string server_connect_code = "";

    std::string public_path   = "";                                                                         // NOLINT
    std::string api_prefix    = "";                                                                         // NOLINT
@@ -736,11 +719,10 @@ struct common_params {
    int32_t i_chunk     =  0; // start processing from this chunk
    int8_t  imat_dat    =  0; // whether the legacy imatrix.dat format should be output (gguf <= 0 < dat)

-    bool process_output         = false; // collect data for the output tensor
-    bool compute_ppl            = true;  // whether to compute perplexity
-    bool show_statistics        = false; // show imatrix statistics per tensor
-    bool activation_statistics  = false; // generate data to calculate activation based statistics
-    bool parse_special          = false; // whether to parse special tokens during imatrix tokenization
+    bool process_output  = false; // collect data for the output tensor
+    bool compute_ppl     = true;  // whether to compute perplexity
+    bool show_statistics = false; // show imatrix statistics per tensor
+    bool parse_special   = false; // whether to parse special tokens during imatrix tokenization

    // cvector-generator params
    int n_pca_batch = 100;
@@ -826,9 +808,7 @@ static std::vector<T> string_split(const std::string & str, char delim) {
    while (std::getline(str_stream, token, delim)) {
        T value;
        std::istringstream token_stream(token);
-        if (!(token_stream >> value)) {
-            throw std::invalid_argument("invalid value: \"" + token + "\"");
-        }
+        token_stream >> value;
        values.push_back(value);
    }
    return values;
@@ -896,21 +876,10 @@ void string_process_escapes(std::string & input);
 std::string string_from(bool value);
 std::string string_from(const std::vector<int> & values);
 std::string string_from(const struct llama_context * ctx, const std::vector<llama_token> & tokens);
+std::string string_from(const struct llama_context * ctx, const struct llama_batch & batch);

 bool glob_match(const std::string & pattern, const std::string & str);

-//
-// Unicode utils
-//
-
-#ifdef _WIN32
-std::wstring utf8_to_wstring(const std::string & str);
-std::string  wstring_to_utf8(const std::wstring & str);
-#endif
-
-// returns the path as a UTF-8 string, preserving its separators
-std::string fs_path_to_utf8(const std::filesystem::path & path);
-
 //
 // Environment utils
 //
@@ -920,30 +889,28 @@ std::string fs_path_to_utf8(const std::filesystem::path & path);
 std::string common_get_env(const std::string & name);
 void        common_set_env(const std::string & name, const std::string & value);

-// reads a path from the environment, an unset variable gives an empty path
-std::filesystem::path common_get_path_from_env(const std::string & name);
-
 //
 // Filesystem utils
 //

 bool fs_validate_filename(const std::string & filename, bool allow_subdirs = false);
+bool fs_create_directory_with_parents(const std::string & path);
 bool fs_is_directory(const std::string & path);

-// some old libstdc++ versions don't follow symlinks here, so adding a trailing "/" fixes it: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101510
-inline bool common_create_directories(const std::filesystem::path & path, std::error_code & ec) {
-#if defined(__linux__)
-    return std::filesystem::create_directories(path / "", ec);
-#else
-    return std::filesystem::create_directories(path, ec);
-#endif
-}
+std::string fs_get_cache_directory();
+std::string fs_get_cache_file(const std::string & filename);
+std::string fs_get_config_directory();

-std::filesystem::path fs_get_cache_directory();
-std::filesystem::path fs_get_cache_file(const std::string & filename);
-std::filesystem::path fs_get_config_directory();
+struct common_file_info {
+    std::string path;
+    std::string name;
+    size_t      size = 0; // in bytes
+    bool        is_dir = false;
+};
+std::vector<common_file_info> fs_list(const std::string & path, bool include_directories);

-void fs_write_atomic(const std::filesystem::path & path, const std::string & data);
+// fs open, also handle UTF8 on Windows
+std::ifstream fs_open_ifstream(const std::string & fname, std::ios_base::openmode mode);

 //
 // TTY utils
@@ -951,10 +918,6 @@ void fs_write_atomic(const std::filesystem::path & path, const std::string & dat

 // Auto-detect if colors can be enabled based on terminal and environment
 bool tty_can_use_colors();
-bool tty_enable_ansi(); // false when stdout or stderr is a console that cannot render ANSI sequences
-
-// Check if the given file is attached to a terminal
-bool common_is_tty(FILE * file);

 //
 // Model utils
@@ -962,36 +925,6 @@ bool common_is_tty(FILE * file);

 struct common_sampler;

-// typed decision models, see "<arch>.decision.type" in the model metadata
-enum common_decision_type {
-    COMMON_DECISION_TYPE_NONE,    // not a decision model
-    COMMON_DECISION_TYPE_OPENJEV, // logits of one label token per option, read at the last prompt token
-    COMMON_DECISION_TYPE_LEV,     // same as openjev, noul is read from a rating scale
-    COMMON_DECISION_TYPE_KEV,     // dot product of the hidden states of the last token and of one end token per option
-    COMMON_DECISION_TYPE_NIMBLE,  // same as openjev, the prompt lists all the questions of the request
-    COMMON_DECISION_TYPE_LAYA,    // score of one marker token per option, read from the embeddings output
-    COMMON_DECISION_TYPE_CLEF,    // all questions in one prompt, score of option i read from the embeddings output at row i
-    COMMON_DECISION_TYPE_PPLX_DECIDER, // same as openjev, label codes of 1 or 2 letters
-    COMMON_DECISION_TYPE_VLLM_DECISION2, // score of each option read from the embeddings output, the options of a question are marked in the batch
-    COMMON_DECISION_TYPE_VLLM_D3, // same as pplx-decider, non-causal attention
-    COMMON_DECISION_TYPE_LFM2_D1, // same as openjev, the labels depend on the question type
-    COMMON_DECISION_TYPE_LFM2_D1_OMNI, // same as laya, other prompt layout
-    COMMON_DECISION_TYPE_GRANITE_SWITCH, // same as openjev, run by the decision aLoRA of granite switch
-    COMMON_DECISION_TYPE_H2O_LIGHTNING, // same as openjev, the labels are read after an answer prefill
-    COMMON_DECISION_TYPE_UNKNOWN, // a decision model of a type that is not supported
-};
-
-common_decision_type common_get_decision_type(const struct llama_model * model);
-
-// metadata of a GGUF file, read without loading the model
-struct common_gguf_info {
-    common_decision_type decision_type = COMMON_DECISION_TYPE_UNKNOWN; // UNKNOWN if the file is missing, unreadable, or invalid
-    uint32_t             n_ctx_train   = 0;                            // 0 if unknown
-    bool                 has_chat_tmpl = false;                        // has the default tokenizer.chat_template
-};
-
-common_gguf_info common_get_gguf_info(const std::string & fname);
-
 // note: defines the model, context, samplers, ets. lifetimes
 struct common_init_result {
    common_init_result(common_params & params, bool model_only = false);
@@ -1079,67 +1012,18 @@ struct common_memory {
 // Batch utils
 //

-// wrapper around llama_batch_ext that provide getter functions for downstream code
-// entries can exceed n_batch, use get_sub_batch() to decode them in chunks
-struct common_batch {
-    struct token {
-        llama_token  id;
-        std::array<llama_pos, GGML_MROPE_SECTIONS> pos; // only pos[0] is used for text tokens
-        llama_seq_id seq_id; // the first sequence id, see add_seq()
-        bool         output;
-        llama_embd   embd; // non-owning view of the data passed to add_embd()/set_embd(), data == NULL if none
-        llama_embd   state; // non-owning view of the data passed to set_embd_state(), data == NULL if none
-        std::vector<llama_seq_id> seq_ids_extra; // see add_seq()
-        int32_t      decision_order = 0; // see llama_batch_ext_set_decision_order()
-    };
+void common_batch_clear(struct llama_batch & batch);

-    std::vector<token> tokens; // mirror of the entries, tokens[i] describes batch index i
-    llama_batch_ext_ptr batch;
-
-    int32_t n_pos = 1; // positions per embedding entry, GGML_MROPE_SECTIONS for MROPE/IMROPE
-
-    common_batch() = default;
-    common_batch(struct llama_context * ctx);
-
-    llama_batch_ext * get() { return get_sub_batch(0, size()); }
-
-    // render entries [off, off + n) into batch, the result is overwritten by the next call
-    llama_batch_ext * get_sub_batch(int32_t off, int32_t n);
-
-    // content type of the batch, all entries carry the same combination
-    bool has_token() const { return !tokens.empty() && tokens[0].id != LLAMA_TOKEN_NULL; }
-    bool has_embd () const { return !tokens.empty() && tokens[0].embd.data != nullptr; }
-
-    void clear();
-
-    // returns the batch index
-    int32_t add(llama_token id, llama_pos pos, llama_seq_id seq_id, bool output);
-
-    // same, with the entry shared by all seq_ids (must not be empty)
-    int32_t add(llama_token id, llama_pos pos, const std::vector<llama_seq_id> & seq_ids, bool output);
-
-    // add the entry at idx to another sequence, tokens[idx].seq_id keeps the first one
-    bool add_seq(int32_t idx, llama_seq_id seq_id);
-
-    bool set_output(int32_t idx, bool value);
-
-    // attach a token embedding to the entry at idx, can only be set once per entry
-    bool set_embd(int32_t idx, llama_embd embd);
-
-    // attach a state embedding (e.g. the target hidden state for MTP) to the entry at idx, can only be set once per entry
-    bool set_embd_state(int32_t idx, llama_embd state);
-
-    // add an embedding-only entry (no token id)
-    // pos points to n_pos positions
-    int32_t add_embd(llama_embd embd, const llama_pos * pos, llama_seq_id seq_id, bool output);
-
-    int32_t size() const { return (int32_t) tokens.size(); }
-};
+void common_batch_add(
+                 struct llama_batch & batch,
+                        llama_token   id,
+                          llama_pos   pos,
+    const std::vector<llama_seq_id> & seq_ids,
+                               bool   logits);

 // create a single-sequence batch from a list of tokens
-// positions continue from the memory, last token always have output_logits set to true
-common_batch common_batch_get_one(struct llama_context * ctx, const llama_token * tokens, int32_t n_tokens);
-common_batch common_batch_get_one(struct llama_context * ctx, const llama_tokens & tokens);
+// last token always have output_logits set to true
+llama_batch_ext_ptr common_batch_ext_get_one(struct llama_context * ctx, const llama_tokens & tokens);

 // decodes a single batch of tokens for a prompt and manages session tokens
 //
@@ -1318,13 +1202,12 @@ struct common_prompt_checkpoint {
            llama_seq_id seq_id,
            llama_state_seq_flags flags);

-    // return false if the state could not be restored
-    bool load_tgt(
+    void load_tgt(
            llama_context * ctx,
            llama_seq_id seq_id,
            llama_state_seq_flags flags) const;

-    bool load_dft(
+    void load_dft(
            llama_context * ctx,
            llama_seq_id seq_id,
            llama_state_seq_flags flags) const;
@@ -1,5 +1,4 @@
 #include "console.h"
-#include "common.h"
 #include "log.h"
 #include <vector>
 #include <iostream>
@@ -1019,7 +1018,6 @@ namespace console {
                    line.clear();
                    pop_cursor();
                }
-                line += '\n';
                has_more = false;
            }
        } else {
@@ -1051,10 +1049,13 @@ namespace console {
        if (!std::getline(std::wcin, wline)) {
            // Input stream is bad or EOF received
            line.clear();
+            GenerateConsoleCtrlEvent(CTRL_C_EVENT, 0);
            return false;
        }

-        line = wstring_to_utf8(wline);
+        int size_needed = WideCharToMultiByte(CP_UTF8, 0, &wline[0], (int)wline.size(), NULL, 0, NULL, NULL);
+        line.resize(size_needed);
+        WideCharToMultiByte(CP_UTF8, 0, &wline[0], (int)wline.size(), &line[0], size_needed, NULL, NULL);
 #else
        if (!std::getline(std::cin, line)) {
            // Input stream is bad or EOF received
@@ -1065,7 +1066,7 @@ namespace console {
        if (!line.empty()) {
            char last = line.back();
            if (last == '/') { // Always return control on '/' symbol
-                line.back() = '\n';
+                line.pop_back();
                return false;
            }
            if (last == '\\') { // '\\' changes the default action
@@ -4,7 +4,6 @@
 #include "common.h"
 #include "log.h"
 #include "download.h"
-#include "file-lock.h"
 #include "hf-cache.h"
 #include "json.h"

@@ -36,16 +35,50 @@
 #endif
 #endif

+// isatty
+#if defined(_WIN32)
+#include <io.h>
+#else
+#include <unistd.h>
+#endif
+
 //
 // downloader
 //

-// the suffix of the file a download writes until it completes
-static const std::string PARTIAL_SUFFIX = ".downloadInProgress";
+// validate repo name format: owner/repo
+static void write_file(const std::string & fname, const std::string & content) {
+    const std::string fname_tmp = fname + ".tmp";
+    std::ofstream     file(fname_tmp);
+    if (!file) {
+        throw std::runtime_error(string_format("error: failed to open file '%s'\n", fname.c_str()));
+    }
+
+    try {
+        file << content;
+        file.close();
+
+        // Makes write atomic
+        if (rename(fname_tmp.c_str(), fname.c_str()) != 0) {
+            LOG_ERR("%s: unable to rename file: %s to %s\n", __func__, fname_tmp.c_str(), fname.c_str());
+            // If rename fails, try to delete the temporary file
+            if (remove(fname_tmp.c_str()) != 0) {
+                LOG_ERR("%s: unable to delete temporary file: %s\n", __func__, fname_tmp.c_str());
+            }
+        }
+    } catch (...) {
+        // If anything fails, try to delete the temporary file
+        if (remove(fname_tmp.c_str()) != 0) {
+            LOG_ERR("%s: unable to delete temporary file: %s\n", __func__, fname_tmp.c_str());
+        }
+
+        throw std::runtime_error(string_format("error: failed to write file '%s'\n", fname.c_str()));
+    }
+}

 static void write_etag(const std::string & path, const std::string & etag) {
    const std::string etag_path = path + ".etag";
-    fs_write_atomic(std::filesystem::u8path(etag_path), etag);
+    write_file(etag_path, etag);
    LOG_DBG("%s: file etag saved: %s\n", __func__, etag_path.c_str());
 }

@@ -78,18 +111,6 @@ std::pair<std::string, std::string> common_download_split_repo_tag(const std::st
    return {hf_repo, tag};
 }

-// file name from url, without the query string
-static std::string url_get_filename(const std::string & url) {
-    std::string filename = url;
-    if (auto pos = filename.rfind('/'); pos != std::string::npos) {
-        filename = filename.substr(pos + 1);
-    }
-    if (auto pos = filename.find('?'); pos != std::string::npos) {
-        filename = filename.substr(0, pos);
-    }
-    return filename;
-}
-
 class ProgressBar : public common_download_callback {
    static inline std::mutex mutex;
    static inline std::map<const ProgressBar *, int> lines;
@@ -106,15 +127,25 @@ class ProgressBar : public common_download_callback {
    }

    static bool is_output_a_tty() {
-        return common_is_tty(stdout);
+#if defined(_WIN32)
+        return _isatty(_fileno(stdout));
+#else
+        return isatty(1);
+#endif
    }

 public:
    ProgressBar() = default;

    void on_start(const common_download_progress & p) override {
-        filename = url_get_filename(p.url);
+        filename = p.url;

+        if (auto pos = filename.rfind('/'); pos != std::string::npos) {
+            filename = filename.substr(pos + 1);
+        }
+        if (auto pos = filename.find('?'); pos != std::string::npos) {
+            filename = filename.substr(0, pos);
+        }
        for (size_t i = 0; i < filename.size(); ++i) {
            if ((filename[i] & 0xC0) != 0x80) {
                if (len++ == 39) {
@@ -196,13 +227,6 @@ static bool common_pull_file(httplib::Client & cli,
        [&](const httplib::Response &response) {
            if (p.downloaded > 0 && response.status != 206) {
                LOG_WRN("%s: server did not respond with 206 Partial Content for a resume request. Status: %d\n", func, response.status);
-                if (response.status == 416 || response.status == 200) {
-                    // the kept partial cannot be resumed: 416 for a complete or stale one,
-                    // 200 from a server that ignores the range; drop it, so the next
-                    // attempt starts over instead of wedging on the same answer
-                    ofs.close();
-                    remove(path_tmp.c_str());
-                }
                return false;
            }
            if (p.downloaded == 0 && response.status != 200) {
@@ -231,7 +255,7 @@ static bool common_pull_file(httplib::Client & cli,
            if (progress_step >= p.total / 1000 || p.downloaded == p.total) {
                if (callback) {
                    callback->on_update(p);
-                    if (callback->is_cancelled() && (p.total == 0 || p.downloaded != p.total)) {
+                    if (callback->is_cancelled()) {
                        return false;
                    }
                }
@@ -250,12 +274,6 @@ static bool common_pull_file(httplib::Client & cli,
        return false;
    }

-    ofs.close();
-    if (!ofs) {
-        LOG_ERR("%s: error closing file: %s\n", __func__, path_tmp.c_str());
-        return false;
-    }
-
    return true;
 }

@@ -264,62 +282,15 @@ static bool common_pull_file(httplib::Client & cli,
 static int common_download_file_single_online(const std::string & url,
                                              const std::string & path,
                                              const common_download_opts & opts,
-                                              bool skip_etag,
-                                              const std::string & lock_path,
-                                              const std::string & alt_path) {
+                                              bool skip_etag) {
    static const int max_attempts        = 3;
    static const int retry_delay_seconds = 2;

-    const std::string path_temporary = path + PARTIAL_SUFFIX;
-    const std::string path_lock = lock_path.empty() ? path + ".lock" : lock_path;
-
-    common_download_progress p;
-    p.url = url;
-
-    if (opts.callback) {
-        opts.callback->on_start(p);
-    }
-
-    // the completion callback may itself take the same lock (the HF cache
-    // finalizes blobs under it), so every exit goes through finish()
-    common_file_lock lock(path_lock);
-    auto finish = [&](int status) {
-        lock.close();
-        if (opts.callback) {
-            opts.callback->on_done(p, is_http_status_ok(status));
-        }
-        return status;
-    };
-
-    // alt_path is the HF snapshot: the blob may have been moved there when symlinks are unavailable
-    auto cache_hit = [&] {
-        return std::filesystem::exists(std::filesystem::u8path(path)) ||
-               (!alt_path.empty() && std::filesystem::exists(std::filesystem::u8path(alt_path)));
-    };
-
-    if (skip_etag && cache_hit()) {
-        LOG_DBG("%s: using cached file: %s\n", __func__, path.c_str());
-        return finish(304); // 304 Not Modified - fake cached response
-    }
-
-    // take the lock before touching the cache, so two processes cannot race on the same file
-    bool waited = false;
-    if (!lock.acquire([&] {
-            if (!waited) {
-                LOG_INF("%s: file '%s' is being downloaded by another process, waiting...\n", __func__, url_get_filename(url).c_str());
-                waited = true;
-            }
-            return !(opts.callback && opts.callback->is_cancelled());
-        })) {
-        return finish(-1);
-    }
-
-    // under the lock: another process may have finished while we waited
-    bool file_exists = cache_hit();
+    const bool file_exists = std::filesystem::exists(path);

    if (file_exists && skip_etag) {
        LOG_DBG("%s: using cached file: %s\n", __func__, path.c_str());
-        return finish(304); // 304 Not Modified - fake cached response
+        return 304; // 304 Not Modified - fake cached response
    }

    auto [cli, parts] = common_http_client(url);
@@ -348,9 +319,9 @@ static int common_download_file_single_online(const std::string & url,
        LOG_TRC("%s: HEAD failed, status: %d\n", __func__, head ? head->status : -1);
        if (file_exists) {
            LOG_TRC("%s: using cached file (HEAD failed): %s\n", __func__, path.c_str());
-            return finish(304); // 304 Not Modified - fake cached response
+            return 304; // 304 Not Modified - fake cached response
        }
-        return finish(head ? head->status : -1);
+        return head ? head->status : -1;
    }

    std::string etag;
@@ -358,6 +329,8 @@ static int common_download_file_single_online(const std::string & url,
        etag = head->get_header_value("ETag");
    }

+    common_download_progress p;
+    p.url = url;
    if (head->has_header("Content-Length")) {
        try {
            p.total = std::stoull(head->get_header_value("Content-Length"));
@@ -374,16 +347,16 @@ static int common_download_file_single_online(const std::string & url,
    if (file_exists) {
        if (etag.empty()) {
            LOG_DBG("%s: using cached file (no server etag): %s\n", __func__, path.c_str());
-            return finish(304); // 304 Not Modified - fake cached response
+            return 304; // 304 Not Modified - fake cached response
        }
        if (!last_etag.empty() && last_etag == etag) {
            LOG_DBG("%s: using cached file (same etag): %s\n", __func__, path.c_str());
-            return finish(304); // 304 Not Modified - fake cached response
+            return 304; // 304 Not Modified - fake cached response
        }
        // pass this point, the file exists but is different from the server version, so we need to redownload it
        if (remove(path.c_str()) != 0) {
            LOG_ERR("%s: unable to delete file: %s\n", __func__, path.c_str());
-            return finish(-1);
+            return -1;
        }
    }

@@ -393,24 +366,11 @@ static int common_download_file_single_online(const std::string & url,
    }

    bool success = false;
+    const std::string path_temporary = path + ".downloadInProgress";
    int delay = retry_delay_seconds;

-    if (!skip_etag && !etag.empty()) {
-        if (std::filesystem::exists(path_temporary) && read_etag(path_temporary) != etag) {
-            LOG_WRN("%s: partial file does not match the server etag, discarding it: %s\n", __func__, path_temporary.c_str());
-            if (remove(path_temporary.c_str()) != 0) {
-                LOG_ERR("%s: unable to delete file: %s\n", __func__, path_temporary.c_str());
-                return finish(-1);
-            }
-        }
-        write_etag(path_temporary, etag);
-    }
-
    if (opts.callback) {
-        // report the resume offset, so a resumed file does not start at 0
-        p.downloaded = supports_ranges && std::filesystem::exists(path_temporary) ?
-                       std::filesystem::file_size(path_temporary) : 0;
-        opts.callback->on_update(p);
+        opts.callback->on_start(p);
    }

    for (int i = 0; i < max_attempts; ++i) {
@@ -447,19 +407,27 @@ static int common_download_file_single_online(const std::string & url,
            }
            if (!etag.empty() && !skip_etag) {
                write_etag(path, etag);
-                remove((path_temporary + ".etag").c_str());
            }
            success = true;
            break;
        }
    }

-    // a stopped download keeps path_temporary, so the next attempt resumes from it
+    if (opts.callback) {
+        opts.callback->on_done(p, success);
+    }
+    if (opts.callback && opts.callback->is_cancelled() &&
+        std::filesystem::exists(path_temporary)) {
+        if (remove(path_temporary.c_str()) != 0) {
+            LOG_ERR("%s: unable to delete temporary file: %s\n", __func__, path_temporary.c_str());
+        }
+    }
    if (!success) {
        LOG_ERR("%s: download failed after %d attempts\n", __func__, max_attempts);
+        return -1; // max attempts reached
    }

-    return finish(success ? head->status : -1);
+    return head->status;
 }

 std::pair<long, std::vector<char>> common_remote_get_content(const std::string          & url,
@@ -499,19 +467,17 @@ std::pair<long, std::vector<char>> common_remote_get_content(const std::string
 int common_download_file_single(const std::string & url,
                                const std::string & path,
                                const common_download_opts & opts,
-                                bool skip_etag,
-                                const std::string & lock_path,
-                                const std::string & alt_path) {
+                                bool skip_etag) {
    if (!opts.offline) {
        ProgressBar tty_cb;
        common_download_opts online_opts = opts;
        if (!online_opts.callback) {
            online_opts.callback = &tty_cb;
        }
-        return common_download_file_single_online(url, path, online_opts, skip_etag, lock_path, alt_path);
+        return common_download_file_single_online(url, path, online_opts, skip_etag);
    }

-    if (!std::filesystem::exists(std::filesystem::u8path(path))) {
+    if (!std::filesystem::exists(path)) {
        LOG_ERR("%s: required file is not available in cache (offline mode): %s\n", __func__, path.c_str());
        return -1;
    }
@@ -663,65 +629,33 @@ static hf_cache::hf_file find_best_sibling(const hf_cache::hf_files & files,
    return best;
 }

-static const std::vector<common_download_sidecar> sidecars = {
-    { "mmproj", "mmproj",  false, &common_download_opts::download_mmproj, &common_download_hf_plan::mmproj },
-    { "mtp",    "mtp-",    true,  &common_download_opts::download_mtp,    &common_download_hf_plan::mtp    },
-    { "dflash", "dflash-", true,  &common_download_opts::download_dflash, &common_download_hf_plan::dflash },
-    { "eagle3", "eagle3-", true,  &common_download_opts::download_eagle3, &common_download_hf_plan::eagle3 },
-    { "dspark", "dspark-", true,  &common_download_opts::download_dspark, &common_download_hf_plan::dspark },
-};
-
-const std::vector<common_download_sidecar> & common_download_sidecars() {
-    return sidecars;
+static hf_cache::hf_file find_best_mmproj(const hf_cache::hf_files & files,
+                                          const std::string        & model) {
+    return find_best_sibling(files, model, "mmproj");
 }

-bool common_download_opts_add_sidecar(common_download_opts & opts, const std::string & kind) {
-    for (const auto & s : sidecars) {
-        if (kind == s.name) {
-            opts.*s.opt = true;
-            return true;
-        }
-    }
-    return false;
+static hf_cache::hf_file find_best_mtp(const hf_cache::hf_files & files,
+                                       const std::string        & model,
+                                       const std::string        & tag = "") {
+    return find_best_sibling(files, model, "mtp-", tag);
 }

-std::vector<std::string> common_download_plan_sidecars(const common_download_hf_plan & plan) {
-    std::vector<std::string> out;
-    for (const auto & s : sidecars) {
-        if (!(plan.*s.file).path.empty()) {
-            out.emplace_back(s.name);
-        }
-    }
-    return out;
+static hf_cache::hf_file find_best_eagle3(const hf_cache::hf_files & files,
+                                          const std::string        & model,
+                                          const std::string        & tag = "") {
+    return find_best_sibling(files, model, "eagle3-", tag);
 }

-std::vector<common_download_partial> common_download_plan_partials(const common_download_hf_plan & plan) {
-    std::vector<common_download_partial> out;
-
-    // a file in the cache resolves to its snapshot entry, a file still to download to its blob
-    auto add = [&](const std::string & kind, const hf_cache::hf_file & f) {
-        if (!f.local_path.empty() && f.local_path != f.final_path) {
-            out.push_back({ kind, f.local_path + PARTIAL_SUFFIX });
-        }
-    };
-
-    for (const auto & f : plan.model_files) {
-        add("", f);
-    }
-    for (const auto & s : sidecars) {
-        add(s.name, plan.*s.file);
-    }
-    return out;
+static hf_cache::hf_file find_best_dflash(const hf_cache::hf_files & files,
+                                          const std::string        & model,
+                                          const std::string        & tag = "") {
+    return find_best_sibling(files, model, "dflash-", tag);
 }

-// true when `name` carries the keyword of a sidecar kind
-static bool name_is_sidecar(const std::string & name) {
-    for (const auto & s : sidecars) {
-        if (name.find(s.keyword) != std::string::npos) {
-            return true;
-        }
-    }
-    return false;
+static hf_cache::hf_file find_best_dspark(const hf_cache::hf_files & files,
+                                          const std::string        & model,
+                                          const std::string        & tag = "") {
+    return find_best_sibling(files, model, "dspark-", tag);
 }

 static bool gguf_filename_is_model(const std::string & filepath) {
@@ -734,7 +668,12 @@ static bool gguf_filename_is_model(const std::string & filepath) {
        filename = filename.substr(pos + 1);
    }

-    return filename.find("imatrix") == std::string::npos && !name_is_sidecar(filename);
+    return filename.find("mmproj")  == std::string::npos &&
+           filename.find("imatrix") == std::string::npos &&
+           filename.find("mtp-")    == std::string::npos &&
+           filename.find("eagle3-") == std::string::npos &&
+           filename.find("dflash-") == std::string::npos &&
+           filename.find("dspark-") == std::string::npos;
 }

 static hf_cache::hf_file find_best_model(const hf_cache::hf_files & files,
@@ -826,11 +765,8 @@ common_download_hf_plan common_download_get_hf_plan(const common_params_model &
        }
    } else {
        primary = find_best_model(all, tag);
-        // a requested draft can resolve on its own, without a full model of the same tag
-        const bool want_draft = std::any_of(sidecars.begin(), sidecars.end(), [&](const common_download_sidecar & s) {
-            return s.draft && opts.*s.opt;
-        });
-        if (primary.path.empty() && !want_draft) {
+        // a requested sidecar can resolve on its own, without a full model of the same tag
+        if (primary.path.empty() && !opts.download_mtp && !opts.download_dflash && !opts.download_eagle3 && !opts.download_dspark) {
            LOG_ERR("%s: no GGUF files found in repository %s\n", __func__, repo.c_str());
            list_available_gguf_files(all);
            return plan;
@@ -842,22 +778,24 @@ common_download_hf_plan common_download_get_hf_plan(const common_params_model &
        plan.model_files = get_split_files(all, primary);
    }

-    // a draft resolves at the tag, the mmproj pairs with the model
-    for (const auto & s : sidecars) {
-        if (!(opts.*s.opt)) {
-            continue;
-        }
-        if (s.draft) {
-            plan.*s.file = find_best_sibling(all, primary.path, s.keyword, tag);
-        } else if (!primary.path.empty()) {
-            plan.*s.file = find_best_sibling(all, primary.path, s.keyword);
-        }
+    if (opts.download_mmproj && !primary.path.empty()) {
+        plan.mmproj = find_best_mmproj(all, primary.path);
+    }
+    if (opts.download_mtp) {
+        plan.mtp = find_best_mtp(all, primary.path, tag);
+    }
+    if (opts.download_dflash) {
+        plan.dflash = find_best_dflash(all, primary.path, tag);
+    }
+    if (opts.download_eagle3) {
+        plan.eagle3 = find_best_eagle3(all, primary.path, tag);
+    }
+    if (opts.download_dspark) {
+        plan.dspark = find_best_dspark(all, primary.path, tag);
    }

-    const bool has_draft = std::any_of(sidecars.begin(), sidecars.end(), [&](const common_download_sidecar & s) {
-        return s.draft && !(plan.*s.file).local_path.empty();
-    });
-    if (primary.path.empty() && !has_draft) {
+    if (primary.path.empty() &&
+        plan.mtp.local_path.empty() && plan.dflash.local_path.empty() && plan.eagle3.local_path.empty() && plan.dspark.local_path.empty()) {
        LOG_ERR("%s: no GGUF files found in repository %s\n", __func__, repo.c_str());
        list_available_gguf_files(all);
    }
@@ -870,7 +808,7 @@ void common_download_run_tasks(const std::vector<common_download_task> & tasks)
    for (const auto & task : tasks) {
        futures.push_back(std::async(std::launch::async,
            [&task]() {
-                return common_download_file_single(task.url, task.local_path, task.opts, task.is_hf, task.lock_path, task.alt_path);
+                return common_download_file_single(task.url, task.local_path, task.opts, task.is_hf);
            }
        ));
    }
@@ -1005,7 +943,7 @@ std::string common_docker_resolve_model(const std::string & docker) {
        std::string model_filename = repo;
        std::replace(model_filename.begin(), model_filename.end(), '/', '_');
        model_filename += "_" + tag + ".gguf";
-        std::string local_path = fs_path_to_utf8(fs_get_cache_file(model_filename));
+        std::string local_path = fs_get_cache_file(model_filename);

        const std::string blob_url = url_prefix + "/blobs/" + gguf_digest;
        common_download_opts opts;
@@ -1023,11 +961,6 @@ std::string common_docker_resolve_model(const std::string & docker) {
    }
 }

-// a cached file that lists a model under its tag: the first split of a model, not a sidecar
-static bool is_listed_model(const gguf_split_info & split) {
-    return split.index == 1 && !split.tag.empty() && !name_is_sidecar(split.prefix);
-}
-
 std::vector<common_cached_model_info> common_list_cached_models() {
    std::unordered_set<std::string> seen;
    std::vector<common_cached_model_info> result;
@@ -1036,7 +969,12 @@ std::vector<common_cached_model_info> common_list_cached_models() {

    for (const auto & f : files) {
        auto split = get_gguf_split_info(f.path);
-        if (!is_listed_model(split)) {
+        if (split.index != 1 || split.tag.empty() ||
+            split.prefix.find("mmproj")  != std::string::npos ||
+            split.prefix.find("mtp-")    != std::string::npos ||
+            split.prefix.find("eagle3-") != std::string::npos ||
+            split.prefix.find("dflash-") != std::string::npos ||
+            split.prefix.find("dspark-") != std::string::npos) {
            continue;
        }
        if (seen.insert(f.repo_id + ":" + split.tag).second) {
@@ -1067,44 +1005,6 @@ std::string common_download_resolve_path(const std::string & hf_repo_with_tag, c
    return find_best_model(files, tag).local_path;
 }

-// the files -hf loads from the cache, the model with every sidecar, for each cached
-// tag of `repo_id` other than `tag`
-static std::unordered_set<std::string> files_in_use(const std::string & repo_id, const std::string & tag) {
-    common_download_opts opts;
-    opts.offline = true;
-    for (const auto & s : sidecars) {
-        opts.*s.opt = true;
-    }
-
-    std::unordered_set<std::string> tags;
-    std::unordered_set<std::string> used;
-
-    for (const auto & f : hf_cache::get_cached_files(repo_id)) {
-        auto split = get_gguf_split_info(f.path);
-        if (!is_listed_model(split) || split.tag == tag || !tags.insert(split.tag).second) {
-            continue;
-        }
-
-        common_params_model model;
-        model.hf_repo = repo_id + ":" + split.tag;
-
-        auto plan = common_download_get_hf_plan(model, opts);
-
-        for (const auto & m : plan.model_files) {
-            used.insert(m.local_path);
-        }
-        for (const auto & s : sidecars) {
-            const auto & sf = plan.*s.file;
-            if (!sf.local_path.empty()) {
-                used.insert(sf.local_path);
-            }
-        }
-    }
-    return used;
-}
-
-static bool remove_snapshot_entries(const std::string & repo_id, const std::vector<std::filesystem::path> & to_remove);
-
 bool common_download_remove(const std::string & hf_repo_with_tag) {
    namespace fs = std::filesystem;

@@ -1124,13 +1024,11 @@ bool common_download_remove(const std::string & hf_repo_with_tag) {
        return false;
    }

-    // collect snapshot entries whose tag matches, but a file another tag loads stays
-    const auto used = files_in_use(repo_id, tag_upper);
-
+    // collect snapshot entries whose tag matches
    std::vector<fs::path> to_remove;
    for (const auto & f : files) {
        auto split = get_gguf_split_info(f.path);
-        if (split.tag == tag_upper && used.find(f.local_path) == used.end()) {
+        if (split.tag == tag_upper) {
            to_remove.emplace_back(f.local_path);
        }
    }
@@ -1139,13 +1037,6 @@ bool common_download_remove(const std::string & hf_repo_with_tag) {
        return false;
    }

-    return remove_snapshot_entries(repo_id, to_remove);
-}
-
-// remove snapshot entries of `repo_id`, then the blobs no remaining entry references
-static bool remove_snapshot_entries(const std::string & repo_id, const std::vector<std::filesystem::path> & to_remove) {
-    namespace fs = std::filesystem;
-
    // resolve blob paths from symlinks before deleting snapshot entries
    std::vector<fs::path> blobs_to_check;
    for (const auto & p : to_remove) {
@@ -1197,26 +1088,3 @@ static bool remove_snapshot_entries(const std::string & repo_id, const std::vect

    return true;
 }
-
-bool common_download_remove_sidecars(const std::string & hf_repo_with_tag, const common_download_opts & opts) {
-    common_params_model model;
-    model.hf_repo = hf_repo_with_tag;
-
-    common_download_opts cached = opts;
-    cached.offline = true;
-
-    auto plan = common_download_get_hf_plan(model, cached);
-
-    std::vector<std::filesystem::path> to_remove;
-    for (const auto & s : sidecars) {
-        const auto & f = plan.*s.file;
-        if (!f.local_path.empty()) {
-            to_remove.emplace_back(std::filesystem::u8path(f.local_path));
-        }
-    }
-    if (to_remove.empty()) {
-        return false;
-    }
-
-    return remove_snapshot_entries(common_download_split_repo_tag(hf_repo_with_tag).first, to_remove);
-}
@@ -69,15 +69,12 @@ struct common_download_task {
    std::string local_path;
    std::function<void()> on_done;
    bool is_hf = false;
-    std::string lock_path;
-    std::string alt_path; // HF snapshot path, also treated as cached (the blob may be moved there)

    common_download_task() = default;
    common_download_task(hf_cache::hf_file f,
            const common_download_opts & opts,
            std::function<void()> on_done = nullptr)
-        : opts(opts), url(f.url), local_path(f.local_path), on_done(on_done), is_hf(true),
-          lock_path(hf_cache::get_lock_path(f.repo_id, f.oid)), alt_path(f.final_path) {}
+        : opts(opts), url(f.url), local_path(f.local_path), on_done(on_done), is_hf(true) {}
 };

 void common_download_run_tasks(const std::vector<common_download_task> & tasks);
@@ -95,14 +92,10 @@ std::string common_download_resolve_path(const std::string & hf_repo_with_tag, c
 // download single file from url to local path
 // returns status code or -1 on error
 // skip_etag: if true, don't read/write .etag files (for HF cache where filename is the hash)
-// lock_path: lock file used to serialize downloads of the same file; when empty, "<path>.lock" is used
-// alt_path: additional path treated as present in cache (see cache_hit in download.cpp)
 int common_download_file_single(const std::string & url,
                                const std::string & path,
                                const common_download_opts & opts = {},
-                                bool skip_etag = false,
-                                const std::string & lock_path = "",
-                                const std::string & alt_path = "");
+                                bool skip_etag = false);

 // resolve and download model from Docker registry
 // return local path to downloaded model file
@@ -111,17 +104,10 @@ std::string common_docker_resolve_model(const std::string & docker);
 // Remove a cached model from disk
 // input format: "user/model" or "user/model:tag"
 // - if tag is omitted, removes the entire repo cache directory
-// - if tag is present, removes only files matching that tag (and orphaned blobs),
-//   except the files another cached tag of the repo still loads
+// - if tag is present, removes only files matching that tag (and orphaned blobs)
 // returns true if anything was removed
 bool common_download_remove(const std::string & hf_repo_with_tag);

-// remove the cached sidecar files `opts` selects for "user/model:tag", as the cached
-// plan resolves them, and leave the model files in place; a sidecar file another tag
-// shares goes for every tag that resolves it
-// returns true if anything was removed
-bool common_download_remove_sidecars(const std::string & hf_repo_with_tag, const common_download_opts & opts);
-
 struct common_download_hf_plan {
    hf_cache::hf_file primary;
    hf_cache::hf_files model_files;
@@ -133,33 +119,3 @@ struct common_download_hf_plan {
    hf_cache::hf_file preset; // if set, only this file is downloaded
 };
 common_download_hf_plan common_download_get_hf_plan(const common_params_model & model, const common_download_opts & opts);
-
-// a sidecar kind a download can pull next to its model: mmproj, and the draft heads
-// of --spec-type draft-<name>
-struct common_download_sidecar {
-    const char * name;    // the kind, as the API names it
-    const char * keyword; // the part of a file name that marks a file of this kind
-    bool         draft;   // a draft head, resolved at the tag even without a model
-
-    bool              common_download_opts::*    opt;  // the option that requests it
-    hf_cache::hf_file common_download_hf_plan::* file; // the plan file it resolves to
-};
-
-// every sidecar kind, the single list the resolution, the listing and the removal follow
-const std::vector<common_download_sidecar> & common_download_sidecars();
-
-// select the sidecar `kind` in `opts`; returns false for an unknown kind
-bool common_download_opts_add_sidecar(common_download_opts & opts, const std::string & kind);
-
-// the sidecar kinds `plan` resolves a file for
-std::vector<std::string> common_download_plan_sidecars(const common_download_hf_plan & plan);
-
-// a file `plan` still has to download, at the path its partial takes while it is
-// incomplete; kind is the sidecar it belongs to, empty for the model files
-struct common_download_partial {
-    std::string kind;
-    std::string path;
-};
-
-// the partials the download of `plan` writes, for the files not in the cache yet
-std::vector<common_download_partial> common_download_plan_partials(const common_download_hf_plan & plan);
@@ -1,179 +0,0 @@
-#include "file-lock.h"
-
-#include "log.h"
-
-#include <chrono>
-#include <filesystem>
-#include <thread>
-
-#include <fcntl.h>
-#include <sys/stat.h>
-
-#if defined(_WIN32)
-#define WIN32_LEAN_AND_MEAN
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#include <windows.h>
-#include <io.h>
-#else
-#include <sys/file.h>
-#include <unistd.h>
-#include <cerrno>
-#include <cstring>
-#endif
-
-common_file_lock::common_file_lock(const std::string & lock_path) {
-    this->lock_path = lock_path;
-}
-
-#if defined(_WIN32)
-// the \\?\ prefix (for paths longer than 255 chars) is only accepted on absolute paths
-// with backslash separators: normalize first, then check the length of the absolute form
-static std::wstring as_extended_path(const std::string & path) {
-    // convert from the narrow encoding std::filesystem uses on this system
-    int wlen = MultiByteToWideChar(CP_ACP, 0, path.c_str(), (int) path.size(), nullptr, 0);
-    if (wlen <= 0) {
-        return std::wstring(path.begin(), path.end()); // best effort for exotic encodings
-    }
-    std::wstring wide(wlen, L'\0');
-    MultiByteToWideChar(CP_ACP, 0, path.c_str(), (int) path.size(), wide.data(), wlen);
-
-    if (wide.rfind(L"\\\\?\\", 0) == 0) {
-        return wide;
-    }
-
-    // GetFullPathNameW resolves relative paths and normalizes separators
-    DWORD size = GetFullPathNameW(wide.c_str(), 0, nullptr, nullptr);
-    if (size == 0) {
-        return wide;
-    }
-    std::wstring full(size, L'\0');
-    DWORD written = GetFullPathNameW(wide.c_str(), size, full.data(), nullptr);
-    if (written == 0 || written >= size) {
-        return wide;
-    }
-    full.resize(written);
-
-    if (full.size() <= 255) {
-        return wide; // short enough: open the path exactly as given
-    }
-    if (full.rfind(L"\\\\", 0) == 0) {
-        return L"\\\\?\\UNC\\" + full.substr(2); // \\server\share -> \\?\UNC\server\share
-    }
-    return L"\\\\?\\" + full;
-}
-#endif
-
-common_file_lock::status common_file_lock::try_lock() {
-    if (lock_path.empty()) {
-        return status::acquired; // no lock path, nothing to lock
-    }
-#if defined(_WIN32)
-    if (fd < 0) {
-        // opened with a wide path: extended paths cannot go through the narrow CRT
-        std::wstring lock_path_w = as_extended_path(lock_path);
-        fd = _wopen(lock_path_w.c_str(), _O_RDWR | _O_CREAT | _O_BINARY | _O_NOINHERIT, _S_IREAD | _S_IWRITE);
-        if (fd < 0) {
-            LOG_ERR("%s: cannot open lock file: %s\n", __func__, lock_path.c_str());
-            return status::error;
-        }
-    }
-    // lock the first byte, the file itself stays empty
-    OVERLAPPED ov = {};
-    locked = LockFileEx((HANDLE) _get_osfhandle(fd),
-                        LOCKFILE_EXCLUSIVE_LOCK | LOCKFILE_FAIL_IMMEDIATELY, 0, 1, 0, &ov);
-    if (locked) {
-        return status::acquired;
-    }
-    if (GetLastError() == ERROR_LOCK_VIOLATION) {
-        return status::busy;
-    }
-    LOG_ERR("%s: file locking failed (%d)\n", __func__, (int) GetLastError());
-    return status::error;
-#else
-    if (fd < 0) {
-        int open_flags = O_RDWR | O_CREAT | O_CLOEXEC;
-#ifdef O_NOFOLLOW
-        open_flags |= O_NOFOLLOW;
-#endif
-        // group-writable, so users sharing a cache can wait on the lock
-        fd = open(lock_path.c_str(), open_flags, 0664);
-        if (fd < 0) {
-            LOG_ERR("%s: cannot open lock file: %s\n", __func__, lock_path.c_str());
-            return status::error;
-        }
-        // open() filters the mode through the umask
-        (void) fchmod(fd, 0664);
-    }
-
-    if (flock(fd, LOCK_EX | LOCK_NB) == 0) {
-        locked = true;
-        return status::acquired;
-    }
-    // EACCES is reported as contention on some filesystems
-    if (errno == EWOULDBLOCK || errno == EAGAIN || errno == EACCES) {
-        return status::busy;
-    }
-    // flock is not implemented (some NFS/FUSE mounts): report it instead of racing
-    LOG_ERR("%s: file locking failed (%s)\n", __func__, strerror(errno));
-    return status::error;
-#endif
-}
-
-bool common_file_lock::acquire(const std::function<bool()> & keep_waiting) {
-    // the lock file is opened by try_lock, its parent must exist by then
-    if (!lock_path.empty()) {
-        std::error_code ec;
-        auto lock_dir = std::filesystem::path(lock_path).parent_path();
-        if (!lock_dir.empty()) {
-            std::filesystem::create_directories(lock_dir, ec);
-            if (ec) {
-                LOG_ERR("%s: unable to create lock directory '%s': %s\n", __func__, lock_dir.string().c_str(), ec.message().c_str());
-                return false;
-            }
-        }
-    }
-
-    while (true) {
-        switch (try_lock()) {
-            case status::acquired:
-                return true;
-            case status::busy:
-                if (keep_waiting && !keep_waiting()) {
-                    return false;
-                }
-                std::this_thread::sleep_for(std::chrono::milliseconds(100));
-                continue;
-            case status::error:
-                return false;
-        }
-    }
-}
-
-// the lock file is never deleted: another process could then create a fresh
-// file at the same path and lock that
-void common_file_lock::close() {
-#if defined(_WIN32)
-    if (fd >= 0) {
-        if (locked) {
-            OVERLAPPED ov = {};
-            UnlockFileEx((HANDLE) _get_osfhandle(fd), 0, 1, 0, &ov);
-        }
-        _close(fd);
-    }
-#else
-    if (fd >= 0) {
-        if (locked) {
-            flock(fd, LOCK_UN);
-        }
-        ::close(fd);
-    }
-#endif
-    fd     = -1;
-    locked = false;
-}
-
-common_file_lock::~common_file_lock() {
-    close();
-}
@@ -1,36 +0,0 @@
-#pragma once
-
-#include <functional>
-#include <string>
-
-// Cross-process exclusive lock (flock on POSIX, LockFileEx on Windows).
-// Lazy: acquire() opens the lock file, so a read-only cache works if the lock is never acquired.
-class common_file_lock {
-public:
-    common_file_lock(const std::string & lock_path);
-    ~common_file_lock();
-
-    // take the lock, waiting while another process holds it;
-    // keep_waiting is polled before each retry, false cancels the wait.
-    // Also returns false when locking is unavailable.
-    bool acquire(const std::function<bool()> & keep_waiting = {});
-
-    void close();
-
-    common_file_lock(const common_file_lock &) = delete;
-    common_file_lock & operator=(const common_file_lock &) = delete;
-
-private:
-    enum class status {
-        acquired,
-        busy,  // another process holds the lock
-        error, // file locking is unavailable: no exclusion is possible
-    };
-
-    status try_lock();
-
-    std::string lock_path;
-
-    int  fd     = -1;
-    bool locked = false;
-};
@@ -192,9 +192,9 @@ static void common_params_fit_impl(
    uint32_t hp_nct = 0; // hparams.n_ctx_train
    uint32_t hp_nex = 0; // hparams.n_expert

-    // with non-unified kv, we need to take into account n_streams
-    // for example, if memory can hold more than model's trained context size, we must extend the n_ctx to hold enough n_streams
-    const uint32_t n_streams  = cparams->kv_unified ? 1 : std::max<uint32_t>(1, cparams->n_seq_max);
+    // size the context for all sequences, but keep minimums and alignment per KV stream
+    const uint32_t n_seq_max  = std::max<uint32_t>(1, cparams->n_seq_max);
+    const uint32_t n_streams  = cparams->kv_unified ? 1 : n_seq_max;
    const bool     n_ctx_auto = cparams->n_ctx == 0;

    dmds_t   dmds_extra;       // memory of the extra model, laid out on the devices of the main model
@@ -264,15 +264,15 @@ static void common_params_fit_impl(
    dmds_t dmds_full = common_get_device_memory_data_impl(path_model, mparams, cparams, devs, hp_ngl, hp_nct, hp_nex, log_level);

    // saturate instead of overflowing, this also preserves the UINT32_MAX sentinel of n_ctx_min:
-    const uint32_t n_ctx_max       = (uint32_t) std::min<uint64_t>(uint64_t(hp_nct)    * n_streams, UINT32_MAX);
+    const uint32_t n_ctx_max       = (uint32_t) std::min<uint64_t>(uint64_t(hp_nct)    * n_seq_max, UINT32_MAX);
    const uint32_t n_ctx_min_total = (uint32_t) std::min<uint64_t>(uint64_t(n_ctx_min) * n_streams, UINT32_MAX);

    // llama_context would use only hp_nct in total for n_ctx == 0, resolve the context before measuring anything else:
    if (n_ctx_auto) {
        cparams->n_ctx = n_ctx_max;
-        if (n_streams > 1) {
-            LOG_TRC("%s: context size unset and KV cache not unified -> using %" PRIu32 " for %" PRIu32 " sequences:\n",
-                __func__, n_ctx_max, n_streams);
+        if (n_seq_max > 1) {
+            LOG_TRC("%s: context size unset -> using %" PRIu32 " for %" PRIu32 " sequences:\n",
+                __func__, n_ctx_max, n_seq_max);
            dmds_full = common_get_device_memory_data_impl(path_model, mparams, cparams, devs, hp_ngl, hp_nct, hp_nex, log_level);
        }
    }
@@ -2,7 +2,6 @@

 #include "build-info.h"
 #include "common.h"
-#include "file-lock.h"
 #include "log.h"
 #include "http.h"
 #include "json.h"
@@ -45,7 +44,8 @@ static fs::path get_cache_directory() {
            {HOME_DIR,                fs::path(".cache") / "huggingface" / "hub"}
        };
        for (const auto & entry : entries) {
-            if (fs::path base = common_get_path_from_env(entry.var); !base.empty()) {
+            if (auto * p = std::getenv(entry.var); p && *p) {
+                fs::path base(p);
                return entry.path.empty() ? base : base / entry.path;
            }
        }
@@ -63,7 +63,12 @@ static fs::path get_cache_directory() {
 }

 std::string get_cache_path() {
-    return fs_path_to_utf8(get_cache_directory());
+#if defined(__cpp_lib_char8_t)
+    const std::u8string u8str = get_cache_directory().u8string();
+    return std::string(reinterpret_cast<const char *>(u8str.data()), u8str.size());
+#else
+    return get_cache_directory().u8string();
+#endif
 }

 static std::string folder_name_to_repo(const std::string & folder) {
@@ -162,14 +167,6 @@ static bool is_valid_oid(const std::string & oid) {
    return is_hex_string(oid, 40) || is_hex_string(oid, 64);
 }

-std::string get_lock_path(const std::string & repo_id, const std::string & oid) {
-    if (!is_valid_repo_id(repo_id) || !is_valid_oid(oid)) {
-        return {};
-    }
-    fs::path lock_path = fs::path(get_cache_path()) / ".locks" / repo_to_folder_name(repo_id) / (oid + ".lock");
-    return lock_path.string();
-}
-
 static bool is_valid_subpath(const fs::path & path, const fs::path & subpath) {
    if (subpath.is_absolute()) {
        return false; // never do a / b with b absolute
@@ -181,6 +178,28 @@ static bool is_valid_subpath(const fs::path & path, const fs::path & subpath) {
    return b_end == b.end();
 }

+static void safe_write_file(const fs::path & path, const std::string & data) {
+    fs::path path_tmp = path.string() + ".tmp";
+
+    if (path.has_parent_path()) {
+        fs::create_directories(path.parent_path());
+    }
+
+    std::ofstream file(path_tmp);
+    file << data;
+    file.close();
+
+    std::error_code ec;
+
+    if (!file.fail()) {
+        fs::rename(path_tmp, path, ec);
+    }
+    if (file.fail() || ec) {
+        fs::remove(path_tmp, ec);
+        throw std::runtime_error("failed to write file: " + path.string());
+    }
+}
+
 static common_json api_get(const std::string & url,
                           const std::string & token) {
    auto [cli, parts] = common_http_client(url);
@@ -227,7 +246,6 @@ static std::string get_repo_commit(const std::string & repo_id,
        fs::path refs_path = get_repo_path(repo_id) / "refs";
        std::string name;
        std::string commit;
-        fs::path name_path;

        for (const auto & branch : json["branches"]) {
            if (!branch.is_object() ||
@@ -238,28 +256,24 @@ static std::string get_repo_commit(const std::string & repo_id,
            std::string _name = branch["name"].get<std::string>();
            std::string _commit = branch["targetCommit"].get<std::string>();

-            if (!is_valid_commit(_commit)) {
-                LOG_WRN("%s: skip invalid commit: %s\n", __func__, _commit.c_str());
+            if (!is_valid_subpath(refs_path, _name)) {
+                LOG_WRN("%s: skip invalid branch: %s\n", __func__, _name.c_str());
                continue;
            }
-            const fs::path candidate = fs::u8path(_name);
-
-            if (!is_valid_subpath(refs_path, candidate)) {
-                LOG_WRN("%s: skip invalid branch: %s\n", __func__, _name.c_str());
+            if (!is_valid_commit(_commit)) {
+                LOG_WRN("%s: skip invalid commit: %s\n", __func__, _commit.c_str());
                continue;
            }

            if (_name == "main") {
                name = _name;
                commit = _commit;
-                name_path = candidate;
                break;
            }

            if (name.empty() || commit.empty()) {
                name = _name;
                commit = _commit;
-                name_path = candidate;
            }
        }

@@ -268,7 +282,7 @@ static std::string get_repo_commit(const std::string & repo_id,
            return {};
        }

-        fs_write_atomic(refs_path / name_path, commit);
+        safe_write_file(refs_path / name, commit);
        return commit;

    } catch (const common_json_error & e) {
@@ -317,9 +331,7 @@ hf_files get_repo_files(const std::string & repo_id,
            file.repo_id = repo_id;
            file.path = item["path"].get<std::string>();

-            const fs::path subpath = fs::u8path(file.path);
-
-            if (!is_valid_subpath(commit_path, subpath)) {
+            if (!is_valid_subpath(commit_path, file.path)) {
                LOG_WRN("%s: skip invalid path: %s\n", __func__, file.path.c_str());
                continue;
            }
@@ -339,12 +351,12 @@ hf_files get_repo_files(const std::string & repo_id,

            file.url = endpoint + repo_id + "/resolve/" + commit + "/" + file.path;

-            fs::path final_path = commit_path / subpath;
-            file.final_path = fs_path_to_utf8(final_path);
+            fs::path final_path = commit_path / file.path;
+            file.final_path = final_path.string();

            if (!file.oid.empty() && !fs::exists(final_path)) {
                fs::path local_path = blobs_path / file.oid;
-                file.local_path = fs_path_to_utf8(local_path);
+                file.local_path = local_path.string();
            } else {
                file.local_path = file.final_path;
            }
@@ -411,7 +423,7 @@ hf_files get_cached_files(const std::string & repo_id) {
        if (!fs::exists(snapshots_path)) {
            continue;
        }
-        std::string _repo_id = folder_name_to_repo(fs_path_to_utf8(repo.path().filename()));
+        std::string _repo_id = folder_name_to_repo(repo.path().filename().string());

        if (!is_valid_repo_id(_repo_id)) {
            continue;
@@ -434,9 +446,8 @@ hf_files get_cached_files(const std::string & repo_id) {
            if (!path.empty()) {
                hf_file file;
                file.repo_id = _repo_id;
-                const auto generic_path = path.generic_u8string();
-                file.path = std::string(generic_path.begin(), generic_path.end());
-                file.local_path = fs_path_to_utf8(entry.path());
+                file.path = path.generic_string();
+                file.local_path = entry.path().string();
                file.final_path = file.local_path;
                files.push_back(std::move(file));
            }
@@ -446,12 +457,12 @@ hf_files get_cached_files(const std::string & repo_id) {
    return files;
 }

-std::string finalize_file(const hf_file & file, const std::function<bool()> & keep_waiting) {
+std::string finalize_file(const hf_file & file) {
    static std::atomic<bool> symlinks_disabled{false};

    std::error_code ec;
-    fs::path local_path = fs::u8path(file.local_path);
-    fs::path final_path = fs::u8path(file.final_path);
+    fs::path local_path(file.local_path);
+    fs::path final_path(file.final_path);

    if (local_path == final_path || fs::exists(final_path, ec)) {
        return file.final_path;
@@ -461,24 +472,6 @@ std::string finalize_file(const hf_file & file, const std::function<bool()> & ke
        return file.final_path;
    }

-    // the lock file is shared with huggingface_hub: another process may be
-    // finalizing the same blob
-    common_file_lock lock(get_lock_path(file.repo_id, file.oid));
-    if (!lock.acquire(keep_waiting)) {
-        // without the lock, another process could move the blob while we check it
-        throw std::runtime_error("failed to lock cache for finalization: " + file.final_path);
-    }
-
-    // acquire() only polls keep_waiting while waiting for a busy lock
-    if (keep_waiting && !keep_waiting()) {
-        throw std::runtime_error("download cancelled before finalization: " + file.final_path);
-    }
-
-    // re-check under the lock: the winner may have created the link already
-    if (fs::exists(final_path, ec)) {
-        return file.final_path;
-    }
-
    fs::create_directories(final_path.parent_path(), ec);

    if (!symlinks_disabled) {
@@ -516,7 +509,7 @@ bool remove_cached_repo(const std::string & repo_id) {
    std::error_code ec;
    auto removed = fs::remove_all(repo_path, ec);
    if (ec) {
-        LOG_ERR("%s: failed to remove repo cache %s: %s\n", __func__, fs_path_to_utf8(repo_path).c_str(), ec.message().c_str());
+        LOG_ERR("%s: failed to remove repo cache %s: %s\n", __func__, repo_path.string().c_str(), ec.message().c_str());
        return false;
    }
    return removed > 0;
@@ -1,6 +1,5 @@
 #pragma once

-#include <functional>
 #include <string>
 #include <vector>

@@ -27,14 +26,8 @@ hf_files get_repo_files(

 hf_files get_cached_files(const std::string & repo_id = {});

-// Lock file path for a blob, shared with the hf CLI: <cache>/.locks/<repo folder>/<oid>.lock
-// Pure path computation: creates nothing. Returns an empty string on invalid repo or oid.
-std::string get_lock_path(const std::string & repo_id, const std::string & oid);
-
-// Create snapshot path (link or move/copy) and return it.
-// Throws when the lock cannot be taken or keep_waiting returns false.
-// A completed snapshot (final_path present) is returned without the lock, so a read-only cache works.
-std::string finalize_file(const hf_file & file, const std::function<bool()> & keep_waiting = {});
+// Create snapshot path (link or move/copy) and return it
+std::string finalize_file(const hf_file & file);

 // Remove the entire cached directory for a repo, returns true if removed
 bool remove_cached_repo(const std::string & repo_id);
@@ -1,7 +1,5 @@
 #pragma once

-#include "log.h"
-
 #include <cpp-httplib/httplib.h>

 #ifdef _WIN32
@@ -99,118 +97,6 @@ static common_http_url common_http_parse_url(const std::string & url) {
    return parts;
 }

-// match a loopback destination: a remote proxy can never reach the client machine's own
-// loopback, so these hosts are always contacted directly, before NO_PROXY is consulted
-// (similar to Go's net/http)
-static bool common_http_is_loopback(const std::string & host) {
-    auto lower = [](std::string s) {
-        for (auto & c : s) {
-            if (c >= 'A' && c <= 'Z') {
-                c += 'a' - 'A';
-            }
-        }
-        return s;
-    };
-
-    const std::string h = lower(host);
-
-    if (h == "localhost" || h == "::1" || h == "0.0.0.0") {
-        return true;
-    }
-
-    if (h.size() > 10 && h.compare(h.size() - 10, 10, ".localhost") == 0) {
-        return true;
-    }
-
-    // IPv4 literal: exactly four all-digit octets with values 0-255, loopback is 127.0.0.0/8
-    int octets[4] = { 0, 0, 0, 0 };
-    size_t pos = 0;
-    int n = 0;
-    bool complete = false;
-    while (n < 4 && pos <= h.size()) {
-        size_t dot = h.find('.', pos);
-        if (dot == std::string::npos) {
-            dot = h.size();
-        }
-        if (dot == pos || dot - pos > 3) {
-            return false;
-        }
-        int val = 0;
-        for (size_t i = pos; i < dot; i++) {
-            if (h[i] < '0' || h[i] > '9') {
-                return false;
-            }
-            val = val * 10 + (h[i] - '0');
-        }
-        if (val > 255) {
-            return false;
-        }
-        octets[n++] = val;
-        if (dot == h.size()) {
-            complete = (n == 4);
-            break;
-        }
-        pos = dot + 1;
-    }
-
-    return complete && octets[0] == 127;
-}
-
-// match a host against a NO_PROXY list: comma separated entries, "*" bypasses the proxy for every host,
-// an entry matches the host itself or any of its subdomains, a leading dot is optional, ports are ignored
-static bool common_http_proxy_bypass(const std::string & no_proxy, const std::string & host) {
-    auto lower = [](std::string s) {
-        for (auto & c : s) {
-            if (c >= 'A' && c <= 'Z') {
-                c += 'a' - 'A';
-            }
-        }
-        return s;
-    };
-
-    const std::string h = lower(host);
-
-    for (size_t pos = 0; pos < no_proxy.size(); ) {
-        size_t end = no_proxy.find(',', pos);
-        if (end == std::string::npos) {
-            end = no_proxy.size();
-        }
-
-        std::string entry = lower(no_proxy.substr(pos, end - pos));
-        pos = end + 1;
-
-        entry.erase(0, entry.find_first_not_of(" \t"));
-        auto last = entry.find_last_not_of(" \t");
-        if (last == std::string::npos) {
-            continue;
-        }
-        entry.erase(last + 1);
-
-        if (entry == "*") {
-            return true;
-        }
-
-        if (entry.front() == '.') {
-            entry.erase(0, 1);
-        }
-
-        if (entry.empty()) {
-            continue;
-        }
-
-        if (h == entry) {
-            return true;
-        }
-
-        if (h.size() > entry.size() && h[h.size() - entry.size() - 1] == '.' &&
-            h.compare(h.size() - entry.size(), entry.size(), entry) == 0) {
-            return true;
-        }
-    }
-
-    return false;
-}
-
 static std::pair<httplib::Client, common_http_url> common_http_client(const std::string & url) {
    common_http_url parts = common_http_parse_url(url);

@@ -237,33 +123,6 @@ static std::pair<httplib::Client, common_http_url> common_http_client(const std:

    cli.set_follow_location(true);

-    // Honor HTTP_PROXY / HTTPS_PROXY environment variables (both lower- and upper-case).
-    auto getenv_s = [](const char * upper, const char * lower) -> std::string {
-        const char * val = std::getenv(upper);
-        if (!val) {
-            val = std::getenv(lower);
-        }
-        return val ? val : "";
-    };
-
-    const std::string proxy_url = (parts.scheme == "https")
-        ? getenv_s("HTTPS_PROXY", "https_proxy")
-        : getenv_s("HTTP_PROXY",  "http_proxy");
-
-    if (!proxy_url.empty() && !common_http_is_loopback(parts.host) &&
-        !common_http_proxy_bypass(getenv_s("NO_PROXY", "no_proxy"), parts.host)) {
-        try {
-            common_http_url proxy = common_http_parse_url(proxy_url);
-            cli.set_proxy(proxy.host, proxy.port);
-            if (!proxy.user.empty()) {
-                cli.set_proxy_basic_auth(proxy.user, proxy.password);
-            }
-        } catch (const std::exception & e) {
-            // fall back to a direct connection, the URL itself is not logged as it can carry credentials
-            LOG_WRN("%s: ignoring malformed proxy URL from the environment: %s\n", __func__, e.what());
-        }
-    }
-
    return { std::move(cli), std::move(parts) };
 }

@@ -98,10 +98,9 @@ bool common_imatrix_load(const std::string & fname, common_imatrix & imatrix) {
        return false;
    }

-    const int64_t datasets_key    = gguf_find_key(ctx_gguf, LLM_KV_IMATRIX_DATASETS);
+    const int64_t datasets_key   = gguf_find_key(ctx_gguf, LLM_KV_IMATRIX_DATASETS);
    const int64_t chunk_count_key = gguf_find_key(ctx_gguf, LLM_KV_IMATRIX_CHUNK_COUNT);
    const int64_t chunk_size_key  = gguf_find_key(ctx_gguf, LLM_KV_IMATRIX_CHUNK_SIZE);
-    const int64_t nextn_key       = gguf_find_key(ctx_gguf, LLM_KV_IMATRIX_N_LAYER_NEXTN);

    if (datasets_key != -1 && gguf_get_kv_type(ctx_gguf, datasets_key) == GGUF_TYPE_ARRAY &&
        gguf_get_arr_type(ctx_gguf, datasets_key) == GGUF_TYPE_STRING) {
@@ -112,42 +111,33 @@ bool common_imatrix_load(const std::string & fname, common_imatrix & imatrix) {
        }
    }

-    imatrix.has_metadata  = datasets_key != -1 && chunk_count_key != -1 && chunk_size_key != -1;
-    imatrix.chunk_count   = chunk_count_key != -1 ? gguf_get_val_u32(ctx_gguf, chunk_count_key) : 0;
-    imatrix.chunk_size    = chunk_size_key  != -1 ? gguf_get_val_u32(ctx_gguf, chunk_size_key) : 0;
-    imatrix.n_layer_nextn = nextn_key       != -1 ? gguf_get_val_u32(ctx_gguf, nextn_key) : 0;
+    imatrix.has_metadata = (datasets_key != -1 && chunk_count_key != -1 && chunk_size_key != -1);
+    imatrix.chunk_count  = (chunk_count_key != -1) ? gguf_get_val_u32(ctx_gguf, chunk_count_key) : 0;
+    imatrix.chunk_size   = (chunk_size_key  != -1) ? gguf_get_val_u32(ctx_gguf, chunk_size_key)  : 0;

-    const std::string in_sum_suffix{ ".in_sum" };
    const std::string in_sum2_suffix{ ".in_sum2" };
    const std::string counts_suffix{ ".counts" };

-    struct sum_tensors {
-        struct ggml_tensor * in_sum  = nullptr;
-        struct ggml_tensor * in_sum2 = nullptr;
-        struct ggml_tensor * counts  = nullptr;
-    };
+    std::map<std::string, std::pair<struct ggml_tensor *, struct ggml_tensor *>> sums_counts_for;

-    std::map<std::string, sum_tensors> sums_counts_for;
    for (struct ggml_tensor * cur = ggml_get_first_tensor(ctx); cur; cur = ggml_get_next_tensor(ctx, cur)) {
        std::string name = cur->name;
+
        if (name.empty()) { continue; }

-        if (string_remove_suffix(name, in_sum_suffix)) {
-            sums_counts_for[std::move(name)].in_sum = cur;
-        } else if (string_remove_suffix(name, in_sum2_suffix)) {
-            sums_counts_for[std::move(name)].in_sum2 = cur;
+        if (string_remove_suffix(name, in_sum2_suffix)) {
+            sums_counts_for[std::move(name)].first = cur;
        } else if (string_remove_suffix(name, counts_suffix)) {
-            sums_counts_for[std::move(name)].counts = cur;
+            sums_counts_for[std::move(name)].second = cur;
        }
    }

    for (const auto & sc : sums_counts_for) {
        const std::string &        name    = sc.first;
-        const struct ggml_tensor * in_sum  = sc.second.in_sum;
-        const struct ggml_tensor * in_sum2 = sc.second.in_sum2;
-        const struct ggml_tensor * counts  = sc.second.counts;
+        const struct ggml_tensor * in_sum2 = sc.second.first;
+        const struct ggml_tensor * counts  = sc.second.second;

-        if (!in_sum2 || !counts || (in_sum != nullptr && ggml_nelements(in_sum) != ggml_nelements(in_sum2))) {
+        if (!in_sum2 || !counts) {
            LOG_ERR("%s: mismatched sums and counts for %s\n", __func__, name.c_str());
            gguf_free(ctx_gguf);
            ggml_free(ctx);
@@ -175,13 +165,6 @@ bool common_imatrix_load(const std::string & fname, common_imatrix & imatrix) {
        for (int64_t j = 0; j < ncounts; ++j) {
            e.counts[j] = std::lround(((const float *) counts->data)[j]);
        }
-
-        if (in_sum && ggml_nelements(in_sum) == nval) {
-            e.activations.resize(nval);
-            for (int64_t j = 0; j < nval; ++j) {
-                e.activations[j] = ((const float *) in_sum->data)[j];
-            }
-        }
    }

    gguf_free(ctx_gguf);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Aman Gupta	7d8a964eb7	RPC: improve loading	2026-09-25 08:16:34 +03:00
Georgi Gerganov	ee2ddd0938	cont : fix conflict	2026-09-25 08:16:34 +03:00
Aman Gupta	043d5ea3d8	move graph_uids to rpc_dispatcher	2026-09-25 08:16:33 +03:00
Aman Gupta	7b1c77be19	fix flush for apple rdma	2026-09-25 08:16:33 +03:00
Aman Gupta	e1d0dd6b17	rpc: allow -sm tensor	2026-09-25 08:16:33 +03:00