Revert "Revert "[CI]Fix Wan DMD pipeline test alignment" (#6574)"

This reverts commit a94b2580a1.

.buildkite/amd/scripts/bootstrap-amd-omni.sh

@@ -1,7 +1,4 @@
 #!/bin/bash
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-FileCopyrightText: Copyright contributors to the vLLM-Omni project
-
 # vllm-omni customized version
 # Based on: https://github.com/vllm-project/ci-infra/blob/main/buildkite/bootstrap-amd.sh
 # Last synced: 2025-12-15
@@ -9,13 +6,8 @@
 
 set -euo pipefail
 
-# The bootstrap runs from the repository root; ShellCheck does not follow
-# sourced files unless invoked with -x.
-# shellcheck disable=SC1091
 source .buildkite/common/scripts/resolve_skip_ci.sh
 
-AMD_SUITE_SELECTOR=".buildkite/amd/scripts/select_test_suites.py"
-
 if [[ -z "${RUN_ALL:-}" ]]; then
     RUN_ALL=0
 fi
@@ -32,20 +24,31 @@ if [[ -z "${AMD_MIRROR_HW:-}" ]]; then
     AMD_MIRROR_HW="amdproduction"
 fi
 
-PR_LABELS=""
-# Explicit debug suites do not depend on PR labels.
-if [[ "${BUILDKITE_PULL_REQUEST:-false}" != "false" && -z "${DEBUG_TEST_YAML:-}" ]]; then
-    if ! PR_LABELS=$(curl -fsSL \
-        "https://api.github.com/repos/vllm-project/vllm-omni/pulls/$BUILDKITE_PULL_REQUEST" \
-        | jq -r '.labels[].name'); then
-        echo "ERROR: Could not read PR labels; refusing to select an incorrect AMD test tier." >&2
-        exit 1
-    fi
-fi
-
 fail_fast() {
-    if [[ "${BUILDKITE_PULL_REQUEST:-false}" != "false" ]]; then
-        echo true
+    DISABLE_LABEL="ci-no-fail-fast"
+    # If BUILDKITE_PULL_REQUEST != "false", then we check the PR labels using curl and jq
+    if [ "$BUILDKITE_PULL_REQUEST" != "false" ]; then
+        PR_LABELS=$(curl -s "https://api.github.com/repos/vllm-project/vllm-omni/pulls/$BUILDKITE_PULL_REQUEST" | jq -r '.labels[].name')
+        if [[ $PR_LABELS == *"$DISABLE_LABEL"* ]]; then
+            echo false
+        else
+            echo true
+        fi
+    else
+        echo false  # not a PR or BUILDKITE_PULL_REQUEST not set
+    fi
+}
+
+check_run_all_label() {
+    RUN_ALL_LABEL="ready-run-all-tests"
+    # If BUILDKITE_PULL_REQUEST != "false", then we check the PR labels using curl and jq
+    if [ "$BUILDKITE_PULL_REQUEST" != "false" ]; then
+        PR_LABELS=$(curl -s "https://api.github.com/repos/vllm-project/vllm-omni/pulls/$BUILDKITE_PULL_REQUEST" | jq -r '.labels[].name')
+        if [[ $PR_LABELS == *"$RUN_ALL_LABEL"* ]]; then
+            echo true
+        else
+            echo false
+        fi
     else
         echo false  # not a PR or BUILDKITE_PULL_REQUEST not set
     fi
@@ -55,64 +58,11 @@ if [[ -z "${COV_ENABLED:-}" ]]; then
     COV_ENABLED=0
 fi
 
-resolve_test_specs() {
-    local selected_specs
-    if ! selected_specs=$(python3 "$AMD_SUITE_SELECTOR" \
-        --branch "$BUILDKITE_BRANCH" \
-        --labels "$PR_LABELS" \
-        --debug-test-yaml "${DEBUG_TEST_YAML:-}"); then
-        exit 1
-    fi
-
-    TEST_SPECS=()
-    while IFS= read -r suite_spec; do
-        [[ -z "$suite_spec" ]] && continue
-        TEST_SPECS+=("$suite_spec")
-    done <<< "$selected_specs"
-}
-
-filter_test_specs_by_skip_ci() {
-    local suite_spec level decision
-    local skip_all=0
-    local -a runnable_specs=()
-
-    for suite_spec in "${TEST_SPECS[@]}"; do
-        case "$suite_spec" in
-            READY_TESTS:*) level="l2" ;;
-            MERGE_TESTS:*) level="l3" ;;
-            *)
-                echo "ERROR: unknown AMD test suite spec '$suite_spec'" >&2
-                exit 1
-                ;;
-        esac
-
-        if decision=$(python3 "$SKIP_CI_PY" gate amd "$level"); then
-            echo "Skipping AMD $level suite due to $decision decision."
-            [[ "$decision" == "skip-all" ]] && skip_all=1
-        else
-            runnable_specs+=("$suite_spec")
-        fi
-    done
-
-    TEST_SPECS=("${runnable_specs[@]}")
-    if [[ ${#TEST_SPECS[@]} -eq 0 ]]; then
-        if [[ $skip_all -eq 1 ]]; then
-            buildkite-agent annotate \
-                ":memo: CI skipped — docs or pytest skip-mark changes only" \
-                --style "info" 2>/dev/null || true
-        fi
-        echo "No AMD L2/L3 suites remain after skip-ci filtering."
-        exit 0
-    fi
-}
-
 upload_pipeline() {
     echo "Uploading pipeline..."
     # Install minijinja
     ls .buildkite || buildkite-agent annotate --style error 'Please merge upstream main branch for buildkite CI'
     curl -sSfL https://github.com/mitsuhiko/minijinja/releases/download/2.3.1/minijinja-cli-installer.sh | sh
-    # Installed by the minijinja bootstrap above and only present on the CI agent.
-    # shellcheck disable=SC1091
     source /var/lib/buildkite-agent/.cargo/env
 
     if [[ $BUILDKITE_PIPELINE_SLUG == "fastcheck" ]]; then
@@ -126,7 +76,7 @@ upload_pipeline() {
     # (WIP) Use pipeline generator instead of jinja template
     if [ -e ".buildkite/amd/pipeline_generator/pipeline_generator.py" ]; then
         python -m pip install click pydantic
-        python .buildkite/amd/pipeline_generator/pipeline_generator.py --run_all="$RUN_ALL" --list_file_diff="$LIST_FILE_DIFF" --nightly="$NIGHTLY" --mirror_hw="$AMD_MIRROR_HW"
+        python .buildkite/amd/pipeline_generator/pipeline_generator.py --run_all=$RUN_ALL --list_file_diff="$LIST_FILE_DIFF" --nightly="$NIGHTLY" --mirror_hw="$AMD_MIRROR_HW"
         buildkite-agent pipeline upload .buildkite/amd/pipeline.yaml
         exit 0
     fi
@@ -139,46 +89,28 @@ upload_pipeline() {
 
     cd .buildkite/amd
 
-    # Multiple label-selected or debug-selected suites share one image build.
-    if [[ ${#TEST_SPECS[@]} -eq 1 ]]; then
-        TEST_YAML="${TEST_SPECS[0]#*:}"
+    # Select test definition file: merge suite for main, ready suite for PRs.
+    # For debugging, DEBUG_TEST_YAML can override the selection — accepts
+    # "merge" or "ready" (case-insensitive).
+    if [[ -n "${DEBUG_TEST_YAML:-}" ]]; then
+        case "${DEBUG_TEST_YAML,,}" in
+            merge)
+                TEST_YAML="test-amd-merge.yml"
+                ;;
+            ready)
+                TEST_YAML="test-amd-ready.yml"
+                ;;
+            *)
+                echo "ERROR: DEBUG_TEST_YAML must be 'merge' or 'ready', got '$DEBUG_TEST_YAML'" >&2
+                exit 1
+                ;;
+        esac
+        echo "DEBUG_TEST_YAML override: using $TEST_YAML"
+    elif [[ $BUILDKITE_BRANCH == "main" ]]; then
+        TEST_YAML="test-amd-merge.yml"
     else
-        TEST_YAML=$(mktemp "${TMPDIR:-/tmp}/amd-selected-tests.XXXXXX.yml")
-        python - "$TEST_YAML" "${TEST_SPECS[@]}" <<'PY'
-import sys
-
-import yaml
-
-
-output_path, *suite_specs = sys.argv[1:]
-combined = {"env": {}, "steps": []}
-
-for suite_spec in suite_specs:
-    group_name, input_path = suite_spec.split(":", 1)
-    with open(input_path, encoding="utf-8") as test_file:
-        suite = yaml.safe_load(test_file)
-
-    for name, value in (suite.get("env") or {}).items():
-        previous = combined["env"].get(name, value)
-        if previous != value:
-            raise ValueError(
-                f"Conflicting environment value for {name}: {previous!r} != {value!r}"
-            )
-        combined["env"][name] = value
-
-    suite_steps = []
-    for entry in suite.get("steps") or []:
-        if "group" in entry:
-            suite_steps.extend(entry.get("steps") or [])
-        else:
-            suite_steps.append(entry)
-    combined["steps"].append({"group": group_name, "steps": suite_steps})
-
-with open(output_path, "w", encoding="utf-8") as output_file:
-    yaml.safe_dump(combined, output_file, sort_keys=False)
-PY
+        TEST_YAML="test-amd-ready.yml"
     fi
-    echo "AMD test suites: ${TEST_SPECS[*]}"
 
     (
         set -x
@@ -198,20 +130,19 @@ PY
             > pipeline.yaml
     )
     cat pipeline.yaml
-    if [[ "$TEST_YAML" == "${TMPDIR:-/tmp}/amd-selected-tests."*.yml ]]; then
-        rm -f -- "$TEST_YAML"
-    fi
     buildkite-agent artifact upload pipeline.yaml
     buildkite-agent pipeline upload pipeline.yaml
     exit 0
 }
 
 get_diff() {
-    git diff --name-only --diff-filter=ACMDR "$(git merge-base origin/main HEAD)"
+    $(git add .)
+    echo $(git diff --name-only --diff-filter=ACMDR $(git merge-base origin/main HEAD))
 }
 
 get_diff_main() {
-    git diff --name-only --diff-filter=ACMDR HEAD~1
+    $(git add .)
+    echo $(git diff --name-only --diff-filter=ACMDR HEAD~1)
 }
 
 file_diff=$(get_diff)
@@ -219,10 +150,12 @@ if [[ $BUILDKITE_BRANCH == "main" ]]; then
     file_diff=$(get_diff_main)
 fi
 
-# Resolve PR tier labels before skip-ci so ready and merge suites can be
-# filtered independently for CI-YAML-only changes.
-resolve_test_specs
-filter_test_specs_by_skip_ci
+# Early exit: unified skip-ci (docs / skip marks) and CI-yaml-only level targeting.
+if [[ $BUILDKITE_BRANCH == "main" ]]; then
+    gate_bootstrap_ci amd l3
+else
+    gate_bootstrap_ci amd l2
+fi
 
 patterns=(
     "docker/Dockerfile"
@@ -248,7 +181,7 @@ for file in $file_diff; do
     # First check if file matches any pattern
     matches_pattern=0
     for pattern in "${patterns[@]}"; do
-        if [[ $file == "$pattern"* ]] || [[ $file == "$pattern" ]]; then
+        if [[ $file == $pattern* ]] || [[ $file == $pattern ]]; then
             matches_pattern=1
             break
         fi
@@ -258,7 +191,7 @@ for file in $file_diff; do
     if [[ $matches_pattern -eq 1 ]]; then
         matches_ignore=0
         for ignore in "${ignore_patterns[@]}"; do
-            if [[ $file == "$ignore"* ]] || [[ $file == "$ignore" ]]; then
+            if [[ $file == $ignore* ]] || [[ $file == $ignore ]]; then
                 matches_ignore=1
                 break
             fi
@@ -272,6 +205,14 @@ for file in $file_diff; do
     fi
 done
 
+# Check for ready-run-all-tests label
+LABEL_RUN_ALL=$(check_run_all_label)
+if [[ $LABEL_RUN_ALL == true ]]; then
+    RUN_ALL=1
+    NIGHTLY=1
+    echo "Found 'ready-run-all-tests' label. Running all tests including optional tests."
+fi
+
 # Decide whether to use precompiled wheels
 # Relies on existing patterns array as a basis.
 if [[ -n "${VLLM_USE_PRECOMPILED:-}" ]]; then

.buildkite/amd/scripts/select_test_suites.py

@@ -1,93 +0,0 @@
-#!/usr/bin/env python3
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-FileCopyrightText: Copyright contributors to the vLLM-Omni project
-"""Select AMD L2/L3 suites after Buildkite has created an AMD build.
-
-This repository-side selector does not decide which GitHub label events start
-the external ``vllm-omni-amd-ci`` pipeline. Its Buildkite PR build condition
-must admit the relevant label event before this code can inspect the labels.
-"""
-
-from __future__ import annotations
-
-import argparse
-import sys
-from collections.abc import Iterable
-
-SUITE_SPECS = {
-    "ready": "READY_TESTS:test-amd-ready.yml",
-    "merge": "MERGE_TESTS:test-amd-merge.yml",
-}
-
-
-def _parse_debug_suites(value: str) -> tuple[str, ...]:
-    suites = tuple(item.strip().lower() for item in value.split(",") if item.strip())
-    if not suites:
-        raise ValueError("DEBUG_TEST_YAML did not contain a test suite")
-
-    seen: set[str] = set()
-    for suite in suites:
-        if suite not in SUITE_SPECS:
-            raise ValueError(f"DEBUG_TEST_YAML entries must be 'merge' or 'ready', got {suite!r}")
-        if suite in seen:
-            raise ValueError(f"duplicate DEBUG_TEST_YAML suite {suite!r}")
-        seen.add(suite)
-    return suites
-
-
-def select_amd_test_suites(
-    *,
-    branch: str,
-    labels: Iterable[str],
-    debug_test_yaml: str = "",
-) -> tuple[str, ...]:
-    """Return ordered suite names while preserving legacy unlabeled PRs."""
-
-    if debug_test_yaml:
-        return _parse_debug_suites(debug_test_yaml)
-    if branch == "main":
-        return ("merge",)
-
-    label_set = {label.strip() for label in labels if label.strip()}
-    selected = tuple(suite for label, suite in (("ready", "ready"), ("merge-test", "merge")) if label in label_set)
-    # AMD historically uploaded L2 for every PR build. Keep that behavior for
-    # triggers such as amd-test while adding tier selection for ready/merge-test.
-    return selected or ("ready",)
-
-
-def main() -> int:
-    parser = argparse.ArgumentParser()
-    parser.add_argument("--branch", required=True)
-    parser.add_argument("--labels", default="")
-    parser.add_argument("--debug-test-yaml", default="")
-    args = parser.parse_args()
-
-    labels = tuple(args.labels.splitlines())
-    try:
-        suites = select_amd_test_suites(
-            branch=args.branch,
-            labels=labels,
-            debug_test_yaml=args.debug_test_yaml,
-        )
-    except ValueError as exc:
-        parser.error(str(exc))
-
-    label_set = {label.strip() for label in labels if label.strip()}
-    if not args.debug_test_yaml and args.branch != "main" and not ({"ready", "merge-test"} & label_set):
-        print(
-            "No AMD L2/L3 tier label found; preserving the legacy ready-suite fallback.",
-            file=sys.stderr,
-        )
-    if "nightly-test" in label_set:
-        print(
-            "AMD nightly-test has no suite yet and does not affect L2/L3 selection.",
-            file=sys.stderr,
-        )
-
-    for suite in suites:
-        print(SUITE_SPECS[suite])
-    return 0
-
-
-if __name__ == "__main__":
-    raise SystemExit(main())

.buildkite/amd/test-amd-merge.yml

@@ -21,7 +21,7 @@ steps:
 
     - label: "Simple · Diffusion Test · Shard %N/%t"
       agent_pool: mi300_1
-      parallelism: 4
+      parallelism: 2
       depends_on: amd-build
       mirror_hardwares: [amdproduction]
       grade: Blocking
@@ -71,45 +71,26 @@ steps:
       commands:
         - export VLLM_LOGGING_LEVEL=DEBUG
         - export VLLM_WORKER_MULTIPROC_METHOD=spawn
-        - pytest -s -v tests/diffusion/offloader/test_diffusion_cpu_offload.py
-        - >-
-          pytest -s -v tests/diffusion/offloader/test_diffusion_layerwise_offload.py
-          --deselect='tests/diffusion/offloader/test_diffusion_layerwise_offload.py::test_layerwise_offload_diffusion_model[stabilityai/stable-audio-open-1.0]'
+        - |
+          bash -c '
+            set +e
+            pytest -s -v tests/diffusion/offloader/test_diffusion_cpu_offload.py
+            EXIT1=\$?
+            pytest -s -v tests/diffusion/offloader/test_diffusion_layerwise_offload.py
+            EXIT2=\$?
+            exit \$((EXIT1 | EXIT2))
+          '
 
-    # TODO: Diagnose unstable Stable Audio layerwise-offload memory savings on ROCm.
-    - label: "Diffusion Stable Audio Layerwise Offload Test (quarantined)"
-      agent_pool: mi300_1
-      depends_on: amd-build
-      mirror_hardwares: [amdproduction]
-      grade: NonBlocking
-      commands:
-        - export VLLM_LOGGING_LEVEL=DEBUG
-        - export VLLM_WORKER_MULTIPROC_METHOD=spawn
-        - >-
-          pytest -s -v
-          'tests/diffusion/offloader/test_diffusion_layerwise_offload.py::test_layerwise_offload_diffusion_model[stabilityai/stable-audio-open-1.0]'
-
-    - label: "Diffusion Sequence Parallelism Test (Need 4 GPUs) · Shard 1/2"
+    - label: "Diffusion Sequence Parallelism Test (Need 4 GPUs)"
       agent_pool: mi300_4
       depends_on: amd-build
       mirror_hardwares: [amdproduction]
-      timeout_in_minutes: 40
       grade: Blocking
       commands:
         - export VLLM_LOGGING_LEVEL=DEBUG
         - export VLLM_WORKER_MULTIPROC_METHOD=spawn
-        - pytest -s -v tests/diffusion/distributed/test_sequence_parallel.py
-
-    - label: "Diffusion Sequence Parallelism Test (Need 4 GPUs) · Shard 2/2"
-      agent_pool: mi300_4
-      depends_on: amd-build
-      mirror_hardwares: [amdproduction]
-      timeout_in_minutes: 40
-      grade: Blocking
-      commands:
-        - export VLLM_LOGGING_LEVEL=DEBUG
-        - export VLLM_WORKER_MULTIPROC_METHOD=spawn
-        - pytest -s -v tests/diffusion/distributed/test_ulysses_uaa_perf.py
+        - timeout 20m pytest -s -v tests/diffusion/distributed/test_sequence_parallel.py
+        - timeout 20m pytest -s -v tests/diffusion/distributed/test_ulysses_uaa_perf.py
 
     # merge-only tests
     - label: "Diffusion Tensor Parallelism Test"
@@ -190,45 +171,21 @@ steps:
       grade: Blocking
       commands:
         - export VLLM_WORKER_MULTIPROC_METHOD=spawn
-        - pytest -s -v tests/e2e/offline_inference/test_qwen3_omni.py tests/e2e/online_serving/test_qwen3_omni.py tests/e2e/offline_inference/test_qwen3_omni_colocate_async.py -m 'advanced_model and cuda' --run-level 'advanced_model'
+        - pytest -s -v tests/e2e/offline_inference/test_qwen3_omni.py tests/e2e/online_serving/test_qwen3_omni.py -m 'advanced_model and cuda' --run-level 'advanced_model'
 
     - label: "Qwen3-TTS CustomVoice E2E Test · Shard %N/%t"
       agent_pool: mi300_1
-      parallelism: 3
+      parallelism: 2
       depends_on: amd-build
       mirror_hardwares: [amdproduction]
       grade: Blocking
-      timeout_in_minutes: 80
       commands:
         - |
-          timeout --signal=TERM --kill-after=2m 80m bash -c '
+          bash -c '
             export VLLM_LOGGING_LEVEL=DEBUG
             export VLLM_WORKER_MULTIPROC_METHOD=spawn
             export VLLM_ALLOW_LONG_MAX_MODEL_LEN="1"
-            TESTS=(
-              "tests/e2e/online_serving/test_qwen3_tts_customvoice.py::test_default_cuda_graph_startup[async_chunk]"
-              "tests/e2e/online_serving/test_qwen3_tts_customvoice.py::test_text_to_audio_002[async_chunk]"
-              "tests/e2e/offline_inference/test_qwen3_tts_customvoice.py::test_text_to_audio_001[no_cuda_graph]"
-            )
-            TEST="$${TESTS[$$BUILDKITE_PARALLEL_JOB]}"
-            pytest -s -v "$$TEST" -m "advanced_model" --run-level "advanced_model"
-          '
-
-    # TODO: Restore this case to the blocking sharded step once its long-running
-    # Whisper validation on AMD CI is resolved.
-    - label: "Qwen3-TTS CustomVoice async_chunk Test (quarantined)"
-      agent_pool: mi300_1
-      depends_on: amd-build
-      mirror_hardwares: [amdproduction]
-      grade: NonBlocking
-      timeout_in_minutes: 80
-      commands:
-        - |
-          timeout --signal=TERM --kill-after=2m 75m bash -c '
-            export VLLM_LOGGING_LEVEL=DEBUG
-            export VLLM_WORKER_MULTIPROC_METHOD=spawn
-            export VLLM_ALLOW_LONG_MAX_MODEL_LEN="1"
-            pytest -s -v "tests/e2e/online_serving/test_qwen3_tts_customvoice.py::test_text_to_audio_001[async_chunk]" -m "advanced_model" --run-level "advanced_model"
+            pytest -s -v tests/e2e/online_serving/test_qwen3_tts_customvoice.py tests/e2e/offline_inference/test_qwen3_tts_customvoice.py -m "advanced_model" --run-level "advanced_model" --num-shards=$$BUILDKITE_PARALLEL_JOB_COUNT --shard-id=$$BUILDKITE_PARALLEL_JOB
           '
 
     - label: "Qwen3-TTS Base E2E Test"
@@ -238,10 +195,13 @@ steps:
       grade: Blocking
       timeout_in_minutes: 50
       commands:
-        - export VLLM_LOGGING_LEVEL=DEBUG
-        - export VLLM_WORKER_MULTIPROC_METHOD=spawn
-        - export VLLM_ALLOW_LONG_MAX_MODEL_LEN="1"
-        - timeout 40m pytest -s -v tests/e2e/online_serving/test_qwen3_tts_base.py tests/e2e/offline_inference/test_qwen3_tts_base.py -m "advanced_model and cuda" --run-level "advanced_model"
+        - |
+          timeout 40m bash -c '
+            export VLLM_LOGGING_LEVEL=DEBUG
+            export VLLM_WORKER_MULTIPROC_METHOD=spawn
+            export VLLM_ALLOW_LONG_MAX_MODEL_LEN="1"
+            pytest -s -v tests/e2e/online_serving/test_qwen3_tts_base.py tests/e2e/offline_inference/test_qwen3_tts_base.py -m 'advanced_model and cuda' --run-level 'advanced_model'
+          '
 
 # TODO: Bagel test on ROCm is very unstable. @tjtanaa
 # Need to debug before reneable numerical changes across large PRs

.buildkite/amd/test-amd-ready.yml

@@ -107,11 +107,6 @@ steps:
         - export VLLM_LOGGING_LEVEL=DEBUG
         - export VLLM_WORKER_MULTIPROC_METHOD=spawn
         - timeout 20m pytest -s -v tests/diffusion/distributed/test_sequence_parallel.py -m core_model
-        - >-
-          timeout 20m pytest -s -v
-          tests/diffusion/models/ltx2/test_ltx2_transformer_ulysses.py
-          -m 'core_model and rocm and cards_2'
-          --run-level "core_model"
 
     - label: "Diffusion GPU Worker Test"
       agent_pool: mi300_2
@@ -127,13 +122,7 @@ steps:
       mirror_hardwares: [amdproduction]
       grade: Blocking
       commands:
-        # Preserve legacy one-GPU tests without cards_1 while excluding every
-        # registered multi-GPU marker from this one-GPU job.
-        - >-
-          timeout 15m pytest -sv tests/diffusion/models/
-          -m 'core_model and cuda and not
-          (cards_2 or cards_3 or cards_4 or cards_5 or cards_6 or cards_7 or cards_8)'
-          --run-level "core_model"
+        - timeout 15m pytest -sv tests/diffusion/models/ -m 'core_model and cuda' --run-level "core_model"
 
     - label: "Diffusion · Wan22 Test"
       agent_pool: mi300_1
@@ -202,7 +191,10 @@ steps:
       mirror_hardwares: [amdproduction]
       grade: Blocking
       commands:
-        - pytest -s -v tests/e2e/online_serving/test_cosyvoice3_tts_expansion.py -m "slow" --run-level "core_model"
+        - |
+          timeout 20m bash -c '
+            pytest -s -v tests/e2e/online_serving/test_cosyvoice3_tts_expansion.py -m "slow" --run-level "core_model"
+          '
 
 # TODO: Bagel test on ROCm is very unstable. @tjtanaa
 # Need to debug before reneable numerical changes across large PRs

.buildkite/common/ci_mirror_hardwares.yml

@@ -1,36 +1,19 @@
 # Uploader-only hardware presets for CUDA / NPU test YAML.
 # Referenced as ``mirror_hardwares: l4_1`` on a step; ``upload_pipeline.py`` expands to
-# ``agents`` (+ optional top-level ``image`` for NPU) + ``plugins`` (+ ``retry``
-# for ``l4_*``), then strips ``mirror_hardwares`` before Buildkite upload.
-#
-# Omit the key: compose {chip}_{n} from pytest -m SKU + cards_n (max of several
-# positives; not cards_1 with no positive cards_* → that chip's highest existing preset).
-# Unset MIRROR_HW matches H100 or L4 in -m (both → H100); no match skips the step.
-# MIRROR_HW=b200 matches B200 in -m (else the step is skipped).
-# MIRROR_HW must be empty or b200 (case-insensitive); unknown values fail the upload.
-# CUDA preset strings (h100_4, l4_1) are omitted when MIRROR_HW=b200.
-# Unset MIRROR_HW keeps string presets. NPU presets ignore MIRROR_HW.
+# ``agents`` (+ optional top-level ``image`` for NPU) + ``plugins``, then strips
+# ``mirror_hardwares`` before Buildkite upload.
 #
 # CUDA naming: {chip}_{count}
-#   l4_1, l4_2, l4_3, l4_4, h100_1 … h100_4, b200_1 … b200_4
+#   l4_1, l4_4, h100_1 … h100_4
 # NPU naming: {queue}_{resource_class}
 #   a2b3_npu_1  — ascend-a2b3, resource_class npu-1 (A2/B3 CI image)
 #   a2b3_npu_4  — ascend-a2b3, resource_class npu-4
-#   a3_npu_2    — ascend-a3, resource_class npu-2 (A3 CI image tag …:$BUILDKITE_COMMIT-a3)
-#   a5_npu_2    — ascend-a5, resource_class npu-2
-#   310p_npu_1  — ascend-310p, resource_class npu-1
+#   a3_npu_2    — ascend-a3, resource_class npu-2
 #
-# B200 (b200-k8s): matches vLLM device ``b200-k8s`` from ci-infra
-# (AgentQueue.B200_K8S + b200_plugin_template). Queue routes the K8s pool;
-# podSpec uses hostNetwork + /raid|/mnt/shared (no H100-style nodeSelector).
-#
-# The ``l4_*`` presets run on the EKS ``l4-k8s`` queue (agent-stack-k8s),
-# packed onto g6.12xlarge L4 nodes (``vllm.ci/gpu-pool=l4x4``). GPU / CPU /
-# memory / shm requests scale with card count (1 GPU = 10 CPU / 40Gi / 24Gi shm).
-# Retry covers lost agents / killed pods, not pytest or OOM (exit 1 / 137).
-# The Kubernetes HF secret deliberately uses VLLM_CI_HF_TOKEN. Scheduled
-# build-level HF_TOKEN values can override pod env entries with the same name;
-# upload_pipeline.py restores the secret-backed value inside the job shell.
+# The ``l4_*`` presets run under the ``docker`` plugin, which does not put
+# ``buildkite-agent`` on PATH inside the container the way the ``kubernetes``
+# presets do, so they set ``mount-buildkite-agent: true``; without it any step
+# calling ``buildkite-agent`` (artifact upload, annotate, meta-data) fails there.
 
 x-npu-k8s-plugins: &npu_k8s_plugins
   - kubernetes:
@@ -38,224 +21,39 @@ x-npu-k8s-plugins: &npu_k8s_plugins
         imagePullSecrets:
           - name: swr-secret
 
-# Infra-only retry. Omit exit 1 (pytest failed) and 137 (cgroup OOM / SIGKILL
-# of the test process). ci-infra ``K8S_RETRY`` still retries exit 1.
-x-l4-k8s-retry: &l4_k8s_retry
-  automatic:
-    - exit_status: -1
-      limit: 1
-    - exit_status: 128
-      limit: 1
-    - signal_reason: agent_stop
-      limit: 1
-    - signal_reason: agent_refused
-      limit: 1
-
 
 mirror_hardwares:
   l4_1:
     agents:
-      queue: l4-k8s
-    retry: *l4_k8s_retry
+      queue: gpu_1_queue
     plugins:
-      - kubernetes:
-          metadata:
-            annotations:
-              cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
-              karpenter.sh/do-not-disrupt: "true"
-          podSpec:
-            priorityClassName: ci
-            serviceAccountName: buildkite-gpu-jobs
-            tolerations:
-              - key: nvidia.com/gpu
-                operator: Exists
-                effect: NoSchedule
-            nodeSelector:
-              vllm.ci/gpu-pool: l4x4
-            containers:
-              - image: public.ecr.aws/q9t5s3a7/vllm-ci-test-repo:$BUILDKITE_COMMIT
-                resources:
-                  limits:
-                    nvidia.com/gpu: 1
-                  requests:
-                    nvidia.com/gpu: 1
-                    cpu: "10"
-                    memory: 40Gi
-                volumeMounts:
-                  - name: devshm
-                    mountPath: /dev/shm
-                  - name: hf-cache
-                    mountPath: /fsx/hf_cache
-                env:
-                  - name: HF_HOME
-                    value: /fsx/hf_cache
-                  - name: VLLM_CI_HF_TOKEN
-                    valueFrom:
-                      secretKeyRef:
-                        name: hf-token-secret
-                        key: token
-            volumes:
-              - name: devshm
-                emptyDir:
-                  medium: Memory
-                  sizeLimit: 24Gi
-              - name: hf-cache
-                hostPath:
-                  path: /fsx/hf_cache
-                  type: DirectoryOrCreate
-
-  l4_2:
-    agents:
-      queue: l4-k8s
-    retry: *l4_k8s_retry
-    plugins:
-      - kubernetes:
-          metadata:
-            annotations:
-              cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
-              karpenter.sh/do-not-disrupt: "true"
-          podSpec:
-            priorityClassName: ci
-            serviceAccountName: buildkite-gpu-jobs
-            tolerations:
-              - key: nvidia.com/gpu
-                operator: Exists
-                effect: NoSchedule
-            nodeSelector:
-              vllm.ci/gpu-pool: l4x4
-            containers:
-              - image: public.ecr.aws/q9t5s3a7/vllm-ci-test-repo:$BUILDKITE_COMMIT
-                resources:
-                  limits:
-                    nvidia.com/gpu: 2
-                  requests:
-                    nvidia.com/gpu: 2
-                    cpu: "20"
-                    memory: 80Gi
-                volumeMounts:
-                  - name: devshm
-                    mountPath: /dev/shm
-                  - name: hf-cache
-                    mountPath: /fsx/hf_cache
-                env:
-                  - name: HF_HOME
-                    value: /fsx/hf_cache
-                  - name: VLLM_CI_HF_TOKEN
-                    valueFrom:
-                      secretKeyRef:
-                        name: hf-token-secret
-                        key: token
-            volumes:
-              - name: devshm
-                emptyDir:
-                  medium: Memory
-                  sizeLimit: 48Gi
-              - name: hf-cache
-                hostPath:
-                  path: /fsx/hf_cache
-                  type: DirectoryOrCreate
-
-  l4_3:
-    agents:
-      queue: l4-k8s
-    retry: *l4_k8s_retry
-    plugins:
-      - kubernetes:
-          metadata:
-            annotations:
-              cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
-              karpenter.sh/do-not-disrupt: "true"
-          podSpec:
-            priorityClassName: ci
-            serviceAccountName: buildkite-gpu-jobs
-            tolerations:
-              - key: nvidia.com/gpu
-                operator: Exists
-                effect: NoSchedule
-            nodeSelector:
-              vllm.ci/gpu-pool: l4x4
-            containers:
-              - image: public.ecr.aws/q9t5s3a7/vllm-ci-test-repo:$BUILDKITE_COMMIT
-                resources:
-                  limits:
-                    nvidia.com/gpu: 3
-                  requests:
-                    nvidia.com/gpu: 3
-                    cpu: "30"
-                    memory: 120Gi
-                volumeMounts:
-                  - name: devshm
-                    mountPath: /dev/shm
-                  - name: hf-cache
-                    mountPath: /fsx/hf_cache
-                env:
-                  - name: HF_HOME
-                    value: /fsx/hf_cache
-                  - name: VLLM_CI_HF_TOKEN
-                    valueFrom:
-                      secretKeyRef:
-                        name: hf-token-secret
-                        key: token
-            volumes:
-              - name: devshm
-                emptyDir:
-                  medium: Memory
-                  sizeLimit: 72Gi
-              - name: hf-cache
-                hostPath:
-                  path: /fsx/hf_cache
-                  type: DirectoryOrCreate
+      - docker#v5.2.0:
+          image: public.ecr.aws/q9t5s3a7/vllm-ci-test-repo:$BUILDKITE_COMMIT
+          always-pull: true
+          propagate-environment: true
+          mount-buildkite-agent: true
+          shm-size: "8gb"
+          environment:
+            - HF_HOME=/fsx/hf_cache
+            - HF_TOKEN
+          volumes:
+            - /fsx/hf_cache:/fsx/hf_cache
 
   l4_4:
     agents:
-      queue: l4-k8s
-    retry: *l4_k8s_retry
+      queue: gpu_4_queue
     plugins:
-      - kubernetes:
-          metadata:
-            annotations:
-              cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
-              karpenter.sh/do-not-disrupt: "true"
-          podSpec:
-            priorityClassName: ci
-            serviceAccountName: buildkite-gpu-jobs
-            tolerations:
-              - key: nvidia.com/gpu
-                operator: Exists
-                effect: NoSchedule
-            nodeSelector:
-              vllm.ci/gpu-pool: l4x4
-            containers:
-              - image: public.ecr.aws/q9t5s3a7/vllm-ci-test-repo:$BUILDKITE_COMMIT
-                resources:
-                  limits:
-                    nvidia.com/gpu: 4
-                  requests:
-                    nvidia.com/gpu: 4
-                    cpu: "40"
-                    memory: 160Gi
-                volumeMounts:
-                  - name: devshm
-                    mountPath: /dev/shm
-                  - name: hf-cache
-                    mountPath: /fsx/hf_cache
-                env:
-                  - name: HF_HOME
-                    value: /fsx/hf_cache
-                  - name: VLLM_CI_HF_TOKEN
-                    valueFrom:
-                      secretKeyRef:
-                        name: hf-token-secret
-                        key: token
-            volumes:
-              - name: devshm
-                emptyDir:
-                  medium: Memory
-                  sizeLimit: 96Gi
-              - name: hf-cache
-                hostPath:
-                  path: /fsx/hf_cache
-                  type: DirectoryOrCreate
+      - docker#v5.2.0:
+          image: public.ecr.aws/q9t5s3a7/vllm-ci-test-repo:$BUILDKITE_COMMIT
+          always-pull: true
+          propagate-environment: true
+          mount-buildkite-agent: true
+          shm-size: "8gb"
+          environment:
+            - HF_HOME=/fsx/hf_cache
+            - HF_TOKEN
+          volumes:
+            - /fsx/hf_cache:/fsx/hf_cache
 
   h100_1:
     agents:
@@ -276,7 +74,7 @@ mirror_hardwares:
                 env:
                   - name: HF_HOME
                     value: /root/.cache/huggingface
-                  - name: VLLM_CI_HF_TOKEN
+                  - name: HF_TOKEN
                     valueFrom:
                       secretKeyRef:
                         name: hf-token-secret
@@ -311,7 +109,7 @@ mirror_hardwares:
                 env:
                   - name: HF_HOME
                     value: /root/.cache/huggingface
-                  - name: VLLM_CI_HF_TOKEN
+                  - name: HF_TOKEN
                     valueFrom:
                       secretKeyRef:
                         name: hf-token-secret
@@ -346,7 +144,7 @@ mirror_hardwares:
                 env:
                   - name: HF_HOME
                     value: /root/.cache/huggingface
-                  - name: VLLM_CI_HF_TOKEN
+                  - name: HF_TOKEN
                     valueFrom:
                       secretKeyRef:
                         name: hf-token-secret
@@ -381,7 +179,7 @@ mirror_hardwares:
                 env:
                   - name: HF_HOME
                     value: /root/.cache/huggingface
-                  - name: VLLM_CI_HF_TOKEN
+                  - name: HF_TOKEN
                     valueFrom:
                       secretKeyRef:
                         name: hf-token-secret
@@ -397,211 +195,6 @@ mirror_hardwares:
                   path: /mnt/hf-cache
                   type: DirectoryOrCreate
 
-  # vLLM device: b200-k8s → agents.queue b200-k8s + Buildkite K8s agent-stack podSpec
-  b200_1:
-    agents:
-      queue: b200-k8s
-    plugins:
-      - kubernetes:
-          podSpec:
-            runtimeClassName: nvidia
-            hostNetwork: true
-            dnsPolicy: ClusterFirstWithHostNet
-            imagePullSecrets:
-              - name: k8s-ecr-login-renew-docker-secret
-            containers:
-              - image: 936637512419.dkr.ecr.us-west-2.amazonaws.com/vllm-ci-pull-through-cache/q9t5s3a7/vllm-ci-test-repo:$BUILDKITE_COMMIT
-                resources:
-                  limits:
-                    nvidia.com/gpu: 1
-                securityContext:
-                  capabilities:
-                    add:
-                      - IPC_LOCK
-                      - SYS_RESOURCE
-                volumeMounts:
-                  - name: devshm
-                    mountPath: /dev/shm
-                  - name: raid
-                    mountPath: /raid
-                  - name: shared
-                    mountPath: /mnt/shared
-                env:
-                  - name: NCCL_CUMEM_HOST_ENABLE
-                    value: "0"
-                  - name: HF_HOME
-                    value: /raid/hf_cache
-                  - name: VLLM_CI_HF_TOKEN
-                    valueFrom:
-                      secretKeyRef:
-                        name: hf-token-secret
-                        key: token
-            volumes:
-              - name: devshm
-                emptyDir:
-                  medium: Memory
-              - name: raid
-                hostPath:
-                  path: /raid
-                  type: DirectoryOrCreate
-              - name: shared
-                hostPath:
-                  path: /mnt/shared
-                  type: DirectoryOrCreate
-
-  b200_2:
-    agents:
-      queue: b200-k8s
-    plugins:
-      - kubernetes:
-          podSpec:
-            runtimeClassName: nvidia
-            hostNetwork: true
-            dnsPolicy: ClusterFirstWithHostNet
-            imagePullSecrets:
-              - name: k8s-ecr-login-renew-docker-secret
-            containers:
-              - image: 936637512419.dkr.ecr.us-west-2.amazonaws.com/vllm-ci-pull-through-cache/q9t5s3a7/vllm-ci-test-repo:$BUILDKITE_COMMIT
-                resources:
-                  limits:
-                    nvidia.com/gpu: 2
-                securityContext:
-                  capabilities:
-                    add:
-                      - IPC_LOCK
-                      - SYS_RESOURCE
-                volumeMounts:
-                  - name: devshm
-                    mountPath: /dev/shm
-                  - name: raid
-                    mountPath: /raid
-                  - name: shared
-                    mountPath: /mnt/shared
-                env:
-                  - name: NCCL_CUMEM_HOST_ENABLE
-                    value: "0"
-                  - name: HF_HOME
-                    value: /raid/hf_cache
-                  - name: VLLM_CI_HF_TOKEN
-                    valueFrom:
-                      secretKeyRef:
-                        name: hf-token-secret
-                        key: token
-            volumes:
-              - name: devshm
-                emptyDir:
-                  medium: Memory
-              - name: raid
-                hostPath:
-                  path: /raid
-                  type: DirectoryOrCreate
-              - name: shared
-                hostPath:
-                  path: /mnt/shared
-                  type: DirectoryOrCreate
-
-  b200_3:
-    agents:
-      queue: b200-k8s
-    plugins:
-      - kubernetes:
-          podSpec:
-            runtimeClassName: nvidia
-            hostNetwork: true
-            dnsPolicy: ClusterFirstWithHostNet
-            imagePullSecrets:
-              - name: k8s-ecr-login-renew-docker-secret
-            containers:
-              - image: 936637512419.dkr.ecr.us-west-2.amazonaws.com/vllm-ci-pull-through-cache/q9t5s3a7/vllm-ci-test-repo:$BUILDKITE_COMMIT
-                resources:
-                  limits:
-                    nvidia.com/gpu: 3
-                securityContext:
-                  capabilities:
-                    add:
-                      - IPC_LOCK
-                      - SYS_RESOURCE
-                volumeMounts:
-                  - name: devshm
-                    mountPath: /dev/shm
-                  - name: raid
-                    mountPath: /raid
-                  - name: shared
-                    mountPath: /mnt/shared
-                env:
-                  - name: NCCL_CUMEM_HOST_ENABLE
-                    value: "0"
-                  - name: HF_HOME
-                    value: /raid/hf_cache
-                  - name: VLLM_CI_HF_TOKEN
-                    valueFrom:
-                      secretKeyRef:
-                        name: hf-token-secret
-                        key: token
-            volumes:
-              - name: devshm
-                emptyDir:
-                  medium: Memory
-              - name: raid
-                hostPath:
-                  path: /raid
-                  type: DirectoryOrCreate
-              - name: shared
-                hostPath:
-                  path: /mnt/shared
-                  type: DirectoryOrCreate
-
-  b200_4:
-    agents:
-      queue: b200-k8s
-    plugins:
-      - kubernetes:
-          podSpec:
-            runtimeClassName: nvidia
-            hostNetwork: true
-            dnsPolicy: ClusterFirstWithHostNet
-            imagePullSecrets:
-              - name: k8s-ecr-login-renew-docker-secret
-            containers:
-              - image: 936637512419.dkr.ecr.us-west-2.amazonaws.com/vllm-ci-pull-through-cache/q9t5s3a7/vllm-ci-test-repo:$BUILDKITE_COMMIT
-                resources:
-                  limits:
-                    nvidia.com/gpu: 4
-                securityContext:
-                  capabilities:
-                    add:
-                      - IPC_LOCK
-                      - SYS_RESOURCE
-                volumeMounts:
-                  - name: devshm
-                    mountPath: /dev/shm
-                  - name: raid
-                    mountPath: /raid
-                  - name: shared
-                    mountPath: /mnt/shared
-                env:
-                  - name: NCCL_CUMEM_HOST_ENABLE
-                    value: "0"
-                  - name: HF_HOME
-                    value: /raid/hf_cache
-                  - name: VLLM_CI_HF_TOKEN
-                    valueFrom:
-                      secretKeyRef:
-                        name: hf-token-secret
-                        key: token
-            volumes:
-              - name: devshm
-                emptyDir:
-                  medium: Memory
-              - name: raid
-                hostPath:
-                  path: /raid
-                  type: DirectoryOrCreate
-              - name: shared
-                hostPath:
-                  path: /mnt/shared
-                  type: DirectoryOrCreate
-
   a2b3_npu_1:
     agents:
       queue: "ascend-a2b3"
@@ -651,52 +244,3 @@ mirror_hardwares:
       resource_class: "npu-16"
     image: "swr.cn-southwest-2.myhuaweicloud.com/modelfoundry/vllm-omni-ci-npu:${BUILDKITE_COMMIT}-a3"
     plugins: *npu_k8s_plugins
-
-  a5_npu_2:
-    agents:
-      queue: "ascend-a5"
-      resource_class: "npu-2"
-    image: "swr.cn-southwest-2.myhuaweicloud.com/modelfoundry/vllm-omni-ci-npu:${BUILDKITE_COMMIT}-a5"
-    plugins: *npu_k8s_plugins
-
-  a5_npu_4:
-    agents:
-      queue: "ascend-a5"
-      resource_class: "npu-4"
-    image: "swr.cn-southwest-2.myhuaweicloud.com/modelfoundry/vllm-omni-ci-npu:${BUILDKITE_COMMIT}-a5"
-    plugins: *npu_k8s_plugins
-
-  a5_npu_8:
-    agents:
-      queue: "ascend-a5"
-      resource_class: "npu-8"
-    image: "swr.cn-southwest-2.myhuaweicloud.com/modelfoundry/vllm-omni-ci-npu:${BUILDKITE_COMMIT}-a5"
-    plugins: *npu_k8s_plugins
-
-  a5_npu_16:
-    agents:
-      queue: "ascend-a5"
-      resource_class: "npu-16"
-    image: "swr.cn-southwest-2.myhuaweicloud.com/modelfoundry/vllm-omni-ci-npu:${BUILDKITE_COMMIT}-a5"
-    plugins: *npu_k8s_plugins
-
-  310p_npu_1:
-    agents:
-      queue: "ascend-310p"
-      resource_class: "npu-1"
-    image: "swr.cn-southwest-2.myhuaweicloud.com/modelfoundry/vllm-omni-ci-npu:${BUILDKITE_COMMIT}-310p"
-    plugins: *npu_k8s_plugins
-
-  310p_npu_2:
-    agents:
-      queue: "ascend-310p"
-      resource_class: "npu-2"
-    image: "swr.cn-southwest-2.myhuaweicloud.com/modelfoundry/vllm-omni-ci-npu:${BUILDKITE_COMMIT}-310p"
-    plugins: *npu_k8s_plugins
-
-  310p_npu_4:
-    agents:
-      queue: "ascend-310p"
-      resource_class: "npu-4"
-    image: "swr.cn-southwest-2.myhuaweicloud.com/modelfoundry/vllm-omni-ci-npu:${BUILDKITE_COMMIT}-310p"
-    plugins: *npu_k8s_plugins

.buildkite/common/scripts/skip_ci.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 # SPDX-License-Identifier: Apache-2.0
-# SPDX-FileCopyrightText: Copyright contributors to the vLLM-Omni project
 """Shared Buildkite skip-ci and CI-YAML level targeting logic.
 
 ``resolve_ci_decision(changed_files, ...)`` buckets explicit file lists (tests, dry-run).
@@ -11,6 +10,12 @@ CLI (for bootstrap scripts; exit code is the signal):
   python3 skip_ci.py gate <platform> <level>
       Exit 0 when bootstrap should stop (skip-all, or that L2/L3 target is off).
       Prints ``skip-all`` or ``skip-l23`` on stdout; logs the decision once.
+  python3 skip_ci.py check-skip-all
+      Exit 0 when only docs/skip-mark changes → bootstrap skips entire CI upload.
+  python3 skip_ci.py check-skip-l2-l3 <platform> <level>
+      Exit 0 when that L2/L3 pipeline should be skipped (CI config YAML-only diffs).
+  python3 skip_ci.py print-annotate
+      Print decision message for Buildkite annotation.
 """
 
 from __future__ import annotations
@@ -253,10 +258,11 @@ class CiDecision:
 
 @dataclass(frozen=True)
 class CiContext:
-    """Skip-ci decision plus changed files used for pipeline filtering."""
+    """Skip-ci decision plus git diff inputs used to compute it."""
 
     decision: CiDecision
     changed_files: list[str] | None
+    diff_range: str | None
 
 
 def _log(message: str) -> None:
@@ -326,7 +332,7 @@ def resolve_ci_context_from_git() -> CiContext:
     diff_range = _resolve_diff_range()
     changed_files = _changed_files_for_diff_range(diff_range)
     decision = resolve_ci_decision(changed_files, diff_range=diff_range)
-    return CiContext(decision=decision, changed_files=changed_files)
+    return CiContext(decision=decision, changed_files=changed_files, diff_range=diff_range)
 
 
 # --- Doc / skip-mark helpers ---
@@ -565,6 +571,23 @@ def main() -> int:
     gate_parser.add_argument("platform", help="cuda, amd, intel, or npu")
     gate_parser.add_argument("level", choices=("l2", "l3"), help="test level")
 
+    subparsers.add_parser(
+        "check-skip-all",
+        help="exit 0 when docs/skip-mark-only diff should skip entire CI upload",
+    )
+
+    skip_parser = subparsers.add_parser(
+        "check-skip-l2-l3",
+        help="exit 0 when PLATFORM l2/l3 pipeline should be skipped (CI config YAML-only diffs)",
+    )
+    skip_parser.add_argument("platform", help="cuda, amd, intel, or npu")
+    skip_parser.add_argument("level", choices=("l2", "l3"), help="test level")
+
+    subparsers.add_parser(
+        "print-annotate",
+        help="print human-readable skip reason for Buildkite annotation",
+    )
+
     args = parser.parse_args()
     decision = resolve_ci_context_from_git().decision
 
@@ -577,6 +600,16 @@ def main() -> int:
             return 0
         return 1
 
+    if args.command == "check-skip-all":
+        return 0 if decision.skip_all else 1
+
+    if args.command == "check-skip-l2-l3":
+        return 0 if not decision.is_run(args.platform, args.level) else 1
+
+    if args.command == "print-annotate":
+        print(decision.message or "CI will run normally")
+        return 0
+
     return 1
 
 

.buildkite/common/scripts/upload_pipeline.py

@@ -12,19 +12,8 @@ Bootstrap mode (``bootstrap-upload-steps.yml``):
 
 Test pipeline mode (e.g. test-merge.yml):
   - Drop steps whose ``source_file_dependencies`` do not match changed files.
-  - Expand uploader-only ``mirror_hardwares`` into ``agents`` (+ optional ``image``
+  - Expand uploader-only ``mirror_hardwares: l4_1`` into ``agents`` (+ optional ``image``
     for NPU) + ``plugins`` (see ci_mirror_hardwares.yml).
-  - Omit ``mirror_hardwares`` to compose ``{chip}_{n}`` from pytest ``-m`` SKU
-    markers plus ``cards_n`` (max of several positives; ``not cards_1`` with no
-    positive ``cards_*`` uses that chip's highest existing preset). An explicit
-    preset string (``h100_2``) is used as-is (marks are ignored). Names that
-    are not keys in ``ci_mirror_hardwares.yml`` fail the upload.
-
-    Inferred chip: unset ``MIRROR_HW`` matches ``H100`` or ``L4`` in ``-m``
-    (both → H100); no match skips the step. ``MIRROR_HW=b200`` matches
-    ``B200`` in ``-m`` (otherwise skipped). ``-m`` is not rewritten.
-    ``MIRROR_HW`` must be empty or ``b200``; unknown values fail the upload.
-    A CUDA preset string such as ``h100_4`` is omitted when ``MIRROR_HW=b200``.
 
 Usage:
   python3 upload_pipeline.py [--upload] [--all | --e2e] <pipeline.yml>
@@ -36,13 +25,11 @@ from __future__ import annotations
 
 import argparse
 import copy
-import os
-import re
 import subprocess
 import sys
 from functools import lru_cache
 from pathlib import Path
-from typing import Any, Literal
+from typing import Any
 
 try:
     import yaml
@@ -58,27 +45,11 @@ from skip_ci import (
     resolve_ci_context_from_git,
 )
 
-if str(ROOT) not in sys.path:
-    sys.path.insert(0, str(ROOT))
-
-from tests.helpers.mark import (  # noqa: E402
-    get_skus_for_platform,
-    get_supported_card_counts,
-)
-
 # --- Constants ---
 
 LOG = "upload_pipeline"
 BOOTSTRAP_STEPS_FILENAME = "bootstrap-upload-steps.yml"
-BOOTSTRAP_IMAGE_BUILD_KEYS = frozenset(
-    {
-        "image-build",
-        "image-build-a2",
-        "image-build-a3",
-        "image-build-a5",
-        "image-build-310p",
-    }
-)
+BOOTSTRAP_IMAGE_BUILD_KEYS = frozenset({"image-build", "image-build-a2", "image-build-a3"})
 BOOTSTRAP_UPLOAD_IF_KEYS = {
     "upload-ready-pipeline": "ready",
     "upload-merge-pipeline": "merge",
@@ -87,8 +58,6 @@ BOOTSTRAP_UPLOAD_IF_KEYS = {
 }
 E2E_GROUP_MARKER = "E2E Test"
 CI_MIRROR_HARDWARES_PATH = ROOT / ".buildkite/common/ci_mirror_hardwares.yml"
-CUDA_HF_TOKEN_ENV = "VLLM_CI_HF_TOKEN"
-CUDA_HF_TOKEN_EXPORT = f'if [ -n "$${{{CUDA_HF_TOKEN_ENV}:-}}" ]; then export HF_TOKEN="$${{{CUDA_HF_TOKEN_ENV}}}"; fi'
 
 # Bootstrap Buildkite ``if`` expressions.
 # ``*_MAIN_IF``: main + env schedule. ``*_LABEL_IF``: PR label (and/or composed with MAIN).
@@ -264,268 +233,32 @@ def _load_mirror_hardwares() -> dict[str, dict[str, Any]]:
     return presets
 
 
-@lru_cache(maxsize=1)
-def _cuda_mirror_chips() -> tuple[str, ...]:
-    """Lowercase CUDA SKUs that have at least one ``{chip}_{n}`` preset.
+def _expand_mirror_hardwares(step: dict[str, Any]) -> dict[str, Any]:
+    """Replace uploader-only ``mirror_hardwares`` with preset fields from ci_mirror_hardwares.yml."""
+    hardware = step.get("mirror_hardwares")
+    if hardware is None:
+        return step
 
-    Longer tokens first so ``h100`` is not matched as a prefix of ``h200``.
-    """
-    skus = get_skus_for_platform("cuda")
-    known = _load_mirror_hardwares()
-    chips = {
-        sku.lower() for sku in skus if any(name == sku.lower() or name.startswith(f"{sku.lower()}_") for name in known)
-    }
-    return tuple(sorted(chips, key=lambda chip: (-len(chip), chip)))
-
-
-def _read_cards_marks(expr: str) -> tuple[set[int], bool]:
-    """Parse registered ``cards_n`` / ``not cards_n`` from a pytest ``-m`` expr.
-
-    Returns positive card counts and whether any ``not cards_*`` is present.
-    """
-    counts = get_supported_card_counts()
-    alt = "|".join(str(n) for n in sorted(counts, key=lambda n: (-len(str(n)), -n))) if counts else "(?!)"
-    positives: set[int] = set()
-    has_not_cards = False
-    for match in re.finditer(rf"\b(?:(not)\s+)?cards_({alt})\b", expr):
-        if match.group(1):
-            has_not_cards = True
-        else:
-            positives.add(int(match.group(2)))
-    return positives, has_not_cards
-
-
-def _read_hardware_marks(expr: str) -> set[str]:
-    """Return lowercase positive CUDA SKUs that have a mirror preset.
-
-    ``not H100`` is ignored. SKUs with no ``{chip}_*`` preset (e.g. H200) are dropped.
-    """
-    skus = sorted(get_skus_for_platform("cuda"), key=lambda s: (-len(s), s))
-    if not skus:
-        return set()
-    alt = "|".join(re.escape(sku) for sku in skus)
-    mirror = set(_cuda_mirror_chips())
-    chips: set[str] = set()
-    for match in re.finditer(rf"\b(?:(not)\s+)?({alt})\b", expr):
-        if match.group(1):
-            continue
-        chip = match.group(2).lower()
-        if chip in mirror:
-            chips.add(chip)
-    return chips
-
-
-# CI policy: not pytest-mark registry.
-_SUPPORTED_MIRROR_HW_SELECTORS = frozenset({"b200"})
-# Unset MIRROR_HW: match H100 then L4 in -m (skip if neither).
-_DEFAULT_INFER_CHIPS = ("h100", "l4")
-_PYTEST_MARKER_ARG = re.compile(r"-m\s+(?:\"([^\"]*)\"|'([^']*)'|(\S+))")
-_CARDS_CHIP_MAX: Literal["max"] = "max"
-
-
-def _get_mirror_hw_selector() -> str:
-    """Return lowercase ``MIRROR_HW``, or empty to keep string presets / marker chips.
-
-    A set value must be ``b200`` (case-insensitive). Unknown values fail closed
-    so a typo cannot silently drop the CUDA pipeline.
-    """
-    selector = os.environ.get("MIRROR_HW", "").strip().lower()
-    if not selector:
-        return ""
-    if selector not in _SUPPORTED_MIRROR_HW_SELECTORS:
-        allowed = " or ".join(repr(s) for s in sorted(_SUPPORTED_MIRROR_HW_SELECTORS))
-        raise ValueError(f"unsupported MIRROR_HW={selector!r}; expected empty or {allowed}")
-    return selector
-
-
-def _read_pytest_marks(commands: Any) -> tuple[set[str], int | Literal["max"] | None]:
-    """Read pytest ``-m`` from step commands: CUDA SKU chips and cards count.
-
-    *chips* are lowercase SKUs from positive markers (``not H100`` is ignored).
-    *cards* is the max positive ``cards_n``, ``"max"`` when only ``not cards_*``
-    is present, or ``None``.
-    """
-    chunks: list[str] = []
-
-    def _collect(value: Any) -> None:
-        if value is None:
-            return
-        if isinstance(value, str):
-            chunks.append(value)
-        elif isinstance(value, list):
-            for part in value:
-                _collect(part)
-        else:
-            chunks.append(str(value))
-
-    _collect(commands)
-    text = "\n".join(chunks)
-
-    chips: set[str] = set()
-    positives: set[int] = set()
-    has_not_cards = False
-    for match in _PYTEST_MARKER_ARG.finditer(text):
-        expr = match.group(1) or match.group(2) or match.group(3) or ""
-        chips |= _read_hardware_marks(expr)
-        card_counts, not_cards = _read_cards_marks(expr)
-        positives.update(card_counts)
-        has_not_cards = has_not_cards or not_cards
-
-    if positives:
-        cards: int | Literal["max"] | None = max(positives)
-    elif has_not_cards:
-        cards = _CARDS_CHIP_MAX
-    else:
-        cards = None
-    return chips, cards
-
-
-def _compose_mirror_hardware_name(
-    chips: set[str],
-    cards: int | Literal["max"] | None,
-    *,
-    step_label: str,
-) -> str | None:
-    """Assemble ``{chip}_{n}`` from pytest ``-m`` chips/cards, or None to skip.
-
-    Unset ``MIRROR_HW``: ``H100`` if in ``-m``, else ``L4``, else skip.
-    Set ``MIRROR_HW``: that chip if in ``-m``, else skip.
-    ``cards`` is a registered ``cards_n``, ``"max"`` for that chip's highest
-    existing preset, or None (error after a chip matched — no ``cards_*``).
-    """
-    selector = _get_mirror_hw_selector()
-    if selector:
-        chip = selector if selector in chips else None
-        skip_reason = f"MIRROR_HW={selector!r} not in -m SKUs {sorted(chips)}"
-    else:
-        chip = next((c for c in _DEFAULT_INFER_CHIPS if c in chips), None)
-        skip_reason = f"no H100 or L4 in -m SKUs {sorted(chips)}"
-    if chip is None:
-        _log(f"skip {step_label}: {skip_reason}")
-        return None
-    if cards is None:
+    if not isinstance(hardware, str) or not hardware.strip():
         raise ValueError(
-            f"step {step_label!r} has a pytest -m SKU marker but no cards_* "
-            f"(or not cards_*); add cards_n or set mirror_hardwares to force a preset",
+            f"mirror_hardwares must be a non-empty string in step {_get_step_label(step)!r}",
         )
 
-    count_source = "not cards_*" if cards == _CARDS_CHIP_MAX else f"cards_{cards}"
-    count = None if cards == _CARDS_CHIP_MAX else cards
-    registered = get_supported_card_counts()
-    if count is not None and count not in registered:
-        supported = ", ".join(f"cards_{n}" for n in sorted(registered)) or "(none)"
-        raise ValueError(
-            f"{count_source} in step {step_label!r} is not a registered cards_* mark; supported: {supported}",
-        )
-    known = _load_mirror_hardwares()
-    if count is None:
-        available = [n for n in sorted(registered) if f"{chip}_{n}" in known]
-        if not available:
-            raise ValueError(
-                f"{count_source} in step {step_label!r} has no CUDA count presets for {chip}",
-            )
-        count = max(available)
-    chosen = f"{chip}_{count}"
-    if chosen not in known:
-        raise ValueError(
-            f"{count_source} in step {step_label!r} has no preset {chosen!r}",
-        )
-    _log(f"{step_label}: {count_source} → {chosen!r}")
-    return chosen
-
-
-def _resolve_mirror_hardware_name(hardware: Any, *, step_label: str) -> str | None:
-    """Map ``mirror_hardwares`` to a ``ci_mirror_hardwares.yml`` preset, or None to skip.
-
-    The value is a preset name (``h100_2``). Unknown names fail later when the
-    registry is loaded. CUDA names are omitted when ``MIRROR_HW`` names a
-    different chip; NPU strings ignore ``MIRROR_HW``.
-    """
-    if isinstance(hardware, bool):
-        raise ValueError(f"mirror_hardwares must not be a boolean in step {step_label!r}")
-    if isinstance(hardware, str):
-        name = hardware.strip()
-    elif isinstance(hardware, int):
-        name = str(hardware)
-    else:
-        raise ValueError(
-            f"mirror_hardwares must be a preset string in step {step_label!r}",
-        )
-    if not name:
-        raise ValueError(f"mirror_hardwares must be a non-empty string in step {step_label!r}")
-
-    selector = _get_mirror_hw_selector()
-    token = name.lower()
-    chip = next(
-        (c for c in _cuda_mirror_chips() if token == c or token.startswith(f"{c}_")),
-        None,
-    )
-    if selector and chip is not None and chip != selector:
-        _log(
-            f"skip {step_label}: preset {name!r} is {chip} hardware; MIRROR_HW={selector!r}",
-        )
-        return None
-    return name
-
-
-def _expand_mirror_hardwares(step: dict[str, Any]) -> dict[str, Any] | None:
-    """Replace ``mirror_hardwares`` (or infer it from ``-m``) with preset agents/plugins.
-
-    Explicit preset string: used as-is; pytest marks are ignored.
-    Omitted key: match H100/L4 (or ``MIRROR_HW``) in ``-m``, then compose
-    ``{chip}_{n}`` from ``cards_n``. No match skips the step. Steps with no
-    SKU/cards and no ``mirror_hardwares`` are left unchanged (CPU jobs).
-
-    Returns None when the current ``MIRROR_HW`` selector does not apply.
-    """
-    step_label = _get_step_label(step)
-    has_pool = step.get("agents") is not None or step.get("plugins") is not None or step.get("image") is not None
-
-    if "mirror_hardwares" not in step:
-        if has_pool:
-            return step
-        chips, cards = _read_pytest_marks(step.get("commands"))
-        if not chips and cards is None:
-            return step
-        preset_name = _compose_mirror_hardware_name(chips, cards, step_label=step_label)
-    else:
-        if has_pool:
-            raise ValueError(
-                f"step {step_label!r} sets mirror_hardwares together with agents/plugins/image; "
-                f"use mirror_hardwares only",
-            )
-        preset_name = _resolve_mirror_hardware_name(
-            step.get("mirror_hardwares"),
-            step_label=step_label,
-        )
-
-    if preset_name is None:
-        return None
-
-    preset = _load_mirror_hardwares().get(preset_name)
+    preset = _load_mirror_hardwares().get(hardware)
     if preset is None:
         known = ", ".join(sorted(_load_mirror_hardwares()))
         raise ValueError(
-            f"unknown mirror_hardwares {preset_name!r} in step {step_label!r}; known: {known}",
+            f"unknown mirror_hardwares {hardware!r} in step {_get_step_label(step)!r}; known: {known}",
+        )
+
+    if step.get("agents") is not None or step.get("plugins") is not None or step.get("image") is not None:
+        raise ValueError(
+            f"step {_get_step_label(step)!r} sets mirror_hardwares together with agents/plugins/image; "
+            "use mirror_hardwares only",
         )
 
     expanded = copy.deepcopy(preset)
-    merged = {key: value for key, value in step.items() if key != "mirror_hardwares"} | expanded
-    # A scheduled build's HF_TOKEN may override a pod env entry with the same
-    # name. The preset injects the Kubernetes secret under a collision-proof
-    # alias; restore the conventional name after Buildkite has merged env.
-    if any(preset_name == chip or preset_name.startswith(f"{chip}_") for chip in _cuda_mirror_chips()):
-        commands = merged.get("commands")
-        if isinstance(commands, list):
-            merged["commands"] = [CUDA_HF_TOKEN_EXPORT, *commands]
-        elif commands is None:
-            merged["commands"] = [CUDA_HF_TOKEN_EXPORT]
-        else:
-            merged["commands"] = [CUDA_HF_TOKEN_EXPORT, commands]
-    # Preset retry (K8S_RETRY on l4_*) must not clobber a step that opted out.
-    if "retry" in step:
-        merged["retry"] = step["retry"]
-    return merged
+    return {key: value for key, value in step.items() if key != "mirror_hardwares"} | expanded
 
 
 def _match_source_file(changed_files: list[str], prefixes: list[str]) -> bool:
@@ -564,7 +297,7 @@ def _process_test_steps(
         nested = step.get("steps")
         if nested is not None:
             kept_nested = _process_test_steps(nested, changed_files)
-            if not kept_nested:
+            if changed_files is not None and not kept_nested:
                 _log(f"omit empty group {_get_step_label(step)!r}")
                 continue
             new_step = {key: value for key, value in step.items() if key != "source_file_dependencies"}
@@ -572,11 +305,14 @@ def _process_test_steps(
             processed.append(new_step)
             continue
 
-        leaf = {key: value for key, value in step.items() if key != "source_file_dependencies"}
-        expanded = _expand_mirror_hardwares(leaf)
-        if expanded is None:
-            continue
-        processed.append(expanded)
+        if deps is not None:
+            processed.append(
+                _expand_mirror_hardwares(
+                    {key: value for key, value in step.items() if key != "source_file_dependencies"},
+                ),
+            )
+        else:
+            processed.append(_expand_mirror_hardwares(step))
 
     return processed
 
@@ -602,10 +338,6 @@ def _render_test_pipeline(
     e2e_only: bool = False,
 ) -> dict[str, Any]:
     """Filter steps by PR diff and strip uploader-only ``source_file_dependencies`` metadata."""
-    # Validate MIRROR_HW once up front. Per-step skip must not run for typos
-    # (e.g. b20o), or a pipeline can shrink to leftover CPU-only steps and
-    # still upload successfully.
-    _get_mirror_hw_selector()
     steps = doc.get("steps")
     if not isinstance(steps, list):
         return doc
@@ -635,7 +367,10 @@ def _render_pipeline(
 
     text = path.read_text(encoding="utf-8")
     ctx = resolve_ci_context_from_git()
-    changed_files = None if force_all or e2e_only else ctx.changed_files
+    if force_all or e2e_only:
+        changed_files = None
+    else:
+        changed_files = ctx.changed_files
 
     doc = yaml.safe_load(text)
     if not isinstance(doc, dict):

.buildkite/cuda/test-merge.yml

@@ -1,8 +1,6 @@
-# CUDA CI L3 (`advanced_model` e2e) plus L1 CPU Simple Test (`core_model and cpu`).
-# Uploaded by Upload Merge Pipeline: PR label `merge-test`, or post-merge on main.
-
 env:
   VLLM_WORKER_MULTIPROC_METHOD: spawn
+  VLLM_USE_FLASHINFER_MOE_FP16: 0
   HF_HUB_DOWNLOAD_TIMEOUT: 300
   HF_HUB_ETAG_TIMEOUT: 60
 
@@ -79,9 +77,6 @@ steps:
     steps:
       - label: "TTS · Qwen3-TTS CustomVoice Test"
         source_file_dependencies:
-          - tests/e2e/features/prefill_phase/
-          - vllm_omni/worker/gpu_model_runner.py
-          - tests/helpers/media.py
           - tests/e2e/online_serving/test_qwen3_tts_customvoice.py
           - tests/e2e/offline_inference/test_qwen3_tts_customvoice.py
           - vllm_omni/model_executor/models/qwen3_tts/
@@ -90,21 +85,17 @@ steps:
           - vllm_omni/model_executor/models/common/alias_free_activation.py
           - vllm_omni/model_executor/stage_input_processors/qwen3_tts.py
           - vllm_omni/deploy/qwen3_tts.yaml
-          - vllm_omni/entrypoints/openai/serving_speech.py
-          - vllm_omni/entrypoints/openai/tts_adapters/
-          - vllm_omni/engine/stage_pool.py
         commands:
           - |
             timeout 40m bash -c "
               export VLLM_LOGGING_LEVEL=DEBUG
               export VLLM_ALLOW_LONG_MAX_MODEL_LEN=1
-              pytest -s -v tests/e2e/online_serving/test_qwen3_tts_customvoice.py tests/e2e/offline_inference/test_qwen3_tts_customvoice.py tests/e2e/features/prefill_phase/test_chunked_prefill_tail.py -m 'advanced_model and cuda' --run-level 'advanced_model'
+              pytest -s -v tests/e2e/online_serving/test_qwen3_tts_customvoice.py tests/e2e/offline_inference/test_qwen3_tts_customvoice.py -m 'advanced_model and cuda' --run-level 'advanced_model'
             "
         mirror_hardwares: l4_1
 
       - label: "TTS · Qwen3-TTS Base Test"
         source_file_dependencies:
-          - tests/helpers/media.py
           - tests/e2e/online_serving/test_qwen3_tts_base.py
           - tests/e2e/offline_inference/test_qwen3_tts_base.py
           - vllm_omni/model_executor/models/qwen3_tts/
@@ -113,9 +104,6 @@ steps:
           - vllm_omni/model_executor/models/common/alias_free_activation.py
           - vllm_omni/model_executor/stage_input_processors/qwen3_tts.py
           - vllm_omni/deploy/qwen3_tts.yaml
-          - vllm_omni/entrypoints/openai/serving_speech.py
-          - vllm_omni/entrypoints/openai/tts_adapters/
-          - vllm_omni/engine/stage_pool.py
           - .buildkite/common/scripts/run_cov_split.sh
           - pyproject.toml
         # 40 -> 60: the coverage split runs the model twice.
@@ -134,7 +122,6 @@ steps:
       - label: "Omni · Qwen3-Omni Test"
         source_file_dependencies:
           - tests/e2e/offline_inference/test_qwen3_omni.py
-          - tests/e2e/offline_inference/test_qwen3_omni_colocate_async.py
           - tests/e2e/online_serving/test_qwen3_omni.py
           - tests/helpers/runtime.py
           - vllm_omni/entrypoints/openai/serving_chat.py
@@ -145,17 +132,15 @@ steps:
           - vllm_omni/model_executor/models/qwen3_tts/cuda_graph_decoder_wrapper.py
           - vllm_omni/model_executor/stage_input_processors/qwen3_omni.py
           - vllm_omni/deploy/qwen3_omni_moe.yaml
-          - vllm_omni/deploy/qwen3_omni_moe_thinking.yaml
         timeout_in_minutes: 50
         commands:
-          - pytest -s -v tests/e2e/offline_inference/test_qwen3_omni.py tests/e2e/online_serving/test_qwen3_omni.py tests/e2e/offline_inference/test_qwen3_omni_colocate_async.py -m 'advanced_model and cuda' --run-level 'advanced_model'
+          - pytest -s -v tests/e2e/offline_inference/test_qwen3_omni.py tests/e2e/online_serving/test_qwen3_omni.py -m 'advanced_model and cuda' --run-level 'advanced_model'
         mirror_hardwares: h100_2
 
       - label: "Omni · MiniCPM-o 4.5 Test"
         source_file_dependencies:
           - tests/e2e/offline_inference/test_minicpmo_4_5.py
           - tests/e2e/online_serving/test_minicpmo_4_5.py
-          - vllm_omni/transformers_utils/chat_templates/minicpmo45_native.jinja
           - vllm_omni/model_executor/models/minicpmo_4_5/
           - vllm_omni/model_executor/models/step_audio2/
           - vllm_omni/model_executor/models/cosyvoice3/code2wav_core/
@@ -166,11 +151,10 @@ steps:
         commands:
           - pytest -s -v tests/e2e/offline_inference/test_minicpmo_4_5.py tests/e2e/online_serving/test_minicpmo_4_5.py -m 'advanced_model and cuda' --run-level 'advanced_model'
         # h100_2, not h100_1: advanced_model asserts transcribe every audio
-        # response with Whisper, and tests/helpers/media.py requires at least
-        # 16 GiB free VRAM on a device to run Whisper on GPU. When the model
-        # server leaves insufficient memory, Whisper falls back to CPU:
-        # ~8-10 min per clip vs ~30 s, which overruns the 50-minute job timeout
-        # (build 2956). h100_2 guarantees a second GPU with ample free VRAM.
+        # response with Whisper, and tests/helpers/media.py only uses an
+        # accelerator for Whisper when a spare GPU exists. On a single card it
+        # grades on CPU: ~8-10 min per clip vs ~30 s, which alone overruns the
+        # 50-minute job timeout (build 2956).
         mirror_hardwares: h100_2
 
       - label: "Omni · MiniCPM-o 4.5 Duplex Test"
@@ -182,25 +166,10 @@ steps:
           - tests/e2e/online_serving/test_minicpmo_realtime_duplex_drivers.py
           - tests/e2e/online_serving/helpers/minicpmo_realtime_duplex_scenarios.py
           - tests/e2e/online_serving/run_minicpmo_realtime_duplex_multi_session.py
-          - tests/e2e/online_serving/run_minicpmo_realtime_duplex_server_vad.py
           - tests/e2e/online_serving/run_minicpmo_realtime_duplex_soft_interrupt.py
           - vllm_omni/deploy/minicpmo_4_5.yaml
           - tests/e2e/online_serving/helpers/minicpmo_4_5_duplex.py
-          - vllm_omni/engine/duplex/
-          - vllm_omni/entrypoints/duplex/
-          # Public duplex client library + its unit suites: client-side
-          # changes must re-run the duplex e2e group. The live client probe
-          # (test_duplex_client_live.py, single GPU, core tier) runs in the
-          # ready pipeline's duplex group.
-          - vllm_omni/clients/
-          - tests/clients/
-          - vllm_omni/entrypoints/duplex_request_client.py
-          - vllm_omni/outputs/duplex.py
-          - vllm_omni/model_executor/duplex_sampling.py
-          - tests/engine/duplex/
-          - tests/entrypoints/duplex/
-          - tests/model_executor/models/minicpmo_4_5/duplex/
-          # Legacy Realtime probe client + video stacking used by the e2e drivers.
+          - vllm_omni/deploy/minicpmo_4_5_duplex.yaml
           - vllm_omni/experimental/fullduplex/
           - vllm_omni/model_executor/models/minicpmo_4_5/
           - vllm_omni/model_executor/models/step_audio2/
@@ -248,50 +217,3 @@ steps:
               pytest -s -v tests/e2e/offline_inference/test_wan22_t2v.py tests/e2e/online_serving/test_wan22_t2v.py -m 'advanced_model and cuda and diffusion' --run-level 'advanced_model'
             "
         mirror_hardwares: h100_1
-
-      - label: "Diffusion · HunyuanVideo-1.5 Test"
-        source_file_dependencies:
-          - tests/e2e/online_serving/test_hunyuan_video_15_expansion.py
-          - vllm_omni/diffusion/models/hunyuan_video/
-        commands:
-          - |
-            timeout 40m bash -c "
-              export VLLM_IMAGE_FETCH_TIMEOUT=60
-              pytest -s -v tests/e2e/online_serving/test_hunyuan_video_15_expansion.py -m 'advanced_model and cuda and diffusion' --run-level 'advanced_model'
-            "
-        mirror_hardwares: h100_1
-
-      - label: "Diffusion · MiniMax-H3 L3 DLO DP2 and FastH3"
-        source_file_dependencies:
-          - tests/e2e/online_serving/minimax_h3/
-          - tests/helpers/assertions.py
-          - tests/helpers/mark.py
-          - tests/helpers/media.py
-          - tests/helpers/runtime.py
-          - vllm_omni/diffusion/models/minimax_h3/
-          - vllm_omni/diffusion/lora/
-          - vllm_omni/diffusion/offloader/
-          - vllm_omni/diffusion/distributed/
-          - vllm_omni/entrypoints/openai/
-        # Keep four server lifecycles in one Buildkite job, but never in one
-        # pytest process. DLO uses multiprocessing shared-memory queues; the
-        # parent's resource_tracker can retain a stale /psm_* entry during
-        # teardown and strand the next Ref2VA collective.
-        # A per-file process plus a hard timeout also makes a regression fail
-        # instead of leaving the merge queue stuck indefinitely.
-        timeout_in_minutes: 150
-        commands:
-          - |
-            set -eu
-            export VLLM_IMAGE_FETCH_TIMEOUT=60
-            if [ -f vllm_omni/diffusion/models/minimax_h3/lora.py ]; then
-              export VLLM_TEST_MINIMAX_H3_TURBO_LORA=$(python3 -c 'from huggingface_hub import hf_hub_download; print(hf_hub_download(repo_id="lightx2v/Minimax-h3-Turbo", filename="minimax_h3_fl2v_turbo_4step_v1.0_768p_bf16.safetensors"))')
-            fi
-            if [ -f vllm_omni/diffusion/models/minimax_h3/fasth3.py ]; then
-              export VLLM_TEST_MINIMAX_H3_FASTH3_LORA=$(python3 -c 'from huggingface_hub import hf_hub_download; print(hf_hub_download(repo_id="FastVideo/FastVideo-FastH3-4-step-Preview-v1-LoRA", filename="dense-datafree/adapter_model.safetensors"))')
-            fi
-            timeout 35m pytest -s -v tests/e2e/online_serving/minimax_h3/test_minimax_h3_dlo_dp2_fl2va.py -m 'advanced_model and cuda and diffusion' --run-level 'advanced_model'
-            timeout 35m pytest -s -v tests/e2e/online_serving/minimax_h3/test_minimax_h3_dlo_dp2_ref2va.py -m 'advanced_model and cuda and diffusion' --run-level 'advanced_model'
-            timeout 35m pytest -s -v tests/e2e/online_serving/minimax_h3/test_minimax_h3_turbo_lora.py -m 'advanced_model and cuda and diffusion' --run-level 'advanced_model'
-            timeout 35m pytest -s -v tests/e2e/online_serving/minimax_h3/test_minimax_h3_fasth3_lora.py -m 'advanced_model and cuda and diffusion' --run-level 'advanced_model'
-        mirror_hardwares: h100_2

.buildkite/cuda/test-nightly.yml

@@ -1,9 +1,6 @@
-# CUDA CI L4 (`full_model`): nightly and release share this file.
-# Uploaded by Upload Nightly Pipeline: NIGHTLY=1, or PR labels (nightly-test / omni-test / ...).
-# Hardware: omit mirror_hardwares to compose from -m SKU + cards_n; or set a preset string to force.
-
 env:
   VLLM_WORKER_MULTIPROC_METHOD: spawn
+  VLLM_USE_FLASHINFER_MOE_FP16: 0
   HF_HUB_DOWNLOAD_TIMEOUT: 300
   HF_HUB_ETAG_TIMEOUT: 60
 
@@ -15,33 +12,29 @@ steps:
     if: build.env("NIGHTLY") == "1" || build.pull_request.labels includes "nightly-test" || build.pull_request.labels includes "omni-test"
     steps:
 
-      - label: ":full_moon: Omni · Function Test with H100 · Single-GPU"
+      - label: ":full_moon: Omni · Function Test with H100"
         timeout_in_minutes: 120
         commands:
-          - pytest -sv tests/e2e --run-level "full_model" -m "full_model and H100 and B200 and omni and cards_1" --ignore=tests/e2e/accuracy --ignore=tests/e2e/online_serving/test_minicpmo_4_5_duplex_expansion.py
-
-      - label: ":full_moon: Omni · Function Test with H100 · 2-GPU"
-        timeout_in_minutes: 90
-        commands:
-          - pytest -sv tests/e2e --run-level "full_model" -m "full_model and H100 and B200 and omni and cards_2" --ignore=tests/e2e/accuracy --ignore=tests/e2e/online_serving/test_qwen3_omni_multi_replicas.py
+          - pytest -sv tests/e2e --run-level "full_model" -m "full_model and H100 and omni" --ignore=tests/e2e/accuracy --ignore=tests/e2e/online_serving/test_qwen3_omni_multi_replicas.py --ignore=tests/e2e/online_serving/test_minicpmo_4_5_duplex_expansion.py
+        mirror_hardwares: h100_2
 
       - label: ":full_moon: Omni · MiniCPM-o 4.5 Duplex Test"
         timeout_in_minutes: 50
         commands:
-          - pytest -s -v tests/e2e/online_serving/test_minicpmo_4_5_duplex_expansion.py -m "full_model and cuda and H100 and omni and cards_1" --run-level "full_model"
+          - pytest -s -v tests/e2e/online_serving/test_minicpmo_4_5_duplex_expansion.py -m "full_model and cuda and H100 and omni" --run-level "full_model"
         mirror_hardwares: h100_1
 
-      - label: ":full_moon: Omni · Doc Test with L4 · 4-GPU"
+      - label: ":full_moon: Omni · Doc Test with L4"
         timeout_in_minutes: 90
         commands:
           - export VLLM_ALLOW_LONG_MAX_MODEL_LEN="1"
-          - pytest -s -v tests/examples/ -m "full_model and omni and L4 and cards_4" --run-level "full_model"
+          - pytest -s -v tests/examples/ -m "full_model and omni and L4" --run-level "full_model"
         mirror_hardwares: l4_4
 
-      - label: ":full_moon: Omni · Doc Test with H100 · 2-GPU"
+      - label: ":full_moon: Omni · Doc Test with H100"
         timeout_in_minutes: 90
         commands:
-          - pytest -s -v tests/examples/ -m "full_model and omni and H100 and cards_2" --run-level "full_model"
+          - pytest -s -v tests/examples/ -m "full_model and omni and H100" --run-level "full_model"
         mirror_hardwares: h100_2
 
       - label: ":full_moon: Omni · Accuracy Test"
@@ -90,7 +83,7 @@ steps:
           - export BENCHMARK_DIR=tests/dfx/perf/results
           - |
             set +e
-            pytest -s -v tests/dfx/perf/scripts/run_benchmark.py --test-config-file tests/dfx/perf/tests/test_qwen3_omni_async_chunk.json -m "H100 and full_model"
+            pytest -s -v tests/dfx/perf/scripts/run_benchmark.py --test-config-file tests/dfx/perf/tests/test_qwen3_omni_async_chunk.json
             EXIT=$$?
             buildkite-agent artifact upload "tests/dfx/perf/results/*.json"
             exit $$EXIT
@@ -143,29 +136,15 @@ steps:
           - pytest -s -v tests/e2e/ -m "full_model and L4 and tts" --run-level "full_model" --ignore=tests/e2e/accuracy
         mirror_hardwares: l4_1
 
-      - label: ":full_moon: TTS · Perf Test · Single-GPU"
-        key: nightly-tts-performance-single
+      - label: ":full_moon: TTS · Perf Test"
+        key: nightly-tts-performance
         timeout_in_minutes: 180
         commands:
           - export BENCHMARK_DIR=tests/dfx/perf/results
           - export VLLM_ALLOW_LONG_MAX_MODEL_LEN="1"
           - |
             set +e
-            pytest -s -v tests/dfx/perf/scripts/run_benchmark.py --test-config-file tests/dfx/perf/tests/test_tts.json -m "H100 and cards_1"
-            EXIT=$$?
-            buildkite-agent artifact upload "tests/dfx/perf/results/*.json"
-            exit $$EXIT
-        mirror_hardwares: h100_1
-
-      - label: ":full_moon: TTS · Perf Test · 2-GPU"
-        key: nightly-tts-performance-2gpu
-        timeout_in_minutes: 180
-        commands:
-          - export BENCHMARK_DIR=tests/dfx/perf/results
-          - export VLLM_ALLOW_LONG_MAX_MODEL_LEN="1"
-          - |
-            set +e
-            pytest -s -v tests/dfx/perf/scripts/run_benchmark.py --test-config-file tests/dfx/perf/tests/test_tts.json -m "H100 and cards_2"
+            pytest -s -v tests/dfx/perf/scripts/run_benchmark.py --test-config-file tests/dfx/perf/tests/test_tts.json
             EXIT=$$?
             buildkite-agent artifact upload "tests/dfx/perf/results/*.json"
             exit $$EXIT
@@ -179,7 +158,7 @@ steps:
       build.pull_request.labels includes "nightly-test"
     steps:
 
-      - label: ":full_moon: Tiny Model Tests · Diffusion (Multi-GPU accelerations) · 2-GPU"
+      - label: ":full_moon: Tiny Model Tests · Diffusion (Multi-GPU accelerations)"
         timeout_in_minutes: 30
         # NOTE: Single-GPU (core_model) tiny model tests run on the ready label,
         # so nightly only adds the multi-GPU parallelism configurations.
@@ -189,14 +168,7 @@ steps:
         # for the CI, since these tests should pass irrespective of whether or not we use
         # the full weights or not.
         commands:
-          - pytest -sv tests/model_tests/diffusion -m 'full_model and cuda and cards_2' --run-level "core_model"
-        mirror_hardwares: l4_2
-
-      - label: ":full_moon: Tiny Model Tests · Diffusion (Multi-GPU accelerations) · 4-GPU"
-        timeout_in_minutes: 30
-        # CFG+TP extra_test_groups request 2×2=4 devices (see get_required_device_count).
-        commands:
-          - pytest -sv tests/model_tests/diffusion -m 'full_model and cuda and cards_4' --run-level "core_model"
+          - timeout 25m pytest -sv tests/model_tests/diffusion -m 'full_model and cuda' --run-level "core_model"
         mirror_hardwares: l4_4
 
   - group: ":card_index_dividers: Diffusion X2I(&A&T) Model Test"
@@ -207,6 +179,7 @@ steps:
       build.pull_request.labels includes "nightly-test" ||
       build.pull_request.labels includes "diffusion-x2iat-test"
     steps:
+      # Use explicit file shards so single-card cases do not reserve 2+ GPUs.
 
       - label: ":full_moon: Diffusion X2I(&A&T) · Function Test with H100 · Single-GPU"
         timeout_in_minutes: 120
@@ -214,35 +187,24 @@ steps:
           - >-
             pytest -sv
             tests/e2e/online_serving/test_qwen_image_expansion.py
-            -m "full_model and diffusion and H100 and cards_1"
+            -m "full_model and diffusion and H100 and not distributed_cuda"
             --run-level "full_model"
         mirror_hardwares: h100_1
 
-      - label: ":full_moon: Diffusion X2I(&A&T) · Function Test with H100 · 2-GPU"
+      - label: ":full_moon: Diffusion X2I(&A&T) · Function Test with H100 · Multi-GPU Qwen-Image"
         timeout_in_minutes: 120
         commands:
           - >-
             pytest -sv
             tests/e2e/online_serving/test_qwen_image_expansion.py
-            -m "full_model and diffusion and H100 and cards_2"
+            -m "full_model and diffusion and H100 and distributed_cuda"
             --run-level "full_model"
         mirror_hardwares: h100_2
 
-      - label: ":full_moon: Diffusion X2I(&A&T) · Boogu Edit CFG · 3-GPU"
+      - label: ":full_moon: Diffusion X2I(&A&T) · Function Test with L4"
         timeout_in_minutes: 120
         commands:
-          - >-
-            pytest -sv
-            tests/e2e/online_serving/test_boogu_image_edit_expansion.py
-            -k "test_double_guidance_cfg_parallel and cfg_parallel_3_full"
-            -m "slow and diffusion and cuda and H100 and cards_3"
-            --run-level "full_model"
-        mirror_hardwares: h100_3
-
-      - label: ":full_moon: Diffusion X2I(&A&T) · Function Test with L4 · 4-GPU"
-        timeout_in_minutes: 120
-        commands:
-          - pytest -sv tests/e2e/ -k "not test_wan and not hunyuan" -m "full_model and diffusion and L4 and cards_4" --run-level "full_model" --ignore=tests/e2e/accuracy
+          - pytest -sv tests/e2e/ -k "not test_wan and not hunyuan" -m "full_model and diffusion and L4" --run-level "full_model" --ignore=tests/e2e/accuracy
         mirror_hardwares: l4_4
 
       - label: ":full_moon: Diffusion X2I(&A&T) · Doc Test"
@@ -273,23 +235,8 @@ steps:
           - pytest -s -v tests/e2e/accuracy/test_hidream_o1_image.py -m full_model --run-level full_model
         mirror_hardwares: h100_2
 
-      - label: ":full_moon: Diffusion X2I(&A&T) · Perf Test · Qwen-Image · Single-GPU"
-        key: nightly-diffusion-x2iat-performance-qwen-image-single
-        timeout_in_minutes: 180
-        commands:
-          - export DIFFUSION_BENCHMARK_DIR=tests/dfx/perf/results
-          - export CACHE_DIT_VERSION=1.5.0
-          - |
-            set +e
-            pytest -s -v tests/dfx/perf/scripts/run_diffusion_benchmark.py --test-config-file tests/dfx/perf/tests/test_qwen_image_vllm_omni.json -m "H100 and cards_1"
-            EXIT=$$?
-            buildkite-agent artifact upload "tests/dfx/perf/results/diffusion_result_*.json"
-            buildkite-agent artifact upload "tests/dfx/perf/results/logs/*.log"
-            exit $$EXIT
-        mirror_hardwares: h100_1
-
-      - label: ":full_moon: Diffusion X2I(&A&T) · Perf Test · Qwen-Image · 4-GPU"
-        key: nightly-diffusion-x2iat-performance-qwen-image-4gpu
+      - label: ":full_moon: Diffusion X2I(&A&T) · Perf Test · Qwen-Image"
+        key: nightly-diffusion-x2iat-performance-qwen-image
         timeout_in_minutes: 180
         commands:
           - export DIFFUSION_BENCHMARK_DIR=tests/dfx/perf/results
@@ -297,7 +244,7 @@ steps:
           - export CACHE_DIT_VERSION=1.5.0
           - |
             set +e
-            pytest -s -v tests/dfx/perf/scripts/run_diffusion_benchmark.py --test-config-file tests/dfx/perf/tests/test_qwen_image_vllm_omni.json -m "H100 and cards_4"
+            pytest -s -v tests/dfx/perf/scripts/run_diffusion_benchmark.py --test-config-file tests/dfx/perf/tests/test_qwen_image_vllm_omni.json
             EXIT=$$?
             buildkite-agent artifact upload "tests/dfx/perf/results/diffusion_result_*.json"
             buildkite-agent artifact upload "tests/dfx/perf/results/logs/*.log"
@@ -313,42 +260,18 @@ steps:
       build.pull_request.labels includes "diffusion-x2v-test"
     steps:
 
-      - label: ":full_moon: Diffusion X2V · Wan2.2 T2V Function Test · Single-GPU"
+      - label: ":full_moon: Diffusion X2V · Wan2.2 T2V Function Test"
         timeout_in_minutes: 90
         commands:
-          - pytest -s -v tests/e2e/online_serving/test_wan22_expansion.py -k "t2v" -m "full_model and cuda and H100 and cards_1" --run-level "full_model"
-        mirror_hardwares: h100_1
-
-      - label: ":full_moon: Diffusion X2V · Wan2.2 T2V Function Test · 2-GPU"
-        timeout_in_minutes: 90
-        commands:
-          - pytest -s -v tests/e2e/online_serving/test_wan22_expansion.py -k "t2v" -m "full_model and cuda and H100 and cards_2" --run-level "full_model"
+          - pytest -s -v tests/e2e/online_serving/test_wan22_expansion.py -k "t2v" -m "full_model and cuda" --run-level "full_model"
         mirror_hardwares: h100_2
 
-      - label: ":full_moon: Diffusion X2V · Wan2.2 I2V/TI2V Function Test · Single-GPU"
+      - label: ":full_moon: Diffusion X2V · Wan2.2 I2V/TI2V Function Test"
         timeout_in_minutes: 90
         commands:
-          - pytest -s -v tests/e2e/online_serving/test_wan22_expansion.py -k "i2v" -m "full_model and cuda and H100 and cards_1" --run-level "full_model"
-        mirror_hardwares: h100_1
-
-      - label: ":full_moon: Diffusion X2V · Wan2.2 I2V/TI2V Function Test · 2-GPU"
-        timeout_in_minutes: 90
-        commands:
-          - pytest -s -v tests/e2e/online_serving/test_wan22_expansion.py -k "i2v" -m "full_model and cuda and H100 and cards_2" --run-level "full_model"
+          - pytest -s -v tests/e2e/online_serving/test_wan22_expansion.py -k "i2v" -m "full_model and cuda" --run-level "full_model"
         mirror_hardwares: h100_2
 
-      - label: ":full_moon: Diffusion X2V · HunyuanVideo-1.5 Function Test"
-        timeout_in_minutes: 90
-        commands:
-          - pytest -s -v tests/e2e/online_serving/test_hunyuan_video_15_expansion.py -m "full_model and cuda" --run-level "full_model"
-        mirror_hardwares: h100_2
-
-      - label: ":full_moon: Diffusion X2V · MAGI-2 Preview Serving Smoke"
-        timeout_in_minutes: 180
-        commands:
-          - pytest -s -v tests/e2e/online_serving/test_magi2.py -m "advanced_model and diffusion and cuda and H100 and cards_4" --run-level "advanced_model"
-        mirror_hardwares: h100_4
-
       - label: ":full_moon: Diffusion X2V · Doc Test"
         timeout_in_minutes: 60
         commands:
@@ -381,48 +304,17 @@ steps:
           - pytest -s -v tests/e2e/accuracy/hunyuanvideo15_i2v/test_hunyuanvideo15_i2v_video_similarity.py -m full_model --run-level full_model
         mirror_hardwares: h100_2
 
-      - label: ":full_moon: Diffusion X2V · Perf Test · Single-GPU"
-        key: nightly-diffusion-x2v-performance-single
-        timeout_in_minutes: 180
-        commands:
-          - export DIFFUSION_BENCHMARK_DIR=tests/dfx/perf/results
-          - |
-            set +e
-            pytest -s -v tests/dfx/perf/scripts/run_diffusion_benchmark.py --test-config-file tests/dfx/perf/tests/test_wan22_i2v_vllm_omni.json -m "H100 and cards_1"
-            EXIT=$$?
-            buildkite-agent artifact upload "tests/dfx/perf/results/diffusion_result_*.json"
-            buildkite-agent artifact upload "tests/dfx/perf/results/logs/*.log"
-            exit $$EXIT
-        mirror_hardwares: h100_1
-
-      - label: ":full_moon: Diffusion X2V · Perf Test · 2-GPU"
-        key: nightly-diffusion-x2v-performance-2gpu
+      - label: ":full_moon: Diffusion X2V · Perf Test"
+        key: nightly-diffusion-x2v-performance
         timeout_in_minutes: 180
         commands:
           - export DIFFUSION_BENCHMARK_DIR=tests/dfx/perf/results
           - export DIFFUSION_ATTENTION_BACKEND=FLASH_ATTN
           - |
             set +e
-            pytest -s -v tests/dfx/perf/scripts/run_diffusion_benchmark.py --test-config-file tests/dfx/perf/tests/test_wan22_i2v_vllm_omni.json -m "H100 and cards_2"
+            pytest -s -v tests/dfx/perf/scripts/run_diffusion_benchmark.py --test-config-file tests/dfx/perf/tests/test_wan22_i2v_vllm_omni.json
             EXIT1=$$?
-            pytest -s -v tests/dfx/perf/scripts/run_diffusion_benchmark.py --test-config-file tests/dfx/perf/tests/test_cosmos3_vllm_omni.json -m "H100 and cards_2"
-            EXIT2=$$?
-            buildkite-agent artifact upload "tests/dfx/perf/results/diffusion_result_*.json"
-            buildkite-agent artifact upload "tests/dfx/perf/results/logs/*.log"
-            if [ $$EXIT1 -ne 0 ]; then exit $$EXIT1; fi
-            exit $$EXIT2
-        mirror_hardwares: h100_2
-
-      - label: ":full_moon: Diffusion X2V · Perf Test · HunyuanVideo-1.5"
-        key: nightly-diffusion-x2v-performance-hunyuanvideo15
-        timeout_in_minutes: 180
-        commands:
-          - export DIFFUSION_BENCHMARK_DIR=tests/dfx/perf/results
-          - |
-            set +e
-            pytest -s -v tests/dfx/perf/scripts/run_diffusion_benchmark.py --test-config-file tests/dfx/perf/tests/test_hunyuanvideo15_t2v_vllm_omni.json
-            EXIT1=$$?
-            pytest -s -v tests/dfx/perf/scripts/run_diffusion_benchmark.py --test-config-file tests/dfx/perf/tests/test_hunyuanvideo15_i2v_vllm_omni.json
+            pytest -s -v tests/dfx/perf/scripts/run_diffusion_benchmark.py --test-config-file tests/dfx/perf/tests/test_cosmos3_vllm_omni.json
             EXIT2=$$?
             buildkite-agent artifact upload "tests/dfx/perf/results/diffusion_result_*.json"
             buildkite-agent artifact upload "tests/dfx/perf/results/logs/*.log"
@@ -435,6 +327,7 @@ steps:
         timeout_in_minutes: 180
         commands:
           - export DIFFUSION_BENCHMARK_DIR=tests/dfx/perf/results
+          - export DIFFUSION_ATTENTION_BACKEND=FLASH_ATTN
           - |
             set +e
             pytest -s -v tests/dfx/perf/scripts/run_diffusion_benchmark.py --test-config-file tests/dfx/perf/tests/test_minimax_h3_vllm_omni.json
@@ -449,34 +342,16 @@ steps:
     depends_on: upload-nightly-pipeline
     if: build.env("NIGHTLY") == "1" || build.pull_request.labels includes "nightly-test"
     steps:
-      - label: ":full_moon: Diffusion · Distributed Test with L4 · 2-GPU"
+      - label: ":full_moon: Diffusion · Distributed Test with L4"
         timeout_in_minutes: 60
         commands:
-          - pytest -sv tests/diffusion/distributed/ -m 'full_model and cuda and L4 and cards_2' --run-level "full_model"
-        mirror_hardwares: l4_2
-
-      - label: ":full_moon: Diffusion · Distributed Test with L4 · 3-GPU"
-        timeout_in_minutes: 60
-        commands:
-          - pytest -sv tests/diffusion/distributed/ -m 'full_model and cuda and L4 and cards_3' --run-level "full_model"
-        mirror_hardwares: l4_3
-
-      - label: ":full_moon: Diffusion · Distributed Test with L4 · 4-GPU"
-        timeout_in_minutes: 60
-        commands:
-          - pytest -sv tests/diffusion/distributed/ -m 'full_model and cuda and L4 and cards_4' --run-level "full_model"
+          - pytest -sv tests/diffusion/distributed/ -m 'full_model and cuda and L4' --run-level "full_model"
         mirror_hardwares: l4_4
 
-      - label: ":full_moon: Diffusion · Distributed Test with H100 · 2-GPU"
+      - label: ":full_moon: Diffusion · Distributed Test with H100"
         timeout_in_minutes: 60
         commands:
-          - pytest -sv tests/diffusion/distributed/ -m 'full_model and cuda and H100 and cards_2' --run-level "full_model"
-        mirror_hardwares: h100_2
-
-      - label: ":full_moon: Diffusion · Distributed Test with H100 · 4-GPU"
-        timeout_in_minutes: 60
-        commands:
-          - pytest -sv tests/diffusion/distributed/ -m 'full_model and cuda and H100 and cards_4' --run-level "full_model"
+          - pytest -sv tests/diffusion/distributed/ -m 'full_model and cuda and H100' --run-level "full_model"
         mirror_hardwares: h100_4
 
       - label: ":full_moon: Diffusion · Offloader Test"
@@ -500,7 +375,7 @@ steps:
       - label: ":full_moon: Diffusion · Quantization Test with L4"
         timeout_in_minutes: 60
         commands:
-          - pip install "vllm-gguf-plugin==0.0.4"
+          - pip install "vllm-gguf-plugin>=0.0.3"
           - pytest -sv tests/diffusion/quantization -m 'full_model and cuda and L4' --run-level "full_model"
         mirror_hardwares: l4_1
 
@@ -511,25 +386,19 @@ steps:
     depends_on:
       - nightly-omni-performance-no-async-chunk
       - nightly-omni-performance-async-chunk
-      - nightly-tts-performance-single
-      - nightly-tts-performance-2gpu
-      - nightly-diffusion-x2iat-performance-qwen-image-single
-      - nightly-diffusion-x2iat-performance-qwen-image-4gpu
-      - nightly-diffusion-x2v-performance-single
-      - nightly-diffusion-x2v-performance-2gpu
+      - nightly-tts-performance
+      - nightly-diffusion-x2iat-performance-qwen-image
+      - nightly-diffusion-x2v-performance
     if: build.env("NIGHTLY") == "1" && build.env("EMAIL_DISTRIBUTION") == "1"
     commands:
       - pip install openpyxl
       - export DEFAULT_INPUT_DIR=tests/dfx/perf/results
       - export DEFAULT_OUTPUT_DIR=tests/dfx/perf/results
-      - buildkite-agent artifact download "tests/dfx/perf/results/*.json" . --step nightly-tts-performance-single
-      - buildkite-agent artifact download "tests/dfx/perf/results/*.json" . --step nightly-tts-performance-2gpu
+      - buildkite-agent artifact download "tests/dfx/perf/results/*.json" . --step nightly-tts-performance
       - buildkite-agent artifact download "tests/dfx/perf/results/*.json" . --step nightly-omni-performance-no-async-chunk
       - buildkite-agent artifact download "tests/dfx/perf/results/*.json" . --step nightly-omni-performance-async-chunk
-      - buildkite-agent artifact download "tests/dfx/perf/results/*.json" . --step nightly-diffusion-x2iat-performance-qwen-image-single
-      - buildkite-agent artifact download "tests/dfx/perf/results/*.json" . --step nightly-diffusion-x2iat-performance-qwen-image-4gpu
-      - buildkite-agent artifact download "tests/dfx/perf/results/*.json" . --step nightly-diffusion-x2v-performance-single
-      - buildkite-agent artifact download "tests/dfx/perf/results/*.json" . --step nightly-diffusion-x2v-performance-2gpu
+      - buildkite-agent artifact download "tests/dfx/perf/results/*.json" . --step nightly-diffusion-x2iat-performance-qwen-image
+      - buildkite-agent artifact download "tests/dfx/perf/results/*.json" . --step nightly-diffusion-x2v-performance
       - python tools/nightly/generate_nightly_perf_excel.py
       - python tools/nightly/generate_nightly_perf_html.py
       - python tools/nightly/send_nightly_email.py --report-file "tests/dfx/perf/results/*.xlsx, tests/dfx/perf/results/*.html"

.buildkite/cuda/test-ready.yml

@@ -1,8 +1,6 @@
-# CUDA CI L2 (`core_model` e2e) plus L1 CPU Simple Test (`core_model and cpu`).
-# Uploaded by Upload Ready Pipeline: PR label `ready`, or main+WEEKLY=1 with --e2e.
-
 env:
   VLLM_WORKER_MULTIPROC_METHOD: spawn
+  VLLM_USE_FLASHINFER_MOE_FP16: 0
   HF_HUB_DOWNLOAD_TIMEOUT: 300
   HF_HUB_ETAG_TIMEOUT: 60
 
@@ -53,20 +51,17 @@ steps:
           - timeout 15m pytest -sv tests/diffusion/batching -m 'core_model and cuda' --run-level "core_model"
         mirror_hardwares: l4_1
 
-      - label: "Diffusion · Distributed Test · Single-GPU"
+      - label: "Diffusion · Distributed & Attention Test"
+        source_file_dependencies:
+          - tests/diffusion/distributed/
+          - tests/diffusion/attention/test_attention_sp.py
+          - vllm_omni/diffusion/distributed/
+          - vllm_omni/diffusion/attention/
+          - vllm_omni/diffusion/data.py
+          - vllm_omni/diffusion/models/
         commands:
-          - timeout 20m pytest -sv tests/diffusion/distributed -m 'core_model and cuda and L4 and cards_1' --run-level "core_model"
-        mirror_hardwares: l4_1
-
-      - label: "Diffusion · Distributed Test · 2-GPU"
-        commands:
-          - timeout 20m pytest -sv tests/diffusion/distributed -m 'core_model and cuda and L4 and cards_2' --run-level "core_model"
-        mirror_hardwares: l4_2
-
-      - label: "Diffusion · Distributed & Attention Test · 4-GPU"
-        commands:
-          - timeout 20m pytest -sv tests/diffusion/distributed -m 'core_model and cuda and L4 and cards_4' --run-level "core_model"
-          - timeout 20m pytest -sv tests/diffusion/attention/test_attention_sp.py -m 'core_model and cuda and L4 and cards_4' --run-level "core_model"
+          - timeout 20m pytest -sv tests/diffusion/distributed -m 'core_model and cuda' --run-level "core_model"
+          - timeout 20m pytest -sv tests/diffusion/attention/test_attention_sp.py -m 'core_model and cuda' --run-level "core_model"
         mirror_hardwares: l4_4
 
       - label: "Diffusion · Model Test"
@@ -76,7 +71,7 @@ steps:
 
       - label: "Diffusion · Other Test"
         commands:
-          - timeout 15m pytest -sv tests/diffusion/*.py tests/diffusion/ar_diffusion -m 'core_model and cuda' --run-level "core_model"
+          - timeout 15m pytest -sv tests/diffusion/*.py -m 'core_model and cuda' --run-level "core_model"
         mirror_hardwares: l4_1
 
   - group: ":card_index_dividers: Tiny Model Tests [Single GPU]"
@@ -93,7 +88,7 @@ steps:
     commands:
       - |
         timeout 15m bash -c "
-                  pytest -sv tests/engine/ tests/model_executor/ tests/worker/test_batched_omni_output.py -m 'core_model and cuda' --run-level 'core_model'
+                  pytest -sv tests/engine/ tests/model_executor/ -m 'core_model and cuda' --run-level 'core_model'
         "
     mirror_hardwares: l4_1
 
@@ -130,8 +125,32 @@ steps:
           - vllm_omni/outputs/
         commands:
           - timeout 20m pytest -s -v tests/e2e/features/custom_pipeline/ -m "core_model"
-        mirror_hardwares: l4_1
-
+        agents:
+          queue: "gpu_1_queue"
+        plugins:
+          - docker#v5.2.0:
+              image: public.ecr.aws/q9t5s3a7/vllm-ci-test-repo:$BUILDKITE_COMMIT
+              always-pull: true
+              propagate-environment: true
+              # vLLM 0.27 added a pre-flight capacity check in
+              # distributed/device_communicators/shm_broadcast.py. Without this
+              # the container gets Docker's 64 MiB default and every test in
+              # this step dies at engine start with
+              #   RuntimeError: Insufficient space in /dev/shm:
+              #                 240 MiB required, 64 MiB available
+              # (9 failed in 8.7s on build #2949). vLLM 0.26 had no such check
+              # and allocated regardless, so this step passed on main while
+              # being under-provisioned the whole time — 0.27 turned a silent
+              # risk into an explicit error.
+              #
+              # This is the only inline docker plugin block in .buildkite/cuda/;
+              # every other step inherits common/ci_mirror_hardwares.yml, which
+              # already sets 8gb. Matching that rather than inventing a value.
+              shm-size: "8gb"
+              environment:
+                - "HF_HOME=/fsx/hf_cache"
+              volumes:
+                - "/fsx/hf_cache:/fsx/hf_cache"
 
       - label: "RLHF · VeRL-Omni E2E Test"
         source_file_dependencies:
@@ -188,7 +207,6 @@ steps:
       - label: "Omni · MiniCPM-o 4.5 Online Test"
         source_file_dependencies:
           - tests/e2e/online_serving/test_minicpmo_4_5.py
-          - vllm_omni/transformers_utils/chat_templates/minicpmo45_native.jinja
           - vllm_omni/model_executor/models/minicpmo_4_5/
           - vllm_omni/model_executor/models/step_audio2/
           - vllm_omni/model_executor/models/cosyvoice3/code2wav_core/
@@ -211,25 +229,10 @@ steps:
           - tests/e2e/online_serving/test_minicpmo_realtime_duplex_drivers.py
           - tests/e2e/online_serving/helpers/minicpmo_realtime_duplex_scenarios.py
           - tests/e2e/online_serving/run_minicpmo_realtime_duplex_multi_session.py
-          - tests/e2e/online_serving/run_minicpmo_realtime_duplex_server_vad.py
           - tests/e2e/online_serving/run_minicpmo_realtime_duplex_soft_interrupt.py
           - vllm_omni/deploy/minicpmo_4_5.yaml
           - tests/e2e/online_serving/helpers/minicpmo_4_5_duplex.py
-          - vllm_omni/engine/duplex/
-          - vllm_omni/entrypoints/duplex/
-          # Public duplex client library + its unit suites: client-side
-          # changes must re-run the duplex e2e group, which includes the
-          # live client probe (test_duplex_client_live.py, single GPU).
-          - vllm_omni/clients/
-          - tests/clients/
-          - tests/e2e/online_serving/test_duplex_client_live.py
-          - vllm_omni/entrypoints/duplex_request_client.py
-          - vllm_omni/outputs/duplex.py
-          - vllm_omni/model_executor/duplex_sampling.py
-          - tests/engine/duplex/
-          - tests/entrypoints/duplex/
-          - tests/model_executor/models/minicpmo_4_5/duplex/
-          # Legacy Realtime probe client + video stacking used by the e2e drivers.
+          - vllm_omni/deploy/minicpmo_4_5_duplex.yaml
           - vllm_omni/experimental/fullduplex/
           - vllm_omni/model_executor/models/minicpmo_4_5/
           - vllm_omni/model_executor/models/step_audio2/
@@ -247,8 +250,8 @@ steps:
           - vllm_omni/config/stage_config.py
         commands:
           - |
-            timeout 35m bash -c "
-              pytest -s -v tests/e2e/online_serving/test_minicpmo_4_5_duplex.py tests/e2e/online_serving/test_duplex_client_live.py -m 'core_model and cuda' --run-level 'core_model'
+            timeout 20m bash -c "
+              pytest -s -v tests/e2e/online_serving/test_minicpmo_4_5_duplex.py -m 'core_model and cuda' --run-level 'core_model'
             "
         mirror_hardwares: h100_1
 
@@ -266,7 +269,6 @@ steps:
 
       - label: "TTS · Qwen3-TTS CustomVoice Test"
         source_file_dependencies:
-          - tests/helpers/media.py
           - tests/e2e/online_serving/test_qwen3_tts_customvoice.py
           - vllm_omni/model_executor/models/qwen3_tts/
           - vllm_omni/model_executor/models/common/qwen3_code_predictor.py
@@ -274,9 +276,6 @@ steps:
           - vllm_omni/model_executor/models/common/alias_free_activation.py
           - vllm_omni/model_executor/stage_input_processors/qwen3_tts.py
           - vllm_omni/deploy/qwen3_tts.yaml
-          - vllm_omni/entrypoints/openai/serving_speech.py
-          - vllm_omni/entrypoints/openai/tts_adapters/
-          - vllm_omni/engine/stage_pool.py
         commands:
           - |
             timeout 20m bash -c "
@@ -285,6 +284,25 @@ steps:
             "
         mirror_hardwares: l4_1
 
+      - label: "TTS · Qwen3-TTS Base Test"
+        source_file_dependencies:
+          - tests/e2e/online_serving/test_qwen3_tts_base.py
+          - vllm_omni/model_executor/models/qwen3_tts/
+          - vllm_omni/model_executor/models/common/qwen3_code_predictor.py
+          - vllm_omni/model_executor/models/common/snake_activation.py
+          - vllm_omni/model_executor/models/common/alias_free_activation.py
+          - vllm_omni/model_executor/stage_input_processors/qwen3_tts.py
+          - vllm_omni/deploy/qwen3_tts.yaml
+        commands:
+          - |
+            timeout 20m bash -c "
+              export VLLM_WORKER_MULTIPROC_METHOD=spawn
+              export VLLM_ALLOW_LONG_MAX_MODEL_LEN=1
+              export VLLM_OMNI_USE_V2_RUNNER=1
+              pytest -s -v tests/e2e/online_serving/test_qwen3_tts_base.py -m 'core_model' --run-level 'core_model'
+            "
+        mirror_hardwares: l4_1
+
       - label: "Diffusion · Wan22 Test"
         source_file_dependencies:
           - tests/e2e/online_serving/test_wan22_t2v.py
@@ -313,24 +331,6 @@ steps:
             "
         mirror_hardwares: h100_1
 
-      - label: "Diffusion · MiniMax-H3 DLO DP2 T2VA Test"
-        timeout_in_minutes: 90
-        source_file_dependencies:
-          - tests/e2e/online_serving/test_minimax_h3_dlo_dp2_t2va.py
-          - tests/helpers/assertions.py
-          - tests/helpers/runtime.py
-          - vllm_omni/diffusion/models/minimax_h3/
-          - vllm_omni/diffusion/offloader/
-          - vllm_omni/diffusion/distributed/
-          - vllm_omni/entrypoints/openai/
-        commands:
-          - |
-            timeout 80m bash -c "
-              export VLLM_IMAGE_FETCH_TIMEOUT=60
-              pytest -s -v tests/e2e/online_serving/test_minimax_h3_dlo_dp2_t2va.py -m 'core_model and cuda and diffusion' --run-level 'core_model'
-            "
-        mirror_hardwares: h100_2
-
       - label: "Diffusion · Qwen Image Test"
         source_file_dependencies:
           - tests/e2e/online_serving/test_qwen_image.py
@@ -344,15 +344,3 @@ steps:
               pytest -s -v tests/e2e/online_serving/test_qwen_image.py -m 'core_model' --run-level 'core_model'
             "
         mirror_hardwares: h100_1
-
-      - label: "Diffusion · HunyuanVideo-1.5 Test"
-        source_file_dependencies:
-          - tests/e2e/online_serving/test_hunyuan_video_15_expansion.py
-          - vllm_omni/diffusion/models/hunyuan_video/
-        commands:
-          - |
-            timeout 40m bash -c "
-              export VLLM_IMAGE_FETCH_TIMEOUT=60
-              pytest -s -v tests/e2e/online_serving/test_hunyuan_video_15_expansion.py -m 'core_model and diffusion' --run-level 'core_model'
-            "
-        mirror_hardwares: h100_1

.buildkite/cuda/test-weekly.yml

@@ -1,8 +1,6 @@
-# CUDA CI L5 (`slow` / reliability / extra coverage).
-# Uploaded by Upload Weekly Pipeline: WEEKLY=1 / NON_CRITICAL=1, or PR label `weekly-test`.
-
 env:
   VLLM_WORKER_MULTIPROC_METHOD: spawn
+  VLLM_USE_FLASHINFER_MOE_FP16: 0
   HF_HUB_DOWNLOAD_TIMEOUT: 300
   HF_HUB_ETAG_TIMEOUT: 60
 
@@ -46,16 +44,10 @@ steps:
           - pytest -s -v tests/dfx/reliability/test_reliability_hunyuan_image.py -m "slow"
         mirror_hardwares: h100_4
 
-      - label: "Reliability Test · Invalid parameters · H100 · Single-GPU"
-        timeout_in_minutes: 90
+      - label: "Reliability Test · Invalid parameters · H100"
+        timeout_in_minutes: 120
         commands:
-          - pytest -s -v tests/dfx/reliability/invalid_param_test/ -m "slow and H100 and cards_1"
-        mirror_hardwares: h100_1
-
-      - label: "Reliability Test · Invalid parameters · H100 · 2-GPU"
-        timeout_in_minutes: 90
-        commands:
-          - pytest -s -v tests/dfx/reliability/invalid_param_test/ -m "slow and H100 and cards_2"
+          - pytest -s -v tests/dfx/reliability/invalid_param_test/ -m "slow and H100"
         mirror_hardwares: h100_2
 
       - label: "Reliability Test · Invalid parameters · L4"
@@ -82,19 +74,6 @@ steps:
             exit $$EXIT
         mirror_hardwares: h100_2
 
-      - label: ":full_moon: Omni · Perf Test · Async Chunk · Random"
-        key: weekly-omni-performance-async-chunk-random
-        timeout_in_minutes: 180
-        commands:
-          - export BENCHMARK_DIR=tests/dfx/perf/results
-          - |
-            set +e
-            pytest -s -v tests/dfx/perf/scripts/run_benchmark.py --test-config-file tests/dfx/perf/tests/test_qwen3_omni_async_chunk.json -m "H100 and slow"
-            EXIT=$$?
-            buildkite-agent artifact upload "tests/dfx/perf/results/*.json"
-            exit $$EXIT
-        mirror_hardwares: h100_2
-
       - label: ":full_moon: Omni · Perf Test · Multi-Replica"
         key: weekly-omni-performance-multi-replicas
         timeout_in_minutes: 180
@@ -113,44 +92,27 @@ steps:
     if: build.env("NON_CRITICAL") == "1"
     steps:
 
-      # Online Qwen2.5 expansion is 2-card; offline expansion + AutoRound are 4-card.
-      - label: "Omni · L4 · 2-GPU"
+      - label: "Omni · L4"
         timeout_in_minutes: 90
         commands:
           - export VLLM_ALLOW_LONG_MAX_MODEL_LEN="1"
-          - pytest -s -v tests/e2e/online_serving/test_qwen2_5_omni_expansion.py -m "slow and L4 and omni and cards_2" --run-level "core_model"
-        mirror_hardwares: l4_2
-
-      - label: "Omni · L4 · 4-GPU"
-        timeout_in_minutes: 90
-        commands:
-          - export VLLM_ALLOW_LONG_MAX_MODEL_LEN="1"
-          - pytest -s -v tests/e2e/offline_inference/test_qwen2_5_omni_expansion.py -m "slow and L4 and omni and cards_4" --run-level "core_model"
+          - pytest -s -v tests/e2e/*/test_qwen2_5_omni_expansion.py --run-level "core_model"
           - >-
             pytest -s -v tests/e2e/
             --ignore=tests/e2e/online_serving/test_qwen2_5_omni_expansion.py
             --ignore=tests/e2e/offline_inference/test_qwen2_5_omni_expansion.py
-            -m "slow and L4 and omni and cards_4"
+            -m "slow and L4 and omni"
             --run-level "full_model"
         mirror_hardwares: l4_4
 
-      - label: "Omni · H100 · Single-GPU"
+      - label: "Omni · H100"
         timeout_in_minutes: 90
         commands:
           - >-
             pytest -sv
-            tests/e2e/ -m "slow and H100 and omni and cards_1"
+            tests/e2e/ -m "slow and H100 and omni"
             --run-level "full_model"
-        mirror_hardwares: h100_1
-
-      - label: "Omni · H100 · 4-GPU"
-        timeout_in_minutes: 90
-        commands:
-          - >-
-            pytest -sv
-            tests/e2e/ -m "slow and H100 and omni and cards_4"
-            --run-level "full_model"
-        mirror_hardwares: h100_4
+        mirror_hardwares: h100_2
 
       - label: "TTS · L4"
         timeout_in_minutes: 120
@@ -194,30 +156,12 @@ steps:
             --run-level "full_model"
         mirror_hardwares: l4_1
 
-      - label: "Diffusion · L4 · Single-GPU"
+      - label: "Diffusion · L4"
         timeout_in_minutes: 60
         commands:
           - >-
             pytest -sv
-            tests/e2e/ -m "slow and diffusion and L4 and cards_1"
-            --run-level "full_model"
-        mirror_hardwares: l4_1
-
-      - label: "Diffusion · L4 · 2-GPU"
-        timeout_in_minutes: 60
-        commands:
-          - >-
-            pytest -sv
-            tests/e2e/ -m "slow and diffusion and L4 and cards_2"
-            --run-level "full_model"
-        mirror_hardwares: l4_2
-
-      - label: "Diffusion · L4 · 4-GPU"
-        timeout_in_minutes: 60
-        commands:
-          - >-
-            pytest -sv
-            tests/e2e/ -m "slow and diffusion and L4 and cards_4"
+            tests/e2e/ -m "slow and diffusion and L4"
             --run-level "full_model"
         mirror_hardwares: l4_4
 
@@ -226,24 +170,15 @@ steps:
         commands:
           - >-
             pytest -sv
-            tests/e2e/ -m "slow and diffusion and H100 and cards_1"
+            tests/e2e/ -m "slow and diffusion and H100 and not distributed_cuda"
             --run-level "full_model"
         mirror_hardwares: h100_1
 
-      - label: "Diffusion · H100 · 2-GPU"
+      - label: "Diffusion · H100 · Multi-GPU"
         timeout_in_minutes: 90
         commands:
           - >-
             pytest -sv
-            tests/e2e/ -m "slow and diffusion and H100 and cards_2"
-            --run-level "full_model"
-        mirror_hardwares: h100_2
-
-      - label: "Diffusion · H100 · 4-GPU"
-        timeout_in_minutes: 90
-        commands:
-          - >-
-            pytest -sv
-            tests/e2e/ -m "slow and diffusion and H100 and cards_4"
+            tests/e2e/ -m "slow and diffusion and H100 and distributed_cuda"
             --run-level "full_model"
         mirror_hardwares: h100_4

.buildkite/intel/pipeline-intel.yml

@@ -10,7 +10,7 @@ steps:
           DOCKER_BUILDKIT: "1"
           # Buildkite will automatically replace this with the actual commit hash
           VLLM_IMAGE_TAG: "${BUILDKITE_COMMIT}"
-          VLLM_VERSION: "v0.28.0"
+          VLLM_VERSION: "v0.27.0"
         priority: 100
         timeout_in_minutes: 60
         soft_fail: false

.buildkite/intel/scripts/run-xpu-test.sh

@@ -5,12 +5,7 @@ set -ex
 
 omni_source_dir=$(git rev-parse --show-toplevel)
 
-: "${VLLM_VERSION:?VLLM_VERSION must be set}"
-# Official upstream XPU image. It is published from vllm's own
-# docker/Dockerfile.xpu, which is exactly what build_vllm_base() clones and
-# builds below, so pulling it is equivalent to building the fallback base.
-upstream_base_image="vllm/vllm-openai-xpu:${VLLM_VERSION}"
-local_base_image="xpu/vllm-omni-ci-base:${VLLM_VERSION}"
+base_image_name="xpu/vllm-omni-ci-base:${VLLM_VERSION:?VLLM_VERSION must be set}"
 image_name="xpu/vllm-omni-ci:${BUILDKITE_COMMIT:?BUILDKITE_COMMIT must be set}"
 container_name="xpu_${BUILDKITE_COMMIT}_$(
     tr -dc A-Za-z0-9 </dev/urandom | head -c 10
@@ -54,36 +49,9 @@ build_vllm_base() (
         "${vllm_source_dir}"
 )
 
-# Resolve the vLLM base image, in priority order:
-#   1. the published upstream image for VLLM_VERSION, pulled fresh (so moving
-#      tags like nightly are refreshed rather than served stale from disk);
-#   2. a local copy of that same image, when the registry is unreachable;
-#   3. VLLM_BASE, if that image is already on disk;
-#   4. otherwise build VLLM_BASE from the matching vLLM source tag (~30min).
-# VLLM_BASE names the fallback base and defaults to ${local_base_image}; set it
-# to reuse or produce a base under a different tag.
-resolve_vllm_base() {
-    if docker pull "${upstream_base_image}"; then
-        base_image_name="${upstream_base_image}"
-        return
-    fi
-
-    # Registry unreachable, but a previous run may have left the image behind.
-    if [ -n "$(docker images -q "${upstream_base_image}")" ]; then
-        echo "WARNING: could not pull ${upstream_base_image}; using local copy" >&2
-        base_image_name="${upstream_base_image}"
-        return
-    fi
-
-    echo "WARNING: ${upstream_base_image} unavailable remotely and locally" >&2
-    base_image_name="${VLLM_BASE:-${local_base_image}}"
-    if [ -z "$(docker images -q "${base_image_name}")" ]; then
-        echo "WARNING: building ${base_image_name} from vLLM ${VLLM_VERSION} source" >&2
-        build_vllm_base
-    fi
-}
-
-resolve_vllm_base
+if [ -z "$(docker images -q "${base_image_name}")" ]; then
+    build_vllm_base
+fi
 
 # Try building the docker image
 docker_build "${image_name}" --build-arg "VLLM_BASE=${base_image_name}" --build-arg "VLLM_VERSION=${VLLM_VERSION}"

.buildkite/npu/bootstrap-upload-steps.yml

@@ -3,10 +3,10 @@
 steps:
   - label: ":buildkit: Build and Push NPU Test Image - A2"
     key: image-build-a2
-    agents: &npu-image-build-agents
+    agents:
       queue: "ascend-a2b3"
       resource_class: "npu-1"
-    plugins: &npu-image-build-plugins
+    plugins:
       - kubernetes:
           metadata:
             annotations:
@@ -46,47 +46,123 @@ steps:
       IMAGE_NAME: "vllm-omni-ci-npu"
       IMAGE_REGISTRY: "swr.cn-southwest-2.myhuaweicloud.com/modelfoundry"
       BUILDKITD_ADDR: "tcp://buildkitd-service.buildkitd:1234"
-    command: bash .buildkite/npu/scripts/build-npu-image.sh Dockerfile.npu.ci "$${VLLM_IMAGE_TAG}"
+    command: |
+      set -ex
+
+      echo "--- Building and pushing NPU Test Image"
+      echo "Image: $${IMAGE_REGISTRY}/$${IMAGE_NAME}:$${VLLM_IMAGE_TAG}"
+      echo "buildkitd address: $${BUILDKITD_ADDR}"
+
+      if ! command -v buildctl &> /dev/null; then
+        echo "Installing buildctl..."
+        mkdir -p /tmp/buildkit
+        BUILDKIT_VERSION="v0.29.0"
+        wget -q "https://github.com/moby/buildkit/releases/download/$${BUILDKIT_VERSION}/buildkit-$${BUILDKIT_VERSION}.linux-arm64.tar.gz" -O /tmp/buildkit.tar.gz
+        tar -xzf /tmp/buildkit.tar.gz -C /tmp/buildkit
+        cp /tmp/buildkit/bin/buildctl /usr/local/bin/
+      fi
+
+      export DOCKER_CONFIG=/home/user/.docker
+      buildctl \
+        --addr="$${BUILDKITD_ADDR}" \
+        --tlscacert=/home/user/.docker/ca.pem \
+        --tlscert=/home/user/.docker/cert.pem \
+        --tlskey=/home/user/.docker/key.pem \
+        build \
+        --frontend dockerfile.v0 \
+        --local context=. \
+        --local dockerfile=./docker \
+        --opt filename=Dockerfile.npu.ci \
+        --secret id=dockerconfig,src=/home/user/.docker/config.json \
+        --output type=image,name=$${IMAGE_REGISTRY}/$${IMAGE_NAME}:$${VLLM_IMAGE_TAG},push=true \
+        --progress=plain
+
+      echo "--- Image pushed successfully"
+      echo "$${IMAGE_REGISTRY}/$${IMAGE_NAME}:$${VLLM_IMAGE_TAG}"
 
   - label: ":buildkit: Build and Push NPU Test Image - A3"
     key: image-build-a3
-    agents: *npu-image-build-agents
-    plugins: *npu-image-build-plugins
+    agents:
+      queue: "ascend-a2b3"
+      resource_class: "npu-1"
+    plugins:
+      - kubernetes:
+          metadata:
+            annotations:
+              vault.hashicorp.com/agent-init-first: "true"
+              vault.hashicorp.com/agent-inject: "true"
+              vault.hashicorp.com/agent-inject-perms-ca.pem: "0400"
+              vault.hashicorp.com/agent-inject-perms-cert.pem: "0400"
+              vault.hashicorp.com/agent-inject-perms-config.json: "0400"
+              vault.hashicorp.com/agent-inject-perms-key.pem: "0400"
+              vault.hashicorp.com/agent-inject-secret-ca.pem: internal/data/ascend/buildkitd
+              vault.hashicorp.com/agent-inject-secret-cert.pem: internal/data/ascend/buildkitd
+              vault.hashicorp.com/agent-inject-secret-config.json: internal/data/ascend/buildkitd
+              vault.hashicorp.com/agent-inject-secret-key.pem: internal/data/ascend/buildkitd
+              vault.hashicorp.com/agent-inject-template-ca.pem: "{{- with secret \"internal/data/ascend/buildkitd\" -}}\n{{ .Data.data.RootCA }}\n{{- end }}"
+              vault.hashicorp.com/agent-inject-template-cert.pem: "{{- with secret \"internal/data/ascend/buildkitd\" -}}\n{{ .Data.data.ClientCaCert }}\n{{- end }}"
+              vault.hashicorp.com/agent-inject-template-config.json: "{{- with secret \"internal/data/ascend/buildkitd\" -}}\n{{ .Data.data.dockerConfig }}\n{{- end }}"
+              vault.hashicorp.com/agent-inject-template-key.pem: "{{- with secret \"internal/data/ascend/buildkitd\" -}}\n{{ .Data.data.ClientCaKey }}\n{{- end }}"
+              vault.hashicorp.com/agent-pre-populate-only: "true"
+              vault.hashicorp.com/agent-run-as-group: "1000"
+              vault.hashicorp.com/agent-run-as-user: "1000"
+              vault.hashicorp.com/agent-service-account-token-volume-name: token-vol
+              vault.hashicorp.com/role: ascend-gha-runners
+              vault.hashicorp.com/secret-volume-path: /home/user/.docker/
+              vault.hashicorp.com/tls-skip-verify: "true"
+          podSpecPatch:
+            volumes:
+            - name: token-vol
+              projected:
+                defaultMode: 420
+                sources:
+                - serviceAccountToken:
+                    audience: api
+                    expirationSeconds: 600
+                    path: token
     env:
       VLLM_IMAGE_TAG: "${BUILDKITE_COMMIT}-a3"
       IMAGE_NAME: "vllm-omni-ci-npu"
       IMAGE_REGISTRY: "swr.cn-southwest-2.myhuaweicloud.com/modelfoundry"
       BUILDKITD_ADDR: "tcp://buildkitd-service.buildkitd:1234"
-    command: bash .buildkite/npu/scripts/build-npu-image.sh Dockerfile.npu.ci "$${VLLM_IMAGE_TAG}" -a3
+    command: |
+      set -ex
 
-  - label: ":buildkit: Build and Push NPU Test Image - A5"
-    key: image-build-a5
-    agents: *npu-image-build-agents
-    plugins: *npu-image-build-plugins
-    env:
-      VLLM_IMAGE_TAG: "${BUILDKITE_COMMIT}-a5"
-      IMAGE_NAME: "vllm-omni-ci-npu"
-      IMAGE_REGISTRY: "swr.cn-southwest-2.myhuaweicloud.com/modelfoundry"
-      BUILDKITD_ADDR: "tcp://buildkitd-service.buildkitd:1234"
-    command: bash .buildkite/npu/scripts/build-npu-image.sh Dockerfile.npu.ci "$${VLLM_IMAGE_TAG}" -a5
+      echo "--- Building and pushing NPU Test Image"
+      echo "Image: $${IMAGE_REGISTRY}/$${IMAGE_NAME}:$${VLLM_IMAGE_TAG}"
+      echo "buildkitd address: $${BUILDKITD_ADDR}"
 
-  - label: ":buildkit: Build and Push NPU Test Image - 310P"
-    key: image-build-310p
-    agents: *npu-image-build-agents
-    plugins: *npu-image-build-plugins
-    env:
-      VLLM_IMAGE_TAG: "${BUILDKITE_COMMIT}-310p"
-      IMAGE_NAME: "vllm-omni-ci-npu"
-      IMAGE_REGISTRY: "swr.cn-southwest-2.myhuaweicloud.com/modelfoundry"
-      BUILDKITD_ADDR: "tcp://buildkitd-service.buildkitd:1234"
-    command: bash .buildkite/npu/scripts/build-npu-image.sh Dockerfile.npu.ci "$${VLLM_IMAGE_TAG}" -310p
+      if ! command -v buildctl &> /dev/null; then
+        echo "Installing buildctl..."
+        mkdir -p /tmp/buildkit
+        BUILDKIT_VERSION="v0.29.0"
+        wget -q "https://github.com/moby/buildkit/releases/download/$${BUILDKIT_VERSION}/buildkit-$${BUILDKIT_VERSION}.linux-arm64.tar.gz" -O /tmp/buildkit.tar.gz
+        tar -xzf /tmp/buildkit.tar.gz -C /tmp/buildkit
+        cp /tmp/buildkit/bin/buildctl /usr/local/bin/
+      fi
+
+      export DOCKER_CONFIG=/home/user/.docker
+      buildctl \
+        --addr="$${BUILDKITD_ADDR}" \
+        --tlscacert=/home/user/.docker/ca.pem \
+        --tlscert=/home/user/.docker/cert.pem \
+        --tlskey=/home/user/.docker/key.pem \
+        build \
+        --frontend dockerfile.v0 \
+        --local context=. \
+        --local dockerfile=./docker \
+        --opt filename=Dockerfile.npu.ci.a3 \
+        --secret id=dockerconfig,src=/home/user/.docker/config.json \
+        --output type=image,name=$${IMAGE_REGISTRY}/$${IMAGE_NAME}:$${VLLM_IMAGE_TAG},push=true \
+        --progress=plain
+
+      echo "--- Image pushed successfully"
+      echo "$${IMAGE_REGISTRY}/$${IMAGE_NAME}:$${VLLM_IMAGE_TAG}"
 
   - label: "Upload Ready Pipeline"
     depends_on:
       - image-build-a2
       - image-build-a3
-      - image-build-a5
-      - image-build-310p
     key: upload-ready-pipeline
     agents:
       queue: "cpu_queue_premerge"
@@ -98,8 +174,6 @@ steps:
     depends_on:
       - image-build-a2
       - image-build-a3
-      - image-build-a5
-      - image-build-310p
     key: upload-nightly-pipeline
     commands:
       - python3 .buildkite/common/scripts/upload_pipeline.py --upload .buildkite/npu/test-npu-nightly.yml

.buildkite/npu/scripts/build-npu-image.sh

@@ -1,48 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-
-dockerfile=${1:?Dockerfile is required}
-image_tag=${2:?Image tag is required}
-device_suffix=${3:-}
-
-image_name=${IMAGE_NAME:-vllm-omni-ci-npu}
-image_registry=${IMAGE_REGISTRY:-swr.cn-southwest-2.myhuaweicloud.com/modelfoundry}
-buildkitd_addr=${BUILDKITD_ADDR:-tcp://buildkitd-service.buildkitd:1234}
-
-echo "--- Building and pushing NPU Test Image"
-echo "Image: ${image_registry}/${image_name}:${image_tag}"
-echo "Dockerfile: ${dockerfile}"
-
-if ! command -v buildctl &> /dev/null; then
-  mkdir -p /tmp/buildkit
-  buildkit_version=v0.29.0
-  wget -q \
-    "https://github.com/moby/buildkit/releases/download/${buildkit_version}/buildkit-${buildkit_version}.linux-arm64.tar.gz" \
-    -O /tmp/buildkit.tar.gz
-  tar -xzf /tmp/buildkit.tar.gz -C /tmp/buildkit
-  cp /tmp/buildkit/bin/buildctl /usr/local/bin/
-fi
-
-build_args=()
-if [[ -n "${device_suffix}" ]]; then
-  build_args+=(--opt "build-arg:VLLM_ASCEND_DEVICE_SUFFIX=${device_suffix}")
-fi
-
-export DOCKER_CONFIG=/home/user/.docker
-buildctl \
-  --addr="${buildkitd_addr}" \
-  --tlscacert=/home/user/.docker/ca.pem \
-  --tlscert=/home/user/.docker/cert.pem \
-  --tlskey=/home/user/.docker/key.pem \
-  build \
-  --frontend dockerfile.v0 \
-  --local context=. \
-  --local dockerfile=./docker \
-  --opt "filename=${dockerfile}" \
-  "${build_args[@]}" \
-  --secret id=dockerconfig,src=/home/user/.docker/config.json \
-  --output "type=image,name=${image_registry}/${image_name}:${image_tag},push=true" \
-  --progress=plain
-
-echo "--- Image pushed successfully"
-echo "${image_registry}/${image_name}:${image_tag}"

.buildkite/npu/test-npu-ready.yml

@@ -1,59 +1,14 @@
 steps:
-  - group: ":card_index_dividers: Simple Test"
+  - label: "Platforms Test"
+    key: ready-platforms-test
     depends_on: upload-ready-pipeline
-    steps:
-      - label: "Platforms Test"
-        key: ready-platforms-test
-        mirror_hardwares: a3_npu_2
-        commands:
-          - >-
-            pytest -s -v
-            tests/platforms/npu/test_minicpmo_code2wav_npugraph.py
-            -m 'core_model and npu and A3 and omni'
-            --run-level 'core_model'
-
-      - label: "Diffusion NPU layer tests - A2"
-        key: ready-diffusion-npu-layer-tests-a2
-        mirror_hardwares: a2b3_npu_1
-        commands:
-          - >-
-            pytest -s -v
-            tests/diffusion/layers/test_activation.py
-            -m 'core_model and npu and A2'
-            --run-level 'core_model'
-
-      - label: "Diffusion NPU layer tests - A3"
-        key: ready-diffusion-npu-layer-tests
-        mirror_hardwares: a3_npu_2
-        commands:
-          - >-
-            pytest -s -v
-            tests/diffusion/layers/test_activation.py
-            tests/diffusion/layers/test_fused_qk_norm_rope_npu.py
-            tests/diffusion/models/minimax_h3/test_minimax_h3_qwen3vl_swiglu.py
-            tests/diffusion/models/minimax_h3/test_minimax_h3_modulation.py
-            -m 'core_model and npu and A3'
-            --run-level 'core_model'
-
-      - label: "Diffusion NPU layer tests - A5"
-        key: ready-diffusion-npu-layer-tests-a5
-        mirror_hardwares: a5_npu_2
-        commands:
-          - >-
-            pytest -s -v
-            tests/diffusion/layers/test_activation.py
-            -m 'core_model and npu and A5'
-            --run-level 'core_model'
-
-      - label: "Diffusion NPU layer tests - 310P"
-        key: ready-diffusion-npu-layer-tests-310p
-        mirror_hardwares: 310p_npu_1
-        commands:
-          - >-
-            pytest -s -v
-            tests/diffusion/layers/test_activation.py
-            -m 'core_model and npu and 310P'
-            --run-level 'core_model'
+    mirror_hardwares: a3_npu_2
+    commands:
+      - >-
+        pytest -s -v
+        tests/platforms/npu/test_minicpmo_code2wav_npugraph.py
+        -m 'core_model and npu and A3 and omni'
+        --run-level 'core_model'
 
   - group: ":card_index_dividers: Omni Model Test"
     key: ready-omni-group

.claude/skills/add-diffusion-model/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: add-diffusion-model
-description: Add a new diffusion model (text-to-image, text-to-video, image-to-video, text-to-audio, image editing) to vLLM-Omni, including native non-Diffusers ports, reference-parity validation, Cache-DiT, offload, and parallelism support (TP, SP/USP, CFG-Parallel, HSDP). Use when integrating or reviewing a new diffusion model, porting a Diffusers pipeline or custom model repository, creating a DiT adapter, reusing shared examples, or qualifying multi-GPU and memory optimizations.
+description: Add a new diffusion model (text-to-image, text-to-video, image-to-video, text-to-audio, image editing) to vLLM-Omni, including Cache-DiT acceleration and parallelism support (TP, SP/USP, CFG-Parallel, HSDP). Use when integrating a new diffusion model, porting a diffusers pipeline or a custom model repo to vllm-omni, creating a new DiT transformer adapter, adding diffusion model support, or enabling multi-GPU parallelism and cache acceleration for an existing model.
 ---
 
 # Adding a Diffusion Model to vLLM-Omni
@@ -26,16 +26,9 @@ Check the model's HF repo for `model_index.json`. This determines your path:
 |----------|----------------|----------------|
 | **Already supported** | `_class_name` in `model_index.json` matches a key in `_DIFFUSION_MODELS` in `registry.py` | Skip implementation, then validate model-specific examples, tests, and docs as needed |
 | **Diffusers-based** | Has standard `model_index.json` with `_diffusers_version`, subfolders for `transformer/`, `vae/`, etc. | Follow **Path A** below |
-| **Native non-Diffusers model** | No Diffusers index, non-standard checkpoint hierarchy, or custom architecture in a separate repo | Follow **Path B** below; port the runtime natively unless an external adapter was explicitly requested |
+| **Custom/private repo** | No diffusers `model_index.json`, weights in non-standard format, custom model code in a separate git repo | Follow **Path B** below |
 | **Hybrid** | Has some diffusers components (VAE) but custom transformer/fusion | Mix of Path A and Path B |
 
-Before coding, write a short integration contract covering runtime ownership,
-checkpoint discovery, reference revision, I/O geometry, attention semantics,
-CFG behavior, auxiliary components, target hardware, and the default deployment.
-For Path B, hybrid models, or any optimization work, read
-[references/native-model-integration-checklist.md](references/native-model-integration-checklist.md)
-and use its phase gates.
-
 ## Path A: Diffusers-Based Model
 
 For models with a standard diffusers layout. See [references/transformer-adaptation.md](references/transformer-adaptation.md) for detailed code patterns.
@@ -110,15 +103,9 @@ For custom loop structures, follow `vllm_omni/diffusion/models/progress_bar.py`
 
 ---
 
-## Path B: Native / Non-Diffusers Model
+## Path B: Custom/Private Repo Model
 
-For models without a Diffusers pipeline—weights in custom formats and model
-code in another public or private repository. Treat that repository as a pinned
-correctness oracle. A request for native support means the vLLM-Omni runtime
-must not import the reference implementation; an external adapter is appropriate
-only when the requested scope explicitly permits that dependency. See
-[references/custom-model-patterns.md](references/custom-model-patterns.md) for
-concrete integration patterns.
+For models without a diffusers pipeline — weights in custom format, model code in a private repo. Real examples: DreamID-Omni, BAGEL, HunyuanImage3. See [references/custom-model-patterns.md](references/custom-model-patterns.md) for concrete custom-model integration patterns.
 
 ### B1. Understand the reference repo
 
@@ -139,25 +126,16 @@ This is the key design decision for custom models. Follow these placement rules:
 | **Pipeline orchestration** (init, forward, denoise loop) | `vllm_omni/diffusion/models/<name>/pipeline_<name>.py` | Always required |
 | **Custom transformer/backbone** (ported and adapted to vllm-omni) | `vllm_omni/diffusion/models/<name>/<name>_transformer.py` or similar | `wan2_2.py`, `fusion.py`, `bagel_transformer.py` |
 | **Custom sub-models** (VAE, fusion, autoencoder) | `vllm_omni/diffusion/models/<name>/` as separate files | `autoencoder.py`, `fusion.py` |
-| **Reference-only code** | Keep outside the runtime; use a pinned revision for golden outputs and architecture analysis | Reference inference script |
-| **Explicit external adapter dependency** | External package, only when the requested scope and maintainer direction allow it | Compatibility adapter, not native support |
+| **External dependency code** (original repo utilities) | **External repo**, installed via download script or pip | `dreamid_omni` package via git clone |
 | **Hardcoded model configs** | Module-level dicts in pipeline file | `VIDEO_CONFIG`, `AUDIO_CONFIG` dicts |
-| **Download/setup script** | `examples/offline_inference/<name>/download_<name>.py` | `download_<name>.py` |
+| **Download/setup script** | `examples/offline_inference/<name>/download_<name>.py` | `download_dreamid_omni.py` |
 | **Custom `model_index.json`** | Generated by download script, placed at model root | Minimal: `{"_class_name": "YourPipeline", ...}` |
 
 ### B3. Handle external dependencies
 
-If the model's code lives in a separate git repo, first decide whether the
-requested deliverable is native support or an external adapter. Do not silently
-choose the adapter path.
+If the model's code lives in a separate git repo:
 
-**Option 1: Port the code directly** (default for native support)
-
-Copy the essential model files into `vllm_omni/diffusion/models/<name>/` and
-adapt them to shared vLLM-Omni contracts. Keep checkpoint loading strict and
-use the pinned reference only to generate parity evidence.
-
-**Option 2: Import with graceful fallback** (adapter scope only)
+**Option 1: Import with graceful fallback** (recommended for models with external utils)
 
 ```python
 try:
@@ -169,15 +147,17 @@ except ImportError:
     )
 ```
 
-Use an external runtime dependency only when the user explicitly requested an
-adapter or a maintainer approved the exception. Document the dependency,
-pinned revision, installation path, and unsupported native features.
+**Option 2: Port the code directly** (preferred when feasible)
+
+Copy the essential model files into `vllm_omni/diffusion/models/<name>/` and adapt them. This avoids external dependencies. BAGEL does this — `autoencoder.py` and `bagel_transformer.py` are ported directly.
+
+**Decision criteria**: Port if the code is self-contained and won't diverge. Use external deps if the model repo is actively maintained and the code is complex.
 
 ### B4. Handle custom weight loading
 
 Custom models have two common patterns for weight loading:
 
-**Pattern 1: Bypass standard loader** (eager custom init)
+**Pattern 1: Bypass standard loader** (DreamID-Omni style)
 
 When the original model has complex custom init functions that load weights in `__init__`:
 
@@ -241,8 +221,7 @@ class CustomPipeline(nn.Module):
 
 ### B5. Create the `model_index.json`
 
-Prefer a `model_index.json` at the model root when vLLM-Omni owns an assembled
-checkpoint directory. For custom models, this is minimal:
+Custom models need a `model_index.json` at the model root for vllm-omni to discover them. For custom models, this is minimal:
 
 ```json
 {
@@ -251,14 +230,7 @@ checkpoint directory. For custom models, this is minimal:
 }
 ```
 
-The `_class_name` must match a key in `_DIFFUSION_MODELS` in `registry.py`.
-Additional keys are model-specific (accessed via `od_config.model_config`).
-
-If the released repository is immutable and has neither a root `config.json`
-nor a Diffusers index, add it to a generic native-checkpoint signature resolver:
-match the exact Hub ID or a distinctive set of local files and return the
-pipeline class. Do not use model-name substrings or add parallel one-off
-predicates in CLI, config, and serving consumers.
+The `_class_name` must match a key in `_DIFFUSION_MODELS` in `registry.py`. Additional keys are model-specific (accessed via `od_config.model_config`).
 
 If the model's weights come from multiple HF repos, write a **download script** that:
 1. Downloads from each repo
@@ -320,9 +292,7 @@ Use the appropriate existing example script:
 | Image-to-Image | `examples/offline_inference/image_to_image/image_edit.py` |
 | Text-to-Audio | `examples/offline_inference/text_to_audio/text_to_audio.py` |
 
-Reuse these shared scripts even for custom models when their request and output
-contracts fit. Create a dedicated model script only when the shared category
-cannot represent the protocol, and document that gap in the PR.
+For custom/Omni models that don't fit these categories, create a dedicated example script.
 
 **Validation**: No errors, output is meaningful, quality matches reference implementation.
 
@@ -330,17 +300,13 @@ See [references/troubleshooting.md](references/troubleshooting.md) for common er
 
 ### Step 6: Add Example Scripts
 
-Only when the shared category scripts cannot represent the model, create:
+For Omni or custom models, create:
 - `examples/offline_inference/your_model_name/` — offline script + README
 - `examples/online_serving/your_model_name/` — server script + client
 - Download script if weights require assembly from multiple sources
 
 ### Step 7: Update Documentation
 
-Follow the [`add-recipe` skill](../add-recipe/SKILL.md) to add or update the
-model-family recipe and its `recipes/README.md` row with verified specifications,
-hardware, commands, feature links, and qualification evidence.
-
 Required updates:
 1. `docs/user_guide/diffusion/parallelism/overview.md` — parallelism support overview/table
 2. `docs/user_guide/diffusion/cpu_offload.md` — if CPU offload supported (add to supported models table)
@@ -372,7 +338,7 @@ Classify the model's **CI priority** first:
 
 **L2 & L3 online — same file, dual marks on the baseline smoke:** The **first / simplest** case in `test_{slug}.py` (default deploy, minimal steps, single prompt) should carry **both** `@pytest.mark.core_model` and `@pytest.mark.advanced_model` on the **same** function so L2 (`test-ready.yml`) and L3 (`test-merge.yml`) share one smoke test. Heavier deploy variants or API paths in the same file use **`advanced_model` only**. When L3 moves to nightly, migrate those heavier cases into `test_{slug}_expansion.py` with `full_model` and remove the dedicated `test-merge.yml` job (see `test_longcat_image_expansion.py`, `test_qwen_image_expansion.py`).
 
-**L4 design (high priority):** Combine multiple supported features (Cache-DiT, TP, USP, CFG, HSDP, CPU offload, quantization) into **few parametrized** `OmniServerParams` rows so each feature appears in at least one case without exploding GPU jobs. Shard single-GPU vs multi-GPU cases across the nightly X2I/X2V function steps (`cards_1` vs `not cards_1`).
+**L4 design (high priority):** Combine multiple supported features (Cache-DiT, TP, USP, CFG, HSDP, CPU offload, quantization) into **few parametrized** `OmniServerParams` rows so each feature appears in at least one case without exploding GPU jobs. Shard single-GPU vs multi-GPU cases across the nightly X2I/X2V function steps (1-GPU vs `distributed_cuda`).
 
 **L4 design (medium / low):** One or two parametrized rows covering the best quality/perf trade-off; skip perf JSON unless the model is high priority.
 
@@ -380,20 +346,107 @@ Classify the model's **CI priority** first:
 
 **Keep model-specific code inside test modules — not `tests/helpers/{slug}.py`:** deploy constants, prompts, sampling dicts, and inline `request_config` / `form_data` belong in each `test_{slug}.py` and `test_{slug}_expansion.py`. Do not add per-model files under `tests/helpers/`; reuse only repo-wide harness (`mark`, `media`, `runtime`, `stage_config`, `assertions`). **L2+ online/offline e2e:** reuse or add `send_*_request` in `tests/helpers/runtime.py` — tests call the handler, not raw `omni.generate` / HTTP. See [vllm-omni-test skill](../vllm-omni-test/SKILL.md) § **Runtime send helpers**.
 
-Keep the model suite proportional using the six distinct failure owners in the
-native integration checklist. Combine supported features into a few
-parametrized E2E rows instead of creating one test per optimization.
-
 ### Step 9: Add Cache-DiT Acceleration
 
-Add caching only after uncached single-device correctness. Read
-[references/cache-dit-patterns.md](references/cache-dit-patterns.md), use the
-automatic single-block-list path when possible, and add a registered
-`BlockAdapter` only for genuinely custom block topology.
+Cache-DiT accelerates inference by caching intermediate computation results across denoising steps. After your model is working correctly on a single GPU, add cache-dit support.
 
-Verify a real cache hit and compare quality with the uncached baseline. Make a
-speed claim only at a realistic step count where warmup permits hits; an
-all-warmup smoke proves integration, not acceleration.
+See [references/cache-dit-patterns.md](references/cache-dit-patterns.md) for detailed code patterns.
+
+#### 9a. Determine your model type
+
+| Model Type | Description | Action |
+|------------|-------------|--------|
+| **Standard single-transformer** | One transformer with one `ModuleList` of blocks | No code needed — `CacheDiTBackend` auto-detects via `enable_cache_for_dit()` |
+| **Multi-block-list** | One transformer with multiple block lists (e.g., `transformer_blocks` + `single_transformer_blocks`) | Write custom enabler with `BlockAdapter` |
+| **Dual-transformer** | Two transformers (e.g., high-noise + low-noise) | Write custom enabler with `BlockAdapter` wrapping both |
+
+#### 9b. Standard models — verify automatic support
+
+For standard single-transformer models, test directly:
+
+```python
+omni = Omni(
+    model="your-model-name",
+    cache_backend="cache_dit",
+    cache_config={
+        "Fn_compute_blocks": 1,
+        "Bn_compute_blocks": 0,
+        "max_warmup_steps": 4,
+    }
+)
+```
+
+Check logs for "Cache-dit enabled successfully on xxx". If it works, skip to Step 9e.
+
+#### 9c. Custom architectures — write a custom enabler
+
+For multi-block-list or dual-transformer models, write a custom enabler function:
+
+```python
+from cache_dit import BlockAdapter, ForwardPattern, ParamsModifier, DBCacheConfig
+
+def enable_cache_for_your_model(pipeline, cache_config):
+    db_cache_config = DBCacheConfig(
+        num_inference_steps=None,
+        Fn_compute_blocks=cache_config.Fn_compute_blocks,
+        Bn_compute_blocks=cache_config.Bn_compute_blocks,
+        max_warmup_steps=cache_config.max_warmup_steps,
+        max_cached_steps=cache_config.max_cached_steps,
+        max_continuous_cached_steps=cache_config.max_continuous_cached_steps,
+        residual_diff_threshold=cache_config.residual_diff_threshold,
+    )
+
+    cache_dit.enable_cache(
+        BlockAdapter(
+            transformer=pipeline.transformer,
+            blocks=[
+                pipeline.transformer.transformer_blocks,
+                pipeline.transformer.single_transformer_blocks,
+            ],
+            forward_pattern=[ForwardPattern.Pattern_1, ForwardPattern.Pattern_1],
+            params_modifiers=[ParamsModifier(...)],
+        ),
+        cache_config=db_cache_config,
+    )
+
+    def refresh_cache_context(pipeline, num_inference_steps, verbose=True):
+        cache_dit.refresh_context(
+            pipeline.transformer, num_inference_steps=num_inference_steps, verbose=verbose
+        )
+    return refresh_cache_context
+```
+
+#### 9d. Register the custom enabler
+
+Add your enabler to `CUSTOM_DIT_ENABLERS` in
+`vllm_omni/diffusion/cache/cachedit/model_specific.py`:
+
+```python
+CUSTOM_DIT_ENABLERS = {
+    "Wan22Pipeline": enable_cache_for_wan22,
+    "LongCatImagePipeline": enable_cache_for_longcat_image,
+    "YourModelPipeline": enable_cache_for_your_model,  # Add here
+}
+```
+
+#### 9e. Test Cache-DiT
+
+```python
+omni = Omni(
+    model="your-model-name",
+    cache_backend="cache_dit",
+    cache_config={
+        "Fn_compute_blocks": 1, "Bn_compute_blocks": 0,
+        "max_warmup_steps": 4, "residual_diff_threshold": 0.24,
+    }
+)
+images = omni.generate("a beautiful landscape",
+    OmniDiffusionSamplingParams(num_inference_steps=50))
+```
+
+**Verify**: 1) logs show cache enabled, 2) 1.5-2x speedup, 3) output quality acceptable vs baseline.
+
+If quality degrades, lower `residual_diff_threshold` (try 0.12-0.18) or increase `max_warmup_steps` (try 6-8).
 
 ---
 
@@ -407,30 +460,107 @@ See [references/parallelism-patterns.md](references/parallelism-patterns.md) for
 
 #### 10a. Tensor Parallelism (TP)
 
-Replace compatible projections with vLLM parallel linears, preserve checkpoint
-fusion/loading, and use local head counts. Require query/KV head divisibility
-and compare a multi-rank forward with the one-rank oracle.
+Shards DiT linear layers across GPUs. Requires code changes in the transformer.
+
+**What to change in the transformer**:
+1. Replace `nn.Linear` with `ColumnParallelLinear` / `RowParallelLinear` / `QKVParallelLinear`
+2. Update `load_weights()` to handle QKV fusion with `stacked_params_mapping`
+3. Use `self.to_qkv.num_heads` (local heads) instead of total heads for split sizes
+
+```python
+from vllm.model_executor.layers.linear import (
+    QKVParallelLinear, RowParallelLinear, ColumnParallelLinear,
+)
+
+# Attention: QKV → RowParallel output
+self.to_qkv = QKVParallelLinear(dim, head_dim, num_heads, num_kv_heads)
+self.to_out = RowParallelLinear(dim, dim, input_is_parallel=True)
+
+# FFN: ColumnParallel → RowParallel
+self.w1 = ColumnParallelLinear(dim, ffn_dim)
+self.w2 = RowParallelLinear(ffn_dim, dim, input_is_parallel=True)
+```
+
+**Constraints**: `num_heads % tp_size == 0` and `num_kv_heads % tp_size == 0`.
+
+**Test**: `--tensor-parallel-size 2`
 
 #### 10b. Sequence Parallelism (SP / USP)
 
-Prefer the declarative `_sp_plan`. For packed variable-length attention or
-learned-sink LSE correction, keep model math explicit and reuse shared exchange
-utilities. Validate uneven sequence splits, RoPE coordinates, and outputs
-against the one-rank oracle.
+Splits sequence tokens across GPUs. Non-intrusive via `_sp_plan` on the transformer class — no changes to `forward()`.
+
+**What to change in the transformer**:
+
+Add `_sp_plan` class attribute:
+
+```python
+from vllm_omni.diffusion.distributed.sp_plan import (
+    SequenceParallelInput, SequenceParallelOutput,
+)
+
+class YourTransformer(nn.Module):
+    _sp_plan = {
+        "blocks.0": {
+            "hidden_states": SequenceParallelInput(split_dim=1, expected_dims=3),
+        },
+        "proj_out": SequenceParallelOutput(gather_dim=1, expected_dims=3),
+    }
+```
+
+If inline tensor ops (e.g., `torch.cat`) exist between shard/gather points, extract them into `nn.Module` submodules so hooks can intercept them.
+
+For RoPE that needs splitting, add an entry for the RoPE module with `split_output=True`.
+
+**Test**: `--ulysses-degree 2` (offline) or `--usp 2` (online serving)
 
 #### 10c. CFG Parallel
 
-Confirm the model uses CFG. Then reuse `CFGParallelMixin`, overriding prediction
-or recombination only for non-standard or multi-output pipelines. Distinguish a
-packed positive/negative implementation from two independent branches and
-validate the two-rank result against the packed one-rank oracle.
+Distributes positive/negative CFG branches across 2 GPUs. Requires the pipeline to inherit `CFGParallelMixin`.
+
+**What to change in the pipeline**:
+
+```python
+from vllm_omni.diffusion.distributed.cfg_parallel import CFGParallelMixin
+
+class YourPipeline(nn.Module, CFGParallelMixin):
+    def diffuse(self, ...) -> torch.Tensor:
+        for i, t in enumerate(timesteps):
+            positive_kwargs = {...}
+            negative_kwargs = {...} if do_true_cfg else None
+            noise_pred = self.predict_noise_maybe_with_cfg(
+                do_true_cfg=do_true_cfg, true_cfg_scale=cfg_scale,
+                positive_kwargs=positive_kwargs, negative_kwargs=negative_kwargs,
+            )
+            latents = self.scheduler_step_maybe_with_cfg(
+                noise_pred, t, latents, do_true_cfg
+            )
+        return latents
+```
+
+Override `predict_noise()` if your transformer call is non-standard. Override `combine_cfg_noise()` for multi-output models (e.g., video + audio).
+
+**Constraint**: Exactly 2 GPUs. Only for models using classifier-free guidance.
+
+**Test**: `--cfg-parallel-size 2`
 
 #### 10d. HSDP (Hybrid Sharded Data Parallel)
 
-Declare layer shard conditions and ignored rank-local modules; preserve mixed
-checkpoint dtypes. HSDP cannot combine with TP. Measure parameter loading,
-FSDP materialization, warm HBM, and host PSS rather than assuming sharding saves
-peak memory. Keep the resident layout as default if HSDP is worse.
+Shards transformer weights via PyTorch FSDP2 to reduce per-GPU VRAM. No code changes to the forward pass — just add a class attribute.
+
+**What to change in the transformer**:
+
+```python
+class YourTransformer(nn.Module):
+    @staticmethod
+    def _is_transformer_block(name: str, module) -> bool:
+        return "blocks" in name and name.split(".")[-1].isdigit()
+
+    _hsdp_shard_conditions = [_is_transformer_block]
+```
+
+**Constraint**: Cannot combine with TP. For standalone HSDP, set `hsdp_shard_size` explicitly.
+
+**Test**: `--use-hsdp` or `DiffusionParallelConfig(use_hsdp=True)`
 
 #### 10e. Update parallelism documentation
 
@@ -469,12 +599,6 @@ Pipelines without `SupportsComponentDiscovery` fall back to scanning
 well-known attribute names (`transformer`, `text_encoder`, `vae`,
 etc.), which fails for non-standard names.
 
-Keep model-specific checkpoint paths, nested block aliases, layout transforms,
-and component lifecycles in the model package. Change a shared offloader only
-for a general contract, demonstrate another consumer or a framework-level bug,
-and add one focused shared regression. Avoid `if ModelName` branches in shared
-backends.
-
 ### Step 12: Performance Profiling
 
 After verifying correctness and implementing parallelism/caching, profile the model's performance to identify bottlenecks and ensure optimal execution.
@@ -484,12 +608,6 @@ See the [Profiling Single-Stage Diffusion](../../../docs/contributing/profiling.
 2. Using Nsight Systems (`nsys`) with `profiler: "cuda"` for low-overhead CUDA traces.
 3. Controlling profiling via `omni.start_profile()` and `omni.stop_profile()`.
 
-Report cold E2E, warm user latency, steady-state wave time, peak allocated and
-reserved HBM, host PSS for the full process tree, and stage boundaries. State
-whether prompt encoding and VAE/audio decoding are included. For multi-device
-layouts, plot user latency against throughput per device and keep different
-denoising-step counts on separate Pareto frontiers.
-
 ---
 
 ## Pre-commit conventions
@@ -517,7 +635,7 @@ shellcheck). In particular:
 3. **Use small models**: Test with smaller variants first
 4. **Check tensor shapes**: Most errors are reshape mismatches in attention
 5. **Add features incrementally**: Single GPU → TP → SP → CFG → HSDP → Cache-DiT
-6. **For custom models**: Run the pinned reference separately, then port the runtime natively; do not ship temporary imports from the reference implementation
+6. **For custom models**: Get the model running with the original code first, then progressively replace components with vllm-omni equivalents
 7. **Cache-DiT before parallelism tuning**: Cache-DiT is lossy — verify quality at baseline before combining with parallelism
 8. **Combine lossless + lossy**: e.g., TP + SP + Cache-DiT for maximum throughput
 
@@ -526,7 +644,6 @@ shellcheck). In particular:
 - [vllm-omni-test skill](../vllm-omni-test/SKILL.md) — L1–L4 markers, naming, Buildkite wiring, run commands
 - [Transformer Adaptation](references/transformer-adaptation.md) — porting transformers from diffusers
 - [Custom Model Patterns](references/custom-model-patterns.md) — patterns for non-diffusers models
-- [Native Model Integration Checklist](references/native-model-integration-checklist.md) — ownership boundaries, phase gates, qualification matrix, and review evidence
 - [Parallelism Patterns](references/parallelism-patterns.md) — TP, SP/USP, CFG parallel, HSDP implementation details
 - [Cache-DiT Patterns](references/cache-dit-patterns.md) — cache-dit acceleration for standard and custom architectures
 - [Troubleshooting](references/troubleshooting.md) — common errors and fixes

.claude/skills/add-diffusion-model/references/cache-dit-patterns.md

@@ -9,9 +9,7 @@ Three caching strategies:
 - **TaylorSeer**: Calibration-based prediction using Taylor expansion to estimate block outputs
 - **SCM** (Step Computation Masking): Dynamic step skipping based on configurable policies
 
-Speedup is model-, step-, and policy-dependent. Treat a cache-enabled run as
-integration evidence until logs or a focused test show real hits and repeated
-timings show an improvement over the uncached baseline.
+**Typical speedup**: 1.5-2.5x depending on model and configuration.
 
 **Official docs**: https://docs.vllm.ai/projects/vllm-omni/en/latest/design/feature/cache_dit
 
@@ -245,10 +243,8 @@ vllm serve your-model --omni --port 8098 \
 
 **Verification checklist**:
 1. Logs show "Cache-dit enabled successfully on xxx"
-2. A focused test or summary confirms at least one real cache hit
-3. Quality is compared with `cache_backend=None`
-4. Performance uses a realistic step count, repeated timings, and a policy
-   whose warmup does not consume the whole run
+2. Performance: 1.5-2x speedup vs no cache
+3. Quality: compare output with `cache_backend=None`
 
 ## Excluded Models
 

.claude/skills/add-diffusion-model/references/custom-model-patterns.md

@@ -16,22 +16,20 @@ vllm_omni/diffusion/models/wan2_2/
 
 The transformer is loaded separately via `weights_sources` + `load_weights()`. Non-transformer components (VAE, text encoder) are loaded in `__init__` via `from_pretrained()`.
 
-### External adapter (not native support)
+### Custom model with external deps (e.g., DreamID-Omni)
 
 ```
-vllm_omni/diffusion/models/<name>/
+vllm_omni/diffusion/models/dreamid_omni/
 ├── __init__.py                    # Exports pipeline only
-├── pipeline_<name>.py             # Pipeline: loads ALL weights in __init__ via custom helpers
-└── <backbone>.py                  # Custom transformer / fusion architecture
+├── pipeline_dreamid_omni.py       # Pipeline: loads ALL weights in __init__ via custom helpers
+├── fusion.py                      # Custom fusion architecture (video + audio cross-attention)
+└── wan2_2.py                      # Re-implemented Wan backbone with split API
 
-examples/offline_inference/<task>/
-└── download_<name>.py             # Downloads weights and/or clones code repo
+examples/offline_inference/x_to_video_audio/
+└── download_dreamid_omni.py       # Downloads weights from 3 HF repos + clones code repo
 ```
 
-All weights are loaded eagerly in `__init__`. `load_weights()` is a no-op. The
-external dependency is imported with try/except. Use this pattern only when the
-requested scope explicitly allows an adapter; it does not satisfy a request for
-a native vLLM-Omni implementation.
+All weights loaded eagerly in `__init__`. `load_weights()` is a no-op. External dependency (`dreamid_omni` package) imported with try/except.
 
 ### Custom model with ported code (e.g., BAGEL)
 
@@ -78,7 +76,7 @@ self.weights_sources = [
 ]
 ```
 
-### Pattern 3: Fully custom loading
+### Pattern 3: Fully custom loading (DreamID-Omni)
 
 ```
 init → load ALL weights eagerly via custom helpers → load_weights() = no-op
@@ -89,7 +87,7 @@ init → load ALL weights eagerly via custom helpers → load_weights() = no-op
 - `load_weights()` is `pass`
 - Weights may come from multiple HF repos in different formats (`.pth`, `.safetensors`)
 
-Use this only for an explicitly approved external adapter when:
+Use this when:
 - The original model has complex, well-tested loading code you don't want to rewrite
 - Weights span multiple HF repos
 - Weight format is non-standard (e.g., a single `.pth` file, not sharded safetensors)
@@ -110,23 +108,16 @@ Standard diffusers `model_index.json`:
 Custom model `model_index.json` (minimal):
 ```json
 {
-    "_class_name": "YourCustomPipeline",
-    "fusion": "weights/model.safetensors"
+    "_class_name": "DreamIDOmniPipeline",
+    "fusion": "DreamID-Omni/dreamid_omni.safetensors"
 }
 ```
 
-The only **required** field is `_class_name` — it must match a key in
-`_DIFFUSION_MODELS` in `registry.py`. Other fields are model-specific and
-accessible via `od_config.model_config`.
-
-When the released repository cannot be modified and contains neither this file
-nor a root `config.json`, use the generic native-checkpoint signature resolver.
-Match the exact Hub ID or a distinctive local file set; never infer support from
-a model-name substring.
+The only **required** field is `_class_name` — it must match a key in `_DIFFUSION_MODELS` in `registry.py`. Other fields are model-specific and accessible via `od_config.model_config` dict.
 
 ## External Dependency Management
 
-### Git clone + .pth injection
+### Git clone + .pth injection (DreamID-Omni pattern)
 
 ```python
 def download_dependency():
@@ -151,10 +142,6 @@ def download_dependency():
 
 Copy essential files from the original repo into `vllm_omni/diffusion/models/<name>/`. Adapt imports to use vllm-omni utilities. Benefits: no external dependency, no git clone step. Drawback: must maintain the ported code.
 
-This is the default for native model support. Keep the reference repository at
-a pinned revision for architecture analysis and golden outputs, but do not
-import it from production code.
-
 ## Multi-Modal Input/Output Protocols
 
 Custom models that handle images, audio, or video I/O should implement protocol classes:
@@ -176,7 +163,7 @@ The engine checks `isinstance(pipeline, SupportImageInput)` at startup to config
 
 Diffusers models use `config.json` in each subfolder. Custom models often use:
 
-**Module-level config dicts**:
+**Module-level config dicts** (DreamID-Omni):
 ```python
 VIDEO_CONFIG = {
     "patch_size": [1, 2, 2], "model_type": "ti2v",
@@ -194,7 +181,7 @@ vae_cfg = bagel_cfg.get("vae_config", {})
 
 ## Custom Architecture Patterns
 
-### Split forward API
+### Split forward API (DreamID-Omni)
 
 When a fusion model needs to interleave blocks from two backbones:
 

.claude/skills/add-diffusion-model/references/native-model-integration-checklist.md

@@ -1,131 +0,0 @@
-# Native Diffusion Model Integration Checklist
-
-Use this checklist for native non-Diffusers models, hybrid pipelines, and
-model-specific optimization work.
-
-## 1. Freeze the contract before coding
-
-Record:
-
-- Reference repository and immutable revision.
-- Official checkpoint ID, local layout, license, and required auxiliary files.
-- Pipeline stages: prompt/image encoding, denoising, video/image/audio decoding,
-  and muxing.
-- Token packing, RoPE coordinates, attention sinks/LSE behavior, MoE layout,
-  scheduler equations, CFG formulation, dtypes, and checkpoint transforms.
-- Output geometry, frame count/FPS, audio rate/channels, supported tasks, and
-  default generation steps.
-- Available local hardware versus the official qualification hardware.
-- Intended default deployment and optional optimization paths.
-
-State whether the deliverable is a native implementation or an external
-adapter. For native support, use the reference as an oracle only.
-
-## 2. Use phase gates
-
-| Phase | Required exit evidence |
-|---|---|
-| Architecture | Component/weight inventory; unsupported reference dependencies identified; ownership decisions documented |
-| Native correctness | Strict checkpoint load; tiny forward or one-step golden vs pinned reference; output contract validated |
-| Framework integration | Registry/discovery, shared request types, existing category example, serving route, docs, and recipe work without model-name branching in shared scripts |
-| Lossless distribution | One-rank oracle vs each supported TP/SP/CFG/HSDP/VAE layout; released-checkpoint smoke for the recommended layout |
-| Memory optimization | Ordinary/layerwise/DLO behavior, peak HBM, full-tree host PSS, and stage timeline; shared backend unchanged unless a general contract is proven |
-| Lossy optimization | Cache hit demonstrated; quality delta measured; speed claim made only when warmup permits hits |
-| Full qualification | Default-resolution E2E at official step count for every supported task; media metadata and hashes recorded |
-| Review readiness | Focused tests, Ruff/format, strict docs, DCO, current-main rebase, issue/RFC for large changes, concise PR evidence and limitations |
-
-Do not start performance tuning before native one-step parity. Do not claim a
-feature from topology validation alone when released weights can exercise it.
-
-## 3. Keep ownership narrow
-
-Default placement:
-
-| Concern | Owner |
-|---|---|
-| Architecture, checkpoint remap, packed attention math, nested block alias, auxiliary lifecycle | Model package |
-| Kernel/version dispatch already useful to multiple models | Shared attention utility |
-| Request-dependent example defaults | Typed model-extra entry consumed through a registry |
-| Exact-ID/local-file detection for repositories without standard metadata | Generic native-checkpoint signature table |
-| General offload/cache/HSDP bug | Shared layer plus one focused shared regression |
-
-Before changing shared code, answer:
-
-1. Is this a framework contract or only this checkpoint's layout?
-2. Can the model expose an existing declarative hook instead?
-3. Is there a second consumer or a framework-level failing test?
-4. Can the shared change avoid importing or naming the model?
-
-If the answers do not justify a shared change, keep it model-local.
-
-## 4. Reuse examples without leaking model logic
-
-- Reuse the existing `x_to_y.py` category script.
-- Resolve the pipeline class through standard metadata or native signature
-  discovery, not path substrings.
-- Put dynamic model defaults and validation in `model_extras`; let shared
-  examples consume only the generic typed API.
-- Do not create image/speech/default abstractions without a real consumer.
-- Add a dedicated example only when the shared request/output protocol cannot
-  express the model.
-
-## 5. Build a bounded evidence matrix
-
-Start with the recommended resident layout. Add only supported, useful points:
-
-- Single request: TP, SP, or hybrid TP/SP.
-- Throughput: DLO/DP layouts when concurrent requests are valid.
-- CFG: compare CFG-parallel output with the packed-CFG oracle only if the model
-  actually uses CFG.
-- HSDP: record loading and materialization peaks; it can use more HBM than a
-  resident SP layout.
-- VAE patch parallelism: compare decoded tensors or media exactly where the
-  algorithm should be lossless.
-- Cache: separate cache integration from acceleration evidence.
-
-With four devices, qualify four-device layouts such as DP4, DP2SP2, SP4, or
-CFG2xSP2. Do not present CFG2xSP4 or an official eight-device runtime as locally
-validated.
-
-For each measured layout record:
-
-- Cold E2E and warm user latency.
-- Steady-state wave time and throughput per device.
-- Prompt, denoise, video decode, audio decode, and mux times.
-- Peak allocated/reserved HBM and full-process-tree host PSS.
-- Step count, seed, output geometry, frame/FPS/audio metadata, and parity metric.
-
-Plot latency versus throughput/device. Keep one-step, four-step, and full-step
-results separate because they are not quality-equivalent.
-
-## 6. Keep tests proportional
-
-Prefer a small set with distinct failure ownership:
-
-1. Strict weight-key/dtype/load contract.
-2. Tiny native golden or one-step reference parity.
-3. One parametrized distributed-parity test covering supported layouts.
-4. Pipeline/request/output geometry and serving smoke.
-5. Shared-example/default test when the category script changes.
-6. One shared regression only for a genuine shared-layer fix.
-
-Avoid duplicating the same shape or configuration assertion across
-model-specific files. Keep expensive released-checkpoint evidence in the PR or
-recipe unless the repository's CI tier explicitly requires it.
-
-## 7. Write evidence, not marketing
-
-In the PR description include:
-
-- A compact architecture/data-flow explanation.
-- Default deployment and why it is recommended.
-- Code-change counts by component.
-- Accuracy and distributed-parity evidence tied to commands/scripts.
-- Separate Pareto figures for different step counts.
-- Supported versus validated versus planned optimizations.
-- Hardware gaps and untested official-runtime claims.
-
-Call a result a bounded local qualification unless it includes repeated timing
-and variance. State whether latency includes text/image encoding and all
-decoders. Preserve the reference revision and exact commands needed to
-reproduce the evidence.

.claude/skills/add-recipe/SKILL.md

@@ -1,126 +0,0 @@
----
-name: add-recipe
-description: Add or update an in-repository vLLM-Omni model recipe with verified task, input, output, hardware, command, feature, and validation contracts. Use when creating files under recipes/, restructuring a recipe after review, documenting a newly supported model, or synchronizing recipe claims with support tables and shared feature guides.
----
-
-# Add a vLLM-Omni Recipe
-
-## Source the contract
-
-Read [`recipes/TEMPLATE.md`](../../../recipes/TEMPLATE.md) and
-[`recipes/README.md`](../../../recipes/README.md) before editing. Inspect the
-canonical model card/repository, implementation, shared examples, tests, and
-available local qualification evidence.
-
-Do not infer support from a model name, sibling recipe, registry entry, or
-topology validator. Mark unexecuted configurations as configuration-only.
-
-## Route by model family
-
-Read only the contributor and user documentation relevant to the model:
-
-| Family | Contributor guide | User-facing documentation to synchronize |
-|---|---|---|
-| Diffusion | [`adding a diffusion model`](../add-diffusion-model/SKILL.md) | `docs/user_guide/diffusion_features.md`, applicable diffusion feature guides, and shared image/video/audio examples |
-| TTS | [`adding a TTS model`](../add-tts-model/SKILL.md) | `examples/offline_inference/text_to_speech/README.md`, `examples/online_serving/text_to_speech/README.md`, and `docs/serving/speech_api.md` |
-| Omni | [`adding an omni model`](../../../docs/contributing/model/adding_omni_model.md) | model-family offline/online example docs, `docs/serving/chat_completions_api.md`, and `docs/user_guide/feature_compatibility.md` |
-
-All families must update `docs/models/supported_models.md` and the matching row
-in `recipes/README.md`. Do not add a modality-specific support document when
-the repository has no such table; update the closest shared user contract.
-
-## Structure the recipe
-
-Keep the recipe task-oriented and use one hardware-specific file named
-`recipes/<vendor>/<model>-<hardware>.md`. A recipe may contain multiple
-deployment topologies on that hardware, but each additional accelerator model
-or platform requires its own suffixed file.
-
-1. **Summary:** vendor, exact model ID, runtime, modes, named hardware,
-   recommended deployment, and maintainer.
-2. **Supported model contract:** put task, input, output, and provided-profile
-   tables before setup or commands.
-3. **References:** link the canonical model source, shared examples, supported
-   model table, and feature matrix.
-4. **Checkpoint/setup:** pin revisions when possible and state required assets.
-5. **Hardware:** document the single accelerator named by the file suffix,
-   including every validated device-count/topology profile on it.
-6. **Commands:** reuse shared `examples/` entrypoints unless the model contract
-   truly requires a dedicated script. Include offline and online paths that
-   were validated.
-7. **Supported features:** use a compact model-specific topology/status table
-   with links to shared feature guides.
-8. **Verification:** provide a quick command and exact expected output
-   contract.
-9. **Qualification evidence:** report correctness, memory, and timing evidence
-   with its measurement scope and caveats.
-
-## Separate hardware from software
-
-For every locally validated hardware profile, record:
-
-- accelerator vendor/model and per-device memory;
-- number of devices;
-- interconnect (`NVLink`, `PCIe`, or the platform equivalent);
-- host memory when CPU staging/offload is material;
-- whether the profile is runtime-qualified or configuration-only.
-
-Record OS, Python, driver/runtime, framework versions, and the vLLM-Omni
-revision in a separate software-environment table. Keep precision, worker
-count, and DP/TP/SP/PP sizes with the deployment profile or exact command.
-
-Never generalize a result from one accelerator family to another or combine
-NVIDIA, AMD, NPU, or distinct accelerator models in one recipe. Create a
-separate hardware-suffixed recipe and `recipes/README.md` row. Distinguish
-upstream requirements from hardware exercised by the PR.
-
-## Keep shared documentation concise
-
-Link the applicable diffusion, TTS, omni, serving, or design guide for generic
-feature semantics and launch instructions. The recipe should contain only the
-model-specific status, valid topology, required flag difference, and evidence
-boundary.
-
-Put unsupported combinations in the same feature table. Avoid repeating the
-same model-specific prose below the global feature matrix; the recipe is the
-detailed source of truth.
-
-## Report evidence precisely
-
-For every performance or memory value, state:
-
-- checkpoint/revision and workload;
-- accelerator and device count;
-- precision and topology;
-- cold/warm scope, step count, and concurrency;
-- peak HBM and host-memory metric when measured;
-- output/quality guard and sample count;
-- monitoring overhead or other known variance.
-
-Call a single bounded run qualification evidence, not a benchmark. Do not add
-a benchmark script unless the contribution explicitly requires one.
-
-## Synchronize repository documentation
-
-Update all applicable locations:
-
-- the row in `recipes/README.md`;
-- `docs/models/supported_models.md`;
-- the family-specific documentation selected in **Route by model family**;
-- shared example documentation when commands or flags change.
-
-Keep global support tables compact. Link to the recipe instead of duplicating
-its deployment explanation.
-
-## Validate
-
-Run, at minimum:
-
-```bash
-pre-commit run --files <changed recipe/docs/skill files>
-mkdocs build --strict
-git diff --check
-```
-
-Remove generated documentation artifacts after validation. Confirm every
-recipe link resolves and every claimed profile has matching code or evidence.

.claude/skills/add-tts-model/SKILL.md

@@ -345,8 +345,8 @@ Heavier scenarios in the same file use **`advanced_model` only** (streaming, ext
 @pytest.mark.tts
 @hardware_test(res={"cuda": "L4"}, num_cards=1)
 @pytest.mark.parametrize("omni_server", tts_server_params, indirect=True)
-def test_voice_clone_en_non_streaming_001(omni_server, online_client) -> None:
-    online_client.send_audio_speech_request({...})
+def test_voice_clone_en_non_streaming_001(omni_server, openai_client) -> None:
+    openai_client.send_audio_speech_request({...})
 ```
 
 **L4 consolidation:** Prefer parametrized `OmniServerParams` rows (`default`, `async_chunk`, feature flags) in one expansion module rather than many merge-only files ([#1832](https://github.com/vllm-project/vllm-omni/issues/1832)).
@@ -363,8 +363,8 @@ def test_voice_clone_en_non_streaming_001(omni_server, online_client) -> None:
 
 | Path | Fixture | Call |
 |------|---------|------|
-| Online `/v1/*` | `online_client` | `online_client.send_*_request(request_config)` |
-| Offline inference | `offline_client` | `offline_client.send_*_request(request_config)` |
+| Online `/v1/*` | `openai_client` | `openai_client.send_*_request(request_config)` |
+| Offline inference | `omni_runner_handler` | `omni_runner_handler.send_*_request(request_config)` |
 
 1. **Grep `runtime.py` first** — reuse `send_omni_request`, `send_diffusion_request`, `send_audio_speech_request` (online + offline Qwen-style TTS), `send_single_stage_tts_request` (Coqui XTTS / MOSS-TTS-Nano offline), etc.
 2. **No matching helper** → add `send_<feature>_request` (or `send_<route>_http_request` for negative/dfx) in **`runtime.py`** with general `assert_*` bundled inside, **then** call it from the test.
@@ -396,7 +396,7 @@ See [vllm-omni-test skill](../vllm-omni-test/SKILL.md) § **Runtime send helpers
   `/health` return non-200 until you're actually ready.
 - **Mark tests per the CI Levels table** — baseline smoke: `core_model` + `advanced_model`; heavier cases: `advanced_model` only; L4 expansion: `full_model`
 - **No per-model helper modules** — do not create `tests/helpers/{slug}.py`; keep constants and `request_config` payloads in the test file
-- **Online and offline e2e go through `runtime.py`** — `online_client.send_audio_speech_request` (online); `offline_client.send_audio_speech_request` (Qwen-style offline) or `send_single_stage_tts_request` (single-stage offline). Add a new `send_*_request` in `runtime.py` when none fits; do not embed `omni.generate` or HTTP in tests
+- **Online and offline e2e go through `runtime.py`** — `openai_client.send_audio_speech_request` (online); `omni_runner_handler.send_audio_speech_request` (Qwen-style offline) or `send_single_stage_tts_request` (single-stage offline). Add a new `send_*_request` in `runtime.py` when none fits; do not embed `omni.generate` or HTTP in tests
 
 ## Phase 4: Async Chunk (Streaming)
 
@@ -499,13 +499,6 @@ Common pre-commit failures, recovery commands for missing sign-off, and the
 full `pre-commit run` invocation for a TTS model:
 [references/precommit-dco.md](references/precommit-dco.md).
 
-## Documentation and recipe
-
-Follow the [`add-recipe` skill](../add-recipe/SKILL.md) to add or update the
-in-repository model-family recipe, the `recipes/README.md` index, the supported
-models table, TTS example documentation, and the speech API contract using
-validated evidence.
-
 ## Integration Checklist
 
 Use this checklist when integrating a new TTS model:
@@ -550,7 +543,6 @@ Use this checklist when integrating a new TTS model:
 - [ ] Buildkite entries match level: `test-ready.yml` / `test-merge.yml` or nightly TTS job / `test-nightly.yml`
 - [ ] Gradio demo working
 - [ ] Documentation added (offline + online docs, nav, supported models)
-- [ ] In-repository recipe and `recipes/README.md` row added via the `add-recipe` skill
 
 ### Phase 4: Async Chunk
 - [ ] Pipeline declares the async handoff processor

.claude/skills/add-tts-model/references/precommit-dco.md

@@ -34,7 +34,7 @@ but the changes are correct — stage the modified files and re-commit.
 | `check-forbidden-imports` | Stdlib `re`/`base64`, pickle, Hugging Face Hub API, or direct Triton/TileLang | `import regex as re` and `pybase64`; use `vllm.transformers_utils.repo_utils`. Do **not** add the file to `allowed_files` without review |
 | `check-torch-cuda-call` | New `torch.cuda.*` call site | Use `current_omni_platform` / `OmniPlatform`; do not grow `ALLOWED_FILES` without review |
 | `check-tts-adapter-migration` | New `self._tts_model_type` branch in `serving_speech.py` | Put per-model logic in `tts_adapters/`. Lower `MAX_MODEL_TYPE_BRANCHES` when removing branches; do not raise it without review |
-| `check-mark` | New `tests/**/test_*.py` missing level/hardware mark, or direct `pytest.mark.H100` | Add `core_model`/`advanced_model`/… plus `cpu`/`cuda`/`hardware_test(`; SKU marks only via helpers |
+| `check-test-ci-coverage` | New `tests/**/test_*.py` missing level or hardware mark | Add `core_model`/`advanced_model`/… plus `cpu`/`cuda`/`hardware_test(` |
 | `mypy-3.10` | Type error on changed `vllm_omni/` files | Fix the types; model trees are excluded. Extra versions: `pre-commit run --hook-stage manual mypy-3.12` |
 | `markdownlint-cli2` | Docs/README markdown lint | Accept auto-fix under `docs/` / `recipes/` / root README |
 | `check-buildkite` | Invalid `.buildkite/*.yml` | Fix the YAML; do not grow `SKIP_FILES` without review |

.claude/skills/production-add-diffusion-model/SKILL.md

@@ -1,458 +0,0 @@
----
-name: production-add-diffusion-model
-description: Productionize a vLLM-Omni diffusion model after its Day-0 vertical slice works. Use when work requires official API parity and input limits, feature-combination evidence, online FP8, distributed layerwise offload, per-request Cache-DiT, CUDA/ROCm/NPU/XPU recipes, faster or sparse attention, fused operators, USP or disaggregation analysis, continuous batching and abort handling, long-running RPS stability, or accuracy/performance/reliability CI. For initial architecture porting, registry wiring, and basic weight loading, use add-diffusion-model first.
----
-
-# Productionizing a Diffusion Model
-
-## Scope
-
-Use this skill to move a working model integration from Day-0 support to a
-measured, fail-closed production deployment. It is deliberately separate from
-[`add-diffusion-model`](../add-diffusion-model/SKILL.md); do not modify or copy
-that skill when productionizing a model. If registry, pipeline, or basic loader
-work is incomplete, read that skill first and finish the Day-0 vertical slice.
-
-MiniMax-H3 [PR #5691](https://github.com/vllm-project/vllm-omni/pull/5691)
-is the merged Day-0 case study. Its open optimization
-[issue #5700](https://github.com/vllm-project/vllm-omni/issues/5700) is an
-actively maintained roadmap and evidence map, not a list of already supported
-features. It can lag merged implementation: read its current revision, cited
-PRs, target source, and maintained recipes, then leave every unverified row
-`not tested` until the target revision has scoped evidence.
-
-Read these references before the corresponding gate:
-
-- [API and hardware recipes](references/api-and-recipes.md)
-- [Production feature patterns](references/feature-patterns.md)
-- [Performance patterns and code examples](references/performance-patterns.md)
-- [Serving, soak, and CI validation](references/production-validation.md)
-
-## Non-negotiable evidence contract
-
-Create a matrix whose row key is at least:
-
-```text
-task x API mode x execution mode/capacity x shape/schedule x attention backend x
-packed layout x cache policy x quantization x offload mode x topology x
-hardware x dtype x output representation/transport
-```
-
-Use exactly these states:
-
-| State | Meaning |
-|---|---|
-| `validated` | The exact row passed correctness and measured deployment tests, with reproducible artifacts. |
-| `limited` | A bounded subset passed; the limitation and rejection/fallback behavior are explicit. |
-| `unsupported` | A stable architectural/platform restriction is proven and fails early with an actionable error. |
-| `not tested` | No adequate evidence exists. This is the default. |
-
-Never infer compatibility from import success, server startup, another task,
-another card, or another topology. Record the model/checkpoint revision,
-vLLM-Omni commit, commands, request assets and hashes, seed/schedule/shape,
-raw output artifacts, environment, and result for every `validated` row.
-
-## Workflow
-
-Follow the gates in order. Keep a dense BF16 single-device path as the
-correctness oracle until every advertised fast path has parity evidence.
-
-### Gate 0: Freeze the official contract
-
-Pin the official implementation and checkpoint revision. Build a matrix for:
-
-- constructor/call arguments, defaults, scheduler and sigma schedule;
-- task-to-source modality/count/order rules;
-- prompt, MIME, bytes, pixels, frames, duration, FPS, steps, seed, guidance,
-  output count, and output format limits;
-- offline API and every public sync/async serving endpoint;
-- checkpoint partitions and task selection.
-
-Normalize offline, sync, and async requests through one validation contract.
-Reject an invalid task/source combination before downloads, upload persistence,
-temporary files, async job creation, or engine submission. Use 400 for invalid
-semantics and 413 for payload limits; clean partial resources on every failure.
-See [API and hardware recipes](references/api-and-recipes.md).
-
-### Gate 1: Re-prove correctness under production shapes
-
-1. Make loading strict: track expected, loaded, unexpected, and intentionally
-   ignored tensors. A fused destination is complete only after every source
-   shard arrives. Missing retained parameters abort startup.
-2. Fix reference revision, asset hashes, seed, schedule, and shape. Compare
-   component outputs, intermediate denoise latents, and final artifacts.
-3. Test unequal packed samples. Verify `cu_seqlens`, padding exclusion,
-   modality/CFG ownership, split/gather boundaries, and one output per request.
-4. Test partial process groups with non-member ranks and group size smaller
-   than world size. Do not construct a private group per component or request.
-5. Run negative API cases before positive E2E tests to prove side-effect-free
-   rejection and cleanup.
-
-### Gate 2: Wire shared fast primitives
-
-Prefer explicit, testable vLLM-Omni/vLLM operators with native fallbacks.
-`torch.compile` remains a separately validated regional optimization; it is
-not a substitute for correct operator selection or lifecycle-safe boundaries.
-
-#### RMSNorm + RoPE baseline
-
-Use the shared cross-platform operators, preserving the official Q/K norm and
-RoPE order:
-
-```python
-from vllm_omni.diffusion.layers.norm import RMSNorm
-from vllm_omni.diffusion.layers.rope import (
-    RotaryEmbedding,
-    apply_rope_to_qk,
-)
-
-self.norm_q = RMSNorm(head_dim, eps=eps)
-self.norm_k = RMSNorm(head_dim, eps=eps)
-self.rope = RotaryEmbedding(is_neox_style=False)
-
-query = self.norm_q(query)  # [B, S, Hq, D] or packed [T, Hq, D]
-key = self.norm_k(key)      # [B, S, Hkv, D] or packed [T, Hkv, D]
-query, key = apply_rope_to_qk(
-    self.rope,
-    query,
-    key,
-    (cos, sin),
-)
-```
-
-Verify `is_neox_style`, `half_head_dim`, partial rotary dimensions, cos/sin
-layout, and packed row ownership against the official model. `False` means
-interleaved/GPT-J style; do not assume the default is NeoX. Shared RMSNorm and
-RoPE are two dispatched operators, not automatically one fused kernel.
-
-For packed non-interleaved RoPE, use the shared fused boundary when its contract
-matches the model:
-
-```python
-from vllm_omni.diffusion.layers.fused_qk_norm_rope import fused_qk_norm_rope
-
-query, key = fused_qk_norm_rope(
-    query,                    # [T, Hq, D]
-    key,                      # [T, Hkv, D]
-    self.norm_q.weight,       # [D]
-    self.norm_k.weight,       # [D]
-    rope_table,               # [T, rotary_dim] = [cos | sin]
-    self.norm_q.variance_epsilon,
-)
-```
-
-The current CUDA fast path specializes BF16 `head_dim=128`, `rotary_dim=96`;
-the public function keeps an eager fallback for unsupported inputs. Verify the
-packed row/frequency contract and trace the actual fast path. Do not reshape an
-incompatible official RoPE layout merely to enter this kernel.
-
-MiniMax-H3-style partial NeoX RoPE rotates a prefix and passes the suffix
-through:
-
-```python
-self.q_norm = RMSNorm(head_dim, eps=eps, dtype=torch.bfloat16)
-self.k_norm = RMSNorm(head_dim, eps=eps, dtype=torch.bfloat16)
-self.rope = RotaryEmbedding(is_neox_style=True, half_head_dim=False)
-
-def apply_partial_rope(self, x, freqs, rot_dim):
-    x_rot, x_pass = x[..., :rot_dim], x[..., rot_dim:]
-    cos, sin = torch.cos(freqs).to(x.dtype), torch.sin(freqs).to(x.dtype)
-    return torch.cat((self.rope(x_rot, cos, sin), x_pass), dim=-1)
-```
-
-The partial-RoPE snippet assumes `import torch` and lives on the owning
-attention module; adapt names and validated frequency shapes rather than
-copying it at module scope.
-
-Call the modules normally so `CustomOp` selects CUDA/HIP/NPU/XPU/native
-implementations. Do not call `forward_cuda()` directly. Compare the shared
-path with native BF16 at operator, block, denoise-trajectory, and artifact
-levels before claiming either accuracy or speed.
-
-#### Faster BF16 attention and fused projections
-
-Use local TP head counts and role-aware shared attention:
-
-```python
-from vllm.model_executor.layers.linear import QKVParallelLinear
-from vllm_omni.diffusion.attention.layer import Attention
-
-self.qkv_proj = QKVParallelLinear(
-    hidden_size=hidden_size,
-    head_size=head_dim,
-    total_num_heads=num_heads,
-    total_num_kv_heads=num_kv_heads,
-    bias=False,
-    quant_config=quant_config,
-    prefix=f"{prefix}.qkv_proj",
-)
-self.attn = Attention(
-    num_heads=self.qkv_proj.num_heads,
-    num_kv_heads=self.qkv_proj.num_kv_heads,
-    head_size=head_dim,
-    softmax_scale=head_dim**-0.5,
-    causal=False,
-    qkv_layout="BSND",
-    role="self",
-    prefix=prefix,
-)
-```
-
-Prove the selected backend from runtime logs/trace and compare it with dense
-SDPA. Packed metadata must express real sample boundaries; do not build masks
-that the selected backend ignores. A backend that is faster for one shape or
-platform is not a global default. See [performance patterns](references/performance-patterns.md)
-for QKV, SwiGLU, AdaLN, sparse attention, redundancy, and fusion examples.
-
-### Gate 3: Add online FP8 without breaking the loader
-
-Route the active config to each component, then pass a stable runtime prefix
-and config into every quantizable vLLM linear:
-
-```python
-def resolve_component_quant_config(quant_config, component):
-    return quant_config.resolve(component) if hasattr(quant_config, "resolve") else quant_config
-
-transformer_quant_config = resolve_component_quant_config(
-    od_config.quantization_config,
-    "transformer",
-)
-self.transformer = MyDiT(
-    od_config,
-    quant_config=transformer_quant_config,
-    prefix="transformer",
-)
-
-self.qkv_proj = QKVParallelLinear(
-    hidden_size=hidden_size,
-    head_size=head_dim,
-    total_num_heads=num_heads,
-    total_num_kv_heads=num_kv_heads,
-    quant_config=quant_config,
-    prefix=f"{prefix}.qkv_proj",
-)
-```
-
-Use `build_quant_config()` for direct construction/testing:
-
-```python
-from vllm_omni.quantization import build_quant_config
-
-quant_config = build_quant_config({
-    "transformer": {"method": "fp8"},
-    "text_encoder": None,
-    "vae": None,
-    "default": None,
-})
-```
-
-Preserve each parameter's vLLM `weight_loader`; perform checkpoint layout
-conversion before invoking it. Account for every QKV/gate-up source shard.
-Keep precision-sensitive norm/modulation/embedders in BF16 unless separately
-proven, using the current `safe_quant_config` pattern where applicable.
-
-Validate resident DiT FP8 first: prove which modules are quantized, HBM saved,
-BF16-vs-FP8 trajectory/artifact quality, latency, and throughput. Text encoder,
-VAE, other hardware, TP/cache/DLO combinations are separate rows.
-Pre-quantized, pruned, rotated, or adapter-modified checkpoints are separate
-model/loading lanes; compare them with the released BF16 model without calling
-the result a pure quantization ablation. Read
-[`../quantization/SKILL.md`](../quantization/SKILL.md) if present and prefer the
-target revision's implementation/docs when sibling guidance differs.
-
-### Gate 4: Make every component offloadable
-
-Declare topology instead of relying on heuristic discovery:
-
-```python
-from typing import ClassVar
-
-import torch.nn as nn
-
-from vllm_omni.diffusion.models.interface import SupportsComponentDiscovery
-from vllm_omni.diffusion.offloader import OffloadPlan
-
-class MyPipeline(nn.Module, SupportsComponentDiscovery):
-    _dit_modules: ClassVar[list[str]] = ["transformer"]
-    _encoder_modules: ClassVar[list[str]] = ["text_encoder"]
-    _vae_modules: ClassVar[list[str]] = ["vae"]
-    _resident_modules: ClassVar[list[str]] = []
-    _offload_plan: ClassVar[OffloadPlan] = OffloadPlan(
-        on_demand_component_paths=frozenset({"text_encoder", "vae"}),
-        block_attrs={"transformer": ("blocks",)},
-        offload_submodules={"token_refiner": "blocks"},
-        resident_dit_paths=frozenset({"transformer"}),
-        encoder_block_attrs={"text_encoder": ("encoder.layers",)},
-    )
-```
-
-Add a test that resolves every dotted component/block path and fails if it is
-missing or is not the expected module/container; discovery may otherwise warn
-and skip. Validate ordinary layerwise offload and distributed layerwise
-offload (DLO) independently.
-
-Keep component lifecycle and host-weight storage separate. `OffloadPlan`
-declares what can be streamed; the diffusion loader owns any `HostWeightPlan`
-and hands the exact prevalidated plan to DLO. Do not make the offloader rescan
-checkpoint files or duplicate loader name/shape/dtype decisions. Direct mmap is
-a fail-closed optimization: current preflight requires TP1, no HSDP, no online
-quantization, complete bindings, and represented transforms. Otherwise the
-ordinary loader remains authoritative.
-
-If the target revision supports Host Weight Runtime (HWR), treat it as a
-separate, exact-identity startup/cache path rather than generic offload or
-zero-copy execution. Qualify `preferred` population/fallback and `required`
-consume-only failure independently; verify immutable manifests, final-layout
-restore, lease cleanup, corruption/quarantine, and node-local sharing. Current
-model contracts may be BF16 no-AllGather-only, so reject AllGather, online
-quantization, HSDP, LoRA/adapted weights, and unrecognized load formats unless
-the exact target revision explicitly adds them.
-
-On small-HBM cards, record load/materialization peak, resident peak, encode,
-each denoise wave, decode, transient per-rank HBM, host PSS, H2D, and collective
-time. Test DLO AllGather and `--dlo-no-use-allgather` as different deployments.
-Sweep the supported resident-block policies and publish the non-dominated
-latency-HBM frontier; a single minimum-memory or fastest point is not the DLO
-trade-off. Keep request-specific preparation replica-local. Only weight
-materialization may enter the declared DLO collective group; never use WORLD
-for per-request work in a DP deployment.
-Direct checkpoint mmap preflight is limited to TP1 without HSDP or online
-quantization; TP>1 falls back to the ordinary TP-aware loader and can still feed
-DLO AllGather or no-AllGather after scoped E2E. HSDP remains incompatible with
-DLO AllGather. A target revision may allow finalized per-tensor online FP8
-through the ordinary loader and AllGather; keep every other online quantizer
-fail-closed, and require model/card/topology E2E before promotion.
-Use deploy YAML for DP under `--omni`; vLLM DP CLI flags are rejected.
-
-### Gate 5: Add request-scoped acceleration safely
-
-Server-wide Cache-DiT support does not imply a per-request quality API. Only
-add request policy after defining calibrated quality tiers and a safe hook
-lifecycle using `SupportsRequestScopedCacheDiT`, `CacheDiTRequestSpec`, and
-`RequestScopedCacheDiTRuntime`. Validate alternating and concurrent quality
-tiers, real cache hits, refresh/reset, success, error, disconnect, abort, and
-the next uncached request. Do not batch different quality policies unless the
-batch compatibility key and hook ownership make that safe.
-
-Then test Cache-DiT against FP8, DLO, TP/SP, compile, and batching one
-combination at a time. See [production feature patterns](references/feature-patterns.md)
-for the lifecycle skeleton and compatibility matrix.
-
-### Gate 6: Optimize only from profiles
-
-Freeze one canonical workload manifest before profiling. Keep lossless runtime
-A/Bs, accelerated paths with numerical/quality trade-offs, and production
-topology studies in separate result lanes. Reconcile the client boundary as
-queue + encode + denoise + video/audio decode + output transport/codec +
-residual; do not hide a material residual in another stage.
-
-Profile stage time, GPU kernels, CPU/GPU synchronization, allocations, H2D,
-output payload/copies, and collectives before choosing work. Apply and A/B one
-change at a time:
-
-1. Remove synchronization and redundant denoise-loop work: hoist static prompt
-   conditioning/token refinement, RoPE tables, masks/metadata, bounded AdaLN
-   schedule projections, and reference scans; remove per-layer `.item()` and
-   unused masks/allocations.
-2. Select the fastest correct BF16 attention backend for each role and shape.
-3. Prefer explicit fused QKV, gate-up + `SiluAndMul`, RMSNorm/RoPE, AdaLN, and
-   layout/residual operators with guarded native fallbacks. Preserve every
-   materialized dtype/rounding boundary consumed by the unfused graph.
-4. Enable sparse attention only when platform, shape, topology, realized
-   sparsity, quality, fallback, and end-to-end speedup are all proven.
-5. Profile USP all-to-all count/bytes, packing, contiguous copies, overlap, and
-   scaling efficiency. Audit replicated cross-attention before using
-   `skip_sequence_parallel`. Qualify regular and accelerated Ulysses transport
-   independently; activation logs, JIT/readiness time, workspace growth,
-   stream ownership, maximum-shape warmup, and numerical drift are gates.
-   Preserve the checkpoint's Q:KV head ratio when padding GQA for Ulysses, and
-   validate strided QKV staging rather than assuming packed contiguity.
-6. Evaluate text-encoder or VAE disaggregation only if stage share, transfer
-   volume, reuse/concurrency, and independent scaling justify it. Tiling,
-   offload, or patch parallelism is not disaggregation.
-
-Do not combine independent optimizations into one performance claim. Preserve
-raw before/after runs with fixed workload and warmup policy.
-
-### Gate 7: Make serving interruptible and load-stable
-
-Treat request-mode batching and step-wise execution as separate capabilities:
-
-- request batching requires `supports_request_batch = True` and
-  `DiffusionRequestBatch -> list[DiffusionOutput]`, exactly one output per
-  request;
-- step execution requires the complete `SupportsStepExecution` contract:
-  `prepare_encode`, `denoise_step`, `step_scheduler`, and `post_decode`.
-
-Keep all mutable scheduler, RNG, latent, mask, cache, and step state request
-scoped. First validate `--step-execution --max-num-seqs 1` and step-boundary
-abort; only then test heterogeneous multi-request waves. Step continuous
-batching is experimental and is not automatically compatible with Cache-DiT.
-Before recommending it, predeclare a useful case and success threshold, then
-A/B it against request mode under the same arrival process. Structural support
-or a generic bridge is not latency, throughput, or cancellation evidence for a
-model.
-
-Test queued and in-flight abort, client disconnect, timeout, OOM, worker error,
-and restart. Require one terminal result, idempotent cleanup, no post-decode
-after abort, no cache/temp/VRAM/request-ID leak, and a successful next request.
-Inject late worker results/exceptions after cancellation and prove the result
-pump stays alive instead of raising `InvalidStateError`. For large batched or
-long-window video outputs, freeze dtype, range, layout, contiguity, ownership,
-payload size, serializer/codec limits, and offline-versus-HTTP semantics.
-Validate device-side output preparation, D2H/IPC or shared handles, remote
-encoding, event-loop responsiveness, and client materialization as separate
-stages, including abort and consumer failure cleanup.
-A model/VAE callback that publishes ordered chunks is only a producer contract;
-it is not transport, backpressure, cancellation, public streaming, or
-time-to-first-frame evidence. Distinguish complete-response faster-than-playback
-(`client E2E / output duration <= 1`) from streaming and report first-chunk,
-steady cadence, finalization, and complete-artifact latency separately.
-Run below-, near-, and above-saturation mixed-RPS soaks and report success/error
-rate, throughput, queue time, memory slope, temp growth, and worker health.
-Report p50/p95/p99 only from a declared arrival model with enough measured
-requests for the claimed percentile. See
-[serving and CI validation](references/production-validation.md).
-
-### Gate 8: Publish recipes and four independent CI tracks
-
-For every target vendor/card/topology, publish exact environment, serve/deploy
-command, one complete JSON or multipart curl per supported task, expected
-output checks, benchmark command, warmup/repeat/concurrency policy, raw metrics,
-per-rank HBM/host PSS, accuracy artifact, and limitations. Mark each
-CUDA/ROCm/NPU/XPU row `validated`, `unsupported`, or `not tested`; never inherit
-support from the platform abstraction or another card. Re-run DLO on each
-small-HBM recipe.
-
-Maintain separate CI gates:
-
-1. Function: strict load, API/offline positive and negative contracts.
-2. Accuracy: fixed reference revision/assets/seed/schedule and scoped tolerance.
-3. Performance: fixed best deployment plus memory-constrained/DLO row, raw JSON,
-   explicit warmup, enough samples for each claimed statistic, and owned
-   regression thresholds.
-4. Reliability: long mixed-RPS soak, abort/disconnect/fault cleanup, memory and
-   temporary-resource trend.
-
-## Production Definition of Done
-
-A model is production-ready only when:
-
-- every official advertised task passes API parity, offline/online parity,
-  strict loading, fixed-reference quality, and negative validation;
-- the recommended deployment row passes correctness, isolation, abort/error
-  cleanup, benchmark, and soak gates on named hardware;
-- online FP8 and DLO are each implemented and either validated in scoped rows
-  or explicitly limited/unsupported with fail-fast behavior;
-- per-request cache quality tiers have measured speed/quality frontiers and
-  request isolation, if advertised;
-- CUDA/ROCm/NPU/XPU recipes describe evidence rather than inferred support;
-- Function, Accuracy, Performance, and Reliability CI have owners, artifacts,
-  and actionable failure output;
-- accelerated paths identify every precision/quality trade-off, and the raw
-  offline plus online encoded output contracts are versioned and tested;
-- all unverified task/backend/cache/quant/offload/topology/hardware combinations
-  remain `not tested` and are not presented as supported.
-
-Day-0 support is still a valid milestone, but title, docs, and matrix must say
-which representative task passed and which production gates remain.

.claude/skills/production-add-diffusion-model/agents/openai.yaml

@@ -1,4 +0,0 @@
-interface:
-  display_name: "Production Add Diffusion Model"
-  short_description: "Productionize vLLM-Omni diffusion models"
-  default_prompt: "Use $production-add-diffusion-model to take this integrated diffusion model from Day-0 support to evidence-backed production readiness."

.claude/skills/production-add-diffusion-model/references/api-and-recipes.md

@@ -1,315 +0,0 @@
-# API Contract and Hardware Recipes
-
-## Contents
-
-1. [Freeze the upstream contract](#freeze-the-upstream-contract)
-2. [Validate before side effects](#validate-before-side-effects)
-3. [Task request templates](#task-request-templates)
-4. [Serving benchmark template](#serving-benchmark-template)
-5. [Hardware recipe contract](#hardware-recipe-contract)
-6. [Best deployment selection](#best-deployment-selection)
-
-## Freeze the upstream contract
-
-Pin three revisions independently:
-
-- official source implementation commit or package version;
-- checkpoint/model-card revision and partition;
-- vLLM-Omni target commit.
-
-Build a table before editing code. One row is one official task/partition.
-
-| Field | Required content |
-|---|---|
-| Task and partition | Official task name, checkpoint subdirectory, task selection rules |
-| Call contract | Constructor and call arguments, types, required/optional, official defaults |
-| Prompt/input | Prompt count/length, modality, MIME, order, count, decoded shape |
-| Size/time | Width/height alignment, pixels, frames, duration, FPS, start offset |
-| Denoise | Scheduler, sigma schedule, steps, CFG/guidance, seed behavior |
-| Output | Count, format, codec/sample rate, return type |
-| API | Offline mapping, sync endpoint, async endpoint/job lifecycle |
-| Rejection | Status code and stable error class/message for every invalid boundary |
-
-Official API parity includes limits and defaults, not just names. Do not add a
-generic default that changes a distilled checkpoint's fixed schedule, or accept
-an input combination the official task rejects.
-
-For every accepted boundary, add the neighboring rejected values. Examples:
-`max_images` and `max_images + 1`, smallest/largest legal duration, aligned and
-misaligned dimensions, omitted and illegal steps, one and too many outputs.
-
-## Validate before side effects
-
-Use one normalization/validation path for offline, sync, and async requests.
-The ordering must be:
-
-```text
-parse -> normalize aliases -> validate task/source matrix -> validate declared
-limits -> stream with byte caps -> inspect/decode with frame/pixel/duration caps
--> persist only if needed -> submit to engine
-```
-
-Fail before download, persistence, job creation, or engine submit whenever the
-available metadata is sufficient. For streamed uploads, enforce:
-
-- total reference count and per-modality count before reading bodies;
-- per-file bytes while streaming;
-- aggregate bytes across all files;
-- decoded frames, duration, pixels, and media type before engine submission.
-
-On rejection, close streams and remove every partial temporary resource. Use
-HTTP 400 for invalid task/field combinations and 413 for payload limits. Test
-both sync and async paths; an invalid async request must not create a job ID.
-
-Do not trust client MIME alone. Sniff/validate content and keep ordered repeated
-multipart fields ordered. Avoid logging prompts, raw references, signed URLs,
-or base64 payloads.
-
-## Task request templates
-
-These are endpoint-shape templates, not model recipes. Replace placeholders
-with the exact official defaults and validated assets for the target model.
-Every production recipe must include all advertised tasks and an expected
-output check.
-
-### Text to image: JSON
-
-```bash
-curl --fail-with-body -sS -X POST http://127.0.0.1:8091/v1/images/generations \
-  -H 'Content-Type: application/json' \
-  -d '{
-    "model": "<model>",
-    "prompt": "<validated prompt>",
-    "size": "1024x1024",
-    "num_inference_steps": 30,
-    "seed": 42,
-    "response_format": "b64_json"
-  }' | jq -er '.data[0].b64_json' | base64 -d > output.png
-file output.png
-```
-
-### Image edit: multipart
-
-```bash
-curl --fail-with-body -sS -X POST http://127.0.0.1:8091/v1/images/edits \
-  -F 'model=<model>' \
-  -F 'prompt=<validated edit prompt>' \
-  -F 'image=@/path/to/reference.png;type=image/png' \
-  -F 'size=1024x1024' \
-  -F 'num_inference_steps=30' \
-  -F 'seed=42' \
-  -F 'output_format=png' \
-  | jq -er '.data[0].b64_json' | base64 -d > edited.png
-file edited.png
-```
-
-Use repeated `image` fields only if the model's official input matrix allows
-multiple ordered sources. Never describe a file upload as JSON-only.
-
-### Public request fields versus internal sampling fields
-
-Use the field exposed by the target revision's endpoint schema; do not rename
-it from the pipeline's internal attribute. For example, the current video JSON
-and multipart contracts expose `extra_params`, while serving translates that
-object into `DiffusionSamplingParams.extra_args`. Other request paths may
-expose canonical `extra_args` or nest it under `extra_body`. Inspect the exact
-Pydantic model/FastAPI form dependency and exercise the generated curl before
-publishing a recipe. A deprecation warning in a different endpoint is not
-evidence that an unrecognized multipart form field works here.
-
-Current endpoint map (re-check it at the target commit):
-
-| Endpoint | Public model-specific field |
-|---|---|
-| `/v1/videos`, `/v1/videos/sync` | Multipart `extra_params` JSON string |
-| `/v1/images/generations` | JSON `extra_params` object |
-| `/v1/chat/completions` diffusion | `extra_body.extra_args` |
-| `/v1/images/edits` | Declared typed form fields only |
-| `/v1/audio/generate` | Declared typed JSON fields only |
-
-Prefer declared top-level fields. Use a generic model-specific envelope only
-when the endpoint actually exposes it.
-
-### Text to video: multipart
-
-```bash
-curl --fail-with-body -sS -X POST http://127.0.0.1:8091/v1/videos/sync \
-  -H 'Accept: video/mp4' \
-  -F 'model=<model>' \
-  -F 'prompt=<validated prompt>' \
-  -F 'size=1280x720' \
-  -F 'num_frames=81' \
-  -F 'fps=16' \
-  -F 'num_inference_steps=30' \
-  -F 'seed=42' \
-  -F 'extra_params={"task":"<official-task>"}' \
-  -o output.mp4
-ffprobe -v error -show_entries stream=codec_name,width,height,r_frame_rate \
-  -of json output.mp4
-```
-
-### Image/video to video: multipart
-
-```bash
-curl --fail-with-body -sS -X POST http://127.0.0.1:8091/v1/videos/sync \
-  -H 'Accept: video/mp4' \
-  -F 'model=<model>' \
-  -F 'prompt=<validated prompt>' \
-  -F 'num_frames=81' \
-  -F 'fps=16' \
-  -F 'num_inference_steps=30' \
-  -F 'seed=42' \
-  -F 'extra_params={"task":"<official-task>","start_time_seconds":0}' \
-  -F 'input_reference=@/path/to/reference.png;type=image/png' \
-  -o i2v.mp4
-
-curl --fail-with-body -sS -X POST http://127.0.0.1:8091/v1/videos/sync \
-  -H 'Accept: video/mp4' \
-  -F 'model=<model>' \
-  -F 'prompt=<validated prompt>' \
-  -F 'num_frames=81' \
-  -F 'num_inference_steps=30' \
-  -F 'seed=43' \
-  -F 'extra_params={"task":"<official-task>","start_time_seconds":0}' \
-  -F 'input_reference=@/path/to/reference.mp4;type=video/mp4' \
-  -o v2v.mp4
-```
-
-For multiple references, repeat the model's accepted multipart field in
-official order. Include complete downloadable or repository fixtures plus
-SHA256 hashes. A placeholder-only recipe is not runnable evidence.
-
-### Text to audio: JSON
-
-```bash
-curl --fail-with-body -sS -X POST http://127.0.0.1:8091/v1/audio/generate \
-  -H 'Content-Type: application/json' \
-  -d '{
-    "model": "<model>",
-    "input": "<validated audio prompt>",
-    "audio_length": 10.0,
-    "num_inference_steps": 100,
-    "seed": 42,
-    "response_format": "wav"
-  }' -o output.wav
-ffprobe -v error -show_entries stream=codec_name,sample_rate,channels \
-  -of json output.wav
-```
-
-Use `/v1/audio/generate` for general diffusion audio. Do not substitute the
-speech API unless the model is actually served through the speech contract.
-
-### Async video lifecycle
-
-Alongside `/v1/videos/sync`, include `POST /v1/videos`, status polling,
-content retrieval, cancellation/abort if public, and cleanup assertions. The
-same request must normalize to the same engine sampling parameters in both
-modes.
-
-## Serving benchmark template
-
-Run a smoke first, then fixed-concurrency and arrival-rate tests. Video task
-names for the harness are `t2v`, `i2v`, `ti2v`, or `v2v`; model-specific task
-selection belongs in `--extra-body` when required.
-
-```bash
-python benchmarks/diffusion/diffusion_benchmark_serving.py \
-  --base-url http://127.0.0.1:8091 \
-  --endpoint /v1/videos \
-  --model '<model>' \
-  --dataset random \
-  --task t2v \
-  --num-prompts 100 \
-  --width 1280 --height 720 \
-  --num-frames 81 --fps 16 \
-  --num-inference-steps 30 \
-  --request-rate 0.2 \
-  --max-concurrency 4 \
-  --warmup-requests 4 \
-  --warmup-concurrency 4 \
-  --extra-body '{"extra_params":"{\"task\":\"<official-task>\"}"}' \
-  --output-file result.json
-```
-
-The video backend currently stringifies each multipart value. Pre-serialize
-the nested `extra_params` object as above; passing it as a nested object would
-produce Python dict syntax rather than valid JSON. If the target revision
-changes the backend to JSON-encode dict/list values, update and smoke-test this
-command against that revision.
-
-For i2v/v2v, use the harness's validated dataset/trace path or provide the
-documented media source; do not silently benchmark t2v and label it i2v. Keep
-prompt, assets, seed, dimensions, frames, steps, guidance, warmup, concurrency,
-and arrival process identical across A/B runs.
-
-Keep three benchmark lanes distinct:
-
-1. lossless runtime A/B with the released schedule/precision/attention policy;
-2. accelerated-path A/B that changes one adapter, quantization, cache, or
-   sparsity policy and adds same-seed quality evidence;
-3. production-topology studies that vary placement or parallelism and report a
-   latency/throughput/memory frontier rather than a kernel speedup.
-
-For a fixed single-request A/B, retain every measured run and report median or
-mean with range after an explicit warmup; do not infer p95/p99 from a few
-repetitions. Tail latency requires a declared arrival process, request count,
-concurrency, and enough successful samples. Reconcile client E2E with queue,
-encoder, denoise, video/audio decode, D2H/IPC, codec, and residual timings.
-
-For generated media, define `real-time` rather than relying on the label. A
-complete-response claim uses `client E2E / validated output duration <= 1` and
-does not imply streaming or low time-to-first-frame. Report first chunk/fragment
-and cadence separately when a public streaming route exists. Never add gains
-across benchmark lanes with different schedules, prompts, seeds, artifacts, or
-topologies.
-
-The diffusion serving harness currently covers image/video task families, not
-`/v1/audio/generate`. For text-to-audio, use the target model's task-specific
-audio benchmark if one exists; otherwise add a serving harness that records
-request rate, concurrency, latency, generated-audio seconds per second, error
-rate, and output validation. Do not relabel the TTS harness or a video workload
-as diffusion-audio evidence.
-
-## Hardware recipe contract
-
-Create a separate row and runnable section for each vendor/card/topology:
-
-| Evidence | Required detail |
-|---|---|
-| Identity | Vendor, exact SKU, device count, HBM, interconnect |
-| Software | Driver, CUDA/ROCm/CANN/oneAPI, framework/container, dependency versions |
-| Source | vLLM-Omni commit, official/checkpoint revision and hashes |
-| Deployment | dtype, attention backend per role, TP/SP/CFG/HSDP/DP, cache, quant, offload |
-| Commands | Complete deploy YAML/serve command, every task curl, benchmark command |
-| Method | Warmup exclusion, repetitions or request count, concurrency, arrival distribution, duration, statistic definitions |
-| Results | Success rate, p50/p95/p99, RPS/throughput per device, stage latency |
-| Memory | Load/materialize, resident, encode, denoise, decode, transient per-rank HBM and host PSS |
-| Quality | Metric/tolerance, artifact links/hashes, temporal/audio checks |
-| Output | Raw/offline dtype, range, layout and ownership; online codec, payload bytes, transport route and client boundary |
-| Limits | `validated`/`limited`/`unsupported`/`not tested`, fallback/rejection behavior |
-
-Use current paths such as `recipes/<vendor>/`, `recipes/README.md`, supported
-models, and feature compatibility tables. Top-level documentation must link to
-the scoped matrix; it must not use an unqualified checkmark that hides a ROCm,
-NPU, XPU, task, topology, or dtype limitation.
-
-DLO evidence is per card, especially on small-HBM devices. A DLO result on one
-CUDA card does not establish another CUDA SKU, ROCm, NPU, or XPU support.
-
-## Best deployment selection
-
-Benchmark a correctness-approved candidate matrix, not every theoretical
-combination. Choose the recommended row by the production objective—latency,
-throughput, cost, or small-HBM fit—and document that objective.
-
-Do not recommend a row until it passes:
-
-- all advertised task/API contracts;
-- fixed-reference quality;
-- request isolation and abort/error cleanup;
-- sustained arrival-rate tests;
-- per-rank HBM and host PSS limits;
-- hardware-specific accuracy and performance CI.
-
-Keep the most memory-constrained DLO row even when it is not the fastest; it is
-a separate production recipe, not a failed latency candidate.

.claude/skills/production-add-diffusion-model/references/feature-patterns.md

@@ -1,462 +0,0 @@
-# Production Feature Patterns
-
-## Contents
-
-1. [Compatibility matrix](#compatibility-matrix)
-2. [Online FP8](#online-fp8)
-3. [Strict fused-weight loading](#strict-fused-weight-loading)
-4. [Distributed layerwise offload](#distributed-layerwise-offload)
-5. [Per-request Cache-DiT](#per-request-cache-dit)
-6. [Combination gates](#combination-gates)
-
-## Compatibility matrix
-
-Create rows at the granularity below. Add evidence links and a reason for every
-non-validated state.
-
-| Task/shape | Execution mode/capacity | Backend/layout | Quant | Cache policy | Offload | Topology | Hardware/dtype | Output contract/transport | State | Evidence |
-|---|---|---|---|---|---|---|---|---|---|---|
-| `<task>/<shape>/<schedule>` | serial request / 1 | SDPA, padded | BF16 | none | resident | 1 device | `<card>` BF16 | raw float / local | `not tested` | — |
-| `<task>/<shape>/<schedule>` | step / N | `<fast>`, packed | BF16 | none | resident | `<TP/SP>` | `<card>` BF16 | encoded / subprocess | `not tested` | — |
-| `<task>/<shape>/<schedule>` | step / N | `<fast>`, packed | FP8 | high | DLO no-AG | `<TP/SP>` | `<card>` | device uint8 / SHM | `not tested` | — |
-
-Initialize every row as `not tested`; the table is a work queue, not evidence.
-Promote the dense BF16 row to the oracle only after its scoped parity passes.
-Add one axis at a time. If the runtime cannot
-enforce a known-incompatible combination, add construction/admission
-validation before writing a recipe.
-
-## Online FP8
-
-### Component routing
-
-The public builder accepts one method or a longest-prefix component map:
-
-```python
-from vllm_omni.quantization import build_quant_config
-
-config = build_quant_config({
-    "transformer": {
-        "method": "fp8",
-        "ignored_layers": ["transformer.final_layer"],
-    },
-    "text_encoder": None,
-    "vae": None,
-    "default": None,
-})
-
-assert config.resolve("transformer.blocks.0.attn.qkv_proj") is not None
-assert config.resolve("text_encoder.layers.0.mlp") is None
-assert config.resolve("vae.decoder.conv_out") is None
-```
-
-Use actual runtime prefixes. Multi-DiT or nested pipelines may not use the
-generic names `transformer` and `vae`. A prefix that falls through to a default
-is not component validation. Add tests for every included and ignored prefix.
-
-For CLI serving, first validate resident DiT-only FP8:
-
-```bash
-vllm serve '<model>' --omni --quantization fp8 --max-num-seqs 1
-```
-
-For scoped routing:
-
-```bash
-vllm serve '<model>' --omni \
-  --diffusion-quantization-config \
-  '{"<dit-runtime-prefix>":{"method":"fp8","ignored_layers":["<exact-linear-prefix>"]},"<vae-runtime-prefix>":null,"default":null}' \
-  --max-num-seqs 1
-```
-
-Do not publish these placeholders. A recipe must contain the target model's
-verified prefixes.
-
-### Quantizable module wiring
-
-Pass `quant_config` and a stable prefix through every vLLM linear. Keep
-precision-sensitive modulation/norm layers safe unless proven otherwise.
-
-```python
-from vllm.model_executor.layers.activation import SiluAndMul
-from vllm.model_executor.layers.linear import (
-    MergedColumnParallelLinear,
-    QKVParallelLinear,
-    RowParallelLinear,
-)
-
-self.qkv_proj = QKVParallelLinear(
-    hidden_size=hidden_size,
-    head_size=head_dim,
-    total_num_heads=num_heads,
-    total_num_kv_heads=num_kv_heads,
-    bias=False,
-    quant_config=quant_config,
-    prefix=f"{prefix}.attn.qkv_proj",
-)
-self.gate_up_proj = MergedColumnParallelLinear(
-    hidden_size,
-    [intermediate_size, intermediate_size],
-    bias=False,
-    quant_config=quant_config,
-    prefix=f"{prefix}.mlp.gate_up_proj",
-)
-self.act_fn = SiluAndMul()
-self.down_proj = RowParallelLinear(
-    intermediate_size,
-    hidden_size,
-    bias=False,
-    input_is_parallel=True,
-    quant_config=quant_config,
-    prefix=f"{prefix}.mlp.down_proj",
-)
-```
-
-Set required checkpoint parameters to fail rather than silently initialize if
-the current loader supports `missing_param_init = "error"`.
-
-### FP8 evidence
-
-For each task/hardware row, capture:
-
-- startup proves the FP8 quant method is attached to intended linear modules;
-- no unexpected BF16 fallback and no meta/uninitialized parameters;
-- same-seed component, trajectory, and final-artifact comparison with BF16;
-- HBM at load, resident, encode, denoise, decode, and peak;
-- cold load time; fixed-work warm-latency raw runs; and serving p50/p95/p99 plus
-  throughput only from a declared arrival load with enough samples;
-- named ignored layers and why their BF16 retention is required.
-
-DiT FP8 evidence does not cover the text encoder or VAE. CUDA evidence does not
-cover ROCm/NPU/XPU. A pre-quantized checkpoint is a different loading path from
-online FP8 and needs its own state. If it is also pruned, rotated, distilled, or
-adapter-modified, report that model delta explicitly; BF16-versus-artifact
-quality and speed are deployment comparisons, not pure quantization ablations.
-
-## Strict fused-weight loading
-
-Never use `param.data.copy_()` for quantizable vLLM parameters. Transform the
-checkpoint layout before invoking the parameter loader so the online quant
-loader remains outermost:
-
-```python
-from vllm.model_executor.model_loader.weight_utils import default_weight_loader
-
-param = params[target_name]
-weight_loader = getattr(param, "weight_loader", default_weight_loader)
-
-if target_name.endswith(".qkv_proj.weight"):
-    packed_qkv = reorder_checkpoint_qkv(checkpoint_weight)
-    weight_loader(param, packed_qkv)
-elif target_name.endswith(".gate_up_proj.weight"):
-    gate, up = checkpoint_weight.chunk(2, dim=0)
-    weight_loader(param, gate, 0)
-    weight_loader(param, up, 1)
-else:
-    weight_loader(param, checkpoint_weight)
-```
-
-Track source shards per fused destination:
-
-```python
-expected = {
-    "blocks.0.attn.qkv_proj.weight": {"q", "k", "v"},
-    "blocks.0.mlp.gate_up_proj.weight": {0, 1},
-}
-seen = {name: set() for name in expected}
-
-# After mapping/loading each source:
-seen[target_name].add(shard_id)
-
-incomplete = {
-    name: sorted(shards - seen[name], key=str)
-    for name, shards in expected.items()
-    if shards - seen[name]
-}
-if incomplete:
-    raise RuntimeError(f"incomplete fused checkpoint parameters: {incomplete}")
-```
-
-Also compare retained model parameters with the returned loaded set. Explicit
-checkpoint ignores need a reason and test; an unknown or missing weight is not
-an ignore policy.
-
-Load-time adapter fusion creates a dedicated model, not a request-switchable
-LoRA. Pin the base and adapter revisions, validate every low-rank and full-rank
-delta target, freeze the adapter-declared schedule/task, and fuse before
-sharding only when the loader contract proves identical rank-local weights.
-Reject offload or host-weight paths that bypass that fusion rather than serving
-the unfused base model silently.
-
-## Distributed layerwise offload
-
-### Declare component topology
-
-Use `SupportsComponentDiscovery` and `OffloadPlan`. Validate all dotted paths
-at construction/test time because discovery may otherwise warn and skip.
-
-Treat a future/requested `--layerwise-offload-components` selector as a public
-API only if it exists in the target revision. Today, express component topology
-with `OffloadPlan` (`on_demand_component_paths`, `block_attrs`,
-`encoder_block_attrs`, `resident_dit_paths`, and `offload_submodules`). Do not
-invent a CLI flag or claim component-selective DLO from discovery declarations
-alone; validate the selector separately when it lands.
-
-```python
-from operator import attrgetter
-
-import torch
-
-def assert_offload_path(root, path):
-    value = attrgetter(path)(root)
-    if not isinstance(value, torch.nn.Module):
-        raise TypeError(f"offload path {path!r} is not an nn.Module")
-    return value
-
-for path in (
-    *pipeline._dit_modules,
-    *pipeline._encoder_modules,
-    *pipeline._vae_modules,
-    *pipeline._offload_plan.on_demand_component_paths,
-):
-    assert_offload_path(pipeline, path)
-```
-
-For `block_attrs`, resolve the DiT first and then each declared block attribute.
-Require an indexable block container with at least one `nn.Module`. Validate
-`offload_submodules`, `resident_dit_paths`, and `encoder_block_attrs` similarly.
-
-### Keep host storage loader-owned
-
-Current DLO accepts a loader-produced `HostWeightPlan`. Pipeline authors should
-not instantiate this plan or add ad hoc mmap capability flags. The loader must
-preflight complete runtime/checkpoint bindings, names, shapes, dtypes, persistent
-buffers, and represented transforms before it skips ordinary materialization.
-The exact accepted plan is consumed once by DLO; a rejected plan records an
-observable fallback reason and continues through the ordinary loader.
-
-Direct checkpoint mmap currently requires TP1 without HSDP or online
-quantization. TP>1 falls back to the ordinary TP-aware loader and may feed DLO
-AllGather or no-AllGather; the current design records a bounded DP2xTP2
-AllGather smoke, but that path does not receive direct-mmap host-page sharing.
-Per-tensor online FP8 must use the ordinary loader. Current revisions can admit
-its finalized weight/scale layout to DLO AllGather, including transposed runtime
-weights, while unsupported online quantizers still fail closed. Direct mmap
-remains unavailable, so capture the temporary full-model host materialization
-before rank sharding.
-
-Host Weight Runtime is a distinct opt-in path. Current final-layout consumers
-use no-AllGather DLO and exact model-declared BF16 representations. In
-`preferred` mode, consume an exact local hit or canonically load and publish for
-a future startup; in `required` mode, consume only and fail on a miss or unusable
-artifact. HWR must not interact with DLO AllGather, online quantization, HSDP,
-LoRA/adapted weights, or an unrecognized load format unless the target revision
-adds an exact producer/restore contract. It is immutable node-local CPU backing,
-not zero-copy GPU execution; the DLO transport still owns staging or direct H2D.
-Qualify identity inputs, cold population, warm reuse, atomic concurrent
-publication, source digests, corruption/quarantine, lease cleanup, capacity,
-node-local PSS, H2D, and E2E latency. A host-memory saving that materially
-regresses transfer or request latency is a separate memory-first deployment.
-
-### DLO deployment modes
-
-Treat these paths separately:
-
-| Path | Weight/runtime behavior | Required boundaries |
-|---|---|---|
-| DLO AllGather | Rank-sharded pinned host tensors; reconstruct layer through collective | TP>1 uses ordinary TP-aware loader output; HSDP and unsupported online quantizers are rejected; finalized per-tensor online FP8 is eligible only when recognized by the target revision; concurrent ranks must participate consistently |
-| DLO no-AllGather | Loader-approved checkpoint mmap or ordinary runtime tensors; each rank streams a complete block | Direct mmap is TP1/non-HSDP/non-online-quant only; TP/HSDP/online quant use ordinary runtime tensors and require scoped E2E |
-| SP + DLO | SP group can supply the DLO collective group | Packed boundaries and collective order require E2E |
-
-Single-stage examples:
-
-```bash
-# SP + DLO AllGather candidate; validate exact model/card before publishing.
-vllm serve '<model>' --omni \
-  --enable-distributed-layerwise-offload \
-  --usp 4 \
-  --max-num-seqs 1
-
-# TP + DLO rank-local candidate; not a support statement.
-vllm serve '<model>' --omni \
-  --tensor-parallel-size 2 \
-  --enable-distributed-layerwise-offload \
-  --dlo-no-use-allgather \
-  --max-num-seqs 1
-```
-
-Under `--omni`, configure DP in a deploy YAML rather than passing vLLM DP CLI
-flags:
-
-```yaml
-pipeline: <registered-pipeline>
-async_chunk: false
-data_parallel_size: 4
-stages:
-  - stage_id: 0
-    devices: "0,1,2,3"
-    max_num_seqs: 1
-    enable_distributed_layerwise_offload: true
-    dlo_use_allgather: true
-    parallel_config:
-      tensor_parallel_size: 1
-      sequence_parallel_size: 1
-```
-
-```bash
-vllm serve '<model>' --omni --deploy-config /path/to/dlo_dp4.yaml
-```
-
-Keep the YAML next to the validated recipe. Match its schema to the target
-revision; do not assume a model accepts another pipeline's deploy config.
-
-### DLO validation sequence
-
-1. Resident BF16 reference.
-2. Ordinary layerwise offload parity.
-3. DLO enable, warmup, same-seed generation, disable/restart.
-4. AllGather and no-AllGather separately.
-5. Concurrent requests with different prompts and identical collective-affecting
-   parameters; then reject or schedule incompatible steps/shapes safely.
-6. Queued/in-flight abort, error, idle rank, worker exit, and next request.
-7. TP, SP, cache, compile, online FP8 one axis at a time.
-8. Loader-plan selection/fallback reason, cold/warm storage lifecycle, and
-   corruption/stale-entry recovery when mmap/cache backing is advertised.
-9. Replica-local request preparation plus DLO-group-only weight collectives in
-   DP; exercise concurrent replicas to catch accidental WORLD rendezvous.
-10. Sweep resident block counts; publish raw latency/HBM pairs, dominated
-    points, and the non-dominated Pareto frontier.
-11. Per-rank HBM, host PSS for the full process tree, H2D and collective trace.
-
-On a small-HBM card, measure transient encode/VAE peaks as well as resident DiT
-weights. If a non-DiT component still exceeds HBM, combine only independently
-validated on-demand component staging, VAE tiling/patching, or another topology;
-do not hide the remaining peak behind the phrase “DLO enabled.”
-
-## Per-request Cache-DiT
-
-### Policy and lifecycle skeleton
-
-First verify that the target revision contains the shared protocol/runtime.
-If not, follow the nearest current model's lifecycle without inventing a new
-public API.
-
-The following is a **serial/exclusive request-mode sketch only**. Pipeline-wide
-hooks are mutable; concurrent requests need an admission/batching key and
-runner-owned transition serialization before this shape is safe.
-
-```python
-import torch.nn as nn
-
-from vllm_omni.diffusion.cache.cachedit import (
-    CacheDiTBackend,
-    CacheDiTRequestSpec,
-    RequestScopedCacheDiTRuntime,
-)
-
-class MyPipeline(nn.Module):
-    def __init__(self, *args, **kwargs):
-        super().__init__()
-        # ... components ...
-        self._cache_dit_runtime = RequestScopedCacheDiTRuntime(self)
-
-    def adopt_cache_dit_backend(self, backend: CacheDiTBackend) -> None:
-        self._cache_dit_runtime.adopt(
-            backend,
-            installation_key="my_model.generic",
-        )
-
-    def is_cache_dit_enabled(self) -> bool:
-        return self._cache_dit_runtime.is_enabled
-
-    def _cache_spec(self, quality, steps):
-        if quality == "lossless":
-            return None
-        if quality == "high":
-            return CacheDiTRequestSpec(
-                installation_key="my_model.high.v1",
-                cache_config=self._validated_high_config,
-                num_inference_steps=steps,
-            )
-        raise ValueError(f"unsupported quality tier: {quality!r}")
-
-    def forward(self, req):
-        quality, steps = validate_and_resolve_request(req)
-        self._cache_dit_runtime.prepare(self._cache_spec(quality, steps))
-        return self._run_validated_request(req)
-```
-
-The snippet shows the model-owned transition for exclusive execution. Put
-disable/restore handling in the runtime/runner lifecycle that owns success,
-exception, disconnect, and asynchronous abort; a `try/finally` inside
-`forward()` alone cannot observe every server cancellation boundary.
-
-The `installation_key` must include every policy dimension that changes hook
-installation; changes in step count can use runtime refresh. `None` disables
-installed hooks. Do not mutate the global startup cache config for a request.
-
-Centralize cleanup in the owning request/runner boundary. An exception, abort,
-disconnect, or admission failure must not leave a changed hook policy visible
-to the next request. The exact owner depends on the target revision; add a
-failure-injection test rather than relying on `forward()` alone to observe
-asynchronous abort.
-
-Example model-specific request form after calibration:
-
-```bash
-curl --fail-with-body -sS -X POST http://127.0.0.1:8091/v1/videos/sync \
-  -F 'model=<model>' \
-  -F 'prompt=<prompt>' \
-  -F 'quality=lossless' \
-  -F 'num_inference_steps=<validated-steps>' \
-  -o lossless.mp4
-
-curl --fail-with-body -sS -X POST http://127.0.0.1:8091/v1/videos/sync \
-  -F 'model=<model>' \
-  -F 'prompt=<prompt>' \
-  -F 'quality=high' \
-  -F 'num_inference_steps=<validated-steps>' \
-  -o high.mp4
-```
-
-Do not expose these tier names merely because another model uses them.
-
-### Cache-DiT evidence
-
-For every tier/task/shape/schedule:
-
-- show real cache hits/skipped blocks, not only “backend enabled” logs;
-- measure fixed-work speed and quality against lossless/native;
-- publish a speed/quality frontier and chosen tier mapping;
-- alternate lossless/high/lossless and vary steps to prove restore/refresh;
-- interleave tasks and shapes; run concurrent requests only when scheduling
-  guarantees exclusive compatible hook state;
-- inject validation error, denoise error, disconnect, and abort, then prove the
-  next request starts with its requested policy;
-- bound any cached tensors and clear request-local state.
-
-## Combination gates
-
-Start every combination as `not tested`.
-
-| Combination | Default production posture |
-|---|---|
-| Direct checkpoint mmap + TP>1/HSDP/online quant | Preflight falls back to the ordinary loader; do not claim direct-mmap savings |
-| Per-tensor online FP8 + DLO AllGather | Generic compatibility exists for finalized weights/scales; each model/card/topology remains a candidate until E2E, and other online quantizers fail closed |
-| Online FP8 + DLO no-AllGather | Candidate only after model/card/topology E2E |
-| TP>1 + DLO AllGather | Ordinary TP-aware loader only; bounded DP2xTP2 smoke exists, but each new model/card/topology still needs E2E |
-| TP>1 + DLO no-AllGather | Ordinary TP-aware loader only; candidate with limited generic coverage |
-| HSDP + DLO AllGather | Reject; it would double-shard HSDP-managed parameters |
-| HSDP + DLO no-AllGather | Configuration-compatible candidate with limited E2E coverage |
-| Cache-DiT + online FP8 | Separate trajectory, hit-rate, HBM, latency test |
-| Cache-DiT + DLO | Verify hooks, streamed blocks, memory peaks, abort cleanup |
-| Cache-DiT + step execution | Do not advertise until lifecycle/batching support is explicit |
-| Sparse attention + Ring | Verify backend execution; reject silently ignored sparse settings |
-| Load-time fused adapter + offload/HWR | Reject unless the selected loader path applies and validates the same fusion before sharding/storage |
-| Packed attention + any topology | Unequal-sample boundary parity is mandatory |
-| Device-side uint8 preparation + offline caller | Version the dtype/range/layout change; HTTP MP4 parity does not preserve the raw tensor contract |
-| Device-side preparation + remote codec | Validate route selection, strided/contiguous layouts, payload bytes, ordering, fallback, and encoded-media parity |
-
-A startup-only test never upgrades a combination. Require request output,
-parity/quality, actual fast-path evidence, resource cleanup, and a benchmark on
-the named hardware.

.claude/skills/production-add-diffusion-model/references/performance-patterns.md

@@ -1,481 +0,0 @@
-# Performance Patterns and Code Examples
-
-## Contents
-
-1. [Measurement loop](#measurement-loop)
-2. [Faster BF16 attention](#faster-bf16-attention)
-3. [Sparse attention](#sparse-attention)
-4. [Fusion-first operator patterns](#fusion-first-operator-patterns)
-5. [Remove redundant computation](#remove-redundant-computation)
-6. [USP communication optimization](#usp-communication-optimization)
-7. [Text encoder and VAE disaggregation](#text-encoder-and-vae-disaggregation)
-8. [Performance acceptance](#performance-acceptance)
-
-## Measurement loop
-
-Do not start with a list of optimizations. Start with a fixed correctness and
-performance workload:
-
-```text
-model/checkpoint revision + prompt/media hashes + seed + dimensions/frames +
-scheduler/sigma/steps/guidance + task + dtype + backend + topology + hardware
-```
-
-Capture:
-
-- stage time: load, encode, conditioning, denoise, VAE decode/postprocess;
-- GPU trace: kernel duration/count, launch gaps, allocations, H2D, collectives;
-- CPU trace: preprocessing, per-layer sync, Python dispatch, temporary files;
-- memory: per-rank HBM peaks and process-tree host PSS;
-- output: device preparation, D2H/IPC, payload bytes, codec wall/process CPU,
-  event-loop wait, client materialization, and signed residual;
-- serving: queue time, throughput, errors, request mix, and distribution samples.
-
-For a fixed-work single-request A/B, run one explicit warmup policy and at
-least three measured repetitions, keep every raw run, and report median or mean
-with range. Do not derive p95/p99 from three samples. For tail latency, declare
-the arrival model and collect enough successful requests for the percentile and
-confidence claimed. Implement one optimization at a time, re-run parity, and
-report both local kernel and end-to-end deltas. A kernel win that moves no E2E
-metric is not a production speed claim.
-
-Use the pipeline profiler already exposed by the target revision when
-available, and use PyTorch/CUDA/ROCm/NPU/XPU profiling tools appropriate to the
-platform. Do not force every platform through a CUDA-only workflow.
-
-## Faster BF16 attention
-
-### Shared attention wiring
-
-Use the shared role-aware attention layer and give it the true local head
-counts and QKV layout:
-
-```python
-import torch
-
-from vllm.model_executor.layers.linear import (
-    QKVParallelLinear,
-    RowParallelLinear,
-)
-from vllm_omni.diffusion.attention.layer import Attention
-
-class SelfAttention(torch.nn.Module):
-    def __init__(
-        self,
-        hidden_size,
-        head_dim,
-        num_heads,
-        num_kv_heads,
-        quant_config=None,
-        prefix="",
-    ):
-        super().__init__()
-        self.head_dim = head_dim
-        self.qkv_proj = QKVParallelLinear(
-            hidden_size=hidden_size,
-            head_size=head_dim,
-            total_num_heads=num_heads,
-            total_num_kv_heads=num_kv_heads,
-            bias=False,
-            quant_config=quant_config,
-            prefix=f"{prefix}.qkv_proj",
-        )
-        self.attention = Attention(
-            num_heads=self.qkv_proj.num_heads,
-            num_kv_heads=self.qkv_proj.num_kv_heads,
-            head_size=head_dim,
-            softmax_scale=head_dim**-0.5,
-            causal=False,
-            qkv_layout="BSND",
-            role="self",
-            prefix=prefix,
-        )
-        self.out_proj = RowParallelLinear(
-            num_heads * head_dim,
-            hidden_size,
-            bias=False,
-            input_is_parallel=True,
-            quant_config=quant_config,
-            prefix=f"{prefix}.out_proj",
-        )
-
-    def forward(self, x, attn_metadata=None):
-        qkv, _ = self.qkv_proj(x)
-        q_size = self.qkv_proj.num_heads * self.head_dim
-        kv_size = self.qkv_proj.num_kv_heads * self.head_dim
-        q, k, v = qkv.split([q_size, kv_size, kv_size], dim=-1)
-        q = q.unflatten(-1, (self.qkv_proj.num_heads, self.head_dim))
-        k = k.unflatten(-1, (self.qkv_proj.num_kv_heads, self.head_dim))
-        v = v.unflatten(-1, (self.qkv_proj.num_kv_heads, self.head_dim))
-        out = self.attention(q, k, v, attn_metadata)
-        out = out.flatten(-2)
-        out, _ = self.out_proj(out)
-        return out
-```
-
-Add Q/K norm and RoPE in the official order before the `Attention` call. Keep
-checkpoint mapping for the fused QKV and output projection complete.
-
-### Backend qualification
-
-For each role (`self`, cross-attention category, token refiner, etc.), record:
-
-- actual selected backend from logs/trace;
-- supported dtype, head size, QKV layout, mask/metadata, packed varlen behavior;
-- platform and compute capability;
-- TP/SP/Ring/AllGather-KV restrictions;
-- fallback behavior and whether fallback changes the claimed performance.
-
-Use unequal packed samples and compare with dense SDPA. Verify `cu_seqlens`,
-max sequence length, padding exclusion, modality boundaries, CFG ownership, and
-output slicing. Do not pass an `attn_mask` and assume it is consumed. Inspect
-the backend contract and trace.
-
-TRTLLM, Flash Attention, cuDNN, NPU varlen, and other backends are independent
-qualification rows. The shared `Attention` class does not make every backend
-packed-safe or faster automatically. Ring and hybrid paths require their own
-boundary parity. AllGather-KV and specific backend combinations may fail fast;
-keep that behavior visible in docs.
-
-## Sparse attention
-
-Sparse attention is a backend/model/platform optimization, not a synonym for
-low-precision dense attention. Enable it only after dense BF16 parity.
-
-For every candidate task/shape/topology:
-
-1. State the sparsity policy, selected backend/kernel, block/head dimensions,
-   supported hardware, external kernel/package revision, and fallback.
-2. Prove the sparse kernel executed and report realized sparsity; an enabled
-   flag is insufficient.
-3. Compare same-seed per-block outputs, denoise trajectory, and final artifact
-   with dense attention.
-4. Add modality-specific metrics: temporal consistency and audio/video sync for
-   video, spectral/audio quality for audio, and prompt/image metrics as relevant.
-5. Report attention time and full E2E time. Include preprocessing/index-build
-   overhead, peak memory, and the exact dense control.
-6. Validate each task and shape. Do not extrapolate a T2V result to I2V/Ref2V,
-   or NPU sparse support to CUDA/ROCm/XPU.
-
-If Ring bypasses the selected backend or a sparse setting would be silently
-ignored, reject the combination. Prefer a visible dense fallback only when the
-recipe labels the row `limited` and does not claim sparse speed.
-
-## Fusion-first operator patterns
-
-Prefer current shared/custom operators with explicit guards and native
-fallbacks. Prove parity at operator, block, trajectory, and artifact levels,
-then use a trace to prove fewer launches/bytes or lower latency.
-
-### Q/K RMSNorm + RoPE
-
-```python
-from vllm_omni.diffusion.layers.norm import RMSNorm
-from vllm_omni.diffusion.layers.rope import RotaryEmbedding, apply_rope_to_qk
-
-self.norm_q = RMSNorm(head_dim, eps=eps)
-self.norm_k = RMSNorm(head_dim, eps=eps)
-# Example only: set these booleans from the official checkpoint contract.
-use_neox_layout = False
-cos_sin_are_half_dim = True
-self.rope = RotaryEmbedding(
-    is_neox_style=use_neox_layout,
-    half_head_dim=cos_sin_are_half_dim,
-)
-
-q = self.norm_q(q)
-k = self.norm_k(k)
-q, k = apply_rope_to_qk(self.rope, q, k, (cos, sin))
-```
-
-Replace the illustrative booleans with the official layout in real code.
-Preserve partial rotary dimensions by splitting the rotated prefix and concatenating
-the pass-through suffix. If 3D cos/sin includes a batch axis, the current
-shared path assumes the values are shared across the batch; per-sample
-different positions require a proven representation/path.
-
-For packed `[tokens, heads, head_dim]` tensors with a non-interleaved
-`[cos | sin]` table, the current shared fused boundary is:
-
-```python
-from vllm_omni.diffusion.layers.fused_qk_norm_rope import fused_qk_norm_rope
-
-q, k = fused_qk_norm_rope(
-    q,
-    k,
-    self.norm_q.weight,
-    self.norm_k.weight,
-    rope_table,
-    self.norm_q.variance_epsilon,
-)
-```
-
-Its CUDA fast path currently specializes BF16 `head_dim=128` and
-`rotary_dim=96`; other valid inputs take the eager implementation. The separate
-shared RMSNorm and RotaryEmbedding still provide the general cross-platform
-baseline. Treat NPU/MUSA and other vendor fusions as independent qualification
-rows, and do not generalize a model-specific Triton kernel without compatible
-shape, layout, frequency partition, dtype, and platform evidence.
-
-### Fused QKV projection
-
-Use `QKVParallelLinear` as shown above. Qualification includes:
-
-- `num_heads` and `num_kv_heads` divisibility by TP;
-- local split sizes from the layer, never reusing global counts after TP;
-- Q/K/V checkpoint order conversion before the vLLM loader;
-- all Q, K, and V shards present;
-- quantization scale/loader mapping when FP8 or another method is enabled.
-
-### Gate-up projection + fused SwiGLU
-
-```python
-from vllm.model_executor.layers.activation import SiluAndMul
-from vllm.model_executor.layers.linear import (
-    MergedColumnParallelLinear,
-    RowParallelLinear,
-)
-
-self.gate_up_proj = MergedColumnParallelLinear(
-    input_size=hidden_size,
-    output_sizes=[intermediate_size, intermediate_size],
-    bias=False,
-    quant_config=quant_config,
-    prefix=f"{prefix}.gate_up_proj",
-)
-self.act_fn = SiluAndMul()
-self.down_proj = RowParallelLinear(
-    input_size=intermediate_size,
-    output_size=hidden_size,
-    bias=False,
-    input_is_parallel=True,
-    quant_config=quant_config,
-    prefix=f"{prefix}.down_proj",
-)
-
-gate_up, _ = self.gate_up_proj(x)
-x = self.act_fn(gate_up)
-x, _ = self.down_proj(x)
-```
-
-Map both checkpoint `gate_proj` and `up_proj` shards into the merged parameter
-and require both. A merged projection followed by `F.silu(gate) * up` is not
-the same claim as the `SiluAndMul` fused activation kernel; identify what the
-trace actually uses.
-
-### AdaLN
-
-Use a shared layer only when its mathematical/return contract matches the
-official model:
-
-```python
-from vllm_omni.diffusion.layers.adalayernorm import AdaLayerNorm
-
-self.adaln = AdaLayerNorm(
-    hidden_size,
-    elementwise_affine=False,
-    eps=1e-6,
-)
-x = self.adaln(x, scale[:, None, :], shift[:, None, :])
-```
-
-`AdaLayerNormZero`, `AdaLayerNormZeroSingle`, and continuous variants include
-different projections, broadcasts, and tuple outputs; they are not drop-in
-replacements. A shared AdaLN may have an NPU fast path while using native ops on
-CUDA/HIP/XPU. Do not call it a universal fused AdaLN kernel.
-
-For sigma schedules with a small finite set of timesteps, profile whether
-precomputing the timestep/AdaLN projection once per request is worthwhile.
-Cache keys must include the exact schedule/config/device/dtype and stay bounded.
-
-### Layout, residual, and other candidates
-
-After profiling, inspect:
-
-- bias/dropout/add or gated residual chains;
-- norm + linear or norm + modulation boundaries;
-- repeated transpose/reshape/contiguous around attention;
-- VAE normalization/activation/convolution boundaries;
-- MoE routing and fused experts for models that actually use MoE.
-
-For fused residual-plus-norm or modulation chains, preserve the unfused
-materialization boundary. If the residual was stored in BF16 before RMSNorm,
-round to BF16 and promote again inside the fused kernel; using the unrounded
-FP32 temporary changes the denoising trajectory even when the stored residual
-looks correct.
-
-Keep DLO materialize/release hooks, process-group collectives, request cache
-transitions, and cleanup outside compiled/fused regions unless lifecycle safety
-is explicitly tested. Compile only stable regions and retain eager fallback.
-
-## Remove redundant computation
-
-### Hoist request invariants
-
-Audit the denoise loop for work that depends only on the request rather than
-the current timestep:
-
-```python
-# Before the denoise loop.
-condition = self.condition_proj(text_embeddings)
-refined_condition = self.token_refiner(condition, packed_metadata)
-rope_tables = self.build_rope_tables(position_ids)
-attn_metadata = self.build_attention_metadata(layout)
-
-for step, sigma in enumerate(sigmas):
-    timestep_state = self.prepare_timestep_state(sigma)
-    noise = self.transformer(
-        latents,
-        refined_condition,
-        rope_tables=rope_tables,
-        attn_metadata=attn_metadata,
-        timestep_state=timestep_state,
-    )
-    latents = self.scheduler_step(noise, sigma, latents)
-```
-
-Candidates include prompt conditioning, token-refiner output, reference
-encoding/scans, position IDs/RoPE tables, packed masks/metadata, static CFG
-branches, and finite-schedule AdaLN projections. First prove they are invariant
-for all official tasks, LoRA/adapters, prompt-update features, shapes, and
-schedules. In continuous batching, store request-specific results on request
-state rather than the pipeline singleton.
-
-### Eliminate per-layer synchronization
-
-Avoid device-to-host scalar extraction such as `.item()` inside every layer:
-
-```python
-# Bad: forces a GPU/CPU synchronization in every attention layer.
-max_len = int(cu_seqlens[-1].item())
-
-# Better: compute validated host metadata once during request packing and pass it.
-packed = PackedLayout(
-    cu_seqlens=cu_seqlens,
-    max_seqlen=max(sample_lengths),
-)
-for block in self.blocks:
-    hidden = block(hidden, packed_layout=packed)
-```
-
-Trace to verify the synchronization disappears. Do not replace a correct
-dynamic value with a stale constant merely to remove `.item()`.
-
-### Remove unused masks and allocations
-
-If packed attention consumes `cu_seqlens` and ignores a dense mask, do not
-construct the dense mask. Reuse immutable request metadata and preallocated
-buffers when safe. Prefer direct indexed scatter/gather over constructing large
-temporary tensors only when duplicate-index semantics and gradients (normally
-disabled for inference) remain correct.
-
-Any cross-request cache needs a bounded lifetime and a complete key containing
-shape, layout, device, dtype, schedule, task, adapter/LoRA, and any value that
-changes the tensor. Otherwise keep it request-scoped.
-
-### VAE and reference work
-
-Profile duplicate VAE decode/postprocess, repeated reference decoding/scans,
-unnecessary host-device round trips, and full-frame materialization. Apply VAE
-tiling, slicing, patch parallelism, or on-demand staging only with seam,
-ordering, color/range, and memory parity tests.
-
-## USP communication optimization
-
-“USP works” is not evidence that USP communication is optimized. For Ulysses,
-Ring, hybrid, and AllGather-KV separately, profile:
-
-- collective count, bytes, duration, stream, and overlap with compute;
-- Q/K/V and output all-to-all boundaries;
-- pack/unpack, padding, metadata broadcast, transpose, and contiguous copies;
-- head divisibility or advanced uneven-head support;
-- scaling efficiency from 1 to N devices on the same workload/interconnect;
-- load balance for unequal packed samples.
-
-Declare `_sp_plan` split/gather boundaries around meaningful module outputs,
-not arbitrary Python statements. Keep packed metadata sharded/gathered in the
-same ownership model as tokens.
-
-When the target revision offers accelerated Ulysses transport such as
-`--ulysses-a2a-permute`, qualify it separately from regular Ulysses. Prove the
-strict scatter-heads/gather-sequence layout selected the fast path, record
-one-time JIT/readiness cost, prewarm the maximum workspace shape before CUDA
-graph capture, keep the grow-only workspace on one stream, and exercise cleanup
-before process-group destruction. Compare collective and E2E deltas after the
-dense backend and topology are frozen; keep unsupported layouts on an explicit
-regular-Ulysses fallback.
-
-For GQA, validate `Q_heads % KV_heads == 0`, pad KV heads first, and derive Q
-padding from the original ratio. Exercise both contiguous and row-strided QKV
-layouts; a fast copy path must preserve bitwise values and packed boundaries.
-
-Cross-attention sometimes uses replicated text K/V while only video/audio Q is
-sequence-sharded. In that specific case, `skip_sequence_parallel=True` can
-avoid incorrect or wasteful Q/K/V redistribution:
-
-```python
-self.cross_attention = Attention(
-    num_heads=local_heads,
-    num_kv_heads=local_kv_heads,
-    head_size=head_dim,
-    softmax_scale=head_dim**-0.5,
-    causal=False,
-    role="cross",
-    skip_sequence_parallel=True,
-    prefix=f"{prefix}.cross_attn",
-)
-```
-
-Use it only after proving K/V are replicated and Q/output ownership is correct.
-Otherwise it disables needed communication. Report whether the optimization
-reduces collective bytes/time and improves E2E scaling.
-
-## Text encoder and VAE disaggregation
-
-Disaggregation is a measured architecture decision. First collect:
-
-| Question | Required measurement |
-|---|---|
-| Is the stage large enough? | Encode/decode share at target concurrency and shape |
-| Is transfer economical? | Tensor/media bytes, serialization, connector latency and bandwidth |
-| Is there reuse? | Prompt/reference reuse rate, cacheability, fan-out |
-| Can it scale independently? | Queue saturation and resource utilization per stage |
-| Is the contract stable? | Shape, dtype, mask/tag/position metadata, ordering |
-
-### Text encoder candidate
-
-Define an explicit tensor contract containing hidden states, masks, tags or
-position IDs, dtype, shape, task/checkpoint revision, and request ID. Support
-disabling the local encoder so the DiT cannot accidentally recompute it. Test
-all tasks, prompt lengths, partial TP group membership, retries, backpressure,
-abort, connector cleanup, and independent replica scaling.
-
-### VAE candidate
-
-Separate VAE encode and decode contracts if both exist. Define latent shape,
-scale/shift, dtype/range, tiling/chunk order, output media ordering, and stage
-metadata. Measure latent/media transfer against local decode cost. Test tiling
-seams, RNG/determinism where relevant, chunk ordering, codec/postprocess,
-backpressure, abort, and worker failure.
-
-Do not label VAE tiling, patch parallelism, compile, or offload as VAE
-disaggregation. Likewise, a separate text-encoder TP group is not a separate
-stage. If no reusable generic stage/connector exists in the target revision,
-produce a feasibility result or RFC and keep the capability `not tested` rather
-than inventing a model-local production architecture.
-
-## Performance acceptance
-
-For each accepted optimization, require:
-
-- same fixed workload and correctness artifacts before/after;
-- actual fast-path execution proven by logs/trace/counters;
-- local metric plus E2E latency/throughput and memory;
-- at least three raw fixed-work repetitions after explicit warmup, or a
-  declared arrival-load sample set large enough for every tail percentile;
-- named hardware, backend, topology, dtype, and task scope;
-- fallback/rejection tests for unsupported shapes/platforms;
-- no regression in abort/error cleanup or long-run memory trend.
-
-Update the feature matrix narrowly. Do not convert a profile-driven direction
-into a generic “supported” feature merely because a model-specific PR exists.

.claude/skills/production-add-diffusion-model/references/production-validation.md

@@ -1,464 +0,0 @@
-# Production Serving and Validation
-
-## Contents
-
-1. [Execution-mode decision](#execution-mode-decision)
-2. [Request-level batching](#request-level-batching)
-3. [Step execution and continuous batching](#step-execution-and-continuous-batching)
-4. [Abort and cleanup](#abort-and-cleanup)
-5. [Mixed-RPS soak](#mixed-rps-soak)
-6. [Four CI tracks](#four-ci-tracks)
-7. [PR evidence checklist](#pr-evidence-checklist)
-
-## Execution-mode decision
-
-Request batching and step-wise execution solve different problems:
-
-| Mode | Pipeline contract | Scheduling/abort boundary |
-|---|---|---|
-| Serial request | `forward(DiffusionRequestBatch)` for one request | Whole request; in-denoise preemption is unavailable |
-| Request batching | `supports_request_batch = True`; one forward consumes compatible independent requests | Whole batch/request |
-| Single-request step | Full `SupportsStepExecution`; `max_num_seqs=1` | Between denoise steps |
-| Step continuous batching | Full step contract plus heterogeneous batched-step evidence | Between denoise waves/steps |
-
-Do not expose four stub methods as an opt-out. The current protocol is
-structural; if a native pipeline is not step-capable, do not define the four
-step methods. If it is capable, implement and test all four.
-
-Treat structural support, a generic request-batch bridge, and model benefit as
-three separate claims. Before recommending step execution, name a hypothesis
-that request mode cannot satisfy, define a success threshold, and run a matched
-request-mode control. If throughput or latency regresses, retain step execution
-as functional/limited and keep request mode as the production recommendation.
-
-Choose compatibility keys from every value that changes tensor shapes,
-semantics, hooks, or scheduler behavior: task, output shape/count, frames,
-steps/schedule, guidance/CFG, dtype/backend, LoRA/adapter, cache quality policy,
-and model-specific conditions. Reject or schedule separately rather than
-silently using the first request's settings.
-
-## Request-level batching
-
-A request-batched pipeline returns exactly one `DiffusionOutput` per logical
-request. This is model-owned pseudocode: `validate_batch_compatibility()` and
-`_generate_batch()` are placeholders to implement from the official contract,
-not shared APIs to import.
-
-```python
-import torch
-
-from vllm_omni.diffusion.data import DiffusionOutput
-from vllm_omni.diffusion.worker.request_batch import (
-    DiffusionRequestBatch,
-    split_diffusion_output_by_request,
-)
-
-class MyPipeline(torch.nn.Module):
-    supports_request_batch = True
-
-    def forward(self, req: DiffusionRequestBatch) -> list[DiffusionOutput]:
-        validate_batch_compatibility(req.sampling_params_list, req.prompts)
-        common = req.sampling_params_list[0]
-
-        text_prompts: list[str] | None = [
-            prompt
-            if isinstance(prompt, str)
-            else (prompt.get("prompt") or "")
-            for prompt in req.prompts
-        ]
-
-        prompt_fields = DiffusionRequestBatch.collate_prompt_field_map(
-            req.prompts,
-            {"prompt_embeds": None, "prompt_mask": None},
-        )
-        if prompt_fields["prompt_embeds"] is not None:
-            text_prompts = None
-        generators = req.collate_request_generators(
-            common.num_outputs_per_prompt,
-            default_generator=None,
-        )
-        output = self._generate_batch(
-            prompt=text_prompts,
-            prompt_fields=prompt_fields,
-            generators=generators,
-            sampling=common,
-        )
-        return split_diffusion_output_by_request(
-            DiffusionOutput(output=output),
-            req,
-            num_outputs_per_prompt=common.num_outputs_per_prompt,
-        )
-```
-
-The prompt-field collator only handles tensor fields; extract raw text prompts
-and model-specific negative/alias fields separately, as current in-tree batched
-pipelines do. Set a raw prompt field to `None` when the matching precomputed
-embedding is supplied. The exact aliases and generator device depend on the
-model. Use current collators rather than manual `torch.cat` when they cover the
-contract; they reject mixed present/missing tensors and incompatible
-shape/dtype/device.
-
-Before reading `sampling_params_list[0]`, validate every field that must be
-common. Tests must cover:
-
-- two and N requests, independent seeds/generators, one output each;
-- mixed prompt lengths and packed/padded boundaries;
-- multiple outputs per prompt and correct result slicing;
-- compatible versus incompatible shapes, steps, guidance, LoRA, and quality;
-- one request failure without cross-request output or state corruption;
-- output ordering and request IDs under different completion times.
-
-After the model advertises support, candidate serving is:
-
-```bash
-vllm serve '<model>' --omni \
-  --max-num-seqs 4 \
-  --request-batch-max-wait-ms 20
-```
-
-The wait window trades admission latency for batch formation. Benchmark at 0
-and candidate nonzero values under the target arrival process.
-
-## Step execution and continuous batching
-
-### Full protocol skeleton
-
-Use the current shared state types and make every mutable value request-local:
-
-The helpers beginning with `_` and `validate_step_batch()` below are
-model-owned placeholders; scheduler initialization is scheduler-specific.
-
-```python
-import copy
-from collections.abc import Sequence
-from typing import Any, ClassVar
-
-import torch
-
-from vllm_omni.diffusion.data import DiffusionOutput
-from vllm_omni.diffusion.models.interface import SupportsStepExecution
-from vllm_omni.diffusion.worker.input_batch import InputBatch
-from vllm_omni.diffusion.worker.utils import StepRequestState
-
-class MyPipeline(torch.nn.Module, SupportsStepExecution):
-    supports_step_execution: ClassVar[bool] = True
-
-    def prepare_encode(
-        self,
-        state: StepRequestState,
-        **kwargs: Any,
-    ) -> StepRequestState:
-        prepared = self._prepare_request(state.prompt, state.sampling)
-        state.prompt_embeds = prepared.prompt_embeds
-        state.latents = prepared.latents
-        state.timesteps = prepared.timesteps
-        state.scheduler = copy.deepcopy(self.scheduler)
-        state.scheduler.set_begin_index(0)
-        state.step_index = 0
-        state.extra["task_state"] = prepared.task_state
-        return state
-
-    def denoise_step(
-        self,
-        input_batch: InputBatch,
-        *,
-        states: Sequence[StepRequestState] | None = None,
-        **kwargs: Any,
-    ) -> torch.Tensor | None:
-        validate_step_batch(input_batch, states)
-        return self.transformer(**build_batched_denoise_inputs(input_batch))
-
-    def step_scheduler(
-        self,
-        state: StepRequestState,
-        noise_pred: torch.Tensor,
-        **kwargs: Any,
-    ) -> None:
-        timestep = state.current_timestep
-        if timestep is None:
-            raise RuntimeError("step_scheduler called without a current timestep")
-        state.latents = state.scheduler.step(
-            noise_pred,
-            timestep,
-            state.latents,
-            return_dict=False,
-        )[0].to(state.latents.dtype)
-        state.step_index += 1
-
-    def post_decode(
-        self,
-        state: StepRequestState,
-        **kwargs: Any,
-    ) -> DiffusionOutput:
-        return DiffusionOutput(output=self.decode(state.latents))
-```
-
-This is a shape guide, not drop-in code: verify the target revision's
-`StepRequestState.extra`, scheduler signature, CFG handling, state fields, and
-decode contract. Follow a current native pipeline such as Qwen-Image for the
-exact revision.
-
-Never use the shared `self.scheduler` to advance a request. Store scheduler,
-latents, embeddings, timesteps, masks, RNG/generator, task metadata, cache
-policy, adapter, and output assembly state on `StepRequestState` or its
-request-local extension. Pipeline fields may hold immutable weights/config and
-bounded immutable caches only.
-
-### Qualification sequence
-
-1. Compare request-mode and step-mode at `max_num_seqs=1` for every task using
-   identical seed/schedule/shape and intermediate latents.
-2. Abort queued and in-flight requests at several step boundaries.
-3. Increase to two compatible requests; verify independent scheduler/RNG/state
-   and output order.
-4. Increase to the target capacity and mix prompt lengths.
-5. Exercise mixed shape, frames, steps/schedule, task, guidance, and quality.
-   Batch only compatible rows; otherwise split/reject predictably.
-6. Inject a failure in encode, denoise, scheduler, and decode independently.
-7. Run the production soak and fault matrix.
-
-Candidate commands only after capability validation:
-
-```bash
-# Conservative step execution and step-boundary abort.
-vllm serve '<model>' --omni \
-  --step-execution \
-  --max-num-seqs 1
-
-# Experimental batched-step candidate after multi-request E2E.
-vllm serve '<model>' --omni \
-  --step-execution \
-  --max-num-seqs 4
-```
-
-If an attention backend is only correct for single-request step mode, fail
-early or keep the recipe at `max_num_seqs=1`. Do not describe generic runtime
-support as model support.
-
-## Abort and cleanup
-
-### Required semantics
-
-For queued and in-flight abort/disconnect:
-
-- emit exactly one terminal aborted/error result;
-- do not run `post_decode` after abort unless a documented partial-output mode
-  explicitly requires it;
-- do not increment `step_index` or apply a scheduler result after cancellation;
-- remove scheduler/state cache entries and request IDs;
-- release latents, prompt/reference tensors, cache hooks, DLO buffers, connector
-  messages, uploaded/temp files, and output buffers;
-- keep other requests alive;
-- make cleanup idempotent when disconnect, timeout, and worker error race;
-- drop late results/exceptions for already-resolved or cancelled futures
-  without terminating the shared result-pump thread;
-- complete the next valid request with its requested cache/offload policy.
-
-Test cancellation before engine admission, while queued, after encode, during
-early/middle/final denoise steps, before decode, and while returning/persisting
-output. Include async job cancellation and client socket disconnect.
-
-### Failure injection matrix
-
-| Location | Injection | Assertions |
-|---|---|---|
-| Validation/upload | bad MIME, count/bytes overflow, truncated media | 400/413, no job/engine submit, no temp leak |
-| Load/start | missing fused shard, unsupported topology | startup fails, actionable error, no silent init |
-| Encode | exception/OOM/timeout | one error, request state/temp released |
-| Denoise | exception/OOM/worker exit | peers handled, hooks/buffers released, health behavior explicit |
-| Scheduler | invalid state/shape | no latent/step partial commit |
-| Decode/post | exception/codec error | no corrupt successful result, partial output removed |
-| Result/IPC | late result after cancel, large split tensor, orphan SHM | pump remains alive, one terminal result, exact ownership cleanup |
-| Connector/disagg | timeout/retry/duplicate | idempotency, backpressure, no orphan payload |
-
-After each injection, check server health and issue a known-good request. If
-the process must restart, document and test the restart policy; do not claim
-transparent recovery.
-
-### Large-output transport
-
-Treat worker-to-engine IPC and engine-to-client transport as separate hops.
-For batched video, prove that each logical output does not accidentally retain
-or serialize the complete batch storage. Exercise the target revision's shared
-memory or artifact-handle path above and below its threshold, including
-non-contiguous views, multiple outputs, consumer failure, timeout, abort, and
-worker exit. Verify every shared segment/file is released exactly once.
-
-Freeze the media contract at each hop: dtype, value range, shape/layout,
-contiguity, request ownership, encoding/color model, payload bytes, and pending
-consumers. Device-side float-to-uint8 preparation, D2H/IPC, planar/interleaved
-conversion, CPU encode/mux, and delivery off the asyncio event loop are
-different optimizations. Validate their route selection and fallbacks
-independently. Byte-identical HTTP MP4 output does not prove that a raw offline
-tensor kept its dtype or range.
-
-For long-window output, validate segment ordering and audio/video continuity,
-then exercise payloads around serializer, shared-memory, HTTP, and codec size
-limits. Chunking must reassemble exactly, reject malformed/missing chunks, and
-release partial state after abort, timeout, or peer failure.
-
-Qualify chunk production, transport, and public streaming as separate layers.
-A VAE callback must define owned representation, frame offsets, final marker,
-rank ownership, source/config gate, and collective-safe failure, but it does not
-prove SHM/ZMQ delivery, bounded backpressure, cancellation, codec reuse, or
-client streaming. Measure time to first owned chunk, first encoded fragment,
-steady cadence, mux finalization, and complete client artifact independently.
-
-Measure remote MP4 encoding, serialization/copies, network transfer, and client
-materialization separately from denoise/decode. An inference-kernel speedup does
-not establish serving throughput if output transport dominates or leaks.
-
-## Mixed-RPS soak
-
-Use a realistic request mix and arrival distribution. Include small/large
-shapes, short/long prompts, all advertised tasks, cache tiers, and a small rate
-of abort/disconnect/error injections. Run phases below, near, and above measured
-saturation so queue/backpressure behavior is visible.
-
-Example serving benchmark phase:
-
-```bash
-python benchmarks/diffusion/diffusion_benchmark_serving.py \
-  --base-url http://127.0.0.1:8091 \
-  --endpoint /v1/videos \
-  --model '<model>' \
-  --dataset trace \
-  --dataset-path /path/to/versioned-production-trace.jsonl \
-  --task t2v \
-  --num-prompts 500 \
-  --request-rate 0.5 \
-  --max-concurrency 8 \
-  --warmup-requests 8 \
-  --warmup-concurrency 8 \
-  --output-file soak-near-saturation.json
-```
-
-Use a task-appropriate trace/media dataset. Run the same phase at rates selected
-from an initial saturation curve; a literal `0.5` is illustrative only.
-
-On supported GPU hosts, wrap a test or soak with the repository monitor:
-
-```bash
-bash tests/dfx/stability/scripts/resource_monitor.sh run --backend gpu -- \
-  pytest -s -v tests/dfx/stability/scripts/test_stability_<model>.py -m slow
-```
-
-Check the target revision's monitor backends. Do not claim CPU/NPU monitoring
-from a reserved CLI choice unless collection is implemented and verified.
-
-Report:
-
-- offered and achieved RPS, success/error/abort rates;
-- p50/p95/p99 and queue/service/stage times, with the successful sample count
-  and arrival process used for each percentile;
-- throughput per device and batch/wave utilization;
-- per-rank HBM and process-tree PSS trend/slope;
-- cache size/hit rate, temp-file/disk growth, open FDs/handles;
-- outstanding shared-memory/artifact handles and encoded/network bytes;
-- worker/engine health, restarts, OOM/timeouts, backpressure response;
-- total duration, request count/mix, raw logs/JSON/monitor artifact hashes.
-
-A short burst or repeated serial curl loop is not a stability test.
-
-## Four CI tracks
-
-Keep the tracks independent so a failure answers a specific question. These
-four readiness tracks are not the repository's numbered CI levels. Map them
-onto the current L1-L5 taxonomy:
-
-| Readiness track | Repository CI placement |
-|---|---|
-| Function | L1 unit/logic plus L2 basic online/offline E2E; extend real-model scenarios in L3/L4 |
-| Accuracy | L3 real-model gates for important cases; deeper and broader nightly coverage in L4 |
-| Performance | Important thresholds in L3 where they fit the time budget; full baselines/regression jobs in nightly L4 |
-| Reliability | Cheap rejection/recovery assertions can run earlier, but long stability, fault injection, and reliability suites belong to weekly L5 |
-
-Distributed topology is a test case within the appropriate level, not a
-replacement definition for a level.
-
-### 1. Function CI
-
-Cover:
-
-- strict unquantized and advertised quantized loading;
-- fused source-shard completeness and prefix routing;
-- official task positive boundaries and neighboring negative cases;
-- offline, sync, async normalization/parity;
-- single-device reference plus every advertised topology smoke;
-- output type/count/order and request ID isolation;
-- feature rejection paths that must fail early.
-
-### 2. Accuracy CI
-
-Pin official implementation/checkpoint/vLLM-Omni revisions, prompts and media
-hashes, seed, scheduler/sigma/steps, dimensions/frames/FPS, guidance, dtype,
-backend, and topology. Compare at suitable levels:
-
-- component outputs or selected blocks;
-- one or more intermediate denoise latents;
-- final image/video/audio artifact metrics;
-- temporal consistency and audio/video synchronization where relevant.
-
-Set tolerance per modality/hardware/backend with rationale. Keep failure
-artifacts and metadata. A single visual inspection does not define CI.
-
-For quantization trajectory tooling, inspect the target revision's current
-`vllm_omni/quantization/tools/compare_diffusion_trajectory_similarity.py` and
-reuse it when compatible instead of creating an ad hoc comparator.
-
-### 3. Performance CI
-
-Pin workload and best deployment. Include a resident recommended row and a
-small-HBM/DLO row when both are production targets. Declare:
-
-- one explicit warmup exclusion and at least three measured fixed-work
-  repetitions;
-- raw result JSON and environment identity;
-- median/mean plus range for small fixed-work A/Bs; p50/p95/p99 only for an
-  arrival-load run with enough samples, plus throughput/RPS, stage time,
-  HBM/PSS;
-- regression metric, threshold, baseline owner, and update procedure;
-- correctness/accuracy check linked to the same configuration.
-
-Use the current harness config style, for example:
-
-```bash
-pytest -s -v tests/dfx/perf/scripts/run_diffusion_benchmark.py \
-  --test-config-file tests/dfx/perf/tests/test_<model>_vllm_omni.json
-```
-
-Verify parser options on the target revision. Do not copy a JSON schema from a
-different model without matching its endpoint, task, dataset, and deploy path.
-
-### 4. Reliability CI
-
-Run a bounded CI soak plus a longer scheduled soak. Cover:
-
-- below/near/above-saturation arrival phases;
-- queued/in-flight abort and disconnect;
-- OOM/timeout and worker/process failure appropriate to the platform;
-- DLO/cache/connector cleanup;
-- health, fast-fail/backpressure, restart/recovery policy;
-- memory/temp/FD trend and successful known-good request after each fault.
-
-Keep reliability thresholds independent from latency thresholds. A fast server
-that leaks memory or hangs after cancellation fails production readiness.
-
-## PR evidence checklist
-
-The PR description must include or link:
-
-- official source/checkpoint revisions and API/limit matrix;
-- scoped feature compatibility matrix with the four allowed states;
-- implementation notes for FP8, DLO, request cache, attention/fusion, batching;
-- exact environment, deploy/serve, every task curl, benchmark and soak commands;
-- fixed accuracy inputs and artifacts;
-- raw before/after performance runs and memory traces;
-- output-contract manifests and stage accounting from device preparation
-  through the complete client artifact;
-- abort/disconnect/fault results and cleanup evidence;
-- Function/Accuracy/Performance/Reliability CI files and ownership;
-- limitations/TODOs that remain `not tested` rather than implied support.
-
-Separate the Day-0 milestone from production readiness. If the PR only closes
-some gates, title and description should say which scoped gates it closes.

.claude/skills/readme.md

@@ -26,9 +26,6 @@ self-check.
 
 - [`add-diffusion-model`](add-diffusion-model/SKILL.md): guides integration of
   a new diffusion model into `vllm-omni`
-- [`add-recipe`](add-recipe/SKILL.md): creates or updates in-repository model
-  recipes with verified task/input/output contracts, concrete hardware,
-  shared feature-guide links, exact commands, and qualification evidence
 - [`add-tts-model`](add-tts-model/SKILL.md): covers integration of new TTS
   models and related serving workflows
 - [`diffusion-perf-opt`](diffusion-perf-opt/SKILL.md): guides diffusion model
@@ -40,10 +37,6 @@ self-check.
 - [`precheck-pr`](precheck-pr/SKILL.md): self-checks a branch before creating a
   PR by validating title format, dead code, simplification opportunities,
   accuracy and performance claims, and merge readiness
-- [`production-add-diffusion-model`](production-add-diffusion-model/SKILL.md):
-  takes a working Day-0 diffusion integration through API/limit parity,
-  feature-combination evidence, quantization/offload, performance, production
-  serving, hardware recipes, and CI readiness
 - [`quantization`](quantization/SKILL.md): guides quantization method selection,
   model integration, checkpoint loading, and quality/performance validation
   for vLLM-Omni

.claude/skills/review-pr/SKILL.md

@@ -123,11 +123,10 @@ it changes again, report the churn and wait for a stable target.
 
 For a trusted PR head, materialize the pinned head in an isolated detached
 worktree. A worktree freezes identity but is not a security sandbox. Treat fork
-heads as untrusted until the user and environment policy explicitly establish
-trust: execute their code only after that trust is recorded for this host,
-with the trusted SHA noted in the review state and secrets kept out of the
-execution scope; without recorded trust, use static SHA-addressed reads and CI
-evidence only. For a local review, freeze the committed, index, worktree,
+heads as untrusted unless the user and environment policy explicitly establish
+otherwise: execute them only in a disposable, secret-free sandbox with restricted
+filesystem, network, and resources; without one, use static SHA-addressed reads
+and CI evidence only. For a local review, freeze the committed, index, worktree,
 and NUL-safe in-scope untracked contents. Follow
 [review-execution.md](references/process/review-execution.md) for trust gates,
 state fingerprints, and byte-for-byte staleness checks.
@@ -197,7 +196,7 @@ style preferences as simplification findings.
 
 Before each validation group, verify the frozen SHA plus the tracked, index,
 untracked, and ignored-file fingerprint, or recreate a pristine snapshot. On a
-head the user explicitly trusted for this host, run an import/version preflight,
+trusted head or inside the required sandbox, run an import/version preflight,
 then the narrowest relevant tests and low-cost static checks. Bind every result
 to the head SHA, snapshot fingerprint, and environment fingerprint. Never run
 imports, tests, builds, hooks, or repo-configurable tooling from an untrusted

.claude/skills/review-pr/references/checks/perf-verification.md

@@ -22,19 +22,6 @@ Keep exact commands and report variability rather than a cherry-picked run.
 Use the repository's benchmark when it covers the claim; otherwise use the
 smallest reproducible workload that reaches the changed production path.
 
-## Isolation per claim
-
-Isolate one claim per comparison. When a PR stacks several changes (a fused or
-restructured load path, a distilled step schedule, a new cache), request one
-column per claim at equal steps/workload instead of one blended base-vs-head
-delta, and name the unchanged stage or metric that pins equivalence.
-
-When the changed path is runtime-switchable (feature flag or environment
-variable), run every column on the same head and toggle the switch rather than
-diffing against a base commit that cannot separate the stacked changes:
-base, head with the switch off, head with the switch on, then head with the
-switch on plus each further claim.
-
 ## Evidence table
 
 | Dimension | Typical evidence |
@@ -47,100 +34,6 @@ switch on plus each further claim.
 Every optimization needs correctness or quality evidence. A faster result on a
 different workload, precision, seed, or topology is not a valid comparison.
 
-## E2e stage-attribution table
-
-For an end-to-end latency claim, request the stage-attribution table the
-repository's perf PRs use:
-
-- Rows carry the benchmark's own field names: total e2e, per-stage execution,
-  postprocess, response encoding, and a request-to-output roll-up. Add a stage
-  handoff/idle row when the pipeline spans stages — connector transfer and
-  scheduling gaps are invisible in per-stage latency deltas.
-- Sanity rows pin comparability: inference steps, output frames/pixels/samples,
-  and generated tokens held identical across columns.
-- Report P50 and P100 from the stated warmup and measured counts. One
-  population per number: never mix cold-start and warm samples into one value.
-- Name the baseline and candidate commit SHAs, and close with an isolation
-  statement naming the metric that stayed unchanged ("X remained effectively
-  unchanged, isolating the gain to Y").
-
-When the serving path caches, captures, or regenerates at runtime (CUDA-graph
-bucket growth, cache rebuilds, recompilation), medians hide the resulting tail.
-Also request the event count and the maximum observed stall.
-
-Component-level tables pair with, not replace, the e2e table: per-op reference
-vs candidate timings (with the numerical-equality result per op) plus one
-complete-pipeline check under the production shapes.
-
-## Proportionality
-
-When a PR adds a model and explicitly labels its numbers as smoke observations
-rather than claims, do not demand the attribution machinery. Ask only for
-evidence protecting the model's stated operating contract — for a
-realtime/duplex model that is sustained cadence over a realistic session
-(enough ticks to leave warmup), with any mid-session capture/regeneration
-event and its stall reported, since a cadence that collapses mid-session is a
-functional failure, not a perf claim.
-
-## Realtime/duplex world models
-
-Request the operating-contract evidence as serving metrics, not claims:
-
-- Sustained per-tick latency over one realistic session: median, max, and the
-  argmax tick.
-- Stall events with their causes.
-- Peak memory at first versus last tick — session-owned state must not grow
-  per tick.
-- Control latency from a submitted action to the tick that applies it.
-- Realtime-versus-offline parity under the same controls, using the
-  repository's video-similarity helpers. Parity plotted over tick index is the
-  drift-over-horizon curve and the honest measure of session lifetime;
-  distribution-level suites (FVD, VBench) belong to model evaluation, not the
-  serving integration.
-
-Watch the contract boundaries the model documents: if a control input is
-tick-API-only, the parity pair must use a horizon both paths can run.
-
-## Speech-generation (TTS) models
-
-The streaming contract outranks the average — a synthesis that pauses
-mid-stream is broken for realtime use regardless of its averages. Request:
-
-- The benchmark's own speech metrics over one long utterance (enough audio to
-  leave warmup, tens of seconds): `audio_ttfp` (time to first packet),
-  `audio_rtf` (real-time factor; above 1.0 cannot keep up), `e2el`, and
-  `ttft`/`tpot` where tokens precede audio.
-- Mid-utterance stalls as the benchmark's continuity fields, not prose:
-  `audio_underrun` percentiles and the `audio_continuity_ok` rate
-  (`vllm_omni/benchmarks/metrics/metrics.py`), computed by
-  `vllm_omni/benchmarks/audio_continuity.py` — the companion to `audio_ttfp`
-  and `audio_rtf`. A synthesis that bursts chunks fast enough on average but
-  underruns mid-stream fails the streaming contract even when the averages
-  pass.
-- Quality as a paired comparison against the reference implementation under
-  the same text, speaker prompt, and seed; report sample rate and frame
-  count, and assert output completeness — truncated or dropped trailing audio
-  is a known failure class, not a quality nuance.
-- For realtime or duplex TTS: interruption (barge-in) latency and the
-  per-session memory trend across turns.
-
-## Omni models
-
-Apply the e2e stage-attribution table directly to the voice-to-voice path of
-omni (speech-to-speech and multimodal AR) models:
-
-- TTFT for text output, `audio_ttfp` for audio output, and per-stage
-  ITL/TPOT cadence across the perception-understanding-generation chain.
-- Cross-modal parity — the omni analogue of realtime-versus-offline parity:
-  the same semantic request through text and audio inputs, compared on output
-  content or timing.
-- For duplex omni sessions: turn-taking latency, interruption handling, the
-  concurrent session count actually validated, and a per-turn memory trend —
-  session-owned KV state must not grow per turn. When either turn produces
-  audio, continuity is judged with the same `audio_underrun` and
-  `audio_continuity_ok` fields as TTS, since turn-taking latency alone does
-  not expose mid-utterance underruns.
-
 ## Reviewer verification ladder
 
 1. Run base/head A/B on suitable hardware when affordable.

.claude/skills/review-pr/references/process/general-checks.md

@@ -121,19 +121,6 @@ Search bounded callers and sibling implementations before reporting dead code,
 duplication, or a missed consumer. Keep new abstractions only when they have a
 distinct live caller, invariant, or compatibility need.
 
-Verify absence and equality claims with whole-file evidence. A line window, a
-grep for one symbol, or a commit message proves presence, never absence: to
-assert that a file matches another version or lacks a change, diff or hash the
-full files (for example `git diff <sha1>:<path> <sha2>:<path>` or the contents
-API's size and SHA fields) before anchoring the finding. A verification
-shortcut that would itself be wrong to run is not evidence.
-
-For a value written or finalized in more than one place, establish which site
-executes first on each entry path — and whether the earlier site makes the
-later ones unreachable — before naming where a fix belongs. Enumerating all
-call sites correctly still misses the bug when a path the enumeration ranked
-last actually finalizes first and clears the state the proposed fix checks.
-
 ## Finding bar
 
 Anchor each finding to a changed `path:line`; name the trigger or call path,

.claude/skills/review-pr/references/process/review-execution.md

@@ -39,13 +39,13 @@ isolated detached worktree. Run every source read, `rg` search, import, and test
 from that snapshot, not the caller's checkout. A detached worktree provides
 snapshot isolation, not a security boundary.
 
-Treat a fork head as untrusted until the user and environment policy
-explicitly establish trust. Without recorded trust, never run its imports,
-tests, builds, hooks, package setup, or repo-configurable linters/plugins on
-the reviewer host. Once the user explicitly trusts this pinned commit for
-this host, record the trusted SHA with the review state and execute with
-credentials, agent sockets, and other secrets out of scope. Without recorded
-trust, limit the review to the remote diff, SHA-addressed
+Treat a fork head as untrusted unless the user and environment policy explicitly
+establish trust. Never run its imports, tests, builds, hooks, package setup, or
+repo-configurable linters/plugins on the reviewer host. Execute them only in a
+disposable sandbox or VM with no credentials or inherited secrets, no host agent
+or service sockets, minimal read-only host mounts, disabled or explicitly
+allowlisted network, resource/time limits, and destruction after the run. If
+that boundary is unavailable, limit the review to the remote diff, SHA-addressed
 reads such as `git show <head_sha>:<path>`, and existing CI evidence; report all
 executable validation as a gap.
 

.claude/skills/vllm-omni-test/SKILL.md

@@ -52,8 +52,8 @@ Always attach markers deliberately:
   - `tts` — speech synthesis / TTS-only models (`/v1/audio/speech`, voice clone, etc.)
   - `diffusion` — generative diffusion models (image / audio / text / video from noise)
 - **Cross-cutting area** (when relevant): `parallel`, `cache`, `example`, `benchmark`
-- **Hardware**: `cpu`, `gpu`, `cuda`, `rocm`, `npu`, …; SKU (`H100`, `L4`, …) and `cards_{n}` via `@hardware_test(...)` / `hardware_marks(...)` only — never `pytest.mark.H100` (`check-mark` rejects it)
-- Optional: `slow`. Multi-card: `num_cards=N` on the helper (filter with `cards_N` / `not cards_1`)
+- **Hardware**: `cpu`, `gpu`, `cuda`, `rocm`, `npu`, `L4`, `H100`, `distributed_cuda`, …
+- Optional: `slow`, distributed markers when multi-card is required
 
 **Baseline smoke (L2 + L3):** The simplest e2e case per model — default deploy, minimal request — should usually carry **both** `@pytest.mark.core_model` and `@pytest.mark.advanced_model` on the **same** test function so `test-ready.yml` and `test-merge.yml` share one test. `send_*_request` picks validation depth from `--run-level`. References: `test_voxcpm2_tts.py::test_text_to_audio_001`, `test_qwen3_tts_customvoice.py::test_text_to_audio_001`. Heavier scenarios use **`advanced_model` only**; L4 expansion uses **`full_model`**.
 
@@ -94,8 +94,8 @@ Existing references: `tests/e2e/offline_inference/test_qwen2_5_omni.py` (L2-styl
 
 | Scenario | Typical location | Fixtures / runner pattern | Baseline markers & level |
 |----------|------------------|---------------------------|---------------------------|
-| **Offline inference e2e** | `tests/e2e/offline_inference/` | **Module (default):** `omni_runner` + `offline_client`. **Function (isolation only):** `omni_runner_function` + `offline_client_function`. Diffusion/TTS may use `Omni(...).generate` directly | L2: `core_model` + **one of** `omni` / `tts` / `diffusion`; `@hardware_test(...)` when GPU/NPU is required |
-| **Online serving e2e** | `tests/e2e/online_serving/` | **Module (default):** `omni_server` + `online_client`. **Function (isolation only):** `omni_server_function` + `online_client_function`. Clients: `send_omni_request` (omni), `send_audio_speech_request` (tts), `send_diffusion_request` / `send_video_diffusion_request` / `send_images_generations_request` (diffusion) | Baseline smoke: **`core_model` + `advanced_model`**; heavier paths: `advanced_model` only; L4 expansion: `full_model` |
+| **Offline inference e2e** | `tests/e2e/offline_inference/` | **Module (default):** `omni_runner` + `omni_runner_handler`. **Function (isolation only):** `omni_runner_function` + `omni_runner_handler_function`. Diffusion/TTS may use `Omni(...).generate` directly | L2: `core_model` + **one of** `omni` / `tts` / `diffusion`; `@hardware_test(...)` when GPU/NPU is required |
+| **Online serving e2e** | `tests/e2e/online_serving/` | **Module (default):** `omni_server` + `openai_client`. **Function (isolation only):** `omni_server_function` + `openai_client_function`. Clients: `send_omni_request` (omni), `send_audio_speech_request` (tts), `send_diffusion_request` / `send_video_diffusion_request` / `send_images_generations_request` (diffusion) | Baseline smoke: **`core_model` + `advanced_model`**; heavier paths: `advanced_model` only; L4 expansion: `full_model` |
 | **Documentation / runnable examples** | `tests/examples/offline_inference/`, `tests/examples/online_serving/` | **Offline docs (preferred):** extract Python/Bash blocks from the doc README (e.g. `ReadmeSnippet.extract_readme_snippets`), `pytest.mark.parametrize` each snippet, run via `example_runner.run` with a stable `output_subfolder`. **Online docs:** copy client/request scripts into dedicated tests and keep them in sync with the doc page. | Usually **L4**: `advanced_model`, often `example` plus hardware marks matching the nightly docs-example job (see `.buildkite/cuda/test-nightly.yml`). Full conventions: [docs/contributing/ci/test_examples/l4_doc_example_tests.inc.md](../../../docs/contributing/ci/test_examples/l4_doc_example_tests.inc.md) (introduced in [PR #1910](https://github.com/vllm-project/vllm-omni/pull/1910): naming, output directory layout, skip rules, avoid trimming `num_inference_steps` without a strong CI reason). |
 | **Performance / benchmark** | `tests/dfx/perf/tests/*.json` + `run_*_benchmark.py` | JSON or script-driven server + load config; assert explicit metrics / baselines | L4 Perf: JSON `mark` with `full_model` + `omni`/`tts`/`diffusion`; wire `test-nightly.yml` Perf steps |
 | **Invalid parameter / negative HTTP validation** | `tests/dfx/reliability/invalid_param_test/` | Live `omni_server` + low-level `send_*_http_request` with `err_code` / `err_message` | `pytest.mark.slow` + `omni` / `tts` / `diffusion` + `@hardware_marks` (`H100` or `L4`); CI in **`test-weekly.yml`** (not ready/merge/nightly) |
@@ -110,9 +110,9 @@ After choosing offline/online/docs/perf, classify the **product under test** and
 |-----------|------------------------------|----------------------------|----------------------------------------|
 | **What it is** | Multimodal LLM pipeline (thinker/talker/stages; text + vision + audio I/O) | Speech synthesis / voice models | Generative diffusion (noise → image, audio, text, or video) |
 | **Examples** | Qwen2.5-Omni, Qwen3-Omni | Qwen3-TTS, VoxCPM2, Higgs-Audio, Step-Audio2 | Qwen-Image, BAGEL, Wan2.2, HunyuanVideo |
-| **Offline runner** | `omni_runner` + `offline_client`, `generate_multimodal` | `Omni(...).generate` with deploy YAML + TTS params | `Omni(...).generate` + `OmniDiffusionSamplingParams` |
-| **Online client** | `online_client.send_omni_request` (chat completions, modalities) | `online_client.send_audio_speech_request` (`/v1/audio/speech`) | `send_diffusion_request` (chat/T2I), `send_video_diffusion_request` (`/v1/videos`, X2V), or `send_images_generations_http_request` / `send_images_edits_http_request` (DALL-E routes) |
-| **Typical assertions** | Stage outputs, text/audio keywords via `OfflineOmniClient` / response handler | WAV bytes, stream chunks, speech endpoint contract | Image/video dimensions, `final_output_type`, `assert_diffusion_response` |
+| **Offline runner** | `omni_runner` + `omni_runner_handler`, `generate_multimodal` | `Omni(...).generate` with deploy YAML + TTS params | `Omni(...).generate` + `OmniDiffusionSamplingParams` |
+| **Online client** | `openai_client.send_omni_request` (chat completions, modalities) | `openai_client.send_audio_speech_request` (`/v1/audio/speech`) | `send_diffusion_request` (chat/T2I), `send_video_diffusion_request` (`/v1/videos`, X2V), or `send_images_generations_http_request` / `send_images_edits_http_request` (DALL-E routes) |
+| **Typical assertions** | Stage outputs, text/audio keywords via `OmniRunnerHandler` / response handler | WAV bytes, stream chunks, speech endpoint contract | Image/video dimensions, `final_output_type`, `assert_diffusion_response` |
 | **Deploy YAML** | Per-model deploy configs (`ci/qwen3_omni_moe.yaml`, …) | `qwen3_tts.yaml`, `voxcpm2.yaml`, … | Often default serve; parallel/offload YAML for heavy DiT |
 | **Nightly group** (`test-nightly.yml`) | **Omni Model Test** — `-m "full_model and omni"` | **TTS Model Test** — `-m "full_model and tts"` | **Diffusion X2I(&A&T)** *or* **Diffusion X2V** (see Step 3 table; same `diffusion` marker, different YAML group / file shard) |
 | **L4 pressure** | Expansion per modality/model as needed | Expansion + accuracy/perf in TTS group | X2I: merge feature combos per [#1832](https://github.com/vllm-project/vllm-omni/issues/1832); X2V: separate nightly group |
@@ -175,9 +175,9 @@ See **L1 unit test constraints (mocking)** below for the full do/don't list.
 @pytest.mark.omni
 @hardware_test(...)
 @pytest.mark.parametrize("omni_runner", test_params, indirect=True)
-def test_<scenario>(omni_runner, offline_client) -> None:
+def test_<scenario>(omni_runner, omni_runner_handler) -> None:
     request_config = {"prompts": ..., "modalities": [...]}  # optional: images, videos, audios
-    offline_client.send_omni_request(request_config)
+    omni_runner_handler.send_omni_request(request_config)
 ```
 
 *Offline generative e2e — **Diffusion** (representative):*
@@ -187,8 +187,8 @@ def test_<scenario>(omni_runner, offline_client) -> None:
 @pytest.mark.diffusion
 @hardware_test(...)
 @pytest.mark.parametrize("omni_runner", test_params, indirect=True)
-def test_text_to_image_001(offline_client) -> None:
-    offline_client.send_diffusion_request({"prompt": "...", "extra_body": {"num_inference_steps": 4, ...}})
+def test_text_to_image_001(omni_runner_handler) -> None:
+    omni_runner_handler.send_diffusion_request({"prompt": "...", "extra_body": {"num_inference_steps": 4, ...}})
 ```
 
 *Offline TTS e2e — **Qwen3-TTS** (two-stage; representative):*
@@ -198,8 +198,8 @@ def test_text_to_image_001(offline_client) -> None:
 @pytest.mark.tts
 @hardware_test(...)
 @pytest.mark.parametrize("omni_runner", tts_server_params, indirect=True)
-def test_text_to_audio_001(omni_runner, offline_client) -> None:
-    offline_client.send_audio_speech_request({
+def test_text_to_audio_001(omni_runner, omni_runner_handler) -> None:
+    omni_runner_handler.send_audio_speech_request({
         "input": "...",
         "task_type": "Base",
         "ref_audio": REF_AUDIO_URL,
@@ -214,8 +214,8 @@ def test_text_to_audio_001(omni_runner, offline_client) -> None:
 @pytest.mark.tts
 @hardware_test(...)
 @pytest.mark.parametrize("omni_runner", tts_server_params, indirect=True)
-def test_voice_clone_001(offline_client) -> None:
-    offline_client.send_single_stage_tts_request({
+def test_voice_clone_001(omni_runner_handler) -> None:
+    omni_runner_handler.send_single_stage_tts_request({
         "input": "...",
         "language": "en",
         "prompt_audio_path": REF_AUDIO_PATH,
@@ -231,9 +231,9 @@ def test_voice_clone_001(offline_client) -> None:
 @pytest.mark.omni
 @hardware_test(...)
 @pytest.mark.parametrize("omni_server", test_params, indirect=True)
-def test_text_to_text_001(omni_server, online_client) -> None:
+def test_text_to_text_001(omni_server, openai_client) -> None:
     request_config = {"model": omni_server.model, "messages": ..., "modalities": ["text"]}
-    online_client.send_omni_request(request_config)
+    openai_client.send_omni_request(request_config)
 ```
 
 *Online serving e2e — **TTS** (representative):*
@@ -244,9 +244,9 @@ def test_text_to_text_001(omni_server, online_client) -> None:
 @pytest.mark.tts
 @hardware_test(...)
 @pytest.mark.parametrize("omni_server", tts_server_params, indirect=True)
-def test_text_to_audio_001(omni_server, online_client) -> None:
+def test_text_to_audio_001(omni_server, openai_client) -> None:
     request_config = {"model": omni_server.model, "input": "...", "response_format": "wav", ...}
-    online_client.send_audio_speech_request(request_config)
+    openai_client.send_audio_speech_request(request_config)
 ```
 
 *Online serving e2e — **Diffusion** X2I (representative):*
@@ -255,8 +255,8 @@ def test_text_to_audio_001(omni_server, online_client) -> None:
 @pytest.mark.core_model
 @pytest.mark.diffusion
 @pytest.mark.parametrize("omni_server", _get_default_case(MODEL), indirect=True)
-def test_text_to_image_001(omni_server, online_client) -> None:
-    online_client.send_diffusion_request({...})  # chat completions + extra_body
+def test_text_to_image_001(omni_server, openai_client) -> None:
+    openai_client.send_diffusion_request({...})  # chat completions + extra_body
 ```
 
 *Online serving e2e — **Diffusion** X2V (representative):*
@@ -264,8 +264,8 @@ def test_text_to_image_001(omni_server, online_client) -> None:
 ```python
 @pytest.mark.core_model
 @pytest.mark.diffusion
-def test_text_to_video_001(omni_server, online_client) -> None:
-    online_client.send_video_diffusion_request({"model": ..., "form_data": {...}})  # /v1/videos
+def test_text_to_video_001(omni_server, openai_client) -> None:
+    openai_client.send_video_diffusion_request({"model": ..., "form_data": {...}})  # /v1/videos
 ```
 
 *Documentation example tests:* follow the **Preferred Test Strategy** in [l4_doc_example_tests.inc.md](../../../docs/contributing/ci/test_examples/l4_doc_example_tests.inc.md): dynamic extraction for offline READMEs; explicit copied client code for online pages until extraction is justified; use the documented **naming**, **output directory** (page folder + case id), and **skipping** rules (e.g. Gradio-only scripts).
@@ -274,7 +274,7 @@ def test_text_to_video_001(omni_server, online_client) -> None:
 
 **3. Cross-cutting rules**
 
-- New `.py` files need the Omni SPDX header (`Copyright contributors to the vLLM-Omni project`, not `vLLM project`). `tests/` may keep stdlib `re`/`base64`; pickle is still banned unless the file is already on the pickle allowlist. Every collected `tests/**/test_*.py` needs a CI **level** mark and a **hardware** platform mark/helper (`check-mark` runs locally; GHA skips it). Do not write `pytest.mark.H100` / `pytest.mark.L4`; use the helpers so `cards_{n}` is attached. Do not grow `allowed_files` to land a test. Policy: [docs/contributing/README.md](../../../docs/contributing/README.md#linting).
+- New `.py` files need the Omni SPDX header (`Copyright contributors to the vLLM-Omni project`, not `vLLM project`). `tests/` may keep stdlib `re`/`base64`; pickle is still banned unless the file is already on the pickle allowlist. Every collected `tests/**/test_*.py` needs a CI **level** mark and a **hardware** mark/helper (`check-test-ci-coverage` runs locally; GHA skips it). Do not grow `allowed_files` to land a test. Policy: [docs/contributing/README.md](../../../docs/contributing/README.md#linting).
 - Reuse existing fixtures for the chosen scenario; do not mix “online client” assumptions into offline `OmniRunner` tests without a clear reason.
 - Avoid external network dependency in assertions unless the scenario is explicitly “online serving” or doc examples that require a model hub (then align with CI secrets/cache).
 - Keep **one test function = one intent** (one modality combo, one endpoint contract, or one acceleration combo).
@@ -324,21 +324,21 @@ vLLM-Omni e2e tests start a real **OmniServer** (online) or **OmniRunner** (offl
 
 | Scope | Online fixtures | Offline fixtures | When to use |
 |-------|-----------------|------------------|-------------|
-| **Module** (default) | `omni_server` → `online_client` | `omni_runner` → `offline_client` | **Default for L2/L3/L4 expansion** — amortize model/server init across `test_*` in the same module. Same `OmniServerParams` / runner config can be reused by multiple tests. |
-| **Function** | `omni_server_function` → `online_client_function` | `omni_runner_function` → `offline_client_function` | **Only when required** — each `test_*` must get a **clean** server/runner (no shared engine/GPU state). Typical: `tests/dfx/reliability/`, sleep/wakeup, crash/restart, tests that mutate global server state. |
+| **Module** (default) | `omni_server` → `openai_client` | `omni_runner` → `omni_runner_handler` | **Default for L2/L3/L4 expansion** — amortize model/server init across `test_*` in the same module. Same `OmniServerParams` / runner config can be reused by multiple tests. |
+| **Function** | `omni_server_function` → `openai_client_function` | `omni_runner_function` → `omni_runner_handler_function` | **Only when required** — each `test_*` must get a **clean** server/runner (no shared engine/GPU state). Typical: `tests/dfx/reliability/`, sleep/wakeup, crash/restart, tests that mutate global server state. |
 
 **Rules:**
 
 1. **Default to module scope** (`omni_server` / `omni_runner`) unless the scenario **explicitly** needs a fresh instance per test function.
-2. **Indirect parametrize name must match the fixture name**: `@pytest.mark.parametrize("omni_server", ...)` with `omni_server` + `online_client`; `@pytest.mark.parametrize("omni_server_function", ...)` with `omni_server_function` + `online_client_function`. Do not mix module fixture with function client (or vice versa).
+2. **Indirect parametrize name must match the fixture name**: `@pytest.mark.parametrize("omni_server", ...)` with `omni_server` + `openai_client`; `@pytest.mark.parametrize("omni_server_function", ...)` with `omni_server_function` + `openai_client_function`. Do not mix module fixture with function client (or vice versa).
 3. Different `OmniServerParams` per `test_*` (e.g. default vs `--enable-cpu-offload`) is still OK with **module** `omni_server` — pytest parametrizes per test node; only switch to `_function` when isolation between tests matters, not merely because `server_args` differ.
 4. One `test_*` with **many** server configs (expansion matrix) → single function + `@pytest.mark.parametrize("omni_server", [...], indirect=True)` + module `omni_server` (see in-tree `test_qwen_image_expansion.py`).
 
 ```python
 # Default — module-scoped server (L4 expansion)
 @pytest.mark.parametrize("omni_server", [pytest.param(OmniServerParams(model=MODEL), marks=H100)], indirect=True)
-def test_foo_images_generations_default_1024(omni_server, online_client) -> None:
-    online_client.send_images_generations_request({...})
+def test_foo_images_generations_default_1024(omni_server, openai_client) -> None:
+    openai_client.send_images_generations_request({...})
 
 # Function-scoped — reliability / per-test clean state only
 @pytest.mark.parametrize(
@@ -346,9 +346,9 @@ def test_foo_images_generations_default_1024(omni_server, online_client) -> None
     [pytest.param(OmniServerParams(model=MODEL), marks=H100)],
     indirect=True,
 )
-def test_foo_sleep_wakeup_cycle(omni_server_function, online_client_function) -> None:
-    online_client_function.send_omni_sleep_http_request({...})
-    online_client_function.send_omni_wakeup_http_request({...})
+def test_foo_sleep_wakeup_cycle(omni_server_function, openai_client_function) -> None:
+    openai_client_function.send_omni_sleep_http_request({...})
+    openai_client_function.send_omni_wakeup_http_request({...})
 ```
 
 #### Runtime send helpers — online **and** offline (`tests/helpers/runtime.py`)
@@ -357,19 +357,19 @@ def test_foo_sleep_wakeup_cycle(omni_server_function, online_client_function) ->
 
 | Principle | Action |
 |-----------|--------|
-| **Reuse first** | Grep `runtime.py` for an existing **`send_*_request`** on `OnlineOmniClient` (online) or `OfflineOmniClient` (offline) that matches the endpoint / pipeline shape. |
+| **Reuse first** | Grep `runtime.py` for an existing **`send_*_request`** on `OpenAIClientHandler` (online) or `OmniRunnerHandler` (offline) that matches the endpoint / pipeline shape. |
 | **Extend when close** | If an existing `send_*_request` almost fits (e.g. missing one optional field), extend it in `runtime.py` — do not fork logic in the test file. |
 | **Add when missing** | No suitable helper → add **`send_<feature>_request`** (high-level: call + general `assert_*`) or **`send_<route>_<verb>_http_request`** (low-level HTTP for negative/dfx) in **`runtime.py` first**, then call it from tests. |
 | **Test module owns payload only** | In `test_*.py`: `MODEL`, deploy path, vendored media, `get_prompt()`, and inline **`request_config` dicts** only. **No** `omni.generate(...)`, raw `requests.post`, OpenAI SDK calls, or `_collect_audio()` / `_process_output()` in e2e tests. |
 
-**Online** (`online_client` from `omni_server`): `OnlineOmniClient.send_*_request`.
+**Online** (`openai_client` from `omni_server`): `OpenAIClientHandler.send_*_request`.
 
-**Offline** (`offline_client` from `omni_runner`): `OfflineOmniClient.send_*_request`.
+**Offline** (`omni_runner_handler` from `omni_runner`): `OmniRunnerHandler.send_*_request`.
 
 | Do | Don't |
 |----|-------|
-| Online: `online_client.send_omni_request`, `send_diffusion_request`, `send_audio_speech_request`, `send_video_diffusion_request`, `send_images_generations_request`, … | `requests.post(f"{base_url}/v1/...", json=…)` or `client.chat.completions.create(...)` inside a test |
-| Offline: `offline_client.send_omni_request`, `send_diffusion_request`, `send_audio_speech_request`, `send_single_stage_tts_request`, `send_single_stage_tts_batch_request`, … | `omni_runner.omni.generate(...)` + hand-rolled tensor/WAV extraction in `test_*.py` |
+| Online: `openai_client.send_omni_request`, `send_diffusion_request`, `send_audio_speech_request`, `send_video_diffusion_request`, `send_images_generations_request`, … | `requests.post(f"{base_url}/v1/...", json=…)` or `client.chat.completions.create(...)` inside a test |
+| Offline: `omni_runner_handler.send_omni_request`, `send_diffusion_request`, `send_audio_speech_request`, `send_single_stage_tts_request`, `send_single_stage_tts_batch_request`, … | `omni_runner.omni.generate(...)` + hand-rolled tensor/WAV extraction in `test_*.py` |
 | Add missing `send_*` to **`runtime.py`** first; bundle general `assert_*` inside the send helper | A one-off `def _post_*` / `def _collect_audio` at the bottom of a test module |
 | Mirror naming/style of neighboring `send_*` (docstring, `request_config` dict, optional `run_level`, `err_code` / `err_message` for negative cases) | Different parameter shapes per test file for the same endpoint |
 
@@ -392,7 +392,7 @@ def test_foo_sleep_wakeup_cycle(omni_server_function, online_client_function) ->
 
 Changing `request_config` fields (`size`, `n`, `seed`, server flags) is **not** special validation — the general `assert_*` should read those from `request_config` inside `send_*`.
 
-**`send_*` ↔ `assert_*` pairing (online `OnlineOmniClient`):**
+**`send_*` ↔ `assert_*` pairing (online `OpenAIClientHandler`):**
 
 | High-level `send_*` (prefer in L2+ e2e) | Assert already invoked inside `runtime.py` | Low-level HTTP-only sibling |
 |----------------------------------------|--------------------------------------------|-----------------------------|
@@ -405,7 +405,7 @@ Changing `request_config` fields (`size`, `n`, `seed`, server flags) is **not**
 
 **Rule:** Tests call high-level `send_*_request` for the general contract. **Never** call the same bundled `assert_*` again. Call an extra `assert_*` in the test **only** for special, case-specific validation.
 
-**Common `OnlineOmniClient` entry points** (non-exhaustive — grep `runtime.py` before adding):
+**Common `OpenAIClientHandler` entry points** (non-exhaustive — grep `runtime.py` before adding):
 
 | Area | High-level (SDK + assert) | Low-level HTTP (`*_http_request`) |
 |------|---------------------------|-----------------------------------|
@@ -416,7 +416,7 @@ Changing `request_config` fields (`size`, `n`, `seed`, server flags) is **not**
 | TTS (online) | `send_audio_speech_request` | `send_audio_speech_http_request`, `send_audio_generate_http_request`, … |
 | Ops / meta | — | `send_health_http_request`, `send_models_http_request`, `send_omni_sleep_http_request`, … |
 
-**Common `OfflineOmniClient` entry points** (offline — grep `runtime.py` before adding):
+**Common `OmniRunnerHandler` entry points** (offline — grep `runtime.py` before adding):
 
 | Area | High-level (`send_*_request` + assert) | Notes |
 |------|----------------------------------------|-------|
@@ -426,7 +426,7 @@ Changing `request_config` fields (`size`, `n`, `seed`, server flags) is **not**
 | Single-stage TTS (Coqui XTTS, MOSS-TTS-Nano, …) | `send_single_stage_tts_request`, `send_single_stage_tts_batch_request` | `prompt` + `additional_information` + `omni.generate` — **do not** duplicate in tests |
 | New model family | **Add** `send_<family>_request` here first | Then call from `tests/e2e/offline_inference/test_*.py` |
 
-L1 tests under `tests/entrypoints/` may use **FastAPI `TestClient`** or direct handler calls with mocks; they do **not** need `OnlineOmniClient` / `OfflineOmniClient`. **L2+ online and offline e2e** must use `runtime.py` `send_*` helpers.
+L1 tests under `tests/entrypoints/` may use **FastAPI `TestClient`** or direct handler calls with mocks; they do **not** need `OpenAIClientHandler` / `OmniRunnerHandler`. **L2+ online and offline e2e** must use `runtime.py` `send_*` helpers.
 
 #### Invalid parameter validation (`tests/dfx/reliability/invalid_param_test/`)
 
@@ -452,7 +452,7 @@ When the user asks for **invalid parameter validation**, **invalid request bodie
 | **Module markers** | `pytestmark = [pytest.mark.slow, pytest.mark.<omni or tts or diffusion>]` |
 | **Server fixture** | `_PARAMS` / `_QWEN3_TTS_SPEECH`-style list of `pytest.param(OmniServerParams(...), id="...", marks=hardware_marks(...))`; `@pytest.mark.parametrize("omni_server", _PARAMS, indirect=True)` |
 | **Hardware** | `hardware_marks(res={"cuda": "H100"})` for heavy diffusion/omni/video; `hardware_marks(res={"cuda": "L4"})` for smaller TTS models (must match weekly `-m "slow and L4"` step) |
-| **HTTP client** | **Low-level** `online_client.send_*_http_request({..., "err_code": 400, "err_message": (...)} )` — **not** `send_*_request` (success path) |
+| **HTTP client** | **Low-level** `openai_client.send_*_http_request({..., "err_code": 400, "err_message": (...)} )` — **not** `send_*_request` (success path) |
 | **Case shape** | Prefer **one `test_*` per route family** + `@pytest.mark.parametrize("body_spec, err_message", [...])` with stable `id=` per case; or dedicated `test_<route>_malformed_json` when not parametrized |
 | **Body helpers** | `_minimal_<endpoint>_json(omni_server)` / `_minimal_*_form_data()`; merge overrides with `body.update(body_spec)` |
 | **Known gaps** | `pytest.mark.skip(reason="…#3649")` as `_SKIP_ISSUE_3649` when server validation is not yet strict (mirror neighboring cases) |
@@ -485,13 +485,13 @@ When the user asks for **invalid parameter validation**, **invalid request bodie
 @pytest.mark.parametrize("omni_server", _PARAMS, indirect=True)
 def test_images_generations_invalid_requests(
     omni_server: OmniServer,
-    online_client: OnlineOmniClient,
+    openai_client: OpenAIClientHandler,
     body_spec: dict[str, object],
     err_message: str | tuple[str, ...],
 ) -> None:
     body = _minimal_images_gen_json(omni_server)
     body.update(body_spec)
-    online_client.send_images_generations_http_request(
+    openai_client.send_images_generations_http_request(
         {"json": body, "timeout": 300, "err_code": 400, "err_message": err_message}
     )
 ```
@@ -542,18 +542,18 @@ def send_images_generations_request(self, request_config: dict[str, Any], ...) -
 
 # tests/e2e/.../test_foo_expansion.py — one case per test_* (no case_id branching)
 @pytest.mark.parametrize("omni_server", [pytest.param(OmniServerParams(model=MODEL), marks=SINGLE_L4)], indirect=True)
-def test_foo_images_generations_default_1024(omni_server, online_client) -> None:
-    online_client.send_images_generations_request({"json": body, "timeout": 300})
+def test_foo_images_generations_default_1024(omni_server, openai_client) -> None:
+    openai_client.send_images_generations_request({"json": body, "timeout": 300})
 
 @pytest.mark.parametrize("omni_server", [pytest.param(OmniServerParams(model=MODEL), marks=SINGLE_L4)], indirect=True)
-def test_foo_images_generations_sizes_256_512_1024(omni_server, online_client) -> None:
+def test_foo_images_generations_sizes_256_512_1024(omni_server, openai_client) -> None:
     for size in ("256x256", "512x512", "1024x1024"):
-        online_client.send_images_generations_request({"json": {**body, "size": size}, "timeout": 300})
+        openai_client.send_images_generations_request({"json": {**body, "size": size}, "timeout": 300})
 
 # chat diffusion — separate test; send_diffusion_request bundles assert_diffusion_response
 @pytest.mark.parametrize("omni_server", [pytest.param(OmniServerParams(model=MODEL), marks=SINGLE_L4)], indirect=True)
-def test_foo_chat_completions_t2i_fallback(omni_server, online_client) -> None:
-    online_client.send_diffusion_request({...})
+def test_foo_chat_completions_t2i_fallback(omni_server, openai_client) -> None:
+    openai_client.send_diffusion_request({...})
 ```
 
 L1 tests under `tests/entrypoints/` may keep **minimal** asserts next to the handler under test when validating a single branch; still prefer `assertions.py` when the same JSON/media check appears in more than one file or level (e.g. L1 protocol test + L4 e2e).

.claude/skills/vllm-omni-test/references/test-routing.md

@@ -79,7 +79,7 @@ E2E (L2+) should not rely on mocks unless documenting a rare exception; prefer r
    - `full_model` — L4 nightly (`test-nightly.yml`); some expansion tests still carry both `advanced_model` and `full_model` during migration
 2. **Model type** (pick one): `omni`, `tts`, or `diffusion`
 3. **Cross-cutting** when relevant: `parallel`, `cache`, `example`, `benchmark`
-4. **Hardware**: `cpu`, `cuda`, `rocm`, `npu`, `L4`, `H100`, `cards_1`, …
+4. **Hardware**: `cpu`, `cuda`, `rocm`, `npu`, `L4`, `H100`, `distributed_cuda`, …
 5. Multi-card: `@hardware_test(...)` in `tests/helpers/mark.py`
 
 ## Command Templates
@@ -244,7 +244,7 @@ pytest -s -v dfx/reliability/invalid_param_test/test_invalid_image_generation.py
 
 ```bash
 cd tests
-pytest -s -v -m "core_model and L4 and not cards_1" --run-level=core_model
+pytest -s -v -m "core_model and distributed_cuda and L4" --run-level=core_model
 ```
 
 ### Concrete e2e paths (common in-tree)
@@ -279,7 +279,7 @@ When adding or modifying tests, do not stop at “where the file lives” — al
 4. **API client + assert placement**: **General** validation → implement in `assertions.py`, call **inside** `send_*_request` in `runtime.py`; tests call **`send_*_request` only**. **Special** case validation → `assert_*` in `assertions.py`, called **in the test** after `send_*_request`. Low-level `send_*_http_request` is for negative/dfx tests (`err_code`), not ordinary L2+ success e2e.
 5. **Shared assertions**: logic in **`tests/helpers/assertions.py`**; general checks inside `send_*_request`; special checks only in the test. No `_assert_*` in `test_*.py`.
 6. **One case → one `test_*`**: function name reflects what is validated; no `if case_id == ...` mega-test merging multiple scenarios.
-7. **Fixture scope**: default **`omni_server` + `online_client`** / **`omni_runner` + `offline_client`** (module). Use **`omni_server_function` + `online_client_function`** / **`omni_runner_function` + `offline_client_function`** only when each `test_*` must spawn a fresh instance. Parametrize name must match fixture (`omni_server` vs `omni_server_function`).
+7. **Fixture scope**: default **`omni_server` + `openai_client`** / **`omni_runner` + `omni_runner_handler`** (module). Use **`omni_server_function` + `openai_client_function`** / **`omni_runner_function` + `omni_runner_handler_function`** only when each `test_*` must spawn a fresh instance. Parametrize name must match fixture (`omni_server` vs `omni_server_function`).
 8. **Type marker**: `omni`, `tts`, or `diffusion` on every model e2e module.
 9. **Diffusion L4 Function**: wire `*_expansion.py` into **X2I(&A&T)** or **X2V** **Function Test** in **`test-nightly.yml` only** — do not add `test-merge.yml` unless the user also requested L3.
 10. **Diffusion L4 Perf** (only when requested): add `tests/dfx/perf/tests/test_<slug>_vllm_omni.json` + **Perf Test · &lt;Model&gt;** step (artifact upload); not part of “L4 functional cases” by default.

.github/workflows/pre-commit.yml

@@ -27,4 +27,4 @@ jobs:
         # Don't run historical-debt hooks against the whole tree in CI yet.
         # They still run locally on changed files.
         env:
-          SKIP: check-mark,markdownlint-cli2,shellcheck,check-spdx-header,mypy-3.10
+          SKIP: check-test-ci-coverage,markdownlint-cli2,shellcheck,check-spdx-header,mypy-3.10

.pre-commit-config.yaml

@@ -105,8 +105,8 @@ repos:
       <<: *mypy_common
       stages: [manual]
 
-    - id: check-mark
-      name: Ensure test files have CI marks (no direct SKU)
+    - id: check-test-ci-coverage
+      name: Ensure test files have pytestmarks
       entry: python tools/pre_commit/check_test_marks.py
       language: python
       types: [python]

CONTRIBUTING.md

@@ -2,8 +2,6 @@
 
 You may find information about contributing to vLLM-Omni on [Contributing](https://vllm-omni.readthedocs.io/en/latest/contributing/).
 
-AI-assisted contributions must follow the [AI Usage Policy](docs/contributing/README.md#ai-usage-policy), including disclosure, human review, and validation requirements.
-
 Local `pre-commit` gates (SPDX, forbidden imports, `torch.cuda`, shellcheck,
 mypy, test marks, TTS adapter ratchet, markdownlint, Buildkite schema, and
 how to extend allowlists) are documented in the

README.md

@@ -16,7 +16,6 @@ Easy, fast, and cheap omni-modality model serving for everyone
 
 *Latest News* 🔥
 
-- [2026/08] We released [0.28.0](https://github.com/vllm-project/vllm-omni/releases/tag/v0.28.0), featuring production-ready [MiniMax H3](recipes/MiniMaxAI/MiniMax-H3.md) serving on GPU and NPU, a unified AR/DiT paged KV cache runtime, and enhanced realtime full-duplex serving for the [MiniCPM-o series](recipes/OpenBMB/MiniCPM-o-4_5.md).
 - [2026/08] [VeRL-Omni](https://github.com/verl-project/verl-omni) `v0.2.0` is released: faster diffusion RL powered by vLLM-Omni (request-level/step-wise batching with FA3), rebuilt Qwen3-Omni multimodal training (DPO & GSPO), plus LTX-2.3, Qwen-Image-Edit support and more. See the [release notes](https://github.com/verl-project/verl-omni/releases/tag/v0.2.0).
 - [2026/08] We released [0.26.0](https://github.com/vllm-project/vllm-omni/releases/tag/v0.26.0) - aligned with the vLLM 0.26 release line, featuring [MiniMax H3](recipes/MiniMaxAI/MiniMax-H3.md) joint video/audio generation, an experimental full-duplex realtime runtime for [MiniCPM-o 4.5](recipes/OpenBMB/MiniCPM-o-4_5.md), distributed layerwise diffusion offload, and broader model, hardware, streaming, TTS, and quantization support.
 - [2026/07] We released [0.24.0](https://github.com/vllm-project/vllm-omni/releases/tag/v0.24.0) - aligned with the vLLM 0.24 release line, expanding production-ready coverage across TTS, speech, diffusion, image/video generation, and robot-policy serving, with major Omni stage runtime refactoring, diffusion request-level batching, async output materialization, quantization/cache/memory improvements, and broad CUDA/ROCm/XPU/NPU support.
@@ -53,14 +52,14 @@ vLLM-Omni is flexible and easy to use with:
 - Tensor, pipeline, data and expert parallelism support for distributed inference
 - Streaming outputs
 - OpenAI-compatible API server
-- [Full-duplex realtime serving](docs/serving/realtime_duplex_api.md) with streaming audio input and output
+- Full-duplex realtime serving with streaming audio input and output (experimental)
 
 vLLM-Omni seamlessly supports most popular open-source models on HuggingFace, including:
 
 - **Omni-modality models** (e.g. Qwen3-Omni, MiniCPM-o 4.5, Cosmos3, HunyuanImage, BAGEL)
-- **TTS models** (e.g. Qwen3-TTS, IndexTTS 2.5, dots.tts, CosyVoice3)
-- **Diffusion models** — image, video, and audio generation (e.g. MiniMax H3, LTX-2.5, SANA-Video, Wan2.2)
-- **Robot-policy and action models** (e.g. π0, GR00T-N1.7, DreamZero-DROID, InternVLA-A1)
+- **TTS models** (e.g. Qwen3-TTS, VoxCPM2, Ming-Omni-TTS, CosyVoice3)
+- **Diffusion models** — image, video, and audio generation (e.g. MiniMax H3, Qwen-Image, Wan2.2, FLUX)
+- **Robot-policy and action models** (e.g. GR00T-N1.7, DreamZero-DROID, InternVLA-A1, Cosmos3 action policy)
 
 ## Getting Started
 
@@ -68,7 +67,6 @@ Visit our [documentation](https://vllm-omni.readthedocs.io/en/latest/) to learn
 
 - [Installation](https://vllm-omni.readthedocs.io/en/latest/getting_started/installation/)
 - [Quickstart](https://vllm-omni.readthedocs.io/en/latest/getting_started/quickstart/)
-- [Nightly CUDA Docker images](https://hub.docker.com/r/vllm/vllm-omni/tags?name=nightly) built from the latest `main`
 - [List of Supported Models](https://vllm-omni.readthedocs.io/en/latest/models/supported_models/)
 - [Deployment Recipes](https://recipes.vllm.ai) for vLLM-Omni model serving
 

benchmarks/diffusion/README.md

@@ -17,18 +17,18 @@ The main entrypoint is:
 vllm serve Qwen/Qwen-Image --omni --port 8099
 ```
 
-1. Run a minimal benchmark:
+2. Run a minimal benchmark:
 
 ```bash
 python3 benchmarks/diffusion/diffusion_benchmark_serving.py \
- --base-url http://localhost:8099 \
- --model Qwen/Qwen-Image \
- --task t2i \
- --dataset vbench \
- --num-prompts 5
+	--base-url http://localhost:8099 \
+	--model Qwen/Qwen-Image \
+	--task t2i \
+	--dataset vbench \
+	--num-prompts 5
 ```
 
-### Notes
+**Notes**
 
 - By default, image tasks talk to `http://<host>:<port>/v1/chat/completions`; video tasks talk to `/v1/videos`.
 - If you run the server on another host or port, pass `--base-url` accordingly.
@@ -52,14 +52,14 @@ Example (`t2v`):
 
 ```bash
 python3 benchmarks/diffusion/diffusion_benchmark_serving.py \
- --base-url http://localhost:8099 \
- --model Wan-AI/Wan2.2-T2V-A14B-Diffusers \
- --task t2v \
- --dataset vbench \
- --num-prompts 50 \
- --width 640 --height 480 \
- --num-frames 81 --fps 16 \
- --num-inference-steps 40
+	--base-url http://localhost:8099 \
+	--model Wan-AI/Wan2.2-T2V-A14B-Diffusers \
+	--task t2v \
+	--dataset vbench \
+	--num-prompts 50 \
+	--width 640 --height 480 \
+	--num-frames 81 --fps 16 \
+	--num-inference-steps 40
 ```
 
 Note: `vbench` can also be used for other tasks such as `t2i` / `i2v` (and `i2i`). For `t2i`, the loader reuses VBench t2v text prompts; for `i2v` / `i2i`, it loads the VBench i2v dataset (with image paths).
@@ -140,21 +140,6 @@ Traffic / concurrency flags:
 - `--request-rate`: Target request rate (requests/second). If set to `inf`, the script sends all requests immediately.
 - `--max-concurrency`: Max number of in-flight requests (default: `1`). This can hard-cap the achieved QPS: if it is too small, requests will queue behind the semaphore, and both achieved throughput and observed SLO attainment can be skewed.
 
-### Video job timeout and failures
-
-`--video-job-timeout` controls how long each `/v1/videos` job may be polled,
-including time queued on the server (default: `900` seconds). For long video
-jobs at high concurrency, use a larger budget, for example
-`--video-job-timeout 1800`. This also applies to warmup jobs. The polling budget
-starts after job creation; it excludes time waiting for the client concurrency
-semaphore. Individual HTTP calls still use the aiohttp session timeout.
-
-An expired job is counted as failed and deleted, which cancels queued or running
-server generation. The benchmark continues processing the remaining requests.
-The progress bar counts both successful and failed requests. The final report
-shows the failure count and the first 10 errors; `--output-file` saves all errors
-with their request IDs in `request_errors`.
-
 ### Batched warmup note
 
 For batched serving runs, warm the same in-flight shape you plan to measure.

benchmarks/diffusion/backends.py

@@ -1,6 +1,3 @@
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-FileCopyrightText: Copyright contributors to the vLLM-Omni project
-
 import asyncio
 import base64
 import json
@@ -46,7 +43,6 @@ class RequestFuncInput:
     video_paths: list[str] | None = None
     request_id: str = field(default_factory=lambda: str(uuid.uuid4()))
     default_bot_task: str | None = DEFAULT_EDITS_BOT_TASK
-    video_job_timeout: float = 900.0
 
 
 @dataclass
@@ -335,64 +331,64 @@ async def async_request_v1_videos(
     output = RequestFuncOutput()
     output.start_time = time.perf_counter()
 
+    files = dict(input.extra_body)
+    if input.prompt:
+        files.setdefault("prompt", input.prompt)
+    if input.width and input.height:
+        files.setdefault("height", input.height)
+        files.setdefault("width", input.width)
+    if input.num_frames:
+        files.setdefault("num_frames", input.num_frames)
+    if input.num_inference_steps:
+        files.setdefault("num_inference_steps", input.num_inference_steps)
+    if input.seed is not None:
+        files.setdefault("seed", input.seed)
+    if input.fps:
+        files.setdefault("fps", input.fps)
+
+    form = aiohttp.FormData()
+    for k, v in files.items():
+        form.add_field(k, str(v))
+
     image_file = None
-    job_id = None
-    try:
-        files = dict(input.extra_body)
-        if input.prompt:
-            files.setdefault("prompt", input.prompt)
-        if input.width and input.height:
-            files.setdefault("height", input.height)
-            files.setdefault("width", input.width)
-        if input.num_frames:
-            files.setdefault("num_frames", input.num_frames)
-        if input.num_inference_steps:
-            files.setdefault("num_inference_steps", input.num_inference_steps)
-        if input.seed is not None:
-            files.setdefault("seed", input.seed)
-        if input.fps:
-            files.setdefault("fps", input.fps)
+    if input.image_paths and input.video_paths:
+        output.error = "Only one of image_paths or video_paths can be provided"
+        output.success = False
+        return output
 
-        form = aiohttp.FormData()
-        for k, v in files.items():
-            form.add_field(k, str(v))
-
-        if input.image_paths and input.video_paths:
-            output.error = "Only one of image_paths or video_paths can be provided"
-            output.success = False
-            return output
-
-        if input.image_paths and len(input.image_paths) > 0:
-            image_path = input.image_paths[0]
-            image_file = open(image_path, "rb")
+    if input.image_paths and len(input.image_paths) > 0:
+        image_path = input.image_paths[0]
+        image_file = open(image_path, "rb")
+        form.add_field(
+            "input_reference",
+            image_file,
+            filename=os.path.basename(image_path),
+            content_type=_guess_mime_type(image_path),
+        )
+    elif input.video_paths and len(input.video_paths) > 0:
+        video_path = input.video_paths[0]
+        if _is_minimax_h3_mixed_reference(input.model):
+            with open(video_path, "rb") as reference_file:
+                video_b64 = base64.b64encode(reference_file.read()).decode("ascii")
+            form.add_field(
+                "video_reference",
+                json.dumps([{"video_url": f"data:video/mp4;base64,{video_b64}"}]),
+            )
+        else:
+            image_file = open(video_path, "rb")
             form.add_field(
                 "input_reference",
                 image_file,
-                filename=os.path.basename(image_path),
-                content_type=_guess_mime_type(image_path),
+                filename=os.path.basename(video_path),
+                content_type=_guess_mime_type(video_path),
             )
-        elif input.video_paths and len(input.video_paths) > 0:
-            video_path = input.video_paths[0]
-            if _is_minimax_h3_mixed_reference(input.model):
-                with open(video_path, "rb") as reference_file:
-                    video_b64 = base64.b64encode(reference_file.read()).decode("ascii")
-                form.add_field(
-                    "video_reference",
-                    json.dumps([{"video_url": f"data:video/mp4;base64,{video_b64}"}]),
-                )
-            else:
-                image_file = open(video_path, "rb")
-                form.add_field(
-                    "input_reference",
-                    image_file,
-                    filename=os.path.basename(video_path),
-                    content_type=_guess_mime_type(video_path),
-                )
 
-        job_status = None
-        poll_json = {}
-        resp_json = {}
+    job_id = None
+    job_status = None
+    poll_json = {}
+    resp_json = {}
 
+    try:
         # invoke a post request (POST /v1/videos)
         async with session.post(input.api_url, data=form) as response:
             if response.status == 200:
@@ -410,7 +406,7 @@ async def async_request_v1_videos(
 
         # invoke a poll request (GET /v1/videos/{video_id})
         poll_interval = 2.0  # Unit(s)
-        timeout_seconds = input.video_job_timeout
+        timeout_seconds = 600.0
         deadline = time.perf_counter() + timeout_seconds
         job_url = f"{input.api_url}/{job_id}"
 
@@ -426,11 +422,8 @@ async def async_request_v1_videos(
                 poll_json = await poll_response.json()
                 job_status = poll_json.get("status")
 
-                if job_status not in {"completed", "failed"} and time.perf_counter() >= deadline:
-                    output.error = (
-                        f"Timed out after {timeout_seconds:g}s waiting for video job {job_id} to complete. "
-                        "Increase --video-job-timeout for long-running or queued video jobs."
-                    )
+                if time.perf_counter() >= deadline:
+                    output.error = f"Timed out waiting for video job {job_id} to complete."
                     output.success = False
                     return output
 
@@ -459,7 +452,7 @@ async def async_request_v1_videos(
             elif "peak_memory_mb" in resp_json:
                 output.peak_memory_mb = resp_json["peak_memory_mb"]
     except Exception as e:
-        output.error = f"{type(e).__name__}: {e}"
+        output.error = str(e)
         output.success = False
     finally:
         if image_file is not None:
@@ -472,13 +465,13 @@ async def async_request_v1_videos(
             except Exception as e:
                 print(f"Failed to clean up video job {job_id}: {e}")
 
-        output.latency = time.perf_counter() - output.start_time
-        if pbar is not None:
-            pbar.update(1)
+    output.latency = time.perf_counter() - output.start_time
 
     if output.success and input.slo_ms is not None:
         output.slo_achieved = (output.latency * 1000.0) <= float(input.slo_ms)
 
+    if pbar:
+        pbar.update(1)
     return output
 
 

benchmarks/diffusion/diffusion_benchmark_serving.py

@@ -1,6 +1,6 @@
 # adapted from fastvideo
 # SPDX-License-Identifier: Apache-2.0
-# SPDX-FileCopyrightText: Copyright contributors to the vLLM-Omni project
+# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
 
 """
 Benchmark online serving for diffusion models (Image/Video Generation).
@@ -87,7 +87,6 @@ import base64
 import glob
 import json
 import logging
-import math
 import os
 import random
 import tempfile
@@ -1117,11 +1116,6 @@ def calculate_metrics(
         "duration": total_duration,
         "completed_requests": num_success,
         "failed_requests": len(error_outputs),
-        "request_errors": [
-            {"request_id": req.request_id, "error": out.error}
-            for req, out in zip(requests_list, outputs)
-            if not out.success
-        ],
         "throughput_qps": num_success / total_duration if total_duration > 0 else 0,
         "latency_mean": np.mean(latencies) if latencies else 0,
         "latency_median": np.median(latencies) if latencies else 0,
@@ -1267,9 +1261,6 @@ def _default_endpoint_for_task(task: str) -> str:
 
 
 async def benchmark(args):
-    if not math.isfinite(args.video_job_timeout) or args.video_job_timeout <= 0:
-        raise ValueError("--video-job-timeout must be a positive finite number of seconds.")
-
     # Construct base_url if not provided
     if args.base_url is None:
         args.base_url = f"http://{args.host}:{args.port}"
@@ -1321,8 +1312,6 @@ async def benchmark(args):
     print("Loading requests...")
     requests_list = dataset.get_requests()
     print(f"Prepared {len(requests_list)} requests from {args.dataset} dataset.")
-    for req in requests_list:
-        req.video_job_timeout = args.video_job_timeout
 
     if args.return_stage_metrics and args.endpoint in _STAGE_METRICS_ENDPOINTS:
         for req in requests_list:
@@ -1387,8 +1376,6 @@ async def benchmark(args):
     metrics["model"] = args.model
     metrics["dataset"] = args.dataset
     metrics["task"] = args.task
-    if args.endpoint == "/v1/videos":
-        metrics["video_job_timeout"] = args.video_job_timeout
     if args.endpoint == "/v1/images/edits":
         metrics["bot_task"] = args.bot_task
 
@@ -1411,11 +1398,6 @@ async def benchmark(args):
         )
     )
     print("{:<40} {}/{:<15}".format("Successful requests:", metrics["completed_requests"], len(requests_list)))
-    print("{:<40} {:<15}".format("Failed requests:", metrics["failed_requests"]))
-    for failure in metrics["request_errors"][:10]:
-        print(f"Request {failure['request_id']} failed: {failure['error']}")
-    if metrics["failed_requests"] > 10:
-        print("Showing first 10 failures; use --output-file to save all request errors.")
 
     # Section 3: Performance Metrics
     print(f"{'-' * 50}")
@@ -1499,13 +1481,6 @@ if __name__ == "__main__":
         help="Path to local dataset file (optional).",
     )
     parser.add_argument("--num-prompts", type=int, default=10, help="Number of prompts to benchmark.")
-    parser.add_argument(
-        "--video-job-timeout",
-        type=float,
-        default=900.0,
-        help="Maximum polling time in seconds per video job, including server queue time (default: 900). "
-        "Increase this for long-running video generation or high concurrency.",
-    )
     parser.add_argument(
         "--max-concurrency",
         type=int,

benchmarks/kernels/benchmark_diffusion_lora_expand.py

@@ -1,156 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-FileCopyrightText: Copyright contributors to the vLLM-Omni project
-"""Benchmark diffusion LoRA expand-and-accumulate implementations.
-
-This compares the previous functional expand path with direct accumulation into
-the selected output slice. It is a synthetic kernel microbenchmark and does not
-load a diffusion model.
-
-Example:
-    python benchmarks/kernels/benchmark_diffusion_lora_expand.py \
-        --m 1,16,128,512,4096,16384 \
-        --in-dim 4096 --out-dim 4096 --rank 64 \
-        --dtype bfloat16 --packed --warmup 30 \
-        --small-iterations 500 --large-iterations 100
-"""
-
-import argparse
-import math
-import statistics
-from collections.abc import Callable
-
-import torch
-
-MiB = 1024**2
-
-
-def parse_args() -> argparse.Namespace:
-    parser = argparse.ArgumentParser(description=__doc__)
-    parser.add_argument("--m", default="1,16,128,512,4096,16384")
-    parser.add_argument("--in-dim", type=int, default=4096)
-    parser.add_argument("--out-dim", type=int, default=4096)
-    parser.add_argument("--rank", type=int, default=64)
-    parser.add_argument("--dtype", choices=("bfloat16", "float16"), default="bfloat16")
-    parser.add_argument(
-        "--packed",
-        action="store_true",
-        help="Accumulate into the second half of a packed output tensor.",
-    )
-    parser.add_argument("--warmup", type=int, default=30)
-    parser.add_argument("--small-iterations", type=int, default=500)
-    parser.add_argument("--large-iterations", type=int, default=100)
-    parser.add_argument("--large-m-threshold", type=int, default=1024)
-    return parser.parse_args()
-
-
-def percentile(samples: list[float], probability: float) -> float:
-    ordered = sorted(samples)
-    position = probability * (len(ordered) - 1)
-    lower = math.floor(position)
-    upper = math.ceil(position)
-    if lower == upper:
-        return ordered[lower]
-    weight = position - lower
-    return ordered[lower] * (1 - weight) + ordered[upper] * weight
-
-
-def measure_latency_ms(operation: Callable[[], None], warmup: int, iterations: int) -> list[float]:
-    for _ in range(warmup):
-        operation()
-    torch.accelerator.synchronize()
-
-    starts = [torch.cuda.Event(enable_timing=True) for _ in range(iterations)]
-    ends = [torch.cuda.Event(enable_timing=True) for _ in range(iterations)]
-    for start, end in zip(starts, ends, strict=True):
-        start.record()
-        operation()
-        end.record()
-    torch.accelerator.synchronize()
-    return [start.elapsed_time(end) for start, end in zip(starts, ends, strict=True)]
-
-
-def measure_extra_peak_mib(operation: Callable[[], None]) -> float:
-    torch.accelerator.synchronize()
-    torch.accelerator.reset_peak_memory_stats()
-    allocated = torch.accelerator.memory_allocated()
-    operation()
-    torch.accelerator.synchronize()
-    peak = torch.accelerator.max_memory_allocated()
-    return (peak - allocated) / MiB
-
-
-def print_header(args: argparse.Namespace, dtype: torch.dtype) -> None:
-    device_name = torch.cuda.get_device_name()
-    print(f"device={device_name} torch={torch.__version__} dtype={dtype}")
-    print(f"in_dim={args.in_dim} out_dim={args.out_dim} rank={args.rank} packed={args.packed} warmup={args.warmup}")
-    print("M       iters  old_p10  old_p50  old_p90  new_p10  new_p50  new_p90  speedup  old_MiB  new_MiB  max_abs")
-
-
-def benchmark_shape(m: int, args: argparse.Namespace, dtype: torch.dtype) -> None:
-    device = torch.device("cuda")
-    output_width = args.out_dim * (2 if args.packed else 1)
-    offset = args.out_dim if args.packed else 0
-    output_slice = slice(offset, offset + args.out_dim)
-    scale = 1 / math.sqrt(args.in_dim)
-
-    x = torch.randn(m, args.in_dim, device=device, dtype=dtype)
-    lora_a = torch.randn(args.rank, args.in_dim, device=device, dtype=dtype) * scale
-    lora_b = torch.randn(args.out_dim, args.rank, device=device, dtype=dtype) / math.sqrt(args.rank)
-    initial_output = torch.randn(m, output_width, device=device, dtype=dtype)
-
-    def baseline(output: torch.Tensor) -> None:
-        buffer = x @ lora_a.t()
-        delta = buffer @ lora_b.t()
-        selected = output[:, output_slice]
-        selected[:] = selected + delta
-
-    def optimized(output: torch.Tensor) -> None:
-        buffer = x @ lora_a.t()
-        selected = output[:, output_slice]
-        torch.addmm(selected, buffer, lora_b.t(), out=selected)
-
-    reference = initial_output.clone()
-    candidate = initial_output.clone()
-    baseline(reference)
-    optimized(candidate)
-    torch.testing.assert_close(candidate, reference, rtol=1e-2, atol=1e-2)
-    max_abs = (candidate - reference).abs().max().item()
-
-    old_output = initial_output.clone()
-    new_output = initial_output.clone()
-    iterations = args.large_iterations if m >= args.large_m_threshold else args.small_iterations
-
-    old_peak = measure_extra_peak_mib(lambda: baseline(old_output))
-    new_peak = measure_extra_peak_mib(lambda: optimized(new_output))
-    old_samples = measure_latency_ms(lambda: baseline(old_output), args.warmup, iterations)
-    new_samples = measure_latency_ms(lambda: optimized(new_output), args.warmup, iterations)
-
-    old_p50 = statistics.median(old_samples)
-    new_p50 = statistics.median(new_samples)
-    print(
-        f"{m:<7} {iterations:<6} "
-        f"{percentile(old_samples, 0.1):>8.5f} {old_p50:>8.5f} {percentile(old_samples, 0.9):>8.5f} "
-        f"{percentile(new_samples, 0.1):>8.5f} {new_p50:>8.5f} {percentile(new_samples, 0.9):>8.5f} "
-        f"{old_p50 / new_p50:>8.3f} {old_peak:>8.2f} {new_peak:>8.2f} {max_abs:>8.5f}"
-    )
-
-
-def main() -> None:
-    args = parse_args()
-    if not torch.cuda.is_available():
-        raise RuntimeError("This benchmark requires a CUDA GPU")
-    if args.warmup < 0 or args.small_iterations <= 0 or args.large_iterations <= 0:
-        raise ValueError("warmup must be non-negative and iteration counts must be positive")
-
-    dtype = getattr(torch, args.dtype)
-    torch.manual_seed(0)
-    print_header(args, dtype)
-    with torch.inference_mode():
-        for m in (int(value) for value in args.m.split(",")):
-            if m <= 0:
-                raise ValueError(f"M must be positive, got {m}")
-            benchmark_shape(m, args, dtype)
-
-
-if __name__ == "__main__":
-    main()

benchmarks/tts/README.md

@@ -2,7 +2,7 @@
 
 A model-agnostic serving benchmark for TTS models in vllm-omni. One CLI
 (`bench_tts.py`) + one YAML registry (`model_configs.yaml`) drive perf and
-quality runs for every registered checkpoint: **Qwen3-TTS** (Base / CustomVoice / VoiceDesign)
+quality runs for every registered checkpoint: **Qwen3-TTS** (Base / CustomVoice)
 and **VoxCPM2** today, more to come.
 
 The same three task types — `voice_clone`, `default_voice`, `voice_design` —
@@ -21,11 +21,6 @@ The server auto-loads its Deploy YAML from `vllm_omni/deploy/qwen3_tts.yaml`
 (Pipeline + Deploy schema introduced in #2383). No explicit `--deploy-config`
 flag is needed for a registered model.
 
-Start the checkpoint that matches the benchmark task below: `-Base` for
-`voice_clone`, `-CustomVoice` for `default_voice`, or `-VoiceDesign` for
-`voice_design`. Restart the server with the matching checkpoint when switching
-tasks; changing only the benchmark's `--model` does not reload the server.
-
 ### 2. Run the benchmark (`vllm bench serve --omni`)
 
 The primary, directly-controllable path. Copy-paste one of these and tweak
@@ -67,12 +62,12 @@ vllm bench serve --omni \
     --save-result --result-dir ./results
 ```
 
-#### voice_design (Qwen3-TTS-VoiceDesign, bundled seed_tts_design)
+#### voice_design (Qwen3-TTS-CustomVoice, bundled seed_tts_design)
 
 ```bash
 vllm bench serve --omni \
     --host 127.0.0.1 --port 8000 \
-    --model Qwen/Qwen3-TTS-12Hz-1.7B-VoiceDesign \
+    --model Qwen/Qwen3-TTS-12Hz-1.7B-CustomVoice \
     --backend openai-audio-speech \
     --endpoint /v1/audio/speech \
     --dataset-name seed-tts-design \
@@ -85,25 +80,6 @@ vllm bench serve --omni \
     --save-result --result-dir ./results
 ```
 
-#### Set the sample rate for models that are not 24 kHz
-
-Streamed PCM carries no header, so the harness derives `audio_duration` from the
-byte count and a **default 24000 Hz** assumption
-(`vllm_omni/metrics/definitions.py:DEFAULT_AUDIO_SAMPLE_RATE`). For a model that
-emits another rate, export the real one or every duration-derived metric is
-wrong by `real_sr / 24000`:
-
-```bash
-# Audio8 TTS, Fish Speech S2 Pro, Ming-omni-tts, ... all decode at 44.1 kHz
-export VLLM_OMNI_BENCH_AUDIO_SAMPLE_RATE=44100
-```
-
-Without it, a 44.1 kHz model reports `audio_duration` 1.84x too long, so
-`audio_rtf` looks 1.84x *better* than reality and `audio_underrun` /
-`Streaming continuity OK rate` are measured against inflated chunk budgets.
-A quick sanity check: compare `Mean AUDIO_DURATION (s)` against the actual
-length of a saved WAV for the same prompt.
-
 #### Streaming continuity (`audio_underrun`)
 
 `audio_underrun` (seconds) is the per-request worst-case buffer deficit
@@ -204,11 +180,11 @@ Outputs TTFP / RTF / throughput curves (and a markdown table) for every
 
 ## Task types
 
-| Task            | Dataset           | Request body                                                            | Checkpoints that support it   |
-| --------------- | ----------------- | ----------------------------------------------------------------------- | ----------------------------- |
-| `voice_clone`   | `seed-tts`        | `ref_audio` + `ref_text` + `task_type=Base`                             | `Qwen3-TTS-*-Base`, `VoxCPM2` |
-| `default_voice` | `seed-tts-text`   | `voice=Vivian` + `task_type=CustomVoice`                                | `Qwen3-TTS-*-CustomVoice`     |
-| `voice_design`  | `seed-tts-design` | `instructions=<natural-language description>` + `task_type=VoiceDesign` | `Qwen3-TTS-*-VoiceDesign`     |
+| Task            | Dataset           | Request body                                        | Checkpoints that support it              |
+|-----------------|-------------------|-----------------------------------------------------|------------------------------------------|
+| `voice_clone`   | `seed-tts`        | `ref_audio` + `ref_text` + `task_type=Base`         | `Qwen3-TTS-*-Base`, `VoxCPM2`            |
+| `default_voice` | `seed-tts-text`   | `voice=Vivian` + `task_type=CustomVoice`            | `Qwen3-TTS-*-CustomVoice`                |
+| `voice_design`  | `seed-tts-design` | `instructions=<natural-language description>` + `task_type=VoiceDesign` | `Qwen3-TTS-*-CustomVoice` |
 
 **`-CustomVoice` checkpoints do NOT ship `speaker_encoder` weights**, so
 voice_clone requests raise `ValueError` at model runtime. Use `-Base` for
@@ -234,12 +210,12 @@ Then add the model's Deploy YAML under `vllm_omni/deploy/<model>.yaml`
 
 ## Datasets
 
-| Dataset           | Bundled? | Format                  | Source                                                               |
-| ----------------- | -------- | ----------------------- | -------------------------------------------------------------------- |
-| `seed-tts-design` | ✅       | 5-field meta.lst        | `benchmarks/build_dataset/seed_tts_design/en/meta.lst` (20 prompts)  |
-| `seed_tts_smoke`  | ✅       | 4-field meta.lst        | `benchmarks/build_dataset/seed_tts_smoke/en/meta.lst` (20 text-only) |
-| `seed-tts`        | ❌       | 4-field meta.lst + WAVs | Google-Drive: [BytedanceSpeech/seed-tts-eval][seedtts] (~1.2 GB)     |
-| `seed-tts-text`   | ❌       | 4-field meta.lst        | Same archive as `seed-tts` (wav column unused)                       |
+| Dataset            | Bundled? | Format            | Source                                                         |
+|--------------------|----------|-------------------|----------------------------------------------------------------|
+| `seed-tts-design`  | ✅       | 5-field meta.lst  | `benchmarks/build_dataset/seed_tts_design/en/meta.lst` (20 prompts) |
+| `seed_tts_smoke`   | ✅       | 4-field meta.lst  | `benchmarks/build_dataset/seed_tts_smoke/en/meta.lst` (20 text-only) |
+| `seed-tts`         | ❌       | 4-field meta.lst + WAVs | Google-Drive: [BytedanceSpeech/seed-tts-eval][seedtts] (~1.2 GB) |
+| `seed-tts-text`    | ❌       | 4-field meta.lst  | Same archive as `seed-tts` (wav column unused)                 |
 
 [seedtts]: https://github.com/BytedanceSpeech/seed-tts-eval
 
@@ -251,11 +227,11 @@ For manual voice_clone / default_voice runs against the full corpus, follow
 
 `tests/dfx/perf/tests/test_tts.json` wires three perf regimes plus quality:
 
-| eval_phase   | concurrency | purpose                                                  | Baseline metrics                           |
-| ------------ | ----------- | -------------------------------------------------------- | ------------------------------------------ |
-| `latency`    | 1           | Single-request TTFP / RTF SLO                            | `median_audio_ttfp_ms`, `median_audio_rtf` |
-| `throughput` | 8           | Codec-batching cliff sentinel (PDF #272 concurrency≥8)   | `median_audio_ttfp_ms`, `median_audio_rtf` |
-| `quality`    | 4           | WER / SIM / UTMOS regression (disabled in CI by default) | `mean_audio_rtf`                           |
+| eval_phase    | concurrency | purpose                                                 | Baseline metrics                        |
+|---------------|-------------|---------------------------------------------------------|-----------------------------------------|
+| `latency`     | 1           | Single-request TTFP / RTF SLO                           | `median_audio_ttfp_ms`, `median_audio_rtf` |
+| `throughput`  | 8           | Codec-batching cliff sentinel (PDF #272 concurrency≥8)  | `median_audio_ttfp_ms`, `median_audio_rtf` |
+| `quality`     | 4           | WER / SIM / UTMOS regression (disabled in CI by default)| `mean_audio_rtf`                        |
 
 Why `median_*` for latency/throughput and `mean_*` for quality: latency
 distributions have cold-start tails that drag the mean; quality aggregates
@@ -269,15 +245,10 @@ PR #2558 — quality runs are manual / release-validation, not nightly).
 
 Observed on H20-3e, Qwen3-TTS-1.7B (measured pre-merge on this branch):
 
-| Task         | Model            | c=1                   | c=4          | **c=8**           | c=16          | c=32          |
-| ------------ | ---------------- | --------------------- | ------------ | ----------------- | ------------- | ------------- |
-| voice_clone  | 1.7B-Base        | RTF 0.15 / TTFP 165ms | 0.28 / 412ms | **0.49 / 1701ms** | 0.72 / 3355ms | 0.77 / 3772ms |
-| voice_design | 1.7B-CustomVoice | RTF 0.08 / TTFP 53ms  | 0.11 / 154ms | **0.21 / 872ms**  | 0.33 / 1801ms | 0.38 / 1989ms |
-
-The historical `voice_design` row above lists a CustomVoice checkpoint, which
-current task validation rejects for VoiceDesign requests. It does not establish
-a VoiceDesign checkpoint baseline; rerun with `Qwen3-TTS-12Hz-1.7B-VoiceDesign`
-before comparing performance.
+| Task          | Model         | c=1    | c=4    | **c=8**    | c=16   | c=32   |
+|---------------|---------------|--------|--------|------------|--------|--------|
+| voice_clone   | 1.7B-Base     | RTF 0.15 / TTFP 165ms | 0.28 / 412ms | **0.49 / 1701ms** | 0.72 / 3355ms | 0.77 / 3772ms |
+| voice_design  | 1.7B-CustomVoice | RTF 0.08 / TTFP 53ms  | 0.11 / 154ms | **0.21 / 872ms**  | 0.33 / 1801ms | 0.38 / 1989ms |
 
 Both models show a **4–6× TTFP jump from c=4 to c=8** while audio throughput
 saturates around c=4–8 — the codec-bs=1 bottleneck documented in
@@ -286,7 +257,7 @@ sentinel for regressions in this area.
 
 ## File layout
 
-```text
+```
 benchmarks/tts/
 ├── README.md                  (this file)
 ├── bench_tts.py               CLI — serve-mode benchmark driver

benchmarks/tts/benchmark_cosyvoice3_trt_streams.py

@@ -1,151 +0,0 @@
-"""Benchmark CosyVoice3-style CUDA stream handoff strategies."""
-
-import argparse
-import json
-import statistics
-import time
-
-import torch
-
-from vllm_omni.platforms import current_omni_platform
-
-
-def run_case(
-    *,
-    device: torch.device,
-    steps: int,
-    warmup_steps: int,
-    producer_cycles: int,
-    estimator_cycles: int,
-    use_stream_dependencies: bool,
-) -> dict[str, float | int | str]:
-    caller_stream = torch.cuda.Stream(device=device)
-    estimator_stream = torch.cuda.Stream(device=device)
-    input_tensor = torch.zeros(1024, device=device)
-    output_tensor = torch.empty_like(input_tensor)
-    submission_ms = []
-
-    def step(measure: bool) -> None:
-        with torch.cuda.stream(caller_stream):
-            torch.cuda._sleep(producer_cycles)
-            input_tensor.add_(1)
-
-        start = time.perf_counter_ns()
-        if use_stream_dependencies:
-            estimator_stream.wait_stream(caller_stream)
-        else:
-            caller_stream.synchronize()
-
-        with torch.cuda.stream(estimator_stream):
-            torch.cuda._sleep(estimator_cycles)
-            output_tensor.copy_(input_tensor)
-
-        if use_stream_dependencies:
-            caller_stream.wait_stream(estimator_stream)
-        else:
-            estimator_stream.synchronize()
-
-        if measure:
-            submission_ms.append((time.perf_counter_ns() - start) / 1e6)
-
-    for _ in range(warmup_steps):
-        step(measure=False)
-    caller_stream.synchronize()
-    estimator_stream.synchronize()
-    input_tensor.zero_()
-    torch.accelerator.reset_peak_memory_stats(device)
-    initial_allocated = torch.accelerator.memory_allocated(device)
-
-    start_event = torch.cuda.Event(enable_timing=True)
-    end_event = torch.cuda.Event(enable_timing=True)
-    wall_start = time.perf_counter()
-    with torch.cuda.stream(caller_stream):
-        start_event.record()
-    for _ in range(steps):
-        step(measure=True)
-    with torch.cuda.stream(caller_stream):
-        end_event.record()
-    end_event.synchronize()
-    wall_ms = (time.perf_counter() - wall_start) * 1e3
-    peak_delta_bytes = torch.accelerator.max_memory_allocated(device) - initial_allocated
-
-    expected = torch.full_like(output_tensor, steps)
-    torch.testing.assert_close(output_tensor, expected, rtol=0, atol=0)
-    return {
-        "mode": "wait_stream" if use_stream_dependencies else "synchronize",
-        "steps": steps,
-        "submission_median_ms": statistics.median(submission_ms),
-        "submission_p95_ms": statistics.quantiles(submission_ms, n=20)[18],
-        "submission_mean_ms": statistics.mean(submission_ms),
-        "gpu_elapsed_ms": start_event.elapsed_time(end_event),
-        "wall_elapsed_ms": wall_ms,
-        "peak_allocation_delta_bytes": peak_delta_bytes,
-        "final_value": int(output_tensor[0].item()),
-    }
-
-
-def parse_args() -> argparse.Namespace:
-    parser = argparse.ArgumentParser()
-    parser.add_argument("--device", default="cuda:0")
-    parser.add_argument("--steps", type=int, default=100)
-    parser.add_argument("--warmup-steps", type=int, default=10)
-    parser.add_argument("--repeats", type=int, default=7)
-    parser.add_argument("--producer-cycles", type=int, default=1_000_000)
-    parser.add_argument("--estimator-cycles", type=int, default=2_000_000)
-    return parser.parse_args()
-
-
-def main() -> None:
-    args = parse_args()
-    device = torch.device(args.device)
-    current_omni_platform.set_device(device)
-    torch.manual_seed(0)
-
-    old_results = []
-    new_results = []
-    for repeat in range(args.repeats):
-        common_args = {
-            "device": device,
-            "steps": args.steps,
-            "warmup_steps": args.warmup_steps,
-            "producer_cycles": args.producer_cycles,
-            "estimator_cycles": args.estimator_cycles,
-        }
-        if repeat % 2 == 0:
-            old_results.append(run_case(**common_args, use_stream_dependencies=False))
-            new_results.append(run_case(**common_args, use_stream_dependencies=True))
-        else:
-            new_results.append(run_case(**common_args, use_stream_dependencies=True))
-            old_results.append(run_case(**common_args, use_stream_dependencies=False))
-
-    old_submission_ms = statistics.median(result["submission_median_ms"] for result in old_results)
-    new_submission_ms = statistics.median(result["submission_median_ms"] for result in new_results)
-    old_gpu_ms = statistics.median(result["gpu_elapsed_ms"] for result in old_results)
-    new_gpu_ms = statistics.median(result["gpu_elapsed_ms"] for result in new_results)
-    print(
-        json.dumps(
-            {
-                "device": torch.cuda.get_device_name(device),
-                "torch": torch.__version__,
-                "cuda": torch.version.cuda,
-                "repeats": args.repeats,
-                "warmup_steps": args.warmup_steps,
-                "producer_cycles": args.producer_cycles,
-                "estimator_cycles": args.estimator_cycles,
-                "old_submission_median_ms": old_submission_ms,
-                "new_submission_median_ms": new_submission_ms,
-                "submission_median_speedup": old_submission_ms / new_submission_ms,
-                "old_gpu_elapsed_median_ms": old_gpu_ms,
-                "new_gpu_elapsed_median_ms": new_gpu_ms,
-                "gpu_elapsed_change_percent": (new_gpu_ms - old_gpu_ms) / old_gpu_ms * 100,
-                "parity": all(result["final_value"] == args.steps for result in old_results + new_results),
-                "old_runs": old_results,
-                "new_runs": new_results,
-            },
-            indent=2,
-        )
-    )
-
-
-if __name__ == "__main__":
-    main()

benchmarks/tts/model_configs.yaml

@@ -17,23 +17,12 @@ models:
         extra_params:
           lang: en
           text_normalization: true
-  # Audio8 TTS Preview: DualAR, 44.1 kHz. trust_remote_code stays false.
-  # Bench at 44.1 kHz: export VLLM_OMNI_BENCH_AUDIO_SAMPLE_RATE=44100, otherwise
-  # the streamed-PCM duration defaults to 24 kHz and RTF looks 1.84x too good.
-  Audio8/Audio8-TTS-Preview-0.6b:
-    supported_tasks: [default_voice, voice_clone]
-    backend: openai-audio-speech
-    endpoint: /v1/audio/speech
-    trust_remote_code: false
-    task_extra_body:
-      default_voice: {}
-      voice_clone: {}
 
   # -CustomVoice checkpoints lack speaker_encoder weights, so voice_clone is
   # NOT supported (an attempt raises ValueError from _extract_speaker_embedding
   # at model runtime).  Use -Base for voice_clone.
   Qwen/Qwen3-TTS-12Hz-1.7B-CustomVoice:
-    supported_tasks: [default_voice]
+    supported_tasks: [default_voice, voice_design]
     backend: openai-audio-speech
     endpoint: /v1/audio/speech
     trust_remote_code: true
@@ -42,13 +31,6 @@ models:
         voice: Vivian
         language: English
         task_type: CustomVoice
-
-  Qwen/Qwen3-TTS-12Hz-1.7B-VoiceDesign:
-    supported_tasks: [voice_design]
-    backend: openai-audio-speech
-    endpoint: /v1/audio/speech
-    trust_remote_code: true
-    task_extra_body:
       voice_design:
         task_type: VoiceDesign
         language: English
@@ -150,14 +132,3 @@ models:
     endpoint: /v1/audio/speech
     task_extra_body:
       voice_design: {}
-
-  # OmniVoice serves plain text-to-speech over /v1/audio/speech; voice cloning
-  # and voice design are offline-only for this model, so default_voice is the
-  # only task the server can answer.
-  k2-fsa/OmniVoice:
-    supported_tasks: [default_voice]
-    backend: openai-audio-speech
-    endpoint: /v1/audio/speech
-    trust_remote_code: true
-    task_extra_body:
-      default_voice: {}

collect_env.py

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
-# SPDX-FileCopyrightText: Copyright contributors to the vLLM-Omni project
+# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
 
 # ruff: noqa
 # code borrowed from https://github.com/pytorch/pytorch/blob/main/torch/utils/collect_env.py
@@ -494,16 +494,6 @@ def is_xnnpack_available():
 
 
 def get_env_vars():
-    try:
-        from vllm_omni.config.environment_variable_inventory import ENVIRONMENT_VARIABLE_INVENTORY
-    except Exception:
-        # Keep environment collection usable when an incomplete/broken Omni
-        # installation is the reason the user is running this diagnostic.
-        # Importing an Omni submodule executes package initialization, which
-        # may fail with RuntimeError, AssertionError, or OSError as well as
-        # ImportError when vLLM or the accelerator stack is broken.
-        ENVIRONMENT_VARIABLE_INVENTORY = {}
-
     env_vars = ""
     secret_terms = ("secret", "token", "api", "access", "password")
     report_prefix = (
@@ -517,17 +507,12 @@ def get_env_vars():
         "MKL_",
         "NVIDIA",
     )
-    for k, v in sorted(os.environ.items()):
-        omni_classification = ENVIRONMENT_VARIABLE_INVENTORY.get(k)
-        if (omni_classification is not None and omni_classification.redact_value) or any(
-            term in k.lower() for term in secret_terms
-        ):
+    for k, v in os.environ.items():
+        if any(term in k.lower() for term in secret_terms):
             continue
-        if (
-            k in environment_variables
-            or (omni_classification is not None and omni_classification.is_public_omni)
-            or k.startswith(report_prefix)
-        ):
+        if k in environment_variables:
+            env_vars = env_vars + "{}={}".format(k, v) + "\n"
+        if k.startswith(report_prefix):
             env_vars = env_vars + "{}={}".format(k, v) + "\n"
 
     return env_vars

docker/Dockerfile.ci

@@ -1,10 +1,24 @@
-# Target vLLM version: v0.29.0 (tag @ 98dff2a81d74).
-# Use the matching release image and its coherent CUDA/PyTorch/FlashInfer
-# runtime. Do not reinstall a commit wheel or repair dependencies on top of
-# an older base image at a release boundary. For a future unreleased target,
-# restore an explicit wheel pin and validate its complete runtime stack.
+# Target vllm version: v0.27.0 (releases/v0.27.0 branch).
+# Keep VLLM_BASE_TAG aligned with the target vLLM release on every rebase.
+#
+# Release-boundary form: there is no precompiled-wheel pin here, because the
+# base image already ships exactly the target vLLM. Everything the runtime
+# needs — torch, flashinfer, nvJitLink, numpy — comes from that image as one
+# self-consistent set.
+#
+# This block reappears only when the rebase targets a vLLM commit that is NOT a
+# released tag. During the 0.27 rebase, targeting v0.27.0rc1 on top of the
+# v0.26.0 base image required reinstalling vLLM from wheels.vllm.ai and then
+# hand-repairing the fallout: pinning torch ahead of flashinfer (installing it
+# after bound flashinfer's TVM FFI runtime to the old torch and aborted engine
+# core init), registering libnvJitLink.so.13 with ldconfig, and re-pinning numpy
+# under numba's ceiling. All of it was compensation for a base image and a vLLM
+# that disagreed. At a real release boundary they agree, so none of it is
+# needed. If you pin an untagged commit again, restore the reinstall block —
+# agent/tasks/20_update_wheel_url.sh fails the run rather than letting the
+# Dockerfile silently ship the wrong vLLM.
 ARG VLLM_BASE_IMAGE=vllm/vllm-openai
-ARG VLLM_BASE_TAG=v0.29.0
+ARG VLLM_BASE_TAG=v0.27.0
 
 # We use registry-based layer caching for the dependencies,
 # where the tag is determined based on the hash of the contents

docker/Dockerfile.cuda

@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=vllm/vllm-openai:v0.28.0
+ARG BASE_IMAGE=vllm/vllm-openai:v0.26.0
 FROM ${BASE_IMAGE}
 
 ARG COMMON_WORKDIR=/app

docker/Dockerfile.npu

@@ -1,7 +1,20 @@
 ARG VLLM_ASCEND_IMAGE=quay.io/atlas-ci/vllm-ascend
-ARG VLLM_ASCEND_VERSION=v0.28.0
-ARG VLLM_ASCEND_DEVICE_SUFFIX=
-FROM ${VLLM_ASCEND_IMAGE}:${VLLM_ASCEND_VERSION}${VLLM_ASCEND_DEVICE_SUFFIX}
+ARG VLLM_ASCEND_TAG=v0.27.0
+FROM ${VLLM_ASCEND_IMAGE}:${VLLM_ASCEND_TAG}
+
+# WORKDIR /vllm-workspace/vllm
+# RUN git fetch origin --tags && git checkout v0.18.0
+
+# WORKDIR /vllm-workspace/vllm-ascend
+# RUN git fetch origin releases/v0.18.0 && git checkout d781902ce9dbda8ab1e11bb0f2f0c1bc508fee7a
+# # Install vllm-ascend
+# # Append `libascend_hal.so` path (devlib) to LD_LIBRARY_PATH
+# RUN export PIP_EXTRA_INDEX_URL=https://mirrors.huaweicloud.com/ascend/repos/pypi && \
+#     source /usr/local/Ascend/ascend-toolkit/set_env.sh && \
+#     source /usr/local/Ascend/nnal/atb/set_env.sh && \
+#     export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/Ascend/ascend-toolkit/latest/`uname -i`-linux/devlib && \
+#     python3 -m pip install -v -e /vllm-workspace/vllm-ascend/ --extra-index https://download.pytorch.org/whl/cpu/ && \
+#     python3 -m pip cache purge
 
 ARG APP_DIR=/vllm-workspace/vllm-omni
 WORKDIR ${APP_DIR}
@@ -11,14 +24,12 @@ RUN export PIP_EXTRA_INDEX_URL=https://mirrors.huaweicloud.com/ascend/repos/pypi
     source /usr/local/Ascend/ascend-toolkit/set_env.sh && \
     source /usr/local/Ascend/nnal/atb/set_env.sh && \
     export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/Ascend/ascend-toolkit/latest/`uname -i`-linux/devlib && \
-    python3 -m pip install -v "mindiesd==3.1.0" && \
     python3 -m pip install -v -e /vllm-workspace/vllm-omni/ --no-build-isolation
 
 RUN python3 -m pip install -v --no-deps \
       "stepaudio2-minicpmo>=0.1.1" \
       "step-audio2>=1.0.0"
 
-ENV VLLM_TARGET_DEVICE=npu
 ENV VLLM_WORKER_MULTIPROC_METHOD=spawn
 
 ENTRYPOINT []

docker/Dockerfile.npu.a3

@@ -0,0 +1,35 @@
+ARG VLLM_ASCEND_IMAGE=quay.io/atlas-ci/vllm-ascend
+ARG VLLM_ASCEND_TAG=v0.27.0-a3
+FROM ${VLLM_ASCEND_IMAGE}:${VLLM_ASCEND_TAG}
+
+# WORKDIR /vllm-workspace/vllm
+# RUN git fetch origin --tags && git checkout v0.18.0
+
+# WORKDIR /vllm-workspace/vllm-ascend
+# RUN git fetch origin releases/v0.18.0 && git checkout d781902ce9dbda8ab1e11bb0f2f0c1bc508fee7a
+# # Install vllm-ascend
+# # Append `libascend_hal.so` path (devlib) to LD_LIBRARY_PATH
+# RUN export PIP_EXTRA_INDEX_URL=https://mirrors.huaweicloud.com/ascend/repos/pypi && \
+#     source /usr/local/Ascend/ascend-toolkit/set_env.sh && \
+#     source /usr/local/Ascend/nnal/atb/set_env.sh && \
+#     export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/Ascend/ascend-toolkit/latest/`uname -i`-linux/devlib && \
+#     python3 -m pip install -v -e /vllm-workspace/vllm-ascend/ --extra-index https://download.pytorch.org/whl/cpu/ && \
+#     python3 -m pip cache purge
+
+ARG APP_DIR=/vllm-workspace/vllm-omni
+WORKDIR ${APP_DIR}
+COPY . .
+
+RUN export PIP_EXTRA_INDEX_URL=https://mirrors.huaweicloud.com/ascend/repos/pypi && \
+    source /usr/local/Ascend/ascend-toolkit/set_env.sh && \
+    source /usr/local/Ascend/nnal/atb/set_env.sh && \
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/Ascend/ascend-toolkit/latest/`uname -i`-linux/devlib && \
+    python3 -m pip install -v -e /vllm-workspace/vllm-omni/ --no-build-isolation
+
+RUN python3 -m pip install -v --no-deps \
+      "stepaudio2-minicpmo>=0.1.1" \
+      "step-audio2>=1.0.0"
+
+ENV VLLM_WORKER_MULTIPROC_METHOD=spawn
+
+ENTRYPOINT []

docker/Dockerfile.npu.ci

@@ -1,10 +1,10 @@
 ARG VLLM_ASCEND_IMAGE=quay.io/atlas-ci/vllm-ascend
-ARG VLLM_ASCEND_VERSION=v0.28.0
-ARG VLLM_ASCEND_DEVICE_SUFFIX=
-FROM ${VLLM_ASCEND_IMAGE}:${VLLM_ASCEND_VERSION}${VLLM_ASCEND_DEVICE_SUFFIX}
+ARG VLLM_ASCEND_TAG=v0.27.0
+FROM ${VLLM_ASCEND_IMAGE}:${VLLM_ASCEND_TAG}
 
 ARG APP_DIR=/vllm-workspace/vllm-omni
 WORKDIR ${APP_DIR}
+COPY . .
 
 RUN sed -i "s@^\(deb.*\)https\?://[a-z0-9.-]*\.ubuntu\.com@\1http://cache-service.nginx-pypi-cache.svc.cluster.local:8081@g" /etc/apt/sources.list
 
@@ -22,9 +22,11 @@ RUN apt-get update && \
     rm -rf /var/cache/apt/* && \
     rm -rf /var/lib/apt/lists/*
 
-RUN python3 -m pip install -U pip && \
+RUN source /usr/local/Ascend/ascend-toolkit/set_env.sh && \
+    source /usr/local/Ascend/nnal/atb/set_env.sh && \
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/Ascend/ascend-toolkit/latest/`uname -i`-linux/devlib && \
+    python3 -m pip install -U pip && \
     python3 -m pip install -v \
-      "mindiesd==3.1.0" \
       "pytest>=7.0.0" \
       "pytest-asyncio>=0.21.0" \
       "pytest-cov>=4.0.0" \
@@ -46,13 +48,7 @@ RUN python3 -m pip install -U pip && \
       "datasets>=3.0.0" \
       --index-url http://cache-service.nginx-pypi-cache.svc.cluster.local/pypi/simple \
       --trusted-host cache-service.nginx-pypi-cache.svc.cluster.local \
-      --default-timeout=60
-
-COPY . .
-
-RUN source /usr/local/Ascend/ascend-toolkit/set_env.sh && \
-    source /usr/local/Ascend/nnal/atb/set_env.sh && \
-    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/Ascend/ascend-toolkit/latest/`uname -i`-linux/devlib && \
+      --default-timeout=60 && \
     python3 -m pip install -v -e /vllm-workspace/vllm-omni/ --no-build-isolation \
       --index-url http://cache-service.nginx-pypi-cache.svc.cluster.local/pypi/simple \
       --trusted-host cache-service.nginx-pypi-cache.svc.cluster.local \
@@ -69,7 +65,6 @@ RUN python3 -m pip install -v --no-deps \
       --trusted-host cache-service.nginx-pypi-cache.svc.cluster.local \
       --default-timeout=60
 
-ENV VLLM_TARGET_DEVICE=npu
 ENV VLLM_WORKER_MULTIPROC_METHOD=spawn
 
 ENTRYPOINT []

docker/Dockerfile.npu.ci.a3

@@ -0,0 +1,71 @@
+ARG VLLM_ASCEND_IMAGE=quay.io/atlas-ci/vllm-ascend
+ARG VLLM_ASCEND_TAG=v0.27.0-a3
+FROM ${VLLM_ASCEND_IMAGE}:${VLLM_ASCEND_TAG}
+
+ARG APP_DIR=/vllm-workspace/vllm-omni
+WORKDIR ${APP_DIR}
+COPY . .
+
+RUN sed -i "s@^\(deb.*\)https\?://[a-z0-9.-]*\.ubuntu\.com@\1http://cache-service.nginx-pypi-cache.svc.cluster.local:8081@g" /etc/apt/sources.list
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+        ffmpeg \
+        libgl1 \
+        libglib2.0-0 \
+        libgomp1 \
+        libsm6 \
+        libxext6 \
+        libxrender1 \
+        libxcb1 \
+        espeak-ng && \
+    rm -rf /var/cache/apt/* && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN source /usr/local/Ascend/ascend-toolkit/set_env.sh && \
+    source /usr/local/Ascend/nnal/atb/set_env.sh && \
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/Ascend/ascend-toolkit/latest/`uname -i`-linux/devlib && \
+    python3 -m pip install -U pip && \
+    python3 -m pip install -v \
+      "pytest>=7.0.0" \
+      "pytest-asyncio>=0.21.0" \
+      "pytest-cov>=4.0.0" \
+      "pytest-mock>=3.10.0" \
+      "openpyxl>=3.0.0" \
+      "psutil>=7.2.0" \
+      "soundfile>=0.13.1" \
+      "pyttsx3>=2.99" \
+      "opencc==1.4.1" \
+      "opencv-python>=4.12.0.88" \
+      "imageio[ffmpeg]>=0.6.0" \
+      "jiwer>=3.0.0" \
+      "zhon>=2.0.0" \
+      "zhconv>=1.4.2" \
+      "funasr>=1.0.0" \
+      "hyperpyyaml>=1.2.0" \
+      "onnx>=1.16.0" \
+      "librosa>=0.10.0" \
+      "torchmetrics>=1.9.0" \
+      "datasets>=3.0.0" \
+      --index-url http://cache-service.nginx-pypi-cache.svc.cluster.local/pypi/simple \
+      --trusted-host cache-service.nginx-pypi-cache.svc.cluster.local \
+      --default-timeout=60 && \
+    python3 -m pip install -v -e /vllm-workspace/vllm-omni/ --no-build-isolation \
+      --index-url http://cache-service.nginx-pypi-cache.svc.cluster.local/pypi/simple \
+      --trusted-host cache-service.nginx-pypi-cache.svc.cluster.local \
+      --default-timeout=60
+
+# MiniCPM-o 4.5 Stage-2 vocoder assets: s3tokenizer plus flashcosyvoice, which
+# is shipped by step-audio2. --no-deps keeps pip from replacing the Ascend torch
+# build and from shadowing onnxruntime-cann with the vanilla onnxruntime wheel;
+# the deps these two actually need are installed above.
+RUN python3 -m pip install -v --no-deps \
+      "s3tokenizer>=0.3.0" \
+      "step-audio2>=1.0.0" \
+      --index-url http://cache-service.nginx-pypi-cache.svc.cluster.local/pypi/simple \
+      --trusted-host cache-service.nginx-pypi-cache.svc.cluster.local \
+      --default-timeout=60
+
+ENV VLLM_WORKER_MULTIPROC_METHOD=spawn
+
+ENTRYPOINT []

docker/Dockerfile.rocm

@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=vllm/vllm-openai-rocm:v0.28.0
+ARG BASE_IMAGE=vllm/vllm-openai-rocm:v0.27.0
 FROM ${BASE_IMAGE} AS base
 
 # Declare a variable to know if we want to use the nightly build or the stable build.
@@ -10,7 +10,7 @@ FROM ${BASE_IMAGE} AS base
 #    we should swap over to use stable release ASAP.
 #    We should avoid relying on custom commits.
 ARG USE_NIGHTLY_BUILD=0
-ARG VLLM_VERSION_OR_COMMIT_HASH=v0.28.0
+ARG VLLM_VERSION_OR_COMMIT_HASH=v0.27.0
 ARG ARG_PYTORCH_ROCM_ARCH
 ENV PYTORCH_ROCM_ARCH=${ARG_PYTORCH_ROCM_ARCH:-${PYTORCH_ROCM_ARCH}}
 

docker/Dockerfile.xpu

@@ -1,33 +1,140 @@
-# Target vLLM version: v0.28.0. Keep VLLM_VERSION aligned with the target vLLM
-# release on every rebase.
-#
-# This file layers vLLM-Omni on top of the published upstream XPU image, which
-# already ships a self-consistent XPU runtime (torch-xpu, oneCCL/UCX+NIXL, the
-# pinned UMD/compute-runtime stack, and vLLM itself) built from
-# https://github.com/vllm-project/vllm/blob/main/docker/Dockerfile.xpu. Docker
-# pulls that base automatically, so there is nothing to build here beyond the
-# Omni layers. Mirrors how docker/Dockerfile.ci consumes vllm/vllm-openai.
-#
-# If the tag does not exist yet (targeting an unreleased vLLM commit), build the
-# base from upstream's own Dockerfile and point VLLM_BASE at the result:
-#
-#   git clone --depth 1 --branch $VLLM_VERSION https://github.com/vllm-project/vllm /tmp/vllm
-#   docker build -t vllm-openai-xpu:local --target vllm-openai \
-#       -f /tmp/vllm/docker/Dockerfile.xpu /tmp/vllm
-#   docker build -f docker/Dockerfile.xpu --build-arg VLLM_BASE=vllm-openai-xpu:local .
-#
-# .buildkite/intel/scripts/run-xpu-test.sh automates that pull-then-build fallback.
-ARG VLLM_BASE_IMAGE=vllm/vllm-openai-xpu
-ARG VLLM_VERSION=v0.28.0
-ARG VLLM_BASE=${VLLM_BASE_IMAGE}:${VLLM_VERSION}
+# Argument to configure vllm base image if pre-built
+ARG VLLM_BASE=vllm-base
+
+FROM intel/deep-learning-essentials:2025.3.2-0-devel-ubuntu24.04 AS vllm-base
+
+WORKDIR /workspace/
+
+ARG PYTHON_VERSION=3.12
+ARG PIP_EXTRA_INDEX_URL="https://download.pytorch.org/whl/xpu"
+
+RUN wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null && \
+    echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | tee /etc/apt/sources.list.d/oneAPI.list
+
+RUN apt clean && apt-get update -y && \
+    apt-get install -y --no-install-recommends --fix-missing \
+    curl \
+    ffmpeg \
+    git \
+    libsndfile1 \
+    libsm6 \
+    libxext6 \
+    libgl1 \
+    lsb-release \
+    libaio-dev \
+    numactl \
+    wget \
+    vim \
+    python3.12 \
+    python3.12-dev \
+    python3-pip
+
+# Add oneAPI repo, pin oneAPI to 2025.3, then install pinned packages in one layer.
+RUN wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null && \
+    echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | tee /etc/apt/sources.list.d/oneAPI.list && \
+    printf '%s\n' \
+    'Package: intel-oneapi-* intel-deep-learning-essentials* intel-pti*' \
+    'Pin: version 2025.3*' \
+    'Pin-Priority: 1001' \
+    > /etc/apt/preferences.d/oneapi-2025.3.pref && \
+    apt-get update -y && \
+    apt-get install -y --no-install-recommends \
+    intel-oneapi-compiler-dpcpp-cpp-2025.3 \
+    intel-oneapi-mkl-devel-2025.3 \
+    intel-oneapi-dnnl-devel-2025.3 && \
+    rm -rf /var/lib/apt/lists/*
+
+# Install UMD with fixed version
+RUN mkdir neo && \
+    cd neo && \
+    wget https://github.com/intel/intel-graphics-compiler/releases/download/v2.24.8/intel-igc-core-2_2.24.8+20344_amd64.deb && \
+    wget https://github.com/intel/intel-graphics-compiler/releases/download/v2.24.8/intel-igc-opencl-2_2.24.8+20344_amd64.deb && \
+    wget https://github.com/intel/compute-runtime/releases/download/25.48.36300.8/intel-ocloc_25.48.36300.8-0_amd64.deb && \
+    wget https://github.com/intel/compute-runtime/releases/download/25.48.36300.8/intel-opencl-icd_25.48.36300.8-0_amd64.deb && \
+    wget https://github.com/intel/compute-runtime/releases/download/25.48.36300.8/libigdgmm12_22.8.2_amd64.deb && \
+    wget https://github.com/intel/compute-runtime/releases/download/25.48.36300.8/libze-intel-gpu1_25.48.36300.8-0_amd64.deb && \
+    wget https://github.com/oneapi-src/level-zero/releases/download/v1.26.0/level-zero_1.26.0+u24.04_amd64.deb && \
+    dpkg -i *.deb && \
+    cd .. && \
+    rm -rf neo
+
+ENV PATH="/root/.local/bin:$PATH"
+ENV VIRTUAL_ENV="/opt/venv"
+ENV UV_PYTHON_INSTALL_DIR=/opt/uv/python
+RUN curl -LsSf https://astral.sh/uv/install.sh | sh
+RUN uv venv --python ${PYTHON_VERSION} --seed ${VIRTUAL_ENV}
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+
+# This oneccl contains the BMG support which is not the case for default version of oneapi 2025.3.
+ARG ONECCL_INSTALLER="intel-oneccl-2021.15.9.14_offline.sh"
+RUN wget "https://github.com/uxlfoundation/oneCCL/releases/download/2021.15.9/${ONECCL_INSTALLER}" && \
+    bash "${ONECCL_INSTALLER}" -a --silent --eula accept && \
+    rm "${ONECCL_INSTALLER}" && \
+    echo "source /opt/intel/oneapi/setvars.sh --force" >> /root/.bashrc && \
+    echo "source /opt/intel/oneapi/ccl/2021.15/env/vars.sh --force" >> /root/.bashrc
+RUN rm -f /opt/intel/oneapi/ccl/latest && \
+    ln -s /opt/intel/oneapi/ccl/2021.15 /opt/intel/oneapi/ccl/latest
+
+SHELL ["bash", "-c"]
+CMD ["bash", "-c", "source /root/.bashrc && exec bash"]
+
+WORKDIR /workspace/
+
+ENV UV_HTTP_TIMEOUT=500
+
+# Configure package index for XPU
+ENV PIP_EXTRA_INDEX_URL=${PIP_EXTRA_INDEX_URL}
+ENV UV_EXTRA_INDEX_URL=${PIP_EXTRA_INDEX_URL}
+ENV UV_INDEX_STRATEGY="unsafe-best-match"
+ENV UV_LINK_MODE="copy"
+
+ARG VLLM_VERSION=v0.27.0
+RUN git clone -b ${VLLM_VERSION} https://github.com/vllm-project/vllm
+WORKDIR /workspace/vllm
+
+RUN --mount=type=cache,target=/root/.cache/uv \
+    uv pip install --upgrade pip && \
+    uv pip install -r requirements/xpu.txt && \
+    uv pip install setuptools_scm &&\
+    uv pip install grpcio-tools protobuf nanobind && \
+    source /opt/intel/oneapi/setvars.sh --force && \
+    source /opt/intel/oneapi/ccl/2021.15/env/vars.sh --force && \
+    export CMAKE_PREFIX_PATH="$(python3 -c 'import site; print(site.getsitepackages()[0])'):${CMAKE_PREFIX_PATH}"
+
+ENV LD_LIBRARY_PATH="/opt/intel/oneapi/ccl/2021.15/lib:$LD_LIBRARY_PATH:/usr/local/lib/"
+
+ENV VLLM_TARGET_DEVICE=xpu
+ENV VLLM_WORKER_MULTIPROC_METHOD=spawn
+
+RUN --mount=type=cache,target=/root/.cache/uv \
+    uv pip uninstall triton triton-xpu && \
+    uv pip install triton-xpu==3.7.2 && \
+    uv pip install --no-build-isolation --no-deps .
+
+CMD ["/bin/bash"]
+
+FROM vllm-base AS vllm-openai
+
+# install nixl from source code
+RUN uv pip install nixl
+
+# install additional dependencies for openai api server
+RUN --mount=type=cache,target=/root/.cache/uv \
+    uv pip install accelerate hf_transfer pytest pytest_asyncio lm_eval[api] modelscope
+
+# install development dependencies (for testing)
+RUN uv pip install -e tests/vllm_test_utils
+
+# ensure vllm is properly installed
+RUN python -c "import vllm, inspect; print(vllm.__file__)"
+RUN uv pip show vllm
+
+CMD ["/bin/bash"]
+
+ENTRYPOINT []
 
 FROM ${VLLM_BASE} AS vllm-omni
 
-# The base image ships ENTRYPOINT ["vllm", "serve"]; clear it so this stage stays
-# usable as a plain shell/test container regardless of which VLLM_BASE was used.
-ENTRYPOINT []
-CMD ["/bin/bash"]
-
 RUN apt-get update && \
     apt-get install -y espeak-ng ffmpeg git jq && \
     apt-get clean && \

docs/.nav.yml

@@ -5,23 +5,14 @@ nav:
     - getting_started/quickstart.md
     - getting_started/installation/*
   - Serving:
-    - API Server:
-      - Overview: serving/README.md
-      - Core APIs:
-        - Chat Completions: serving/chat_completions_api.md
-        - Text to Speech: serving/speech_api.md
-        - Audio Generation: serving/audio_generate_api.md
-        - Image Generation: serving/image_generation_api.md
-        - Image Edit: serving/image_edit_api.md
-        - Videos: serving/videos_api.md
-      - Streaming and Realtime:
-        - Realtime Audio: serving/realtime_api.md
-        - Full Duplex: serving/full_duplex_api.md
-        - Realtime Duplex Reference: serving/realtime_duplex_api.md
-        - Streaming Video Input: serving/video_stream_api.md
-        - Streaming Video Output: serving/streaming_video_output_api.md
-        - OpenPI Robot Policy: serving/openpi_api.md
-      - Standalone Experimental Servers: serving/standalone_servers.md
+    - OpenAI-Compatible API:
+      - Chat Completions API: serving/chat_completions_api.md
+      - Image Generation: serving/image_generation_api.md
+      - Image Edit: serving/image_edit_api.md
+      - Text to Speech: serving/speech_api.md
+      - Videos: serving/videos_api.md
+      - Audio Generation: serving/audio_generate_api.md
+      - Streaming Video Input: serving/video_stream_api.md
   - Examples:
     - examples/README.md
     - Offline Inference:
@@ -33,6 +24,7 @@ nav:
       - Text-To-Speech: user_guide/examples/offline_inference/text_to_speech.md
       - Text-To-Video: user_guide/examples/offline_inference/text_to_video.md
       - X-To-Text: user_guide/examples/offline_inference/x_to_text.md
+      - X-To-Video-Audio: user_guide/examples/offline_inference/x_to_video_audio.md
     - Online Serving:
       - Image-To-Image: user_guide/examples/online_serving/image_to_image.md
       - Image-To-Video: user_guide/examples/online_serving/image_to_video.md
@@ -62,18 +54,16 @@ nav:
       - BitsAndBytes W4: user_guide/quantization/bitsandbytes.md
       - MXFP8 W8A8: user_guide/quantization/mxfp8.md
       - MXFP4 W4A4: user_guide/quantization/mxfp4.md
-      - SVDQuant W4A4: user_guide/quantization/svdquant.md
       - ModelOpt: user_guide/quantization/modelopt.md
       - AutoRound: user_guide/quantization/autoround.md
       - msModelSlim: user_guide/quantization/msmodelslim.md
-      - TorchAO: user_guide/quantization/torchao.md
     - Diffusion Acceleration:
       - Overview and Compatibility:
         - Overview: user_guide/diffusion_features.md
         - Feature Compatibility: user_guide/feature_compatibility.md
       - CPU Offloading:
         - Overview: user_guide/diffusion/cpu_offload.md
-        - Model-Level: user_guide/diffusion/offloader/module_offload.md
+        - Model-Level: user_guide/diffusion/offloader/cpu_offload.md
         - Layerwise: user_guide/diffusion/offloader/layerwise_offload.md
         - Distributed Layerwise: user_guide/diffusion/offloader/distributed_layerwise_offload.md
       - Cache Acceleration:
@@ -127,7 +117,6 @@ nav:
         - Async Chunk: design/feature/async_chunk.md
         - Async Diffusion Output: design/feature/async_diffusion_output.md
         - Async Omni Output Materialization: design/feature/omni_async_output_materialization.md
-        - Prefill/Decode Phase Contract: design/feature/preprocess_phase_contract.md
         - Automatic Prefix Caching: design/feature/prefix_caching.md
         - Realtime AR-Diffusion: design/feature/realtime_ar_diffusion.md
       - Communication:
@@ -153,7 +142,7 @@ nav:
           - Skip-Softmax: design/feature/skip_softmax.md
         - CPU Offloading:
           - Overview: design/feature/offloader/README.md
-          - Model-Level: design/feature/offloader/module_offload.md
+          - Model-Level: design/feature/offloader/cpu_offload.md
           - Layerwise: design/feature/offloader/layerwise_offload.md
           - Distributed Layerwise: design/feature/offloader/distributed_layerwise_offload.md
         - Cache-DiT: design/feature/cache_dit.md

docs/README.md

@@ -23,6 +23,7 @@ Easy, fast, and cheap omni-modality model serving for everyone
 <a class="github-button" href="https://github.com/vllm-project/vllm-omni/fork" data-show-count="true" data-icon="octicon-repo-forked" data-size="large" aria-label="Fork">Fork</a>
 </p>
 
+
 ## About
 
 [vLLM](https://github.com/vllm-project/vllm) was originally designed to support large language models for text-based autoregressive generation tasks. vLLM-Omni is a framework that extends its support for omni-modality model inference and serving:
@@ -51,14 +52,14 @@ vLLM-Omni is flexible and easy to use with:
 - Tensor, pipeline, data and expert parallelism support for distributed inference
 - Streaming outputs
 - OpenAI-compatible API server
-- [Full-duplex realtime serving](serving/realtime_duplex_api.md) with streaming audio input and output
+- Full-duplex realtime serving with streaming audio input and output (experimental)
 
 vLLM-Omni seamlessly supports most popular open-source models on HuggingFace, including:
 
 - Omni-modality models (e.g. Qwen3-Omni, MiniCPM-o 4.5, Cosmos3, HunyuanImage, BAGEL)
-- TTS models (e.g. Qwen3-TTS, IndexTTS 2.5, dots.tts, CosyVoice3)
-- Diffusion models — image, video, and audio generation (e.g. MiniMax H3, LTX-2.5, SANA-Video, Wan2.2)
-- Robot-policy and action models (e.g. π0, GR00T-N1.7, DreamZero-DROID, InternVLA-A1)
+- TTS models (e.g. Qwen3-TTS, VoxCPM2, Ming-Omni-TTS, CosyVoice3)
+- Diffusion models — image, video, and audio generation (e.g. MiniMax H3, Qwen-Image, Wan2.2, FLUX)
+- Robot-policy and action models (e.g. GR00T-N1.7, DreamZero-DROID, InternVLA-A1, Cosmos3 action policy)
 
 For more information, checkout the following:
 

docs/api/README.md

@@ -15,36 +15,6 @@ Main entry points for vLLM-Omni inference and serving.
 - [vllm_omni.entrypoints.omni_base.OmniBase][]
 - [vllm_omni.entrypoints.pd_utils.PDDisaggregationMixin][]
 
-## Clients
-
-Client libraries that talk to a running vLLM-Omni server (the full-duplex Realtime client and its per-model session presets).
-
-- [vllm_omni.clients.duplex.AudioDelta][]
-- [vllm_omni.clients.duplex.AudioFormat][]
-- [vllm_omni.clients.duplex.ConnectionResumed][]
-- [vllm_omni.clients.duplex.DuplexClient][]
-- [vllm_omni.clients.duplex.DuplexClientError][]
-- [vllm_omni.clients.duplex.DuplexConnectionError][]
-- [vllm_omni.clients.duplex.DuplexEvent][]
-- [vllm_omni.clients.duplex.DuplexProtocolError][]
-- [vllm_omni.clients.duplex.DuplexSessionClosedError][]
-- [vllm_omni.clients.duplex.ErrorEvent][]
-- [vllm_omni.clients.duplex.EventCollector][]
-- [vllm_omni.clients.duplex.ListenDecision][]
-- [vllm_omni.clients.duplex.ReconnectPolicy][]
-- [vllm_omni.clients.duplex.ResponseCreated][]
-- [vllm_omni.clients.duplex.ResponseDone][]
-- [vllm_omni.clients.duplex.ResponseHandle][]
-- [vllm_omni.clients.duplex.SessionClosed][]
-- [vllm_omni.clients.duplex.SessionConfig][]
-- [vllm_omni.clients.duplex.SessionCreated][]
-- [vllm_omni.clients.duplex.SessionExpired][]
-- [vllm_omni.clients.duplex.SessionResumed][]
-- [vllm_omni.clients.duplex.SpeakDecision][]
-- [vllm_omni.clients.duplex.TextDelta][]
-- [vllm_omni.clients.duplex.TranscriptDelta][]
-- [vllm_omni.clients.duplex.WebSocketTransport][]
-
 ## Inputs
 
 Input data structures for multi-modal inputs.
@@ -144,10 +114,6 @@ Configuration classes.
 - [vllm_omni.model_executor.models.qwen3_tts.tokenizer_25hz.configuration_qwen3_tts_tokenizer_v1.Qwen3TTSTokenizerV1DecoderDiTConfig][]
 - [vllm_omni.model_executor.models.qwen3_tts.tokenizer_25hz.configuration_qwen3_tts_tokenizer_v1.Qwen3TTSTokenizerV1EncoderConfig][]
 - [vllm_omni.transformers_utils.configs.cosyvoice3.CosyVoice3Config][]
-- [vllm_omni.transformers_utils.configs.mammoth_moda2.Mammothmoda2Config][]
-- [vllm_omni.transformers_utils.configs.mammoth_moda2.Mammothmoda2Qwen2_5_VLConfig][]
-- [vllm_omni.transformers_utils.configs.mammoth_moda2.Mammothmoda2Qwen2_5_VLTextConfig][]
-- [vllm_omni.transformers_utils.configs.mammoth_moda2.Mammothmoda2Qwen2_5_VLVisionConfig][]
 - [vllm_omni.transformers_utils.configs.omnivoice.OmniVoiceConfig][]
 - [vllm_omni.transformers_utils.configs.voxcpm2.VoxCPM2Config][]
 

docs/cli/README.md

@@ -2,11 +2,6 @@
 
 The CLI for vLLM-Omni inherits from vllm with some additional arguments.
 
-Environment variables are process configuration rather than CLI-only options.
-See the [Environment Variables](../configuration/environment_variables.md)
-reference for ownership, precedence, evaluation time, and per-stage `env`
-scoping.
-
 ## serve
 
 Starts the vLLM-Omni OpenAI Compatible API server.
@@ -44,5 +39,4 @@ vllm bench serve --omni \
     --num-prompts  5
 ```
 
-See [vllm bench serve](./bench/serve.md) for serving benchmark arguments and
-dataset-specific examples, including OmniInteract native-duplex sessions.
+See [vllm bench serve](./bench/serve.md) for the full reference of all available arguments.

docs/cli/bench/serve.md

@@ -1,20 +1,16 @@
 # vLLM-Omni Benchmark CLI Guide
-
 The vllm bench command launches the vLLM-Omni benchmark to evaluate the performance of multimodal models.
 
 ## Notes
-
-vLLM-Omni registers the `openai-chat-omni`, `openai-audio-speech`, `openai-image-edits-omni`, `daily-omni`, and `openai-realtime-duplex` serving benchmark backends. It also adds the `omniinteract` dataset.
+vLLM-Omni registers the `openai-chat-omni`, `openai-audio-speech`, `openai-image-edits-omni`, and `daily-omni` serving benchmark backends.
 
 ## Basic Parameter Description
-
 You can use `vllm bench serve --omni --help=all` to get descriptions of all parameters. The commonly used parameters are described below:
-
 - `--omni`
   Enable Omni (multimodal) mode, supporting multimodal inputs and outputs such as images, videos, and audio.
 
 - `--backend`
-  Specify the backend adapter. vLLM-Omni adds `openai-chat-omni`, `openai-audio-speech`, `openai-image-edits-omni`, `daily-omni`, and `openai-realtime-duplex` to the upstream vLLM backend choices.
+  Specify the backend adapter. vLLM-Omni adds `openai-chat-omni`, `openai-audio-speech`, `openai-image-edits-omni`, and `daily-omni` to the upstream vLLM backend choices.
 
 - `--model`
   The model identifier to load, filled according to the models supported by vLLM-Omni.
@@ -23,7 +19,7 @@ You can use `vllm bench serve --omni --help=all` to get descriptions of all para
   The API endpoint exposed externally, to which clients send their requests.
 
 - `--dataset-name`
-  The name of the dataset used; random-mm indicates generating random multimodal inputs (images, videos, audio), while `omniinteract` replays official OmniInteract videos.
+  The name of the dataset used; random-mm indicates generating random multimodal inputs (images, videos, audio).
 
 - `--num-prompts`
   The total number of requests to send, an integer.
@@ -81,8 +77,8 @@ Specify to save benchmark results to a json file
 - `--random-prefix-len`
   Number of fixed prefix tokens before the random context in a request.
   The total input length is the sum of random-prefix-len and a random
-  context length sampled from [input_len *(1 - range_ratio),
-  input_len* (1 + range_ratio)].Only the random and random-mm modes
+  context length sampled from [input_len * (1 - range_ratio),
+  input_len * (1 + range_ratio)].Only the random and random-mm modes
   support this parameter.
 
 - `--random-input-len`
@@ -95,7 +91,7 @@ Specify to save benchmark results to a json file
   Range ratio for sampling input/output length,
   used only for random sampling. Must be in the range [0, 1) to define
   a symmetric sampling range
-  [length *(1 - range_ratio), length* (1 + range_ratio)].
+  [length * (1 - range_ratio), length * (1 + range_ratio)].
   Only the random and random-mm modes support this parameter.
 
 - `--random-mm-base-items-per-request`
@@ -141,7 +137,6 @@ Specify to save benchmark results to a json file
 ## Usage Examples
 
 ### Online Benchmark
-
 <details class="admonition abstract" markdown="1">
 <summary>Show more</summary>
 
@@ -167,9 +162,7 @@ vllm bench serve \
   --dataset-path ShareGPT_V3_unfiltered_cleaned_split.json \
   --percentile-metrics ttft,tpot,itl,e2el
 ```
-
 If successful, you will see the following output:
-
 ```text
 ============ Serving Benchmark Result ============
 Successful requests:                     2
@@ -271,74 +264,11 @@ Median AUDIO_RTF:                        0.47
 P99 AUDIO_RTF:                           0.48
 ==================================================
 ```
-
 Notes:
 We use audio generation time / audio duration to calculate RTF.
 
 </details>
 
-### OmniInteract Realtime Benchmark
-
-OmniInteract runs each video as one native-duplex WebSocket sample in the standard serving-benchmark lifecycle:
-
-```bash
-vllm bench serve --omni \
-  --backend openai-realtime-duplex \
-  --dataset-name omniinteract \
-  --dataset-path /path/to/OmniInteract \
-  --model openbmb/MiniCPM-o-4_5 \
-  --base-url http://127.0.0.1:8000 \
-  --endpoint /v1/realtime \
-  --omniinteract-ref-audio /path/to/reference.wav \
-  --omniinteract-output-dir ./omniinteract-artifacts \
-  --num-prompts 3 \
-  --num-warmups 0
-```
-
-`--dataset-path` accepts an extracted directory, `data.tar[.gz]`, or a Hugging Face dataset ID; omitting it uses
-`lucky-lance/OmniInteract`. `--num-prompts` is the total across subsets and defaults to 3 for OmniInteract; explicit `0`
-selects all and oversize values use all available cases. Reference audio is required, and OmniInteract uses the
-`/v1/realtime` endpoint.
-
-Audio is replayed as 16 kHz PCM16 in 200 ms chunks and video at 1 FPS with real-time pacing. All selected media is decoded
-before timing and remains in client memory for the run, so `--max-concurrency` does not limit media preparation memory; use
-explicit `--num-prompts 0` only when the client has enough RAM for the full dataset. Media commands are bounded by
-`--omniinteract-media-timeout-s`, and concurrency defaults to 1. Standard request-rate, warmup, result-saving, and summary
-options apply. Use `--omniinteract-require-response` only for functional E2E cases; LISTEN is a valid benchmark result.
-
-Each completed case writes `output.wav`, `wav_transcript.json`, `events.json`, `result.json`, and a final `.done` marker under
-`--omniinteract-output-dir`. The root also contains `batch_summary.json` and `official_eval_manifest.jsonl`; failed cases write
-`.failed.json`. Runs sharing one output root are serialized. Completion validates transport, response lifecycle, and artifacts,
-not answer accuracy. Transcript timestamps are serialized playback-queue times. Playback ACKs report cumulative progress
-incrementally along that serialized clock, like a live listener; the first ack for a response goes out as soon as its audio
-arrives, checkpointing the response's history position so a later committed user input updates it in place. A residual
-`playback_ack_too_late` rejection is recorded as an artifact warning rather than failing the case. Clipped or cancelled
-outputs are ineligible and omitted from the official manifest; `audio_clipped_bytes` records output beyond the rounded video
-horizon.
-
-TTFT, TTFP, and RTF start at client receipt of `response.created`. TPOT/ITL use engine stage-0 timing; ITL is emitted only when
-every token interval is present.
-
-The checked-in local performance configuration measures four deterministic cases from each OmniInteract subset (12 videos
-total), with no benchmark warmups and a maximum concurrency of two. Each subset also sends one readiness request before its
-measured cases. Run it from the repository root with:
-
-```bash
-export HF_HOME=/path/to/persistent/huggingface-cache
-export BENCHMARK_DIR=tests/dfx/perf/results
-bash tools/nightly/run_nightly_jobs.sh \
-  --test-type local \
-  --model-type omni \
-  --label-substr minicpmo_4_5_omniinteract
-```
-
-The first run downloads the pinned OmniInteract archive into `HF_HOME`; later runs reuse that cache.
-
-It requires every case to commit its input, complete any emitted response lifecycles, and publish the expected WAV,
-transcript, event, and result artifacts without errors. A valid LISTEN-only case may have no response audio or transcript
-chunks. Official-manifest eligibility is reported separately because clipped or cancelled output is a benchmark-quality
-signal, not a transport failure. This local performance test does not score answer accuracy.
-
 ### Multi-Modal Benchmark
 
 <details class="admonition abstract" markdown="1">
@@ -351,8 +281,8 @@ Generate synthetic image、video、audio inputs alongside random text prompts to
 Notes:
 
 - Works only with online benchmark via:
-    - the OpenAI chat backend (`--backend openai-chat-omni`) and endpoint `/v1/chat/completions`.
-    - the OpenAI edit image backend (`--backend openai-image-edits-omni`) and endpoint `/v1/images/edits`.
+  - the OpenAI chat backend (`--backend openai-chat-omni`) and endpoint `/v1/chat/completions`.
+  - the OpenAI edit image backend (`--backend openai-image-edits-omni`) and endpoint `/v1/images/edits`.
 
 Start the server (example):
 
@@ -363,7 +293,6 @@ vllm serve Qwen/Qwen2.5-Omni-7B --omni
 It is recommended to use the flag `--ignore-eos` to simulate real responses. You can set the size of the output via the arg `random-output-len`.
 
 Then run the benchmarking script:
-
 ```bash
 vllm bench serve \
     --omni \
@@ -433,79 +362,8 @@ How sampling works:
 - If a modality (e.g., image) reaches its limit from `--random-mm-limit-mm-per-prompt`, all buckets of that modality are excluded and the remaining bucket probabilities are renormalized before continuing.
 This should be seen as an edge case, and if this behavior can be avoided by setting `--random-mm-limit-mm-per-prompt` to a large number. Note that this might result in errors due to engine config `--limit-mm-per-prompt`.
 - The resulting request contains synthetic image data in `multi_modal_data` (OpenAI Chat format). When `random-mm` is used with the OpenAI Chat backend, prompts remain text and MM content is attached via `multi_modal_data`.
-
 </details>
 
-### Image / video generation
-
-For `/v1/images/generations`, `/v1/images/edits`, and `/v1/videos`, set `--endpoint` to that path and omit `--backend`. The endpoint path is registered as the bench request adapter, so a separate named backend is not required.
-
-Example (`/v1/images/generations`):
-
-```bash
-vllm bench serve --omni \
-  --endpoint /v1/images/generations \
-  --dataset-name random \
-  --model ~/models/Qwen/Qwen-Image \
-  --tokenizer ~/models/Qwen/Qwen-Image/tokenizer \
-  --max-concurrency 1 \
-  --num-warmups 2 \
-  --num-prompts 10 \
-  --random-input-len 64 \
-  --random-output-len 1 \
-  --ignore-eos \
-  --percentile-metrics e2el \
-  --extra-body '{
-    "num_inference_steps": 20,
-    "seed": 42,
-    "true_cfg_scale": 4.0
-  }'
-```
-
-If successful, following output is like:
-
-```text
-============ Serving Benchmark Result ============
-Successful requests:                     3  
-Failed requests:                         0  
-Maximum request concurrency:             1  
-Benchmark duration (s):                  8.42  
-Request throughput (req/s):              0.36  
-Peak concurrent requests:                2.00  
--------------------Peak Memory--------------------
-Mean PEAK_MEMORY_MB (MB):                58832.00  
-Median PEAK_MEMORY_MB (MB):              58832.00  
-P99 PEAK_MEMORY_MB (MB):                 58832.00  
-----------------End-to-end Latency----------------
-Mean E2EL (ms):                          2798.16  
-Median E2EL (ms):                        2799.83  
-P99 E2EL (ms):                           2800.03  
-================== Image Result ==================
-Total images generated:                  3  
-Image throughput (img/s):                0.36  
-Average pixels per image:                1048576.00
-Mean denoise step latency (ms):          136.59  
----------------- Image Generation ----------------
-Mean IMAGE_GENERATION (ms):              2731.84  
-Median IMAGE_GENERATION (ms):            2732.02  
-P99 IMAGE_GENERATION (ms):               2734.65  
-==================================================
-```
-
-Use the same pattern with `--endpoint /v1/images/edits` or `--endpoint /v1/videos` (and model-specific `--extra-body` as needed). Pure image/video runs omit the Text Result section when there is no generated text.
-
-`/v1/images/edits` defaults to **non-streaming JSON** (`stream=false`) so single-stage edit models are not rejected by the server. For multi-stage pipelines that need SSE (AR TTFT / image chunks), pass `"stream": true` in `--extra-body`.
-
-`/v1/videos` is an async job API: the client creates a job, then polls until `completed`/`failed`. Measured **e2el** therefore includes client poll sleep and any overshoot after the job actually finishes. Tune polling via `--extra-body`:
-
-- `poll_interval_s` (default `2.0`): sleep between status polls
-- `poll_timeout_s` (default `21600`, i.e. 6 hours): give up waiting for the job
-
-**VIDEO_RTF** prefers server-reported generation time when available:
-
-- `video_rtf = video_generation_time_ms / 1000 / video_duration`, where `video_generation_time_ms` comes from response `stage_durations` (or `inference_time_s` as fallback)
-- If generation time is missing, falls back to `e2el / video_duration` (this fallback *does* include poll overhead)
-
 ### Multi-Stage Benchmark
 
 <details class="admonition abstract" markdown="1">
@@ -518,7 +376,6 @@ vllm serve --omni --port 29999 --model ~/Qwen3-Omni-30B-A3B-Instruct
 ```
 
 Then run the benchmarking script (remember to add the flag `--print-stage`):
-
 ```bash
 vllm bench serve --omni \
   --dataset-name random \
@@ -538,7 +395,6 @@ vllm bench serve --omni \
 ```
 
 Besides the "Serving Benchmark Result", there will be "Stage Benchmark Result" below:
-
 ```text
 ============= Stage Benchmark Result =============
 =============== Stage 0 (thinker) ================
@@ -595,9 +451,7 @@ Mean AUDIO_RTF:                          0.24
 Median AUDIO_RTF:                        0.26
 P99 AUDIO_RTF:                           0.27
 ```
-
 Explanation:
-
 - stage_gen_time: Time from submitting a request to a specific stage to that stage finishing generation.
 
 - Serving TTFC (Time to First Chunk): Time from the HTTP request being accepted by the serving frontend to

docs/configuration/README.md

@@ -2,14 +2,11 @@
 
 This section lists the most common options for running vLLM-Omni.
 
-For options within a vLLM Engine, please refer to the [vLLM 0.29 configuration guide](https://docs.vllm.ai/en/v0.29.0/configuration/index.html).
+For options within a vLLM Engine, please refer to the [vLLM 0.26 configuration guide](https://docs.vllm.ai/en/v0.26.0/configuration/index.html).
 
 Each model defines fixed topology in a registered `PipelineConfig` and runtime
 overrides in a deploy YAML.
 
-For process-level settings shared by the CLI, deploy YAML, workers, and model
-integrations, see [Environment Variables](./environment_variables.md).
-
 For a specific example, see the [Qwen2.5-Omni deploy config](gh-file:vllm_omni/deploy/qwen2_5_omni.yaml). The matching frozen pipeline topology lives at [vllm_omni/model_executor/models/qwen2_5_omni/pipeline.py](gh-file:vllm_omni/model_executor/models/qwen2_5_omni/pipeline.py).
 
 For an introduction, see [Pipeline and deploy configurations](./stage_configs.md).

docs/configuration/environment_variables.md

@@ -1,238 +0,0 @@
-# Environment Variables
-
-Environment variables are process-level configuration shared by the CLI,
-deploy YAML, Python APIs, worker processes, and model integrations. They are
-therefore documented under **User Guide → Configuration**, rather than under
-CLI Reference.
-
-This page describes the public vLLM-Omni environment-variable contract on the
-`latest` documentation branch. Use the documentation for your installed
-vLLM-Omni release when behavior differs.
-
-!!! important "Public contract"
-    Only names in [Public vLLM-Omni variables](#public-vllm-omni-variables) are
-    public Omni configuration. A name found in source code is not automatically
-    supported: model-specific, benchmark, platform, and internal variables have
-    separate ownership and lifecycle rules.
-
-## Naming and implementation boundary
-
-New public variables owned by vLLM-Omni must use the `VLLM_OMNI_` prefix.
-Existing public names with older prefixes remain supported for compatibility,
-but they do not establish naming precedent for new settings. Inherited vLLM
-and third-party names retain the prefix chosen by their owning project.
-
-The source [environment-variable inventory](gh-file:vllm_omni/config/environment_variable_inventory.py)
-records ownership, migration disposition, and redaction metadata. Unlike
-`vllm.envs`, it is not an executable value resolver: existing consumers still
-own parsing, defaults, precedence, and evaluation time. The public tables below
-describe those live consumer contracts. Stable model or stage behavior should
-move to typed configuration, and request-varying behavior should move to a
-request schema instead of adding another environment variable.
-
-## Precedence and evaluation time
-
-There is no repository-wide rule that makes environment variables override (or
-lose to) every CLI, YAML, or request option. The tables below state precedence
-for each public setting. In general:
-
-- request fields should control behavior that can vary per request;
-- typed deploy or stage configuration should control stable model and stage
-  behavior;
-- environment variables are appropriate for process launch, platform
-  integration, emergency diagnostics, and compatibility fallbacks.
-
-An environment variable can be read while a module is imported, when server or
-model configuration is constructed, when a worker is spawned, or whenever a
-property is accessed. Set import- and startup-time variables before invoking
-`vllm serve` or importing vLLM-Omni. Changing the parent shell after workers
-start does not update existing worker environments.
-
-The lifecycle labels used below are:
-
-- **Stable** — reviewed public configuration; changes require compatibility
-  consideration.
-- **Experimental** — public for evaluation, but its contract may still evolve.
-- **Diagnostic** — supported for investigation or temporary mitigation, not as
-  a normal tuning interface.
-- **Deprecated** — compatibility alias; migrate to the named replacement.
-
-## Public vLLM-Omni variables
-
-### Diffusion backend and cache selection
-
-| Name | Type and default | Applies to and read time | Precedence and invalid values | Lifecycle |
-| --- | --- | --- | --- | --- |
-| `DIFFUSION_ATTENTION_BACKEND` | Backend name or `auto`; default `auto` (platform selection) | Diffusion stages; read when `OmniDiffusionConfig` is constructed | `diffusion_attention_config.default` wins. An unknown backend fails during backend resolution. | Stable fallback |
-| `DIFFUSION_CACHE_BACKEND` | `none`, `cache_dit`, `tea_cache`, `mag_cache`, `step_cache`, `stepcache`, or `step_cache_dit`; default `none` | Diffusion runner startup | Explicit `cache_backend` in config wins. Otherwise this name wins over the deprecated alias. Unsupported values raise `ValueError` during runner setup. | Stable fallback |
-| `DIFFUSION_CACHE_ADAPTER` | Same values as `DIFFUSION_CACHE_BACKEND`; default `none` | Diffusion runner startup | Used only when neither explicit `cache_backend` nor `DIFFUSION_CACHE_BACKEND` is set. Unsupported values raise `ValueError`. | Deprecated; use `DIFFUSION_CACHE_BACKEND` |
-| `OMNI_DIFFUSION_PROMPT_EMBED_CACHE` | Boolean: `1`, `true`, `yes`, `on`, `0`, `false`, `no`, or `off`; default disabled | Each diffusion runner; resolved during model setup | A recognized environment value overrides the explicit enable setting. An unrecognized value is ignored. | Experimental |
-| `OMNI_DIFFUSION_PROMPT_EMBED_CACHE_SIZE` | Positive integer; default `32` entries | Each diffusion runner; resolved during model setup | A valid environment value overrides the explicit cache size. A non-integer logs a warning; a non-positive value is ignored. | Experimental |
-| `OMNI_DIFFUSION_SESSION_STATE_MANAGER` | Boolean with the same accepted spellings as the prompt cache; default disabled | Experimental diffusion session manager; model setup | A recognized environment value overrides the explicit enable setting. An unrecognized value is ignored. | Experimental |
-| `OMNI_DIFFUSION_SESSION_STATE_MANAGER_MAX_SESSIONS` | Positive integer; default `64` | Experimental diffusion session manager; model setup | A valid environment value overrides the explicit maximum. A non-integer logs a warning; a non-positive value is ignored. | Experimental |
-
-Backend names for `DIFFUSION_ATTENTION_BACKEND` are the members of
-`DiffusionAttentionBackendEnum`, such as `FLASH_ATTN`, `TORCH_SDPA`,
-`SAGE_ATTN`, `FLASHINFER_ATTN`, and `TRTLLM_ATTN`. Platform support still
-depends on the installed kernels and model path.
-
-### Serving and runtime
-
-| Name | Type and default | Applies to and read time | Precedence and invalid values | Lifecycle |
-| --- | --- | --- | --- | --- |
-| `SPEAKER_SAMPLES_DIR` | Filesystem path; default `~/.cache/vllm-omni/speakers` | Speech server; read when speaker storage initializes | Environment-only setting. The directory is created; filesystem errors propagate. | Stable |
-| `SPEAKER_MAX_UPLOADED` | Integer; default `1000` | Speech server; read when speaker storage initializes | Environment-only setting. A non-integer logs a warning and uses `1000`; range is not otherwise validated. | Stable |
-| `VLLM_OMNI_ASYNC_OUTPUT_TIMEOUT` | Float seconds; default `600` | Diffusion engine async-output wait in `step_streaming`; resolved per call on the request path, not at import | Environment-only setting. A non-float or `<=0` value warns once and uses the default. | Experimental |
-| `VLLM_OMNI_EVENT_DRIVEN_ORCH` | `1`, `true`, `yes` or `on` enables; default `0` (off) | Orchestration loop and the serving-side final-output drain; read once when the `Orchestrator` is constructed | Environment-only setting. Values are stripped and case-normalized; any unrecognized value leaves the legacy poll loop selected. | Experimental |
-| `VLLM_OMNI_INPUT_WAIT_TIMEOUT_S` | Float seconds; default `600`; `<=0` disables | Full-payload input coordinator, not async-chunk transfer; read when the scheduler module imports in each worker | Environment-only setting. A non-float logs a warning and uses `600`. | Stable operational control |
-| `VLLM_OMNI_ORCH_MONITOR_PATH` | Filesystem path; default `<current-working-directory>/vllm_omni_orch_monitor_<timestamp>.json` | Orchestrator monitor enabled by `--enable-orch-monitor`; read when the monitor is created | Environment-only path override. Parent directories are created; write errors are logged. | Diagnostic |
-| `VLLM_OMNI_VIDEO_SYNC_TIMEOUT` | Float seconds; default `600` | Synchronous Videos API; read when the API server module imports | Environment-only setting. A non-float raises `ValueError` during import. | Experimental |
-| `VLLM_VIDEO_ASYNC_CHUNK` | `on` or `off`; default `on` | Streaming video output; read on attribute access | Environment-only setting. Values are trimmed and case-normalized; an invalid value warns once and uses `on`. | Experimental |
-| `VLLM_VIDEO_AUDIO_DELTA_MODE` | `fast` or `slow`; default `fast` | Streaming video audio deltas; read on attribute access | Environment-only setting. Values are trimmed and case-normalized; an invalid value warns once and uses `fast`. | Experimental |
-
-### Server storage
-
-Storage names use Pydantic's nested-settings delimiter (`__`). They are read
-when `ServerSettings` is initialized, normally during server import/startup.
-Invalid integer values raise a Pydantic validation error.
-
-| Name | Type and default | Meaning | Lifecycle |
-| --- | --- | --- | --- |
-| `VLLM_OMNI_SERVER_STORAGE__PATH` | Path; default `/tmp/storage` | Directory for completed server files. | Stable |
-| `VLLM_OMNI_SERVER_STORAGE__FILE_CONCURRENCY` | Integer; default `4` | Maximum concurrent file operations. No additional range validation is currently applied. | Stable |
-| `VLLM_OMNI_SERVER_STORAGE__FILE_TTL` | Integer seconds or unset; default unset | Optional lifetime for locally stored files. | Stable |
-| `VLLM_OMNI_SERVER_STORAGE__TTL_SWEEP_INTERVAL` | Integer seconds or unset | Sweep frequency. If file TTL is set and this is unset, the effective default is `300`. | Stable |
-| `VLLM_OMNI_STORAGE_PATH` | Path | Deprecated alias for `VLLM_OMNI_SERVER_STORAGE__PATH`. The new name wins when both are set. | Deprecated |
-| `VLLM_OMNI_STORAGE_MAX_CONCURRENCY` | Integer | Deprecated alias for `VLLM_OMNI_SERVER_STORAGE__FILE_CONCURRENCY`. The new name wins when both are set. | Deprecated |
-
-The deprecated aliases emit `DeprecationWarning`. They do not affect file TTL
-settings.
-
-### Quantization diagnostics and performance
-
-| Name | Type and default | Applies to and read time | Precedence and invalid values | Lifecycle |
-| --- | --- | --- | --- | --- |
-| `VLLM_OMNI_SKIP_NVFP4_NAN_CLAMP` | Boolean truthy spellings: `1`, `true`, `yes`, `on`; default false | ModelOpt NVFP4 compatibility patch; read when `vllm_omni.patch` imports | Environment-only escape hatch. Any other value means false. Set only to diagnose the upstream NaN-scale issue. | Diagnostic and temporary |
-| `VLLM_OMNI_USE_QUACK_FP8` | Boolean truthy spellings: `1`, `true`, `yes`, `on`; unset means hardware auto-detection | FP8 scaled matrix multiplication; evaluated when quack capability is selected | A set value overrides auto-detection. Any non-truthy value forces quack off. If quack cannot load, vLLM-Omni warns and falls back to FlashInfer. | Experimental performance control |
-
-`QUACK_CACHE_DIR` is owned by the external quack library and is not an
-Omni-owned variable, even though vLLM-Omni supplies a persistent default when
-it is unset.
-
-## Per-stage environment
-
-Deploy configurations can set arbitrary environment keys for one stage:
-
-```yaml
-stages:
-  - stage_id: 0
-    env:
-      HCCL_IF_BASE_PORT: 23000
-      MY_MODEL_CACHE: /mnt/model-cache
-```
-
-The legacy nested form under `runtime.env` is also accepted. vLLM-Omni converts
-keys and values to strings, applies them while the stage engine or child process
-is launched, logs keys but not values, and restores the parent process's prior
-environment afterward. A child process inherits the scoped values. This keeps
-sibling stages from permanently changing one another's parent environment.
-
-This scoping has two consequences:
-
-1. A setting read inside stage/model initialization can see the stage value.
-2. A setting already cached by an import that occurred before stage launch
-   cannot be changed retroactively with stage `env`.
-
-Stage `env` is an escape hatch for process and third-party settings, not a
-replacement for typed stage configuration. Do not put request-varying behavior
-there. Secret values may reach child processes; logs and diagnostics must emit
-their keys only.
-
-## Inherited vLLM variables
-
-vLLM-Omni also reads variables through its aligned vLLM dependency. Refer to
-the [vLLM 0.29 environment-variable reference](https://docs.vllm.ai/en/v0.29.0/configuration/env_vars.html)
-for their definitions. This includes vLLM launch, cache, logging, plugin, ROCm,
-XPU, ModelScope, and FlashInfer workspace settings.
-
-An inherited name does not become Omni-owned because Omni reads or forwards it.
-Where behavior differs, the Omni-specific page should document only that
-difference. For example, device-visibility values can be further narrowed by a
-stage's `devices` setting.
-
-## Platform, external, and secret variables
-
-Hardware runtimes, distributed launchers, and third-party libraries retain
-ownership of their variables. Common groups include:
-
-- device visibility (`ASCEND_RT_VISIBLE_DEVICES`, `HIP_VISIBLE_DEVICES`, and
-  `MUSA_VISIBLE_DEVICES`);
-- distributed launch (`MASTER_ADDR`, `MASTER_PORT`, `RANK`, and `WORLD_SIZE`);
-- Hugging Face cache and authentication (`HF_HOME`, `HF_TOKEN`, and related
-  names);
-- accelerator libraries such as NCCL, FlashInfer, MindIE, MORI, and quack.
-
-Consult the owning project's documentation for accepted values and support.
-`HF_TOKEN`, `HUGGINGFACE_HUB_TOKEN`, and `OPENAI_API_KEY` are explicitly marked
-for redaction in the reviewed inventory. Never print their values in environment
-collection, examples, bug reports, or logs.
-
-## Model-specific variables
-
-The audit found 58 variables read by a single model or pipeline family. They are
-not listed as public usage options here because doing so would turn implementation
-escape hatches into an accidental compatibility contract.
-
-Every audited model-specific name has a migration disposition in the
-[environment-variable inventory](gh-file:vllm_omni/config/environment_variable_inventory.py):
-
-| Disposition | Count | Required outcome |
-| --- | ---: | --- |
-| Promote | 35 | Move a stable setting into typed stage or model configuration. |
-| Request scope | 6 | Move request-varying behavior into a declared request-option schema. |
-| External | 0 | Retain only when a supported third-party library owns the contract. |
-| Internalize | 11 | Keep a debug or diagnostic switch out of public documentation and configuration. |
-| Deprecate/remove | 6 | Remove a compatibility escape hatch that has no continuing contract. |
-
-The disposition is a migration target, not a statement that the existing
-environment switch is stable. Promote or request-scope work should land in
-model-owner-reviewed follow-up changes with validation and model-page updates.
-The family-sized migration packages and their ownership gate are tracked in
-[#6232](https://github.com/vllm-project/vllm-omni/issues/6232).
-
-## Environment collection and troubleshooting
-
-Run the repository collector when preparing a bug report:
-
-```bash
-python collect_env.py
-```
-
-The environment section includes the safe public Omni allowlist, registered
-vLLM variables, and selected platform prefixes. It omits names marked for
-redaction and names containing common secret terms. Review the output before
-sharing it. A key supplied through stage `env` is not collected merely because
-it appears in deploy configuration; the same allowlist and prefix rules apply.
-
-If a setting appears ineffective, first check its read time in the tables
-above. Restart processes after changing import- or startup-time values, verify
-that the variable reaches the intended worker, and check whether an explicit
-typed configuration field takes precedence.
-
-## Benchmark and internal variables
-
-The reviewed inventory marks 20 benchmark variables as transitional while
-benchmark configuration moves to CLI/request schemas in
-[issue #5376](https://github.com/vllm-project/vllm-omni/issues/5376). They are not
-part of the serving/runtime contract.
-
-Internal process-coordination and debug variables are deliberately excluded
-from this page. The CI scanner resolves string literals and module-level string
-constants used by direct `os` access, local wrapper helpers, aliased `os`
-imports, and environment membership checks. Server-storage names generated by
-Pydantic settings are checked separately against their model fields.
-
-Names assembled from cross-module metadata and arbitrary keys supplied through
-stage `env` cannot be inferred reliably. Contributors must classify those names
-explicitly. CI fails when a statically resolved name has no classification or
-when a reviewed public name is absent from this page.

docs/configuration/stage_configs.md

@@ -14,7 +14,7 @@ describe fixed model topology and are not accepted in deploy YAMLs.
 Common `PipelineConfig` fields include:
 
 | Field | Description |
-| ------- | ------------- |
+|-------|-------------|
 | `model_type` | Pipeline identifier used during model and config resolution. |
 | `default_deploy_config_name` | Bundled deploy YAML loaded when the user does not pass `deploy_config`. |
 | `model_arch` | Default Hugging Face architecture for the pipeline. |
@@ -26,7 +26,7 @@ Common `PipelineConfig` fields include:
 Common `StagePipelineConfig` fields include:
 
 | Field | Description |
-| ------- | ------------- |
+|-------|-------------|
 | `stage_id` | Stable stage identifier. |
 | `model_stage` | Logical stage name used by runtime and strategy resolution. |
 | `execution_type` | `LLM_AR`, `LLM_GENERATION`, or `DIFFUSION`. |
@@ -49,17 +49,17 @@ deployment overrides.
 The new deploy schema lives under `vllm_omni/deploy/` and is paired with a frozen `PipelineConfig` registered by the model's `pipeline.py`. Each deploy YAML has these top-level fields:
 
 | Field | Type | Required | Default | Description |
-| ------- | ------ | ---------- | --------- | ------------- |
+|-------|------|----------|---------|-------------|
 | `base_config` | str (path) | optional | — | Overlay parent (relative or absolute). `stages:` / `platforms:` deep-merged by stage_id; other scalars overlay-wins. Intended for user-authored overlays; prod yamls stay flat. |
 | `async_chunk` | bool | optional | `true` | Enable chunked streaming between stages. Pin to `false` if the pipeline runs end-to-end. |
-| `session_mode` | str | optional | `"turn"` | Session behavior. MiniCPM-o 4.5 deploy YAMLs set `"duplex"` so `/v1/realtime` and chat share the same profile. |
+| `session_mode` | str | optional | `"turn"` | Session behavior. Use `"duplex"` only with a pipeline that enables duplex control. |
 | `active_stream_window` | int | optional | `0` | Number of active downstream stream slots; `0` preserves all-stream cycling. |
 | `duplex_session` | dict | optional | runtime defaults | Full-duplex session lifecycle, buffering, replay, and capacity limits. |
 | `connectors` | dict | optional | `null` | Named connector specs (`{name, extra}`). Referenced by each stage's `input_connectors` / `output_connectors`. See [Connector schema](#connector-schema). |
 | `edges` | list | optional | `null` | Explicit edge list for the KV transfer graph. Auto-derived from stage inputs if omitted. |
 | `stages` | list | optional | `[]` | Per-stage runtime overrides matched by `stage_id`. Pipeline stages are still created from `PipelineConfig` when this list is empty. |
 | `platforms` | dict | optional | `null` | Keyed by `npu` / `rocm` / `xpu`, each contains a `stages:` list with per-platform overrides applied on top of the CUDA defaults. |
-| `pipeline` | str | optional | `null` | Override the auto-detected pipeline registry key (used for structural variants like `qwen2_5_omni_thinker_only` / `qwen3_omni_moe_thinker_only`). |
+| `pipeline` | str | optional | `null` | Override the auto-detected pipeline registry key (used for structural variants like `qwen2_5_omni_thinker_only`). |
 | `trust_remote_code` | bool \| null | optional | `null` | **Pipeline-wide.** Trust HF remote code on model load; applies to every stage when specified. |
 | `distributed_executor_backend` | str \| null | optional | `null` | **Pipeline-wide.** Distributed executor backend forwarded to vLLM (`"mp"`, `"ray"`, `"external_launcher"`). If omitted, vLLM auto-selects backend from runtime topology. |
 | `dtype` | str \| null | optional | `null` | **Pipeline-wide.** Model dtype for every stage. |
@@ -84,7 +84,7 @@ subprocess on one GPU. `ray` / `external_launcher` are not fully supported yet.
 Each entry under `stages:` accepts any `StageDeployConfig` field directly (no nested `engine_args:`). Only fields whose value legitimately varies across stages live here; pipeline-wide settings (trust_remote_code, distributed_executor_backend, dtype, quantization, prefix/chunked prefill, DP/PP sizes) are declared at the top level and applied to every stage. Unknown keys fall through to `engine_extras:` and are forwarded to the engine. Frequently used fields are listed below; the source-of-truth schema is `StageDeployConfig` in `vllm_omni/config/stage_config.py`.
 
 | Field | Type | Required | Default | Description |
-| ------- | ------ | ---------- | --------- | ------------- |
+|-------|------|----------|---------|-------------|
 | `stage_id` | int | required | — | Stage identity; matched against `PipelineConfig.stages[*].stage_id`. |
 | `max_num_seqs` | int \| null | optional | `null` | Max concurrent sequences per stage. |
 | `gpu_memory_utilization` | float \| null | optional | `null` | Per-stage total memory target; used for automatic KV-cache sizing. |
@@ -94,14 +94,12 @@ Each entry under `stages:` accepts any `StageDeployConfig` field directly (no ne
 | `max_num_batched_tokens` | int \| null | optional | `null` | Per-stage prefill/token budget; also contributes to the native maximum in-flight token limit. |
 | `max_model_len` | int \| null | optional | `null` | Per-sequence context or KV length; `-1` enables native cache-capacity auto-fitting, while values above the HF default auto-set `VLLM_ALLOW_LONG_MAX_MODEL_LEN=1`. |
 | `async_scheduling` | bool \| null | optional | `null` | Per-stage async scheduling toggle. |
-| `devices` | str \| null | optional | `null` | Device list assigned to this stage. The number of device ids must equal this stage's local world size (`tensor_parallel_size` × local data-parallel size × `pipeline_parallel_size`, or `num_replicas` × that product for a replica pool); a mismatch fails early — see the note below. |
+| `devices` | str \| null | optional | `null` | Device list assigned to this stage. |
 | `output_connectors` | dict \| null | optional | `null` | Keyed by `to_stage_<n>`; values are names registered under top-level `connectors:`. |
 | `input_connectors` | dict \| null | optional | `null` | Keyed by `from_stage_<n>`; values are names registered under top-level `connectors:`. |
 | `default_sampling_params` | dict \| null | optional | `null` | Baseline sampling params. Deep-merged with pipeline `sampling_constraints` (pipeline wins). |
 | `engine_extras` | dict | optional | `{}` | Catch-all for engine fields not listed above; deep-merged across overlays and forwarded to the stage engine. |
 
-**Note:** a stage's `devices` count must equal its local world size (`tensor_parallel_size` × `data_parallel_size_local` × `pipeline_parallel_size`, falling back to global `data_parallel_size` when the local size is unset), or `num_replicas` × that product for a replica pool. A mismatch fails early and names the offending stage. A top-level `--tensor-parallel-size` is broadcast to every stage, so it can make a single-GPU stage violate this contract ([issue #5003](gh-issue:5003)); fix that case with `--stage-overrides` (set `tensor_parallel_size` and `devices` together per stage) or set TP only on the multi-GPU stage.
-
 ### Connector schema
 
 Each entry under top-level `connectors:` follows this shape:
@@ -115,9 +113,9 @@ connectors:
       # Additional connector-specific options
 ```
 
-| Connector class          | Use case                                                              | `extra` keys                                                                                                      |
-|--------------------------|-----------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------|
-| `SharedMemoryConnector`  | Same-host KV transfer between stages (default for bundled YAMLs).     | None. All payloads use shared memory.                                                                             |
+| Connector class | Use case | `extra` keys |
+|-----------------|----------|--------------|
+| `SharedMemoryConnector` | Same-host KV transfer between stages (default for bundled YAMLs). | None. All payloads use shared memory. |
 | `MooncakeStoreConnector` | Cross-host KV transfer over TCP. Required for multi-node deployments. | `host`, `metadata_server`, `master`, `segment` (int bytes), `localbuf` (int bytes), `proto` (`"tcp"` / `"rdma"`). |
 
 A stage references a connector by name in its `input_connectors` / `output_connectors`:
@@ -137,7 +135,7 @@ stages:
 ### CLI flags
 
 | Flag | Description |
-| ------ | ------------- |
+|------|-------------|
 | `--deploy-config PATH` | Load a deploy YAML. **Optional** — when omitted, the bundled `vllm_omni/deploy/<model_type>.yaml` is auto-loaded by the model registry. |
 | `--stage-overrides JSON` | Per-stage JSON overrides, e.g. `'{"0":{"gpu_memory_utilization":0.5}}'`. Per-stage values always win over global flags. |
 | `--async-chunk` / `--no-async-chunk` | Flip the deploy YAML's `async_chunk:` bool. Unset (default) leaves the YAML value in force. |
@@ -251,7 +249,7 @@ CUDA_VISIBLE_DEVICES=0 vllm serve Qwen/Qwen3-Omni-30B-A3B-Instruct --omni \
 Effective config per stage after the merge:
 
 | Stage | Field | Final value | Source |
-| ------- | ------- | ------------- | -------- |
+|-------|-------|-------------|--------|
 | 0 | `gpu_memory_utilization` | `0.9` | base YAML (overlay didn't touch stage 0) |
 | 0 | `max_num_seqs` | `8` | per-stage CLI (`--stage-overrides`) — wins over base `32` |
 | 0 | `max_model_len` | `16384` | global CLI |
@@ -275,14 +273,12 @@ when loading a deploy configuration.
 Examples:
 
 For offline inference (assuming the necessary dependencies have been imported):
-
 ```python
 model_name = "Qwen/Qwen2.5-Omni-7B"
 omni = Omni(model=model_name, deploy_config="/path/to/deploy_config.yaml")
 ```
 
 For online serving:
-
 ```bash
 vllm serve Qwen/Qwen2.5-Omni-7B --omni --port 8091 --deploy-config /path/to/deploy_config.yaml
 ```

docs/contributing/README.md

@@ -49,7 +49,7 @@ vLLM-Omni's `pre-commit` hooks will now run automatically every time you commit.
     `--all-files` run stays green while historical debt is cleaned up. The
     current `SKIP` list in
     [`.github/workflows/pre-commit.yml`](https://github.com/vllm-project/vllm-omni/blob/main/.github/workflows/pre-commit.yml)
-    is `check-mark`, `markdownlint-cli2`, `shellcheck`,
+    is `check-test-ci-coverage`, `markdownlint-cli2`, `shellcheck`,
     `check-spdx-header`, and `mypy-3.10`. Those hooks still run on **your
     commit** for changed files. A passing GitHub pre-commit check does not mean
     they passed locally. Hooks **not** on that list (forbidden imports,
@@ -66,7 +66,7 @@ already there). `check-pickle-imports` is gone: pickle is now one rule inside
 | `markdownlint-cli2` | Markdown in `docs/`, `recipes/`, `README.md`, `CONTRIBUTING.md` (not `.claude/` / `.cursor/` / `CLAUDE.md`) | skipped |
 | `mypy-3.10` | Type-check changed `vllm_omni/` files (model trees excluded). `tests/` uses `--follow-imports skip` | skipped |
 | `mypy-3.11` / `3.12` / `3.13` | Same checker, extra Python versions | not installed; `pre-commit run --hook-stage manual mypy-3.12` |
-| `check-mark` | Every `tests/**/test_*.py` has a CI level mark and a hardware platform mark or helper; no direct `pytest.mark.H100` / SKU | skipped |
+| `check-test-ci-coverage` | Every `tests/**/test_*.py` has a CI level mark and a hardware mark/helper | skipped |
 | `check-tts-adapter-migration` | `self._tts_model_type` branches in `serving_speech.py` must not increase | runs |
 | `shellcheck` | `*.sh` quoting / undefined vars | skipped |
 | `check-spdx-header` | Omni SPDX header on `.py` / `.pyi` / `.sh` / `.rs` / `.proto` | skipped |
@@ -144,13 +144,11 @@ pre-commit run --hook-stage manual mypy-3.12
 
 #### Test CI marks
 
-`check-mark` requires each collected test module under `tests/` to
+`check-test-ci-coverage` requires each collected test module under `tests/` to
 have at least one CI **level** mark (`core_model`, `advanced_model`,
-`full_model`, `local_model`, or `slow`) and a **hardware** platform mark
-(`cpu`, `cuda`, …) or helper (`hardware_test(` / `hardware_marks(`). SKU marks
-(`H100`, `L4`, …) must come from those helpers so `cards_{n}` is attached;
-direct `pytest.mark.H100` is rejected. GitHub Actions skips this hook; local
-commit does not. See the
+`full_model`, `local_model`, or `slow`) and a **hardware** mark (`cpu`, `cuda`,
+`H100`, …) or helper (`hardware_test(` / `hardware_marks(`). GitHub Actions
+skips this hook; local commit does not. See the
 [test writing guide](./ci/test_writing_guide.md).
 
 #### TTS adapter ratchet
@@ -262,28 +260,6 @@ or serving, explain the required L2/L3 environment and provide the exact command
 
 Repository skills guide the agent, but they do not replace contributor judgment, the accepted issue or RFC, required test evidence, or maintainer review. Review all generated changes before submitting them.
 
-## AI Usage Policy
-
-AI tools are welcome in vLLM-Omni contributions. Contributors, including maintainers, remain responsible for everything they submit. These requirements apply to pull requests, issues, discussions, and review comments:
-
-- **Disclose AI assistance.** Name the tools used and describe their role in the submission, including assistance with code, tests, documentation, or writing.
-- **Understand your changes.** Review every generated change and be able to explain its behavior, design choices, and interaction with vLLM-Omni without relying on AI to answer for you.
-- **Validate before submitting.** Run relevant checks and report actual results. For model, kernel, or performance changes, include the hardware, model, configuration, and commands needed to reproduce accuracy or benchmark evidence. Clearly identify checks you could not run; generated claims are not test results.
-- **Keep communication useful.** Verify technical claims, search for existing reports, and edit AI-assisted text for accuracy and brevity. Submit only content you have personally reviewed, and take responsibility for responding to review feedback.
-- **Label generated media.** Model-generated images, video, and audio are valid examples or test artifacts for this multimodal project. Identify them as generated output and provide the model, inputs, and reproduction settings. Do not present them as ground-truth references or independent evidence of correctness.
-
-For example, a PR description could include:
-
-```text
-AI assistance: Used Codex to draft the regression test and PR description.
-I reviewed the changes and verified the test reproduces the reported failure.
-Validation: <commands, results, hardware, and any checks not run>.
-```
-
-Maintainer review time is limited. Contributions that are unverified, misleading, or beyond the author's understanding may be closed. Repeated violations may lead to contribution restrictions. New contributors are welcome to ask for help and submit small, well-understood changes.
-
-This policy is adapted from [Ghostty's AI Usage Policy](https://github.com/ghostty-org/ghostty/blob/main/AI_POLICY.md) for vLLM-Omni's contribution and multimodal validation workflows. The [coding-agent workflow](#using-repository-skills-with-coding-agents) provides practical guidance for applying it.
-
 ## Issues
 
 If you encounter a bug or have a feature request, please search existing issues first to see if it has already been reported. If not, please file a new issue, providing as much relevant information as possible.

docs/contributing/ci/ci_settings.md

@@ -57,11 +57,13 @@ Canonical layout (prefer these paths for new changes):
 | Bootstrap vs test YAML | **Bootstrap** (`pipeline*.yml`) builds images and uploads **child** test pipelines. **Test** YAML (`test-*.yml`) lists pytest steps only. |
 | Register CI YAML in `skip_ci.py` | If you add a new whitelisted test pipeline file, update `L2_YAML_FILES`, `L3_YAML_FILES`, or `L45_YAML_FILES` in `.buildkite/common/scripts/skip_ci.py` so skip-ci paths stay correct. |
 
+There are still **legacy copies** at `.buildkite/*.yaml` (without the `cuda/` prefix). Treat `.buildkite/cuda/*` as source of truth.
+
 ## Platform comparison
 
 | Platform | Bootstrap entry | Test job files | Upload mechanism | Job hardware in YAML |
 | -------- | ---------------- | -------------- | ---------------- | -------------------- |
-| **CUDA** | `cuda/pipeline.yml` | `test-ready.yml`, `test-merge.yml`, `test-nightly.yml`, `test-weekly.yml` | `upload_pipeline.py --upload` (expands uploader-only keys) | omit `mirror_hardwares` (from `-m`) / preset string + `MIRROR_HW` |
+| **CUDA** | `cuda/pipeline.yml` | `test-ready.yml`, `test-merge.yml`, `test-nightly.yml`, `test-weekly.yml` | `upload_pipeline.py --upload` (expands uploader-only keys) | `mirror_hardwares: <preset>` (string) |
 | **NPU** | `npu/pipeline-npu.yml` | `test-npu-ready.yml`, `test-npu-nightly.yml` | `upload_pipeline.py --upload` | `mirror_hardwares: a2b3_npu_1` / `a2b3_npu_4` / `a3_npu_2` |
 | **AMD** | `amd/scripts/bootstrap-amd-omni.sh` | `test-amd-ready.yml`, `test-amd-merge.yml` | Jinja (`test-template-amd-omni.j2`) → `pipeline upload` | `agent_pool` + `mirror_hardwares: [amdproduction]` (array, template filter) |
 | **Intel** | `intel/scripts/bootstrap-intel-omni.sh` | `intel/pipeline-intel.yml` (steps inline) | Direct `pipeline upload` | Inline `agents.queue` on each step |
@@ -90,23 +92,7 @@ Canonical layout (prefer these paths for new changes):
 
     **Upload:** `upload_pipeline.py --upload` expands uploader-only keys before Buildkite upload.
 
-    **Hardware in YAML:** omit `mirror_hardwares` to compose `{chip}_{n}` from pytest `-m` (SKU + `cards_n`). Several positive `cards_*` take the **max** n (`cards_2 and cards_3` → `{chip}_3`). `not cards_1` with no positive `cards_*` uses that chip's **highest existing** preset in `ci_mirror_hardwares.yml` (L4 → `l4_4`, H100 → `h100_4`, B200 → `b200_4`). Set a **preset string** to force a pool (marks are ignored). Do **not** set `agents` / `plugins` on the same step as `mirror_hardwares`. `MIRROR_HW=b200` remaps inferred jobs whose `-m` includes `B200`, and omits CUDA `h100_*` / `l4_*` strings. Jobs whose `-m` does not match (unset: no H100/L4; set: no B200) are **skipped**.
-
-    ```yaml
-    # inferred: H100+B200 + cards_2 → h100_2, or b200_2 when MIRROR_HW=b200
-    commands:
-      - pytest -sv tests/e2e -m "full_model and H100 and B200 and omni and cards_2"
-    # no mirror_hardwares
-
-    # inferred: not cards_1 (no positive cards_*) → that chip's highest pool (l4_4 / h100_4 / b200_4)
-    commands:
-      - pytest -sv tests/e2e -m "full_model and diffusion and L4 and not cards_1"
-
-    # forced preset (ignores -m SKU/cards for pool selection)
-    mirror_hardwares: h100_1
-    ```
-
-    Inferred form: unset/`empty` `MIRROR_HW` matches `H100` or `L4` in `-m` (both present → H100); no match skips the step. `MIRROR_HW=b200` must appear in `-m` or the step is skipped. The uploader does **not** rewrite pytest `-m`; B200 collection comes from the YAML expression and from tests that declare `B200` in `hardware_test` / `hardware_marks` (for example `res={"cuda": ["H100", "B200"]}`). `MIRROR_HW` must be empty or `b200` (case-insensitive); unknown values (for example `b20o`) **fail the upload**. A CUDA preset string such as `mirror_hardwares: h100_4` is skipped when `MIRROR_HW=b200`. Unset `MIRROR_HW` keeps string presets. NPU presets ignore `MIRROR_HW`. A `mirror_hardwares` name that is not a key in `ci_mirror_hardwares.yml` **fails the upload**.
+    **Hardware in YAML:** `mirror_hardwares: <preset>` (string)—preset names in [`common/ci_mirror_hardwares.yml`](https://github.com/vllm-project/vllm-omni/blob/main/.buildkite/common/ci_mirror_hardwares.yml). Do **not** set `agents` / `plugins` on the same step.
 
     **Conventions**
 
@@ -117,9 +103,9 @@ Canonical layout (prefer these paths for new changes):
 
     **Adding a job**
 
-    1. Pick the level file (`test-ready.yml` / `test-merge.yml` / `test-nightly.yml` / `test-weekly.yml`).
+    1. Pick the level file (ready / merge / nightly / weekly).
     2. Add a step under the right **group** (usually **E2E Test** for model pytest).
-    3. Set `label`, `commands`, `mirror_hardwares`, `depends_on: upload-ready-pipeline` (or `upload-merge-pipeline` / `upload-nightly-pipeline` / `upload-weekly-pipeline`).
+    3. Set `label`, `commands`, `mirror_hardwares`, `depends_on: upload-<level>-pipeline`.
     4. For L2/L3 E2E, add `source_file_dependencies` (pytest + model + deploy YAML prefixes).
     5. Dry-run:
 
@@ -129,7 +115,7 @@ Canonical layout (prefer these paths for new changes):
 
 === "NPU"
 
-    **Bootstrap:** [`npu/pipeline-npu.yml`](https://github.com/vllm-project/vllm-omni/blob/main/.buildkite/npu/pipeline-npu.yml) + [`npu/bootstrap-upload-steps.yml`](https://github.com/vllm-project/vllm-omni/blob/main/.buildkite/npu/bootstrap-upload-steps.yml)—same split as CUDA; builds A2/B3, A3, A5, and 310P CI images, then uploads child test pipelines.
+    **Bootstrap:** [`npu/pipeline-npu.yml`](https://github.com/vllm-project/vllm-omni/blob/main/.buildkite/npu/pipeline-npu.yml) + [`npu/bootstrap-upload-steps.yml`](https://github.com/vllm-project/vllm-omni/blob/main/.buildkite/npu/bootstrap-upload-steps.yml)—same split as CUDA; builds A2/B3 and A3 CI images, then uploads child test pipelines.
 
     **Test YAML:** `npu/test-npu-ready.yml` (L2), `test-npu-nightly.yml` (L4).
 
@@ -137,12 +123,7 @@ Canonical layout (prefer these paths for new changes):
 
     **Upload:** same as CUDA—`upload_pipeline.py --upload`.
 
-    **Hardware in YAML:** `mirror_hardwares` preset (string), expanded to `agents`, top-level `image`, and `plugins`. NPU presets in `common/ci_mirror_hardwares.yml` are:
-
-    - A2: `a2b3_npu_1`, `a2b3_npu_4`, `a2b3_npu_8`
-    - A3: `a3_npu_2`, `a3_npu_4`, `a3_npu_8`, `a3_npu_16`
-    - A5: `a5_npu_2`, `a5_npu_4`, `a5_npu_8`, `a5_npu_16`
-    - 310P: `310p_npu_1`, `310p_npu_2`, `310p_npu_4`
+    **Hardware in YAML:** `mirror_hardwares` preset (string), expanded to `agents`, top-level `image`, and `plugins`. Presets: `a2b3_npu_1`, `a2b3_npu_4`, `a3_npu_2` in `common/ci_mirror_hardwares.yml`.
 
     **Conventions**
 
@@ -166,9 +147,7 @@ Canonical layout (prefer these paths for new changes):
 
     **Bootstrap:** [`amd/scripts/bootstrap-amd-omni.sh`](https://github.com/vllm-project/vllm-omni/blob/main/.buildkite/amd/scripts/bootstrap-amd-omni.sh)—skip-ci, diff filtering, Jinja render, then `buildkite-agent pipeline upload`.
 
-    **Test YAML (data):** `amd/test-amd-ready.yml` (L2 / `ready`), `test-amd-merge.yml` (L3 / `merge-test` and `main`). On a PR carrying both labels, AMD combines both suites behind one image build. PR builds without either tier label retain the legacy L2 fallback for compatibility with the `amd-test` trigger. `DEBUG_TEST_YAML` remains an explicit override. AMD has no L4 file yet, so `nightly-test` does not select an additional suite.
-
-    **Trigger boundary:** AMD label handling has two layers. First, the external `vllm-omni-amd-ci` Buildkite pipeline condition decides whether a GitHub label event creates a build. Only after that build starts does this repository's bootstrap inspect all current PR labels and select L2, L3, or both. Repository-side selection therefore cannot make a `merge-test` event start AMD CI by itself. The external condition must admit both `ready` and `merge-test`, while preserving the legacy `amd-test` trigger and non-PR `main` / scheduled builds. For PR builds without a `DEBUG_TEST_YAML` override, an unreadable label set fails the bootstrap instead of silently selecting the wrong tier. Debug overrides skip label lookup and are validated directly; invalid values, including whitespace-only values, fail the bootstrap. Keep `nightly-test` out of the AMD condition until an AMD L4 suite exists; otherwise it would start a build without providing nightly coverage.
+    **Test YAML (data):** `amd/test-amd-ready.yml` (L2 / PR), `test-amd-merge.yml` (L3 / main).
 
     **Rendering:** [`test-template-amd-omni.j2`](https://github.com/vllm-project/vllm-omni/blob/main/.buildkite/amd/test-template-amd-omni.j2) wraps data steps with `amd-build` image build and `amd_<agent_pool>` queues. Do **not** hand-edit generated `pipeline.yaml`.
 
@@ -423,7 +402,7 @@ loads the model once per mode.
 Before splitting, confirm each half actually collects at least one test under the job's forwarded filters — pytest exits with code 5 ("no tests collected") if a half is empty, which the script reports as a failure, red-ing a job that used to pass as one combined invocation.
 
 Also check the tests' `num_cards` against the job's `mirror_hardwares` preset.
-`_cuda_marks` turns `num_cards > 1` into `skipif(device_count() < num_cards)`, so a
+`cuda_marks` turns `num_cards > 1` into `skipif(device_count() < num_cards)`, so a
 test asking for more GPUs than the preset provides is silently skipped and its
 coverage artifact comes back empty. Splitting such a job produces a file that
 looks fine and measures nothing — "Diffusion · Z Image Test" is the current
@@ -435,12 +414,10 @@ settings in `pyproject.toml`: online tests launch the server with
 `subprocess.Popen` and stop it with SIGTERM, and without those settings the XML
 reflects only the pytest parent process, not the server's code paths.
 
-The upload depends on `buildkite-agent` being callable inside the container.
-CUDA (`l4_*`, `h100_*`) and NPU (`*_npu_*`) presets all use the `kubernetes`
-plugin, which provides the agent. `l4_*` jobs run on the EKS `l4-k8s` queue
-(agent-stack-k8s); they no longer use the docker plugin or
-`mount-buildkite-agent`. A new **docker** preset that runs a coverage job
-still needs `mount-buildkite-agent: true`.
+The upload depends on `buildkite-agent` being callable inside the container. The
+`kubernetes` presets (`h100_*`, `*_npu_*`) provide it; the `docker` ones (`l4_*`)
+only do because they set `mount-buildkite-agent: true`. A new docker preset that
+runs a coverage job needs the same.
 
 List both `run_cov_split.sh` and `pyproject.toml` in every opted-in job's
 `source_file_dependencies` — both change what the job measures, so without them a

docs/contributing/ci/test_examples/l4_functionality_tests.inc.md

@@ -1,8 +1,8 @@
-#### Scope
+**Scope**
 
 For diffusion models, the L4 functionality test covers all or common *diffusion features* that are supported by this model, including several [parallelism acceleration methods](https://docs.vllm.ai/projects/vllm-omni/en/latest/user_guide/diffusion/parallelism_acceleration/), [CPU offloading](https://docs.vllm.ai/projects/vllm-omni/en/latest/user_guide/diffusion/cpu_offload/), [TeaCache](https://docs.vllm.ai/projects/vllm-omni/en/latest/user_guide/diffusion/teacache/) and [Cache-DiT](https://docs.vllm.ai/projects/vllm-omni/en/latest/user_guide/diffusion/cache_dit_acceleration/) cache backends, [quantization methods](https://docs.vllm.ai/projects/vllm-omni/en/latest/user_guide/quantization/overview/).
 
-#### Test Case Design
+**Test Case Design**
 
 For a *high priority* model (currently listed in [issue #1832](https://github.com/vllm-project/vllm-omni/issues/1832)), we use several test cases, each with multiple features turned on, so that each supported feature is tested in at least one test case. This is to relieve the GPU workload on the CI machine. The suggested test case combination is as follows:
 
@@ -34,12 +34,12 @@ For a *normal priority* model, further reduce the number of test cases.
 
 Currently all the features are available in online serving mode. Hence, only need to add `tests/e2e/online_serving/test_{model}_expansion.py`.
 
-#### Code Style
+**Code Style**
 
-- Validation: test that the multimodal output files of your model have the correct shapes. `OnlineOmniClient.send_diffusion_request` should have taken care of this.
+- Validation: test that the multimodal output files of your model have the correct shapes. `OpenAIClientHandler.send_diffusion_request` should have taken care of this.
 - Test marks: always add `full_model` and `diffusion` for L4 nightly `test_*_expansion.py` cases. Add GPU-related marks if needed. Ref: [Markers for Tests](https://docs.vllm.ai/projects/vllm-omni/en/latest/contributing/ci/test_writing_guide/#markers-for-tests).
 - To maximize code reuse, you may refer to
-    - `tests/conftest.py` for `omni_server` (running server in subprocess) and `online_client` fixtures (sending requests and validating output), `generate_synthetic_image` and `assert_XXX_valid` helper.
+    - `tests/conftest.py` for `omni_server` (running server in subprocess) and `openai_client` fixtures (sending requests and validating output), `generate_synthetic_image` and `assert_XXX_valid` helper.
     - `tests/helpers/mark.py` for `@hardware_test(...)` and `hardware_marks`.
     - [Parametrizing tests (pytest doc)](https://docs.pytest.org/en/stable/example/parametrize.html) to reuse test function implementation for different cases.
 - Doc: add a concise docstring for each test function.

docs/contributing/ci/test_examples/l4_performance_tests.inc.md

@@ -4,8 +4,8 @@ When you want to add L4-level ***performance test*** cases, add entries to JSON
 
 | Model type | Runner | Example JSON files |
 | ---------- | ------ | ------------------ |
-| Omni (nightly) | `run_benchmark.py` | `test_qwen3_omni_no_async_chunk.json`, `test_qwen3_omni_async_chunk.json` (`full_model` without `slow` in `mark`) |
-| Omni (weekly) | `run_benchmark.py` | `test_qwen3_omni_async_chunk.json` (CUDA only), `test_qwen3_omni_vllm_text.json`, `test_qwen3_omni_multi_replicas.json` (`slow` in `mark`; **Perf Test** in `test-weekly.yml`) |
+| Omni (nightly) | `run_benchmark.py` | `test_qwen3_omni_no_async_chunk.json`, `test_qwen3_omni_async_chunk.json` (`full_model` in `mark`) |
+| Omni (weekly) | `run_benchmark.py` | `test_qwen3_omni_vllm_text.json`, `test_qwen3_omni_multi_replicas.json` (`slow` in `mark`; **Perf Test** in `test-weekly.yml`) |
 | TTS | `run_benchmark.py` | `test_tts.json`, `test_voxcpm2.json`, `test_higgs_audio_v3.json` |
 | Diffusion | `run_diffusion_benchmark.py` | `test_qwen_image_vllm_omni.json`, `test_bagel_vllm_omni.json`, `test_wan22_i2v_vllm_omni.json`, `test_cosmos3_vllm_omni.json`, … |
 
@@ -20,7 +20,7 @@ Diffusion cases are detected when the JSON has `server_type` (typically `"vllm-o
 
 #### Running perf cases
 
-Pass **`--test-config-file`** to load one JSON file, or omit it for the bulk scan above. In either mode, pytest **`-m`** filters each case using its JSON `mark`. A single file can contain nightly, weekly, and platform-specific case objects. For example, the nightly object in `test_qwen3_omni_async_chunk.json` declares both H100 and A3, while its `slow` weekly object is CUDA-only; there is no NPU weekly counterpart. Use `-m "H100 and full_model and not slow"`, `-m "H100 and full_model and slow"`, or `-m "npu"` to select the intended schedule and platform.
+Pass **`--test-config-file`** to run one JSON file as-is, or omit it for the bulk scan above and filter with pytest **`-m`** on each case's JSON `mark` (for example `pytest … run_benchmark.py -m "full_model and tts and H100"` or `-m "slow and omni and H100"` for weekly Omni configs).
 
 ```JSON
 {
@@ -75,14 +75,14 @@ Omit `mark` only for configs not meant to be filtered by `-m`. `server_type` is
 
 Optional top-level field on each perf JSON **case object** (one per `test_name`). `run_benchmark.py` and `run_diffusion_benchmark.py` read it via `tests.dfx.conftest.resolve_pytest_marks` and attach the marks to the corresponding `pytest.param`, so you can filter locally with `-m`.
 
-When `mark` is present, it must be an **array** with exactly one ``hardware_marks`` object (same shape as `@hardware_test` / `hardware_marks()` in `tests/helpers/mark.py`), followed by registered pytest marker name strings such as `full_model`, `slow`, `omni`, `tts`, `diffusion`, or `local_model`.
+When `mark` is present, it must be an **array** with exactly one ``hardware_marks`` object (same shape as `@hardware_test` / `hardware_marks()` in `tests/helpers/mark.py`), followed by registered pytest marker name strings such as `full_model`, `omni`, `tts`, `diffusion`, or `local_model`.
 
 Supported form:
 
 | Form | Example | Effect |
 | ---- | ------- | ------ |
-| Array (single platform) | `"mark": [{"hardware_marks": {"res": {"cuda": "H100"}, "num_cards": 2}}, "full_model", "diffusion"]` | Hardware marks from `hardware_marks(...)`; `num_cards` adds `cards_{n}` (including `cards_1` when omitted). String entries become extra pytest marks. |
-| Array (multi-platform) | `"mark": [{"hardware_marks": {"res": {"cuda": "H100", "rocm": "MI325"}, "num_cards": 2}}, "full_model", "omni"]` | Same as above, but declares **multiple platforms** on one item. All platforms must share the same `num_cards` (int or identical dict values). Different counts need `@hardware_test` or one `hardware_marks()` per `pytest.param`. Filter examples: `-m "full_model and H100 and cards_2 and cuda"`, `-m "full_model and MI325 and cards_2 and rocm"`. |
+| Array (single platform) | `"mark": [{"hardware_marks": {"res": {"cuda": "H100"}, "num_cards": 2}}, "full_model", "diffusion"]` | Hardware marks from `hardware_marks(...)`; `num_cards` > 1 adds `distributed_*` (+ CUDA `skipif_cuda` when applicable). String entries become extra pytest marks. |
+| Array (multi-platform) | `"mark": [{"hardware_marks": {"res": {"cuda": "H100", "rocm": "MI325", "npu": "A2"}, "num_cards": {"cuda": 2, "rocm": 2, "npu": 1}}}, "full_model", "omni"]` | Same as above, but declares **multiple platforms** in one case. Filter examples: `-m "full_model and H100 and cuda"`, `-m "full_model and MI325 and rocm"`. |
 
 Recommended for L4 perf cases:
 
@@ -142,22 +142,15 @@ Examples:
 pytest -s -v tests/dfx/perf/scripts/run_diffusion_benchmark.py -m "full_model and H100 and diffusion"
 pytest -s -v tests/dfx/perf/scripts/run_benchmark.py -m "full_model and omni and H100"
 
-# Single file (same selectors as the CI Perf steps)
+# Single file (same as nightly CI Perf steps)
 pytest -s -v tests/dfx/perf/scripts/run_diffusion_benchmark.py \
   --test-config-file tests/dfx/perf/tests/test_bagel_vllm_omni.json
 pytest -s -v tests/dfx/perf/scripts/run_benchmark.py \
-  --test-config-file tests/dfx/perf/tests/test_qwen3_omni_async_chunk.json \
-  -m "H100 and full_model and not slow"
-pytest -s -v tests/dfx/perf/scripts/run_benchmark.py \
-  --test-config-file tests/dfx/perf/tests/test_qwen3_omni_async_chunk.json \
-  -m "H100 and full_model and slow"
-pytest -s -v tests/dfx/perf/scripts/run_benchmark.py \
-  --test-config-file tests/dfx/perf/tests/test_qwen3_omni_async_chunk.json \
-  -m "npu"
+  --test-config-file tests/dfx/perf/tests/test_qwen3_omni_async_chunk.json
 ```
 
 <!-- markdownlint-disable-next-line MD051 -->
-See also [Markers for Tests](#markers-for-tests) for registered hardware markers (`H100`, `L4`, `cuda`, `cards_1`, …).
+See also [Markers for Tests](#markers-for-tests) for registered hardware markers (`H100`, `L4`, `cuda`, `distributed_cuda`, …).
 
 #### `server_params` Configuration
 

docs/contributing/ci/test_execution_guide.md

@@ -88,7 +88,7 @@ Failed jobs: 1/2
     ```bash
     cd tests
     pytest -s -v test_xxxx.py --run-level=core_model
-    pytest -s -v -m "core_model and L4 and not cards_1" --run-level=core_model
+    pytest -s -v -m "core_model and distributed_cuda and L4" --run-level=core_model
     ```
 
 === "L3 level"
@@ -119,7 +119,7 @@ Failed jobs: 1/2
 
     ```bash
     pytest -s -v test_xxxx.py --run-level=advanced_model
-    pytest -s -v -m "advanced_model and L4 and not cards_1" --run-level=advanced_model
+    pytest -s -v -m "advanced_model and distributed_cuda and L4" --run-level=advanced_model
     ```
 
 === "L4 level"
@@ -153,12 +153,12 @@ Failed jobs: 1/2
     ```bash
     cd tests
     pytest -s -v test_xxxx.py --run-level=full_model
-    pytest -s -v -m "full_model and L4 and not cards_1" --run-level=full_model
+    pytest -s -v -m "full_model and distributed_cuda and L4" --run-level=full_model
     pytest -s -v -m "full_model and (omni or tts) and H100" --run-level=full_model
     ```
     If you only want to run specific test cases on a particular platform, you can use:
     ```bash
-    pytest -s -v -m "full_model and L4 and not cards_1"  --run-level=full_model
+    pytest -s -v -m "full_model and distributed_cuda and L4"  --run-level=full_model
     ```
     Note: ``run_benchmark.py`` and ``run_diffusion_benchmark.py`` accept an optional ``--test-config-file``. If omitted, each loads every ``*.json`` under ``tests/dfx/perf/tests/`` (omni/tts vs diffusion split by ``is_diffusion_perf_config``) and pytest ``-m`` filters by each case's JSON ``mark``:
     ```bash

docs/contributing/ci/test_system_overview.md

@@ -136,7 +136,7 @@ Through five levels (L1-L5) and common (Common) specifications, the system clari
         <a href="test_writing_guide.md#l4-level-testing-full-functionality-performance-and-documentation-testing">L4</a><br>
         L4: Purpose, Test Content, Directory Location, Example
       </td>
-      <td>Nightly / Days before Release<br>(additional GPU SKUs)</td>
+      <td>Nightly</td>
       <td>GPU</td>
     </tr>
     <tr>
@@ -175,15 +175,6 @@ Before entering specific testing levels, the project establishes two common spec
 
 ## Notes
 
-### L4 cadence (nightly and pre-release)
-
-CUDA **L4** (`full_model`) jobs are defined once in [`.buildkite/cuda/test-nightly.yml`](https://github.com/vllm-project/vllm-omni/blob/main/.buildkite/cuda/test-nightly.yml). That file is reused at two cadences:
-
-- **Nightly:** scheduled `main` builds with `NIGHTLY=1` (and PR labels such as `nightly-test` / `omni-test`). Default fleet is typically H100.
-- **Pre-release:** the same L4 suite runs again on extra GPU SKUs before a release (for example B200 via `MIRROR_HW=b200`), so `full_model` coverage is not limited to the nightly machine type.
-
-How count-form `mirror_hardwares` and `MIRROR_HW` pick a SKU: [CI Settings](./ci_settings.md).
-
 ### L2 / L3 diff-aware CI (CUDA)
 
 On CUDA **L2** and **L3**, **E2E Test** Buildkite jobs may be omitted at pipeline upload when the PR diff does not touch their path prefixes; other groups still always upload. Full two-layer mechanics and YAML examples: [CI Settings — Diff-aware CI](./ci_settings.md#diff-aware-ci) ([step filtering](./ci_settings.md#step-filtering)).

docs/contributing/ci/test_writing_guide.md

@@ -48,14 +48,17 @@ Defined in `pyproject.toml`:
 | `MI325`            | Tests that require MI325 GPU (AMD/ROCm) *                                                               |
 | `A2`               | Tests that require A2 NPU *                                                                             |
 | `A3`               | Tests that require A3 NPU *                                                                             |
-| `A5`               | Tests that require A5 NPU *                                                                             |
-| `310P`             | Tests that require 310P NPU *                                                                           |
-| `cards_{n}`        | Tests that require *n* accelerator cards (`cards_1` … `cards_8`); auto-added from `num_cards` *         |
+| `distributed_cuda` | Tests that require multi cards on CUDA platform *                                                       |
+| `distributed_rocm` | Tests that require multi cards on ROCm platform  *                                                      |
+| `distributed_npu`  | Tests that require multi cards on NPU platform  *                                                       |
+| `skipif_cuda`      | Skip if the num of CUDA cards is less than the required *                                               |
+| `skipif_rocm`      | Skip if the num of ROCm cards is less than the required *                                               |
+| `skipif_npu`       | Skip if the num of NPU cards is less than the required *                                                |
 | `slow`             | Slow tests (may skip in quick CI)                                                                       |
 | `benchmark`        | Benchmark tests (decorator on runner test functions; perf JSON uses `full_model` + type marker instead) |
 | `local_model`      | Tests requiring local / non-HF-hub model weights                                                        |
 
-\* Means those markers are auto-added by `@hardware_test` (parametrization decorator) or `hardware_marks` (only returning the list of marks for flexibility). Do **not** write `pytest.mark.H100` / `pytest.mark.L4` (or other SKU names) by hand: `check-mark` rejects that so `cards_{n}` cannot be skipped.
+\* Means those markers are auto-added by `@hardware_test` (parametrization decorator) or `hardware_marks` (only returning the list of marks for flexibility).
 
 #### Example usage for markers
 
@@ -78,23 +81,25 @@ def test_video_to_audio()
 This decorator is intended to make hardware-aware, cross-platform test authoring easier and more robust for CI/CD environments. The `hardware_test` decorator in `vllm-omni/tests/helpers/mark.py` performs the following actions:
 
 1. **Applies platform and resource markers**  
-   Adds the appropriate pytest markers for each specified hardware platform (e.g., `cuda`, `rocm`, `xpu`, `npu`) and resource type (e.g., `L4`, `H100`, `H200`, `B200`, `MI325`, `B60`, `A2`, `A3`, `A5`, `310P`).
+   Adds the appropriate pytest markers for each specified hardware platform (e.g., `cuda`, `rocm`, `xpu`, `npu`) and resource type (e.g., `L4`, `H100`, `MI325`, `B60`, `A2`, `A3`).
    ```python
    @pytest.mark.cuda
    @pytest.mark.L4
    ```
-2. **Handles card-count filtering**  
-   Adds a filterable marker `cards_{n}` (including `cards_1` when `num_cards` is omitted / 1). Use this with the SKU and platform, e.g. `-m "H100 and cards_4 and cuda"` vs `-m "H100 and cards_2 and cuda"`. Any multi-card CUDA test is `-m "cuda and not cards_1"`.
-
-   When `res` lists more than one platform **and** `num_cards` differs by platform, `@hardware_test` collects **one variant per platform** so those `cards_{n}` marks do not stack. `-m "H100 and cards_4 and cuda"` then selects only the CUDA/H100 4-card variant, not a ROCm 2-card sibling. The same count on every platform stays a single item.
+2. **Handles multi-card (distributed) scenarios**  
+   For tests requiring multiple cards, it automatically adds distributed markers such as `distributed_cuda`, `distributed_rocm`, or `distributed_npu`.
+   ```python
+   @pytest.mark.distributed_cuda(num_cards=num_cards)
+   ```
 3. **Supports flexible card requirements**  
    Accepts `num_cards` as either a single integer for all platforms or as a dictionary with per-platform values. If not specified, defaults to 1 card per platform.
 
 4. **Integrates resource validation**  
-   On CUDA and XPU, when `num_cards > 1`, attaches pytest's built-in `skipif` if the machine has fewer devices than requested. This is not a named `skipif_*` marker and is not used for `-m` filtering.
+   On CUDA, adds a skip marker (`skipif_cuda`) if the system does not have the required number of devices.
+   Support for `skipif_rocm` and `skipif_npu` will be implemented later.
 
 5. **Works with pytest filtering**  
-   Allows tests to be filtered and selected at runtime using standard pytest marker expressions (e.g., `-m "H100 and cards_2"`, `-m "L4 and not cards_1"`).
+   Allows tests to be filtered and selected at runtime using standard pytest marker expressions (e.g., `-m "distributed_cuda and L4"`).
 
 ##### Example usage for decorator
 
@@ -112,14 +117,13 @@ This decorator is intended to make hardware-aware, cross-platform test authoring
         num_cards=2,
     )
     ```
-- `res` must be a dict. SKU values come from `pyproject.toml` markers tagged `[hardware-resource]` plus the platform key (`[cuda]`, `[rocm]`, `[xpu]`, `[npu]`, `[musa]`).
+- `res` must be a dict; supported resources: CUDA (L4/H100), ROCm (MI325), XPU (B60), MUSA (S5000), NPU (A2/A3)
 - `num_cards` can be int (all platforms) or dict (per platform); defaults to 1 when missing
+- Distributed markers (`distributed_cuda`, `distributed_rocm`, `distributed_npu`) are auto-added for multi-card cases
 - Filtering examples:
-    - CUDA H100 4-card: `pytest -m "H100 and cards_4 and cuda"`
-    - CUDA H100 2-card: `pytest -m "H100 and cards_2 and cuda"`
-    - CUDA multi-card (any count): `pytest -m "L4 and not cards_1"`
-    - ROCm multi-card: `pytest -m "MI325 and not cards_1"`
-    - NPU multi-card: `pytest -m "npu and not cards_1"`
+    - CUDA only: `pytest -m "distributed_cuda and L4"`
+    - ROCm only: `pytest -m "distributed_rocm and MI325"`
+    - NPU only: `pytest -m "distributed_npu"`
 
 #### Function: `hardware_marks`
 
@@ -175,30 +179,37 @@ If you want to add support for a new platform (e.g., "tpu" for a new accelerator
    [tool.pytest.ini_options]
    markers = [
        # ... existing markers ...
-       "tpu: [hardware-platform] Tests that require TPU device",
-       # Add [gpu] next to [hardware-platform] if this platform should also get pytest.mark.gpu.
-       "TPU_V3: [hardware-resource] [tpu] Tests that require TPU v3 hardware",
-       "cards_1: [hardware-cards] Tests that require 1 accelerator card",
-       "cards_2: [hardware-cards] Tests that require 2 accelerator cards",
+       "tpu: Tests that require TPU device",
+       "TPU_V3: Tests that require TPU v3 hardware",
+       "distributed_tpu: Tests that require multiple TPU devices",
    ]
    ```
-   `check-mark` treats `[hardware-platform]` names (including `cpu`/`gpu`) as allowed `pytest.mark.<name>` values. `hardware_test(res=...)` still rejects `cpu`/`gpu` as `res` keys.
 2. **Implement a marker construction function for your platform** in `vllm-omni/tests/helpers/mark.py`:
    ```python
    # In vllm-omni/tests/helpers/mark.py
 
-   def _tpu_marks(*, res: str, num_cards: int):
-       _require_sku("tpu", res)
-       return [pytest.mark.tpu, getattr(pytest.mark, res), _cards_mark(num_cards)]
+   def tpu_marks(*, res: str, num_cards: int):
+       test_platform = pytest.mark.tpu
+       if res == "TPU_V3":
+           test_resource = pytest.mark.TPU_V3
+       else:
+           raise ValueError(
+               f"Invalid TPU resource type: {res}. Supported: TPU_V3")
+
+       if num_cards == 1:
+           return [test_platform, test_resource]
+       else:
+           test_distributed = pytest.mark.distributed_tpu(num_cards=num_cards)
+           # Optionally: add skipif_tpu when implemented
+           return [test_platform, test_resource, test_distributed]
    ```
-3. **Register the builder** in `_marks_for_platform`:
+3. **Update `hardware_marks` to recognize your new platform**:
+    In the relevant place (see the `hardware_marks` implementation), add:
     ```python
-    builders = {
-        # ... existing platforms ...
-        "tpu": _tpu_marks,
-    }
+    if platform == "tpu":
+        marks = tpu_marks(res=resource, num_cards=cards)
     ```
-    (`hardware_test` / `hardware_marks` both go through `_marks_for_platform`.)
+    (`hardware_test` calls `hardware_marks` internally, so both will pick up the change.)
 4. **(Recommended) Add a test using your new markers**:
    ```python
    @hardware_test(
@@ -212,11 +223,11 @@ If you want to add support for a new platform (e.g., "tpu" for a new accelerator
 **Summary**:  
 
 - Add pytest markers for your new platform/resources  
-- Implement a private marker function (`_xxx_marks`)
-- Register it in `_marks_for_platform`
-- You're done: tests using `@hardware_test` or `hardware_marks` with your platform now automatically get the correct markers and `cards_{n}` filtering.
+- Implement a marker function (`xxx_marks`)  
+- Plug into `hardware_marks`  
+- You're done: tests using `@hardware_test` or `hardware_marks` with your platform now automatically get the correct markers, distribution, and isolation!
 
-See code in `vllm-omni/tests/helpers/mark.py` for existing examples (`_cuda_marks`, `_rocm_marks`, `_npu_marks`).
+See code in `vllm-omni/tests/helpers/mark.py` for existing examples (`cuda_marks`, `rocm_marks`, `npu_marks`).
 
 ## Test case style
 

docs/contributing/model/adding_diffusion_model.md

@@ -779,31 +779,6 @@ turning them on. For Qwen-Image-style serving examples, document
 `--step-execution` as the feature gate and `--max-num-seqs N` as the
 companion batching knob.
 
-### Streaming Output and Mid-Stream Interactions
-
-To add streaming generation with optional mid-stream prompt updates to a new diffusion pipeline (often a video generation pipeline):
-
-0. **Model should internally support** chunked video emission and bounded VAE decode of a chunk.
-1. **Implement stepwise execution** so interaction RPCs can be consumed at chunk
-   boundaries (see [Step Execution](#step-execution) above).
-2. **Mix in** ``InteractionMixin`` on the pipeline class.
-3. **Implement** ``peek_chunk_media(StepRequestState) -> ChunkMediaSpec`` to offer information
-   about the next chunk to generate.
-   This is called whenever one supported interaction modality needs frame-level calculation,
-   e.g., per-frame camera trajectory. If only chunk-level calculation is involved, peeking is skipped.
-4. **Optionally implement** ``prepare_next_chunk(StepRequestState)`` if the
-   pipeline must rebuild something (e.g., per-chunk state) after an interaction is applied.
-   This function is called at chunk boundary.
-5. **Register** supported modalities and handlers in ``vllm_omni/diffusion/interaction/registry.py``
-   (keyed by ``od_config.model_class_name`` → modality key as in ``req["multi_modal_data"]``).
-
-Serve with ``--diffusion-streaming-output`` (auto-enables step execution). See
-[Diffusion Execution Modes](../../user_guide/diffusion/execution_modes.md#streaming-output)
-and the example script at `examples/online_serving/streaming_video_generation/`.
-
-**Interaction payload contract:** Although ``OmniInteractionPrompt`` type annocation requires ``event_id``,
-the WebSocket API payload may omit ``event_id`` and let the API layer assigns one.
-
 ### Cache Acceleration
 
 #### TeaCache

docs/contributing/model/adding_omni_model.md

@@ -29,7 +29,7 @@ Each stage is implemented as a separate model class that can be configured indep
 
 When adding a new model, you'll need to create the following structure:
 
-```text
+```
 vllm_omni/model_executor/models/
 └── your_model_name/              # Model directory (e.g., qwen3_omni)
     ├── __init__.py               # Exports main model class
@@ -222,16 +222,6 @@ __all__ = ["Qwen3OmniMoeForConditionalGeneration"]
 
 ## Key Components
 
-### Preprocess phase metadata
-
-Models with `has_preprocess=True`, including out-of-tree plugins, can rely on
-the runner's stable `_omni_is_prefill`, `_omni_prompt_len`, and
-`_omni_num_computed_tokens` fields. Use request progress to distinguish prompt
-prefill from decode: a one-token span can still be a prefill tail. See the
-[runner-to-model phase contract](../../design/feature/preprocess_phase_contract.md)
-for types, batched-hook semantics, MTP routing guarantees, and the correctness
-workaround for vLLM-Omni 0.20.x and earlier.
-
 ### 1. Model Interfaces
 
 Your model should implement the appropriate interfaces:
@@ -432,25 +422,22 @@ The stage transition process follows these steps:
 Understanding the data structures is crucial for implementing stage transitions:
 
 **Input to your function:**
-
 - `stage_list[source_stage_id].engine_outputs`: List of `EngineCoreOutput` objects
-    - Each contains `outputs`: List of `RequestOutput` objects
-        - Each `RequestOutput` has:
-            - `token_ids`: Generated token IDs
-            - `multimodal_output`: Dict with keys like `"code_predictor_codes"`, etc. These are the hidden states or intermediate outputs from the model's forward pass
-            - `prompt_token_ids`: Original prompt token IDs
+-   -  Each contains `outputs`: List of `RequestOutput` objects
+    - Each `RequestOutput` has:
+-   -  - `token_ids`: Generated token IDs
+       - `multimodal_output`: Dict with keys like `"code_predictor_codes"`, etc.These are the hidden states or intermediate outputs from the model's forward pass
+       - `prompt_token_ids`: Original prompt token IDs
 
 **Output from your function:**
-
 - Must return `list[OmniTokensPrompt]` where each `OmniTokensPrompt` contains:
-    - `prompt_token_ids`: List[int] - Token IDs for the next stage
+-   - `prompt_token_ids`: List[int] - Token IDs for the next stage
     - `additional_information`: Dict[str, Any] - Optional metadata (e.g., embeddings, hidden states)
     - `multi_modal_data`: Optional multimodal data if needed
 
 ### How Model Outputs Are Stored
 
 The model's `forward()` method returns an `OmniOutput` object that contains:
-
 - `text_hidden_states`: Final hidden states for text generation
 - `multimodal_outputs`: Dict containing intermediate outputs
 
@@ -477,7 +464,6 @@ def forward(self, ...):
 ```
 
 These keys are then accessible in your stage transition function:
-
 ```python
 # In stage_input_processors/qwen3_omni.py
 thinker_prefill_embeddings = output.multimodal_output["0"]  # Access by key
@@ -507,7 +493,7 @@ thinker_hidden_states = output.multimodal_output["24"]
 Create stage transition processors in `vllm_omni/model_executor/stage_input_processors/your_model_name.py`. Each inter-stage edge should provide a **coherent processor set** rather than a single monolithic function:
 
 | Suffix | Role | Runs when |
-| -------- | ------ | ----------- |
+|--------|------|-----------|
 | `*_full_payload` | Worker-side payload producer | `async_chunk=false`; accumulates tensors and ships via connector |
 | `*_async_chunk` | Scheduler-side streaming producer | `async_chunk=true`; emits per-chunk payloads |
 | `*_token_only` | Orchestrator placeholder builder | `async_chunk=false`; allocates downstream prompt slots only |
@@ -568,16 +554,7 @@ For comprehensive testing guidelines, please refer to the [Test Writing Guide](.
 
 ## Adding a Model Recipe
 
-After implementing and testing your model, add a recipe under this repository's
-`recipes/` directory. Follow the
-[`add-recipe` skill](https://github.com/vllm-project/vllm-omni/blob/main/.claude/skills/add-recipe/SKILL.md)
-and [`recipes/TEMPLATE.md`](https://github.com/vllm-project/vllm-omni/blob/main/recipes/TEMPLATE.md),
-then update the model row in
-[`recipes/README.md`](https://github.com/vllm-project/vllm-omni/blob/main/recipes/README.md).
-The external
-[vllm-project/recipes](https://github.com/vllm-project/recipes) repository can
-be used as a structural reference, but it is not the destination for a
-vLLM-Omni model recipe.
+After implementing and testing your model, please add a model recipe to the [vllm-project/recipes](https://github.com/vllm-project/recipes) repository. This helps other users understand how to use your model with vLLM-Omni.
 
 ### What to Include
 
@@ -591,10 +568,15 @@ Your recipe should include:
 3. **Usage Examples**: Command-line examples demonstrating how to run the model
 4. **Configuration Details**: Important configuration parameters and their meanings
 
+### Example
+
+For reference, see the [LongCat recipe example](https://github.com/vllm-project/recipes/pull/179) which demonstrates the expected format and structure.
+
 ### Recipe Location
 
-Create `recipes/<vendor>/<model-family>.md` and keep commands, feature status,
-hardware evidence, and limitations specific to the model family.
+Create your recipe file in the appropriate directory structure:
+- For organization-specific models: `OrganizationName/ModelName.md`
+- For general models: `ModelName.md`
 
 The recipe should be a Markdown file that provides clear, reproducible instructions for users to get started with your model.
 
@@ -608,7 +590,7 @@ Adding a new model to vLLM-Omni involves:
 4. **Define pipeline topology and deploy defaults** in `pipeline.py` and `vllm_omni/deploy/`
 5. **Implement stage input processors** for stage transitions
 6. **Write tests** to verify functionality
-7. **Add an in-repository model recipe** under `recipes/` and update its index (see [Adding a Model Recipe](#adding-a-model-recipe))
+7. **Add model recipe** to the [vllm-project/recipes](https://github.com/vllm-project/recipes) repository (see [Adding a Model Recipe](#adding-a-model-recipe) section)
 
 ### Qwen3-Omni Reference Files
 
@@ -625,7 +607,6 @@ For a complete reference implementation, see:
 - **Testing**: `vllm_omni/tests/e2e/offline_inference/test_qwen3_omni.py`
 
 For more information, see:
-
 - [Architecture Overview](../../design/architecture_overview.md)
 - [Supported Models](../../models/supported_models.md)
 - [Pipeline and Deploy Configuration Guide](../../configuration/stage_configs.md)

docs/contributing/model/adding_tts_model.md

@@ -438,7 +438,7 @@ selects the scheduler and worker family:
 Key topology fields belong to `StagePipelineConfig`:
 
 | Field | Description |
-| ------- | ------------- |
+|-------|-------------|
 | `model_stage` | Logical stage name (`ar_stage`, `decoder`, etc.). |
 | `execution_type` | Runtime family for this stage. |
 | `input_sources` | Upstream stage IDs that provide input. |
@@ -960,7 +960,7 @@ Common failures and fixes:
 | `check-forbidden-imports` | Stdlib `re`/`base64`, pickle, Hugging Face Hub API, or direct Triton/TileLang | `import regex as re` and `pybase64`; do not grow the allowlist without review |
 | `check-torch-cuda-call` | New `torch.cuda.*` call site | Use `current_omni_platform`; do not grow `ALLOWED_FILES` without review |
 | `check-tts-adapter-migration` | New `_tts_model_type` branch in `serving_speech.py` | Put logic in `tts_adapters/`; lower `MAX_MODEL_TYPE_BRANCHES` when removing branches |
-| `check-mark` | Test file missing level/hardware mark, or direct `pytest.mark.H100` | Add `core_model`/… plus `cpu`/`cuda`/`hardware_test(`; SKU marks only via helpers |
+| `check-test-ci-coverage` | Test file missing level or hardware mark | Add `core_model`/… plus `cpu`/`cuda`/`hardware_test(` |
 | `shellcheck` | Native `shellcheck` missing, or script warning | Install via apt/dnf/brew (or `shellcheck.exe` on Windows). See [Linting](../README.md#linting) |
 | `mypy-3.10` / `markdownlint-cli2` / `check-buildkite` | Types, docs markdown, or Buildkite YAML | See [Linting](../README.md#linting) |
 
@@ -991,13 +991,10 @@ git push origin your-branch --force-with-lease
 
 ## Adding a Model Recipe
 
-After implementing and testing your model, add a recipe under this repository's
-`recipes/` directory. Follow the
-[`add-recipe` skill](https://github.com/vllm-project/vllm-omni/blob/main/.claude/skills/add-recipe/SKILL.md)
-and [`recipes/TEMPLATE.md`](https://github.com/vllm-project/vllm-omni/blob/main/recipes/TEMPLATE.md),
-update the model row in
-[`recipes/README.md`](https://github.com/vllm-project/vllm-omni/blob/main/recipes/README.md),
-and synchronize the relevant TTS example and speech API documentation.
+After implementing and testing your model, add a model recipe to the
+[vllm-project/recipes](https://github.com/vllm-project/recipes) repository so users can
+get started quickly. See [Adding an Omni-Modality Model](./adding_omni_model.md#adding-a-model-recipe)
+for the expected format.
 
 ## Summary
 
@@ -1014,7 +1011,7 @@ Adding a TTS model to vLLM-Omni involves:
 8. **Online serving** - add all 5 integration points to `serving_speech.py` in one commit
 9. **Tests** - cover single request, batching, and streaming
 10. **Pre-commit + DCO** - run `pre-commit` before pushing; sign every commit with `git commit -s`
-11. **Model recipe** - add under the in-repository `recipes/` directory and update its index
+11. **Model recipe** - add to [vllm-project/recipes](https://github.com/vllm-project/recipes)
 12. **Invariants** - re-check I1–I5 (streaming contract, consumer hygiene, hot-loop discipline, validation pyramid, per-request state) at the end of every phase
 
 ### Qwen3-TTS Reference Files

docs/contributing/profiling.md

@@ -322,15 +322,6 @@ Each 1-second window records:
 
 On shutdown the server also logs a short summary (`loop_active_pct`, per-replica queue averages/maxima).
 
-`loop_idle` and `loop_active` count loop iterations, so their absolute scale is
-tied to which orchestration loop is running. Under the default poll loop an idle
-orchestrator records roughly one iteration per millisecond. Under the
-event-driven loop (`VLLM_OMNI_EVENT_DRIVEN_ORCH=1`, see
-[Speech API](../serving/speech_api.md#orchestration-loop-experimental)) an idle
-orchestrator wakes only once per 0.5 s reconcile timeout, while a busy one still
-records one iteration per routed output. Window counts and the `loop_active_pct`
-summary are therefore not comparable across the two modes.
-
 ### Relationship to other diagnostics
 
 This monitor is intentionally separate from the existing profiling tools:

docs/design/ar_diffusion_pipeline_capability.md

@@ -22,15 +22,11 @@ A pipeline opts in by implementing `SupportsARDiffusionPipeline`. Its immutable
 - named fixed-length cross-attention KV, model-specific scratch geometry, and
   the pipeline's requested session-capacity upper bound.
 
-The runner binds an `ARDiffusionKVState` only around one runner invocation
-(`execute_model` or `execute_stepwise`). The pipeline may use it during that
-context but must not retain it. Scratch and committed pages stay on the
-runner-owned session object, so unbinding does not drop an in-flight stepwise
-chunk. Tick-mode sessions survive subsequent requests with the same
-`session_id`. On the stepwise path the session id is the request id and is
-released when that request finishes or fails. Request reset, explicit close,
-LRU eviction, and forward exceptions all release runner-owned KV and call the
-pipeline's reset/close lifecycle hook. Cross-attention KV is allocated lazily
+The runner binds an `ARDiffusionKVState` only around one `forward()` call. The
+pipeline may use it during that context but must not retain it. The session
+survives subsequent requests with the same `session_id`. Request reset, explicit
+close, LRU eviction, and forward exceptions all release runner-owned KV and call
+the pipeline's reset/close lifecycle hook. Cross-attention KV is allocated lazily
 per session and logical KV branch, and is released on the same path. A pipeline
 publishes one named cache transactionally by yielding exactly one `(k, v)` pair
 per layer:
@@ -52,12 +48,11 @@ successful forward. The runner also exposes `reset_session()` and
 
 ## Current execution limits
 
-The experimental runner supports `max_num_seqs=1`. Request-batch execution is
-still rejected. Step execution is allowed only when the loaded pipeline
-implements `SupportsStepExecution`; other AR-Diffusion pipelines still fail at
-load if `step_execution=True`. Capable pipelines bind KV around each
-`execute_stepwise` invocation instead of inheriting the generic runner entry
-point unwrapped.
+The experimental runner supports request-mode execution with
+`max_num_seqs=1`. It rejects step execution and request-batch execution at load
+time, and its inherited batch/step entry points also fail explicitly. Supporting
+those paths requires a batch-aware state-binding contract rather than silently
+bypassing `bind_ar_diffusion_state()`.
 
 The implementation may retain multiple sessions per model instance. It selects
 the largest feasible capacity up to the pipeline's `session_capacity`, based on

docs/design/architecture_overview.md

@@ -323,24 +323,18 @@ inputs, fields, and ownership rules are described below.
 ```mermaid
 flowchart TB
     layer1["Layer 1 · Authoring inputs<br/>PipelineConfig + DeployConfig"]
-    layer2["Layer 2 · Production resolution boundary<br/>resolve_omni_config()<br/>(StageConfigFactory + VllmOmniConfig internally)"]
-    layer3["Layer 3 · Startup hand-off<br/>OmniConfigResolution<br/>PipelineConfig + temporary OmegaConf stage bridge"]
+    layer2["Layer 2 · Resolve once<br/>StageConfigFactory.create_from_model()<br/>VllmOmniConfig.from_pipeline_config()"]
+    layer3["Layer 3 · Transport-safe control plane<br/>VllmOmniConfig"]
     layer4["Layer 4 · Runtime launch planning<br/>StageRuntime"]
     layer5["Layer 5 · Engine materialization<br/>VllmConfig / OmniDiffusionConfig"]
 
     layer1 --> layer2 --> layer3 --> layer4 --> layer5
 ```
 
-The production resolution boundary is `resolve_omni_config()` in
+The single resolution boundary is implemented by
+`StageConfigFactory.create_from_model()` and
+`VllmOmniConfig.from_pipeline_config()` in
 [`vllm_omni/config`](https://github.com/vllm-project/vllm-omni/tree/main/vllm_omni/config).
-It delegates typed construction to `StageConfigFactory.create_from_model()` and
-`VllmOmniConfig.from_pipeline_config()`, then returns an
-`OmniConfigResolution` consumed by both `AsyncOmniEngine` and headless startup.
-Until `StageRuntime` consumes typed stage configs directly, this envelope carries
-the effective `PipelineConfig` alongside OmegaConf-compatible `stage_configs` as
-a temporary runtime bridge; both views describe the same resolved topology,
-including injected stages.
-
 The legacy `stage_args` YAML path has been removed. Model topology now resolves
 through `PipelineConfig`, with runtime overrides supplied by `DeployConfig`.
 
@@ -360,12 +354,9 @@ The important ownership rules are:
    deploy-time defaults; it does not redefine the model graph.
 3. CLI and Python overrides are applied at the resolution boundary, with
    per-stage overrides taking precedence over global values where supported.
-4. `OmniConfigResolution` is the sole startup hand-off. Its `pipeline_config`
-   and temporary `stage_configs` compatibility view must describe the same
-   topology.
-5. `StageRuntime` owns launch planning and replica lifecycle. `ReplicaInitPlan`
+4. `StageRuntime` owns launch planning and replica lifecycle. `ReplicaInitPlan`
    is runtime-private state, not a user configuration object.
-6. `VllmConfig` and the enriched `OmniDiffusionConfig` are materialized in the
+5. `VllmConfig` and the enriched `OmniDiffusionConfig` are materialized in the
    process that owns the corresponding engine.
 
 ## Main features
@@ -427,7 +418,7 @@ The public interfaces map onto the same engine and stage boundaries:
 flowchart LR
     offline["Offline Python<br/>Omni.generate()"] --> engine["AsyncOmniEngine"]
     online["OpenAI-compatible serving<br/>vllm serve ... --omni"] --> engine
-    duplex["Duplex WebSocket<br/>/v1/realtime?duplex=1 or /v1/duplex"] --> engine
+    duplex["Experimental duplex WebSocket<br/>/v1/duplex or realtime duplex"] --> engine
     engine --> stages["Configured AR and diffusion stages"]
     stages --> result["Streaming or final multimodal output"]
 ```

docs/design/feature/cfg_parallel.md

@@ -63,7 +63,7 @@ vLLM-omni provides `CFGParallelMixin` that encapsulates all CFG parallel logic.
 
 ### N-Branch CFG (3+ branches)
 
-Some models require more than 2 CFG branches. For example, Bagel and OmniGen2 use 3 branches.
+Some models require more than 2 CFG branches. For example, Bagel and OmniGen2 use 3 branches, DreamID Omni uses 4 branches.
 
 `predict_noise_with_multi_branch_cfg()` handles these by automatically dispatching N branches across M GPUs using round-robin (rule: branch `i` → rank `i % M`):
 

docs/design/feature/diffusion_continuous_batching.md

@@ -150,17 +150,8 @@ that do not belong in the shared contract should be stored in `state.extra`.
 Queueing and lifecycle metadata remain in the scheduler's request state.
 
 Current native pipelines that explicitly enable step execution include
-Qwen-Image, BAGEL, HunyuanImage3, and Helios. Step execution alone does not
-imply continuous-batching support: Qwen-Image accepts batched step states.
-BAGEL accepts batched step states for image generation with its default,
-think-mode, and single-stage deploy configs. Only the diffusion stage uses the
-step protocol in two-stage deployments; explicit single-stage text output
-retains complete-request execution. BAGEL requires at least two inference steps
-because it schedules `num_inference_steps - 1` denoising updates, and its step
-path does not currently support sequence parallelism or a diffusion cache
-backend. When a finished stepwise request is followed by an explicit text
-fallback wave, the runner retires its step state and paged diffusion-KV rows
-before the full forward dispatch.
+Qwen-Image, HunyuanImage3, and Helios. Step execution alone does not imply
+continuous-batching support: Qwen-Image accepts batched step states.
 HunyuanImage3 accepts batched step states only when its resolved self-attention
 backend is `TORCH_SDPA`; otherwise it rejects groups larger than one request.
 Configure `DIFFUSION_ATTENTION_BACKEND=TORCH_SDPA` or

docs/design/feature/host_weight_runtime.md

@@ -14,12 +14,12 @@ specified in the [Host Weight Runtime module design](../module/host_weight_runti
 
 ## Status
 
-The implementation provides contracts and a CPU local-filesystem store. The
-diffusion consumer additionally defines typed,
+The first implementation provides contracts and a CPU local-filesystem store.
+The initial diffusion consumer contract additionally defines typed,
 representation-independent final-layout identity/restoration mechanics plus a
-concrete BF16-with-preserved-FP32 policy for MiniMax H3 and
-`black-forest-labs/FLUX.2-klein-4B`. The opt-in no-AllGather DLO integration
-selects, publishes, restores, and transfers these artifacts.
+concrete BF16-with-preserved-FP32 policy for MiniMax H3. It remains
+library-only: no loader or DLO path selects, publishes, restores, or transports
+that artifact yet.
 
 V1 includes:
 
@@ -33,12 +33,13 @@ V1 includes:
 
 V1 does not include:
 
-- default-on activation or consumers outside no-AllGather DLO;
-- online FP8, quantized, merged-adaptation, or additional model producers;
-- HWR interaction with DLO AllGather;
+- a public CLI, loader activation, or default-on model integration;
+- lease handoff to DLO or another transport consumer;
+- FP8, quantized, merged-adaptation, or additional model producers;
+- CUDA registration, pinned staging, H2D scheduling, or GPU kernels;
 - a remote artifact provider or cross-node coordination;
 - automatic eviction; or
-- a change to DLO collective or execution behavior.
+- a change to DLO AllGather or no-AllGather behavior.
 
 ## Motivation and use cases
 
@@ -254,8 +255,7 @@ The contract is intentionally separate from loader activation:
 - `FinalLayoutBF16Producer` accepts only the matching identity context and a
   finalized CPU model. It is `POST_LOAD_ONLY` and `SINGLE_PROCESS` per exact TP
   coordinate. Its BF16 policy preserves model-declared FP32 parameters and
-  buffers, revalidates MiniMax H3 mixed-precision invariants, and revalidates
-  FLUX.2-klein's two block stacks, packed QKV mapping, and BF16 base layout.
+  buffers and revalidates MiniMax H3 mixed-precision invariants.
 
 Other representations reuse source identity, typed parallel identity, tensor
 ownership, and exact restoration only when their policy proves those semantics.

docs/design/feature/offloader/README.md

@@ -5,27 +5,23 @@ The three strategies have separate user and design pages:
 
 | Strategy | User guide | Design contract |
 | --- | --- | --- |
-| Model-level | [Guide](../../../user_guide/diffusion/offloader/module_offload.md) | [Design](module_offload.md) |
+| Model-level | [Guide](../../../user_guide/diffusion/offloader/cpu_offload.md) | [Design](cpu_offload.md) |
 | Layerwise | [Guide](../../../user_guide/diffusion/offloader/layerwise_offload.md) | [Design](layerwise_offload.md) |
 | Distributed layerwise | [Guide](../../../user_guide/diffusion/offloader/distributed_layerwise_offload.md) | [Design](distributed_layerwise_offload.md) |
 
 ## Strategy selection
 
 `OffloadConfig.from_od_config()` converts diffusion configuration into one
-`OffloadStrategy`. The public config separates component selection from
-policy:
+`OffloadStrategy`. If callers set multiple flags, selection is deterministic:
 
-- `mode="module"` selects model-level offload;
-- `mode="layer"` with rank-local transfers selects ordinary layerwise
-  offload; and
-- AllGather transfer or resident layers selects the distributed layerwise
-  backend that implements those capabilities.
+1. `DISTRIBUTED_LAYERWISE`;
+2. `LAYERWISE`;
+3. `MODEL_LEVEL`; and
+4. `NONE`.
 
-The compatibility boolean flags retain their historical priority (distributed
-layerwise, layerwise, then model-level). A compact config rejects a conflicting
-legacy strategy or non-default legacy DLO tuning. The factory derives parallel
-and HSDP state from `DiffusionParallelConfig`; callers do not provide a
-separate offload group size.
+The factory logs when a higher-priority strategy disables another. It derives
+parallel and HSDP state from `DiffusionParallelConfig`; callers do not provide
+a separate offload group size.
 
 `get_offload_backend()` then validates platform offload support, resolves the
 device, and creates exactly one backend. Returning `None` means offloading is
@@ -43,21 +39,11 @@ Every backend implements `OffloadBackend`:
 `disable()` does not promise to restore the pipeline's original device
 placement. The caller owns any subsequent rematerialization.
 
-An enable failure must remove every partially installed hook. Rank-local
-backends restore ordinary tensors so the pipeline can be retried. A failed
-multi-rank AllGather startup must not enter unmatched recovery collectives;
-that worker is safely discarded after local resource cleanup.
-
 Hooks are registered through `HookRegistry` and `ModelHook`; offload backends
 must use distinct hook names and remove only hooks they own.
 
 ## Discovery and topology
 
-`resolve_offload_plan(pipeline, config)` is the single topology entry point.
-Every backend calls it once when `enable()` starts and then consumes the
-resolved components, block stacks, resident heads, and staged-residency flags
-it returns. Backends do not re-read model declarations.
-
 Pipeline component discovery prefers `SupportsComponentDiscovery` declarations:
 
 - `_dit_modules`;
@@ -66,26 +52,16 @@ Pipeline component discovery prefers `SupportsComponentDiscovery` declarations:
 - `_resident_modules`.
 
 Dotted paths are supported. Legacy pipelines may use the fallback scan of
-well-known attribute names; it now warns once per pipeline class, and new
-integrations must declare components explicitly.
+well-known attribute names, but new integrations should declare components
+explicitly.
 
-Block topology comes from the pipeline `OffloadPlan` first: `block_attrs` maps
-each DiT path to its ordered block containers, `encoder_block_attrs` declares
-streamable encoder stacks, `on_demand_component_paths` marks pipeline-managed
-residency, `resident_dit_paths` marks the DiTs that may hold resident layers,
-and `encoder_dlo_weight_replication` marks the encoders whose loader-produced
-weights are safe for AllGather. DiTs absent from the plan fall back to
-`_layerwise_offload_blocks_attrs` (including the deprecated singular-name
-compatibility path).
-
-The resolver is pure: it moves no tensor, installs no hook, writes no module
-attribute, and reads no process group — multi-rank facts come from
-`OffloadConfig`. It owns topology validation, so a configuration the model
-cannot serve fails before the first component is placed. Explicit component
-selection turns every declaration problem into an error, while the
-compatibility topology (no component selector) keeps the historical
-warn-and-skip behavior. Metadata still describes structure only; the backend
-remains responsible for transfer, synchronization, and storage ownership.
+Ordinary layerwise offload obtains topology from declared
+`_layerwise_offload_blocks_attrs` (with a deprecated singular-name
+compatibility path). Distributed layerwise offload may instead use a pipeline
+`OffloadPlan`, then falls back to declared block attributes and its documented
+compatibility discovery. Discovery metadata describes structure only; the
+backend remains responsible for transfer, synchronization, and storage
+ownership.
 
 ## Cross-strategy invariants
 

docs/design/feature/offloader/cpu_offload.md

@@ -2,7 +2,7 @@
 
 Model-level offload enforces mutual exclusion between pipeline component
 groups. For commands and model support, see the
-[model-level user guide](../../../user_guide/diffusion/offloader/module_offload.md).
+[model-level user guide](../../../user_guide/diffusion/offloader/cpu_offload.md).
 
 ## Generic hook path
 
@@ -10,15 +10,10 @@ groups. For commands and model support, see the
 makes encoders and VAEs device resident for initialization, then installs
 `SequentialOffloadHook` instances:
 
-- each DiT hook offloads selected encoders and other selected DiTs before
-  loading itself;
-- each encoder hook offloads selected DiTs before loading itself; and
+- each DiT hook offloads all encoders and other DiTs before loading itself;
+- each encoder hook offloads every DiT before loading itself; and
 - VAEs are not part of the mutual-exclusion hook set.
 
-All execution-stage modules still receive a hook so an unselected resident
-stage can evict a selected component before it runs. Only components listed in
-`diffusion_offload_config.components` are eligible to move to CPU.
-
 The hook moves parameters and buffers without recursively calling
 `module.to()`. This avoids recursion through modules that retain references to
 other transformer blocks. Host tensors are pinned when configured; DTensors
@@ -41,9 +36,7 @@ contract:
 
 - only the executing component is device resident;
 - enable and disable are idempotent;
-- transfers use the supplied device, pinning, and HSDP settings;
-- explicit component selection is either honored or rejected before partial
-  setup; and
+- transfers use the supplied device, pinning, and HSDP settings; and
 - disabling removes all model-local offload hooks or contexts.
 
 The delegation is currently duck typed. If another independent implementation

docs/design/feature/offloader/distributed_layerwise_offload.md

@@ -1,11 +1,10 @@
 # Distributed Layerwise Offload
 
 This document describes distributed layerwise offload (DLO) for diffusion
-models. DLO keeps only a small number of selected DiT or text-encoder blocks
-on the accelerator and streams the remaining blocks from host memory. The
-distributed backend can either shard those host-side weights across an
-existing parallel group or keep complete rank-local block sources and avoid
-an additional collective.
+models. DLO keeps only a small number of DiT blocks on the accelerator and
+streams the remaining blocks from host memory. The distributed backend can
+either shard those host-side weights across an existing parallel group or keep
+complete rank-local block sources and avoid an additional collective.
 
 For user-facing commands, see the
 [distributed layerwise offloading guide](../../../user_guide/diffusion/offloader/distributed_layerwise_offload.md)
@@ -21,14 +20,12 @@ implemented but has less end-to-end coverage than the primary path.
 Legend: ✅ supported, ⚠️ compatibility path or limited validation, ❌ unsupported.
 
 | Feature | DLO + AllGather | DLO without AllGather |
-| --- | --- | --- |
+|---|---|---|
 | **DP** | ✅ Primary path; host weights are sharded across the DP group. | ✅ Each DP rank streams complete rank-local blocks. |
 | **SP** | ✅ When DP=1, DLO uses the SP group for weight sharding. | ✅ SP remains active without a DLO weight collective. |
 | **TP > 1** | ⚠️ Ordinary TP-aware loader only; no direct checkpoint mmap. | ⚠️ Ordinary TP-aware loader only; no direct checkpoint mmap. |
 | **HSDP** | ❌ Rejected to avoid double-sharding parameters. | ⚠️ Limited end-to-end coverage. |
 | **Per-tensor online FP8 linears** | ✅ Ordinary loader finalizes weights and scales before DLO sharding. | ✅ Ordinary loader retains complete rank-local tensors. |
-| **Online INT8 linears** | ✅ Ordinary loader finalizes the int8 weight (contiguous or transposed view) and fp32 scale before DLO sharding. | ✅ Ordinary loader retains complete rank-local tensors. |
-| **Online MXFP8 linears** | ✅ Ordinary loader finalizes the fp8 weight (contiguous) and e8m0 block scale (contiguous or transposed view) before DLO sharding. | ✅ Ordinary loader retains complete rank-local tensors. |
 | **Other online quantization methods** | ❌ Rejected until runtime packing and scale layouts are validated. | ⚠️ Allowed through the ordinary loader; validation is method-specific. |
 | **Model-level or standard layerwise CPU offload** | ❌ Disabled because DLO takes priority. | ❌ Disabled because DLO takes priority. |
 | **Resident leading layers** | ❌ Rejected. | ✅ Requires eligible resident paths in the model's `OffloadPlan`. |
@@ -39,11 +36,10 @@ detailed contracts and validation boundaries.
 
 ## Status
 
-DLO is implemented for multi-device diffusion execution. The default public
-transfer is `rank-local`; setting a selected component's
-`layer_options.NAME.weight_transfer` to `allgather` enables weight sharding across a
-compatible DP or SP group. Transfers are configured independently for `dit`
-and `text_encoder`.
+DLO is implemented for multi-device diffusion execution. The default
+AllGather path is the primary path for DP and SP deployments. The
+`--dlo-no-use-allgather` path streams complete blocks independently and adds no
+DLO weight collective.
 
 Host storage is selected separately from the transfer protocol. The loader can
 produce a direct-checkpoint mmap plan for a proven-compatible runtime layout;
@@ -111,7 +107,7 @@ checkpoint adapter beside the ordinary loader.
 
 ### AllGather path
 
-For a component configured with `weight_transfer="allgather"`, each rank stores approximately
+With the default `dlo_use_allgather=True`, each rank stores approximately
 `1 / group_size` of each streamable block in pinned host memory. The next
 block's shard is copied to a device buffer and reconstructed with
 `all_gather_into_tensor` on a communication stream while the current block is
@@ -134,8 +130,9 @@ source used to prepare each rank's persistent shard. They can be closed after
 shard preparation. Across the AllGather group, those private shards total
 approximately one runtime model copy.
 
-An effective DLO group size of one performs no collective; it follows the
-rank-local transfer path described below.
+An effective DLO group size of one performs no collective, even when
+`dlo_use_allgather=True`; it follows the rank-local transfer path described
+below.
 
 When DP is greater than one, the engine can process one request per DP rank in
 the same denoising wave. Because AllGather is a collective, all participating
@@ -143,10 +140,9 @@ requests must take the same execution path at every denoising step.
 
 ### Rank-local path without DLO AllGather
 
-With `weight_transfer="rank-local"`, DLO forces the affected component's internal
-offload shard size to one and streams complete blocks using H2D copies only.
-The host backing may be either a loader-approved checkpoint mapping or
-ordinary runtime tensors.
+With `--dlo-no-use-allgather`, DLO forces its internal offload shard size to
+one and streams complete blocks using H2D copies only. The host backing may be
+either a loader-approved checkpoint mapping or ordinary runtime tensors.
 
 For direct mmap, each process retains immutable safetensors views and uses two
 bounded pinned host staging slots. Processes on the same node that map the same
@@ -173,242 +169,10 @@ This mode means:
   copy per rank.
 - The scheduler does not require a synchronized DP request wave for DLO.
 
-### Component allocator-cache retention
-
-MiniMax-H3 DLO keeps one bounded PyTorch allocator cache across its staged
-encoder, DiT, and VAE component boundaries so allocations released by one
-component can be reused by the next. The DiT prefetch path and its two shared
-device buffers are unchanged.
-
-After a component is offloaded, cached-but-unallocated memory is retained only
-while it is at most 25% of device capacity and at least 5% of device capacity
-remains physically free. Crossing either bound releases the allocator cache.
-Missing allocator telemetry also releases it conservatively. Component or
-staging failure forces a release, and an out-of-memory allocation gets one
-retry after release. This is a component-local policy rather than a global
-`empty_cache` override, so the executor's unconditional shutdown cleanup is
-preserved.
-
-Retaining allocator blocks trades higher reserved and peak device memory for
-lower lifecycle latency. The benefit is device- and workload-dependent, and a
-smaller or externally loaded device may cross a bound and return to the
-ordinary per-component cache-release behavior. Current performance validation
-covers MiniMax-H3 no-AllGather DLO on CUDA. Other MiniMax-H3 DLO transfer
-topologies and platforms receive the same bounded policy but are not claimed
-performance targets; other DLO models remain unchanged unless they explicitly
-adopt it.
-
-### Final-layout Host Weight Runtime consumer
-
-> **Status:** PR2 landed in
-> [PR #6486](https://github.com/vllm-project/vllm-omni/pull/6486). PR3 adds
-> registered direct H2D plus generic HWR publication/source-digest
-> optimizations without changing AllGather behavior.
-
-Final-layout Host Weight Runtime (HWR) backing is opt-in and currently applies
-only to a selected rank-local DiT. Enable it with
-`--host-weight-runtime-mode preferred` (or `required`) and
-`--host-weight-runtime-root <node-local-root>`.
-
-The modes express operator fallback policy, not different artifact formats:
-
-- `preferred` consumes an exact hit, but on a miss it allows canonical loading
-  followed by post-load publication. It is the normal population path.
-- `required` consumes the same exact artifact but fails startup on a miss or
-  unusable artifact. It never invokes canonical DiT fallback or post-load
-  publication and therefore cannot populate an empty store.
-
-PR2 has no separate prewarm command. Operators populate one matching producer
-cohort per node-local storage domain in `preferred` mode, then restart the same
-model revision and parallel layout with `required`. TP coordinates have distinct
-identities, while equivalent DP replicas share them.
-
-The current producer/consumer boundary is the model-declared final-layout BF16
-contract (MiniMax H3 and `black-forest-labs/FLUX.2-klein-4B`). The FLUX.2-klein
-contract covers both transformer block stacks, constructor-stable packed QKV
-mapping state, BF16 parameters, and any persistent loader-owned `beta`/`eps`
-buffers. The shared HWR machinery supports ordinary-loader final layouts for
-TP1 and TP2 rank identities plus SP layout identities. FLUX.2-klein evidence
-in this change is TP1-only; its TP2/SP layouts rely on the existing
-per-coordinate identity mechanics and remain unmeasured. Online quantization,
-HSDP, LoRA/adapted weights, and non-default load formats remain ineligible.
-HWR mode
-`disabled`, DLO-disabled, and DLO AllGather configurations stop before source
-identity or store construction and retain the existing checkpoint-mmap or
-ordinary-loader path.
-
-Eligibility is decided before constructing HWR, resolving canonical sources,
-hashing identity inputs, probing a filesystem, or emitting an HWR observer
-event:
-
-```text
-DLO disabled / HWR disabled / DLO AllGather
-  -> zero final-layout HWR interaction
-  -> preserve current checkpoint-mmap or ordinary-loader behavior
-```
-
-When final-layout HWR is explicitly enabled for no-AllGather DLO, runtime
-outcomes are authoritative:
-
-- `LOCAL_HIT`: plan and commit an exact restoration, then transfer the lease
-  transactionally to DLO.
-- `CANONICAL_FALLBACK`: bypass checkpoint mmap, canonically materialize and
-  finalize the DiT, then call `publish_after_load()` for a future startup. The
-  current startup retains its canonical tensors.
-- `FAILED`: fail startup. Preferred mode does not reinterpret nonretryable
-  identity, configuration, or compatibility failures as misses.
-- Required mode cannot bootstrap an empty store through a `POST_LOAD_ONLY`
-  producer.
-
-Checkpoint mmap remains an unchanged control path whenever final-layout HWR is
-not selected.
-
-Local source identity and publication avoid repeated full-payload passes while
-preserving the same semantic contract:
-
-- Canonical files without a trusted immutable Hub blob identity are hashed in
-  parallel. Their content IDs are cached per storage domain under the HWR root
-  and reused only when the path, inode, size, timestamps, symlink target, and
-  cache-record checksum still match. Corrupt entries are rebuilt; cache-lock or
-  cache-I/O failure falls back to hashing the canonical file directly.
-- Producers that emit payload bytes in canonical storage-key order may declare
-  `ordered=True`. The filesystem writer then computes file and tensor SHA256
-  values during the write and overlaps payload `fsync` with later producer
-  work. Producers without that guarantee retain unordered writes and use a
-  parallel readback checksum fallback.
-- Manifest and `READY` publication still wait for every payload `fsync` and
-  checksum to complete. These optimizations do not weaken artifact validation
-  or change lease ownership.
-
-#### Registered mmap transport
-
-After DLO takes an HWR lease, the no-AllGather backend may register the lease's
-complete immutable mapped ranges under the existing `pin_cpu_memory` policy.
-Registration is transport state: it does not change artifact identity, the
-store, tensor ownership, or H2D payload. On success, each tensor view copies
-directly into the existing rotating HBM block buffers and the two private host
-staging slots are not allocated.
-
-`--dlo-host-registration-limit-gib` is an optional per-worker preflight ceiling
-over page-aligned registered bytes. Zero adds no ceiling. A disabled pinned
-memory policy, unsupported platform/capability, over-budget mapping, or fully
-rolled-back registration error selects the existing two-slot staging path. A
-partial registration that cannot be rolled back aborts startup because closing
-the lease would unmap memory still owned by the platform.
-
-Direct checkpoint mmap remains unchanged and continues to use staging. It may
-require loader-owned per-block transforms, while the HWR artifact already
-contains final runtime bytes. DLO AllGather never receives an HWR final-layout
-lease and therefore never enters this registration path.
-
-#### Pre-service transaction boundary
-
-The startup transaction does not end at restore commit. A lease-backed model is
-disposable until backend setup and initial prefetch complete:
-
-```text
-UNRESOLVED
-  -> LEASE_OWNED_BY_LOADER
-  -> RESTORE_PLANNED
-  -> COMMIT_STARTED
-  -> CARRIER_OWNED
-  -> BACKEND_OWNED
-  -> BACKEND_READY
-  -> IN_SERVICE
-```
-
-Failure before `COMMIT_STARTED` closes the loader-owned lease. Preferred mode
-may canonically load using the untouched skeleton; required mode fails.
-
-Failure from `COMMIT_STARTED` through `BACKEND_READY` must:
-
-1. synchronize or otherwise quiesce partial backend and initial-prefetch work;
-2. release hook, staging, restore-plan, and model references;
-3. close the lease through its current owner;
-4. discard the restored model; and
-5. in preferred mode, construct a fresh canonical model while bypassing HWR
-   lookup, HWR publication, and checkpoint mmap for that recovery attempt.
-
-Required mode fails instead of constructing the fresh fallback. Once the model
-enters service, failures follow normal runtime handling rather than startup
-fallback.
-
-#### Finalization phases
-
-Cold canonical loading separates byte-changing work from shared runtime-state
-finalization:
-
-```text
-Cold-only byte-changing:
-  casting, reordering, packing, quantization, generated scales,
-  model-specific weight transforms, and calibration that mutates
-  parameters or persistent buffers
-
-Shared cold/warm non-byte:
-  validation, hook installation, eval state, bookkeeping,
-  and non-persistent runtime state
-```
-
-The warm path must snapshot restored tensor bytes and backing pointers before
-shared finalization and prove both are unchanged afterward.
-
-#### Lease ownership
-
-Lease transfer is single-owner and single-take:
-
-```text
-loader owns
-  -> restore plan borrows
-  -> commit succeeds
-  -> runner carrier takes once
-  -> backend takes once before asynchronous work
-  -> backend drains pending H2D work
-  -> backend releases hooks, staging, and model references
-  -> backend unregisters every mapped range
-  -> backend closes lease
-```
-
-The runner carrier is process-local, rejects serialization, and rejects a
-duplicate `take()`. If the carrier still owns the lease, runner cleanup closes
-it. Once the backend takes ownership, only backend abort or teardown may drain
-work and close it.
-
-The implementation keeps the final-layout lease through backend setup and
-initial prefetch. Successful registration copies directly from immutable HWR
-views; otherwise the backend uses the existing two bounded rank-local staging
-slots. Transactional cleanup drains device work, removes source references,
-unregisters mappings, and only then closes the lease. An unregistration failure
-retains both registration and lease for retry/process teardown. Preferred mode
-then uses the runner's fresh canonical retry; required mode propagates the
-failure.
-
-#### PR2 and PR3 promotion gates
-
-- Warm hit performs zero ordinary DiT materialization and zero producer calls.
-- Shared warm finalization changes neither restored bytes nor backing pointers.
-- Preferred `FAILED` outcomes do not silently fall back.
-- Planning failure leaves the skeleton untouched.
-- Any pre-service failure after commit begins discards the restored model;
-  preferred mode uses a fresh canonical model and required mode fails.
-- Mixed components load normally and no required tensor remains on `meta`.
-- Disabled mode and AllGather emit zero final-layout HWR interaction.
-- The lease carrier rejects duplicate take and serialization.
-- Backend setup or prefetch failure drains asynchronous work before lease close.
-- Registration is all-or-nothing; rollback/unregistration failure never closes
-  a mapping still owned by the platform.
-- Registered HWR transport bypasses host staging while preserving output and
-  H2D payload; unsupported registration retains the bounded staging path.
-- Compatible checkpoint mmap remains an unchanged benchmark and control path.
-- Prewarm uses one matching producer cohort per TP/SP topology and storage
-  domain.
-- Benchmarks compare ordinary loading, cold publication, and warm staging with
-  output parity, startup latency, aggregate PSS, page-cache state, HBM, and H2D
-  payload.
-
 ## Parallelism compatibility
 
 | Parallelism | DLO + AllGather | DLO without AllGather |
-| --- | --- | --- |
+|---|---|---|
 | **DP** | Supported primary path. DLO shards host weights across the DP group and can run DP multi-concurrency. | Supported rank-local path. Compatible TP1 replicas can share checkpoint pages on each node; fallback runtime tensors remain private. |
 | **SP** | Supported in the implementation. With DP=1, DLO uses the SP group for host-weight sharding; SP still shards sequence/activation work. | SP remains active, but DLO keeps standard-loader rank-local weights and adds no SP weight collective. |
 | **TP > 1** | Outside the Phase A shared-mmap support scope. The loader falls back before mutation, preserves TP-local layouts, and DLO may apply DP/SP host sharding to those ordinary runtime tensors. | Outside the Phase A shared-mmap support scope. The ordinary TP-aware loader produces rank-local tensors, which DLO streams without an additional weight collective; DP replicas retain private runtime storage. |
@@ -421,11 +185,10 @@ failure.
   the SP group becomes DLO's sharding group in AllGather mode.
 - **DP + TP/SP without AllGather:** standard model loading defines the
   rank-local tensor layout. DLO adds no cross-DP, cross-TP, or cross-SP weight
-  collective. When the model declares the final-layout contract, HWR keys the
-  reusable artifact by TP rank/size and SP layout.
+  collective.
 - **HSDP + SP:** the general parallel configuration permits HSDP over SP, but
-  each selected component must use `weight_transfer="rank-local"`. HSDP remains
-  responsible for weight materialization and synchronization.
+  DLO must use `--dlo-no-use-allgather`. HSDP remains responsible for weight
+  materialization and synchronization.
 - **HSDP + DP or TP:** rejected independently by the diffusion parallel
   configuration.
 
@@ -442,23 +205,16 @@ requirements.
 
 Direct checkpoint mmap can back either transfer path. It is currently limited
 to proven TP1, non-HSDP, non-online-quantized layouts. Other layouts use the
-ordinary loader. Per-tensor online FP8, online INT8, and online MXFP8 linears
-can use DLO AllGather after the ordinary loader finalizes their runtime
-weights and scales; DLO then shards and reconstructs those tensors with their
-recorded layouts (they all keep plain 1-byte dtypes over ordinary strided
-views: online INT8 has an int8 weight plus fp32 scale, online MXFP8 has an
-fp8 weight plus e8m0 block scale, each with a contiguous or transposed-view
-finalized tensor, all covered by the same physical-order packing as online
-FP8). Other online methods must set
-`layer_options.dit.weight_transfer="rank-local"` or disable online quantization
-until their runtime layouts are validated.
+ordinary loader. Per-tensor online FP8 linears can use DLO AllGather after the
+ordinary loader finalizes their runtime weights and scales; DLO then shards and
+reconstructs those tensors with their recorded layouts. Other online methods
+must use `--dlo-no-use-allgather` or disable online quantization until their
+runtime layouts are validated.
 
-The Host Weight Runtime representation, publication, and no-AllGather consumer
-contracts are merged; see
-[RFC #6414](https://github.com/vllm-project/vllm-omni/issues/6414),
-[PR #6445](https://github.com/vllm-project/vllm-omni/pull/6445), and
-[PR #6486](https://github.com/vllm-project/vllm-omni/pull/6486). Registered
-direct H2D is an optional transport layer over that merged lease contract.
+A normalized runtime mmap cache, built through the ordinary loader, is the
+proposed general mechanism for sharing transformed TP or quantized layouts.
+That cache and its publication/lifecycle protocol are intentionally outside
+this phase; see [RFC #6195](https://github.com/vllm-project/vllm-omni/issues/6195).
 
 ## Validation coverage
 
@@ -468,19 +224,13 @@ Current source-level validation includes:
 - HSDP + DLO without AllGather acceptance at configuration level;
 - loader preflight fallback for TP, HSDP, online quantization, unknown custom
   loaders, missing keys, and shape/dtype mismatches;
-- ordinary-loader fallback for per-tensor online FP8, online INT8, and online
-  MXFP8 linears followed by DLO sharding of finalized weights and scales;
+- ordinary-loader fallback for per-tensor online FP8 linears followed by DLO
+  sharding of finalized weights and scales;
 - exact loader-to-backend plan transfer and ordinary-loader fallback;
-- ordered publication hashing, overlapped durability, unordered parallel
-  checksum fallback, and node-local source-digest reuse/invalidation;
 - rank-local mmap source retention, bounded two-slot staging, and adapter
   transforms without parameter-side flags;
-- read-only registration preflight, direct source-to-device copies, safe
-  fallback, partial rollback, retryable unregistration, and lease ordering;
 - resident-layer requests requiring no-AllGather;
 - DP request-wave validation for denoising-step compatibility;
-- bounded component allocator-cache retention, conservative/forced release,
-  OOM retry, and immutable encoder non-block staging;
 - sharding, double-buffer, AllGather-size, and heterogeneous-block regression
   tests.
 
@@ -493,7 +243,7 @@ VAEs at TP1. They validate the ordinary-loader fallback only, not direct mmap
 or shared-mmap host-memory savings.
 
 | Configuration | Result | Warm E2E | Peak device memory | Host PSS |
-| --- | ---: | ---: | ---: | ---: |
+|---|---:|---:|---:|---:|
 | DP4xTP1 AllGather | Passed, 4 concurrent requests | 2.87 s / 4 requests | 13.84 GiB | 211.99 GiB |
 | DP4xTP1 no-AllGather | Passed, 1 request | 15.02 s | 13.23 GiB | 187.77 GiB |
 | DP2xTP2 AllGather | Passed, 2 concurrent requests | 4.16 s / 2 requests | 12.50 GiB | 211.97 GiB |
@@ -525,7 +275,7 @@ pipeline components, so each worker should be compared with the same worker in
 the other storage mode.
 
 | Worker | Ordinary RSS | mmap RSS | Ordinary PSS | mmap PSS | PSS reduction |
-| --- | ---: | ---: | ---: | ---: | ---: |
+|---|---:|---:|---:|---:|---:|
 | DP worker 0 | 168.27 GiB | 132.76 GiB | 167.84 GiB | 101.43 GiB | 66.40 GiB |
 | DP worker 1 | 116.19 GiB | 79.97 GiB | 115.73 GiB | 48.64 GiB | 67.09 GiB |
 | **Two-worker total** | — | — | **283.56 GiB** | **150.08 GiB** | **133.48 GiB (47.1%)** |

docs/design/feature/offloader/layerwise_offload.md

@@ -36,14 +36,12 @@ dependencies, not incidental global synchronization, define correctness.
 ## Topology contract
 
 A DiT declares ordered block-container attributes using
-`_layerwise_offload_blocks_attrs` or an `OffloadPlan`. A text encoder declares
-its block-list paths through `OffloadPlan.encoder_block_attrs`. Each resolved
-item must be an executable `nn.Module`; ordering must match forward execution.
-Multiple containers are streamed as separate hook rings.
+`_layerwise_offload_blocks_attrs` or an `OffloadPlan`. Each resolved item must
+be an executable `nn.Module`; ordering must match forward execution. Multiple
+containers are concatenated in execution order.
 
-Non-block state of a selected DiT or text encoder remains device resident.
-Unselected components, VAEs, and declared resident modules are not streamed by
-this backend.
+Non-block DiT modules, encoders, VAEs, and declared resident modules are not
+streamed by this backend.
 
 ## Invariants and limitations
 
@@ -52,8 +50,7 @@ this backend.
 - Blocks with heterogeneous shapes and dtypes use their recorded metadata;
   implementations must not assume identical blocks.
 - The ring is initialized before the first forward so block zero is available.
-- This backend uses rank-local host weights. Multi-device compute may remain
-  active, but cross-rank weight reconstruction belongs to
+- This backend is single-device; distributed weight reconstruction belongs to
   [Distributed Layerwise Offload](distributed_layerwise_offload.md).
 
 Shared selection and lifecycle behavior is defined in the

docs/design/feature/preprocess_phase_contract.md

@@ -1,172 +0,0 @@
-# Runner-to-model prefill/decode phase contract
-
-## Overview
-
-Autoregressive models with a custom `preprocess` hook need to distinguish
-prompt processing from decoding. A one-token span can be either a complete
-one-token prompt, the last chunk of a longer prompt, or a decode step. Using
-span length as the phase signal can replace a prompt embedding with a generated
-audio embedding and advance teacher-forced text too early without an exception.
-
-[Issue #4382](https://github.com/vllm-project/vllm-omni/issues/4382) requests a
-stable contract for the metadata and routing guards introduced by
-[PR #3662](https://github.com/vllm-project/vllm-omni/pull/3662).
-The shared runner already implements those guards. This design documents the
-existing interface and adds runner-level regression coverage rather than
-introducing a second phase detector or changing scheduling policy.
-
-## Scope and objectives
-
-- Make the three existing phase keys safe to depend on in out-of-tree models.
-- Preserve prompt embeddings and model state on a one-token prefill tail.
-- Keep normal and batched decode routing consistent in mixed batches.
-- Explain the correctness workaround required on older releases.
-
-This contract does not enable chunked prefill for models whose other state
-handling does not support it. It does not change the scheduler, introduce new
-kwargs, or standardize other `_omni_*` fields. The implementation adds
-documentation and regression coverage; no hot-path allocation is added.
-
-## Design
-
-### Ownership and data flow
-
-```text
-Scheduler / current input batch
-  prompt_token_ids + num_computed_tokens_cpu (before this step)
-                         |
-            OmniGPUModelRunner._preprocess
-                         |
-            per-request phase metadata
-                  /                 \
-       prefill / other spans     single-token decode
-          preprocess             preprocess or preprocess_decode_batch
-              |                              |
-       prompt embedding              runner-managed talker_mtp
-                  \                 /
-                    model forward
-```
-
-The producer is `OmniGPUModelRunner._preprocess` in
-`vllm_omni/worker/gpu_model_runner.py`. `GPUARModelRunner` and
-`GPUGenerationModelRunner` inherit it. The current `OmniNPUModelRunner` also
-inherits this method; device-specific execution still needs its own hardware
-validation. A plugin runner that overrides preprocessing is responsible for
-preserving this interface.
-
-### Stable model-facing fields
-
-The following names, types, and meanings are a supported interface for in-tree
-and out-of-tree model hooks despite the leading underscore. Models should treat
-them as read-only runner-owned values. Changes to their meanings or removal
-require an explicit compatibility/migration plan.
-
-| Key | Python type | Meaning |
-| --- | --- | --- |
-| `_omni_prompt_len` | `int` | Length of the current request state's `prompt_token_ids`. This is the stage's prompt length, not the current chunk size or raw text length. |
-| `_omni_num_computed_tokens` | `int` | The row's `input_batch.num_computed_tokens_cpu` value **before** processing the scheduled span. It includes already-computed/cached progress, not just tokens computed in the current call. |
-| `_omni_is_prefill` | `bool` | Exactly `_omni_num_computed_tokens < _omni_prompt_len`. Equality and greater progress mean decode. |
-
-The runner refreshes the fields after current request state has been gathered,
-immediately before selecting the per-row hook. Existing values in intermediate
-model state cannot override the current phase. Row indices follow the current
-input batch (including any reordering), not request arrival order. A resumed
-or streaming request is classified from its **current** prompt/progress values;
-the phase is not latched for the lifetime of the request.
-
-The normal hook receives these fields as keyword arguments:
-
-```python
-def preprocess(self, input_ids, input_embeds, **info):
-    if info["_omni_is_prefill"]:
-        offset = info["_omni_num_computed_tokens"]
-        # Select the scheduled slice of the model's prompt embeddings.
-        ...
-    else:
-        # Advance decode-only text/audio state.
-        ...
-```
-
-For `preprocess_decode_batch(input_ids=..., req_infos=...)`, each `req_infos`
-entry contains the same fields, aligned with its corresponding input row.
-Every such row has `_omni_is_prefill == False`. The optional earlier
-`preprocess_batch` hook is a separate whole-batch preparation hook; these freshly
-computed per-row fields are not promised at that earlier boundary.
-
-### Routing guarantee
-
-With `has_preprocess=True`, the batched decode hook is eligible only when it is
-callable, the runner has `talker_mtp`, the scheduled span is one token, and
-`_omni_is_prefill` is false. Otherwise the normal `preprocess` hook runs.
-
-Runner-managed MTP is likewise restricted to single-token decode rows. A prefill
-row, including a one-token tail, is never added to that MTP batch: the runner
-does not consume its `mtp_inputs`, generate codes for it, or overwrite its
-preprocessed embedding with an MTP embedding. Decode rows in the same step
-continue to receive their MTP outputs at their own token offsets. Models may
-still implement their own model-specific work inside `preprocess`.
-
-| Prompt length | Computed before step | Scheduled span | Phase | Runner MTP eligible |
-| --- | --- | --- | --- | --- |
-| 5 | 0 | 4 | Prefill | No |
-| 5 | 4 | 1 | Prefill tail | No |
-| 5 | 5 | 1 | Decode | Yes |
-| 5 | 6 | 1 | Decode | Yes |
-| 1 | 0 | 1 | Prefill | No |
-| 5 | 5 | 2 | Decode | No (not a single-token span) |
-
-### Compatibility
-
-!!! warning "vLLM-Omni 0.20.x and earlier"
-    AR talker models with custom preprocessing that infer phase from span length
-    must use `enable_chunked_prefill: false` for correctness on these releases.
-    They lack the phase metadata and the runner's prefill-tail MTP protection.
-    A model-only heuristic cannot prevent the older runner from overwriting a
-    one-token prompt embedding. Disabling chunking avoids split tails; it does
-    not make span length a reliable phase detector for every possible prompt.
-
-The mechanism landed in #3662 (v0.21.0rc2 / v0.22.0 and later); this document
-formalizes that existing behavior. Prefer upgrading the matching vLLM and
-vLLM-Omni release pair and consuming the explicit phase keys. Do not silently
-fall back to `input_ids.numel() > 1` when the model requires chunking correctness.
-For a custom or backported runtime, verify both metadata and MTP guards.
-
-## Correctness and testing plan
-
-Runner tests call the production `_preprocess` and `_talker_mtp_forward` methods
-with CPU buffers and a deterministic MTP model. They inspect kwargs at the model
-boundary, resulting embeddings, and per-request generated codes. Coverage must
-include a multi-step prompt split with a one-token tail followed by decode,
-mixed prefill/decode batches in different orders, normal/batched decode hooks,
-adjacent decode requests in the same hook call with exact per-request codes,
-single-token prompts, cached progress, and decode spans longer than one token.
-No test should pass merely because MTP was disabled for every row.
-
-Real-weight validation uses Qwen3-TTS CustomVoice through the full talker and
-code2wav pipeline. Record the actual scheduled prompt progress, assert that at
-least one one-token prefill tail was observed, check its hook metadata and MTP
-exclusion, and require finite non-empty output audio. Compare to an unchunked
-run with the same real input, greedy sampling, and `VLLM_BATCH_INVARIANT=1`.
-Greedy sampling alone does not guarantee identical codes across different
-prefill shapes: floating-point reduction differences can change an argmax and
-diverge in subsequent autoregressive steps. Invariant kernels keep this exact
-comparison focused on the phase contract. The two engines must be initialized
-separately because their chunking settings and token budgets differ. GPU tests belong under
-`tests/e2e/features/`; existing model tests remain useful adjacent regression
-coverage. Functional audio checks do not establish throughput or all-model
-semantic parity; this change makes no performance claim.
-
-## Open questions and discussions
-
-There are no new field names or execution modes to choose. Future runner
-implementations, including Model Runner V2, should preserve these semantics or
-provide an explicit migration path. Hardware validation beyond the tested
-platform remains separate from the shared Python routing tests.
-
-## References
-
-- [Issue #4382](https://github.com/vllm-project/vllm-omni/issues/4382)
-- [Original metadata and guards, #3662](https://github.com/vllm-project/vllm-omni/pull/3662)
-- [Qwen2.5-Omni consumer fix, #5019](https://github.com/vllm-project/vllm-omni/pull/5019)
-- [Adding an Omni model](../../contributing/model/adding_omni_model.md)
-- [Test writing guide](../../contributing/ci/test_writing_guide.md)

docs/design/feature/quantization.md

@@ -84,8 +84,8 @@ dictionary narrows this global scope through runtime layer-prefix routing.
 
 The factory uses Omni-specific overrides for methods whose diffusion behavior
 or platform dispatch is not provided by the vLLM registry. The current override
-set includes INT8, BitsAndBytes, MXFP8, MXFP4, MXFP4 dual-scale, INC/AutoRound,
-and TorchAO. Other methods, such as FP8, GGUF, and ModelOpt, are resolved through
+set includes INT8, BitsAndBytes, MXFP8, MXFP4, MXFP4 dual-scale, and INC/
+AutoRound. Other methods, such as FP8, GGUF, and ModelOpt, are resolved through
 vLLM's registry when their configuration is compatible.
 
 ## Per-component routing

docs/design/feature/skip_softmax.md

@@ -1,197 +1,90 @@
 # Skip-Softmax
 
-Skip-Softmax is the sparse-attention mode of the `TRTLLM_ATTN` backend. It implements
-[BLASST](https://arxiv.org/abs/2512.12087) (Dynamic BLocked Attention Sparsity via Softmax
-Thresholding), which adds a per-tile skip test to the FlashAttention main loop. This page describes the algorithm, how the user configuration is resolved
-into the value the kernel consumes, and how checkpoint calibration and timestep gating participate
-in that resolution. Configuration keys and operating-point guidance are covered in
-[TRTLLM Attention](../../user_guide/diffusion/attention_backends/trtllm.md#skip-softmax); the
-backend selection contract is covered in
-[Diffusion Attention Backend Selection](attention_backend_selection.md).
+Skip-Softmax is the sparse-attention mode of the `TRTLLM_ATTN` backend. Usage — the config keys
+and how to pick an operating point — is in
+[TRTLLM Attention](../../user_guide/diffusion/attention_backends/trtllm.md#skip-softmax).
+The shared selector contract is documented in
+[Diffusion Attention Backend Selection](attention_backend_selection.md). This
+page explains the algorithm.
 
 ## Motivation
 
 In a long attention row (a video DiT can have tens of thousands of keys), the softmax weight
 concentrates on a small fraction of the keys; the rest receive near-zero weight and barely move the
 output. Computing softmax and the value-weighted sum over those keys is wasted work. Skip-Softmax
-detects, per tile of keys, when a tile cannot matter and skips its softmax and its value multiply.
+detects, per block of keys, when a block cannot matter and skips its softmax and its value
+multiply.
 
-It is approximate: a skipped tile still carries a small non-zero contribution, so the mode is
+It is approximate: a skipped block still carries a small non-zero contribution, so the mode is
 opt-in and off by default.
 
-## Algorithm
+## The online-softmax pass
 
-![The BLASST algorithm: FlashAttention with a per-tile skip test on the local maximum](../figures/skip_softmax/blasst_algorithm.jpg)
-
-FlashAttention computes attention in a single streaming pass over KV tiles. Per query row the
+Attention is computed in a single streaming pass over the keys, in tiles of 128. Per query row the
 kernel maintains three running values:
 
 - `m` — the largest score seen so far,
 - `l` — the running denominator `Σ exp(sⱼ − m)`,
 - `O` — the running numerator `Σ exp(sⱼ − m)·vⱼ`,
 
-and returns `O / l` at the end. For each KV tile it computes the scores `QK_j^T`, updates `m`, and
-accumulates the tile's contribution into `l` and `O`. Rescaling `l` and `O` when `m` grows keeps the
-dense pass numerically exact.
+and returns `O / l` at the end. For each key tile it computes the tile's scores `Q · K_jᵀ · scale`,
+updates `m`, and accumulates that tile's contribution into `l` and `O`. Rescaling `l` and `O` when
+`m` grows keeps the single pass numerically exact.
 
-A tile is a block of query rows against a block of keys, and the kernel processes it as a unit.
-BLASST inserts one test between computing a tile's scores and accumulating them. For each query
-row `i` in the tile, let `tile_max[i]` be the row's largest score within the tile, `running_max[i]`
-the row's running maximum, and `λ` the effective threshold:
+## The skip test
+
+Once a tile's scores are known, its largest score `tile_max` is compared against the running
+maximum:
 
 ```text
-if all(exp(tile_max[i] - running_max[i]) < λ for every row i in the tile):
-    skip this tile          # do not compute its Softmax or PV contribution
+if exp(tile_max − running_max) < threshold:
+    skip this tile          # do not compute its softmax weights or its P·V accumulation
 ```
 
-`exp(tile_max[i] − running_max[i])` is an upper bound on the softmax weight any key in the tile can
-receive in row `i`: if even the row's best key in this tile is far below the row's current maximum,
-the tile is unimportant for that row. Only when this holds for every row in the tile can the
-Softmax and `PV` work for the tile be skipped, in which case its contribution to `l` and `O` is
-simply omitted. A larger `λ` makes the test more aggressive. The figure states the same test in
-log space, `m̃ − m < ln(λ)`, which is how the kernel evaluates it.
+`exp(tile_max − running_max)` is an upper bound on the softmax weight any key in the tile can
+receive: if even the tile's best key is far below the current maximum, every key in the tile is
+negligible, and both the softmax (the exponentials) and the `P·V` accumulation for that tile can be
+dropped. The tile's contribution to `l` and `O` is simply skipped.
 
-The test needs the tile's scores, so `QK_j^T` always runs and only the Softmax and `PV` work can
-be skipped. Since the two matmuls have the same FLOP count, skipping every eligible tile removes at
-most roughly half of the attention arithmetic, and the kernel-level speedup stays well under 2×.
+## What this bounds
 
-## From configuration to the kernel threshold
+Two properties of the test shape the achievable speedup:
 
-The FlashInfer kernel does not take `λ` directly. It takes a `threshold_scale_factor` and divides
-it by the KV sequence length of the call:
+- **`Q · K_jᵀ` always runs.** The test needs `tile_max`, which comes from the tile's scores, so the
+  score matmul is never skipped — only the softmax and the `P·V` accumulation are. The score matmul
+  and the value matmul are comparable in cost, so skipping every eligible tile removes at most
+  roughly half the attention work; the kernel-level speedup is bounded well under 2×, not unbounded.
+
+- **The decision is per tile, not per key.** A tile is skipped only when *all* of its keys are
+  collectively negligible; a single important key keeps the whole tile. How many tiles actually
+  qualify depends on the data and rounds down to tile granularity, so `target_sparsity` selects an
+  operating point on a calibrated curve — it is not a promise that a fixed fraction of tiles is
+  skipped.
+
+## The threshold
+
+The per-tile threshold is normalized by sequence length:
 
 ```text
-λ = threshold_scale_factor / max_kv_len
+threshold = factor / seqlen
 ```
 
-vLLM-Omni resolves the factor from one of two mutually exclusive user controls:
+`factor` comes from one of two sources:
 
-| Control | Factor passed to the kernel | Resulting `λ` |
-| --- | --- | --- |
-| `threshold` | `threshold * max_kv_len` | `threshold` |
-| `target_sparsity=s` | `a * exp(b * s)` | `a * exp(b * s) / max_kv_len` |
-
-`threshold` is therefore `λ` itself and is independent of sequence length: the same value yields
-the same per-tile test at any resolution or frame count. `threshold=0` skips no tiles. Because the
-left-hand side of the skip test lies in `(0, 1]`, values in `(0, 1)` are the meaningful range; the
-schema accepts any finite non-negative value.
-
-`target_sparsity` selects a point on a curve fitted per model by
-[NVIDIA ModelOpt](https://github.com/NVIDIA/Model-Optimizer/tree/main/examples/diffusers/sparsity),
-so that `s` lands near that fraction of skipped tiles on the calibration data. The coefficients
-`a` and `b` come from the checkpoint; the achieved sparsity on another prompt, shape, or layer can
-differ.
-
-### Skip-Softmax calibration config
-
-ModelOpt stores the calibration in each transformer component's `config.json` under
-`sparse_attention_config`. The following is taken from the `transformer/config.json` of
-[`nvidia/Wan2.2-T2V-A14B-Diffusers-FP8`](https://huggingface.co/nvidia/Wan2.2-T2V-A14B-Diffusers-FP8),
-with the `ignore` list abridged:
-
-```json
-{
-  "sparse_attention_config": {
-    "config_groups": {
-      "group_0": {
-        "algorithm": "skip_softmax",
-        "targets": ["WanAttention"],
-        "ignore": ["blocks.0.attn1", "blocks.0.attn2", "blocks.1.attn1", "..."],
-        "threshold_scale_factor": {
-          "formula": "a * exp(b * target_sparsity)",
-          "coefficients": {"a": 2822.6209952221557, "b": 4.388250623520793}
-        },
-        "target_sparsity": 0.7,
-        "disabled_until_timestep": 0.93
-      }
-    }
-  }
-}
-```
-
-A checkpoint with several transformer components carries one such config per component, each
-with its own coefficients; in this example, `transformer_2/config.json` holds the low-noise
-expert's curve.
-
-vLLM-Omni consumes `formula`, `coefficients`, and `ignore`, and ignores `targets`,
-`target_sparsity`, and `disabled_until_timestep`:
-
-- Only the formula `a * exp(b * target_sparsity)` is accepted; a checkpoint with any other formula
-  is rejected at startup. If a spec requests `target_sparsity` and the checkpoint carries no
-  calibration, startup fails and the error points to `threshold` as the calibration-free
-  alternative.
-- Each component's curve is applied to that component's attention layers. If the config for a
-  secondary component such as `transformer_2` cannot be read, that component stays dense and a
-  warning is logged.
-- `ignore` holds fnmatch patterns matched against both the full module name and the name relative
-  to the component, so `blocks.0.attn1` matches `transformer.blocks.0.attn1` as well as
-  `transformer_2.blocks.0.attn1`. Matching layers receive no coefficients and therefore stay dense
-  regardless of the user configuration.
-
-At each attention call, a layer with a `threshold` uses it directly; a layer with
-`target_sparsity` and stamped coefficients evaluates the curve; a layer with `target_sparsity` but
-no coefficients runs dense. The timestep gate below is applied to the result before it reaches the
-kernel.
+- **Calibrated** — `factor = a · exp(b · target_sparsity)`, where `a` and `b` are fit per model (and
+  per expert, for a multi-expert model) so that a given `target_sparsity` lands near that fraction of
+  skipped tiles on the calibration data.
+- **Direct** — `factor = skip_softmax.threshold · seqlen`, the calibration-free path; the user sets
+  the threshold themselves.
 
 ## Timestep gating
 
-The early, high-noise denoising steps set the global structure of the output, and their errors
-propagate through every later step. Keeping just these steps dense markedly improves the quality
-of the generated video at a small cost in skipped work. `disabled_until_timestep` implements this:
-on each attention call the backend compares the current normalized timestep `t` against the
-configured cutoff and passes no skip factor to the kernel while `t` is above it. Skip-Softmax
-becomes active on the first step whose `t` is at or below the cutoff and stays active for the rest
-of the run, since `t` only decreases.
+`disabled_until_timestep = D` keeps the mode off during the early, high-noise denoise steps and
+turns it on once the normalized timestep `t` drops to `t ≤ D` (`t` runs `1.0` → `0.0` over the
+schedule). The early steps set the global structure of the output and their errors propagate through
+every later step, so keeping them dense costs a few skipped-tile opportunities but protects fidelity.
 
-The default `disabled_until_timestep = 0` is a sentinel rather than a cutoff: the gate is off, the
-timestep is never read, and Skip-Softmax runs on every step. Any positive value enables the gate.
-`disabled_until_timestep = 1.0` therefore also yields no dense steps on a pipeline that publishes
-`t`, but on a pipeline that does not publish it the backend stays dense and logs a warning once
-rather than guessing from the step index.
-
-### Where `t` comes from
-
-The pipeline publishes `t` once per denoising step before running the transformer. It is the
-scheduler's own position in `[0, 1]`, decreasing from near `1.0` (pure noise) to `0.0` (clean
-sample): scheduler-based pipelines publish the scheduler timestep divided by `num_train_timesteps`,
-and rectified-flow pipelines publish the current sigma. `t` is deliberately not the step index
-divided by the step count. Schedulers place their steps non-uniformly in `t`, so expressing the
-cutoff in `t` ties it to the same noise level across step counts and schedulers.
-
-### Mapping the cutoff to denoising steps
-
-For a run whose published sequence is `t[0], ..., t[N-1]`, the number of dense steps is
-
-```text
-dense_steps = count(t[i] > disabled_until_timestep)
-skip_softmax_steps = N - dense_steps
-```
-
-This count **depends on the schedule**, and schedules differ from model to model: the
-scheduler family, the number of steps, and any time shift all change where the steps land in `t`.
-The same cutoff can therefore gate a very different fraction of the run on two models. Take
-MiniMax-H3 as an example. Its video branch uses a flow-shifted rectified-flow schedule that applies
-a shift `s` to `N + 1` uniform positions `u` from `1` to `0`,
-
-```text
-t = s * u / (1 + (s - 1) * u)
-```
-
-and a large `s` pushes most positions toward `t ≈ 1`. With the default `s = 12` and
-`num_inference_steps = 50` (50 sigma points, `N = 49` denoiser forwards), the published sequence
-starts `1.000, 0.998, 0.996, 0.995, 0.993, ...` and stays above `0.9` for 28 steps, giving:
-
-| `disabled_until_timestep` | Dense steps | Skip-Softmax steps |
-| :---: | ---: | ---: |
-| `1.00` | 0 | 49 |
-| `0.99` | 6 | 43 |
-| `0.97` | 14 | 35 |
-| `0.95` | 19 | 30 |
-| `0.90` | 28 | 21 |
-| `0.86` | 33 | 16 |
-
-These numbers hold only for that schedule. A model with a smaller shift, a different step count,
-or a scheduler that is not rectified flow produces a different sequence and a different table; a
-request that overrides `flow_shift` or the step count changes it for MiniMax-H3 too.
-Choose the cutoff by counting against the schedule actually served, not by reusing a value from
-another model.
+`t` is the scheduler's own timestep divided by `num_train_timesteps`, published by the pipeline via
+`DenoiseProgressMixin.record_denoise_step`. It is deliberately not derived from the step index,
+because schedulers space their steps non-uniformly. A pipeline that does not publish a timestep
+stays dense when `disabled_until_timestep` is set.

docs/design/feature/vae_parallel.md

@@ -22,60 +22,59 @@ We use **Qwen-Image** as the reference implementation for decode parallel, and *
 
 **VAE Patch Parallelism** is an acceleration technique for both **encoding** and **decoding**. Instead of processing the entire tensor at once, the tensor is:
 
-- Split into multiple spatial tiles
++ Split into multiple spatial tiles
 
-- Distributed across multiple ranks
++ Distributed across multiple ranks
 
-- Encoded/Decoded in parallel
++ Encoded/Decoded in parallel
 
-- Merged to reconstruct the final output
++ Merged to reconstruct the final output
 
 This approach:
 
-- Distributes computation across multiple devices
++ Distributes computation across multiple devices
 
-- Reduces peak memory usage per device
++ Reduces peak memory usage per device
 
-- Accelerates encoding/decoding latency
++ Accelerates encoding/decoding latency
 
 ### When to Use Encode vs Decode Parallel
 
-| Operation           | Use Case                     | Example                           |
-| ------------------- | ---------------------------- | --------------------------------- |
-| **Decode Parallel** | Text-to-Image, Text-to-Video | Latent → Image/Video              |
-| **Encode Parallel** | Image-to-Video (I2V)         | Image → Latent (for conditioning) |
+| Operation | Use Case | Example |
+|-----------|----------|---------|
+| **Decode Parallel** | Text-to-Image, Text-to-Video | Latent → Image/Video |
+| **Encode Parallel** | Image-to-Video (I2V) | Image → Latent (for conditioning) |
 
 ### Architecture
-
 We introduce **DistributedVaeExecutor** as the core component responsible for distributed VAE encoding/decoding.
 
 The executor is model-agnostic and accepts three function parameters:
 
-- split – Partition the latent into tiles
++ split – Partition the latent into tiles
 
-- exec – Decode a single tile
++ exec – Decode a single tile
 
-- merge – Combine decoded tiles into the final output
++ merge – Combine decoded tiles into the final output
 
 #### Execution Flow
 
-- Call split(z) to generate a list of TileTask and a GridSpec
++ Call split(z) to generate a list of TileTask and a GridSpec
 
-- Dispatch tasks across ranks using workload-based balancing
++ Dispatch tasks across ranks using workload-based balancing
 
-- Each rank executes exec(task) on its assigned tiles
++ Each rank executes exec(task) on its assigned tiles
 
-- Gather decoded tile results to rank 0
++ Gather decoded tile results to rank 0
 
-- Rank 0 performs merge(...)
++ Rank 0 performs merge(...)
 
-- (Optional) Broadcast final result to all ranks
++ (Optional) Broadcast final result to all ranks
 
 This design separates:
 
-- Distributed execution logic
++ Distributed execution logic
 
-- Model-specific tiling and merging logic
++ Model-specific tiling and merging logic
 
 #### Why split / exec / merge is necessary?
 
@@ -83,23 +82,23 @@ The latent tensor cannot be arbitrarily partitioned.
 
 During decoding:
 
-- Each output pixel may depend on neighboring pixels
++ Each output pixel may depend on neighboring pixels
 
-- The receptive field is model-dependent
++ The receptive field is model-dependent
 
 Therefore:
 
-- Tiles must include overlap
++ Tiles must include overlap
 
-- Merge must perform blending to avoid seams
++ Merge must perform blending to avoid seams
 
 ## Step-by-Step Implementation (Decode)
 
 ### Step 1: Implement DistributedAutoencoderKLQwenImage
-
 `QwenImagePipeline` use `AutoencoderKLQwenImage` for vae, so implement a distributed version:
 
-```python
+
+```
 class DistributedAutoencoderKLQwenImage(AutoencoderKLQwenImage, DistributedVaeMixin):
     @classmethod
     def from_pretrained(cls, *args: Any, **kwargs: Any):
@@ -107,35 +106,28 @@ class DistributedAutoencoderKLQwenImage(AutoencoderKLQwenImage, DistributedVaeMi
         model.init_distributed()
         return model
 ```
-
 **Key points**:
-
-- Inherit both AutoencoderKLQwenImage and DistributedVaeMixin
-- Call init_distributed() after loading weights
++ Inherit both AutoencoderKLQwenImage and DistributedVaeMixin
++ Call init_distributed() after loading weights
 
 ### Step 2: Implement split/exec/merge
-
 Reuse `AutoencoderKLQwenImage.tiled_decode` logic and divide it into three stages. And we need return tiles with `GridSpec` and `TileTask`:
-
-```python
+```
 class GridSpec:
     split_dims: tuple[int, ...]  # Tensor dimensions being split (e.g., (2, 3) for (B, C, H, W))
     grid_shape: tuple[int, ...]  # Tile grid layout (num_rows, num_cols)
     tile_spec: dict = field(default_factory=dict) # Metadata required for merging
     output_dtype: torch.dtype | None = None # Final output dtype
 ```
-
-```python
+```
 class TileTask:
     tile_id: int # task id
     grid_coord: tuple[int, ...]  # Tile position in grid
     tensor: torch.Tensor | list[torch.Tensor]  # The tile tensor
     workload: int | float = 1 # Used for load balancing (e.g., tile area)
 ```
-
 And tiled base split/exec/merge as follow:
-
-```python
+```
 def tile_split(self, z: torch.Tensor) -> tuple[list[TileTask], GridSpec]:
     # mostly copy from AutoencoderKL
     _, _, num_frames, height, width = z.shape
@@ -218,14 +210,11 @@ def tile_merge(self, coord_tensor_map: dict[tuple[int, ...], torch.Tensor], grid
 ```
 
 ### Step 3: Override tiled_decode
-
 We need to override tiled_decode, the main logic is:
-
-- check distributed is enabled
-- select split/exec/merge
-- Invoke self.distributed_executor.execute to decode
-
-```python
++ check distributed is enabled
++ select split/exec/merge
++ Invoke self.distributed_executor.execute to decode
+```
 def tiled_decode(self, z: torch.Tensor, return_dict: bool = True):
     if not self.is_distributed_enabled():
         return super().tiled_decode(z, return_dict=return_dict)
@@ -241,14 +230,11 @@ def tiled_decode(self, z: torch.Tensor, return_dict: bool = True):
 
     return DecoderOutput(sample=result)
 ```
-
 `broadcast_result` is set to True or False depending on the model; when enabled, the result will be used even on ranks other than 0.
 
 ### Step 4: Modify Pipeline
-
 Change vae model from AutoencoderKLQwenImage to DistributedAutoencoderKLQwenImage
-
-```diff
+```
 class YourModelPipeline(nn.Module):
     def __init__(
         self,
@@ -273,8 +259,8 @@ For models that require VAE encoding (e.g., Image-to-Video), you can also parall
 
 Similar to decode, split the input tensor into tiles. Key considerations:
 
-- **Patchify handling**: If the model uses `patch_size`, scale tile parameters accordingly
-- **Temporal chunking**: Video VAEs may have temporal compression (e.g., 4x)
++ **Patchify handling**: If the model uses `patch_size`, scale tile parameters accordingly
++ **Temporal chunking**: Video VAEs may have temporal compression (e.g., 4x)
 
 ```python
 def encode_tile_split(self, x: torch.Tensor) -> tuple[list[TileTask], GridSpec]:
@@ -420,28 +406,23 @@ def tiled_encode(self, x: torch.Tensor) -> torch.Tensor:
 **Key differences from decode parallel:**
 
 | Aspect | Decode Parallel | Encode Parallel |
-| -------- | ----------------- | ----------------- |
+|--------|-----------------|-----------------|
 | `broadcast_result` | Often `False` (only rank 0 needs output) | `True` (all ranks need latents for diffusion) |
 | Patchify | Applied in merge (unpatchify) | Handled by parent `_encode()` before `tiled_encode()` |
 | Temporal chunking | Frame-by-frame | Chunk-based (e.g., 1 + 4n frames) |
 
 ## Testing
-
 Verify numerical consistency between:
++ vae_patch_parallel_size = 1
 
-- vae_patch_parallel_size = 1
-- vae_patch_parallel_size = N
++ vae_patch_parallel_size = N
 
 Example:
-
-```python
 torch.allclose(output_1, output_n, atol=1e-5)
-```
 
 Testing requirements:
-
-- Fix random seed
-- Use identical tiling strategy
++ Fix random seed
++ Use identical tiling strategy
 
 ```python
 m = Omni(
@@ -453,7 +434,6 @@ m = Omni(
         ),
     )
 ```
-
 When vae_patch_parallel_size is larger than the DiT world size, it will automatically fall back to using the DiT world size instead.
 
 ## Reference Implementations
@@ -461,7 +441,7 @@ When vae_patch_parallel_size is larger than the DiT world size, it will automati
 Complete examples in the codebase:
 
 | Model | Path | Decode Parallel | Encode Parallel |
-| ------- | ------ | ----------------- | ----------------- |
+|-------|------|-----------------|-----------------|
 | **Z-Image** | `vllm_omni/diffusion/distributed/autoencoders/autoencoder_kl.py` | ✅ | ❌ |
 | **Wan2.2** | `vllm_omni/diffusion/distributed/autoencoders/autoencoder_kl_wan.py` | ✅ | ✅ |
 | **Qwen-Image** | `vllm_omni/diffusion/distributed/autoencoders/autoencoder_kl_qwenimage.py` | ✅ | ❌ |
@@ -476,7 +456,7 @@ The tile-parallel executor above assigns independent spatial **tiles** to ranks.
 ### How it differs from tile parallel
 
 | Aspect | Tile parallel (`"tile"`) | Spatially-sharded (`"spatial_shard_height"`/`"spatial_shard_width"`) |
-| -------- | -------------------------- | ----------------------------------------------- |
+|--------|--------------------------|-----------------------------------------------|
 | Unit of work | Independent overlapping tiles | A single global feature map sharded along H or W |
 | Cross-rank communication | Gather tiles to rank 0, stitch + blend | Per-conv **halo exchange** of boundary rows/cols (P2P) |
 | Output assembly | Blend overlapping tiles | All-gather shards on rank 0, trim padding (matches `broadcast_result=False`) |
@@ -501,7 +481,7 @@ serve.py (--vae-parallel-mode) / OmniEngineArgs
 ### Notes
 
 - The decoder is patched **in place** the first time spatial-shard decode runs and is bound to a single split dimension for the lifetime of the VAE instance.
-- Numerical correctness vs. single-GPU decode is covered by `tests/diffusion/distributed/test_wan_spatial_shard.py::test_spatial_shard_decode_matches_reference` (multi-GPU, nightly `full_model` + `cards_2`).
+- Numerical correctness vs. single-GPU decode is covered by `tests/diffusion/distributed/test_wan_spatial_shard.py::test_spatial_shard_decode_matches_reference` (multi-GPU, nightly `full_model` + `distributed_cuda`).
 
 ---
 

docs/design/figures/magi2/dlo-pareto-1-step.svg

@@ -1,59 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="760" height="460" viewBox="0 0 760 460" role="img" aria-labelledby="title desc">
-  <title id="title">MAGI-2 DLO one-step Pareto frontier</title>
-  <desc id="desc">Warm user latency in seconds versus throughput per device. DP1SP4 is 5.735 seconds and 0.0436 outputs per second per device, DP2SP2 is 6.785 and 0.0737, and DP4 is 9.997 and 0.1000.</desc>
-  <rect width="760" height="460" fill="#ffffff"/>
-  <style>
-    text { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; fill: #111827; }
-    .title { font-size: 20px; font-weight: 600; }
-    .axis-label { font-size: 14px; font-weight: 500; }
-    .tick { font-size: 12px; fill: #4b5563; }
-    .point-label { font-size: 13px; font-weight: 600; }
-    .value-label { font-size: 11px; fill: #4b5563; }
-    .grid { stroke: #e5e7eb; stroke-width: 1; }
-    .axis { stroke: #6b7280; stroke-width: 1.5; }
-    .frontier { fill: none; stroke: #2563eb; stroke-width: 3; }
-    .point { fill: #2563eb; stroke: #ffffff; stroke-width: 2; }
-  </style>
-
-  <text x="380" y="28" text-anchor="middle" class="title">One diffusion step</text>
-
-  <g aria-hidden="true">
-    <line x1="85" y1="309" x2="700" y2="309" class="grid"/>
-    <line x1="85" y1="226" x2="700" y2="226" class="grid"/>
-    <line x1="85" y1="143" x2="700" y2="143" class="grid"/>
-    <line x1="85" y1="61" x2="700" y2="61" class="grid"/>
-    <line x1="85" y1="40" x2="85" y2="350" class="axis"/>
-    <line x1="85" y1="350" x2="700" y2="350" class="axis"/>
-
-    <text x="73" y="313" text-anchor="end" class="tick">0.04</text>
-    <text x="73" y="230" text-anchor="end" class="tick">0.06</text>
-    <text x="73" y="147" text-anchor="end" class="tick">0.08</text>
-    <text x="73" y="65" text-anchor="end" class="tick">0.10</text>
-
-    <text x="85" y="370" text-anchor="middle" class="tick">5</text>
-    <text x="197" y="370" text-anchor="middle" class="tick">6</text>
-    <text x="309" y="370" text-anchor="middle" class="tick">7</text>
-    <text x="421" y="370" text-anchor="middle" class="tick">8</text>
-    <text x="532" y="370" text-anchor="middle" class="tick">9</text>
-    <text x="644" y="370" text-anchor="middle" class="tick">10</text>
-  </g>
-
-  <text x="392" y="414" text-anchor="middle" class="axis-label">Warm user latency (seconds) — lower is better</text>
-  <text x="20" y="195" transform="rotate(-90 20 195)" text-anchor="middle" class="axis-label">Throughput/device (outputs/s) — higher is better</text>
-
-  <polyline points="167,294 285,169 644,61" class="frontier"/>
-
-  <circle cx="167" cy="294" r="7" class="point"/>
-  <text x="179" y="288" class="point-label">DP1SP4</text>
-  <text x="179" y="305" class="value-label">5.735 s, 0.0436</text>
-
-  <circle cx="285" cy="169" r="7" class="point"/>
-  <text x="297" y="163" class="point-label">DP2SP2</text>
-  <text x="297" y="180" class="value-label">6.785 s, 0.0737</text>
-
-  <circle cx="644" cy="61" r="7" class="point"/>
-  <text x="632" y="84" text-anchor="end" class="point-label">DP4</text>
-  <text x="632" y="101" text-anchor="end" class="value-label">9.997 s, 0.1000</text>
-
-  <text x="700" y="444" text-anchor="end" class="tick">4x NVIDIA L20X · warm qualification run</text>
-</svg>

docs/design/figures/magi2/dlo-pareto-4-step.svg

@@ -1,65 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="760" height="460" viewBox="0 0 760 460" role="img" aria-labelledby="title desc">
-  <title id="title">MAGI-2 DLO four-step Pareto frontier</title>
-  <desc id="desc">Warm user latency in seconds versus throughput per device. DP1SP4 is 8.647 seconds and 0.0289 outputs per second per device, DP2SP2 is 11.682 and 0.0428, and DP4 is 20.957 and 0.0477.</desc>
-  <rect width="760" height="460" fill="#ffffff"/>
-  <style>
-    text { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; fill: #111827; }
-    .title { font-size: 20px; font-weight: 600; }
-    .axis-label { font-size: 14px; font-weight: 500; }
-    .tick { font-size: 12px; fill: #4b5563; }
-    .point-label { font-size: 13px; font-weight: 600; }
-    .value-label { font-size: 11px; fill: #4b5563; }
-    .grid { stroke: #e5e7eb; stroke-width: 1; }
-    .axis { stroke: #6b7280; stroke-width: 1.5; }
-    .frontier { fill: none; stroke: #2563eb; stroke-width: 3; }
-    .point { fill: #2563eb; stroke: #ffffff; stroke-width: 2; }
-  </style>
-
-  <text x="380" y="28" text-anchor="middle" class="title">Four diffusion steps</text>
-
-  <g aria-hidden="true">
-    <line x1="85" y1="350" x2="700" y2="350" class="grid"/>
-    <line x1="85" y1="288" x2="700" y2="288" class="grid"/>
-    <line x1="85" y1="226" x2="700" y2="226" class="grid"/>
-    <line x1="85" y1="164" x2="700" y2="164" class="grid"/>
-    <line x1="85" y1="102" x2="700" y2="102" class="grid"/>
-    <line x1="85" y1="40" x2="700" y2="40" class="grid"/>
-    <line x1="85" y1="40" x2="85" y2="350" class="axis"/>
-    <line x1="85" y1="350" x2="700" y2="350" class="axis"/>
-
-    <text x="73" y="354" text-anchor="end" class="tick">0.025</text>
-    <text x="73" y="292" text-anchor="end" class="tick">0.030</text>
-    <text x="73" y="230" text-anchor="end" class="tick">0.035</text>
-    <text x="73" y="168" text-anchor="end" class="tick">0.040</text>
-    <text x="73" y="106" text-anchor="end" class="tick">0.045</text>
-    <text x="73" y="44" text-anchor="end" class="tick">0.050</text>
-
-    <text x="85" y="370" text-anchor="middle" class="tick">8</text>
-    <text x="173" y="370" text-anchor="middle" class="tick">10</text>
-    <text x="261" y="370" text-anchor="middle" class="tick">12</text>
-    <text x="349" y="370" text-anchor="middle" class="tick">14</text>
-    <text x="436" y="370" text-anchor="middle" class="tick">16</text>
-    <text x="524" y="370" text-anchor="middle" class="tick">18</text>
-    <text x="612" y="370" text-anchor="middle" class="tick">20</text>
-    <text x="700" y="370" text-anchor="middle" class="tick">22</text>
-  </g>
-
-  <text x="392" y="414" text-anchor="middle" class="axis-label">Warm user latency (seconds) — lower is better</text>
-  <text x="20" y="195" transform="rotate(-90 20 195)" text-anchor="middle" class="axis-label">Throughput/device (outputs/s) — higher is better</text>
-
-  <polyline points="113,302 247,129 654,69" class="frontier"/>
-
-  <circle cx="113" cy="302" r="7" class="point"/>
-  <text x="125" y="296" class="point-label">DP1SP4</text>
-  <text x="125" y="313" class="value-label">8.647 s, 0.0289</text>
-
-  <circle cx="247" cy="129" r="7" class="point"/>
-  <text x="259" y="123" class="point-label">DP2SP2</text>
-  <text x="259" y="140" class="value-label">11.682 s, 0.0428</text>
-
-  <circle cx="654" cy="69" r="7" class="point"/>
-  <text x="642" y="92" text-anchor="end" class="point-label">DP4</text>
-  <text x="642" y="109" text-anchor="end" class="value-label">20.957 s, 0.0477</text>
-
-  <text x="700" y="444" text-anchor="end" class="tick">4x NVIDIA L20X · warm qualification run</text>
-</svg>

docs/design/index.md

@@ -17,14 +17,11 @@ implementation contract; it is not, by itself, a general support claim.
 
 ### Runtime and stage execution
 
-- [Full-Duplex Runtime (MiniCPM-o 4.5)](fullduplex.md)
-- [Full-Duplex Runtime (PersonaPlex)](fullduplex-personaplex.md)
 - [Disaggregated Inference](feature/disaggregated_inference.md)
 - [Host Weight Runtime](feature/host_weight_runtime.md)
 - [Async Chunk](feature/async_chunk.md)
 - [Async Diffusion Output](feature/async_diffusion_output.md)
 - [Async Omni Output Materialization](feature/omni_async_output_materialization.md)
-- [Runner-to-model Prefill/Decode Phase Contract](feature/preprocess_phase_contract.md)
 - [Automatic Prefix Caching in Omni Models](feature/prefix_caching.md)
 - [Realtime AR-Diffusion Sessions](feature/realtime_ar_diffusion.md)
 
@@ -67,7 +64,7 @@ The design contracts separate selection mechanics from backend algorithms:
 #### CPU offloading
 
 - [Overview and Shared Contracts](feature/offloader/README.md)
-- [Model-Level Offload](feature/offloader/module_offload.md)
+- [Model-Level Offload](feature/offloader/cpu_offload.md)
 - [Layerwise Offload](feature/offloader/layerwise_offload.md)
 - [Distributed Layerwise Offload](feature/offloader/distributed_layerwise_offload.md)
 

docs/design/metrics.md

@@ -6,7 +6,7 @@ This document describes how vLLM-Omni exposes Prometheus metrics for multi-stage
 
 - Expose pipeline-level request and latency metrics that span the full multi-stage execution (orchestrator scope).
 - Preserve all upstream vLLM per-engine metrics (`vllm:*`) for stages backed by an AR LLM engine, and reshape their `engine` label into `stage` + `replica` so multi-replica deployments gain per-replica visibility automatically.
-- Expose per-modality SLO metrics that the upstream `vllm:*` families do not capture — audio TTFP / RTF / duration / frames / streaming continuity / silent-loss, plus image and diffusion workload, queueing, execution, and memory signals.
+- Expose per-modality SLO metrics that the upstream `vllm:*` families do not capture — audio TTFP / RTF / duration / frames / streaming continuity / silent-loss.
 - Expose per-replica-edge cross-stage transfer metrics so the slack between E2E latency and the sum of per-stage `gen_time` (queueing, serialization, network) becomes attributable.
 - Keep the metrics collection overhead low enough that it does not regress TTFA or throughput.
 
@@ -20,7 +20,7 @@ vLLM's `unregister_vllm_metrics()` function strips every `prometheus_client` col
 
 ### The Problem
 
-vLLM-Omni runs multiple engine instances (stages × replicas) within a single process, coordinated by an Orchestrator. The pipeline needs its own metrics — aggregate request counts, end-to-end latency across all stages, per-modality SLO signals, and cross-stage transfer attribution — that do not exist in upstream vLLM. All pipeline-level metrics use the `vllm_omni:` prefix to distinguish them from upstream per-engine metrics. At import time (see `vllm_omni/patch.py`) we replace `unregister_vllm_metrics()` with a scoped version that still strips upstream `vllm:*` collectors before each new `PrometheusStatLogger` registers (so multi-engine processes don't crash on duplicate registration), but preserves anything prefixed `vllm_omni:` / `vllm_omni`.
+vLLM-Omni runs multiple engine instances (stages × replicas) within a single process, coordinated by an Orchestrator. The pipeline needs its own metrics — aggregate request counts, end-to-end latency across all stages, per-modality SLO signals, and cross-stage transfer attribution — that do not exist in upstream vLLM. All pipeline-level metrics use the `vllm:omni_` prefix to distinguish them from upstream per-engine metrics. At import time (see `vllm_omni/patch.py`) we replace `unregister_vllm_metrics()` with a scoped version that still strips upstream `vllm:*` collectors before each new `PrometheusStatLogger` registers (so multi-engine processes don't crash on duplicate registration), but preserves anything prefixed `vllm:omni_` / `vllm_omni`.
 
 Upstream per-engine metrics retain the `vllm:` prefix but are now registered by `OmniPrometheusStatLogger`, a thin subclass of upstream's `PrometheusStatLogger` that reshapes the single `engine` label into a `stage` + `replica` pair (see "OmniPrometheusStatLogger wrap" below).
 
@@ -38,7 +38,7 @@ Upstream per-engine metrics retain the `vllm:` prefix but are now registered by
                                    |
         +--------+--------+--------+--------+--------+
         |                                            |
-   vllm_omni:*                                    vllm:*
+   vllm:omni_*                                    vllm:*
    collectors                                  collectors
         |                                            |
    +----+--------+   +-----------+   +----------+   +-----------+
@@ -58,30 +58,17 @@ Upstream per-engine metrics retain the `vllm:` prefix but are now registered by
 
 ### Data Flow
 
-There are five independent paths for metric collection.
+There are four independent paths for metric collection.
 
-**Path 1: Pipeline-level metrics (`vllm_omni:*`)**
+**Path 1: Pipeline-level metrics (`vllm:omni_*`)**
 
 `OmniPrometheusMetrics` registers the Gauge / Counter / Histogram collectors at import time. It is instantiated once per entrypoint, labeled with the model name. The entrypoint calls its methods as requests progress:
 
 - `set_running(n)` / `set_waiting(n)` — updated after each request completes. The running count comes from `OmniRequestCounter`, a simple counter incremented/decremented by the Orchestrator as it tracks requests. Waiting is derived as `total - running`.
-- `request_succeeded(e2e_seconds, finished_reason="stop")` — recorded when a request finishes at the final stage. `finished_reason` is extracted from `engine_outputs.outputs[0].finish_reason` (vLLM `CompletionOutput` convention) and increments `vllm_omni:requests_success_total{finished_reason}`.
-- `request_failed()` — recorded by the cleanup path when a request exits without natural completion. Internally maps to `finished_reason="abort"` on the existing completion Counter.
-- `inc_requests_failed(reason)` — increments the dedicated failure-attribution Counter once per request. Reasons are normalized to the bounded set `client_abort`, `client_disconnect`, `stage_error`, and `unknown`.
+- `request_succeeded(e2e_seconds, finished_reason="stop")` — recorded when a request finishes at the final stage. `finished_reason` is extracted from `engine_outputs.outputs[0].finish_reason` (vLLM `CompletionOutput` convention) and increments `vllm:omni_requests_success_total{finished_reason}`.
+- `request_failed()` — recorded by the cleanup path when a request exits without natural completion. Internally maps to `finished_reason="abort"` so a single Counter family covers both natural and aborted completion.
 
-**Path 2: Image and diffusion metrics**
-
-Image and diffusion metrics use two cooperating collectors. `OmniPrometheusMetrics` owns pipeline/stage workload families, while `OmniModalityMetrics` owns per-replica diffusion breakdowns. Finished stage messages are consumed once in `OmniBase._process_single_result`, which prevents replayed terminal messages from incrementing Counters or Histograms twice.
-
-- `stage_gen_time_s`, `stage_in_queue_s`, image workload, inference-step, and per-stage peak-memory values are emitted from `StageRequestStats` when a stage finishes. `image_pixels` and `image_count_total` are restricted to image outputs; `num_inference_steps` is restricted to diffusion stages.
-- Diffusion engine timings are accumulated per request by `OrchestratorAggregator.accumulate_diffusion_metrics`. Engine-side millisecond values are converted to seconds before `observe_modality_at_finalize(...)` dispatches the per-replica Histogram observations.
-- `request_queue_wait_s` is emitted once at final request completion from `pipeline_timings["queue_wait_ms"]`. A present value of `0` is a valid observation; a missing key produces no sample.
-- `stage_waiting_requests` is the sum of the latest scheduler snapshots for all live replicas in a stage. AR snapshots arrive through `SchedulerStats`; diffusion snapshots ride normal diffusion output metrics. A dead replica's snapshot is removed. Because this deliberately reuses existing message paths, the gauge can retain its last value while a replica produces no output.
-- `kv_wait_s` measures the AR scheduler interval from entering the KV-transfer-free wait state until extraction acknowledgement. The sample is carried to the Orchestrator through the existing engine output and labeled by connector type. Abort/error/removal paths discard incomplete timers rather than emitting partial waits.
-
-Zero and missing values have different meanings. Valid zero-duration queue observations are recorded, while unavailable optional measurements are omitted instead of being exported as synthetic zeroes. `peak_memory_mb`, `diffusion_forward_s`, `diffusion_kv_load_s`, `vae_decode_s`, and `kv_wait_s` therefore appear only when their data source is active.
-
-**Path 3: Audio modality metrics (`vllm_omni:audio_*`)**
+**Path 2: Audio modality metrics (`vllm:omni_audio_*`)**
 
 `OmniModalityMetrics` registers seven audio families with `{model_name, stage, replica}` (plus an extra `threshold_ms` / `reason` label on the two extra-cardinality Counters). Three observation sites:
 
@@ -89,7 +76,7 @@ Zero and missing values have different meanings. Valid zero-duration queue obser
 - `observe_audio_first_packet(...)` — called from the OpenAI SSE audio branch in `serving_chat.py` on the first audio packet for a request. The once-per-request guard is held by `ClientRequestState.first_audio_ts`. The `request_arrival_ts` anchor is stored in `ClientRequestState` by `async_omni.generate()`, computed at request entry.
 - `observe_audio_streaming_finalize(...)` — called from `serving_chat.py` after the streaming chunk loop exhausts. It runs the per-chunk player simulation from `vllm_omni/benchmarks/audio_continuity.py` to compute the worst-case underrun and emits `audio_underrun_s` plus (when the request stayed below the threshold) `audio_continuity_ok_total{threshold_ms}`. Per-chunk PCM byte counts and arrival timestamps are recorded by the same audio branch that updates `first_audio_ts`.
 
-**Path 4: Cross-stage transfer metrics (`vllm_omni:transfer_*`)**
+**Path 3: Cross-stage transfer metrics (`vllm:omni_transfer_*`)**
 
 `OmniTransferMetrics` registers four Histogram families with `{model_name, from_stage, from_replica, to_stage, to_replica}` labels. Each observation corresponds to one physical transfer hop (one chunk between adjacent stages), not the per-request accumulated total — so the histograms track per-transfer distribution.
 
@@ -100,7 +87,7 @@ The hook lives in `OrchestratorAggregator.record_transfer_tx` and `record_transf
 
 Defensive fail-safe: if `transfer_emitter` or `replica_resolver` is missing, or the resolver returns `None` for either side, the emit is skipped silently (the underlying `TransferEdgeStats` accumulation is unaffected).
 
-**Path 5: Per-engine metrics (`vllm:*`, stage/replica wrap)**
+**Path 4: Per-engine metrics (`vllm:*`, stage/replica wrap)**
 
 The Orchestrator instantiates `OmniPrometheusStatLogger` (a thin subclass of upstream `vllm.v1.metrics.loggers.PrometheusStatLogger`) and feeds it scheduler stats and iteration stats after processing each batch of engine outputs. This populates the standard ~37 vLLM metric families (TTFT, ITL, TPOT, KV cache usage, etc.) using the same upstream code path — but with the `engine` label reshaped into `stage` + `replica` so multi-replica deployments produce distinct series per replica. See the next section for the wrap mechanics.
 
@@ -110,9 +97,9 @@ The Orchestrator runs in a background thread. The API server (OmniBase) runs in
 
 ### Metric Registration and Lifecycle
 
-All `vllm_omni:*` collectors are registered once when their owning class (`OmniPrometheusMetrics` / `OmniModalityMetrics` / `OmniTransferMetrics`) is imported. Per-`(stage, replica)` labels are bound lazily on first observation to avoid registering label sets for combinations that never produce data.
+All `vllm:omni_*` collectors are registered once when their owning class (`OmniPrometheusMetrics` / `OmniModalityMetrics` / `OmniTransferMetrics`) is imported. Per-`(stage, replica)` labels are bound lazily on first observation to avoid registering label sets for combinations that never produce data.
 
-The `prometheus_client` default registry holds all collectors. FastAPI's `/metrics` endpoint serves the default registry, so `vllm_omni:*` and the wrapped `vllm:*` metrics appear in the same scrape response alongside `http_*` and `process_*` metrics from the instrumentator and the Python client runtime.
+The `prometheus_client` default registry holds all collectors. FastAPI's `/metrics` endpoint serves the default registry, so `vllm:omni_*` and the wrapped `vllm:*` metrics appear in the same scrape response alongside `http_*` and `process_*` metrics from the instrumentator and the Python client runtime.
 
 ## OmniPrometheusStatLogger Wrap
 
@@ -143,11 +130,11 @@ A reverse map `(stage_id, replica_id) -> flat_idx` is maintained on the Orchestr
 
 ## Gating: `--log-stats`
 
-All metrics — both the omni-specific `vllm_omni:*` families and the upstream `vllm:*` wrap families — are gated by the user's `--log-stats` CLI flag (default off). The flag is plumbed from `OmniBase.__init__(log_stats=...)` through `AsyncOmniEngine` to the stage-spawn helpers and to the three Prometheus metric classes (`OmniPrometheusMetrics` / `OmniModalityMetrics` / `OmniTransferMetrics`), and is forwarded to `Orchestrator._init_metrics_state(...)`.
+All metrics — both the 15 `vllm:omni_*` families and the ~65 upstream `vllm:*` wrap families — are gated by the user's `--log-stats` CLI flag (default off). The flag is plumbed from `OmniBase.__init__(log_stats=...)` through `AsyncOmniEngine` to the stage-spawn helpers and to the three Prometheus metric classes (`OmniPrometheusMetrics` / `OmniModalityMetrics` / `OmniTransferMetrics`), and is forwarded to `Orchestrator._init_metrics_state(...)`.
 
 Behavior with `--log-stats=off` (default):
 
-- The three `Omni*Metrics` classes register their module-level Gauge / Counter / Histogram families at import time (prometheus_client requires up-front registration), but each `observe / inc / set` method early-returns. The per-label child series for `vllm_omni:*` stay materialized but never have data written to them.
+- The three `Omni*Metrics` classes register their module-level Gauge / Counter / Histogram families at import time (prometheus_client requires up-front registration), but each `observe / inc / set` method early-returns. The per-label child series for `vllm:omni_*` stay materialized but never have data written to them.
 - `OmniPrometheusStatLogger` is not constructed in `_init_metrics_state`, so the ~65 upstream `vllm:*` wrap families are not registered in the default registry at all.
 - The engine core's `Scheduler.make_stats()` also short-circuits inside upstream (`if not self.log_stats: return None`), so no `SchedulerStats` is produced per step — the per-iteration cost is bounded by the existing upstream gate.
 
@@ -175,43 +162,10 @@ second.
 
 | Metric | Type | Labels | Description |
 |--------|------|--------|-------------|
-| `vllm_omni:num_requests_running` | Gauge | `model_name` | Requests currently executing across all stages |
-| `vllm_omni:num_requests_waiting` | Gauge | `model_name` | Requests queued but not yet scheduled |
-| `vllm_omni:requests_success_total` | Counter | `model_name`, `finished_reason` | Total requests by completion reason ({stop, length, abort, ...}); aborts cover client-disconnect / cancellation paths in addition to upstream `FinishReason.ABORT` |
-| `vllm_omni:e2e_request_latency_s` | Histogram | `model_name` | Pipeline-global end-to-end latency in seconds |
-
-### Image and diffusion service-level metrics
-
-| Metric | Type | Labels | Description |
-|--------|------|--------|-------------|
-| `vllm_omni:stage_gen_time_s` | Histogram | `model_name`, `stage`, `stage_type` | Stage submit to finished output; includes in-stage queueing |
-| `vllm_omni:request_queue_wait_s` | Histogram | `model_name` | Orchestration-layer queue wait; a present zero is recorded |
-| `vllm_omni:stage_waiting_requests` | Gauge | `model_name`, `stage` | Sum of the latest waiting snapshots across live replicas in the stage |
-| `vllm_omni:stage_in_queue_s` | Histogram | `model_name`, `stage` | Diffusion scheduler wait from enqueue to initial execution admission |
-| `vllm_omni:num_inference_steps` | Histogram | `model_name` | Denoising-step distribution for diffusion stages |
-| `vllm_omni:image_count_total` | Counter | `model_name` | Cumulative number of generated image outputs |
-| `vllm_omni:image_pixels` | Histogram | `model_name` | Pixel-count distribution for image outputs |
-| `vllm_omni:peak_memory_mb` | Gauge | `model_name`, `stage` | Positive per-stage peak-memory samples reported by engine outputs |
-| `vllm_omni:requests_failed_total` | Counter | `model_name`, `reason` | Request failures with bounded reason values (`client_abort`, `client_disconnect`, `stage_error`, `unknown`) |
-| `vllm_omni:kv_wait_s` | Histogram | `model_name`, `connector_type` | Completed AR KV-transfer wait intervals, grouped by connector backend |
-
-### Diffusion execution breakdown
-
-Labels: `{model_name, stage, replica}`.
-
-| Metric | Type | Description |
-|--------|------|-------------|
-| `vllm_omni:diffusion_exec_s` | Histogram | Core diffusion-step execution time per request |
-| `vllm_omni:diffusion_exec_per_step_s` | Histogram | Core diffusion execution divided by inference-step count |
-| `vllm_omni:diffusion_preprocess_s` | Histogram | Diffusion input preprocessing time |
-| `vllm_omni:diffusion_postprocess_s` | Histogram | Diffusion output postprocessing time |
-| `vllm_omni:vae_decode_s` | Histogram | VAE decode time when the engine reports it |
-| `vllm_omni:diffusion_forward_s` | Histogram | Forward-only denoise-loop time when pipeline profiling is enabled |
-| `vllm_omni:diffusion_kv_load_s` | Histogram | Diffusion-side KV receive/load time when upstream KV is used |
-| `vllm_omni:image_ttfp_s` | Histogram | Image-stage submit to first materialized image output |
-| `vllm_omni:denoise_step_latency_s` | Histogram | Mean diffusion forward time per denoise step for image output stages |
-
-The optional breakdown and memory families are sparse by design: when an engine does not produce the source measurement, no sample is emitted. This differs from queue timings, where an explicitly measured zero is meaningful and is retained.
+| `vllm:omni_num_requests_running` | Gauge | `model_name` | Requests currently executing across all stages |
+| `vllm:omni_num_requests_waiting` | Gauge | `model_name` | Requests queued but not yet scheduled |
+| `vllm:omni_requests_success_total` | Counter | `model_name`, `finished_reason` | Total requests by completion reason ({stop, length, abort, ...}); aborts cover client-disconnect / cancellation paths in addition to upstream `FinishReason.ABORT` |
+| `vllm:omni_e2e_request_latency_s` | Histogram | `model_name` | Pipeline-global end-to-end latency in seconds |
 
 ### Audio (7)
 
@@ -219,13 +173,13 @@ Labels: `{model_name, stage, replica}` plus the listed extra label.
 
 | Metric | Type | Extra label | Description |
 |--------|------|-------------|-------------|
-| `vllm_omni:audio_ttfp_s` | Histogram | — | Time from request arrival to first audio packet/frame |
-| `vllm_omni:audio_duration_s` | Histogram | — | Audio content duration (`audio_frames / sample_rate`) |
-| `vllm_omni:audio_rtf` | Histogram | — | Real-time factor `stage_gen_time_s / audio_duration_s` (SLO `< 1`); uses `RTF_BUCKETS` |
-| `vllm_omni:audio_frames_total` | Counter | — | Cumulative audio frames generated |
-| `vllm_omni:audio_underrun_s` | Histogram | — | Per-request worst-case player deficit; `> 0` indicates listener heard silent gaps |
-| `vllm_omni:audio_continuity_ok_total` | Counter | `threshold_ms` | Incremented when the request's worst underrun stayed below `threshold_ms` |
-| `vllm_omni:audio_skipped_requests_total` | Counter | `reason` | Silent-loss counter — code2wav rejected malformed codec input and returned `200 OK` with empty audio |
+| `vllm:omni_audio_ttfp_s` | Histogram | — | Time from request arrival to first audio packet/frame |
+| `vllm:omni_audio_duration_s` | Histogram | — | Audio content duration (`audio_frames / sample_rate`) |
+| `vllm:omni_audio_rtf` | Histogram | — | Real-time factor `stage_gen_time_s / audio_duration_s` (SLO `< 1`); uses `RTF_BUCKETS` |
+| `vllm:omni_audio_frames_total` | Counter | — | Cumulative audio frames generated |
+| `vllm:omni_audio_underrun_s` | Histogram | — | Per-request worst-case player deficit; `> 0` indicates listener heard silent gaps |
+| `vllm:omni_audio_continuity_ok_total` | Counter | `threshold_ms` | Incremented when the request's worst underrun stayed below `threshold_ms` |
+| `vllm:omni_audio_skipped_requests_total` | Counter | `reason` | Silent-loss counter — code2wav rejected malformed codec input and returned `200 OK` with empty audio |
 
 ### Cross-stage transfer (4)
 
@@ -233,10 +187,10 @@ Labels: `{model_name, from_stage, from_replica, to_stage, to_replica}`.
 
 | Metric | Type | Description |
 |--------|------|-------------|
-| `vllm_omni:transfer_size_bytes` | Histogram | Per-transfer payload size in bytes |
-| `vllm_omni:transfer_tx_s` | Histogram | Sender-side time (serialize + submit to connector) |
-| `vllm_omni:transfer_rx_s` | Histogram | Receiver-side time (recv + deserialize) |
-| `vllm_omni:transfer_in_flight_s` | Histogram | Network in-flight time (TX done → RX recv start) |
+| `vllm:omni_transfer_size_bytes` | Histogram | Per-transfer payload size in bytes |
+| `vllm:omni_transfer_tx_s` | Histogram | Sender-side time (serialize + submit to connector) |
+| `vllm:omni_transfer_rx_s` | Histogram | Receiver-side time (recv + deserialize) |
+| `vllm:omni_transfer_in_flight_s` | Histogram | Network in-flight time (TX done → RX recv start) |
 
 ### LLM stage-level (wrapped `vllm:*`)
 
@@ -249,7 +203,7 @@ After the wrap, every upstream `vllm:*` family — TTFT, ITL, TPOT, e2e latency,
   - `SECONDS_FAST_BUCKETS` (0.001 s – 60 s) for fine-grained cross-stage transfer and audio-underrun values that need millisecond-level resolution.
 - Counters use the `_total` suffix (auto-appended by `prometheus_client`).
 - Sizes use the `_bytes` suffix.
-- All omni-specific families are prefixed `vllm_omni:`. The upstream `unregister_vllm_metrics()` function is monkey-patched to a scoped version that still strips upstream `vllm:*` collectors (so multi-engine init within one process does not crash on duplicate registration) but preserves anything prefixed `vllm_omni:` / `vllm_omni`.
+- All omni-specific families are prefixed `vllm:omni_`. The upstream `unregister_vllm_metrics()` function is monkey-patched to a scoped version that still strips upstream `vllm:*` collectors (so multi-engine init within one process does not crash on duplicate registration) but preserves anything prefixed `vllm:omni_` / `vllm_omni`.
 
 ## Logging vs. Prometheus
 

docs/design/module/diffusion/diffusion_runtime.md

@@ -8,44 +8,22 @@ owners:
   - "@SamitHuang"
   - "@fhfuih"
 primary_code_paths:
-  - vllm_omni/diffusion/diffusion_engine.py
-  - vllm_omni/diffusion/request.py
-  - vllm_omni/diffusion/data.py
   - vllm_omni/diffusion/sched/**
   - vllm_omni/diffusion/executor/**
   - vllm_omni/diffusion/worker/**
 related_code_paths:
-  - vllm_omni/diffusion/stage_diffusion_client.py
-  - vllm_omni/diffusion/stage_diffusion_proc.py
-  - vllm_omni/diffusion/inline_stage_diffusion_client.py
-  - vllm_omni/diffusion/ipc.py
   - vllm_omni/diffusion/hooks/**
   - vllm_omni/diffusion/postprocess/**
 depends_on:
   - ../engine_orchestration.md
-  - ../stage_runtime.md
   - ../input_output_modality_contracts.md
   - diffusion_model_integration.md
 validation_paths:
-  - tests/diffusion/test_diffusion_engine.py
-  - tests/diffusion/test_diffusion_engine_cleanup.py
-  - tests/diffusion/test_diffusion_engine_dummy_run.py
-  - tests/diffusion/test_diffusion_engine_rpc_routing.py
-  - tests/diffusion/test_diffusion_scheduler.py
-  - tests/diffusion/test_diffusion_model_runner.py
-  - tests/diffusion/test_diffusion_worker.py
-  - tests/diffusion/test_multiproc_engine_concurrency.py
-  - tests/diffusion/test_uniproc_executor.py
-  - tests/diffusion/test_result_pump.py
-  - tests/diffusion/test_async_output_worker.py
-  - tests/diffusion/test_diffusion_ipc.py
-  - tests/diffusion/test_diffusion_streaming_output.py
-  - tests/diffusion/test_stage_diffusion_proc.py
-  - tests/diffusion/test_inline_stage_diffusion_client.py
+  - tests/diffusion/diffusion_backend/**
+  - tests/diffusion/hooks/**
 upstream_refs:
   - diffusers.DiffusionPipeline
-last_reviewed: 2026-09-02
-last_verified_commit: e51fe6ec1b9a9a0e14bb1fdb296d61b6593b93c6
+last_reviewed: 2026-07-16
 ---
 
 # Diffusion runtime
@@ -53,380 +31,6 @@ last_verified_commit: e51fe6ec1b9a9a0e14bb1fdb296d61b6593b93c6
 The diffusion runtime owns request admission, scheduling, execution, progress,
 output, cancellation, and cleanup inside a diffusion stage.
 
-It is easiest to think of the runtime as a small control loop:
-
-1. the **scheduler** chooses ready requests;
-2. the **executor** sends that choice to the worker layer;
-3. each **worker** manages its device and delegates model work to a **runner**;
-4. the runner calls the model pipeline and returns per-request results; and
-5. the engine feeds those results back to the scheduler and output streams.
-
-!!! note
-
-    This page describes the runtime plumbing. Model loading and pipeline
-    contracts belong to [Diffusion model integration](diffusion_model_integration.md).
-    Batch compatibility and step-state details belong to
-    [Diffusion continuous batching](continuous_batching.md).
-
-## Goals and non-goals
-
-The runtime aims to keep request policy separate from device execution. It
-also keeps request identity stable from admission through the final output,
-including cancellation and failures.
-
-This module does **not** choose the next Omni stage, place stage replicas, or
-define a model's denoising algorithm:
-
-- cross-stage routing belongs to [Engine orchestration](../engine_orchestration.md);
-- process placement and replica lifecycle belong to
-  [Stage runtime](../stage_runtime.md); and
-- model-specific work belongs to
-  [Diffusion model integration](diffusion_model_integration.md).
-
-## Runtime at a glance
-
-The stage owns `DiffusionEngine` and a `DiffusionExecutor` backend. The inline
-stage client keeps that stack in the caller process; a process-backed stage
-runs it inside `StageDiffusionProc`.
-
-The executor then chooses how the worker runs:
-
-- **`uni`** (default when `num_gpus == 1`): `UniProcDiffusionExecutor` builds
-  one in-process worker. There is no worker subprocess and no shared-memory
-  RPC.
-- **`mp`** (default when `num_gpus > 1`, or when set explicitly):
-  `MultiprocDiffusionExecutor` starts one `WorkerProc` per device.
-
-Either way, each worker owns its device, distributed state,
-`DiffusionWorker`, `DiffusionModelRunner`, and pipeline instance.
-
-```mermaid
-flowchart TB
-    client["Stage client"]
-
-    subgraph stage["Diffusion stage process"]
-        stageProc["StageDiffusionProc<br/>stage transport and lifecycle"]
-        engine["DiffusionEngine<br/>admission and control loop"]
-        scheduler["RequestScheduler or StepScheduler<br/>request state and policy"]
-        executor["DiffusionExecutor<br/>uni or mp backend"]
-        streams["Per-request output streams"]
-
-        stageProc --> engine
-        engine --> scheduler
-        scheduler -->|"DiffusionSchedulerOutput"| engine
-        engine --> executor
-        engine --> streams
-    end
-
-    subgraph workers["Worker layer"]
-        workerProc["WorkerProc<br/>mp IPC loop only"]
-        worker["DiffusionWorker<br/>device and distributed setup"]
-        runner["DiffusionModelRunner<br/>model state and execution"]
-        pipeline["Diffusion pipeline<br/>model-specific computation"]
-
-        workerProc --> worker
-        worker --> runner --> pipeline
-    end
-
-    client -->|"process-backed: ZMQ"| stageProc
-    client -.->|"inline: direct call"| engine
-    executor -->|"mp: broadcast / result queues"| workerProc
-    executor -.->|"uni: in-process call"| worker
-    streams -->|"process-backed"| stageProc
-    stageProc -->|"ZMQ results"| client
-    streams -.->|"inline"| client
-```
-
-!!! info "Stage process vs worker process"
-
-    A deployed stage may already run in a `StageDiffusionProc` child process.
-    That is separate from the optional `mp` worker processes. With `uni`, the
-    worker lives in the same process as the engine.
-
-## Component responsibilities
-
-| Component | Owns | Does not own |
-| --- | --- | --- |
-| `DiffusionEngine` | Admission, the busy loop, scheduler/executor coordination, RPC ordering, output streams, warmup, abort routing | Batch policy details, device setup, model computation |
-| `BaseScheduler` | Request states, waiting/running sets, capacity, compatibility, terminal transitions | IPC, worker calls, output formatting |
-| `RequestScheduler` | Complete-request waves and optional admission delay for request-level batching | Denoising-step progress |
-| `StepScheduler` | Per-request denoising progress and step-wise completion | Pipeline tensors and model state |
-| `DiffusionExecutor` | Execution backend contract, worker RPC, health, shutdown | Admission and request-state transitions |
-| `UniProcDiffusionExecutor` | Single in-process worker for `num_gpus == 1`; no IPC or async output pump | Multi-GPU execution |
-| `MultiprocDiffusionExecutor` | Worker processes, shared-memory message queues, result dispatch, worker monitoring | In-process single-GPU path |
-| `WorkerProc` | One `mp` worker process's IPC loop and reply rules | Scheduling policy; unused by `uni` |
-| `DiffusionWorker` | Device/distributed setup, LoRA activation, profiling, sleep/wake, runner delegation | Request admission |
-| `DiffusionModelRunner` | Pipeline loading, request-local model state, cache/compile setup, request or step execution | Queueing and cross-stage routing |
-
-The boundary between policy and execution is
-`DiffusionSchedulerOutput`. It contains newly admitted request payloads,
-IDs for requests whose runner state is already cached, finished IDs,
-optional KV-prefetch work, and per-request `diffusion_kv_metadata` on
-`NewRequestData` envelopes when paged Diffusion KV is enabled. Executors and
-workers consume this output; they do not decide what should run next.
-
-`BaseScheduler.initialize()` sets `max_num_running_reqs` from
-`od_config.max_num_seqs` (default 1). The engine may override that capacity
-for distributed layerwise offload with AllGather DP concurrency.
-
-## One scheduling tick
-
-Async requests share one engine busy loop. Worker calls and control RPCs pass
-through that loop, so they cannot race on the executor transport.
-
-```mermaid
-sequenceDiagram
-    participant Caller
-    participant Engine as DiffusionEngine
-    participant Scheduler
-    participant Executor
-    participant Worker
-    participant Runner
-
-    Caller->>Engine: add request
-    Engine->>Scheduler: add_request(request)
-    Engine->>Scheduler: schedule()
-    Scheduler-->>Engine: DiffusionSchedulerOutput
-    Engine->>Executor: execute_batch() or execute_step()
-    Executor->>Worker: run worker method
-    Worker->>Runner: execute model or one step
-    Runner-->>Worker: RunnerOutput(s)
-    Worker-->>Executor: result
-    Executor-->>Engine: BaseRunnerOutput
-    Engine->>Scheduler: update_from_output(...)
-    Scheduler-->>Engine: finished request IDs
-    Engine-->>Caller: chunk or final output
-```
-
-The engine catches request execution errors and turns them into per-request
-error outputs. A dead worker group is different: the executor marks itself
-failed, health checks raise `EngineDeadError`, and the owning stage client
-handles the stage-level failure.
-
-## Execution modes
-
-The engine resolves one mode at startup and binds the matching scheduler and
-executor call.
-
-| Mode | Scheduler | Executor call | Runner path |
-| --- | --- | --- | --- |
-| Request batch | `RequestScheduler` | `execute_batch()` | `execute_model()` for one request, or `execute_model_batch()` for a fused batch |
-| Step batch | `StepScheduler` | `execute_step()` | `execute_stepwise()` |
-
-**Request mode** runs a complete pipeline forward for each scheduled wave. A
-single-request wave is the conservative path. A multi-request wave usually
-uses fused `execute_model_batch()` and requires the pipeline to declare
-request-batch support.
-
-**Distributed layerwise offload with AllGather (DLO DP concurrency)** is a
-separate multiproc dispatch path. It activates when
-`data_parallel_size > 1`, `enable_distributed_layerwise_offload` is set, and
-`dlo_use_allgather` is true. The engine then sets `dp_concurrent = True` and
-raises `scheduler.max_num_running_reqs` to `dp_size`, overriding the
-`max_num_seqs` value from `initialize()`. The scheduler still emits a
-multi-request `DiffusionSchedulerOutput`; the multiproc executor routes that
-wave through `execute_request()` instead of fused `execute_model_batch()`.
-
-Optional admission coalescing can fill a `dp_size` wave: when
-`request_batch_max_wait_ms > 0`, `RequestScheduler` may wait briefly before
-the first schedule of a wave (under `dp_concurrent`, the stable window is
-`min(0.3s, wait/2)`). With the default `request_batch_max_wait_ms == 0`,
-there is no wait.
-
-Before dispatch, `MultiprocDiffusionExecutor.execute_request()` rejects waves
-whose requests differ in sampling-parameter compatibility or `extra_args`
-(AllGather requires every DP rank to follow the same forward schedule). Each
-worker rank then picks one envelope from the wave:
-`req[dp_rank % len(req)]`, so every rank enters the same collective while
-computing different requests.
-
-**Step mode** keeps `StepRequestState` in the runner. New requests run
-`prepare_encode()` once; every tick runs `denoise_step()` and
-`step_scheduler()`; completed requests run `post_decode()`. The scheduler keeps
-only lifecycle and progress metadata—it does not hold model tensors.
-
-**Step mode is also the path for streaming diffusion output**. Enabling
-`streaming_output` turns on step execution if needed. Chunk-capable pipelines
-can emit intermediate outputs through the same request stream; final-only step
-pipelines still emit only the final result. If the pipeline does not implement
-step execution, initialization fails.
-
-!!! tip
-
-    For user-facing flags and examples, see
-    [Diffusion execution modes](../../../user_guide/diffusion/execution_modes.md).
-    That guide explains how to select a mode; this page explains what happens
-    after the choice is made.
-
-## Request state and identity
-
-The scheduler is the source of truth for an admitted request. Its normal state
-flow is:
-
-```mermaid
-stateDiagram-v2
-    [*] --> WAITING: add_request
-    WAITING --> RUNNING: schedule
-    WAITING --> FINISHED_ABORTED: abort
-    RUNNING --> FINISHED_ABORTED: abort
-    RUNNING --> FINISHED_COMPLETED: successful output
-    RUNNING --> FINISHED_ERROR: failed or missing output
-    FINISHED_COMPLETED --> [*]: deliver and remove state
-    FINISHED_ABORTED --> [*]: deliver and remove state
-    FINISHED_ERROR --> [*]: deliver and remove state
-```
-
-`PREEMPTED` and `BaseScheduler.preempt_request()` exist on the scheduler API,
-but the engine loop does not call them today—only scheduler unit tests do.
-
-`request_id` ties together scheduler state, runner state, executor results, and
-the output queue. Batch positions are temporary and must never replace request
-identity when results are mapped back.
-
-Only compatible requests enter the same running wave. The scheduler compares a
-mode-specific sampling-parameter key and stops at the first incompatible
-waiting request. This is intentionally conservative and can cause
-head-of-line blocking.
-
-## Executor and IPC
-
-`DiffusionExecutor` is the backend interface. Built-in backends are selected by
-`distributed_executor_backend`:
-
-| Backend | When chosen | Worker layout |
-| --- | --- | --- |
-| `uni` | Default for `num_gpus == 1`, or set explicitly | One in-process worker |
-| `mp` | Default for `num_gpus > 1`, or set explicitly | One worker process per device |
-
-Ray and external-launcher diffusion backends are not implemented. A custom
-`DiffusionExecutor` subclass or import path is also accepted.
-
-### Uniproc backend
-
-`UniProcDiffusionExecutor` constructs `WorkerWrapperBase` in the engine process
-and calls worker methods directly. It avoids a second model load, MessageQueue
-rings, ZMQ IPC sockets, and `/dev/shm` tensor packing. RPC timeouts are
-accepted for interface parity but are not enforced: a hung worker blocks the
-calling thread. Sticky accelerator faults mark the executor dead through
-failure callbacks; ordinary request errors stay per-request.
-
-### Multiproc backend
-
-`MultiprocDiffusionExecutor`:
-
-1. creates a broadcast queue shared by all workers;
-2. spawns one worker process per configured device;
-3. waits until every worker reports ready;
-4. sends generation and control calls as RPC messages;
-5. applies rank-aware reply rules so only expected ranks respond; and
-6. monitors worker process sentinels and fails the executor if a worker dies.
-
-In request mode on this backend, each async output produces two correlated
-messages keyed by `async_output_id`:
-
-- `COMPUTE_DONE` — the forward finished and the device can start the next
-  request.
-- `OUTPUT_READY` — background D2H/SHM packing finished and the final output
-  is ready.
-
-The worker queues background packing work before it enqueues `COMPUTE_DONE`,
-but either message may reach the executor first. The result pump and
-`execute_batch()` must handle both orderings. Step mode keeps the synchronous
-result path and does not start those pumps.
-
-See [Async diffusion output](../../feature/async_diffusion_output.md) for the
-multiproc request-mode timeline.
-
-## Worker and runner boundary
-
-On the `mp` path, `WorkerProc` receives messages and calls methods through
-`WorkerWrapperBase`. On the `uni` path, the executor owns that wrapper
-directly. In both cases, `DiffusionWorker` handles the parts tied to a device:
-distributed initialization, model-runner construction, LoRA activation,
-profiling, and memory sleep/wake. It delegates actual model work to
-`DiffusionModelRunner`.
-
-The runner owns long-lived model-side state:
-
-- the loaded pipeline and compilation setup;
-- cache and offload integration;
-- random-generator setup;
-- request batches for complete forwards; and
-- `StepRequestState` plus `InputBatch` for step execution.
-
-This split keeps infrastructure out of model pipelines. A pipeline receives a
-request batch or step state and performs model work; it should not inspect
-engine queues or change scheduler state.
-
-## Lifecycle and cleanup
-
-### Startup
-
-`DiffusionEngine.make_engine()` resolves the engine class, constructs the
-executor and scheduler, then normally runs a small dummy request to warm up the
-model.
-
-Warmup is skipped only when distributed layerwise offload with AllGather
-is enabled (via `enable_distributed_layerwise_offload` and `dlo_use_allgather`)
-and `max(data_parallel_size, sequence_parallel_size) > 1`, because
-the dummy run sends one request while AllGather needs every shard rank to
-enter the same collective. If initialization or warmup fails, the runtime
-closes scheduler state and worker resources before returning the error.
-
-### Cancellation
-
-`abort()` places request IDs on an abort queue. The busy loop marks those
-requests `FINISHED_ABORTED`; finalization removes scheduler state and emits an
-aborted output when a consumer still exists. The runner removes cached
-step-mode state when it receives a scheduler output that reports the finished
-request ID.
-
-On the multiproc request-mode async path, abort or consumer drop while output
-is still materializing should release the associated async-output bookkeeping
-so late results are not retained after the request ends
-*(pending #6253/#6439/#6580)*. Today, an unconsumed `OUTPUT_READY` is cached
-by design until `wait_output_ready()` or executor teardown. Dropping an
-output-stream consumer removes that consumer's queue. It does not take
-ownership of scheduler cleanup.
-
-### Shutdown and worker failure
-
-`DiffusionEngine.close()` is idempotent. It stops the busy loop, wakes pending
-streams with an error, closes scheduler state, and shuts down the executor.
-
-- **`mp`**: the executor asks workers to stop, waits for them, then terminates
-  workers that miss the grace period. Shutdown marks unfinished RPC and
-  async-output futures as failed, then clears them. Completed async outputs
-  cached for later `wait_output_ready()` calls are dropped with the executor
-  object.
-- **`uni`**: the executor shuts down the in-process worker, drops the final
-  model reference, and empties the accelerator cache so a later engine can reuse
-  the device.
-
-!!! warning
-
-    Do not continue using a worker group after a fatal collective timeout or
-    unexpected worker exit. Distributed state may be incomplete. The
-    multiprocess executor deliberately fails closed so the stage can restart.
-    The uniproc executor fails closed when the accelerator context itself is
-    poisoned.
-
-## Extension boundaries
-
-- A custom engine may set `default_diffusion_model_runner_cls`; an explicit
-  `diffusion_model_runner_cls` configuration still wins.
-- Tests and custom engine integrations may inject a `BaseScheduler` subclass.
-  `SchedulerInterface` remains only as a deprecated compatibility name.
-- `distributed_executor_backend` may be `"uni"`, `"mp"`, a custom `DiffusionExecutor`
-  subclass, or an import path. A backend must preserve scheduler output,
-  request identity, health, and cleanup contracts. Use `"mp"` when you need
-  process isolation or multi-GPU; `"uni"` is the single-GPU default.
-- Worker extensions go through `WorkerWrapperBase`. They add worker methods;
-  they do not become a second scheduler or request lifecycle.
-
-These are advanced Python integration points, not stable end-user CLI
-customization surfaces.
-
 ## Candidate invariants
 
 ### DIFF-RUNTIME-INV-001: One lifecycle owner
@@ -437,50 +41,19 @@ until completion, cancellation, or failure.
 ### DIFF-RUNTIME-INV-002: Execution follows scheduler output
 
 **Rule:** Executors and workers MUST execute scheduler decisions without
-admitting, reordering, or forwarding requests independently. Distributed
-layerwise offload with AllGather is an exception at dispatch time: the
-scheduler may schedule a multi-request wave, but each DP rank executes one
-envelope from that wave so every rank enters the same collective schedule.
+admitting, reordering, or forwarding requests independently.
 
 ### DIFF-RUNTIME-INV-003: Terminal cleanup is complete
 
 **Rule:** Every terminal path MUST release request state, temporary tensors,
-hooks, and runtime-owned resources. Async-output bookkeeping on abort or
-consumer drop before consumption is also required *(pending #6253/#6439/#6580)*.
+hooks, and runtime-owned resources.
 
 ### DIFF-RUNTIME-INV-004: Optional features use runtime hooks
 
 **Rule:** Cache, profiling, offload, and parallel features SHOULD integrate at
 defined hooks instead of creating another request lifecycle.
 
-### DIFF-RUNTIME-INV-005: Results keep request identity
-
-**Rule:** Batched and asynchronous results MUST be mapped by stable request ID,
-not by assumed completion order.
-
 ## Safe-change guide
 
-Test the smallest affected slice, then cover its neighboring boundary:
-
-| Change area | Minimum evidence |
-| --- | --- |
-| Admission or state transitions | `test_diffusion_scheduler.py`, including duplicate IDs, compatibility, abort, and missing output |
-| Engine loop or output delivery | `test_diffusion_engine.py`, `test_diffusion_engine_cleanup.py`, `test_diffusion_engine_rpc_routing.py` |
-| Executor or IPC | `test_multiproc_engine_concurrency.py`, `test_uniproc_executor.py`, `test_result_pump.py`, `test_diffusion_ipc.py`, `test_async_output_worker.py` |
-| Worker or runner | `test_diffusion_worker.py`, `test_diffusion_model_runner.py` |
-| Stage boundary | `test_stage_diffusion_proc.py`, `test_inline_stage_diffusion_client.py` |
-| Warmup or streaming | `test_diffusion_engine_dummy_run.py`, `test_diffusion_streaming_output.py` |
-
-Always exercise success, cancellation, per-request failure, fatal worker
-failure, repeated shutdown, one request, and multiple compatible requests.
-For step-mode changes, also test partial progress and cleanup of runner state.
-
-## Related documents
-
-- [Diffusion module overview](index.md)
-- [Diffusion model integration](diffusion_model_integration.md)
-- [Diffusion continuous batching](continuous_batching.md)
-- [Diffusion execution modes](../../../user_guide/diffusion/execution_modes.md)
-- [Async diffusion output](../../feature/async_diffusion_output.md)
-- [Engine orchestration](../engine_orchestration.md)
-- [Stage runtime](../stage_runtime.md)
+Test success, cancellation, failure, shutdown, multiple requests, and resource
+cleanup.

docs/design/module/diffusion/offloader.md

@@ -18,7 +18,7 @@ validation_paths:
   - tests/diffusion/offloader/**
 upstream_refs:
   - torch.nn.Module.to
-last_reviewed: 2026-08-25
+last_reviewed: 2026-07-16
 ---
 
 # Diffusion offloader
@@ -48,11 +48,6 @@ and correctness required by the selected execution mode.
 **Rule:** Retained host and device copies MUST respect configured limits and
 provide deterministic teardown.
 
-Allocator-cache retention MUST remain local to an explicit component owner,
-declare both cache and physical-free-memory bounds, release conservatively
-when telemetry is unavailable, and force release on failure or memory
-pressure. It MUST NOT replace unconditional executor shutdown cleanup.
-
 ## Safe-change guide
 
 Test enabled and disabled paths, repeated execution, asynchronous transfer,

docs/design/module/engine_orchestration.md

@@ -28,9 +28,6 @@ related_code_paths:
   - vllm_omni/engine/stage_pool.py
   - vllm_omni/outputs/output_processor.py
   - vllm_omni/distributed/omni_coordinator/**
-  # Duplex kernel design is owned by ../fullduplex.md; listed here because the
-  # orchestrator hosts the duplex control plane.
-  - vllm_omni/engine/duplex/**
 depends_on:
   - input_output_modality_contracts.md
   - error_contracts.md
@@ -40,15 +37,13 @@ validation_paths:
   - tests/engine/test_async_omni_engine_input.py
   - tests/engine/test_async_omni_engine_outputs.py
   - tests/engine/test_async_omni_engine_abort.py
-  - tests/e2e/offline_inference/test_qwen3_omni.py
   - tests/engine/test_async_omni_engine_stage_init.py
   - tests/engine/test_orchestrator.py
   - tests/engine/test_orchestrator_error_handling.py
   - tests/engine/test_orchestrator_stage_input_bridge.py
   - tests/engine/test_cfg_companion_lifecycle.py
   - tests/engine/test_rpc_result_router.py
-  - tests/engine/duplex/**
-  - tests/engine/test_duplex_import_boundary.py
+  - tests/e2e/features/fullduplex/engine/**
 upstream_refs:
   - vllm.v1.engine.EngineCoreRequest
   - vllm.v1.engine.EngineCoreOutputs
@@ -71,12 +66,6 @@ the boundary affected by the in-flight stage client/process refactor in
 [#5441](https://github.com/vllm-project/vllm-omni/pull/5441). Names and
 responsibilities proposed only by that PR are not current contracts.
 
-The orchestration loop also has an opt-in event-driven mode
-(`VLLM_OMNI_EVENT_DRIVEN_ORCH=1`, default off) proposed in
-[#5221](https://github.com/vllm-project/vllm-omni/pull/5221). It changes poll
-cadence only: the routing, ordering, and terminal-state contracts below hold
-identically on both loops.
-
 ## Ownership boundary
 
 This document owns `AsyncOmniEngine`, `Orchestrator`, request-state creation,
@@ -118,15 +107,6 @@ Numbers become append-only after normative promotion.
 
 Test routing, output ordering, queue correlation, cancellation, failure
 propagation, shutdown ordering, and representative multi-stage execution.
-AR abort of a final-stage LLM request must deliver a terminal output with
-`finish_reason="abort"` and the generated prefix so collocated training can
-resume; diffusion abort remains whole-sample retry. Aborting a parallel-sampling
-child must drop `parent_requests` once no children remain. EngineCore control
-RPCs (`sleep` / `wake_up` / `pause_scheduler` / `resume_scheduler`) must
-propagate worker exceptions rather than returning `{"supported": False}`.
-When a request has multiple final output stages, only the last abort message
-is request-terminal. Output-processor abort state is committed only after the
-physical EngineCore abort succeeds.
 Changes that cross into stage runtime or public error behavior require review
 from that contract's owners.
 

docs/design/module/entrypoints.md

@@ -26,18 +26,9 @@ primary_code_paths:
   - vllm_omni/entrypoints/client_request_state.py
   - vllm_omni/entrypoints/stage_utils.py
   - vllm_omni/entrypoints/utils.py
-  - vllm_omni/entrypoints/duplex/**
-  - vllm_omni/entrypoints/duplex_request_client.py
-  - vllm_omni/clients/**
 primary_path_exceptions:
   - path: vllm_omni/entrypoints/openai/errors.py
     owner: error_contracts.md
-  - path: vllm_omni/entrypoints/duplex/**
-    owner: ../fullduplex.md
-  - path: vllm_omni/entrypoints/duplex_request_client.py
-    owner: ../fullduplex.md
-  - path: vllm_omni/clients/**
-    owner: ../fullduplex.md
 related_code_paths:
   - vllm_omni/errors.py
   - vllm_omni/inputs/**
@@ -52,7 +43,6 @@ depends_on:
 validation_paths:
   - tests/entrypoints/test_omni_entrypoints.py
   - tests/entrypoints/test_async_omni.py
-  - tests/entrypoints/test_async_omni_pause_sleep_routing.py
   - tests/entrypoints/test_async_omni_duplex.py
   - tests/entrypoints/test_serve.py
   - tests/entrypoints/test_stream_finish_reason.py
@@ -129,13 +119,7 @@ promotion.
 
 Test request validation, protocol conversion, model-adapter routing,
 streaming, session identity, disconnect/cancellation, and error mapping for
-each affected offline or serving entrypoint. Sleep must wait for in-flight
-`generate()` admission before EngineCore offload; `wake_up` does not resume
-admission — callers must `resume_generation()`. Sleeping tags are tracked per
-stage so `wake_up(stage_ids=[0])` does not skip a later `wake_up(stage_ids=[1])`.
-Streaming input pumps take an admission slot immediately before each EngineCore
-ADD or update, not while waiting for the next client chunk. Frontend abort
-keeps `request_states` until `generate()` consumes the terminal output.
+each affected offline or serving entrypoint.
 
 ## Promotion gate
 

docs/design/module/host_weight_runtime.md

@@ -16,7 +16,7 @@ validation_paths:
   - tests/host_weight_runtime/**
 upstream_refs:
   - https://github.com/vllm-project/vllm-omni/issues/6414
-last_reviewed: 2026-08-25
+last_reviewed: 2026-08-21
 ---
 
 # Host Weight Runtime
@@ -84,13 +84,6 @@ another. `WeightArtifactIdentity` includes:
 - producer version, implementation fingerprint, manifest schema, and restorer
   schema.
 
-Loader integrations may persist content digests for canonical source shards in
-the selected storage domain. Reuse requires the same path, inode, size,
-timestamps, symlink target, and cache-record checksum. Corrupt records are
-rebuilt, and coordination or cache-I/O failure falls back to hashing the
-canonical source directly. This is an identity-computation optimization, not a
-second source of truth or an artifact substitution rule.
-
 The identity excludes transfer policy such as registered mmap versus private
 pinned staging. Those paths move the same host representation and must not
 produce duplicate artifacts.
@@ -244,12 +237,6 @@ Every publication computes full file and tensor hashes. Local lookup supports:
   and
 - `full_checksum`, which additionally reads and hashes every payload file.
 
-An ordered producer may compute file and tensor digests while payload bytes are
-written and overlap each closed payload's `fsync` with later producer work. An
-unordered producer retains parallel readback hashing. In both cases manifest
-and `READY` publication wait for every payload digest and `fsync`; the atomic
-publication and validation contract is unchanged.
-
 Filesystem verity is modeled but unsupported. Invalid artifacts receive an
 external deny marker before their shared lookup lock is released; a build owner
 then quarantines the immutable directory under the exclusive lock.
@@ -257,53 +244,6 @@ Lookup checks the marker both before validation and after constructing the
 lease so a weaker overlapping lookup cannot return a lease after a stronger
 validation has denied the artifact.
 
-If publishing the external deny marker fails, lookup returns a retryable
-storage failure and marks the artifact directory with a persistent invalidation
-mode before releasing the shared lock. Cooperating readers check that mode both
-while opening and immediately before returning a lease. Lookup then makes a
-bounded attempt to take the exclusive artifact lock and quarantine the entry;
-the quarantine transition removes the internal mode marker. If a cooperating
-builder replaces the marked inode while the locks are exchanged, containment
-preserves that new publication instead of quarantining it. If neither the
-external marker nor the directory-mode marker can be persisted, cross-process
-exclusion cannot be guaranteed on an unavailable filesystem and the domain
-must remain failed rather than treating the artifact as an ordinary invalid
-cache entry.
-
-New publications carry the internal invalidation mode through the staging
-rename. Hardening clears it and is the logical authority transition for a
-process crash; the temporary- and artifact-parent syncs then make the rename
-durable, with an artifact-inode sync first making the hardened mode durable. A
-process that dies before hardening leaves a persistently denied
-entry, while one that dies after successful hardening leaves an authoritative
-ready entry. Any synchronous failure after rename is marked invalid and
-contained in quarantine before `PUBLICATION_FAILED` is returned, so that
-nonretryable result cannot later resolve as a ready hit. If the filesystem
-refuses both the inode marker and the quarantine move, the store instead returns
-a retryable storage failure with `outcome_uncertain` details; as with deny-marker
-double failure, cross-process exclusion cannot be guaranteed until storage
-recovers. Once the artifact-parent sync succeeds, a later artifact- or
-build-lock release error is logged and lookup resolves the committed entry
-instead of reporting a contradictory publication failure. The same authority
-rule applies when a competing publisher already installed byte-identical
-semantic content; staging-cleanup errors are retried without downgrading that
-validated ready entry to publication failure.
-
-Before widening a hardened artifact for a lifecycle move, the store durably
-sets the same invalidation mode. A process crash before rename therefore leaves
-the writable source denied. After rename, the store re-hardens the destination
-but retains the marker until both parent-directory syncs make the move durable;
-only then does it durably clear the marker. An interrupted move therefore leaves
-a marked transition that the next exact-key lifecycle operation re-hardens.
-Explicit cleanup uses the locked move and retries exact-key
-`.cleanup.*` tombstones left by an interrupted removal; a later build performs
-the same tombstone reconciliation before producing replacement content.
-
-An operational failure while inspecting a noncooperative competing publication
-is a retryable storage failure. The competing entry remains authoritative and
-is not mislabeled as corrupt or quarantined merely because its manifest could
-not be read transiently.
-
 `inspect_domain()` and `inspect_artifact()` return typed, read-only snapshots.
 Inspection validation does not create a deny marker. Reported lock activity is
 point-in-time evidence only; kernel locks are not a persistent owner registry.

docs/design/qwen3_omni_tts_performance_optimization.md

@@ -410,8 +410,8 @@ Notes:
 - `stages[].max_num_seqs` controls stage-level batching.
 - Thinker/Talker commonly use `enforce_eager: false` for CUDA Graph paths.
 - Code2Wav often remains eager (`enforce_eager: true`) depending on runtime behavior.
-- The Qwen3-Omni deploy config pins `moe_backend: triton` for the Thinker and Talker stages. Triton has been more
- stable and faster than the FlashInfer CUTLASS unquantized MoE backend on recent vLLM rebases.
+- Qwen3-Omni defaults `VLLM_USE_FLASHINFER_MOE_FP16=0`. The Triton has been more stable & faster
+ than the FlashInfer CUTLASS unquantized MoE backend on recent vLLM rebases.
 
 #### 2) Enable async chunk